diff --git a/default.nix b/default.nix index d35351c..fb32034 100644 --- a/default.nix +++ b/default.nix @@ -59,7 +59,7 @@ }: let inherit (lib) optionalAttrs optionalString; - inherit (import ./fetch-overrides.nix) extraPins extraUrls forceDeepCloneDomains; + inherit (import ./fetch-overrides.nix) extraPins extraUrls; # Step 1: determine which Emacs packages to pull in. # @@ -261,12 +261,10 @@ let # Note Doom does have packages with pin + branch (or nonrecursive) set, # expecting to inherit the rest of the recipe from Straight. - } - // optionalAttrs (p ? recipe.branch) { ref = p.recipe.branch; } - // optionalAttrs (p ? recipe.depth) { shallow = p.recipe.depth == 1; } - // optionalAttrs (lib.any (d: lib.hasPrefix d url) forceDeepCloneDomains) { + # TODO: remove if https://github.com/NixOS/nix/issues/11012 is fixed. shallow = false; - }; + } + // optionalAttrs (p ? recipe.branch) { ref = p.recipe.branch; }; src = if experimentalFetchTree then builtins.fetchTree ( diff --git a/fetch-overrides.nix b/fetch-overrides.nix index d0e68d4..81e438b 100644 --- a/fetch-overrides.nix +++ b/fetch-overrides.nix @@ -42,14 +42,4 @@ # In emacsattic, so shouldn't change underneath us. ammonite-term-repl = "b552fe21977e005c1c460bf6607557e67241a6b6"; }; - - # Domains for which to force `shallow = false`. - forceDeepCloneDomains = [ - "https://git.notmuchmail.org/" - "https://git.savannah.gnu.org/" - "https://git.sr.ht/" - "https://codeberg.org/" - "https://gitlab.com/" - "https://repo.or.cz/" - ]; }