From 404ecd73d9db1918e98410a9027aa827bbc412df Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 6 Oct 2021 23:23:10 -0300 Subject: [PATCH] cbqn: update version string Also, remove clangStdenv as dependency. --- pkgs/development/interpreters/bqn/cbqn/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 11 ++--------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index 78d7732ac00b..3a153977cd9b 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c9fb71ab805..d8e0075acc4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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"; };