[squashme] remove unused/bad code

This commit is contained in:
Audrey Dutcher 2024-07-20 09:17:49 -07:00
parent 4ee5ad5929
commit c494d17409

View File

@ -248,12 +248,6 @@ let
"bin/unxz" "bin/unxz"
]; ];
}; };
cacert = linkBS {
paths = [
"etc/ssl/certs"
"nix-support/setup-hook"
];
};
binutils-unwrapped = linkBS { binutils-unwrapped = linkBS {
name = "binutils"; name = "binutils";
paths = map (str: "bin/" + str) [ paths = map (str: "bin/" + str) [
@ -425,7 +419,6 @@ in
gzip gzip
bzip2 bzip2
xz xz
cacert
; ;
binutils-unwrapped = builtins.removeAttrs bootstrapTools.binutils-unwrapped [ "src" ]; binutils-unwrapped = builtins.removeAttrs bootstrapTools.binutils-unwrapped [ "src" ];
fetchurl = import ../../build-support/fetchurl { fetchurl = import ../../build-support/fetchurl {
@ -492,7 +485,6 @@ in
# we can import bins and libs that DON'T get imported OR LINKED into the final stdenv from boot-0 # we can import bins and libs that DON'T get imported OR LINKED into the final stdenv from boot-0
curl = prevStage.curlReal; curl = prevStage.curlReal;
curlReal = super.curl; curlReal = super.curl;
cacert = prevStage.cacert;
inherit (prevStage) inherit (prevStage)
fetchurl fetchurl
python3 python3
@ -501,6 +493,7 @@ in
cmake cmake
ninja ninja
; ;
fetchurlReal = super.fetchurl;
freebsd = super.freebsd.overrideScope ( freebsd = super.freebsd.overrideScope (
self': super': { self': super': {
locales = prevStage.freebsd.locales; locales = prevStage.freebsd.locales;
@ -518,7 +511,7 @@ in
overrides = prevStage: self: super: { overrides = prevStage: self: super: {
__bootstrapArchive = bootstrapArchive; __bootstrapArchive = bootstrapArchive;
curl = prevStage.curlReal; curl = prevStage.curlReal;
inherit (prevStage) fetchurl; fetchurl = prevStage.fetchurlReal;
freebsd = super.freebsd.overrideScope ( freebsd = super.freebsd.overrideScope (
self': super': { localesPrev = prevStage.freebsd.localesReal; } self': super': { localesPrev = prevStage.freebsd.localesReal; }
); );