Merge pull request #229433 from Detegr/cbqn

cbqn: 2023-02-01 -> 0.2.0
This commit is contained in:
Weijia Wang 2023-05-03 15:21:05 +03:00 committed by GitHub
commit e594440755
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 13 deletions

View File

@ -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;
};
}

View File

@ -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;
};
}

View File

@ -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;
};
}

View File

@ -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;
};
}