From 8fa9c604eb8cbe5f868466c457d9eb6c350df78b Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:40:41 +0200 Subject: redo now from haskellngPackages --- custom/redo-wrapper.nix | 7 +++++-- custom/redo.nix | 19 ------------------- 2 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 custom/redo.nix 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 @@ -{ stdenv, makeWrapper, haskellPackages }: +{ stdenv, makeWrapper, haskellngPackages }: let - redo = haskellPackages.callPackage ./redo.nix {}; + #redo = haskellPackages.callPackage ./redo.nix {}; + redo = stdenv.lib.overrideDerivation (haskellngPackages.redo) (attrs: { + patches = attrs ++ [./redo.patch]; + }); in stdenv.mkDerivation { name = "redo-wrapper"; 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 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, filepath, pureMD5 }: - -cabal.mkDerivation (self: { - pname = "redo"; - version = "0.2.0"; - sha256 = "18951sri8wix8aazd8hy8g2gzcpxw2x1ihzmn2prlf10zy1jcy4d"; - isLibrary = false; - isExecutable = true; - buildDepends = [ filepath pureMD5 ]; - patches = [ ./redo.patch ]; - meta = { - homepage = "https://github.com/jekor/redo"; - description = "software build system, make replacement, implementation of djb's redo"; - license = self.stdenv.lib.licenses.publicDomain; - platforms = self.ghc.meta.platforms; - }; -}) -- cgit v1.2.3