a28e362 · haskell.nix · git.iko.soy

compiler/old-ghc-nix/old-ghc-nix.json+3−3

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -1,7 +1,7 @@

1{

2 "url": "https://github.com/angerman/old-ghc-nix",

3− "rev": "c7c381f3ec5fb80e807271271f9df75ab7127f57",

3+ "rev": "ee5e7181f681522f075e01a1875228188b03cc8c",

4− "date": "2019-12-06T12:34:44+08:00",

4+ "date": "2019-12-08T20:24:29+08:00",

5− "sha256": "0j1jwxfhcdz6h9qpvzz39kllhz6wb2bvgyy5irj6iav9ykp6xjin",

5+ "sha256": "0ywvyjvyw9vm0qbf0a7k6zpsrzcz5wa7y16rfcs3wfv36plj3qd5",

6 "fetchSubmodules": false

7}

lib/call-cabal-project-to-nix.nix+1

@@ -160,6 +160,7 @@ let

160 nativeBuildInputs = [ nix-tools ghc hpack cabal-install pkgs.rsync pkgs.git ];

161 # Needed or stack-to-nix will die on unicode inputs

162 LANG = "en_US.UTF-8";

163+ meta.platforms = pkgs.lib.platforms.all;

163 preferLocalBuild = false;

164 preferLocalBuild = false;

164 } // (if plan-sha256 == null

165 } // (if plan-sha256 == null

165 then {}

166 then {}

nix-tools/default.nix+1

@@ -53,6 +53,7 @@ in

53 name = "nix-tools";

54 paths = builtins.attrValues hsPkgs.nix-tools.components.exes;

55 buildInputs = [ makeWrapper ];

56+ meta.platforms = lib.platforms.all;

56 # We wrap the -to-nix executables with the executables from `tools` (e.g. nix-prefetch-git)

57 # We wrap the -to-nix executables with the executables from `tools` (e.g. nix-prefetch-git)

57 # so that consumers of `nix-tools` won't have to provide those tools.

58 # so that consumers of `nix-tools` won't have to provide those tools.

58 postBuild = ''

59 postBuild = ''

overlays/haskell.nix+2−1

@@ -165,7 +165,7 @@ self: super: {

165 # TODO perhaps there is a cleaner way to get a suitable nix-tools.

166

167 # Produce a fixed output derivation from a moving target (hackage index tarball)

168− hackageTarball = { index-state, sha256, nix-tools ? self.nix-tools, ... }:

168+ hackageTarball = { index-state, sha256, nix-tools ? self.haskell-nix.nix-tools, ... }:

169 assert sha256 != null;

170 self.fetchurl {

171 name = "01-index.tar.gz-at-${builtins.replaceStrings [":"] [""] index-state}";

@@ -390,6 +390,7 @@ self: super: {

390 (filterSupportedGhc self.ghc-extra-projects));

391 } // self.lib.optionalAttrs (ifdLevel > 1) {

392 # Things that require two levels of IFD to build (inputs should be in level 1)

393+ inherit (self.haskell-nix) nix-tools;

393 ghc-extra-packages = self.recurseIntoAttrs

394 ghc-extra-packages = self.recurseIntoAttrs

394 (filterSupportedGhc self.ghc-extra-packages);

395 (filterSupportedGhc self.ghc-extra-packages);

395 });

396 });