Merge branch 'master' of git://git.yggdrasil.li/nixos

4 files changed, 54 insertions, 0 deletions

diff --git a/custom/redo-wrapper.nix b/custom/redo-wrapper.nix
new file mode 100644
index 00000000..20e1675a
--- /dev/null
+++ b/custom/redo-wrapper.nix
@@ -0,0 +1,16 @@
+{ stdenv, makeWrapper, haskellPackages }:
+
+let
+  redo = haskellPackages.callPackage ./redo.nix {};
+in stdenv.mkDerivation {
+  name = "redo-wrapper";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    ln -s $out/bin/redo $out/bin/redo-ifchange
+    makeWrapper ${redo}/bin/redo $out/bin/redo \
+      --set REDO_PATH "$out/bin"
+  '';
+}
diff --git a/custom/redo.nix b/custom/redo.nix
new file mode 100644
index 00000000..b5255f98
--- /dev/null
+++ b/custom/redo.nix
@@ -0,0 +1,19 @@
+# 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;
+  };
+})
diff --git a/custom/redo.patch b/custom/redo.patch
new file mode 100644
index 00000000..cd3a678e
--- /dev/null
+++ b/custom/redo.patch
@@ -0,0 +1,18 @@
+diff --git a/redo.hs b/redo.hs
+index f0e816a..01c6a2e 100644
+--- a/redo.hs
++++ b/redo.hs
+@@ -48,7 +48,12 @@ redo target dir = do
+          createDirectoryIfMissing True metaDepsDir
+          writeMD5 target path
+          oldEnv <- getEnvironment
+-         let newEnv = toList $ adjust (++ ":.") "PATH" $ insert "REDO_TARGET" target $ fromList oldEnv
++         redoPath <- lookupEnv "REDO_PATH"
++         let
++           redoPath' = case redoPath of
++             Just p -> p
++             _ -> "."
++           newEnv = toList $ adjust (++ (':' : redoPath')) "PATH" $ insert "REDO_TARGET" target $ fromList oldEnv
+          (_, _, _, ph) <- createProcess $ (shell $ cmd path) {env = Just newEnv}
+          exit <- waitForProcess ph
+          case exit of
diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix
index 79a121fc..0ac360dc 100644
--- a/users/gkleen@vali.nix
+++ b/users/gkleen@vali.nix
@@ -1,4 +1,5 @@
 {
   packageOverrides = pkgs: rec {
+    redo = pkgs.callPackage ../custom/redo-wrapper.nix {};
   } // (import ../utils/nix/default.nix) {};
 }