jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #97894 from TethysSvensson/fixBusybox

Browse Source 
busybox: Fix 404 error by using git instead
This commit is contained in:
WORLDofPEACE 2020-09-13 14:25:22 -04:00 committed by GitHub
commit f5fdc6b240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/fetchgitlab/default.nix
View File

@ -12,7 +12,7 @@ let
((optional (group != null) group) ++ [ owner repo ]);
escapedSlug = replaceStrings ["." "/"] ["%2E" "%2F"] slug;
escapedRev = replaceStrings ["+"] ["%2B"] rev;
escapedRev = replaceStrings ["+" "%" "/"] ["%2B" "%25" "%2F"] rev;
in
fetchzip ({

18
pkgs/os-specific/linux/busybox/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildPackages, fetchurl, fetchzip
{ stdenv, lib, buildPackages, fetchurl, fetchFromGitLab
, enableStatic ? false
, enableMinimal ? false
# Allow forcing musl without switching stdenv itself, e.g. for our bootstrapping:
@ -32,12 +32,18 @@ let
CONFIG_FEATURE_WTMP n
'';
debianName = "busybox_1.30.1-5";
debianTarball = fetchzip {
url = "http://deb.debian.org/debian/pool/main/b/busybox/${debianName}.debian.tar.xz";
sha256 = "03m4rvs2pd0hj0mdkdm3r4m1gh0bgwr0cvnqds297xnkfi5s01nx";
# The debian version lacks behind the upstream version and also contains
# a debian-specific suffix. We only fetch the debian repository to get the
# default.script
debianVersion = "1.30.1-6";
debianSource = fetchFromGitLab {
domain = "salsa.debian.org";
owner = "installer-team";
repo = "busybox";
rev = "debian/1%${debianVersion}";
sha256 = "sha256-6r0RXtmqGXtJbvLSD1Ma1xpqR8oXL2bBKaUE/cSENL8=";
};
debianDispatcherScript = "${debianTarball}/tree/udhcpc/etc/udhcpc/default.script";
debianDispatcherScript = "${debianSource}/debian/tree/udhcpc/etc/udhcpc/default.script";
outDispatchPath = "$out/default.script";
in