diff options
| author | aleksana <me@aleksana.moe> | 2023-08-07 00:52:01 +0800 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-08-06 21:19:12 +0200 |
| commit | 32e050583d29e0b9650cf8a117a2fe65f43ba110 (patch) | |
| tree | 3e98a72cb155843490a05deb6dd7d18d1deb5cca /pkgs/applications/misc/health | |
| parent | 85eb9355b5f1fcb79bfc159e02f9987b7c178aca (diff) | |
health: 0.94.0 -> 0.95.0
Diffstat (limited to 'pkgs/applications/misc/health')
| -rw-r--r-- | pkgs/applications/misc/health/default.nix | 21 | ||||
| -rw-r--r-- | pkgs/applications/misc/health/update_gtk4_cargo_deps.patch | 28 |
2 files changed, 3 insertions, 46 deletions
diff --git a/pkgs/applications/misc/health/default.nix b/pkgs/applications/misc/health/default.nix index 84683c1a4d393..951bea87e8a12 100644 --- a/pkgs/applications/misc/health/default.nix +++ b/pkgs/applications/misc/health/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkg-config @@ -18,36 +17,22 @@ stdenv.mkDerivation rec { pname = "health"; - version = "0.94.0"; + version = "0.95.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - hash = "sha256-KS0sdCQg2LqQB0K1cUbAjA8VITn5rAb8XCWjOKYbPqM="; + hash = "sha256-PrNPprSS98yN8b8yw2G6hzTSaoE65VbsM3q7FVB4mds="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - patches = [ ./update_gtk4_cargo_deps.patch ]; name = "${pname}-${version}"; - hash = "sha256-j0I0vKoGaf2pce2C/xkz+nJYCfLvHB5F6Q9XpJtABMI="; + hash = "sha256-8fa3fa+sFi5H+49B5sr2vYPkp9C9s6CcE0zv4xB8gww="; }; - patches = [ - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/max_size_tightending_thresh_0.94.0.patch?h=health&id=d35d89760964b00ad457eca07855143a1dcbabdf"; - hash = "sha256-ndoxyrm+SVGVxfUbc5sQItQwzK75ZtKMSGUOB9mzBmo="; - }) - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/max_value_0.94.0.patch?h=health&id=d35d89760964b00ad457eca07855143a1dcbabdf"; - hash = "sha256-YKVQNtz+RWN6Ydw+kbStCVf0vu0eTrMKGd6kEijFG00="; - }) - # patch both or it will complain Cargo.lock mismatch - ./update_gtk4_cargo_deps.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/applications/misc/health/update_gtk4_cargo_deps.patch b/pkgs/applications/misc/health/update_gtk4_cargo_deps.patch deleted file mode 100644 index 9c22a8465b727..0000000000000 --- a/pkgs/applications/misc/health/update_gtk4_cargo_deps.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 0331121..8d290e4 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -829,9 +829,9 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a" - - [[package]] - name = "gtk4" --version = "0.4.8" -+version = "0.4.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c64f0c2a3d80e899dc3febddad5bac193ffcf74a0fd7e31037f30dd34d6f7396" -+checksum = "4e8ae5aef2793bc3551b5e5e3fa062a5de54bb1eccf10dfa4effe9e4384fbbbc" - dependencies = [ - "bitflags", - "cairo-rs", -@@ -852,9 +852,9 @@ dependencies = [ - - [[package]] - name = "gtk4-macros" --version = "0.4.8" -+version = "0.4.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fafbcc920af4eb677d7d164853e7040b9de5a22379c596f570190c675d45f7a7" -+checksum = "6aba0b544e91a753068e279e99d34e9624b8cfd26282167024c8a5773b8a826c" - dependencies = [ - "anyhow", - "proc-macro-crate", |