colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #139486 from figsoda/joshuto-update

Browse Source 
joshuto: 0.9.0 -> 0.9.1
This commit is contained in:
figsoda 2021-09-25 19:56:10 -04:00 committed by GitHub
commit 24162e75b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/misc/joshuto/default.nix
View File

@ -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;

11
pkgs/applications/misc/joshuto/fix-cargo-lock.patch Normal file
View File

@ -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",