summary refs log tree commit diff
path: root/pkgs/os-specific/linux/busybox
diff options
context:
space:
mode:
authorTethys Svensson <freaken@freaken.dk>2020-09-13 11:30:39 +0200
committerTethys Svensson <freaken@freaken.dk>2020-09-13 12:34:08 +0200
commita9597f957371cd5b191f5e456f939dfb8cc94c2f (patch)
tree3c0fa0d0cdaa05a2b33965b574bbe50b0e545a5b /pkgs/os-specific/linux/busybox
parent43cd431b443c2df4b1be9247083a2bcb8d6540fd (diff)
downloadnixpkgs-a9597f957371cd5b191f5e456f939dfb8cc94c2f.tar
nixpkgs-a9597f957371cd5b191f5e456f939dfb8cc94c2f.tar.gz
nixpkgs-a9597f957371cd5b191f5e456f939dfb8cc94c2f.tar.bz2
nixpkgs-a9597f957371cd5b191f5e456f939dfb8cc94c2f.tar.lz
nixpkgs-a9597f957371cd5b191f5e456f939dfb8cc94c2f.tar.xz
nixpkgs-a9597f957371cd5b191f5e456f939dfb8cc94c2f.tar.zst
nixpkgs-a9597f957371cd5b191f5e456f939dfb8cc94c2f.zip
busybox: Use git to fetch debian.script from debian
Debian has yanked the upstream tarball we use to get default.script. We
could simply bump the version number to get the new tarball, but to
avoid the problem in the future, we should instead fetch it from git.
Diffstat (limited to 'pkgs/os-specific/linux/busybox')
-rw-r--r--pkgs/os-specific/linux/busybox/default.nix18
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 728d2d49118..599754129b4 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -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