diff --git a/pkgs/by-name/le/lemurs/0001-fix-static-lifetime-string.patch b/pkgs/by-name/le/lemurs/0001-fix-static-lifetime-string.patch deleted file mode 100644 index fd2e06e2080f..000000000000 --- a/pkgs/by-name/le/lemurs/0001-fix-static-lifetime-string.patch +++ /dev/null @@ -1,22 +0,0 @@ -tree 18207ad257a4c0a9ffc4fd250360a91d0b5240cb -parent 37963b8ff6945ae8bdbabee658e5e36d0f67b84a -author Noa Aarts Tue Nov 5 13:49:49 2024 +0100 -committer Noa Aarts Tue Nov 5 13:49:49 2024 +0100 - -fix static lifetime for string - -This fixes a compiler error without changing functionality - -diff --git a/src/config.rs b/src/config.rs -index f4bca31..a4fc6bf 100644 ---- a/src/config.rs -+++ b/src/config.rs -@@ -645,7 +645,7 @@ struct Variable<'a> { - } - - impl<'a> Variable<'a> { -- const START_SYMBOL: &str = "$"; -+ const START_SYMBOL: &'static str = "$"; - - fn span(&self) -> std::ops::Range { - self.start..self.start + Self::START_SYMBOL.len() + self.ident.len() diff --git a/pkgs/by-name/le/lemurs/package.nix b/pkgs/by-name/le/lemurs/package.nix index f4a8fc3bf30d..0d5095feaa64 100644 --- a/pkgs/by-name/le/lemurs/package.nix +++ b/pkgs/by-name/le/lemurs/package.nix @@ -1,46 +1,50 @@ { fetchFromGitHub, lib, + bash, + lemurs, linux-pam, rustPlatform, + systemdMinimal, testers, - lemurs, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "lemurs"; - version = "0.3.2"; + version = "0.3.2-unstable-2024-07-24"; src = fetchFromGitHub { owner = "coastalwhite"; repo = "lemurs"; - rev = "v${version}"; - hash = "sha256-YDopY+wdWlVL2X+/wc1tLSSqFclAkt++JXMK3VodD4s="; + rev = "1d4be7d0c3f528a0c1e9326ac77f1e8a17161c83"; + hash = "sha256-t/riJpgy0bD5CU8Zkzket4Gks2JXXSLRreMlrxlok0c="; }; - patches = [ - # part of https://github.com/coastalwhite/lemurs/commit/09003a830400250ec7745939399fc942c505e6c6, but including the rest of the commit may be breaking - ./0001-fix-static-lifetime-string.patch - ]; - useFetchCargoVendor = true; - cargoHash = "sha256-FybaQ9xd5Unvo8gpSC8DzVKrXyVquHcJarzu0GaG8fw="; + cargoHash = "sha256-Cwgu30rGe1/Mm4FEEH11OTtTHUlBNwl5jVzmJg5qQe8="; buildInputs = [ + bash linux-pam + systemdMinimal ]; 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 = with lib; { + meta = { description = "Customizable TUI display/login manager written in Rust"; homepage = "https://github.com/coastalwhite/lemurs"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; - maintainers = with maintainers; [ jeremiahs ]; + maintainers = with lib.maintainers; [ + jeremiahs + nullcube + ]; mainProgram = "lemurs"; }; }