From 58dbfa26eb9af4e3055524edceb4761f7134253f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 9 May 2024 13:51:30 +0000 Subject: [PATCH 1/8] =?UTF-8?q?gnome.aisleriot:=203.22.30=20=E2=86=92=203.?= =?UTF-8?q?22.32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/aisleriot/-/compare/3.22.30...3.22.32 Does not seem to need appstream-glib. --- pkgs/desktops/gnome/games/aisleriot/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index e0c8ec7fb3ff..dfba82308d1a 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -13,27 +13,25 @@ , guile , libcanberra-gtk3 , ninja -, appstream-glib , yelp-tools }: stdenv.mkDerivation rec { pname = "aisleriot"; - version = "3.22.30"; + version = "3.22.32"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "aisleriot"; rev = version; - sha256 = "sha256-Fj5v2h6xDqf+PPxduxGr3vTy+eZ3aIv0u/ThrheYLGQ="; + sha256 = "sha256-+U/EsKTZjWa05DbILWAxqIpMcZ0DP0l4LIYxM2wCFdM="; }; nativeBuildInputs = [ wrapGAppsHook3 meson ninja - appstream-glib pkg-config itstool libxml2 From e78405ac05e922fe3cfda67e87bd74ec62b27b91 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 May 2024 13:54:56 +0000 Subject: [PATCH 2/8] =?UTF-8?q?gnome.file-roller:=2044.1=20=E2=86=92=2044.?= =?UTF-8?q?2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/file-roller/-/compare/44.1...44.2 --- pkgs/desktops/gnome/apps/file-roller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index d32b9bddec8e..27c189af64cb 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "file-roller"; - version = "44.1"; + version = "44.2"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz"; - hash = "sha256-JQz1Uc/LEqZwyorflT4GgfHJt27gnZRYsgIDxiYCxIc="; + hash = "sha256-LFcXzn8F+6sTyEe2zjGxsCSIYfp6uPD/Hx4dRdHizfk="; }; nativeBuildInputs = [ From bd285d966a225983edf71300e16bf65ec3384736 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 May 2024 14:00:27 +0000 Subject: [PATCH 3/8] =?UTF-8?q?gnome.gnome-calculator:=2046.0=20=E2=86=92?= =?UTF-8?q?=2046.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-calculator/-/compare/46.0...46.1 --- pkgs/desktops/gnome/core/gnome-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix index 059ca6522e83..3b666976681e 100644 --- a/pkgs/desktops/gnome/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "46.0"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-RGlP2mtiM5I/XBCkjQLSz1ck4BGoqFeJB0yVMQHzO/E="; + hash = "sha256-LTZ1CnOJAIYSLPPwyD5oUXiRWFYVFlMG+hWWqRhmgkc="; }; nativeBuildInputs = [ From 6799e1ea8315949e48bae1339824a9462e8a1dfd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 May 2024 14:05:36 +0000 Subject: [PATCH 4/8] =?UTF-8?q?gnome.gnome-sudoku:=2046.0=20=E2=86=92=2046?= =?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-sudoku/-/compare/46.0...46.1 --- pkgs/desktops/gnome/games/gnome-sudoku/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index a9f0001ae2d7..4c84e0053b27 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "46.0"; + version = "46.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-d8TnjYhvOxRFav7w+5aPLqAa01cDzEhSP41yR4P/pq8="; + hash = "sha256-ObtDHxCjH1Vq9im2aFyG1Qyknymhuv6GIZwgwVUQcKY="; }; nativeBuildInputs = [ From 8bdde3c836127570c75ecfe01ddc3592137bf24b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 May 2024 14:10:15 +0000 Subject: [PATCH 5/8] =?UTF-8?q?gnome-text-editor:=2046.1=20=E2=86=92=2046.?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/46.1...46.3 --- pkgs/desktops/gnome/apps/gnome-text-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix index 14f4d15a4ce6..deb3e011c1cd 100644 --- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation rec { pname = "gnome-text-editor"; - version = "46.1"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-jr+gvqEudfXv6sxyG+O4rmUCewJKqB257KuMMSJXous="; + hash = "sha256-AFtIEEqQm+Zq4HRI0rxXBsfRE3gQV6JP9tpVvfMkxz0="; }; nativeBuildInputs = [ From 93dab39f5df48de253b239b4e19551ba2c3384e0 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 May 2024 14:13:29 +0000 Subject: [PATCH 6/8] =?UTF-8?q?snapshot:=2046.2=20=E2=86=92=2046.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/snapshot/-/compare/46.2...46.3 --- pkgs/applications/graphics/snapshot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/snapshot/default.nix b/pkgs/applications/graphics/snapshot/default.nix index e449daac6dcc..d05bfe3e349b 100644 --- a/pkgs/applications/graphics/snapshot/default.nix +++ b/pkgs/applications/graphics/snapshot/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "snapshot"; - version = "46.2"; + version = "46.3"; src = fetchurl { url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz"; - hash = "sha256-Ef55oSuzQFHionnajB9FRYfQEaFPwkI35FTGT0S6z00="; + hash = "sha256-RZV6BBX0VNY1MUkaoEeVzuDO1O3d1dj6DQAPXvBzW2c="; }; nativeBuildInputs = [ From 5ceece11fb642597f84010dfd593404296895896 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 May 2024 22:20:29 +0800 Subject: [PATCH 7/8] gnome.gnome-shell: Fix screencast proxy bus name As said in the upstream MR this is needed for the GLib CVE-2024-34397 fix. --- pkgs/desktops/gnome/core/gnome-shell/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix index 9fdffcfd8c92..7b94533f7b60 100644 --- a/pkgs/desktops/gnome/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -102,6 +102,13 @@ stdenv.mkDerivation (finalAttrs: { url = "https://src.fedoraproject.org/rpms/gnome-shell/raw/dcd112d9708954187e7490564c2229d82ba5326f/f/0001-gdm-Work-around-failing-fingerprint-auth.patch"; hash = "sha256-mgXty5HhiwUO1UV3/eDgWtauQKM0cRFQ0U7uocST25s="; }) + + # screencast: Correct expected bus name for streams + # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3303 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/50a011a19dcc6997ea6173c07bb80b2d9888d363.patch"; + hash = "sha256-ccEpdWgDxwnj7ouzFekpoln5Y2PtgRikWetwK+0U9Fg="; + }) ]; nativeBuildInputs = [ From 023afbdb27810b7a9fef61507c6ea0c9a10a235f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 May 2024 22:35:55 +0800 Subject: [PATCH 8/8] gtksourceview5: Mark as broken on x86_64-darwin ref: https://hydra.nixos.org/job/nixpkgs/trunk/gtksourceview5.x86_64-darwin ref: https://hydra.nixos.org/job/nixpkgs/trunk/gtksourceview5.aarch64-darwin --- pkgs/development/libraries/gtksourceview/5.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 93f5bb519495..4b5f52c22b77 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -115,5 +115,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.unix; license = licenses.lgpl21Plus; maintainers = teams.gnome.members; + # https://hydra.nixos.org/build/258191535/nixlog/1 + broken = stdenv.isDarwin && stdenv.isx86_64; }; })