13164ac · haskell.nix · git.iko.soy

git.iko.soy/haskell.nix

on iko/ghcjs-patch-master help sign in

Revert "Use builtins.fetchGit{allRefs=true;} if no ref provided." (#1274)

13164acJean-Baptiste Giraudeau5 years ago

lib/stack-cache-generator.nix+1−5

compare with iko/ghcjs-patch-master

unifiedsplit

@@ -103,11 +103,7 @@ concatMap (dep:

103 }

104 else builtins.fetchGit ({

105 inherit (dep) url rev;

106− } // (if branch != null

106+ } // pkgs.lib.optionalAttrs (branch != null) { ref = branch; });

107− then { ref = branch; }

108− # Don't fail if rev not in default branch:

109− else { allRefs = true; })

110− );

111 in map (subdir: {

107 in map (subdir: {

112 name = cabalName "${pkgsrc}/${subdir}";

108 name = cabalName "${pkgsrc}/${subdir}";

113 inherit (dep) url rev;

109 inherit (dep) url rev;

overlays/haskell.nix+2−8

@@ -308,10 +308,7 @@ final: prev: {

308 assert isNull sha256;

309 builtins.fetchGit

310 ({ inherit url rev; } //

311− (if ref != null

311+ final.buildPackages.lib.optionalAttrs (ref != null) { inherit ref; }

312− then { inherit ref; }

313− # Don't fail if rev not in default branch:

314− else { allRefs = true; })

315 )

312 )

316 else

313 else

317 # Non-private repos must have sha256 set.

314 # Non-private repos must have sha256 set.

@@ -405,10 +402,7 @@ final: prev: {

405 then

402 then

406 builtins.fetchGit

403 builtins.fetchGit

407 ({ inherit url rev; } //

404 ({ inherit url rev; } //

408− (if ref != null

405+ final.buildPackages.lib.optionalAttrs (ref != null) { inherit ref; }

409− then { inherit ref; }

410− # don't fail if rev not in default branch:

411− else { allRefs = true; })

412 )

406 )

413 else

407 else

414 final.evalPackages.fetchgit { inherit url rev sha256; };

408 final.evalPackages.fetchgit { inherit url rev sha256; };