From f9d0de7fccd2eae95ddcdb099aca4e3938b21bef Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 29 Oct 2024 23:19:57 +0100
Subject: [PATCH 01/62] python312Packages.docstring-parser: 0.15 -> 0.16

Diff: https://github.com/rr-/docstring_parser/compare/refs/tags/0.15...0.16

Changelog: https://github.com/rr-/docstring_parser/blob/0.16/CHANGELOG.md
---
 pkgs/development/python-modules/docstring-parser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/docstring-parser/default.nix b/pkgs/development/python-modules/docstring-parser/default.nix
index d1a06935e0fd..cd317a2c1f1f 100644
--- a/pkgs/development/python-modules/docstring-parser/default.nix
+++ b/pkgs/development/python-modules/docstring-parser/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "docstring-parser";
-  version = "0.15";
+  version = "0.16";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "rr-";
     repo = "docstring_parser";
     rev = "refs/tags/${version}";
-    hash = "sha256-rnDitZn/xI0I9KMQv6gxzVYevWUymDgyFETjAnRlEHw=";
+    hash = "sha256-xwV+mgCOC/MyCqGELkJVqQ3p2g2yw/Ieomc7k0HMXms=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From f9efbc90b4c85e49949da97fea81ede49885d14f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 29 Sep 2024 00:43:09 +0200
Subject: [PATCH 02/62] python312Packages.pytest-celery: 0.1.0 -> 1.1.1

Diff: celery/pytest-celery@refs/tags/v0.1.0...v1.1.1

Changelog: https://github.com/celery/pytest-celery/blob/v1.1.1/Changelog.rst
---
 .../python-modules/pytest-celery/default.nix  | 47 +++++++++++++++----
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix
index 12b7c581ab38..14241ea1465b 100644
--- a/pkgs/development/python-modules/pytest-celery/default.nix
+++ b/pkgs/development/python-modules/pytest-celery/default.nix
@@ -1,37 +1,66 @@
 {
   lib,
   buildPythonPackage,
+  celery,
+  debugpy,
+  docker,
   fetchFromGitHub,
-  flit-core,
+  poetry-core,
+  psutil,
+  pytest-cov-stub,
+  pytest-docker-tools,
+  pytest,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  tenacity,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-celery";
-  version = "0.1.0";
+  version = "1.1.1";
+  pyproject = true;
 
-  format = "pyproject";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "celery";
     repo = "pytest-celery";
-    rev = "v${version}";
-    hash = "sha256-vzWwkOS3BLOInaFDk+PegvEmC88ZZ1sG1CmHwhn7r9w=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-LLbT2GjKvG8RisAgsCxI3iybJLLjbESZ9tCBKub8bj8=";
   };
 
   postPatch = ''
-    # avoid infinite recursion with celery
+    # Avoid infinite recursion with celery
     substituteInPlace pyproject.toml \
-      --replace '"celery >= 4.4.0"' ""
+      --replace 'celery = { version = "*" }' ""
   '';
 
-  nativeBuildInputs = [ flit-core ];
+  pythonRelaxDeps = [
+    "debugpy"
+    "setuptools"
+  ];
 
-  # This package has nothing to test or import.
+  build-system = [ poetry-core ];
+
+  buildInput = [ pytest ];
+
+  dependencies = [
+    debugpy
+    docker
+    psutil
+    pytest-docker-tools
+    setuptools
+    tenacity
+  ];
+
+  # Infinite recursion with celery
   doCheck = false;
 
   meta = with lib; {
     description = "Pytest plugin to enable celery.contrib.pytest";
     homepage = "https://github.com/celery/pytest-celery";
+    changelog = "https://github.com/celery/pytest-celery/blob/v${version}/Changelog.rst";
     license = licenses.mit;
     maintainers = [ ];
   };

From 162a6c2bbf034af25739222dd28f89b7de0de7fb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 16 Oct 2024 16:53:25 +0200
Subject: [PATCH 03/62] python312Packages.python-engineio: 4.9.1 -> 4.10.1

Diff: https://github.com/miguelgrinberg/python-engineio/compare/refs/tags/v4.9.1...v4.10.1

Changelog: https://github.com/miguelgrinberg/python-engineio/blob/v4.10.1/CHANGES.md
---
 pkgs/development/python-modules/python-engineio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
index 28bf7840a30b..60f1fa2895d2 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "python-engineio";
-  version = "4.9.1";
+  version = "4.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "miguelgrinberg";
     repo = "python-engineio";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wn2qiVkL05GTopGJeghHe9i+wyOQZbEeYDmEIIbXDS0=";
+    hash = "sha256-qfFMpE0aW8/TUBaKcaD/qV+JaBEqNR3WZ+mhQQsXkdU=";
   };
 
   build-system = [ setuptools ];

From f1e8d2b37f3df1be97defdb22aaf31aef43936ea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 13 Oct 2024 23:45:52 +0200
Subject: [PATCH 04/62] python312Packages.simple-websocket: 1.0.0 -> 1.1.0

Diff: https://github.com/miguelgrinberg/simple-websocket/compare/refs/tags/v1.0.0...v1.1.0

Changelog: https://github.com/miguelgrinberg/simple-websocket/blob/1.1.0/CHANGES.md
---
 .../simple-websocket/default.nix              | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/simple-websocket/default.nix b/pkgs/development/python-modules/simple-websocket/default.nix
index a7937b59f6c1..3c2e78338f2a 100644
--- a/pkgs/development/python-modules/simple-websocket/default.nix
+++ b/pkgs/development/python-modules/simple-websocket/default.nix
@@ -3,34 +3,38 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
+  pythonOlder,
   setuptools,
-  wheel,
   wsproto,
 }:
 
 buildPythonPackage rec {
   pname = "simple-websocket";
-  version = "1.0.0";
-  format = "pyproject";
+  version = "1.1.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "simple-websocket";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5dUZnbjHzH1sQ93CbFdEoW9j2zY4Z+8wNsYfmOrgC8E=";
+    hash = "sha256-dwL6GUyygNGBXqkkTnsHwFFpa1JAaeWc9ycQNRgTN4I=";
   };
 
-  nativeBuildInputs = [
-    setuptools
-    wheel
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ wsproto ];
+  dependencies = [ wsproto ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "simple_websocket" ];
 
+  disabledTests = [
+    # Tests require network access
+    "SimpleWebSocketClientTestCase"
+  ];
+
   meta = with lib; {
     description = "Simple WebSocket server and client for Python";
     homepage = "https://github.com/miguelgrinberg/simple-websocket";

From d65d45c669bd548f0cdfb7cacba808b1d40410be Mon Sep 17 00:00:00 2001
From: r17x <ri7nz@evilfactory.id>
Date: Thu, 8 Aug 2024 23:56:36 +0700
Subject: [PATCH 05/62] maintainers: add r17x

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fdd7825291e2..8c057feaa75a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17966,6 +17966,13 @@
     matrix = "@qyriad:katesiria.org";
     name = "Qyriad";
   };
+  r17x = {
+    email = "hi@rin.rocks";
+    github = "r17x";
+    githubId = 16365952;
+    name = "Rin";
+    keys = [ { fingerprint = "476A F55D 6378 F878 0709  848A 18F9 F516 1CC0 576C"; } ];
+  };
   r3dl3g = {
     email = "redleg@rothfuss-web.de";
     github = "r3dl3g";

From c304abf7cf0e60b8af36777a279e2f474a7da896 Mon Sep 17 00:00:00 2001
From: r17x <ri7nz@evilfactory.id>
Date: Fri, 9 Aug 2024 00:03:26 +0700
Subject: [PATCH 06/62] xbar: init at 2.1.7-beta

---
 pkgs/by-name/xb/xbar/package.nix | 38 ++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/xb/xbar/package.nix

diff --git a/pkgs/by-name/xb/xbar/package.nix b/pkgs/by-name/xb/xbar/package.nix
new file mode 100644
index 000000000000..72cae27c5b8d
--- /dev/null
+++ b/pkgs/by-name/xb/xbar/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  undmg,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "xbar";
+  version = "2.1.7-beta";
+
+  src = fetchurl {
+    url = "https://github.com/matryer/xbar/releases/download/v${finalAttrs.version}/xbar.v${finalAttrs.version}.dmg";
+    sha256 = "sha256-Cn6nxA5NTi7M4NrjycN3PUWd31r4Z0T3DES5+ZAbxz8=";
+  };
+
+  sourceRoot = "xbar.app";
+
+  nativeBuildInputs = [ undmg ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications/xbar.app
+    cp -R . $out/Applications/xbar.app
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Put the output from any script or program into your macOS Menu Bar (the BitBar reboot)";
+    homepage = "https://xbarapp.com/";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ r17x ];
+    license = lib.licenses.mit;
+  };
+})

From 479359d5b60fe1c420409e3f1b213a560d073896 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Sat, 2 Nov 2024 09:17:17 -0300
Subject: [PATCH 07/62] kcl: 0.10.0 -> 0.10.9

Release: https://github.com/kcl-lang/cli/releases/tag/v0.10.9

- unpin go version
- order by phases/alphabetical order
- add meta.changelog
- remove nested with in meta
- add partial fix for crosscompiling
- mark crosscompiling as broken
- replace lib.optional (single item) with lib.optionals (multiple items)
- add nix-update-script
- refactor install shell completion
- nixfmt

Note: Tried to add a version test but had issues. Will consider it
another time.
---
 pkgs/by-name/kc/kcl/package.nix | 94 ++++++++++++++++++++-------------
 1 file changed, 57 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix
index 890f7bf33c40..649689730164 100644
--- a/pkgs/by-name/kc/kcl/package.nix
+++ b/pkgs/by-name/kc/kcl/package.nix
@@ -1,69 +1,89 @@
-{ lib
-, stdenv
-, buildGo123Module
-, fetchFromGitHub
-, kclvm_cli
-, kclvm
-, makeWrapper
-, installShellFiles
-, darwin
-,
+{
+  buildGoModule,
+  darwin,
+  fetchFromGitHub,
+  installShellFiles,
+  kclvm_cli,
+  kclvm,
+  lib,
+  makeWrapper,
+  nix-update-script,
+  stdenv,
 }:
-buildGo123Module rec {
+
+buildGoModule rec {
   pname = "kcl";
-  version = "0.10.0";
+  version = "0.10.9";
 
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-0KxT4t77EDB7Vr/cb+P20ARRR+7g5uZiF5QYOArUhgI=";
+    hash = "sha256-V9HLUv018gCkzrt1mGNENZVjXCSvqEneQIgIwxawxKM=";
   };
 
-  vendorHash = "sha256-9APQDYCBvG38y0ZYuacfyUmjoEV9jGqRg7OZ7mArzIU=";
+  vendorHash = "sha256-y8KWiy6onZmYdpanXcSQDmYv51pLfo1NTdg+EaR6p0E=";
 
-  # By default, libs and bins are stripped. KCL will crash on darwin if they are.
-  dontStrip = stdenv.hostPlatform.isDarwin;
+  subPackages = [ "cmd/kcl" ];
 
   ldflags = [
     "-w -s"
     "-X=kcl-lang.io/cli/pkg/version.version=v${version}"
   ];
 
-  nativeBuildInputs = [ makeWrapper installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+  ];
 
-  buildInputs = [ kclvm kclvm_cli ] ++ (
-    lib.optional stdenv.hostPlatform.isDarwin [
+  buildInputs =
+    [
+      kclvm
+      kclvm_cli
+    ]
+    ++ (lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.apple_sdk.frameworks.Security
       darwin.apple_sdk.frameworks.CoreServices
       darwin.apple_sdk.frameworks.SystemConfiguration
-    ]
-  );
+    ]);
 
-  subPackages = [ "cmd/kcl" ];
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    export HOME=$(mktemp -d)
+    for shell in bash fish zsh; do
+      installShellCompletion --cmd kcl \
+        --$shell <($out/bin/kcl completion $shell)
+    done
+  '';
+
+  # By default, libs and bins are stripped. KCL will crash on darwin if they are.
+  dontStrip = stdenv.hostPlatform.isDarwin;
 
   # env vars https://github.com/kcl-lang/kcl-go/blob/main/pkg/env/env.go#L29
   postFixup = ''
-     wrapProgram $out/bin/kcl \
-    --prefix PATH : "${lib.makeBinPath [kclvm kclvm_cli]}" \
-    --prefix KCL_LIB_HOME : "${lib.makeLibraryPath [kclvm]}" \
-    --prefix KCL_GO_DISABLE_INSTALL_ARTIFACT : false
+    wrapProgram $out/bin/kcl \
+      --prefix PATH : "${
+        lib.makeBinPath [
+          kclvm
+          kclvm_cli
+        ]
+      }" \
+      --prefix KCL_LIB_HOME : "${lib.makeLibraryPath [ kclvm ]}" \
+      --prefix KCL_GO_DISABLE_INSTALL_ARTIFACT : false
   '';
 
-  postInstall = ''
-    export HOME=$(mktemp -d)
-    installShellCompletion --cmd kcl \
-      --bash <($out/bin/kcl completion bash) \
-      --fish <($out/bin/kcl completion fish) \
-      --zsh <($out/bin/kcl completion zsh)
-  '';
+  updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "A command line interface for KCL programming language";
+    changelog = "https://github.com/kcl-lang/cli/releases/tag/v${version}";
     homepage = "https://github.com/kcl-lang/cli";
-    license = licenses.asl20;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ selfuryon peefy ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [
+      peefy
+      selfuryon
+    ];
     mainProgram = "kcl";
+    broken = stdenv.buildPlatform != stdenv.hostPlatform;
   };
 }

From 511ae6d1787e96c0c89e0d73380bd35717d35d26 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Wed, 20 Nov 2024 05:20:14 -0600
Subject: [PATCH 08/62] pomerium: 0.27.2 -> 0.28.0

---
 ...001-envoy-allow-specification-of-external-binary.patch | 8 ++++----
 pkgs/by-name/po/pomerium/package.nix                      | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch b/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch
index d43242b6cc14..cd1f3fb7421c 100644
--- a/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch
+++ b/pkgs/by-name/po/pomerium/0001-envoy-allow-specification-of-external-binary.patch
@@ -1,4 +1,4 @@
-From e82f2949b86d127aec908d90d872dfd6feb509e5 Mon Sep 17 00:00:00 2001
+From 54e426127a35ea6c88bf0ba882f97f0712533ef5 Mon Sep 17 00:00:00 2001
 From: Morgan Helton <mhelton@gmail.com>
 Date: Sun, 26 May 2024 12:17:01 -0500
 Subject: [PATCH] envoy: allow specification of external binary
@@ -8,7 +8,7 @@ Subject: [PATCH] envoy: allow specification of external binary
  1 file changed, 10 insertions(+), 7 deletions(-)
 
 diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go
-index 6639d4bd..c6ca198f 100644
+index 66cf71ae..8d81090e 100644
 --- a/pkg/envoy/envoy.go
 +++ b/pkg/envoy/envoy.go
 @@ -8,9 +8,9 @@ import (
@@ -40,7 +40,7 @@ index 6639d4bd..c6ca198f 100644
  // NewServer creates a new server with traffic routed by envoy.
  func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Builder) (*Server, error) {
 -	if err := preserveRlimitNofile(); err != nil {
--		log.Debug(ctx).Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy")
+-		log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy")
 -	}
 +	envoyPath := OverrideEnvoyPath
 +	wd := filepath.Join(os.TempDir(), workingDirectoryName)
@@ -59,5 +59,5 @@ index 6639d4bd..c6ca198f 100644
  		grpcPort:  src.GetConfig().GRPCPort,
  		httpPort:  src.GetConfig().HTTPPort,
 -- 
-2.46.0
+2.47.0
 
diff --git a/pkgs/by-name/po/pomerium/package.nix b/pkgs/by-name/po/pomerium/package.nix
index 009fc19ddf61..2dcbf2069c38 100644
--- a/pkgs/by-name/po/pomerium/package.nix
+++ b/pkgs/by-name/po/pomerium/package.nix
@@ -13,15 +13,15 @@ let
 in
 buildGo123Module rec {
   pname = "pomerium";
-  version = "0.27.2";
+  version = "0.28.0";
   src = fetchFromGitHub {
     owner = "pomerium";
     repo = "pomerium";
     rev = "v${version}";
-    hash = "sha256-t1j5usgr/SO3Ev3JpCJWb3Ys8wgZUTGQVb6mo0oIsEc=";
+    hash = "sha256-Uj/mVklFRaoDNQjCFS5NW/AhSU+7V1XxPiZBAUuly7s=";
   };
 
-  vendorHash = "sha256-nTEFSLP0/GUVgtujVG6lQIxnj6DOEifc0MVh9CNxt8s=";
+  vendorHash = "sha256-s6EZUZoGNBpy5RaLAPiCCCVFli+YzZ0PHJ/aH3s4APA=";
 
   ui = mkYarnPackage {
     inherit version;

From 832aeacb18514f58a711072587b8d1e7a6af01f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 16:48:31 +0000
Subject: [PATCH 09/62] bililiverecorder: 2.12.0 -> 2.13.0

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

diff --git a/pkgs/by-name/bi/bililiverecorder/package.nix b/pkgs/by-name/bi/bililiverecorder/package.nix
index 5a1dcf4f2e79..3efa80e687ea 100644
--- a/pkgs/by-name/bi/bililiverecorder/package.nix
+++ b/pkgs/by-name/bi/bililiverecorder/package.nix
@@ -13,8 +13,8 @@ let
     aspnetcore_6_0
   ];
 
-  version = "2.12.0";
-  hash = "sha256-2usiJTGA2FcJ9HBs3RDiARfC2yv/UqBgmT+z5F5Y7w0=";
+  version = "2.13.0";
+  hash = "sha256-4OQ2gut/eLk4CXRN5E3Z8XobXsT3bSmtmJEcHzHcz/0=";
 
 in
 stdenv.mkDerivation {

From 6eda86c02fa7108b63de26aa19212ea77bdd7730 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 23 Nov 2024 09:30:22 +0100
Subject: [PATCH 10/62] python312Packages.docstring-parser: refactor

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

diff --git a/pkgs/development/python-modules/docstring-parser/default.nix b/pkgs/development/python-modules/docstring-parser/default.nix
index cd317a2c1f1f..bc3aad6444f9 100644
--- a/pkgs/development/python-modules/docstring-parser/default.nix
+++ b/pkgs/development/python-modules/docstring-parser/default.nix
@@ -10,7 +10,7 @@
 buildPythonPackage rec {
   pname = "docstring-parser";
   version = "0.16";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     hash = "sha256-xwV+mgCOC/MyCqGELkJVqQ3p2g2yw/Ieomc7k0HMXms=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From efb434511a0add0ba8eb47fddbab52a8e68817d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Nov 2024 04:45:27 +0000
Subject: [PATCH 11/62] python312Packages.icalendar: 6.0.1 -> 6.1.0

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

diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix
index 4c6d6da0e88e..51dd8271dd1a 100644
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@@ -12,7 +12,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "6.0.1";
+  version = "6.1.0";
   pname = "icalendar";
   pyproject = true;
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "collective";
     repo = "icalendar";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pcTiXRiHtx7jVzxDkY6WDhzo8sg8fPecqTpRSRIdvfs=";
+    hash = "sha256-P+cUwNFSBjyTzqdBnIricoM3rUWUXQc8k1912jil79Q=";
   };
 
   patches = [

From f19e0f76f469784ce8800898327799abd183c3cc Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 24 Nov 2024 23:49:10 +0800
Subject: [PATCH 12/62] xfce.xfce4-settings: Fix screen locked but lockscreen
 invisible after suspend

See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1077277.
---
 pkgs/desktops/xfce/core/xfce4-settings/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
index 05923da38aeb..73f22d35f0fd 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix
@@ -9,7 +9,9 @@
 , libxfce4util
 , libxklavier
 , upower
-, withUpower ? true
+# Disabled by default on upstream and actually causes issues:
+# https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/222
+, withUpower ? false
 , xfconf
 , xf86inputlibinput
 , colord

From ee2bb9be3e7910877c16bda01136c2086074949f Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Fri, 8 Nov 2024 20:24:10 +0800
Subject: [PATCH 13/62] nerdfonts: separate into packages under nerd-fonts

---
 .../manual/release-notes/rl-2411.section.md   |   5 +
 .../terminal-emulators/kitty/default.nix      |   4 +-
 .../data/fonts/nerd-fonts/convert-license.nix |  28 +
 pkgs/data/fonts/nerd-fonts/default.nix        |  94 +++
 .../fonts/nerd-fonts/manifests/checksums.json |  69 +++
 .../fonts/nerd-fonts/manifests/fonts.json     | 538 ++++++++++++++++++
 .../fonts/nerd-fonts/manifests/release.json   |   4 +
 pkgs/data/fonts/nerd-fonts/update.py          |  90 +++
 pkgs/data/fonts/nerdfonts/default.nix         |  72 ---
 pkgs/data/fonts/nerdfonts/shas.nix            |  69 ---
 pkgs/data/fonts/nerdfonts/update.sh           |  26 -
 pkgs/data/fonts/nerdfonts/version.nix         |   1 -
 pkgs/top-level/aliases.nix                    |   4 +
 pkgs/top-level/all-packages.nix               |  13 +-
 14 files changed, 835 insertions(+), 182 deletions(-)
 create mode 100644 pkgs/data/fonts/nerd-fonts/convert-license.nix
 create mode 100644 pkgs/data/fonts/nerd-fonts/default.nix
 create mode 100644 pkgs/data/fonts/nerd-fonts/manifests/checksums.json
 create mode 100644 pkgs/data/fonts/nerd-fonts/manifests/fonts.json
 create mode 100644 pkgs/data/fonts/nerd-fonts/manifests/release.json
 create mode 100755 pkgs/data/fonts/nerd-fonts/update.py
 delete mode 100644 pkgs/data/fonts/nerdfonts/default.nix
 delete mode 100644 pkgs/data/fonts/nerdfonts/shas.nix
 delete mode 100755 pkgs/data/fonts/nerdfonts/update.sh
 delete mode 100644 pkgs/data/fonts/nerdfonts/version.nix

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 5deb33eeb99f..297f89c5a1e2 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -749,6 +749,11 @@
   - The `atlassian-crowd` package and its `services.crowd` NixOS module
   - The `atlassian-jira` package and its `services.jira` NixOS module
 
+- `nerdfonts` has been separated into individual font packages under the namespace `nerd-fonts`. The directories for font
+  files have changed from `$out/share/fonts/{opentype,truetype}/NerdFonts` to
+  `$out/share/fonts/{opentype,truetype}/NerdFonts/<fontDirName>`, where `<fontDirName>` can be found in the
+  [official website](https://www.nerdfonts.com/font-downloads) as the titles in preview images, with the "Nerd Font"
+  suffix and any whitespaces trimmed.
 
 - `python3Packages.nose` has been removed, as it has been deprecated and unmaintained for almost a decade and does not work on Python 3.12.
   Please switch to `pytest` or another test runner/framework.
diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index 70bb01e9346f..1d7bb4d71dd4 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -2,7 +2,7 @@
 , harfbuzz, fontconfig, pkg-config, ncurses, imagemagick
 , libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor
 , libxkbcommon, libXi, libXext, wayland-protocols, wayland, xxHash
-, nerdfonts
+, nerd-fonts
 , lcms2
 , librsync
 , openssl
@@ -144,7 +144,7 @@ buildPythonApplication rec {
 
     # Add the font by hand because fontconfig does not finds it in darwin
     mkdir ./fonts/
-    cp "${(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})}/share/fonts/truetype/NerdFonts/SymbolsNerdFontMono-Regular.ttf" ./fonts/
+    cp "${nerd-fonts.symbols-only}/share/fonts/truetype/NerdFonts/Symbols/SymbolsNerdFontMono-Regular.ttf" ./fonts/
 
     ${ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" }
     ${if stdenv.hostPlatform.isDarwin then ''
diff --git a/pkgs/data/fonts/nerd-fonts/convert-license.nix b/pkgs/data/fonts/nerd-fonts/convert-license.nix
new file mode 100644
index 000000000000..032be43e8c2e
--- /dev/null
+++ b/pkgs/data/fonts/nerd-fonts/convert-license.nix
@@ -0,0 +1,28 @@
+lib:
+let
+  ls = lib.licenses;
+in
+licenseString:
+builtins.getAttr licenseString (
+  (
+    with builtins;
+    lib.trivial.pipe (attrValues ls) [
+      (filter (l: l ? spdxId))
+      (map (l: lib.attrsets.nameValuePair l.spdxId l))
+      listToAttrs
+    ]
+  )
+  // {
+    "Bitstream-Vera AND MIT" = with ls; [
+      bitstreamVera
+      mit
+    ];
+    "LicenseRef-Monofur" = ls.free; # upstream `src/unpatched-fonts/Monofur/LICENSE.txt`
+    "LicenseRef-UbuntuFont" = ls.ufl;
+    "LicenseRef-VicFieger" = ls.free; # upstream `src/unpatched-fonts/HeavyData/Vic Fieger License.txt`
+    "MIT OR OFL-1.1-no-RFN" = ls.mit;
+    "OFL-1.1-RFN" = ls.ofl;
+    "OFL-1.1-no-RFN or LGPL-2.1-only" = ls.ofl;
+    "OFL-1.1-no-RFN" = ls.ofl;
+  }
+)
diff --git a/pkgs/data/fonts/nerd-fonts/default.nix b/pkgs/data/fonts/nerd-fonts/default.nix
new file mode 100644
index 000000000000..e7b2d449a554
--- /dev/null
+++ b/pkgs/data/fonts/nerd-fonts/default.nix
@@ -0,0 +1,94 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+}:
+
+let
+  releaseInfo = lib.trivial.importJSON ./manifests/release.json;
+  fontsInfo = lib.trivial.importJSON ./manifests/fonts.json;
+  checksums = lib.trivial.importJSON ./manifests/checksums.json;
+
+  convertAttrName =
+    name:
+    let
+      lowerName = lib.strings.toLower name;
+    in
+    if builtins.match "[[:digit:]].*" lowerName != null then "_" + lowerName else lowerName;
+
+  convertVersion =
+    version: date:
+    if builtins.match "[[:digit:]].*" version != null then
+      version
+    else
+      "0-unstable-" + builtins.head (lib.strings.splitString "T" date);
+
+  convertLicense = import ./convert-license.nix lib;
+
+  makeNerdFont =
+    {
+      caskName,
+      description,
+      folderName,
+      licenseId,
+      patchedName,
+      version,
+      ...
+    }:
+    stdenvNoCC.mkDerivation {
+      pname = lib.strings.toLower caskName;
+      version = convertVersion version releaseInfo.published_at;
+
+      src =
+        let
+          filename = folderName + ".tar.xz";
+          url = "https://github.com/ryanoasis/nerd-fonts/releases/download/${releaseInfo.tag_name}/${filename}";
+          sha256 = checksums.${filename};
+        in
+        fetchurl {
+          inherit url sha256;
+        };
+
+      sourceRoot = ".";
+
+      installPhase =
+        let
+          dirName = lib.strings.concatStrings (lib.strings.splitString " " patchedName);
+        in
+        ''
+          runHook preInstall
+
+          dst_opentype=$out/share/fonts/opentype/NerdFonts/${dirName}
+          dst_truetype=$out/share/fonts/truetype/NerdFonts/${dirName}
+
+          find -name \*.otf -exec mkdir -p $dst_opentype \; -exec cp -p {} $dst_opentype \;
+          find -name \*.ttf -exec mkdir -p $dst_truetype \; -exec cp -p {} $dst_truetype \;
+
+          runHook postInstall
+        '';
+
+      passthru.updateScript = {
+        command = ./update.py;
+        supportedFeatures = [ "commit" ];
+      };
+
+      meta = {
+        description = "Nerd Fonts: " + description;
+        license = convertLicense licenseId;
+        homepage = "https://nerdfonts.com/";
+        changelog = "https://github.com/ryanoasis/nerd-fonts/blob/${releaseInfo.tag_name}/changelog.md";
+        platforms = lib.platforms.all;
+        maintainers = with lib.maintainers; [
+          doronbehar
+          rc-zb
+        ];
+      };
+    };
+
+  nerdFonts = lib.trivial.pipe fontsInfo [
+    (map (font: lib.attrsets.nameValuePair (convertAttrName font.caskName) (makeNerdFont font)))
+    builtins.listToAttrs
+  ];
+in
+
+nerdFonts
diff --git a/pkgs/data/fonts/nerd-fonts/manifests/checksums.json b/pkgs/data/fonts/nerd-fonts/manifests/checksums.json
new file mode 100644
index 000000000000..d3d2c4af032b
--- /dev/null
+++ b/pkgs/data/fonts/nerd-fonts/manifests/checksums.json
@@ -0,0 +1,69 @@
+{
+  "0xProto.tar.xz": "cf165059645c02212fbdb5a27858056772d12a762468a0971c5bed3de88d0427",
+  "3270.tar.xz": "6168e416a4331e8d59d5436d9a3c8170f98ee044e2fe662cbf1d7bea612f927d",
+  "Agave.tar.xz": "c307d029f638a411834972569317a04b9d75e968a53b12e41c787db064a6bef7",
+  "AnonymousPro.tar.xz": "1e4b7f7c8528c9d43760eacdb5d423ad272f028cad5958e594a30486dce409d3",
+  "Arimo.tar.xz": "20f3bc015e46e4fe9f57cfe495eaa167b796e047df4f98676fe16649aba4ffb8",
+  "AurulentSansMono.tar.xz": "d71be5a39c772a58d2592e490784298753573ee47836633ade381f1eeee39c72",
+  "BigBlueTerminal.tar.xz": "432c4a9080038554a94a46f435cb1aca3d58e23deb445e5c39d2c740a9edac84",
+  "BitstreamVeraSansMono.tar.xz": "5328418c755f076363e46960f311c734c0939167ab02eb718a8fb7bcc1bbd2e8",
+  "CascadiaCode.tar.xz": "5af79aaebec3aa474c801e48aa2cb901cf1e9c03cbb3b6c189fed439e867e6e9",
+  "CascadiaMono.tar.xz": "9672540e8707d221fe48fa5da49aec5a605b2d38a85c9fed959eb76990b33367",
+  "CodeNewRoman.tar.xz": "45d29f5be8add78ae271550d542387f4c98bbbe62e395a3646bc67f66f9d3c5c",
+  "ComicShannsMono.tar.xz": "dc0835a985f19491526fb5773ad7d9646bbdb962cda5076615b686427fb565dc",
+  "CommitMono.tar.xz": "173f5a8fe5bb0a4e7db61ac9a77e97c7b5071b9b2a9f8dbaf8432311518a5f4a",
+  "Cousine.tar.xz": "b8f14c715bdcce4afafd9c4e57acba5b9d5c1c3357f054a505716187ae1e98b1",
+  "D2Coding.tar.xz": "c01665970a43c13b27ea1fb9c85055d9c2369b3f9f2d1b37c08ffeaad7830cb0",
+  "DaddyTimeMono.tar.xz": "6e7dd3ebdb82ee4a5b358801c082553692431e246c996dcbb3a737a28c78e4db",
+  "DejaVuSansMono.tar.xz": "b94bde4d2e9ceb1f2c19b2846c1a9892797e4e15e9594303eb7088534244a18b",
+  "DroidSansMono.tar.xz": "d3910065466618646baf9a621d385f8122c310e29d449462e5bd25bd300e0dd7",
+  "EnvyCodeR.tar.xz": "d1ca4f8bae74e089775a9ba6b2015ee79e03ec0970e76499f56131499524efa4",
+  "FantasqueSansMono.tar.xz": "2d6db874195ac7ec4d9b396a9612e1e342b060d8aef0304b0b99c49c3b9a351d",
+  "FiraCode.tar.xz": "def4b29f7aa0620a7fa12edb28197a2697680b5e21636fa3dcc602e08ae13bc4",
+  "FiraMono.tar.xz": "c0224b12e3da90550bb1c42a9149346326ebbc9f41cf83a5e6c8944e57772bc5",
+  "GeistMono.tar.xz": "0f247f19afece755de1a1b7b2eae38d48023ce4436323ab51f571d38314c6c73",
+  "Go-Mono.tar.xz": "44a4ce529f51dc5f067a10b851acd06a1dc7ea7d6af5ba8a420e057232c8d948",
+  "Gohu.tar.xz": "7ab613fac9d5931bd32d8e5a438ae0cb17536317e171f28ee5ddb8a171941041",
+  "Hack.tar.xz": "89b9023f3f6d5e4b8040022ff29b36faee440cf49015fda163215c922569b5f3",
+  "Hasklig.tar.xz": "4fb0ff16a5e587e65f59e55d08283729de700f0c0bf682ec1bef18ab51264ada",
+  "HeavyData.tar.xz": "f6b8a6cfb0d06bd25e7653c2ac18a562f53f6143eb131195a5fca4dde30d6aa8",
+  "Hermit.tar.xz": "23552caf1b6075858756de2e8f3a3fbb9799b478882f3f7afeefa8ca7f4601ae",
+  "IBMPlexMono.tar.xz": "97e2774a01a151fc2f711f018831d24777472daf0f2822230ce20a7ac227a041",
+  "Inconsolata.tar.xz": "2c9f5a1117e1b5a640287081680837e7b870c94868627766483011ff0b80c3f7",
+  "InconsolataGo.tar.xz": "69e0a42a6e8072b2a084f09a5056e857e9b620afd57d7d07c8d1da2cf4809b41",
+  "InconsolataLGC.tar.xz": "7a96f8cc30e57a426ffce3b844deb10d6325181b28df9b76735308f2d787dc2d",
+  "IntelOneMono.tar.xz": "a016b61e49c395c5b1e5bd2c919ae668724a33f2ef14da3becf932da401a080d",
+  "Iosevka.tar.xz": "1be123fa355a9acee79d19891c02499792f6a4e12ffa8973c6b1cb738465f337",
+  "IosevkaTerm.tar.xz": "b5d5e7b26c76f1cfe97a697716fdd682b18faf9f73883915c2b0c2d9fcc48cf5",
+  "IosevkaTermSlab.tar.xz": "3132ff085ce404a3c065054638f3dc68de27d07a5cc5379b90b2a248877971eb",
+  "JetBrainsMono.tar.xz": "6cf8822bc1ca18e34b06578c7499f380c019e6ffc883eed26df5f498dfcc4006",
+  "Lekton.tar.xz": "2282cb16651a377d5b084486a268189fdafd9067775f1f24ffaf5a36a2459501",
+  "LiberationMono.tar.xz": "9d0ad55cbd83967ca93e940f4951d41b23a44c892d9a4788af460d71f8bb81a4",
+  "Lilex.tar.xz": "a2720d1fbf7ebb51b6a0ab191de41d96c7594d61f02c582db2249ea30c1ce263",
+  "MPlus.tar.xz": "5c60700788b093e0bfb30b2f59b52397f3fdc2cdf2b6fb9307a58b61e7ddfe74",
+  "MartianMono.tar.xz": "62484ea8f66ae3b75610b89c5d3258f8610844fec6d8402239c27a5042dccc7d",
+  "Meslo.tar.xz": "1abdaf5542b75a51d75de6373148a8e401b28eda88e6c90f243fb6114fd659ea",
+  "Monaspace.tar.xz": "e5d2e8180d5df1fe473b598edac5f67ce38b1d906248936eb386dd332a338346",
+  "Monofur.tar.xz": "eb035bfb09043db2278dd6f95ca956a7cc42a3e6cc30910295c51555b2e8ff81",
+  "Monoid.tar.xz": "c7a5ff556ff4aad5381e8a57e0d17d79c591e1267f0a9c271b09306ac4581aba",
+  "Mononoki.tar.xz": "eb3697dd13c5e50951023c0768538a2f70e1e4f22d94800a45779a6d1b49f7a3",
+  "NerdFontsSymbolsOnly.tar.xz": "b7a3eee24d2b0910f3a07705f1e053221d2535f07c5a13614c4dead2620e9978",
+  "Noto.tar.xz": "4be621219ff5508c4176487b4fdc8cd0f6d8d8fceeb935f83df11a49dca3096f",
+  "OpenDyslexic.tar.xz": "96d43a8c53173b992537a1d34ae984f65a8999b7c8991a02c17d4b77497581fa",
+  "Overpass.tar.xz": "fcb796892b105c98ad05a29f184f09a02038970ff6a95f8cda082cd1b1b08cde",
+  "ProFont.tar.xz": "fe3bd035d43b943de17e6e0da1dfb0bd1dcc1b319e10c5e5925ab70436d48385",
+  "ProggyClean.tar.xz": "1a58c57b63f380441ea07d44780680844afe12dd299651b87db59f9f311702d1",
+  "Recursive.tar.xz": "e5f7db6999bf6dd6501d8933575caab49827486ce774c6c35a6e411da8c6cfba",
+  "RobotoMono.tar.xz": "3ccfd4d8d625c708e593e46ea0404536984f69f11c7a08b5a59eb9bbc9dfde3c",
+  "ShareTechMono.tar.xz": "dbcfa99f4d41f05e4b59eb2197873515c035eff1a68800bf0f43db471ef7ba57",
+  "SourceCodePro.tar.xz": "56a43a2729035f7fec17b68823a7db9ea06fcf9ec8d0b5e70d73ab79488a1b21",
+  "SpaceMono.tar.xz": "b6b9d7c604cc55d2c6859ad098371dfbfe540eb2d5aab4faad21f81149659338",
+  "Terminus.tar.xz": "658cc9506acf89b5f5dfc6b55eb9899b782dcf8d89f3d11c9abb2c4d52617f12",
+  "Tinos.tar.xz": "21b43c2314614733f5e9b4b4f3117edc3986d2b0f2a33409b111cc38360e8391",
+  "Ubuntu.tar.xz": "6a254d48c837974e7c43fb92124e8e057c1d4b31c9ebe635f5c562233a24f3ad",
+  "UbuntuMono.tar.xz": "2b678521c5c8a963ba2c8f7846e21df4323838c64d70d59cb1ff38124d7f7396",
+  "UbuntuSans.tar.xz": "3ef8c7ca298d5528cf4296298ab67d7c5c2ba00030735db4851cea8f52d8444a",
+  "VictorMono.tar.xz": "aa1b09dca861a306cd24c2c47fded88b63ae833ff0e815dad3642465583e300f",
+  "ZedMono.tar.xz": "2df9c9e54e5a2bc19c2ffd1df7ee283e02ba2e9a5fda1067b4884375ae4b0b7a",
+  "iA-Writer.tar.xz": "85b0b39b30a9ddd89462b0a7a732b461de04f667dc01a5e987bf0c2accbb576f"
+}
\ No newline at end of file
diff --git a/pkgs/data/fonts/nerd-fonts/manifests/fonts.json b/pkgs/data/fonts/nerd-fonts/manifests/fonts.json
new file mode 100644
index 000000000000..295310993e4b
--- /dev/null
+++ b/pkgs/data/fonts/nerd-fonts/manifests/fonts.json
@@ -0,0 +1,538 @@
+[
+  {
+    "caskName": "0xproto",
+    "description": "An opinionated font for software engineers",
+    "folderName": "0xProto",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "0xProto",
+    "version": "1.603"
+  },
+  {
+    "caskName": "3270",
+    "description": "Derived from the x3270 font, a modern format of a font with high nostalgic value",
+    "folderName": "3270",
+    "licenseId": "BSD-3-Clause",
+    "patchedName": "3270",
+    "version": "3.0.1"
+  },
+  {
+    "caskName": "agave",
+    "description": "A small, monospace, outline font that is geometrically regular and simple",
+    "folderName": "Agave",
+    "licenseId": "MIT",
+    "patchedName": "Agave",
+    "version": "37"
+  },
+  {
+    "caskName": "anonymice",
+    "description": "Inspired by Anonymous 9 on Macintosh, since 2009, distinct `O`, `0`, `I`, `l`, `1`",
+    "folderName": "AnonymousPro",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "AnonymicePro",
+    "version": "1.002"
+  },
+  {
+    "caskName": "arimo",
+    "description": "Metrically similar to Arial, pan-European WGL character set, sans serif",
+    "folderName": "Arimo",
+    "licenseId": "Apache-2.0",
+    "patchedName": "Arimo",
+    "version": "1.33"
+  },
+  {
+    "caskName": "aurulent-sans-mono",
+    "description": "Sans serif, designed by Stephen G. Hartke which also created Verily Serif",
+    "folderName": "AurulentSansMono",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "AurulentSansM",
+    "version": "-"
+  },
+  {
+    "caskName": "bigblue-terminal",
+    "description": "Nostalgic, closely based on IBM's 8x14 EGA/VGA charset",
+    "folderName": "BigBlueTerminal",
+    "licenseId": "CC-BY-SA-4.0",
+    "patchedName": "BigBlueTerm",
+    "version": "-"
+  },
+  {
+    "caskName": "bitstream-vera-sans-mono",
+    "description": "Dotted zero, compact lowercase characters",
+    "folderName": "BitstreamVeraSansMono",
+    "licenseId": "Bitstream-Vera",
+    "patchedName": "BitstromWera",
+    "version": "1.1"
+  },
+  {
+    "caskName": "blex-mono",
+    "description": "It's global, it's versatile and it's distinctly IBM",
+    "folderName": "IBMPlexMono",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "BlexMono",
+    "version": "2.004 (6.4.0)"
+  },
+  {
+    "caskName": "caskaydia-cove",
+    "description": "A fun, new monospaced font that includes programming ligatures and is designed to enhance the modern look and feel of the Windows Terminal",
+    "folderName": "CascadiaCode",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "CaskaydiaCove",
+    "version": "2111.01"
+  },
+  {
+    "caskName": "caskaydia-mono",
+    "description": "Like Cascadia Code but without any ligatures",
+    "folderName": "CascadiaMono",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "CaskaydiaMono",
+    "version": "2111.01"
+  },
+  {
+    "caskName": "code-new-roman",
+    "description": "Tunable, slashed zeros, compact smaller characters",
+    "folderName": "CodeNewRoman",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "CodeNewRoman",
+    "version": "2.0"
+  },
+  {
+    "caskName": "comic-shanns-mono",
+    "description": "The very typeface you\u2019ve been trained to recognize since childhood",
+    "folderName": "ComicShannsMono",
+    "licenseId": "MIT",
+    "patchedName": "ComicShannsMono",
+    "version": "1.3.1"
+  },
+  {
+    "caskName": "commit-mono",
+    "description": "An anonymous and neutral programming typeface",
+    "folderName": "CommitMono",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "CommitMono",
+    "version": "1.143"
+  },
+  {
+    "caskName": "cousine",
+    "description": "Similar to Courier New with better readablitiy, dotted zeros",
+    "folderName": "Cousine",
+    "licenseId": "Apache-2.0",
+    "patchedName": "Cousine",
+    "version": "1.211"
+  },
+  {
+    "caskName": "d2coding",
+    "description": "A coding font for Koreans. This is the variant with ligatures.",
+    "folderName": "D2Coding",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "D2CodingLigature",
+    "version": "1.3.2"
+  },
+  {
+    "caskName": "daddy-time-mono",
+    "description": "A monospaced font for programmers and other terminal groupies",
+    "folderName": "DaddyTimeMono",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "DaddyTimeMono",
+    "version": "1.2.3"
+  },
+  {
+    "caskName": "dejavu-sans-mono",
+    "description": "Dotted zero, based on the Bitstream Vera Fonts with a wider range of character",
+    "folderName": "DejaVuSansMono",
+    "licenseId": "Bitstream-Vera",
+    "patchedName": "DejaVuSansM",
+    "version": "2.37"
+  },
+  {
+    "caskName": "droid-sans-mono",
+    "description": "Good for small screens or font sizes",
+    "folderName": "DroidSansMono",
+    "licenseId": "Apache-2.0",
+    "patchedName": "DroidSansM",
+    "version": "1.00-113"
+  },
+  {
+    "caskName": "envy-code-r",
+    "description": "Fully-scalable monospaced font designed for programming and command prompts",
+    "folderName": "EnvyCodeR",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "EnvyCodeR",
+    "version": "0.79"
+  },
+  {
+    "caskName": "fantasque-sans-mono",
+    "description": "\"Wibbly-wobbly handwriting-like fuzziness\", takes some inspiration from Inconsolata and Monaco",
+    "folderName": "FantasqueSansMono",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "FantasqueSansM",
+    "version": "1.8.0"
+  },
+  {
+    "caskName": "fira-code",
+    "description": "Programming ligatures, extension of Fira Mono font, enlarged operators",
+    "folderName": "FiraCode",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "FiraCode",
+    "version": "6.2"
+  },
+  {
+    "caskName": "fira-mono",
+    "description": "Mozilla typeface, dotted zero",
+    "folderName": "FiraMono",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "FiraMono",
+    "version": "3.206"
+  },
+  {
+    "caskName": "geist-mono",
+    "description": "Monospaced typeface designed to be used in code editors, diagrams, terminals, and other textbased interfaces where code is represented",
+    "folderName": "GeistMono",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "GeistMono",
+    "version": "1.2.0 (1.3.0)"
+  },
+  {
+    "caskName": "go-mono",
+    "description": "Created specifically for the Go project, looks particularly clear for use with the Go language",
+    "folderName": "Go-Mono",
+    "licenseId": "BSD-3-Clause-Clear",
+    "patchedName": "GoMono",
+    "version": "2.010"
+  },
+  {
+    "caskName": "gohufont",
+    "description": "Bitmap font, tall capitals and ascenders, small serifs",
+    "folderName": "Gohu",
+    "licenseId": "WTFPL",
+    "patchedName": "GohuFont",
+    "version": "2.0"
+  },
+  {
+    "caskName": "hack",
+    "description": "Dotted zero, short descenders, expands upon work done for Bitstream Vera &amp; DejaVu, legible at common sizes",
+    "folderName": "Hack",
+    "licenseId": "Bitstream-Vera AND MIT",
+    "patchedName": "Hack",
+    "version": "3.003"
+  },
+  {
+    "caskName": "hasklug",
+    "description": "Monospaced ligatures, makes composite glyphs (e.g. ->) more reabable, especially in Haskell",
+    "folderName": "Hasklig",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "Hasklug",
+    "version": "1.2"
+  },
+  {
+    "caskName": "heavy-data",
+    "description": "Novel and unique design, dotted zero",
+    "folderName": "HeavyData",
+    "licenseId": "LicenseRef-VicFieger",
+    "patchedName": "HeavyData",
+    "version": "1"
+  },
+  {
+    "caskName": "hurmit",
+    "description": "Symbols stand out from common text",
+    "folderName": "Hermit",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "Hurmit",
+    "version": "2.0"
+  },
+  {
+    "caskName": "im-writing",
+    "description": "A heavy modification of IBM's Plex font",
+    "folderName": "iA-Writer",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "iMWriting",
+    "version": "Dec 2018"
+  },
+  {
+    "caskName": "inconsolata",
+    "description": "Slashed zero, takes inspiration from many different fonts and glyphs, subtle curves in lowercase",
+    "folderName": "Inconsolata",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "Inconsolata",
+    "version": "3.000"
+  },
+  {
+    "caskName": "inconsolata-go",
+    "description": "Inconsolata with straight quotes",
+    "folderName": "InconsolataGo",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "InconsolataGo",
+    "version": "1.013"
+  },
+  {
+    "caskName": "inconsolata-lgc",
+    "description": "Inconsolata with added the Cyrillic alphabet",
+    "folderName": "InconsolataLGC",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "Inconsolata LGC",
+    "version": "1.5.2"
+  },
+  {
+    "caskName": "intone-mono",
+    "description": "Expressive monospaced font family that\u2019s built with clarity, legibility, and the needs of developers in mind",
+    "folderName": "IntelOneMono",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "IntoneMono",
+    "version": "1.3.0"
+  },
+  {
+    "caskName": "iosevka",
+    "description": "Narrow and horizontally tight characters, slashed zero",
+    "folderName": "Iosevka",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "Iosevka",
+    "version": "29.0.4"
+  },
+  {
+    "caskName": "iosevka-term",
+    "description": "A narrower variant focusing terminal uses: Arrows and geometric symbols will be narrow to follow typical terminal usages",
+    "folderName": "IosevkaTerm",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "IosevkaTerm",
+    "version": "29.0.4"
+  },
+  {
+    "caskName": "iosevka-term-slab",
+    "description": "Nice as Iosevka but with slab serifs",
+    "folderName": "IosevkaTermSlab",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "IosevkaTermSlab",
+    "version": "29.0.4"
+  },
+  {
+    "caskName": "jetbrains-mono",
+    "description": "JetBrains officially created font for developers",
+    "folderName": "JetBrainsMono",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "JetBrainsMono",
+    "version": "2.304"
+  },
+  {
+    "caskName": "lekton",
+    "description": "Very light and thin characters, sharp m's, `0` and `O` very similar",
+    "folderName": "Lekton",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "Lekton",
+    "version": "34"
+  },
+  {
+    "caskName": "liberation",
+    "description": "`0` and `O` very similar, very short tight descenders",
+    "folderName": "LiberationMono",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "LiterationMono",
+    "version": "2.1.5"
+  },
+  {
+    "caskName": "lilex",
+    "description": "Modern with ligatures",
+    "folderName": "Lilex",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "Lilex",
+    "version": "2.400"
+  },
+  {
+    "caskName": "martian-mono",
+    "description": "Free and open-source monospaced font from Evil Martians",
+    "folderName": "MartianMono",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "MartianMono",
+    "version": "1.0.0"
+  },
+  {
+    "caskName": "meslo-lg",
+    "description": "Slashed zeros, customized version of Apple's Menlo",
+    "folderName": "Meslo",
+    "licenseId": "Apache-2.0",
+    "patchedName": "MesloLG",
+    "version": "1.21"
+  },
+  {
+    "caskName": "monaspace",
+    "description": "Five matching fonts all having 'texture healing' to improve legibility",
+    "folderName": "Monaspace",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "Monaspice",
+    "version": "1.0.0"
+  },
+  {
+    "caskName": "monofur",
+    "description": "Dotted zeros, slightly exaggerated curvy characters, compact characters",
+    "folderName": "Monofur",
+    "licenseId": "LicenseRef-Monofur",
+    "patchedName": "Monofur",
+    "version": "1.0"
+  },
+  {
+    "caskName": "monoid",
+    "description": "Ligatures, distinguishable glyphs with short ascenders &amp; descenders, large operators &amp; punctuation",
+    "folderName": "Monoid",
+    "licenseId": "MIT OR OFL-1.1-no-RFN",
+    "patchedName": "Monoid",
+    "version": "0.61"
+  },
+  {
+    "caskName": "mononoki",
+    "description": "Keeps in mind differentiation of characters and resolution sizes",
+    "folderName": "Mononoki",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "Mononoki",
+    "version": "1.6"
+  },
+  {
+    "caskName": "mplus",
+    "description": "Multiple styles and weights, many glyph sets (e.g. Kana glyphs)",
+    "folderName": "MPlus",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "M+",
+    "version": "2023/09"
+  },
+  {
+    "caskName": "noto",
+    "description": "`0` and `O` very similar, characters are either very curvy or straight lined",
+    "folderName": "Noto",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "Noto",
+    "version": "div"
+  },
+  {
+    "caskName": "open-dyslexic",
+    "description": "Designed specifically to alleviate reading errors caused by dyslexia",
+    "folderName": "OpenDyslexic",
+    "licenseId": "Bitstream-Vera",
+    "patchedName": "OpenDyslexic",
+    "version": "2.001"
+  },
+  {
+    "caskName": "overpass",
+    "description": "An open source font family inspired by Highway Gothic",
+    "folderName": "Overpass",
+    "licenseId": "OFL-1.1-no-RFN or LGPL-2.1-only",
+    "patchedName": "Overpass",
+    "version": "3.0.5"
+  },
+  {
+    "caskName": "profont",
+    "description": "Looks best with anti-aliasing turned off, squared off character corners, vertically tight small `s`",
+    "folderName": "ProFont",
+    "licenseId": "MIT",
+    "patchedName": "ProFont",
+    "version": "2.3/2.2"
+  },
+  {
+    "caskName": "proggy-clean-tt",
+    "description": "Designed particularly for use at small point sizes",
+    "folderName": "ProggyClean",
+    "licenseId": "MIT",
+    "patchedName": "ProggyClean",
+    "version": "2004/04/15"
+  },
+  {
+    "caskName": "recursive-mono",
+    "description": "inspired by casual script signpainting, 4 variants",
+    "folderName": "Recursive",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "RecMono",
+    "version": "1.085"
+  },
+  {
+    "caskName": "roboto-mono",
+    "description": "Dashed zero, curved and straight character lines",
+    "folderName": "RobotoMono",
+    "licenseId": "Apache-2.0",
+    "patchedName": "RobotoMono",
+    "version": "3.0"
+  },
+  {
+    "caskName": "shure-tech-mono",
+    "description": "Dotted zeros, distinguishable 1 and l, curved and straight character lines",
+    "folderName": "ShareTechMono",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "ShureTechMono",
+    "version": "1.003"
+  },
+  {
+    "caskName": "sauce-code-pro",
+    "description": "Monospaced font family for user interface and coding environments",
+    "folderName": "SourceCodePro",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "SauceCodePro",
+    "version": "2.042"
+  },
+  {
+    "caskName": "space-mono",
+    "description": "Squarish character lines, dotted zero, aggressive parethesis",
+    "folderName": "SpaceMono",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "SpaceMono",
+    "version": "1.001"
+  },
+  {
+    "caskName": "symbols-only",
+    "description": "Just the Nerd Font Icons. I.e Symbol font only",
+    "folderName": "NerdFontsSymbolsOnly",
+    "licenseId": "MIT",
+    "patchedName": "Symbols",
+    "version": "latest"
+  },
+  {
+    "caskName": "terminess-ttf",
+    "description": "Squarish characters that are slightly askew",
+    "folderName": "Terminus",
+    "licenseId": "OFL-1.1-RFN",
+    "patchedName": "Terminess",
+    "version": "4.49.2"
+  },
+  {
+    "caskName": "tinos",
+    "description": "Some similarities to Times New Roman, designed by Steve Matteson, includes pan-European WGL character set",
+    "folderName": "Tinos",
+    "licenseId": "Apache-2.0",
+    "patchedName": "Tinos",
+    "version": "1.23"
+  },
+  {
+    "caskName": "ubuntu",
+    "description": "Specially created for Ubuntu",
+    "folderName": "Ubuntu",
+    "licenseId": "LicenseRef-UbuntuFont",
+    "patchedName": "Ubuntu",
+    "version": "0.83"
+  },
+  {
+    "caskName": "ubuntu-mono",
+    "description": "Dotted zeros, used the `n`, `o`, `H` &amp; `O` Latin characters as a base for design",
+    "folderName": "UbuntuMono",
+    "licenseId": "LicenseRef-UbuntuFont",
+    "patchedName": "UbuntuMono",
+    "version": "0.80"
+  },
+  {
+    "caskName": "ubuntu-sans",
+    "description": "Refreshed version of Ubuntu and Ubuntu Mono fonts",
+    "folderName": "UbuntuSans",
+    "licenseId": "LicenseRef-UbuntuFont",
+    "patchedName": "UbuntuSans",
+    "version": "1.004"
+  },
+  {
+    "caskName": "victor-mono",
+    "description": "Clean, crisp and narrow, with a large x-height and clear punctuation",
+    "folderName": "VictorMono",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "VictorMono",
+    "version": "1.5.6"
+  },
+  {
+    "caskName": "zed-mono",
+    "description": "Zed Mono is a more rounded version of Iosevka",
+    "folderName": "ZedMono",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "ZedMono",
+    "version": "1.2.0"
+  }
+]
\ No newline at end of file
diff --git a/pkgs/data/fonts/nerd-fonts/manifests/release.json b/pkgs/data/fonts/nerd-fonts/manifests/release.json
new file mode 100644
index 000000000000..e95c302f606d
--- /dev/null
+++ b/pkgs/data/fonts/nerd-fonts/manifests/release.json
@@ -0,0 +1,4 @@
+{
+  "tag_name": "v3.2.1",
+  "published_at": "2024-04-12Tbla"
+}
\ No newline at end of file
diff --git a/pkgs/data/fonts/nerd-fonts/update.py b/pkgs/data/fonts/nerd-fonts/update.py
new file mode 100755
index 000000000000..315609da9bf8
--- /dev/null
+++ b/pkgs/data/fonts/nerd-fonts/update.py
@@ -0,0 +1,90 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -p python3 -i python3
+import os
+import urllib.request as ureq
+import json
+
+if not all(
+    f"UPDATE_NIX_{v}" in os.environ
+    for v in ["NAME", "PNAME", "OLD_VERSION", "ATTR_PATH"]
+) or not os.environ['UPDATE_NIX_ATTR_PATH'].startswith("nerd-fonts."):
+    raise Exception(
+        "Please don't run this script manually, only with:\n"
+        "nix-shell maintainers/scripts/update.nix --argstr path nerd-fonts "
+        "--argstr commit true"
+    )
+
+RELEASE_INFO_URL = "https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest"
+FONTS_INFO_URL_TEMPLATE = "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/refs/tags/{}/bin/scripts/lib/fonts.json"
+SHA256_URL_TEMPLATE = "https://github.com/ryanoasis/nerd-fonts/releases/download/{}/SHA-256.txt"
+
+RELEASE_INFO_FILENAME = "release.json"
+FONTS_INFO_FILENAME = "fonts.json"
+CHECKSUMS_FILENAME = "checksums.json"
+
+def fetchjson(url):
+    with ureq.urlopen(url) as r:
+        return json.loads(r.read())
+
+def storejson(path, obj):
+    with open(path, "w", encoding="utf-8") as f:
+        json.dump(obj, f, indent=2)
+        # Needed to satisfy EditorConfig's rules
+        f.write('\n')
+
+def slicedict(d, ks):
+    return {k: d[k] for k in ks}
+
+os.chdir(os.path.join(os.path.dirname(os.path.abspath(__file__)), "manifests"))
+
+release_info = slicedict(
+    fetchjson(RELEASE_INFO_URL),
+    ["tag_name", "published_at"]
+)
+
+tag_name = release_info["tag_name"]
+with open(RELEASE_INFO_FILENAME, "r", encoding="utf-8") as f:
+    former_tag_name = json.load(f)["tag_name"]
+if tag_name == former_tag_name:
+    raise Exception("no newer version available")
+# See: https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#supported-features
+print(json.dumps(
+    [
+        {
+            "attrPath": "nerd-fonts",
+            "oldVersion": former_tag_name.removeprefix("v"),
+            "newVersion": tag_name.removeprefix("v"),
+        },
+    ],
+    indent=2
+))
+
+storejson(RELEASE_INFO_FILENAME, release_info)
+
+storejson(
+    FONTS_INFO_FILENAME,
+    [
+        slicedict(
+            item,
+            [
+                "caskName",
+                "description",
+                "folderName",
+                "licenseId",
+                "patchedName",
+                "version",
+            ]
+        )
+        for item in fetchjson(FONTS_INFO_URL_TEMPLATE.format(tag_name))["fonts"]
+    ],
+)
+
+storejson(
+    CHECKSUMS_FILENAME,
+    {
+        filename: sha256
+        for row in ureq.urlopen(SHA256_URL_TEMPLATE.format(tag_name))
+        for sha256, filename in [row.decode('utf-8').split()]
+        if filename.endswith(".tar.xz")
+    },
+)
diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix
deleted file mode 100644
index b2576d0fca46..000000000000
--- a/pkgs/data/fonts/nerdfonts/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ stdenv
-, fetchurl
-, lib
-# To select only certain fonts, put a list of strings to `fonts`: every key in
-# ./shas.nix is an optional font
-, fonts ? []
-# Whether to enable Windows font variants, their internal font name is limited
-# to 31 characters
-, enableWindowsFonts ? false
-}:
-
-let
-  # both of these files are generated via ./update.sh
-  version = import ./version.nix;
-  fontsShas = import ./shas.nix;
-  knownFonts = builtins.attrNames fontsShas;
-  selectedFonts = if (fonts == []) then
-    knownFonts
-  else
-    let unknown = lib.subtractLists knownFonts fonts; in
-    if (unknown != []) then
-      throw "Unknown font(s): ${lib.concatStringsSep " " unknown}"
-    else
-      fonts
-  ;
-  selectedFontsShas = lib.attrsets.genAttrs selectedFonts (
-    fName:
-    fontsShas."${fName}"
-  );
-  srcs = lib.attrsets.mapAttrsToList (
-    fName:
-    fSha:
-    (fetchurl {
-      url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/${fName}.tar.xz";
-      sha256 = fSha;
-    })
-  ) selectedFontsShas;
-in
-
-stdenv.mkDerivation (finalAttrs: {
-  inherit version;
-  inherit srcs;
-  pname = "nerdfonts";
-  sourceRoot = ".";
-  buildPhase = ''
-    echo "selected fonts are ${toString selectedFonts}"
-    ls *.otf *.ttf
-  '';
-  installPhase = ''
-    find -name \*.otf -exec mkdir -p $out/share/fonts/opentype/NerdFonts \; -exec mv {} $out/share/fonts/opentype/NerdFonts \;
-    find -name \*.ttf -exec mkdir -p $out/share/fonts/truetype/NerdFonts \; -exec mv {} $out/share/fonts/truetype/NerdFonts \;
-    ${lib.optionalString (! enableWindowsFonts) ''
-      rm -rfv $out/share/fonts/opentype/NerdFonts/*Windows\ Compatible.*
-      rm -rfv $out/share/fonts/truetype/NerdFonts/*Windows\ Compatible.*
-    ''}
-  '';
-  passthru.updateScript = ./update.sh;
-
-  meta = with lib; {
-    description = "Iconic font aggregator, collection, & patcher. 3,600+ icons, 50+ patched fonts";
-    longDescription = ''
-      Nerd Fonts is a project that attempts to patch as many developer targeted
-      and/or used fonts as possible. The patch is to specifically add a high
-      number of additional glyphs from popular 'iconic fonts' such as Font
-      Awesome, Devicons, Octicons, and others.
-    '';
-    homepage = "https://nerdfonts.com/";
-    license = licenses.mit;
-    maintainers = with maintainers; [ doronbehar ];
-    hydraPlatforms = []; # 'Output limit exceeded' on Hydra
-  };
-})
diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/data/fonts/nerdfonts/shas.nix
deleted file mode 100644
index b7ad0b67aa1b..000000000000
--- a/pkgs/data/fonts/nerdfonts/shas.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "0xProto" = "09q4ipl3vvav3jbs0s14fqmd2wk70mc7i8mmplpj20jwcicm05ng";
-  "3270" = "0zcj5xhylyqxpwn6dzp28kh8xybhh4y9lva3smcqs7iklhbf8s31";
-  "Agave" = "1xxylrjb0zbq3kj14fx5d3lpb7abl0br6mkj961i391qyqlx01y3";
-  "AnonymousPro" = "1lq9wkf8c153jkjmhnddih12y9xd4gabbkgac0vx9j98hmy7yjqy";
-  "Arimo" = "1f7zljmljrp1dxkrhkyz8zh9ddv7l7m9br6gaygzxr26bq0vrwr0";
-  "AurulentSansMono" = "0wlwwgp1w7rqvqx66dkqwhz5flw75620fj9fb795hakpkjiya6yp";
-  "BigBlueTerminal" = "115cxnll1iyj75f5wi7b7pi5hgfa3b5kbx269alm9183h284lb23";
-  "BitstreamVeraSansMono" = "1s6jpg0vrdwgi9qyn0mbcy8r7h1lqw8z6q39wiin61szfn642a2k";
-  "CascadiaCode" = "1sg6czl3km7yi70vdcyb0ff1xkq1p4nalj0yh164gan3psp9mxss";
-  "CascadiaMono" = "0rrknf86kdwyjpnryp5870nmnq2sxjda8pgs93z23lh7hw758wln";
-  "CodeNewRoman" = "0p1wkmpzcrxw8qv5lf9fwsxqpjglhwim83amf7i8mmxdx1drzlj5";
-  "ComicShannsMono" = "1p35nmzl51mn2mk0g9fdcawvssv4v7bklxxmdx99357ihnlka26w";
-  "CommitMono" = "0jjzi98i28s3z2x8v7rakcdhgdf7jxzagj8snrylw2mvwn7mlgqp";
-  "Cousine" = "1ccq3sp8fqbi0njm9w2p6cf5r7avpan5fklwzpx4mknwbdqlrwdq";
-  "D2Coding" = "1c0chgbsmzlgq0vinbcz7ydkdhnram8cif8zx8kkpha31abna5n0";
-  "DaddyTimeMono" = "1nz4g26a4dx7ng5nv6bc4hg474inan1c00c86mdlmvl2vgmx6zbf";
-  "DejaVuSansMono" = "12x18i15723hxc1l6ng92m77wycjk0d6r15j34n1zsww5r6xwjxr";
-  "DroidSansMono" = "1mqd1qqbs9dxwmi98i4xw88c68l1bww1sqlsmxmn86368rjh14fk";
-  "EnvyCodeR" = "197g4jaljcb1yncn9rvh17n077p7bq0v59lvb9vqkq3lms5lzjni";
-  "FantasqueSansMono" = "079mk8xrri4r1d5k1w5fv1hb0hp3w499csirkd6yriss35sbhv9d";
-  "FiraCode" = "1i1vw65f00n6vjinyqr1bq5ni5r6g8cjinrfl5zhlqm0gagv5x6y";
-  "FiraMono" = "1i9bfxblx568wsjq7ks1kyyfn9k36i4r2an4n45mb46swc94n8n0";
-  "GeistMono" = "0wvc9hqkh7ap3ysklcin8k72706l72p2wyqv3bg5brzcmwcpy90g";
-  "Go-Mono" = "0j6rr0r7418f8a5bmxbagpmcf7bas2n53f0hg835zp2ikx9cx924";
-  "Gohu" = "0h8hjiqs3f6xwn7g4wg12xim65ybw2546nlf5p9ip4ymr7x17dks";
-  "Hack" = "1wxmd4jr4p11cfhzs5chyh649vps6sdz4bq28204npkd7wzh5fc9";
-  "Hasklig" = "1nja4r8sn67g3gn85xhb1h7p1pi96wl0hpg5b5gyd1z5llbgzc2g";
-  "HeavyData" = "1a3a1pixv97wlnai24zb8dhkzxb2llcarhjkfrgd4syhn37sdf7n";
-  "Hermit" = "1bh18rzwma7gzrx3ybw8g2s9k5xv7wx8ybnyas3qaxb03fpjqm93";
-  "iA-Writer" = "0vsppg62l35zhzlsa0fwczv09pk1nhrag9xhcaadipd962dv7c45";
-  "IBMPlexMono" = "0hd04z17l2p21hij4a0gmwnlfxs7s8qqh08zf4pzqld10557gqlp";
-  "Inconsolata" = "1xy3h05zy49h91k7fqk8934p1f776w46i0bh510addg12w8mm7rc";
-  "InconsolataGo" = "0hcvh3s2rnnir03pszfmmwhbdsapx1b516phhjhb4wl0dqma9q39";
-  "InconsolataLGC" = "0bfwhzbz422kfdv9ppr83cc2aqqdn7g49f73zipl4yp5636gi5ks";
-  "IntelOneMono" = "0388390dlcprxhxxl57gy8rllwk8wsd92b5xwnqwb5f394gbc5m0";
-  "Iosevka" = "0dzkcn277jxiqrrqkyigw6jgd4lp9411r28rkpkwx6js6px27q8v";
-  "IosevkaTerm" = "1xccqkydkhmhq8akk23kkypqzcc2svyicxv9gblwzwbndjrfgmdm";
-  "IosevkaTermSlab" = "1svig63li8mjj2dkgiawgb82gpk8vkrkhih5cp0a6174bh4gycii";
-  "JetBrainsMono" = "01j0rkgrix7mdp9fx0y8zzk1kh40yfcp932p0r5y666aq4mq5y3c";
-  "Lekton" = "00cm8ni3cnmgzwj1ypvpcy8gvnlz31la51j411dpsdqsclbcp0i2";
-  "LiberationMono" = "1941pgw723a6my44g6idi56a88qvsi8lj3wl7slpr5l3pmfda2lx";
-  "Lilex" = "0qz23h6a77i4n8nmhb7hc56mkiwn3pj1s6dbl2v53fvypwghswm2";
-  "MartianMono" = "0zfcvi150yn274i41n66zr20hqgqb0r5v75q21bbgqvaysl4wj32";
-  "Meslo" = "1sjrsr7i3diz4h7wkrl8va7b40g4m1432dz6bpbm2nmp89aszg8s";
-  "Monaspace" = "0il36cm37pc6ndp96j32j0fqpqvwyv2xm3jr7d3zxwax1lcfilp5";
-  "Monofur" = "10gzx2r5a5f5jl192c6cwsil5k57aslmryfnilkv4g8417xmn0zb";
-  "Monoid" = "1fhsb326lc093ckrq2kz4vhr3ibrgp8y0mwa3qwdbapldxazz9f7";
-  "Mononoki" = "18zp94dnv6kp8l58151dybjf2w1gi99nh1rw098hkrf52gfrfdpb";
-  "MPlus" = "0x7yvpkn32x50y9zpdpjrp1gvwwp4fsmjbqbnfzy14xhi03p0q2w";
-  "NerdFontsSymbolsOnly" = "0y4r1rid5sjd9ihi6nkwy0sja792aghg21bpl3ri029b9pifx8xp";
-  "Noto" = "0vq9lgf4j6pi7pw3bfgfzkcdixnhikf4yys8fr0qql7mkwhj3rjb";
-  "OpenDyslexic" = "1yl1fm4pfjvxq411m6f8nycqjnpnhkllmlx16wjrjfqpaf63mm4n";
-  "Overpass" = "1plcn2qx2b08va65zagn1ybkh850157ii7x20nnrhp0h5f4rddzw";
-  "ProFont" = "11c3shv09dssjbjwa44y64dwq7dxn3gs23bfgvhkv51vshsx0fzy";
-  "ProggyClean" = "1l822wqrz7xmgnw535i9vl9gwjl4h037hi3xl0g4907kcdxwan0s";
-  "Recursive" = "1fngqsl1shbfbb1wcx77di42g65lm9f5fcw93m8dcvdzk5lxpxz5";
-  "RobotoMono" = "0g6yvz4vpfcylnshhyhwy5llz61n8m0a0vp4jgjhiir5svcd9krw";
-  "ShareTechMono" = "0mxsywg4gns31yzh1256y7pkbh0m6n3rf8gbb55mxw219ngskkyv";
-  "SourceCodePro" = "088vi947kavk1pkvbl68kv7nz84yvfkj725n2zn7ypq354kkm92n";
-  "SpaceMono" = "0f4kcm4i3y11mpxb9anmn8759zpv3lvril4shp3d4mfc0k3dgfdn";
-  "Terminus" = "04kzc594sb5vk8fd3ww9ip7jsy4vi6wmxdf6vzsvb2fgd98ck335";
-  "Tinos" = "14c31qv3ik0in44k98zjn398cffwgq8z7d5lx7sk6iv12hikrd11";
-  "Ubuntu" = "1bgk4hx26qn5ylsydsy9655isz05ir7154pv8dy4x5rpr144s9ba";
-  "UbuntuMono" = "15kkgx6i4f7zn6fdaw2dqqw3hcpl3pi4cy4g5jx67af8qlhqarrb";
-  "UbuntuSans" = "0jj4v198zshwhns5swrh02h2np3wgnv8lacn8b7jhmcd575cgy1y";
-  "VictorMono" = "03rh7rc6a934sgd1bs7h7y1swqwbv3g7zi624k6hd8v1m3f0j6xa";
-  "ZedMono" = "0yhb9fp7ahw8niki1njzk8pbl0iy53pgf7gx5yfc2ass9vjwky9d";
-}
diff --git a/pkgs/data/fonts/nerdfonts/update.sh b/pkgs/data/fonts/nerdfonts/update.sh
deleted file mode 100755
index 03acd617e6f0..000000000000
--- a/pkgs/data/fonts/nerdfonts/update.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash -p nix-prefetch jq
-
-latest_release=$(curl --silent https://api.github.com/repos/ryanoasis/nerd-fonts/releases/latest)
-version=$(jq -r '.tag_name' <<<"$latest_release")
-
-dirname="$(dirname "$0")"
-echo \""${version#v}"\" >"$dirname/version-new.nix"
-if diff -q "$dirname/version-new.nix" "$dirname/version.nix"; then
-    echo No new version available, current: $version
-    exit 0
-else
-    echo Updated to version "$version"
-    mv "$dirname/version-new.nix" "$dirname/version.nix"
-fi
-
-printf '{\n' > "$dirname/shas.nix"
-
-while
-  read -r name
-  read -r url
-do
-    printf '  "%s" = "%s";\n' "${name%%.*}" "$(nix-prefetch-url "$url")" >>"$dirname/shas.nix"
-done < <(jq -r '.assets[] | select(.name | test("xz")) | .name, .browser_download_url' <<<"$latest_release")
-
-printf '}\n' >> "$dirname/shas.nix"
diff --git a/pkgs/data/fonts/nerdfonts/version.nix b/pkgs/data/fonts/nerdfonts/version.nix
deleted file mode 100644
index 038707f5b9ec..000000000000
--- a/pkgs/data/fonts/nerdfonts/version.nix
+++ /dev/null
@@ -1 +0,0 @@
-"3.2.1"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4efab55ea533..2cd5da8406ed 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -372,6 +372,7 @@ mapAliases {
   fileschanged = throw "'fileschanged' has been removed as it is unmaintained upstream"; # Added 2024-04-19
   finger_bsd = bsd-finger;
   fingerd_bsd = bsd-fingerd;
+  fira-code-nerdfont = lib.warn "fira-code-nerdfont is redundant. Use nerd-fonts.fira-code instead." nerd-fonts.fira-code; # Added 2024-11-10
   firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead.";
   firefox-esr-115-unwrapped = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-128-unwrapped` instead.";
   firefox-wayland = firefox; # Added 2022-11-15
@@ -535,6 +536,7 @@ mapAliases {
   imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17
   imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17
   immersed-vr = lib.warn "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11
+  inconsolata-nerdfont = lib.warn "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10
   incrtcl = tclPackages.incrtcl; # Added 2024-10-02
   input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21
   index-fm = libsForQt5.mauiPackages.index; # added 2022-05-17
@@ -840,6 +842,7 @@ mapAliases {
   nextcloud27Packages = throw "Nextcloud27 is EOL!"; # Added 2024-06-25
   nagiosPluginsOfficial = monitoring-plugins;
   neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10
+  nerdfonts = throw "nerdfonts has been separated into individual font packages under the namespace nerd-fonts"; # Added 2024-11-09
   newlibCross = newlib; # Added 2024-09-06
   newlib-nanoCross = newlib-nano; # Added 2024-09-06
   nix-direnv-flakes = nix-direnv;
@@ -1212,6 +1215,7 @@ mapAliases {
   teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
   teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26
   teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18
+  terminus-nerdfont = lib.warn "terminus-nerdfont is redundant. Use nerd-fonts.terminess-ttf instead." nerd-fonts.terminess-ttf; # Added 2024-11-10
   temurin-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
   temurin-jre-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
   temurin-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7543000e7961..00374d46e565 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4494,7 +4494,7 @@ with pkgs;
 
   navilu-font = callPackage ../data/fonts/navilu { stdenv = stdenvNoCC; };
 
-  nerdfonts = callPackage ../data/fonts/nerdfonts { };
+  nerd-fonts = recurseIntoAttrs (callPackage ../data/fonts/nerd-fonts { });
 
   netcdf-mpi = netcdf.override {
     hdf5 = hdf5-mpi.override { usev110Api = true; };
@@ -13014,9 +13014,6 @@ with pkgs;
 
   fira-code = callPackage ../data/fonts/fira-code { };
   fira-code-symbols = callPackage ../data/fonts/fira-code/symbols.nix { };
-  fira-code-nerdfont = nerdfonts.override {
-    fonts = [ "FiraCode" ];
-  };
 
   flat-remix-icon-theme = callPackage ../data/icons/flat-remix-icon-theme {
     inherit (plasma5Packages) breeze-icons;
@@ -13067,10 +13064,6 @@ with pkgs;
 
   inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix { };
 
-  inconsolata-nerdfont = nerdfonts.override {
-    fonts = [ "Inconsolata" ];
-  };
-
   input-fonts = callPackage ../data/fonts/input-fonts { };
 
   iosevka = callPackage ../data/fonts/iosevka { };
@@ -13232,10 +13225,6 @@ with pkgs;
     inherit (libsForQt5) breeze-icons;
   };
 
-  terminus-nerdfont = nerdfonts.override {
-    fonts = [ "Terminus" ];
-  };
-
   tex-gyre = callPackages ../data/fonts/tex-gyre { };
 
   tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };

From 536dc87db6ea8ac6cd3c5ea08e8bc8bf59ccfa2f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 23 Nov 2024 22:18:18 +0000
Subject: [PATCH 14/62] nerd-fonts: 3.2.1 -> 3.3.0

---
 .../fonts/nerd-fonts/manifests/checksums.json | 137 +++++++++---------
 .../fonts/nerd-fonts/manifests/fonts.json     |  18 ++-
 .../fonts/nerd-fonts/manifests/release.json   |   6 +-
 3 files changed, 85 insertions(+), 76 deletions(-)

diff --git a/pkgs/data/fonts/nerd-fonts/manifests/checksums.json b/pkgs/data/fonts/nerd-fonts/manifests/checksums.json
index d3d2c4af032b..0cb041a7e586 100644
--- a/pkgs/data/fonts/nerd-fonts/manifests/checksums.json
+++ b/pkgs/data/fonts/nerd-fonts/manifests/checksums.json
@@ -1,69 +1,70 @@
 {
-  "0xProto.tar.xz": "cf165059645c02212fbdb5a27858056772d12a762468a0971c5bed3de88d0427",
-  "3270.tar.xz": "6168e416a4331e8d59d5436d9a3c8170f98ee044e2fe662cbf1d7bea612f927d",
-  "Agave.tar.xz": "c307d029f638a411834972569317a04b9d75e968a53b12e41c787db064a6bef7",
-  "AnonymousPro.tar.xz": "1e4b7f7c8528c9d43760eacdb5d423ad272f028cad5958e594a30486dce409d3",
-  "Arimo.tar.xz": "20f3bc015e46e4fe9f57cfe495eaa167b796e047df4f98676fe16649aba4ffb8",
-  "AurulentSansMono.tar.xz": "d71be5a39c772a58d2592e490784298753573ee47836633ade381f1eeee39c72",
-  "BigBlueTerminal.tar.xz": "432c4a9080038554a94a46f435cb1aca3d58e23deb445e5c39d2c740a9edac84",
-  "BitstreamVeraSansMono.tar.xz": "5328418c755f076363e46960f311c734c0939167ab02eb718a8fb7bcc1bbd2e8",
-  "CascadiaCode.tar.xz": "5af79aaebec3aa474c801e48aa2cb901cf1e9c03cbb3b6c189fed439e867e6e9",
-  "CascadiaMono.tar.xz": "9672540e8707d221fe48fa5da49aec5a605b2d38a85c9fed959eb76990b33367",
-  "CodeNewRoman.tar.xz": "45d29f5be8add78ae271550d542387f4c98bbbe62e395a3646bc67f66f9d3c5c",
-  "ComicShannsMono.tar.xz": "dc0835a985f19491526fb5773ad7d9646bbdb962cda5076615b686427fb565dc",
-  "CommitMono.tar.xz": "173f5a8fe5bb0a4e7db61ac9a77e97c7b5071b9b2a9f8dbaf8432311518a5f4a",
-  "Cousine.tar.xz": "b8f14c715bdcce4afafd9c4e57acba5b9d5c1c3357f054a505716187ae1e98b1",
-  "D2Coding.tar.xz": "c01665970a43c13b27ea1fb9c85055d9c2369b3f9f2d1b37c08ffeaad7830cb0",
-  "DaddyTimeMono.tar.xz": "6e7dd3ebdb82ee4a5b358801c082553692431e246c996dcbb3a737a28c78e4db",
-  "DejaVuSansMono.tar.xz": "b94bde4d2e9ceb1f2c19b2846c1a9892797e4e15e9594303eb7088534244a18b",
-  "DroidSansMono.tar.xz": "d3910065466618646baf9a621d385f8122c310e29d449462e5bd25bd300e0dd7",
-  "EnvyCodeR.tar.xz": "d1ca4f8bae74e089775a9ba6b2015ee79e03ec0970e76499f56131499524efa4",
-  "FantasqueSansMono.tar.xz": "2d6db874195ac7ec4d9b396a9612e1e342b060d8aef0304b0b99c49c3b9a351d",
-  "FiraCode.tar.xz": "def4b29f7aa0620a7fa12edb28197a2697680b5e21636fa3dcc602e08ae13bc4",
-  "FiraMono.tar.xz": "c0224b12e3da90550bb1c42a9149346326ebbc9f41cf83a5e6c8944e57772bc5",
-  "GeistMono.tar.xz": "0f247f19afece755de1a1b7b2eae38d48023ce4436323ab51f571d38314c6c73",
-  "Go-Mono.tar.xz": "44a4ce529f51dc5f067a10b851acd06a1dc7ea7d6af5ba8a420e057232c8d948",
-  "Gohu.tar.xz": "7ab613fac9d5931bd32d8e5a438ae0cb17536317e171f28ee5ddb8a171941041",
-  "Hack.tar.xz": "89b9023f3f6d5e4b8040022ff29b36faee440cf49015fda163215c922569b5f3",
-  "Hasklig.tar.xz": "4fb0ff16a5e587e65f59e55d08283729de700f0c0bf682ec1bef18ab51264ada",
-  "HeavyData.tar.xz": "f6b8a6cfb0d06bd25e7653c2ac18a562f53f6143eb131195a5fca4dde30d6aa8",
-  "Hermit.tar.xz": "23552caf1b6075858756de2e8f3a3fbb9799b478882f3f7afeefa8ca7f4601ae",
-  "IBMPlexMono.tar.xz": "97e2774a01a151fc2f711f018831d24777472daf0f2822230ce20a7ac227a041",
-  "Inconsolata.tar.xz": "2c9f5a1117e1b5a640287081680837e7b870c94868627766483011ff0b80c3f7",
-  "InconsolataGo.tar.xz": "69e0a42a6e8072b2a084f09a5056e857e9b620afd57d7d07c8d1da2cf4809b41",
-  "InconsolataLGC.tar.xz": "7a96f8cc30e57a426ffce3b844deb10d6325181b28df9b76735308f2d787dc2d",
-  "IntelOneMono.tar.xz": "a016b61e49c395c5b1e5bd2c919ae668724a33f2ef14da3becf932da401a080d",
-  "Iosevka.tar.xz": "1be123fa355a9acee79d19891c02499792f6a4e12ffa8973c6b1cb738465f337",
-  "IosevkaTerm.tar.xz": "b5d5e7b26c76f1cfe97a697716fdd682b18faf9f73883915c2b0c2d9fcc48cf5",
-  "IosevkaTermSlab.tar.xz": "3132ff085ce404a3c065054638f3dc68de27d07a5cc5379b90b2a248877971eb",
-  "JetBrainsMono.tar.xz": "6cf8822bc1ca18e34b06578c7499f380c019e6ffc883eed26df5f498dfcc4006",
-  "Lekton.tar.xz": "2282cb16651a377d5b084486a268189fdafd9067775f1f24ffaf5a36a2459501",
-  "LiberationMono.tar.xz": "9d0ad55cbd83967ca93e940f4951d41b23a44c892d9a4788af460d71f8bb81a4",
-  "Lilex.tar.xz": "a2720d1fbf7ebb51b6a0ab191de41d96c7594d61f02c582db2249ea30c1ce263",
-  "MPlus.tar.xz": "5c60700788b093e0bfb30b2f59b52397f3fdc2cdf2b6fb9307a58b61e7ddfe74",
-  "MartianMono.tar.xz": "62484ea8f66ae3b75610b89c5d3258f8610844fec6d8402239c27a5042dccc7d",
-  "Meslo.tar.xz": "1abdaf5542b75a51d75de6373148a8e401b28eda88e6c90f243fb6114fd659ea",
-  "Monaspace.tar.xz": "e5d2e8180d5df1fe473b598edac5f67ce38b1d906248936eb386dd332a338346",
-  "Monofur.tar.xz": "eb035bfb09043db2278dd6f95ca956a7cc42a3e6cc30910295c51555b2e8ff81",
-  "Monoid.tar.xz": "c7a5ff556ff4aad5381e8a57e0d17d79c591e1267f0a9c271b09306ac4581aba",
-  "Mononoki.tar.xz": "eb3697dd13c5e50951023c0768538a2f70e1e4f22d94800a45779a6d1b49f7a3",
-  "NerdFontsSymbolsOnly.tar.xz": "b7a3eee24d2b0910f3a07705f1e053221d2535f07c5a13614c4dead2620e9978",
-  "Noto.tar.xz": "4be621219ff5508c4176487b4fdc8cd0f6d8d8fceeb935f83df11a49dca3096f",
-  "OpenDyslexic.tar.xz": "96d43a8c53173b992537a1d34ae984f65a8999b7c8991a02c17d4b77497581fa",
-  "Overpass.tar.xz": "fcb796892b105c98ad05a29f184f09a02038970ff6a95f8cda082cd1b1b08cde",
-  "ProFont.tar.xz": "fe3bd035d43b943de17e6e0da1dfb0bd1dcc1b319e10c5e5925ab70436d48385",
-  "ProggyClean.tar.xz": "1a58c57b63f380441ea07d44780680844afe12dd299651b87db59f9f311702d1",
-  "Recursive.tar.xz": "e5f7db6999bf6dd6501d8933575caab49827486ce774c6c35a6e411da8c6cfba",
-  "RobotoMono.tar.xz": "3ccfd4d8d625c708e593e46ea0404536984f69f11c7a08b5a59eb9bbc9dfde3c",
-  "ShareTechMono.tar.xz": "dbcfa99f4d41f05e4b59eb2197873515c035eff1a68800bf0f43db471ef7ba57",
-  "SourceCodePro.tar.xz": "56a43a2729035f7fec17b68823a7db9ea06fcf9ec8d0b5e70d73ab79488a1b21",
-  "SpaceMono.tar.xz": "b6b9d7c604cc55d2c6859ad098371dfbfe540eb2d5aab4faad21f81149659338",
-  "Terminus.tar.xz": "658cc9506acf89b5f5dfc6b55eb9899b782dcf8d89f3d11c9abb2c4d52617f12",
-  "Tinos.tar.xz": "21b43c2314614733f5e9b4b4f3117edc3986d2b0f2a33409b111cc38360e8391",
-  "Ubuntu.tar.xz": "6a254d48c837974e7c43fb92124e8e057c1d4b31c9ebe635f5c562233a24f3ad",
-  "UbuntuMono.tar.xz": "2b678521c5c8a963ba2c8f7846e21df4323838c64d70d59cb1ff38124d7f7396",
-  "UbuntuSans.tar.xz": "3ef8c7ca298d5528cf4296298ab67d7c5c2ba00030735db4851cea8f52d8444a",
-  "VictorMono.tar.xz": "aa1b09dca861a306cd24c2c47fded88b63ae833ff0e815dad3642465583e300f",
-  "ZedMono.tar.xz": "2df9c9e54e5a2bc19c2ffd1df7ee283e02ba2e9a5fda1067b4884375ae4b0b7a",
-  "iA-Writer.tar.xz": "85b0b39b30a9ddd89462b0a7a732b461de04f667dc01a5e987bf0c2accbb576f"
-}
\ No newline at end of file
+  "0xProto.tar.xz": "d72bdd83f02a9071d4bb0acd38a37fe687a47bd29189e838edf847ed39b87e10",
+  "3270.tar.xz": "304010729a11da9bea9f2f1e35e84f4f2240cd8b0ec2a315ef3c1af0ba3af185",
+  "Agave.tar.xz": "2f7939592934ac02ed74e90556a7e13e95ca621b6e44df31db729ae6930f9cb4",
+  "AnonymousPro.tar.xz": "85798dd957cb18837c387ca7fd43044a62830a58860d24e7bd315fc10b5b94f6",
+  "Arimo.tar.xz": "4abbf467968a0f31bb3ad8da7ecd15117cdc8265a67a793e5b9ded6437654ce7",
+  "AurulentSansMono.tar.xz": "b1898e9bbfa1cbea8fd514b151ff4bb572d2562234e942408a9ef90dfb14075f",
+  "BigBlueTerminal.tar.xz": "44bf48101c6c31f6777a42430021681cf54c2f0699f1357a33c73c8788c5aa35",
+  "BitstreamVeraSansMono.tar.xz": "0e5c4ed24358be59a8f7268f3b7352d92f5f19894cdbc62e3c0d91af16250d95",
+  "CascadiaCode.tar.xz": "86ac1e16199fe9c3448a7882e4f3e90c11c27396fd4771c552661648e3d18f96",
+  "CascadiaMono.tar.xz": "29e494f00c6ec0bbbeba031cb69f30ebbe4cf46945d341e0347aab7073049bf0",
+  "CodeNewRoman.tar.xz": "b032b5521c070076148f986d861708ed142fe19f2014a9f248ca4d0a43e9cc8e",
+  "ComicShannsMono.tar.xz": "cb3667e107e265010566d05e544170b57eec3808f33b0c1790b3b1bd069690aa",
+  "CommitMono.tar.xz": "aa7f15a591374a04379223a0c224cd66a7c98938e52cda306311681cc51a1c22",
+  "Cousine.tar.xz": "c7ee3224ff34c69fadfe947d5a9bf349952206cf8e0708564f7cf3d49095d4d8",
+  "D2Coding.tar.xz": "cad0abe4898b6d9aa12d28c4383ea7260eadba951b6ed9d347a524efc234dd1b",
+  "DaddyTimeMono.tar.xz": "8a4b6f1fda69bad7dbf102059416998caa5a870fb413c49e88d64ac2912a93e5",
+  "DejaVuSansMono.tar.xz": "e02d9dcf740b6fe72288ece5ea235a78cdc3763502b2682d7659c7618d4400c5",
+  "DepartureMono.tar.xz": "45dca8cadd11f6eb289c13f66be3ad7fbd525504168d3c0931d57c8ad56be909",
+  "DroidSansMono.tar.xz": "1e2b79f888e4d07617857ddae0f82ffe07b65328fc0664e9a94bc0fac1aef888",
+  "EnvyCodeR.tar.xz": "be99355fc93e9c351a4c70d7713c8f4fe038a65ac72f7ac9cc5550bc52734b70",
+  "FantasqueSansMono.tar.xz": "947166571476762b8e9b87a6b0532f9eab29147dc9e5d15aad1b7983229328d7",
+  "FiraCode.tar.xz": "7c64c44d7e530b25faf23904e135e9d1ff0339a92ee64e35e7da9116aa48af67",
+  "FiraMono.tar.xz": "d23c8db9d53397606bcfe6593f576abb12dd8e3d0605062231e391e2719e92c0",
+  "GeistMono.tar.xz": "8c5cacfa8a1fe276ea4ebdbe3b542ce71a7144c04a811c9f210faa401b436b3b",
+  "Go-Mono.tar.xz": "d3d2a8ec7f30513e52412f8907ec4838fd5843323b9e2a5a841de6531aff9a3a",
+  "Gohu.tar.xz": "da43efcf1eb53dc1773938861a9f3fcb19b71065a6a5bb0295e6038e90545027",
+  "Hack.tar.xz": "f797524e4b99191a5f35614c6fe48e96f7b8872712e2943a2aaf59cda086e909",
+  "Hasklig.tar.xz": "9cb2f02337782dd5eb1711f9890edaeea3d59eca00dd7ea3810c237336883fe3",
+  "HeavyData.tar.xz": "a3473e58cf5a7469a511dfdba2935611945e5cbd2f17d09a361c1ce19a30df0f",
+  "Hermit.tar.xz": "fddd0ada8ab3266042d4f6ddb3dd7a9c652c15ac80eda35097c3914281e14db0",
+  "IBMPlexMono.tar.xz": "f7b420dae1361d347858c78d6d48e385bc644e32781cc21eb7dcc483c3682eb1",
+  "Inconsolata.tar.xz": "d843486d7bab95ccf06c6c17ef03773b2dc5b284602b3926356a668c49be565f",
+  "InconsolataGo.tar.xz": "105963a2025b4cb96798d1538f38aa65bd13a856cda9941ce25c139959eccd03",
+  "InconsolataLGC.tar.xz": "442501cffb407e11539fa9fb4714253d779dd0508c0257c42eec187f11a18b13",
+  "IntelOneMono.tar.xz": "0a5287b9e24a9adce148daea25c04242ae65f9bb04e3610c8374eaca7379ec20",
+  "Iosevka.tar.xz": "01b352cd732b36d24fb7b0f2b331ddc34c2a39155af6e7a42bddf2ee279bb25d",
+  "IosevkaTerm.tar.xz": "5ca2a43d1ed2a0098fbc9f87e7dc89c6a13d0399bcb82f09359fa141f9afb70b",
+  "IosevkaTermSlab.tar.xz": "c8e7e72b6652adb34e4f0af20e22d1eda06368db3a6ebab5194d1078944ea31a",
+  "JetBrainsMono.tar.xz": "7d171ea3884be22fc08bf1a1aee640a3dc93f031989c27f6f9ceb30a6a668de1",
+  "Lekton.tar.xz": "2f83aabdf69d1ae28e9b60ef3777e572aafc359f32c8eae7a6278337f1364014",
+  "LiberationMono.tar.xz": "cc2d9a78c88c91875d8fee10d7d5d67ee9f0687ef004fd61bee4e7a1ecef700b",
+  "Lilex.tar.xz": "1f4d1c13252f12e9b09e09f881ea21a77645e1eac3472604990b3a11deea78c1",
+  "MPlus.tar.xz": "55d7390e8b45fc19a028dd93d42aebf0fe55fd85321940d1be13a5f6fa592e76",
+  "MartianMono.tar.xz": "7cad96ae914fecff010fa438276a99daf984044ade8b473049b3b63f771a5603",
+  "Meslo.tar.xz": "6ad716ed719e2c97794abd5856a90c6131c406606b249debdc83b04ae11f4cb7",
+  "Monaspace.tar.xz": "faeb907827a2a07ae64c8fa1a5ca48cd9e60c9084a24c48d779a30cf6bd0693a",
+  "Monofur.tar.xz": "9dfad24a7debf0ca56db2465e8bd5a0a28435945c23e2a831bcd111785b57480",
+  "Monoid.tar.xz": "51765143936c5c5078249eb77f2dc862f0d9436328c4c698918b276637d5caee",
+  "Mononoki.tar.xz": "b9bff1032796daffef71610639685d28a4a5baf31cb4ca43dd53f3d14820f5cf",
+  "NerdFontsSymbolsOnly.tar.xz": "8b5ecbe2612cb37d75e2645f7644876bc38960574909b1c01c002d0e8d33deb3",
+  "Noto.tar.xz": "556a30d1dcdbf565946605f50657fa77105d95d150413492cfa7065263f56427",
+  "OpenDyslexic.tar.xz": "5cd679c82f992f4140f2ab4f6cb77b0080f71a3d7152fb8c91fe0c07f4dcce83",
+  "Overpass.tar.xz": "6dc50cddca27afa51bd2cce334d6b451d6ce56e6f955c06518ae5b9b1f99e9fc",
+  "ProFont.tar.xz": "960a9f36ea58ab07c2955b8cb37b4386626ae19b23d026095ef896a05842dadb",
+  "ProggyClean.tar.xz": "70e91ef90a6d6230f6870a978b856e6138dcff0b98efa9ba3e84c447dda638a2",
+  "Recursive.tar.xz": "2c9d0b6db82ef6acf71b235b5bd7b16f33cfbbba5ce08bfb1278f7dc6ec1eb20",
+  "RobotoMono.tar.xz": "fad79b182e2c27454276b45d9633c0800302da996168bc5cee0109fda2181ed3",
+  "ShareTechMono.tar.xz": "0f7fb196b3700caeee85ddad56efde174416d73afc651a79d38bd319c1587d43",
+  "SourceCodePro.tar.xz": "87834bca780558bbe3ff808e51c89e1c3d98140a2c1a0d3100e10e944456a63c",
+  "SpaceMono.tar.xz": "a2058cfc43eee5a170208c6e90fa77d8f0aa755e0d213e795f70781f7d807942",
+  "Terminus.tar.xz": "88b17b50aab7ee284f9a1ed395f96c20ab4d22640fde1fe0f80a31f1eacd6585",
+  "Tinos.tar.xz": "f763b82e01f06ebce5830c475306598734d2fc91ded1760fe925a826b3cba8ef",
+  "Ubuntu.tar.xz": "4ff08c04bec3ec86b60d75a987b5c09d7e5c434f006f426bcfdac80f6f66d938",
+  "UbuntuMono.tar.xz": "dc8a6aebd8950e59dd89a1c5f49be3914879691e2e1293c157b7f66291c09712",
+  "UbuntuSans.tar.xz": "3d0ed4bbadf13f9655c5e4a3bc089eef6db232fa3d4552144b1683adc9fad98d",
+  "VictorMono.tar.xz": "f61229287e333e575f134923fd46da32fe4e01120a2a74a17d2d9b7591a9b87e",
+  "ZedMono.tar.xz": "fa29af2373bbf6edda1c3c9a42655227748d1a9f7b2563bf4b79253618768318",
+  "iA-Writer.tar.xz": "50d885c7f03931323c5ea232c677b8963f8d1a196cfd8f2935e2ddcf535b5971"
+}
diff --git a/pkgs/data/fonts/nerd-fonts/manifests/fonts.json b/pkgs/data/fonts/nerd-fonts/manifests/fonts.json
index 295310993e4b..3d201fd4cf07 100644
--- a/pkgs/data/fonts/nerd-fonts/manifests/fonts.json
+++ b/pkgs/data/fonts/nerd-fonts/manifests/fonts.json
@@ -1,11 +1,11 @@
 [
   {
     "caskName": "0xproto",
-    "description": "An opinionated font for software engineers",
+    "description": "A programming font focused on source code legibility",
     "folderName": "0xProto",
     "licenseId": "OFL-1.1-no-RFN",
     "patchedName": "0xProto",
-    "version": "1.603"
+    "version": "2.201"
   },
   {
     "caskName": "3270",
@@ -135,6 +135,14 @@
     "patchedName": "DaddyTimeMono",
     "version": "1.2.3"
   },
+  {
+    "caskName": "departure-mono",
+    "description": "A monospaced pixel font with a lo-fi, techy vibe",
+    "folderName": "DepartureMono",
+    "licenseId": "OFL-1.1-no-RFN",
+    "patchedName": "DepartureMono",
+    "version": "1.422"
+  },
   {
     "caskName": "dejavu-sans-mono",
     "description": "Dotted zero, based on the Bitstream Vera Fonts with a wider range of character",
@@ -277,7 +285,7 @@
     "folderName": "IntelOneMono",
     "licenseId": "OFL-1.1-RFN",
     "patchedName": "IntoneMono",
-    "version": "1.3.0"
+    "version": "1.4.0"
   },
   {
     "caskName": "iosevka",
@@ -357,7 +365,7 @@
     "folderName": "Monaspace",
     "licenseId": "OFL-1.1-RFN",
     "patchedName": "Monaspice",
-    "version": "1.0.0"
+    "version": "1.101"
   },
   {
     "caskName": "monofur",
@@ -535,4 +543,4 @@
     "patchedName": "ZedMono",
     "version": "1.2.0"
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/data/fonts/nerd-fonts/manifests/release.json b/pkgs/data/fonts/nerd-fonts/manifests/release.json
index e95c302f606d..428f1edccec2 100644
--- a/pkgs/data/fonts/nerd-fonts/manifests/release.json
+++ b/pkgs/data/fonts/nerd-fonts/manifests/release.json
@@ -1,4 +1,4 @@
 {
-  "tag_name": "v3.2.1",
-  "published_at": "2024-04-12Tbla"
-}
\ No newline at end of file
+  "tag_name": "v3.3.0",
+  "published_at": "2024-11-18T12:43:12Z"
+}

From 356af207229bf6f14eac9058ab90df9b905a1de4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Nov 2024 20:35:27 +0000
Subject: [PATCH 15/62] terragrunt: 0.68.7 -> 0.69.1

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

diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index 964a95d4d725..ede6c2f25fbe 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "terragrunt";
-  version = "0.68.7";
+  version = "0.69.1";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-+66+qntwEILB0wbO/J5S6ED5W8JoE0C1KSGmGwIYGM0=";
+    hash = "sha256-/fQOrxfxZOuECp093M90KQRrCUSAqtQ5icTDTw8SM6k=";
   };
 
   nativeBuildInputs = [ go-mockery ];
@@ -21,7 +21,7 @@ buildGoModule rec {
     make generate-mocks
   '';
 
-  vendorHash = "sha256-MLIj+/FUw7C4sOWby9nmcQFAvjVNvnf6bKs3pmlhzRQ=";
+  vendorHash = "sha256-HcN5TRPpKpMpy7OwM9MfRVrvw5zCbPny7X2HgY8Iu1U=";
 
   doCheck = false;
 

From 1d220ad5523b9cb137b67a8e70deef30da1e12ce Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 24 Nov 2024 22:54:16 +0100
Subject: [PATCH 16/62] penelope: init at 0.12.4-unstable-2024-10-21

Penelope Shell Handler

https://github.com/brightio/penelope
---
 pkgs/by-name/pe/penelope/package.nix | 39 ++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/pe/penelope/package.nix

diff --git a/pkgs/by-name/pe/penelope/package.nix b/pkgs/by-name/pe/penelope/package.nix
new file mode 100644
index 000000000000..6df9ef4da757
--- /dev/null
+++ b/pkgs/by-name/pe/penelope/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "penelope";
+  version = "0.12.4-unstable-2024-10-21";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "brightio";
+    repo = "penelope";
+    rev = "366534d192ed279cc822da565408ea7ff48d6a60";
+    hash = "sha256-pBEYgLyicG34HsIBSt8P9xGJEaEz9ZWyxokNyuO6mdM=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "[project.scripts]" "" \
+      --replace-fail 'penelope = "penelope:main"' ""
+  '';
+
+  build-system = with python3.pkgs; [ setuptools ];
+
+  # Project has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Penelope Shell Handler";
+    homepage = "https://github.com/brightio/penelope";
+    changelog = "https://github.com/brightio/penelope/releases/tag/v${version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "penelope.py";
+    platforms = lib.platforms.all;
+  };
+}

From 6239ac5d0615dd5f055734edf5bc5046c538cd2d Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 25 Nov 2024 09:28:29 +0530
Subject: [PATCH 17/62] uwsm: prefer user env binaries

As much as I hate relying on user environment, this fixes the issue where sub processes that are launched with uwsm (with `uwsm app`) inherit uwsm's PATH. Now UWSM itself and its subprocesses should prefer the user environment. Fixes https://github.com/NixOS/nixpkgs/issues/358805
---
 pkgs/by-name/uw/uwsm/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index 2ca7e4359314..6ad4f1f18868 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall =
     let
       wrapperArgs = ''
-        --prefix PATH : "${lib.makeBinPath finalAttrs.propagatedBuildInputs}"
+        --suffix PATH : "${lib.makeBinPath finalAttrs.propagatedBuildInputs}"
       '';
     in
     ''

From a20bd2cca935ff6bd5dee07722e78d8a3174bf56 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 25 Nov 2024 09:39:53 +0530
Subject: [PATCH 18/62] uwsm: add missing systemd dependency

NOT a requirement to build, but a runtime dependency. Ideally, it is present in all environments, but let's not take any chances.
---
 pkgs/by-name/uw/uwsm/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index 6ad4f1f18868..fa671e540eca 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -13,6 +13,7 @@
   libnotify,
   newt,
   python3Packages,
+  systemd,
   util-linux,
   fumonSupport ? true,
   uuctlSupport ? true,
@@ -49,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     newt # whiptail
     libnotify # notify
     bash # sh
+    systemd
     python
   ] ++ (lib.optionals uuctlSupport [ dmenu ]);
 

From 4ae22ca15cddac78d28a92e051a9ea6368cdb4ce Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Nov 2024 09:03:31 +0100
Subject: [PATCH 19/62] ldeep: 1.0.73 -> 1.0.75

Diff: https://github.com/franc-pentest/ldeep/compare/refs/tags/1.0.73...1.0.75

Changelog: https://github.com/franc-pentest/ldeep/releases/tag/1.0.75
---
 pkgs/by-name/ld/ldeep/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ld/ldeep/package.nix b/pkgs/by-name/ld/ldeep/package.nix
index bf5f0fa97207..1a6c3ddd93fc 100644
--- a/pkgs/by-name/ld/ldeep/package.nix
+++ b/pkgs/by-name/ld/ldeep/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ldeep";
-  version = "1.0.73";
+  version = "1.0.75";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "franc-pentest";
     repo = "ldeep";
     rev = "refs/tags/${version}";
-    hash = "sha256-rFcl7Zf8Q6eugcEL79xpKIvXuhDdI6iEyAPDtqGX6xw=";
+    hash = "sha256-WdEOhyWZZRqBZQCNl2vqYiy+sT/gPk3xDpMFVILxmK4=";
   };
 
   pythonRelaxDeps = [

From cd7b8f7f5cc8d81d957992199a124aef93243522 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Nov 2024 09:27:21 +0100
Subject: [PATCH 20/62] seclists: 2024.3 -> 2024.4

Diff: https://github.com/danielmiessler/SecLists/compare/2024.3...2024.4
---
 pkgs/by-name/se/seclists/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix
index 8ed7f7b15b47..f16eb981f109 100644
--- a/pkgs/by-name/se/seclists/package.nix
+++ b/pkgs/by-name/se/seclists/package.nix
@@ -5,13 +5,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "seclists";
-  version = "2024.3";
+  version = "2024.4";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "SecLists";
-    rev = "2024.3";
-    hash = "sha256-Ffd4jpV8F6rtMQVqsu+8X/QU5rwbKXv0zkOCmUuhP8I=";
+    rev = "2024.4";
+    hash = "sha256-mGXCMmHbNKxXNDcfr0rtsyfmX4tygeIN5XKQYip5O8Y=";
   };
 
   installPhase = ''

From 1d2443c3d7b13c4eb47b29edf0a3dbf5934b7f39 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 11 Nov 2024 10:49:37 +0800
Subject: [PATCH 21/62] cbmc: nixfmt

---
 pkgs/by-name/cb/cbmc/package.nix | 72 ++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix
index 0bfb51273758..fdee35e98ec5 100644
--- a/pkgs/by-name/cb/cbmc/package.nix
+++ b/pkgs/by-name/cb/cbmc/package.nix
@@ -1,14 +1,15 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, testers
-, bison
-, cadical
-, cbmc
-, cmake
-, flex
-, makeWrapper
-, perl
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  testers,
+  bison,
+  cadical,
+  cbmc,
+  cmake,
+  flex,
+  makeWrapper,
+  perl,
 }:
 
 stdenv.mkDerivation rec {
@@ -38,18 +39,20 @@ stdenv.mkDerivation rec {
     ./0001-Do-not-download-sources-in-cmake.patch
   ];
 
-  postPatch = ''
-    # do not hardcode gcc
-    substituteInPlace "scripts/bash-autocomplete/extract_switches.sh" \
-      --replace "gcc" "$CC" \
-      --replace "g++" "$CXX"
-    # fix library_check.sh interpreter error
-    patchShebangs .
-  '' + lib.optionalString (!stdenv.cc.isGNU) ''
-    # goto-gcc rely on gcc
-    substituteInPlace "regression/CMakeLists.txt" \
-      --replace "add_subdirectory(goto-gcc)" ""
-  '';
+  postPatch =
+    ''
+      # do not hardcode gcc
+      substituteInPlace "scripts/bash-autocomplete/extract_switches.sh" \
+        --replace "gcc" "$CC" \
+        --replace "g++" "$CXX"
+      # fix library_check.sh interpreter error
+      patchShebangs .
+    ''
+    + lib.optionalString (!stdenv.cc.isGNU) ''
+      # goto-gcc rely on gcc
+      substituteInPlace "regression/CMakeLists.txt" \
+        --replace "add_subdirectory(goto-gcc)" ""
+    '';
 
   postInstall = ''
     # goto-cc expects ls_parse.py in PATH
@@ -60,16 +63,23 @@ stdenv.mkDerivation rec {
       --prefix PATH : "$out/share/cbmc" \
   '';
 
-  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [
-    # Needed with GCC 12 but breaks on darwin (with clang)
-    "-Wno-error=maybe-uninitialized"
-  ] ++ lib.optionals stdenv.cc.isClang [
-    # fix "argument unused during compilation"
-    "-Wno-unused-command-line-argument"
-  ]);
+  env.NIX_CFLAGS_COMPILE = toString (
+    lib.optionals stdenv.cc.isGNU [
+      # Needed with GCC 12 but breaks on darwin (with clang)
+      "-Wno-error=maybe-uninitialized"
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      # fix "argument unused during compilation"
+      "-Wno-unused-command-line-argument"
+    ]
+  );
 
   # TODO: add jbmc support
-  cmakeFlags = [ "-DWITH_JBMC=OFF" "-Dsat_impl=cadical" "-Dcadical_INCLUDE_DIR=${cadical.dev}/include" ];
+  cmakeFlags = [
+    "-DWITH_JBMC=OFF"
+    "-Dsat_impl=cadical"
+    "-Dcadical_INCLUDE_DIR=${cadical.dev}/include"
+  ];
 
   passthru.tests.version = testers.testVersion {
     package = cbmc;

From 0d71320797007c58d408dfc991e21ef236843de6 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 11 Nov 2024 11:46:21 +0800
Subject: [PATCH 22/62] cbmc: 6.0.1 -> 6.4.0

---
 ...001-Do-not-download-sources-in-cmake.patch | 53 +++++--------
 ...002-Do-not-download-sources-in-cmake.patch | 53 +++++++++++++
 pkgs/by-name/cb/cbmc/package.nix              | 76 ++++++++++++++-----
 3 files changed, 129 insertions(+), 53 deletions(-)
 create mode 100644 pkgs/by-name/cb/cbmc/0002-Do-not-download-sources-in-cmake.patch

diff --git a/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch b/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch
index c209ed059e44..324fd2adc04a 100644
--- a/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch
+++ b/pkgs/by-name/cb/cbmc/0001-Do-not-download-sources-in-cmake.patch
@@ -1,41 +1,26 @@
-From 714f5ebe9ade721abdccf58edfcddba52465cb8d Mon Sep 17 00:00:00 2001
-From: Jiajie Chen <c@jia.je>
-Date: Sun, 2 Jul 2023 22:43:27 +0800
+From 7b49a436bd5cc903b86b01f1a0f046ab8ec99fdb Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Mon, 11 Nov 2024 11:07:37 +0800
 Subject: [PATCH] Do not download sources in cmake
 
 ---
- src/solvers/CMakeLists.txt | 11 +----------
- 1 file changed, 1 insertion(+), 10 deletions(-)
+ CMakeLists.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/src/solvers/CMakeLists.txt b/src/solvers/CMakeLists.txt
-index daa0853a57..4bcbbdaa47 100644
---- a/src/solvers/CMakeLists.txt
-+++ b/src/solvers/CMakeLists.txt
-@@ -123,16 +123,6 @@ foreach(SOLVER ${sat_impl})
-     elseif("${SOLVER}" STREQUAL "cadical")
-         message(STATUS "Building solvers with cadical")
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c1289a..8128362 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -116,8 +116,7 @@ if(DEFINED CMAKE_USE_CUDD)
+     include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadProject.cmake")
+     message(STATUS "Downloading Cudd-3.0.0")
+     download_project(PROJ cudd
+-            URL https://sourceforge.net/projects/cudd-mirror/files/cudd-3.0.0.tar.gz/download
+-            URL_MD5 4fdafe4924b81648b908881c81fe6c30
++            SOURCE_DIR @cudd.src@
+             )
  
--        download_project(PROJ cadical
--            URL https://github.com/arminbiere/cadical/archive/rel-1.7.2.tar.gz
--            PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/../scripts/cadical-1.7.2-patch
--            COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/../scripts/cadical_CMakeLists.txt CMakeLists.txt
--            COMMAND ./configure
--            URL_MD5 be646831a017f81b300664e58deba1b5
--        )
--
--        add_subdirectory(${cadical_SOURCE_DIR} ${cadical_BINARY_DIR})
--
-         target_compile_definitions(solvers PUBLIC
-             SATCHECK_CADICAL HAVE_CADICAL
-         )
-@@ -140,6 +130,7 @@ foreach(SOLVER ${sat_impl})
-         target_include_directories(solvers
-             PUBLIC
-             ${cadical_SOURCE_DIR}/src
-+            ${cadical_INCLUDE_DIR}
-         )
- 
-         target_link_libraries(solvers cadical)
+     if(NOT EXISTS ${cudd_SOURCE_DIR}/Makefile)
 -- 
-2.42.0
+2.47.0
 
diff --git a/pkgs/by-name/cb/cbmc/0002-Do-not-download-sources-in-cmake.patch b/pkgs/by-name/cb/cbmc/0002-Do-not-download-sources-in-cmake.patch
new file mode 100644
index 000000000000..c45b65e80f6e
--- /dev/null
+++ b/pkgs/by-name/cb/cbmc/0002-Do-not-download-sources-in-cmake.patch
@@ -0,0 +1,53 @@
+From c6b6438d3c87ce000b4e80b2eda2389e9473d24c Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Mon, 11 Nov 2024 11:35:03 +0800
+Subject: [PATCH] Do not download sources in cmake
+
+---
+ src/solvers/CMakeLists.txt | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/src/solvers/CMakeLists.txt b/src/solvers/CMakeLists.txt
+index ab8d111..d7165e2 100644
+--- a/src/solvers/CMakeLists.txt
++++ b/src/solvers/CMakeLists.txt
+@@ -102,10 +102,9 @@ foreach(SOLVER ${sat_impl})
+         message(STATUS "Building solvers with glucose")
+ 
+         download_project(PROJ glucose
+-            URL https://github.com/BrunoDutertre/glucose-syrup/archive/0bb2afd3b9baace6981cbb8b4a1c7683c44968b7.tar.gz
++            SOURCE_DIR @srcglucose@
+             PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/glucose-syrup-patch
+             COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/scripts/glucose_CMakeLists.txt CMakeLists.txt
+-            URL_MD5 7c539c62c248b74210aef7414787323a
+         )
+ 
+         add_subdirectory(${glucose_SOURCE_DIR} ${glucose_BINARY_DIR})
+@@ -121,11 +120,10 @@ foreach(SOLVER ${sat_impl})
+         message(STATUS "Building solvers with cadical")
+ 
+         download_project(PROJ cadical
+-            URL https://github.com/arminbiere/cadical/archive/rel-2.0.0.tar.gz
++            SOURCE_DIR @srccadical@
+             PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-2.0.0-patch
+             COMMAND cmake -E copy ${CBMC_SOURCE_DIR}/scripts/cadical_CMakeLists.txt CMakeLists.txt
+             COMMAND ./configure
+-            URL_MD5 9fc2a66196b86adceb822a583318cc35
+         )
+ 
+         add_subdirectory(${cadical_SOURCE_DIR} ${cadical_BINARY_DIR})
+@@ -144,10 +142,9 @@ foreach(SOLVER ${sat_impl})
+         message(STATUS "Building with IPASIR solver linking against: CaDiCaL")
+ 
+         download_project(PROJ cadical
+-            URL https://github.com/arminbiere/cadical/archive/rel-2.0.0.tar.gz
++            SOURCE_DIR @srccadical@
+             PATCH_COMMAND patch -p1 -i ${CBMC_SOURCE_DIR}/scripts/cadical-2.0.0-patch
+             COMMAND ./configure
+-            URL_MD5 9fc2a66196b86adceb822a583318cc35
+         )
+ 
+         message(STATUS "Building CaDiCaL")
+-- 
+2.47.0
+
diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix
index fdee35e98ec5..fb360095c7bc 100644
--- a/pkgs/by-name/cb/cbmc/package.nix
+++ b/pkgs/by-name/cb/cbmc/package.nix
@@ -10,19 +10,39 @@
   flex,
   makeWrapper,
   perl,
+  substituteAll,
+  substitute,
+  cudd,
+  fetchurl,
+  nix-update-script,
+  apple-sdk,
+  apple-sdk_10_15,
+  darwinMinVersionHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cbmc";
-  version = "6.0.1";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "diffblue";
-    repo = pname;
-    rev = "${pname}-${version}";
-    sha256 = "sha256-7syRpCNL7TRZoJaNrmAdahNy7IyovyniYyOwD/lzhuw=";
+    repo = "cbmc";
+    rev = "refs/tags/cbmc-${finalAttrs.version}";
+    hash = "sha256-PZZnseOE3nodE0zwyG+82gm55BO4rsCcP4T+fZq7L6I=";
   };
 
+  srcglucose = fetchFromGitHub {
+    owner = "brunodutertre";
+    repo = "glucose-syrup";
+    rev = "0bb2afd3b9baace6981cbb8b4a1c7683c44968b7";
+    hash = "sha256-+KrnXEJe7ApSuj936T615DaXOV+C2LlRxc213fQI+Q4=";
+  };
+
+  srccadical =
+    (cadical.override {
+      version = "2.0.0";
+    }).src;
+
   nativeBuildInputs = [
     bison
     cmake
@@ -31,27 +51,45 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  buildInputs = [ cadical ];
+  buildInputs =
+    [ cadical ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      (darwinMinVersionHook "10.15")
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && lib.versionOlder apple-sdk.version "10.15") [
+      apple-sdk_10_15
+    ];
 
   # do not download sources
   # link existing cadical instead
   patches = [
-    ./0001-Do-not-download-sources-in-cmake.patch
+    (substituteAll {
+      src = ./0001-Do-not-download-sources-in-cmake.patch;
+      inherit cudd;
+    })
+    ./0002-Do-not-download-sources-in-cmake.patch
   ];
 
   postPatch =
     ''
-      # do not hardcode gcc
-      substituteInPlace "scripts/bash-autocomplete/extract_switches.sh" \
-        --replace "gcc" "$CC" \
-        --replace "g++" "$CXX"
       # fix library_check.sh interpreter error
       patchShebangs .
+
+      mkdir -p srccadical
+      cp -r ${finalAttrs.srccadical}/* srccadical
+
+      mkdir -p srcglucose
+      cp -r ${finalAttrs.srcglucose}/* srcglucose
+      find -exec chmod +w {} \;
+
+      substituteInPlace src/solvers/CMakeLists.txt \
+       --replace-fail "@srccadical@" "$PWD/srccadical" \
+       --replace-fail "@srcglucose@" "$PWD/srcglucose"
     ''
     + lib.optionalString (!stdenv.cc.isGNU) ''
       # goto-gcc rely on gcc
       substituteInPlace "regression/CMakeLists.txt" \
-        --replace "add_subdirectory(goto-gcc)" ""
+        --replace-fail "add_subdirectory(goto-gcc)" ""
     '';
 
   postInstall = ''
@@ -86,13 +124,13 @@ stdenv.mkDerivation rec {
     command = "cbmc --version";
   };
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "CBMC is a Bounded Model Checker for C and C++ programs";
     homepage = "http://www.cprover.org/cbmc/";
-    license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ jiegec ];
-    platforms = platforms.unix;
-    # error: no member named 'aligned_alloc' in the global namespace
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
+    license = lib.licenses.bsdOriginal;
+    maintainers = with lib.maintainers; [ jiegec ];
+    platforms = lib.platforms.unix;
   };
-}
+})

From 160facf7c1614c5bfaebfbb3c04785de51828cac Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 25 Nov 2024 11:00:54 +0100
Subject: [PATCH 23/62] python312Packages.qcodes: 0.49.0 -> 0.50.0

Diff: https://github.com/microsoft/Qcodes/compare/refs/tags/v0.49.0...v0.50.0

Changelog: https://github.com/QCoDeS/Qcodes/releases/tag/v0.50.0
---
 pkgs/development/python-modules/qcodes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/qcodes/default.nix b/pkgs/development/python-modules/qcodes/default.nix
index a1c5206f4af2..863725b5fd04 100644
--- a/pkgs/development/python-modules/qcodes/default.nix
+++ b/pkgs/development/python-modules/qcodes/default.nix
@@ -59,14 +59,14 @@
 
 buildPythonPackage rec {
   pname = "qcodes";
-  version = "0.49.0";
+  version = "0.50.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "Qcodes";
     rev = "refs/tags/v${version}";
-    hash = "sha256-AlrQH0yKbEz+ICdvWWjMD7LQvWl36cFWlp+fegAmtL8=";
+    hash = "sha256-pOzIhqI4XmJm3GiGN2+zOALEogyB4qDgB71TJoLKd+4=";
   };
 
   build-system = [

From a5b22ac2b0cc5b9dc4d91d36aa0c1a6d1764777f Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Mon, 25 Nov 2024 11:27:52 +0100
Subject: [PATCH 24/62] abracadabra: 2.7.0 -> 2.7.1

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

diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix
index 498a10e24807..c1bc7395b4d9 100644
--- a/pkgs/by-name/ab/abracadabra/package.nix
+++ b/pkgs/by-name/ab/abracadabra/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abracadabra";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "KejPi";
     repo = "AbracaDABra";
     rev = "v${version}";
-    hash = "sha256-iHa41VmCrNGsj+6LeYIigwiBahQuTVr+bAo0kFmQ6dw=";
+    hash = "sha256-d9DNgpvAZUova0ef6Ge4L/hRjLpY/UkDBawU2UAuSGI=";
   };
 
   nativeBuildInputs = [

From dee1b880431deadf01bfa1354b3c00846b514437 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 25 Nov 2024 11:32:56 +0100
Subject: [PATCH 25/62] limesctl: drop

---
 pkgs/by-name/li/limesctl/package.nix | 25 -------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 pkgs/by-name/li/limesctl/package.nix

diff --git a/pkgs/by-name/li/limesctl/package.nix b/pkgs/by-name/li/limesctl/package.nix
deleted file mode 100644
index 00323a259db2..000000000000
--- a/pkgs/by-name/li/limesctl/package.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  pname = "limesctl";
-  version = "3.3.2";
-
-  src = fetchFromGitHub {
-    owner = "sapcc";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-UYQe2C50tB1uc5ij8oh+RBaFg9UYWwPmJ77LCJ11Ml4=";
-  };
-
-  vendorHash = null;
-
-  subPackages = [ "." ];
-
-  meta = with lib; {
-    description = "CLI for Limes";
-    homepage = "https://github.com/sapcc/limesctl";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ SuperSandro2000 ];
-    mainProgram = "limesctl";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4efab55ea533..19ff40571e79 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -655,6 +655,7 @@ mapAliases {
   libyamlcpp_0_3 = yaml-cpp_0_3; # Added 2023-01-29
   lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
   lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects.";
+  limesctl = throw "limesctl has been removed because it is insignificant."; # Added 2024-11-25
   linux_wallpaperengine = throw "linux_wallpaperengine was removed due to freeimage dependency"; # Added 2024-07-19
   lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07

From 87647a1bf9e53820b3d64920bc4312d0daee495b Mon Sep 17 00:00:00 2001
From: Evgeny Kurnevsky <kurnevsky@gmail.com>
Date: Mon, 25 Nov 2024 11:40:14 +0100
Subject: [PATCH 26/62] bloop: fix service

bloop uses 'start' command now which starts daemon in the background
---
 nixos/modules/services/development/bloop.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/development/bloop.nix b/nixos/modules/services/development/bloop.nix
index c1180a8bbdd4..5796b1148b9f 100644
--- a/nixos/modules/services/development/bloop.nix
+++ b/nixos/modules/services/development/bloop.nix
@@ -43,8 +43,9 @@ in {
         PATH = mkForce "${makeBinPath [ config.programs.java.package ]}";
       };
       serviceConfig = {
-        Type        = "simple";
-        ExecStart   = "${pkgs.bloop}/bin/bloop server";
+        Type        = "forking";
+        ExecStart   = "${pkgs.bloop}/bin/bloop start";
+        ExecStop    = "${pkgs.bloop}/bin/bloop exit";
         Restart     = "always";
       };
     };

From 134c8fab1823105555e1c95dab67efa8069300f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 11:04:44 +0000
Subject: [PATCH 27/62] chirp: 0.4.0-unstable-2024-11-11 ->
 0.4.0-unstable-2024-11-22

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

diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index 09e051757c51..102331abb768 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2024-11-11";
+  version = "0.4.0-unstable-2024-11-22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "71812ad1214fcd1555375aeddfc5ddaf2079918b";
-    hash = "sha256-cDDv3GECxoJu0LT8mYeStFL4DeQKS638ZoweI8HbvaI=";
+    rev = "5b41e67d5e261da85523789e0d1e7ac377f419f6";
+    hash = "sha256-a1UAnSqQyud812NOxqn/PukW5PrIN0MxdEfr9jIvncY=";
   };
 
   nativeBuildInputs = [

From 073b870d295b9622d56a126e5b008ad66f5e6920 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Nov 2024 12:36:16 +0100
Subject: [PATCH 28/62] python312Packages.publicsuffixlist: 1.0.2.20241123 ->
 1.0.2.20241124

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20241124-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 4f25fef7cb3e..3cebe3f311bf 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20241123";
+  version = "1.0.2.20241124";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-b+72cEjaxZgVWbpLv4EZY0Kszv545/niXpGvWpEJGgE=";
+    hash = "sha256-fgJwTEVA54932I+GfnTuejApGjyupbORJ3xoPm7nwOY=";
   };
 
   build-system = [ setuptools ];

From e5ab4f857142bd01bcd1cad3a8b702d72eade2f1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Nov 2024 12:36:56 +0100
Subject: [PATCH 29/62] python312Packages.cyclopts: 3.0.1 -> 3.1.0

Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.0.1...v3.1.0

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

diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index 39ac0c9ec165..bfe12debae6a 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "cyclopts";
-  version = "3.0.1";
+  version = "3.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "BrianPugh";
     repo = "cyclopts";
     rev = "refs/tags/v${version}";
-    hash = "sha256-oMsskBM0SV1OBxy3/6di1rKcOoV0qGisDyjKHNv72Go=";
+    hash = "sha256-acmEECW486Q1t/y+ym9giAcN7QfzU9whsHP6HImgBm0=";
   };
 
   build-system = [

From 6c74308bfc5de56de1bede90bb4766ca193cf6c4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Nov 2024 12:39:38 +0100
Subject: [PATCH 30/62] python312Packages.librouteros: 3.2.1 -> 3.3.0

Changelog: https://github.com/luqasz/librouteros/blob/3.3.0/CHANGELOG.rst
---
 .../python-modules/librouteros/default.nix          | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/librouteros/default.nix b/pkgs/development/python-modules/librouteros/default.nix
index 8db1f4a3356e..c1892e247860 100644
--- a/pkgs/development/python-modules/librouteros/default.nix
+++ b/pkgs/development/python-modules/librouteros/default.nix
@@ -5,12 +5,13 @@
   pytest-xdist,
   pytest7CheckHook,
   pythonOlder,
-  setuptools,
+  poetry-core,
+  toml,
 }:
 
 buildPythonPackage rec {
   pname = "librouteros";
-  version = "3.2.1";
+  version = "3.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,10 +20,12 @@ buildPythonPackage rec {
     owner = "luqasz";
     repo = "librouteros";
     rev = "refs/tags/${version}";
-    hash = "sha256-VwpZ1RY6Sul7xvWY7ZoOxZ7KgbRmKRwcVdF9e2b3f6Q=";
+    hash = "sha256-dbeKJ3iG0eEW+sJJoZmQXyUad6mPhIlCAdJyQZT+CCQ=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ poetry-core ];
+
+  dependencies = [ toml ];
 
   nativeCheckInputs = [
     pytest-xdist
@@ -47,7 +50,7 @@ buildPythonPackage rec {
     description = "Python implementation of the MikroTik RouterOS API";
     homepage = "https://librouteros.readthedocs.io/";
     changelog = "https://github.com/luqasz/librouteros/blob/${version}/CHANGELOG.rst";
-    license = with licenses; [ gpl2Only ];
+    license = licenses.gpl2Only;
     maintainers = with maintainers; [ fab ];
   };
 }

From 2a9e028c450f70c0370c35fdf924ad2751bde41b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Nov 2024 12:41:25 +0100
Subject: [PATCH 31/62] python312Packages.pyexploitdb: 0.2.55 -> 0.2.56

Changelog: https://github.com/Hackman238/pyExploitDb/blob/master/ChangeLog.md
---
 pkgs/development/python-modules/pyexploitdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index 8d30f00ed893..c9eea0e812e2 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyexploitdb";
-  version = "0.2.55";
+  version = "0.2.56";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "pyExploitDb";
     inherit version;
-    hash = "sha256-tFJogmMM0T/nZawDqDeaM3XP4FCTdKnNAZdpxUakvL8=";
+    hash = "sha256-HyD5oh16kFcx9QUuP4ZhJmpfsfu7miPCzDouzEh7xKI=";
   };
 
   build-system = [ setuptools ];

From a8e9cae4c419c0a53ed18ddfc47d9f845d7f341d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Nov 2024 12:41:56 +0100
Subject: [PATCH 32/62] python312Packages.playwrightcapture: 1.27.1 -> 1.27.3

Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.27.1...v1.27.3

Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.27.3
---
 pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix
index 32d567b3a79a..cb31d6bdcf43 100644
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "playwrightcapture";
-  version = "1.27.1";
+  version = "1.27.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "Lookyloo";
     repo = "PlaywrightCapture";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2QF59YzveW4OJmueEs9v4qk+sONVQ/XgXhsT8nswNyo=";
+    hash = "sha256-fOtHPFn8mlT8kv+HTN4Mxp93+I+rtRQ1z+SSyiV/5qA=";
   };
 
   pythonRelaxDeps = [

From dfa2cb5482fa1399670ab20e2e342f9da32e68a4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Nov 2024 12:42:39 +0100
Subject: [PATCH 33/62] python312Packages.pyvicare: 2.36.0 -> 2.37.0

Diff: https://github.com/openviess/PyViCare/compare/refs/tags/2.36.0...2.37.0

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

diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix
index 6c73cf71f324..9fa7ed9030d1 100644
--- a/pkgs/development/python-modules/pyvicare/default.nix
+++ b/pkgs/development/python-modules/pyvicare/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvicare";
-  version = "2.36.0";
+  version = "2.37.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openviess";
     repo = "PyViCare";
     rev = "refs/tags/${version}";
-    hash = "sha256-WkdW1sSA/nVHK8Pp2sOkj3qYc8se4MT6WM4AoQvI5i8=";
+    hash = "sha256-v+fRlyR4UZJs3yVFSaJfExFDOHVxOA0aCEXEbTxyZ7E=";
   };
 
   postPatch = ''

From 5d33f18b8b6fea6125b7311058b434be938f5f53 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 25 Nov 2024 12:43:16 +0100
Subject: [PATCH 34/62] python312Packages.lxmf: 0.5.7 -> 0.5.8

Diff: https://github.com/markqvist/lxmf/compare/refs/tags/0.5.7...0.5.8

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

diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index b5e957b54d65..c5ddfe44736a 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "lxmf";
-  version = "0.5.7";
+  version = "0.5.8";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "lxmf";
     rev = "refs/tags/${version}";
-    hash = "sha256-ekemsCs3Ils8ovDTzyi6aQ4Z0bnfTKpuQYBeh1MA94Q=";
+    hash = "sha256-68c4KrXudjs6YGi282pa31XwbvjsXgKVQ2e+zPBYHf4=";
   };
 
   build-system = [ setuptools ];

From c020f7d83e9a13b1676e66324cd5cd559cb7bd44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 13:49:51 +0000
Subject: [PATCH 35/62] cargo-shear: 1.1.3 -> 1.1.4

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

diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index 8eaa8247089e..d8efe2547c43 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -6,7 +6,7 @@
   cargo-shear,
 }:
 let
-  version = "1.1.3";
+  version = "1.1.4";
 in
 rustPlatform.buildRustPackage {
   pname = "cargo-shear";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "Boshen";
     repo = "cargo-shear";
     rev = "v${version}";
-    hash = "sha256-xKO/57yvHSGzjWyDPu1DmI9eeDESyFgMschqK+OLUMs=";
+    hash = "sha256-40LBTB/lDY1UxK2dCqZJu1CUIqJxMbDxpSTlSLClpVY=";
   };
 
-  cargoHash = "sha256-lwPD46irkBg+Xg9/d07Q6BPk2rzKYkj3114EiMbbd+U=";
+  cargoHash = "sha256-GmNKUv0jfQ59pG8AspZT1NTX0AJQ9xl93LbCgUzPllo=";
 
   # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
   SHEAR_VERSION = version;

From c8b7043ed3d8e009ab949007cc381a8bb0ba2835 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 14:03:35 +0000
Subject: [PATCH 36/62] gcfflasher: 4.4.0 -> 4.5.2

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

diff --git a/pkgs/by-name/gc/gcfflasher/package.nix b/pkgs/by-name/gc/gcfflasher/package.nix
index 01a071dc68f4..6bcb45fec941 100644
--- a/pkgs/by-name/gc/gcfflasher/package.nix
+++ b/pkgs/by-name/gc/gcfflasher/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gcfflasher";
-  version = "4.4.0";
+  version = "4.5.2";
 
   src = fetchFromGitHub {
     owner = "dresden-elektronik";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-o0S4NtgQ/Rlpmkk8pTocmP0N+5F7BX8lUsczOKjujwk=";
+    hash = "sha256-jBKYKjsog0vfyrPoixqTifej5Kb+qYS11Tn+il3J0w0=";
   };
 
   nativeBuildInputs = [

From f8d40e2677177ea9375fce4f6282daa5c36dbe04 Mon Sep 17 00:00:00 2001
From: definfo <hjsdbb1@gmail.com>
Date: Sun, 27 Oct 2024 02:48:57 +0800
Subject: [PATCH 37/62] rime-ls: init at 0.4.0

NOTE: Currently rime-data is only used to pass checkPhase. Users may need to set RIME_DATA_DIR and configure editors themselves.
---
 pkgs/by-name/ri/rime-ls/package.nix | 37 +++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/ri/rime-ls/package.nix

diff --git a/pkgs/by-name/ri/rime-ls/package.nix b/pkgs/by-name/ri/rime-ls/package.nix
new file mode 100644
index 000000000000..1381760ed452
--- /dev/null
+++ b/pkgs/by-name/ri/rime-ls/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  librime,
+  rime-data,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "rime-ls";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "wlh320";
+    repo = "rime-ls";
+    rev = "v${version}";
+    hash = "sha256-ZqoRFIF3ehfEeTN+ZU+/PAzA4JyS1403+sqZdzwJHA8=";
+  };
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-mbkxOYlOCpNzxVWwG8n4vD8klHGVjvMA8XSsBbifjoM=";
+
+  nativeBuildInputs = [ rustPlatform.bindgenHook ];
+
+  buildInputs = [ librime ];
+
+  # Set RIME_DATA_DIR to work around test_get_candidates during checkPhase
+  env.RIME_DATA_DIR = "${rime-data}/share/rime-data";
+
+  meta = {
+    description = "Language server for Rime input method engine";
+    homepage = "https://github.com/wlh320/rime-ls";
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ definfo ];
+    mainProgram = "rime_ls";
+  };
+}

From 30965469fe8fdf79f4f75b48995a207a29530a45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 16:31:45 +0000
Subject: [PATCH 38/62] splash: 3.10.3 -> 3.11.0

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

diff --git a/pkgs/by-name/sp/splash/package.nix b/pkgs/by-name/sp/splash/package.nix
index 39d22a88b9d4..d9c7a6d0042a 100644
--- a/pkgs/by-name/sp/splash/package.nix
+++ b/pkgs/by-name/sp/splash/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "splash";
-  version = "3.10.3";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "danieljprice";
     repo = "splash";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-5ieJHUWZDGgsNj7U9tbdhtDIsN+wgbs03IxVd1xM+hw=";
+    hash = "sha256-lKYLB1NISrhavukHK3du3/ntAjzrkTHJdgeTvZW2mxA=";
   };
 
   nativeBuildInputs = [

From b17934bcf5e36ade52ba0334cb6fedcbd2985eb7 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Mon, 25 Nov 2024 15:16:18 -0500
Subject: [PATCH 39/62] gitea: 1.22.3 -> 1.22.4

Diff: https://github.com/go-gitea/gitea/compare/v1.22.3...v1.22.4
---
 pkgs/by-name/gi/gitea/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index e68a58be66e6..bb4b94c5cecf 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -33,18 +33,18 @@ let
   };
 in buildGoModule rec {
   pname = "gitea";
-  version = "1.22.3";
+  version = "1.22.4";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${gitea.version}";
-    hash = "sha256-F1vvyf/FE/OIfDjM0CCOef/cXy+GPA+8n1AypE0r6p8=";
+    hash = "sha256-9vmLG2t2vBRpLwLhGOL3W/LGNpUmxPt0mRh+jFXUWAc=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-iKf4ozCBcTJQ6bm6dX4dd4buVMGNDVF+rLuYkb7Zxw8=";
+  vendorHash = "sha256-72Q5XBb7RwfX3eekt8dsaS1doDhLCO0MFPHzJvlzxUo=";
 
   outputs = [ "out" "data" ];
 

From d323fab808073da5525e14578a2761623b7a026d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theo1.bori@epitech.eu>
Date: Mon, 25 Nov 2024 22:02:54 +0100
Subject: [PATCH 40/62] python3Packages.fairseq: Relaxing Python dependencies
 restrictions

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

diff --git a/pkgs/development/python-modules/fairseq/default.nix b/pkgs/development/python-modules/fairseq/default.nix
index 5cea23e2bda6..d68c8c2ebbc3 100644
--- a/pkgs/development/python-modules/fairseq/default.nix
+++ b/pkgs/development/python-modules/fairseq/default.nix
@@ -58,6 +58,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [
     "hydra-core"
     "omegaconf"
+    "torchaudio"
   ];
 
   propagatedBuildInputs = [

From 3e1f2bc01606d72b93956a87fc50f603b6f467f6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 25 Nov 2024 22:33:47 +0100
Subject: [PATCH 41/62] python312Packages.eliot: 1.15.0 -> 1.16.0

Diff: https://github.com/itamarst/eliot/compare/refs/tags/1.15.0...1.16.0

Changelog: https://github.com/itamarst/eliot/blob/1.16.0/docs/source/news.rst
---
 pkgs/development/python-modules/eliot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eliot/default.nix b/pkgs/development/python-modules/eliot/default.nix
index 04cb574509c2..fedbca7e913b 100644
--- a/pkgs/development/python-modules/eliot/default.nix
+++ b/pkgs/development/python-modules/eliot/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "eliot";
-  version = "1.15.0";
+  version = "1.16.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8" || pythonAtLeast "3.13";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "itamarst";
     repo = "eliot";
     rev = "refs/tags/${version}";
-    hash = "sha256-Ur7q7PZ5HH4ttD3b0HyBTe1B7eQ2nEWcTBR/Hjeg9yw=";
+    hash = "sha256-KqAXOMrRawzjpt5do2KdqpMMgpBtxeZ+X+th0WwBl+U=";
   };
 
   build-system = [ setuptools ];

From 58424e10eb55d95f27da1a88e3402ebaeac265e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 22:07:23 +0000
Subject: [PATCH 42/62] python312Packages.pre-commit-hooks: 4.6.0 -> 5.0.0

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

diff --git a/pkgs/development/python-modules/pre-commit-hooks/default.nix b/pkgs/development/python-modules/pre-commit-hooks/default.nix
index 55058f846d08..291f236c3c9b 100644
--- a/pkgs/development/python-modules/pre-commit-hooks/default.nix
+++ b/pkgs/development/python-modules/pre-commit-hooks/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pre-commit-hooks";
-  version = "4.6.0";
+  version = "5.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "pre-commit";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-p/pPpuuNjVxHSPyi4RL2DJlj9weSq8QinugQ4zmv9Ck=";
+    hash = "sha256-BYNi/xtdichqsn55hqr1MSFwWpH+7cCbLfqmpn9cxto=";
   };
 
   propagatedBuildInputs = [ ruamel-yaml ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];

From 53d984f16e1c22335ce110cd8875f1b8127dd649 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 22:29:37 +0000
Subject: [PATCH 43/62] star-history: 1.0.22 -> 1.0.26

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

diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix
index e8d96eb4249b..6c2ee875b68a 100644
--- a/pkgs/by-name/st/star-history/package.nix
+++ b/pkgs/by-name/st/star-history/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "star-history";
-  version = "1.0.22";
+  version = "1.0.26";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-Ymocx843DVxvtTHBS3PdyYDLgYJJtUMpmdOnOmFKJZE=";
+    hash = "sha256-qwpUV+amv/n/lRcFYf/TgXoj3aHdg3kZJigEeA0fKBg=";
   };
 
-  cargoHash = "sha256-xDO+Qdg8gDj0Eny7QtaRiAxwdXycOsInf5L1YZKv++g=";
+  cargoHash = "sha256-dKC+ZrQEcJW8jiYmFWBVWYiFzJ4guGAw4X4nazi9u6Y=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 313065f7f41eb974c25da1817c2cb7657e2d92f4 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Mon, 12 Jun 2023 23:54:12 +0200
Subject: [PATCH 44/62] em100: init at 0-unstable-2024-11-14

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/em/em100/package.nix | 47 +++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 pkgs/by-name/em/em100/package.nix

diff --git a/pkgs/by-name/em/em100/package.nix b/pkgs/by-name/em/em100/package.nix
new file mode 100644
index 000000000000..d8721a7b82b1
--- /dev/null
+++ b/pkgs/by-name/em/em100/package.nix
@@ -0,0 +1,47 @@
+{
+  curl,
+  fetchgit,
+  lib,
+  libusb1,
+  pkg-config,
+  stdenv,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "em100";
+  version = "0-unstable-2024-11-14";
+
+  src = fetchgit {
+    url = "https://review.coreboot.org/em100";
+    # No git tags available. Use latest rev from the main branch.
+    rev = "a78b4ba4774f05ecd7af495604b437113596d70e";
+    hash = "sha256-jzP56SMMiWiOynW17CFksi1VhpGt4oYYJrf4Rp9Vfs4=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    curl
+    libusb1
+  ];
+
+  buildFlags = [
+    "em100"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 em100 $out/bin/em100
+    install -Dm644 60-dediprog-em100pro.rules $out/lib/udev/rules.d/dediprog_em100.rules
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://www.coreboot.org";
+    description = "Open source tool for the EM100 SPI flash emulator";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ felixsinger ];
+    platforms = platforms.linux;
+    mainProgram = "em100";
+  };
+}

From 96b1a7a00f22378e5ce079b7f300ce218296a2a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 22:54:33 +0000
Subject: [PATCH 45/62] starboard: 0.15.21 -> 0.15.22

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

diff --git a/pkgs/by-name/st/starboard/package.nix b/pkgs/by-name/st/starboard/package.nix
index ea4f3a80adb4..f16c1497b46f 100644
--- a/pkgs/by-name/st/starboard/package.nix
+++ b/pkgs/by-name/st/starboard/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "starboard";
-  version = "0.15.21";
+  version = "0.15.22";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-XSxmF3dDTKVnZI4yt686LA0E3mIVdamGMX5EqIQ2qQE=";
+    hash = "sha256-s/DU9CKXl0rULuUWCjlqz2KU/07eRNwKdrYHiPwukxM=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -20,7 +20,7 @@ buildGoModule rec {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-eDAJyOj3P1dJ0h/Y0O+8JrHw2S+8MPj4NikzrI7eDrk=";
+  vendorHash = "sha256-oiuTOU9e2aMZZbCqKKvGaxoYUupgQ0qATD1r3RU8fmw=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 61b63f3c19ae779cb5e0faf2baa0a5e8c2ddbb56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 23:13:29 +0000
Subject: [PATCH 46/62] dgraph: 24.0.4 -> 24.0.5

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

diff --git a/pkgs/by-name/dg/dgraph/package.nix b/pkgs/by-name/dg/dgraph/package.nix
index ca8142e5930b..1e7babdec14b 100644
--- a/pkgs/by-name/dg/dgraph/package.nix
+++ b/pkgs/by-name/dg/dgraph/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "dgraph";
-  version = "24.0.4";
+  version = "24.0.5";
 
   src = fetchFromGitHub {
     owner = "dgraph-io";
     repo = "dgraph";
     rev = "v${version}";
-    sha256 = "sha256-VtOa+MfhNMbzqiDJY5KYwo2OCgu+4sn18M+dujzwi0g=";
+    sha256 = "sha256-JqkfkazR4VWUKt3Fi0ZINGHP5rIFV8zVBB46zjl3YbM=";
   };
 
   vendorHash = "sha256-pX5jRVh4cSuPK3cpDVyvt/gTHcFgG9hE3H96TuMYxKk=";

From b5a3b984df155da641cec91cfeb22b204abeaf59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 25 Nov 2024 23:25:33 +0000
Subject: [PATCH 47/62] zpaqfranz: 60.7 -> 60.9

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

diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix
index 9bc55d0ffca5..0e759d6d559d 100644
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zpaqfranz";
-  version = "60.7";
+  version = "60.9";
 
   src = fetchFromGitHub {
     owner = "fcorbelli";
     repo = "zpaqfranz";
     rev = finalAttrs.version;
-    hash = "sha256-tlMbCHlrGPvRSqdfItdCkxLPm1LtVWcGTQMUoZTCsIg=";
+    hash = "sha256-7X1nmJ6X1oRMzB3L/oKe3ARY02ZimUD09KO4fukxTyg=";
   };
 
   nativeBuildInputs = [

From 5e86512c8fba3e2f1a326fda93c4f2bdf8ecd8e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 01:32:10 +0000
Subject: [PATCH 48/62] cargo-run-bin: 1.7.3 -> 1.7.4

---
 pkgs/by-name/ca/cargo-run-bin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-run-bin/package.nix b/pkgs/by-name/ca/cargo-run-bin/package.nix
index e72f5d074273..fa4d2a5a33ed 100644
--- a/pkgs/by-name/ca/cargo-run-bin/package.nix
+++ b/pkgs/by-name/ca/cargo-run-bin/package.nix
@@ -5,14 +5,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-run-bin";
-  version = "1.7.3";
+  version = "1.7.4";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-VMlia5EEnNiNkOzwdTZwoaKtAxHz5xAxxnGlGoSbD80=";
+    hash = "sha256-79DJ6j2sai1dTdcXf0qD97TCNZuGRSUobLGahoApMss=";
   };
 
-  cargoHash = "sha256-DFsDUoYq+TE8ifwQIl5YfoeUl8udIf1z35rFmLe/4To=";
+  cargoHash = "sha256-6ub82+1DJqPjxNuEuk1YwdL6auCtWZK3L09xQlgific=";
 
   # multiple impurities in tests
   doCheck = false;

From 102b68144a9602bef3af0cd229210f7194e41e16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 01:50:38 +0000
Subject: [PATCH 49/62] ceph-csi: 3.12.2 -> 3.12.3

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

diff --git a/pkgs/by-name/ce/ceph-csi/package.nix b/pkgs/by-name/ce/ceph-csi/package.nix
index 55ff6cda52fb..b3f9aa4cda1f 100644
--- a/pkgs/by-name/ce/ceph-csi/package.nix
+++ b/pkgs/by-name/ce/ceph-csi/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ceph-csi";
-  version = "3.12.2";
+  version = "3.12.3";
 
   src = fetchFromGitHub {
     owner = "ceph";
     repo = "ceph-csi";
     rev = "v${version}";
-    hash = "sha256-AyGdXPszvYO/ocfcWKeRaUXgwB0IHFVG9uc+c2iaEvA=";
+    hash = "sha256-Q5JfnXw6aYcUaHa7ooXofMDXzs+/IsXajY9HYjDKbPQ=";
   };
 
   preConfigure = ''

From f70a484eaa266fd2311e0aff821e0cbac6638259 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 03:10:55 +0000
Subject: [PATCH 50/62] nhost-cli: 1.27.0 -> 1.27.1

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

diff --git a/pkgs/by-name/nh/nhost-cli/package.nix b/pkgs/by-name/nh/nhost-cli/package.nix
index d9146815bb2f..213a22828c82 100644
--- a/pkgs/by-name/nh/nhost-cli/package.nix
+++ b/pkgs/by-name/nh/nhost-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "nhost-cli";
-  version = "1.27.0";
+  version = "1.27.1";
 
   src = fetchFromGitHub {
     owner = "nhost";
     repo = "cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XYa7dCAeWS6sc2MovOUnG9j6Bd09JMHzCFpGdvo2nmI=";
+    hash = "sha256-31YkO0zvAp470pQQKapkwXnk6uDmzIZlLMQVsPhGaZ4=";
   };
 
   vendorHash = null;

From fce2e90047991d878a5ff0e6c68d3a0a24c0209a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 03:21:09 +0000
Subject: [PATCH 51/62] python312Packages.casbin: 1.36.3 -> 1.37.0

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

diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix
index 49c9b305626b..cd07b0e48165 100644
--- a/pkgs/development/python-modules/casbin/default.nix
+++ b/pkgs/development/python-modules/casbin/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "casbin";
-  version = "1.36.3";
+  version = "1.37.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "casbin";
     repo = "pycasbin";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JTAd7Nkreyfczomki05WHuuJCFWspvG8i6DAWaQI6fs=";
+    hash = "sha256-gFh8+fcunDG4kT+cJpmuVGsgWQzntbbm6AQmvS/iCo0=";
   };
 
   build-system = [ setuptools ];

From 521ad721e93cc293d34faabf8975141d42220387 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 04:20:16 +0000
Subject: [PATCH 52/62] python312Packages.scmrepo: 3.3.8 -> 3.3.9

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

diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix
index 6d38658041b5..f04af7051682 100644
--- a/pkgs/development/python-modules/scmrepo/default.nix
+++ b/pkgs/development/python-modules/scmrepo/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "scmrepo";
-  version = "3.3.8";
+  version = "3.3.9";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "scmrepo";
     rev = "refs/tags/${version}";
-    hash = "sha256-8fx4yZcdOb32x5eo04ixpMe3Mh21LwqzNKVRVEnjfQo=";
+    hash = "sha256-HrJraiETYC7U2IB9ykjGUOg3khA4lBIH18r7btvXRH8=";
   };
 
   build-system = [

From 19e40cd9cf92c06570b18e6b0a287eb5824c83e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 05:37:07 +0000
Subject: [PATCH 53/62] python312Packages.pipdeptree: 2.23.4 -> 2.24.0

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

diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix
index 559fc84fc3de..f69a6ef6ac41 100644
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pipdeptree";
-  version = "2.23.4";
+  version = "2.24.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "tox-dev";
     repo = "pipdeptree";
     rev = "refs/tags/${version}";
-    hash = "sha256-wK3RaVq5PwDVAKotkDVEeAMImJxJVN1GceyoKBGBkOY=";
+    hash = "sha256-Tg41ZH91yyE3N2ndmQ9VsK/0t7g9cBNZd4A6XcqBZdo=";
   };
 
   postPatch = ''

From b550ea1c836da21461bdc9f49fcac18813aebe60 Mon Sep 17 00:00:00 2001
From: Asherah Connor <ashe@kivikakk.ee>
Date: Tue, 26 Nov 2024 17:16:28 +1100
Subject: [PATCH 54/62] maintainers: add kivikakk

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index af87adef0619..09c0fd659617 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11697,6 +11697,12 @@
     name = "Kat Inskip";
     keys = [ { fingerprint = "9CC6 44B5 69CD A59B C874  C4C9 E8DD E3ED 1C90 F3A0"; } ];
   };
+  kivikakk = {
+    email = "ashe@kivikakk.ee";
+    github = "kivikakk";
+    githubId = 1915;
+    name = "Asherah Connor";
+  };
   kjeremy = {
     email = "kjeremy@gmail.com";
     name = "Jeremy Kolb";

From 54e1724fff85063ae28118dad2491b44a36ec6b7 Mon Sep 17 00:00:00 2001
From: Asherah Connor <ashe@kivikakk.ee>
Date: Tue, 26 Nov 2024 17:17:56 +1100
Subject: [PATCH 55/62] comrak: add kivikakk as maintainer

I'm the upstream author/maintainer and would like to keep it up to date!
---
 pkgs/by-name/co/comrak/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index 05eee8cc8136..5324b2e5daaa 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/kivikakk/comrak";
     changelog = "https://github.com/kivikakk/comrak/blob/${version}/changelog.txt";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with maintainers; [ figsoda kivikakk ];
   };
 }

From f162d6a47bc844ad115d9d3e18165d3f495e3d42 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 06:32:09 +0000
Subject: [PATCH 56/62] toxiproxy: 2.9.0 -> 2.11.0

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

diff --git a/pkgs/by-name/to/toxiproxy/package.nix b/pkgs/by-name/to/toxiproxy/package.nix
index 22dd5d2f6eeb..0b2aff389dbc 100644
--- a/pkgs/by-name/to/toxiproxy/package.nix
+++ b/pkgs/by-name/to/toxiproxy/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "toxiproxy";
-  version = "2.9.0";
+  version = "2.11.0";
 
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "toxiproxy";
     rev = "v${version}";
-    sha256 = "sha256-zwKeJ8LMMSSHvE0x0/9j3wBdAJG43RiGcszKz0B3dG8=";
+    sha256 = "sha256-1z4a69KnBurTrudqXiOPgrlICICu1ts86WrnFUlRWXE=";
   };
 
-  vendorHash = "sha256-eSQvLsSWWypA5vXR/GiEf5j7TzzsL8ZFRPOeICsIrlY=";
+  vendorHash = "sha256-LQV+TFFcrq4Px580yOWU+8EuGt/7bFJYi35He2es6Q8=";
 
   excludedPackages = [ "test/e2e" ];
 

From 052ae4f0d4db262c2f693ba13f9fc424b7004a53 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 09:34:42 +0100
Subject: [PATCH 57/62] python312Packages.reolink-aio: 0.11.2 -> 0.11.3

Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.11.2...0.11.3

Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.11.3
---
 pkgs/development/python-modules/reolink-aio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index d5aff40fe576..2689572dbf75 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.11.2";
+  version = "0.11.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     rev = "refs/tags/${version}";
-    hash = "sha256-VHuZhnesfY/bGIGMiT3VWFQXSisntNfbdDJy3tH0SlU=";
+    hash = "sha256-N47+mjQNVaTsKUTm+RRVDVCA5onQFI5ISMOBYuUv34Y=";
   };
 
   build-system = [ setuptools ];

From cf71af617655d6901cb70fcd668550e398db170e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 26 Nov 2024 10:06:22 +0000
Subject: [PATCH 58/62] gcc: restore dropped `isl` line
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I think this was a rebase mishap and causes a ton of rebuilds.

Not sure if we actually need the Darwin condition any more (or to be
using the older `isl` version?), but `master` isn’t the place to
find out :)

Fixes: 90474914ee2c8f592342d3e3cc16e0e7693479f8
---
 pkgs/development/compilers/gcc/all.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix
index ca95661e0d6e..444253a37878 100644
--- a/pkgs/development/compilers/gcc/all.nix
+++ b/pkgs/development/compilers/gcc/all.nix
@@ -24,6 +24,7 @@ let
         profiledCompiler = false;
         libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then args.libcCross else null;
         threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { };
+        isl = if stdenv.hostPlatform.isDarwin then null else isl_0_20;
         # do not allow version skew when cross-building gcc
         #
         # When `gcc` is cross-built (`build` != `target` && `host` == `target`)

From c506809699c84a6633b2681e3b574d44a3263a6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Nov 2024 11:14:52 +0000
Subject: [PATCH 59/62] redpanda-client: 24.2.6 -> 24.2.11

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

diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix
index 98ff552a3e3c..3605ac2a0e68 100644
--- a/pkgs/by-name/re/redpanda-client/package.nix
+++ b/pkgs/by-name/re/redpanda-client/package.nix
@@ -6,12 +6,12 @@
 , stdenv
 }:
 let
-  version = "24.2.6";
+  version = "24.2.11";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-zGVd2jsjhVtNghiBE2BjO28A8+VLvslCBeUpD3vQjcw=";
+    sha256 = "sha256-tbo7S6Vo3Uwepme/Sfbfng7DlWWryTDvg8ZMbuvJ4h0=";
   };
 in
 buildGoModule rec {
@@ -19,7 +19,7 @@ buildGoModule rec {
   inherit doCheck src version;
   modRoot = "./src/go/rpk";
   runVend = false;
-  vendorHash = "sha256-JEbIC33J+uUzPN04EtO5XoC0MIkYRXKYNCsFsirJfhY=";
+  vendorHash = "sha256-ZZRUmBx+jkZX8gqCYNlzto1D05atJ4zH+1kuZLYDeC0=";
 
   ldflags = [
     ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''

From 771d0b7622f2d083f4aadb99b326c20529e29281 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 26 Nov 2024 12:37:43 +0100
Subject: [PATCH 60/62] python312Packages.scmrepo: update disabled

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

diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix
index f04af7051682..cb8bab773c45 100644
--- a/pkgs/development/python-modules/scmrepo/default.nix
+++ b/pkgs/development/python-modules/scmrepo/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   version = "3.3.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "iterative";

From 3d20b485d9acfe4290c0296f0d75d7d8d2c2520a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 20 Nov 2024 17:06:21 +0100
Subject: [PATCH 61/62] =?UTF-8?q?ocamlPackages.findlib:=201.9.7=20?=
 =?UTF-8?q?=E2=86=92=201.9.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/tools/ocaml/findlib/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 283d6a4deb7a..e8a821fcd59a 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ocaml${ocaml.version}-findlib";
-  version = "1.9.7";
+  version = "1.9.8";
 
   src = fetchurl {
     url = "http://download.camlcity.org/download/findlib-${version}.tar.gz";
-    hash = "sha256-zNgiAI8bh6vVahL/f0rxlaDNouO8AROSF3miBcl5Hik=";
+    hash = "sha256-ZiyRD3dOn+46GcTgV/OAWBqy/E7lLaR2EwSsnDG4hp0=";
   };
 
   nativeBuildInputs = [ ocaml ];
@@ -14,10 +14,6 @@ stdenv.mkDerivation rec {
 
   patches = [ ./ldconf.patch ./install_topfind.patch ];
 
-  postPatch = ''
-    substituteInPlace src/bytes/Makefile --replace-warn OCAMLOPT_SHARED OCAMLOPT
-  '';
-
   dontAddPrefix=true;
   dontAddStaticConfigureFlags = true;
   configurePlatforms = [];

From 80ec892b740b187eda41df438cb8ff29dd224da1 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Tue, 26 Nov 2024 07:56:33 -0500
Subject: [PATCH 62/62] Revert "nixos/iso-image: fix isoImage.grubTheme = null;
 logic"

---
 nixos/modules/installer/cd-dvd/iso-image.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 724421c0d910..63abf88cab09 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -335,13 +335,12 @@ let
       set textmode=true
       terminal_output console
     }
-    '' + lib.optionalString (config.isoImage.grubTheme != null) ''
     hiddenentry 'GUI mode' --hotkey 'g' {
       $(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/BOOT/grub-theme/%P\n")
       set textmode=false
       terminal_output gfxterm
     }
-    '' + ''
+
 
     # If the parameter iso_path is set, append the findiso parameter to the kernel
     # line. We need this to allow the nixos iso to be booted from grub directly.