logistic-bot/nix-doom-emacs-unstraightened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extend/generalize shallow clone avoidance

Browse source 
Savannah seems to have the same problem.

CI fails for emms. Extend to all of savannah as we'll presumably hit
this for several other packages next...
This commit is contained in:
Marien Zwart 2024-07-02 21:59:49 +10:00
parent 1d61287aff
commit 37da9ce045
No known key found for this signature in database
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
default.nix
View file

@ -59,7 +59,7 @@
}: }:
let let
inherit (lib) optionalAttrs optionalString; inherit (lib) optionalAttrs optionalString;
inherit (import ./fetch-overrides.nix) extraPins extraUrls forceDeepClone; inherit (import ./fetch-overrides.nix) extraPins extraUrls forceDeepCloneDomains;
# Step 1: determine which Emacs packages to pull in. # Step 1: determine which Emacs packages to pull in.
# #
@ -261,7 +261,9 @@ let
} }
// optionalAttrs (p ? recipe.branch) { ref = p.recipe.branch; } // optionalAttrs (p ? recipe.branch) { ref = p.recipe.branch; }
// optionalAttrs (p ? recipe.depth) { shallow = p.recipe.depth == 1; } // optionalAttrs (p ? recipe.depth) { shallow = p.recipe.depth == 1; }
// optionalAttrs (forceDeepClone.${url} or false) { shallow = false; }; // optionalAttrs (lib.any (d: lib.hasPrefix d url) forceDeepCloneDomains) {
shallow = false;
};
src = src =
if experimentalFetchTree if experimentalFetchTree
then builtins.fetchTree ( then builtins.fetchTree (

9
fetch-overrides.nix
View file

@ -55,8 +55,9 @@
git-commit = "ea0f07e54967197ac0b072a69ba314314a4080c1"; git-commit = "ea0f07e54967197ac0b072a69ba314314a4080c1";
}; };
# Repositories for which to force `shallow = false`. # Domains for which to force `shallow = false`.
forceDeepClone = { forceDeepCloneDomains = [
"https://git.notmuchmail.org/git/notmuch" = true; "https://git.notmuchmail.org/"
}; "https://git.savannah.gnu.org/"
];
} }