lemurs: 0.3.2 -> 0.3.2-unstable-2024-07-24

This commit is contained in:
NullCube
2025-02-21 13:22:59 -08:00
parent 3f97c1b253
commit fac67837b0
2 changed files with 12 additions and 33 deletions
@@ -1,22 +0,0 @@
tree 18207ad257a4c0a9ffc4fd250360a91d0b5240cb
parent 37963b8ff6945ae8bdbabee658e5e36d0f67b84a
author Noa Aarts <noa@voorwaarts.nl> Tue Nov 5 13:49:49 2024 +0100
committer Noa Aarts <noa@voorwaarts.nl> 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<usize> {
self.start..self.start + Self::START_SYMBOL.len() + self.ident.len()
+12 -11
View File
@@ -1,36 +1,37 @@
{
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; {