Skip to content

Commit 26aae5e

Browse files
authored
minimal-bootstrap: Package updates (NixOS#508255)
2 parents 9e2c9bd + 97c6d1a commit 26aae5e

7 files changed

Lines changed: 17 additions & 21 deletions

File tree

pkgs/os-specific/linux/minimal-bootstrap/coreutils/musl.nix

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
let
1616
inherit (import ./common.nix { inherit lib; }) meta;
1717
pname = "bootstrap-coreutils-musl";
18-
version = "9.9";
18+
version = "9.10";
1919

2020
src = fetchurl {
2121
url = "mirror://gnu/coreutils/coreutils-${version}.tar.gz";
22-
hash = "sha256-kacZ/Pkj3mhgFvLI0ISovh95PzQXOGEnPEZo98Za+Uo=";
22+
hash = "sha256-4L3h+2hQlEf8cjzyUX6KjH+kZ2mRm7dJDtNQoukjhWI=";
2323
};
2424

2525
configureFlags = [
@@ -33,9 +33,6 @@ let
3333
"gl_cv_func_getcwd_path_max=\"no, but it is partly working\""
3434
"gl_cv_have_unlimited_file_name_length=no"
3535

36-
# test crashes bash-2.05b?
37-
"gl_cv_func_pthread_rwlock_good_waitqueue=no"
38-
3936
# depends on linux/version.h, which is not present at this stage
4037
"gl_cv_func_copy_file_range=no"
4138
"gl_cv_onwards_func_copy_file_range=no"

pkgs/os-specific/linux/minimal-bootstrap/coreutils/static.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
let
2121
inherit (import ./common.nix { inherit lib; }) meta;
2222
pname = "coreutils-static";
23-
version = "9.9";
23+
version = "9.10";
2424

2525
src = fetchurl {
2626
url = "mirror://gnu/coreutils/coreutils-${version}.tar.gz";
27-
hash = "sha256-kacZ/Pkj3mhgFvLI0ISovh95PzQXOGEnPEZo98Za+Uo=";
27+
hash = "sha256-4L3h+2hQlEf8cjzyUX6KjH+kZ2mRm7dJDtNQoukjhWI=";
2828
};
2929

3030
configureFlags = [

pkgs/os-specific/linux/minimal-bootstrap/gnum4/default.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@
1414
diffutils,
1515
findutils,
1616
gnutar,
17+
linux-headers,
1718
xz,
1819
}:
1920
let
2021
pname = "gnum4";
21-
version = "1.4.20";
22+
version = "1.4.21";
2223

2324
src = fetchurl {
2425
url = "mirror://gnu/m4/m4-${version}.tar.xz";
25-
hash = "sha256-4jbqOhzPX2wnCxxLtgcm83H6SUWajqrryQshazKNrys=";
26+
hash = "sha256-8lxqtRVIpzp1VYdC+wMeBiXWSF/l+RVZSdZIaiQIq2Y=";
2627
};
2728
in
2829
bash.runCommand "${pname}-${version}"
@@ -70,7 +71,8 @@ bash.runCommand "${pname}-${version}"
7071
--build=${buildPlatform.config} \
7172
--host=${hostPlatform.config} \
7273
--disable-dependency-tracking \
73-
CC=musl-gcc
74+
CC=musl-gcc \
75+
CFLAGS=-I${linux-headers}/include
7476
7577
# Build
7678
make -j $NIX_BUILD_CORES

pkgs/os-specific/linux/minimal-bootstrap/python/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
}:
2121
let
2222
pname = "python";
23-
version = "3.14.2";
23+
version = "3.14.4";
2424

2525
src = fetchurl {
2626
url = "https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz";
27-
hash = "sha256-zlQ6uFS8JWthtx6bJ/gx/9G/1gpHnWOfi+f5dXz1c+k=";
27+
hash = "sha256-2SPFEwPjjiSRNvwb3zVo1W7LAyFO/e9IUWF209f6rvg=";
2828
};
2929

3030
patches = [

pkgs/os-specific/linux/minimal-bootstrap/xz/default.nix

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,11 @@
1414
}:
1515
let
1616
pname = "xz";
17-
18-
# At least versions 5.6.4 and 5.8.2 crash with spurious OoM when decompressing
19-
# certain tarballs, when compiled with tcc.
20-
version = "5.4.7";
17+
version = "5.8.3";
2118

2219
src = fetchurl {
2320
url = "https://tukaani.org/xz/xz-${version}.tar.gz";
24-
hash = "sha256-jbZmTEjKB5CLkrrtz+fzuiP0nvJHaGRRirXbZyODbnE=";
21+
hash = "sha256-PToblzryGBFPT4ibuqL0wDfequDI6BXuw4HD1Ua5dKA=";
2522
};
2623
in
2724
bash.runCommand "${pname}-${version}"

pkgs/os-specific/linux/minimal-bootstrap/xz/static.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
}:
1717
let
1818
pname = "xz";
19-
version = "5.8.2";
19+
version = "5.8.3";
2020

2121
src = fetchurl {
2222
url = "https://tukaani.org/xz/xz-${version}.tar.gz";
23-
hash = "sha256-zgnFCllieGuD5do4nJDdLBXs0JgKJY3QH3D5585YqPE=";
23+
hash = "sha256-PToblzryGBFPT4ibuqL0wDfequDI6BXuw4HD1Ua5dKA=";
2424
};
2525
in
2626
bash.runCommand "${pname}-${version}"

pkgs/os-specific/linux/minimal-bootstrap/zlib/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
}:
1414
let
1515
pname = "zlib";
16-
version = "1.3.1";
16+
version = "1.3.2";
1717

1818
src = fetchurl {
1919
url = "https://github.com/madler/zlib/releases/download/v${version}/zlib-${version}.tar.xz";
20-
hash = "sha256-OO+WuN/lENQnB9nHgYd5FHklQRM+GHCEFGO/pz+IPjI=";
20+
hash = "sha256-16BlR4Ok2lKdG7eTt62cMxgCCvd2Z7yuNfldDkKnkvM=";
2121
};
2222
in
2323
bash.runCommand "${pname}-${version}"

0 commit comments

Comments
 (0)