Unverified Commit 141a1ec4 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #279934: fetchFromGitHub: drop unzip

parents 74754d51 71a024e1

pkgs/build-support/fetchgithub/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ let 
  useFetchGit = fetchSubmodules || (leaveDotGit == true) || deepClone || forceFetchGit || (sparseCheckout != []);

  # We prefer fetchzip in cases we don't need submodules as the hash

  # is more stable in that case.

  fetcher = if useFetchGit then fetchgit else fetchzip;

  fetcher = if useFetchGit then fetchgit else fetchzip.override { withUnzip = false; };

  privateAttrs = lib.optionalAttrs private {

    netrcPhase = ''

      if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then

pkgs/build-support/fetchzip/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# (e.g. due to minor changes in the compression algorithm, or changes

# in timestamps).



{ lib, fetchurl, unzip, glibcLocalesUtf8 }:

{ lib, fetchurl, withUnzip ? true, unzip, glibcLocalesUtf8 }:



{ name ? "source"

, url ? ""
@@ -42,7 +42,7 @@ fetchurl ({ 
  # Have to pull in glibcLocalesUtf8 for unzip in setup-hook.sh to handle

  # UTF-8 aware locale:

  #   https://github.com/NixOS/nixpkgs/issues/176225#issuecomment-1146617263

  nativeBuildInputs = [ unzip glibcLocalesUtf8 ] ++ nativeBuildInputs;

  nativeBuildInputs = lib.optionals withUnzip [ unzip glibcLocalesUtf8 ] ++ nativeBuildInputs;



  postFetch =

    ''