diff --git a/pkgs/build-support/fetchcodeberg/default.nix b/pkgs/build-support/fetchcodeberg/default.nix index 4277e5a5613c..aac1f97a7fdb 100644 --- a/pkgs/build-support/fetchcodeberg/default.nix +++ b/pkgs/build-support/fetchcodeberg/default.nix @@ -1,2 +1,11 @@ { lib, fetchFromGitea }: -lib.makeOverridable (args: fetchFromGitea ({ domain = "codeberg.org"; } // args)) +lib.makeOverridable ( + args: + fetchFromGitea ( + { + domain = "codeberg.org"; + functionName = "fetchFromCodeberg"; + } + // args + ) +) diff --git a/pkgs/build-support/fetchgitea/default.nix b/pkgs/build-support/fetchgitea/default.nix index a7910b671e9b..cfa7c592db1f 100644 --- a/pkgs/build-support/fetchgitea/default.nix +++ b/pkgs/build-support/fetchgitea/default.nix @@ -3,7 +3,20 @@ { lib, fetchFromGitHub }: lib.makeOverridable ( - { domain, ... }@args: + { + domain, + functionName ? "fetchFromGitea", + ... + }@args: - fetchFromGitHub ((removeAttrs args [ "domain" ]) // { githubBase = domain; }) + fetchFromGitHub ( + (removeAttrs args [ + "domain" + "functionName" + ]) + // { + inherit functionName; + githubBase = domain; + } + ) ) diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index f21256f5d57b..27a19b53b18d 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -48,6 +48,7 @@ decorate ( repo, tag ? null, rev ? null, + functionName ? "fetchFromGitHub", # TODO(@ShamrockLee): Add back after reconstruction with lib.extendMkDerivation # name ? repoRevToNameMaybe finalAttrs.repo (lib.revOrTag finalAttrs.revCustom finalAttrs.tag) "github", private ? false, @@ -60,7 +61,7 @@ decorate ( assert ( lib.xor (tag == null) (rev == null) - || throw "fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both)." + || throw "${functionName} requires one of either `rev` or `tag` to be provided (not both)." ); let @@ -115,6 +116,7 @@ decorate ( "repo" "tag" "rev" + "functionName" "private" "githubBase" "varPrefix" @@ -135,7 +137,7 @@ decorate ( in '' if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then - echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 + echo "Error: Private ${functionName} requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 exit 1 fi cat > netrc <