Skip to content

Fix error with specifying rev to builtins.fetchGit when creating cache #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
angerman merged 1 commit into from
Dec 13, 2019
Merged

Fix error with specifying rev to builtins.fetchGit when creating cache #366

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions overlays/haskell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,10 @@ self: super: {
# It doesn't make sense to specify sha256 on a private repo
# because it is not used by buitins.fetchGit.
assert isNull sha256;
builtins.fetchGit {
url = url;
rev = rev;
} // self.buildPackages.lib.optionalAttrs (ref != null) {
ref = ref;
}
builtins.fetchGit
({ inherit url rev; } //
self.buildPackages.lib.optionalAttrs (ref != null) { inherit ref; }
)
else
# Non-private repos must have sha256 set.
assert sha256 != null;
Expand Down Expand Up @@ -324,8 +322,10 @@ self: super: {
src =
if is-private
then
builtins.fetchGit { inherit url rev; }
// self.buildPackages.lib.optionalAttrs (ref != null) { inherit ref; }
builtins.fetchGit
({ inherit url rev; } //
self.buildPackages.lib.optionalAttrs (ref != null) { inherit ref; }
)
else
self.buildPackages.pkgs.fetchgit { inherit url rev sha256; };
} // self.buildPackages.lib.optionalAttrs (subdir != null) { postUnpack = "sourceRoot+=/${subdir}; echo source root reset to $sourceRoot"; };
Expand Down