From ec329b4e876d7a2049e67ba509412b5644f85dc9 Mon Sep 17 00:00:00 2001 From: NullCube Date: Sat, 22 Feb 2025 05:12:51 -0800 Subject: [PATCH 1/2] lemurs: 0.3.2-unstable-2024-07-24 -> 0.4.0 --- pkgs/by-name/le/lemurs/package.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/le/lemurs/package.nix b/pkgs/by-name/le/lemurs/package.nix index 0d5095feaa64..cbb8495a06e5 100644 --- a/pkgs/by-name/le/lemurs/package.nix +++ b/pkgs/by-name/le/lemurs/package.nix @@ -8,19 +8,19 @@ systemdMinimal, testers, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage rec { pname = "lemurs"; - version = "0.3.2-unstable-2024-07-24"; + version = "0.4.0"; src = fetchFromGitHub { owner = "coastalwhite"; repo = "lemurs"; - rev = "1d4be7d0c3f528a0c1e9326ac77f1e8a17161c83"; - hash = "sha256-t/riJpgy0bD5CU8Zkzket4Gks2JXXSLRreMlrxlok0c="; + tag = "v${version}"; + hash = "sha256-dtAmgzsUhn3AfafWbCaaog0S1teIy+8eYtaHBhvLfLI="; }; useFetchCargoVendor = true; - cargoHash = "sha256-Cwgu30rGe1/Mm4FEEH11OTtTHUlBNwl5jVzmJg5qQe8="; + cargoHash = "sha256-XoGtIHYCGXNuwnpDTU7NbZAs6rCO+69CAG89VCv9aAc="; buildInputs = [ bash @@ -30,8 +30,6 @@ rustPlatform.buildRustPackage { passthru.tests.version = testers.testVersion { package = lemurs; - # Package version is now different from the version that lemurs reports itself as. - version = "0.3.2"; }; meta = { From b124d8ceaf00e90467f5f2651fb69a28652446df Mon Sep 17 00:00:00 2001 From: NullCube Date: Sat, 22 Feb 2025 18:09:38 -0800 Subject: [PATCH 2/2] lemurs: use versionCheckHook --- pkgs/by-name/le/lemurs/package.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/le/lemurs/package.nix b/pkgs/by-name/le/lemurs/package.nix index cbb8495a06e5..1f61fc809df0 100644 --- a/pkgs/by-name/le/lemurs/package.nix +++ b/pkgs/by-name/le/lemurs/package.nix @@ -2,11 +2,10 @@ fetchFromGitHub, lib, bash, - lemurs, linux-pam, rustPlatform, systemdMinimal, - testers, + versionCheckHook, }: rustPlatform.buildRustPackage rec { pname = "lemurs"; @@ -28,9 +27,8 @@ rustPlatform.buildRustPackage rec { systemdMinimal ]; - passthru.tests.version = testers.testVersion { - package = lemurs; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; meta = { description = "Customizable TUI display/login manager written in Rust";