From a6328224f3d3f1b05278a0f352432d287bf96eb5 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 19:33:40 +0200 Subject: Bump in dotfiles --- dotfiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles b/dotfiles index 7e14dc64..e62a346d 160000 --- a/dotfiles +++ b/dotfiles @@ -1 +1 @@ -Subproject commit 7e14dc64630e39adf884f229a57b5431fec434a5 +Subproject commit e62a346d035773783ae0ce72963f9bdfb5a03601 -- cgit v1.2.3 From fedcdddffb5340a81a3bd3d8f077dd2b2a410276 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 19:49:46 +0200 Subject: Bump in utils --- utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils b/utils index 5ffaa312..cdf3f394 160000 --- a/utils +++ b/utils @@ -1 +1 @@ -Subproject commit 5ffaa3126e1a35309a09d5bd356dbe363de91d88 +Subproject commit cdf3f394fbd4713ae8aa13f9111be9ca8f64d34b -- cgit v1.2.3 From 1293345d9ad9ed2d4cc70adcf68067a1573bb0b3 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:05:45 +0200 Subject: Bump in dotfiles --- dotfiles | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles b/dotfiles index e62a346d..4a303279 160000 --- a/dotfiles +++ b/dotfiles @@ -1 +1 @@ -Subproject commit e62a346d035773783ae0ce72963f9bdfb5a03601 +Subproject commit 4a30327944eed71d936836d05c665aa58afad85b -- cgit v1.2.3 From 72ced7fd1186decac8ca247d535535f4e35186c6 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:08:33 +0200 Subject: Bump in utils --- utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils b/utils index cdf3f394..fa8ffecc 160000 --- a/utils +++ b/utils @@ -1 +1 @@ -Subproject commit cdf3f394fbd4713ae8aa13f9111be9ca8f64d34b +Subproject commit fa8ffecc5e423ad7f31725568e1b03a5ac7dbc4c -- cgit v1.2.3 From fc634b1aaff56ff138d18de27acaad3e9089013e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:12:36 +0200 Subject: Bump in utils --- utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils b/utils index fa8ffecc..57349639 160000 --- a/utils +++ b/utils @@ -1 +1 @@ -Subproject commit fa8ffecc5e423ad7f31725568e1b03a5ac7dbc4c +Subproject commit 573496399a73e127f92d65d88f0f943b78387d4d -- cgit v1.2.3 From db1b21f97ddcd3dbd8e1bcf4bfcc0a4c3b0a93f6 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:13:43 +0200 Subject: Bump in utils --- utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils b/utils index 57349639..dd28d96d 160000 --- a/utils +++ b/utils @@ -1 +1 @@ -Subproject commit 573496399a73e127f92d65d88f0f943b78387d4d +Subproject commit dd28d96d3469a46888ac4e1103818978aa4fc51b -- cgit v1.2.3 From af62fe55782944f5913d5b5a6c60bacddad892b5 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:18:03 +0200 Subject: =?UTF-8?q?Introduced=20myHaskellPackages=20to=20gkleen@vali.nix?= =?UTF-8?q?=20because=20it=C2=B4s=20hardcoded=20in=20some=20other=20repos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- users/gkleen@vali.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index 0ac360dc..7779e2d3 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix @@ -1,5 +1,6 @@ { packageOverrides = pkgs: rec { redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; + myHaskellPackages = haskellPackages; } // (import ../utils/nix/default.nix) {}; } -- cgit v1.2.3 From 74d728fa5c1ab6d0c5238a1a982319553d176858 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:19:01 +0200 Subject: scoping --- users/gkleen@vali.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index 7779e2d3..963f4bca 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix @@ -1,6 +1,6 @@ { packageOverrides = pkgs: rec { redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; - myHaskellPackages = haskellPackages; + myHaskellPackages = pkgs.haskellPackages; } // (import ../utils/nix/default.nix) {}; } -- cgit v1.2.3 From a3d686eb0df5eee0835250a8d8af41343d1a7619 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:21:11 +0200 Subject: Switched to haskellngPackages --- users/gkleen@vali.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index 963f4bca..b773e8f7 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix @@ -1,6 +1,7 @@ { packageOverrides = pkgs: rec { redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; - myHaskellPackages = pkgs.haskellPackages; + haskellPackages = haskellngPackages; + myHaskellPackages = haskellPackages; } // (import ../utils/nix/default.nix) {}; } -- cgit v1.2.3 From 55024e7f4696c45cf9461c449c7e2814aed7e225 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:22:24 +0200 Subject: scoping --- users/gkleen@vali.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index b773e8f7..a113d4e1 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix @@ -1,7 +1,7 @@ { packageOverrides = pkgs: rec { redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; - haskellPackages = haskellngPackages; + haskellPackages = pkgs.haskellngPackages; myHaskellPackages = haskellPackages; } // (import ../utils/nix/default.nix) {}; } -- cgit v1.2.3 From 3652892668169d8ee253fe7835c4b0913aa14c42 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:23:11 +0200 Subject: More elegant inheritance from haskellngPackages --- users/gkleen@vali.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index a113d4e1..09c46481 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix @@ -1,7 +1,8 @@ { packageOverrides = pkgs: rec { redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; - haskellPackages = pkgs.haskellngPackages; - myHaskellPackages = haskellPackages; + myHaskellPackages = haskellPackages // ( + inherit (pkgs.haskellngPackages) boolexpr; + ); } // (import ../utils/nix/default.nix) {}; } -- cgit v1.2.3 From a0f4c35abcf6f694425387466edf1bee930fc98d Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:23:34 +0200 Subject: syntax --- users/gkleen@vali.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index 09c46481..9af0248c 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix @@ -1,8 +1,8 @@ { packageOverrides = pkgs: rec { redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; - myHaskellPackages = haskellPackages // ( + myHaskellPackages = haskellPackages // { inherit (pkgs.haskellngPackages) boolexpr; - ); + }; } // (import ../utils/nix/default.nix) {}; } -- cgit v1.2.3 From 32f40b38bc275365254ed329fa99929586234756 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:23:54 +0200 Subject: scoping --- users/gkleen@vali.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index 9af0248c..59da76e7 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix @@ -1,7 +1,7 @@ { packageOverrides = pkgs: rec { redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; - myHaskellPackages = haskellPackages // { + myHaskellPackages = pkgs.haskellPackages // { inherit (pkgs.haskellngPackages) boolexpr; }; } // (import ../utils/nix/default.nix) {}; -- cgit v1.2.3 From 3afa79b3197ccca23bdda4f6ee016893e69545b3 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:28:03 +0200 Subject: syntax --- users/gkleen@vali.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index 59da76e7..006ac18e 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix @@ -1,8 +1,8 @@ { packageOverrides = pkgs: rec { redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; - myHaskellPackages = pkgs.haskellPackages // { - inherit (pkgs.haskellngPackages) boolexpr; - }; + myHaskellPackages = pkgs.haskellPackages // (with pkgs.haskellngPackages; { + inherit boolexpr; + }); } // (import ../utils/nix/default.nix) {}; } -- cgit v1.2.3 From de99b7209b50cf15b9614b2298645120fd8a158c Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:30:54 +0200 Subject: Revert "syntax" This reverts commit 3afa79b3197ccca23bdda4f6ee016893e69545b3. --- users/gkleen@vali.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index 006ac18e..59da76e7 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix @@ -1,8 +1,8 @@ { packageOverrides = pkgs: rec { redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; - myHaskellPackages = pkgs.haskellPackages // (with pkgs.haskellngPackages; { - inherit boolexpr; - }); + myHaskellPackages = pkgs.haskellPackages // { + inherit (pkgs.haskellngPackages) boolexpr; + }; } // (import ../utils/nix/default.nix) {}; } -- cgit v1.2.3 From 6d71f6afb469e3ed9388fa9067d834953b639052 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:35:51 +0200 Subject: better way of overwriting haskellPackages --- users/gkleen@vali.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index 59da76e7..873e50c1 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix @@ -1,8 +1,14 @@ { packageOverrides = pkgs: rec { redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; - myHaskellPackages = pkgs.haskellPackages // { - inherit (pkgs.haskellngPackages) boolexpr; - }; + myHaskellPackages = pkgs.recurseIntoAttrs ( + pkgs.haskellPackages.override { + extension = self: super: let + callPackage = pkgs.lib.callPackageWith self; + in rec { + inherit (pkgs.haskellngPackages) boolexpr; + }; + } + ); } // (import ../utils/nix/default.nix) {}; } -- cgit v1.2.3 From 3d502faac78ade99b287475c41ca30de540bffa8 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:36:16 +0200 Subject: filelock --- users/gkleen@vali.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index 873e50c1..77cd7ba7 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix @@ -6,7 +6,7 @@ extension = self: super: let callPackage = pkgs.lib.callPackageWith self; in rec { - inherit (pkgs.haskellngPackages) boolexpr; + inherit (pkgs.haskellngPackages) boolexpr filelock; }; } ); -- cgit v1.2.3 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 From d0e9d3915bd863b529575cabb74270baf4e36d3d Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:40:50 +0200 Subject: Dev environments belong in default.nix's --- users/gkleen@vali.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/users/gkleen@vali.nix b/users/gkleen@vali.nix index 77cd7ba7..0ac360dc 100644 --- a/users/gkleen@vali.nix +++ b/users/gkleen@vali.nix @@ -1,14 +1,5 @@ { packageOverrides = pkgs: rec { redo = pkgs.callPackage ../custom/redo-wrapper.nix {}; - myHaskellPackages = pkgs.recurseIntoAttrs ( - pkgs.haskellPackages.override { - extension = self: super: let - callPackage = pkgs.lib.callPackageWith self; - in rec { - inherit (pkgs.haskellngPackages) boolexpr filelock; - }; - } - ); } // (import ../utils/nix/default.nix) {}; } -- cgit v1.2.3 From c448fe03dee50238065edc7bbb3eb8abedc183f0 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 16 Jul 2015 20:41:31 +0200 Subject: typo --- custom/redo-wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom/redo-wrapper.nix b/custom/redo-wrapper.nix index 59e96323..5b446636 100644 --- a/custom/redo-wrapper.nix +++ b/custom/redo-wrapper.nix @@ -3,7 +3,7 @@ let #redo = haskellPackages.callPackage ./redo.nix {}; redo = stdenv.lib.overrideDerivation (haskellngPackages.redo) (attrs: { - patches = attrs ++ [./redo.patch]; + patches = attrs.patches ++ [./redo.patch]; }); in stdenv.mkDerivation { name = "redo-wrapper"; -- cgit v1.2.3