git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Put back src for nix-tools
commitadf6b4385bdaa866b8f8dc7b83067275743a83c0 authorRodney Lorrimar <rodney.lorrimar@iohk.io> dateTue 2 Apr 2019, 20:18 (8 years ago) parentd416f60
3 files changed+19−2
compare with iko/ghcjs-patch-master
unifiedsplit
default.nix+1−1 nix-tools/default.nix+11−1 nix-tools/nix-tools-src.json+7
default.nix+1−1
@@ -106,7 +106,7 @@ let
106106
107107 # Programs for generating Nix expressions from Cabal and Stack
108108 # files.
109− nix-tools = self.callPackage ./nix-tools {};
109+ nix-tools = self.callPackage ./nix-tools { inherit fetchExternal; };
110110
111111 # Snapshots of Hackage and Stackage, converted to Nix expressions,
112112 # regularly updated.
nix-tools/default.nix+11−1
@@ -1,6 +1,12 @@
1−{ symlinkJoin, mkCabalProjectPkgSet }:
1+{ symlinkJoin, fetchExternal, mkCabalProjectPkgSet }:
22
33let
4+ src = fetchExternal {
5+ name = "nix-tools-src";
6+ specJSON = ./nix-tools-src.json;
7+ override = "nix-tools";
8+ };
9+
410 pkgSet = mkCabalProjectPkgSet {
511 plan-pkgs = import ./pkgs.nix;
612 pkg-def-extras = [];
@@ -10,6 +16,10 @@ let
1016 packages.time-compat.components.library.doExactConfig = true;
1117 packages.time-locale-compat.components.library.doExactConfig = true;
1218 }
19+
20+ {
21+ packages.nix-tools.src = src;
22+ }
1323 ];
1424 };
1525
nix-tools/nix-tools-src.jsonnew file+7
@@ -0,0 +1,7 @@
1+{
2+ "url": "https://github.com/input-output-hk/nix-tools",
3+ "rev": "38bf6fd0adef4d22fe06def521f5d793c081f6ed",
4+ "date": "2019-03-20T12:40:31+10:00",
5+ "sha256": "0y8xap5cvc9rssjjvlgv6lyi8ixpxnq675r3gkz2ix7hrsgk8989",
6+ "fetchSubmodules": false
7+}