uiua{,-unstable}: use lib.fix to reference self, rename unstable flag…

… to uiua_versionType (#365712)
NixOS · Dec 18, 2024 · 493a01f · 493a01f
2 parents 0ec3e98 + 7af555c
commit 493a01f
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 47 deletions.
diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix
@@ -1,4 +1,6 @@
 {
+  uiua_versionType ? "stable",
+
   lib,
   stdenv,
   rustPlatform,
@@ -10,61 +12,67 @@
   alsa-lib,
   webcamSupport ? false,
 
-  # passthru.tests.run
   runCommand,
-  uiua,
-
-  unstable ? false,
 }:
 
 let
-  versionInfo = import (if unstable then ./unstable.nix else ./stable.nix);
+  versionInfo =
+    {
+      "stable" = import ./stable.nix;
+      "unstable" = import ./unstable.nix;
+    }
+    .${uiua_versionType};
 in
-rustPlatform.buildRustPackage rec {
-  pname = "uiua";
-  inherit (versionInfo) version cargoHash;
 
-  src = fetchFromGitHub {
-    owner = "uiua-lang";
-    repo = "uiua";
-    inherit (versionInfo) rev hash;
-  };
+# buildRustPackage doesn't support finalAttrs, so we can't use finalPackage for the tests
+lib.fix (
+  uiua:
+  rustPlatform.buildRustPackage rec {
+    pname = "uiua";
+    inherit (versionInfo) version cargoHash;
 
-  nativeBuildInputs =
-    lib.optionals (webcamSupport || stdenv.hostPlatform.isDarwin) [ rustPlatform.bindgenHook ]
-    ++ lib.optionals audioSupport [ pkg-config ];
+    src = fetchFromGitHub {
+      owner = "uiua-lang";
+      repo = "uiua";
+      inherit (versionInfo) rev hash;
+    };
 
-  buildInputs =
-    [ libffi ] # we force dynamic linking our own libffi below
-    ++ lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ];
+    nativeBuildInputs =
+      lib.optionals (webcamSupport || stdenv.hostPlatform.isDarwin) [ rustPlatform.bindgenHook ]
+      ++ lib.optionals audioSupport [ pkg-config ];
 
-  buildFeatures =
-    [ "libffi/system" ] # force libffi to be linked dynamically instead of rebuilding it
-    ++ lib.optional audioSupport "audio"
-    ++ lib.optional webcamSupport "webcam";
+    buildInputs =
+      [ libffi ] # we force dynamic linking our own libffi below
+      ++ lib.optionals (audioSupport && stdenv.hostPlatform.isLinux) [ alsa-lib ];
 
-  passthru.updateScript = versionInfo.updateScript;
-  passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } ''
-    uiua init
-    diff -U3 --color=auto <(uiua run main.ua) <(echo '"Hello, World!"')
-    touch $out
-  '';
+    buildFeatures =
+      [ "libffi/system" ] # force libffi to be linked dynamically instead of rebuilding it
+      ++ lib.optional audioSupport "audio"
+      ++ lib.optional webcamSupport "webcam";
 
-  meta = {
-    changelog = "https://github.com/uiua-lang/uiua/blob/${src.rev}/changelog.md";
-    description = "Stack-oriented array programming language with a focus on simplicity, beauty, and tacit code";
-    longDescription = ''
-      Uiua combines the stack-oriented and array-oriented paradigms in a single
-      language. Combining these already terse paradigms results in code with a very
-      high information density and little syntactic noise.
+    passthru.updateScript = versionInfo.updateScript;
+    passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } ''
+      uiua init
+      diff -U3 --color=auto <(uiua run main.ua) <(echo '"Hello, World!"')
+      touch $out
     '';
-    homepage = "https://www.uiua.org/";
-    license = lib.licenses.mit;
-    mainProgram = "uiua";
-    maintainers = with lib.maintainers; [
-      cafkafk
-      tomasajt
-      defelo
-    ];
-  };
-}
+
+    meta = {
+      changelog = "https://github.com/uiua-lang/uiua/blob/${src.rev}/changelog.md";
+      description = "Stack-oriented array programming language with a focus on simplicity, beauty, and tacit code";
+      longDescription = ''
+        Uiua combines the stack-oriented and array-oriented paradigms in a single
+        language. Combining these already terse paradigms results in code with a very
+        high information density and little syntactic noise.
+      '';
+      homepage = "https://www.uiua.org/";
+      license = lib.licenses.mit;
+      mainProgram = "uiua";
+      maintainers = with lib.maintainers; [
+        cafkafk
+        tomasajt
+        defelo
+      ];
+    };
+  }
+)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -7090,7 +7090,7 @@ with pkgs;
   babashka-unwrapped = callPackage ../development/interpreters/babashka { };
   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