From 3e677a51c907e6638d3cac65df38f56f89ac89ae Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 31 Oct 2024 12:30:23 +0000 Subject: [PATCH 01/10] =?UTF-8?q?libspelling:=200.4.2=20=E2=86=92=200.4.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libspelling/-/compare/0.4.2...0.4.4 Fixes #349477. --- pkgs/development/libraries/libspelling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libspelling/default.nix b/pkgs/development/libraries/libspelling/default.nix index a621975c0926..8aec418da377 100644 --- a/pkgs/development/libraries/libspelling/default.nix +++ b/pkgs/development/libraries/libspelling/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "libspelling"; - version = "0.4.2"; + version = "0.4.4"; outputs = [ "out" "dev" "devdoc" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libspelling"; rev = version; - hash = "sha256-7CvctZaky+Ci/dOA0nH96X3R8KqBRljpsC+1idcLZGM="; + hash = "sha256-6ggegeDR4UBP2LKn6lj0pOB1Iz7MwLEf9usIB28SEMA="; }; nativeBuildInputs = [ From a7236443d576e3de3aba87fc3009d421bdc8204f Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 31 Oct 2024 12:28:53 +0000 Subject: [PATCH 02/10] =?UTF-8?q?gnome-text-editor:=2047.0=20=E2=86=92=204?= =?UTF-8?q?7.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-text-editor/-/compare/47.0...47.1 --- pkgs/by-name/gn/gnome-text-editor/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix index 8512d27f3537..2baf665c08b1 100644 --- a/pkgs/by-name/gn/gnome-text-editor/package.nix +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-text-editor"; - version = "47.0"; + version = "47.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz"; - hash = "sha256-AwSWGXS9rMfm6NFG2tyUlSffmbKCNYLI0bqLM9JdQhc="; + hash = "sha256-3pVkLitA/yZf7s2GuTng/QGOTrK6SZNQ8rrSv8xUAQw="; }; nativeBuildInputs = [ From 91a00d6a6452b4257453cf39f482cf6b2181cdf3 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 31 Oct 2024 21:21:07 +0800 Subject: [PATCH 03/10] =?UTF-8?q?d-spy:=201.10.0=20=E2=86=92=2047.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/d-spy/-/compare/1.10.0...47.0 --- pkgs/development/tools/misc/d-spy/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/d-spy/default.nix b/pkgs/development/tools/misc/d-spy/default.nix index c2812c2e1209..7ed2a9890f96 100644 --- a/pkgs/development/tools/misc/d-spy/default.nix +++ b/pkgs/development/tools/misc/d-spy/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "d-spy"; - version = "1.10.0"; + version = "47.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/d-spy/${lib.versions.majorMinor version}/d-spy-${version}.tar.xz"; - hash = "sha256-VVgSucZUBVHaWZ7oFHiArTkVuTyH4XV7bRz9kKDgXlM="; + url = "mirror://gnome/sources/d-spy/${lib.versions.major version}/d-spy-${version}.tar.xz"; + hash = "sha256-7/sw1DKtXkPmxEm9+OMX2il+VuAnQW5z4ulsTPGPaeg="; }; nativeBuildInputs = [ @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "d-spy"; - versionPolicy = "odd-unstable"; }; }; From 67fc4abb7e8090f2a5a1b9635e06c21751bf9bb1 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 31 Oct 2024 12:27:48 +0000 Subject: [PATCH 04/10] =?UTF-8?q?gnome-sudoku:=2047.0=20=E2=86=92=2047.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-sudoku/-/compare/47.0...47.1.1 --- pkgs/by-name/gn/gnome-sudoku/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index bf33b00d976d..62aba7d70d4c 100644 --- a/pkgs/by-name/gn/gnome-sudoku/package.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "47.0"; + version = "47.1.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz"; - hash = "sha256-sTu+wgi/LgD+O3Ux+oTyZQqSItXLTD4L4JfTsi81clw="; + hash = "sha256-RyW0KDZGaysqzF5RZrU9jrEczd4lh9tofK+MjUc+uIk="; }; nativeBuildInputs = [ From 534a10253460398bcec01e539fc84ed38eccfb18 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 31 Oct 2024 21:09:15 +0800 Subject: [PATCH 05/10] totem: Require libx11 1.8 I assume the version requirement is the only reason we revert these patches. --- pkgs/by-name/to/totem/package.nix | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix index 8baa3f884c80..e2f3434a6c15 100644 --- a/pkgs/by-name/to/totem/package.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , meson , ninja , gettext @@ -39,25 +38,6 @@ stdenv.mkDerivation rec { hash = "sha256-s202VZKLWJZGKk05+Dtq1m0328nJnc6wLqii43OUpB4="; }; - patches = [ - # Lower X11 dependency version since we do not have it. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/totem/-/commit/140d9eea70c3101ef3234abb4de5974cb84b13db.patch"; - hash = "sha256-ohppxqMiH8Ksc9B2e3AXighfM6KVN+RNXYL+fLELSN8="; - revert = true; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/totem/-/commit/2610b4536f73493587e4a5a38e01c9961fcabb96.patch"; - hash = "sha256-nPfzS+LQuAlyQOz67hCdtx93w2frhgWlg1KGX5bEU38="; - revert = true; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/totem/-/commit/5b871aee5292f25bbf39dca18045732e979e7a68.patch"; - hash = "sha256-LqQLdgyZkIVc+/hQ5sdBLqhtjCVIMDSs9tjVXwMFodg="; - revert = true; - }) - ]; - nativeBuildInputs = [ meson ninja From 575b6910204344def09c4cb6f735e99c8d36dedb Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 31 Oct 2024 22:42:08 +0800 Subject: [PATCH 06/10] totem: Enable tests The comment no longer applies. --- pkgs/by-name/to/totem/package.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix index e2f3434a6c15..6f09fde18c4d 100644 --- a/pkgs/by-name/to/totem/package.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -83,9 +83,7 @@ stdenv.mkDerivation rec { "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" ]; - # Tests do not work with GStreamer 1.18. - # https://gitlab.gnome.org/GNOME/totem/-/issues/450 - doCheck = false; + doCheck = true; postPatch = '' chmod +x meson_compile_python.py # patchShebangs requires executable file @@ -97,7 +95,7 @@ stdenv.mkDerivation rec { runHook preCheck xvfb-run -s '-screen 0 800x600x24' \ - ninja test + meson test --print-errorlogs runHook postCheck ''; From 434067defbe25b98b6131786973f058374d0ed98 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 31 Oct 2024 12:28:28 +0000 Subject: [PATCH 07/10] =?UTF-8?q?totem:=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/totem/-/compare/43.0...43.1 --- pkgs/by-name/to/totem/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix index 6f09fde18c4d..db3e8892fe56 100644 --- a/pkgs/by-name/to/totem/package.nix +++ b/pkgs/by-name/to/totem/package.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { pname = "totem"; - version = "43.0"; + version = "43.1"; src = fetchurl { url = "mirror://gnome/sources/totem/${lib.versions.major version}/totem-${version}.tar.xz"; - hash = "sha256-s202VZKLWJZGKk05+Dtq1m0328nJnc6wLqii43OUpB4="; + hash = "sha256-VmgpHpxkRJhcs//k6k8CEvVMK75g3QERTBqVD5R1nm0="; }; nativeBuildInputs = [ From ad8f55bc452ba3e284c1d87a81b92e5aae4dc267 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 31 Oct 2024 12:30:29 +0000 Subject: [PATCH 08/10] =?UTF-8?q?loupe:=2047.0=20=E2=86=92=2047.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/loupe/-/compare/47.0...47.1 --- pkgs/by-name/lo/loupe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix index 8bfa8b90b00a..7e2c146ae4d0 100644 --- a/pkgs/by-name/lo/loupe/package.nix +++ b/pkgs/by-name/lo/loupe/package.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "loupe"; - version = "47.0"; + version = "47.1"; src = fetchurl { url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz"; - hash = "sha256-WJOLpnOy92m197ibmFSj1V2/NUH+1eYOCOFGWVEV95E="; + hash = "sha256-9gNWmpThcwHy2sNLAsEsbY48pq65vmq1uYM5P5Ve2Ho="; }; patches = [ From bfedd4a02133644ce198b6ba1f0a8732f2194678 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 31 Oct 2024 12:30:46 +0000 Subject: [PATCH 09/10] =?UTF-8?q?shotwell:=200.32.9=20=E2=86=92=200.32.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/shotwell/-/compare/shotwell-0.32.9...shotwell-0.32.10 --- pkgs/applications/graphics/shotwell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index eb6c6839bc5b..8305afb563ab 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -38,11 +38,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "shotwell"; - version = "0.32.9"; + version = "0.32.10"; src = fetchurl { url = "mirror://gnome/sources/shotwell/${lib.versions.majorMinor finalAttrs.version}/shotwell-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-EjKjPcnBftI6oA2P8lUA5xC73JiZ1VtEFbaLdCnlYOs="; + sha256 = "sha256-JuRaYbVDGwlv/NF28RW9B76ad6aDNYmVQhBuGeB/QA4="; }; nativeBuildInputs = [ From 3fd360cd72b747a040c98b6e8b3da384c41b3381 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Thu, 31 Oct 2024 22:50:32 +0800 Subject: [PATCH 10/10] tinysparql: Mark as broken on darwin This is broken for one NixOS release cycle and I don't think we have darwin users using it. https://hydra.nixos.org/job/nixpkgs/staging-next/tinysparql.aarch64-darwin https://hydra.nixos.org/job/nixpkgs/staging-next/tinysparql.x86_64-darwin https://hydra.nixos.org/job/nixpkgs/trunk/tracker.aarch64-darwin https://hydra.nixos.org/job/nixpkgs/trunk/tracker.x86_64-darwin --- pkgs/by-name/ti/tinysparql/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix index 82aa22d44bc7..f4d5283c91d4 100644 --- a/pkgs/by-name/ti/tinysparql/package.nix +++ b/pkgs/by-name/ti/tinysparql/package.nix @@ -185,5 +185,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; platforms = platforms.unix; pkgConfigModules = [ "tracker-sparql-3.0" "tinysparql-3.0" ]; + # Not before is properly conditioned. + broken = stdenv.hostPlatform.isDarwin; }; })