diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 66bb3b7..83811e8 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -27,6 +27,7 @@ lib.makeOverridable ( , # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes) # needed for netrcPhase netrcImpureEnvVars ? [] +, passthru ? {} , meta ? {} , allowedRequisites ? null }: @@ -103,7 +104,7 @@ stdenvNoCC.mkDerivation { inherit preferLocalBuild meta allowedRequisites; - passthru = { + passthru = passthru // { gitRepoUrl = url; }; } diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index 4ce3c6e..66da4d6 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -1,22 +1,30 @@ { lib, fetchgit, fetchzip }: lib.makeOverridable ( -{ owner, repo, rev, name ? "source" +{ owner, repo, rev +, name ? null # Override with null to use the default value +, pname ? "source-${githubBase}-${owner}-${repo}" , fetchSubmodules ? false, leaveDotGit ? null , deepClone ? false, private ? false, forceFetchGit ? false , sparseCheckout ? [] , githubBase ? "github.com", varPrefix ? null +, passthru ? { } , meta ? { } , ... # For hash agility }@args: let + name = if args.name or null != null then args.name + else "${pname}-${rev}"; position = (if args.meta.description or null != null then builtins.unsafeGetAttrPos "description" args.meta else builtins.unsafeGetAttrPos "rev" args ); baseUrl = "https://${githubBase}/${owner}/${repo}"; + newPassthru = passthru // { + inherit rev owner repo; + }; newMeta = meta // { homepage = meta.homepage or baseUrl; } // lib.optionalAttrs (position != null) { @@ -53,16 +61,19 @@ let fetcherArgs = (if useFetchGit then { inherit rev deepClone fetchSubmodules sparseCheckout; url = gitRepoUrl; + passthru = newPassthru; } // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; } else { url = "${baseUrl}/archive/${rev}.tar.gz"; - passthru = { + passthru = newPassthru // { inherit gitRepoUrl; }; } ) // privateAttrs // passthruAttrs // { inherit name; }; in -fetcher fetcherArgs // { meta = newMeta; inherit rev owner repo; } +(fetcher fetcherArgs).overrideAttrs (finalAttrs: previousAttrs: { + meta = newMeta; +}) ) diff --git a/pkgs/by-name/py/python/python-modules/build/default.nix b/pkgs/by-name/py/python/python-modules/build/default.nix index 4eaace8..53c9b8c 100644 --- a/pkgs/by-name/py/python/python-modules/build/default.nix +++ b/pkgs/by-name/py/python/python-modules/build/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "build"; - version = "1.2.1"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "pypa"; repo = "build"; rev = "refs/tags/${version}"; - hash = "sha256-G0g+1v19sQMUuQlZKGELZOwwX07i7TIdEdaYzr8bKtI="; + hash = "sha256-SGWpm+AGIfqKMpDfmz2aMYmcs+XVREbHIXSuU4R7U/k="; }; postPatch = ''