diff --git a/pkgs/development/interpreters/racket/manifest.json b/pkgs/development/interpreters/racket/manifest.json index adb19437139a..022680c991ab 100644 --- a/pkgs/development/interpreters/racket/manifest.json +++ b/pkgs/development/interpreters/racket/manifest.json @@ -1,11 +1,11 @@ { - "version": "8.15", + "version": "8.16", "full": { - "filename": "racket-8.15-src.tgz", - "sha256": "602b848459daf1b2222a46a9094e85ae2d28e480067219957fa46af8400e1233" + "filename": "racket-8.16-src.tgz", + "sha256": "b233a968f4a561f7b005ce06f2c4c29428562f308c1a04d28e2e2286f6b945c3" }, "minimal": { - "filename": "racket-minimal-8.15-src.tgz", - "sha256": "1ac132c56bc52312049fa4f0849237f66713e8e0a7ab6c4780504633ee8f1dc3" + "filename": "racket-minimal-8.16-src.tgz", + "sha256": "4e727db75574ab11d6bec7af5e5d72a084fa7f662e200c35d5bc200772f5ce96" } } diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 60e33859afee..775cd155366e 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -19,7 +19,7 @@ let manifest = lib.importJSON ./manifest.json; - inherit (stdenv.hostPlatform) isDarwin isStatic; + inherit (stdenv.hostPlatform) isDarwin; in stdenv.mkDerivation (finalAttrs: { @@ -69,13 +69,14 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ - "--enable-check" + # > docs failure: ftype-ref: ftype mismatch for # + # "--enable-check" "--enable-csonly" "--enable-liblz4" "--enable-libz" ] ++ lib.optional disableDocs "--disable-docs" - ++ lib.optionals (!isStatic) [ + ++ lib.optionals (!(finalAttrs.dontDisableStatic or false)) [ # instead of `--disable-static` that `stdenv` assumes "--disable-libs" # "not currently supported" in `configure --help-cs` but still emphasized in README @@ -87,6 +88,9 @@ stdenv.mkDerivation (finalAttrs: { "--enable-xonx" ]; + # The upstream script builds static libraries by default. + dontAddStaticConfigureFlags = true; + dontStrip = isDarwin; postFixup = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e8430c75d91..32f7af89e7a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7246,7 +7246,9 @@ with pkgs; wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix { }; racket = callPackage ../development/interpreters/racket { }; - racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { }; + racket-minimal = callPackage ../development/interpreters/racket/minimal.nix { + stdenv = stdenvAdapters.makeStaticLibraries stdenv; + }; rakudo = callPackage ../development/interpreters/rakudo { }; moarvm = darwin.apple_sdk_11_0.callPackage ../development/interpreters/rakudo/moarvm.nix {