diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-07-21 06:01:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-21 06:01:05 +0000 |
| commit | 17a15a50abead91057d245f3c1dc5feb684228fa (patch) | |
| tree | 546c589f703bc5359921fe4d8ab16c309005b7d7 /pkgs/build-support/fetchgit | |
| parent | 61505962dcfd0db96e9154ad18f4a7e474b30b44 (diff) | |
| parent | 104a964b5c9fc941c0a3287b3c576bcd44196839 (diff) | |
| download | nixpkgs-17a15a50abead91057d245f3c1dc5feb684228fa.tar nixpkgs-17a15a50abead91057d245f3c1dc5feb684228fa.tar.gz nixpkgs-17a15a50abead91057d245f3c1dc5feb684228fa.tar.bz2 nixpkgs-17a15a50abead91057d245f3c1dc5feb684228fa.tar.lz nixpkgs-17a15a50abead91057d245f3c1dc5feb684228fa.tar.xz nixpkgs-17a15a50abead91057d245f3c1dc5feb684228fa.tar.zst nixpkgs-17a15a50abead91057d245f3c1dc5feb684228fa.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support/fetchgit')
| -rw-r--r-- | pkgs/build-support/fetchgit/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 3d73eae9821..1d06ce44a91 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -11,7 +11,7 @@ in "${if matched == null then base else builtins.head matched}${appendShort}"; in lib.makeOverridable ( -{ url, rev ? "HEAD", md5 ? "", sha256 ? "", hash ? "", leaveDotGit ? deepClone +{ url, rev ? "HEAD", sha256 ? "", hash ? "", leaveDotGit ? deepClone , fetchSubmodules ? true, deepClone ? false , branchName ? null , sparseCheckout ? [] @@ -56,9 +56,7 @@ lib.makeOverridable ( assert deepClone -> leaveDotGit; assert nonConeMode -> (sparseCheckout != []); -if md5 != "" then - throw "fetchgit does not support md5 anymore, please use sha256" -else if hash != "" && sha256 != "" then +if hash != "" && sha256 != "" then throw "Only one of sha256 or hash can be set" else if builtins.isString sparseCheckout then # Changed to throw on 2023-06-04 |