From 0e68835e06e3cd5fdee34f0ef7076cc2120e7848 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 28 Oct 2024 16:46:29 +0100
Subject: [PATCH 01/42] python312Packages.azure-mgmt-resource: 23.1.1 -> 23.2.0

Changelog: https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource_23.2.0/sdk/resources/azure-mgmt-resource/CHANGELOG.md
---
 .../azure-mgmt-resource/default.nix              | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index abbf8d344348..f23f351452b3 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -4,21 +4,23 @@
   fetchPypi,
   azure-mgmt-core,
   azure-mgmt-common,
-  msrest,
+  isodate,
   pythonOlder,
   setuptools,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-resource";
-  version = "23.1.1";
+  version = "23.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ILawBrVE/bGWB/P2o4EQViXgu2D78wNvOYhcRkbTND4=";
+    pname = "azure_mgmt_resource";
+    inherit version;
+    hash = "sha256-dHt1DfevI6sw5T0/NiR6sMFt4eJn1maxpQd8OaQpJSk=";
   };
 
   build-system = [ setuptools ];
@@ -26,7 +28,8 @@ buildPythonPackage rec {
   dependencies = [
     azure-mgmt-common
     azure-mgmt-core
-    msrest
+    isodate
+    typing-extensions
   ];
 
   # Module has no tests
@@ -38,7 +41,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Microsoft Azure SDK for Python";
-    homepage = "https://github.com/Azure/azure-sdk-for-python";
+    homepage = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/resources/azure-mgmt-resource";
+    changelog = "https://github.com/Azure/azure-sdk-for-python/blob/azure-mgmt-resource_${version}/sdk/resources/azure-mgmt-resource/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
       olcai

From bbb6e83f5191eec81ee7d4e1d73a72396a626f96 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 8 Nov 2024 17:31:06 +0100
Subject: [PATCH 02/42] nixos/binfmt: add option
 `addEmulatedSystemsToNixSandbox`

---
 nixos/doc/manual/release-notes/rl-2411.section.md |  2 ++
 nixos/modules/system/boot/binfmt.nix              | 12 +++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 73ccad6714df..6b3010b0963a 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -761,6 +761,8 @@
     Note that first solution of the [official FAQ answer](https://cloud.seatable.io/dtable/external-links/7b976c85f504491cbe8e/?tid=0000&vid=0000&row-id=BQhH-2HSQs68Nq2EW91DBA)
     is not allowed by the `services.nginx` module's config-checker.
 
+- The new option `boot.binfmt.addEmulatedSystemsToNixSandbox` allows you to skip adding the emulated systems to `nix.settings.extra-platforms`. Now you can emulate foreign binaries locally while only building them on native remote builders.
+
 - The latest available version of Nextcloud is v30 (available as `pkgs.nextcloud30`). The installation logic is as follows:
   - If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**)
   - If [`system.stateVersion`](#opt-system.stateVersion) is >=24.05, `pkgs.nextcloud29` will be installed by default.
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix
index 5a4ee29dadfe..e9de71dc4d5a 100644
--- a/nixos/modules/system/boot/binfmt.nix
+++ b/nixos/modules/system/boot/binfmt.nix
@@ -279,6 +279,16 @@ in {
         type = types.listOf (types.enum (builtins.attrNames magics));
       };
 
+      addEmulatedSystemsToNixSandbox = mkOption {
+        type = types.bool;
+        default = true;
+        example = false;
+        description = ''
+          Whether to add the {option}`boot.binfmt.emulatedSystems` to {option}`nix.settings.extra-platforms`.
+          Disable this to use remote builders for those platforms, while allowing testing binaries locally.
+        '';
+      };
+
       preferStaticEmulators = mkOption {
         default = false;
         description = ''
@@ -325,7 +335,7 @@ in {
         interpreterSandboxPath = mkDefault (dirOf (dirOf config.interpreter));
       } // (magics.${system} or (throw "Cannot create binfmt registration for system ${system}")));
     }) cfg.emulatedSystems);
-    nix.settings = lib.mkIf (cfg.emulatedSystems != []) {
+    nix.settings = lib.mkIf (cfg.addEmulatedSystemsToNixSandbox && cfg.emulatedSystems != []) {
       extra-platforms = cfg.emulatedSystems ++ lib.optional pkgs.stdenv.hostPlatform.isx86_64 "i686-linux";
       extra-sandbox-paths = let
         ruleFor = system: cfg.registrations.${system};

From 5647888ffb2277294992e073c857120c0eb964fb Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Wed, 13 Nov 2024 14:23:06 -0300
Subject: [PATCH 03/42] python3Packages.python-mapnik: mark broken

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

diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix
index c06251663e0b..72f26cde2d95 100644
--- a/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/pkgs/development/python-modules/python-mapnik/default.nix
@@ -132,5 +132,6 @@ buildPythonPackage rec {
     maintainers = [ ];
     homepage = "https://mapnik.org";
     license = licenses.lgpl21Plus;
+    broken = true; # At 2024-11-13, test_raster_warping fails.
   };
 }

From 850c40d402bd292899dcd08852ea2bd993f628e3 Mon Sep 17 00:00:00 2001
From: Emily Trau <emily@downunderctf.com>
Date: Sat, 16 Nov 2024 14:38:31 +1100
Subject: [PATCH 04/42] 7z2hashcat: init at 2.0

---
 pkgs/by-name/7z/7z2hashcat/package.nix | 48 ++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 pkgs/by-name/7z/7z2hashcat/package.nix

diff --git a/pkgs/by-name/7z/7z2hashcat/package.nix b/pkgs/by-name/7z/7z2hashcat/package.nix
new file mode 100644
index 000000000000..7e9bfd670850
--- /dev/null
+++ b/pkgs/by-name/7z/7z2hashcat/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  perl,
+  perlPackages,
+  makeWrapper,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "7z2hashcat";
+  version = "2.0";
+
+  src = fetchFromGitHub {
+    owner = "philsmd";
+    repo = "7z2hashcat";
+    rev = finalAttrs.version;
+    hash = "sha256-BmpO2VLcuUtQaN4qmLm0YQEfK5iE+2hw4k6uBbwcFS4=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+
+  buildInputs = [
+    perl
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -D 7z2hashcat.pl $out/bin/7z2hashcat
+    wrapProgram $out/bin/7z2hashcat \
+      --set PERL5LIB "${perlPackages.makePerlPath [ perlPackages.CompressRawLzma ]}" \
+
+    runHook postInstall
+  '';
+
+  meta = {
+    changelog = "https://github.com/philsmd/7z2hashcat/releases/tag/${finalAttrs.version}";
+    description = "Extract hashcat hashes from password-protected .7z archives (and .sfx files)";
+    homepage = "https://github.com/philsmd/7z2hashcat";
+    license = lib.licenses.publicDomain;
+    mainProgram = "7z2hashcat";
+    maintainers = with lib.maintainers; [ emilytrau ];
+    platforms = lib.platforms.unix;
+  };
+})

From 2c1a608bf7ab1cdf3055afd1f452d1dce6da1b78 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Thu, 7 Nov 2024 11:04:08 +0100
Subject: [PATCH 05/42] apfsprogs: format with nixfmt-rfc-style

---
 pkgs/by-name/ap/apfsprogs/package.nix | 29 +++++++++++++++------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ap/apfsprogs/package.nix b/pkgs/by-name/ap/apfsprogs/package.nix
index 6483b967e7ba..42175558be32 100644
--- a/pkgs/by-name/ap/apfsprogs/package.nix
+++ b/pkgs/by-name/ap/apfsprogs/package.nix
@@ -1,7 +1,8 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, nixosTests
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -15,15 +16,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-+c+wU52XKNOTxSpSrkrNWoGEYw6Zo4CGEOyKMvkXEa0=";
   };
 
-  postPatch = let
-    shortRev = builtins.substring 0 9 finalAttrs.src.rev;
-  in ''
-    substituteInPlace \
-      apfs-snap/Makefile apfsck/Makefile mkapfs/Makefile apfs-label/Makefile \
-      --replace-fail \
-        '$(shell git describe --always HEAD | tail -c 9)' \
-        '${shortRev}'
-  '';
+  postPatch =
+    let
+      shortRev = builtins.substring 0 9 finalAttrs.src.rev;
+    in
+    ''
+      substituteInPlace \
+        apfs-snap/Makefile apfsck/Makefile mkapfs/Makefile apfs-label/Makefile \
+        --replace-fail \
+          '$(shell git describe --always HEAD | tail -c 9)' \
+          '${shortRev}'
+    '';
 
   buildPhase = ''
     runHook preBuild

From 7b77b4ab6cf7b48faab962f88a1166423c7f249f Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Thu, 7 Nov 2024 11:04:18 +0100
Subject: [PATCH 06/42] apfsprogs: 0-unstable-2024-09-27 -> 0.2.0

https://github.com/linux-apfs/apfsprogs/releases/tag/v0.2.0

Also add some simple tests to check that all tools can output the correct version.
---
 pkgs/by-name/ap/apfsprogs/package.nix | 55 ++++++++++++++++++---------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ap/apfsprogs/package.nix b/pkgs/by-name/ap/apfsprogs/package.nix
index 42175558be32..53b374f77975 100644
--- a/pkgs/by-name/ap/apfsprogs/package.nix
+++ b/pkgs/by-name/ap/apfsprogs/package.nix
@@ -3,30 +3,34 @@
   stdenv,
   fetchFromGitHub,
   nixosTests,
+  testers,
 }:
-
+let
+  tools = [
+    "apfsck"
+    "apfs-label"
+    "apfs-snap"
+    "mkapfs"
+  ];
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "apfsprogs";
-  version = "0-unstable-2024-09-27";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "linux-apfs";
     repo = "apfsprogs";
-    rev = "f31d7c2d69d212ce381399d2bb1e91410f592484";
-    hash = "sha256-+c+wU52XKNOTxSpSrkrNWoGEYw6Zo4CGEOyKMvkXEa0=";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-rolbBLdE98jqlKC06fTo6eJU3abKzgB3QIlaw4bza9U=";
   };
 
-  postPatch =
-    let
-      shortRev = builtins.substring 0 9 finalAttrs.src.rev;
-    in
-    ''
-      substituteInPlace \
-        apfs-snap/Makefile apfsck/Makefile mkapfs/Makefile apfs-label/Makefile \
-        --replace-fail \
-          '$(shell git describe --always HEAD | tail -c 9)' \
-          '${shortRev}'
-    '';
+  postPatch = ''
+    substituteInPlace \
+      apfs-snap/Makefile apfsck/Makefile mkapfs/Makefile apfs-label/Makefile \
+      --replace-fail \
+        '$(shell git describe --always HEAD | tail -c 9)' \
+        'v${finalAttrs.version}'
+  '';
 
   buildPhase = ''
     runHook preBuild
@@ -46,15 +50,30 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.tests = {
-    apfs = nixosTests.apfs;
-  };
+  passthru.tests =
+    let
+      mkVersionTest = tool: {
+        "version-${tool}" = testers.testVersion {
+          package = finalAttrs.finalPackage;
+          command = "${tool} -v";
+          version = "v${finalAttrs.version}";
+        };
+      };
+      versionTestList = builtins.map mkVersionTest tools;
+
+      versionTests = lib.mergeAttrsList versionTestList;
+    in
+    {
+      apfs = nixosTests.apfs;
+    }
+    // versionTests;
 
   strictDeps = true;
 
   meta = with lib; {
     description = "Experimental APFS tools for linux";
     homepage = "https://github.com/linux-apfs/apfsprogs";
+    changelog = "https://github.com/linux-apfs/apfsprogs/releases/tag/v${finalAttrs.version}";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
     maintainers = with maintainers; [ Luflosi ];

From 3f34ba46d6e6aba733af0e3392a964f3bfa0e409 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sun, 24 Nov 2024 17:47:28 +0800
Subject: [PATCH 07/42] nezha-agent: add updateScript

---
 pkgs/by-name/ne/nezha-agent/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix
index 750e1ecdaf2f..4b2699f879c6 100644
--- a/pkgs/by-name/ne/nezha-agent/package.nix
+++ b/pkgs/by-name/ne/nezha-agent/package.nix
@@ -4,6 +4,7 @@
   stdenv,
   fetchFromGitHub,
   versionCheckHook,
+  nix-update-script,
 }:
 buildGoModule rec {
   pname = "nezha-agent";
@@ -54,6 +55,10 @@ buildGoModule rec {
     versionCheckHook
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Agent of Nezha Monitoring";
     homepage = "https://github.com/nezhahq/agent";

From 78c80ec3842f9ba71dae7e383709a4d57f0f7165 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sun, 24 Nov 2024 17:48:43 +0800
Subject: [PATCH 08/42] nezha-agent: 0.20.3 -> 0.20.5

Diff: https://github.com/nezhahq/agent/compare/refs/tags/v0.20.3...v0.20.5
---
 pkgs/by-name/ne/nezha-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix
index 4b2699f879c6..5641cff73012 100644
--- a/pkgs/by-name/ne/nezha-agent/package.nix
+++ b/pkgs/by-name/ne/nezha-agent/package.nix
@@ -8,16 +8,16 @@
 }:
 buildGoModule rec {
   pname = "nezha-agent";
-  version = "0.20.3";
+  version = "0.20.5";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "agent";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cLLiJbAr7TxVUNV31Y9TG8ZL4uqBCOnrOr1FM4+1U5c=";
+    hash = "sha256-CVE1c0LLheGlH8oMWQWs6fox7mlHc5Y2O9XQ6kqXAwI=";
   };
 
-  vendorHash = "sha256-q6/265vVg6jCnDvs825nni8QFHkJpQz4xxC9MlJH2do=";
+  vendorHash = "sha256-ytFsTHl6kVwmqCabaMDxxijszY3jzWWUIZKBCebPMkI=";
 
   ldflags = [
     "-s"

From b84c7c214ee16d46d41ce0097455d26a2eb222a6 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sun, 24 Nov 2024 17:57:42 +0800
Subject: [PATCH 09/42] nixos/nezha-agent: add options for new features

 - servives.nezha-agent.disableNat: Disable NAT penetration
 - servives.nezha-agent.disableSendQuery: Disable sending TCP/ICMP/HTTP requests
---
 .../modules/services/monitoring/nezha-agent.nix  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/services/monitoring/nezha-agent.nix b/nixos/modules/services/monitoring/nezha-agent.nix
index e51328e48795..035485a939b8 100644
--- a/nixos/modules/services/monitoring/nezha-agent.nix
+++ b/nixos/modules/services/monitoring/nezha-agent.nix
@@ -52,6 +52,20 @@ in
           Disable executing the command from dashboard.
         '';
       };
+      disableNat = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = ''
+          Disable NAT penetration.
+        '';
+      };
+      disableSendQuery = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = ''
+          Disable sending TCP/ICMP/HTTP requests.
+        '';
+      };
       skipConnection = lib.mkOption {
         type = lib.types.bool;
         default = false;
@@ -125,6 +139,8 @@ in
         ]
         ++ lib.optional cfg.debug "--debug"
         ++ lib.optional cfg.disableCommandExecute "--disable-command-execute"
+        ++ lib.optional cfg.disableNat "--disable-nat"
+        ++ lib.optional cfg.disableSendQuery "--disable-send-query"
         ++ lib.optional (cfg.reportDelay != null) "--report-delay ${toString cfg.reportDelay}"
         ++ lib.optional (cfg.server != null) "--server ${cfg.server}"
         ++ lib.optional cfg.skipConnection "--skip-conn"

From 31fb039bd455c9855733f244099f7b6961f57402 Mon Sep 17 00:00:00 2001
From: Quentin Boyer <quentin+dev@familleboyer.net>
Date: Sun, 24 Nov 2024 21:59:13 +0100
Subject: [PATCH 10/42] vimPlugins: Remove the nvim-cmp dependency on
 cmp-sources

The `blink.cmp` neovim plugin provides a shim to use sources initially
developped for `nvim-cmp` by using the `blink.compat` plugin.

This plugin implements a `cmp` lua module, so that `nvim-cmp` sources
register with `blink.cmp` instead of registering with `nvim-cmp`.

If we have a hard dependency on nvim-cmp for cmp sources this means we
can't use them with `blink.cmp`

This also means that we can't easily require the plugin in the check
phase, as we would need to add nvim-cmp (or blink.compat) to provide the
'cmp' lua module.
---
 .../editors/vim/plugins/overrides.nix         | 125 +-----------------
 1 file changed, 2 insertions(+), 123 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 080ada46b9ed..f708b428637d 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -335,233 +335,113 @@ in
 
   cmp-ai = super.cmp-ai.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       plenary-nvim
     ];
-    nvimRequireCheck = "cmp_ai";
-  };
-
-  cmp-async-path = super.cmp-async-path.overrideAttrs {
-    dependencies = [ self.nvim-cmp ];
-  };
-
-  cmp-beancount = super.cmp-beancount.overrideAttrs {
-    dependencies = [ self.nvim-cmp ];
   };
 
   cmp-clippy = super.cmp-clippy.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       plenary-nvim
     ];
-    nvimRequireCheck = "cmp_clippy";
-  };
-
-  cmp-cmdline = super.cmp-cmdline.overrideAttrs {
-    dependencies = [ self.nvim-cmp ];
   };
 
   cmp-conjure = super.cmp-conjure.overrideAttrs {
     dependencies = with self; [
       conjure
-      nvim-cmp
     ];
   };
 
   cmp-copilot = super.cmp-copilot.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       copilot-vim
     ];
-    nvimRequireCheck = "cmp_copilot";
-  };
-
-  cmp-ctags = super.cmp-ctags.overrideAttrs {
-    dependencies = with self; [ nvim-cmp ];
-    nvimRequireCheck = "cmp_ctags";
   };
 
   cmp-dap = super.cmp-dap.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       nvim-dap
     ];
-    nvimRequireCheck = "cmp_dap";
-  };
-
-  cmp-dictionary = super.cmp-dictionary.overrideAttrs {
-    dependencies = with self; [ nvim-cmp ];
-    nvimRequireCheck = "cmp_dictionary";
-  };
-
-  cmp-digraphs = super.cmp-digraphs.overrideAttrs {
-    dependencies = with self; [ nvim-cmp ];
-    nvimRequireCheck = "cmp_digraphs";
-  };
-
-  cmp-fish = super.cmp-fish.overrideAttrs {
-    dependencies = with self; [ nvim-cmp ];
-    nvimRequireCheck = "cmp_fish";
   };
 
   cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       fuzzy-nvim
     ];
-    nvimRequireCheck = "cmp_fuzzy_buffer";
   };
 
   cmp-fuzzy-path = super.cmp-fuzzy-path.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       fuzzy-nvim
     ];
-    nvimRequireCheck = "cmp_fuzzy_path";
   };
 
   cmp-git = super.cmp-git.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       plenary-nvim
     ];
-    nvimRequireCheck = "cmp_git";
-  };
-
-  cmp-greek = super.cmp-greek.overrideAttrs {
-    dependencies = [ self.nvim-cmp ];
-    nvimRequireCheck = "cmp_greek";
-  };
-
-  cmp-look = super.cmp-look.overrideAttrs {
-    dependencies = [ self.nvim-cmp ];
-    nvimRequireCheck = "cmp_look";
   };
 
   cmp_luasnip = super.cmp_luasnip.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       luasnip
     ];
   };
 
   cmp-neosnippet = super.cmp-neosnippet.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       neosnippet-vim
     ];
-    nvimRequireCheck = "cmp_neosnippet";
-  };
-
-  cmp-nixpkgs-maintainers = super.cmp-nixpkgs-maintainers.overrideAttrs {
-    dependencies = with self; [ nvim-cmp ];
-    nvimRequireCheck = "cmp_nixpkgs_maintainers";
   };
 
   cmp-npm = super.cmp-npm.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       plenary-nvim
     ];
-    nvimRequireCheck = "cmp-npm";
-  };
-
-  cmp-nvim-lsp-signature-help = super.cmp-nvim-lsp-signature-help.overrideAttrs {
-    dependencies = with self; [ nvim-cmp ];
-    nvimRequireCheck = "cmp_nvim_lsp_signature_help";
-  };
-
-  cmp-nvim-lua = super.cmp-nvim-lua.overrideAttrs {
-    dependencies = [ self.nvim-cmp ];
-  };
-
-  cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs {
-    dependencies = with self; [ nvim-cmp ];
-    nvimRequireCheck = "cmp_nvim_tags";
-  };
-
-  cmp-nvim-ultisnips = super.cmp-nvim-ultisnips.overrideAttrs {
-    dependencies = [ self.nvim-cmp ];
   };
 
   cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       plenary-nvim
     ];
-    nvimRequireCheck = "cmp_pandoc";
-  };
-
-  cmp-pandoc-references = super.cmp-pandoc-references.overrideAttrs {
-    dependencies = [ self.nvim-cmp ];
-  };
-
-  cmp-path = super.cmp-path.overrideAttrs {
-    dependencies = [ self.nvim-cmp ];
-  };
-
-  cmp-rg = super.cmp-rg.overrideAttrs {
-    dependencies = with self; [ nvim-cmp ];
-    nvimRequireCheck = "cmp-rg";
   };
 
   cmp-snippy = super.cmp-snippy.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       nvim-snippy
     ];
-    nvimRequireCheck = "cmp_snippy";
-  };
-
-  cmp-tabby = super.cmp-tabby.overrideAttrs {
-    dependencies = with self; [ nvim-cmp ];
-    nvimRequireCheck = "cmp_tabby";
   };
 
   cmp-tabnine = super.cmp-tabnine.overrideAttrs {
     buildInputs = [ tabnine ];
-    dependencies = with self; [ nvim-cmp ];
 
     postFixup = ''
       mkdir -p $target/binaries/${tabnine.version}
       ln -s ${tabnine}/bin/ $target/binaries/${tabnine.version}/${tabnine.passthru.platform}
     '';
-    nvimRequireCheck = "cmp_tabnine";
   };
 
   cmp-tmux = super.cmp-tmux.overrideAttrs {
-    dependencies = with self; [
-      nvim-cmp
+    dependencies = [
       tmux
     ];
-    nvimRequireCheck = "cmp_tmux";
   };
 
   cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       vim-lsp
     ];
   };
 
   cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs {
     dependencies = with self; [
-      nvim-cmp
       vimwiki
     ];
-    nvimRequireCheck = "cmp_vimwiki_tags";
-  };
-
-  cmp-vsnip = super.cmp-vsnip.overrideAttrs {
-    dependencies = [ self.nvim-cmp ];
   };
 
   cmp-zsh = super.cmp-zsh.overrideAttrs {
-    dependencies = with self; [
-      nvim-cmp
+    dependencies = [
       zsh
     ];
-    nvimRequireCheck = "cmp_zsh";
   };
 
   coc-clangd = buildVimPlugin {
@@ -631,7 +511,6 @@ in
     in
     super.codeium-nvim.overrideAttrs {
       dependencies = with self; [
-        nvim-cmp
         plenary-nvim
       ];
       buildPhase = ''

From b2c3907f9b8f46b90d51cd5dd0faa49e9cd4a735 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Mon, 25 Nov 2024 01:16:22 +0100
Subject: [PATCH 11/42] vscodium: fix update script to work with longer hashes

The previous VSCodium update introduced longer hashes. This broke the update script, since the hash length is hardcoded. To fix this, make the hash length a bit more flexible and in exchange, make sure the characters are hexadecimal.
---
 pkgs/applications/editors/vscode/update-vscodium.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh
index c7d9c1068b14..d5f2c4bf641b 100755
--- a/pkgs/applications/editors/vscode/update-vscodium.sh
+++ b/pkgs/applications/editors/vscode/update-vscodium.sh
@@ -21,7 +21,7 @@ update_vscodium () {
   ARCHIVE_FMT=$4
   VSCODIUM_URL="https://github.com/VSCodium/vscodium/releases/download/${VSCODIUM_VER}/VSCodium-${ARCH}-${VSCODIUM_VER}.${ARCHIVE_FMT}"
   VSCODIUM_SHA256=$(nix-prefetch-url ${VSCODIUM_URL})
-  sed -i "s/${ARCH_LONG} = \".\{52\}\"/${ARCH_LONG} = \"${VSCODIUM_SHA256}\"/" "$ROOT/vscodium.nix"
+  sed -i "s/${ARCH_LONG} = \"[0-9a-fA-F]\{40,64\}\"/${ARCH_LONG} = \"${VSCODIUM_SHA256}\"/" "$ROOT/vscodium.nix"
 }
 
 # VSCodium

From aac60d6a8742e87fa82c28946b8201b99015d935 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Mon, 25 Nov 2024 01:36:47 +0100
Subject: [PATCH 12/42] vscodium: 1.95.2 -> 1.95.3

https://github.com/VSCodium/vscodium/releases/tag/1.95.3.24320
https://github.com/VSCodium/vscodium/releases/tag/1.95.3.24321
---
 pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index b112f1fe663b..167df0c85482 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -15,11 +15,11 @@ let
   archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "c3c97f536692f7d658ddd77dc809693d4cb48b720c9ab97d3931bec028633639";
-    x86_64-darwin = "0fa21f9e0562b61e755d458596bb6ed41d55efb3a9376ec07eea02641eaef631";
-    aarch64-linux = "0bf48851a51ee7c506d73b8633bd02c1da986b5973683eadfeac804cd73e5d2a";
-    aarch64-darwin = "b54453610b92c17032d4ecc71717a1a7b3c9643091e91e58c34576e5a6a78b3c";
-    armv7l-linux = "211b93a60bda18f62cee5ec279f6179af9b94d827535cd89f6c1c832a3ae6dfa";
+    x86_64-linux = "0948jbnhjra09bvf9acrl6b2dp1xar5ajahmzy0cwf6dbidfms5y";
+    x86_64-darwin = "1a8ga66526lfy2xrgshhizmidp8aaiwvpr38rvhsx0hqb4vmm0hy";
+    aarch64-linux = "08la7kbb6myf9iz23p60vd00mrmhnizw8dgh54gb0msh8wbasidq";
+    aarch64-darwin = "01z1dx77briqzhfx45c2f2np78r11b5xm92smi9idivbsia800i3";
+    armv7l-linux = "0h3f9sy7d4ylk0ay63adhnz9s7jlpwlf3x831v8pygzm2r7k9zgc";
   }.${system} or throwSystem;
 
   sourceRoot = lib.optionalString (!stdenv.hostPlatform.isDarwin) ".";
@@ -29,7 +29,7 @@ in
 
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.95.2.24313";
+    version = "1.95.3.24321";
     pname = "vscodium";
 
     executableName = "codium";

From c76b79b7d2f74d07932bce178e6fb2ca070903a4 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 24 Nov 2024 21:03:12 +0100
Subject: [PATCH 13/42] libstdcxx5: remove

I observed this package to be a big red herring when people are searching
for the package they need if libstdc++ is missing: I observed this to
happen if you're either very new to packaging and don't know where it's
supposed to come from or if you package some binary program (or virtual
environment) and this library is missing.

The package is a subset of GCC 3.3 from 2005 and only needed for very
old proprietary software that cannot be recompiled where it's only
questionable if this is even appropriate to have in nixpkgs.

There's in fact one such package, unreal tournament 2004. As much as I
don't think that libstdcxx5 has a place in here, this also applies to
it. If people want to consume this, it should belong into an external
flake.

Until this happens, I'm sorry for https://www.youtube.com/watch?v=mXapt4GHt-s
---
 .../development/libraries/gcc/libstdc++/5.nix | 119 ------------------
 .../libraries/gcc/libstdc++/no-sys-dirs.patch |  53 --------
 .../gcc/libstdc++/struct-ucontext.patch       |  61 ---------
 pkgs/games/ut2004/default.nix                 |   9 --
 pkgs/games/ut2004/demo.nix                    |  40 ------
 pkgs/games/ut2004/wrapper.nix                 |  46 -------
 pkgs/top-level/aliases.nix                    |   3 +
 pkgs/top-level/all-packages.nix               |   6 -
 pkgs/top-level/packages-config.nix            |   1 -
 9 files changed, 3 insertions(+), 335 deletions(-)
 delete mode 100644 pkgs/development/libraries/gcc/libstdc++/5.nix
 delete mode 100644 pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch
 delete mode 100644 pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch
 delete mode 100644 pkgs/games/ut2004/default.nix
 delete mode 100644 pkgs/games/ut2004/demo.nix
 delete mode 100644 pkgs/games/ut2004/wrapper.nix

diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix
deleted file mode 100644
index 455c84e5dc18..000000000000
--- a/pkgs/development/libraries/gcc/libstdc++/5.nix
+++ /dev/null
@@ -1,119 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, flex, bison, file }:
-
-stdenv.mkDerivation rec {
-  pname = "libstdc++5";
-  version = "3.3.6";
-
-  src = [
-    (fetchurl {
-      url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2";
-      sha256 = "1dpyrpsgakilz2rnh5f8gvrzq5pwzvndacc0df6m04bpqn5fx6sg";
-    })
-    (fetchurl {
-      url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2";
-      sha256 = "14lxl81f7adpc9jxfiwzdxsdzs5zv4piv8xh7f9w910hfzrgvsby";
-    })
-  ];
-
-  patches = [
-    ./no-sys-dirs.patch
-    (fetchpatch {
-      name = "siginfo.patch";
-      url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/e36ee8ed9bb5942db14cf6249a2ead14974a2bfa/trunk/siginfo.patch";
-      sha256 = "15zldbm33yba293dgrgsbv3j332hkc3iqpyc8fa7zl42mh9qk22j";
-      extraPrefix = "";
-    })
-    (fetchpatch {
-      name = "gcc-3.4.3-no_multilib_amd64.patch";
-      url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/e36ee8ed9bb5942db14cf6249a2ead14974a2bfa/trunk/gcc-3.4.3-no_multilib_amd64.patch";
-      sha256 = "11m5lc51b0addhc4yq4rz0dwpv6k73rrj73wya3lqdk8rly6cjpm";
-      extraPrefix = "";
-    })
-    # Required because of glibc 2.26
-    ./struct-ucontext.patch
-  ];
-
-  postPatch = ''
-    # fix build issue with recent gcc
-    sed -i "s#O_CREAT#O_CREAT, 0666#" gcc/collect2.c
-
-    # No fixincludes
-    sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-  '';
-
-  preConfigure = ''
-    mkdir ../build
-    cd ../build
-    configureScript=../$sourceRoot/configure
-  '';
-
-  preBuild = ''
-    # libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad
-    # Thing.
-    export CPP="gcc -E"
-
-    # Use *real* header files, otherwise a limits.h is generated
-    # that does not include Glibc's limits.h (notably missing
-    # SSIZE_MAX, which breaks the build).
-    export NIX_FIXINC_DUMMY="$(cat $NIX_CC/nix-support/orig-libc-dev)/include"
-
-    # The path to the Glibc binaries such as `crti.o'.
-    glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib"
-
-    # Figure out what extra flags to pass to the gcc compilers
-    # being generated to make sure that they use our glibc.
-    EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-crt1-cflags) $(cat $NIX_CC/nix-support/libc-cflags) -O2"
-
-    extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_BINTOOLS/nix-support/libc-ldflags || true) $(cat $NIX_BINTOOLS/nix-support/libc-ldflags-before || true)"
-    for i in $extraLDFlags; do
-      EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i"
-    done
-
-    # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find
-    # the startfiles.
-    # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx
-    # for the startfiles.
-    makeFlagsArray=( \
-      "''${makeFlagsArray[@]}" \
-      NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
-      SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \
-      CFLAGS_FOR_BUILD="$EXTRA_FLAGS" \
-      CFLAGS_FOR_TARGET="$EXTRA_FLAGS" \
-      CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS" \
-      CXXFLAGS_FOR_TARGET="$EXTRA_FLAGS" \
-      FLAGS_FOR_TARGET="$EXTRA_FLAGS" \
-      LDFLAGS_FOR_BUILD="$EXTRA_FLAGS" \
-      LDFLAGS_FOR_TARGET="$EXTRA_FLAGS" \
-      BOOT_CFLAGS="$EXTRA_FLAGS" \
-      BOOT_LDFLAGS="$EXTRA_FLAGS"
-      )
-  '';
-
-  hardeningDisable = [ "format" ];
-
-  nativeBuildInputs = [ flex bison file ];
-
-  configureFlags = [ "--disable-multilib" "--enable-__cxa-atexit" "--enable-threads=posix" "--enable-languages=c++" "--enable-clocale=gnu" ];
-
-  buildFLags = [ "all-target-libstdc++-v3" ];
-
-  installFlags = [ "install-target-libstdc++-v3" ];
-
-  postInstall = ''
-    # Remove includefiles and libs provided by gcc
-    shopt -s extglob
-    rm -rf $out/{bin,include,share,man,info}
-    rm -f $out/lib/*.a
-    rm -rf $out/lib/!(libstdc++*)
-  '';
-
-  meta = with lib; {
-    homepage = "https://gcc.gnu.org/";
-    license = licenses.lgpl3Plus;
-    description = "GNU Compiler Collection, version ${version} -- C++ standard library";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ abbradar ];
-    # never built on aarch64-linux since first introduction in nixpkgs
-    broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;
-  };
-}
diff --git a/pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch b/pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch
deleted file mode 100644
index 8c91d75f2a53..000000000000
--- a/pkgs/development/libraries/gcc/libstdc++/no-sys-dirs.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -ru3 gcc-3.3.6-old/gcc/cppdefault.c gcc-3.3.6/gcc/cppdefault.c
---- gcc-3.3.6-old/gcc/cppdefault.c	2003-11-07 02:13:31.000000000 +0300
-+++ gcc-3.3.6/gcc/cppdefault.c	2016-09-02 16:00:03.492484016 +0300
-@@ -26,6 +26,10 @@
- #include "system.h"
- #include "cppdefault.h"
- 
-+#undef LOCAL_INCLUDE_DIR
-+#undef SYSTEM_INCLUDE_DIR
-+#undef STANDARD_INCLUDE_DIR
-+
- const struct default_include cpp_include_defaults[]
- #ifdef INCLUDE_DEFAULTS
- = INCLUDE_DEFAULTS;
-diff -ru3 gcc-3.3.6-old/gcc/gcc.c gcc-3.3.6/gcc/gcc.c
---- gcc-3.3.6-old/gcc/gcc.c	2004-04-01 20:55:17.000000000 +0400
-+++ gcc-3.3.6/gcc/gcc.c	2016-09-02 16:01:24.843520114 +0300
-@@ -6130,10 +6130,6 @@
- 		      NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1);
- 	}
- 
--      add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_1,
--			    "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
--      add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_2,
--			    "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
- #if 0 /* Can cause surprises, and one can use -B./ instead.  */
-       add_prefix (&startfile_prefixes, "./", NULL,
- 		  PREFIX_PRIORITY_LAST, 1, NULL, 0);
-diff -ru3 gcc-3.3.6-old/gcc/Makefile.in gcc-3.3.6/gcc/Makefile.in
---- gcc-3.3.6-old/gcc/Makefile.in	2004-04-01 20:55:23.000000000 +0400
-+++ gcc-3.3.6/gcc/Makefile.in	2016-09-02 16:00:03.493484017 +0300
-@@ -260,7 +260,11 @@
- PARTITION_H = $(srcdir)/../include/partition.h
- 
- # Default native SYSTEM_HEADER_DIR, to be overridden by targets.
--NATIVE_SYSTEM_HEADER_DIR = /usr/include
-+# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent
-+# `fixinc' from fixing header files in /usr/include.  However,
-+# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set
-+# it to some dummy directory.
-+NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY)
- # Default cross SYSTEM_HEADER_DIR, to be overridden by targets.
- CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@
- 
-@@ -2201,7 +2205,7 @@
-   -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
-   -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_alias)\" \
-   -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
--  -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
-+  -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \
-   -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \
-   -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
-   @TARGET_SYSTEM_ROOT_DEFINE@
diff --git a/pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch b/pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch
deleted file mode 100644
index 5462e0e33ecd..000000000000
--- a/pkgs/development/libraries/gcc/libstdc++/struct-ucontext.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/gcc/config/alpha/linux.h b/gcc/config/alpha/linux.h
-index 3a2940c..67f9899 100644
---- a/gcc/config/alpha/linux.h
-+++ b/gcc/config/alpha/linux.h
-@@ -89,7 +89,7 @@ Boston, MA 02111-1307, USA.  */
-       {									\
- 	struct rt_sigframe {						\
- 	  struct siginfo info;						\
--	  struct ucontext uc;						\
-+	  ucontext_t uc;						\
- 	} *rt_ = (CONTEXT)->cfa;					\
- 	sc_ = &rt_->uc.uc_mcontext;					\
-       }									\
-diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
-index e86ab3d..30797a7 100644
---- a/gcc/config/i386/linux.h
-+++ b/gcc/config/i386/linux.h
-@@ -260,7 +260,7 @@ Boston, MA 02111-1307, USA.  */
- 	  siginfo_t *pinfo;					\
- 	  void *puc;							\
- 	  siginfo_t info;						\
--	  struct ucontext uc;						\
-+	  ucontext_t uc;						\
- 	} *rt_ = (CONTEXT)->cfa;					\
- 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
-       }									\
-diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
-index fbfaa58..200c8dc 100644
---- a/gcc/config/i386/linux64.h
-+++ b/gcc/config/i386/linux64.h
-@@ -112,7 +112,7 @@ Boston, MA 02111-1307, USA.  */
-     if (*(unsigned char *)(pc_+0) == 0x48				\
- 	&& *(unsigned long *)(pc_+1) == 0x050f0000000fc0c7)		\
-       {									\
--	struct ucontext *uc_ = (CONTEXT)->cfa;				\
-+	ucontext_t *uc_ = (CONTEXT)->cfa;				\
- 	sc_ = (struct sigcontext *) &uc_->uc_mcontext;			\
-       }									\
-     else								\
-@@ -182,7 +182,7 @@ Boston, MA 02111-1307, USA.  */
- 	  struct siginfo *pinfo;					\
- 	  void *puc;							\
- 	  struct siginfo info;						\
--	  struct ucontext uc;						\
-+	  ucontext_t uc;						\
- 	} *rt_ = (CONTEXT)->cfa;					\
- 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
-       }									\
-diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
-index ba70ec1..0fff8b1 100644
---- a/gcc/config/rs6000/linux.h
-+++ b/gcc/config/rs6000/linux.h
-@@ -101,7 +101,7 @@ Boston, MA 02111-1307, USA.  */
- 
- struct kernel_old_ucontext {
-   unsigned long     uc_flags;
--  struct ucontext  *uc_link;
-+  ucontext_t       *uc_link;
-   stack_t           uc_stack;
-   struct sigcontext_struct uc_mcontext;
-   sigset_t          uc_sigmask;
diff --git a/pkgs/games/ut2004/default.nix b/pkgs/games/ut2004/default.nix
deleted file mode 100644
index 3f306ac6eb54..000000000000
--- a/pkgs/games/ut2004/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ callPackage }:
-
-{
-  ut2004-demo = callPackage ./demo.nix { };
-
-  ut2004 = gamePacks: callPackage ./wrapper.nix {
-    inherit gamePacks;
-  };
-}
diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix
deleted file mode 100644
index caa6651e457f..000000000000
--- a/pkgs/games/ut2004/demo.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib, stdenv, fetchurl }:
-
-let
-  arch =
-    if stdenv.hostPlatform.system == "x86_64-linux" then "amd64"
-    else if stdenv.hostPlatform.system == "i686-linux" then "x86"
-    else throw "Unsupported architecture";
-
-in stdenv.mkDerivation rec {
-  pname = "ut2004-demo";
-  version = "3334";
-
-  src = fetchurl {
-    url = "http://ftp.snt.utwente.nl/pub/games/UT2004/demo/UT2004-LNX-Demo${version}.run.gz";
-    sha256 = "0d5f84qz8l1rg16yzx2k4ikr46n9iwj68na1bqi87wrww7ck6jh7";
-  };
-
-  buildCommand = ''
-    cat $src | gunzip > setup.run
-    chmod +x setup.run
-    ./setup.run --noexec --target .
-    mkdir $out
-    tar -xaf ut2004demo.tar.bz2 -C $out
-    tar -xaf linux-${arch}.tar.bz2 -C $out
-
-    rm $out/System/libSDL-1.2.so.0
-    rm $out/System/openal.so
-  '';
-
-  dontStrip = true;
-  dontPatchELF = true;
-
-  meta = with lib; {
-    description = "First-person shooter video game developed by Epic Games and Digital Extreme -- demo version";
-    homepage = "http://www.unrealtournament2004.com";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ abbradar ];
-    platforms = [ "x86_64-linux" "i686-linux" ];
-  };
-}
diff --git a/pkgs/games/ut2004/wrapper.nix b/pkgs/games/ut2004/wrapper.nix
deleted file mode 100644
index cc5b0e400bc1..000000000000
--- a/pkgs/games/ut2004/wrapper.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, lib, runCommand, buildEnv, makeWrapper, makeDesktopItem, gamePacks, libstdcxx5, SDL, openal }:
-
-let
-  game = buildEnv {
-    name = "ut2004-game";
-    paths = gamePacks;
-    ignoreCollisions = true;
-    pathsToLink = [ "/" "/System" ];
-    postBuild = ''
-      ln -s ${lib.getLib SDL}/lib/libSDL-1.2.so.0 $out/System
-      ln -s ${lib.getLib openal}/lib/libopenal.so $out/System/openal.so
-      for i in $out/System/*-bin; do
-        path="$(readlink -f "$i")"
-        rm "$i"
-        cp "$path" "$i"
-        chmod +w "$i"
-        patchelf \
-          --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
-          --set-rpath "$out/System:${lib.makeLibraryPath [ libstdcxx5 ]}" \
-          "$i"
-      done
-    '';
-  };
-
-  desktop = makeDesktopItem {
-    name = "ut2004";
-    desktopName = "Unreal Tournament 2004";
-    comment = "A first-person shooter video game developed by Epic Games and Digital Extreme";
-    genericName = "First-person shooter";
-    categories = [ "Game" ];
-    exec = "ut2004";
-  };
-
-in runCommand "ut2004" {
-  nativeBuildInputs = [ makeWrapper ];
-} ''
-  mkdir -p $out/bin
-  for i in ${game}/System/*-bin; do
-    name="$(basename "$i")"
-    makeWrapper $i $out/bin/''${name%-bin} \
-      --chdir "${game}/System"
-  done
-
-  mkdir -p $out/share/applications
-  ln -s ${desktop}/share/applications/* $out/share/applications
-''
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4efab55ea533..328581b7d4b0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -643,6 +643,7 @@ mapAliases {
   librewolf-wayland = librewolf; # Added 2022-11-15
   libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17
   libsForQt515 = libsForQt5; # Added 2022-11-24
+  libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24
   libtensorflow-bin = libtensorflow; # Added 2022-09-25
   libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17
   libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2024-10-17
@@ -1283,6 +1284,8 @@ mapAliases {
   urxvt_tabbedex = throw "'urxvt_tabbedex' has been renamed to/replaced by 'rxvt-unicode-plugins.tabbedex'"; # Converted to throw 2024-10-17
   urxvt_theme_switch = throw "'urxvt_theme_switch' has been renamed to/replaced by 'rxvt-unicode-plugins.theme-switch'"; # Converted to throw 2024-10-17
   urxvt_vtwheel = throw "'urxvt_vtwheel' has been renamed to/replaced by 'rxvt-unicode-plugins.vtwheel'"; # Converted to throw 2024-10-17
+  ut2004Packages = throw "UT2004 requires libstdc++5 which is not supported by nixpkgs anymore"; # Added 2024-11-24
+  ut2004demo = ut2004Packages; # Added 2024-11-24
   util-linuxCurses = util-linux; # Added 2022-04-12
   utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7543000e7961..fd59a97798b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8184,8 +8184,6 @@ with pkgs;
       then targetPackages.stdenv.cc.cc
     else gcc.cc;
 
-  libstdcxx5 = callPackage ../development/libraries/gcc/libstdc++/5.nix { };
-
   libsigrok = callPackage ../development/tools/libsigrok {
     python = python3;
   };
@@ -17338,10 +17336,6 @@ with pkgs;
 
   ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });
 
-  ut2004Packages = dontRecurseIntoAttrs (callPackage ../games/ut2004 { });
-
-  ut2004demo = res.ut2004Packages.ut2004 [ res.ut2004Packages.ut2004-demo ];
-
   # To ensure vdrift's code is built on hydra
   vdrift-bin = vdrift.bin;
 
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index 51c2b44fc584..769cfb73d28f 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -21,7 +21,6 @@
       rPackages
       roundcubePlugins
       sourceHanPackages
-      ut2004Packages
       zabbix50
       zabbix60
       zeroadPackages

From d12dfaf2d755afdd3612aab8d7354ad528f18322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 25 Nov 2024 14:07:21 +0100
Subject: [PATCH 14/42] goreleaser: 2.4.5 -> 2.4.8

Diff: https://github.com/goreleaser/goreleaser/compare/v2.4.5...v2.4.8
---
 pkgs/by-name/go/goreleaser/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix
index 1919d239490e..d595615e2512 100644
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -10,16 +10,16 @@
 }:
 buildGoModule rec {
   pname = "goreleaser";
-  version = "2.4.5";
+  version = "2.4.8";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "goreleaser";
     rev = "v${version}";
-    hash = "sha256-s0t7aKmA42WqFCCL1rMD4az9g9aHc/ordMB2KXilhV8=";
+    hash = "sha256-inM+CyYk8sTTS8QomPhm9SsQVhnv+JkjL4vpwLsotnY=";
   };
 
-  vendorHash = "sha256-jNzTVNSg/NR2lIuheUZSao+AXMuYRYmNPmFTB2Wu2dI=";
+  vendorHash = "sha256-rS6+/HpF12AHgH5yPkyhA5qIMtucbNUTSMxuWfhvMZo=";
 
   ldflags = [
     "-s"

From 7b147a804bae1c5d7a79dad4bae62bd4f7f9b21d Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 25 Nov 2024 18:00:56 +0100
Subject: [PATCH 15/42] alpaca: 2.7.0 -> 2.8.0

---
 pkgs/by-name/al/alpaca/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index 09974003d4cc..e338cf83b54e 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "2.7.0";
+  version = "2.8.0";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     rev = "refs/tags/${version}";
-    hash = "sha256-gEQUVSNf8u92qIg0+5fsLIOPgIASdYdlTRDpzl61P+Q=";
+    hash = "sha256-Wk7a5/fO87yl/TolzoonSRLkc2TGEZKgVCgXcUuhjQI=";
   };
 
   nativeBuildInputs = [
@@ -52,6 +52,7 @@ python3Packages.buildPythonApplication rec {
     pytube
     html2text
     youtube-transcript-api
+    pydbus
   ];
 
   dontWrapGApps = true;

From 13020da8a870fd0b898aa5e1039f643c854b3741 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 25 Nov 2024 17:15:28 +0000
Subject: [PATCH 16/42] audacious-bare: init at 4.4.2

---
 pkgs/applications/audio/audacious/plugins.nix | 6 +++---
 pkgs/by-name/vg/vgmstream/package.nix         | 4 ++--
 pkgs/top-level/all-packages.nix               | 6 ++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix
index 53026e3fa267..65286b33d593 100644
--- a/pkgs/applications/audio/audacious/plugins.nix
+++ b/pkgs/applications/audio/audacious/plugins.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetchFromGitHub
 , alsa-lib
-, audacious
+, audacious-bare
 , curl
 , faad2
 , ffmpeg
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    audacious
+    audacious-bare
     alsa-lib
     curl
     faad2
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
     ln -s ${vgmstream.override { buildAudaciousPlugin = true; }}/lib/audacious/Input/* $out/lib/audacious/Input
   '';
 
-  meta = audacious.meta // {
+  meta = audacious-bare.meta // {
     description = "Plugins for Audacious music player";
     downloadPage = "https://github.com/audacious-media-player/audacious-plugins";
   };
diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix
index 17ad8025789a..b8e470883ec4 100644
--- a/pkgs/by-name/vg/vgmstream/package.nix
+++ b/pkgs/by-name/vg/vgmstream/package.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, cmake, pkg-config, gtk3
-, audacious, mpg123, ffmpeg, libvorbis, libao, jansson, speex
+, audacious-bare, mpg123, ffmpeg, libvorbis, libao, jansson, speex
 , nix-update-script
 , buildAudaciousPlugin ? false  # only build cli by default, pkgs.audacious-plugins sets this to enable plugin support
 }:
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     libao
     jansson
     speex
-  ] ++ lib.optional buildAudaciousPlugin (audacious.override { audacious-plugins = null; });
+  ] ++ lib.optional buildAudaciousPlugin audacious-bare;
 
   preConfigure = ''
     substituteInPlace cmake/dependencies/audacious.cmake \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 882196e53a13..9e924eb7f29c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13382,11 +13382,9 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
+  audacious-bare = audacious.override { audacious-plugins = null; };
   audacious = qt6Packages.callPackage ../applications/audio/audacious { };
-  audacious-plugins = qt6Packages.callPackage ../applications/audio/audacious/plugins.nix {
-    # Avoid circular dependency
-    audacious = audacious.override { audacious-plugins = null; };
-  };
+  audacious-plugins = qt6Packages.callPackage ../applications/audio/audacious/plugins.nix { };
 
   av-98 = callPackage ../applications/networking/browsers/av-98 { };
 

From b41a09978bb110f8c02ca7575cb19e01fb5f7aeb Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 25 Nov 2024 17:16:28 +0000
Subject: [PATCH 17/42] vgmstream: format with nixfmt-rfc-style

---
 pkgs/by-name/vg/vgmstream/package.nix | 33 +++++++++++++++++++--------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix
index b8e470883ec4..3efe8c3eaec8 100644
--- a/pkgs/by-name/vg/vgmstream/package.nix
+++ b/pkgs/by-name/vg/vgmstream/package.nix
@@ -1,7 +1,19 @@
-{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, gtk3
-, audacious-bare, mpg123, ffmpeg, libvorbis, libao, jansson, speex
-, nix-update-script
-, buildAudaciousPlugin ? false  # only build cli by default, pkgs.audacious-plugins sets this to enable plugin support
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  gtk3,
+  audacious-bare,
+  mpg123,
+  ffmpeg,
+  libvorbis,
+  libao,
+  jansson,
+  speex,
+  nix-update-script,
+  buildAudaciousPlugin ? false, # only build cli by default, pkgs.audacious-plugins sets this to enable plugin support
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +29,10 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = nix-update-script {
     attrPath = "vgmstream";
-    extraArgs = [ "--version-regex" "r(.*)" ];
+    extraArgs = [
+      "--version-regex"
+      "r(.*)"
+    ];
   };
 
   nativeBuildInputs = [
@@ -42,13 +57,13 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     # It always tries to download it, no option to use the system one
     "-DUSE_CELT=OFF"
-  ] ++ lib.optional (! buildAudaciousPlugin) "-DBUILD_AUDACIOUS=OFF";
+  ] ++ lib.optional (!buildAudaciousPlugin) "-DBUILD_AUDACIOUS=OFF";
 
   meta = with lib; {
     description = "Library for playback of various streamed audio formats used in video games";
-    homepage    = "https://vgmstream.org";
+    homepage = "https://vgmstream.org";
     maintainers = with maintainers; [ zane ];
-    license     = with licenses; isc;
-    platforms   = with platforms; unix;
+    license = with licenses; isc;
+    platforms = with platforms; unix;
   };
 }

From d8a95443b41b614e655a15a3bec641cca83932bb Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 25 Nov 2024 17:17:45 +0000
Subject: [PATCH 18/42] audacious-plugins: format with nixfmt-rfc-style

---
 pkgs/applications/audio/audacious/plugins.nix | 93 ++++++++++---------
 1 file changed, 48 insertions(+), 45 deletions(-)

diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix
index 65286b33d593..3012ac0d4f60 100644
--- a/pkgs/applications/audio/audacious/plugins.nix
+++ b/pkgs/applications/audio/audacious/plugins.nix
@@ -1,47 +1,48 @@
-{ stdenv
-, fetchFromGitHub
-, alsa-lib
-, audacious-bare
-, curl
-, faad2
-, ffmpeg
-, flac
-, fluidsynth
-, gdk-pixbuf
-, lame
-, libbs2b
-, libcddb
-, libcdio
-, libcdio-paranoia
-, libcue
-, libjack2
-, libmad
-, libmms
-, libmodplug
-, libmowgli
-, libnotify
-, libogg
-, libopenmpt
-, libpulseaudio
-, libsamplerate
-, libsidplayfp
-, libsndfile
-, libvorbis
-, libxml2
-, lirc
-, meson
-, mpg123
-, neon
-, ninja
-, pkg-config
-, opusfile
-, pipewire
-, qtbase
-, qtmultimedia
-, qtwayland
-, soxr
-, vgmstream
-, wavpack
+{
+  stdenv,
+  fetchFromGitHub,
+  alsa-lib,
+  audacious-bare,
+  curl,
+  faad2,
+  ffmpeg,
+  flac,
+  fluidsynth,
+  gdk-pixbuf,
+  lame,
+  libbs2b,
+  libcddb,
+  libcdio,
+  libcdio-paranoia,
+  libcue,
+  libjack2,
+  libmad,
+  libmms,
+  libmodplug,
+  libmowgli,
+  libnotify,
+  libogg,
+  libopenmpt,
+  libpulseaudio,
+  libsamplerate,
+  libsidplayfp,
+  libsndfile,
+  libvorbis,
+  libxml2,
+  lirc,
+  meson,
+  mpg123,
+  neon,
+  ninja,
+  pkg-config,
+  opusfile,
+  pipewire,
+  qtbase,
+  qtmultimedia,
+  qtwayland,
+  soxr,
+  vgmstream,
+  wavpack,
 }:
 
 stdenv.mkDerivation rec {
@@ -111,7 +112,9 @@ stdenv.mkDerivation rec {
   dontWrapQtApps = true;
 
   postInstall = ''
-    ln -s ${vgmstream.override { buildAudaciousPlugin = true; }}/lib/audacious/Input/* $out/lib/audacious/Input
+    ln -s ${
+      vgmstream.override { buildAudaciousPlugin = true; }
+    }/lib/audacious/Input/* $out/lib/audacious/Input
   '';
 
   meta = audacious-bare.meta // {

From 4637550101bd8b72cd92362ff62829bcc1dfb677 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 25 Nov 2024 17:19:02 +0000
Subject: [PATCH 19/42] audacious-plugins: move to pkgs/by-name

---
 .../0001-Set-plugindir-to-PREFIX-lib-audacious.patch   |  0
 .../au/audacious-plugins/package.nix}                  | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  1 -
 3 files changed, 4 insertions(+), 7 deletions(-)
 rename pkgs/{applications/audio/audacious => by-name/au/audacious-plugins}/0001-Set-plugindir-to-PREFIX-lib-audacious.patch (100%)
 rename pkgs/{applications/audio/audacious/plugins.nix => by-name/au/audacious-plugins/package.nix} (95%)

diff --git a/pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch b/pkgs/by-name/au/audacious-plugins/0001-Set-plugindir-to-PREFIX-lib-audacious.patch
similarity index 100%
rename from pkgs/applications/audio/audacious/0001-Set-plugindir-to-PREFIX-lib-audacious.patch
rename to pkgs/by-name/au/audacious-plugins/0001-Set-plugindir-to-PREFIX-lib-audacious.patch
diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/by-name/au/audacious-plugins/package.nix
similarity index 95%
rename from pkgs/applications/audio/audacious/plugins.nix
rename to pkgs/by-name/au/audacious-plugins/package.nix
index 3012ac0d4f60..5614a0450e04 100644
--- a/pkgs/applications/audio/audacious/plugins.nix
+++ b/pkgs/by-name/au/audacious-plugins/package.nix
@@ -37,9 +37,7 @@
   pkg-config,
   opusfile,
   pipewire,
-  qtbase,
-  qtmultimedia,
-  qtwayland,
+  qt6,
   soxr,
   vgmstream,
   wavpack,
@@ -97,9 +95,9 @@ stdenv.mkDerivation rec {
     neon
     opusfile
     pipewire
-    qtbase
-    qtmultimedia
-    qtwayland
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qtwayland
     soxr
     wavpack
     libopenmpt
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e924eb7f29c..b8fe79febbf7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13384,7 +13384,6 @@ with pkgs;
 
   audacious-bare = audacious.override { audacious-plugins = null; };
   audacious = qt6Packages.callPackage ../applications/audio/audacious { };
-  audacious-plugins = qt6Packages.callPackage ../applications/audio/audacious/plugins.nix { };
 
   av-98 = callPackage ../applications/networking/browsers/av-98 { };
 

From 5a39f9caaabbd519ceb9267ec1133cfe855709b8 Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 25 Nov 2024 17:26:16 +0000
Subject: [PATCH 20/42] audacious: format with nixfmt-rfc-style

---
 pkgs/applications/audio/audacious/default.nix | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index deed9e3684ad..953569575b20 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -1,14 +1,15 @@
-{ lib
-, stdenv
-, audacious-plugins
-, fetchFromGitHub
-, meson
-, ninja
-, pkg-config
-, qtbase
-, qtsvg
-, qtwayland
-, wrapQtAppsHook
+{
+  lib,
+  stdenv,
+  audacious-plugins,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  qtbase,
+  qtsvg,
+  qtwayland,
+  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -50,14 +51,18 @@ stdenv.mkDerivation rec {
     homepage = "https://audacious-media-player.org";
     downloadPage = "https://github.com/audacious-media-player/audacious";
     mainProgram = "audacious";
-    maintainers = with lib.maintainers; [ ramkromberg ttuegel thiagokokada ];
+    maintainers = with lib.maintainers; [
+      ramkromberg
+      ttuegel
+      thiagokokada
+    ];
     platforms = lib.platforms.linux;
     license = with lib.licenses; [
       bsd2
-      bsd3 #https://github.com/audacious-media-player/audacious/blob/master/COPYING
+      bsd3 # https://github.com/audacious-media-player/audacious/blob/master/COPYING
       gpl2
       gpl3
-      lgpl2Plus #http://redmine.audacious-media-player.org/issues/46
+      lgpl2Plus # http://redmine.audacious-media-player.org/issues/46
     ];
   };
 }

From d0b8e7beace045d198d85481ab06d0abbe3a1cca Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 25 Nov 2024 17:26:31 +0000
Subject: [PATCH 21/42] audacious: move to pkgs/by-name

---
 .../au/audacious-bare/package.nix}               | 16 +++++++---------
 pkgs/top-level/all-packages.nix                  |  3 +--
 2 files changed, 8 insertions(+), 11 deletions(-)
 rename pkgs/{applications/audio/audacious/default.nix => by-name/au/audacious-bare/package.nix} (88%)

diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/by-name/au/audacious-bare/package.nix
similarity index 88%
rename from pkgs/applications/audio/audacious/default.nix
rename to pkgs/by-name/au/audacious-bare/package.nix
index 953569575b20..543f213b3826 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/by-name/au/audacious-bare/package.nix
@@ -6,10 +6,8 @@
   meson,
   ninja,
   pkg-config,
-  qtbase,
-  qtsvg,
-  qtwayland,
-  wrapQtAppsHook,
+  qt6,
+  withPlugins ? false,
 }:
 
 stdenv.mkDerivation rec {
@@ -27,13 +25,13 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
-    qtwayland
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qtwayland
   ];
 
   mesonFlags = [
@@ -41,7 +39,7 @@ stdenv.mkDerivation rec {
     "-Dbuildstamp=NixOS"
   ];
 
-  postInstall = lib.optionalString (audacious-plugins != null) ''
+  postInstall = lib.optionalString withPlugins ''
     ln -s ${audacious-plugins}/lib/audacious $out/lib
     ln -s ${audacious-plugins}/share/audacious/Skins $out/share/audacious/
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8fe79febbf7..825110881763 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13382,8 +13382,7 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  audacious-bare = audacious.override { audacious-plugins = null; };
-  audacious = qt6Packages.callPackage ../applications/audio/audacious { };
+  audacious = audacious-bare.override { withPlugins = true; };
 
   av-98 = callPackage ../applications/networking/browsers/av-98 { };
 

From fd66d4ac6813183c3d78f30f8ab353d3dfe35f71 Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Sat, 23 Nov 2024 21:49:33 +0100
Subject: [PATCH 22/42] linuxPackages.nvidiaPackages.production: 550.127.05 ->
 550.135

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index da95074c7b67..a2a1f6e470fc 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -39,12 +39,12 @@ rec {
   stable = if stdenv.hostPlatform.system == "i686-linux" then legacy_390 else latest;
 
   production = generic {
-    version = "550.127.05";
-    sha256_64bit = "sha256-04TzT10qiWvXU20962ptlz2AlKOtSFocLuO/UZIIauk=";
-    sha256_aarch64 = "sha256-3wsGqJvDf8io4qFSqbpafeHHBjbasK5i/W+U6TeEeBY=";
-    openSha256 = "sha256-r0zlWPIuc6suaAk39pzu/tp0M++kY2qF8jklKePhZQQ=";
-    settingsSha256 = "sha256-cUSOTsueqkqYq3Z4/KEnLpTJAryML4Tk7jco/ONsvyg=";
-    persistencedSha256 = "sha256-8nowXrL6CRB3/YcoG1iWeD4OCYbsYKOOPE374qaa4sY=";
+    version = "550.135";
+    sha256_64bit = "sha256-ESBH9WRABWkOdiFBpVtCIZXKa5DvQCSke61MnoGHiKk=";
+    sha256_aarch64 = "sha256-uyBCVhGZ637wv9JAp6Bq0A4e5aQ84jz/5iBgXdPr2FU=";
+    openSha256 = "sha256-426lonLlCk4jahU4waAilYiRUv6bkLMuEpOLkCwcutE=";
+    settingsSha256 = "sha256-4B61Q4CxDqz/BwmDx6EOtuXV/MNJbaZX+hj/Szo1z1Q=";
+    persistencedSha256 = "sha256-FXKOTLbjhoGbO3q6kRuRbHw2pVUkOYTbTX2hyL/az94=";
   };
 
   latest = selectHighestVersion production (generic {

From 5707d4ed640401926aab6729a196eedb76b27ac9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 19:45:12 +0000
Subject: [PATCH 23/42] sqlite3-to-mysql: 2.3.1 -> 2.3.2

---
 pkgs/by-name/sq/sqlite3-to-mysql/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
index b6cb04558341..c0d2126e0af0 100644
--- a/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
+++ b/pkgs/by-name/sq/sqlite3-to-mysql/package.nix
@@ -9,7 +9,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "sqlite3-to-mysql";
-  version = "2.3.1";
+  version = "2.3.2";
   format = "pyproject";
 
   disabled = python3Packages.pythonOlder "3.8";
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
     owner = "techouse";
     repo = "sqlite3-to-mysql";
     rev = "refs/tags/v${version}";
-    hash = "sha256-13NLtP9gDd9hrwY09+7CuM4Rl+Hce82TETdfwBC/5HI=";
+    hash = "sha256-2zylVnPlptPCxUFwU9j9g//T5fzPJgXc3hQc6iMoLLE=";
   };
 
   build-system = with python3Packages; [

From 452ecaa89c31e86f3e9c12c17258c64863c86b67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 19:56:09 +0000
Subject: [PATCH 24/42] diesel-cli: 2.2.4 -> 2.2.5

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

diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index 04f610061599..b4f721c5305d 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.2.4";
+  version = "2.2.5";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-kTwAG1B4gy+1jj5ar5RkmIUMAO9wYsG7QnMcZii/OZk=";
+    hash = "sha256-cMGSBZ2UexIvSWRI2LIXR7thKciM9+HTB4V8FWpP3ZU=";
   };
 
-  cargoHash = "sha256-qcyNFuKJldHVJDAye4K1rHPf/SvpZ+BmqBast1vh/3Q=";
+  cargoHash = "sha256-Qdi9zdBiaAWS0Ao/8Z1jrb07FLE92ETd7RCMd/7J+mI=";
 
   nativeBuildInputs = [
     installShellFiles

From 075597b340f937b082561e8d796170614fbd7c3c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 14 Mar 2024 23:53:56 +0000
Subject: [PATCH 25/42] stdenv: don't discard string context from
 ContentAddressed derivations

Without the change build for packages that use `disallowedReferences`
fails in `contentAddressedByDefault = true` mode:

    $ nix build -f. ruby_3_1 --arg config '{ contentAddressedByDefault = true; }'
    ...
    error: derivation contains an illegal reference specifier '/0j3hif3ni7zl5zhlzzr5q2q23z66136mnzp75pyiqp5c72q14im2'
    error: 1 dependencies of derivation '/nix/store/39ji7qp225pxvrm8cgvzmyjqsyis2n0h-ruby-3.1.2.drv' failed to build

Original intent of https://github.com/NixOS/nixpkgs/pull/211783 was to
avoid pulling in actual derivation for reference scanning purposes.

Unfortunately CA derivations's outputPath are placeholders until they
are instantiated.

Let's restore string context for CA derivations for now.
---
 pkgs/stdenv/generic/make-derivation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index d4d5ee46638a..ca878fe1032d 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -139,7 +139,7 @@ let
   # Turn a derivation into its outPath without a string context attached.
   # See the comment at the usage site.
   unsafeDerivationToUntrackedOutpath = drv:
-    if isDerivation drv
+    if isDerivation drv && (!drv.__contentAddressed or false)
     then builtins.unsafeDiscardStringContext drv.outPath
     else drv;
 

From f0d9bf64cd2f319ee9eee6d3b732e4c216fe56dd Mon Sep 17 00:00:00 2001
From: Lan Tian <xuyh0120@outlook.com>
Date: Sun, 24 Nov 2024 23:42:23 -0800
Subject: [PATCH 26/42] llama-cpp: 3887 -> 4154

---
 pkgs/by-name/ll/llama-cpp/package.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index d9e5f3096a73..a6db3cfce3b5 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -69,13 +69,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "3887";
+  version = "4154";
 
   src = fetchFromGitHub {
     owner = "ggerganov";
     repo = "llama.cpp";
     rev = "refs/tags/b${finalAttrs.version}";
-    hash = "sha256-uyZ/uyuLzXAeZ8TQK8e6+zf+ZTFRSJJ1Doqw8Cd10+A=";
+    hash = "sha256-rttgk8mF9s3R53+TN5+PdDtkTG5cohn/9wz9Z5gRpdM=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -84,8 +84,16 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   };
 
   postPatch = ''
-    substituteInPlace ./ggml/src/ggml-metal.m \
-      --replace-fail '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";"
+    # Workaround for local-ai package which overrides this package to an older llama-cpp
+    if [ -f ./ggml/src/ggml-metal.m ]; then
+      substituteInPlace ./ggml/src/ggml-metal.m \
+        --replace-fail '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";"
+    fi
+
+    if [ -f ./ggml/src/ggml-metal/ggml-metal.m ]; then
+      substituteInPlace ./ggml/src/ggml-metal/ggml-metal.m \
+        --replace-fail '[bundle pathForResource:@"ggml-metal" ofType:@"metal"];' "@\"$out/bin/ggml-metal.metal\";"
+    fi
 
     substituteInPlace ./scripts/build-info.sh \
       --replace-fail 'build_number="0"' 'build_number="${finalAttrs.version}"' \
@@ -160,7 +168,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/ggerganov/llama.cpp/";
     license = licenses.mit;
     mainProgram = "llama";
-    maintainers = with maintainers; [ dit7ya elohmeier philiptaron ];
+    maintainers = with maintainers; [ dit7ya elohmeier philiptaron xddxdd ];
     platforms = platforms.unix;
     badPlatforms = optionals (cudaSupport || openclSupport) lib.platforms.darwin;
     broken = (metalSupport && !effectiveStdenv.hostPlatform.isDarwin);

From 5422cafbb3430ed4a8734e3d473fc3a19c545088 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 09:42:55 +0000
Subject: [PATCH 27/42] python312Packages.pbs-installer: 2024.10.08 ->
 2024.10.16

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

diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix
index 576ec488241c..caecd0c76e3d 100644
--- a/pkgs/development/python-modules/pbs-installer/default.nix
+++ b/pkgs/development/python-modules/pbs-installer/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pbs-installer";
-  version = "2024.10.08";
+  version = "2024.10.16";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "frostming";
     repo = "pbs-installer";
     rev = "refs/tags/${version}";
-    hash = "sha256-fftrY1r84o9Vj9Hw18WYItGRRjgKarF1tXmDV2tERXQ=";
+    hash = "sha256-rMj0zKqfYvOvKZVNoZxOULaXyzjiMfBN49M+Z3+SAaM=";
   };
 
   build-system = [ pdm-backend ];

From 0766e2152f66fe3d108ae921c2a5f38eb30f6679 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 11:02:53 +0000
Subject: [PATCH 28/42] rasm: 2.2.8 -> 2.2.11

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

diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix
index acbe1ebeaa21..e2161bb06506 100644
--- a/pkgs/by-name/ra/rasm/package.nix
+++ b/pkgs/by-name/ra/rasm/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rasm";
-  version = "2.2.8";
+  version = "2.2.11";
 
   src = fetchFromGitHub {
     owner = "EdouardBERGE";
     repo = "rasm";
     rev = "v${version}";
-    hash = "sha256-L3kVwB6ZGw8HGqn2m60Grd3fwpTeRK8LeMtmNb4UjdQ=";
+    hash = "sha256-wFdRMWnOZ3gVp9RwTwD1bJEKVJ9khPRSQoCi75/YiPM=";
   };
 
   # by default the EXEC variable contains `rasm.exe`

From a0883dea63ca5e4144d5ace61b2e6c0109d8d024 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 12:40:12 +0100
Subject: [PATCH 29/42] python312Packages.garminconnect: 0.2.20 -> 0.2.21

Diff: https://github.com/cyberjunky/python-garminconnect/compare/refs/tags/0.2.20...0.2.21

Changelog: https://github.com/cyberjunky/python-garminconnect/releases/tag/0.2.21
---
 pkgs/development/python-modules/garminconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix
index 0ea4c8d2cfcd..e4d5c3fba533 100644
--- a/pkgs/development/python-modules/garminconnect/default.nix
+++ b/pkgs/development/python-modules/garminconnect/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "garminconnect";
-  version = "0.2.20";
+  version = "0.2.21";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "cyberjunky";
     repo = "python-garminconnect";
     rev = "refs/tags/${version}";
-    hash = "sha256-PFasW2rOfKwAjkqd690UXE3NNIjO3njBVYy5m+aXcfk=";
+    hash = "sha256-sSprHu6VCa+VRipmSX/YcfyTe5dKHhNkxmbO9hzNYq8=";
   };
 
   build-system = [ pdm-backend ];

From 9b7a3c3ef4b006264f7c77e5d41c7cddf7cdf93f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 12:41:04 +0100
Subject: [PATCH 30/42] python312Packages.lacuscore: 1.12.3 -> 1.12.5

Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.12.3...v1.12.5

Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.12.5
---
 pkgs/development/python-modules/lacuscore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index 1cd4707a421d..46fd51edf6ab 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "lacuscore";
-  version = "1.12.3";
+  version = "1.12.5";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "ail-project";
     repo = "LacusCore";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cKAHNOZZtIdys0z36F0ORf6xXL/JkAgwZouvYYu/OTU=";
+    hash = "sha256-iozCgQ7VULQVlKaHmThxiFDZ2hly2yYMdIrXBFHFRfI=";
   };
 
   pythonRelaxDeps = [

From 119e7b496f83e5be68ae3095f29854f98ac90b07 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 12:45:49 +0100
Subject: [PATCH 31/42] python312Packages.tencentcloud-sdk-python: 3.0.1271 ->
 3.0.1272

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1271...3.0.1272

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1272/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 3369170b2562..e1a505704dba 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1271";
+  version = "3.0.1272";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-kXkn9RhQm6EPS3MABe413xKv+ldKOT6EBs6qo4fMacY=";
+    hash = "sha256-J6W4czmoxxdEudKoeqEH57vNBb2fEyqYU2LAiYTBq40=";
   };
 
   build-system = [ setuptools ];

From 5818ad941f938ab050fba0a0d9f47e50691ed381 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 12:46:43 +0100
Subject: [PATCH 32/42] python312Packages.mypy-boto3-directconnect: 1.35.0 ->
 1.35.69

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d3f3c16ffd36..62e7cfc2a9a5 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -402,8 +402,8 @@ rec {
       "sha256-KOvVP0ttOXBxmDF05GPRNvr2fKUc6+qJz3Pw53oAI+o=";
 
   mypy-boto3-directconnect =
-    buildMypyBoto3Package "directconnect" "1.35.0"
-      "sha256-HCSark4bQG673j5KZ1ZULwNiOBk/cichkGwuH1XNAPk=";
+    buildMypyBoto3Package "directconnect" "1.35.69"
+      "sha256-GD1z4qFr5lhUUM74z3hC9iRFfJUpQkGEEyA/dq3G/1c=";
 
   mypy-boto3-discovery =
     buildMypyBoto3Package "discovery" "1.35.66"

From ef1f077b34cec0caac6a359c53bf3fe5d280c440 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 12:47:31 +0100
Subject: [PATCH 33/42] python312Packages.mypy-boto3-networkmanager: 1.35.0 ->
 1.35.69

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 62e7cfc2a9a5..0701e49639cd 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -954,8 +954,8 @@ rec {
       "sha256-i4h13QqDO65bSTlxdt5hN6iXag578jc3Mv7bOHBZkpQ=";
 
   mypy-boto3-networkmanager =
-    buildMypyBoto3Package "networkmanager" "1.35.0"
-      "sha256-z1YOK7DoyTEWnaWJ8x8VKZNETw/7jPXBjmN4ZX7m5E0=";
+    buildMypyBoto3Package "networkmanager" "1.35.69"
+      "sha256-zTWtchusIiyp5CLz2kEeKrLVueg5Par92sufw0EM5mM=";
 
   mypy-boto3-nimble =
     buildMypyBoto3Package "nimble" "1.35.0"

From eb7a59d06724459b2ac09835e5998273de9960f3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 12:47:48 +0100
Subject: [PATCH 34/42] python312Packages.mypy-boto3-s3: 1.35.67 -> 1.35.69

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0701e49639cd..86fe8a0c206f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1162,8 +1162,8 @@ rec {
       "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw=";
 
   mypy-boto3-s3 =
-    buildMypyBoto3Package "s3" "1.35.67"
-      "sha256-rtfS6OOE1A59exAxKTtPma2U7y6qGrx8GqBgqZlu6Zs=";
+    buildMypyBoto3Package "s3" "1.35.69"
+      "sha256-l/eUSoSkpJKCglvvFIOiVoDc3OddpgF3RdcJ0s8qocA=";
 
   mypy-boto3-s3control =
     buildMypyBoto3Package "s3control" "1.35.55"

From c582905e5a5e5788c8e3101aaee4925045c1b774 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 12:51:23 +0100
Subject: [PATCH 35/42] python312Packages.pygitguardian: 1.17.0 -> 1.18.0

Diff: https://github.com/GitGuardian/py-gitguardian/compare/refs/tags/v1.17.0...v1.18.0

Changelog: https://github.com/GitGuardian/py-gitguardian/blob/v1.18.0/CHANGELOG.md
---
 pkgs/development/python-modules/pygitguardian/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix
index 1bd193e0cc32..d3b014a3f81f 100644
--- a/pkgs/development/python-modules/pygitguardian/default.nix
+++ b/pkgs/development/python-modules/pygitguardian/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pygitguardian";
-  version = "1.17.0";
+  version = "1.18.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "GitGuardian";
     repo = "py-gitguardian";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+L0rF5wy4iL/6nPdLSXwYazxsobH2G3pCATrqYe9B6U=";
+    hash = "sha256-4qMcBtelLiqLXKV8YIw9M6e97Nbo/K8UpsKoR0W7uKM=";
   };
 
   pythonRelaxDeps = [
@@ -55,6 +55,7 @@ buildPythonPackage rec {
 
   disabledTests = [
     # Tests require an API key
+    "test_api_tokens"
     "test_bogus_rate_limit"
     "test_compute_sca_files"
     "test_content_scan_exceptions"
@@ -76,6 +77,7 @@ buildPythonPackage rec {
     "test_sca_scan_all_with_params"
     "test_sca_scan_directory_invalid_tar"
     "test_sca_scan_directory"
+    "test_scan"
     "test_versions_from_headers"
   ];
 

From d594f57f09cd00dce7bb882af0fde049905eb202 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 12:53:12 +0100
Subject: [PATCH 36/42] python312Packages.teslajsonpy: 3.12.2 -> 3.12.3

Diff: https://github.com/zabuldon/teslajsonpy/compare/refs/tags/v3.12.2...v3.12.3

Changelog: https://github.com/zabuldon/teslajsonpy/releases/tag/v3.12.3
---
 pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix
index 870e88e426fd..33c304847a93 100644
--- a/pkgs/development/python-modules/teslajsonpy/default.nix
+++ b/pkgs/development/python-modules/teslajsonpy/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "teslajsonpy";
-  version = "3.12.2";
+  version = "3.12.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "zabuldon";
     repo = "teslajsonpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-chUW7aa99KzYyn8qVDX4GK8eI8MoP8+TKRx9PI+0ZKE=";
+    hash = "sha256-LvkStE5iIDfJ6U939JkVWqNsPLojGBXM/TFiJZpZ8tA=";
   };
 
   build-system = [ poetry-core ];

From 9458f0618b4e61b41b2e9f65fe5e1c14816c9b0c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 26 Nov 2024 16:24:24 +0300
Subject: [PATCH 37/42] kdePackages: Plasma 6.2.3 -> 6.2.4

---
 pkgs/kde/generated/sources/plasma.json    | 396 +++++++++++-----------
 pkgs/kde/plasma/plasma-mobile/default.nix |   6 +-
 2 files changed, 203 insertions(+), 199 deletions(-)

diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index 13f3379e4ced..32469681630c 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,332 +1,332 @@
 {
   "bluedevil": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/bluedevil-6.2.3.tar.xz",
-    "hash": "sha256-gEC21kiD8wDksAm6ZiRDy0a36iaupxJ7ciNq56Pxkbs="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/bluedevil-6.2.4.tar.xz",
+    "hash": "sha256-5mSo3RvlVwNWki7IV4vZGi24ZlamdsHIbbnDzv2+ogI="
   },
   "breeze": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/breeze-6.2.3.tar.xz",
-    "hash": "sha256-UIzt2XlqS7LjwRWi9VZxnW5iYDIGRjR2OXkpUE+hGqQ="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/breeze-6.2.4.tar.xz",
+    "hash": "sha256-TZYTiWCC8zZBOrsk74+NhlE/fpmkwLzfL0XNfFu9fCA="
   },
   "breeze-grub": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/breeze-grub-6.2.3.tar.xz",
-    "hash": "sha256-n+Iw30bEqVEnlboP1l7z0ygee2owmWdqY4s20YGVRLE="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/breeze-grub-6.2.4.tar.xz",
+    "hash": "sha256-gUbx1po18gP1XIZXwzlVkvEiEU+8yXV8/NJXukRQrIs="
   },
   "breeze-gtk": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/breeze-gtk-6.2.3.tar.xz",
-    "hash": "sha256-PFmy9gWbZmHvH+t05ZrTBbrTkdaSsw19Ox4NkcQSxqE="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/breeze-gtk-6.2.4.tar.xz",
+    "hash": "sha256-YQwk1Ghr4IqSM3UWtn6fCcfjZd3cPgKXbSSvNkIzvKA="
   },
   "breeze-plymouth": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/breeze-plymouth-6.2.3.tar.xz",
-    "hash": "sha256-hRaoLZYQR0am8zmPPx8VsCkVxEbuG/10Tj9wu82lFiI="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/breeze-plymouth-6.2.4.tar.xz",
+    "hash": "sha256-IaISI1lhDkM6NiCDYKt4NL/JHHIixqHV7d2ZI9yyDtw="
   },
   "discover": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/discover-6.2.3.tar.xz",
-    "hash": "sha256-bfLedenei/y6Va7noc64278PqzsBilkYP7yvurL7Iso="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/discover-6.2.4.tar.xz",
+    "hash": "sha256-YZqKgGcPUtALvmfa6iLR2w18m0S1eGXclyVYBhutFCc="
   },
   "drkonqi": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/drkonqi-6.2.3.tar.xz",
-    "hash": "sha256-3BTgxUiF6An59uKCUyrqFX+Qo39CjVTy9ws3WaONJeY="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/drkonqi-6.2.4.tar.xz",
+    "hash": "sha256-qXCmXNwUaQWKfMZS3SzM0NazAq6QapMgjTXYINtXMtg="
   },
   "flatpak-kcm": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/flatpak-kcm-6.2.3.tar.xz",
-    "hash": "sha256-bFR+SoX2t4t2KuYNWekZiwFO3w3+wdozW8tiN/z3hrc="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/flatpak-kcm-6.2.4.tar.xz",
+    "hash": "sha256-EPiyGLMv1NCDexfov4duE2ZgR8k4+6I9d730CcOyPoM="
   },
   "kactivitymanagerd": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kactivitymanagerd-6.2.3.tar.xz",
-    "hash": "sha256-Sr769igaR1VTJ2kucSCqY1MlzCCuhofOues647AtDYI="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kactivitymanagerd-6.2.4.tar.xz",
+    "hash": "sha256-F2csZVAMcx7rPENknPUuyuEVrf0ZQsJFmQVezj5KkNo="
   },
   "kde-cli-tools": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kde-cli-tools-6.2.3.tar.xz",
-    "hash": "sha256-TFffe8/SHmnFaF1yezqi5Ci9/uG5kB6PHYeiFdEm8vM="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kde-cli-tools-6.2.4.tar.xz",
+    "hash": "sha256-EXrLp9aABuApn9aBKLb+VIWekg4OOKTzlJmKuIER2ec="
   },
   "kdecoration": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kdecoration-6.2.3.tar.xz",
-    "hash": "sha256-SWN3JuDDR2dPKgJIQI5MXrN7XjX5nhE0O3M4uMNYwGM="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kdecoration-6.2.4.tar.xz",
+    "hash": "sha256-rGRbTVgtEQJYaUqeLqK/Zfu9S9WOnen5NUeGOXvE9xo="
   },
   "kde-gtk-config": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kde-gtk-config-6.2.3.tar.xz",
-    "hash": "sha256-LpiFDJiJw6jsd2ebiHMwWeorGC6lbIK3BxO2Zz7ljL4="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kde-gtk-config-6.2.4.tar.xz",
+    "hash": "sha256-6AGhYuhZdmGCvM/S1KvXCT273pUYPidq1N6BkhUeVkU="
   },
   "kdeplasma-addons": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kdeplasma-addons-6.2.3.tar.xz",
-    "hash": "sha256-fG/qKMQHxnz2dGA4T0cgFN20dpQGPEWgju/9P8Ox8Pk="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kdeplasma-addons-6.2.4.tar.xz",
+    "hash": "sha256-0JnCk13XTrL0mWOHG34m+FS+QOTXdz/Jodash5/Rb5E="
   },
   "kgamma": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kgamma-6.2.3.tar.xz",
-    "hash": "sha256-1afemiTvMQXT87HrIIMg5Ip8D1dVKxb8FuaHGmMJOgQ="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kgamma-6.2.4.tar.xz",
+    "hash": "sha256-c6dF/GbNFOqm4TNQw4aDpQRRJYh6GPRh6ytk5Q5qGSI="
   },
   "kglobalacceld": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kglobalacceld-6.2.3.tar.xz",
-    "hash": "sha256-2ey5OT8arFqnR6JBimjfevOm/uDZt1azqbTJfTq23qg="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kglobalacceld-6.2.4.tar.xz",
+    "hash": "sha256-0ikE4sg0LbzPeoGX0mDMDff17KWuZZq4ExVXPbgNNno="
   },
   "kinfocenter": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kinfocenter-6.2.3.tar.xz",
-    "hash": "sha256-iX7RKqxUv5zNw966VJAJ3Ug6sRF4OaOC6/AioemszKA="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kinfocenter-6.2.4.tar.xz",
+    "hash": "sha256-a92mBn9tEVaiWKQ6Vtc0EmIP8iSwZAs+pCSt8SIwO6I="
   },
   "kmenuedit": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kmenuedit-6.2.3.tar.xz",
-    "hash": "sha256-GvvsMPW8q/oHlzmlwGuR4OTsr/uh1pUpaauo9EuiDEk="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kmenuedit-6.2.4.tar.xz",
+    "hash": "sha256-F09b+xdGQre3JEXylNQQz6zK9lczUMFK9xHkjchWrfk="
   },
   "kpipewire": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kpipewire-6.2.3.tar.xz",
-    "hash": "sha256-u0c/FbTU9ZR5y7q6bveB2bxIgTuXw17fs5gtCsjwMPc="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kpipewire-6.2.4.tar.xz",
+    "hash": "sha256-duRWIGqfbpIssQYUR2oZaC+MJ5V8XImY8dGg2tuUyms="
   },
   "krdp": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/krdp-6.2.3.tar.xz",
-    "hash": "sha256-EffDMZqetNm2s9VN2L605ozIF4jgE4Nc5rJ2U7Kvx+Q="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/krdp-6.2.4.tar.xz",
+    "hash": "sha256-9iKdH3zPzjTXLmVl2LTL3HbvNXmHlM0u0llPca6DV7s="
   },
   "kscreen": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kscreen-6.2.3.tar.xz",
-    "hash": "sha256-comxlZ7iZxV/m2z+eP1/+uGBM8pqlJ9ILSJRVZu5OWk="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kscreen-6.2.4.tar.xz",
+    "hash": "sha256-P2YMmOaYtTqU6rdfVd1W4q/y3HrjTIvmmHVGZZnnsAI="
   },
   "kscreenlocker": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kscreenlocker-6.2.3.tar.xz",
-    "hash": "sha256-FDjIvb2OCY7MWg9togXm+uUlQB2c8T0nn1X69xPR5U8="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kscreenlocker-6.2.4.tar.xz",
+    "hash": "sha256-Ep0Qw4kiIhaNu/gM29qBCtBiwm3lH3y8JZDmVfVTyxY="
   },
   "ksshaskpass": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/ksshaskpass-6.2.3.tar.xz",
-    "hash": "sha256-GHIZheT2KKnSo8qIxqxB+lLZktEpvcbN3n1BQLIbkBs="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/ksshaskpass-6.2.4.tar.xz",
+    "hash": "sha256-PdkdLhg+9eISmBvSYzkZidKrb8kk+TVROKurB/LKv78="
   },
   "ksystemstats": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/ksystemstats-6.2.3.tar.xz",
-    "hash": "sha256-W9Q6H9vwjElVTbIrkZdrGYQSpeAA4QnQEHW9JeYGFBo="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/ksystemstats-6.2.4.tar.xz",
+    "hash": "sha256-SalO8F5qsOjw/1onIZTzTYpNVy/nn8q2XJbqLsFGDEM="
   },
   "kwallet-pam": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kwallet-pam-6.2.3.tar.xz",
-    "hash": "sha256-rETUciK0QNFM34ZimQ7NzleOj2VHXvZ1mkx7nVhRSe4="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kwallet-pam-6.2.4.tar.xz",
+    "hash": "sha256-CwShwte6T9wgoHY3J6XNQ2ItKHRSPdn9gzuRLBEB1eM="
   },
   "kwayland": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kwayland-6.2.3.tar.xz",
-    "hash": "sha256-D9U50EKDh6TyT/qsyh0qUUEtTCrcQRltDt6VZQK7L9w="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kwayland-6.2.4.tar.xz",
+    "hash": "sha256-9P5pl4+OmwxABYAZeC8Tv913DPVF2TJaezeIJvDNNKw="
   },
   "kwayland-integration": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kwayland-integration-6.2.3.tar.xz",
-    "hash": "sha256-9QDDA2QmuqcPlO6zgIfMobEE8ct8KsJAZRuolt6hTC8="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kwayland-integration-6.2.4.tar.xz",
+    "hash": "sha256-NH+TvNhLkNvMIhGMHYl/T3zWhmTA6H9rhm1SQABv4js="
   },
   "kwin": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kwin-6.2.3.tar.xz",
-    "hash": "sha256-66IKOVKZryNY/guh1iFsAEgOzdzJ1EUvd/emDB548QE="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kwin-6.2.4.tar.xz",
+    "hash": "sha256-1LeOvclDLLHiJGIaxDz7gbktvO4DSv6Qu+tbIvIY8yE="
   },
   "kwrited": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/kwrited-6.2.3.tar.xz",
-    "hash": "sha256-fwL3PyQQmse8DuYbYa/9ztoYxh8OkWikPG/BHqbnYb4="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/kwrited-6.2.4.tar.xz",
+    "hash": "sha256-VbZkMQ2Y0uJtMEh49qLn3BWsMrlBB2rmozkeBJw+m2Y="
   },
   "layer-shell-qt": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/layer-shell-qt-6.2.3.tar.xz",
-    "hash": "sha256-AJQf7fxUIPZda+JHBLXMLwf1lx9bfAAUVmjO3HNlHhw="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/layer-shell-qt-6.2.4.tar.xz",
+    "hash": "sha256-ABiXp9SZGp6VvnMVLZUTZizH2KUyEXAtkG1Ze3PO2HI="
   },
   "libkscreen": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/libkscreen-6.2.3.tar.xz",
-    "hash": "sha256-p54GdZRLS2lxPobyz+PJd3V9RPJPGT8xGqVC6TgvIjg="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/libkscreen-6.2.4.tar.xz",
+    "hash": "sha256-PMBtXFYatNvtvFSKRlURnoYcSsKeVl/1hGJz8MdunLQ="
   },
   "libksysguard": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/libksysguard-6.2.3.tar.xz",
-    "hash": "sha256-rnsVfcys/oVw1UlOBQWKI5hg5fArjcs6O5IpSNo5CTU="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/libksysguard-6.2.4.tar.xz",
+    "hash": "sha256-95n5Dv07Pg6hexlpuwzFdEx3YuoW0SixtNMd+njMWK4="
   },
   "libplasma": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/libplasma-6.2.3.tar.xz",
-    "hash": "sha256-LoXzJFwQuAyEGYXER5+o9F+I9K8BprgFP9C324qcWO4="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/libplasma-6.2.4.tar.xz",
+    "hash": "sha256-Zu2hRftX3MWF25f9flQ/LN/HRc64PBbL49CAk59bGxQ="
   },
   "milou": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/milou-6.2.3.tar.xz",
-    "hash": "sha256-NxGG3iA+a1KNm12ZytfsPNXvXme9qWJNBsQ4WvMpAlc="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/milou-6.2.4.tar.xz",
+    "hash": "sha256-tHpjWQSneqgvsC2WoCYQAMyV2gHQdJjqnynUwHQ3dfk="
   },
   "ocean-sound-theme": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/ocean-sound-theme-6.2.3.tar.xz",
-    "hash": "sha256-7OsnYhVDzcGCQFHZw0DqAwOK/Iv0XBD+7ozd1ayIB9E="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/ocean-sound-theme-6.2.4.tar.xz",
+    "hash": "sha256-e1SSq62KddJC54g5XNoFTez8hdD/IhvOBbkkUY8WMAo="
   },
   "oxygen": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/oxygen-6.2.3.tar.xz",
-    "hash": "sha256-LYdUmyVz4bDeDbFRFnubi+kEZ3+zUdAbU4e42ZX+z78="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/oxygen-6.2.4.tar.xz",
+    "hash": "sha256-hmpYvaPzYfKweMRHuViFudOQXYCyhUVIYRk9PoY6FFI="
   },
   "oxygen-sounds": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/oxygen-sounds-6.2.3.tar.xz",
-    "hash": "sha256-pslNLDH05ZBBJBAgKcGFYO402CG+nVkn/W9AHKWxDmk="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/oxygen-sounds-6.2.4.tar.xz",
+    "hash": "sha256-eWe8OSAwNyWq4bVwAfIZKwaiUIT787joRfXwUaViWN4="
   },
   "plasma5support": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma5support-6.2.3.tar.xz",
-    "hash": "sha256-xO7Ntf5SqWkojGPDVFAZqy0u9AS1UtcZ5g/6djFm8K0="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma5support-6.2.4.tar.xz",
+    "hash": "sha256-Izu9w/HAuKy7cQ9TxjCDWcMVtpmVj2eEs0Z/RyT5PY0="
   },
   "plasma-activities": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-activities-6.2.3.tar.xz",
-    "hash": "sha256-pi741F3rk0wBf6q806use2rfPHrUeRltOw+H832ziEc="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-activities-6.2.4.tar.xz",
+    "hash": "sha256-fJddJCHmeS6MPMpfImEdrFX0Th7IZI35dxLwDLuQfMs="
   },
   "plasma-activities-stats": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-activities-stats-6.2.3.tar.xz",
-    "hash": "sha256-W+1GyGD1NwjT3mgw9M1VRHINGFHAB0ESPohR7i2+fvs="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-activities-stats-6.2.4.tar.xz",
+    "hash": "sha256-wicYULV7DaboTmEEnD3W1gJE5HSCJFZyqcIg3r8EzLs="
   },
   "plasma-browser-integration": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-browser-integration-6.2.3.tar.xz",
-    "hash": "sha256-/s5wowbUOiFfN8lHbYMY1bPbBQZSmcylmGE60CCMNPA="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-browser-integration-6.2.4.tar.xz",
+    "hash": "sha256-UEvhuwyyKxoTwLdHE1FnL7o6Rr3I5XJNS6QBPo8tY80="
   },
   "plasma-desktop": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-desktop-6.2.3.tar.xz",
-    "hash": "sha256-Yh7xjmXXU3gyCIHAxdSGbzkDILCyq6/ryzPXVGFoYyo="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-desktop-6.2.4.tar.xz",
+    "hash": "sha256-gfKrQM3sMykYyQsbcyq7KqDAUChU5IuPoG+4K1KSTaM="
   },
   "plasma-dialer": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-dialer-6.2.3.tar.xz",
-    "hash": "sha256-Ukz0HUt7SK7GenW1DvCxSH2lIdWfyHXpP4gCmIEbUCE="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-dialer-6.2.4.tar.xz",
+    "hash": "sha256-sdHANPIayXww+bEsnJmPzaJk02cn0v1GSU5lWuecgWc="
   },
   "plasma-disks": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-disks-6.2.3.tar.xz",
-    "hash": "sha256-tFtEm6azlXcsPkHrKx8c4XH0+KMFKenshhMUGk9IHLo="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-disks-6.2.4.tar.xz",
+    "hash": "sha256-cysnzgdv3/7LAbVRhNSVfoWSFhdk5XmDXVnlz/XnJGo="
   },
   "plasma-firewall": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-firewall-6.2.3.tar.xz",
-    "hash": "sha256-x7oY5/3Q7XK8Bq5YJengVpl42Nf6XU4j/pkL6BYyZ/4="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-firewall-6.2.4.tar.xz",
+    "hash": "sha256-mrcISNBhbwjk8nuzHCN0aqNdgA2bdIKR6qB43RmZPVU="
   },
   "plasma-integration": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-integration-6.2.3.tar.xz",
-    "hash": "sha256-v0Pkku9BneHnHLLcr/yWeT1FTAjz0v5LGg/tqqnMu30="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-integration-6.2.4.tar.xz",
+    "hash": "sha256-jT2bAirvQRo2qtpWSTGq1OyB34uO9uP0CR42JSIpXMc="
   },
   "plasma-mobile": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-mobile-6.2.3.tar.xz",
-    "hash": "sha256-Mma10wHNmF/2zaIEZm81m5iWsHeaL+B4Z8RPRRQFMkQ="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-mobile-6.2.4.tar.xz",
+    "hash": "sha256-7RmOzJAr3Ow9Zr8ePWBCFFDsP13qdLE5WqaifR7uoK8="
   },
   "plasma-nano": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-nano-6.2.3.tar.xz",
-    "hash": "sha256-oJX9nChafpuPR803tOAJ3NY7GuBMCovWYcx4RmpVOSc="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-nano-6.2.4.tar.xz",
+    "hash": "sha256-X29HKQk7mLclZADJD2m+qgOZ/Qnq3RSN4BBFTYo4WiE="
   },
   "plasma-nm": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-nm-6.2.3.tar.xz",
-    "hash": "sha256-EDhCnLa135e4rudXceBR04E+rbvEgPK08j8iXRHtnHs="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-nm-6.2.4.tar.xz",
+    "hash": "sha256-9DY/MnzNdX+wE91L8pkqN6WNtrZifPLQEPMNWvr9gyo="
   },
   "plasma-pa": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-pa-6.2.3.tar.xz",
-    "hash": "sha256-AOyBDMJYzDjYYC9Tc753PBJHT73vSjyi/ZageOjpOxE="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-pa-6.2.4.tar.xz",
+    "hash": "sha256-J2V1s4HCYIAnmlrPh69kJQJtLuvhqQZQc4P18J5oGlc="
   },
   "plasma-sdk": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-sdk-6.2.3.tar.xz",
-    "hash": "sha256-8r7AyQAargJ2AXu792WSVkPCohEqvBd1U60cSosX0t0="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-sdk-6.2.4.tar.xz",
+    "hash": "sha256-V29qp1HZ0s9mzfCVYs6G7QLLv3PlrlzL0G4B+BY7iHg="
   },
   "plasma-systemmonitor": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-systemmonitor-6.2.3.tar.xz",
-    "hash": "sha256-EtnGmNN1NcHExovtFejaE9fqRjb6DJSf7dIsOI63P7w="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-systemmonitor-6.2.4.tar.xz",
+    "hash": "sha256-R5a1pXH/Q5b9R1WxsJCyfCP6WWuHFcMs5KAxXRLIBkw="
   },
   "plasma-thunderbolt": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-thunderbolt-6.2.3.tar.xz",
-    "hash": "sha256-yxsJTEr7U1zKFKmPMVktm05Si3he+xmHMTsHp2xN2cA="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-thunderbolt-6.2.4.tar.xz",
+    "hash": "sha256-xDXVALHA+iwYSFGtPqIFzWBlGgqqoxqeb82I4K7vtnA="
   },
   "plasma-vault": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-vault-6.2.3.tar.xz",
-    "hash": "sha256-5/uDsikjQ8xUR7eCYXEzDqcnsPRBORTz9U5tLCgfUVQ="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-vault-6.2.4.tar.xz",
+    "hash": "sha256-ypk008ov5VYzxCkwIGj4F3i/SmLiIFnuK2qglQ6WhsM="
   },
   "plasma-welcome": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-welcome-6.2.3.tar.xz",
-    "hash": "sha256-poSSmGAHkG4GEU3acvLTAVcGGZHBryd0PtaWlKi8698="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-welcome-6.2.4.tar.xz",
+    "hash": "sha256-2QnEefl0eZZCMv2h+AsFOlTDp0jlEnwhG5OHB2LmtlM="
   },
   "plasma-workspace": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-workspace-6.2.3.tar.xz",
-    "hash": "sha256-n2gAe83KcBV9k/ocHpJb/9h7IdK3EAXSpQ+KbyfdWZg="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-workspace-6.2.4.tar.xz",
+    "hash": "sha256-Mqo72inXt2p9rn4fjJeJz+f2CeuHjhp5PbSxSQyjwXQ="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plasma-workspace-wallpapers-6.2.3.tar.xz",
-    "hash": "sha256-pvYf0CsneYc9TTXewFiHwV7NUdo0vLHLoS5ivnsUOrE="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plasma-workspace-wallpapers-6.2.4.tar.xz",
+    "hash": "sha256-63qSncfSVIsO59d3N/sPLrV1cfgjXjmM4bM+kuivqls="
   },
   "plymouth-kcm": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/plymouth-kcm-6.2.3.tar.xz",
-    "hash": "sha256-oRuXDjHyrbr/jHWm9UiCqdlQXJgzPh1aS/hVSnf/QNc="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/plymouth-kcm-6.2.4.tar.xz",
+    "hash": "sha256-KfzAFFAn7WHFgelog49vaCtVWwuo4ODtNtmupZ2ZoX0="
   },
   "polkit-kde-agent-1": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/polkit-kde-agent-1-6.2.3.tar.xz",
-    "hash": "sha256-71XQ25jSz53iQ8B8lTR/T3LnUqk/9G8laPsjN0Mti18="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/polkit-kde-agent-1-6.2.4.tar.xz",
+    "hash": "sha256-Et5F4Vcjm1gfIb3Zo+2j/3O8VTALqXmkLJeZ8bd1P40="
   },
   "powerdevil": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/powerdevil-6.2.3.tar.xz",
-    "hash": "sha256-VM8+PQvC+jV4r5Aet7fi5Wj7WfC3Acru73AX5VlUHsY="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/powerdevil-6.2.4.tar.xz",
+    "hash": "sha256-F8RA19WWvgd5f2BJhcSyX5KXEoqv1vEbiKSpr+IL3a8="
   },
   "print-manager": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/print-manager-6.2.3.tar.xz",
-    "hash": "sha256-RKyOxYO5hs27eG5AxTR9f2OCbnfOIQ+LIWHHkwDrgdY="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/print-manager-6.2.4.tar.xz",
+    "hash": "sha256-4Ly5GtOxnkJZp6NQl/cYedLv5tlmUhl5Az+x6R/GuJU="
   },
   "qqc2-breeze-style": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/qqc2-breeze-style-6.2.3.tar.xz",
-    "hash": "sha256-3LJHPKYLHbnGuBd46zHhPFmA/8EdbmogSMou5PK52VI="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/qqc2-breeze-style-6.2.4.tar.xz",
+    "hash": "sha256-rAKm2xTlOXlvxSVfUS+o1qSOKkyq2sKD72sZDnBHEXo="
   },
   "sddm-kcm": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/sddm-kcm-6.2.3.tar.xz",
-    "hash": "sha256-mpzD46nxNAAl0UM9f+O+5Hlx05kGdpL+JyYfrd2LXV4="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/sddm-kcm-6.2.4.tar.xz",
+    "hash": "sha256-foYsQNW82GlD89vlhVg6pVXU+gvDEqf87csxbq3fsdc="
   },
   "spacebar": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/spacebar-6.2.3.tar.xz",
-    "hash": "sha256-n0z8aCp4W21m8C+8vLQVrNU160XukngScxoPDCCiP6I="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/spacebar-6.2.4.tar.xz",
+    "hash": "sha256-vvdBZWaHLdxgLATJhgjSCnK3HMWSz3OAwst0HUusilg="
   },
   "systemsettings": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/systemsettings-6.2.3.tar.xz",
-    "hash": "sha256-RPAFD8nFR4jbaQi9+8n5o7HRqxh2OrCQfQgV0WPXwTo="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/systemsettings-6.2.4.tar.xz",
+    "hash": "sha256-YXnzPDWPm5Zub7eaftYnF6qOdJdZVudasPp4clCHwVY="
   },
   "wacomtablet": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/wacomtablet-6.2.3.tar.xz",
-    "hash": "sha256-poG8k45ljTrBvzcjvctRvZHk2BiOh0nRDzoPFvWlBb8="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/wacomtablet-6.2.4.tar.xz",
+    "hash": "sha256-P68lefv+ibKaLlRIV7lymRFCmD8i1h4xbwnh1L/PYOM="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.2.3",
-    "url": "mirror://kde/stable/plasma/6.2.3/xdg-desktop-portal-kde-6.2.3.tar.xz",
-    "hash": "sha256-XyrRCMQga5a0h2DvCT3re5NRhYNsXM53oz5JyvPddNo="
+    "version": "6.2.4",
+    "url": "mirror://kde/stable/plasma/6.2.4/xdg-desktop-portal-kde-6.2.4.tar.xz",
+    "hash": "sha256-2vLYdp0PRSZO8fSLY/UnREYiJXT/gy5A8h0GpMOCLR0="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/plasma/plasma-mobile/default.nix b/pkgs/kde/plasma/plasma-mobile/default.nix
index 18654f28dc3d..18de7ba8e59a 100644
--- a/pkgs/kde/plasma/plasma-mobile/default.nix
+++ b/pkgs/kde/plasma/plasma-mobile/default.nix
@@ -2,13 +2,17 @@
   mkKdeDerivation,
   pkg-config,
   qtsensors,
+  qtwayland,
   plasma-workspace,
 }:
 mkKdeDerivation {
   pname = "plasma-mobile";
 
   extraNativeBuildInputs = [ pkg-config ];
-  extraBuildInputs = [ qtsensors ];
+  extraBuildInputs = [
+    qtsensors
+    qtwayland
+  ];
   postFixup = ''
     substituteInPlace "$out/share/wayland-sessions/plasma-mobile.desktop" \
       --replace-fail \

From a7c8d553aefadab06d6c716ef38cb417dc83ae28 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 26 Nov 2024 18:55:41 +0300
Subject: [PATCH 38/42] nixos/logrotate: allow change mode of a file

---
 nixos/modules/services/logging/logrotate.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/logging/logrotate.nix b/nixos/modules/services/logging/logrotate.nix
index 1c161e167be8..07b6eabf2c83 100644
--- a/nixos/modules/services/logging/logrotate.nix
+++ b/nixos/modules/services/logging/logrotate.nix
@@ -261,6 +261,7 @@ in
         CapabilityBoundingSet = [
           "CAP_CHOWN"
           "CAP_DAC_OVERRIDE"
+          "CAP_FOWNER"
           "CAP_KILL"
           "CAP_SETUID"
           "CAP_SETGID"

From 7233ce069735eb0236e61d3aaf5add448e425560 Mon Sep 17 00:00:00 2001
From: cooparo <cooparo@proton.me>
Date: Sat, 23 Nov 2024 17:38:35 +0100
Subject: [PATCH 39/42] python312Packages.python-bitcoinlib: rename from
 bitcoinlib

---
 pkgs/by-name/ze/zeronet-conservancy/package.nix               | 2 +-
 pkgs/by-name/ze/zeronet/package.nix                           | 2 +-
 pkgs/development/python-modules/opentimestamps/default.nix    | 4 ++--
 .../{bitcoinlib => python-bitcoinlib}/default.nix             | 2 +-
 pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix       | 2 +-
 pkgs/top-level/python-packages.nix                            | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/development/python-modules/{bitcoinlib => python-bitcoinlib}/default.nix (97%)

diff --git a/pkgs/by-name/ze/zeronet-conservancy/package.nix b/pkgs/by-name/ze/zeronet-conservancy/package.nix
index 284578460a04..0477684142c1 100644
--- a/pkgs/by-name/ze/zeronet-conservancy/package.nix
+++ b/pkgs/by-name/ze/zeronet-conservancy/package.nix
@@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3Packages; [
     gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client
-    gevent-websocket rencode bitcoinlib maxminddb pyopenssl rich defusedxml
+    gevent-websocket rencode python-bitcoinlib maxminddb pyopenssl rich defusedxml
     pyaes coincurve
   ];
 
diff --git a/pkgs/by-name/ze/zeronet/package.nix b/pkgs/by-name/ze/zeronet/package.nix
index d0a358a5ba15..d3ffcf81a889 100644
--- a/pkgs/by-name/ze/zeronet/package.nix
+++ b/pkgs/by-name/ze/zeronet/package.nix
@@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3Packages; [
     gevent msgpack base58 merkletools rsa pysocks pyasn1 websocket-client
-    gevent-websocket rencode bitcoinlib maxminddb pyopenssl
+    gevent-websocket rencode python-bitcoinlib maxminddb pyopenssl
   ];
 
   buildPhase = ''
diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix
index 5a9c412dcd54..2f7936888b69 100644
--- a/pkgs/development/python-modules/opentimestamps/default.nix
+++ b/pkgs/development/python-modules/opentimestamps/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  bitcoinlib,
+  python-bitcoinlib,
   buildPythonPackage,
   fetchFromGitHub,
   gitpython,
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [
-    bitcoinlib
+    python-bitcoinlib
     gitpython
     pycryptodomex
   ];
diff --git a/pkgs/development/python-modules/bitcoinlib/default.nix b/pkgs/development/python-modules/python-bitcoinlib/default.nix
similarity index 97%
rename from pkgs/development/python-modules/bitcoinlib/default.nix
rename to pkgs/development/python-modules/python-bitcoinlib/default.nix
index 910e3ea654a9..745ba8e25bc5 100644
--- a/pkgs/development/python-modules/bitcoinlib/default.nix
+++ b/pkgs/development/python-modules/python-bitcoinlib/default.nix
@@ -8,7 +8,7 @@
 }:
 
 buildPythonPackage rec {
-  pname = "bitcoinlib";
+  pname = "python-bitcoinlib";
   version = "0.12.2";
   format = "setuptools";
 
diff --git a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix
index dace095e13d2..2f92d69d3560 100644
--- a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   # The makefile builds docker containers.
   dontBuild = true;
 
-  propagatedBuildInputs = with python3Packages; [ prometheus-client bitcoinlib riprova ];
+  propagatedBuildInputs = with python3Packages; [ prometheus-client python-bitcoinlib riprova ];
 
   installPhase = ''
     mkdir -p $out/bin
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c4cd60b6fad7..df98b45c231b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1657,7 +1657,7 @@ self: super: with self; {
 
   bitbox02 = callPackage ../development/python-modules/bitbox02 { };
 
-  bitcoinlib = callPackage ../development/python-modules/bitcoinlib { };
+  python-bitcoinlib = callPackage ../development/python-modules/python-bitcoinlib { };
 
   bitcoin-utils-fork-minimal = callPackage ../development/python-modules/bitcoin-utils-fork-minimal { };
 

From 470e6e641f412894086b6df2f204847bd3905f17 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 21 Nov 2024 05:58:19 +0100
Subject: [PATCH 40/42] =?UTF-8?q?coqPackages.fourcolor:=201.3.1=20?=
 =?UTF-8?q?=E2=86=92=201.4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/coq-modules/fourcolor/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/fourcolor/default.nix b/pkgs/development/coq-modules/fourcolor/default.nix
index 4bf4ae771a0e..53500b7f918c 100644
--- a/pkgs/development/coq-modules/fourcolor/default.nix
+++ b/pkgs/development/coq-modules/fourcolor/default.nix
@@ -11,10 +11,11 @@ mkCoqDerivation {
   release."1.2.5".sha256 = "sha256-3qOPNCRjGK2UdHGMSqElpIXhAPVCklpeQgZwf9AFals=";
   release."1.3.0".sha256 = "sha256-h9pa6vaKT6jCEaIdEdcu0498Ou5kEXtZdb9P7WXK1DQ=";
   release."1.3.1".sha256 = "sha256-wBizm1hJXPYBu0tHFNScQHd22FebsJYoggT5OlhY/zM=";
+  release."1.4.0".sha256 = "sha256-8TtNPEbp3uLAH+MjOKiTZHOjPb3vVYlabuqsdWxbg80=";
 
   inherit version;
   defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
-    { cases = [ (isGe "8.16") (isGe "2.0") ]; out = "1.3.1"; }
+    { cases = [ (isGe "8.16") (isGe "2.0") ]; out = "1.4.0"; }
     { cases = [ (isGe "8.16") "2.0.0" ]; out = "1.3.0"; }
     { cases = [ (isGe "8.11") (range "1.12" "1.19") ]; out = "1.2.5"; }
     { cases = [ (isGe "8.11") (range "1.11" "1.14") ]; out = "1.2.4"; }

From 8f9753343fb65403783cf8963b4f54090859b840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Mon, 25 Nov 2024 20:11:11 +0100
Subject: [PATCH 41/42] qmmp: add libxmp and libsidplayfp to buildInputs

This adds support support more input formats, like .mod, .xm, .it, .s3m,
.sid.

Fixes https://github.com/NixOS/nixpkgs/issues/358922.
---
 pkgs/applications/audio/qmmp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix
index af7abcef17db..1496efd886ca 100644
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@@ -5,7 +5,7 @@
 # input plugins
 , libmad, taglib, libvorbis, libogg, flac, libmpcdec, libmodplug, libsndfile
 , libcdio, cdparanoia, libcddb, faad2, ffmpeg, wildmidi, libbs2b, game-music-emu
-, libarchive, opusfile, soxr, wavpack
+, libarchive, opusfile, soxr, wavpack, libxmp, libsidplayfp
 # output plugins
 , alsa-lib, libpulseaudio, pipewire, libjack2
 # effect plugins
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       # input plugins
       libmad taglib libvorbis libogg flac libmpcdec libmodplug libsndfile
       libcdio cdparanoia libcddb faad2 ffmpeg wildmidi libbs2b game-music-emu
-      libarchive opusfile soxr wavpack
+      libarchive opusfile soxr wavpack libxmp libsidplayfp
       # output plugins
       alsa-lib libpulseaudio pipewire libjack2
       # effect plugins

From 62e97383c2e9bfa1e94fd7c0f648606a290d0830 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Tue, 26 Nov 2024 12:33:48 -0500
Subject: [PATCH 42/42] geant4: move to by-name, drop deprecated enableQT
 argument (#358781)

---
 .../ge}/geant4/datasets-hook.sh               |   0
 pkgs/by-name/ge/geant4/datasets.nix           | 137 ++++++++++++++++
 .../ge}/geant4/geant4-hook.sh                 |   0
 pkgs/by-name/ge/geant4/package.nix            | 155 ++++++++++++++++++
 .../physics => by-name/ge}/geant4/tests.nix   |   6 +-
 .../libraries/physics/geant4/datasets.nix     | 119 --------------
 .../libraries/physics/geant4/default.nix      | 143 ----------------
 pkgs/top-level/all-packages.nix               |   2 -
 8 files changed, 297 insertions(+), 265 deletions(-)
 rename pkgs/{development/libraries/physics => by-name/ge}/geant4/datasets-hook.sh (100%)
 create mode 100644 pkgs/by-name/ge/geant4/datasets.nix
 rename pkgs/{development/libraries/physics => by-name/ge}/geant4/geant4-hook.sh (100%)
 create mode 100644 pkgs/by-name/ge/geant4/package.nix
 rename pkgs/{development/libraries/physics => by-name/ge}/geant4/tests.nix (93%)
 delete mode 100644 pkgs/development/libraries/physics/geant4/datasets.nix
 delete mode 100644 pkgs/development/libraries/physics/geant4/default.nix

diff --git a/pkgs/development/libraries/physics/geant4/datasets-hook.sh b/pkgs/by-name/ge/geant4/datasets-hook.sh
similarity index 100%
rename from pkgs/development/libraries/physics/geant4/datasets-hook.sh
rename to pkgs/by-name/ge/geant4/datasets-hook.sh
diff --git a/pkgs/by-name/ge/geant4/datasets.nix b/pkgs/by-name/ge/geant4/datasets.nix
new file mode 100644
index 000000000000..9e0d21e83642
--- /dev/null
+++ b/pkgs/by-name/ge/geant4/datasets.nix
@@ -0,0 +1,137 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  geant4,
+}:
+
+let
+  mkDataset =
+    {
+      pname,
+      version,
+      sha256,
+      envvar,
+    }:
+    stdenv.mkDerivation {
+      inherit pname version;
+      geant_version = geant4.version;
+
+      src = fetchurl {
+        url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz";
+        inherit sha256;
+      };
+
+      preferLocalBuild = true;
+      dontBuild = true;
+      dontConfigure = true;
+
+      datadir = "${placeholder "out"}/share/Geant4-${geant4.version}/data/${pname}${version}";
+      installPhase = ''
+        mkdir -p $datadir
+        mv ./* $datadir
+      '';
+
+      inherit envvar;
+      setupHook = ./datasets-hook.sh;
+
+      meta = with lib; {
+        description = "Data files for the Geant4 toolkit";
+        homepage = "https://geant4.web.cern.ch/support/download";
+        license = licenses.g4sl;
+        platforms = platforms.all;
+      };
+    };
+in
+builtins.listToAttrs (
+  map
+    (a: {
+      name = a.pname;
+      value = mkDataset a;
+    })
+    [
+      {
+        pname = "G4NDL";
+        version = "4.7.1";
+        sha256 = "sha256-06yuSGIhGNJXneJKVNUz+yQWvw2p3SiPFyTfFIWkbHw=";
+        envvar = "NEUTRONHP";
+      }
+
+      {
+        pname = "G4EMLOW";
+        version = "8.5";
+        sha256 = "sha256-ZrrKSaxdReKsEMEltPsmYiXlEYA+ZpgZCc6c0+m873M=";
+        envvar = "LE";
+      }
+
+      {
+        pname = "G4PhotonEvaporation";
+        version = "5.7";
+        sha256 = "sha256-dh5C5W/93j2YOfn52BAmB8a0wDKRUe5Rggb07p535+U=";
+        envvar = "LEVELGAMMA";
+      }
+
+      {
+        pname = "G4RadioactiveDecay";
+        version = "5.6";
+        sha256 = "sha256-OIYHfJyOWph4PmcY4cMlZ4me6y27M+QC1Edrwv5PDfE=";
+        envvar = "RADIOACTIVE";
+      }
+
+      {
+        pname = "G4SAIDDATA";
+        version = "2.0";
+        sha256 = "sha256-HSao55uqceRNV1m59Vpn6Lft4xdRMWqekDfYAJDHLpE=";
+        envvar = "SAIDXS";
+      }
+
+      {
+        pname = "G4PARTICLEXS";
+        version = "4.0";
+        sha256 = "sha256-k4EDlwPD8rD9NqtJmTYqLItP+QgMMi+QtOMZKBEzypU=";
+        envvar = "PARTICLEXS";
+      }
+
+      {
+        pname = "G4ABLA";
+        version = "3.3";
+        sha256 = "sha256-HgQbMlLunO+IbWJPdT5pMwOqMtfl7zu6h7NPNtkuorE=";
+        envvar = "ABLA";
+      }
+
+      {
+        pname = "G4INCL";
+        version = "1.2";
+        sha256 = "sha256-+ICxYHPuCpLXSU8ydqbVLU3h02d6DUx8WHADlu0OGn4=";
+        envvar = "INCL";
+      }
+
+      {
+        pname = "G4PII";
+        version = "1.3";
+        sha256 = "sha256-YiWtkCZ19DgcmMa6JfxaBs6HVJqpeWNNPQNJHWYW6SY=";
+        envvar = "PII";
+      }
+
+      {
+        pname = "G4ENSDFSTATE";
+        version = "2.3";
+        sha256 = "sha256-lETF4IIHkavTzKrOEFsOR3kPrc4obhEUmDTnnEqOkgM=";
+        envvar = "ENSDFSTATE";
+      }
+
+      {
+        pname = "G4RealSurface";
+        version = "2.2";
+        sha256 = "sha256-mVTe4AEvUzEmf3g2kOkS5y21v1Lqm6vs0S6iIoIXaCA=";
+        envvar = "REALSURFACE";
+      }
+
+      {
+        pname = "G4TENDL";
+        version = "1.4";
+        sha256 = "sha256-S3J0AgzItO1Wm4ku8YwuCI7c22tm850lWFzO4l2XIeA=";
+        envvar = "PARTICLEHP";
+      }
+    ]
+)
diff --git a/pkgs/development/libraries/physics/geant4/geant4-hook.sh b/pkgs/by-name/ge/geant4/geant4-hook.sh
similarity index 100%
rename from pkgs/development/libraries/physics/geant4/geant4-hook.sh
rename to pkgs/by-name/ge/geant4/geant4-hook.sh
diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix
new file mode 100644
index 000000000000..f5a80b186deb
--- /dev/null
+++ b/pkgs/by-name/ge/geant4/package.nix
@@ -0,0 +1,155 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  callPackage,
+  boost,
+  clhep,
+  cmake,
+  coin3d,
+  expat,
+  libGL,
+  libGLU,
+  libGLX,
+  libXext,
+  libXmu,
+  libXpm,
+  motif,
+  python3,
+  qt5,
+  soxt,
+  xercesc,
+  zlib,
+  enableMultiThreading ? true,
+  enableInventor ? false,
+  enableQt ? false,
+  enableXM ? false,
+  enableOpenGLX11 ? !stdenv.hostPlatform.isDarwin,
+  enablePython ? false,
+  enableRaytracerX11 ? false,
+}:
+
+let
+  boost_python = boost.override {
+    enablePython = true;
+    python = python3;
+  };
+in
+
+stdenv.mkDerivation rec {
+  version = "11.2.2";
+  pname = "geant4";
+
+  src = fetchurl {
+    url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz";
+    hash = "sha256-0k9lc1uKCgOcAPlDSZHpnvEZuGxRDQ8qshFV24KjSR0=";
+  };
+
+  # Fix broken paths in a .pc
+  postPatch = ''
+    substituteInPlace source/externals/ptl/cmake/Modules/PTLPackageConfigHelpers.cmake \
+      --replace '${"$"}{prefix}/${"$"}{PTL_INSTALL_' '${"$"}{PTL_INSTALL_'
+  '';
+
+  cmakeFlags =
+    [
+      "-DGEANT4_INSTALL_DATA=OFF"
+      "-DGEANT4_USE_GDML=ON"
+      "-DGEANT4_USE_G3TOG4=ON"
+      "-DGEANT4_USE_QT=${if enableQt then "ON" else "OFF"}"
+      "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
+      "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
+      "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
+      "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}"
+      "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
+      "-DGEANT4_USE_SYSTEM_CLHEP=ON"
+      "-DGEANT4_USE_SYSTEM_EXPAT=ON"
+      "-DGEANT4_USE_SYSTEM_ZLIB=ON"
+      "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
+    ]
+    ++ lib.optionals (enableOpenGLX11 && stdenv.hostPlatform.isDarwin) [
+      "-DXQuartzGL_INCLUDE_DIR=${libGLX.dev}/include"
+      "-DXQuartzGL_gl_LIBRARY=${libGLX}/lib/libGL.dylib"
+    ]
+    ++ lib.optionals (enableMultiThreading && enablePython) [
+      "-DGEANT4_BUILD_TLS_MODEL=global-dynamic"
+    ]
+    ++ lib.optionals enableInventor [
+      "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
+      "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
+    ];
+
+  nativeBuildInputs = [ cmake ];
+
+  propagatedNativeBuildInputs = lib.optionals enableQt [ qt5.wrapQtAppsHook ];
+  dontWrapQtApps = true; # no binaries
+
+  buildInputs =
+    lib.optionals enableOpenGLX11 [
+      libGLU
+      libXext
+      libXmu
+    ]
+    ++ lib.optionals enableInventor [
+      libXpm
+      coin3d
+      soxt
+      motif
+    ]
+    ++ lib.optionals enablePython [
+      boost_python
+      python3
+    ];
+
+  propagatedBuildInputs =
+    [
+      clhep
+      expat
+      xercesc
+      zlib
+    ]
+    ++ lib.optionals enableOpenGLX11 [ libGL ]
+    ++ lib.optionals enableXM [ motif ]
+    ++ lib.optionals enableQt [ qt5.qtbase ];
+
+  postFixup =
+    ''
+      # Don't try to export invalid environment variables.
+      sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
+    ''
+    + lib.optionalString enableQt ''
+      wrapQtAppsHook
+    '';
+
+  setupHook = ./geant4-hook.sh;
+
+  passthru = {
+    data = callPackage ./datasets.nix { };
+
+    tests = callPackage ./tests.nix { };
+
+    inherit enableQt;
+  };
+
+  # Set the myriad of envars required by Geant4 if we use a nix-shell.
+  shellHook = ''
+    source $out/nix-support/setup-hook
+  '';
+
+  meta = with lib; {
+    broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
+    description = "Toolkit for the simulation of the passage of particles through matter";
+    longDescription = ''
+      Geant4 is a toolkit for the simulation of the passage of particles through matter.
+      Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
+      The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
+    '';
+    homepage = "http://www.geant4.org";
+    license = licenses.g4sl;
+    maintainers = with maintainers; [
+      omnipotententity
+      veprbl
+    ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/development/libraries/physics/geant4/tests.nix b/pkgs/by-name/ge/geant4/tests.nix
similarity index 93%
rename from pkgs/development/libraries/physics/geant4/tests.nix
rename to pkgs/by-name/ge/geant4/tests.nix
index 7d68780e2eb2..f3f359c8725e 100644
--- a/pkgs/development/libraries/physics/geant4/tests.nix
+++ b/pkgs/by-name/ge/geant4/tests.nix
@@ -1,4 +1,8 @@
-{ stdenv, cmake, geant4 }:
+{
+  stdenv,
+  cmake,
+  geant4,
+}:
 
 {
   example_B1 = stdenv.mkDerivation {
diff --git a/pkgs/development/libraries/physics/geant4/datasets.nix b/pkgs/development/libraries/physics/geant4/datasets.nix
deleted file mode 100644
index 66714ba16c78..000000000000
--- a/pkgs/development/libraries/physics/geant4/datasets.nix
+++ /dev/null
@@ -1,119 +0,0 @@
-{ lib, stdenv, fetchurl, geant4 }:
-
-let
-  mkDataset = { pname, version, sha256, envvar }:
-    stdenv.mkDerivation {
-      inherit pname version;
-      geant_version = geant4.version;
-
-      src = fetchurl {
-        url = "https://cern.ch/geant4-data/datasets/${pname}.${version}.tar.gz";
-        inherit sha256;
-      };
-
-      preferLocalBuild = true;
-      dontBuild = true;
-      dontConfigure = true;
-
-      datadir = "${placeholder "out"}/share/Geant4-${geant4.version}/data/${pname}${version}";
-      installPhase = ''
-        mkdir -p $datadir
-        mv ./* $datadir
-      '';
-
-      inherit envvar;
-      setupHook = ./datasets-hook.sh;
-
-      meta = with lib; {
-        description = "Data files for the Geant4 toolkit";
-        homepage = "https://geant4.web.cern.ch/support/download";
-        license = licenses.g4sl;
-        platforms = platforms.all;
-      };
-    };
-in
-  builtins.listToAttrs (map (a: { name = a.pname; value = mkDataset a; }) [
-    {
-      pname = "G4NDL";
-      version = "4.7.1";
-      sha256 = "sha256-06yuSGIhGNJXneJKVNUz+yQWvw2p3SiPFyTfFIWkbHw=";
-      envvar = "NEUTRONHP";
-    }
-
-    {
-      pname = "G4EMLOW";
-      version = "8.5";
-      sha256 = "sha256-ZrrKSaxdReKsEMEltPsmYiXlEYA+ZpgZCc6c0+m873M=";
-      envvar = "LE";
-    }
-
-    {
-      pname = "G4PhotonEvaporation";
-      version = "5.7";
-      sha256 = "sha256-dh5C5W/93j2YOfn52BAmB8a0wDKRUe5Rggb07p535+U=";
-      envvar = "LEVELGAMMA";
-    }
-
-    {
-      pname = "G4RadioactiveDecay";
-      version = "5.6";
-      sha256 = "sha256-OIYHfJyOWph4PmcY4cMlZ4me6y27M+QC1Edrwv5PDfE=";
-      envvar = "RADIOACTIVE";
-    }
-
-    {
-      pname = "G4SAIDDATA";
-      version = "2.0";
-      sha256 = "sha256-HSao55uqceRNV1m59Vpn6Lft4xdRMWqekDfYAJDHLpE=";
-      envvar = "SAIDXS";
-    }
-
-    {
-      pname = "G4PARTICLEXS";
-      version = "4.0";
-      sha256 = "sha256-k4EDlwPD8rD9NqtJmTYqLItP+QgMMi+QtOMZKBEzypU=";
-      envvar = "PARTICLEXS";
-    }
-
-    {
-      pname = "G4ABLA";
-      version = "3.3";
-      sha256 = "sha256-HgQbMlLunO+IbWJPdT5pMwOqMtfl7zu6h7NPNtkuorE=";
-      envvar = "ABLA";
-    }
-
-    {
-      pname = "G4INCL";
-      version = "1.2";
-      sha256 = "sha256-+ICxYHPuCpLXSU8ydqbVLU3h02d6DUx8WHADlu0OGn4=";
-      envvar = "INCL";
-    }
-
-    {
-      pname = "G4PII";
-      version = "1.3";
-      sha256 = "sha256-YiWtkCZ19DgcmMa6JfxaBs6HVJqpeWNNPQNJHWYW6SY=";
-      envvar = "PII";
-    }
-
-    {
-      pname = "G4ENSDFSTATE";
-      version = "2.3";
-      sha256 = "sha256-lETF4IIHkavTzKrOEFsOR3kPrc4obhEUmDTnnEqOkgM=";
-      envvar = "ENSDFSTATE";
-    }
-
-    {
-      pname = "G4RealSurface";
-      version = "2.2";
-      sha256 = "sha256-mVTe4AEvUzEmf3g2kOkS5y21v1Lqm6vs0S6iIoIXaCA=";
-      envvar = "REALSURFACE";
-    }
-
-    {
-      pname = "G4TENDL";
-      version = "1.4";
-      sha256 = "sha256-S3J0AgzItO1Wm4ku8YwuCI7c22tm850lWFzO4l2XIeA=";
-      envvar = "PARTICLEHP";
-    }
-  ])
diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix
deleted file mode 100644
index eff46f5ff924..000000000000
--- a/pkgs/development/libraries/physics/geant4/default.nix
+++ /dev/null
@@ -1,143 +0,0 @@
-{ enableMultiThreading ? true
-, enableInventor       ? false
-, enableQT             ? false # deprecated name
-, enableQt             ? enableQT
-, enableXM             ? false
-, libGLX
-, enableOpenGLX11      ? !stdenv.hostPlatform.isDarwin
-, enablePython         ? false
-, enableRaytracerX11   ? false
-
-# Standard build environment with cmake.
-, lib, stdenv, fetchurl, cmake
-
-, clhep
-, expat
-, xercesc
-, zlib
-
-# For enableQt.
-, qtbase
-, wrapQtAppsHook
-
-# For enableXM.
-, motif
-
-# For enableInventor
-, coin3d
-, soxt
-, libXpm
-
-# For enableQt, enableXM, enableOpenGLX11, enableRaytracerX11.
-, libGLU, libGL
-, libXext
-, libXmu
-
-# For enablePython
-, boost
-, python3
-
-# For tests
-, callPackage
-}:
-
-let
-  boost_python = boost.override { enablePython = true; python = python3; };
-in
-
-lib.warnIf (enableQT != false) "geant4: enableQT is deprecated, please use enableQt"
-
-stdenv.mkDerivation rec {
-  version = "11.2.2";
-  pname = "geant4";
-
-  src = fetchurl {
-    url = "https://cern.ch/geant4-data/releases/geant4-v${version}.tar.gz";
-    hash = "sha256-0k9lc1uKCgOcAPlDSZHpnvEZuGxRDQ8qshFV24KjSR0=";
-  };
-
-  # Fix broken paths in a .pc
-  postPatch = ''
-    substituteInPlace source/externals/ptl/cmake/Modules/PTLPackageConfigHelpers.cmake \
-      --replace '${"$"}{prefix}/${"$"}{PTL_INSTALL_' '${"$"}{PTL_INSTALL_'
-  '';
-
-  cmakeFlags = [
-    "-DGEANT4_INSTALL_DATA=OFF"
-    "-DGEANT4_USE_GDML=ON"
-    "-DGEANT4_USE_G3TOG4=ON"
-    "-DGEANT4_USE_QT=${if enableQt then "ON" else "OFF"}"
-    "-DGEANT4_USE_XM=${if enableXM then "ON" else "OFF"}"
-    "-DGEANT4_USE_OPENGL_X11=${if enableOpenGLX11 then "ON" else "OFF"}"
-    "-DGEANT4_USE_INVENTOR=${if enableInventor then "ON" else "OFF"}"
-    "-DGEANT4_USE_PYTHON=${if enablePython then "ON" else "OFF"}"
-    "-DGEANT4_USE_RAYTRACER_X11=${if enableRaytracerX11 then "ON" else "OFF"}"
-    "-DGEANT4_USE_SYSTEM_CLHEP=ON"
-    "-DGEANT4_USE_SYSTEM_EXPAT=ON"
-    "-DGEANT4_USE_SYSTEM_ZLIB=ON"
-    "-DGEANT4_BUILD_MULTITHREADED=${if enableMultiThreading then "ON" else "OFF"}"
-  ] ++ lib.optionals (enableOpenGLX11 && stdenv.hostPlatform.isDarwin) [
-    "-DXQuartzGL_INCLUDE_DIR=${libGLX.dev}/include"
-    "-DXQuartzGL_gl_LIBRARY=${libGLX}/lib/libGL.dylib"
-  ] ++ lib.optionals (enableMultiThreading && enablePython) [
-    "-DGEANT4_BUILD_TLS_MODEL=global-dynamic"
-  ] ++ lib.optionals enableInventor [
-    "-DINVENTOR_INCLUDE_DIR=${coin3d}/include"
-    "-DINVENTOR_LIBRARY_RELEASE=${coin3d}/lib/libCoin.so"
-  ];
-
-  nativeBuildInputs =  [
-    cmake
-  ];
-
-  propagatedNativeBuildInputs = lib.optionals enableQt [
-    wrapQtAppsHook
-  ];
-  dontWrapQtApps = true; # no binaries
-
-  buildInputs =
-    lib.optionals enableOpenGLX11 [ libGLU libXext libXmu ]
-    ++ lib.optionals enableInventor [ libXpm coin3d soxt motif ]
-    ++ lib.optionals enablePython [ boost_python python3 ];
-
-  propagatedBuildInputs = [ clhep expat xercesc zlib ]
-    ++ lib.optionals enableOpenGLX11 [ libGL ]
-    ++ lib.optionals enableXM [ motif ]
-    ++ lib.optionals enableQt [ qtbase ];
-
-  postFixup = ''
-    # Don't try to export invalid environment variables.
-    sed -i 's/export G4\([A-Z]*\)DATA/#export G4\1DATA/' "$out"/bin/geant4.sh
-  '' + lib.optionalString enableQt ''
-    wrapQtAppsHook
-  '';
-
-  setupHook = ./geant4-hook.sh;
-
-  passthru = {
-    data = callPackage ./datasets.nix {};
-
-    tests = callPackage ./tests.nix {};
-
-    inherit enableQt;
-  };
-
-  # Set the myriad of envars required by Geant4 if we use a nix-shell.
-  shellHook = ''
-    source $out/nix-support/setup-hook
-  '';
-
-  meta = with lib; {
-    broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
-    description = "Toolkit for the simulation of the passage of particles through matter";
-    longDescription = ''
-      Geant4 is a toolkit for the simulation of the passage of particles through matter.
-      Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science.
-      The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278.
-    '';
-    homepage = "http://www.geant4.org";
-    license = licenses.g4sl;
-    maintainers = with maintainers; [ omnipotententity veprbl ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f7ebf911a04..f58581a16a0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18068,8 +18068,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Cocoa;
   };
 
-  geant4 = libsForQt5.callPackage ../development/libraries/physics/geant4 { };
-
   hepmc3 = callPackage ../development/libraries/physics/hepmc3 {
     python = null;
   };