From 5fdb0a6cafff7c41107fdd80e306b47a1bc54718 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 25 Sep 2021 18:46:36 -0400 Subject: [PATCH] joshuto: 0.9.0 -> 0.9.1 --- pkgs/applications/misc/joshuto/default.nix | 16 ++++++---------- .../misc/joshuto/fix-cargo-lock.patch | 11 +++++++++++ 2 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 pkgs/applications/misc/joshuto/fix-cargo-lock.patch diff --git a/pkgs/applications/misc/joshuto/default.nix b/pkgs/applications/misc/joshuto/default.nix index 89e5aea943a5..5497d37ef0e1 100644 --- a/pkgs/applications/misc/joshuto/default.nix +++ b/pkgs/applications/misc/joshuto/default.nix @@ -2,23 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "joshuto"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "kamiyaa"; repo = pname; rev = version; - sha256 = "08d6h7xwcgycw5bdzwwc6aaikcrw3yc7inkiydgml9q261kql7zl"; - # upstream includes an outdated Cargo.lock that stops cargo from compiling - postFetch = '' - mkdir -p $out - tar xf $downloadedFile --strip=1 -C $out - substituteInPlace $out/Cargo.lock \ - --replace 0.8.6 ${version} - ''; + sha256 = "sha256-+qKOvFoEF/gZL4ijL8lIRWE9ZWJM2eBlk29Lk46jAfQ="; }; - cargoSha256 = "1scrqm7fs8y7anfiigimj7y5rjxcc2qvrxiq8ai7k5cwfc4v1ghm"; + # upstream includes an outdated Cargo.lock that stops cargo from compiling + cargoPatches = [ ./fix-cargo-lock.patch ]; + + cargoSha256 = "sha256-JlekxU9pMkHNsIcH3+7b2I6MYUlxRqNX+0wwyVrQMAE="; buildInputs = lib.optional stdenv.isDarwin SystemConfiguration; diff --git a/pkgs/applications/misc/joshuto/fix-cargo-lock.patch b/pkgs/applications/misc/joshuto/fix-cargo-lock.patch new file mode 100644 index 000000000000..023c824add10 --- /dev/null +++ b/pkgs/applications/misc/joshuto/fix-cargo-lock.patch @@ -0,0 +1,11 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -512,7 +512,7 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + + [[package]] + name = "joshuto" +-version = "0.9.0" ++version = "0.9.1" + dependencies = [ + "alphanumeric-sort", + "chrono",