diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-05-26 00:02:58 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-26 00:02:58 +0000 |
commit | f82caaee7467739bc2d1e72ecda10f490e2525f9 (patch) | |
tree | 74cb3f7a07b817e6e78581d6f11c607431af21db /pkgs/build-support | |
parent | f9efb46ae16290a019004a58df7072c2d6f57b02 (diff) | |
parent | ec51248b83396286dc5bc37692ea96fb1b4147a1 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/dotnet/build-dotnet-module/default.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/fetchgit/default.nix | 4 | ||||
-rw-r--r-- | pkgs/build-support/fetchgithub/default.nix | 13 | ||||
-rw-r--r-- | pkgs/build-support/fetchgitlab/default.nix | 8 |
4 files changed, 24 insertions, 5 deletions
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 6e7388a4a75e7..fa987237a75cb 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -56,9 +56,9 @@ # The type of build to perform. This is passed to `dotnet` with the `--configuration` flag. Possible values are `Release`, `Debug`, etc. , buildType ? "Release" # The dotnet SDK to use. -, dotnet-sdk ? dotnetCorePackages.sdk_5_0 +, dotnet-sdk ? dotnetCorePackages.sdk_6_0 # The dotnet runtime to use. -, dotnet-runtime ? dotnetCorePackages.runtime_5_0 +, dotnet-runtime ? dotnetCorePackages.runtime_6_0 # The dotnet SDK to run tests against. This can differentiate from the SDK compiled against. , dotnet-test-sdk ? dotnet-sdk , ... } @ args: diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index b0cc42f071450..2ae1714e4af02 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -92,4 +92,8 @@ stdenvNoCC.mkDerivation { ]; inherit preferLocalBuild meta; + + passthru = { + gitRepoUrl = url; + }; } diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index 27cb8312ea0a4..cfb6a6ca7cd80 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -42,11 +42,20 @@ let ''; netrcImpureEnvVars = [ "${varBase}USERNAME" "${varBase}PASSWORD" ]; }; + + gitRepoUrl = "${baseUrl}.git"; + fetcherArgs = (if useFetchGit then { - inherit rev deepClone fetchSubmodules sparseCheckout; url = "${baseUrl}.git"; + inherit rev deepClone fetchSubmodules sparseCheckout; url = gitRepoUrl; } // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; } - else { url = "${baseUrl}/archive/${rev}.tar.gz"; } + else { + url = "${baseUrl}/archive/${rev}.tar.gz"; + + passthru = { + inherit gitRepoUrl; + }; + } ) // privateAttrs // passthruAttrs // { inherit name; }; in diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix index 5c82a8f8587d9..264bbcf3f761d 100644 --- a/pkgs/build-support/fetchgitlab/default.nix +++ b/pkgs/build-support/fetchgitlab/default.nix @@ -15,11 +15,17 @@ let useFetchGit = deepClone || fetchSubmodules || leaveDotGit; fetcher = if useFetchGit then fetchgit else fetchzip; + gitRepoUrl = "${protocol}://${domain}/${slug}.git"; + fetcherArgs = (if useFetchGit then { inherit rev deepClone fetchSubmodules leaveDotGit; - url = "${protocol}://${domain}/${slug}.git"; + url = gitRepoUrl; } else { url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}"; + + passthru = { + inherit gitRepoUrl; + }; }) // passthruAttrs // { inherit name; }; in |