From 98cb07dc5e6ddc8ff1897593495c1a0d875aa7e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 13 Jan 2024 05:28:14 +0000
Subject: [PATCH 001/149] openfst: 1.8.2 -> 1.8.3

---
 pkgs/development/libraries/openfst/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix
index cf4984229129..318a4107a813 100644
--- a/pkgs/development/libraries/openfst/default.nix
+++ b/pkgs/development/libraries/openfst/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "openfst";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchurl {
     url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz";
-    sha256 = "sha256-3ph782JHIcXVujIa+VdRiY5PS7Qcijbi1k8GJ2Vti0I=";
+    hash = "sha256-B3cUFZ1c8+OKgLbGZW08zCyLi2xQu0G7ZcX+wQeWv1M=";
   };
 
   configureFlags = [

From 83851c6b244444d7ce4fc855ccbe5d2300095ba1 Mon Sep 17 00:00:00 2001
From: caryoscelus <caryoscelus@gmx.com>
Date: Sun, 28 Jul 2024 17:29:08 +0000
Subject: [PATCH 002/149] cataclysm-dda-git: remove incompatible patches, bump
 git.

---
 pkgs/games/cataclysm-dda/git.nix              | 21 ++++---------------
 .../games/cataclysm-dda/locale-path-git.patch | 17 +++++++++++++++
 2 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/games/cataclysm-dda/locale-path-git.patch

diff --git a/pkgs/games/cataclysm-dda/git.nix b/pkgs/games/cataclysm-dda/git.nix
index e577d1aa710f..495d5f97fb09 100644
--- a/pkgs/games/cataclysm-dda/git.nix
+++ b/pkgs/games/cataclysm-dda/git.nix
@@ -2,9 +2,9 @@
 , tiles ? true, Cocoa
 , debug ? false
 , useXdgDir ? false
-, version ? "2022-08-20"
-, rev ? "f65b2bc4c6dea24bd9a993b8df146e5698e7e36f"
-, sha256 ? "sha256-00Tp9OmsM39PYwAJXKKRS9zmn7KsGQ9s1eVmEqghkpw="
+, version ? "2024-07-28"
+, rev ? "bfeb1fffc4179fed242a042f24b1c97f6cfaff3d"
+, sha256 ? "sha256-IodXEA+pWfDdR9huRXieP3+J3WZJO19C8PUPT18dFBw="
 }:
 
 let
@@ -24,20 +24,7 @@ let
 
     patches = [
       # Unconditionally look for translation files in $out/share/locale
-      ./locale-path.patch
-      # Fixes for failing build with GCC 13, remove on updating next release after 0.G
-      (fetchpatch {
-        url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-dangling-reference-warning.patch";
-        hash = "sha256-9nPbyz49IYBOVHqr7jzCIyS8z/SQgpK4EjEz1fruIPE=";
-      })
-      (fetchpatch {
-        url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-cstdint.patch";
-        hash = "sha256-8IBW2OzAHVgEJZoViQ490n37sl31hA55ePuqDL/lil0=";
-      })
-      (fetchpatch {
-        url = "https://sources.debian.org/data/main/c/cataclysm-dda/0.G-4/debian/patches/gcc13-keyword-requires.patch";
-        hash = "sha256-8yvHh0YKC7AC/qzia7AZAfMewMC0RiSepMXpOkMXRd8=";
-      })
+      ./locale-path-git.patch
     ];
 
     makeFlags = common.makeFlags ++ [
diff --git a/pkgs/games/cataclysm-dda/locale-path-git.patch b/pkgs/games/cataclysm-dda/locale-path-git.patch
new file mode 100644
index 000000000000..8f18b0ffb71e
--- /dev/null
+++ b/pkgs/games/cataclysm-dda/locale-path-git.patch
@@ -0,0 +1,17 @@
+diff --git a/src/translations.cpp b/src/translations.cpp
+--- a/src/translations.cpp
++++ b/src/translations.cpp
+@@ -52,13 +52,11 @@ std::string locale_dir()
+ #define CATA_IS_ON_BSD
+ #endif
+
+-#if !defined(__ANDROID__) && ((defined(__linux__) || defined(CATA_IS_ON_BSD) || (defined(MACOSX) && !defined(TILES))))
+     if( !PATH_INFO::base_path().empty() ) {
+         loc_dir = PATH_INFO::base_path() + "share/locale";
+     } else {
+         loc_dir = PATH_INFO::langdir();
+     }
+-#endif
+ #endif // LOCALIZE
+     return loc_dir;
+ }

From f1eb2f7892ff2d4254560563e1428562ce30b39a Mon Sep 17 00:00:00 2001
From: DCsunset <DCsunset@protonmail.com>
Date: Mon, 18 Mar 2024 18:20:15 -0400
Subject: [PATCH 003/149] tproxy: init at 0.8.1

---
 pkgs/by-name/tp/tproxy/package.nix | 36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/tp/tproxy/package.nix

diff --git a/pkgs/by-name/tp/tproxy/package.nix b/pkgs/by-name/tp/tproxy/package.nix
new file mode 100644
index 000000000000..47330b682508
--- /dev/null
+++ b/pkgs/by-name/tp/tproxy/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildGoModule rec {
+  pname = "tproxy";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner = "kevwan";
+    repo = "tproxy";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-LX3ciC3cMYuQPm6ekEkJPrSdTXH+WZ4flXyrsvJZgn8=";
+  };
+
+  vendorHash = "sha256-7s2gnd9UR/R7H5pcA8NcoenaabSVpMh3qzzkOr5RWnU=";
+
+  ldflags = [
+    "-w"
+    "-s"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "CLI tool to proxy and analyze TCP connections";
+    homepage = "https://github.com/kevwan/tproxy";
+    changelog = "https://github.com/kevwan/tproxy/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ DCsunset ];
+    mainProgram = "tproxy";
+  };
+}

From 1bca03dfe35b3a9a2b9442ba7c04d521abc9d055 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 20 Jul 2024 23:18:51 +0200
Subject: [PATCH 004/149] python312Packages.mdformat-gfm-alerts: init at 1.0.1

---
 .../mdformat-gfm-alerts/default.nix           | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/mdformat-gfm-alerts/default.nix

diff --git a/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix b/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix
new file mode 100644
index 000000000000..097e2b912cf8
--- /dev/null
+++ b/pkgs/development/python-modules/mdformat-gfm-alerts/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  flit-core,
+  mdformat,
+  mdit-py-plugins,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "mdformat-gfm-alerts";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "KyleKing";
+    repo = "mdformat-gfm-alerts";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-2EYdNCyS1LxcEnCXkOugAAGx5XLWV4cWTNkXjR8RVQo=";
+  };
+
+  build-system = [ flit-core ];
+
+  dependencies = [
+    mdformat
+    mdit-py-plugins
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "mdformat_gfm_alerts" ];
+
+  meta = {
+    description = "Format 'GitHub Markdown Alerts', which use blockquotes to render admonitions";
+    homepage = "https://github.com/KyleKing/mdformat-gfm-alerts";
+    changelog = "https://github.com/KyleKing/mdformat-gfm-alerts/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sigmanificient ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c0342015c5ae..d95000afd6ed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7494,6 +7494,7 @@ self: super: with self; {
   mdformat-footnote = callPackage ../development/python-modules/mdformat-footnote { };
   mdformat-frontmatter = callPackage ../development/python-modules/mdformat-frontmatter { };
   mdformat-gfm = callPackage ../development/python-modules/mdformat-gfm { };
+  mdformat-gfm-alerts = callPackage ../development/python-modules/mdformat-gfm-alerts { };
   mdformat-mkdocs = callPackage ../development/python-modules/mdformat-mkdocs { };
   mdformat-nix-alejandra = callPackage ../development/python-modules/mdformat-nix-alejandra { };
   mdformat-simple-breaks = callPackage ../development/python-modules/mdformat-simple-breaks { };

From 6e7747792622ca7fcbcb16d262aa91d17542b3bd Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 4 Aug 2024 17:30:05 -0500
Subject: [PATCH 005/149] chiaki4deck: rename to chiaki-ng

---
 pkgs/games/{chiaki4deck => chiaki-ng}/default.nix | 6 +++---
 pkgs/top-level/aliases.nix                        | 1 +
 pkgs/top-level/all-packages.nix                   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename pkgs/games/{chiaki4deck => chiaki-ng}/default.nix (95%)

diff --git a/pkgs/games/chiaki4deck/default.nix b/pkgs/games/chiaki-ng/default.nix
similarity index 95%
rename from pkgs/games/chiaki4deck/default.nix
rename to pkgs/games/chiaki-ng/default.nix
index 509fa9eccb22..54034e4b4dd1 100644
--- a/pkgs/games/chiaki4deck/default.nix
+++ b/pkgs/games/chiaki-ng/default.nix
@@ -35,12 +35,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "chiaki4deck";
+  pname = "chiaki-ng";
   version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = "streetpea";
-    repo = pname;
+    repo = "chiaki-ng";
     rev = "v${version}";
     hash = "sha256-9EF+Mm6nZeo3XYH8KO7e22cJ4e9TWUEinhkm+Z213RU=";
     fetchSubmodules = true;
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "https://streetpea.github.io/chiaki4deck/";
+    homepage = "https://streetpea.github.io/chiaki-ng/";
     description = "Fork of Chiaki (Open Source Playstation Remote Play) with Enhancements for Steam Deck";
     # Includes OpenSSL linking exception that we currently have no way
     # to represent.
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a97ab1c0c949..1e0cdeeef0cf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -225,6 +225,7 @@ mapAliases ({
   chia = throw "chia has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30
   chia-dev-tools = throw "chia-dev-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30
   chia-plotter = throw "chia-plotter has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # Added 2023-11-30
+  chiaki4deck = chiaki-ng; # Added 2024-08-04
   chkservice = throw "chkservice has been removed from nixpkgs, as it has been deleted upstream"; # Added 2024-01-08
   chocolateDoom = chocolate-doom; # Added 2023-05-01
   ChowCentaur = chow-centaur; # Added 2024-06-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bff116702190..84610d9d8925 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35928,7 +35928,7 @@ with pkgs;
 
   chiaki = libsForQt5.callPackage ../games/chiaki { };
 
-  chiaki4deck = qt6Packages.callPackage ../games/chiaki4deck { };
+  chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };
 
   chromium-bsu = callPackage ../games/chromium-bsu { };
 

From f143061b219df61796aeb5af7169b9605ea55c7c Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Tue, 6 Aug 2024 20:00:59 +0400
Subject: [PATCH 006/149] rospo: init at 0.12.1

---
 pkgs/by-name/ro/rospo/package.nix | 46 +++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/ro/rospo/package.nix

diff --git a/pkgs/by-name/ro/rospo/package.nix b/pkgs/by-name/ro/rospo/package.nix
new file mode 100644
index 000000000000..088d0d04f61b
--- /dev/null
+++ b/pkgs/by-name/ro/rospo/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+}:
+
+buildGoModule rec {
+  pname = "rospo";
+  version = "0.12.1";
+
+  src = fetchFromGitHub {
+    owner = "ferama";
+    repo = "rospo";
+    rev = "v${version}";
+    hash = "sha256-cUah73wr0fKK9Lw3228r5SITDn5rNlpgQW5rHtbo6jU=";
+  };
+
+  vendorHash = "sha256-KbR8T7KwueQ9fc4AOX26GOTQFXuV9LgfSxgwCzQt4eE=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/ferama/rospo/cmd.Version=${version}"
+  ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  doCheck = false;
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd rospo \
+      --bash <($out/bin/rospo completion bash) \
+      --fish <($out/bin/rospo completion fish) \
+      --zsh <($out/bin/rospo completion zsh)
+  '';
+
+  meta = {
+    description = "Simple, reliable, persistent ssh tunnels with embedded ssh server";
+    homepage = "https://github.com/ferama/rospo";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sikmir ];
+    mainProgram = "rospo";
+  };
+}

From 0e022141f4b2ad06753148d82876ec2b11677cb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Aug 2024 15:31:26 +0000
Subject: [PATCH 007/149] tidal-hifi: 5.15.0 -> 5.16.0

---
 pkgs/applications/audio/tidal-hifi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix
index c76c6c6a4f86..375e2b7d4635 100644
--- a/pkgs/applications/audio/tidal-hifi/default.nix
+++ b/pkgs/applications/audio/tidal-hifi/default.nix
@@ -37,11 +37,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tidal-hifi";
-  version = "5.15.0";
+  version = "5.16.0";
 
   src = fetchurl {
     url = "https://github.com/Mastermindzh/tidal-hifi/releases/download/${finalAttrs.version}/tidal-hifi_${finalAttrs.version}_amd64.deb";
-    sha256 = "sha256-0OXNynf56On+emLO0ZfNIcoT3GEhSXdoQhfxapLYYic=";
+    sha256 = "sha256-gDinm7kILm4SKlWmaJ1grwRuketGs/aWlJfNEF+AIRo=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];

From effb44737251e30809e1a0c32f4cc194238687b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Aug 2024 12:40:55 +0000
Subject: [PATCH 008/149] p2pool: 4.0 -> 4.1

---
 pkgs/applications/misc/p2pool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/p2pool/default.nix b/pkgs/applications/misc/p2pool/default.nix
index 1ab2edea7662..3d537afc1d2b 100644
--- a/pkgs/applications/misc/p2pool/default.nix
+++ b/pkgs/applications/misc/p2pool/default.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "p2pool";
-  version = "4.0";
+  version = "4.1";
 
   src = fetchFromGitHub {
     owner = "SChernykh";
     repo = "p2pool";
     rev = "v${version}";
-    hash = "sha256-UAKEyJFdgwJ4Jz3lTG6vmxEkIVLSikWOEBjYV6o72nQ=";
+    hash = "sha256-eMg8DXFtVfYhl6vpg/KRUZUgMU/XsCS29Af1CSIbUsY=";
     fetchSubmodules = true;
   };
 

From 5e7780a26ef8434cc856a5ef32ac5d9ccb434f92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Aug 2024 14:00:05 +0000
Subject: [PATCH 009/149] getoptions: 3.3.1 -> 3.3.2

---
 pkgs/tools/misc/getoptions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/getoptions/default.nix b/pkgs/tools/misc/getoptions/default.nix
index cf5a21c6d4ff..2ff3d4c64403 100644
--- a/pkgs/tools/misc/getoptions/default.nix
+++ b/pkgs/tools/misc/getoptions/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "getoptions";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "ko1nksm";
     repo = "getoptions";
     rev = "v${version}";
-    hash = "sha256-HHxImHMT5862ysI+1QGkzaA21YsrUUUOH2LwAkVBPf0=";
+    hash = "sha256-hapOGPibqt2Mm6k73v63gHxrX+lifZ8xcwzj8vWbtgo=";
   };
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];

From cb0d3e9d0a55214858bad221a838c3c4ce107241 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 18 Aug 2024 16:30:58 +0000
Subject: [PATCH 010/149] xdg-desktop-portal-shana: 0.3.11 -> 0.3.12

---
 pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix
index e02d1fbedf40..04be8d606e4c 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "xdg-desktop-portal-shana";
-  version = "0.3.11";
+  version = "0.3.12";
 
   src = fetchFromGitHub {
     owner = "Decodetalkers";
     repo = "xdg-desktop-portal-shana";
     rev = "v${version}";
-    sha256 = "sha256-bUskzFDd4qjH4Isp6vAJHe5qzgCLudQbkh+JNNTSMu8=";
+    sha256 = "sha256-bBKoAegT3wk2UD2fqSLaix2MuKtVAcHA6vcB9VAzLJw=";
   };
 
   nativeBuildInputs = [
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
 
   mesonBuildType = "release";
 
-  cargoHash = "sha256-FzEdQePDnSCuMDqbz0ZUywDzNfbiOwottSrE+eWL9to=";
+  cargoHash = "sha256-vufD/eYulblUKQVHsyvjl2AlRoRAGp2oeYol9kTt3lQ=";
 
   meta = with lib; {
     description = "Filechooser portal backend for any desktop environment";

From 45089df0cf12db54756284793f6aaa507fd70936 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 Aug 2024 12:04:52 +0000
Subject: [PATCH 011/149] pacemaker: 2.1.7 -> 2.1.8

---
 pkgs/misc/logging/pacemaker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/logging/pacemaker/default.nix b/pkgs/misc/logging/pacemaker/default.nix
index 87ab12ee29c8..e0d20dfcb46c 100644
--- a/pkgs/misc/logging/pacemaker/default.nix
+++ b/pkgs/misc/logging/pacemaker/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pacemaker";
-  version = "2.1.7";
+  version = "2.1.8";
 
   src = fetchFromGitHub {
     owner = "ClusterLabs";
     repo = pname;
     rev = "Pacemaker-${version}";
-    sha256 = "sha256-cvCMIzeyP9oEzHpafOvCORYwWg6cH5qj3qXOUMW4nHA=";
+    sha256 = "sha256-J57+NSs4cL3BlEjSaXAoUTEhbMMxhWy8sUZ/K3x2nRM=";
   };
 
   nativeBuildInputs = [

From e86a7c5986650d4ac621ebf2592ea85947b48c60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 Aug 2024 19:16:32 +0000
Subject: [PATCH 012/149] thanos: 0.35.1 -> 0.36.1

---
 pkgs/servers/monitoring/thanos/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix
index ce4a75cea75b..b0f1ca4f6a3d 100644
--- a/pkgs/servers/monitoring/thanos/default.nix
+++ b/pkgs/servers/monitoring/thanos/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "thanos";
-  version = "0.35.1";
+  version = "0.36.1";
 
   src = fetchFromGitHub {
     owner = "thanos-io";
     repo = "thanos";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XSQMFtMZvcUcOFi14EZiyq65GdPbzOqUVqFM0FLSj3E=";
+    hash = "sha256-Zcc860kQkVP1DPyadBoalhcvwh5HF9CgQyjzWRdeXt0=";
   };
 
-  vendorHash = "sha256-i8EGUxNbxfyPQ3BVa7yBR1ygHIC64v6m/aDGFzWWfIE=";
+  vendorHash = "sha256-d+jHGmCfx9Ffm5pajm1RvKnMea99JswL0I8nmILXN50=";
 
   doCheck = true;
 

From 62dcf47ab471bb6e0883f156ab10d2b5e97477bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 Aug 2024 01:14:12 +0000
Subject: [PATCH 013/149] fflogs: 8.12.19 -> 8.13.1

---
 pkgs/by-name/ff/fflogs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix
index 50526b45a1cb..08631635cbf6 100644
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@@ -5,10 +5,10 @@
 
 let
   pname = "fflogs";
-  version = "8.12.19";
+  version = "8.13.1";
   src = fetchurl {
     url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-/TGmUHMNowQFIw09OGw1ybiYE7ADPLbsZpAMPw3G5NE=";
+    hash = "sha256-NSLJo+6o30bF2+1c1mHdHGC5GoZUjzC0JYJ5x/tY4uQ=";
   };
   extracted = appimageTools.extractType2 { inherit pname version src; };
 in

From 81bc42c9b8010726dd5bbb05a90534b6edce4f16 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 9 Jun 2024 08:59:58 +0200
Subject: [PATCH 014/149] u-config: init at 0.33.1

---
 pkgs/by-name/u-/u-config/package.nix | 43 ++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 pkgs/by-name/u-/u-config/package.nix

diff --git a/pkgs/by-name/u-/u-config/package.nix b/pkgs/by-name/u-/u-config/package.nix
new file mode 100644
index 000000000000..deeba46483b5
--- /dev/null
+++ b/pkgs/by-name/u-/u-config/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "u-config";
+  version = "0.33.1";
+
+  src = fetchFromGitHub {
+    owner = "skeeto";
+    repo = "u-config";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-r1zcXKLqw/gK+9k3SX7OCBaZhvV2ya5VC9O3h+WdkyY=";
+  };
+
+  makeFlags = [
+    "CROSS=${stdenv.cc.targetPrefix}"
+    "CC=${lib.getExe stdenv.cc}"
+  ];
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildFlags = [ "pkg-config" ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 pkg-config -t $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Smaller, simpler, portable pkg-config clone";
+    homepage = "https://github.com/skeeto/u-config";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ sigmanificient ];
+    platforms = lib.platforms.all;
+  };
+})

From 035abb86ca5deb96ce98511d221fccdd7699d37e Mon Sep 17 00:00:00 2001
From: Yuxuan Shui <yshuiv7@gmail.com>
Date: Wed, 21 Aug 2024 10:12:54 +0100
Subject: [PATCH 015/149] python3Packages.gguf: 0.6.0 -> 0.9.1

---
 pkgs/development/python-modules/gguf/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix
index f0edfa48049f..64b96698cc62 100644
--- a/pkgs/development/python-modules/gguf/default.nix
+++ b/pkgs/development/python-modules/gguf/default.nix
@@ -5,26 +5,26 @@
   numpy,
   poetry-core,
   pythonOlder,
+  tqdm,
 }:
 buildPythonPackage rec {
   pname = "gguf";
-  version = "0.6.0";
+  version = "0.9.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-suIuq6KhBsGtFIGGoUrZ8pxCk1Fob+nXzhbfOaBgfmU=";
+    hash = "sha256-9ecJh+FbGcVF9qn3UztAM/swYzDrHzxclf0osUw/0zs=";
   };
 
   dependencies = [
     numpy
     poetry-core
+    tqdm
   ];
 
-  doCheck = false;
-
   meta = with lib; {
     description = "Module for writing binary files in the GGUF format";
     homepage = "https://ggml.ai/";

From b3d96378e1c6fb89d3dfd41b32f5f4ec9e4f424e Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 21 Aug 2024 22:10:12 +0800
Subject: [PATCH 016/149] molsketch: fix cmakeFlags for __structuredAttrs

---
 pkgs/applications/editors/molsketch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/molsketch/default.nix b/pkgs/applications/editors/molsketch/default.nix
index abbedff17c16..dd3ee9bcdbb1 100644
--- a/pkgs/applications/editors/molsketch/default.nix
+++ b/pkgs/applications/editors/molsketch/default.nix
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
       --replace "CXX_STANDARD 14" "CXX_STANDARD 17"
   '';
 
-  preConfigure = ''
-    cmakeFlags="$cmakeFlags -DMSK_PREFIX=$out"
-  '';
+  cmakeFlags = [
+    "-DMSK_PREFIX=${placeholder "out"}"
+  ];
 
   postFixup = ''
     ln -s $out/lib/molsketch/* $out/lib/.

From f4c1b6f205aa4bff93199e283575d24158bb151b Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 21 Aug 2024 22:12:26 +0800
Subject: [PATCH 017/149] python3Packages.pymeshlab: fix cmakeFlags

---
 pkgs/applications/graphics/pymeshlab/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/pymeshlab/default.nix b/pkgs/applications/graphics/pymeshlab/default.nix
index 255b14f09211..4a4653b45227 100644
--- a/pkgs/applications/graphics/pymeshlab/default.nix
+++ b/pkgs/applications/graphics/pymeshlab/default.nix
@@ -88,12 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace src/meshlab/src/external/ssynth.cmake \
       --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
       --replace-warn "MD5 ''${SSYNTH_MD5}" ""
-    export cmakeFlags="cmakeFlags
-      -DCMAKE_INSTALL_PREFIX=$out/${python3Packages.python.sitePackages}/pymeshlab
-    "
   '';
 
   cmakeFlags = [
+    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python3Packages.python.sitePackages}/pymeshlab"
     "-DVCGDIR=${vcg.src}"
   ];
 

From 1e8290ea5f4e9cfd6d4a6bbc427394e15a4e1f6d Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 21 Aug 2024 22:14:31 +0800
Subject: [PATCH 018/149] yarp: fix cmakeFlags for __structuredAttrs

---
 pkgs/applications/science/robotics/yarp/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix
index 3b33096dc683..4f2e45384b76 100644
--- a/pkgs/applications/science/robotics/yarp/default.nix
+++ b/pkgs/applications/science/robotics/yarp/default.nix
@@ -18,11 +18,9 @@ stdenv.mkDerivation rec {
     "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON"
     "-DCREATE_YARPC:BOOL=ON"
     "-DCREATE_YARPCXX:BOOL=ON"
+    "-DCMAKE_INSTALL_LIBDIR=${placeholder "out"}/lib"
   ];
 
-  # since we cant expand $out in cmakeFlags
-  preConfigure = ''cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_LIBDIR=$out/lib"'';
-
   postInstall = "mv ./$out/lib/*.so $out/lib/";
 
   meta = {

From 8fa3649f99a3438d9236020fe761d22eae893d51 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 21 Aug 2024 22:15:25 +0800
Subject: [PATCH 019/149] aws-c-common: fix setup hook cmakeFlags for
 __structuredAttrs

---
 pkgs/development/libraries/aws-c-common/setup-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/aws-c-common/setup-hook.sh b/pkgs/development/libraries/aws-c-common/setup-hook.sh
index e670f7cf8529..174933621f00 100644
--- a/pkgs/development/libraries/aws-c-common/setup-hook.sh
+++ b/pkgs/development/libraries/aws-c-common/setup-hook.sh
@@ -1,5 +1,5 @@
 addAwsCCommonModuleDir() {
-    cmakeFlags="-DCMAKE_MODULE_PATH=@out@/lib/cmake ${cmakeFlags:-}"
+    prependToVar cmakeFlags "-DCMAKE_MODULE_PATH=@out@/lib/cmake"
 }
 
 postHooks+=(addAwsCCommonModuleDir)

From 8b93d36ef7a879368a6c64c5db090883ee3654f4 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 21 Aug 2024 22:18:25 +0800
Subject: [PATCH 020/149] openwsman: fix cmakeFlags for __structuredAttrs

---
 pkgs/development/libraries/openwsman/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix
index 4df98d28fd09..a12abd5db557 100644
--- a/pkgs/development/libraries/openwsman/default.nix
+++ b/pkgs/development/libraries/openwsman/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    cmakeFlags="$cmakeFlags -DPACKAGE_ARCHITECTURE=$(uname -m)";
+    appendToVar cmakeFlags "-DPACKAGE_ARCHITECTURE=$(uname -m)"
   '';
 
   configureFlags = [ "--disable-more-warnings" ];

From 13d2eec8108c8854438ccdedfe0ddc486c2c70a8 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 21 Aug 2024 22:22:13 +0800
Subject: [PATCH 021/149] vigra: format with nixfmt-rfc-style

---
 pkgs/development/libraries/vigra/default.nix | 38 +++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 7db1d0d49195..100bdf2caa79 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -1,17 +1,18 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, boost
-, cmake
-, fftw
-, fftwSinglePrec
-, hdf5
-, ilmbase
-, libjpeg
-, libpng
-, libtiff
-, openexr
-, python3
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  boost,
+  cmake,
+  fftw,
+  fftwSinglePrec,
+  hdf5,
+  ilmbase,
+  libjpeg,
+  libpng,
+  libtiff,
+  openexr,
+  python3,
 }:
 
 let
@@ -46,9 +47,12 @@ stdenv.mkDerivation rec {
 
   preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/${python.sitePackages}\"";
 
-  cmakeFlags = [ "-DWITH_OPENEXR=1" ]
-    ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
-    [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
+  cmakeFlags =
+    [ "-DWITH_OPENEXR=1" ]
+    ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
+      "-DCMAKE_CXX_FLAGS=-fPIC"
+      "-DCMAKE_C_FLAGS=-fPIC"
+    ];
 
   meta = with lib; {
     description = "Novel computer vision C++ library with customizable algorithms and data structures";

From 80dd13fbc1681f84eb72910fb2897af071f06fcd Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 21 Aug 2024 22:22:58 +0800
Subject: [PATCH 022/149] vigra: fix cmakeFlags for __structuredAttrs

---
 pkgs/development/libraries/vigra/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix
index 100bdf2caa79..34bd608de8e2 100644
--- a/pkgs/development/libraries/vigra/default.nix
+++ b/pkgs/development/libraries/vigra/default.nix
@@ -45,10 +45,11 @@ stdenv.mkDerivation rec {
     python
   ];
 
-  preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/${python.sitePackages}\"";
-
   cmakeFlags =
-    [ "-DWITH_OPENEXR=1" ]
+    [
+      "-DWITH_OPENEXR=1"
+      "-DVIGRANUMPY_INSTALL_DIR=${placeholder "out"}/${python.sitePackages}"
+    ]
     ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
       "-DCMAKE_CXX_FLAGS=-fPIC"
       "-DCMAKE_C_FLAGS=-fPIC"

From c0d35f87337d9bfb33af08d910fda5f4a564afa4 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 21 Aug 2024 22:28:48 +0800
Subject: [PATCH 023/149] python3Packages.hoomd-blue: fix cmakeFlags for
 __structuredAttrs

---
 pkgs/development/python-modules/hoomd-blue/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix
index e48cc94bccc4..248a2f8cb258 100644
--- a/pkgs/development/python-modules/hoomd-blue/default.nix
+++ b/pkgs/development/python-modules/hoomd-blue/default.nix
@@ -49,13 +49,9 @@ buildPythonPackage rec {
     "-DBUILD_HPMC=${onOffBool components.hpmc}"
     "-DBUILD_MD=${onOffBool components.md}"
     "-DBUILD_METAL=${onOffBool components.metal}"
+    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python.sitePackages}"
   ];
 
-  preConfigure = ''
-    # Since we can't expand $out in `cmakeFlags`
-    cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out/${python.sitePackages}"
-  '';
-
   # tests fail but have tested that package runs properly
   doCheck = false;
   checkTarget = "test";

From 263be5c8519ba553abbe5e0bde08c4c772907793 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 21 Aug 2024 22:30:05 +0800
Subject: [PATCH 024/149] python3Packages.rdkit: fix cmakeFlags for
 __structuredAttrs

---
 pkgs/development/python-modules/rdkit/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix
index 44096b6910c0..248f212f0abe 100644
--- a/pkgs/development/python-modules/rdkit/default.nix
+++ b/pkgs/development/python-modules/rdkit/default.nix
@@ -100,10 +100,10 @@ buildPythonPackage rec {
 
   preConfigure = ''
     # Since we can't expand with bash in cmakeFlags
-    cmakeFlags="$cmakeFlags -DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')"
-    cmakeFlags="$cmakeFlags -DFREESASA_DIR=$PWD/External/FreeSASA/freesasa"
-    cmakeFlags="$cmakeFlags -DFREESASA_SRC_DIR=$PWD/External/FreeSASA/freesasa"
-    cmakeFlags="$cmakeFlags -DAVALONTOOLS_DIR=$PWD/External/AvalonTools/avalon"
+    appendToVar cmakeFlags "-DPYTHON_NUMPY_INCLUDE_PATH=$(${python}/bin/python -c 'import numpy; print(numpy.get_include())')"
+    appendToVar cmakeFlags "-DFREESASA_DIR=$PWD/External/FreeSASA/freesasa"
+    appendToVar cmakeFlags "-DFREESASA_SRC_DIR=$PWD/External/FreeSASA/freesasa"
+    appendToVar cmakeFlags "-DAVALONTOOLS_DIR=$PWD/External/AvalonTools/avalon"
   '';
 
   cmakeFlags = [

From 2d66a0bf73a0dd3d54d2da4cc5a6c7fc5e703f55 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 21 Aug 2024 22:31:10 +0800
Subject: [PATCH 025/149] commandergenius: fix cmakeFlags and makeFlags for
 __structuredAttrs

---
 pkgs/games/commandergenius/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix
index 568dcc7e51e1..d3549fd211f2 100644
--- a/pkgs/games/commandergenius/default.nix
+++ b/pkgs/games/commandergenius/default.nix
@@ -28,10 +28,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_ttf libGL boost libvorbis zlib curl python3 ];
 
-  preConfigure = ''
-    export cmakeFlags="$cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DSHAREDIR=$out/share"
-    export makeFlags="$makeFlags DESTDIR=$(out)"
-  '';
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
+    "-DSHAREDIR=${placeholder "out"}/share"
+  ];
+
+  makeFlags = [
+    "DESTDIR=${placeholder "out"}"
+  ];
 
   nativeBuildInputs = [ cmake pkg-config ];
 

From e44a479b1a5c9865dbb6ed0c56440b61c3450724 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 21 Aug 2024 22:34:50 +0800
Subject: [PATCH 026/149] irods: fix cmakeFlags for __structuredAttrs

---
 pkgs/tools/filesystems/irods/common.nix  |  8 +++-----
 pkgs/tools/filesystems/irods/default.nix | 11 ++++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix
index 33edc0e4a05b..c2e09220a957 100644
--- a/pkgs/tools/filesystems/irods/common.nix
+++ b/pkgs/tools/filesystems/irods/common.nix
@@ -27,15 +27,13 @@
     "-DCPACK_GENERATOR=TGZ"
     "-DCMAKE_CXX_FLAGS=-I${lib.getDev libcxx}/include/c++/v1"
     "-DPAM_LIBRARY=${pam}/lib/libpam.so"
+    "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}"
+    "-DIRODS_HOME_DIRECTORY=${placeholder "out"}"
+    "-DCMAKE_INSTALL_SBINDIR=${placeholder "out"}/sbin"
   ];
 
   postPatch = ''
     patchShebangs ./packaging ./scripts
-    export cmakeFlags="$cmakeFlags
-      -DCMAKE_INSTALL_PREFIX=$out
-      -DIRODS_HOME_DIRECTORY=$out
-      -DCMAKE_INSTALL_SBINDIR=$out/sbin
-    "
   '';
 
   meta = with lib; {
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index 5db0ed453eab..beddb6959ba4 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -32,6 +32,12 @@ rec {
     # fix build with recent llvm versions
     env.NIX_CFLAGS_COMPILE = "-Wno-deprecated-register -Wno-deprecated-declarations";
 
+    cmakeFlags = common.cmakeFlags or [ ] ++ [
+      "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib"
+      "-DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib"
+      "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,${placeholder "out"}/lib"
+    ];
+
     postPatch = common.postPatch + ''
       patchShebangs ./test
       substituteInPlace plugins/database/CMakeLists.txt --replace-fail "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"
@@ -39,11 +45,6 @@ rec {
       do
         substituteInPlace $file --replace-quiet "CATCH2}/include" "CATCH2}/include/catch2"
       done
-      export cmakeFlags="$cmakeFlags
-        -DCMAKE_EXE_LINKER_FLAGS=-Wl,-rpath,$out/lib
-        -DCMAKE_MODULE_LINKER_FLAGS=-Wl,-rpath,$out/lib
-        -DCMAKE_SHARED_LINKER_FLAGS=-Wl,-rpath,$out/lib
-        "
 
       substituteInPlace server/auth/CMakeLists.txt --replace-fail SETUID ""
     '';

From 244ed365b998cd2b19c224f1210f498da31dc49b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 Aug 2024 16:07:26 +0000
Subject: [PATCH 027/149] scalingo: 1.32.0 -> 1.33.0

---
 pkgs/by-name/sc/scalingo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sc/scalingo/package.nix b/pkgs/by-name/sc/scalingo/package.nix
index db17f1fad6eb..260cf2897862 100644
--- a/pkgs/by-name/sc/scalingo/package.nix
+++ b/pkgs/by-name/sc/scalingo/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "scalingo";
-  version = "1.32.0";
+  version = "1.33.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = "cli";
     rev = version;
-    hash = "sha256-kursqM0/HxTnEvrVxEd4YUiIG4I974JKZqkQTqP00ko=";
+    hash = "sha256-7hb1RU33wGeSESxY16pYJfQ2O3QOT92Em6jlh8oP/Zc=";
   };
 
   vendorHash = null;

From a35a9a314a58e28e4fd64effe3f7c199d47a7c60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 Aug 2024 17:47:03 +0000
Subject: [PATCH 028/149] feishu: 7.18.11 -> 7.22.9

---
 .../networking/instant-messengers/feishu/default.nix   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/feishu/default.nix b/pkgs/applications/networking/instant-messengers/feishu/default.nix
index 0a27f5b81b9c..8a0dc4256a03 100644
--- a/pkgs/applications/networking/instant-messengers/feishu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/feishu/default.nix
@@ -65,12 +65,12 @@
 let
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/88a232d5/Feishu-linux_x64-7.18.11.deb";
-      sha256 = "sha256-EneDVW8eQ6J+M49hn9xLtvlqiDOx4Rs8VMLt1cqSbak=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/bfdb886c/Feishu-linux_x64-7.22.9.deb";
+      sha256 = "sha256-4lLCQeW6ZRzmzrHPQ91RxKEqJCxqqa4iGuJ8snZqvkQ=";
     };
     aarch64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f29ac73d/Feishu-linux_arm64-7.18.11.deb";
-      sha256 = "sha256-ghAWPQgVEBSom7zBHUKb56O3EZR4rOnQlz9BRSJBNp4=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/c3f495d6/Feishu-linux_arm64-7.22.9.deb";
+      sha256 = "sha256-cT9n1p220ya1T21fWy4b7b7dIx3hqw7lConGaSZ2+UA=";
     };
   };
 
@@ -131,7 +131,7 @@ let
   ];
 in
 stdenv.mkDerivation {
-  version = "7.18.11";
+  version = "7.22.9";
   pname = "feishu";
 
   src = sources.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

From 6f17a88bb19c940d9f4e0e4b4496adbf3ad096d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 Aug 2024 23:02:19 +0000
Subject: [PATCH 029/149] frida-tools: 12.3.0 -> 12.5.0

---
 pkgs/tools/security/frida-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/frida-tools/default.nix b/pkgs/tools/security/frida-tools/default.nix
index 9a3bdee5dae2..36abd4ad5c68 100644
--- a/pkgs/tools/security/frida-tools/default.nix
+++ b/pkgs/tools/security/frida-tools/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "frida-tools";
-  version = "12.3.0";
+  version = "12.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jtxn0a43kv9bLcY1CM3k0kf5K30Ne/FT10ohptWNwEU=";
+    hash = "sha256-vlqBN0E+bpfx+TLliZ3hgCaeOEdMRP/rmAfkmjOTqyA=";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 5ea4f918417b7ad9e6536cc9560af7888537f7af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 Aug 2024 23:34:28 +0000
Subject: [PATCH 030/149] httplib: 0.16.2 -> 0.16.3

---
 pkgs/development/libraries/httplib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/httplib/default.nix b/pkgs/development/libraries/httplib/default.nix
index ffa72657782a..ed397d4a5a6c 100644
--- a/pkgs/development/libraries/httplib/default.nix
+++ b/pkgs/development/libraries/httplib/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "httplib";
-  version = "0.16.2";
+  version = "0.16.3";
 
   src = fetchFromGitHub {
     owner = "yhirose";
     repo = "cpp-httplib";
     rev = "v${version}";
-    hash = "sha256-BR6Iy3RkSuOZHAs7edd7JFBHxFlN+R/ZC1Xt8p6xe2A=";
+    hash = "sha256-wihYgQLPXElsLB6B3+VCP62CfuXZWS+1kw1gA3mdLv0=";
   };
 
   nativeBuildInputs = [ cmake ];

From 774a38edb7d0092665576215e4af4f9b36d3a00b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 Aug 2024 04:36:50 +0000
Subject: [PATCH 031/149] nagios: 4.5.3 -> 4.5.4

---
 pkgs/servers/monitoring/nagios/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix
index 5d46addfc963..d10c614828c7 100644
--- a/pkgs/servers/monitoring/nagios/default.nix
+++ b/pkgs/servers/monitoring/nagios/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nagios";
-  version = "4.5.3";
+  version = "4.5.4";
 
   src = fetchFromGitHub {
     owner = "NagiosEnterprises";
     repo = "nagioscore";
     rev = "refs/tags/nagios-${finalAttrs.version}";
-    hash = "sha256-irr6JVCE3krcD3kScGR8maSbvsNPeQFqWm5oNl9OhQU=";
+    hash = "sha256-QZKSVjaOUDmsQwOlJSTQgy8BuTZ5tcDaJB0a6KttrdU=";
   };
 
   patches = [ ./nagios.patch ];

From 7b1f1f77ebaf3e9d8e39512f8c3f6b26a60db483 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 4 Aug 2024 17:34:28 -0500
Subject: [PATCH 032/149] chiaki-ng: 1.7.4 -> 1.8.1

---
 pkgs/games/chiaki-ng/default.nix |  7 +++----
 pkgs/top-level/all-packages.nix  | 11 ++++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix
index 54034e4b4dd1..cc183cb7c1da 100644
--- a/pkgs/games/chiaki-ng/default.nix
+++ b/pkgs/games/chiaki-ng/default.nix
@@ -1,6 +1,5 @@
 { lib
 , fetchFromGitHub
-, fetchpatch2
 , stdenv
 , cmake
 , pkg-config
@@ -36,13 +35,13 @@
 
 stdenv.mkDerivation rec {
   pname = "chiaki-ng";
-  version = "1.7.4";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "streetpea";
     repo = "chiaki-ng";
     rev = "v${version}";
-    hash = "sha256-9EF+Mm6nZeo3XYH8KO7e22cJ4e9TWUEinhkm+Z213RU=";
+    hash = "sha256-wYshjduufxTxLzU2462ZRCj9WP/PZoJUOC/kGzus8ew=";
     fetchSubmodules = true;
   };
 
@@ -114,7 +113,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://streetpea.github.io/chiaki-ng/";
-    description = "Fork of Chiaki (Open Source Playstation Remote Play) with Enhancements for Steam Deck";
+    description = "Next-Generation of Chiaki (the open-source remote play client for PlayStation)";
     # Includes OpenSSL linking exception that we currently have no way
     # to represent.
     #
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84610d9d8925..3c53afedbcc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35928,7 +35928,16 @@ with pkgs;
 
   chiaki = libsForQt5.callPackage ../games/chiaki { };
 
-  chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };
+  chiaki-ng = kdePackages.callPackage ../games/chiaki-ng {
+    libplacebo = libplacebo.overrideAttrs (old: {
+      version = "6.338.2-unstable-2024-01-29";
+      src = old.src.override {
+        # broken with 7.349.0 -- pinning to rev used by upstream https://github.com/streetpea/chiaki-ng/blob/96d535db41bb9c3b37fbffcf2402d51e891ff960/scripts/build-libplacebo.sh#L9
+        rev = "c320f61e601caef2be081ce61138e5d51c1be21d";
+        hash = "sha256-ZlKYgWz/Rkp4IPt6cJ+KNnzBB2s8jGZEamSAOIGyDuE=";
+      };
+    });
+  };
 
   chromium-bsu = callPackage ../games/chromium-bsu { };
 

From 521380e506fe2190ad9e112548306a1f90d4e041 Mon Sep 17 00:00:00 2001
From: John Chadwick <john@jchw.io>
Date: Thu, 22 Aug 2024 17:17:40 -0400
Subject: [PATCH 033/149] ghidra-extensions.ghidra-delinker-extension: 0.4.0 ->
 0.5.0

---
 .../ghidra/extensions/ghidra-delinker-extension/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
index 4bddcd4d18a7..0a8cc8352354 100644
--- a/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
+++ b/pkgs/tools/security/ghidra/extensions/ghidra-delinker-extension/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 }:
 let
-  version = "0.4.0";
+  version = "0.5.0";
   self = ghidra.buildGhidraExtension {
     pname = "ghidra-delinker-extension";
     inherit version;
@@ -13,8 +13,8 @@ let
     src = fetchFromGitHub {
       owner = "boricj";
       repo = "ghidra-delinker-extension";
-      rev = "04338fd028bf8b5449ff3f5373635111140bbeda";
-      hash = "sha256-tfO92dnpfY13ZbvL36WzV/pC3xH/fbQDICNAF8D4fCI=";
+      rev = "v${version}";
+      hash = "sha256-y0afqqIsWN33b/zGsxJYn8O+R5IP4eD300CgzMymEA0=";
     };
 
     postPatch = ''

From 32ee8434dd3f07cd1b14a14001977e1cf4f0ee75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 23 Aug 2024 05:39:57 +0000
Subject: [PATCH 034/149] radarr: 5.8.3.8933 -> 5.9.1.9070

---
 pkgs/servers/radarr/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix
index 43ed4e175ede..896e8b3d1f1a 100644
--- a/pkgs/servers/radarr/default.nix
+++ b/pkgs/servers/radarr/default.nix
@@ -10,15 +10,15 @@ let
   }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
   hash = {
-    x64-linux_hash = "sha256-2UkdzOvJZ7fWag/kyfFffPtCVEXil0TTcTReykPKWuU=";
-    arm64-linux_hash = "sha256-IuLtPWsUukiIk9H/0yf74SipYcbvn1p5MZUbptypCJs=";
-    x64-osx_hash = "sha256-vLkY9rqdQwr/ntpmUMK5bCIjLWGCt1xEhH/QQzgkZV8=";
-    arm64-osx_hash = "sha256-Y0aXaMnOCdzrIiM7BqGdHAIO60VFNWUb5ISGaVDX/9s=";
+    x64-linux_hash = "sha256-byYFQ3QJVElVNSxYWOx0EWbreDKgFcaQFkXNkWt3TP8=";
+    arm64-linux_hash = "sha256-ekt8Kl3RL+bBoeehpCWH7qD4Zt+ni9WAOsI9Zw4ZVi0=";
+    x64-osx_hash = "sha256-0VtDl6jPsT25KV9uEvn/bDxOIouRXK32YFPv/ZBK4Qc=";
+    arm64-osx_hash = "sha256-8N9X4UYewouD16B/WOhIL1m8R6C7cdptDQQZIutLzXU=";
   }."${arch}-${os}_hash";
 
 in stdenv.mkDerivation rec {
   pname = "radarr";
-  version = "5.8.3.8933";
+  version = "5.9.1.9070";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";

From e236ff11c26bb3f4e93acc677f80a1fdfca4be3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fausto=20J=C3=A1quez?=
 <46538610+Faustrox@users.noreply.github.com>
Date: Fri, 23 Aug 2024 14:31:39 -0400
Subject: [PATCH 035/149] catppuccin-cursors: 0.3.0 -> 0.3.1

---
 pkgs/by-name/ca/catppuccin-cursors/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/catppuccin-cursors/package.nix b/pkgs/by-name/ca/catppuccin-cursors/package.nix
index 1a46f4370bfb..604b04e50e0c 100644
--- a/pkgs/by-name/ca/catppuccin-cursors/package.nix
+++ b/pkgs/by-name/ca/catppuccin-cursors/package.nix
@@ -5,6 +5,7 @@
 , just
 , xcursorgen
 , hyprcursor
+, xcur2png
 }:
 
 let
@@ -14,7 +15,7 @@ let
   };
   variantName = { palette, color }: palette + color;
   variants = lib.mapCartesianProduct variantName dimensions;
-  version = "0.3.0";
+  version = "0.3.1";
 in
 stdenvNoCC.mkDerivation {
   pname = "catppuccin-cursors";
@@ -24,10 +25,10 @@ stdenvNoCC.mkDerivation {
     owner = "catppuccin";
     repo = "cursors";
     rev = "v${version}";
-    hash = "sha256-LJyBnXDUGBLOD4qPI7l0YC0CcqYTtgoMJc1H2yLqk9g=";
+    hash = "sha256-CuzD6O/RImFKLWzJoiUv7nlIdoXNvwwl+k5mTeVIY10=";
   };
 
-  nativeBuildInputs = [ just inkscape xcursorgen hyprcursor ];
+  nativeBuildInputs = [ just inkscape xcursorgen hyprcursor xcur2png ];
 
   outputs = variants ++ [ "out" ]; # dummy "out" output to prevent breakage
 

From 40e859e3ac805aff01803800da276b58666c9aeb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 08:42:30 +0000
Subject: [PATCH 036/149] zarf: 0.37.0 -> 0.38.3

---
 pkgs/applications/networking/cluster/zarf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/zarf/default.nix b/pkgs/applications/networking/cluster/zarf/default.nix
index 7a802dd351bf..84465bb3d433 100644
--- a/pkgs/applications/networking/cluster/zarf/default.nix
+++ b/pkgs/applications/networking/cluster/zarf/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "zarf";
-  version = "0.37.0";
+  version = "0.38.3";
 
   src = fetchFromGitHub {
     owner = "defenseunicorns";
     repo = "zarf";
     rev = "v${version}";
-    hash = "sha256-GgvpBYFPH1corqNCA6NQCg6Rkbdez9mFwv5HlmOCKvE=";
+    hash = "sha256-tnxLktz8tc8ceWirThPR5eqlk5W3jnliiKka6feeX38=";
   };
 
-  vendorHash = "sha256-gLnUvNxuxrMu6i+b0jgindgcbGOA+tk4N5N4owGV7B8=";
+  vendorHash = "sha256-y4A3A6zTgZaFjy6B31BAIpyRDp+pYdc/dkFpZq2NQ2c=";
   proxyVendor = true;
 
   nativeBuildInputs = [ installShellFiles ];

From a916cae47a0056ce042f8ee3e5cbd38947f534cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 25 Aug 2024 09:27:58 +0000
Subject: [PATCH 037/149] atac: 0.16.0 -> 0.18.0

---
 pkgs/by-name/at/atac/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix
index 66d001d21522..2a8ce471e2e1 100644
--- a/pkgs/by-name/at/atac/package.nix
+++ b/pkgs/by-name/at/atac/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "atac";
-  version = "0.16.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "Julien-cpsn";
     repo = "ATAC";
     rev = "v${version}";
-    hash = "sha256-PTslXzgZCzmy45zI2omv4Ef5h4gJdfWcK5ko7ulHnXo=";
+    hash = "sha256-FSZGpV+dREwjst84TT1aBm/H+VqkjI8XDPo3usJ7UeI=";
   };
 
-  cargoHash = "sha256-ZQyj2+gsZnayWD29dYZDh1zYTstaQluzzF7pXf0yoY4=";
+  cargoHash = "sha256-sNgtqvFiwHSYMDf0379i8Yl9NrkCRVLo/ogjbHFgKBY=";
 
   nativeBuildInputs = [
     pkg-config

From 7941f311e0bc86db788972ac4ecbb09840021fca Mon Sep 17 00:00:00 2001
From: j4ger <xiayuxuan@live.com>
Date: Sat, 24 Aug 2024 22:26:52 +0800
Subject: [PATCH 038/149] siyuan: add desktop entry & icon, enable wayland ime

---
 pkgs/by-name/si/siyuan/package.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index 1059a5726439..bfa939c3ebfb 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -9,6 +9,8 @@
   pnpm_9,
   electron,
   makeWrapper,
+  makeDesktopItem,
+  copyDesktopItems,
 }:
 
 let
@@ -20,6 +22,15 @@ let
   };
 
   platformId = platformIds.${stdenv.system} or (throw "Unsupported platform: ${stdenv.system}");
+
+  desktopEntry = makeDesktopItem {
+    name = "siyuan";
+    desktopName = "SiYuan";
+    comment = "Refactor your thinking";
+    icon = "siyuan";
+    exec = "siyuan %U";
+    categories = [ "Utility" ];
+  };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
@@ -68,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     nodejs
     pnpm.configHook
     makeWrapper
+    copyDesktopItems
   ];
 
   pnpmDeps = pnpm.fetchDeps {
@@ -117,12 +129,16 @@ stdenv.mkDerivation (finalAttrs: {
         --chdir $out/share/siyuan/resources \
         --add-flags $out/share/siyuan/resources/app \
         --set ELECTRON_FORCE_IS_PACKAGED 1 \
-        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+        --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}" \
         --inherit-argv0
 
+    install -Dm644 src/assets/icon.svg $out/share/icons/hicolor/scalable/apps/siyuan.svg
+
     runHook postInstall
   '';
 
+  desktopItems = [ desktopEntry ];
+
   meta = {
     description = "Privacy-first personal knowledge management system that supports complete offline usage, as well as end-to-end encrypted data sync";
     homepage = "https://b3log.org/siyuan/";

From 6dd492a0f1f1942855f84554084e8374ff43927e Mon Sep 17 00:00:00 2001
From: luftmensch-luftmensch <valentinobocchetti59@gmail.com>
Date: Sun, 21 Jul 2024 11:07:54 +0200
Subject: [PATCH 039/149] csvtk: init at 0.30.0

---
 pkgs/by-name/cs/csvtk/package.nix | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/cs/csvtk/package.nix

diff --git a/pkgs/by-name/cs/csvtk/package.nix b/pkgs/by-name/cs/csvtk/package.nix
new file mode 100644
index 000000000000..4079b55f9835
--- /dev/null
+++ b/pkgs/by-name/cs/csvtk/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+let
+  version = "0.30.0";
+in
+buildGoModule {
+  pname = "csvtk";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "shenwei356";
+    repo = "csvtk";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-xq56dErO0vjG9bZ5aISIFWX4IOHaQksE9W1is2HiFuQ=";
+  };
+
+  vendorHash = "sha256-wJedDF7QIg8oWc/QX+rZDyq/nkAW+PMb8EYb0RGJxQM=";
+
+  meta = {
+    description = "Cross-platform, efficient and practical CSV/TSV toolkit in Golang";
+    changelog = "https://github.com/shenwei356/csvtk/releases/tag/v${version}";
+    homepage = "https://github.com/shenwei356/csvtk";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
+    mainProgram = "csvtk";
+  };
+}

From f61bcfebb7a04feb9229090f96fffca54a87cd36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sun, 25 Aug 2024 19:14:16 -0700
Subject: [PATCH 040/149] python312Packages.plugwise: 1.1.0 -> 1.2.0

Diff: https://github.com/plugwise/python-plugwise/compare/refs/tags/v1.1.0...v1.2.0

Changelog: https://github.com/plugwise/python-plugwise/releases/tag/v1.2.0
---
 .../python-modules/plugwise/default.nix       | 24 ++++---------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 7fddf000ddb3..3a411be77e09 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -1,28 +1,23 @@
 {
   lib,
   aiohttp,
-  async-timeout,
   buildPythonPackage,
-  crcmod,
   defusedxml,
   fetchFromGitHub,
   freezegun,
   jsonpickle,
   munch,
-  pyserial,
   pytest-aiohttp,
   pytest-asyncio,
   pytestCheckHook,
   python-dateutil,
   pythonOlder,
-  semver,
   setuptools,
-  wheel,
 }:
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -31,30 +26,21 @@ buildPythonPackage rec {
     owner = "plugwise";
     repo = "python-plugwise";
     rev = "refs/tags/v${version}";
-    hash = "sha256-IaLXCuope/6shF3HmKAo7IrXxVJLzAQzsqlx0dASllk=";
+    hash = "sha256-I9GCFPgTSHquRxvXS0R22q7lxdhKRC76kALIx4hFAAM=";
   };
 
   postPatch = ''
-    # setuptools
-    sed -i -e "s/~=[0-9.]*//" pyproject.toml
-    # wheel
-    sed -i -e "s/~=[0-9.]*//" pyproject.toml
+    # setuptools and wheel
+    sed -i -e "s/~=[0-9.]*//g" pyproject.toml
   '';
 
-  build-system = [
-    setuptools
-    wheel
-  ];
+  build-system = [ setuptools ];
 
   dependencies = [
     aiohttp
-    async-timeout
-    crcmod
     defusedxml
     munch
-    pyserial
     python-dateutil
-    semver
   ];
 
   nativeCheckInputs = [

From 1b07c5eb2fb21d56ab17ab33dec62101156ce799 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 25 Aug 2024 06:10:50 +0100
Subject: [PATCH 041/149] python3Packages.mautrix: use `pyproject`

---
 pkgs/development/python-modules/mautrix/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index 9895f6417184..a150c69466e8 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   pythonOlder,
   # deps
+  setuptools,
   aiohttp,
   attrs,
   yarl,
@@ -23,7 +24,7 @@
 buildPythonPackage rec {
   pname = "mautrix";
   version = "0.20.6";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.10";
 
@@ -34,13 +35,15 @@ buildPythonPackage rec {
     hash = "sha256-g6y2u3ipSp5HoakHqd/ryPlyA+kR7zO6uY4AqfqbwiE=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
     attrs
     yarl
   ];
 
-  passthru.optional-dependencies = {
+  optional-dependencies = {
     detect_mimetype = [ python-magic ];
     encryption = [
       python-olm

From 90b75a1f393735769f0e9a2d232c02b5dc9115bc Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 24 Aug 2024 00:42:17 +0100
Subject: [PATCH 042/149] python3Packages.mautrix: add `withOlm` flag

Closes: #336052
---
 pkgs/development/python-modules/mautrix/default.nix | 8 ++++++--
 pkgs/servers/mautrix-facebook/default.nix           | 2 +-
 pkgs/servers/mautrix-googlechat/default.nix         | 2 +-
 pkgs/servers/mautrix-telegram/default.nix           | 2 +-
 pkgs/tools/networking/maubot/default.nix            | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix
index a150c69466e8..1746fa01dbe9 100644
--- a/pkgs/development/python-modules/mautrix/default.nix
+++ b/pkgs/development/python-modules/mautrix/default.nix
@@ -19,6 +19,8 @@
   aiosqlite,
   asyncpg,
   ruamel-yaml,
+
+  withOlm ? false,
 }:
 
 buildPythonPackage rec {
@@ -41,7 +43,7 @@ buildPythonPackage rec {
     aiohttp
     attrs
     yarl
-  ];
+  ] ++ lib.optionals withOlm optional-dependencies.encryption;
 
   optional-dependencies = {
     detect_mimetype = [ python-magic ];
@@ -58,7 +60,9 @@ buildPythonPackage rec {
     aiosqlite
     asyncpg
     ruamel-yaml
-  ] ++ passthru.optional-dependencies.encryption;
+  ];
+
+  disabledTestPaths = lib.optionals (!withOlm) [ "mautrix/crypto/" ];
 
   pythonImportsCheck = [ "mautrix" ];
 
diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix
index cb7897853b52..3857e5abd45d 100644
--- a/pkgs/servers/mautrix-facebook/default.nix
+++ b/pkgs/servers/mautrix-facebook/default.nix
@@ -21,7 +21,7 @@ python3.pkgs.buildPythonPackage rec {
     aiohttp
     asyncpg
     commonmark
-    mautrix
+    (mautrix.override { withOlm = true; })
     paho-mqtt
     pillow
     prometheus-client
diff --git a/pkgs/servers/mautrix-googlechat/default.nix b/pkgs/servers/mautrix-googlechat/default.nix
index e0f5bc80b8f1..8f8bef86ab2b 100644
--- a/pkgs/servers/mautrix-googlechat/default.nix
+++ b/pkgs/servers/mautrix-googlechat/default.nix
@@ -55,7 +55,7 @@
     commonmark
     python-magic
     protobuf
-    mautrix
+    (mautrix.override { withOlm = enableE2be; })
   ] ++ lib.optionals enableE2be passthru.optional-dependencies.e2be
   ++ lib.optionals enableMetrics passthru.optional-dependencies.metrics
   ++ lib.optionals enableSqlite passthru.optional-dependencies.sqlite;
diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix
index 4e9d00a9534b..53bdb18c22ae 100644
--- a/pkgs/servers/mautrix-telegram/default.nix
+++ b/pkgs/servers/mautrix-telegram/default.nix
@@ -43,7 +43,7 @@ python.pkgs.buildPythonPackage rec {
     commonmark
     aiohttp
     yarl
-    mautrix
+    (mautrix.override { withOlm = withE2BE; })
     tulir-telethon
     asyncpg
     mako
diff --git a/pkgs/tools/networking/maubot/default.nix b/pkgs/tools/networking/maubot/default.nix
index b66940d92390..dd932804fd1a 100644
--- a/pkgs/tools/networking/maubot/default.nix
+++ b/pkgs/tools/networking/maubot/default.nix
@@ -62,7 +62,7 @@ let
     propagatedBuildInputs = with python.pkgs; [
       setuptools
       # requirements.txt
-      mautrix
+      (mautrix.override { withOlm = encryptionSupport; })
       aiohttp
       yarl
       sqlalchemy

From 343ad0ee4a1342ba18edcf67df4d9d46104d13dd Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 24 Aug 2024 00:42:17 +0100
Subject: [PATCH 043/149] python3Packages.matrix-nio: add `withOlm` flag

---
 nixos/tests/matrix/mjolnir.nix                |  4 +-
 .../matrix-commander/default.nix              |  4 +-
 .../pantalaimon/default.nix                   |  3 +-
 .../scripts/weechat-matrix/default.nix        |  4 +-
 .../networking/opsdroid/default.nix           | 81 +++++++++----------
 .../matrix-nio/allow-tests-without-olm.patch  | 59 ++++++++++++++
 .../python-modules/matrix-nio/default.nix     | 78 ++++++++++++++----
 7 files changed, 169 insertions(+), 64 deletions(-)
 create mode 100644 pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch

diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix
index 8a888b17a3d7..265b13821ebd 100644
--- a/nixos/tests/matrix/mjolnir.nix
+++ b/nixos/tests/matrix/mjolnir.nix
@@ -109,8 +109,8 @@ import ../make-test-python.nix (
         environment.systemPackages = [
           (pkgs.writers.writePython3Bin "create_management_room_and_invite_mjolnir"
             { libraries = with pkgs.python3Packages; [
-                matrix-nio
-              ] ++ matrix-nio.optional-dependencies.e2e;
+                (matrix-nio.override { withOlm = true; })
+              ];
             } ''
             import asyncio
 
diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
index 6d39ab785cfa..856aa55f132d 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
@@ -41,7 +41,7 @@ buildPythonApplication rec {
   propagatedBuildInputs = [
     cacert
     setuptools
-    matrix-nio
+    (matrix-nio.override { withOlm = true; })
     python-magic
     markdown
     pillow
@@ -51,7 +51,7 @@ buildPythonApplication rec {
     pyxdg
     python-olm
     emoji
-  ] ++ matrix-nio.optional-dependencies.e2e;
+  ];
 
   meta = with lib; {
     description = "Simple but convenient CLI-based Matrix client app for sending and receiving";
diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
index f5118bb96863..2f22a6e23a47 100644
--- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix
@@ -39,11 +39,10 @@ python3Packages.buildPythonApplication rec {
     janus
     keyring
     logbook
-    matrix-nio
+    (matrix-nio.override { withOlm = true; })
     peewee
     prompt-toolkit
   ]
-  ++ matrix-nio.optional-dependencies.e2e
   ++ lib.optionals enableDbusUi optional-dependencies.ui;
 
   optional-dependencies.ui = with python3Packages; [
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
index a67903c6fe98..265065a445e3 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@@ -56,10 +56,10 @@ in buildPythonPackage {
     attrs
     logbook
     pygments
-    matrix-nio
+    (matrix-nio.override { withOlm = true; })
     aiohttp
     requests
-  ] ++ matrix-nio.optional-dependencies.e2e;
+  ];
 
   passthru.scripts = [ "matrix.py" ];
 
diff --git a/pkgs/applications/networking/opsdroid/default.nix b/pkgs/applications/networking/opsdroid/default.nix
index 7169850327be..3ef92e059e05 100644
--- a/pkgs/applications/networking/opsdroid/default.nix
+++ b/pkgs/applications/networking/opsdroid/default.nix
@@ -18,48 +18,45 @@ python3Packages.buildPythonPackage rec {
 
   build-system = with python3Packages; [ setuptools ];
 
-  dependencies =
-    with python3Packages;
-    [
-      aiohttp
-      aiohttp-middlewares
-      aioredis
-      aiosqlite
-      appdirs
-      arrow
-      babel
-      bitstring
-      bleach
-      # botbuilder-core, connector for teams
-      certifi
-      click
-      # dialogflow, connector for Dialogflow
-      dnspython
-      emoji
-      get-video-properties
-      ibm-watson
-      matrix-nio
-      mattermostdriver
-      motor
-      multidict
-      nbconvert
-      nbformat
-      opsdroid-get-image-size
-      parse
-      puremagic
-      pycron
-      python-olm
-      pyyaml
-      regex
-      rich
-      slack-sdk
-      tailer
-      voluptuous
-      watchgod
-      webexteamssdk
-      wrapt
-    ]
-    ++ matrix-nio.optional-dependencies.e2e;
+  dependencies = with python3Packages; [
+    aiohttp
+    aiohttp-middlewares
+    aioredis
+    aiosqlite
+    appdirs
+    arrow
+    babel
+    bitstring
+    bleach
+    # botbuilder-core, connector for teams
+    certifi
+    click
+    # dialogflow, connector for Dialogflow
+    dnspython
+    emoji
+    get-video-properties
+    ibm-watson
+    (matrix-nio.override { withOlm = true; })
+    mattermostdriver
+    motor
+    multidict
+    nbconvert
+    nbformat
+    opsdroid-get-image-size
+    parse
+    puremagic
+    pycron
+    python-olm
+    pyyaml
+    regex
+    rich
+    slack-sdk
+    tailer
+    voluptuous
+    watchgod
+    webexteamssdk
+    wrapt
+  ];
 
   passthru.python = python3Packages.python;
 
diff --git a/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch b/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch
new file mode 100644
index 000000000000..f8ae4015a3f9
--- /dev/null
+++ b/pkgs/development/python-modules/matrix-nio/allow-tests-without-olm.patch
@@ -0,0 +1,59 @@
+diff --git a/tests/async_client_test.py b/tests/async_client_test.py
+index 846c854a32..3a66af2baa 100644
+--- a/tests/async_client_test.py
++++ b/tests/async_client_test.py
+@@ -129,7 +129,10 @@
+ )
+ from nio.api import EventFormat, ResizingMethod, RoomPreset, RoomVisibility
+ from nio.client.async_client import connect_wrapper, on_request_chunk_sent
+-from nio.crypto import OlmDevice, Session, decrypt_attachment
++try:
++    from nio.crypto import OlmDevice, Session, decrypt_attachment
++except ImportError:
++    pass
+ 
+ TEST_ROOM_ID = "!testroom:example.org"
+ 
+diff --git a/tests/conftest.py b/tests/conftest.py
+index ae37ca1169..e5f791a31e 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -9,11 +9,17 @@
+     async_client_pair,
+     async_client_pair_same_user,
+ )
+-from olm import Account
++try:
++    from olm import Account
++except ImportError:
++    pass
+ 
+ from nio import Client, ClientConfig, HttpClient
+-from nio.crypto import Olm, OlmDevice
+-from nio.store import SqliteMemoryStore
++try:
++    from nio.crypto import Olm, OlmDevice
++    from nio.store import SqliteMemoryStore
++except ImportError:
++    pass
+ 
+ ALICE_ID = "@alice:example.org"
+ ALICE_DEVICE_ID = "JLAFKJWSCS"
+diff --git a/tests/helpers.py b/tests/helpers.py
+index 63445b605a..05096d1dc3 100644
+--- a/tests/helpers.py
++++ b/tests/helpers.py
+@@ -26,8 +26,11 @@
+     WindowUpdateFrame,
+ )
+ 
+-from nio.crypto import OlmAccount, OlmDevice
+-from nio.store import Ed25519Key
++try:
++    from nio.crypto import OlmAccount, OlmDevice
++    from nio.store import Ed25519Key
++except ImportError:
++    pass
+ 
+ SAMPLE_SETTINGS = {
+     SettingsFrame.HEADER_TABLE_SIZE: 4096,
diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix
index 6e28fe1cffef..2ddbc6bb58a3 100644
--- a/pkgs/development/python-modules/matrix-nio/default.nix
+++ b/pkgs/development/python-modules/matrix-nio/default.nix
@@ -38,6 +38,8 @@
   pantalaimon,
   weechatScripts,
   zulip,
+
+  withOlm ? false,
 }:
 
 buildPythonPackage rec {
@@ -52,9 +54,14 @@ buildPythonPackage rec {
     hash = "sha256-XlswVHLvKOi1qr+I7Mbm4IBjn1DG7glgDsNY48NA5Ew=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  patches = [
+    # Ignore olm import failures when testing
+    ./allow-tests-without-olm.patch
+  ];
 
-  propagatedBuildInputs = [
+  build-system = [ poetry-core ];
+
+  dependencies = [
     aiofiles
     aiohttp
     aiohttp-socks
@@ -63,13 +70,9 @@ buildPythonPackage rec {
     jsonschema
     pycryptodome
     unpaddedbase64
-  ];
+  ] ++ lib.optionals withOlm optional-dependencies.e2e;
 
-  pythonRelaxDeps = [
-    "aiohttp-socks" # Pending matrix-nio/matrix-nio#516
-  ];
-
-  passthru.optional-dependencies = {
+  optional-dependencies = {
     e2e = [
       atomicwrites
       cachetools
@@ -78,6 +81,10 @@ buildPythonPackage rec {
     ];
   };
 
+  pythonRelaxDeps = [
+    "aiohttp-socks" # Pending matrix-nio/matrix-nio#516
+  ];
+
   nativeCheckInputs = [
     aioresponses
     faker
@@ -87,17 +94,60 @@ buildPythonPackage rec {
     pytest-aiohttp
     pytest-benchmark
     pytestCheckHook
-  ] ++ passthru.optional-dependencies.e2e;
+  ];
 
   pytestFlagsArray = [ "--benchmark-disable" ];
 
-  disabledTests = [
-    # touches network
-    "test_connect_wrapper"
-    # time dependent and flaky
-    "test_transfer_monitor_callbacks"
+  disabledTestPaths = lib.optionals (!withOlm) [
+    "tests/encryption_test.py"
+    "tests/key_export_test.py"
+    "tests/memory_store_test.py"
+    "tests/sas_test.py"
+    "tests/sessions_test.py"
+    "tests/store_test.py"
   ];
 
+  disabledTests =
+    [
+      # touches network
+      "test_connect_wrapper"
+      # time dependent and flaky
+      "test_transfer_monitor_callbacks"
+    ]
+    ++ lib.optionals (!withOlm) [
+      "test_client_account_sharing"
+      "test_client_key_query"
+      "test_client_login"
+      "test_client_protocol_error"
+      "test_client_restore_login"
+      "test_client_room_creation"
+      "test_device_store"
+      "test_e2e_sending"
+      "test_early_store_loading"
+      "test_encrypted_data_generator"
+      "test_http_client_keys_query"
+      "test_key_claiming"
+      "test_key_exports"
+      "test_key_invalidation"
+      "test_key_sharing"
+      "test_key_sharing_callbacks"
+      "test_key_sharing_cancellation"
+      "test_keys_query"
+      "test_keys_upload"
+      "test_marking_sessions_as_shared"
+      "test_message_sending"
+      "test_query_rule"
+      "test_room_devices"
+      "test_sas_verification"
+      "test_sas_verification_cancel"
+      "test_session_sharing"
+      "test_session_sharing_2"
+      "test_session_unwedging"
+      "test_storing_room_encryption_state"
+      "test_sync_forever"
+      "test_sync_token_restoring"
+    ];
+
   passthru.tests = {
     inherit (nixosTests)
       dendrite

From e8c134f783a909edfdc673938c9559c5f4eadb95 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 21 Aug 2024 23:42:02 -0300
Subject: [PATCH 044/149] libbytesize: migrate to by-name

---
 .../default.nix => by-name/li/libbytesize/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/libbytesize/default.nix => by-name/li/libbytesize/package.nix} (100%)

diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/by-name/li/libbytesize/package.nix
similarity index 100%
rename from pkgs/development/libraries/libbytesize/default.nix
rename to pkgs/by-name/li/libbytesize/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86ab62a60c81..45d31c3d5cb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21167,8 +21167,6 @@ with pkgs;
 
   libbs2b = callPackage ../development/libraries/audio/libbs2b { };
 
-  libbytesize = callPackage ../development/libraries/libbytesize { };
-
   libcaca = callPackage ../development/libraries/libcaca { };
 
   libcacard = callPackage ../development/libraries/libcacard { };

From 487bca6f29095fd55888ad8eee8e55af334c0ab8 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 25 Aug 2024 11:30:29 -0300
Subject: [PATCH 045/149] libbytesize: nixfmt-rfc-style

---
 pkgs/by-name/li/libbytesize/package.nix | 38 ++++++++++++++-----------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix
index f0af39cc8810..57942d672fba 100644
--- a/pkgs/by-name/li/libbytesize/package.nix
+++ b/pkgs/by-name/li/libbytesize/package.nix
@@ -1,17 +1,18 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, docbook_xml_dtd_43
-, docbook_xsl
-, gettext
-, gmp
-, gtk-doc
-, libxslt
-, mpfr
-, pcre2
-, pkg-config
-, python3
+{
+  lib,
+  autoreconfHook,
+  docbook_xml_dtd_43,
+  docbook_xsl,
+  fetchFromGitHub,
+  gettext,
+  gmp,
+  gtk-doc,
+  libxslt,
+  mpfr,
+  pcre2,
+  pkg-config,
+  python3,
+  stdenv,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,7 +26,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-IPBoYcnSQ1/ws3mzPUXxgbetZkXRWrGhtakXaVVFb6U=";
   };
 
-  outputs = [ "out" "dev" "devdoc" "man" ];
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+    "man"
+  ];
 
   nativeBuildInputs = [
     autoreconfHook
@@ -49,8 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     homepage = "https://github.com/storaged-project/libbytesize";
     description = "Tiny library providing a C 'class' for working with arbitrary big sizes in bytes";
-    mainProgram = "bscalc";
     license = lib.licenses.lgpl2Plus;
+    mainProgram = "bscalc";
     maintainers = with lib.maintainers; [ AndersonTorres ];
     platforms = lib.platforms.linux;
   };

From 207d668c49bd21de51c6804eb0647e3b989e0d85 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 25 Aug 2024 11:34:55 -0300
Subject: [PATCH 046/149] libbytesize: 2.10 -> 2.11

---
 pkgs/by-name/li/libbytesize/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libbytesize/package.nix b/pkgs/by-name/li/libbytesize/package.nix
index 57942d672fba..bd395682cc14 100644
--- a/pkgs/by-name/li/libbytesize/package.nix
+++ b/pkgs/by-name/li/libbytesize/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libbytesize";
-  version = "2.10";
+  version = "2.11";
 
   src = fetchFromGitHub {
     owner = "storaged-project";
     repo = "libbytesize";
     rev = finalAttrs.version;
-    hash = "sha256-IPBoYcnSQ1/ws3mzPUXxgbetZkXRWrGhtakXaVVFb6U=";
+    hash = "sha256-scOnucn7xp6KKEtkpwfyrdzcntJF2l0h0fsQotcceLc=";
   };
 
   outputs = [

From 01033afa0b4c85534eaf10776b7c2b8cc6d12986 Mon Sep 17 00:00:00 2001
From: WeetHet <stas.ale66@gmail.com>
Date: Tue, 27 Aug 2024 13:56:09 +0300
Subject: [PATCH 047/149] raylib: fix darwin builds

---
 pkgs/development/libraries/raylib/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix
index 944896d1cf57..2cdde4f2b726 100644
--- a/pkgs/development/libraries/raylib/default.nix
+++ b/pkgs/development/libraries/raylib/default.nix
@@ -36,9 +36,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    autoPatchelfHook
     cmake
-  ];
+  ] ++ lib.optional stdenv.isLinux autoPatchelfHook;
 
   buildInputs = [ glfw ]
     ++ lib.optionals stdenv.isLinux [ mesa libXi libXcursor libXrandr libXinerama ]
@@ -71,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # fix libasound.so/libpulse.so not being found
-  appendRunpaths = [
+  appendRunpaths = lib.optionals stdenv.isLinux [
     (lib.makeLibraryPath (lib.optional alsaSupport alsa-lib ++ lib.optional pulseSupport libpulseaudio))
   ];
 

From 1e14ee7532f126fe2c85245a1f9a4bcf01de2a16 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m@matteopacini.me>
Date: Tue, 27 Aug 2024 17:41:10 +0100
Subject: [PATCH 048/149] keycastr: added update script

---
 pkgs/by-name/ke/keycastr/package.nix |  2 ++
 pkgs/by-name/ke/keycastr/update.sh   | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100755 pkgs/by-name/ke/keycastr/update.sh

diff --git a/pkgs/by-name/ke/keycastr/package.nix b/pkgs/by-name/ke/keycastr/package.nix
index 8259a8bb400d..5eca502af147 100644
--- a/pkgs/by-name/ke/keycastr/package.nix
+++ b/pkgs/by-name/ke/keycastr/package.nix
@@ -24,6 +24,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     homepage = "https://github.com/keycastr/keycastr";
     description = "Open-source keystroke visualizer";
diff --git a/pkgs/by-name/ke/keycastr/update.sh b/pkgs/by-name/ke/keycastr/update.sh
new file mode 100755
index 000000000000..b564ff9f52e0
--- /dev/null
+++ b/pkgs/by-name/ke/keycastr/update.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq gnused
+
+set -euo pipefail
+
+cd "$(dirname "$0")" || exit 1
+
+# Grab latest release version
+LATEST_VER="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/keycastr/keycastr/releases/latest" | jq -r '.tag_name' | sed 's/^v//')"
+CURRENT_VER="$(grep -oP 'version = "\K[^"]+' package.nix)"
+
+if [[ "$LATEST_VER" == "$CURRENT_VER" ]]; then
+    echo "keycastr is up-to-date"
+    exit 0
+fi
+
+HASH="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/keycastr/keycastr/releases/download/v${LATEST_VER}/KeyCastr.app.zip")")"
+
+sed -i "s#hash = \".*\"#hash = \"$HASH\"#g" package.nix
+sed -i "s#version = \".*\";#version = \"$LATEST_VER\";#g" package.nix

From 4db845690e766f84dab0daaeb310ee9b7e855c26 Mon Sep 17 00:00:00 2001
From: Jacob Birkett <jacob@birkett.dev>
Date: Thu, 22 Aug 2024 03:08:59 -0700
Subject: [PATCH 049/149] tidal-hifi: call wrapGAppsHook3

---
 pkgs/applications/audio/tidal-hifi/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/tidal-hifi/default.nix b/pkgs/applications/audio/tidal-hifi/default.nix
index 375e2b7d4635..1a5b41808a75 100644
--- a/pkgs/applications/audio/tidal-hifi/default.nix
+++ b/pkgs/applications/audio/tidal-hifi/default.nix
@@ -4,6 +4,7 @@
 , autoPatchelfHook
 , dpkg
 , makeWrapper
+, wrapGAppsHook3
 , alsa-lib
 , at-spi2-atk
 , at-spi2-core
@@ -44,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-gDinm7kILm4SKlWmaJ1grwRuketGs/aWlJfNEF+AIRo=";
   };
 
-  nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper ];
+  nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook3 ];
 
   buildInputs = [
     alsa-lib

From af241d460784de58cb4fb6a4c0a307ee3efa069b Mon Sep 17 00:00:00 2001
From: WeetHet <stas.ale66@gmail.com>
Date: Thu, 29 Aug 2024 11:16:31 +0300
Subject: [PATCH 050/149] raylib-python-cffi: fix builds on darwin

---
 .../raylib-python-cffi/default.nix            | 44 +++++++++++++++----
 .../raylib-python-cffi/fix_macos_raylib.patch | 11 +++++
 2 files changed, 46 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/python-modules/raylib-python-cffi/fix_macos_raylib.patch

diff --git a/pkgs/development/python-modules/raylib-python-cffi/default.nix b/pkgs/development/python-modules/raylib-python-cffi/default.nix
index f1d46c1822d1..e77e357b3f3a 100644
--- a/pkgs/development/python-modules/raylib-python-cffi/default.nix
+++ b/pkgs/development/python-modules/raylib-python-cffi/default.nix
@@ -1,4 +1,6 @@
 {
+  stdenv,
+  gcc,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
@@ -9,9 +11,19 @@
   raylib,
   physac,
   raygui,
-  lib
+  darwin,
+  lib,
 }:
 
+let
+  inherit (darwin.apple_sdk.frameworks)
+    OpenGL
+    Cocoa
+    IOKit
+    CoreFoundation
+    CoreVideo
+    ;
+in
 buildPythonPackage rec {
   pname = "raylib-python-cffi";
   version = "5.0.0.2";
@@ -31,22 +43,36 @@ buildPythonPackage rec {
     # This patch fixes to the builder script function to call pkg-config
     # using the library name rather than searching only through raylib
     ./fix_pyray_builder.patch
+
+    # use get_lib_flags() instead of linking to libraylib.a directly
+    ./fix_macos_raylib.patch
   ];
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    gcc
+  ];
 
   # tests require a graphic environment
   doCheck = false;
 
   pythonImportsCheck = [ "pyray" ];
 
-  buildInputs = [
-    glfw
-    libffi
-    raylib
-    physac
-    raygui
-  ];
+  buildInputs =
+    [
+      glfw
+      libffi
+      raylib
+      physac
+      raygui
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      OpenGL
+      Cocoa
+      IOKit
+      CoreFoundation
+      CoreVideo
+    ];
 
   meta = {
     description = "Python CFFI bindings for Raylib";
diff --git a/pkgs/development/python-modules/raylib-python-cffi/fix_macos_raylib.patch b/pkgs/development/python-modules/raylib-python-cffi/fix_macos_raylib.patch
new file mode 100644
index 000000000000..be2f41a3720c
--- /dev/null
+++ b/pkgs/development/python-modules/raylib-python-cffi/fix_macos_raylib.patch
@@ -0,0 +1,11 @@
+--- a/raylib/build.py
++++ b/raylib/build.py
+@@ -158,7 +158,7 @@ def build_unix():
+
+     if platform.system() == "Darwin":
+         print("BUILDING FOR MAC")
+-        extra_link_args = [get_the_lib_path() + '/libraylib.a', '-framework', 'OpenGL', '-framework', 'Cocoa',
++        extra_link_args = get_lib_flags() + ['-framework', 'OpenGL', '-framework', 'Cocoa',
+                            '-framework', 'IOKit', '-framework', 'CoreFoundation', '-framework',
+                            'CoreVideo']
+         libraries = []

From 5ec3aafd5f7cc72b50674b8f028449c4d9f910dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 Aug 2024 18:48:16 +0000
Subject: [PATCH 051/149] handheld-daemon: 3.3.8 -> 3.3.11

---
 pkgs/by-name/ha/handheld-daemon/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index c0a289250704..565732418ebd 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -8,14 +8,14 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "handheld-daemon";
-  version = "3.3.8";
+  version = "3.3.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hhd-dev";
     repo = "hhd";
     rev = "refs/tags/v${version}";
-    hash = "sha256-15vG+e509CEagZ+G9FcfRmsdD8Jex8xUfdvEKlY+FaI=";
+    hash = "sha256-vjJY9YrULRHEgVIgzwLS5gKfQnbHFKXigU+rlm+BiJQ=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 96de48f57a711e6d4502f6defa0271becd4c64a7 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 29 Aug 2024 22:53:39 +0200
Subject: [PATCH 052/149] ntirpc: 5.8 -> 6.0.1

---
 pkgs/development/libraries/ntirpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix
index 5ae6380849c8..03e2624b624f 100644
--- a/pkgs/development/libraries/ntirpc/default.nix
+++ b/pkgs/development/libraries/ntirpc/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ntirpc";
-  version = "5.8";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = "nfs-ganesha";
     repo = "ntirpc";
     rev = "v${version}";
-    sha256 = "sha256-t9InlnlwVts9mlrH8sHaaTYSrjJKlkFlGs1YCmZzjdE=";
+    sha256 = "sha256-Txtc0Oyt/WfZiMe26uMzx3HFq/YaeU6cYfjPQwh0uQg=";
   };
 
   postPatch = ''

From dbadf9d8c6452dd420f73841b9f232d509214479 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 29 Aug 2024 23:07:08 +0200
Subject: [PATCH 053/149] ntirpc: split output -> out, dev

---
 pkgs/development/libraries/ntirpc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/ntirpc/default.nix b/pkgs/development/libraries/ntirpc/default.nix
index 03e2624b624f..e7100e66f384 100644
--- a/pkgs/development/libraries/ntirpc/default.nix
+++ b/pkgs/development/libraries/ntirpc/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Txtc0Oyt/WfZiMe26uMzx3HFq/YaeU6cYfjPQwh0uQg=";
   };
 
+  outputs = [ "out" "dev" ];
   postPatch = ''
     substituteInPlace ntirpc/netconfig.h --replace "/etc/netconfig" "$out/etc/netconfig"
     sed '1i#include <assert.h>' -i src/work_pool.c

From 7871866169bd836e8bae76a8e6070c572c827530 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 29 Aug 2024 23:08:53 +0200
Subject: [PATCH 054/149] nfs-ganesha: 5.9 -> 6.0

---
 pkgs/servers/nfs-ganesha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nfs-ganesha/default.nix b/pkgs/servers/nfs-ganesha/default.nix
index c5d3d97d629f..ad9d880b8540 100644
--- a/pkgs/servers/nfs-ganesha/default.nix
+++ b/pkgs/servers/nfs-ganesha/default.nix
@@ -5,14 +5,14 @@
 
 stdenv.mkDerivation rec {
   pname = "nfs-ganesha";
-  version = "5.9";
+  version = "6.0";
   outputs = [ "out" "tools" ];
 
   src = fetchFromGitHub {
     owner = "nfs-ganesha";
     repo = "nfs-ganesha";
     rev = "V${version}";
-    sha256 = "sha256-YFQcqRZenJUdTnlYM7gPnIxU47dytSHk5ALdbpSf5Ms=";
+    sha256 = "sha256-tT8m4X2OgANreTljqAYcCN0HTu++boFBmzyha7XGo8Y=";
   };
 
   preConfigure = "cd src";

From 22e16c025fbc88e76a58f4690f8dd6bbbc03a9a8 Mon Sep 17 00:00:00 2001
From: Valentin Chassignol <valentin.chassignol@infomaniak.com>
Date: Tue, 23 Jul 2024 10:16:59 +0200
Subject: [PATCH 055/149] python312Packages.doc8: relaxing dependancies on
 docutils

---
 pkgs/development/python-modules/doc8/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix
index bd47412044f6..68c9377d3bff 100644
--- a/pkgs/development/python-modules/doc8/default.nix
+++ b/pkgs/development/python-modules/doc8/default.nix
@@ -53,6 +53,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  pythonRelaxDeps = [ "docutils" ];
+
   pythonImportsCheck = [ "doc8" ];
 
   meta = with lib; {

From 3b9b9b38d7f82248c72446f2aa4f217cf190a419 Mon Sep 17 00:00:00 2001
From: Valentin Chassignol <valentin.chassignol@infomaniak.com>
Date: Thu, 11 Jul 2024 11:34:30 +0200
Subject: [PATCH 056/149] python12Packages.osprofiler: init at 4.1.0

---
 .../python-modules/osprofiler/default.nix     | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/osprofiler/default.nix

diff --git a/pkgs/development/python-modules/osprofiler/default.nix b/pkgs/development/python-modules/osprofiler/default.nix
new file mode 100644
index 000000000000..546d7e5fedf6
--- /dev/null
+++ b/pkgs/development/python-modules/osprofiler/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  netaddr,
+  oslo-concurrency,
+  oslo-serialization,
+  oslo-utils,
+  prettytable,
+  requests,
+  setuptools,
+  webob,
+}:
+
+buildPythonPackage rec {
+  pname = "osprofiler";
+  version = "4.1.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-V4N7YgWBsTREouIFZHddT8c+/2fHiIr5mUftWC/lFLA=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    netaddr
+    oslo-concurrency
+    oslo-serialization
+    oslo-utils
+    prettytable
+    requests
+    webob
+  ];
+
+  # NOTE(vinetos): OSProfiler depends on jeager-client which use opentracing
+  # Opentracing and jeager-client are archived since 2022.
+  # As this package is made only to support old OpenStack clients and bindings,
+  # We do not really care
+  doCheck = false;
+
+  pythonImportsCheck = [ "osprofiler" ];
+
+  meta = with lib; {
+    description = "OpenStack Library to profile request between all involved services";
+    homepage = "https://opendev.org/openstack/osprofiler/";
+    license = licenses.asl20;
+    maintainers = teams.openstack.members;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4332f6d5adcc..eb2d7311a37d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9761,6 +9761,8 @@ self: super: with self; {
 
   ospd = callPackage ../development/python-modules/ospd { };
 
+  osprofiler = callPackage ../development/python-modules/osprofiler { };
+
   osqp = callPackage ../development/python-modules/osqp { };
 
   oss2 = callPackage ../development/python-modules/oss2 { };

From 735db61d4b489f3eb541bb915ce0e2999f07437c Mon Sep 17 00:00:00 2001
From: Valentin Chassignol <valentin.chassignol@infomaniak.com>
Date: Tue, 23 Jul 2024 10:39:48 +0200
Subject: [PATCH 057/149] python312Packages.os-client-config: init at 2.1.0

---
 .../os-client-config/default.nix              | 62 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/python-modules/os-client-config/default.nix

diff --git a/pkgs/development/python-modules/os-client-config/default.nix b/pkgs/development/python-modules/os-client-config/default.nix
new file mode 100644
index 000000000000..e06fa9be9f4b
--- /dev/null
+++ b/pkgs/development/python-modules/os-client-config/default.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  fixtures,
+  hacking,
+  jsonschema,
+  openstacksdk,
+  oslotest,
+  python-glanceclient,
+  setuptools,
+  stestr,
+  subunit,
+  testscenarios,
+  testtools,
+}:
+
+buildPythonPackage rec {
+  pname = "os-client-config";
+  version = "2.1.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-q8OKNR+MAG009+5fP2SN5ePs9kVcxdds/YidKRzfP04=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    openstacksdk
+    python-glanceclient
+  ];
+
+  nativeCheckInputs = [
+    hacking
+    fixtures
+    jsonschema
+    subunit
+    oslotest
+    stestr
+    testscenarios
+    testtools
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    stestr run
+
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "os_client_config" ];
+
+  meta = with lib; {
+    homepage = "https://opendev.org/openstack/os-client-config";
+    description = "Collect client configuration for using OpenStack in consistent and comprehensive manner";
+    license = licenses.asl20;
+    maintainers = teams.openstack.members;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb2d7311a37d..4589738e3eb4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9715,6 +9715,8 @@ self: super: with self; {
 
   orvibo = callPackage ../development/python-modules/orvibo { };
 
+  os-client-config = callPackage ../development/python-modules/os-client-config { };
+
   os-service-types = callPackage ../development/python-modules/os-service-types { };
 
   osc = callPackage ../development/python-modules/osc { };

From 03b19fdb87ea7a1f2822405649b2c1187fab182a Mon Sep 17 00:00:00 2001
From: Valentin Chassignol <valentin.chassignol@infomaniak.com>
Date: Wed, 10 Jul 2024 17:51:33 +0200
Subject: [PATCH 058/149] python312Packages.python-neutronclient init at 11.3.1

---
 .../python-neutronclient/default.nix          | 98 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 100 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-neutronclient/default.nix

diff --git a/pkgs/development/python-modules/python-neutronclient/default.nix b/pkgs/development/python-modules/python-neutronclient/default.nix
new file mode 100644
index 000000000000..0c68f8c086db
--- /dev/null
+++ b/pkgs/development/python-modules/python-neutronclient/default.nix
@@ -0,0 +1,98 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  # Build and Runtime
+  pbr,
+  cliff,
+  debtcollector,
+  iso8601,
+  netaddr,
+  openstacksdk,
+  osc-lib,
+  oslo-i18n,
+  oslo-log,
+  oslo-serialization,
+  oslo-utils,
+  os-client-config,
+  keystoneauth1,
+  python-keystoneclient,
+  requests,
+  hacking,
+  # Tests
+  fixtures,
+  oslotest,
+  osprofiler,
+  python-openstackclient,
+  subunit,
+  requests-mock,
+  stestr,
+  testtools,
+  testscenarios,
+  tempest,
+}:
+
+buildPythonPackage rec {
+  pname = "python-neutronclient";
+  version = "11.3.1";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-U82ZI/Q6OwdypA41YfdGVa3IA4+QJhqz3gW2IR0S7cs=";
+  };
+
+  build-system = [
+    setuptools
+    pbr
+  ];
+
+  dependencies = [
+    cliff
+    debtcollector
+    iso8601
+    netaddr
+    openstacksdk
+    osc-lib
+    oslo-i18n
+    oslo-log
+    oslo-serialization
+    oslo-utils
+    os-client-config
+    keystoneauth1
+    python-keystoneclient
+    requests
+  ];
+
+  nativeCheckInputs = [
+    hacking
+    fixtures
+    oslotest
+    osprofiler
+    python-openstackclient
+    subunit
+    requests-mock
+    stestr
+    testtools
+    testscenarios
+    tempest
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    stestr run
+
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "neutronclient" ];
+
+  meta = with lib; {
+    description = "Python bindings for the OpenStack Networking API";
+    homepage = "https://opendev.org/openstack/python-neutronclient/";
+    license = licenses.asl20;
+    maintainers = teams.openstack.members;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4589738e3eb4..e327355e670a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13019,6 +13019,8 @@ self: super: with self; {
 
   python-mystrom = callPackage ../development/python-modules/python-mystrom { };
 
+  python-neutronclient = callPackage ../development/python-modules/python-neutronclient { };
+
   python-nest = callPackage ../development/python-modules/python-nest { };
 
   pythonnet = callPackage ../development/python-modules/pythonnet { };

From 3730b2575bc388cfaca17a2b863157137d89ae5d Mon Sep 17 00:00:00 2001
From: Valentin Chassignol <valentin.chassignol@infomaniak.com>
Date: Wed, 26 Jun 2024 09:36:37 +0200
Subject: [PATCH 059/149] pythonPackages.python-octaviaclient init at 3.7.0

---
 .../python-octaviaclient/default.nix          | 89 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 91 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-octaviaclient/default.nix

diff --git a/pkgs/development/python-modules/python-octaviaclient/default.nix b/pkgs/development/python-modules/python-octaviaclient/default.nix
new file mode 100644
index 000000000000..7b9017618e8f
--- /dev/null
+++ b/pkgs/development/python-modules/python-octaviaclient/default.nix
@@ -0,0 +1,89 @@
+{
+  lib,
+  buildPythonPackage,
+  cliff,
+  doc8,
+  docutils,
+  fetchPypi,
+  hacking,
+  keystoneauth1,
+  openstackclient,
+  openstackdocstheme,
+  osc-lib,
+  oslotest,
+  oslo-serialization,
+  oslo-utils,
+  pbr,
+  pygments,
+  python-neutronclient,
+  requests,
+  requests-mock,
+  setuptools,
+  sphinx,
+  sphinxcontrib-apidoc,
+  stestr,
+  subunit,
+  testscenarios,
+}:
+
+buildPythonPackage rec {
+  pname = "python-octaviaclient";
+  version = "3.7.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-wAGxByeRBOwdWZg2DwVpt1yGi5er3KQ/qhyRVAwaKe4=";
+  };
+
+  build-system = [
+    setuptools
+    pbr
+  ];
+
+  nativeBuildInputs = [
+    openstackdocstheme
+    sphinx
+    sphinxcontrib-apidoc
+  ];
+
+  dependencies = [
+    cliff
+    keystoneauth1
+    python-neutronclient
+    openstackclient
+    osc-lib
+    oslo-serialization
+    oslo-utils
+    requests
+  ];
+
+  nativeCheckInputs = [
+    hacking
+    requests-mock
+    doc8
+    docutils
+    pygments
+    subunit
+    oslotest
+    stestr
+    testscenarios
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    stestr run
+
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "octaviaclient" ];
+
+  meta = with lib; {
+    description = "OpenStack Octavia Command-line Client";
+    homepage = "https://opendev.org/openstack/python-octaviaclient/";
+    license = licenses.asl20;
+    maintainers = teams.openstack.members;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e327355e670a..35111599e506 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10591,6 +10591,8 @@ self: super: with self; {
 
   python-motionmount = callPackage ../development/python-modules/python-motionmount { };
 
+  python-octaviaclient = callPackage ../development/python-modules/python-octaviaclient { };
+
   python-otbr-api = callPackage ../development/python-modules/python-otbr-api { };
 
   python-openems = callPackage ../development/python-modules/python-openems { };

From 1a57c0eec97b060e0e3aab8f6a81d31b35a864a7 Mon Sep 17 00:00:00 2001
From: Valentin Chassignol <valentin.chassignol@infomaniak.com>
Date: Fri, 26 Jul 2024 08:59:14 +0200
Subject: [PATCH 060/149] teams.openstack: add vinetos to openstack team

---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index d304498ec593..f88125e56ccc 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -753,6 +753,7 @@ with lib.maintainers;
     members = [
       SuperSandro2000
       anthonyroussel
+      vinetos
     ];
     scope = "Maintain the ecosystem around OpenStack";
     shortName = "OpenStack";

From 090167236a961ee2c9dcb2dce7641c3e80def250 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 30 Aug 2024 21:27:12 +0100
Subject: [PATCH 061/149] networkmanager: 1.48.8 -> 1.48.10

Changes: https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/compare/1.48.8...1.48.10?from_project_id=411&straight=false
---
 pkgs/tools/networking/networkmanager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix
index 8f18bfd3cdaa..fbc7ec0857b5 100644
--- a/pkgs/tools/networking/networkmanager/default.nix
+++ b/pkgs/tools/networking/networkmanager/default.nix
@@ -60,11 +60,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "networkmanager";
-  version = "1.48.8";
+  version = "1.48.10";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
-    hash = "sha256-YgDqyPHT/mo+ofLEFYs8lbO5+R50zXBOl7CwUbWlSHg=";
+    hash = "sha256-XcGI/f/PLSPInTSx5jGaayAgPhLq7CSzADe36orIxhM=";
   };
 
   outputs = [ "out" "dev" "devdoc" "man" "doc" ];

From 8b17835309a5e963de495595c3666602c8d2f019 Mon Sep 17 00:00:00 2001
From: George Macon <george@themacons.net>
Date: Tue, 27 Aug 2024 20:15:47 -0400
Subject: [PATCH 062/149] mautrix-{meta,signal,whatsapp}: Optionally build
 against goolm

After olm gained knownVulnerabilities in #334638, allow building these
bridges using the pure-Go goolm library instead of libolm bindings.
---
 pkgs/by-name/ma/mautrix-meta/package.nix  |  9 ++++++++-
 pkgs/servers/mautrix-signal/default.nix   | 18 +++++++++++++++---
 pkgs/servers/mautrix-whatsapp/default.nix | 16 ++++++++++++++--
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix
index 17639dc432e3..9f497e00712b 100644
--- a/pkgs/by-name/ma/mautrix-meta/package.nix
+++ b/pkgs/by-name/ma/mautrix-meta/package.nix
@@ -3,6 +3,12 @@
 , lib
 , nixosTests
 , olm
+# This option enables the use of an experimental pure-Go implementation of the
+# Olm protocol instead of libolm for end-to-end encryption. Using goolm is not
+# recommended by the mautrix developers, but they are interested in people
+# trying it out in non-production-critical environments and reporting any
+# issues they run into.
+, withGoolm ? false
 }:
 
 buildGoModule rec {
@@ -18,7 +24,8 @@ buildGoModule rec {
     hash = "sha256-whBqhdB2FSFfrbtGtq8v3pjXW7QMt+I0baHTXVGPWVg=";
   };
 
-  buildInputs = [ olm ];
+  buildInputs = lib.optional (!withGoolm) olm;
+  tags = lib.optional withGoolm "goolm";
 
   vendorHash = "sha256-rP9wvF6yYW0TdQ+vQV6ZcVMxnCtqz8xRcd9v+4pYYio=";
 
diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix
index 309f7df1a62b..08894b5492f6 100644
--- a/pkgs/servers/mautrix-signal/default.nix
+++ b/pkgs/servers/mautrix-signal/default.nix
@@ -1,4 +1,16 @@
-{ lib, buildGoModule, fetchFromGitHub, olm, libsignal-ffi }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  olm,
+  libsignal-ffi,
+  # This option enables the use of an experimental pure-Go implementation of
+  # the Olm protocol instead of libolm for end-to-end encryption. Using goolm
+  # is not recommended by the mautrix developers, but they are interested in
+  # people trying it out in non-production-critical environments and reporting
+  # any issues they run into.
+  withGoolm ? false,
+}:
 
 buildGoModule rec {
   pname = "mautrix-signal";
@@ -11,12 +23,12 @@ buildGoModule rec {
     hash = "sha256-KBb/rLYM2ne4VD/bPy/lcXD0avCx3J74e3zDcmg+Dzs=";
   };
 
-  buildInputs = [
-    olm
+  buildInputs = (lib.optional (!withGoolm) olm) ++ [
     # must match the version used in https://github.com/mautrix/signal/tree/main/pkg/libsignalgo
     # see https://github.com/mautrix/signal/issues/401
     libsignal-ffi
   ];
+  tags = lib.optional withGoolm "goolm";
 
   vendorHash = "sha256-DDcz4O3RhV6OVI+qC/LkDW/UsE5jOAn5t/gmILxHx1s=";
 
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index d7bad1c9c79b..b66dad00dad5 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -1,4 +1,15 @@
-{ lib, buildGoModule, fetchFromGitHub, olm }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  olm,
+  # This option enables the use of an experimental pure-Go implementation of
+  # the Olm protocol instead of libolm for end-to-end encryption. Using goolm
+  # is not recommended by the mautrix developers, but they are interested in
+  # people trying it out in non-production-critical environments and reporting
+  # any issues they run into.
+  withGoolm ? false,
+}:
 
 buildGoModule rec {
   pname = "mautrix-whatsapp";
@@ -11,7 +22,8 @@ buildGoModule rec {
     hash = "sha256-iVILI6OGndnxIVmgNcIwHA64tkv9V3OTH3YtrCyeYx4=";
   };
 
-  buildInputs = [ olm ];
+  buildInputs = lib.optional (!withGoolm) olm;
+  tags = lib.optional withGoolm "goolm";
 
   vendorHash = "sha256-DpgkSXSLF+U6zIzJ4AF2uTcFWQQYsRgkaUTG9F+bnVk=";
 

From 2d54b2b0486fe1d07bfdd93656452584d82d3595 Mon Sep 17 00:00:00 2001
From: Tristan Gosselin-Hane <starcraft66@gmail.com>
Date: Fri, 30 Aug 2024 22:17:00 -0400
Subject: [PATCH 063/149] nixos/kubernetes: allow setting multiple kubelet dns
 resolvers

The current kubernetes module only allows you to set a single DNS
resolver for the kubelet. Historically, this has not mattered as the
value was passed to a cli argument as a string and as per the kubelet's
configuration parsing mechanism, multiple values could be passed as a
comma-delimited string. However, recently, the module was refactored to
make configure kubernetes components via configuration files rather than
the deprecated command-line arguments. These files more strongly-typed
than CLI arguments and to pass multiple values, one must define a list
in the file. When this change was made, an incorrect assumption was made
that only a single DNS server could be specified and forced a
single-item list into this configuration file. We need to introduce a
breaking change to the module in order to allow the user to supply their
own list with however many dns resolvers they wish to use.
---
 nixos/doc/manual/release-notes/rl-2411.section.md     | 2 ++
 nixos/modules/services/cluster/kubernetes/kubelet.nix | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 02b34eed060c..f5a00abd3973 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -119,6 +119,8 @@
 
 - `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.
 
+- `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.
+
 - `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust.
   The module was updated to accommodate for breaking changes.
   Breaking changes to the module API were minimised as much as possible,
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index fd9df556e7ec..cdbda5fc62f9 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -64,7 +64,7 @@ let
   } // lib.optionalAttrs (cfg.tlsCertFile != null)  { tlsCertFile = cfg.tlsCertFile; }
     // lib.optionalAttrs (cfg.tlsKeyFile != null)   { tlsPrivateKeyFile = cfg.tlsKeyFile; }
     // lib.optionalAttrs (cfg.clusterDomain != "")  { clusterDomain = cfg.clusterDomain; }
-    // lib.optionalAttrs (cfg.clusterDns != "")     { clusterDNS = [ cfg.clusterDns ] ; }
+    // lib.optionalAttrs (cfg.clusterDns != [])     { clusterDNS = cfg.clusterDns; }
     // lib.optionalAttrs (cfg.featureGates != {})   { featureGates = cfg.featureGates; }
   ));
 
@@ -112,8 +112,8 @@ in
 
     clusterDns = mkOption {
       description = "Use alternative DNS.";
-      default = "10.1.0.1";
-      type = str;
+      default = [ "10.1.0.1" ];
+      type = listOf str;
     };
 
     clusterDomain = mkOption {

From 1bc7736ae73275d9be5afa70b51ccc0be5320589 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 31 Aug 2024 09:40:41 +0200
Subject: [PATCH 064/149] python312Packages.cirq-core: 1.4.0 -> 1.4.1

Diff: https://github.com/quantumlib/cirq/compare/refs/tags/v1.4.0...v1.4.1

Changelog: https://github.com/quantumlib/Cirq/releases/tag/v1.4.1
---
 pkgs/development/python-modules/cirq-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index e12dc6f3255e..c436c208c255 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "cirq-core";
-  version = "1.4.0";
+  version = "1.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = "quantumlib";
     repo = "cirq";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KHwVq0qVtc8E9i2lugILYNwk9awq952w0x4DM+HG7Pg=";
+    hash = "sha256-1GcRDVgYF+1igZQFlQbiWZmU1WNIJh4CcOftQe6OP6I=";
   };
 
   sourceRoot = "${src.name}/${pname}";

From 894bd64a4d03cd907eb8cfd1d1352d54a48fdfb7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 31 Aug 2024 09:54:41 +0200
Subject: [PATCH 065/149] python312Packages.duet: 0.2.7 -> 0.2.9

Diff: https://github.com/google/duet/compare/refs/tags/v0.2.7...v0.2.9
---
 .../python-modules/duet/default.nix            | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/duet/default.nix b/pkgs/development/python-modules/duet/default.nix
index de9685345ba1..2f9720bc0de1 100644
--- a/pkgs/development/python-modules/duet/default.nix
+++ b/pkgs/development/python-modules/duet/default.nix
@@ -3,25 +3,33 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
+  pythonOlder,
+  setuptools,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "duet";
-  version = "0.2.7";
-  format = "setuptools";
+  version = "0.2.9";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "duet";
-    rev = "v${version}";
-    hash = "sha256-9CTAupAxZI1twoLpgr7VfECw70QunE6pk+SskiT3JDw=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-P7JxUigD7ZyhtocV+YuAVxuUYVa4F7PpXuA1CCmcMvg=";
   };
 
-  propagatedBuildInputs = [ typing-extensions ];
+  build-system = [ setuptools ];
+
+  dependencies = [ typing-extensions ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  pythonImportsCheck = [ "duet" ];
+
   meta = with lib; {
     description = "Simple future-based async library for python";
     homepage = "https://github.com/google/duet";

From 550100413006f0358e7aa53e37eb2912e1e0f1ef Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 31 Aug 2024 13:00:13 +0200
Subject: [PATCH 066/149] python312Packages.cirq-rigetti: unbreak

---
 pkgs/development/python-modules/cirq-rigetti/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/cirq-rigetti/default.nix b/pkgs/development/python-modules/cirq-rigetti/default.nix
index 932ab71a1500..d6848fe013a4 100644
--- a/pkgs/development/python-modules/cirq-rigetti/default.nix
+++ b/pkgs/development/python-modules/cirq-rigetti/default.nix
@@ -84,9 +84,4 @@ buildPythonPackage rec {
 
   # cirq's importlib hook doesn't work here
   #pythonImportsCheck = [ "cirq_rigetti" ];
-
-  meta = cirq-core.meta // {
-    # ModuleNotFoundError: No module named 'pyquil.parser'
-    broken = lib.versionAtLeast pyquil.version "4";
-  };
 }

From 5946122ff93217fc0c26bb2e88fb00a35f9f3666 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 31 Aug 2024 13:21:30 +0200
Subject: [PATCH 067/149] python312Pasckages.cirq-ft: remove

---
 .../python-modules/cirq-ft/default.nix        | 45 -------------------
 .../python-modules/cirq/default.nix           |  3 --
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 4 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/development/python-modules/cirq-ft/default.nix

diff --git a/pkgs/development/python-modules/cirq-ft/default.nix b/pkgs/development/python-modules/cirq-ft/default.nix
deleted file mode 100644
index 6ee4c28c8879..000000000000
--- a/pkgs/development/python-modules/cirq-ft/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  attrs,
-  buildPythonPackage,
-  cachetools,
-  cirq-core,
-  ipython,
-  ipywidgets,
-  nbconvert,
-  nbformat,
-  pytestCheckHook,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "cirq-ft";
-  pyproject = true;
-  inherit (cirq-core) version src meta;
-
-  sourceRoot = "${src.name}/${pname}";
-
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
-    attrs
-    cachetools
-    cirq-core
-    ipython
-    ipywidgets
-    nbconvert
-    nbformat
-  ];
-
-  nativeCheckInputs = [
-    ipython
-    pytestCheckHook
-  ];
-
-  disabledTests = [
-    # Upstream doesn't always adjust the version
-    "test_version"
-  ];
-
-  # cirq's importlib hook doesn't work here
-  #pythonImportsCheck = [ "cirq_ft" ];
-}
diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix
index d640655c4cd8..54eee66b5f20 100644
--- a/pkgs/development/python-modules/cirq/default.nix
+++ b/pkgs/development/python-modules/cirq/default.nix
@@ -2,7 +2,6 @@
   buildPythonPackage,
   cirq-aqt,
   cirq-core,
-  cirq-ft,
   cirq-google,
   cirq-ionq,
   cirq-pasqal,
@@ -19,7 +18,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     cirq-aqt
     cirq-core
-    cirq-ft
     cirq-ionq
     cirq-google
     cirq-rigetti
@@ -34,7 +32,6 @@ buildPythonPackage rec {
   disabledTestPaths = [
     "cirq-aqt"
     "cirq-core"
-    "cirq-ft"
     "cirq-google"
     "cirq-ionq"
     "cirq-pasqal"
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index d210b6970090..fd78ca2714e1 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -97,6 +97,7 @@ mapAliases ({
   chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
   chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
   class-registry = phx-class-registry; # added 2021-10-05
+  cirq-ft = throw "cirq-ft is not longer provieded by cirq upstream"; # added 2024-08-31
   cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20
   clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
   clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4332f6d5adcc..479bfccd92a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2221,8 +2221,6 @@ self: super: with self; {
 
   cirq-core = callPackage ../development/python-modules/cirq-core { };
 
-  cirq-ft = callPackage ../development/python-modules/cirq-ft { };
-
   cirq-ionq = callPackage ../development/python-modules/cirq-ionq { };
 
   cirq-google = callPackage ../development/python-modules/cirq-google { };

From 25e518ac628524ed23feb116763c510ffeb0a166 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 31 Aug 2024 13:21:45 +0200
Subject: [PATCH 068/149] python312Packages.cirq-core: refactor

---
 .../python-modules/cirq-core/default.nix      | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/cirq-core/default.nix b/pkgs/development/python-modules/cirq-core/default.nix
index c436c208c255..b2cf178596b5 100644
--- a/pkgs/development/python-modules/cirq-core/default.nix
+++ b/pkgs/development/python-modules/cirq-core/default.nix
@@ -1,39 +1,38 @@
 {
   lib,
   stdenv,
-  buildPythonPackage,
-  pythonOlder,
-  fetchFromGitHub,
   attrs,
+  autoray ? null,
+  buildPythonPackage,
   duet,
+  fetchFromGitHub,
+  freezegun,
   matplotlib,
   networkx,
   numpy,
+  opt-einsum,
   pandas,
+  ply,
+  pylatex ? null,
+  pyquil ? null,
+  pytest-asyncio,
+  pytestCheckHook,
+  pythonOlder,
+  quimb ? null,
   requests,
   scipy,
+  setuptools,
   sortedcontainers,
   sympy,
   tqdm,
   typing-extensions,
-  # Contrib requirements
   withContribRequires ? false,
-  autoray ? null,
-  opt-einsum,
-  ply,
-  pylatex ? null,
-  pyquil ? null,
-  quimb ? null,
-  # test inputs
-  pytestCheckHook,
-  freezegun,
-  pytest-asyncio,
 }:
 
 buildPythonPackage rec {
   pname = "cirq-core";
   version = "1.4.1";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.9";
 
@@ -51,7 +50,9 @@ buildPythonPackage rec {
       --replace "matplotlib~=3.0" "matplotlib"
   '';
 
-  propagatedBuildInputs =
+  build-system = [ setuptools ];
+
+  dependencies =
     [
       attrs
       duet

From 62a30ca4917d80ba2686a09d2cc26943666929f9 Mon Sep 17 00:00:00 2001
From: ilaumjd <ilaumjd@gmail.com>
Date: Fri, 16 Aug 2024 22:02:09 +0700
Subject: [PATCH 069/149] python312Packages.howdoi: remove broken mark on
 darwin and remove one bad test case

---
 pkgs/development/python-modules/howdoi/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix
index 53995d2de5d7..db109c2f70ee 100644
--- a/pkgs/development/python-modules/howdoi/default.nix
+++ b/pkgs/development/python-modules/howdoi/default.nix
@@ -1,5 +1,4 @@
 {
-  stdenv,
   lib,
   appdirs,
   buildPythonPackage,
@@ -7,6 +6,7 @@
   colorama,
   cssselect,
   fetchFromGitHub,
+  fetchpatch,
   keep,
   lxml,
   pygments,
@@ -31,6 +31,16 @@ buildPythonPackage rec {
     hash = "sha256-u0k+h7Sp2t/JUnfPqRzDpEA+vNXB7CpyZ/SRvk+B9t0=";
   };
 
+  patches = [
+    # Bad test case fix: comparing hardcoded string to internet search result
+    # PR merged: https://github.com/gleitz/howdoi/pull/497
+    # Please remove on the next release
+    (fetchpatch {
+      url = "https://github.com/gleitz/howdoi/commit/7d24e9e1c87811a6e66d60f504381383cf1ac3fd.patch";
+      sha256 = "sha256-AFQMnMEijaExqiimbNaVeIRmZJ4Yj0nGUOEjfsvBLh8=";
+    })
+  ];
+
   propagatedBuildInputs = [
     appdirs
     cachelib
@@ -55,7 +65,6 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "howdoi" ];
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
     changelog = "https://github.com/gleitz/howdoi/blob/v${version}/CHANGES.txt";
     description = "Instant coding answers via the command line";
     homepage = "https://github.com/gleitz/howdoi";

From dda0fa0e93d29943056db85e30341fc2dcae2f2c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 15 Aug 2024 08:57:38 +0200
Subject: [PATCH 070/149] python312Packages.llama-cloud: 0.0.11 -> 0.0.13

---
 pkgs/development/python-modules/llama-cloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix
index f949eef4cf6b..f75f11c4841c 100644
--- a/pkgs/development/python-modules/llama-cloud/default.nix
+++ b/pkgs/development/python-modules/llama-cloud/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-cloud";
-  version = "0.0.11";
+  version = "0.0.13";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_cloud";
     inherit version;
-    hash = "sha256-EAiCtSiJIGUhFDbaBIJS1X7KFNhoPS/eb4nusglQrBg=";
+    hash = "sha256-DjFloi+N80oA0T8fVzlDi6TWIPLYqSid+DAHijn+bx8=";
   };
 
   build-system = [ poetry-core ];

From 6e3e270000b0002d175ad23797bd4ae3d7e1fde7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:18:33 +0200
Subject: [PATCH 071/149] python311Packages.llama-index-core: 0.10.60 -> 0.11.3

Diff: https://github.com/run-llama/llama_index/compare/refs/tags/v0.10.60...v0.11.3

Changelog: https://github.com/run-llama/llama_index/blob/0.11.3/CHANGELOG.md
---
 .../python-modules/llama-index-core/default.nix        | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-core/default.nix b/pkgs/development/python-modules/llama-index-core/default.nix
index f6dab9b1f0fb..039ccc9a263c 100644
--- a/pkgs/development/python-modules/llama-index-core/default.nix
+++ b/pkgs/development/python-modules/llama-index-core/default.nix
@@ -47,7 +47,7 @@ in
 
 buildPythonPackage rec {
   pname = "llama-index-core";
-  version = "0.10.60";
+  version = "0.11.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     owner = "run-llama";
     repo = "llama_index";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CH/YTG0/SVDhwY1iN+K1s7cdTDFDZboO6N9208qLFf4=";
+    hash = "sha256-bgkuX7ukN7aEnaUyIbPQ7FoUtsUT9Tq326RQgXNnOpg=";
   };
 
   sourceRoot = "${src.name}/${pname}";
@@ -135,6 +135,12 @@ buildPythonPackage rec {
     "tests/tools/"
   ];
 
+  disabledTests = [
+    # Tests require network access
+    "test_from_namespaced_persist_dir"
+    "test_from_persist_dir"
+  ];
+
   meta = with lib; {
     description = "Data framework for your LLM applications";
     homepage = "https://github.com/run-llama/llama_index/";

From f180115f253b838766d5205be5148ea8f3ba130a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:20:07 +0200
Subject: [PATCH 072/149] python311Packages.llama-cloud: 0.0.13 -> 0.0.15

---
 pkgs/development/python-modules/llama-cloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-cloud/default.nix b/pkgs/development/python-modules/llama-cloud/default.nix
index f75f11c4841c..467dd9685c1c 100644
--- a/pkgs/development/python-modules/llama-cloud/default.nix
+++ b/pkgs/development/python-modules/llama-cloud/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-cloud";
-  version = "0.0.13";
+  version = "0.0.15";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_cloud";
     inherit version;
-    hash = "sha256-DjFloi+N80oA0T8fVzlDi6TWIPLYqSid+DAHijn+bx8=";
+    hash = "sha256-vgb9iI6IliN5a5wqoPwNCe8DntUUX/Jn2ECMy+pwwEg=";
   };
 
   build-system = [ poetry-core ];

From 1e31576fb0957c4207fed91883923fbefc0dcad1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:20:29 +0200
Subject: [PATCH 073/149] python311Packages.llama-parse: 0.4.9 -> 0.5.1

---
 pkgs/development/python-modules/llama-parse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix
index 051fc5745af2..c248a7cede96 100644
--- a/pkgs/development/python-modules/llama-parse/default.nix
+++ b/pkgs/development/python-modules/llama-parse/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-parse";
-  version = "0.4.9";
+  version = "0.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_parse";
     inherit version;
-    hash = "sha256-ZX+PpffTmfFMBFT8BcrmA02gNz8ZHfbPyhehtKcE74c=";
+    hash = "sha256-IGw0gUeR6WRNrtDaD61QTctrbVK9pUKoe8CB7aknAKA=";
   };
 
   build-system = [ poetry-core ];

From 4624b8ebcb055f1189c46ca2f89d7cfde17a4592 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:20:46 +0200
Subject: [PATCH 074/149] python311Packages.llama-index-vector-stores-qdrant:
 0.2.14 -> 0.3.0

---
 .../llama-index-vector-stores-qdrant/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
index 38bf71e35519..b45bfd7c0bd5 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-qdrant";
-  version = "0.2.14";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_qdrant";
     inherit version;
-    hash = "sha256-+wwwZNQXt2NBSVqYcF5ATiy5K2Cku+Auuhuni7usnKI=";
+    hash = "sha256-mWY86wyS3aVd+cBhY8pCvn6w86Z0AdWrjOlz987Wg6I=";
   };
 
   build-system = [ poetry-core ];

From 699e60626777e256b6a95b6ca50087d5203aa0d5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:21:07 +0200
Subject: [PATCH 075/149] python311Packages.llama-index-vector-stores-postgres:
 0.1.13 -> 0.2.1

---
 .../llama-index-vector-stores-postgres/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
index a07dd4e6f02d..fb8aa5970f88 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-postgres/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-postgres";
-  version = "0.1.13";
+  version = "0.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_postgres";
     inherit version;
-    hash = "sha256-aqSSgXb1fmEY98pj8xNQolDLOFbsq/UOXCVZReHYgD4=";
+    hash = "sha256-xjlFAa3HTJRP/34HaN4fN5BE1VvfAWSLDZnj2s/ES/U=";
   };
 
   pythonRemoveDeps = [ "psycopg2-binary" ];

From 4aed08e6f9fd98fcb2730f02650464948e9a78ec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:21:25 +0200
Subject: [PATCH 076/149] python311Packages.llama-index-vector-stores-google:
 0.1.5 -> 0.2.0

---
 .../llama-index-vector-stores-google/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix
index fcf3e0fa9742..aea4617dc992 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-google/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-google";
-  version = "0.1.5";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_google";
     inherit version;
-    hash = "sha256-E6RNf2DzktoZW89P0VKfmeZ5SEslGkyFLRxVtnsQOYc=";
+    hash = "sha256-7BEgRLkhyCo0z3puoWcFRqa+xG6vQdkKFWvr9oz6xs4=";
   };
 
   pythonRelaxDeps = [ "google-generativeai" ];

From e6f44b91754530f04cdfa2c8ecd8b0ac90be0241 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:37:02 +0200
Subject: [PATCH 077/149] python311Packages.llama-index-readers-weather: 0.1.3
 -> 0.2.0

---
 .../python-modules/llama-index-readers-weather/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-weather/default.nix b/pkgs/development/python-modules/llama-index-readers-weather/default.nix
index d3f84bf306f1..1eee073053bd 100644
--- a/pkgs/development/python-modules/llama-index-readers-weather/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-weather/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-weather";
-  version = "0.1.3";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_weather";
     inherit version;
-    hash = "sha256-LJy2nU9f+yZZQm9stNn9mIqOkT5lOHaMIIm1Ezf2D0Q=";
+    hash = "sha256-m4EaV14tcH2I5veHdgGjBloKKAShJqsJGS9Ci8xRnMg=";
   };
 
   build-system = [ poetry-core ];

From eb013334ef4f8cab19191d924f916e009ea9cedf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:37:18 +0200
Subject: [PATCH 078/149] python311Packages.llama-index-readers-txtai: 0.1.2 ->
 0.2.0

---
 .../python-modules/llama-index-readers-txtai/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix
index 0e8e43b4d4d3..6cf4a9fb87f4 100644
--- a/pkgs/development/python-modules/llama-index-readers-txtai/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-txtai/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-txtai";
-  version = "0.1.2";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_txtai";
     inherit version;
-    hash = "sha256-F1P3/ZICFDTqowpqu0AF2RIKfLTH9Phuw0O+VsHpI4U=";
+    hash = "sha256-jaCg3TeMkBKHtZRxpa5KrQb+uGP95qN1nWtrE08Oq98=";
   };
 
   build-system = [ poetry-core ];

From 866074dfe39effef18ab23816a209e88795a17aa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:37:34 +0200
Subject: [PATCH 079/149] python311Packages.llama-index-readers-twitter: 0.1.3
 -> 0.2.0

---
 .../python-modules/llama-index-readers-twitter/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix
index 168e3b691757..51bc5d549976 100644
--- a/pkgs/development/python-modules/llama-index-readers-twitter/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-twitter/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-twitter";
-  version = "0.1.3";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_twitter";
     inherit version;
-    hash = "sha256-ZPwluiPdSkwMZ3JQy/HHhR7erYhUE9BWtplkfHk+TK8=";
+    hash = "sha256-1bxg/tbv5NrMezm9OQUojiQGutv+yhWY4gkeUXb4z2o=";
   };
 
   build-system = [ poetry-core ];

From c2f09735d958a97c1f43aa7f792ade595c10f31f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:38:07 +0200
Subject: [PATCH 080/149] python311Packages.llama-index-readers-llama-parse:
 0.1.6 -> 0.2.0

---
 .../llama-index-readers-llama-parse/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix
index 877acc82c84d..ca574a141412 100644
--- a/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-llama-parse/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-llama-parse";
-  version = "0.1.6";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_llama_parse";
     inherit version;
-    hash = "sha256-BPLc+7D7h85wiQ9aL0+JlB15vmqBi0NzjwU1YOS0Uc8=";
+    hash = "sha256-xU6KIH1z77nwEWNqMKTBB2tD13o00lY9N03GfAzd/IM=";
   };
 
   pythonRelaxDeps = [ "llama-parse" ];

From 67d44516f3d53147ee1377f94ed163ba51ae5463 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:38:22 +0200
Subject: [PATCH 081/149] python311Packages.llama-index-readers-json: 0.1.5 ->
 0.2.0

---
 .../python-modules/llama-index-readers-json/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-json/default.nix b/pkgs/development/python-modules/llama-index-readers-json/default.nix
index 6ec922a3a262..0fcc1da35ef2 100644
--- a/pkgs/development/python-modules/llama-index-readers-json/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-json/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-json";
-  version = "0.1.5";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_json";
     inherit version;
-    hash = "sha256-H+CG+2FtoOF/DUG6EuAWzY2xe1upLX0pakVutJTZFE0=";
+    hash = "sha256-Sxya3Iw75sl6mGmKvRMe9Y8bIWh4cfXQPYbCyAvhnvU=";
   };
 
   build-system = [ poetry-core ];

From b2101fd600ce3ddf944dc1a26894681be14c4ec4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:38:39 +0200
Subject: [PATCH 082/149] python311Packages.llama-index-readers-file: 0.1.27 ->
 0.2.0

---
 .../python-modules/llama-index-readers-file/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix
index ee6c4453e4d5..2154758ae869 100644
--- a/pkgs/development/python-modules/llama-index-readers-file/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-file";
-  version = "0.1.27";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_file";
     inherit version;
-    hash = "sha256-BMm8MGOpQJ/Nh3932bKr/VAuBydjqm3XiODGN0GLhmQ=";
+    hash = "sha256-Vdt8MWZrqyst0vdi1iLy3I5zkzlDyS+IOIaKkB5QVwg=";
   };
 
   pythonRelaxDeps = [

From 4fd45d68c7002d34a28d74a3467447694eb6abb9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:38:54 +0200
Subject: [PATCH 083/149] python311Packages.llama-index-readers-database: 0.1.4
 -> 0.2.0

Changelog: https://github.com/run-llama/llama_index/blob/main/llama-index-integrations/readers/llama-index-readers-database/CHANGELOG.md
---
 .../python-modules/llama-index-readers-database/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-database/default.nix b/pkgs/development/python-modules/llama-index-readers-database/default.nix
index b6c36bbabe85..b77afe7b8dda 100644
--- a/pkgs/development/python-modules/llama-index-readers-database/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-database/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-database";
-  version = "0.1.4";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_database";
     inherit version;
-    hash = "sha256-x71+szDNDZNaVc8AMXruKvxSNXg561ibE2+kx53zHfI=";
+    hash = "sha256-/hI/3lCo0RpJ1yLJDFrnuQ565WoQQm9Sw7Sr4qp1fa0=";
   };
 
   build-system = [ poetry-core ];

From 985e654850e042293725a4ce4e680e4bfbbe3b3d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:40:03 +0200
Subject: [PATCH 084/149] python311Packages.llama-index-llms-openai: 0.1.27 ->
 0.2.0

---
 .../python-modules/llama-index-llms-openai/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
index 5a10557cc9cc..6e2426aa1807 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-openai";
-  version = "0.1.27";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_openai";
     inherit version;
-    hash = "sha256-N8LRFZtWYH06gH2QJg7iW08AIIbWJRxycq+8U/JRRgM=";
+    hash = "sha256-E8hdTPEr0Hueq5gFy8Qt+y410N/J3CZyDt0b3xwRKlQ=";
   };
 
   build-system = [ poetry-core ];

From 3eee0714f7d04e65083c40dfb4042811c5177c9e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:40:23 +0200
Subject: [PATCH 085/149] python311Packages.llama-index-llms-ollama: 0.2.2 ->
 0.3.0

---
 .../python-modules/llama-index-llms-ollama/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
index 998759b62920..010843defbe0 100644
--- a/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-ollama/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-ollama";
-  version = "0.2.2";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_ollama";
     inherit version;
-    hash = "sha256-DH8ZLLi3aHB71RVLl+KkEoRzLWIHDrdhkN7hJelSReo=";
+    hash = "sha256-nfL+cUwdw6zPc8J81dCEFoLpcCIKMBNNeCXkzvZgsdQ=";
   };
 
   build-system = [ poetry-core ];

From 533eec5eb77d1bdeeaa3504ca3949bbf45eb2d7c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:40:40 +0200
Subject: [PATCH 086/149] python311Packages.llama-index-legacy: 0.9.48 ->
 0.9.48.post3

---
 .../development/python-modules/llama-index-legacy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-legacy/default.nix b/pkgs/development/python-modules/llama-index-legacy/default.nix
index e7c350cdd0a0..f51ae416bb1d 100644
--- a/pkgs/development/python-modules/llama-index-legacy/default.nix
+++ b/pkgs/development/python-modules/llama-index-legacy/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-legacy";
-  version = "0.9.48";
+  version = "0.9.48.post3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_legacy";
     inherit version;
-    hash = "sha256-gt3EaR7b9JUz1lWCwkm6IsA/6W+9PpL3dY3M7yjkODQ=";
+    hash = "sha256-9pafEIXvsKvr1jZ+RvNRICDz9rnAhvRYpRmDDdYeggY=";
   };
 
   build-system = [ poetry-core ];

From e778af6ad619183c9499b35d41262248afaadd3e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:40:55 +0200
Subject: [PATCH 087/149] 
 python311Packages.llama-index-indices-managed-llama-cloud: 0.2.7 -> 0.3.0

---
 .../llama-index-indices-managed-llama-cloud/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix
index eeef4efe2ed8..e35110322bb3 100644
--- a/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix
+++ b/pkgs/development/python-modules/llama-index-indices-managed-llama-cloud/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-indices-managed-llama-cloud";
-  version = "0.2.7";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_indices_managed_llama_cloud";
     inherit version;
-    hash = "sha256-1+m0zFAhSzz8116mPKzOTuNgkstnLAA/Ff0jujHEnsA=";
+    hash = "sha256-AqHQtBP/+1UCLn6E4FeIzLGMvc9Uz+wEZthMVlUJ+uY=";
   };
 
   build-system = [ poetry-core ];

From f2773dad1af7f0cc94c9415eff9dfdffb87c0674 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:41:10 +0200
Subject: [PATCH 088/149] python311Packages.llama-index-graph-stores-neptune:
 0.1.3 -> 0.2.0

---
 .../llama-index-graph-stores-neptune/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix
index dbc2bd5238b1..b731a56dcbce 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-neptune/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-graph-stores-neptune";
-  version = "0.1.3";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_graph_stores_neptune";
     inherit version;
-    hash = "sha256-ZveFCJJT7Qal82cuVTs+3AmSuvdc7GsHqqqNvcDb3CY=";
+    hash = "sha256-dIbleh/I90xo7rYFXhCck2kfkywAYTlrawlPP0gDqIY=";
   };
 
   build-system = [ poetry-core ];

From c97896340e0fb43d622ddcd2f3516c7a023d225d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:41:48 +0200
Subject: [PATCH 089/149] python311Packages.llama-index-graph-stores-neo4j:
 0.2.11 -> 0.3.1

---
 .../python-modules/llama-index-graph-stores-neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
index 3700c2bc96ba..e74cb94aa181 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-graph-stores-neo4j";
-  version = "0.2.11";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_graph_stores_neo4j";
     inherit version;
-    hash = "sha256-nXKpwbE28vq2Ew8Vrw0rxveHBVbu6542wt+aM1t4xl0=";
+    hash = "sha256-v4rtGi47qyV6cDXfQcKuGrES9IjG/Se5zpnhktuoNHc=";
   };
 
   build-system = [ poetry-core ];

From 37af2273d4161974a7773b1b9c97761dd9e46d99 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:42:04 +0200
Subject: [PATCH 090/149] python311Packages.llama-index-graph-stores-nebula:
 0.2.0 -> 0.3.0

---
 .../llama-index-graph-stores-nebula/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
index cd093a05e17c..65be86795ec7 100644
--- a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
+++ b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-graph-stores-nebula";
-  version = "0.2.0";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_graph_stores_nebula";
     inherit version;
-    hash = "sha256-wX/j4wSUp12QlXLy0B0dUB0V7zjDX75NBE9mNWbj0w8=";
+    hash = "sha256-yT1jxJEnBKWcsHCgBPx8Ue+wkggdL9S2havmJtSYcD4=";
   };
 
   build-system = [ poetry-core ];

From f73bd8ab4aa4b586d74377098224b6359292f347 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:42:19 +0200
Subject: [PATCH 091/149] python311Packages.llama-index-embeddings-openai:
 0.1.10 -> 0.2.3

---
 .../python-modules/llama-index-embeddings-openai/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
index f6027aee43f8..0df7d65ac5e9 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-openai/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-openai";
-  version = "0.1.10";
+  version = "0.2.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_openai";
     inherit version;
-    hash = "sha256-G8H8m0Z3OhKHDF0wl9NzXXyjOAXxJGKo41ropuXOHPY=";
+    hash = "sha256-L3re9rYf1PG+pIcWb/ml/wYyJ2hrfbtdIifkZFCn7Ew=";
   };
 
   build-system = [ poetry-core ];

From 33c05922ce42b48c67fda3468c7c6c9bc5508a7a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:43:22 +0200
Subject: [PATCH 092/149] python311Packages.llama-index-embeddings-ollama:
 0.1.3 -> 0.3.0

---
 .../llama-index-embeddings-ollama/default.nix          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
index db3ef8d5b994..e82f1a8c7fdc 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-ollama/default.nix
@@ -3,13 +3,14 @@
   buildPythonPackage,
   fetchPypi,
   llama-index-core,
+  ollama,
   poetry-core,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-ollama";
-  version = "0.1.3";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -17,12 +18,15 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_ollama";
     inherit version;
-    hash = "sha256-S9HdMjDJvgTPpFsow6gGbkbBZU1DYPy+zcFxiskBPso=";
+    hash = "sha256-Q5pc0R473lBPrWqICF6UIX0mp4akY2SBqXBS7MIkB7Y=";
   };
 
   build-system = [ poetry-core ];
 
-  dependencies = [ llama-index-core ];
+  dependencies = [
+    llama-index-core
+    ollama
+  ];
 
   # Tests are only available in the mono repo
   doCheck = false;

From 78ef1712cbe29b2dc8bfee8d696a26b92ee97f38 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:43:51 +0200
Subject: [PATCH 093/149] python311Packages.llama-index-embeddings-huggingface:
 0.2.2 -> 0.3.1

---
 .../llama-index-embeddings-huggingface/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix
index 4da4ef2ab654..935590283d85 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-huggingface/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-huggingface";
-  version = "0.2.2";
+  version = "0.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_huggingface";
     inherit version;
-    hash = "sha256-Q7KXh0DSkpGuTHVmki0rHHVD3JeeJoeUtXjhoq37Qxk=";
+    hash = "sha256-eu9jJKGVdua5W/6SfDvU/BxXJe3Onya05dLu+ifAL9s=";
   };
 
   build-system = [ poetry-core ];

From 39ad874a30acfb694ea48971ce9ce61ca6e51949 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:44:10 +0200
Subject: [PATCH 094/149] python311Packages.llama-index-embeddings-google:
 0.1.6 -> 0.2.1

---
 .../python-modules/llama-index-embeddings-google/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix
index f848acf1fd42..060b3f562c49 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-google/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-google/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-google";
-  version = "0.1.6";
+  version = "0.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_google";
     inherit version;
-    hash = "sha256-XPqZ+4aZfrTGU4sOLxMElG6kuGVJa8/3uxW+icSHpzQ=";
+    hash = "sha256-7L24jKB7uFs+4OIIsXdweJ3TRuP4SFjY/p97ocUfmL8=";
   };
 
   pythonRelaxDeps = [ "google-generativeai" ];

From 1c9f6b26805139057bea898fefdcd1cabe6e5e0a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 01:44:27 +0200
Subject: [PATCH 095/149] python311Packages.llama-index-embeddings-gemini:
 0.1.8 -> 0.2.0

---
 .../python-modules/llama-index-embeddings-gemini/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
index 466f93653337..76dcdacb5c1e 100644
--- a/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
+++ b/pkgs/development/python-modules/llama-index-embeddings-gemini/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-embeddings-gemini";
-  version = "0.1.8";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_embeddings_gemini";
     inherit version;
-    hash = "sha256-rQKyPqZnyVYH2h5TTVV53kYYldGURWARWjYBrBb4d5M=";
+    hash = "sha256-7ftu+Gh8Ar9+yrFkUldlAvUfVtAw+xzrmyzqr7TeQdc=";
   };
 
   pythonRelaxDeps = [ "google-generativeai" ];

From 414c77b12cefe3d89cc0b6a00011b98f15e5ed3d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 02:07:55 +0200
Subject: [PATCH 096/149] python311Packages.llama-index-vector-stores-chroma:
 0.1.10 -> 0.2.0

---
 .../llama-index-vector-stores-chroma/default.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
index 5af67033af97..6ab0835a135c 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-chroma/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-chroma";
-  version = "0.1.10";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_vector_stores_chroma";
     inherit version;
-    hash = "sha256-l5cfezZGHvN74CO5zrVTE5bMSDYNC9vaUczhKQMBzEc=";
+    hash = "sha256-n6fGNgXB4pbhea1e5QT0Co/sVnd8r3L5+pVCut5U2Uw=";
   };
 
   build-system = [ poetry-core ];

From d248ce953c88cde9207ca29acd83ea3dc8d1bed8 Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Sun, 1 Sep 2024 00:02:42 -0600
Subject: [PATCH 097/149] dvc: 3.55.0 -> 3.55.1

---
 pkgs/development/python-modules/dvc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix
index 94f598abbe19..a0b4f33ad3ee 100644
--- a/pkgs/development/python-modules/dvc/default.nix
+++ b/pkgs/development/python-modules/dvc/default.nix
@@ -57,7 +57,7 @@
 
 buildPythonPackage rec {
   pname = "dvc";
-  version = "3.55.0";
+  version = "3.55.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -66,7 +66,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "dvc";
     rev = "refs/tags/${version}";
-    hash = "sha256-nKzMHVMaoDu/d1wMAxA2q8DHdwoIb7+YG/7AhAtRVEM=";
+    hash = "sha256-DrhjmVHCX1lXJUrklVgO/eguL1uRQ33kJjSgCAEIyew=";
   };
 
   pythonRelaxDeps = [

From 27cf88273b9fbbdd1bc2fbe6ac89e8cc9e238cb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 31 Aug 2024 23:34:30 -0700
Subject: [PATCH 098/149] vaultwarden.webvault: 2024.6.2b -> 2024.6.2c

Changelog: https://github.com/dani-garcia/bw_web_builds/releases/tag/v2024.6.2c
---
 pkgs/tools/security/vaultwarden/webvault.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/vaultwarden/webvault.nix b/pkgs/tools/security/vaultwarden/webvault.nix
index a20ce16cec5c..c4d881373fa2 100644
--- a/pkgs/tools/security/vaultwarden/webvault.nix
+++ b/pkgs/tools/security/vaultwarden/webvault.nix
@@ -3,18 +3,20 @@
 , fetchFromGitHub
 , git
 , nixosTests
-, python311
+, python3
 , vaultwarden
 }:
 
 let
-  version = "2024.6.2b";
+  version = "2024.6.2c";
+
+  suffix = lib.head (lib.match "[0-9.]*([a-z]*)" version);
 
   bw_web_builds = fetchFromGitHub {
     owner = "dani-garcia";
     repo = "bw_web_builds";
     rev = "v${version}";
-    hash = "sha256-Gcn/TOXdhMqGq4NTCPQTTEvN5rOQS3LImPUYBsv8de8=";
+    hash = "sha256-Gd8yQx9j6ieUvaM6IPSELNRy83y0cBkBwLYMqk8OIjU=";
   };
 
 in buildNpmPackage rec {
@@ -24,7 +26,7 @@ in buildNpmPackage rec {
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
-    rev = "web-v${lib.removeSuffix "b" version}";
+    rev = "web-v${lib.removeSuffix suffix version}";
     hash = "sha256-HMQ0oQ04WkLlUgsYt6ZpcziDq05mnSA0+VnJCpteceg=";
   };
 
@@ -37,8 +39,7 @@ in buildNpmPackage rec {
   '';
 
   nativeBuildInputs = [
-    # signalr through gyp wants to import distutils
-    python311
+    (python3.withPackages (ps: [ ps.setuptools ]))
   ];
 
   makeCacheWritable = true;

From e00303b3bf5f49302db2bd44d4b2aa44cb34d092 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 07:09:11 +0000
Subject: [PATCH 099/149] roddhjav-apparmor-rules: 0-unstable-2024-08-26 ->
 0-unstable-2024-08-30

---
 pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index e4c928ce86da..5c856dfa5728 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2024-08-26";
+  version = "0-unstable-2024-08-30";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "96d774a9ebae3fe61623029389d763e0c73aa362";
-    hash = "sha256-re4uiXt4No4OEeNm6hc52lkQ8lqkAoF1xy2BjIIi3A8=";
+    rev = "fb29e8ba74aa9712b5b06c20e935a7f4cd208b8c";
+    hash = "sha256-zv+51x8vxsh3vXRPb1k6hCShYk7GQz6n0MAp7KFQbAw=";
   };
 
   dontConfigure = true;

From 3f30c069e617e553ff06cfd1a94bef959ddfb9c5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 09:28:05 +0200
Subject: [PATCH 100/149] python311Packages.llama-index-llms-openai-like: 0.1.3
 -> 0.2.0

---
 .../python-modules/llama-index-llms-openai-like/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix
index 4415127ee30c..fd6b916bec0a 100644
--- a/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix
+++ b/pkgs/development/python-modules/llama-index-llms-openai-like/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-llms-openai-like";
-  version = "0.1.3";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_llms_openai_like";
     inherit version;
-    hash = "sha256-w0EjJQd8dSY+N9YNUBMUub3HcPEtiisW51bn2ayPnj8=";
+    hash = "sha256-0E7r8TZadpl557DevF3dXLHLx8oXXyeWABvUPLgx7Nw=";
   };
 
   build-system = [ poetry-core ];

From dc7b0797835f8c464688073871a50e26d83f0610 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 09:28:35 +0200
Subject: [PATCH 101/149] 
 python311Packages.llama-index-multi-modal-llms-openai: 0.1.8 -> 0.2.0

---
 .../llama-index-multi-modal-llms-openai/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
index 963f054cd6ef..fd18de972e8a 100644
--- a/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-multi-modal-llms-openai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-multi-modal-llms-openai";
-  version = "0.1.8";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_multi_modal_llms_openai";
     inherit version;
-    hash = "sha256-XiyUpkFaJQnK0DXM6jRGGVmuMnpZANPoIEF+nruaE+w=";
+    hash = "sha256-gRlrcwN0zIjSg/h5Q1fQvWZka5pNqlwJz1dhkDC0aWw=";
   };
 
   build-system = [ poetry-core ];

From a71254fe616cdbf67c889de6ddf421f46c8ace77 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 09:28:54 +0200
Subject: [PATCH 102/149] python311Packages.llama-index-agent-openai: 0.2.9 ->
 0.3.0

---
 .../python-modules/llama-index-agent-openai/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-agent-openai/default.nix b/pkgs/development/python-modules/llama-index-agent-openai/default.nix
index c7a1d2e46676..41fe1b667abf 100644
--- a/pkgs/development/python-modules/llama-index-agent-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-agent-openai/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-agent-openai";
-  version = "0.2.9";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_agent_openai";
     inherit version;
-    hash = "sha256-3r6G2m2dmD2zK0Rd3KfHmKwUD+WVc7r97XNZWzmV89U=";
+    hash = "sha256-2t5w6LmHGU16+2kl9yMGDp9JU+sTRADaL81M7t8sPf8=";
   };
 
   pythonRelaxDeps = [ "llama-index-llms-openai" ];

From b6f2a6c7dc8a564c3204d8802fc0f81a8ac97702 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 09:29:24 +0200
Subject: [PATCH 103/149] python311Packages.llama-index-readers-s3: 0.1.9 ->
 0.2.0

---
 .../python-modules/llama-index-readers-s3/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-readers-s3/default.nix b/pkgs/development/python-modules/llama-index-readers-s3/default.nix
index 8beec615d8be..3b0f5cb2c0ce 100644
--- a/pkgs/development/python-modules/llama-index-readers-s3/default.nix
+++ b/pkgs/development/python-modules/llama-index-readers-s3/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-readers-s3";
-  version = "0.1.9";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_readers_s3";
     inherit version;
-    hash = "sha256-ramC3INitu++AHKCWov78ad66/XnZG+Z4bZJHBdN5Uk=";
+    hash = "sha256-BXld0+j4UpwUFtkjkmfn3CwxMQoCZFj84D4R3Rr2jso=";
   };
 
   build-system = [ poetry-core ];

From f69ec9c83258726bb4c1b950f93940a1d74bef2f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 09:33:55 +0200
Subject: [PATCH 104/149] python311Packages.llama-index-program-openai: 0.1.7
 -> 0.2.0

---
 .../python-modules/llama-index-program-openai/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-program-openai/default.nix b/pkgs/development/python-modules/llama-index-program-openai/default.nix
index 781e03a06a44..62b9f6c2527f 100644
--- a/pkgs/development/python-modules/llama-index-program-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-program-openai/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-program-openai";
-  version = "0.1.7";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_program_openai";
     inherit version;
-    hash = "sha256-v362GgczgXFL5aBJ2TtABE3+Ub1DM77lOdFTK3QHYh8=";
+    hash = "sha256-QTmTVUHAESV/v+uWYrO/Eje3Ke9LHI9N31tnidI3SsQ=";
   };
 
   pythonRelaxDeps = [ "llama-index-agent-openai" ];

From 9751e79a3c9a0e1a67926f186ac2027befa7d464 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 09:44:30 +0200
Subject: [PATCH 105/149] python311Packages.llama-index-question-gen-openai:
 0.1.3 -> 0.2.0

---
 .../llama-index-question-gen-openai/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix
index 4633a56770ad..7f7615953bba 100644
--- a/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix
+++ b/pkgs/development/python-modules/llama-index-question-gen-openai/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-question-gen-openai";
-  version = "0.1.3";
+  version = "0.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_question_gen_openai";
     inherit version;
-    hash = "sha256-RIYZgRekVFfS4DauYLk69YBSiTzH14+ptvR91HuB4uE=";
+    hash = "sha256-Pd4c7L1lEABjnCADHX6iMzQnaquxgcrED/Qk814QRl4=";
   };
 
   build-system = [ poetry-core ];

From 8afcb98bbe109665158c4fa003e524233110a7e4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 1 Sep 2024 09:53:09 +0200
Subject: [PATCH 106/149] python311Packages.llama-index-cli: 0.1.13 -> 0.3.0

---
 pkgs/development/python-modules/llama-index-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-cli/default.nix b/pkgs/development/python-modules/llama-index-cli/default.nix
index 5d6795dce972..264316d0d626 100644
--- a/pkgs/development/python-modules/llama-index-cli/default.nix
+++ b/pkgs/development/python-modules/llama-index-cli/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "llama-index-cli";
-  version = "0.1.13";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "llama_index_cli";
     inherit version;
-    hash = "sha256-hhR97UQ5+6sdbHwNcujyMdKTXan99cnT8N3k811Eqlk=";
+    hash = "sha256-pC4B/ioCqg/TtkXrFAP5BY+n9i++6ioGpVt/uMB9XQI=";
   };
 
   build-system = [ poetry-core ];

From 2521bebbf26a516b966b5ff7b365ceb0c9156514 Mon Sep 17 00:00:00 2001
From: Quantenzitrone <nix@dev.quantenzitrone.eu>
Date: Tue, 19 Mar 2024 23:01:04 +0100
Subject: [PATCH 107/149] nixosTests.systemd-initrd-luks-fido2: fix test on
 aarch64-linux

This is the error message on fail:

> qemu-system-aarch64: -device canokey,file=/tmp/canokey-file: Warning:
>   speed mismatch trying to attach usb device "CanoKey QEMU" (full
>   speed) to bus "usb0.0", port "3" (high speed)

My Understanding of the Issue is: The test failed because
qemu-system-aarch64 apparently has different USB controllers enabled by
default, resulting in a "speed mismatch" between the USB controller and
CanoKey that only occurred on aarch64.
I could reproduce the issue on x86_64 by enabling the EHCI controller
and then fix the issue by specifying which USB bus to use for the
CanoKey.
This didn't fully fix the issue on my first attempt, because the UCHI
controller enabled by -usb doesn't have the same bus name on aarch64
and x86_64.
While bus=usb-bus.0 worked on x86_64, on aarch64 i get this message:

> qemu-system-aarch64: -device canokey,bus=usb-bus.0,file=
>   /tmp/canokey-file: Bus 'usb-bus.0' not found

The final solution now manually enables the OHCI controller (which may
be similar to UHCI, but i really have no idea other than it works) and
assigns it the id aka bus name "usb-bus", so it works the same under
both architectures.
---
 nixos/tests/systemd-initrd-luks-fido2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/systemd-initrd-luks-fido2.nix b/nixos/tests/systemd-initrd-luks-fido2.nix
index 207f51f4dd9b..4441ad061ee4 100644
--- a/nixos/tests/systemd-initrd-luks-fido2.nix
+++ b/nixos/tests/systemd-initrd-luks-fido2.nix
@@ -9,7 +9,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
       # Booting off the encrypted disk requires having a Nix store available for the init script
       mountHostNixStore = true;
       useEFIBoot = true;
-      qemu.options = [ "-device canokey,file=/tmp/canokey-file" ];
+      qemu.options = [ "-device pci-ohci,id=usb-bus" "-device canokey,bus=usb-bus.0,file=/tmp/canokey-file" ];
     };
     boot.loader.systemd-boot.enable = true;
 

From 4208ed503bd4266e2485a3a3a11207ac94db7ea3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 09:17:43 +0000
Subject: [PATCH 108/149] velero: 1.14.0 -> 1.14.1

---
 pkgs/applications/networking/cluster/velero/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix
index 509b5aa5576e..a27d844a4e2e 100644
--- a/pkgs/applications/networking/cluster/velero/default.nix
+++ b/pkgs/applications/networking/cluster/velero/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "velero";
-  version = "1.14.0";
+  version = "1.14.1";
 
 
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "velero";
     rev = "v${version}";
-    sha256 = "sha256-1jhhZosrU2zTlgMhM7vJ2kLpO+BITPdUo0t3rcbDYjg=";
+    sha256 = "sha256-rXWBTPM3dCGON1DvpCOsA4C4mAuVDqV9YbrvP5yDCa0=";
   };
 
   ldflags = [
@@ -20,7 +20,7 @@ buildGoModule rec {
     "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
   ];
 
-  vendorHash = "sha256-J0fYfSbxL4R1ac6ezM03e1+J8n7+CRSujVU6XDCyPU4=";
+  vendorHash = "sha256-HpPJXYBrk5qfV01VOqXGpn4waEONJa61mqLbEsuwrEs=";
 
   excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ];
 

From 18af402eeb1a76bf01f729afc56628a5e427d67e Mon Sep 17 00:00:00 2001
From: Patka <patka@patka.dev>
Date: Sun, 1 Sep 2024 12:20:33 +0200
Subject: [PATCH 109/149] zed-editor: update default fonts

upstream moved to using flex-mono and plex-sans instead of maintaining their own custom fonts. For more info see: https://github.com/zed-industries/zed/pull/13596
---
 pkgs/by-name/ze/zed-editor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 004074cb7ef2..5f865a3c5f62 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -121,8 +121,8 @@ rustPlatform.buildRustPackage rec {
     ZSTD_SYS_USE_PKG_CONFIG = true;
     FONTCONFIG_FILE = makeFontsConf {
       fontDirectories = [
-        "${src}/assets/fonts/zed-mono"
-        "${src}/assets/fonts/zed-sans"
+        "${src}/assets/fonts/plex-mono"
+        "${src}/assets/fonts/plex-sans"
       ];
     };
     # Setting this environment variable allows to disable auto-updates

From c291955fe21178b9a5ed5d1f0631d64e069f409f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 10:22:57 +0000
Subject: [PATCH 110/149] cirrus-cli: 0.122.4 -> 0.124.2

---
 .../tools/continuous-integration/cirrus-cli/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
index 4e2fa7b6234d..508dc9614d6e 100644
--- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "cirrus-cli";
-  version = "0.122.4";
+  version = "0.124.2";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-YpdzwGThmc9r4I+Rx8nxTZToi+J3UbqwZD+F2hYEG8M=";
+    hash = "sha256-S57ApSuO3Mo/GpoaXx0dKOU3CfdQXmPM8AWi8fZ9MfY=";
   };
 
-  vendorHash = "sha256-WAYjYIHsBkQiTUmMDRXnx3Q1UAFVfXmZDFxzw7Kh0ds=";
+  vendorHash = "sha256-BbBwia47E6EtoEzO2c2fhjg6WHGHTnzl5VyVYxIMu6E=";
 
   ldflags = [
     "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"

From eacef538b2ca2b75dc97d645fe253a4b76b15449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Reynier?= <loic@loicreynier.fr>
Date: Sun, 1 Sep 2024 10:50:19 +0000
Subject: [PATCH 111/149] license-generator: move to by-name

---
 .../default.nix => by-name/li/license-generator/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/license-generator/default.nix => by-name/li/license-generator/package.nix} (100%)

diff --git a/pkgs/tools/misc/license-generator/default.nix b/pkgs/by-name/li/license-generator/package.nix
similarity index 100%
rename from pkgs/tools/misc/license-generator/default.nix
rename to pkgs/by-name/li/license-generator/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59126af72914..872cc8b04b35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1857,8 +1857,6 @@ with pkgs;
 
   license-cli = callPackage ../tools/misc/license-cli { };
 
-  license-generator = callPackage ../tools/misc/license-generator { };
-
   linux-router = callPackage ../tools/networking/linux-router { };
 
   linux-router-without-wifi = linux-router.override { useWifiDependencies = false; };

From 61efff1e8244472e79b471b90bdd1278566a1d59 Mon Sep 17 00:00:00 2001
From: Jack Wilsdon <jack@wilsdon.me>
Date: Sat, 31 Aug 2024 22:58:30 +0100
Subject: [PATCH 112/149] gammastep: add missing wayland-scanner dependency

---
 pkgs/applications/misc/redshift/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 4546883b2bb3..f74e3492f1a8 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, fetchFromGitLab
 , autoconf, automake, gettext, intltool
-, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection
+, libtool, pkg-config, wrapGAppsHook3, wrapPython, gobject-introspection, wayland-scanner
 , gtk3, python, pygobject3, pyxdg
 
 , withQuartz ? stdenv.isDarwin, ApplicationServices
@@ -26,6 +26,8 @@ let
 
       strictDeps = true;
 
+      depsBuildBuild = [ pkg-config ];
+
       nativeBuildInputs = [
         autoconf
         automake
@@ -37,7 +39,7 @@ let
         wrapPython
         gobject-introspection
         python
-      ];
+      ] ++ lib.optionals (pname == "gammastep") [ wayland-scanner ];
 
       configureFlags = [
         "--enable-randr=${if withRandr then "yes" else "no"}"

From 53e193609db7abb9d1f3417953a20229a6f0fc43 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 1 Sep 2024 15:14:03 +0400
Subject: [PATCH 113/149] =?UTF-8?q?opengrm-ngram:=201.3.14=20=E2=86=92=201?=
 =?UTF-8?q?.3.16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/opengrm-ngram/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/development/libraries/opengrm-ngram/default.nix
index b84e4159f3e7..ec1b297da834 100644
--- a/pkgs/development/libraries/opengrm-ngram/default.nix
+++ b/pkgs/development/libraries/opengrm-ngram/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "opengrm-ngram";
-  version = "1.3.14";
+  version = "1.3.16";
 
   src = fetchurl {
     url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz";
-    sha256 = "sha256-ivMPDy6CPM17hWCToLOVzUgcWZiEt2pjYeizeBLYnYc=";
+    hash = "sha256-pcwP0VVW8H+0Y2Fsmh4WaH4whPPJlE3WyBI4VJfsES4=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 08df2f9c3de6eb6189a71bf5f5f662818fcf95fa Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 1 Sep 2024 13:42:50 +0200
Subject: [PATCH 114/149] linux_testing: 6.11-rc5 -> 6.11-rc6

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index f68ef004e4d1..7cd3f146a96f 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,7 +1,7 @@
 {
     "testing": {
-        "version": "6.11-rc5",
-        "hash": "sha256:06qq6y7cryq0xy4b68ky2hr44cw2nqhbna0dbzfbmr9d5sh9c0gn"
+        "version": "6.11-rc6",
+        "hash": "sha256:15lx6da4kdsipxlv7my8wamss5i001r4cc2ab1icvw1ms207b5in"
     },
     "6.1": {
         "version": "6.1.107",

From 294a3cb4cf788d0c51adcbb015af2cd68c61381f Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 1 Sep 2024 13:43:27 +0200
Subject: [PATCH 115/149] linux-rt_6_1: 6.1.105-rt38 -> 6.1.107-rt39

---
 pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
index df92857c2543..dad37ccef616 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "6.1.105-rt38"; # updated by ./update-rt.sh
+  version = "6.1.107-rt39"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -19,14 +19,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-    sha256 = "162yz32jqd2xkswsd1jxmjq4yhzmhzn17snicad35x51k3vaigr3";
+    sha256 = "1s5h51r41l0d3k1h9i4mya7nz53jd6i200s06w5gl49hsz8jjcpl";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0mk9xz1llzfib0g68b7d1ni5qyj899ldz6n1x1him0ngrqqb0y97";
+      sha256 = "0pgamrlbzxwrnvp75xs6h838y5zvlys11pxx23clbgj9gmaqkvax";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 

From c4462ae03ab9094200ece96ca79470b446e93178 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 1 Sep 2024 13:44:02 +0200
Subject: [PATCH 116/149] linux-rt_6_6: 6.6.44-rt39 -> 6.6.48-rt40

---
 pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
index dbbe62e673b2..2978a49219f9 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "6.6.44-rt39"; # updated by ./update-rt.sh
+  version = "6.6.48-rt40"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -19,14 +19,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-    sha256 = "1n6ckxx0i4dbq018b56q1wkwq944jhjy225swrpn65a9jfb848ck";
+    sha256 = "0a90fx0r25nkcr5b16dn1j7vwyndnshaxn6ziyviccds59xxy5kb";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0c6a75b33xyzwp779j35xyz9gp9njmqvg84425yrnmykdl5fwfqh";
+      sha256 = "1i5jzz7yq13d6ia6n0lb2bxi8bzhq775z2acg0mddzy2a092g102";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 

From 99c921501a06976ec938cecc8135636d6c6b276d Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 1 Sep 2024 15:46:31 +0400
Subject: [PATCH 117/149] openfst: migrate to by-name

---
 .../openfst/default.nix => by-name/op/openfst/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/openfst/default.nix => by-name/op/openfst/package.nix} (100%)

diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/by-name/op/openfst/package.nix
similarity index 100%
rename from pkgs/development/libraries/openfst/default.nix
rename to pkgs/by-name/op/openfst/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22833f1199d0..39ac42ed0a76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -41647,8 +41647,6 @@ with pkgs;
 
   houdini = callPackage ../applications/misc/houdini { };
 
-  openfst = callPackage ../development/libraries/openfst { };
-
   opengrm-ngram = callPackage ../development/libraries/opengrm-ngram { };
 
   openring = callPackage ../applications/misc/openring { };

From 3859083923487b1a47bb4a42fe17f818dd284d25 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 1 Sep 2024 15:47:56 +0400
Subject: [PATCH 118/149] opengrm-ngram: migrate to by-name

---
 .../default.nix => by-name/op/opengrm-ngram/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/opengrm-ngram/default.nix => by-name/op/opengrm-ngram/package.nix} (100%)

diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/by-name/op/opengrm-ngram/package.nix
similarity index 100%
rename from pkgs/development/libraries/opengrm-ngram/default.nix
rename to pkgs/by-name/op/opengrm-ngram/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39ac42ed0a76..f6017ccd5f7e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -41647,8 +41647,6 @@ with pkgs;
 
   houdini = callPackage ../applications/misc/houdini { };
 
-  opengrm-ngram = callPackage ../development/libraries/opengrm-ngram { };
-
   openring = callPackage ../applications/misc/openring { };
 
   openrisk = callPackage ../tools/security/openrisk { };

From 0fd0c7d8770b49c829de81cdf3c9364e2e740b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 1 Sep 2024 14:02:35 +0200
Subject: [PATCH 119/149] kongress: add missing dependencies

Closes #338765
---
 pkgs/kde/gear/kongress/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/kde/gear/kongress/default.nix b/pkgs/kde/gear/kongress/default.nix
index 8ac8807eb68e..e91c9cf59069 100644
--- a/pkgs/kde/gear/kongress/default.nix
+++ b/pkgs/kde/gear/kongress/default.nix
@@ -1,9 +1,11 @@
 {
   mkKdeDerivation,
+  kcontacts,
+  qtlocation,
   qtsvg,
 }:
 mkKdeDerivation {
   pname = "kongress";
 
-  extraBuildInputs = [qtsvg];
+  extraBuildInputs = [kcontacts qtsvg qtlocation];
 }

From fca9eb6edd092794348815b0f56c6266b74c92f1 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Aug 2024 23:15:54 +0200
Subject: [PATCH 120/149] gnome: Format with nixpkgs-fmt

Also switch to finalAttrs pattern and avoid pname rec.
---
 .../gnome/apps/gnome-text-editor/default.nix  |  49 +--
 .../core/gnome-bluetooth/1.0/default.nix      |  64 ++--
 .../gnome/core/gnome-bluetooth/default.nix    |   6 +-
 .../core/gnome-control-center/default.nix     | 166 ++++----
 .../desktops/gnome/core/gnome-session/ctl.nix |  19 +-
 .../gnome/core/gnome-session/default.nix      |  68 ++--
 .../core/gnome-settings-daemon/43/default.nix |  89 ++---
 .../core/gnome-settings-daemon/default.nix    |  88 ++---
 .../gnome/core/gnome-shell/default.nix        | 149 ++++----
 .../gnome/core/gnome-tour/default.nix         |  49 +--
 .../desktops/gnome/core/mutter/43/default.nix | 110 +++---
 pkgs/desktops/gnome/core/mutter/default.nix   | 141 +++----
 .../gnome/games/gnome-2048/default.nix        |  37 +-
 .../gnome/misc/gnome-applets/default.nix      |  54 +--
 .../gnome/misc/gnome-flashback/default.nix    | 357 ++++++++++--------
 .../gnome/misc/gnome-panel/default.nix        |  61 +--
 .../gnome/misc/gnome-panel/wrapper.nix        |  33 +-
 17 files changed, 807 insertions(+), 733 deletions(-)

diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix
index 0ea81c6d103f..1cbe5a2c32c7 100644
--- a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix
+++ b/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix
@@ -1,32 +1,33 @@
-{ lib
-, stdenv
-, meson
-, fetchurl
-, python3
-, pkg-config
-, gtk4
-, glib
-, gtksourceview5
-, gsettings-desktop-schemas
-, wrapGAppsHook4
-, ninja
-, gnome
-, cairo
-, enchant
-, icu
-, itstool
-, libadwaita
-, editorconfig-core-c
-, libxml2
-, desktop-file-utils
+{
+  lib,
+  stdenv,
+  meson,
+  fetchurl,
+  python3,
+  pkg-config,
+  gtk4,
+  glib,
+  gtksourceview5,
+  gsettings-desktop-schemas,
+  wrapGAppsHook4,
+  ninja,
+  gnome,
+  cairo,
+  enchant,
+  icu,
+  itstool,
+  libadwaita,
+  editorconfig-core-c,
+  libxml2,
+  desktop-file-utils,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-text-editor";
   version = "46.3";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
     hash = "sha256-AFtIEEqQm+Zq4HRI0rxXBsfRE3gQV6JP9tpVvfMkxz0=";
   };
 
@@ -67,4 +68,4 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
   };
-}
+})
diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix
index 6c63a486eef7..b7d155ad1cfc 100644
--- a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix
@@ -1,38 +1,44 @@
-{ stdenv
-, lib
-, fetchurl
-, fetchpatch
-, gnome
-, adwaita-icon-theme
-, meson
-, ninja
-, pkg-config
-, gtk3
-, gettext
-, glib
-, udev
-, itstool
-, libxml2
-, wrapGAppsHook3
-, libnotify
-, libcanberra-gtk3
-, gobject-introspection
-, gtk-doc
-, docbook-xsl-nons
-, docbook_xml_dtd_43
-, python3
-, gsettings-desktop-schemas
+{
+  stdenv,
+  lib,
+  fetchurl,
+  fetchpatch,
+  gnome,
+  adwaita-icon-theme,
+  meson,
+  ninja,
+  pkg-config,
+  gtk3,
+  gettext,
+  glib,
+  udev,
+  itstool,
+  libxml2,
+  wrapGAppsHook3,
+  libnotify,
+  libcanberra-gtk3,
+  gobject-introspection,
+  gtk-doc,
+  docbook-xsl-nons,
+  docbook_xml_dtd_43,
+  python3,
+  gsettings-desktop-schemas,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-bluetooth";
   version = "3.34.5";
 
   # TODO: split out "lib"
-  outputs = [ "out" "dev" "devdoc" "man" ];
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+    "man"
+  ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.majorMinor finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz";
     sha256 = "bJSeUsi+zCBU2qzWBJAfZs5c9wml+pHEu3ysyTm1Pqk=";
   };
 
@@ -82,7 +88,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gnome-bluetooth";
       attrPath = "gnome.gnome-bluetooth_1_0";
       freeze = true;
     };
@@ -96,4 +102,4 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix
index 9e4944221c15..75a7b8127ed9 100644
--- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix
@@ -26,7 +26,7 @@
   gsettings-desktop-schemas,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-bluetooth";
   version = "46.1";
 
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major version}/gnome-bluetooth-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major finalAttrs.version}/gnome-bluetooth-${finalAttrs.version}.tar.xz";
     hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw=";
   };
 
@@ -86,4 +86,4 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix
index 59f8b2b8e746..47ce218c6dd7 100644
--- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix
@@ -1,74 +1,75 @@
-{ fetchurl
-, lib
-, stdenv
-, substituteAll
-, accountsservice
-, adwaita-icon-theme
-, colord
-, colord-gtk4
-, cups
-, dbus
-, docbook-xsl-nons
-, fontconfig
-, gdk-pixbuf
-, gettext
-, glib
-, glib-networking
-, gcr_4
-, glibc
-, gnome-bluetooth
-, gnome-color-manager
-, gnome-desktop
-, gnome-online-accounts
-, gnome-settings-daemon
-, gnome-tecla
-, gnome
-, gsettings-desktop-schemas
-, gsound
-, gst_all_1
-, gtk4
-, ibus
-, json-glib
-, libgtop
-, libgudev
-, libadwaita
-, libkrb5
-, libjxl
-, libpulseaudio
-, libpwquality
-, librsvg
-, webp-pixbuf-loader
-, libsecret
-, libsoup_3
-, libwacom
-, libXi
-, libxml2
-, libxslt
-, meson
-, modemmanager
-, mutter
-, networkmanager
-, networkmanagerapplet
-, libnma-gtk4
-, ninja
-, pkg-config
-, polkit
-, python3
-, samba
-, setxkbmap
-, shadow
-, shared-mime-info
-, sound-theme-freedesktop
-, tracker
-, tracker-miners
-, tzdata
-, udisks2
-, upower
-, libepoxy
-, gnome-user-share
-, gnome-remote-desktop
-, wrapGAppsHook4
-, xorgserver
+{
+  fetchurl,
+  lib,
+  stdenv,
+  substituteAll,
+  accountsservice,
+  adwaita-icon-theme,
+  colord,
+  colord-gtk4,
+  cups,
+  dbus,
+  docbook-xsl-nons,
+  fontconfig,
+  gdk-pixbuf,
+  gettext,
+  glib,
+  glib-networking,
+  gcr_4,
+  glibc,
+  gnome-bluetooth,
+  gnome-color-manager,
+  gnome-desktop,
+  gnome-online-accounts,
+  gnome-settings-daemon,
+  gnome-tecla,
+  gnome,
+  gsettings-desktop-schemas,
+  gsound,
+  gst_all_1,
+  gtk4,
+  ibus,
+  json-glib,
+  libgtop,
+  libgudev,
+  libadwaita,
+  libkrb5,
+  libjxl,
+  libpulseaudio,
+  libpwquality,
+  librsvg,
+  webp-pixbuf-loader,
+  libsecret,
+  libsoup_3,
+  libwacom,
+  libXi,
+  libxml2,
+  libxslt,
+  meson,
+  modemmanager,
+  mutter,
+  networkmanager,
+  networkmanagerapplet,
+  libnma-gtk4,
+  ninja,
+  pkg-config,
+  polkit,
+  python3,
+  samba,
+  setxkbmap,
+  shadow,
+  shared-mime-info,
+  sound-theme-freedesktop,
+  tracker,
+  tracker-miners,
+  tzdata,
+  udisks2,
+  upower,
+  libepoxy,
+  gnome-user-share,
+  gnome-remote-desktop,
+  wrapGAppsHook4,
+  xorgserver,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -147,11 +148,10 @@ stdenv.mkDerivation (finalAttrs: {
     tracker-miners # for search locations dialog
     udisks2
     upower
-  ] ++ (with gst_all_1; [
     # For animations in Mouse panel.
-    gst-plugins-base
-    gst-plugins-good
-  ]);
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+  ];
 
   nativeCheckInputs = [
     dbus
@@ -177,13 +177,15 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = ''
     # Pull in WebP and JXL support for gnome-backgrounds.
     # In postInstall to run before gappsWrapperArgsHook.
-    export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
-      extraLoaders = [
-        libjxl
-        librsvg
-        webp-pixbuf-loader
-      ];
-    }}"
+    export GDK_PIXBUF_MODULE_FILE="${
+      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
+        extraLoaders = [
+          libjxl
+          librsvg
+          webp-pixbuf-loader
+        ];
+      }
+    }"
   '';
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome/core/gnome-session/ctl.nix b/pkgs/desktops/gnome/core/gnome-session/ctl.nix
index 10b59d660bef..fbdad96f9236 100644
--- a/pkgs/desktops/gnome/core/gnome-session/ctl.nix
+++ b/pkgs/desktops/gnome/core/gnome-session/ctl.nix
@@ -1,12 +1,13 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
-, glib
-, systemd
-, wrapGAppsHook3
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  glib,
+  systemd,
+  wrapGAppsHook3,
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix
index f7aa278fe8cc..74eb9dbd09ec 100644
--- a/pkgs/desktops/gnome/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-session/default.nix
@@ -1,42 +1,46 @@
-{ fetchurl
-, lib
-, stdenv
-, substituteAll
-, meson
-, ninja
-, pkg-config
-, gnome
-, adwaita-icon-theme
-, glib
-, gtk3
-, gsettings-desktop-schemas
-, gnome-desktop
-, dbus
-, json-glib
-, libICE
-, xmlto
-, docbook_xsl
-, docbook_xml_dtd_412
-, python3
-, libxslt
-, gettext
-, makeWrapper
-, systemd
-, xorg
-, libepoxy
-, bash
-, gnome-session-ctl
+{
+  fetchurl,
+  lib,
+  stdenv,
+  substituteAll,
+  meson,
+  ninja,
+  pkg-config,
+  gnome,
+  adwaita-icon-theme,
+  glib,
+  gtk3,
+  gsettings-desktop-schemas,
+  gnome-desktop,
+  dbus,
+  json-glib,
+  libICE,
+  xmlto,
+  docbook_xsl,
+  docbook_xml_dtd_412,
+  python3,
+  libxslt,
+  gettext,
+  makeWrapper,
+  systemd,
+  xorg,
+  libepoxy,
+  bash,
+  gnome-session-ctl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-session";
   # Also bump ./ctl.nix when bumping major version.
   version = "46.0";
 
-  outputs = [ "out" "sessions" ];
+  outputs = [
+    "out"
+    "sessions"
+  ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-session/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz";
     hash = "sha256-xuFiSvYJC8ThoZH+Imir+nqN4HgxynpX8hfmeb97mlQ=";
   };
 
@@ -133,4 +137,4 @@ stdenv.mkDerivation rec {
     maintainers = teams.gnome.members;
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix
index 6e87a2ab6e3b..ff0fbbffb066 100644
--- a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix
@@ -1,52 +1,53 @@
-{ stdenv
-, lib
-, fetchpatch
-, substituteAll
-, fetchurl
-, meson
-, ninja
-, pkg-config
-, gnome
-, perl
-, gettext
-, gtk3
-, glib
-, libnotify
-, libgnomekbd
-, lcms2
-, libpulseaudio
-, alsa-lib
-, libcanberra-gtk3
-, upower
-, colord
-, libgweather
-, polkit
-, gsettings-desktop-schemas
-, geoclue2
-, systemd
-, libgudev
-, libwacom
-, libxslt
-, libxml2
-, modemmanager
-, networkmanager
-, gnome-desktop
-, geocode-glib_2
-, docbook_xsl
-, wrapGAppsHook3
-, python3
-, tzdata
-, nss
-, gcr_4
-, gnome-session-ctl
+{
+  stdenv,
+  lib,
+  fetchpatch,
+  substituteAll,
+  fetchurl,
+  meson,
+  ninja,
+  pkg-config,
+  gnome,
+  perl,
+  gettext,
+  gtk3,
+  glib,
+  libnotify,
+  libgnomekbd,
+  lcms2,
+  libpulseaudio,
+  alsa-lib,
+  libcanberra-gtk3,
+  upower,
+  colord,
+  libgweather,
+  polkit,
+  gsettings-desktop-schemas,
+  geoclue2,
+  systemd,
+  libgudev,
+  libwacom,
+  libxslt,
+  libxml2,
+  modemmanager,
+  networkmanager,
+  gnome-desktop,
+  geocode-glib_2,
+  docbook_xsl,
+  wrapGAppsHook3,
+  python3,
+  tzdata,
+  nss,
+  gcr_4,
+  gnome-session-ctl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-settings-daemon";
   version = "43.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
     sha256 = "NRO7JPxvgYFmciOmSgZ1NP3M879mMmqUA9OLDw1gE9A=";
   };
 
@@ -125,4 +126,4 @@ stdenv.mkDerivation rec {
     maintainers = teams.pantheon.members;
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix
index 4284a68ee3e7..f5b1f89805d4 100644
--- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix
@@ -1,49 +1,50 @@
-{ stdenv
-, lib
-, substituteAll
-, fetchurl
-, meson
-, ninja
-, pkg-config
-, gnome
-, perl
-, gettext
-, gtk3
-, glib
-, libnotify
-, libgnomekbd
-, libpulseaudio
-, alsa-lib
-, libcanberra-gtk3
-, upower
-, colord
-, libgweather
-, polkit
-, gsettings-desktop-schemas
-, geoclue2
-, systemd
-, libgudev
-, libwacom
-, libxslt
-, libxml2
-, modemmanager
-, networkmanager
-, gnome-desktop
-, geocode-glib_2
-, docbook_xsl
-, wrapGAppsHook3
-, python3
-, tzdata
-, gcr_4
-, gnome-session-ctl
+{
+  stdenv,
+  lib,
+  substituteAll,
+  fetchurl,
+  meson,
+  ninja,
+  pkg-config,
+  gnome,
+  perl,
+  gettext,
+  gtk3,
+  glib,
+  libnotify,
+  libgnomekbd,
+  libpulseaudio,
+  alsa-lib,
+  libcanberra-gtk3,
+  upower,
+  colord,
+  libgweather,
+  polkit,
+  gsettings-desktop-schemas,
+  geoclue2,
+  systemd,
+  libgudev,
+  libwacom,
+  libxslt,
+  libxml2,
+  modemmanager,
+  networkmanager,
+  gnome-desktop,
+  geocode-glib_2,
+  docbook_xsl,
+  wrapGAppsHook3,
+  python3,
+  tzdata,
+  gcr_4,
+  gnome-session-ctl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-settings-daemon";
   version = "46.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
     hash = "sha256-C5oPZPoYqOfgm0yVo/dU+gM8LNvS3DVwHwYYVywcs9c=";
   };
 
@@ -103,7 +104,6 @@ stdenv.mkDerivation rec {
   # we're using plain
   env.NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS";
 
-
   postPatch = ''
     for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl; do
       chmod +x $f
@@ -113,8 +113,8 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
-      attrPath = "gnome.${pname}";
+      packageName = "gnome-settings-daemon";
+      attrPath = "gnome.gnome-settings-daemon";
     };
   };
 
@@ -123,4 +123,4 @@ stdenv.mkDerivation rec {
     maintainers = teams.gnome.members;
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix
index f84908eff074..f218e6640ade 100644
--- a/pkgs/desktops/gnome/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix
@@ -1,66 +1,68 @@
-{ fetchurl
-, fetchpatch
-, substituteAll
-, lib, stdenv
-, meson
-, ninja
-, pkg-config
-, gnome
-, json-glib
-, gettext
-, libsecret
-, python3
-, polkit
-, networkmanager
-, gi-docgen
-, at-spi2-core
-, unzip
-, shared-mime-info
-, libgweather
-, libjxl
-, librsvg
-, webp-pixbuf-loader
-, geoclue2
-, perl
-, desktop-file-utils
-, libpulseaudio
-, libical
-, gobject-introspection
-, wrapGAppsHook4
-, libxslt
-, gcr_4
-, accountsservice
-, gdk-pixbuf
-, gdm
-, upower
-, ibus
-, libnma-gtk4
-, gnome-desktop
-, gsettings-desktop-schemas
-, gnome-keyring
-, glib
-, gjs
-, mutter
-, evolution-data-server-gtk4
-, gtk4
-, libadwaita
-, sassc
-, systemd
-, pipewire
-, gst_all_1
-, adwaita-icon-theme
-, gnome-bluetooth
-, gnome-clocks
-, gnome-settings-daemon
-, gnome-autoar
-, gnome-tecla
-, asciidoc
-, bash-completion
-, mesa
-, libGL
-, libXi
-, libX11
-, libxml2
+{
+  fetchurl,
+  fetchpatch,
+  substituteAll,
+  lib,
+  stdenv,
+  meson,
+  ninja,
+  pkg-config,
+  gnome,
+  json-glib,
+  gettext,
+  libsecret,
+  python3,
+  polkit,
+  networkmanager,
+  gi-docgen,
+  at-spi2-core,
+  unzip,
+  shared-mime-info,
+  libgweather,
+  libjxl,
+  librsvg,
+  webp-pixbuf-loader,
+  geoclue2,
+  perl,
+  desktop-file-utils,
+  libpulseaudio,
+  libical,
+  gobject-introspection,
+  wrapGAppsHook4,
+  libxslt,
+  gcr_4,
+  accountsservice,
+  gdk-pixbuf,
+  gdm,
+  upower,
+  ibus,
+  libnma-gtk4,
+  gnome-desktop,
+  gsettings-desktop-schemas,
+  gnome-keyring,
+  glib,
+  gjs,
+  mutter,
+  evolution-data-server-gtk4,
+  gtk4,
+  libadwaita,
+  sassc,
+  systemd,
+  pipewire,
+  gst_all_1,
+  adwaita-icon-theme,
+  gnome-bluetooth,
+  gnome-clocks,
+  gnome-settings-daemon,
+  gnome-autoar,
+  gnome-tecla,
+  asciidoc,
+  bash-completion,
+  mesa,
+  libGL,
+  libXi,
+  libX11,
+  libxml2,
 }:
 
 let
@@ -70,7 +72,10 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell";
   version = "46.4";
 
-  outputs = [ "out" "devdoc" ];
+  outputs = [
+    "out"
+    "devdoc"
+  ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
@@ -191,13 +196,15 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = ''
     # Pull in WebP and JXL support for gnome-backgrounds.
     # In postInstall to run before gappsWrapperArgsHook.
-    export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
-      extraLoaders = [
-        libjxl
-        librsvg
-        webp-pixbuf-loader
-      ];
-    }}"
+    export GDK_PIXBUF_MODULE_FILE="${
+      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
+        extraLoaders = [
+          libjxl
+          librsvg
+          webp-pixbuf-loader
+        ];
+      }
+    }"
   '';
 
   preFixup = ''
diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix
index 0cc5c596bb5c..6c4fdddcf662 100644
--- a/pkgs/desktops/gnome/core/gnome-tour/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix
@@ -1,31 +1,32 @@
-{ lib
-, stdenv
-, rustPlatform
-, gettext
-, meson
-, ninja
-, fetchurl
-, pkg-config
-, gtk4
-, glib
-, gdk-pixbuf
-, desktop-file-utils
-, appstream-glib
-, wrapGAppsHook4
-, python3
-, gnome
-, libadwaita
-, librsvg
-, rustc
-, cargo
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  gettext,
+  meson,
+  ninja,
+  fetchurl,
+  pkg-config,
+  gtk4,
+  glib,
+  gdk-pixbuf,
+  desktop-file-utils,
+  appstream-glib,
+  wrapGAppsHook4,
+  python3,
+  gnome,
+  libadwaita,
+  librsvg,
+  rustc,
+  cargo,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-tour";
   version = "46.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-tour/${lib.versions.major finalAttrs.version}/gnome-tour-${finalAttrs.version}.tar.xz";
     hash = "sha256-8yZSqp1+8GQ3YM5jkyCCz9NkHnczt2xCm3jQl4O3xGo=";
   };
 
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gnome-tour";
     };
   };
 
@@ -72,4 +73,4 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/desktops/gnome/core/mutter/43/default.nix
index cef4edf84c0f..9ea450395263 100644
--- a/pkgs/desktops/gnome/core/mutter/43/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/43/default.nix
@@ -1,60 +1,66 @@
-{ fetchurl
-, runCommand
-, lib
-, fetchpatch
-, stdenv
-, pkg-config
-, gnome
-, gettext
-, gobject-introspection
-, cairo
-, colord
-, lcms2
-, pango
-, json-glib
-, libstartup_notification
-, libcanberra
-, ninja
-, xvfb-run
-, xkeyboard_config
-, libxcvt
-, libxkbfile
-, libXdamage
-, libxkbcommon
-, libXtst
-, libinput
-, libdrm
-, gsettings-desktop-schemas
-, glib
-, gtk3
-, gnome-desktop
-, pipewire
-, libgudev
-, libwacom
-, xwayland
-, mesa
-, meson
-, gnome-settings-daemon
-, xorgserver
-, python3
-, wayland-scanner
-, wrapGAppsHook3
-, gi-docgen
-, sysprof
-, libsysprof-capture
-, desktop-file-utils
-, libcap_ng
-, egl-wayland
-, graphene
-, wayland
-, wayland-protocols
+{
+  fetchurl,
+  runCommand,
+  lib,
+  fetchpatch,
+  stdenv,
+  pkg-config,
+  gnome,
+  gettext,
+  gobject-introspection,
+  cairo,
+  colord,
+  lcms2,
+  pango,
+  json-glib,
+  libstartup_notification,
+  libcanberra,
+  ninja,
+  xvfb-run,
+  xkeyboard_config,
+  libxcvt,
+  libxkbfile,
+  libXdamage,
+  libxkbcommon,
+  libXtst,
+  libinput,
+  libdrm,
+  gsettings-desktop-schemas,
+  glib,
+  gtk3,
+  gnome-desktop,
+  pipewire,
+  libgudev,
+  libwacom,
+  xwayland,
+  mesa,
+  meson,
+  gnome-settings-daemon,
+  xorgserver,
+  python3,
+  wayland-scanner,
+  wrapGAppsHook3,
+  gi-docgen,
+  sysprof,
+  libsysprof-capture,
+  desktop-file-utils,
+  libcap_ng,
+  egl-wayland,
+  graphene,
+  wayland,
+  wayland-protocols,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
   version = "43.8";
 
-  outputs = [ "out" "dev" "man" "devdoc" ];
+  outputs = [
+    "out"
+    "dev"
+    "man"
+    "devdoc"
+  ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
@@ -175,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: {
     libdir = "${finalAttrs.finalPackage}/lib/mutter-11";
 
     tests = {
-      libdirExists = runCommand "mutter-libdir-exists" {} ''
+      libdirExists = runCommand "mutter-libdir-exists" { } ''
         if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then
           echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one."
           exit 1
diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix
index 78b21f4d215f..54687cbb0f94 100644
--- a/pkgs/desktops/gnome/core/mutter/default.nix
+++ b/pkgs/desktops/gnome/core/mutter/default.nix
@@ -1,75 +1,81 @@
-{ fetchurl
-, runCommand
-, lib
-, stdenv
-, pkg-config
-, gnome
-, gettext
-, gobject-introspection
-, cairo
-, colord
-, lcms2
-, pango
-, libstartup_notification
-, libcanberra
-, ninja
-, xvfb-run
-, libxcvt
-, libICE
-, libX11
-, libXcomposite
-, libXcursor
-, libXdamage
-, libXext
-, libXfixes
-, libXi
-, libXtst
-, libxkbfile
-, xkeyboard_config
-, libxkbcommon
-, libXrender
-, libxcb
-, libXrandr
-, libXinerama
-, libXau
-, libinput
-, libdrm
-, libei
-, libdisplay-info
-, gsettings-desktop-schemas
-, glib
-, atk
-, gtk4
-, fribidi
-, harfbuzz
-, gnome-desktop
-, pipewire
-, libgudev
-, libwacom
-, libSM
-, xwayland
-, mesa
-, meson
-, gnome-settings-daemon
-, xorgserver
-, python3
-, wayland-scanner
-, wrapGAppsHook4
-, gi-docgen
-, sysprof
-, libsysprof-capture
-, desktop-file-utils
-, egl-wayland
-, graphene
-, wayland
-, wayland-protocols
+{
+  fetchurl,
+  runCommand,
+  lib,
+  stdenv,
+  pkg-config,
+  gnome,
+  gettext,
+  gobject-introspection,
+  cairo,
+  colord,
+  lcms2,
+  pango,
+  libstartup_notification,
+  libcanberra,
+  ninja,
+  xvfb-run,
+  libxcvt,
+  libICE,
+  libX11,
+  libXcomposite,
+  libXcursor,
+  libXdamage,
+  libXext,
+  libXfixes,
+  libXi,
+  libXtst,
+  libxkbfile,
+  xkeyboard_config,
+  libxkbcommon,
+  libXrender,
+  libxcb,
+  libXrandr,
+  libXinerama,
+  libXau,
+  libinput,
+  libdrm,
+  libei,
+  libdisplay-info,
+  gsettings-desktop-schemas,
+  glib,
+  atk,
+  gtk4,
+  fribidi,
+  harfbuzz,
+  gnome-desktop,
+  pipewire,
+  libgudev,
+  libwacom,
+  libSM,
+  xwayland,
+  mesa,
+  meson,
+  gnome-settings-daemon,
+  xorgserver,
+  python3,
+  wayland-scanner,
+  wrapGAppsHook4,
+  gi-docgen,
+  sysprof,
+  libsysprof-capture,
+  desktop-file-utils,
+  egl-wayland,
+  graphene,
+  wayland,
+  wayland-protocols,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
   version = "46.4";
 
-  outputs = [ "out" "dev" "man" "devdoc" ];
+  outputs = [
+    "out"
+    "dev"
+    "man"
+    "devdoc"
+  ];
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
@@ -139,7 +145,6 @@ stdenv.mkDerivation (finalAttrs: {
     xwayland
     wayland
     wayland-protocols
-  ] ++ [
     # X11 client
     gtk4
     libICE
@@ -184,7 +189,7 @@ stdenv.mkDerivation (finalAttrs: {
     libdir = "${finalAttrs.finalPackage}/lib/mutter-14";
 
     tests = {
-      libdirExists = runCommand "mutter-libdir-exists" {} ''
+      libdirExists = runCommand "mutter-libdir-exists" { } ''
         if [[ ! -d ${finalAttrs.finalPackage.libdir} ]]; then
           echo "passthru.libdir should contain a directory, “${finalAttrs.finalPackage.libdir}” is not one."
           exit 1
diff --git a/pkgs/desktops/gnome/games/gnome-2048/default.nix b/pkgs/desktops/gnome/games/gnome-2048/default.nix
index fc04ee0b8f1e..88e373497bbe 100644
--- a/pkgs/desktops/gnome/games/gnome-2048/default.nix
+++ b/pkgs/desktops/gnome/games/gnome-2048/default.nix
@@ -1,26 +1,27 @@
-{ lib
-, stdenv
-, fetchurl
-, fetchpatch
-, wrapGAppsHook3
-, meson
-, vala
-, pkg-config
-, ninja
-, itstool
-, clutter-gtk
-, libgee
-, libgnome-games-support
-, gnome
-, gtk3
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchpatch,
+  wrapGAppsHook3,
+  meson,
+  vala,
+  pkg-config,
+  ninja,
+  itstool,
+  clutter-gtk,
+  libgee,
+  libgnome-games-support,
+  gnome,
+  gtk3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-twenty-forty-eight";
   version = "3.38.2";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor version}/gnome-2048-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-2048/${lib.versions.majorMinor finalAttrs.version}/gnome-2048-${finalAttrs.version}.tar.xz";
     sha256 = "0s5fg4z5in1h39fcr69j1qc5ynmg7a8mfprk3mc3c0csq3snfwz2";
   };
 
@@ -63,4 +64,4 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix
index 0270045dad7d..179e9a0d6d74 100644
--- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-applets/default.nix
@@ -1,32 +1,34 @@
-{ lib, stdenv
-, fetchurl
-, gettext
-, itstool
-, libxml2
-, pkg-config
-, gnome-panel
-, gtk3
-, glib
-, libwnck
-, libgtop
-, libnotify
-, upower
-, wirelesstools
-, linuxPackages
-, adwaita-icon-theme
-, libgweather
-, gucharmap
-, tracker
-, polkit
-, gnome
+{
+  lib,
+  stdenv,
+  fetchurl,
+  gettext,
+  itstool,
+  libxml2,
+  pkg-config,
+  gnome-panel,
+  gtk3,
+  glib,
+  libwnck,
+  libgtop,
+  libnotify,
+  upower,
+  wirelesstools,
+  linuxPackages,
+  adwaita-icon-theme,
+  libgweather,
+  gucharmap,
+  tracker,
+  polkit,
+  gnome,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-applets";
   version = "3.52.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-applets/${lib.versions.majorMinor finalAttrs.version}/gnome-applets-${finalAttrs.version}.tar.xz";
     hash = "sha256-bz07QoZW/21bHT7lzLfs49Kxi1S/BFes9DtxHlXi1iw=";
   };
 
@@ -64,8 +66,8 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
-      attrPath = "gnome.${pname}";
+      packageName = "gnome-applets";
+      attrPath = "gnome.gnome-applets";
       versionPolicy = "odd-unstable";
     };
   };
@@ -78,4 +80,4 @@ stdenv.mkDerivation rec {
     maintainers = teams.gnome.members;
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
index 770d389d77d1..89880a68e14e 100644
--- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
@@ -1,43 +1,40 @@
-{ stdenv
-, lib
-, autoreconfHook
-, fetchurl
-, gettext
-, glib
-, gnome-bluetooth
-, gnome-desktop
-, gnome-panel
-, gnome-session
-, gnome
-, gsettings-desktop-schemas
-, gtk3
-, ibus
-, libcanberra-gtk3
-, libpulseaudio
-, libxkbfile
-, libxml2
-, pkg-config
-, polkit
-, gdm
-, systemd
-, upower
-, pam
-, wrapGAppsHook3
-, writeTextFile
-, xkeyboard_config
-, xorg
-, nixosTests
-, runCommand
-, buildEnv
+{
+  stdenv,
+  lib,
+  autoreconfHook,
+  fetchurl,
+  gettext,
+  glib,
+  gnome-bluetooth,
+  gnome-desktop,
+  gnome-panel,
+  gnome-session,
+  gnome,
+  gsettings-desktop-schemas,
+  gtk3,
+  ibus,
+  libcanberra-gtk3,
+  libpulseaudio,
+  libxkbfile,
+  libxml2,
+  pkg-config,
+  polkit,
+  gdm,
+  systemd,
+  upower,
+  pam,
+  wrapGAppsHook3,
+  writeTextFile,
+  xkeyboard_config,
+  xorg,
+  nixosTests,
+  runCommand,
+  buildEnv,
 }:
-let
-  pname = "gnome-flashback";
-  version = "3.52.1";
 
+let
   # From data/sessions/Makefile.am
-  requiredComponentsCommon = enableGnomePanel:
-    [ ]
-    ++ lib.optional enableGnomePanel "gnome-panel";
+  requiredComponentsCommon = enableGnomePanel: [ ] ++ lib.optional enableGnomePanel "gnome-panel";
   requiredComponentsGsd = [
     "org.gnome.SettingsDaemon.A11ySettings"
     "org.gnome.SettingsDaemon.Color"
@@ -56,143 +53,171 @@ let
     "org.gnome.SettingsDaemon.Wacom"
     "org.gnome.SettingsDaemon.XSettings"
   ];
-  requiredComponents = wmName: enableGnomePanel: "RequiredComponents=${lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd)};";
+  requiredComponents =
+    wmName: enableGnomePanel:
+    "RequiredComponents=${
+      lib.concatStringsSep ";" (
+        [ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd
+      )
+    };";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gnome-flashback";
+  version = "3.52.1";
 
-  gnome-flashback = stdenv.mkDerivation rec {
-    name = "${pname}-${version}";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-flashback/${lib.versions.majorMinor finalAttrs.version}/gnome-flashback-${finalAttrs.version}.tar.xz";
+    hash = "sha256-ugRhPNrbYr2iBkN8BHKZ4WAlzeG9gJXglKp3dpx4YDo=";
+  };
 
-    src = fetchurl {
-      url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz";
-      hash = "sha256-ugRhPNrbYr2iBkN8BHKZ4WAlzeG9gJXglKp3dpx4YDo=";
+  # make .desktop Execs absolute
+  postPatch = ''
+    patch -p0 <<END_PATCH
+    +++ data/applications/gnome-flashback.desktop.in
+    @@ -4 +4 @@
+    -Exec=gnome-flashback
+    +Exec=$out/bin/gnome-flashback
+    END_PATCH
+  '';
+
+  postInstall = ''
+    # Check that our expected RequiredComponents match the stock session files, but then don't install them.
+    # They can be installed using mkSessionForWm.
+    grep '${requiredComponents "metacity" true}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false)
+
+    rm -r $out/share/gnome-session
+    rm -r $out/share/xsessions
+    rm $out/libexec/gnome-flashback-metacity
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook
+    gettext
+    libxml2
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    glib
+    gnome-bluetooth
+    gnome-desktop
+    gsettings-desktop-schemas
+    gtk3
+    ibus
+    libcanberra-gtk3
+    libpulseaudio
+    libxkbfile
+    xorg.libXxf86vm
+    polkit
+    gdm
+    gnome-panel
+    systemd
+    upower
+    pam
+    xkeyboard_config
+  ];
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  PKG_CONFIG_LIBGNOME_PANEL_LAYOUTSDIR = "${placeholder "out"}/share/gnome-panel/layouts";
+  PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules";
+
+  passthru = {
+    updateScript = gnome.updateScript {
+      packageName = "gnome-flashback";
+      attrPath = "gnome.gnome-flashback";
+      versionPolicy = "odd-unstable";
     };
 
-    # make .desktop Execs absolute
-    postPatch = ''
-      patch -p0 <<END_PATCH
-      +++ data/applications/gnome-flashback.desktop.in
-      @@ -4 +4 @@
-      -Exec=gnome-flashback
-      +Exec=$out/bin/gnome-flashback
-      END_PATCH
-    '';
-
-    postInstall = ''
-      # Check that our expected RequiredComponents match the stock session files, but then don't install them.
-      # They can be installed using mkSessionForWm.
-      grep '${requiredComponents "metacity" true}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false)
-
-      rm -r $out/share/gnome-session
-      rm -r $out/share/xsessions
-      rm $out/libexec/gnome-flashback-metacity
-    '';
-
-    nativeBuildInputs = [
-      autoreconfHook
-      gettext
-      libxml2
-      pkg-config
-      wrapGAppsHook3
-    ];
-
-    buildInputs = [
-      glib
-      gnome-bluetooth
-      gnome-desktop
-      gsettings-desktop-schemas
-      gtk3
-      ibus
-      libcanberra-gtk3
-      libpulseaudio
-      libxkbfile
-      xorg.libXxf86vm
-      polkit
-      gdm
-      gnome-panel
-      systemd
-      upower
-      pam
-      xkeyboard_config
-    ];
-
-    doCheck = true;
-
-    enableParallelBuilding = true;
-
-    PKG_CONFIG_LIBGNOME_PANEL_LAYOUTSDIR = "${placeholder "out"}/share/gnome-panel/layouts";
-    PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules";
-
-    passthru = {
-      updateScript = gnome.updateScript {
-        packageName = pname;
-        attrPath = "gnome.${pname}";
-        versionPolicy = "odd-unstable";
+    mkWmApplication =
+      {
+        wmName,
+        wmLabel,
+        wmCommand,
+      }:
+      writeTextFile {
+        name = "gnome-flashback-${wmName}-wm";
+        destination = "/share/applications/${wmName}.desktop";
+        text = ''
+          [Desktop Entry]
+          Type=Application
+          Encoding=UTF-8
+          Name=${wmLabel}
+          Exec=${wmCommand}
+          NoDisplay=true
+          X-GNOME-WMName=${wmLabel}
+          X-GNOME-Autostart-Phase=WindowManager
+          X-GNOME-Provides=windowmanager
+          X-GNOME-Autostart-Notify=false
+        '';
       };
 
-      mkWmApplication = { wmName, wmLabel, wmCommand }:
-        writeTextFile {
-          name = "gnome-flashback-${wmName}-wm";
-          destination = "/share/applications/${wmName}.desktop";
-          text = ''
-            [Desktop Entry]
-            Type=Application
-            Encoding=UTF-8
-            Name=${wmLabel}
-            Exec=${wmCommand}
-            NoDisplay=true
-            X-GNOME-WMName=${wmLabel}
-            X-GNOME-Autostart-Phase=WindowManager
-            X-GNOME-Provides=windowmanager
-            X-GNOME-Autostart-Notify=false
-          '';
-        };
-
-      mkGnomeSession = { wmName, wmLabel, enableGnomePanel }:
-        writeTextFile {
-          name = "gnome-flashback-${wmName}-gnome-session";
-          destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session";
-          text = ''
-            [GNOME Session]
-            Name=GNOME Flashback (${wmLabel})
-            ${requiredComponents wmName enableGnomePanel}
-          '';
-        };
-
-      mkSessionForWm = { wmName, wmLabel, wmCommand }:
-        writeTextFile
-          {
-            name = "gnome-flashback-${wmName}-xsession";
-            destination = "/share/xsessions/gnome-flashback-${wmName}.desktop";
-            text = ''
-              [Desktop Entry]
-              Name=GNOME Flashback (${wmLabel})
-              Comment=This session logs you into GNOME Flashback with ${wmLabel}
-              Exec=${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName}
-              TryExec=${wmCommand}
-              Type=Application
-              DesktopNames=GNOME-Flashback;GNOME;
-            '';
-          } // {
-          providedSessions = [ "gnome-flashback-${wmName}" ];
-        };
-
-      mkSystemdTargetForWm = { wmName, wmLabel, wmCommand, enableGnomePanel }:
-        runCommand "gnome-flashback-${wmName}.target" { } ''
-          mkdir -p $out/lib/systemd/user
-          cp -r "${gnome-flashback}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \
-            "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d"
+    mkGnomeSession =
+      {
+        wmName,
+        wmLabel,
+        enableGnomePanel,
+      }:
+      writeTextFile {
+        name = "gnome-flashback-${wmName}-gnome-session";
+        destination = "/share/gnome-session/sessions/gnome-flashback-${wmName}.session";
+        text = ''
+          [GNOME Session]
+          Name=GNOME Flashback (${wmLabel})
+          ${requiredComponents wmName enableGnomePanel}
         '';
+      };
 
-      tests = { inherit (nixosTests) gnome-flashback; };
-    };
+    mkSessionForWm =
+      {
+        wmName,
+        wmLabel,
+        wmCommand,
+      }:
+      writeTextFile {
+        name = "gnome-flashback-${wmName}-xsession";
+        destination = "/share/xsessions/gnome-flashback-${wmName}.desktop";
+        text = ''
+          [Desktop Entry]
+          Name=GNOME Flashback (${wmLabel})
+          Comment=This session logs you into GNOME Flashback with ${wmLabel}
+          Exec=${gnome-session}/bin/gnome-session --session=gnome-flashback-${wmName}
+          TryExec=${wmCommand}
+          Type=Application
+          DesktopNames=GNOME-Flashback;GNOME;
+        '';
+      }
+      // {
+        providedSessions = [ "gnome-flashback-${wmName}" ];
+      };
 
-    meta = with lib; {
-      description = "GNOME 2.x-like session for GNOME 3";
-      mainProgram = "gnome-flashback";
-      homepage = "https://gitlab.gnome.org/GNOME/gnome-flashback";
-      license = licenses.gpl2;
-      maintainers = teams.gnome.members;
-      platforms = platforms.linux;
+    mkSystemdTargetForWm =
+      {
+        wmName,
+        wmLabel,
+        wmCommand,
+        enableGnomePanel,
+      }:
+      runCommand "gnome-flashback-${wmName}.target" { } ''
+        mkdir -p $out/lib/systemd/user
+        cp -r "${finalAttrs.gnome-flashback}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \
+          "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d"
+      '';
+
+    tests = {
+      inherit (nixosTests) gnome-flashback;
     };
   };
-in
-gnome-flashback
+
+  meta = with lib; {
+    description = "GNOME 2.x-like session for GNOME 3";
+    mainProgram = "gnome-flashback";
+    homepage = "https://gitlab.gnome.org/GNOME/gnome-flashback";
+    license = licenses.gpl2;
+    maintainers = teams.gnome.members;
+    platforms = platforms.linux;
+  };
+})
diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix
index 71bfd89d4599..17ecae10933c 100644
--- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix
+++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix
@@ -1,35 +1,40 @@
-{ stdenv
-, lib
-, fetchurl
-, autoreconfHook
-, dconf
-, evolution-data-server
-, gdm
-, geocode-glib_2
-, gettext
-, glib
-, gnome-desktop
-, gnome-menus
-, gnome
-, gtk3
-, itstool
-, libgweather
-, libwnck
-, libxml2
-, pkg-config
-, polkit
-, systemd
-, wrapGAppsHook3
+{
+  stdenv,
+  lib,
+  fetchurl,
+  autoreconfHook,
+  dconf,
+  evolution-data-server,
+  gdm,
+  geocode-glib_2,
+  gettext,
+  glib,
+  gnome-desktop,
+  gnome-menus,
+  gnome,
+  gtk3,
+  itstool,
+  libgweather,
+  libwnck,
+  libxml2,
+  pkg-config,
+  polkit,
+  systemd,
+  wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-panel";
   version = "3.52.0";
 
-  outputs = [ "out" "dev" "man" ];
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/gnome-panel/${lib.versions.majorMinor finalAttrs.version}/gnome-panel-${finalAttrs.version}.tar.xz";
     hash = "sha256-nim6iHPN5A1AwpNKRk+PQ7ousbUisZFEfKon3XhTxdQ=";
   };
 
@@ -91,8 +96,8 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
-      attrPath = "gnome.${pname}";
+      packageName = "gnome-panel";
+      attrPath = "gnome.gnome-panel";
       versionPolicy = "odd-unstable";
     };
   };
@@ -105,4 +110,4 @@ stdenv.mkDerivation rec {
     maintainers = teams.gnome.members;
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix b/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix
index 10b81eaad62c..9fb6d3c2d1dd 100644
--- a/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix
+++ b/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix
@@ -1,17 +1,21 @@
-{ stdenv
-, lib
-, buildEnv
-, gnome-panel
-, gnome-flashback
-, xorg
-, glib
-, wrapGAppsHook3
-, panelModulePackages ? [ ]
+{
+  stdenv,
+  lib,
+  buildEnv,
+  gnome-panel,
+  gnome-flashback,
+  xorg,
+  glib,
+  wrapGAppsHook3,
+  panelModulePackages ? [ ],
 }:
 
 let
   # We always want to find the built-in panel applets.
-  selectedPanelModulePackages = [ gnome-panel gnome-flashback ] ++ panelModulePackages;
+  selectedPanelModulePackages = [
+    gnome-panel
+    gnome-flashback
+  ] ++ panelModulePackages;
 
   panelModulesEnv = buildEnv {
     name = "gnome-panel-modules-env";
@@ -28,8 +32,9 @@ stdenv.mkDerivation {
     wrapGAppsHook3
   ];
 
-  buildInputs = selectedPanelModulePackages ++
-    lib.forEach selectedPanelModulePackages (x: x.buildInputs or [ ]);
+  buildInputs =
+    selectedPanelModulePackages
+    ++ lib.forEach selectedPanelModulePackages (x: x.buildInputs or [ ]);
 
   dontUnpack = true;
   dontConfigure = true;
@@ -62,5 +67,7 @@ stdenv.mkDerivation {
     )
   '';
 
-  meta = gnome-panel.meta // { outputsToInstall = [ "out" ]; };
+  meta = gnome-panel.meta // {
+    outputsToInstall = [ "out" ];
+  };
 }

From 27ba32c031b3c0e7b24a61b6d3bea2ed0bce6e4b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Aug 2024 23:17:33 +0200
Subject: [PATCH 121/149] gnome-text-editor: Move to by-name

---
 .../default.nix => by-name/gn/gnome-text-editor/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{desktops/gnome/apps/gnome-text-editor/default.nix => by-name/gn/gnome-text-editor/package.nix} (100%)

diff --git a/pkgs/desktops/gnome/apps/gnome-text-editor/default.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix
similarity index 100%
rename from pkgs/desktops/gnome/apps/gnome-text-editor/default.nix
rename to pkgs/by-name/gn/gnome-text-editor/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cd1a2b1d431..8e66d0c8be16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36507,8 +36507,6 @@ with pkgs;
 
   gnome-extensions-cli = python3Packages.callPackage ../desktops/gnome/misc/gnome-extensions-cli { };
 
-  gnome-text-editor = callPackage ../desktops/gnome/apps/gnome-text-editor { };
-
   gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { };
 
   gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { };

From 7c05cf7101d21130cabd40d859abc448508c8996 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Aug 2024 23:18:34 +0200
Subject: [PATCH 122/149] gnome-tour: Move to by-name

---
 .../default.nix => by-name/gn/gnome-tour/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{desktops/gnome/core/gnome-tour/default.nix => by-name/gn/gnome-tour/package.nix} (100%)

diff --git a/pkgs/desktops/gnome/core/gnome-tour/default.nix b/pkgs/by-name/gn/gnome-tour/package.nix
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-tour/default.nix
rename to pkgs/by-name/gn/gnome-tour/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e66d0c8be16..1e9a24c065ad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36507,8 +36507,6 @@ with pkgs;
 
   gnome-extensions-cli = python3Packages.callPackage ../desktops/gnome/misc/gnome-extensions-cli { };
 
-  gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { };
-
   gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { };
 
   gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { };

From 2180dc740e58cf6c76bc50b164fcd4324b3b3c09 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Aug 2024 23:19:33 +0200
Subject: [PATCH 123/149] gnome-2048: Move to by-name

---
 .../default.nix => by-name/gn/gnome-2048/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{desktops/gnome/games/gnome-2048/default.nix => by-name/gn/gnome-2048/package.nix} (100%)

diff --git a/pkgs/desktops/gnome/games/gnome-2048/default.nix b/pkgs/by-name/gn/gnome-2048/package.nix
similarity index 100%
rename from pkgs/desktops/gnome/games/gnome-2048/default.nix
rename to pkgs/by-name/gn/gnome-2048/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e9a24c065ad..c27edd24db5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36509,8 +36509,6 @@ with pkgs;
 
   gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { };
 
-  gnome-2048 = callPackage ../desktops/gnome/games/gnome-2048 { };
-
   gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { });
 
   lomiri = recurseIntoAttrs (callPackage ../desktops/lomiri { });

From b4c59a979a943b698b76c43eefc64913fedc4cbf Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Aug 2024 23:28:56 +0200
Subject: [PATCH 124/149] gnome-bluetooth{,_1_0}: Move to by-name

---
 nixos/modules/services/x11/desktop-managers/gnome.nix       | 2 +-
 pkgs/applications/window-managers/phosh/default.nix         | 3 ++-
 pkgs/by-name/ag/ags/package.nix                             | 4 ++--
 pkgs/by-name/bu/budgie-control-center/package.nix           | 3 ++-
 .../core => by-name/gn}/gnome-bluetooth/1.0/default.nix     | 2 +-
 .../default.nix => by-name/gn/gnome-bluetooth/package.nix}  | 1 -
 pkgs/desktops/gnome/default.nix                             | 6 ++----
 pkgs/tools/bluetooth/blueberry/default.nix                  | 4 ++--
 pkgs/top-level/all-packages.nix                             | 2 ++
 9 files changed, 14 insertions(+), 13 deletions(-)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-bluetooth/1.0/default.nix (97%)
 rename pkgs/{desktops/gnome/core/gnome-bluetooth/default.nix => by-name/gn/gnome-bluetooth/package.nix} (97%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 678ba1b12307..2933217c3b86 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -375,7 +375,7 @@ in
             pkgs.adwaita-icon-theme
             nixos-background-info
             pkgs.gnome-backgrounds
-            gnome-bluetooth
+            pkgs.gnome-bluetooth
             pkgs.gnome-color-manager
             gnome-control-center
             pkgs.gnome-shell-extensions
diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index 047e2dfda596..7a1d5a29ddb9 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -18,6 +18,7 @@
 , glib
 , gtk4
 , gnome
+, gnome-bluetooth
 , gnome-desktop
 , gcr
 , pam
@@ -71,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     networkmanager
     polkit
     gmobile
-    gnome.gnome-bluetooth
+    gnome-bluetooth
     gnome.gnome-control-center
     gnome-desktop
     gnome.gnome-session
diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix
index 5fd52f72485e..f47dca9aaad4 100644
--- a/pkgs/by-name/ag/ags/package.nix
+++ b/pkgs/by-name/ag/ags/package.nix
@@ -8,7 +8,7 @@
   gobject-introspection,
   gjs,
   glib-networking,
-  gnome,
+  gnome-bluetooth,
   gtk-layer-shell,
   libpulseaudio,
   libsoup_3,
@@ -50,7 +50,7 @@ buildNpmPackage rec {
   buildInputs = [
     gjs
     glib-networking
-    gnome.gnome-bluetooth
+    gnome-bluetooth
     gtk-layer-shell
     libpulseaudio
     libsoup_3
diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index 3efe7787db6f..702c48d5bf70 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -21,6 +21,7 @@
   glib-networking,
   glibc,
   gnome,
+  gnome-bluetooth_1_0,
   gnome-color-manager,
   gnome-desktop,
   gnome-remote-desktop,
@@ -116,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnome-desktop
     adwaita-icon-theme
     cheese
-    gnome.gnome-bluetooth_1_0
+    gnome-bluetooth_1_0
     gnome-remote-desktop
     gnome.gnome-settings-daemon
     gnome-user-share
diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix b/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix
similarity index 97%
rename from pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix
rename to pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix
index b7d155ad1cfc..e72398326bf9 100644
--- a/pkgs/desktops/gnome/core/gnome-bluetooth/1.0/default.nix
+++ b/pkgs/by-name/gn/gnome-bluetooth/1.0/default.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-bluetooth";
-      attrPath = "gnome.gnome-bluetooth_1_0";
+      attrPath = "gnome-bluetooth_1_0";
       freeze = true;
     };
   };
diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/by-name/gn/gnome-bluetooth/package.nix
similarity index 97%
rename from pkgs/desktops/gnome/core/gnome-bluetooth/default.nix
rename to pkgs/by-name/gn/gnome-bluetooth/package.nix
index 75a7b8127ed9..fe50b0958dec 100644
--- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix
+++ b/pkgs/by-name/gn/gnome-bluetooth/package.nix
@@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-bluetooth";
-      attrPath = "gnome.gnome-bluetooth";
     };
   };
 
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index a81a5ea46350..f503e6ce720c 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -17,10 +17,6 @@ in
 
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
-  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
-
-  gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { };
-
   gnome-control-center = callPackage ./core/gnome-control-center { };
 
   gnome-session = callPackage ./core/gnome-session { };
@@ -109,6 +105,8 @@ in
   gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22.
   gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13.
   gnome-backgrounds = lib.warn "The ‘gnome.gnome-backgrounds’ was moved to top-level. Please use ‘pkgs.gnome-backgrounds’ directly." pkgs.gnome-backgrounds; # Added on 2024-08-11.
+  gnome-bluetooth = lib.warn "The ‘gnome.gnome-bluetooth’ was moved to top-level. Please use ‘pkgs.gnome-bluetooth’ directly." pkgs.gnome-bluetooth; # Added on 2024-08-28.
+  gnome-bluetooth_1_0 = lib.warn "The ‘gnome.gnome-bluetooth_1_0’ was moved to top-level. Please use ‘pkgs.gnome-bluetooth_1_0’ directly." pkgs.gnome-bluetooth_1_0; # Added on 2024-08-28.
   gnome-boxes = lib.warn "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly." pkgs.gnome-boxes; # Added on 2024-08-11.
   gnome-characters = lib.warn "The ‘gnome.gnome-characters’ was moved to top-level. Please use ‘pkgs.gnome-characters’ directly." pkgs.gnome-characters; # Added on 2024-08-11.
   gnome-chess = lib.warn "The ‘gnome.gnome-chess’ was moved to top-level. Please use ‘pkgs.gnome-chess’ directly." pkgs.gnome-chess; # Added on 2024-08-11.
diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix
index 4b4786ac9a0d..4bc7736e06ed 100644
--- a/pkgs/tools/bluetooth/blueberry/default.nix
+++ b/pkgs/tools/bluetooth/blueberry/default.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchFromGitHub
 , bluez-tools
-, gnome
+, gnome-bluetooth_1_0
 , gobject-introspection
 , libnotify
 , pavucontrol
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     bluez-tools
-    gnome.gnome-bluetooth_1_0
+    gnome-bluetooth_1_0
     libnotify
     python3Packages.python
     util-linux
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c27edd24db5a..461fbd3202b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36507,6 +36507,8 @@ with pkgs;
 
   gnome-extensions-cli = python3Packages.callPackage ../desktops/gnome/misc/gnome-extensions-cli { };
 
+  gnome-bluetooth_1_0 = callPackage ../by-name/gn/gnome-bluetooth/1.0 { };
+
   gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { };
 
   gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { });

From 649d663029e6417b6845340dec286be552b426de Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Aug 2024 23:38:27 +0200
Subject: [PATCH 125/149] gnome-session-ctl: Move to top-level

---
 pkgs/desktops/gnome/default.nix | 3 +--
 pkgs/top-level/all-packages.nix | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index f503e6ce720c..6c435e76ed95 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -21,8 +21,6 @@ in
 
   gnome-session = callPackage ./core/gnome-session { };
 
-  gnome-session-ctl = callPackage ./core/gnome-session/ctl.nix { };
-
   gnome-shell = callPackage ./core/gnome-shell { };
 
   gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { };
@@ -135,6 +133,7 @@ in
   gnome-remote-desktop = lib.warn "The ‘gnome.gnome-remote-desktop’ was moved to top-level. Please use ‘pkgs.gnome-remote-desktop’ directly." pkgs.gnome-remote-desktop; # Added on 2024-08-11.
   gnome-robots = lib.warn "The ‘gnome.gnome-robots’ was moved to top-level. Please use ‘pkgs.gnome-robots’ directly." pkgs.gnome-robots; # Added on 2024-08-11.
   gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22.
+  gnome-session-ctl = lib.warn "The ‘gnome.gnome-session-ctl’ was moved to top-level. Please use ‘pkgs.gnome-session-ctl’ directly." pkgs.gnome-session-ctl; # Added on 2024-08-28.
   gnome-shell-extensions = lib.warn "The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly." pkgs.gnome-shell-extensions; # Added on 2024-08-11.
   gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11.
   gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 461fbd3202b4..3879536cb954 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36511,6 +36511,8 @@ with pkgs;
 
   gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { };
 
+  gnome-session-ctl = callPackage ../desktops/gnome/core/gnome-session/ctl.nix { };
+
   gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { });
 
   lomiri = recurseIntoAttrs (callPackage ../desktops/lomiri { });

From d2da9a19c4ebbd9995c5228f05b4cd7aa9fce82d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Aug 2024 23:41:06 +0200
Subject: [PATCH 126/149] gnome-settings-daemon{,43}: Move from gnome scope to
 top-level

---
 .../cd-dvd/installation-cd-graphical-calamares-gnome.nix   | 2 +-
 .../services/desktops/gnome/gnome-settings-daemon.nix      | 6 +++---
 pkgs/applications/networking/browsers/eolie/default.nix    | 4 ++--
 pkgs/by-name/ay/ayatana-indicator-session/package.nix      | 4 ++--
 pkgs/by-name/bu/budgie-control-center/package.nix          | 3 ++-
 pkgs/by-name/bu/budgie-desktop/package.nix                 | 3 ++-
 pkgs/by-name/bu/budgie-session/package.nix                 | 6 +++---
 pkgs/by-name/gn/gnome-disk-utility/package.nix             | 3 ++-
 .../gn}/gnome-settings-daemon/43/default.nix               | 0
 .../gn}/gnome-settings-daemon/43/fix-paths.patch           | 0
 .../add-gnome-session-ctl-option.patch                     | 0
 .../gn}/gnome-settings-daemon/fix-paths.patch              | 0
 .../gn/gnome-settings-daemon/package.nix}                  | 1 -
 pkgs/by-name/gn/gnome-tweaks/package.nix                   | 3 ++-
 pkgs/by-name/ma/magpie/package.nix                         | 4 ++--
 pkgs/desktops/gnome/core/gnome-session/default.nix         | 5 +++--
 pkgs/desktops/gnome/default.nix                            | 7 ++-----
 pkgs/desktops/pantheon/default.nix                         | 2 +-
 .../libraries/xdg-desktop-portal-gtk/default.nix           | 4 ++--
 pkgs/top-level/all-packages.nix                            | 3 +++
 20 files changed, 32 insertions(+), 28 deletions(-)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-settings-daemon/43/default.nix (100%)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-settings-daemon/43/fix-paths.patch (100%)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-settings-daemon/add-gnome-session-ctl-option.patch (100%)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-settings-daemon/fix-paths.patch (100%)
 rename pkgs/{desktops/gnome/core/gnome-settings-daemon/default.nix => by-name/gn/gnome-settings-daemon/package.nix} (97%)

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix
index 1de5ba113875..81d59f55db7c 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix
@@ -25,7 +25,7 @@
       sleep-inactive-battery-type='nothing'
     '';
 
-    extraGSettingsOverridePackages = [ pkgs.gnome.gnome-settings-daemon ];
+    extraGSettingsOverridePackages = [ pkgs.gnome-settings-daemon ];
 
     enable = true;
   };
diff --git a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
index 30b35f669092..21e7c3b58713 100644
--- a/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix
@@ -32,15 +32,15 @@ in
   config = lib.mkIf cfg.enable {
 
     environment.systemPackages = [
-      pkgs.gnome.gnome-settings-daemon
+      pkgs.gnome-settings-daemon
     ];
 
     services.udev.packages = [
-      pkgs.gnome.gnome-settings-daemon
+      pkgs.gnome-settings-daemon
     ];
 
     systemd.packages = [
-      pkgs.gnome.gnome-settings-daemon
+      pkgs.gnome-settings-daemon
     ];
 
     systemd.user.targets."gnome-session-x11-services".wants = [
diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix
index 69c3fdbfbca0..1c82fa7d8612 100644
--- a/pkgs/applications/networking/browsers/eolie/default.nix
+++ b/pkgs/applications/networking/browsers/eolie/default.nix
@@ -1,7 +1,7 @@
 { lib, fetchgit, meson, ninja, pkg-config, nix-update-script
 , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib
 , glib-networking, gtkspell3, hunspell, desktop-file-utils
-, gobject-introspection, wrapGAppsHook3, gnome }:
+, gobject-introspection, wrapGAppsHook3, gnome-settings-daemon }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "eolie";
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
     gst-plugins-base
     gst-plugins-ugly
     gstreamer
-    gnome.gnome-settings-daemon
+    gnome-settings-daemon
     gtk3
     gtkspell3
     hunspell
diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix
index 0914bec39610..0ee7f5228624 100644
--- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix
+++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix
@@ -7,7 +7,7 @@
   cmake,
   dbus,
   glib,
-  gnome,
+  gnome-settings-daemon,
   gsettings-desktop-schemas,
   gtest,
   intltool,
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     # TODO these bloat the closure size alot, just so the indicator doesn't have the potential to crash.
     # is there a better way to give it access to DE-specific schemas as needed?
     # https://github.com/AyatanaIndicators/ayatana-indicator-session/blob/88846bad7ee0aa8e0bb122816d06f9bc887eb464/src/service.c#L1387-L1413
-    gnome.gnome-settings-daemon
+    gnome-settings-daemon
     mate.mate-settings-daemon
   ];
 
diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index 702c48d5bf70..931c26ff8d6c 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -25,6 +25,7 @@
   gnome-color-manager,
   gnome-desktop,
   gnome-remote-desktop,
+  gnome-settings-daemon,
   gnome-user-share,
   gsettings-desktop-schemas,
   gsound,
@@ -119,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
     cheese
     gnome-bluetooth_1_0
     gnome-remote-desktop
-    gnome.gnome-settings-daemon
+    gnome-settings-daemon
     gnome-user-share
     gnome.mutter
     gsettings-desktop-schemas
diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index e75704944f7a..f6452953e835 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -9,6 +9,7 @@
   glib,
   gnome,
   gnome-desktop,
+  gnome-settings-daemon,
   graphene,
   gst_all_1,
   gtk-doc,
@@ -79,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     budgie-screensaver
     glib
     gnome-desktop
-    gnome.gnome-settings-daemon
+    gnome-settings-daemon
     gnome.mutter
     zenity
     graphene
diff --git a/pkgs/by-name/bu/budgie-session/package.nix b/pkgs/by-name/bu/budgie-session/package.nix
index 0dfd4dc60824..407902d824e7 100644
--- a/pkgs/by-name/bu/budgie-session/package.nix
+++ b/pkgs/by-name/bu/budgie-session/package.nix
@@ -6,12 +6,12 @@
   meson,
   ninja,
   pkg-config,
-  gnome,
   adwaita-icon-theme,
   glib,
   gtk3,
   gsettings-desktop-schemas,
   gnome-desktop,
+  gnome-settings-daemon,
   dbus,
   json-glib,
   libICE,
@@ -76,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     json-glib
     xorg.xtrans
     adwaita-icon-theme
-    gnome.gnome-settings-daemon
+    gnome-settings-daemon
     gsettings-desktop-schemas
     systemd
     libepoxy
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
     wrapProgram "$out/libexec/budgie-session-binary" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-      --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg"
+      --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg"
   '';
 
   separateDebugInfo = true;
diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix
index dd65e5727623..f93a877bc018 100644
--- a/pkgs/by-name/gn/gnome-disk-utility/package.nix
+++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix
@@ -15,6 +15,7 @@
 , libnotify
 , itstool
 , gnome
+, gnome-settings-daemon
 , adwaita-icon-theme
 , libxml2
 , gsettings-desktop-schemas
@@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
     udisks2
     adwaita-icon-theme
     systemd
-    gnome.gnome-settings-daemon
+    gnome-settings-daemon
     gsettings-desktop-schemas
   ];
 
diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix b/pkgs/by-name/gn/gnome-settings-daemon/43/default.nix
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-settings-daemon/43/default.nix
rename to pkgs/by-name/gn/gnome-settings-daemon/43/default.nix
diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch b/pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-settings-daemon/43/fix-paths.patch
rename to pkgs/by-name/gn/gnome-settings-daemon/43/fix-paths.patch
diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/add-gnome-session-ctl-option.patch b/pkgs/by-name/gn/gnome-settings-daemon/add-gnome-session-ctl-option.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-settings-daemon/add-gnome-session-ctl-option.patch
rename to pkgs/by-name/gn/gnome-settings-daemon/add-gnome-session-ctl-option.patch
diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch b/pkgs/by-name/gn/gnome-settings-daemon/fix-paths.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch
rename to pkgs/by-name/gn/gnome-settings-daemon/fix-paths.patch
diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
similarity index 97%
rename from pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix
rename to pkgs/by-name/gn/gnome-settings-daemon/package.nix
index f5b1f89805d4..8f9b06f0dfda 100644
--- a/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix
+++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
@@ -114,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-settings-daemon";
-      attrPath = "gnome.gnome-settings-daemon";
     };
   };
 
diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix
index 0e3e44f345d5..57660f06badc 100644
--- a/pkgs/by-name/gn/gnome-tweaks/package.nix
+++ b/pkgs/by-name/gn/gnome-tweaks/package.nix
@@ -8,6 +8,7 @@
 , glib
 , gnome
 , gnome-desktop
+, gnome-settings-daemon
 , gnome-shell-extensions
 , gobject-introspection
 , gsettings-desktop-schemas
@@ -48,7 +49,7 @@ python3Packages.buildPythonApplication rec {
     gdk-pixbuf
     glib
     gnome-desktop
-    gnome.gnome-settings-daemon
+    gnome-settings-daemon
     gnome.gnome-shell
     # Makes it possible to select user themes through the `user-theme` extension
     gnome-shell-extensions
diff --git a/pkgs/by-name/ma/magpie/package.nix b/pkgs/by-name/ma/magpie/package.nix
index 176c81fae2b8..d549a46148d9 100644
--- a/pkgs/by-name/ma/magpie/package.nix
+++ b/pkgs/by-name/ma/magpie/package.nix
@@ -5,7 +5,7 @@
   fetchpatch,
   stdenv,
   pkg-config,
-  gnome,
+  gnome-settings-daemon,
   gettext,
   gobject-introspection,
   cairo,
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
     glib
     gnome-desktop
-    gnome.gnome-settings-daemon
+    gnome-settings-daemon
     gobject-introspection
     gsettings-desktop-schemas
     gtk3
diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix
index 74eb9dbd09ec..78824870ac0c 100644
--- a/pkgs/desktops/gnome/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-session/default.nix
@@ -12,6 +12,7 @@
   gtk3,
   gsettings-desktop-schemas,
   gnome-desktop,
+  gnome-settings-daemon,
   dbus,
   json-glib,
   libICE,
@@ -75,7 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     json-glib
     xorg.xtrans
     adwaita-icon-theme
-    gnome.gnome-settings-daemon
+    gnome-settings-daemon
     gsettings-desktop-schemas
     systemd
     libepoxy
@@ -114,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
       --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share" \
-      --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg"
+      --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg"
   '';
 
   separateDebugInfo = true;
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 6c435e76ed95..401d6bbdd73c 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -23,11 +23,6 @@ in
 
   gnome-shell = callPackage ./core/gnome-shell { };
 
-  gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { };
-
-  # Using 43 to match Mutter used in Pantheon
-  gnome-settings-daemon43 = callPackage ./core/gnome-settings-daemon/43 { };
-
   gvfs = pkgs.gvfs.override { gnomeSupport = true; };
 
   mutter = callPackage ./core/mutter { };
@@ -134,6 +129,8 @@ in
   gnome-robots = lib.warn "The ‘gnome.gnome-robots’ was moved to top-level. Please use ‘pkgs.gnome-robots’ directly." pkgs.gnome-robots; # Added on 2024-08-11.
   gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22.
   gnome-session-ctl = lib.warn "The ‘gnome.gnome-session-ctl’ was moved to top-level. Please use ‘pkgs.gnome-session-ctl’ directly." pkgs.gnome-session-ctl; # Added on 2024-08-28.
+  gnome-settings-daemon = lib.warn "The ‘gnome.gnome-settings-daemon’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon’ directly." pkgs.gnome-settings-daemon; # Added on 2024-08-28.
+  gnome-settings-daemon43 = lib.warn "The ‘gnome.gnome-settings-daemon43’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon43’ directly." pkgs.gnome-settings-daemon43; # Added on 2024-08-28.
   gnome-shell-extensions = lib.warn "The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly." pkgs.gnome-shell-extensions; # Added on 2024-08-11.
   gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11.
   gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11.
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index 47f4d036fc5c..d0febb9513e9 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -41,7 +41,7 @@ lib.makeScope pkgs.newScope (self: with self; {
   mutter = pkgs.gnome.mutter43;
 
   # Using 43 to match Mutter used in Pantheon
-  gnome-settings-daemon = pkgs.gnome.gnome-settings-daemon43;
+  gnome-settings-daemon = pkgs.gnome-settings-daemon43;
 
   elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { };
 
diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
index e1a51284927a..a1d01682f22e 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
@@ -6,7 +6,7 @@
 , pkg-config
 , xdg-desktop-portal
 , gtk3
-, gnome
+, gnome-settings-daemon
 , gnome-desktop
 , glib
 , wrapGAppsHook3
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals buildPortalsInGnome [
     gsettings-desktop-schemas # settings exposed by settings portal
     gnome-desktop
-    gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings)
+    gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s, just mouse and xsettings)
   ];
 
   mesonFlags = lib.optionals (!buildPortalsInGnome) [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3879536cb954..c392ecef985d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36513,6 +36513,9 @@ with pkgs;
 
   gnome-session-ctl = callPackage ../desktops/gnome/core/gnome-session/ctl.nix { };
 
+  # Using 43 to match Mutter used in Pantheon
+  gnome-settings-daemon43 = callPackage ../by-name/gn/gnome-settings-daemon/43 { };
+
   gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep { });
 
   lomiri = recurseIntoAttrs (callPackage ../desktops/lomiri { });

From 7f387d6bf915b8fd7d7131edd3e5107f4a98cc9d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Aug 2024 23:56:04 +0200
Subject: [PATCH 127/149] mutter{,43}: Move from gnome scope to top-level

---
 nixos/modules/services/x11/desktop-managers/gnome.nix      | 6 +++---
 pkgs/applications/misc/phoc/default.nix                    | 4 ++--
 pkgs/by-name/bu/budgie-control-center/package.nix          | 5 +++--
 pkgs/by-name/bu/budgie-desktop/package.nix                 | 4 ++--
 pkgs/by-name/bu/budgie-gsettings-overrides/package.nix     | 4 ++--
 pkgs/by-name/gn/gnome-tweaks/package.nix                   | 3 ++-
 .../gnome/core => by-name/mu}/mutter/43/default.nix        | 0
 .../mutter/default.nix => by-name/mu/mutter/package.nix}   | 1 -
 pkgs/desktops/gnome/default.nix                            | 7 ++-----
 pkgs/desktops/pantheon/default.nix                         | 2 +-
 pkgs/top-level/all-packages.nix                            | 3 +++
 11 files changed, 20 insertions(+), 19 deletions(-)
 rename pkgs/{desktops/gnome/core => by-name/mu}/mutter/43/default.nix (100%)
 rename pkgs/{desktops/gnome/core/mutter/default.nix => by-name/mu/mutter/package.nix} (99%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 2933217c3b86..45d1ad045cd9 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -334,10 +334,10 @@ in
         gnome-shell
       ];
 
-      services.udev.packages = with pkgs.gnome; [
+      services.udev.packages = [
         # Force enable KMS modifiers for devices that require them.
-        # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443
-        mutter
+        # https://gitlab.gnome.org/GNOME/pkgs.mutter/-/merge_requests/1443
+        pkgs.mutter
       ];
 
       services.avahi.enable = mkDefault true;
diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix
index 2c31efe54291..494d287364c2 100644
--- a/pkgs/applications/misc/phoc/default.nix
+++ b/pkgs/applications/misc/phoc/default.nix
@@ -10,7 +10,7 @@
 , wrapGAppsHook3
 , libinput
 , gobject-introspection
-, gnome
+, mutter
 , gnome-desktop
 , glib
 , gtk3
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     gnome-desktop
     # For keybindings settings schemas
-    gnome.mutter
+    mutter
     json-glib
     wayland
     finalAttrs.wlroots
diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index 931c26ff8d6c..ca114fb1f6ff 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -48,6 +48,7 @@
   libxslt,
   meson,
   modemmanager,
+  mutter,
   networkmanager,
   networkmanagerapplet,
   ninja,
@@ -122,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnome-remote-desktop
     gnome-settings-daemon
     gnome-user-share
-    gnome.mutter
+    mutter
     gsettings-desktop-schemas
     gsound
     gtk3
@@ -176,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
       --prefix XDG_DATA_DIRS : "${librsvg}/share"
       # WM keyboard shortcuts
-      --prefix XDG_DATA_DIRS : "${gnome.mutter}/share"
+      --prefix XDG_DATA_DIRS : "${mutter}/share"
     )
   '';
 
diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index f6452953e835..74d9d2c35a94 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -7,7 +7,6 @@
   budgie-screensaver,
   docbook-xsl-nons,
   glib,
-  gnome,
   gnome-desktop,
   gnome-settings-daemon,
   graphene,
@@ -27,6 +26,7 @@
   magpie,
   mesa,
   meson,
+  mutter,
   ninja,
   nix-update-script,
   nixosTests,
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gnome-desktop
     gnome-settings-daemon
-    gnome.mutter
+    mutter
     zenity
     graphene
     gst_all_1.gstreamer
diff --git a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix
index f45a033a8732..02bd605ee3cf 100644
--- a/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix
+++ b/pkgs/by-name/bu/budgie-gsettings-overrides/package.nix
@@ -5,7 +5,7 @@
   budgie-desktop-view,
   glib,
   gsettings-desktop-schemas,
-  gnome,
+  mutter,
   nixos-artwork,
   nixos-background-light ? nixos-artwork.wallpapers.nineish,
   nixos-background-dark ? nixos-artwork.wallpapers.nineish-dark-gray,
@@ -59,7 +59,7 @@ let
     budgie-desktop
     budgie-desktop-view
     gsettings-desktop-schemas
-    gnome.mutter
+    mutter
   ] ++ extraGSettingsOverridePackages;
 
 in
diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix
index 57660f06badc..6fd3c8566912 100644
--- a/pkgs/by-name/gn/gnome-tweaks/package.nix
+++ b/pkgs/by-name/gn/gnome-tweaks/package.nix
@@ -18,6 +18,7 @@
 , libgudev
 , libnotify
 , libxml2
+, mutter
 , pkg-config
 , python3Packages
 , wrapGAppsHook4
@@ -53,7 +54,7 @@ python3Packages.buildPythonApplication rec {
     gnome.gnome-shell
     # Makes it possible to select user themes through the `user-theme` extension
     gnome-shell-extensions
-    gnome.mutter
+    mutter
     gsettings-desktop-schemas
     gtk4
     libadwaita
diff --git a/pkgs/desktops/gnome/core/mutter/43/default.nix b/pkgs/by-name/mu/mutter/43/default.nix
similarity index 100%
rename from pkgs/desktops/gnome/core/mutter/43/default.nix
rename to pkgs/by-name/mu/mutter/43/default.nix
diff --git a/pkgs/desktops/gnome/core/mutter/default.nix b/pkgs/by-name/mu/mutter/package.nix
similarity index 99%
rename from pkgs/desktops/gnome/core/mutter/default.nix
rename to pkgs/by-name/mu/mutter/package.nix
index 54687cbb0f94..82e3f951f16c 100644
--- a/pkgs/desktops/gnome/core/mutter/default.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -200,7 +200,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     updateScript = gnome.updateScript {
       packageName = "mutter";
-      attrPath = "gnome.mutter";
     };
   };
 
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 401d6bbdd73c..769585c7fcad 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -25,11 +25,6 @@ in
 
   gvfs = pkgs.gvfs.override { gnomeSupport = true; };
 
-  mutter = callPackage ./core/mutter { };
-
-  # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided
-  mutter43 = callPackage ./core/mutter/43 { };
-
   networkmanager-openvpn = pkgs.networkmanager-openvpn.override {
     withGnome = true;
   };
@@ -150,6 +145,8 @@ in
   iagno = lib.warn "The ‘gnome.iagno’ was moved to top-level. Please use ‘pkgs.iagno’ directly." pkgs.iagno; # Added on 2024-08-11.
   lightsoff = lib.warn "The ‘gnome.lightsoff’ was moved to top-level. Please use ‘pkgs.lightsoff’ directly." pkgs.lightsoff; # Added on 2024-08-11.
   metacity = lib.warn "The ‘gnome.metacity’ was moved to top-level. Please use ‘pkgs.metacity’ directly." pkgs.metacity; # Added on 2024-08-11.
+  mutter = lib.warn "The ‘gnome.mutter’ was moved to top-level. Please use ‘pkgs.mutter’ directly." pkgs.mutter; # Added on 2024-08-28.
+  mutter43 = lib.warn "The ‘gnome.mutter43’ was moved to top-level. Please use ‘pkgs.mutter43’ directly." pkgs.mutter43; # Added on 2024-08-28.
   nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13.
   nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13.
   polari = lib.warn "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly." pkgs.polari; # Added on 2024-08-11.
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index d0febb9513e9..ae524b4b4888 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   maintainers = lib.teams.pantheon.members;
 
-  mutter = pkgs.gnome.mutter43;
+  mutter = pkgs.mutter43;
 
   # Using 43 to match Mutter used in Pantheon
   gnome-settings-daemon = pkgs.gnome-settings-daemon43;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c392ecef985d..1de8b63a7869 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36544,6 +36544,9 @@ with pkgs;
 
   mate = recurseIntoAttrs (callPackage ../desktops/mate { });
 
+  # Needed for elementary's gala, wingpanel and greeter until support for higher versions is provided
+  mutter43 = callPackage ../by-name/mu/mutter/43 { };
+
   pantheon = recurseIntoAttrs (callPackage ../desktops/pantheon { });
 
   wingpanel-indicator-ayatana = callPackage ../desktops/pantheon/third-party/wingpanel-indicator-ayatana { };

From ca9576c81da013b7ab7a302990f7928d33e85198 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Aug 2024 23:56:05 +0200
Subject: [PATCH 128/149] gnome-shell: Move from gnome scope to top-level

---
 nixos/modules/services/x11/desktop-managers/gnome.md |  2 +-
 .../modules/services/x11/desktop-managers/gnome.nix  | 10 +++++-----
 nixos/modules/services/x11/display-managers/gdm.nix  |  6 +++++-
 nixos/tests/gnome-extensions.nix                     |  2 +-
 nixos/tests/gnome-xorg.nix                           |  2 +-
 nixos/tests/gnome.nix                                |  2 +-
 pkgs/applications/window-managers/phosh/default.nix  |  3 ++-
 .../core => by-name/gn}/gnome-shell/fix-paths.patch  |  0
 .../gn}/gnome-shell/greeter-logo-size.patch          |  0
 .../gn/gnome-shell/package.nix}                      |  1 -
 .../gn}/gnome-shell/shew-gir-path.patch              |  0
 .../gn}/gnome-shell/wrap-services.patch              |  0
 pkgs/by-name/gn/gnome-tweaks/package.nix             |  3 ++-
 pkgs/by-name/ma/matrix-gtk-theme/package.nix         |  4 ++--
 pkgs/by-name/to/tokyonight-gtk-theme/package.nix     |  4 ++--
 pkgs/data/themes/adapta/default.nix                  |  4 ++--
 pkgs/data/themes/arc/default.nix                     |  4 ++--
 pkgs/data/themes/ayu-theme-gtk/default.nix           |  4 ++--
 pkgs/data/themes/equilux-theme/default.nix           |  4 ++--
 pkgs/data/themes/lounge/default.nix                  |  4 ++--
 pkgs/data/themes/materia-theme/default.nix           |  4 ++--
 pkgs/desktops/gnome/core/gnome-session/default.nix   |  3 ++-
 pkgs/desktops/gnome/default.nix                      |  3 +--
 .../gnome/extensions/EasyScreenCast/default.nix      |  4 ++--
 .../gnome/extensions/clock-override/default.nix      |  4 ++--
 .../extensions/gnome-browser-connector/default.nix   |  3 ++-
 pkgs/desktops/gnome/extensions/gsconnect/default.nix |  4 ++--
 .../desktops/gnome/extensions/icon-hider/default.nix |  6 +++---
 .../extensions/pidgin-im-integration/default.nix     |  4 ++--
 .../desktops/gnome/extensions/tilingnome/default.nix |  4 ++--
 pkgs/desktops/gnome/extensions/unite/default.nix     |  4 ++--
 .../extensions/window-corner-preview/default.nix     |  4 ++--
 pkgs/top-level/all-packages.nix                      | 12 +++---------
 33 files changed, 59 insertions(+), 59 deletions(-)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-shell/fix-paths.patch (100%)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-shell/greeter-logo-size.patch (100%)
 rename pkgs/{desktops/gnome/core/gnome-shell/default.nix => by-name/gn/gnome-shell/package.nix} (99%)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-shell/shew-gir-path.patch (100%)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-shell/wrap-services.patch (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.md b/nixos/modules/services/x11/desktop-managers/gnome.md
index 9943f138dc60..6641bc9ff43b 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.md
+++ b/nixos/modules/services/x11/desktop-managers/gnome.md
@@ -167,7 +167,7 @@ You can use `dconf-editor` tool to explore which GSettings you can set.
 
     extraGSettingsOverridePackages = [
       pkgs.gsettings-desktop-schemas # for org.gnome.desktop
-      pkgs.gnome.gnome-shell # for org.gnome.shell
+      pkgs.gnome-shell # for org.gnome.shell
     ];
   };
 }
diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 45d1ad045cd9..aafd230deb36 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -108,7 +108,7 @@ in
             favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ]
           '''
         '';
-        description = "List of desktop files to put as favorite apps into gnome-shell. These need to be installed somehow globally.";
+        description = "List of desktop files to put as favorite apps into pkgs.gnome-shell. These need to be installed somehow globally.";
       };
 
       extraGSettingsOverrides = mkOption {
@@ -309,7 +309,7 @@ in
       services.xserver.desktopManager.gnome.sessionPath =
         let
           mandatoryPackages = [
-            pkgs.gnome.gnome-shell
+            pkgs.gnome-shell
           ];
           optionalPackages = [
             pkgs.gnome-shell-extensions
@@ -331,7 +331,7 @@ in
 
       systemd.packages = with pkgs.gnome; [
         gnome-session
-        gnome-shell
+        pkgs.gnome-shell
       ];
 
       services.udev.packages = [
@@ -368,8 +368,8 @@ in
       # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst
       environment.systemPackages =
         let
-          mandatoryPackages = with pkgs.gnome; [
-            gnome-shell
+          mandatoryPackages = [
+            pkgs.gnome-shell
           ];
           optionalPackages = with pkgs.gnome; [
             pkgs.adwaita-icon-theme
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index c4987f1b6322..36567d993752 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -181,7 +181,11 @@ in
     ];
 
     # Otherwise GDM will not be able to start correctly and display Wayland sessions
-    systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ];
+    systemd.packages = with pkgs.gnome; [
+      gdm
+      gnome-session
+      pkgs.gnome-shell
+    ];
     environment.systemPackages = [ pkgs.adwaita-icon-theme ];
 
     # We dont use the upstream gdm service
diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix
index 332cf44b0ed4..109fdf6b0846 100644
--- a/nixos/tests/gnome-extensions.nix
+++ b/nixos/tests/gnome-extensions.nix
@@ -45,7 +45,7 @@ import ./make-test-python.nix (
               # Eval API is now internal so Shell needs to run in unsafe mode.
               # TODO: improve test driver so that it supports openqa-like manipulation
               # that would allow us to drop this mess.
-              "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode"
+              "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
             ];
           };
         };
diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix
index c8ffb459edec..45538ef4eab4 100644
--- a/nixos/tests/gnome-xorg.nix
+++ b/nixos/tests/gnome-xorg.nix
@@ -35,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
               # Eval API is now internal so Shell needs to run in unsafe mode.
               # TODO: improve test driver so that it supports openqa-like manipulation
               # that would allow us to drop this mess.
-              "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode"
+              "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
             ];
           };
         };
diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix
index 98d61c7ea172..9a296b93682c 100644
--- a/nixos/tests/gnome.nix
+++ b/nixos/tests/gnome.nix
@@ -31,7 +31,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
               # Eval API is now internal so Shell needs to run in unsafe mode.
               # TODO: improve test driver so that it supports openqa-like manipulation
               # that would allow us to drop this mess.
-              "${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode"
+              "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
             ];
           };
         };
diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index 7a1d5a29ddb9..28ffcbe2578c 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -20,6 +20,7 @@
 , gnome
 , gnome-bluetooth
 , gnome-desktop
+, gnome-shell
 , gcr
 , pam
 , systemd
@@ -110,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Depends on GSettings schemas in gnome-shell
   preFixup = ''
     gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}"
+      --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath gnome-shell}"
       --set GNOME_SESSION "${gnome.gnome-session}/bin/gnome-session"
     )
   '';
diff --git a/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch b/pkgs/by-name/gn/gnome-shell/fix-paths.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch
rename to pkgs/by-name/gn/gnome-shell/fix-paths.patch
diff --git a/pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch b/pkgs/by-name/gn/gnome-shell/greeter-logo-size.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch
rename to pkgs/by-name/gn/gnome-shell/greeter-logo-size.patch
diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/by-name/gn/gnome-shell/package.nix
similarity index 99%
rename from pkgs/desktops/gnome/core/gnome-shell/default.nix
rename to pkgs/by-name/gn/gnome-shell/package.nix
index f218e6640ade..31190a9e1f5b 100644
--- a/pkgs/desktops/gnome/core/gnome-shell/default.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -231,7 +231,6 @@ stdenv.mkDerivation (finalAttrs: {
     mozillaPlugin = "/lib/mozilla/plugins";
     updateScript = gnome.updateScript {
       packageName = "gnome-shell";
-      attrPath = "gnome.gnome-shell";
     };
   };
 
diff --git a/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch
rename to pkgs/by-name/gn/gnome-shell/shew-gir-path.patch
diff --git a/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch b/pkgs/by-name/gn/gnome-shell/wrap-services.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch
rename to pkgs/by-name/gn/gnome-shell/wrap-services.patch
diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix
index 6fd3c8566912..075b2d777ec3 100644
--- a/pkgs/by-name/gn/gnome-tweaks/package.nix
+++ b/pkgs/by-name/gn/gnome-tweaks/package.nix
@@ -9,6 +9,7 @@
 , gnome
 , gnome-desktop
 , gnome-settings-daemon
+, gnome-shell
 , gnome-shell-extensions
 , gobject-introspection
 , gsettings-desktop-schemas
@@ -51,7 +52,7 @@ python3Packages.buildPythonApplication rec {
     glib
     gnome-desktop
     gnome-settings-daemon
-    gnome.gnome-shell
+    gnome-shell
     # Makes it possible to select user themes through the `user-theme` extension
     gnome-shell-extensions
     mutter
diff --git a/pkgs/by-name/ma/matrix-gtk-theme/package.nix b/pkgs/by-name/ma/matrix-gtk-theme/package.nix
index 77283781bcaa..5477ad89d604 100644
--- a/pkgs/by-name/ma/matrix-gtk-theme/package.nix
+++ b/pkgs/by-name/ma/matrix-gtk-theme/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  gnome,
+  gnome-shell,
   sassc,
   gnome-themes-extra,
   gtk-engine-murrine,
@@ -82,7 +82,7 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
     nativeBuildInputs = [
-      gnome.gnome-shell
+      gnome-shell
       sassc
     ];
     buildInputs = [ gnome-themes-extra ];
diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
index 2c402c008fa7..cd4d28ca6621 100644
--- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
+++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  gnome,
+  gnome-shell,
   sassc,
   gnome-themes-extra,
   gtk-engine-murrine,
@@ -83,7 +83,7 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
     nativeBuildInputs = [
-      gnome.gnome-shell
+      gnome-shell
       sassc
     ];
     buildInputs = [ gnome-themes-extra ];
diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix
index 6f32b2b727e2..7b9164ef4424 100644
--- a/pkgs/data/themes/adapta/default.nix
+++ b/pkgs/data/themes/adapta/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome }:
+{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome-shell }:
 
 stdenv.mkDerivation rec {
   pname = "adapta-gtk-theme";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     inkscape
     libxml2
     glib.dev
-    gnome.gnome-shell
+    gnome-shell
   ];
 
   buildInputs = [
diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix
index b3625858ec98..0f282df8fea6 100644
--- a/pkgs/data/themes/arc/default.nix
+++ b/pkgs/data/themes/arc/default.nix
@@ -4,7 +4,7 @@
 , meson
 , ninja
 , glib
-, gnome
+, gnome-shell
 , gnome-themes-extra
 , gtk-engine-murrine
 , inkscape
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity"
     # "-Dvariants=light,darker,dark,lighter"
     "-Dcinnamon_version=${cinnamon-common.version}"
-    "-Dgnome_shell_version=${gnome.gnome-shell.version}"
+    "-Dgnome_shell_version=${gnome-shell.version}"
     # You will need to patch gdm to make use of this.
     "-Dgnome_shell_gresource=true"
   ];
diff --git a/pkgs/data/themes/ayu-theme-gtk/default.nix b/pkgs/data/themes/ayu-theme-gtk/default.nix
index 29421c58bff2..1f154f6de2f6 100644
--- a/pkgs/data/themes/ayu-theme-gtk/default.nix
+++ b/pkgs/data/themes/ayu-theme-gtk/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , autoreconfHook
 , fetchFromGitHub
-, gnome
+, gnome-shell
 , gnome-themes-extra
 , gtk-engine-murrine
 , gtk3
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--with-gnome-shell=${gnome.gnome-shell.version}"
+    "--with-gnome-shell=${gnome-shell.version}"
     "--disable-unity"
   ];
 
diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix
index 3b3af2431dd3..53e45328a8e6 100644
--- a/pkgs/data/themes/equilux-theme/default.nix
+++ b/pkgs/data/themes/equilux-theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gnome, gnome-themes-extra, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
+{ lib, stdenv, fetchFromGitHub, gnome-shell, gnome-themes-extra, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
 
 stdenv.mkDerivation rec {
   pname = "equilux-theme";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     patchShebangs install.sh
     sed -i install.sh \
       -e "s|if .*which gnome-shell.*;|if true;|" \
-      -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome.gnome-shell.version}|"
+      -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome-shell.version}|"
     mkdir -p $out/share/themes
     ./install.sh --dest $out/share/themes
     rm $out/share/themes/*/COPYING
diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/data/themes/lounge/default.nix
index ab945f510538..f04e19bc2db3 100644
--- a/pkgs/data/themes/lounge/default.nix
+++ b/pkgs/data/themes/lounge/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome, gdk-pixbuf, librsvg, gtk-engine-murrine }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome-shell, gdk-pixbuf, librsvg, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   pname = "lounge-gtk-theme";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   mesonFlags = [
-    "-D gnome_version=${lib.versions.majorMinor gnome.gnome-shell.version}"
+    "-D gnome_version=${lib.versions.majorMinor gnome-shell.version}"
   ];
 
   postFixup = ''
diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix
index 7ccf0fd68b2f..a5a574aa7927 100644
--- a/pkgs/data/themes/materia-theme/default.nix
+++ b/pkgs/data/themes/materia-theme/default.nix
@@ -4,7 +4,7 @@
 , meson
 , ninja
 , sassc
-, gnome
+, gnome-shell
 , gnome-themes-extra
 , gtk-engine-murrine
 , gdk-pixbuf
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
   mesonFlags = [
-    "-Dgnome_shell_version=${lib.versions.majorMinor gnome.gnome-shell.version}"
+    "-Dgnome_shell_version=${lib.versions.majorMinor gnome-shell.version}"
   ];
 
   postInstall = ''
diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix
index 78824870ac0c..841458f94037 100644
--- a/pkgs/desktops/gnome/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-session/default.nix
@@ -13,6 +13,7 @@
   gsettings-desktop-schemas,
   gnome-desktop,
   gnome-settings-daemon,
+  gnome-shell,
   dbus,
   json-glib,
   libICE,
@@ -114,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
     wrapProgram "$out/libexec/gnome-session-binary" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-      --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share" \
+      --suffix XDG_DATA_DIRS : "${gnome-shell}/share" \
       --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg"
   '';
 
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 769585c7fcad..29e94b1ce79d 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -21,8 +21,6 @@ in
 
   gnome-session = callPackage ./core/gnome-session { };
 
-  gnome-shell = callPackage ./core/gnome-shell { };
-
   gvfs = pkgs.gvfs.override { gnomeSupport = true; };
 
   networkmanager-openvpn = pkgs.networkmanager-openvpn.override {
@@ -126,6 +124,7 @@ in
   gnome-session-ctl = lib.warn "The ‘gnome.gnome-session-ctl’ was moved to top-level. Please use ‘pkgs.gnome-session-ctl’ directly." pkgs.gnome-session-ctl; # Added on 2024-08-28.
   gnome-settings-daemon = lib.warn "The ‘gnome.gnome-settings-daemon’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon’ directly." pkgs.gnome-settings-daemon; # Added on 2024-08-28.
   gnome-settings-daemon43 = lib.warn "The ‘gnome.gnome-settings-daemon43’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon43’ directly." pkgs.gnome-settings-daemon43; # Added on 2024-08-28.
+  gnome-shell = lib.warn "The ‘gnome.gnome-shell’ was moved to top-level. Please use ‘pkgs.gnome-shell’ directly." pkgs.gnome-shell; # Added on 2024-08-28.
   gnome-shell-extensions = lib.warn "The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly." pkgs.gnome-shell-extensions; # Added on 2024-08-11.
   gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11.
   gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11.
diff --git a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
index ea371ae6efd8..f7f79e89dc9c 100644
--- a/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
+++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext, jq, intltool }:
+{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome-shell, gettext, jq, intltool }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell-extension-EasyScreenCast";
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     (substituteAll {
       src = ./fix-gi-path.patch;
-      gnomeShell = gnome.gnome-shell;
+      gnomeShell = gnome-shell;
     })
   ];
 
diff --git a/pkgs/desktops/gnome/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix
index 1f749574c40c..919dfb68de04 100644
--- a/pkgs/desktops/gnome/extensions/clock-override/default.nix
+++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchzip, gnome, gettext, glib }:
+{ lib, stdenv, fetchzip, gnome-shell, gettext, glib }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-clock-override";
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = with maintainers; [ rhoriguchi ];
     homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override";
-    broken = versionOlder gnome.gnome-shell.version "3.18";
+    broken = versionOlder gnome-shell.version "3.18";
   };
 }
diff --git a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix
index 3d4108eafdf7..0eeaea47befd 100644
--- a/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix
+++ b/pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix
@@ -4,6 +4,7 @@
 , ninja
 , python3
 , gnome
+, gnome-shell
 , wrapGAppsNoGuiHook
 , gobject-introspection
 }:
@@ -30,7 +31,7 @@ buildPythonApplication rec {
   ];
 
   buildInputs = [
-    gnome.gnome-shell
+    gnome-shell
   ];
 
   pythonPath = [
diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
index ca5c939de263..97270194bdb0 100644
--- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix
+++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix
@@ -13,7 +13,7 @@
 , glib-networking
 , gtk3
 , openssh
-, gnome
+, gnome-shell
 , evolution-data-server-gtk4
 , gjs
 , nixosTests
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dgnome_shell_libdir=${gnome.gnome-shell}/lib"
+    "-Dgnome_shell_libdir=${gnome-shell}/lib"
     "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts"
     "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts"
     "-Dopenssl_path=${openssl}/bin/openssl"
diff --git a/pkgs/desktops/gnome/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
index b5b2ae8ec747..28ad5f1d32a1 100644
--- a/pkgs/desktops/gnome/extensions/icon-hider/default.nix
+++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gnome }:
+{ lib, stdenv, fetchFromGitHub, gnome-shell }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-icon-hider";
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
     description = "Icon Hider is a GNOME Shell extension for managing status area items";
     license = licenses.bsd3;
     maintainers = with maintainers; [ jonafato ];
-    platforms = gnome.gnome-shell.meta.platforms;
+    platforms = gnome-shell.meta.platforms;
     homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider";
-    broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34
+    broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34
   };
 }
diff --git a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
index 200ca9a63e5c..3dc9fa61b747 100644
--- a/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
+++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, glib, gnome }:
+{ lib, stdenv, fetchFromGitHub, glib, gnome-shell }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-pidgin-im-integration";
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ ];
-    broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34
+    broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34
   };
 }
diff --git a/pkgs/desktops/gnome/extensions/tilingnome/default.nix b/pkgs/desktops/gnome/extensions/tilingnome/default.nix
index fbf89ffa19c9..3e6a2efb990f 100644
--- a/pkgs/desktops/gnome/extensions/tilingnome/default.nix
+++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, glib, gnome }:
+{ stdenv, lib, fetchFromGitHub, glib, gnome-shell }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-tilingnome";
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = with maintainers; [ benley ];
     homepage = "https://github.com/rliang/gnome-shell-extension-tilingnome";
-    platforms = gnome.gnome-shell.meta.platforms;
+    platforms = gnome-shell.meta.platforms;
   };
 }
diff --git a/pkgs/desktops/gnome/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix
index c39d430c937a..5c5cf7444d87 100644
--- a/pkgs/desktops/gnome/extensions/unite/default.nix
+++ b/pkgs/desktops/gnome/extensions/unite/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, gnome, fetchFromGitHub, xprop, glib }:
+{ lib, stdenv, gnome-shell, fetchFromGitHub, xprop, glib }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-unite";
@@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ rhoriguchi ];
     homepage = "https://github.com/hardpixel/unite-shell";
-    broken = versionOlder gnome.gnome-shell.version "3.32";
+    broken = versionOlder gnome-shell.version "3.32";
   };
 }
diff --git a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
index 48d80545ecca..e8d43bb15831 100644
--- a/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
+++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gnome }:
+{ lib, stdenv, fetchFromGitHub, gnome-shell }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-window-corner-preview";
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = [ ];
     homepage = "https://github.com/medenagan/window-corner-preview";
-    broken = lib.versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34
+    broken = lib.versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1de8b63a7869..96b0417a4f5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28022,9 +28022,7 @@ with pkgs;
 
   mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { };
 
-  mojave-gtk-theme = callPackage ../data/themes/mojave {
-    inherit (gnome) gnome-shell;
-  };
+  mojave-gtk-theme = callPackage ../data/themes/mojave { };
 
   moka-icon-theme = callPackage ../data/icons/moka-icon-theme { };
 
@@ -28536,9 +28534,7 @@ with pkgs;
 
   vimix-cursor-theme = callPackage ../data/icons/vimix-cursor-theme { };
 
-  vimix-gtk-themes = callPackage ../data/themes/vimix {
-    inherit (gnome) gnome-shell;
-  };
+  vimix-gtk-themes = callPackage ../data/themes/vimix { };
 
   vimix-icon-theme = callPackage ../data/icons/vimix-icon-theme { };
 
@@ -28554,9 +28550,7 @@ with pkgs;
 
   whitesur-cursors = callPackage ../data/icons/whitesur-cursors { };
 
-  whitesur-gtk-theme = callPackage ../data/themes/whitesur {
-    inherit (gnome) gnome-shell;
-  };
+  whitesur-gtk-theme = callPackage ../data/themes/whitesur { };
 
   whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { };
 

From c2f1fa833e43b34b11f0f47072482a9a41f1b579 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Aug 2024 23:56:05 +0200
Subject: [PATCH 129/149] gnome-session: Move from gnome scope to top-level

---
 nixos/modules/config/xdg/portal.nix                  |  2 +-
 .../modules/services/x11/desktop-managers/gnome.nix  | 12 ++++++------
 .../services/x11/desktop-managers/pantheon.nix       |  2 +-
 nixos/modules/services/x11/display-managers/gdm.nix  |  4 ++--
 pkgs/applications/window-managers/phosh/default.nix  |  5 +++--
 .../gnome/core => by-name/gn}/gnome-session/ctl.nix  |  0
 .../gn}/gnome-session/fix-paths.patch                |  0
 .../gn/gnome-session/package.nix}                    |  1 -
 pkgs/desktops/gnome/default.nix                      |  3 +--
 pkgs/desktops/pantheon/default.nix                   |  4 +---
 pkgs/top-level/all-packages.nix                      |  2 +-
 11 files changed, 16 insertions(+), 19 deletions(-)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-session/ctl.nix (100%)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-session/fix-paths.patch (100%)
 rename pkgs/{desktops/gnome/core/gnome-session/default.nix => by-name/gn/gnome-session/package.nix} (98%)

diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix
index ec4e13169fa3..7e66a32c7db2 100644
--- a/nixos/modules/config/xdg/portal.nix
+++ b/nixos/modules/config/xdg/portal.nix
@@ -83,7 +83,7 @@ in
     configPackages = mkOption {
       type = types.listOf types.package;
       default = [ ];
-      example = lib.literalExpression "[ pkgs.gnome.gnome-session ]";
+      example = lib.literalExpression "[ pkgs.gnome-session ]";
       description = ''
         List of packages that provide XDG desktop portal configuration, usually in
         the form of `share/xdg-desktop-portal/$desktop-portals.conf`.
diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index aafd230deb36..8daa67e27eeb 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -123,7 +123,7 @@ in
         description = "List of packages for which gsettings are overridden.";
       };
 
-      debug = mkEnableOption "gnome-session debug messages";
+      debug = mkEnableOption "pkgs.gnome-session debug messages";
 
       flashback = {
         enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity";
@@ -196,7 +196,7 @@ in
       services.gnome.core-shell.enable = true;
       services.gnome.core-utilities.enable = mkDefault true;
 
-      services.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ];
+      services.displayManager.sessionPackages = [ pkgs.gnome-session.sessions ];
 
       environment.extraInit = ''
         ${lib.concatMapStrings (p: ''
@@ -249,7 +249,7 @@ in
       ]
       # For /share/applications/${wmName}.desktop
       ++ (map (wm: gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms)
-      # For /share/gnome-session/sessions/gnome-flashback-${wmName}.session
+      # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session
       ++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms);
     })
 
@@ -287,7 +287,7 @@ in
           buildPortalsInGnome = false;
         })
       ];
-      xdg.portal.configPackages = mkDefault [ pkgs.gnome.gnome-session ];
+      xdg.portal.configPackages = mkDefault [ pkgs.gnome-session ];
 
       networking.networkmanager.enable = mkDefault true;
 
@@ -329,8 +329,8 @@ in
       services.gvfs.enable = true;
       services.system-config-printer.enable = (lib.mkIf config.services.printing.enable (mkDefault true));
 
-      systemd.packages = with pkgs.gnome; [
-        gnome-session
+      systemd.packages = [
+        pkgs.gnome-session
         pkgs.gnome-shell
       ];
 
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix
index a401af9b7e18..55d5c2cb292d 100644
--- a/nixos/modules/services/x11/desktop-managers/pantheon.nix
+++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix
@@ -177,7 +177,7 @@ in
         pkgs.pantheon.mutter
       ];
       systemd.packages = with pkgs; [
-        gnome.gnome-session
+        gnome-session
         pantheon.gala
         pantheon.gnome-settings-daemon
         pantheon.elementary-session-settings
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 36567d993752..f1ce5bb3b6bb 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -183,7 +183,7 @@ in
     # Otherwise GDM will not be able to start correctly and display Wayland sessions
     systemd.packages = with pkgs.gnome; [
       gdm
-      gnome-session
+      pkgs.gnome-session
       pkgs.gnome-shell
     ];
     environment.systemPackages = [ pkgs.adwaita-icon-theme ];
@@ -236,7 +236,7 @@ in
       EnvironmentFile = "-/etc/locale.conf";
     };
 
-    systemd.services.display-manager.path = [ pkgs.gnome.gnome-session ];
+    systemd.services.display-manager.path = [ pkgs.gnome-session ];
 
     # Allow choosing an user account
     services.accounts-daemon.enable = true;
diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index 28ffcbe2578c..365ef32b89e5 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -20,6 +20,7 @@
 , gnome
 , gnome-bluetooth
 , gnome-desktop
+, gnome-session
 , gnome-shell
 , gcr
 , pam
@@ -76,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnome-bluetooth
     gnome.gnome-control-center
     gnome-desktop
-    gnome.gnome-session
+    gnome-session
     gtk4
     pam
     systemd
@@ -112,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath gnome-shell}"
-      --set GNOME_SESSION "${gnome.gnome-session}/bin/gnome-session"
+      --set GNOME_SESSION "${gnome-session}/bin/gnome-session"
     )
   '';
 
diff --git a/pkgs/desktops/gnome/core/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-session/ctl.nix
rename to pkgs/by-name/gn/gnome-session/ctl.nix
diff --git a/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch b/pkgs/by-name/gn/gnome-session/fix-paths.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-session/fix-paths.patch
rename to pkgs/by-name/gn/gnome-session/fix-paths.patch
diff --git a/pkgs/desktops/gnome/core/gnome-session/default.nix b/pkgs/by-name/gn/gnome-session/package.nix
similarity index 98%
rename from pkgs/desktops/gnome/core/gnome-session/default.nix
rename to pkgs/by-name/gn/gnome-session/package.nix
index 841458f94037..87bf26868f4c 100644
--- a/pkgs/desktops/gnome/core/gnome-session/default.nix
+++ b/pkgs/by-name/gn/gnome-session/package.nix
@@ -124,7 +124,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-session";
-      attrPath = "gnome.gnome-session";
     };
     providedSessions = [
       "gnome"
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 29e94b1ce79d..206190913e25 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -19,8 +19,6 @@ in
 
   gnome-control-center = callPackage ./core/gnome-control-center { };
 
-  gnome-session = callPackage ./core/gnome-session { };
-
   gvfs = pkgs.gvfs.override { gnomeSupport = true; };
 
   networkmanager-openvpn = pkgs.networkmanager-openvpn.override {
@@ -121,6 +119,7 @@ in
   gnome-remote-desktop = lib.warn "The ‘gnome.gnome-remote-desktop’ was moved to top-level. Please use ‘pkgs.gnome-remote-desktop’ directly." pkgs.gnome-remote-desktop; # Added on 2024-08-11.
   gnome-robots = lib.warn "The ‘gnome.gnome-robots’ was moved to top-level. Please use ‘pkgs.gnome-robots’ directly." pkgs.gnome-robots; # Added on 2024-08-11.
   gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22.
+  gnome-session = lib.warn "The ‘gnome.gnome-session’ was moved to top-level. Please use ‘pkgs.gnome-session’ directly." pkgs.gnome-session; # Added on 2024-08-28.
   gnome-session-ctl = lib.warn "The ‘gnome.gnome-session-ctl’ was moved to top-level. Please use ‘pkgs.gnome-session-ctl’ directly." pkgs.gnome-session-ctl; # Added on 2024-08-28.
   gnome-settings-daemon = lib.warn "The ‘gnome.gnome-settings-daemon’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon’ directly." pkgs.gnome-settings-daemon; # Added on 2024-08-28.
   gnome-settings-daemon43 = lib.warn "The ‘gnome.gnome-settings-daemon43’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon43’ directly." pkgs.gnome-settings-daemon43; # Added on 2024-08-28.
diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix
index ae524b4b4888..cde3255eb46f 100644
--- a/pkgs/desktops/pantheon/default.nix
+++ b/pkgs/desktops/pantheon/default.nix
@@ -95,9 +95,7 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   elementary-print-shim = callPackage ./desktop/elementary-print-shim { };
 
-  elementary-session-settings = callPackage ./desktop/elementary-session-settings {
-    inherit (gnome) gnome-session;
-  };
+  elementary-session-settings = callPackage ./desktop/elementary-session-settings { };
 
   elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96b0417a4f5a..7bd0e34d2a1e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -36505,7 +36505,7 @@ with pkgs;
 
   gnome-browser-connector = callPackage ../desktops/gnome/extensions/gnome-browser-connector { };
 
-  gnome-session-ctl = callPackage ../desktops/gnome/core/gnome-session/ctl.nix { };
+  gnome-session-ctl = callPackage ../by-name/gn/gnome-session/ctl.nix { };
 
   # Using 43 to match Mutter used in Pantheon
   gnome-settings-daemon43 = callPackage ../by-name/gn/gnome-settings-daemon/43 { };

From a110f292a195ad789a50485093386c1020bbac21 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 28 Aug 2024 23:56:06 +0200
Subject: [PATCH 130/149] gnome-control-center: Move from gnome scope to
 top-level

---
 nixos/modules/services/x11/desktop-managers/gnome.nix         | 4 ++--
 nixos/modules/services/x11/display-managers/gdm.nix           | 2 +-
 pkgs/applications/window-managers/phosh/default.nix           | 4 ++--
 .../gn/gnome-control-center/package.nix}                      | 1 -
 .../core => by-name/gn}/gnome-control-center/paths.patch      | 0
 pkgs/desktops/gnome/default.nix                               | 3 +--
 6 files changed, 6 insertions(+), 8 deletions(-)
 rename pkgs/{desktops/gnome/core/gnome-control-center/default.nix => by-name/gn/gnome-control-center/package.nix} (98%)
 rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-control-center/paths.patch (100%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 8daa67e27eeb..0371b24a82c2 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -371,13 +371,13 @@ in
           mandatoryPackages = [
             pkgs.gnome-shell
           ];
-          optionalPackages = with pkgs.gnome; [
+          optionalPackages = [
             pkgs.adwaita-icon-theme
             nixos-background-info
             pkgs.gnome-backgrounds
             pkgs.gnome-bluetooth
             pkgs.gnome-color-manager
-            gnome-control-center
+            pkgs.gnome-control-center
             pkgs.gnome-shell-extensions
             pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
             pkgs.gnome-user-docs
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index f1ce5bb3b6bb..c454b110776b 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -153,7 +153,7 @@ in
           XDG_DATA_DIRS = lib.makeSearchPath "share" [
             gdm # for gnome-login.session
             config.services.displayManager.sessionData.desktops
-            pkgs.gnome.gnome-control-center # for accessibility icon
+            pkgs.gnome-control-center # for accessibility icon
             pkgs.adwaita-icon-theme
             pkgs.hicolor-icon-theme # empty icon theme as a base
           ];
diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix
index 365ef32b89e5..0f0996a0dd5d 100644
--- a/pkgs/applications/window-managers/phosh/default.nix
+++ b/pkgs/applications/window-managers/phosh/default.nix
@@ -17,8 +17,8 @@
 , evince
 , glib
 , gtk4
-, gnome
 , gnome-bluetooth
+, gnome-control-center
 , gnome-desktop
 , gnome-session
 , gnome-shell
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     polkit
     gmobile
     gnome-bluetooth
-    gnome.gnome-control-center
+    gnome-control-center
     gnome-desktop
     gnome-session
     gtk4
diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/by-name/gn/gnome-control-center/package.nix
similarity index 98%
rename from pkgs/desktops/gnome/core/gnome-control-center/default.nix
rename to pkgs/by-name/gn/gnome-control-center/package.nix
index 47ce218c6dd7..d5b1dd84c925 100644
--- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix
+++ b/pkgs/by-name/gn/gnome-control-center/package.nix
@@ -207,7 +207,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-control-center";
-      attrPath = "gnome.gnome-control-center";
     };
   };
 
diff --git a/pkgs/desktops/gnome/core/gnome-control-center/paths.patch b/pkgs/by-name/gn/gnome-control-center/paths.patch
similarity index 100%
rename from pkgs/desktops/gnome/core/gnome-control-center/paths.patch
rename to pkgs/by-name/gn/gnome-control-center/paths.patch
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 206190913e25..10f48ccc606d 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -17,8 +17,6 @@ in
 
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
-  gnome-control-center = callPackage ./core/gnome-control-center { };
-
   gvfs = pkgs.gvfs.override { gnomeSupport = true; };
 
   networkmanager-openvpn = pkgs.networkmanager-openvpn.override {
@@ -100,6 +98,7 @@ in
   gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22.
   gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22.
   gnome-contacts = lib.warn "The ‘gnome.gnome-contacts’ was moved to top-level. Please use ‘pkgs.gnome-contacts’ directly." pkgs.gnome-contacts; # Added on 2024-08-11.
+  gnome-control-center = lib.warn "The ‘gnome.gnome-control-center’ was moved to top-level. Please use ‘pkgs.gnome-control-center’ directly." pkgs.gnome-control-center; # Added on 2024-08-28.
   gnome-dictionary = lib.warn "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly." pkgs.gnome-dictionary; # Added on 2024-06-22.
   gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22.
   gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22.

From 771f47b485b0b05b2aa0e166a73e3a5fd4a0e2fa Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 31 Aug 2024 11:00:02 +0200
Subject: [PATCH 131/149] gnome.gnome-panel: prepare for move

---
 pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix b/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix
index 9fb6d3c2d1dd..a1c0dc0c0320 100644
--- a/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix
+++ b/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix
@@ -2,8 +2,7 @@
   stdenv,
   lib,
   buildEnv,
-  gnome-panel,
-  gnome-flashback,
+  gnome,
   xorg,
   glib,
   wrapGAppsHook3,
@@ -11,6 +10,8 @@
 }:
 
 let
+  inherit (gnome) gnome-panel gnome-flashback;
+
   # We always want to find the built-in panel applets.
   selectedPanelModulePackages = [
     gnome-panel

From e1093690a83c83c5ac25cbd94d6fc668a92bc426 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 31 Aug 2024 11:00:48 +0200
Subject: [PATCH 132/149] gnome-panel: Move from gnome scope to top-level

---
 nixos/modules/services/x11/desktop-managers/gnome.nix       | 4 ++--
 .../window-managers/xmonad/log-applet/default.nix           | 4 ++--
 .../gn}/gnome-panel/modulesdir-env-var.patch                | 0
 .../default.nix => by-name/gn/gnome-panel/package.nix}      | 1 -
 .../gnome/misc => by-name/gn}/gnome-panel/wrapper.nix       | 3 ++-
 pkgs/desktops/gnome/default.nix                             | 6 ++----
 pkgs/top-level/all-packages.nix                             | 2 ++
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename pkgs/{desktops/gnome/misc => by-name/gn}/gnome-panel/modulesdir-env-var.patch (100%)
 rename pkgs/{desktops/gnome/misc/gnome-panel/default.nix => by-name/gn/gnome-panel/package.nix} (98%)
 rename pkgs/{desktops/gnome/misc => by-name/gn}/gnome-panel/wrapper.nix (96%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 0371b24a82c2..48f11b779534 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -166,7 +166,7 @@ in
           defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]";
           type = types.listOf types.package;
           description = ''
-            Packages containing modules that should be made available to `gnome-panel` (usually for applets).
+            Packages containing modules that should be made available to `pkgs.gnome-panel` (usually for applets).
 
             If you're packaging something to use here, please install the modules in `$out/lib/gnome-panel/modules`.
           '';
@@ -243,7 +243,7 @@ in
 
       environment.systemPackages = with pkgs.gnome; [
         gnome-flashback
-        (gnome-panel-with-modules.override {
+        (pkgs.gnome-panel-with-modules.override {
           panelModulePackages = cfg.flashback.panelModulePackages;
         })
       ]
diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
index c31b3c80b8d4..2e6d72b91071 100644
--- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix
+++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib
 , desktopSupport ? "gnomeflashback", xorg
 , gtk2
-, gtk3, gnome, mate
+, gtk3, gnome-panel, mate
 , libxfce4util, xfce4-panel
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ glib dbus-glib xorg.xcbutilwm ]
-    ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ]
+    ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome-panel ]
     ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ]
     ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ]
   ;
diff --git a/pkgs/desktops/gnome/misc/gnome-panel/modulesdir-env-var.patch b/pkgs/by-name/gn/gnome-panel/modulesdir-env-var.patch
similarity index 100%
rename from pkgs/desktops/gnome/misc/gnome-panel/modulesdir-env-var.patch
rename to pkgs/by-name/gn/gnome-panel/modulesdir-env-var.patch
diff --git a/pkgs/desktops/gnome/misc/gnome-panel/default.nix b/pkgs/by-name/gn/gnome-panel/package.nix
similarity index 98%
rename from pkgs/desktops/gnome/misc/gnome-panel/default.nix
rename to pkgs/by-name/gn/gnome-panel/package.nix
index 17ecae10933c..fa1fe224c235 100644
--- a/pkgs/desktops/gnome/misc/gnome-panel/default.nix
+++ b/pkgs/by-name/gn/gnome-panel/package.nix
@@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-panel";
-      attrPath = "gnome.gnome-panel";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix b/pkgs/by-name/gn/gnome-panel/wrapper.nix
similarity index 96%
rename from pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix
rename to pkgs/by-name/gn/gnome-panel/wrapper.nix
index a1c0dc0c0320..d191953fe38c 100644
--- a/pkgs/desktops/gnome/misc/gnome-panel/wrapper.nix
+++ b/pkgs/by-name/gn/gnome-panel/wrapper.nix
@@ -3,6 +3,7 @@
   lib,
   buildEnv,
   gnome,
+  gnome-panel,
   xorg,
   glib,
   wrapGAppsHook3,
@@ -10,7 +11,7 @@
 }:
 
 let
-  inherit (gnome) gnome-panel gnome-flashback;
+  inherit (gnome) gnome-flashback;
 
   # We always want to find the built-in panel applets.
   selectedPanelModulePackages = [
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 10f48ccc606d..fe540be7325e 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -51,10 +51,6 @@ in
 
   gnome-flashback = callPackage ./misc/gnome-flashback { };
 
-  gnome-panel = callPackage ./misc/gnome-panel { };
-
-  gnome-panel-with-modules = callPackage ./misc/gnome-panel/wrapper.nix { };
-
 }) // lib.optionalAttrs config.allowAliases {
 #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
   libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22.
@@ -114,6 +110,8 @@ in
   gnome-nibbles = lib.warn "The ‘gnome.gnome-nibbles’ was moved to top-level. Please use ‘pkgs.gnome-nibbles’ directly." pkgs.gnome-nibbles; # Added on 2024-08-11.
   gnome-notes = lib.warn "The ‘gnome.gnome-notes’ was moved to top-level. Please use ‘pkgs.gnome-notes’ directly." pkgs.gnome-notes; # Added on 2024-08-11.
   gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22.
+  gnome-panel = lib.warn "The ‘gnome.gnome-panel’ was moved to top-level. Please use ‘pkgs.gnome-panel’ directly." pkgs.gnome-panel; # Added on 2024-08-31.
+  gnome-panel-with-modules = lib.warn "The ‘gnome.gnome-panel-with-modules’ was moved to top-level. Please use ‘pkgs.gnome-panel-with-modules’ directly." pkgs.gnome-panel-with-modules; # Added on 2024-08-31.
   gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11.
   gnome-remote-desktop = lib.warn "The ‘gnome.gnome-remote-desktop’ was moved to top-level. Please use ‘pkgs.gnome-remote-desktop’ directly." pkgs.gnome-remote-desktop; # Added on 2024-08-11.
   gnome-robots = lib.warn "The ‘gnome.gnome-robots’ was moved to top-level. Please use ‘pkgs.gnome-robots’ directly." pkgs.gnome-robots; # Added on 2024-08-11.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7bd0e34d2a1e..e0b15ffc49d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8149,6 +8149,8 @@ with pkgs;
 
   gnome-solanum = callPackage ../applications/misc/gnome-solanum { };
 
+  gnome-panel-with-modules = callPackage ../by-name/gn/gnome-panel/wrapper.nix { };
+
   gnome-podcasts = callPackage ../applications/audio/gnome-podcasts { };
 
   gnome-photos = callPackage ../applications/graphics/gnome-photos { };

From b37f158fb00eb0a43dc2a7bc205919fdac4df3fa Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 31 Aug 2024 11:00:49 +0200
Subject: [PATCH 133/149] gnome-applets: Move from gnome scope to top-level

---
 nixos/modules/services/x11/desktop-managers/gnome.nix         | 4 ++--
 .../default.nix => by-name/gn/gnome-applets/package.nix}      | 1 -
 pkgs/desktops/gnome/default.nix                               | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{desktops/gnome/misc/gnome-applets/default.nix => by-name/gn/gnome-applets/package.nix} (97%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 48f11b779534..283cfe1726d7 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -162,8 +162,8 @@ in
         };
 
         panelModulePackages = mkOption {
-          default = [ pkgs.gnome.gnome-applets ];
-          defaultText = literalExpression "[ pkgs.gnome.gnome-applets ]";
+          default = [ pkgs.gnome-applets ];
+          defaultText = literalExpression "[ pkgs.gnome-applets ]";
           type = types.listOf types.package;
           description = ''
             Packages containing modules that should be made available to `pkgs.gnome-panel` (usually for applets).
diff --git a/pkgs/desktops/gnome/misc/gnome-applets/default.nix b/pkgs/by-name/gn/gnome-applets/package.nix
similarity index 97%
rename from pkgs/desktops/gnome/misc/gnome-applets/default.nix
rename to pkgs/by-name/gn/gnome-applets/package.nix
index 179e9a0d6d74..65edba55cb08 100644
--- a/pkgs/desktops/gnome/misc/gnome-applets/default.nix
+++ b/pkgs/by-name/gn/gnome-applets/package.nix
@@ -67,7 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-applets";
-      attrPath = "gnome.gnome-applets";
       versionPolicy = "odd-unstable";
     };
   };
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index fe540be7325e..f9ebf1a074d9 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -47,8 +47,6 @@ in
 
 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
 
-  gnome-applets = callPackage ./misc/gnome-applets { };
-
   gnome-flashback = callPackage ./misc/gnome-flashback { };
 
 }) // lib.optionalAttrs config.allowAliases {
@@ -81,6 +79,7 @@ in
   geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22.
   ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22.
   gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22.
+  gnome-applets = lib.warn "The ‘gnome.gnome-applets’ was moved to top-level. Please use ‘pkgs.gnome-applets’ directly." pkgs.gnome-applets; # Added on 2024-08-31.
   gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13.
   gnome-backgrounds = lib.warn "The ‘gnome.gnome-backgrounds’ was moved to top-level. Please use ‘pkgs.gnome-backgrounds’ directly." pkgs.gnome-backgrounds; # Added on 2024-08-11.
   gnome-bluetooth = lib.warn "The ‘gnome.gnome-bluetooth’ was moved to top-level. Please use ‘pkgs.gnome-bluetooth’ directly." pkgs.gnome-bluetooth; # Added on 2024-08-28.

From 58bf5606fb16bc89a65d86150e4065e3b7d27629 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 31 Aug 2024 11:00:50 +0200
Subject: [PATCH 134/149] gnome-flashback: Move from gnome scope to top-level

---
 .../services/x11/desktop-managers/gnome.nix      | 16 ++++++++--------
 .../gn/gnome-flashback/package.nix}              |  1 -
 pkgs/by-name/gn/gnome-panel/wrapper.nix          |  3 +--
 pkgs/desktops/gnome/default.nix                  |  5 +----
 4 files changed, 10 insertions(+), 15 deletions(-)
 rename pkgs/{desktops/gnome/misc/gnome-flashback/default.nix => by-name/gn/gnome-flashback/package.nix} (99%)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix
index 283cfe1726d7..e07700469dfb 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome.nix
@@ -228,7 +228,7 @@ in
           assert (lib.assertMsg namesAreUnique "Flashback WM names must be unique.");
           map
             (wm:
-              pkgs.gnome.gnome-flashback.mkSessionForWm {
+              pkgs.gnome-flashback.mkSessionForWm {
                 inherit (wm) wmName wmLabel wmCommand;
               }
             ) flashbackWms;
@@ -237,20 +237,20 @@ in
         enableGnomeKeyring = true;
       };
 
-      systemd.packages = with pkgs.gnome; [
-        gnome-flashback
-      ] ++ map gnome-flashback.mkSystemdTargetForWm flashbackWms;
+      systemd.packages = [
+        pkgs.gnome-flashback
+      ] ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms;
 
-      environment.systemPackages = with pkgs.gnome; [
-        gnome-flashback
+      environment.systemPackages = [
+        pkgs.gnome-flashback
         (pkgs.gnome-panel-with-modules.override {
           panelModulePackages = cfg.flashback.panelModulePackages;
         })
       ]
       # For /share/applications/${wmName}.desktop
-      ++ (map (wm: gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms)
+      ++ (map (wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }) flashbackWms)
       # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session
-      ++ (map (wm: gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms);
+      ++ (map (wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }) flashbackWms);
     })
 
     (lib.mkIf serviceCfg.core-os-services.enable {
diff --git a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix b/pkgs/by-name/gn/gnome-flashback/package.nix
similarity index 99%
rename from pkgs/desktops/gnome/misc/gnome-flashback/default.nix
rename to pkgs/by-name/gn/gnome-flashback/package.nix
index 89880a68e14e..cfd2913d356b 100644
--- a/pkgs/desktops/gnome/misc/gnome-flashback/default.nix
+++ b/pkgs/by-name/gn/gnome-flashback/package.nix
@@ -128,7 +128,6 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "gnome-flashback";
-      attrPath = "gnome.gnome-flashback";
       versionPolicy = "odd-unstable";
     };
 
diff --git a/pkgs/by-name/gn/gnome-panel/wrapper.nix b/pkgs/by-name/gn/gnome-panel/wrapper.nix
index d191953fe38c..b52bab969403 100644
--- a/pkgs/by-name/gn/gnome-panel/wrapper.nix
+++ b/pkgs/by-name/gn/gnome-panel/wrapper.nix
@@ -4,6 +4,7 @@
   buildEnv,
   gnome,
   gnome-panel,
+  gnome-flashback,
   xorg,
   glib,
   wrapGAppsHook3,
@@ -11,8 +12,6 @@
 }:
 
 let
-  inherit (gnome) gnome-flashback;
-
   # We always want to find the built-in panel applets.
   selectedPanelModulePackages = [
     gnome-panel
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index f9ebf1a074d9..a46909b8bb03 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -45,10 +45,6 @@ in
 
   nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { };
 
-#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
-
-  gnome-flashback = callPackage ./misc/gnome-flashback { };
-
 }) // lib.optionalAttrs config.allowAliases {
 #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope.
   libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22.
@@ -96,6 +92,7 @@ in
   gnome-control-center = lib.warn "The ‘gnome.gnome-control-center’ was moved to top-level. Please use ‘pkgs.gnome-control-center’ directly." pkgs.gnome-control-center; # Added on 2024-08-28.
   gnome-dictionary = lib.warn "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly." pkgs.gnome-dictionary; # Added on 2024-06-22.
   gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22.
+  gnome-flashback = lib.warn "The ‘gnome.gnome-flashback’ was moved to top-level. Please use ‘pkgs.gnome-flashback’ directly." pkgs.gnome-flashback; # Added on 2024-08-31.
   gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22.
   gnome-initial-setup = lib.warn "The ‘gnome.gnome-initial-setup’ was moved to top-level. Please use ‘pkgs.gnome-initial-setup’ directly." pkgs.gnome-initial-setup; # Added on 2024-08-11.
   gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22.

From 7b9332a2a5f800f9a2fb72d6d1102745399f6c4d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 31 Aug 2024 11:21:17 +0200
Subject: [PATCH 135/149] gnome.networkmanager-*: Move to top-level

Those overrides are pointless, `withGnome = true` is the default since long time ago.
---
 pkgs/desktops/gnome/default.nix | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index a46909b8bb03..edb942833123 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -19,30 +19,6 @@ in
 
   gvfs = pkgs.gvfs.override { gnomeSupport = true; };
 
-  networkmanager-openvpn = pkgs.networkmanager-openvpn.override {
-    withGnome = true;
-  };
-
-  networkmanager-vpnc = pkgs.networkmanager-vpnc.override {
-    withGnome = true;
-  };
-
-  networkmanager-openconnect = pkgs.networkmanager-openconnect.override {
-    withGnome = true;
-  };
-
-  networkmanager-fortisslvpn = pkgs.networkmanager-fortisslvpn.override {
-    withGnome = true;
-  };
-
-  networkmanager-l2tp = pkgs.networkmanager-l2tp.override {
-    withGnome = true;
-  };
-
-  networkmanager-iodine = pkgs.networkmanager-iodine.override {
-    withGnome = true;
-  };
-
   nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { };
 
 }) // lib.optionalAttrs config.allowAliases {
@@ -139,6 +115,12 @@ in
   mutter = lib.warn "The ‘gnome.mutter’ was moved to top-level. Please use ‘pkgs.mutter’ directly." pkgs.mutter; # Added on 2024-08-28.
   mutter43 = lib.warn "The ‘gnome.mutter43’ was moved to top-level. Please use ‘pkgs.mutter43’ directly." pkgs.mutter43; # Added on 2024-08-28.
   nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13.
+  networkmanager-openvpn = lib.warn "The ‘gnome.networkmanager-openvpn’ was moved to top-level. Please use ‘pkgs.networkmanager-openvpn’ directly." pkgs.networkmanager-openvpn; # Added on 2024-08-31.
+  networkmanager-vpnc = lib.warn "The ‘gnome.networkmanager-vpnc’ was moved to top-level. Please use ‘pkgs.networkmanager-vpnc’ directly." pkgs.networkmanager-vpnc; # Added on 2024-08-31.
+  networkmanager-openconnect = lib.warn "The ‘gnome.networkmanager-openconnect’ was moved to top-level. Please use ‘pkgs.networkmanager-openconnect’ directly." pkgs.networkmanager-openconnect; # Added on 2024-08-31.
+  networkmanager-fortisslvpn = lib.warn "The ‘gnome.networkmanager-fortisslvpn’ was moved to top-level. Please use ‘pkgs.networkmanager-fortisslvpn’ directly." pkgs.networkmanager-fortisslvpn; # Added on 2024-08-31.
+  networkmanager-l2tp = lib.warn "The ‘gnome.networkmanager-l2tp’ was moved to top-level. Please use ‘pkgs.networkmanager-l2tp’ directly." pkgs.networkmanager-l2tp; # Added on 2024-08-31.
+  networkmanager-iodine = lib.warn "The ‘gnome.networkmanager-iodine’ was moved to top-level. Please use ‘pkgs.networkmanager-iodine’ directly." pkgs.networkmanager-iodine; # Added on 2024-08-31.
   nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13.
   polari = lib.warn "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly." pkgs.polari; # Added on 2024-08-11.
   pomodoro = lib.warn "The ‘gnome.pomodoro’ was moved to top-level. Please use ‘pkgs.gnome-pomodoro’ directly." pkgs.gnome-pomodoro; # Added on 2024-06-22.

From ffdd6582a0089981153a0d2f8b95626513a3c0dd Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 31 Aug 2024 11:16:15 +0200
Subject: [PATCH 136/149] release-notes: Mention gnome scope dissolution

Now, only non-packages remain.
---
 nixos/doc/manual/release-notes/rl-2411.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 0fea2aa31494..d27634f9b4ba 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -173,6 +173,8 @@
 
 - All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`).
 
+- All GNOME packages have been moved to top-level (i.e., `gnome.nautilus` is now `nautilus`).
+
 - `services.cgit` now runs as the cgit user by default instead of root.
   This change requires granting access to the repositories to this user or
   setting the appropriate one through `services.cgit.some-instance.user`.

From f6efa6d64ea9d344dbaff4eb8fa225292af2f50b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20J=C3=B6ns?=
 <34899572+jopejoe1@users.noreply.github.com>
Date: Sun, 1 Sep 2024 12:42:53 +0000
Subject: [PATCH 137/149] discord: various updates (#338785)

* discord-development: 0.0.24 -> 0.0.25

* discord-canary: 0.0.475 -> 0.0.479

* pkgsCross.aarch64-darwin.discord: 0.0.316 -> 0.0.317

* pkgsCross.aarch64-darwin.discord-ptb: 0.0.130 -> 0.0.131

* pkgsCross.aarch64-darwin.discord-development: 0.0.46 -> 0.0.47

* pkgsCross.aarch64-darwin.discord-canary: 0.0.583 -> 0.0.587
---
 .../instant-messengers/discord/default.nix    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 67cc95799d13..a891660ab95e 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -4,13 +4,13 @@ let
     if stdenv.isLinux then {
       stable = "0.0.66";
       ptb = "0.0.101";
-      canary = "0.0.475";
-      development = "0.0.24";
+      canary = "0.0.479";
+      development = "0.0.25";
     } else {
-      stable = "0.0.316";
-      ptb = "0.0.130";
-      canary = "0.0.583";
-      development = "0.0.46";
+      stable = "0.0.317";
+      ptb = "0.0.131";
+      canary = "0.0.587";
+      development = "0.0.47";
     };
   version = versions.${branch};
   srcs = rec {
@@ -25,29 +25,29 @@ let
       };
       canary = fetchurl {
         url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
-        hash = "sha256-suVIDCZhI6DwUVizBmTm104Clr6pH/olAIbOMNzFNss=";
+        hash = "sha256-mirioiRpwQB07sL1avGYk2+Cnmdw7PW808AAA6p2Y0U=";
       };
       development = fetchurl {
         url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz";
-        hash = "sha256-rSlGL2BwtUxLJltSD2Ms94qmZ4kuX5i9jFqyYC30jyQ=";
+        hash = "sha256-9dwZ89YOs2iNOeoVrGfNHwr4mvfXmPk1SrJYoteYakY=";
       };
     };
     x86_64-darwin = {
       stable = fetchurl {
         url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
-        hash = "sha256-ZJ2ybvKGGCm8CZhwGxmLXZWNUD1eAyg17zD/sBwViB4=";
+        hash = "sha256-SX6a2qPSFURL00dMLrHSI4+964Xc76ada4PUMlG1V9U=";
       };
       ptb = fetchurl {
         url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
-        hash = "sha256-mLfeMx5dQNpoLUyoOSCj8XtNxWjsBpVWdFv1obtHJak=";
+        hash = "sha256-/wuYPjGh/RJZSDeo8r78YEbCYj+qZWTaIDIfKuSH+r0=";
       };
       canary = fetchurl {
         url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
-        hash = "sha256-eIjkXOW07sR26iBttT0mGDxNnpLFKlVJtzSAtFcicBg=";
+        hash = "sha256-6m6wmGzVOEY2oVAHsSMsAtgQK5zqC0D7U3s28pcH0ss=";
       };
       development = fetchurl {
         url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg";
-        hash = "sha256-nMihtf/xLIxwqAVrF1BSRewdS2WThx0LZ5HZUI+OzM0=";
+        hash = "sha256-mgVCuTE2zYFRUW6Ukw7mUmPnOR4g/QUFYlWI3bux0es=";
       };
     };
     aarch64-darwin = x86_64-darwin;

From b12f10e5275dd710eb2b938b7bee4e7c527cf27b Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 1 Sep 2024 16:53:43 +0400
Subject: [PATCH 138/149] cirrus-cli: migrate to by-name

---
 .../default.nix => by-name/ci/cirrus-cli/package.nix}           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/continuous-integration/cirrus-cli/default.nix => by-name/ci/cirrus-cli/package.nix} (100%)

diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/by-name/ci/cirrus-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
rename to pkgs/by-name/ci/cirrus-cli/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1352af0af5c4..f06d6ae983eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6469,8 +6469,6 @@ with pkgs;
 
   circus = with python310Packages; toPythonApplication circus;
 
-  cirrus-cli = callPackage ../development/tools/continuous-integration/cirrus-cli { };
-
   cirrusgo = callPackage ../tools/security/cirrusgo { };
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })

From abc5eb2565ac60b792fd689b591c48ea8eb82cbe Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 1 Sep 2024 14:57:34 +0200
Subject: [PATCH 139/149] roundcube: 1.6.8 -> 1.6.9

ChangeLog: https://github.com/roundcube/roundcubemail/releases/tag/1.6.9
---
 pkgs/servers/roundcube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index 646379e3e641..db49d376c62d 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "roundcube";
-  version = "1.6.8";
+  version = "1.6.9";
 
   src = fetchurl {
     url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
-    sha256 = "sha256-hGi+AgSnNMV0re9L4BV4x9xPq5wv40ADvzQaK9IO/So=";
+    sha256 = "sha256-thpfXCL4kMKZ6TWqz88IcGdpkNiuv/DWzf8HW/F8708=";
   };
 
   patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ];

From 3397a57a53da264badea147ee69ad854c126b6a9 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 1 Sep 2024 17:01:01 +0400
Subject: [PATCH 140/149] velero: migrate to by-name

---
 .../velero/default.nix => by-name/ve/velero/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/cluster/velero/default.nix => by-name/ve/velero/package.nix} (100%)

diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/by-name/ve/velero/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/velero/default.nix
rename to pkgs/by-name/ve/velero/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1352af0af5c4..1eb12babe3ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -38163,8 +38163,6 @@ with pkgs;
 
   helmsman = callPackage ../applications/networking/cluster/helmsman { };
 
-  velero = callPackage ../applications/networking/cluster/velero { };
-
   hplip = callPackage ../misc/drivers/hplip { };
 
   hplipWithPlugin = hplip.override { withPlugin = true; };

From 49f79e2a9f6f0ec5daae3e9cd52be3bddf49c118 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 13:02:16 +0000
Subject: [PATCH 141/149] act: 0.2.65 -> 0.2.66

---
 pkgs/development/tools/misc/act/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix
index e9877d257e62..33e286e13673 100644
--- a/pkgs/development/tools/misc/act/default.nix
+++ b/pkgs/development/tools/misc/act/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "act";
-  version = "0.2.65";
+  version = "0.2.66";
 
   src = fetchFromGitHub {
     owner = "nektos";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-b2CJMjQr6Eez1xijGpXNkKeYeO87o1a13rB9bA2ShV0=";
+    hash = "sha256-84ssbd0qF0p2x+cFYwYNW4P79KSZqhvF4Zd6wlRhgLo=";
   };
 
-  vendorHash = "sha256-AqzhDEan0tdjfbP/nmpfa2e842zR6RyymllNR02zjlM=";
+  vendorHash = "sha256-fzGnswfzvKhzs7iYnsiQb1c+TTk9+113uj7ryOAvUJk=";
 
   doCheck = false;
 

From 5f15da12444c7edecbfe8ffffd8b64d2ab57f86a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 29 Aug 2024 13:28:15 +0200
Subject: [PATCH 142/149] python312Packages.protobuf5: 5.27.2 -> 5.28.0

---
 pkgs/development/python-modules/protobuf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix
index 75dc81ccbad3..049833dc1b09 100644
--- a/pkgs/development/python-modules/protobuf/default.nix
+++ b/pkgs/development/python-modules/protobuf/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "protobuf";
-  version = "5.27.2";
+  version = "5.28.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8+ze8ia5r4VgdfKCJ/8skM46WU0JLDm+5VE1c/JeJxQ=";
+    hash = "sha256-3edK8Pp3T6mIkiCZkila2/uR2j+pjI9nqIr+j1o0mt0=";
   };
 
   build-system = [ setuptools ];

From 2959099d2f97ac694dc6749014ec1b3c3be28436 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 29 Aug 2024 13:28:33 +0200
Subject: [PATCH 143/149] python312Packages.mitmproxy: relax protobuf
 dependency

---
 pkgs/development/python-modules/mitmproxy/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix
index b50216ece8ad..2c4d1da6e629 100644
--- a/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/pkgs/development/python-modules/mitmproxy/default.nix
@@ -59,6 +59,7 @@ buildPythonPackage rec {
 
 
   pythonRelaxDeps = [
+    "protobuf"
     "urwid"
   ];
 

From 21d76a4ff3b0bbb111a4d4f90a407ddf969470be Mon Sep 17 00:00:00 2001
From: Valentin Chassignol <valentin.chassignol@infomaniak.com>
Date: Mon, 29 Jul 2024 21:07:09 +0200
Subject: [PATCH 144/149] python312Packages.python-openstackclient Add neutron
 and octavia as CLI plugins

---
 .../python-modules/python-openstackclient/default.nix           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
index 114b2aae444b..f78874f9124b 100644
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -13,6 +13,7 @@
   python-ironicclient,
   python-keystoneclient,
   python-manilaclient,
+  python-neutronclient,
   python-openstackclient,
   requests-mock,
   requests,
@@ -73,6 +74,7 @@ buildPythonPackage rec {
         python-heatclient
         python-ironicclient
         python-manilaclient
+        python-neutronclient
       ];
     };
     tests.version = testers.testVersion {

From b5574c71bec95159d5342c19f6d5221b68c2aaee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89tienne=20Simon?= <esimon@esimon.eu>
Date: Sun, 1 Sep 2024 15:55:12 +0200
Subject: [PATCH 145/149] Fix nested quotes in fontconfig.nix

A sed with nested double quotes is inserting malformed XML into /etc/fonts/fonts.conf, this commit put the sed command into single quotes to properly insert double quotes to enclose the XML attribute.
---
 nixos/modules/config/fonts/fontconfig.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index 98d90ccc0fca..feb7546b8de8 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -183,7 +183,7 @@ let
     # horrible sed hack to add the line that was accidentally removed
     # from the default config in #324516
     # FIXME: fix that, revert this
-    sed "5i <include ignore_missing="yes">/etc/fonts/conf.d</include>" -i $dst/../fonts.conf
+    sed '5i <include ignore_missing="yes">/etc/fonts/conf.d</include>' -i $dst/../fonts.conf
 
     # TODO: remove this legacy symlink once people stop using packages built before #95358 was merged
     mkdir -p $out/etc/fonts/2.11

From 1cd96300d546fcc59676d97fe048a5566b2cc13d Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 1 Sep 2024 18:06:56 +0400
Subject: [PATCH 146/149] act: migrate to by-name

---
 .../tools/misc/act/default.nix => by-name/ac/act/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/misc/act/default.nix => by-name/ac/act/package.nix} (100%)

diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/by-name/ac/act/package.nix
similarity index 100%
rename from pkgs/development/tools/misc/act/default.nix
rename to pkgs/by-name/ac/act/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cd1a2b1d431..a097b01bb24c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1488,8 +1488,6 @@ with pkgs;
 
   acquire = with python3Packages; toPythonApplication acquire;
 
-  act = callPackage ../development/tools/misc/act { };
-
   actdiag = with python3.pkgs; toPythonApplication actdiag;
 
   actkbd = callPackage ../tools/system/actkbd { };

From 5e8d9db28ae63f00a760397f04daada94ea3e69c Mon Sep 17 00:00:00 2001
From: pinage404 <pinage404@gmail.com>
Date: Mon, 19 Aug 2024 21:12:22 +0200
Subject: [PATCH 147/149] maestro: refactor move to pkgs/by-name

---
 .../maestro/default.nix => by-name/ma/maestro/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/mobile/maestro/default.nix => by-name/ma/maestro/package.nix} (100%)

diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/by-name/ma/maestro/package.nix
similarity index 100%
rename from pkgs/development/mobile/maestro/default.nix
rename to pkgs/by-name/ma/maestro/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccd435865fad..db77074eeafd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33345,8 +33345,6 @@ with pkgs;
 
   maestral-gui = qt6Packages.callPackage ../applications/networking/maestral-qt { };
 
-  maestro = callPackage ../development/mobile/maestro { };
-
   myfitnesspal = with python3Packages; toPythonApplication myfitnesspal;
 
   lemurs = callPackage ../applications/display-managers/lemurs { };

From 3c03c676dde96f4564ebc0787167c77810a91f5f Mon Sep 17 00:00:00 2001
From: pinage404 <pinage404@gmail.com>
Date: Mon, 19 Aug 2024 21:13:15 +0200
Subject: [PATCH 148/149] maestro: refactor fortmat with nixfmt

---
 pkgs/by-name/ma/maestro/package.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix
index 2b7e22255e19..5e6186c02645 100644
--- a/pkgs/by-name/ma/maestro/package.nix
+++ b/pkgs/by-name/ma/maestro/package.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, fetchurl, unzip, makeWrapper, jre_headless }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  unzip,
+  makeWrapper,
+  jre_headless,
+}:
 
 stdenv.mkDerivation rec {
   pname = "maestro";
@@ -10,7 +17,10 @@ stdenv.mkDerivation rec {
   };
 
   dontUnpack = true;
-  nativeBuildInputs = [ unzip makeWrapper ];
+  nativeBuildInputs = [
+    unzip
+    makeWrapper
+  ];
 
   installPhase = ''
     mkdir $out

From 860d4e2627ee2b60fb4cfcf549c8827b492ead93 Mon Sep 17 00:00:00 2001
From: pinage404 <pinage404@gmail.com>
Date: Mon, 19 Aug 2024 21:18:16 +0200
Subject: [PATCH 149/149] maestro: 1.36.0 -> 1.37.9

---
 pkgs/by-name/ma/maestro/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix
index 5e6186c02645..e4b8321aba9f 100644
--- a/pkgs/by-name/ma/maestro/package.nix
+++ b/pkgs/by-name/ma/maestro/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "maestro";
-  version = "1.36.0";
+  version = "1.37.9";
 
   src = fetchurl {
     url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip";
-    sha256 = "18zffmqz32dfb66yy48z3dl258rlfc8m2r4021hbrbixvk7k3qb7";
+    sha256 = "sha256-bWZuD2+v6molwW1ef2a3djBnVfYscBjILLGXeeSUmoU=";
   };
 
   dontUnpack = true;