diff options
| author | WORLDofPEACE <worldofpeace@protonmail.ch> | 2020-10-23 20:02:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-23 20:02:38 -0400 |
| commit | 949f7f92277d4f779f4b42941795e4ee65bbfab5 (patch) | |
| tree | 3194a53fb55b9bfce9c12a4bddfe5f773b950ccf /pkgs/applications/graphics | |
| parent | 8317c630af3912e24747d78eb4496c391d8be73c (diff) | |
| parent | 8ccd765d3775f80566bf19e48a21f527f0aa7e29 (diff) | |
| download | nixpkgs-949f7f92277d4f779f4b42941795e4ee65bbfab5.tar nixpkgs-949f7f92277d4f779f4b42941795e4ee65bbfab5.tar.gz nixpkgs-949f7f92277d4f779f4b42941795e4ee65bbfab5.tar.bz2 nixpkgs-949f7f92277d4f779f4b42941795e4ee65bbfab5.tar.lz nixpkgs-949f7f92277d4f779f4b42941795e4ee65bbfab5.tar.xz nixpkgs-949f7f92277d4f779f4b42941795e4ee65bbfab5.tar.zst nixpkgs-949f7f92277d4f779f4b42941795e4ee65bbfab5.zip | |
Merge pull request #98316 from NixOS/gnome-3.38
GNOME 3.38
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/gnome-photos/default.nix | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 337b8f4cba6..0d4b06c8c6d 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , at-spi2-core , babl , dbus @@ -35,17 +36,32 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "3.34.2"; + version = "3.38.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06ml5sf8xhpan410msqz085hmfc7082d368pb82yq646y9pcfn9w"; + sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6"; }; patches = [ ./installed-tests-path.patch + + # Port to Tracker 3 + # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/135 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/f39a85bb1a82093f4ba615494ff7e95609674fc2.patch"; + sha256 = "M5r5WuB1JpUBVN3KxNvpMiPWj0pIpT+ImQMOiGtUgT4="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/3d847ff80d429cadf0bc59aa50caa37bf27c0201.patch"; + sha256 = "zGjSL1qpWVJ/5Ifgh2CbhFSBR/WDAra8F+YUOemyxyU="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/2eb923726147b05c936dee64b205d833525db1df.patch"; + sha256 = "vCA6NXHzmNf2GoLqzWwIyziC6puJgJ0QTLeKWsAEFAE="; + }) ]; nativeBuildInputs = [ |