colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #140805 from AndersonTorres/update-version-strings

Browse Source
This commit is contained in:
Anderson Torres 2021-10-07 06:11:53 -03:00 committed by GitHub
commit b5b042b580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/interpreters/bqn/cbqn/default.nix
View File

@ -12,19 +12,20 @@ let
owner = "dzaima";
repo = "CBQN";
rev = "4d23479cdbd5ac6eb512c376ade58077b814b2b7";
sha256 = "1il6pxbllf4rs0wf2s6q6h72m3p1d6ymgsllpkmadnw1agif0fri";
hash = "sha256-MTvg4lOB26bqvJTqV71p4Y4qDjTYaOE40Jk4Sle/hsY=";
};
in
assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
stdenv.mkDerivation rec {
pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
version = "0.0.0+unstable=2021-10-05";
version = "0.pre+unstable=2021-10-05";
src = fetchFromGitHub {
owner = "dzaima";
repo = "CBQN";
rev = "e23dab20daff9c0dacc2561c616174af72029a3e";
sha256 = "17h8fb9a0hjindbxgkljajl1hjr8rdqrb85s5lz903v17wl4lrba";
hash = "sha256-amVKKD9hD5A+LbqglXHLKEsYqFSSztdXs1FCoNJyCJ4=";
};
dontConfigure = true;
@ -62,8 +63,7 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica ];
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

2
pkgs/development/interpreters/bqn/dzaima-bqn/default.nix
View File

@ -8,7 +8,7 @@
stdenv.mkDerivation rec {
pname = "dbqn" + lib.optionalString buildNativeImage "-native";
version = "0.0.0+unstable=2021-10-05";
version = "0.pre+unstable=2021-10-05";
src = fetchFromGitHub {
owner = "dzaima";

8
pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix
View File

@ -7,13 +7,13 @@
stdenvNoCC.mkDerivation rec {
pname = "bqn";
version = "0.0.0+unstable=2021-10-01";
version = "0.pre+unstable=2021-10-06";
src = fetchFromGitHub {
owner = "mlochbaum";
repo = "BQN";
rev = "b3d68f730d48ccb5e3b3255f9010c95bf9f86e22";
hash = "sha256-Tkgwz7+d25svmjRsXFUQq0S/73QJU+BKSNeGqpUcBTQ=";
rev = "2ce2dc40702431ef3d3ffece9e2f6f8b883ac6c5";
hash = "sha256-bvXKOaBlddG6O0GbmtqU9prklqmOOvlbXuCUaFO+j0M=";
};
nativeBuildInputs = [ makeWrapper ];
@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
buildInputs = [ nodejs ];
patches = [
# Creates a @libbqn@ substitution variable
# Creates a @libbqn@ substitution variable, to be filled in the fixupPhase
./001-libbqn-path.patch
];

11
pkgs/top-level/all-packages.nix
View File

@ -12896,29 +12896,22 @@ with pkgs;
# Below, the classic self-bootstrapping process
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;
phase0 = callPackage ../development/interpreters/bqn/cbqn {
inherit (cbqn-bootstrap) stdenv;
genBytecode = false;
bqn-path = null;
mbqn-source = null;
};
phase1 = callPackage ../development/interpreters/bqn/cbqn {
inherit (cbqn-bootstrap) stdenv mbqn-source;
inherit (cbqn-bootstrap) mbqn-source;
genBytecode = true;
bqn-path = "${buildPackages.cbqn-bootstrap.phase0}/bin/cbqn";
};
phase2 = callPackage ../development/interpreters/bqn/cbqn {
inherit (cbqn-bootstrap) stdenv mbqn-source;
inherit (cbqn-bootstrap) mbqn-source;
genBytecode = true;
bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn";
};