315b6d3 · haskell.nix · git.iko.soy

lib/cabal-project-parser.nix+4−2

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -137,10 +137,11 @@ let

137 name = __head lines;

138 # The $HOME dir with `.cabal` sub directory after running `cabal new-update` to download the repository

139 home =

140− pkgs.evalPackages.runCommandLocal name ({

140+ pkgs.evalPackages.runCommand name ({

141 nativeBuildInputs = [ cabal-install pkgs.evalPackages.curl nix-tools ];

142 LOCALE_ARCHIVE = pkgs.lib.optionalString (pkgs.evalPackages.stdenv.buildPlatform.libc == "glibc") "${pkgs.evalPackages.glibcLocales}/lib/locale/locale-archive";

143 LANG = "en_US.UTF-8";

144+ preferLocalBuild = true;

144 } // pkgs.lib.optionalAttrs (sha256 != null) {

145 } // pkgs.lib.optionalAttrs (sha256 != null) {

145 outputHashMode = "recursive";

146 outputHashMode = "recursive";

146 outputHashAlgo = "sha256";

147 outputHashAlgo = "sha256";

@@ -161,10 +162,11 @@ let

161 '';

162 '';

162 # Output of hackage-to-nix

163 # Output of hackage-to-nix

163 hackage = import (

164 hackage = import (

164− pkgs.evalPackages.runCommandLocal ("hackage-to-nix-" + name) {

165+ pkgs.evalPackages.runCommand ("hackage-to-nix-" + name) {

165 nativeBuildInputs = [ cabal-install pkgs.evalPackages.curl nix-tools ];

166 nativeBuildInputs = [ cabal-install pkgs.evalPackages.curl nix-tools ];

166 LOCALE_ARCHIVE = pkgs.lib.optionalString (pkgs.evalPackages.stdenv.buildPlatform.libc == "glibc") "${pkgs.evalPackages.glibcLocales}/lib/locale/locale-archive";

167 LOCALE_ARCHIVE = pkgs.lib.optionalString (pkgs.evalPackages.stdenv.buildPlatform.libc == "glibc") "${pkgs.evalPackages.glibcLocales}/lib/locale/locale-archive";

167 LANG = "en_US.UTF-8";

168 LANG = "en_US.UTF-8";

169+ preferLocalBuild = true;

168 } ''

170 } ''

169 mkdir -p $out

171 mkdir -p $out

170 hackage-to-nix $out ${home}/.cabal/packages/${name}/01-index.tar ${attrs.url}

172 hackage-to-nix $out ${home}/.cabal/packages/${name}/01-index.tar ${attrs.url}

lib/clean-git.nix+2−2

@@ -1,5 +1,5 @@

1# From https://github.com/NixOS/nix/issues/2944

2−{ lib, runCommandLocal, git, cleanSourceWith }:

2+{ lib, runCommand, git, cleanSourceWith }:

3{ name ? null, src, subDir ? "", includeSiblings ? false, keepGitDir ? false }:

4

5# The function call

@@ -112,7 +112,7 @@ then

112 # `git ls-files --recurse-submodules` to give us an accurate list

113 # of all the files in the index.

114 whitelist_files = knownSubmoduleDirs:

115− runCommandLocal "git-ls-files" {} ''

115+ runCommand "git-ls-files" { preferLocalBuild = true; } ''

116 tmp=$(mktemp -d)

117 cd $tmp

118 ${ lib.optionalString hasSubmodules ''

lib/default.nix+1−1

@@ -202,7 +202,7 @@ in {

202 cleanGit = import ./clean-git.nix {

203 inherit lib cleanSourceWith;

204 git = gitMinimal;

205− inherit (pkgs.evalPackages.buildPackages) runCommandLocal;

205+ inherit (pkgs.evalPackages.buildPackages) runCommand;

206 };

207

208 # Some times it is handy to temporarily use a relative path between git

mk-local-hackage-repo/default.nix+1−1

@@ -17,7 +17,7 @@

17pkgs:

18{ name, index }:

19

20−pkgs.evalPackages.runCommandLocal "hackage-repo-${name}" {} ''

20+pkgs.evalPackages.runCommand "hackage-repo-${name}" { preferLocalBuild = true; } ''

21mkdir -p $out

22export expires="4000-01-01T00:00:00Z"

23

overlays/haskell.nix+2−2

@@ -211,8 +211,8 @@ final: prev: {

211 # dotCabalName anyway.

212 dotCabalName = "dot-cabal-" + allNames;

213 in

214− # This is very big, and cheap to build: use runCommandLocal to prefer building it locally

214+ # This is very big, and cheap to build: prefer building it locally

215− final.evalPackages.runCommandLocal dotCabalName { nativeBuildInputs = [ cabal-install ]; } ''

215+ final.evalPackages.runCommand dotCabalName { nativeBuildInputs = [ cabal-install ]; preferLocalBuild = true; } ''

216 mkdir -p $out/.cabal

217 cat <<EOF > $out/.cabal/config

218 ${final.lib.concatStrings (