Merge pull request #133160 from vyp/update-tiny

tiny: 0.8.0 -> 0.9.0
This commit is contained in:
Sandro 2021-08-08 20:24:43 +02:00 committed by GitHub
commit be699e47d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 10 deletions

View File

@ -1,7 +1,6 @@
{ stdenv
, lib
, rustPlatform
, fetchpatch
, fetchFromGitHub
, pkg-config
, dbus
@ -11,23 +10,20 @@
rustPlatform.buildRustPackage rec {
pname = "tiny";
version = "0.8.0";
version = "0.9.0";
src = fetchFromGitHub {
owner = "osa1";
repo = pname;
rev = "v${version}";
sha256 = "07a50shv6k4fwl2gmv4j0maxaqqkjpwwmqkxkqs0gvx38lc5f7m7";
sha256 = "gKyHR3FZHDybaP38rqB8/gvr8T+mDO4QQxoTtWS+TlE=";
};
cargoSha256 = "0npkcprcqy2pn7k64jzwg41vk9id6yzw211xw203h80cc5444igr";
cargoSha256 = "0ChfW8vaqC2kCp4lpS0HOvhuihPw9G5TOmgwKzVDfws=";
# Fix Cargo.lock version. Remove with the next release.
cargoPatches = [
# Fix Cargo.lock version. Remove with the next release.
(fetchpatch {
url = "https://github.com/osa1/tiny/commit/b1caf48a6399dad8875de1d965d1ad445e49585d.patch";
sha256 = "1zkjhx94nwmd69cfwwwzg51ipcwq01wyvgsmn0vq7iaa2h0d286i";
})
./fix-Cargo.lock.patch
];
nativeBuildInputs = lib.optional stdenv.isLinux pkg-config;
@ -38,6 +34,6 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/osa1/tiny";
changelog = "https://github.com/osa1/tiny/blob/v${version}/CHANGELOG.md";
license = licenses.mit;
maintainers = with maintainers; [ Br1ght0ne ];
maintainers = with maintainers; [ Br1ght0ne vyp ];
};
}

View File

@ -0,0 +1,13 @@
diff --git a/Cargo.lock b/Cargo.lock
index 3a184dc..0e58cb1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1023,7 +1023,7 @@ dependencies = [
[[package]]
name = "tiny"
-version = "0.8.0"
+version = "0.9.0"
dependencies = [
"clap",
"dirs 3.0.1",