From 856335396f0a0208474fb033b96e9dfb7d194dab Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Mar 2018 16:42:14 -0600 Subject: [PATCH 1/3] x86_64-musl: use native-built bootstrap package on x86_64 Built using: https://github.com/NixOS/nixpkgs/commits/46f83fa9d1bf00b09b1e9a9aa83f577c246ac674 --- pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix index 12093f34000..dd27c7def4f 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix @@ -5,7 +5,7 @@ executable = true; }; bootstrapTools = import { - url = https://wdtz.org/files/030q34q7fk6jdfxkgcqp5rzr4yhw3pgx-stdenv-bootstrap-tools-x86_64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz; - sha256 = "0ly0wj8wzbikn2j8sn727vikk90bq36drh98qvfx1kkh5k5azm2j"; + url = https://wdtz.org/files/2m15z3pmg495w52jc8dg2nbxxzmzvb04-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz; + sha256 = "1w66l0ra0sfy83hs80w6l0lb015hrhdg3xd89xh4c5kr8bcrjriw"; }; } From d7c2cffd86978999b14a671b0976306366cb16a8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Mar 2018 17:34:45 -0600 Subject: [PATCH 2/3] x86_64-musl: regen again w/symlinks preserved --- pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix index dd27c7def4f..4ec56028a54 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix @@ -1,11 +1,11 @@ { busybox = import { - url = https://wdtz.org/files/030q34q7fk6jdfxkgcqp5rzr4yhw3pgx-stdenv-bootstrap-tools-x86_64-unknown-linux-musl/on-server/busybox; - sha256 = "16lzrwwvdk6q3g08gs45pldz0rh6xpln2343xr444960h6wqxl5v"; + url = https://wdtz.org/files/6bh4giyw5rf8mc28621rxipw8d6w6w8d-stdenv-bootstrap-tools/on-server/busybox; + sha256 = "0779c2wn00467h76xpqil678gfi1y2p57c7zq2d917jsv2qj5009"; executable = true; }; bootstrapTools = import { - url = https://wdtz.org/files/2m15z3pmg495w52jc8dg2nbxxzmzvb04-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz; - sha256 = "1w66l0ra0sfy83hs80w6l0lb015hrhdg3xd89xh4c5kr8bcrjriw"; + url = https://wdtz.org/files/6bh4giyw5rf8mc28621rxipw8d6w6w8d-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz; + sha256 = "197h8gjw51q3i25myapzgqba2l4h2skzwi3q1iry26mzjjmbcvys"; }; } From a6e7c85ab87bd13ef42f13d067737da298ba7664 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 6 Mar 2018 11:22:19 -0600 Subject: [PATCH 3/3] x86_64-musl bootstrap regen, much smaller compressed: 28M -> 20M uncompressed: 201M -> 119M Built using: https://github.com/NixOS/nixpkgs/commit/94f3dc4fdf0c6b32816d67f422d8220e9954c76e cc https://github.com/NixOS/nixpkgs/pull/36383 --- pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix index 4ec56028a54..543c1c83849 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix @@ -1,11 +1,11 @@ { busybox = import { - url = https://wdtz.org/files/6bh4giyw5rf8mc28621rxipw8d6w6w8d-stdenv-bootstrap-tools/on-server/busybox; + url = https://wdtz.org/files/gywxhjgl70sxippa0pxs0vj5qcgz1wi8-stdenv-bootstrap-tools/on-server/busybox; sha256 = "0779c2wn00467h76xpqil678gfi1y2p57c7zq2d917jsv2qj5009"; executable = true; }; bootstrapTools = import { - url = https://wdtz.org/files/6bh4giyw5rf8mc28621rxipw8d6w6w8d-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz; - sha256 = "197h8gjw51q3i25myapzgqba2l4h2skzwi3q1iry26mzjjmbcvys"; + url = https://wdtz.org/files/gywxhjgl70sxippa0pxs0vj5qcgz1wi8-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz; + sha256 = "1dwiqw4xvnm0b5fdgl89lz2qq45f6s9icwxn6n6ams71xw0dbqyi"; }; }