BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #203460 from sternenseemann/cbqn-2022-11-27

Browse source 
cbqn: 0.pre+date=2022-10-04 -> 0.pre+date=2022-11-27
This commit is contained in:
Anderson Torres 2022-11-28 20:17:38 -03:00 committed by GitHub
commit 04e7308c68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/development/interpreters/bqn/cbqn/default.nix
View file

@ -5,6 +5,7 @@
, bqn-path ? null
, mbqn-source ? null
, libffi
, pkg-config
}:
let
@ -20,15 +21,20 @@ assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
stdenv.mkDerivation rec {
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
version = "0.pre+date=2022-10-04";
version = "0.pre+date=2022-11-27";
src = fetchFromGitHub {
owner = "dzaima";
repo = "CBQN";
rev = "abcb575a537712763e9e53b6cb0eb415346b00e6";
hash = "sha256:05gqw2ppcykv36ji8mkp8mq502q84vk9algp9c2d3z495xqy8rn6";
rev = "dbc7c83f7085d05e87721bedf1ee38931f671a8e";
hash = "sha256:0nal1fs9y7nyx4d5q1qw868lxk7mivzw2y16wc3hw97pq4qf0dpb";
};
nativeBuildInputs = [
pkg-config
];
# TODO(@sternenseemann): allow building against dzaima's replxx fork
buildInputs = [
libffi
];
@ -45,11 +51,11 @@ stdenv.mkDerivation rec {
preBuild = ''
# Purity: avoids git downloading bytecode files
touch src/gen/customRuntime
mkdir -p build/bytecodeLocal/gen
'' + (if genBytecode then ''
${bqn-path} genRuntime ${mbqn-source}
${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/
'' else ''
cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} src/gen/
cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} build/bytecodeLocal/gen/
'')
# Need to adjust ld flags for darwin manually
# https://github.com/dzaima/CBQN/issues/26

6
pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix
View file

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation rec {
pname = "bqn";
version = "0.pre+date=2022-10-03";
version = "0.pre+date=2022-11-24";
src = fetchFromGitHub {
owner = "mlochbaum";
repo = "BQN";
rev = "1518205cceeb1fef27c584d24e92b189ffd234f4";
hash = "sha256:1pyk331ymbs2fv9jxmbv28yvk9mr2mcni1dsja6fzkk1jrd767hy";
rev = "976bd82fb0e830876cca117c302c8a19048033a4";
hash = "sha256:1nhn30ypc2zvq58b3zi66ypc9wv3v8cryn43cqihazc1lq8qxqdw";
};
nativeBuildInputs = [ makeWrapper ];