summaryrefslogtreecommitdiff
path: root/users
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2015-12-06 03:31:53 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2015-12-06 03:31:53 +0100
commit70c73bb8d7a68083f13466ddc4bcd382f52d8a06 (patch)
tree8bdefd202c87f29d97cae6bd4014137bc98a4abd /users
parent27196899f9bdd43b7fd299aedf9b7ad6c75cf4ca (diff)
downloadnixos-70c73bb8d7a68083f13466ddc4bcd382f52d8a06.tar
nixos-70c73bb8d7a68083f13466ddc4bcd382f52d8a06.tar.gz
nixos-70c73bb8d7a68083f13466ddc4bcd382f52d8a06.tar.bz2
nixos-70c73bb8d7a68083f13466ddc4bcd382f52d8a06.tar.xz
nixos-70c73bb8d7a68083f13466ddc4bcd382f52d8a06.zip
bump for new haskellPackages
Diffstat (limited to 'users')
-rw-r--r--users/gkleen@bragi.nix4
1 files changed, 2 insertions, 2 deletions
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 @@
30 }; 30 };
31 myHaskellPackages = pkgs.recurseIntoAttrs ( 31 myHaskellPackages = pkgs.recurseIntoAttrs (
32 pkgs.haskellPackages.override { 32 pkgs.haskellPackages.override {
33 extension = self: super: let 33 overrides = self: super: let
34 callPackage = pkgs.lib.callPackageWith ( pkgs // self ); 34 callPackage = pkgs.lib.callPackageWith ( pkgs // self );
35 in { 35 in {
36 attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {}; 36 attoparsecExpr = callPackage ../custom/attoparsec-expr.nix {};
@@ -40,7 +40,7 @@
40 }; 40 };
41 } 41 }
42 ); 42 );
43 adjmix = let trivmix = myHaskellPackages.trivmix; in 43 adjmix = let trivmix = callPackage ../custom/trivmix.nix {}; in
44 pkgs.stdenv.mkDerivation { 44 pkgs.stdenv.mkDerivation {
45 name = "adjmix"; 45 name = "adjmix";
46 buildCommand = '' 46 buildCommand = ''