uiua{,-unstable}: use lib.fix to reference self, rename unstable flag to uiua_versionType (#365712)

This commit is contained in:
Christina Sørensen
2024-12-18 05:47:57 +01:00
committed by GitHub
2 changed files with 55 additions and 47 deletions
+13 -5
View File
@@ -1,4 +1,6 @@
{ {
uiua_versionType ? "stable",
lib, lib,
stdenv, stdenv,
rustPlatform, rustPlatform,
@@ -10,16 +12,21 @@
alsa-lib, alsa-lib,
webcamSupport ? false, webcamSupport ? false,
# passthru.tests.run
runCommand, runCommand,
uiua,
unstable ? false,
}: }:
let let
versionInfo = import (if unstable then ./unstable.nix else ./stable.nix); versionInfo =
{
"stable" = import ./stable.nix;
"unstable" = import ./unstable.nix;
}
.${uiua_versionType};
in in
# buildRustPackage doesn't support finalAttrs, so we can't use finalPackage for the tests
lib.fix (
uiua:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "uiua"; pname = "uiua";
inherit (versionInfo) version cargoHash; inherit (versionInfo) version cargoHash;
@@ -68,3 +75,4 @@ rustPlatform.buildRustPackage rec {
]; ];
}; };
} }
)
+1 -1
View File
@@ -7090,7 +7090,7 @@ with pkgs;
babashka-unwrapped = callPackage ../development/interpreters/babashka { }; babashka-unwrapped = callPackage ../development/interpreters/babashka { };
babashka = callPackage ../development/interpreters/babashka/wrapped.nix { }; babashka = callPackage ../development/interpreters/babashka/wrapped.nix { };
uiua-unstable = callPackage ../by-name/ui/uiua/package.nix { unstable = true; }; uiua-unstable = callPackage ../by-name/ui/uiua/package.nix { uiua_versionType = "unstable"; };
# BQN interpreters and compilers # BQN interpreters and compilers