Skip to content

Commit 3657fc8

Browse files
authored
racket: 8.15 -> 8.16, restore static libraries (#387460)
2 parents 05a8f2c + f68f849 commit 3657fc8

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"version": "8.15",
2+
"version": "8.16",
33
"full": {
4-
"filename": "racket-8.15-src.tgz",
5-
"sha256": "602b848459daf1b2222a46a9094e85ae2d28e480067219957fa46af8400e1233"
4+
"filename": "racket-8.16-src.tgz",
5+
"sha256": "b233a968f4a561f7b005ce06f2c4c29428562f308c1a04d28e2e2286f6b945c3"
66
},
77
"minimal": {
8-
"filename": "racket-minimal-8.15-src.tgz",
9-
"sha256": "1ac132c56bc52312049fa4f0849237f66713e8e0a7ab6c4780504633ee8f1dc3"
8+
"filename": "racket-minimal-8.16-src.tgz",
9+
"sha256": "4e727db75574ab11d6bec7af5e5d72a084fa7f662e200c35d5bc200772f5ce96"
1010
}
1111
}

pkgs/development/interpreters/racket/minimal.nix

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
let
2020
manifest = lib.importJSON ./manifest.json;
2121

22-
inherit (stdenv.hostPlatform) isDarwin isStatic;
22+
inherit (stdenv.hostPlatform) isDarwin;
2323
in
2424

2525
stdenv.mkDerivation (finalAttrs: {
@@ -69,13 +69,14 @@ stdenv.mkDerivation (finalAttrs: {
6969

7070
configureFlags =
7171
[
72-
"--enable-check"
72+
# > docs failure: ftype-ref: ftype mismatch for #<ftype-pointer>
73+
# "--enable-check"
7374
"--enable-csonly"
7475
"--enable-liblz4"
7576
"--enable-libz"
7677
]
7778
++ lib.optional disableDocs "--disable-docs"
78-
++ lib.optionals (!isStatic) [
79+
++ lib.optionals (!(finalAttrs.dontDisableStatic or false)) [
7980
# instead of `--disable-static` that `stdenv` assumes
8081
"--disable-libs"
8182
# "not currently supported" in `configure --help-cs` but still emphasized in README
@@ -87,6 +88,9 @@ stdenv.mkDerivation (finalAttrs: {
8788
"--enable-xonx"
8889
];
8990

91+
# The upstream script builds static libraries by default.
92+
dontAddStaticConfigureFlags = true;
93+
9094
dontStrip = isDarwin;
9195

9296
postFixup =

pkgs/top-level/all-packages.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7246,7 +7246,9 @@ with pkgs;
72467246
wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { };
72477247

72487248
racket = callPackage ../development/interpreters/racket { };
7249-
racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { };
7249+
racket-minimal = callPackage ../development/interpreters/racket/minimal.nix {
7250+
stdenv = stdenvAdapters.makeStaticLibraries stdenv;
7251+
};
72507252

72517253
rakudo = callPackage ../development/interpreters/rakudo { };
72527254
moarvm = darwin.apple_sdk_11_0.callPackage ../development/interpreters/rakudo/moarvm.nix {

0 commit comments

Comments
 (0)