From 91815b8f47bf965539bb80bc2564af02a8ce2f28 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 21 Feb 2024 04:20:00 +0000 Subject: [PATCH 1/4] chez: 9.6.4 -> 10.0.0 Diff: https://github.com/cisco/ChezScheme/compare/v9.6.4...v10.0.0 Changelog: https://cisco.github.io/ChezScheme/release_notes/v10.0/release_notes.html --- pkgs/development/compilers/chez/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index fc7dfa78cefe..9327b69998f7 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "chez-scheme"; - version = "9.6.4"; + version = "10.0.0"; src = fetchurl { url = "https://github.com/cisco/ChezScheme/releases/download/v${finalAttrs.version}/csv${finalAttrs.version}.tar.gz"; - hash = "sha256-9YJ2gvolnEeXX/4Hh4X7Vh5KXFT3ZDMe9mwyEyhDaF0="; + hash = "sha256-03GZASte0ZhcQGnWqH/xjl4fWi3yfkApkfr0XcTyIyw="; }; nativeBuildInputs = lib.optional stdenv.isDarwin cctools; @@ -28,18 +28,11 @@ stdenv.mkDerivation (finalAttrs: { ** NixOS or in any chroot build. */ patchPhase = '' - substituteInPlace ./configure \ - --replace "git submodule init && git submodule update || exit 1" "true" - - substituteInPlace ./workarea \ - --replace "/bin/ln" ln \ - --replace "/bin/cp" cp - substituteInPlace ./makefiles/installsh \ - --replace "/usr/bin/true" "${coreutils}/bin/true" + --replace-warn "/usr/bin/true" "${coreutils}/bin/true" substituteInPlace zlib/configure \ - --replace "/usr/bin/libtool" libtool + --replace-warn "/usr/bin/libtool" libtool ''; /* @@ -52,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ** for. */ configurePhase = '' - ./configure --threads --installprefix=$out --installman=$out/share/man + ./configure --as-is --threads --installprefix=$out --installman=$out/share/man ''; /* From 5e7907a11102a285d45e210ab88c59590f67a0a8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 21 Feb 2024 04:20:00 +0000 Subject: [PATCH 2/4] chez: add meta.mainProgram --- pkgs/development/compilers/chez/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 9327b69998f7..dfdb47f5db24 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -64,5 +64,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.unix; badPlatforms = [ "aarch64-linux" "aarch64-darwin" ]; + mainProgram = "scheme"; }; }) From 1fb5e0221fae5428666a01cfb0582eaa34890056 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 21 Feb 2024 04:20:00 +0000 Subject: [PATCH 3/4] chez: add version tester --- pkgs/development/compilers/chez/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index dfdb47f5db24..9a8338f06730 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , coreutils, cctools -, ncurses, libiconv, libX11, libuuid +, ncurses, libiconv, libX11, libuuid, testers }: stdenv.mkDerivation (finalAttrs: { @@ -57,6 +57,12 @@ stdenv.mkDerivation (finalAttrs: { setupHook = ./setup-hook.sh; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + meta = { description = "A powerful and incredibly fast R6RS Scheme compiler"; homepage = "https://cisco.github.io/ChezScheme/"; From 2a58797444db810cc091aada159fed626c1fb53e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 22 Feb 2024 04:20:00 +0000 Subject: [PATCH 4/4] chez: remove meta.badPlatforms --- pkgs/development/compilers/chez/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index 9a8338f06730..c0448a7e6d4f 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.unix; - badPlatforms = [ "aarch64-linux" "aarch64-darwin" ]; mainProgram = "scheme"; }; })