Merge pull request #140805 from AndersonTorres/update-version-strings
This commit is contained in:
commit
b5b042b580
@ -12,19 +12,20 @@ let
|
|||||||
owner = "dzaima";
|
owner = "dzaima";
|
||||||
repo = "CBQN";
|
repo = "CBQN";
|
||||||
rev = "4d23479cdbd5ac6eb512c376ade58077b814b2b7";
|
rev = "4d23479cdbd5ac6eb512c376ade58077b814b2b7";
|
||||||
sha256 = "1il6pxbllf4rs0wf2s6q6h72m3p1d6ymgsllpkmadnw1agif0fri";
|
hash = "sha256-MTvg4lOB26bqvJTqV71p4Y4qDjTYaOE40Jk4Sle/hsY=";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
|
assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
|
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
|
||||||
version = "0.0.0+unstable=2021-10-05";
|
version = "0.pre+unstable=2021-10-05";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dzaima";
|
owner = "dzaima";
|
||||||
repo = "CBQN";
|
repo = "CBQN";
|
||||||
rev = "e23dab20daff9c0dacc2561c616174af72029a3e";
|
rev = "e23dab20daff9c0dacc2561c616174af72029a3e";
|
||||||
sha256 = "17h8fb9a0hjindbxgkljajl1hjr8rdqrb85s5lz903v17wl4lrba";
|
hash = "sha256-amVKKD9hD5A+LbqglXHLKEsYqFSSztdXs1FCoNJyCJ4=";
|
||||||
};
|
};
|
||||||
|
|
||||||
dontConfigure = true;
|
dontConfigure = true;
|
||||||
@ -62,8 +63,7 @@ stdenv.mkDerivation rec {
|
|||||||
license = licenses.gpl3Plus;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica ];
|
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica ];
|
||||||
platforms = platforms.all;
|
platforms = platforms.all;
|
||||||
priority = if genBytecode then 0 else 10;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
# TODO: factor and version cbqn-bytecode-files
|
# TODO: version cbqn-bytecode-files
|
||||||
# TODO: test suite
|
# TODO: test suite
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "dbqn" + lib.optionalString buildNativeImage "-native";
|
pname = "dbqn" + lib.optionalString buildNativeImage "-native";
|
||||||
version = "0.0.0+unstable=2021-10-05";
|
version = "0.pre+unstable=2021-10-05";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "dzaima";
|
owner = "dzaima";
|
||||||
|
@ -7,13 +7,13 @@
|
|||||||
|
|
||||||
stdenvNoCC.mkDerivation rec {
|
stdenvNoCC.mkDerivation rec {
|
||||||
pname = "bqn";
|
pname = "bqn";
|
||||||
version = "0.0.0+unstable=2021-10-01";
|
version = "0.pre+unstable=2021-10-06";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mlochbaum";
|
owner = "mlochbaum";
|
||||||
repo = "BQN";
|
repo = "BQN";
|
||||||
rev = "b3d68f730d48ccb5e3b3255f9010c95bf9f86e22";
|
rev = "2ce2dc40702431ef3d3ffece9e2f6f8b883ac6c5";
|
||||||
hash = "sha256-Tkgwz7+d25svmjRsXFUQq0S/73QJU+BKSNeGqpUcBTQ=";
|
hash = "sha256-bvXKOaBlddG6O0GbmtqU9prklqmOOvlbXuCUaFO+j0M=";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ makeWrapper ];
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
|
|||||||
buildInputs = [ nodejs ];
|
buildInputs = [ nodejs ];
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
# Creates a @libbqn@ substitution variable
|
# Creates a @libbqn@ substitution variable, to be filled in the fixupPhase
|
||||||
./001-libbqn-path.patch
|
./001-libbqn-path.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -12896,29 +12896,22 @@ with pkgs;
|
|||||||
|
|
||||||
# Below, the classic self-bootstrapping process
|
# Below, the classic self-bootstrapping process
|
||||||
cbqn-bootstrap = lib.dontRecurseIntoAttrs {
|
cbqn-bootstrap = lib.dontRecurseIntoAttrs {
|
||||||
# use clang here since it emits less speculative warnings;
|
|
||||||
# however, avoid its building in cross compilations
|
|
||||||
stdenv =
|
|
||||||
if stdenv.hostPlatform == stdenv.buildPlatform
|
|
||||||
then clangStdenv
|
|
||||||
else stdenv;
|
|
||||||
mbqn-source = buildPackages.mbqn.src;
|
mbqn-source = buildPackages.mbqn.src;
|
||||||
|
|
||||||
phase0 = callPackage ../development/interpreters/bqn/cbqn {
|
phase0 = callPackage ../development/interpreters/bqn/cbqn {
|
||||||
inherit (cbqn-bootstrap) stdenv;
|
|
||||||
genBytecode = false;
|
genBytecode = false;
|
||||||
bqn-path = null;
|
bqn-path = null;
|
||||||
mbqn-source = null;
|
mbqn-source = null;
|
||||||
};
|
};
|
||||||
|
|
||||||
phase1 = callPackage ../development/interpreters/bqn/cbqn {
|
phase1 = callPackage ../development/interpreters/bqn/cbqn {
|
||||||
inherit (cbqn-bootstrap) stdenv mbqn-source;
|
inherit (cbqn-bootstrap) mbqn-source;
|
||||||
genBytecode = true;
|
genBytecode = true;
|
||||||
bqn-path = "${buildPackages.cbqn-bootstrap.phase0}/bin/cbqn";
|
bqn-path = "${buildPackages.cbqn-bootstrap.phase0}/bin/cbqn";
|
||||||
};
|
};
|
||||||
|
|
||||||
phase2 = callPackage ../development/interpreters/bqn/cbqn {
|
phase2 = callPackage ../development/interpreters/bqn/cbqn {
|
||||||
inherit (cbqn-bootstrap) stdenv mbqn-source;
|
inherit (cbqn-bootstrap) mbqn-source;
|
||||||
genBytecode = true;
|
genBytecode = true;
|
||||||
bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn";
|
bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn";
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user