From d9ab54843ac463555281bfc31709353a5ba80c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Tue, 2 May 2023 10:50:44 +0300 Subject: [PATCH 1/4] cbqn-bytecode: 2023-01-27 -> 2023-04-19 --- pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix b/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix index 85e78f86cc3b..34768c1955ec 100644 --- a/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix +++ b/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation { pname = "cbqn-bytecode"; - version = "unstable-2023-01-27"; + version = "unstable-2023-04-19"; src = fetchFromGitHub { owner = "dzaima"; repo = "cbqnBytecode"; - rev = "b2f47806ea770451d06d04e20177baeaec92e6dd"; - hash = "sha256-dukpEB5qg6jF4AIHKK+atTvCKZTVtJ1M/nw7+SNp250="; + rev = "78ed4102f914eb5fa490d76d4dcd4f8be6e53417"; + hash = "sha256-IOhxcfGmpARiTdFMSpc+Rh8VXtasZdfP6vKJzULNxAg="; }; dontConfigure = true; @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/dzaima/cbqnBytecode"; description = "CBQN precompiled bytecode"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ]; + maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk detegr ]; platforms = platforms.all; }; } From 2743e4cc3966bd2aef2478d04105defd2c4a3261 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Tue, 2 May 2023 10:50:44 +0300 Subject: [PATCH 2/4] replxx: add detegr as maintainer --- pkgs/development/interpreters/bqn/cbqn/replxx.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/replxx.nix b/pkgs/development/interpreters/bqn/cbqn/replxx.nix index afe6cef2aed3..c94927144348 100644 --- a/pkgs/development/interpreters/bqn/cbqn/replxx.nix +++ b/pkgs/development/interpreters/bqn/cbqn/replxx.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/dzaima/replxx"; description = "A replxx fork for CBQN"; license = licenses.free; - maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ]; + maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk detegr ]; platforms = platforms.all; }; } From 7015586d4d2ee36e320b24d6d3d7195d92ae661b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Tue, 2 May 2023 10:50:44 +0300 Subject: [PATCH 3/4] singeli: add detegr as maintainer --- pkgs/development/interpreters/bqn/cbqn/singeli.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/singeli.nix b/pkgs/development/interpreters/bqn/cbqn/singeli.nix index 3dfade53dfc2..9b14985e3a7d 100644 --- a/pkgs/development/interpreters/bqn/cbqn/singeli.nix +++ b/pkgs/development/interpreters/bqn/cbqn/singeli.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation { homepage = "https://github.com/mlochbaum/Singeli"; description = "A metaprogramming DSL for SIMD"; license = licenses.isc; - maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ]; + maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk detegr ]; platforms = platforms.all; }; } From 333b6ce59d584514d77bd7fe05ec72b16a9507bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antti=20Ker=C3=A4nen?= Date: Tue, 2 May 2023 10:50:44 +0300 Subject: [PATCH 4/4] cbqn: 2023-02-01 -> 0.2.0 --- .../development/interpreters/bqn/cbqn/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 632aa8ca1e48..575e1ea7b943 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -3,13 +3,13 @@ , stdenv , stdenvNoCC , fetchFromGitHub +, fixDarwinDylibNames , genBytecode ? false , bqn-path ? null , mbqn-source ? null , enableReplxx ? false , enableSingeli ? stdenv.hostPlatform.avx2Support - # No support for macOS' .dylib on the CBQN side -, enableLibcbqn ? stdenv.hostPlatform.isLinux +, enableLibcbqn ? ((stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin) && !enableReplxx) , libffi , pkg-config }: @@ -24,18 +24,18 @@ assert genBytecode -> ((bqn-path != null) && (mbqn-source != null)); stdenv.mkDerivation rec { pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; - version = "unstable-2023-02-01"; + version = "0.2.0"; src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; - rev = "05c1270344908e98c9f2d06b3671c3646f8634c3"; - hash = "sha256-wKeyYWMgTZPr+Ienz3xnsXeD67vwdK4sXbQlW+GpQho="; + rev = "v${version}"; + hash = "sha256-M9GTsm65DySLcMk9QDEhImHnUvWtYGPwiG657wHg3KA="; }; nativeBuildInputs = [ pkg-config - ]; + ] ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; buildInputs = [ libffi @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { postPatch = '' sed -i '/SHELL =.*/ d' makefile + patchShebangs build/build ''; makeFlags = [ @@ -103,7 +104,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/dzaima/CBQN/"; description = "BQN implementation in C"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ]; + maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk detegr ]; platforms = platforms.all; }; }