diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-10-22 09:33:07 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-10-22 09:33:07 -0700 |
| commit | fc25d940101161034ac357c48a5912b413fa75cc (patch) | |
| tree | 8d704fee8fa5137952e12e19d74e683ce1fea729 /pkgs/build-support | |
| parent | 54a42ab84624e64ad5a1f34daa9559d148970f95 (diff) | |
| parent | 1cab3e231b41f38f2d2cbf5617eb7b88e433428a (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/development/python-modules/jupyter-client/default.nix pkgs/development/python-modules/jupyterlab-git/default.nix
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/buildenv/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/fetchgitlab/default.nix | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix index c2186cf6bfa04..006fc2aff9232 100644 --- a/pkgs/build-support/buildenv/default.nix +++ b/pkgs/build-support/buildenv/default.nix @@ -62,7 +62,7 @@ runCommand name # and otherwise use `meta.outputsToInstall`. The attribute is guaranteed # to exist in mkDerivation-created cases. The other cases (e.g. runCommand) # aren't expected to have multiple outputs. - (if drv.outputUnspecified or false + (if (! drv ? outputSpecified || ! drv.outputSpecified) && drv.meta.outputsToInstall or null != null then map (outName: drv.${outName}) drv.meta.outputsToInstall else [ drv ]) diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix index 5b9dbd71c5953..9ee0b3ca3686e 100644 --- a/pkgs/build-support/fetchgitlab/default.nix +++ b/pkgs/build-support/fetchgitlab/default.nix @@ -1,7 +1,7 @@ { fetchgit, fetchzip, lib }: # gitlab example -{ owner, repo, rev, domain ? "gitlab.com", name ? "source", group ? null +{ owner, repo, rev, protocol ? "https", domain ? "gitlab.com", name ? "source", group ? null , fetchSubmodules ? false, leaveDotGit ? false, deepClone ? false , ... # For hash agility } @ args: @@ -17,10 +17,10 @@ let fetcherArgs = (if useFetchGit then { inherit rev deepClone fetchSubmodules leaveDotGit; - url = "https://${domain}/${slug}.git"; + url = "${protocol}://${domain}/${slug}.git"; } else { - url = "https://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}"; + url = "${protocol}://${domain}/api/v4/projects/${escapedSlug}/repository/archive.tar.gz?sha=${escapedRev}"; }) // passthruAttrs // { inherit name; }; in -fetcher fetcherArgs // { meta.homepage = "https://${domain}/${slug}/"; inherit rev; } +fetcher fetcherArgs // { meta.homepage = "${protocol}://${domain}/${slug}/"; inherit rev; } |