git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #140805 from AndersonTorres/update-version-strings
commitb5b042b5806b726196384b3188d6a7be5ae08aa9 authorAnderson Torres <torres.anderson.85@protonmail.com> dateThu 7 Oct 2021, 06:11 (5 years ago) parent5164d4c404ecd7
4 files changed+12−19
compare with master
unifiedsplit
pkgs/development/interpreters/bqn/cbqn/default.nix+5−5 pkgs/development/interpreters/bqn/dzaima-bqn/default.nix+1−1 pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix+4−4 pkgs/top-level/all-packages.nix+2−9
pkgs/development/interpreters/bqn/cbqn/default.nix+5−5
@@ -12,19 +12,20 @@ let
1212 owner = "dzaima";
1313 repo = "CBQN";
1414 rev = "4d23479cdbd5ac6eb512c376ade58077b814b2b7";
15− sha256 = "1il6pxbllf4rs0wf2s6q6h72m3p1d6ymgsllpkmadnw1agif0fri";
15+ hash = "sha256-MTvg4lOB26bqvJTqV71p4Y4qDjTYaOE40Jk4Sle/hsY=";
1616 };
1717in
1818assert genBytecode -> ((bqn-path != null) && (mbqn-source != null));
19+
1920stdenv.mkDerivation rec {
2021 pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone";
21− version = "0.0.0+unstable=2021-10-05";
22+ version = "0.pre+unstable=2021-10-05";
2223
2324 src = fetchFromGitHub {
2425 owner = "dzaima";
2526 repo = "CBQN";
2627 rev = "e23dab20daff9c0dacc2561c616174af72029a3e";
27− sha256 = "17h8fb9a0hjindbxgkljajl1hjr8rdqrb85s5lz903v17wl4lrba";
28+ hash = "sha256-amVKKD9hD5A+LbqglXHLKEsYqFSSztdXs1FCoNJyCJ4=";
2829 };
2930
3031 dontConfigure = true;
@@ -62,8 +63,7 @@ stdenv.mkDerivation rec {
6263 license = licenses.gpl3Plus;
6364 maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica ];
6465 platforms = platforms.all;
65− priority = if genBytecode then 0 else 10;
6666 };
6767}
68−# TODO: factor and version cbqn-bytecode-files
68+# TODO: version cbqn-bytecode-files
6969# TODO: test suite
pkgs/development/interpreters/bqn/dzaima-bqn/default.nix+1−1
@@ -8,7 +8,7 @@
88
99stdenv.mkDerivation rec {
1010 pname = "dbqn" + lib.optionalString buildNativeImage "-native";
11− version = "0.0.0+unstable=2021-10-05";
11+ version = "0.pre+unstable=2021-10-05";
1212
1313 src = fetchFromGitHub {
1414 owner = "dzaima";
pkgs/development/interpreters/bqn/mlochbaum-bqn/default.nix+4−4
@@ -7,13 +7,13 @@
77
88stdenvNoCC.mkDerivation rec {
99 pname = "bqn";
10− version = "0.0.0+unstable=2021-10-01";
10+ version = "0.pre+unstable=2021-10-06";
1111
1212 src = fetchFromGitHub {
1313 owner = "mlochbaum";
1414 repo = "BQN";
15− rev = "b3d68f730d48ccb5e3b3255f9010c95bf9f86e22";
16− hash = "sha256-Tkgwz7+d25svmjRsXFUQq0S/73QJU+BKSNeGqpUcBTQ=";
15+ rev = "2ce2dc40702431ef3d3ffece9e2f6f8b883ac6c5";
16+ hash = "sha256-bvXKOaBlddG6O0GbmtqU9prklqmOOvlbXuCUaFO+j0M=";
1717 };
1818
1919 nativeBuildInputs = [ makeWrapper ];
@@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec {
2121 buildInputs = [ nodejs ];
2222
2323 patches = [
24− # Creates a @libbqn@ substitution variable
24+ # Creates a @libbqn@ substitution variable, to be filled in the fixupPhase
2525 ./001-libbqn-path.patch
2626 ];
2727
pkgs/top-level/all-packages.nix+2−9
@@ -12896,29 +12896,22 @@ with pkgs;
1289612896
1289712897 # Below, the classic self-bootstrapping process
1289812898 cbqn-bootstrap = lib.dontRecurseIntoAttrs {
12899− # use clang here since it emits less speculative warnings;
12900− # however, avoid its building in cross compilations
12901− stdenv =
12902− if stdenv.hostPlatform == stdenv.buildPlatform
12903− then clangStdenv
12904− else stdenv;
1290512899 mbqn-source = buildPackages.mbqn.src;
1290612900
1290712901 phase0 = callPackage ../development/interpreters/bqn/cbqn {
12908− inherit (cbqn-bootstrap) stdenv;
1290912902 genBytecode = false;
1291012903 bqn-path = null;
1291112904 mbqn-source = null;
1291212905 };
1291312906
1291412907 phase1 = callPackage ../development/interpreters/bqn/cbqn {
12915− inherit (cbqn-bootstrap) stdenv mbqn-source;
12908+ inherit (cbqn-bootstrap) mbqn-source;
1291612909 genBytecode = true;
1291712910 bqn-path = "${buildPackages.cbqn-bootstrap.phase0}/bin/cbqn";
1291812911 };
1291912912
1292012913 phase2 = callPackage ../development/interpreters/bqn/cbqn {
12921− inherit (cbqn-bootstrap) stdenv mbqn-source;
12914+ inherit (cbqn-bootstrap) mbqn-source;
1292212915 genBytecode = true;
1292312916 bqn-path = "${buildPackages.cbqn-bootstrap.phase1}/bin/cbqn";
1292412917 };