diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2015-12-08 00:21:54 +0000 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2015-12-08 00:21:54 +0000 |
| commit | ee27565d350e3b52f8db6258033c71008094f135 (patch) | |
| tree | 5a312f5514f4ce90ecfc4f7986ec4cb8b185f123 /users | |
| parent | cee4979c73950845051aa2d16bb0b217583d5c1d (diff) | |
| parent | c1907d19c12cc07858d1efb502b1d8e94ce2e53b (diff) | |
| download | nixos-ee27565d350e3b52f8db6258033c71008094f135.tar nixos-ee27565d350e3b52f8db6258033c71008094f135.tar.gz nixos-ee27565d350e3b52f8db6258033c71008094f135.tar.bz2 nixos-ee27565d350e3b52f8db6258033c71008094f135.tar.xz nixos-ee27565d350e3b52f8db6258033c71008094f135.zip | |
Merge branch 'master' of git.yggdrasil.li:nixos
Diffstat (limited to 'users')
| -rw-r--r-- | users/gkleen@bragi.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/users/gkleen@bragi.nix b/users/gkleen@bragi.nix index b67696a5..a32fa0d1 100644 --- a/users/gkleen@bragi.nix +++ b/users/gkleen@bragi.nix | |||
| @@ -30,12 +30,12 @@ | |||
| 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 {}; |
| 37 | shellMonad = callPackage ../custom/shell-monad.nix {}; | 37 | # shellMonad = callPackage ../custom/shell-monad.nix {}; |
| 38 | filelock = callPackage ../custom/filelock.nix {}; | 38 | # filelock = callPackage ../custom/filelock.nix {}; |
| 39 | trivmix = callPackage ../custom/trivmix.nix {}; | 39 | trivmix = callPackage ../custom/trivmix.nix {}; |
| 40 | }; | 40 | }; |
| 41 | } | 41 | } |