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 /custom | |
| 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 'custom')
| -rw-r--r-- | custom/redo-wrapper.nix | 4 | ||||
| m--------- | custom/trivmix | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/custom/redo-wrapper.nix b/custom/redo-wrapper.nix index 5b446636..3a3d7bbc 100644 --- a/custom/redo-wrapper.nix +++ b/custom/redo-wrapper.nix | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | { stdenv, makeWrapper, haskellngPackages }: | 1 | { stdenv, makeWrapper, haskellPackages }: |
| 2 | 2 | ||
| 3 | let | 3 | let |
| 4 | #redo = haskellPackages.callPackage ./redo.nix {}; | 4 | #redo = haskellPackages.callPackage ./redo.nix {}; |
| 5 | redo = stdenv.lib.overrideDerivation (haskellngPackages.redo) (attrs: { | 5 | redo = stdenv.lib.overrideDerivation (haskellPackages.redo) (attrs: { |
| 6 | patches = attrs.patches ++ [./redo.patch]; | 6 | patches = attrs.patches ++ [./redo.patch]; |
| 7 | }); | 7 | }); |
| 8 | in stdenv.mkDerivation { | 8 | in stdenv.mkDerivation { |
diff --git a/custom/trivmix b/custom/trivmix | |||
| Subproject d40917517feeaffc3d8e90cf8e06004623b0c5f | Subproject 782b5b37976fce5e10b4e7df96bcc19c48fff0b | ||