From 3e1099df284bd9349cd77e9304438f9d22e950b8 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 01:45:42 +0100 Subject: trivmix bump --- custom/trivmix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'custom') diff --git a/custom/trivmix b/custom/trivmix index d4091751..8b1cc0ea 160000 --- a/custom/trivmix +++ b/custom/trivmix @@ -1 +1 @@ -Subproject commit d40917517feeaffc3d8e90cf8e06004623b0c5ff +Subproject commit 8b1cc0ea290ef4b870107e82a50a168a5af05e02 -- cgit v1.2.3 From 651b0353d0e378bd76b827a6e6838310b8880bf7 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 01:49:42 +0100 Subject: trivmix bump --- custom/trivmix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'custom') diff --git a/custom/trivmix b/custom/trivmix index 8b1cc0ea..d30e060e 160000 --- a/custom/trivmix +++ b/custom/trivmix @@ -1 +1 @@ -Subproject commit 8b1cc0ea290ef4b870107e82a50a168a5af05e02 +Subproject commit d30e060e91d84718a79b3c2bcf925ff249f5b68d -- cgit v1.2.3 From f22417c33823aaaae821219a2cd32f12511d0210 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 02:43:07 +0100 Subject: trivmix bump --- custom/trivmix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'custom') diff --git a/custom/trivmix b/custom/trivmix index d30e060e..8c0ee037 160000 --- a/custom/trivmix +++ b/custom/trivmix @@ -1 +1 @@ -Subproject commit d30e060e91d84718a79b3c2bcf925ff249f5b68d +Subproject commit 8c0ee03791ae6901e31b3b79cfe5a1279fb24396 -- cgit v1.2.3 From 27196899f9bdd43b7fd299aedf9b7ad6c75cf4ca Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 02:45:36 +0100 Subject: trivmix bump --- custom/trivmix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'custom') diff --git a/custom/trivmix b/custom/trivmix index 8c0ee037..782b5b37 160000 --- a/custom/trivmix +++ b/custom/trivmix @@ -1 +1 @@ -Subproject commit 8c0ee03791ae6901e31b3b79cfe5a1279fb24396 +Subproject commit 782b5b37976fce5e10b4e7df96bcc19c48fff0bf -- cgit v1.2.3 From c1907d19c12cc07858d1efb502b1d8e94ce2e53b Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 6 Dec 2015 03:39:05 +0100 Subject: switch to new haskell --- custom/redo-wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'custom') 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 @@ -{ stdenv, makeWrapper, haskellngPackages }: +{ stdenv, makeWrapper, haskellPackages }: let #redo = haskellPackages.callPackage ./redo.nix {}; - redo = stdenv.lib.overrideDerivation (haskellngPackages.redo) (attrs: { + redo = stdenv.lib.overrideDerivation (haskellPackages.redo) (attrs: { patches = attrs.patches ++ [./redo.patch]; }); in stdenv.mkDerivation { -- cgit v1.2.3