Skip to content

Commit 0d95bdb

Browse files
committed
uiua{,-unstable}: refactor
- use `tag` instead of `rev` in `fetchFromGitHub` - add `versionCheckHook`
1 parent 327c230 commit 0d95bdb

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

pkgs/by-name/ui/uiua/package.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
rustPlatform,
77
fetchFromGitHub,
88
pkg-config,
9+
versionCheckHook,
910

1011
libffi,
1112
audioSupport ? true,
@@ -34,7 +35,7 @@ lib.fix (
3435
src = fetchFromGitHub {
3536
owner = "uiua-lang";
3637
repo = "uiua";
37-
inherit (versionInfo) rev hash;
38+
inherit (versionInfo) tag hash;
3839
};
3940

4041
nativeBuildInputs =
@@ -50,6 +51,10 @@ lib.fix (
5051
++ lib.optional audioSupport "audio"
5152
++ lib.optional webcamSupport "webcam";
5253

54+
nativeInstallCheckInputs = [ versionCheckHook ];
55+
versionCheckProgramArg = "--version";
56+
doInstallCheck = true;
57+
5358
passthru.updateScript = versionInfo.updateScript;
5459
passthru.tests.run = runCommand "uiua-test-run" { nativeBuildInputs = [ uiua ]; } ''
5560
uiua init

pkgs/by-name/ui/uiua/stable.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
rec {
22
version = "0.14.1";
3-
rev = version;
3+
tag = version;
44
hash = "sha256-+FiJYxB2Lb1B7l9QEuB/XzdEYgJZmYAQpKimRIhWwhc=";
55
cargoHash = "sha256-0ZK87aX3akEPEXIsFrbOvTfhW24TZCuCcSVp+j8ylyg=";
66
updateScript = ./update-stable.sh;

pkgs/by-name/ui/uiua/unstable.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
rec {
22
version = "0.14.1";
3-
rev = version;
3+
tag = version;
44
hash = "sha256-+FiJYxB2Lb1B7l9QEuB/XzdEYgJZmYAQpKimRIhWwhc=";
55
cargoHash = "sha256-0ZK87aX3akEPEXIsFrbOvTfhW24TZCuCcSVp+j8ylyg=";
66
updateScript = ./update-unstable.sh;

0 commit comments

Comments
 (0)