From 70c73bb8d7a68083f13466ddc4bcd382f52d8a06 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 03:31:53 +0100 Subject: bump for new haskellPackages --- users/gkleen@bragi.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'users/gkleen@bragi.nix') diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix index b67696a5..93ed41f6 100644 --- a/users/gkleen@bragi.nix +++ b/users/gkleen@bragi.nix @@ -30,7 +30,7 @@ }; myHaskellPackages = pkgs.recurseIntoAttrs ( pkgs.haskellPackages.override { - extension = self: super: let + overrides = self: super: let callPackage = pkgs.lib.callPackageWith ( pkgs // self ); in { attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {}; @@ -40,7 +40,7 @@ }; } ); - adjmix = let trivmix = myHaskellPackages.trivmix; in + adjmix = let trivmix = callPackage ../custom/trivmix.nix {}; in pkgs.stdenv.mkDerivation { name = "adjmix"; buildCommand = '' -- cgit v1.2.3 From 787dc4d718d7a43685f307d0215c22728bbace32 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 03:32:45 +0100 Subject: typo --- users/gkleen@bragi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/gkleen@bragi.nix') diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix index 93ed41f6..fe978b08 100644 --- a/users/gkleen@bragi.nix +++ b/users/gkleen@bragi.nix @@ -40,7 +40,7 @@ }; } ); - adjmix = let trivmix = callPackage ../custom/trivmix.nix {}; in + adjmix = let trivmix = myHaskellPackages.trivmix; in pkgs.stdenv.mkDerivation { name = "adjmix"; buildCommand = '' -- cgit v1.2.3 From 24e892bd43643d8194ec9e661a0d4bce9a714573 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 03:35:18 +0100 Subject: more new haskell stuff --- users/gkleen@bragi.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'users/gkleen@bragi.nix') diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix index fe978b08..a32fa0d1 100644 --- a/users/gkleen@bragi.nix +++ b/users/gkleen@bragi.nix @@ -33,9 +33,9 @@ overrides = self: super: let callPackage = pkgs.lib.callPackageWith ( pkgs // self ); in { - attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {}; - shellMonad = callPackage ../custom/shell-monad.nix {}; - filelock = callPackage ../custom/filelock.nix {}; + # attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {}; + # shellMonad = callPackage ../custom/shell-monad.nix {}; + # filelock = callPackage ../custom/filelock.nix {}; trivmix = callPackage ../custom/trivmix.nix {}; }; } -- cgit v1.2.3