From 18de1eba7f12e99aa63f593457295a551834af33 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 20 Oct 2021 18:02:20 +0200 Subject: [PATCH 1/7] =?UTF-8?q?gnome-desktop-testing:=20unstable-2019-12-1?= =?UTF-8?q?1=20=E2=86=92=202021.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-desktop-testing/-/compare/57239dc8ef49ba74d442603a07a3e132b0cfdc6a...v2021.1 --- .../tools/gnome-desktop-testing/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index 5f01881958fe..5531823b8f5b 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv +{ stdenv +, lib , glib , autoreconfHook , pkg-config , systemd , fetchFromGitLab +, nix-update-script }: stdenv.mkDerivation rec { pname = "gnome-desktop-testing"; - version = "unstable-2019-12-11"; + version = "2021.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gnome-desktop-testing"; - rev = "57239dc8ef49ba74d442603a07a3e132b0cfdc6a"; - sha256 = "01c4jhpk23kfcnw3l9kfwjw9v5kgqmfhhqypw4k2d2sdkf4mgfv4"; + rev = "v${version}"; + sha256 = "sha256-PWn4eEZskY0YgMpf6O2dgXNSu8b8T311vFHREv2HE/Q="; }; nativeBuildInputs = [ @@ -30,6 +32,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + updateScript = nix-update-script { + attrPath = "gnome-desktop-testing"; + }; + }; + meta = with lib; { description = "GNOME test runner for installed tests"; homepage = "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests"; From 6ef96ead9a47a0b5ca67a425c90367b85d439c73 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 09:27:30 +0000 Subject: [PATCH 2/7] =?UTF-8?q?gnome.gnome-applets:=203.40.0=20=E2=86=92?= =?UTF-8?q?=203.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/misc/gnome-applets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix index f581017dd565..2cdafcc23b30 100644 --- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-applets/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-applets"; - version = "3.40.0"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1k6mdkg16ia29fyg8ikf4dfs51gnrmg0f8xwpvd3192lhfsbsh19"; + sha256 = "/RaXR7kv7/Rs05/mLyPd+WZ8EAaPRigDOF0TjvxIedQ="; }; nativeBuildInputs = [ From 3d9cb399a65cd0d36a70b9d4187d4a7ad342e8d0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 09:27:53 +0000 Subject: [PATCH 3/7] =?UTF-8?q?gnome.gnome-clocks:=2040.0=20=E2=86=92=2041?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/apps/gnome-clocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix index d9a749a24b09..2e8ec02bd845 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -27,11 +27,11 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "40.0"; + version = "41.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "02d3jg46sn8d9gd4dsaly22gg5vkbz2gpq4pmwpvncb4rsqk7sn2"; + sha256 = "34yLBKuS+mGPXe5RGFce+fyeilt5XqAKNcbcZ3ywLaw="; }; nativeBuildInputs = [ From ae56abbb470bc50cb13e92b5d50664894ad33e9f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 09:29:05 +0000 Subject: [PATCH 4/7] =?UTF-8?q?gnome.gnome-panel:=203.40.0=20=E2=86=92=203?= =?UTF-8?q?.42.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/misc/gnome-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix index 2e33be766b86..aa472230e9cd 100644 --- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-panel"; - version = "3.40.0"; + version = "3.42.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-nxNQde3GZs8rnKkd41xnA+KxdxwQp3B0FPtlbCilmzs="; + hash = "sha256-rqjA78LtuiDpetRpUXnNCiU45kwpBHAsyMWU6OCJhwM="; }; patches = [ From d2ea39144c458b99e7e998b81d9df89b04ba68f3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 09:30:17 +0000 Subject: [PATCH 5/7] =?UTF-8?q?gnome.metacity:=203.40.0=20=E2=86=92=203.42?= =?UTF-8?q?.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome/misc/metacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/misc/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix index 702b7ffb38bb..8dcef7922659 100644 --- a/pkgs/desktops/gnome/misc/metacity/default.nix +++ b/pkgs/desktops/gnome/misc/metacity/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "metacity"; - version = "3.40.0"; + version = "3.42.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1d8mj2nshijshfiaica8dirfws1p6i9631frq7q23b3y91jiyk12"; + sha256 = "2J1nnc/tm17vGPBuLcszp6tUPVOzWPqJzmVZPCMe7rw="; }; patches = [ From 522e29d09e587985db1ad0da8a3e8abb14a0c8ef Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 12:37:57 +0200 Subject: [PATCH 6/7] shotwell.updateScript: fix version policy --- pkgs/applications/graphics/shotwell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 7b74dd745f78..56d41d3dd503 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = pname; - versionPolicy = "none"; + versionPolicy = "odd-unstable"; }; }; From 453edd71bfc0a7f56ad6e8969d80945ad1cc3c23 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 24 Oct 2021 09:35:21 +0000 Subject: [PATCH 7/7] =?UTF-8?q?vte:=200.64.2=20=E2=86=92=200.66.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.64.0...0.66.0 --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 0411086c78c3..6b65f8419645 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.64.2"; + version = "0.66.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-KzyCC2WmZ8HYhZuiBHi+Ym0VGcwxWdrCX3AzMMbQfhg="; + sha256 = "sha256-0IE6wA+x102IhR52X3VdSWyD4JcJc1jqG6rbOLN7ezM="; }; patches = [