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

4 files changed, 5 insertions, 21 deletions

diff --git a/custom/redo-wrapper.nix b/custom/redo-wrapper.nix
index 20e1675a..5b446636 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.patches ++ [./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;
-  };
-})
diff --git a/dotfiles b/dotfiles
-Subproject 7e14dc64630e39adf884f229a57b5431fec434a
+Subproject 4a30327944eed71d936836d05c665aa58afad85
diff --git a/utils b/utils
-Subproject 5ffaa3126e1a35309a09d5bd356dbe363de91d8
+Subproject dd28d96d3469a46888ac4e1103818978aa4fc51