diff options
| author | maxine <35892750+amaxine@users.noreply.github.com> | 2023-12-10 11:55:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-10 11:55:31 +0100 |
| commit | 039f53da232d7bb8ef3ee1b6ce5c97f97a48102e (patch) | |
| tree | 35204ee1f322a1a137781ec128e7551ec98c3d8a /pkgs/applications | |
| parent | 137f80e8fc29fae7e8e6f9769b8dd2f96dc65351 (diff) | |
| parent | 640248f313fc06fad9fe77a77206c75a25a57e17 (diff) | |
| download | nixlib-039f53da232d7bb8ef3ee1b6ce5c97f97a48102e.tar nixlib-039f53da232d7bb8ef3ee1b6ce5c97f97a48102e.tar.gz nixlib-039f53da232d7bb8ef3ee1b6ce5c97f97a48102e.tar.bz2 nixlib-039f53da232d7bb8ef3ee1b6ce5c97f97a48102e.tar.lz nixlib-039f53da232d7bb8ef3ee1b6ce5c97f97a48102e.tar.xz nixlib-039f53da232d7bb8ef3ee1b6ce5c97f97a48102e.tar.zst nixlib-039f53da232d7bb8ef3ee1b6ce5c97f97a48102e.zip | |
Merge pull request #273127 from jtojnar/gnome-updates
GNOME updates 2023-12-09
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/graphics/shotwell/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/graphics/snapshot/default.nix | 20 |
2 files changed, 11 insertions, 21 deletions
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 6f624747d688..d93423e07521 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -38,13 +38,13 @@ # for dependencies see https://wiki.gnome.org/Apps/Shotwell/BuildingAndInstalling -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.3"; + version = "0.32.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-4AD+5bPzYseRFPDs/44is0yaKGW1nkGi2j5NxdLKLDw="; + url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; + sha256 = "sha256-3iqUUIRtHOwUxqEDA3X9SeGvJNySCtZIA0QST5zLhW8="; }; nativeBuildInputs = [ @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "shotwell"; versionPolicy = "odd-unstable"; }; }; @@ -103,4 +103,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; []; platforms = platforms.linux; }; -} +}) diff --git a/pkgs/applications/graphics/snapshot/default.nix b/pkgs/applications/graphics/snapshot/default.nix index a47016e379da..4b0c5f5f2cc2 100644 --- a/pkgs/applications/graphics/snapshot/default.nix +++ b/pkgs/applications/graphics/snapshot/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , cargo , desktop-file-utils , meson @@ -17,24 +16,15 @@ , gnome }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "45.0"; + version = "45.1"; src = fetchurl { - url = "mirror://gnome/sources/snapshot/${lib.versions.major version}/snapshot-${version}.tar.xz"; - hash = "sha256-7keO4JBzGgsIJLZrsXRr2ADcv+h6yDWEmUSa85z822c="; + url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; + hash = "sha256-/kRifa7zrZbBaaLlRhDmZxj4k9cN/SXUDTBskYQ7zjk="; }; - patches = [ - # Fix portal requests - # https://gitlab.gnome.org/GNOME/snapshot/-/merge_requests/168 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/snapshot/-/commit/6aec0f56d6bb994731c1309ac6e2cb822b82067e.patch"; - hash = "sha256-6tnOhhTQ3Rfl3nCw/rliLKkvZknvZKCQyeMKaTxYmok="; - }) - ]; - nativeBuildInputs = [ cargo desktop-file-utils @@ -75,4 +65,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "snapshot"; }; -} +}) |