From 6cdee1c592b503da141374a9f6e5b70c14d1c569 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 26 Oct 2022 19:18:17 +0000 Subject: [PATCH 1/8] =?UTF-8?q?gnome.aisleriot:=203.22.25=20=E2=86=92=203.?= =?UTF-8?q?22.26?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/aisleriot/-/compare/3.22.25...3.22.26 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/games/aisleriot/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index 8092a212d7d0..5983b89f37f4 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -1,7 +1,7 @@ { stdenv , lib , fetchFromGitLab -, nix-update-script +, gitUpdater , pkg-config , itstool , gtk3 @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.25"; + version = "3.22.26"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; - repo = pname; + repo = "aisleriot"; rev = version; - sha256 = "sha256-ur29fKSYRGzQBv14L5efN+UuAdTE8e8ooop6DGvO+Rg="; + sha256 = "sha256-enUDJ6KM3QDsPb3ckKOxpRzMe4I0bj4TQR94oZWJJJY="; }; nativeBuildInputs = [ @@ -60,8 +60,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = nix-update-script { - attrPath = "gnome.${pname}"; + updateScript = gitUpdater { }; }; From 0fc3454f0eb1e25b846e4ba3fdd0ae1fc5406e8e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 26 Oct 2022 20:06:32 +0000 Subject: [PATCH 2/8] =?UTF-8?q?vte:=200.70.0=20=E2=86=92=200.70.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/vte/-/compare/0.70.0...0.70.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/vte/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 8fa3c0862248..07ec683bf05a 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.70.0"; + version = "0.70.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-k+DdShvCp6GmLaZBYKJ0zORWl26hVn2YWR2pbi0mWuY="; + sha256 = "sha256-H0YBy/6lMCuWkCIIyPGF5bGLJZtTWLyTzzkr9ZhxxbY="; }; patches = [ @@ -48,11 +48,6 @@ stdenv.mkDerivation rec { url = "https://git.alpinelinux.org/aports/plain/community/vte3/fix-W_EXITCODE.patch?id=4d35c076ce77bfac7655f60c4c3e4c86933ab7dd"; sha256 = "FkVyhsM0mRUzZmS2Gh172oqwcfXv6PyD6IEgjBhy2uU="; }) - # error: implicit declaration of function 'cfmakeraw' is invalid in C99 [-Werror,-Wimplicit-function-declaration] - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/vte/-/commit/1f1f177ff797ac2bb453168951135865cfded900.patch"; - sha256 = "sha256-VRVhq8JAshtcFejJkNUpMilo7tLgcojlEnCTrAtGVa0="; - }) ]; nativeBuildInputs = [ From c79fd5b8e6b0dc7743e8b0cf423aefde5499c759 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 26 Oct 2022 20:25:44 +0000 Subject: [PATCH 3/8] =?UTF-8?q?gnome.gnome-boxes:=2043.0=20=E2=86=92=2043.?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-boxes/-/compare/43.0...43.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 08679b94e2fb..dfc7cb3a1cab 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "V0UFCWQUyCC4COzQ9x4tGakzI1HhKj3YJvdi5DK/ayY="; + sha256 = "NB5qXO1RrVAPwd00ZZ1YhsP3YEViS1POZBv/Y8WwimE="; }; patches = [ From c83a5c611e758145ea15a8cc4721d690a0671749 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 26 Oct 2022 20:27:23 +0000 Subject: [PATCH 4/8] =?UTF-8?q?tracker-miners:=203.4.0=20=E2=86=92=203.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/tracker-miners/-/compare/3.4.0...3.4.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/tracker-miners/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index fa0e30f1abc4..55793719dd81 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "ouA2XjCBG7YelcghSzP0eCo6BODGJGoG7NnAFBfNhOY="; + sha256 = "L84OyF+3YXyLKIfCJ5d0DV3shOwDbbdNbCCLurXFjCQ="; }; nativeBuildInputs = [ From fd288a72b1680002b48d22f8d7daa35907ff36e9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 26 Oct 2022 22:54:34 +0200 Subject: [PATCH 5/8] =?UTF-8?q?gucharmap:=2015.0.0=20=E2=86=92=2015.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gucharmap/-/compare/15.0.0...15.0.1 Also switch to `gitUpdater` since `nix-update` depends on `NIX_PATH` and chooses an incorrect version when a maintanance release for an older branch is tagged after the latest release. Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/gucharmap/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix index df546c6590de..a98d9f2ceea7 100644 --- a/pkgs/desktops/gnome/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -25,7 +25,7 @@ , runCommand , symlinkJoin , gobject-introspection -, nix-update-script +, gitUpdater }: let @@ -45,16 +45,16 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "15.0.0"; + version = "15.0.1"; outputs = [ "out" "lib" "dev" "devdoc" ]; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; - repo = pname; + repo = "gucharmap"; rev = version; - sha256 = "sha256-ymEtiOKdmQ1XWrGk40csX5O5BiwxH3aCPboVekcUukQ="; + sha256 = "sha256-uVXWgnNpPcky9N3FXkDu5oaqaEALECooFnf43Ed+zTY="; }; nativeBuildInputs = [ @@ -94,8 +94,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { - attrPath = "gnome.gucharmap"; + updateScript = gitUpdater { }; }; From 4e8b341ade3675e3049ae38d084fe18be76d56e8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 26 Oct 2022 23:01:07 +0200 Subject: [PATCH 6/8] =?UTF-8?q?webkitgtk:=202.38.0=20=E2=86=92=202.38.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://webkitgtk.org/2022/10/20/webkitgtk2.38.1-released.html https://github.com/WebKit/WebKit/compare/webkitgtk-2.38.0...webkitgtk-2.38.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 9a03680e3224..59d258e9d98d 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "webkitgtk"; - version = "2.38.0"; + version = "2.38.1"; name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "5.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}"; outputs = [ "out" "dev" "devdoc" ]; @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-+c5jdaO24TKbC2CfRpIeJifcetYiSze5Z6supkO8D70="; + sha256 = "AuGVs/ueBXdDszZO5/HuwT9xYUImhJVEwHwypzuPGEg="; }; patches = lib.optionals stdenv.isLinux [ From 0aec4cb4d1d5201334283f1be3bd156395545bb8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Oct 2022 08:19:47 +0000 Subject: [PATCH 7/8] =?UTF-8?q?evince:=2043.0=20=E2=86=92=2043.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/evince/-/compare/43.0...43.1 Changelog-Reviewed-By: Jan Tojnar --- pkgs/desktops/gnome/core/evince/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index 7138b9947632..30f8ed9fac97 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -42,13 +42,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "43.0"; + version = "43.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "Zr4N5LR7ETBIYQOYjMFSwErqlZULo+8W3CDC72toHUc="; + sha256 = "bXXKYrc7+7YA9xigmBA9xrgT+QULlZS+kp4ptFidIzU="; }; nativeBuildInputs = [ From 29da163d0e303e7f74e089c88273d3f7e319f696 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 27 Oct 2022 10:35:46 +0200 Subject: [PATCH 8/8] =?UTF-8?q?gnome-browser-connector:=2042.0=20=E2=86=92?= =?UTF-8?q?=2042.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-browser-connector/-/compare/v42.0...v42.1 --- .../gnome-browser-connector/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix index 57052ddf3c56..835fa31dd29b 100644 --- a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix +++ b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix @@ -1,6 +1,6 @@ { stdenv , lib -, fetchFromGitLab +, fetchurl , meson , ninja , python3 @@ -14,16 +14,13 @@ let in buildPythonApplication rec { pname = "gnome-browser-connector"; - version = "42.0"; + version = "42.1"; format = "other"; - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "nE0sIghT"; - repo = "gnome-browser-connector"; - rev = "v${version}"; - sha256 = "pYbV/qCmSrM2nrrKxbxHnJYMDOiW0aeNbFlsm5kKWdk="; + src = fetchurl { + url = "mirror://gnome/sources/gnome-browser-connector/${lib.versions.major version}/gnome-browser-connector-${version}.tar.xz"; + sha256 = "vZcCzhwWNgbKMrjBPR87pugrJHz4eqxgYQtBHfFVYhI="; }; nativeBuildInputs = [ @@ -53,6 +50,12 @@ buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru = { + updateScript = gnome.updateScript { + packageName = "gnome-browser-connector"; + }; + }; + meta = with lib; { description = "Native host connector for the GNOME Shell browser extension"; homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegration";