summary refs log tree commit diff
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-04-23 01:12:27 +0000
committerBobby Rong <rjl931189261@126.com>2023-04-23 09:34:41 +0800
commit2ddb47d131d5aafbc30e4a0190ea569db9b661e6 (patch)
tree395b695564b34ab1038c835e74ef4beba5ff5813
parenta45bbf6c9b079d454781576a7e066a07586fcb61 (diff)
downloadnixpkgs-2ddb47d131d5aafbc30e4a0190ea569db9b661e6.tar
nixpkgs-2ddb47d131d5aafbc30e4a0190ea569db9b661e6.tar.gz
nixpkgs-2ddb47d131d5aafbc30e4a0190ea569db9b661e6.tar.bz2
nixpkgs-2ddb47d131d5aafbc30e4a0190ea569db9b661e6.tar.lz
nixpkgs-2ddb47d131d5aafbc30e4a0190ea569db9b661e6.tar.xz
nixpkgs-2ddb47d131d5aafbc30e4a0190ea569db9b661e6.tar.zst
nixpkgs-2ddb47d131d5aafbc30e4a0190ea569db9b661e6.zip
shotwell: 0.31.7 → 0.32.0
https://gitlab.gnome.org/GNOME/shotwell/-/compare/shotwell-0.31.7...shotwell-0.32.0
-rw-r--r--pkgs/applications/graphics/shotwell/default.nix14
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 623a8d783f7..c326b9725b8 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchurl
-, fetchpatch2
 , meson
 , ninja
 , gtk3
@@ -42,22 +41,13 @@
 
 stdenv.mkDerivation rec {
   pname = "shotwell";
-  version = "0.31.7";
+  version = "0.32.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-gPCj2HVS+L3vpeNig77XZ9AFdtqMyWpEo9NKQjXEmeA=";
+    sha256 = "sha256-F3Ky+h56VHnVKAKLyaMD8oVeHZWaWzyReSLmOpipCxk=";
   };
 
-  patches = [
-    # Fix build with vala 0.56.4, can be removed on next update
-    # https://gitlab.gnome.org/GNOME/shotwell/-/merge_requests/69
-    (fetchpatch2 {
-      url = "https://gitlab.gnome.org/GNOME/shotwell/-/commit/cd82759231e5ece2fa0dea40397c9051d15fd5c2.patch";
-      hash = "sha256-Vy2kvUlmPdEEuPB1RTcI5pGYNveeiQ+lId0YVlWo4wU=";
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja