From 31fb64851e752b18fc9fbda1af6b94fce7c23e1e Mon Sep 17 00:00:00 2001 From: rczb Date: Sun, 18 May 2025 11:29:07 +0800 Subject: [PATCH 1/4] racket, racket-minimal: 8.16 -> 8.17 --- pkgs/development/interpreters/racket/manifest.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/racket/manifest.json b/pkgs/development/interpreters/racket/manifest.json index 022680c991ab..e7250d32f99d 100644 --- a/pkgs/development/interpreters/racket/manifest.json +++ b/pkgs/development/interpreters/racket/manifest.json @@ -1,11 +1,11 @@ { - "version": "8.16", + "version": "8.17", "full": { - "filename": "racket-8.16-src.tgz", - "sha256": "b233a968f4a561f7b005ce06f2c4c29428562f308c1a04d28e2e2286f6b945c3" + "filename": "racket-8.17-src.tgz", + "sha256": "44431395138f7b8c5e67d416ff063b8fb6ce056f4c4f0fda27b7b1ec58bfa33b" }, "minimal": { - "filename": "racket-minimal-8.16-src.tgz", - "sha256": "4e727db75574ab11d6bec7af5e5d72a084fa7f662e200c35d5bc200772f5ce96" + "filename": "racket-minimal-8.17-src.tgz", + "sha256": "4acb365869290881fa07c69588cfa8b2dc1000bdc69955d70964b0b1e76b71ba" } } From 84047a3142a9ac2f17957aec8e35a5d97a80decb Mon Sep 17 00:00:00 2001 From: rczb Date: Sun, 18 May 2025 11:32:04 +0800 Subject: [PATCH 2/4] racket, racket-minimal: move to pkgs/by-name --- .../ra}/racket/configure-installation.rkt | 0 .../interpreters => by-name/ra}/racket/manifest.json | 0 .../interpreters => by-name/ra}/racket/minimal.nix | 0 .../racket/default.nix => by-name/ra/racket/package.nix} | 0 .../ra}/racket/patches/force-cs-variant.patch | 0 .../ra}/racket/patches/force-remove-codesign-then-add.patch | 0 .../interpreters => by-name/ra}/racket/tests/draw-crossing.nix | 0 .../ra}/racket/tests/get-version-and-variant.nix | 0 .../interpreters => by-name/ra}/racket/tests/load-openssl.nix | 0 .../ra}/racket/tests/nix-write-script.nix | 0 .../ra}/racket/tests/write-greeting.nix | 0 pkgs/{development/interpreters => by-name/ra}/racket/update.py | 0 pkgs/top-level/all-packages.nix | 3 +-- 13 files changed, 1 insertion(+), 2 deletions(-) rename pkgs/{development/interpreters => by-name/ra}/racket/configure-installation.rkt (100%) rename pkgs/{development/interpreters => by-name/ra}/racket/manifest.json (100%) rename pkgs/{development/interpreters => by-name/ra}/racket/minimal.nix (100%) rename pkgs/{development/interpreters/racket/default.nix => by-name/ra/racket/package.nix} (100%) rename pkgs/{development/interpreters => by-name/ra}/racket/patches/force-cs-variant.patch (100%) rename pkgs/{development/interpreters => by-name/ra}/racket/patches/force-remove-codesign-then-add.patch (100%) rename pkgs/{development/interpreters => by-name/ra}/racket/tests/draw-crossing.nix (100%) rename pkgs/{development/interpreters => by-name/ra}/racket/tests/get-version-and-variant.nix (100%) rename pkgs/{development/interpreters => by-name/ra}/racket/tests/load-openssl.nix (100%) rename pkgs/{development/interpreters => by-name/ra}/racket/tests/nix-write-script.nix (100%) rename pkgs/{development/interpreters => by-name/ra}/racket/tests/write-greeting.nix (100%) rename pkgs/{development/interpreters => by-name/ra}/racket/update.py (100%) diff --git a/pkgs/development/interpreters/racket/configure-installation.rkt b/pkgs/by-name/ra/racket/configure-installation.rkt similarity index 100% rename from pkgs/development/interpreters/racket/configure-installation.rkt rename to pkgs/by-name/ra/racket/configure-installation.rkt diff --git a/pkgs/development/interpreters/racket/manifest.json b/pkgs/by-name/ra/racket/manifest.json similarity index 100% rename from pkgs/development/interpreters/racket/manifest.json rename to pkgs/by-name/ra/racket/manifest.json diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/by-name/ra/racket/minimal.nix similarity index 100% rename from pkgs/development/interpreters/racket/minimal.nix rename to pkgs/by-name/ra/racket/minimal.nix diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/by-name/ra/racket/package.nix similarity index 100% rename from pkgs/development/interpreters/racket/default.nix rename to pkgs/by-name/ra/racket/package.nix diff --git a/pkgs/development/interpreters/racket/patches/force-cs-variant.patch b/pkgs/by-name/ra/racket/patches/force-cs-variant.patch similarity index 100% rename from pkgs/development/interpreters/racket/patches/force-cs-variant.patch rename to pkgs/by-name/ra/racket/patches/force-cs-variant.patch diff --git a/pkgs/development/interpreters/racket/patches/force-remove-codesign-then-add.patch b/pkgs/by-name/ra/racket/patches/force-remove-codesign-then-add.patch similarity index 100% rename from pkgs/development/interpreters/racket/patches/force-remove-codesign-then-add.patch rename to pkgs/by-name/ra/racket/patches/force-remove-codesign-then-add.patch diff --git a/pkgs/development/interpreters/racket/tests/draw-crossing.nix b/pkgs/by-name/ra/racket/tests/draw-crossing.nix similarity index 100% rename from pkgs/development/interpreters/racket/tests/draw-crossing.nix rename to pkgs/by-name/ra/racket/tests/draw-crossing.nix diff --git a/pkgs/development/interpreters/racket/tests/get-version-and-variant.nix b/pkgs/by-name/ra/racket/tests/get-version-and-variant.nix similarity index 100% rename from pkgs/development/interpreters/racket/tests/get-version-and-variant.nix rename to pkgs/by-name/ra/racket/tests/get-version-and-variant.nix diff --git a/pkgs/development/interpreters/racket/tests/load-openssl.nix b/pkgs/by-name/ra/racket/tests/load-openssl.nix similarity index 100% rename from pkgs/development/interpreters/racket/tests/load-openssl.nix rename to pkgs/by-name/ra/racket/tests/load-openssl.nix diff --git a/pkgs/development/interpreters/racket/tests/nix-write-script.nix b/pkgs/by-name/ra/racket/tests/nix-write-script.nix similarity index 100% rename from pkgs/development/interpreters/racket/tests/nix-write-script.nix rename to pkgs/by-name/ra/racket/tests/nix-write-script.nix diff --git a/pkgs/development/interpreters/racket/tests/write-greeting.nix b/pkgs/by-name/ra/racket/tests/write-greeting.nix similarity index 100% rename from pkgs/development/interpreters/racket/tests/write-greeting.nix rename to pkgs/by-name/ra/racket/tests/write-greeting.nix diff --git a/pkgs/development/interpreters/racket/update.py b/pkgs/by-name/ra/racket/update.py similarity index 100% rename from pkgs/development/interpreters/racket/update.py rename to pkgs/by-name/ra/racket/update.py diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21affad468e6..27781fc6e79b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6696,8 +6696,7 @@ 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 ../by-name/ra/racket/minimal.nix { stdenv = stdenvAdapters.makeStaticLibraries stdenv; }; From a8d0fd7e40a2368dcb88296b0c52bd0e8116b9a4 Mon Sep 17 00:00:00 2001 From: rczb Date: Sun, 18 May 2025 11:33:32 +0800 Subject: [PATCH 3/4] racket, racket-minimal: specify meta.sourceProvenance --- pkgs/by-name/ra/racket/minimal.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/by-name/ra/racket/minimal.nix b/pkgs/by-name/ra/racket/minimal.nix index 8d85729c2a58..498ac889ae29 100644 --- a/pkgs/by-name/ra/racket/minimal.nix +++ b/pkgs/by-name/ra/racket/minimal.nix @@ -173,6 +173,10 @@ stdenv.mkDerivation (finalAttrs: { asl20 mit ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode + ]; maintainers = with lib.maintainers; [ rc-zb ]; mainProgram = "racket"; platforms = lib.platforms.all; From 42af7c534c901d08a4435f196578844d173358aa Mon Sep 17 00:00:00 2001 From: rczb Date: Mon, 26 May 2025 20:25:41 +0800 Subject: [PATCH 4/4] racket, racket-minimal: remove redundant patch for Darwin --- pkgs/by-name/ra/racket/minimal.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/by-name/ra/racket/minimal.nix b/pkgs/by-name/ra/racket/minimal.nix index 498ac889ae29..2acd10f83bd7 100644 --- a/pkgs/by-name/ra/racket/minimal.nix +++ b/pkgs/by-name/ra/racket/minimal.nix @@ -1,7 +1,6 @@ { lib, stdenv, - fetchpatch, fetchurl, libiconvReal, @@ -50,13 +49,6 @@ stdenv.mkDerivation (finalAttrs: { circumvent this error. */ ./patches/force-remove-codesign-then-add.patch - - (fetchpatch { - name = "darwin-cs-preprocess.patch"; - url = "https://github.com/racket/racket/commit/ee9fb20a10a1a8e36650681afcafe99f0b044423.patch"; - hash = "sha256-9aTRzfd3dwznfJg0fwsjhN4SYgXncrGyBCbcmKlxlio="; - stripLen = 1; - }) ]; preConfigure =