leftwm: fix build, add maintainer (#338992)

This commit is contained in:
Artturin 2024-09-03 03:00:53 +03:00 committed by GitHub
commit e826b3bde5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 68 additions and 2 deletions

View File

@ -20,7 +20,16 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-wn5DurPWFwSUtc5naEL4lBSQpKWTJkugpN9mKx+Ed2Y=";
};
cargoHash = "sha256-TylRxdpAVuGtZ3Lm8je6FZ0JUwetBi6mOGRoT2M3Jyk=";
cargoPatches = [
# This pacth can be removed with the next version bump, it just updates the `time` crate
./update-time-crate.patch
];
# To show the "correct" git-hash in `leftwm-check` we manually set the GIT_HASH env variable
# can be remove together with the above patch
GIT_HASH = "36609e0 patched";
cargoHash = "sha256-SNq76pTAPSUGVRp/+fwCjSMP/lKVzh6wU+WZW5n/yjg=";
buildInputs = rpathLibs;
@ -39,7 +48,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/leftwm/leftwm";
license = lib.licenses.mit;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ yanganto ];
maintainers = with lib.maintainers; [ vuimuich yanganto ];
changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG.md";
mainProgram = "leftwm";
};

View File

@ -0,0 +1,57 @@
From 9358bebb11df19f46d0813723959518498d812b2 Mon Sep 17 00:00:00 2001
From: VuiMuich <vuimuich@quantentunnel.de>
Date: Mon, 2 Sep 2024 11:15:27 +0200
Subject: [PATCH] fix rust 1.80.x for nixpkgs
---
Cargo.lock | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index f8a82eecf..5728b55bf 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -777,6 +777,12 @@ dependencies = [
"winapi",
]
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
[[package]]
name = "num-traits"
version = "0.2.17"
@@ -1218,13 +1224,14 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.30"
+version = "0.3.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "ef89ece63debf11bc32d1ed8d078ac870cbeb44da02afb02a9ff135ae7ca0582"
dependencies = [
"deranged",
"itoa",
"libc",
+ "num-conv",
"num_threads",
"powerfmt",
"serde",
@@ -1240,10 +1247,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.15"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
+ "num-conv",
"time-core",
]