diff options
-rw-r--r-- | custom/redo-wrapper.nix | 7 | ||||
-rw-r--r-- | custom/redo.nix | 19 |
2 files changed, 5 insertions, 21 deletions
diff --git a/custom/redo-wrapper.nix b/custom/redo-wrapper.nix index 20e1675a..59e96323 100644 --- a/custom/redo-wrapper.nix +++ b/custom/redo-wrapper.nix | |||
@@ -1,7 +1,10 @@ | |||
1 | { stdenv, makeWrapper, haskellPackages }: | 1 | { stdenv, makeWrapper, haskellngPackages }: |
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: { | ||
6 | patches = attrs ++ [./redo.patch]; | ||
7 | }); | ||
5 | in stdenv.mkDerivation { | 8 | in stdenv.mkDerivation { |
6 | name = "redo-wrapper"; | 9 | name = "redo-wrapper"; |
7 | 10 | ||
diff --git a/custom/redo.nix b/custom/redo.nix deleted file mode 100644 index b5255f98..00000000 --- a/custom/redo.nix +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | # This file was auto-generated by cabal2nix. Please do NOT edit manually! | ||
2 | |||
3 | { cabal, filepath, pureMD5 }: | ||
4 | |||
5 | cabal.mkDerivation (self: { | ||
6 | pname = "redo"; | ||
7 | version = "0.2.0"; | ||
8 | sha256 = "18951sri8wix8aazd8hy8g2gzcpxw2x1ihzmn2prlf10zy1jcy4d"; | ||
9 | isLibrary = false; | ||
10 | isExecutable = true; | ||
11 | buildDepends = [ filepath pureMD5 ]; | ||
12 | patches = [ ./redo.patch ]; | ||
13 | meta = { | ||
14 | homepage = "https://github.com/jekor/redo"; | ||
15 | description = "software build system, make replacement, implementation of djb's redo"; | ||
16 | license = self.stdenv.lib.licenses.publicDomain; | ||
17 | platforms = self.ghc.meta.platforms; | ||
18 | }; | ||
19 | }) | ||