Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upload new meta repository attribute #330756

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pkgs/build-support/fetch9front/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,10 @@ lib.makeOverridable (
passthru = {
inherit gitRepoUrl;
};
}) // passthruAttrs // { inherit name; };
})
// passthruAttrs
// { inherit name; }
// { meta.repository = [ gitRepoUrl ]; };
in

fetcher fetcherArgs // { inherit rev; }
Expand Down
1 change: 1 addition & 0 deletions pkgs/build-support/fetchbitbucket/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
)
2 changes: 2 additions & 0 deletions pkgs/build-support/fetchbzr/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ stdenvNoCC.mkDerivation {
outputHash = sha256;

inherit url rev;

meta.repository = [ url ];
}
2 changes: 2 additions & 0 deletions pkgs/build-support/fetchcvs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@ stdenvNoCC.mkDerivation {
outputHash = sha256;

inherit cvsRoot module sha256 tag date;

meta.repository = [ cvsRoot ];
}
)
2 changes: 2 additions & 0 deletions pkgs/build-support/fetchdarcs/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,7 @@ stdenvNoCC.mkDerivation {
outputHash = sha256;

inherit url rev context name;

meta.repository = [ url ];
}
)
2 changes: 2 additions & 0 deletions pkgs/build-support/fetchfossil/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,6 @@ stdenv.mkDerivation {

inherit url rev;
preferLocalBuild = true;

meta.repository = [ url ];
}
6 changes: 5 additions & 1 deletion pkgs/build-support/fetchgit/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,14 @@ stdenvNoCC.mkDerivation {
];


inherit preferLocalBuild meta allowedRequisites;
inherit preferLocalBuild allowedRequisites;

passthru = {
gitRepoUrl = url;
};

meta = {
repository = [ url ];
} // meta;
}
)
1 change: 1 addition & 0 deletions pkgs/build-support/fetchgithub/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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}";
Expand Down
1 change: 1 addition & 0 deletions pkgs/build-support/fetchgitiles/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
)
7 changes: 5 additions & 2 deletions pkgs/build-support/fetchgitlab/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
})
2 changes: 2 additions & 0 deletions pkgs/build-support/fetchhg/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,6 @@ stdenvNoCC.mkDerivation {

inherit url rev;
inherit preferLocalBuild;

meta.repository = [ url ];
}
2 changes: 2 additions & 0 deletions pkgs/build-support/fetchpijul/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,7 @@ else
inherit url change state channel;

impureEnvVars = lib.fetchers.proxyImpureEnvVars;

meta.repository = [ url ];
}
)
1 change: 1 addition & 0 deletions pkgs/build-support/fetchrepoorcz/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
1 change: 1 addition & 0 deletions pkgs/build-support/fetchsavannah/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
)
1 change: 1 addition & 0 deletions pkgs/build-support/fetchsourcehut/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@ let
in cases.${fetcher}.fetch cases.${fetcher}.arguments // {
inherit rev;
meta.homepage = "${baseUrl}";
meta.repository = [ "${baseUrl}" ];
}
)
2 changes: 2 additions & 0 deletions pkgs/build-support/fetchsvn/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,6 @@ stdenvNoCC.mkDerivation {

impureEnvVars = lib.fetchers.proxyImpureEnvVars;
inherit preferLocalBuild;

meta.repository = [ url ];
}
8 changes: 8 additions & 0 deletions pkgs/stdenv/generic/check-meta.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -461,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.
Expand Down