summary refs log tree commit diff
path: root/pkgs/applications/graphics/rnote/default.nix
diff options
context:
space:
mode:
authorRobert Schütz <nix@dotlambda.de>2023-04-23 11:40:47 -0700
committerRobert Schütz <github@dotlambda.de>2023-04-23 18:29:33 -0700
commit4616038ad3bcbf7b1cea8b42e7c13b7143782b7c (patch)
tree2fbfad6edc1f03877a667d026b9ded90e9684f3d /pkgs/applications/graphics/rnote/default.nix
parent0defb4dd16fe35ac3d1636cd5e25659c14207435 (diff)
downloadnixpkgs-4616038ad3bcbf7b1cea8b42e7c13b7143782b7c.tar
nixpkgs-4616038ad3bcbf7b1cea8b42e7c13b7143782b7c.tar.gz
nixpkgs-4616038ad3bcbf7b1cea8b42e7c13b7143782b7c.tar.bz2
nixpkgs-4616038ad3bcbf7b1cea8b42e7c13b7143782b7c.tar.lz
nixpkgs-4616038ad3bcbf7b1cea8b42e7c13b7143782b7c.tar.xz
nixpkgs-4616038ad3bcbf7b1cea8b42e7c13b7143782b7c.tar.zst
nixpkgs-4616038ad3bcbf7b1cea8b42e7c13b7143782b7c.zip
rnote: 0.5.18 -> 0.6.0
Diff: https://github.com/flxzt/rnote/compare/v0.5.18...v0.6.0

Changelog: https://github.com/flxzt/rnote/releases/tag/v0.6.0
Diffstat (limited to 'pkgs/applications/graphics/rnote/default.nix')
-rw-r--r--pkgs/applications/graphics/rnote/default.nix20
1 files changed, 5 insertions, 15 deletions
diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix
index 1e4a5b78337..01d9c653d31 100644
--- a/pkgs/applications/graphics/rnote/default.nix
+++ b/pkgs/applications/graphics/rnote/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , alsa-lib
 , appstream-glib
 , cmake
@@ -24,32 +23,24 @@
 
 stdenv.mkDerivation rec {
   pname = "rnote";
-  version = "0.5.18";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "flxzt";
     repo = "rnote";
     rev = "v${version}";
-    hash = "sha256-N07Y9kmGvMFS0Kq4i2CltJvNTuqbXausZZGjAQRDmNU=";
+    hash = "sha256-47mWlUXp62fMh5c13enFjmuMxzrmEZlwJFsZhYCB1Vs=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "ink-stroke-modeler-rs-0.1.0" = "sha256-+R3T/9Ty+F6YxxtA0Un6UhFyKbGOvqBKwHt4WSHWhsk=";
-      "librsvg-2.55.92" = "sha256-WVwxjjWR/TloSmyzH8Jo1mTjLHVifBw1Xn965wuoEDs=";
-      "piet-0.6.2" = "sha256-76yeX0yQMC0hh6u2xT/kS/2fjs+GO+nCks2fnOImf0c=";
+      "ink-stroke-modeler-rs-0.1.0" = "sha256-DrbFolHGL3ywk2p6Ly3x0vbjqxy1mXld+5CPrNlJfQM=";
+      "librsvg-2.56.0" = "sha256-4poP7xsoylmnKaUWuJ0tnlgEMpw9iJrM3dvt4IaFi7w=";
+      "piet-0.6.2" = "sha256-If0qiZkgXeLvsrECItV9/HmhTk1H52xmVO7cUsD9dcU=";
     };
   };
 
-  patches = [
-    # https://github.com/flxzt/rnote/pull/569
-    (fetchpatch {
-      url = "https://github.com/flxzt/rnote/commit/8585b446c08b246f3d55359026415cb3d242d44e.patch";
-      hash = "sha256-ePpTQ/3mzZTNjU9P4vTu9CM0vX8+r8b6njuj7hDgFCg=";
-    })
-  ];
-
   nativeBuildInputs = [
     appstream-glib # For appstream-util
     cmake
@@ -85,7 +76,6 @@ stdenv.mkDerivation rec {
     pushd build-aux
     chmod +x cargo_build.py meson_post_install.py
     patchShebangs cargo_build.py meson_post_install.py
-    substituteInPlace meson_post_install.py --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
     popd
   '';