adf6b43 · haskell.nix · git.iko.soy

default.nix+1−1

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -106,7 +106,7 @@ let

106

107 # Programs for generating Nix expressions from Cabal and Stack

108 # files.

109− nix-tools = self.callPackage ./nix-tools {};

109+ nix-tools = self.callPackage ./nix-tools { inherit fetchExternal; };

110

111 # Snapshots of Hackage and Stackage, converted to Nix expressions,

112 # regularly updated.

nix-tools/default.nix+11−1

@@ -1,6 +1,12 @@

1−{ symlinkJoin, mkCabalProjectPkgSet }:

1+{ symlinkJoin, fetchExternal, mkCabalProjectPkgSet }:

2

3let

4+ src = fetchExternal {

5+ name = "nix-tools-src";

6+ specJSON = ./nix-tools-src.json;

7+ override = "nix-tools";

8+ };

9+

4 pkgSet = mkCabalProjectPkgSet {

10 pkgSet = mkCabalProjectPkgSet {

5 plan-pkgs = import ./pkgs.nix;

11 plan-pkgs = import ./pkgs.nix;

6 pkg-def-extras = [];

12 pkg-def-extras = [];

@@ -10,6 +16,10 @@ let

10 packages.time-compat.components.library.doExactConfig = true;

16 packages.time-compat.components.library.doExactConfig = true;

11 packages.time-locale-compat.components.library.doExactConfig = true;

17 packages.time-locale-compat.components.library.doExactConfig = true;

12 }

18 }

19+

20+ {

21+ packages.nix-tools.src = src;

22+ }

13 ];

23 ];

14 };

24 };

15

25

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+}