From 48f4245b34be1c712ae6ce8a54969a257ff74d19 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 30 Mar 2024 16:18:16 -0300 Subject: [PATCH 01/18] stdenv: add meta.repository attribute --- pkgs/stdenv/generic/check-meta.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index 502343f01fb32..a8b43dbbfb4cc 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -318,6 +318,10 @@ let (listOf licenseType) licenseType ]; + repository = union [ + (listOf str) + str + ]; sourceProvenance = listOf attrs; maintainers = listOf (attrsOf any); # TODO use the maintainer type from lib/tests/maintainer-module.nix priority = int; From 52e8b622c68783339e540a70c563eb7f738d9ff6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 30 Mar 2024 16:12:44 -0300 Subject: [PATCH 02/18] stdenv: set repository as an empty list by default --- pkgs/stdenv/generic/check-meta.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index a8b43dbbfb4cc..03c0488151e32 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -465,6 +465,10 @@ let # Let's have a clean always accessible version here. name = attrs.name or "${attrs.pname}-${attrs.version}"; + # `repository` shall default to an empty list + + repository = attrs.repository or []; + # If the packager hasn't specified `outputsToInstall`, choose a default, # which is the name of `p.bin or p.out or p` along with `p.man` when # present. From 66aabb4b0d144a1f36e35b23f65852246a03d607 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 10 May 2024 22:07:38 -0300 Subject: [PATCH 03/18] fetchbzr: set meta.repository attribute --- pkgs/build-support/fetchbzr/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/fetchbzr/default.nix b/pkgs/build-support/fetchbzr/default.nix index b7db9e9274da3..94eed7c6eea39 100644 --- a/pkgs/build-support/fetchbzr/default.nix +++ b/pkgs/build-support/fetchbzr/default.nix @@ -12,4 +12,6 @@ stdenvNoCC.mkDerivation { outputHash = sha256; inherit url rev; + + meta.repository = [ url ]; } From eeadfba080c0b12a4de047a7e6e44b4f76ad5ca6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 10 May 2024 22:09:08 -0300 Subject: [PATCH 04/18] fetchcvs: set meta.repository attribute --- pkgs/build-support/fetchcvs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/fetchcvs/default.nix b/pkgs/build-support/fetchcvs/default.nix index 43a10c3aa5529..5acb1855f3ce4 100644 --- a/pkgs/build-support/fetchcvs/default.nix +++ b/pkgs/build-support/fetchcvs/default.nix @@ -18,5 +18,7 @@ stdenvNoCC.mkDerivation { outputHash = sha256; inherit cvsRoot module sha256 tag date; + + meta.repository = [ cvsRoot ]; } ) From 5ed14c7eb31b5bc3049f3c6d8ae582076d02aafa Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 10 May 2024 22:09:19 -0300 Subject: [PATCH 05/18] fetchdarcs: set meta.repository attribute --- pkgs/build-support/fetchdarcs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/fetchdarcs/default.nix b/pkgs/build-support/fetchdarcs/default.nix index 6073efec28159..722c1154418c3 100644 --- a/pkgs/build-support/fetchdarcs/default.nix +++ b/pkgs/build-support/fetchdarcs/default.nix @@ -17,5 +17,7 @@ stdenvNoCC.mkDerivation { outputHash = sha256; inherit url rev context name; + + meta.repository = [ url ]; } ) From 72c6238202be9529c9bb99fad5a1d8e35cc2f6c7 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 10 May 2024 22:09:28 -0300 Subject: [PATCH 06/18] fetchfossil: set meta.repository attribute --- pkgs/build-support/fetchfossil/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/fetchfossil/default.nix b/pkgs/build-support/fetchfossil/default.nix index 3f3bf69db0477..36f4cccac15bf 100644 --- a/pkgs/build-support/fetchfossil/default.nix +++ b/pkgs/build-support/fetchfossil/default.nix @@ -30,4 +30,6 @@ stdenv.mkDerivation { inherit url rev; preferLocalBuild = true; + + meta.repository = [ url ]; } From 74ad1fdc6dc7267e00524a80606b251d2acdab13 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 10 May 2024 22:24:15 -0300 Subject: [PATCH 07/18] fetchgit: set meta.repository attribute --- pkgs/build-support/fetchgit/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 66bb3b7c09ffc..184c49c3318fc 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -101,10 +101,14 @@ stdenvNoCC.mkDerivation { ]; - inherit preferLocalBuild meta allowedRequisites; + inherit preferLocalBuild allowedRequisites; passthru = { gitRepoUrl = url; }; + + meta = { + repository = [ url ]; + } // meta; } ) From da00faf2da26274f8ed7ac00b87e2262fd402b3a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 10 May 2024 22:24:25 -0300 Subject: [PATCH 08/18] fetchhg: set meta.repository attribute --- pkgs/build-support/fetchhg/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/fetchhg/default.nix b/pkgs/build-support/fetchhg/default.nix index 6af886bf09344..ec022413b59f7 100644 --- a/pkgs/build-support/fetchhg/default.nix +++ b/pkgs/build-support/fetchhg/default.nix @@ -31,4 +31,6 @@ stdenvNoCC.mkDerivation { inherit url rev; inherit preferLocalBuild; + + meta.repository = [ url ]; } From 34d54b2e11291fe716a1f9d96e729fb415465336 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 10 May 2024 22:24:34 -0300 Subject: [PATCH 09/18] fetchpijul: set meta.repository attribute --- pkgs/build-support/fetchpijul/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/fetchpijul/default.nix b/pkgs/build-support/fetchpijul/default.nix index fd41cfa55355c..992f3009a03af 100644 --- a/pkgs/build-support/fetchpijul/default.nix +++ b/pkgs/build-support/fetchpijul/default.nix @@ -55,5 +55,7 @@ else inherit url change state channel; impureEnvVars = lib.fetchers.proxyImpureEnvVars; + + meta.repository = [ url ]; } ) From a35bb610facb3a3fbdafe88b1634c31e8e8467ac Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 10 May 2024 22:24:46 -0300 Subject: [PATCH 10/18] fetchsvn: set meta.repository attribute --- pkgs/build-support/fetchsvn/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 41752eb55a7a8..efb15f81388cf 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -56,4 +56,6 @@ stdenvNoCC.mkDerivation { impureEnvVars = lib.fetchers.proxyImpureEnvVars; inherit preferLocalBuild; + + meta.repository = [ url ]; } From 3dd10446369d0bc15ded4a082d2e18b30369c948 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 20:05:57 -0300 Subject: [PATCH 11/18] fetchFrom9Front: set meta.repository attribute So that it can be "inherited" by the caller. Set it to a list so that it can be "expanded". --- pkgs/build-support/fetch9front/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/fetch9front/default.nix b/pkgs/build-support/fetch9front/default.nix index 677fee1decd77..f6fa6d29236e8 100644 --- a/pkgs/build-support/fetch9front/default.nix +++ b/pkgs/build-support/fetch9front/default.nix @@ -29,7 +29,10 @@ lib.makeOverridable ( passthru = { inherit gitRepoUrl; }; - }) // passthruAttrs // { inherit name; }; + }) + // passthruAttrs + // { inherit name; } + // { meta.repository = [ gitRepoUrl ]; }; in fetcher fetcherArgs // { inherit rev; } From 7a12eef679d218f70c1ea85ba23c435f1f2bccc8 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 20:06:12 -0300 Subject: [PATCH 12/18] fetchFromBitbucket: set meta.repository attribute So that it can be "inherited" by the caller. Set it to a list so that it can be "expanded". --- pkgs/build-support/fetchbitbucket/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchbitbucket/default.nix b/pkgs/build-support/fetchbitbucket/default.nix index 2f9103f2bb3e0..c21fdd24c77a7 100644 --- a/pkgs/build-support/fetchbitbucket/default.nix +++ b/pkgs/build-support/fetchbitbucket/default.nix @@ -7,5 +7,6 @@ lib.makeOverridable ( inherit name; url = "https://bitbucket.org/${owner}/${repo}/get/${rev}.tar.gz"; meta.homepage = "https://bitbucket.org/${owner}/${repo}/"; + meta.repository = [ "https://bitbucket.org/${owner}/${repo}/" ]; } // removeAttrs args [ "owner" "repo" "rev" ]) // { inherit rev; } ) From 81aecc32cb5f5afa5f5677f04e4e24a4ec8d797f Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 30 Mar 2024 14:56:17 -0300 Subject: [PATCH 13/18] fetchFromGitHub: set meta.repository attribute So that it can be "inherited" by the caller. Set it to a list so that it can be "expanded". --- pkgs/build-support/fetchgithub/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index 4ce3c6e84d768..eab1904e3dd6b 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -19,6 +19,7 @@ let baseUrl = "https://${githubBase}/${owner}/${repo}"; newMeta = meta // { homepage = meta.homepage or baseUrl; + repository = meta.repository or [ baseUrl ]; } // lib.optionalAttrs (position != null) { # to indicate where derivation originates, similar to make-derivation.nix's mkDerivation position = "${position.file}:${toString position.line}"; From dfd4ffe74dd995221fab79331e61cf0e2a67a76d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 20:06:45 -0300 Subject: [PATCH 14/18] fetchFromGitLab: set meta.repository attribute So that it can be "inherited" by the caller. Set it to a list so that it can be "expanded". --- pkgs/build-support/fetchgitlab/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix index 749883f2365eb..33d7614b55598 100644 --- a/pkgs/build-support/fetchgitlab/default.nix +++ b/pkgs/build-support/fetchgitlab/default.nix @@ -32,5 +32,8 @@ let }) // passthruAttrs // { inherit name; }; in -fetcher fetcherArgs // { meta.homepage = "${protocol}://${domain}/${slug}/"; inherit rev owner repo; } -) +fetcher fetcherArgs // { + meta.homepage = "${protocol}://${domain}/${slug}/"; + meta.repository = [ gitRepoUrl ]; + inherit rev owner repo; +}) From 67d1098e602efdea243553bbea97211c9d3e48d3 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 20:06:28 -0300 Subject: [PATCH 15/18] fetchFromGitiles: set meta.repository attribute So that it can be "inherited" by the caller. Set it to a list so that it can be "expanded". --- pkgs/build-support/fetchgitiles/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchgitiles/default.nix b/pkgs/build-support/fetchgitiles/default.nix index be81c6e8a4c21..4e4e34ac3886b 100644 --- a/pkgs/build-support/fetchgitiles/default.nix +++ b/pkgs/build-support/fetchgitiles/default.nix @@ -8,5 +8,6 @@ fetchzip ({ url = "${url}/+archive/${rev}.tar.gz"; stripRoot = false; meta.homepage = url; + meta.repository = [ url ]; } // removeAttrs args [ "url" "rev" ]) // { inherit rev; } ) From 08115b6f6ee56aef330ac1adf3a9efb6b5aec277 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 20:07:06 -0300 Subject: [PATCH 16/18] fetchFromRepoOrCz: set meta.repository attribute So that it can be "inherited" by the caller. Set it to a list so that it can be "expanded". --- pkgs/build-support/fetchrepoorcz/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchrepoorcz/default.nix b/pkgs/build-support/fetchrepoorcz/default.nix index 3ac7cace0dcf7..ecb851cf05d46 100644 --- a/pkgs/build-support/fetchrepoorcz/default.nix +++ b/pkgs/build-support/fetchrepoorcz/default.nix @@ -7,4 +7,5 @@ inherit name; url = "https://repo.or.cz/${repo}.git/snapshot/${rev}.tar.gz"; meta.homepage = "https://repo.or.cz/${repo}.git/"; + meta.repository = [ "https://repo.or.cz/${repo}.git/" ]; } // removeAttrs args [ "repo" "rev" ]) // { inherit rev; } From 5b4c6f063ee3479af3b399b1da3d55794a04b357 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 20:07:26 -0300 Subject: [PATCH 17/18] fetchFromSavannah: set meta.repository attribute So that it can be "inherited" by the caller. Set it to a list so that it can be "expanded". --- pkgs/build-support/fetchsavannah/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchsavannah/default.nix b/pkgs/build-support/fetchsavannah/default.nix index e75e25fc1e70b..66a740dd74b4a 100644 --- a/pkgs/build-support/fetchsavannah/default.nix +++ b/pkgs/build-support/fetchsavannah/default.nix @@ -8,5 +8,6 @@ lib.makeOverridable ( inherit name; url = "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz"; meta.homepage = "https://git.savannah.gnu.org/cgit/${repo}.git/"; + meta.repository = [ "https://git.savannah.gnu.org/cgit/${repo}.git/" ]; } // removeAttrs args [ "repo" "rev" ]) // { inherit rev; } ) From a8bd8f24d60744957123be49717fa359b6006f0b Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 19:55:07 -0300 Subject: [PATCH 18/18] fetchFromSourceHut: set meta.repository attribute So that it can be "inherited" by the caller. Set it to a list so that it can be "expanded". --- pkgs/build-support/fetchsourcehut/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchsourcehut/default.nix b/pkgs/build-support/fetchsourcehut/default.nix index 42d437b3555e6..2692bb1e40c73 100644 --- a/pkgs/build-support/fetchsourcehut/default.nix +++ b/pkgs/build-support/fetchsourcehut/default.nix @@ -58,5 +58,6 @@ let in cases.${fetcher}.fetch cases.${fetcher}.arguments // { inherit rev; meta.homepage = "${baseUrl}"; + meta.repository = [ "${baseUrl}" ]; } )