From 2dac67a2ae1ac2392496083ba54eb020c33f464e Mon Sep 17 00:00:00 2001 From: Sander Date: Sun, 13 Oct 2024 00:22:38 +0000 Subject: [PATCH] gptcommit: 0.5.16 -> 0.5.17 --- .../tools/gptcommit/0001-update-time.patch | 60 ------------------- pkgs/development/tools/gptcommit/default.nix | 12 +--- 2 files changed, 3 insertions(+), 69 deletions(-) delete mode 100644 pkgs/development/tools/gptcommit/0001-update-time.patch diff --git a/pkgs/development/tools/gptcommit/0001-update-time.patch b/pkgs/development/tools/gptcommit/0001-update-time.patch deleted file mode 100644 index eb6f9692f401..000000000000 --- a/pkgs/development/tools/gptcommit/0001-update-time.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 203afecca3717787628eab30b550ba25389cb188 Mon Sep 17 00:00:00 2001 -From: Sander -Date: Sat, 12 Oct 2024 12:26:51 +0000 -Subject: [PATCH] deps: bump time to fix compilation error - ---- - Cargo.lock | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 9ce33e5..785764d 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1420,6 +1420,12 @@ dependencies = [ - "minimal-lexical", - ] - -+[[package]] -+name = "num-conv" -+version = "0.1.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -+ - [[package]] - name = "num_cpus" - version = "1.16.0" -@@ -2219,13 +2225,14 @@ dependencies = [ - - [[package]] - name = "time" --version = "0.3.31" -+version = "0.3.36" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" -+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" - dependencies = [ - "deranged", - "itoa", - "libc", -+ "num-conv", - "num_threads", - "powerfmt", - "serde", -@@ -2241,10 +2248,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - - [[package]] - name = "time-macros" --version = "0.2.16" -+version = "0.2.18" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" -+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" - dependencies = [ -+ "num-conv", - "time-core", - ] - --- -2.44.1 - diff --git a/pkgs/development/tools/gptcommit/default.nix b/pkgs/development/tools/gptcommit/default.nix index 9aabb2ef5058..1a4036d77189 100644 --- a/pkgs/development/tools/gptcommit/default.nix +++ b/pkgs/development/tools/gptcommit/default.nix @@ -11,7 +11,7 @@ let pname = "gptcommit"; - version = "0.5.16"; + version = "0.5.17"; in rustPlatform.buildRustPackage { inherit pname version; @@ -20,16 +20,10 @@ rustPlatform.buildRustPackage { owner = "zurawiki"; repo = pname; rev = "v${version}"; - hash = "sha256-JhMkK2zw3VL9o7j8DJmjY/im+GyCjfV2TJI3GDo8T8c="; + hash = "sha256-MB78QsJA90Au0bCUXfkcjnvfPagTPZwFhFVqxix+Clw="; }; - cargoPatches = [ - # Bump `time` and friends to fix compilation with rust 1.80. - # See https://github.com/NixOS/nixpkgs/issues/332957 - ./0001-update-time.patch - ]; - - cargoHash = "sha256-0UAttCCbSH91Dn7IvEX+Klp/bSYZM4rml7/dD3a208A="; + cargoHash = "sha256-F4nabUeQZMnmSNC8KlHjx3IcyR2Xn36kovabmJ6g1zo="; nativeBuildInputs = [ pkg-config ];