From 8125e281fd095e1d3c7448683ad2de6fc5c1dbd6 Mon Sep 17 00:00:00 2001
From: Florian Agbuya <fa@m-labs.ph>
Date: Thu, 13 Mar 2025 16:15:20 +0800
Subject: [PATCH 01/53] nixos/flarum: restart on package update

Ensures the Flarum service automatically restarts when its package is updated, preventing stale instances from running after upgrades.
---
 nixos/modules/services/web-apps/flarum.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/web-apps/flarum.nix b/nixos/modules/services/web-apps/flarum.nix
index c60416970a27..ace42173cb56 100644
--- a/nixos/modules/services/web-apps/flarum.nix
+++ b/nixos/modules/services/web-apps/flarum.nix
@@ -196,6 +196,10 @@ in
       }
     ];
 
+    systemd.services."phpfpm-flarum" = {
+      restartTriggers = [ cfg.package ];
+    };
+
     systemd.services.flarum-install = {
       description = "Flarum installation";
       requiredBy = [ "phpfpm-flarum.service" ];

From 954d7a973791a419bdd503a1c2f6561a0b2bc8cb Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Tue, 11 Mar 2025 10:10:33 +0100
Subject: [PATCH 02/53] plan-exporter: init at 0.0.6

---
 pkgs/by-name/pl/plan-exporter/package.nix | 24 +++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 pkgs/by-name/pl/plan-exporter/package.nix

diff --git a/pkgs/by-name/pl/plan-exporter/package.nix b/pkgs/by-name/pl/plan-exporter/package.nix
new file mode 100644
index 000000000000..936ef9107dd8
--- /dev/null
+++ b/pkgs/by-name/pl/plan-exporter/package.nix
@@ -0,0 +1,24 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+}:
+buildGoModule rec {
+  pname = "plan-exporter";
+  version = "0.0.6";
+  src = fetchFromGitHub {
+    owner = "agneum";
+    repo = "plan-exporter";
+    tag = "v${version}";
+    hash = "sha256-Csp57wmkDA8b05hmKbk1+bGtORFgNls7I01A0irTKao=";
+  };
+  vendorHash = null;
+
+  meta = {
+    description = "Query plan exporter for psql";
+    homepage = "https://github.com/agneum/plan-exporter";
+    changelog = "https://github.com/agneum/plan-exporter/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ autra ];
+  };
+}

From b7a75d6ddc6747c333489f9e5c1f28b575259248 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 14 Mar 2025 19:06:12 +0000
Subject: [PATCH 03/53] proftpd: 1.3.8c -> 1.3.9

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

diff --git a/pkgs/by-name/pr/proftpd/package.nix b/pkgs/by-name/pr/proftpd/package.nix
index 8c66f48490ca..741f21f33d47 100644
--- a/pkgs/by-name/pr/proftpd/package.nix
+++ b/pkgs/by-name/pr/proftpd/package.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "proftpd";
-  version = "1.3.8c";
+  version = "1.3.9";
 
   src = fetchFromGitHub {
     owner = "proftpd";
     repo = "proftpd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wHcJJiGY8ULVIMo6RVEE7ne6YZM7gECt2IygPhX+3cU=";
+    hash = "sha256-4Iyzk0OctTvDDkYXPDSrvaWQOjkbBXHY7ELyhkUx/X0=";
   };
 
   patches = [ ./no-install-user.patch ];

From 0869d0648058be7c1dfcfff66e9c123857c8d911 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Sat, 15 Mar 2025 15:50:43 +0900
Subject: [PATCH 04/53] deno: 2.2.3 -> 2.2.4

https://github.com/denoland/deno/releases/tag/v2.2.4

Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/de/deno/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 790189113597..f23f5150c4b3 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -20,17 +20,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "deno";
-  version = "2.2.3";
+  version = "2.2.4";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     tag = "v${version}";
-    hash = "sha256-eYzDCQVjilm6Olc9Ko+EYlSCNN7UVl/YXuK55xeoOOg=";
+    hash = "sha256-gcUd4N2rTVYprBxx5T2RjG+0uZ090KjXPswYzGU5+14=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-Hmxz4bryk6wMbccaXcKg8XuD9H9BF+nuvMkiCNeYMXY=";
+  cargoHash = "sha256-V2dKiiTYAsUhq6Pr+z/ga3qtKI43mfzqgBDSAhcBVKo=";
 
   postPatch = ''
     # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857

From 68a0a7a9a78c3c1257130df7d5a043059ec25c90 Mon Sep 17 00:00:00 2001
From: Antonio <vozaanthony@gmail.com>
Date: Sat, 15 Mar 2025 14:10:42 +0100
Subject: [PATCH 05/53] htb-toolkit: 0-unstable-2024-04-22 ->
 0-unstable-2025-03-15

---
 pkgs/by-name/ht/htb-toolkit/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix
index 015ac2db396c..9e4cc9f9eec2 100644
--- a/pkgs/by-name/ht/htb-toolkit/package.nix
+++ b/pkgs/by-name/ht/htb-toolkit/package.nix
@@ -16,18 +16,18 @@
 
 rustPlatform.buildRustPackage {
   pname = "htb-toolkit";
-  version = "0-unstable-2024-04-22";
+  version = "0-unstable-2025-03-15";
 
   src = fetchFromGitHub {
     owner = "D3vil0p3r";
     repo = "htb-toolkit";
     # https://github.com/D3vil0p3r/htb-toolkit/issues/3
-    rev = "921e4b352a9dd8b3bc8ac8774e13509abd179aef";
-    hash = "sha256-o91p/m06pm9qoYZZVh+qHulqHO2G7xVJQPpEvRsq+8Q=";
+    rev = "dd193c2974cd5fd1bbc6f7f616ebd597e28539ec";
+    hash = "sha256-NTZv0BPyIB32CNXbINYTy4n8tNVJ3pRLr1QDhI/tg2Y=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-TQsqZhgmbHqNFgUddtRRKYkob0L40dJiSq8FxKnpPEE=";
+  cargoHash = "sha256-ReEe8pyW66GXIPwAy6IKsFEAUjxHmzw5mj21i/h4quQ=";
 
   # Patch to disable prompt change of the shell when a target machine is run. Needed due to Nix declarative nature
   patches = [

From c3e2dace1a02015541349a0ebc33b11c5b5c4b0a Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 17 Nov 2024 21:16:23 -0500
Subject: [PATCH 06/53] python312Packages.wordninja: init at 2.0.0

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

diff --git a/pkgs/development/python-modules/wordninja/default.nix b/pkgs/development/python-modules/wordninja/default.nix
new file mode 100644
index 000000000000..69617bc2bafc
--- /dev/null
+++ b/pkgs/development/python-modules/wordninja/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  setuptools-scm,
+  wheel,
+}:
+
+buildPythonPackage rec {
+  pname = "wordninja";
+  version = "2.0.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-GhzH7BRq0Z1vcZQe6CrvPTEiFwDw2L+EQTbPjfedKBo=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+    wheel
+  ];
+
+  pythonImportsCheck = [ "wordninja" ];
+
+  meta = {
+    description = "Probabilistically split concatenated words using NLP based on English Wikipedia unigram frequencies";
+    homepage = "https://github.com/keredson/wordninja";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b8c03b3d2f03..20321c2e80cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18616,6 +18616,8 @@ self: super: with self; {
 
   wordfreq = callPackage ../development/python-modules/wordfreq { };
 
+  wordninja = callPackage ../development/python-modules/wordninja { };
+
   world-bank-data = callPackage ../development/python-modules/world-bank-data { };
 
   worldengine = callPackage ../development/python-modules/worldengine { };

From 3601d5e8a6356972f53c6f865d2b3bacf7e69c35 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 17 Nov 2024 21:08:13 -0500
Subject: [PATCH 07/53] python312Packages.text2digits: init at 0.1.0

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

diff --git a/pkgs/development/python-modules/text2digits/default.nix b/pkgs/development/python-modules/text2digits/default.nix
new file mode 100644
index 000000000000..2dd59134a1aa
--- /dev/null
+++ b/pkgs/development/python-modules/text2digits/default.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pypaInstallHook,
+  setuptoolsBuildHook,
+}:
+
+buildPythonPackage rec {
+  pname = "text2digits";
+  version = "0.1.0";
+  pyproject = false;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-oB2NyNVxediIulid9A4Ccw878t2JKrIsN1OOR5lyi7I=";
+  };
+
+  nativeBuildInputs = [
+    pypaInstallHook
+    setuptoolsBuildHook
+  ];
+
+  pythonImportsCheck = [ "text2digits" ];
+
+  meta = {
+    description = "Converts text such as 'twenty three' to number/digit '23' in any sentence";
+    homepage = "https://github.com/ShailChoksi/text2digits";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 20321c2e80cc..5428cfb5c9fc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16478,6 +16478,8 @@ self: super: with self; {
 
   texsoup = callPackage ../development/python-modules/texsoup { };
 
+  text2digits = callPackage ../development/python-modules/text2digits { };
+
   textblob = callPackage ../development/python-modules/textblob { };
 
   textfsm = callPackage ../development/python-modules/textfsm { };

From 3f66e7e71cf70816e76e0e1eb153f803ffefc6d0 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 17 Nov 2024 21:18:25 -0500
Subject: [PATCH 08/53] python312Packages.comicapi: init at 3.2.0

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

diff --git a/pkgs/development/python-modules/comicapi/default.nix b/pkgs/development/python-modules/comicapi/default.nix
new file mode 100644
index 000000000000..4a6721359728
--- /dev/null
+++ b/pkgs/development/python-modules/comicapi/default.nix
@@ -0,0 +1,83 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  importlib-metadata,
+  natsort,
+  pillow,
+  py7zr,
+  pycountry,
+  pyicu,
+  pytestCheckHook,
+  pythonOlder,
+  rapidfuzz,
+  rarfile,
+  setuptools,
+  setuptools-scm,
+  text2digits,
+  wheel,
+  wordninja,
+}:
+
+buildPythonPackage rec {
+  pname = "comicapi";
+  version = "3.2.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "comictagger";
+    repo = "comicapi";
+    rev = "2bf8332114e49add0bbc0fd3d85bdbba02de3d1a";
+    hash = "sha256-Cd3ILy/4PqWUj1Uu9of9gCpdVp2R6CXjPOuSXgrB894=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+    wheel
+  ];
+
+  dependencies = [
+    importlib-metadata
+    natsort
+    pillow
+    pycountry
+    rapidfuzz
+    text2digits
+    wordninja
+  ];
+
+  optional-dependencies = {
+    _7z = [ py7zr ];
+
+    all = [
+      py7zr
+      rarfile
+    ] ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) pyicu;
+
+    cbr = [ rarfile ];
+
+    icu = lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) pyicu;
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  pythonRelaxDeps = [ "pycountry" ];
+
+  disabledTests = [
+    # AssertionError
+    "test_copy_from_archive"
+  ];
+
+  pythonImportsCheck = [ "comicapi" ];
+
+  meta = {
+    description = "Comic archive (cbr/cbz/cbt) and metadata utilities";
+    homepage = "https://github.com/comictagger/comicapi";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5428cfb5c9fc..d6b1e24acb07 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2196,6 +2196,8 @@ self: super: with self; {
     inherit (pkgs) secp256k1;
   };
 
+  comicapi = callPackage ../development/python-modules/comicapi { };
+
   comicon = callPackage ../development/python-modules/comicon { };
 
   command-runner = callPackage ../development/python-modules/command-runner { };

From 75cf9bd326d0ec07bcdb62573e8cf0dcf50c244f Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 17 Nov 2024 22:18:24 -0500
Subject: [PATCH 09/53] python312Packages.scholarly: init at 1.7.11

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

diff --git a/pkgs/development/python-modules/scholarly/default.nix b/pkgs/development/python-modules/scholarly/default.nix
new file mode 100644
index 000000000000..39f24bbc2781
--- /dev/null
+++ b/pkgs/development/python-modules/scholarly/default.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  arrow,
+  beautifulsoup4,
+  bibtexparser,
+  buildPythonPackage,
+  deprecated,
+  fake-useragent,
+  fetchFromGitHub,
+  free-proxy,
+  httpx,
+  python-dotenv,
+  requests,
+  selenium,
+  setuptools,
+  sphinx-rtd-theme,
+  stem,
+  typing-extensions,
+  wheel,
+}:
+
+buildPythonPackage rec {
+  pname = "scholarly";
+  version = "1.7.11";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "scholarly-python-package";
+    repo = "scholarly";
+    tag = "v${version}";
+    hash = "sha256-yvew63tGwSjwseHK7wDqm26xiyCztUzxMqBpwwLD798=";
+  };
+
+  build-system = [
+    setuptools
+    wheel
+  ];
+
+  dependencies = [
+    arrow
+    beautifulsoup4
+    bibtexparser
+    deprecated
+    fake-useragent
+    free-proxy
+    httpx
+    python-dotenv
+    requests
+    selenium
+    sphinx-rtd-theme
+    typing-extensions
+  ];
+
+  optional-dependencies = {
+    tor = [ stem ];
+  };
+
+  nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies);
+
+  pythonImportsCheck = [ "scholarly" ];
+
+  meta = {
+    description = "Retrieve author and publication information from Google Scholar";
+    homepage = "https://scholarly.readthedocs.io/";
+    changelog = "https://github.com/scholarly-python-package/scholarly/releases/tag/${src.tag}";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d6b1e24acb07..4de56619ca59 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14850,6 +14850,8 @@ self: super: with self; {
 
   schiene = callPackage ../development/python-modules/schiene { };
 
+  scholarly = callPackage ../development/python-modules/scholarly { };
+
   schwifty = callPackage ../development/python-modules/schwifty { };
 
   scienceplots = callPackage ../development/python-modules/scienceplots { };

From b168e51ab17d501eb9d8e8b8e354e571f45a7621 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 17 Nov 2024 22:36:32 -0500
Subject: [PATCH 10/53] python312Packages.urlobject: init at 2.4.3

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

diff --git a/pkgs/development/python-modules/urlobject/default.nix b/pkgs/development/python-modules/urlobject/default.nix
new file mode 100644
index 000000000000..5c0a1371c101
--- /dev/null
+++ b/pkgs/development/python-modules/urlobject/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pypaInstallHook,
+  setuptoolsBuildHook,
+}:
+
+buildPythonPackage rec {
+  pname = "urlobject";
+  version = "2.4.3";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "zacharyvoase";
+    repo = "urlobject";
+    tag = "v${version}";
+    hash = "sha256-4UuQZTkVre8jXlchW7/TjeaADYvLnGMpGbJR/sdeKv4=";
+  };
+
+  nativeBuildInputs = [
+    pypaInstallHook
+    setuptoolsBuildHook
+  ];
+
+  # Tests use `nose`
+  doInstallCheck = false;
+
+  pythonImportsCheck = [ "urlobject" ];
+
+  meta = {
+    description = "Python library for manipulating URLs (and some URIs) in a more natural way";
+    homepage = "http://zacharyvoase.github.com/urlobject";
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4de56619ca59..76156f065131 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18126,6 +18126,8 @@ self: super: with self; {
 
   urlmatch = callPackage ../development/python-modules/urlmatch { };
 
+  urlobject = callPackage ../development/python-modules/urlobject { };
+
   urlpy = callPackage ../development/python-modules/urlpy { };
 
   urwid = callPackage ../development/python-modules/urwid { };

From b00b098ce9e99447d6b3228d6c5ee8f0d1548b4e Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 17 Nov 2024 22:37:22 -0500
Subject: [PATCH 11/53] python312Packages.flask-dance: init at 7.1.0

---
 .../python-modules/flask-dance/default.nix    | 95 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 97 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-dance/default.nix

diff --git a/pkgs/development/python-modules/flask-dance/default.nix b/pkgs/development/python-modules/flask-dance/default.nix
new file mode 100644
index 000000000000..5c6a15fe48e0
--- /dev/null
+++ b/pkgs/development/python-modules/flask-dance/default.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  betamax,
+  blinker,
+  buildPythonPackage,
+  coverage,
+  fetchFromGitHub,
+  flask,
+  flask-caching,
+  flask-login,
+  flask-sqlalchemy,
+  flit,
+  freezegun,
+  oauthlib,
+  pallets-sphinx-themes,
+  pillow,
+  pytest,
+  pytest-mock,
+  pytestCheckHook,
+  requests,
+  requests-oauthlib,
+  responses,
+  sphinx,
+  sphinxcontrib-seqdiag,
+  sphinxcontrib-spelling,
+  sqlalchemy,
+  urlobject,
+  werkzeug,
+}:
+
+buildPythonPackage rec {
+  pname = "flask-dance";
+  version = "7.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "singingwolfboy";
+    repo = "flask-dance";
+    tag = "v${version}";
+    hash = "sha256-rKHC0G5S7l52QSrbbweMii68AZuBAgf6tYsJdPKIeUk=";
+  };
+
+  build-system = [ flit ];
+
+  dependencies = [
+    flask
+    oauthlib
+    requests
+    requests-oauthlib
+    urlobject
+    werkzeug
+  ];
+
+  optional-dependencies = {
+    docs = [
+      betamax
+      pallets-sphinx-themes
+      pillow
+      sphinx
+      sphinxcontrib-seqdiag
+      sphinxcontrib-spelling
+      sqlalchemy
+    ];
+
+    signals = [ blinker ];
+
+    sqla = [ sqlalchemy ];
+
+    test = [
+      betamax
+      coverage
+      flask-caching
+      flask-login
+      flask-sqlalchemy
+      freezegun
+      oauthlib
+      pytest
+      pytest-mock
+      responses
+      sqlalchemy
+    ];
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  pythonImportsCheck = [ "flask_dance" ];
+
+  meta = {
+    description = "Doing the OAuth dance with style using Flask, requests, and oauthlib";
+    homepage = "https://github.com/singingwolfboy/flask-dance";
+    changelog = "https://github.com/singingwolfboy/flask-dance/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 76156f065131..ab26809c0432 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4802,6 +4802,8 @@ self: super: with self; {
 
   flask-cors = callPackage ../development/python-modules/flask-cors { };
 
+  flask-dance = callPackage ../development/python-modules/flask-dance { };
+
   flask-dramatiq = callPackage ../development/python-modules/flask-dramatiq { };
 
   flask-elastic = callPackage ../development/python-modules/flask-elastic { };

From 5ccb66d56b0b6c70df2bfbd6e4c807f4da5a6d10 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 17 Nov 2024 23:33:45 -0500
Subject: [PATCH 12/53] python312Packages.netifaces-plus: init at 0.12.4

---
 .../python-modules/netifaces-plus/default.nix | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/netifaces-plus/default.nix

diff --git a/pkgs/development/python-modules/netifaces-plus/default.nix b/pkgs/development/python-modules/netifaces-plus/default.nix
new file mode 100644
index 000000000000..dcce0b372d18
--- /dev/null
+++ b/pkgs/development/python-modules/netifaces-plus/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  setuptools,
+  wheel,
+}:
+
+buildPythonPackage rec {
+  pname = "netifaces-plus";
+  version = "0.12.4";
+  pyproject = true;
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "tsukumijima";
+    repo = "netifaces-plus";
+    tag = "release_${lib.replaceStrings [ "." ] [ "_" ] version}";
+    hash = "sha256-3CYAe0doWMagcUIN9+ikH9gEST9AqglSQDlZsKOMnC8=";
+  };
+
+  build-system = [
+    setuptools
+    wheel
+  ];
+
+  pythonImportsCheck = [ "netifaces" ];
+
+  meta = {
+    description = "Portable network interface information";
+    homepage = "https://github.com/tsukumijima/netifaces-plus";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ab26809c0432..fd78e6fcd020 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9430,6 +9430,8 @@ self: super: with self; {
 
   netifaces2 = callPackage ../development/python-modules/netifaces2 { };
 
+  netifaces-plus = callPackage ../development/python-modules/netifaces-plus { };
+
   netmiko = callPackage ../development/python-modules/netmiko { };
 
   netio = callPackage ../development/python-modules/netio { };

From a5dcac83dfc22bd3dc694d421db958e8a79662cb Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 17 Nov 2024 16:44:53 -0500
Subject: [PATCH 13/53] calibre-web: format with nixfmt

---
 pkgs/by-name/ca/calibre-web/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ca/calibre-web/package.nix b/pkgs/by-name/ca/calibre-web/package.nix
index c3f125261ca8..6f643ba842ed 100644
--- a/pkgs/by-name/ca/calibre-web/package.nix
+++ b/pkgs/by-name/ca/calibre-web/package.nix
@@ -1,8 +1,9 @@
-{ lib
-, fetchFromGitHub
-, nixosTests
-, nix-update-script
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  nixosTests,
+  nix-update-script,
+  python3,
 }:
 
 let

From 7bdcfa1db80e063d68242037aacf753ef01df5a6 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 17 Nov 2024 16:45:14 -0500
Subject: [PATCH 14/53] calibre-web: 0.6.22 -> 0.6.24

Diff: https://github.com/janeczku/calibre-web/compare/0.6.22...0.6.24

Changelog: https://github.com/janeczku/calibre-web/releases/tag/0.6.24
---
 pkgs/by-name/ca/calibre-web/package.nix | 156 +++++++++++++++++-------
 1 file changed, 109 insertions(+), 47 deletions(-)

diff --git a/pkgs/by-name/ca/calibre-web/package.nix b/pkgs/by-name/ca/calibre-web/package.nix
index 6f643ba842ed..7a4ae13160ff 100644
--- a/pkgs/by-name/ca/calibre-web/package.nix
+++ b/pkgs/by-name/ca/calibre-web/package.nix
@@ -1,58 +1,23 @@
 {
   lib,
   fetchFromGitHub,
-  nixosTests,
   nix-update-script,
-  python3,
+  nixosTests,
+  python3Packages,
 }:
 
-let
-  python = python3.override {
-    self = python;
-    packageOverrides = self: super: {
-      sqlalchemy = super.sqlalchemy_1_4;
-    };
-  };
-in
-python.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "calibre-web";
-  version = "0.6.22";
+  version = "0.6.24";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "janeczku";
     repo = "calibre-web";
-    rev = version;
-    hash = "sha256-nWZmDasBH+DW/+Cvw510mOv11CXorRnoBwNFpoKPErY=";
+    tag = version;
+    hash = "sha256-DYhlD3ly6U/e5cDlsubDyW1uKeCtB+HrpagJlNDJhyI=";
   };
 
-  propagatedBuildInputs = with python.pkgs; [
-    advocate
-    apscheduler
-    babel
-    bleach
-    chardet
-    flask
-    flask-babel
-    flask-limiter
-    flask-login
-    flask-principal
-    flask-simpleldap
-    flask-wtf
-    iso-639
-    jsonschema
-    lxml
-    pypdf
-    python-magic
-    pytz
-    regex
-    requests
-    sqlalchemy
-    tornado
-    unidecode
-    wand
-    werkzeug
-  ];
-
   patches = [
     # default-logger.patch switches default logger to /dev/stdout. Otherwise calibre-web tries to open a file relative
     # to its location, which can't be done as the store is read-only. Log file location can later be configured using UI
@@ -70,12 +35,108 @@ python.pkgs.buildPythonApplication rec {
     mv cps.py src/calibreweb/__init__.py
     mv cps src/calibreweb
 
-    substituteInPlace setup.cfg \
-      --replace-fail "cps = calibreweb:main" "calibre-web = calibreweb:main"
+    substituteInPlace pyproject.toml \
+      --replace-fail 'cps = "calibreweb:main"' 'calibre-web = "calibreweb:main"'
   '';
 
-  # Upstream repo doesn't provide any tests.
-  doCheck = false;
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies = with python3Packages; [
+    apscheduler
+    babel
+    bleach
+    chardet
+    cryptography
+    flask
+    flask-babel
+    flask-httpauth
+    flask-limiter
+    flask-principal
+    flask-wtf
+    iso-639
+    lxml
+    netifaces-plus
+    pycountry
+    pypdf
+    python-magic
+    pytz
+    regex
+    requests
+    sqlalchemy
+    tornado
+    unidecode
+    urllib3
+    wand
+  ];
+
+  optional-dependencies = {
+    comics = with python3Packages; [
+      comicapi
+      natsort
+    ];
+
+    gdrive = with python3Packages; [
+      gevent
+      google-api-python-client
+      greenlet
+      httplib2
+      oauth2client
+      pyasn1-modules
+      # https://github.com/NixOS/nixpkgs/commit/bf28e24140352e2e8cb952097febff0e94ea6a1e
+      # pydrive2
+      pyyaml
+      rsa
+      uritemplate
+    ];
+
+    gmail = with python3Packages; [
+      google-api-python-client
+      google-auth-oauthlib
+    ];
+
+    # We don't support the goodreads feature, as the `goodreads` package is
+    # archived and depends on other long unmaintained packages (rauth & nose)
+    # goodreads = [ ];
+
+    kobo = with python3Packages; [ jsonschema ];
+
+    ldap = with python3Packages; [
+      flask-simpleldap
+      python-ldap
+    ];
+
+    metadata = with python3Packages; [
+      faust-cchardet
+      html2text
+      markdown2
+      mutagen
+      py7zr
+      pycountry
+      python-dateutil
+      rarfile
+      scholarly
+    ];
+
+    oauth = with python3Packages; [
+      flask-dance
+      sqlalchemy-utils
+    ];
+  };
+
+  pythonRelaxDeps = [
+    "apscheduler"
+    "bleach"
+    "cryptography"
+    "flask"
+    "flask-limiter"
+    "lxml"
+    "pypdf"
+    "regex"
+  ];
+
+  nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies);
+
+  pythonImportsCheck = [ "calibreweb" ];
 
   passthru = {
     tests.calibre-web = nixosTests.calibre-web;
@@ -85,9 +146,10 @@ python.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Web app for browsing, reading and downloading eBooks stored in a Calibre database";
     homepage = "https://github.com/janeczku/calibre-web";
+    changelog = "https://github.com/janeczku/calibre-web/releases/tag/${src.tag}";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ pborzenkov ];
-    platforms = platforms.all;
     mainProgram = "calibre-web";
+    platforms = platforms.all;
   };
 }

From c303ae59c7bbe614aea8b585bdaca20f33f79392 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 17 Nov 2024 16:46:48 -0500
Subject: [PATCH 15/53] calibre-web: only use nixosTests on linux

---
 pkgs/by-name/ca/calibre-web/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/calibre-web/package.nix b/pkgs/by-name/ca/calibre-web/package.nix
index 7a4ae13160ff..00d520a94e5b 100644
--- a/pkgs/by-name/ca/calibre-web/package.nix
+++ b/pkgs/by-name/ca/calibre-web/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   nix-update-script,
   nixosTests,
@@ -139,7 +140,7 @@ python3Packages.buildPythonApplication rec {
   pythonImportsCheck = [ "calibreweb" ];
 
   passthru = {
-    tests.calibre-web = nixosTests.calibre-web;
+    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { inherit (nixosTests) calibre-web; };
     updateScript = nix-update-script { };
   };
 

From 4b3bacf9bd34bd14947897369781c5c8afa2c83e Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sun, 17 Nov 2024 17:01:01 -0500
Subject: [PATCH 16/53] calibre-web: don't overuse `with lib;`

---
 pkgs/by-name/ca/calibre-web/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/calibre-web/package.nix b/pkgs/by-name/ca/calibre-web/package.nix
index 00d520a94e5b..6e7fe46c42fa 100644
--- a/pkgs/by-name/ca/calibre-web/package.nix
+++ b/pkgs/by-name/ca/calibre-web/package.nix
@@ -144,13 +144,13 @@ python3Packages.buildPythonApplication rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Web app for browsing, reading and downloading eBooks stored in a Calibre database";
     homepage = "https://github.com/janeczku/calibre-web";
     changelog = "https://github.com/janeczku/calibre-web/releases/tag/${src.tag}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ pborzenkov ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ pborzenkov ];
     mainProgram = "calibre-web";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }

From 6fd0026bbbeedadcac73452d8733422428df6275 Mon Sep 17 00:00:00 2001
From: Juul-Mc-Goa <jules.magois.pro@proton.me>
Date: Sat, 15 Mar 2025 23:39:29 +0100
Subject: [PATCH 17/53] zotero: fix linux rpath

Change library path from `${stdenv.cc.cc.lib}/lib64` to `${stdenv.cc.cc.lib}/lib`
---
 pkgs/by-name/zo/zotero/linux.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix
index b45182f6b8f5..88e572a1077d 100644
--- a/pkgs/by-name/zo/zotero/linux.nix
+++ b/pkgs/by-name/zo/zotero/linux.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
       pciutils
     ]
     + ":"
-    + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
+    + lib.makeSearchPathOutput "lib" "lib" [ stdenv.cc.cc ];
 
   desktopItem = makeDesktopItem {
     name = "zotero";

From 801c1a0d1669ae3d17e3719721fa19bf8bcdb951 Mon Sep 17 00:00:00 2001
From: Juul-Mc-Goa <jules.magois.pro@proton.me>
Date: Sun, 16 Mar 2025 00:28:43 +0100
Subject: [PATCH 18/53] zotero-beta: fix linux rpath

---
 pkgs/by-name/zo/zotero-beta/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/zo/zotero-beta/package.nix b/pkgs/by-name/zo/zotero-beta/package.nix
index 9b4f1eca9b57..268b6d493d18 100644
--- a/pkgs/by-name/zo/zotero-beta/package.nix
+++ b/pkgs/by-name/zo/zotero-beta/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
       pciutils
     ]
     + ":"
-    + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
+    + lib.makeSearchPathOutput "lib" "lib" [ stdenv.cc.cc ];
 
   desktopItem = makeDesktopItem {
     name = "zotero";

From 6e97a154a38726714395828fd3453a42595bb1e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 15 Mar 2025 23:50:49 +0000
Subject: [PATCH 19/53] retroarch-assets: 1.20.0-unstable-2025-01-30 ->
 1.20.0-unstable-2025-03-09

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

diff --git a/pkgs/by-name/re/retroarch-assets/package.nix b/pkgs/by-name/re/retroarch-assets/package.nix
index 5eb07305a93e..458076efca65 100644
--- a/pkgs/by-name/re/retroarch-assets/package.nix
+++ b/pkgs/by-name/re/retroarch-assets/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "retroarch-assets";
-  version = "1.20.0-unstable-2025-01-30";
+  version = "1.20.0-unstable-2025-03-09";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "retroarch-assets";
-    rev = "9afd2b8a9d16fc25c5a046122bc0d2b3c965980e";
-    hash = "sha256-PWwq9aNj0u+Dc9Q7lSRivER1Fd42H6u2auU/XLlg61k=";
+    rev = "fb39cdde6dfaea2c98218d28c71b14afc632fa03";
+    hash = "sha256-2ytGtoci0xd10KrYGwMsGbXoT402DiokSVlCek8nhyI=";
   };
 
   makeFlags = [

From 4abbfef4e8d8b8f2177e6d463b084974274bbbba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 16 Mar 2025 03:46:46 +0000
Subject: [PATCH 20/53] rabbitmqadmin-ng: 0.24.0 -> 0.27.0

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

diff --git a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
index 94b0884b74f6..3f8f064908fc 100644
--- a/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
+++ b/pkgs/by-name/ra/rabbitmqadmin-ng/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rabbitmqadmin-ng";
-  version = "0.24.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "rabbitmq";
     repo = "rabbitmqadmin-ng";
     tag = "v${version}";
-    hash = "sha256-P6/M90LvvK4NQ7jiT84rROrzgQukJ8V+24naRBehhHQ";
+    hash = "sha256-PSG//vyhNFUVDf9XfIuqm0mGcDo0B02+x0Sesj3ggAA=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-SODm95UOvsRIMI4WgV0Nk5UBtQU0lmcENoOcyhuGU9s=";
+  cargoHash = "sha256-hMFawT1m8VNRWENvJtoi5Ysw7k3iNRB7y5wgNAJCxX8=";
 
   buildInputs = [ openssl ];
   nativeBuildInputs = [ pkg-config ];

From 0e2b84585d011e062bb648cebd4ed8f694d4cacf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 16 Mar 2025 04:27:21 +0000
Subject: [PATCH 21/53] tideways-daemon: 1.9.34 -> 1.9.36

---
 pkgs/by-name/ti/tideways-daemon/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix
index 09bfec46a49f..a7842e63dd2a 100644
--- a/pkgs/by-name/ti/tideways-daemon/package.nix
+++ b/pkgs/by-name/ti/tideways-daemon/package.nix
@@ -10,7 +10,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-daemon";
-  version = "1.9.34";
+  version = "1.9.36";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-duJmsFX6KNgO6G8VrhVIVv9H9jccQGtGuaBOw2A7p1c=";
+        hash = "sha256-+EnXHjFAD23jmG8IucnppjWeGNKX6yzWJypICECy3do=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-1rw6s8E0jCr2vyx1eoejt/wNm0FQx2UVoj4EpLBbkgI=";
+        hash = "sha256-p5/wzvr7EyvELADfA1X/mo8VdAT47SbAXZlIWdGZVb4=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-A4+IE/bzvc6SSd/V3MqLB9Y7ruFe5edZ/HNY07JJ7fc=";
+        hash = "sha256-uI7qOO7nj32BXrNFMmQlX32omT4Kxruf/J7A63QQ62w=";
       };
     };
     updateScript = "${

From 92393e0a1e04dc7e3cc95d91b810cabd28ec4a25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 16 Mar 2025 07:10:23 +0000
Subject: [PATCH 22/53] clash-meta: 1.19.2 -> 1.19.3

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

diff --git a/pkgs/by-name/mi/mihomo/package.nix b/pkgs/by-name/mi/mihomo/package.nix
index ef456ae69c95..e7abb69102c0 100644
--- a/pkgs/by-name/mi/mihomo/package.nix
+++ b/pkgs/by-name/mi/mihomo/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "mihomo";
-  version = "1.19.2";
+  version = "1.19.3";
 
   src = fetchFromGitHub {
     owner = "MetaCubeX";
     repo = "mihomo";
     rev = "v${version}";
-    hash = "sha256-lTrUM4/t7GP8IhuyMqit7Iv4AX2I8tlMJWvgx2tDbgE=";
+    hash = "sha256-NzxH6rgr85oHmkMxh3rLbYXJoQKOsngeTazAV3SvRCg=";
   };
 
-  vendorHash = "sha256-/YW3IRdDHcOrwUkXt/ORhN3OrwwV5H63WP6ioTFDR+c=";
+  vendorHash = "sha256-dQNdOTFcfk53Snu01XLGB3PTiU1Ex/QQvykfopIdk2M=";
 
   excludedPackages = [ "./test" ];
 

From d218798fcd6702c87bf4c6abaf178a1329324ca0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 16 Mar 2025 00:52:20 +0000
Subject: [PATCH 23/53] editorconfig-checker: 3.2.0 -> 3.2.1

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

diff --git a/pkgs/by-name/ed/editorconfig-checker/package.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix
index 51d7552b0e25..b9cda0e91a62 100644
--- a/pkgs/by-name/ed/editorconfig-checker/package.nix
+++ b/pkgs/by-name/ed/editorconfig-checker/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "editorconfig-checker";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "editorconfig-checker";
     repo = "editorconfig-checker";
     rev = "v${version}";
-    hash = "sha256-JEpmCpFLj7LO/Vojw7MoAu8E5bZKT1cU4Zk4Nw6IEmM=";
+    hash = "sha256-LoOuP98vRj/kzyWKKsXNPfE+9IELrKBtdSZvP7GtMew=";
   };
 
-  vendorHash = "sha256-GNUkU/cmu8j6naFAHIEZ56opJnj8p2Sb8M7TduTbJcU=";
+  vendorHash = "sha256-3mcz7tstVfIb1ATuCwDdQ5IyCtjSGaDWNw2qCmY/ObE=";
 
   doCheck = false;
 

From ac98fdafb2e8923472fe6882f8f8a8d6350426cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 16 Mar 2025 07:47:11 +0000
Subject: [PATCH 24/53] polarity: latest-unstable-2025-02-28 ->
 latest-unstable-2025-03-14

---
 pkgs/by-name/po/polarity/Cargo.lock  | 30 +++++++++++-----------------
 pkgs/by-name/po/polarity/package.nix |  8 ++++----
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/po/polarity/Cargo.lock b/pkgs/by-name/po/polarity/Cargo.lock
index d0468d6b7f2b..25f8b891b534 100644
--- a/pkgs/by-name/po/polarity/Cargo.lock
+++ b/pkgs/by-name/po/polarity/Cargo.lock
@@ -1997,7 +1997,7 @@ dependencies = [
  "log",
  "lsp-server",
  "reqwest",
- "tower-lsp",
+ "tower-lsp-server",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "wasm-streams",
@@ -2014,7 +2014,7 @@ dependencies = [
  "miette",
  "miette_util",
  "printer",
- "tower-lsp",
+ "tower-lsp-server",
  "url",
 ]
 
@@ -2509,11 +2509,12 @@ dependencies = [
  "log",
  "lsp-server",
  "miette",
+ "parser",
  "printer",
  "termsize",
  "thiserror",
  "tokio",
- "tower-lsp",
+ "tower-lsp-server",
 ]
 
 [[package]]
@@ -2823,15 +2824,14 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.17.8"
+version = "0.17.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
+checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee"
 dependencies = [
  "cc",
  "cfg-if",
  "getrandom 0.2.15",
  "libc",
- "spin",
  "untrusted",
  "windows-sys 0.52.0",
 ]
@@ -3090,12 +3090,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -3595,9 +3589,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
-name = "tower-lsp"
-version = "0.20.0"
-source = "git+https://github.com/tower-lsp/tower-lsp?rev=19f5a87810ff4b643d2bc394e438450bd9c74365#19f5a87810ff4b643d2bc394e438450bd9c74365"
+name = "tower-lsp-server"
+version = "0.21.0"
+source = "git+https://github.com/tower-lsp-community/tower-lsp-server?rev=ae955f1d1c2a86bf675cc9bd0638e4c684864a6d#ae955f1d1c2a86bf675cc9bd0638e4c684864a6d"
 dependencies = [
  "async-codec-lite",
  "async-trait",
@@ -3611,14 +3605,14 @@ dependencies = [
  "serde",
  "serde_json",
  "tower",
- "tower-lsp-macros",
+ "tower-lsp-server-macros",
  "tracing",
 ]
 
 [[package]]
-name = "tower-lsp-macros"
+name = "tower-lsp-server-macros"
 version = "0.9.0"
-source = "git+https://github.com/tower-lsp/tower-lsp?rev=19f5a87810ff4b643d2bc394e438450bd9c74365#19f5a87810ff4b643d2bc394e438450bd9c74365"
+source = "git+https://github.com/tower-lsp-community/tower-lsp-server?rev=ae955f1d1c2a86bf675cc9bd0638e4c684864a6d#ae955f1d1c2a86bf675cc9bd0638e4c684864a6d"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index 97d3948130d6..d2849ca44634 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -7,19 +7,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "polarity";
-  version = "latest-unstable-2025-02-28";
+  version = "latest-unstable-2025-03-14";
 
   src = fetchFromGitHub {
     owner = "polarity-lang";
     repo = "polarity";
-    rev = "627a0d0ebfca2a586279e284921e05313514d374";
-    hash = "sha256-Q/lx4/cFpttbGRvyPnMC6YBHn/7kyKZAP5Y2mtBeGQ8=";
+    rev = "ab9fda44fb490da445dcaee7ad9f8bf08b9e9e10";
+    hash = "sha256-ufWHDqvAaQiqwlezm95BCTLMdQEK5NTmMQgeq3oKR1o=";
   };
 
   cargoLock = {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "tower-lsp-0.20.0" = "sha256-f3S2CyFFX6yylaxMoXhB1/bfizVsLfNldLM+dXl5Y8k=";
+      "tower-lsp-server-0.21.0" = "sha256-aeCc8m7zf3Kww1EBmMJFhQTYJ9lP6+R+9WzQ8yaj3Jo=";
     };
   };
 

From 1051db20eef1d814b413d226248d8bea9c62ea4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 16 Mar 2025 08:30:14 +0000
Subject: [PATCH 25/53] osu-lazer-bin: 2025.306.0 -> 2025.316.0

---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index 5e1ab48b4a74..59d4d229b1ab 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2025.306.0";
+  version = "2025.316.0";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-        hash = "sha256-VbzHD7LQstBXmSIkDpue6kPGHEzFO+Fy22eLYj+rNcw=";
+        hash = "sha256-u5d8MjBRWd4Y/6avRyBIzgR9J+GJANjGYhkXhu7imbI=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-        hash = "sha256-1KC0PnTMgN0GFhNYmlqfqWSVEpo8i+gb4nVHEwBMSS8=";
+        hash = "sha256-isgYm4+GXAC6A9P1UjNLcohNr1Zi4C/94V2jtLixGVI=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-        hash = "sha256-A9CWoTvByyNkULQ2abeVgiwAmSmyHx9IZqtHGS+bW6Y=";
+        hash = "sha256-348B6gtYLRTGlyCNsWiOrqg98bF/cPIsPBroisApzfc=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

From 1040c817435f45356675a930516a14abd96dd44a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 16 Mar 2025 08:31:03 +0000
Subject: [PATCH 26/53] osu-lazer: 2025.306.0 -> 2025.316.0

---
 pkgs/by-name/os/osu-lazer/deps.json   | 12 ++++++------
 pkgs/by-name/os/osu-lazer/package.nix |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index 358f21b34335..0802a357e2b8 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -651,8 +651,8 @@
   },
   {
     "pname": "ppy.osu.Framework",
-    "version": "2025.225.0",
-    "hash": "sha256-XXqNC/nzUb/mEKy7SzVBQnE2VsOwQiCFhH700/LDblc="
+    "version": "2025.313.0",
+    "hash": "sha256-daN3BmGYAyh+I0l5l7fFMaMoksYR3mhb9sPMg70GZxo="
   },
   {
     "pname": "ppy.osu.Framework.NativeLibs",
@@ -666,8 +666,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2025.303.0",
-    "hash": "sha256-+Lnin+oEo67ARp9RFWOe00JcOL73O9gh/XJFIF151Yg="
+    "version": "2025.313.0",
+    "hash": "sha256-DbPR7XwlhC9wDkgUCRUt2QrYRoscqJaRGvtUZ9LGyvM="
   },
   {
     "pname": "ppy.osuTK.NS20",
@@ -1016,8 +1016,8 @@
   },
   {
     "pname": "SixLabors.ImageSharp",
-    "version": "3.1.5",
-    "hash": "sha256-3UehX9T+I81nfgv2dTHlpoPgYzXFk7kHr1mmlQOCBfw="
+    "version": "3.1.7",
+    "hash": "sha256-jMD/FiIwW1kNhTI6hKig8/QFOO3eTQX/C22cSAcKBH4="
   },
   {
     "pname": "SQLitePCLRaw.bundle_e_sqlite3",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index 6870c819fe57..9a5e224743c9 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -21,13 +21,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2025.306.0";
+  version = "2025.316.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = version;
-    hash = "sha256-SqPwVQGmtkaF/Mkcp4WnKRYNXSQD3+56XbNVw9ZMr+A=";
+    hash = "sha256-EbuJ3LrfW+JtNqFx9HSR5xWDZdXP72NXvKC05ek7zhc=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From 16a3bbb8499c801b48cc7fe258867e8f5ccda56e Mon Sep 17 00:00:00 2001
From: Picnoir <picnoir@alternativebit.fr>
Date: Wed, 12 Mar 2025 11:40:51 +0100
Subject: [PATCH 27/53] pleroma: 2.9.0 -> 2.9.1

Security update.

Full changelog: https://git.pleroma.social/pleroma/pleroma/-/releases/v2.9.1
---
 pkgs/servers/pleroma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix
index 9c11864ffdec..cb9dc6e2ce8c 100644
--- a/pkgs/servers/pleroma/default.nix
+++ b/pkgs/servers/pleroma/default.nix
@@ -19,14 +19,14 @@
 
 beamPackages.mixRelease rec {
   pname = "pleroma";
-  version = "2.9.0";
+  version = "2.9.1";
 
   src = fetchFromGitLab {
     domain = "git.pleroma.social";
     owner = "pleroma";
     repo = "pleroma";
     rev = "v${version}";
-    sha256 = "sha256-P+BcPC5TRxJppOFu3hXrse/10ZOU9Yph/GmPTY44CaE=";
+    sha256 = "sha256-mZcr+LlRQFDZVU5yAm0XkFdFHCDp4DZNLoVUlWxknMI=";
   };
 
   patches = [ ./Revert-Config-Restrict-permissions-of-OTP-config.patch ];

From 52902872c96499c2306493768a152d44431ce9dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 16 Mar 2025 09:29:32 +0000
Subject: [PATCH 28/53] snapcraft: 8.7.1 -> 8.7.2

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

diff --git a/pkgs/by-name/sn/snapcraft/package.nix b/pkgs/by-name/sn/snapcraft/package.nix
index 8c64b299bc55..bb43fd6b6025 100644
--- a/pkgs/by-name/sn/snapcraft/package.nix
+++ b/pkgs/by-name/sn/snapcraft/package.nix
@@ -13,7 +13,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snapcraft";
-  version = "8.7.1";
+  version = "8.7.2";
 
   pyproject = true;
 
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
     owner = "canonical";
     repo = "snapcraft";
     tag = version;
-    hash = "sha256-QKnlnFvQjpNYaZ42vcSNGS5HRSz+hHDzxBpE5lRYfWw=";
+    hash = "sha256-RlaAvLU0UE8u6y2xCHLxbOFLQF9jRa+8e2mgrRgTIjw=";
   };
 
   patches = [

From 27008ddbb2eee8369187b3c101aa3867bae53ae4 Mon Sep 17 00:00:00 2001
From: Philipp Riegger <philipp@riegger.name>
Date: Wed, 12 Mar 2025 19:58:08 +0100
Subject: [PATCH 29/53] factorio, factorio-experimental: 2.0.32 -> 2.0.41

---
 pkgs/by-name/fa/factorio/versions.json | 64 +++++++++++++-------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index 7e1681792dd1..cc0e85adde33 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -3,25 +3,25 @@
     "alpha": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.32.tar.xz"
+          "factorio_linux_2.0.41.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.32.tar.xz",
+        "name": "factorio_alpha_x64-2.0.41.tar.xz",
         "needsAuth": true,
-        "sha256": "4c3434986bbe7d10e02b742d36ecad36f13b7c125204bf2ad34f17b804cf611f",
+        "sha256": "d6f632845056b94601f16ee6a9b818991e492a8dc687213ab49d555b7cad2069",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.32/alpha/linux64",
-        "version": "2.0.32"
+        "url": "https://factorio.com/get-download/2.0.41/alpha/linux64",
+        "version": "2.0.41"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.32.tar.xz"
+          "factorio_linux_2.0.41.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.32.tar.xz",
+        "name": "factorio_alpha_x64-2.0.41.tar.xz",
         "needsAuth": true,
-        "sha256": "4c3434986bbe7d10e02b742d36ecad36f13b7c125204bf2ad34f17b804cf611f",
+        "sha256": "d6f632845056b94601f16ee6a9b818991e492a8dc687213ab49d555b7cad2069",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.32/alpha/linux64",
-        "version": "2.0.32"
+        "url": "https://factorio.com/get-download/2.0.41/alpha/linux64",
+        "version": "2.0.41"
       }
     },
     "demo": {
@@ -50,51 +50,51 @@
     "expansion": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.32.tar.xz"
+          "factorio-space-age_linux_2.0.41.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.32.tar.xz",
+        "name": "factorio_expansion_x64-2.0.41.tar.xz",
         "needsAuth": true,
-        "sha256": "51b1cad9d665015e200ea0f69619454ebf0f60557d1f78c857c4526dad2e3d77",
+        "sha256": "b1a085cb98b5d8800cb296578ca8f38df233b036f5c99c82e33f3eb868bb783f",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.32/expansion/linux64",
-        "version": "2.0.32"
+        "url": "https://factorio.com/get-download/2.0.41/expansion/linux64",
+        "version": "2.0.41"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.32.tar.xz"
+          "factorio-space-age_linux_2.0.41.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.32.tar.xz",
+        "name": "factorio_expansion_x64-2.0.41.tar.xz",
         "needsAuth": true,
-        "sha256": "51b1cad9d665015e200ea0f69619454ebf0f60557d1f78c857c4526dad2e3d77",
+        "sha256": "b1a085cb98b5d8800cb296578ca8f38df233b036f5c99c82e33f3eb868bb783f",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.32/expansion/linux64",
-        "version": "2.0.32"
+        "url": "https://factorio.com/get-download/2.0.41/expansion/linux64",
+        "version": "2.0.41"
       }
     },
     "headless": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.32.tar.xz",
-          "factorio_headless_x64_2.0.32.tar.xz"
+          "factorio-headless_linux_2.0.41.tar.xz",
+          "factorio_headless_x64_2.0.41.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.32.tar.xz",
+        "name": "factorio_headless_x64-2.0.41.tar.xz",
         "needsAuth": false,
-        "sha256": "2a6102ae42dcc5e8fe923bd68bcd326a569e35912acde121301e5d4d2d856417",
+        "sha256": "77ebccae8167fc1a9fc4da8c11e8410f6017b92b1a0913eb58ac5285c9eec399",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.32/headless/linux64",
-        "version": "2.0.32"
+        "url": "https://factorio.com/get-download/2.0.41/headless/linux64",
+        "version": "2.0.41"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.32.tar.xz",
-          "factorio_headless_x64_2.0.32.tar.xz"
+          "factorio-headless_linux_2.0.41.tar.xz",
+          "factorio_headless_x64_2.0.41.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.32.tar.xz",
+        "name": "factorio_headless_x64-2.0.41.tar.xz",
         "needsAuth": false,
-        "sha256": "2a6102ae42dcc5e8fe923bd68bcd326a569e35912acde121301e5d4d2d856417",
+        "sha256": "77ebccae8167fc1a9fc4da8c11e8410f6017b92b1a0913eb58ac5285c9eec399",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.32/headless/linux64",
-        "version": "2.0.32"
+        "url": "https://factorio.com/get-download/2.0.41/headless/linux64",
+        "version": "2.0.41"
       }
     }
   }

From 5ac6a03d89930da60156bf07563b46414ff80d31 Mon Sep 17 00:00:00 2001
From: Philipp Riegger <philipp@riegger.name>
Date: Thu, 13 Mar 2025 11:54:06 +0100
Subject: [PATCH 30/53] factorio-demo: 1.1.110 -> 2.0.27, fix update script

---
 pkgs/by-name/fa/factorio/update.py     |  2 +-
 pkgs/by-name/fa/factorio/versions.json | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fa/factorio/update.py b/pkgs/by-name/fa/factorio/update.py
index 1fce95179804..a2322a3fb6fc 100755
--- a/pkgs/by-name/fa/factorio/update.py
+++ b/pkgs/by-name/fa/factorio/update.py
@@ -68,7 +68,7 @@ RELEASE_TYPES = [
         needs_auth=True,
         hash_filename_format=["factorio_linux_{version}.tar.xz"],
     ),
-    ReleaseType("demo", hash_filename_format=["factorio_demo_x64_{version}.tar.xz"]),
+    ReleaseType("demo", hash_filename_format=["factorio-demo_linux_{version}.tar.xz"]),
     ReleaseType(
         "headless",
         hash_filename_format=[
diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index cc0e85adde33..3b062298d033 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -37,14 +37,14 @@
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio_demo_x64_1.1.110.tar.xz"
+          "factorio-demo_linux_2.0.27.tar.xz"
         ],
-        "name": "factorio_demo_x64-1.1.110.tar.xz",
+        "name": "factorio_demo_x64-2.0.27.tar.xz",
         "needsAuth": false,
-        "sha256": "bddb91dcba9f300c25d590f861772eaf41f0b6ce8ae6b754de00d0e5f3eb5a35",
+        "sha256": "75938e76d0e730273616e2441ae3c3bc238bb3cfa38d34a43e5fb25a3d1f2323",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.110/demo/linux64",
-        "version": "1.1.110"
+        "url": "https://factorio.com/get-download/2.0.27/demo/linux64",
+        "version": "2.0.27"
       }
     },
     "expansion": {

From b0e0d97594e6566e8b30372add6ce7c785928653 Mon Sep 17 00:00:00 2001
From: Philipp Riegger <philipp@riegger.name>
Date: Thu, 13 Mar 2025 11:55:50 +0100
Subject: [PATCH 31/53] factorio-demo-experimental: init at 2.0.40

---
 pkgs/by-name/fa/factorio/versions.json | 9 +++++----
 pkgs/top-level/all-packages.nix        | 2 ++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index 3b062298d033..c28ecb7d03d3 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -27,13 +27,14 @@
     "demo": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_demo_x64_2.0.27.tar.xz"
+          "factorio-demo_linux_2.0.40.tar.xz"
         ],
-        "name": "factorio_demo_x64-2.0.27.tar.xz",
+        "name": "factorio_demo_x64-2.0.40.tar.xz",
         "needsAuth": false,
+        "sha256": "91ab921f8599c575f6090f5539090fb2eb42eb0d8bc83f366da078d995c639e6",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.27/demo/linux64",
-        "version": "2.0.27"
+        "url": "https://factorio.com/get-download/2.0.40/demo/linux64",
+        "version": "2.0.40"
       },
       "stable": {
         "candidateHashFilenames": [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5e2a2b94421..68119da755de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16140,6 +16140,8 @@ with pkgs;
 
   factorio-demo = factorio.override { releaseType = "demo"; };
 
+  factorio-demo-experimental = factorio.override { releaseType = "demo"; experimental = true; };
+
   factorio-space-age = factorio.override { releaseType = "expansion"; };
 
   factorio-space-age-experimental = factorio.override { releaseType = "expansion"; experimental = true; };

From c8f156948a3d20beae19d76923bc0d7dccc7d059 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Wed, 12 Mar 2025 22:45:10 +0100
Subject: [PATCH 32/53] plexRaw: 1.41.4.9463-630c9f557 -> 1.41.5.9522-a96edc606

---
 pkgs/servers/plex/raw.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix
index c729a434c64e..24bf86c7bf07 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -14,7 +14,7 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.41.4.9463-630c9f557";
+  version = "1.41.5.9522-a96edc606";
   pname = "plexmediaserver";
 
   # Fetch the source
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
     if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-        sha256 = "1viflfwjnskmf5iq4jb22rcxjf3nx2bl3vikypy93lvdlafkyrjs";
+        sha256 = "sha256-ugN1y3V1HE/IBhnvzlOYIL/5LyEa33IRPuj6903vPaA=";
       }
     else
       fetchurl {
         url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-        sha256 = "104imla4kkhniqxf5q0rawq73ypz8cgc2lqnk0ir3w76y0gz055a";
+        sha256 = "sha256-3bGmsa2OLBt587YnZDNpSjWHdQ1ubwSNocLPW6A6kQU=";
       };
 
   outputs = [

From 0dec5c9f74ae3869cc47141d88860408363ccbda Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 16 Mar 2025 10:33:26 +0100
Subject: [PATCH 33/53] python312Packages.litellm: 1.59.8 -> 1.63.11

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

diff --git a/pkgs/development/python-modules/litellm/default.nix b/pkgs/development/python-modules/litellm/default.nix
index 46f3538a6912..e69090bbca02 100644
--- a/pkgs/development/python-modules/litellm/default.nix
+++ b/pkgs/development/python-modules/litellm/default.nix
@@ -39,7 +39,7 @@
 
 buildPythonPackage rec {
   pname = "litellm";
-  version = "1.59.8";
+  version = "1.63.11";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -47,14 +47,12 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "BerriAI";
     repo = "litellm";
-    tag = "v${version}";
-    hash = "sha256-2OkREmgs+r+vco1oEVgp5nq7cfwIAlMAh0FL2ceO88Y=";
+    tag = "v${version}-stable";
+    hash = "sha256-j2RfuVffmWoeAAVcT579S9pU06haKEYYa7FcpMzu9uA=";
   };
 
   build-system = [ poetry-core ];
 
-  pythonRelaxDeps = [ "httpx" ];
-
   dependencies = [
     aiohttp
     click

From b5c9cecbccc4e6183369fe2fd8bb072cc598204a Mon Sep 17 00:00:00 2001
From: Todd Brown <todd.brown@hey.com>
Date: Sun, 16 Mar 2025 02:56:31 -0700
Subject: [PATCH 34/53] nixos/docker: add auto prune randomizedDelaySec and
 persistent options (#301547)

docker: add auto prune randomizedDelaySec and persistent options

Options mirror nix garbage collection
---
 nixos/modules/virtualisation/docker.nix | 35 +++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix
index 76f91c71fa59..00a99b6fcd7d 100644
--- a/nixos/modules/virtualisation/docker.nix
+++ b/nixos/modules/virtualisation/docker.nix
@@ -159,6 +159,34 @@ in
           which the prune will occur.
         '';
       };
+
+      randomizedDelaySec = mkOption {
+        default = "0";
+        type = types.singleLineStr;
+        example = "45min";
+        description = ''
+          Add a randomized delay before each auto prune.
+          The delay will be chosen between zero and this value.
+          This value must be a time span in the format specified by
+          {manpage}`systemd.time(7)`
+        '';
+      };
+
+      persistent = mkOption {
+        default = true;
+        type = types.bool;
+        example = false;
+        description = ''
+          Takes a boolean argument. If true, the time when the service
+          unit was last triggered is stored on disk. When the timer is
+          activated, the service unit is triggered immediately if it
+          would have been triggered at least once during the time when
+          the timer was inactive. Such triggering is nonetheless
+          subject to the delay imposed by RandomizedDelaySec=. This is
+          useful to catch up on missed runs of the service when the
+          system was powered down.
+        '';
+      };
     };
 
     package = mkPackageOption pkgs "docker" { };
@@ -254,6 +282,13 @@ in
         requires = [ "docker.service" ];
       };
 
+      systemd.timers.docker-prune = mkIf cfg.autoPrune.enable {
+        timerConfig = {
+          RandomizedDelaySec = cfg.autoPrune.randomizedDelaySec;
+          Persistent = cfg.autoPrune.persistent;
+        };
+      };
+
       assertions = [
         { assertion = cfg.enableNvidia && pkgs.stdenv.hostPlatform.isx86_64 -> config.hardware.graphics.enable32Bit or false;
           message = "Option enableNvidia on x86_64 requires 32-bit support libraries";

From cb039de495f1ecff7e05e33ca1f650425e6a741f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 16 Mar 2025 11:52:17 +0100
Subject: [PATCH 35/53] python312Packages.mypy-boto3-cognito-identity: 1.37.0
 -> 1.37.13

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 51bc466de9be..36c5256ca816 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -310,8 +310,8 @@ rec {
       "sha256-++3ixApRniFY/gYZDA2ae6dtAVyxE2ujciTyLT2/vbk=";
 
   mypy-boto3-cognito-identity =
-    buildMypyBoto3Package "cognito-identity" "1.37.0"
-      "sha256-MK11RuIgZfoy8vvZWHFEJjkSsJSzqKjXvm9GCjt3QH4=";
+    buildMypyBoto3Package "cognito-identity" "1.37.13"
+      "sha256-6w2v795pNhcKZlWayROdYe5bzQvSmkITxErl2M0F5o4=";
 
   mypy-boto3-cognito-idp =
     buildMypyBoto3Package "cognito-idp" "1.37.5"

From d893922aa2f75f7110324a801e6437ec4c678e18 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 16 Mar 2025 11:52:18 +0100
Subject: [PATCH 36/53] python312Packages.mypy-boto3-cognito-idp: 1.37.5 ->
 1.37.13

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 36c5256ca816..26e48f54c572 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -314,8 +314,8 @@ rec {
       "sha256-6w2v795pNhcKZlWayROdYe5bzQvSmkITxErl2M0F5o4=";
 
   mypy-boto3-cognito-idp =
-    buildMypyBoto3Package "cognito-idp" "1.37.5"
-      "sha256-FAMF7HEM+StH7vkhPomIxh2GRSIhNxQaCZx0o6/EoYc=";
+    buildMypyBoto3Package "cognito-idp" "1.37.13"
+      "sha256-L9F74KW7z+Q+7hUoGIQR67TQyNiJF8nW4XHWBppFO4Q=";
 
   mypy-boto3-cognito-sync =
     buildMypyBoto3Package "cognito-sync" "1.37.0"

From 582744f2c153c6c74e5476711c80197e605673e9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 16 Mar 2025 11:52:39 +0100
Subject: [PATCH 37/53] python312Packages.mypy-boto3-glue: 1.37.0 -> 1.37.13

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 26e48f54c572..059247db7cec 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -574,8 +574,8 @@ rec {
       "sha256-JSVZVCZ6P5A+EqjXHmbbDIdE1rKrdSwNcZvUbYxKpSA=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.37.0"
-      "sha256-Xi0qA0cq98YeOAoJCGuXUk5cIEAkkhOR3KDaQD7qbic=";
+    buildMypyBoto3Package "glue" "1.37.13"
+      "sha256-FrJfuU55fUM3pxt4ey/KLmgXD3wTs6PlksCOBCQ1ibA=";
 
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.37.0"

From f6d30dd4d1410c4146c03d57368446617e76d36b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 16 Mar 2025 11:52:53 +0100
Subject: [PATCH 38/53] python312Packages.mypy-boto3-lakeformation: 1.37.0 ->
 1.37.13

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 059247db7cec..122614f5bb7c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -766,8 +766,8 @@ rec {
       "sha256-5wgeRfBkLbX35PGmGBciTx8gVS8Uqsh5WG8NeQwmEJs=";
 
   mypy-boto3-lakeformation =
-    buildMypyBoto3Package "lakeformation" "1.37.0"
-      "sha256-6HsfUV066CiTERS87hsLDqaCnj917ZTyBxdcLH9nvfQ=";
+    buildMypyBoto3Package "lakeformation" "1.37.13"
+      "sha256-E5A6wS8kwjG1rWo1RFT7kwpqmWKGZ7UAmcR4KUvUrzg=";
 
   mypy-boto3-lambda =
     buildMypyBoto3Package "lambda" "1.37.0"

From 5dc19e4e4e609cc1aece17abf08fca5d39ed7830 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 16 Mar 2025 11:53:40 +0100
Subject: [PATCH 39/53] python313Packages.botocore-stubs: 1.37.12 -> 1.37.13

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index df67429291a1..38cdf6349819 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.37.12";
+  version = "1.37.13";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-24NObF8AQ6fcs58sXxLHQ0qDXEd9kaogvCzn+sWI2ts=";
+    hash = "sha256-6h6aOA5BGcVwzAd6lMc3cn2MgeC4Z6PXXdlL6xe7F7c=";
   };
 
   nativeBuildInputs = [ setuptools ];

From e04c8db1227de2b7420a85f686e471a8c1a3cb8d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 16 Mar 2025 11:53:45 +0100
Subject: [PATCH 40/53] python313Packages.boto3-stubs: 1.37.12 -> 1.37.13

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index a5298179ba3f..0d20226cee2c 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -359,7 +359,7 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.37.12";
+  version = "1.37.13";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -367,7 +367,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-PHl0o8itRkM01+b1oJK5MIy4LyNoPS4lnB2Kfa0nHBc=";
+    hash = "sha256-vZIxrbBXis/GLIIW9j4jqdQJzSpUtl8xJo4JRw+78FM=";
   };
 
   build-system = [ setuptools ];

From 0fb8e1a688f11ff5c672ba27860e80fb28cbb181 Mon Sep 17 00:00:00 2001
From: John Garcia <jgarcia3788@yahoo.co.uk>
Date: Fri, 14 Mar 2025 19:42:45 +0000
Subject: [PATCH 41/53] various: remove chewblacka as package maintainer

---
 pkgs/applications/misc/electrum/default.nix            | 1 -
 pkgs/applications/science/math/mathematica/default.nix | 1 -
 pkgs/by-name/cl/clamtk/package.nix                     | 1 -
 pkgs/by-name/on/onedrivegui/package.nix                | 2 +-
 pkgs/by-name/re/refind/package.nix                     | 2 +-
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 43defb195023..4d26bf266e5d 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -158,7 +158,6 @@ python3.pkgs.buildPythonApplication rec {
       joachifm
       np
       prusnak
-      chewblacka
     ];
     mainProgram = "electrum";
   };
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 29e7aa77cc02..6ce5ee7a4eb0 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -78,7 +78,6 @@ callPackage ./generic.nix {
     maintainers = with maintainers; [
       herberteuler
       rafaelrc
-      chewblacka
     ];
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/by-name/cl/clamtk/package.nix b/pkgs/by-name/cl/clamtk/package.nix
index 32d807ee32f7..d9f7821bad0b 100644
--- a/pkgs/by-name/cl/clamtk/package.nix
+++ b/pkgs/by-name/cl/clamtk/package.nix
@@ -90,7 +90,6 @@ perlPackages.buildPerlPackage rec {
     homepage = "https://github.com/dave-theunsub/clamtk";
     platforms = platforms.linux;
     maintainers = with maintainers; [
-      chewblacka
       ShamrockLee
     ];
   };
diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix
index 92ba53477e9c..d03bc1e07943 100644
--- a/pkgs/by-name/on/onedrivegui/package.nix
+++ b/pkgs/by-name/on/onedrivegui/package.nix
@@ -100,7 +100,7 @@ python3Packages.buildPythonApplication rec {
     description = "Simple GUI for Linux OneDrive Client, with multi-account support";
     mainProgram = "onedrivegui";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ chewblacka ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/re/refind/package.nix b/pkgs/by-name/re/refind/package.nix
index c9d351eaaae6..2b77b5b7916e 100644
--- a/pkgs/by-name/re/refind/package.nix
+++ b/pkgs/by-name/re/refind/package.nix
@@ -173,7 +173,7 @@ stdenv.mkDerivation rec {
       Linux kernels that provide EFI stub support.
     '';
     homepage = "http://refind.sourceforge.net/";
-    maintainers = with maintainers; [ chewblacka ];
+    maintainers = with maintainers; [ ];
     platforms = [
       "i686-linux"
       "x86_64-linux"

From fff29a3e5f7991512e790617d1a693df5f3550f6 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 19 Feb 2025 01:03:03 +0100
Subject: [PATCH 42/53] buildNpmPackage: pass nativeBuildInputs to npmDeps (for
 patch phase)

---
 pkgs/build-support/node/build-npm-package/default.nix | 1 +
 pkgs/build-support/node/fetch-npm-deps/default.nix    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/node/build-npm-package/default.nix b/pkgs/build-support/node/build-npm-package/default.nix
index 747043e3d12a..9832e11ed923 100644
--- a/pkgs/build-support/node/build-npm-package/default.nix
+++ b/pkgs/build-support/node/build-npm-package/default.nix
@@ -63,6 +63,7 @@ lib.extendMkDerivation {
           patches
           postPatch
           patchFlags
+          nativeBuildInputs
           ;
         name = "${name}-npm-deps";
         hash = npmDepsHash;
diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix
index 158ff08fae6c..89f2f5fb8efa 100644
--- a/pkgs/build-support/node/fetch-npm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-npm-deps/default.nix
@@ -152,6 +152,7 @@
     , hash ? ""
     , forceGitDeps ? false
     , forceEmptyCache ? false
+    , nativeBuildInputs ? [ ]
     , ...
     } @ args:
     let
@@ -169,7 +170,7 @@
     stdenvNoCC.mkDerivation (args // {
       inherit name;
 
-      nativeBuildInputs = [ prefetch-npm-deps ];
+      nativeBuildInputs = nativeBuildInputs ++ [ prefetch-npm-deps ];
 
       buildPhase = ''
         runHook preBuild

From 8e1e15cf11e50d5a5466caf4479b0981a698e305 Mon Sep 17 00:00:00 2001
From: sanana <umutinanerdogan@pm.me>
Date: Sun, 9 Mar 2025 23:34:11 +0300
Subject: [PATCH 43/53] lib/licenses: add bsdAxisNoDisclaimerUnmodified

This is a variant composed of clause 1 and 3 of a BSD-Modified found in the
Linux kernel and this extra variant has the words "without modification" added
at the end of clause 1 either with or without a comma. It also lacks the
warranty disclaimer.

See <https://scancode-licensedb.aboutcode.org/bsd-no-disclaimer-unmodified.html>.
---
 lib/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 5d0aff11b7a3..44fca61afbbd 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -220,6 +220,11 @@ lib.mapAttrs mkLicense ({
     fullName = "Lawrence Berkeley National Labs BSD variant license";
   };
 
+  bsdAxisNoDisclaimerUnmodified = {
+    fullName = "BSD-Axis without Warranty Disclaimer with Unmodified requirement";
+    url = "https://scancode-licensedb.aboutcode.org/bsd-no-disclaimer-unmodified.html";
+  };
+
   bsdOriginal = {
     spdxId = "BSD-4-Clause";
     fullName = ''BSD 4-clause "Original" or "Old" License'';

From 3fc3e474c5549c907cb7900c79007e08280a78f1 Mon Sep 17 00:00:00 2001
From: sanana <umutinanerdogan@pm.me>
Date: Mon, 10 Mar 2025 20:16:16 +0300
Subject: [PATCH 44/53] gnu-efi: 3.0.18 -> 4.0.0, fix meta, format

This update may break packages that depend on gnu-efi, as this is an ABI
break and most upstream packages have not been updated to support this
release.
---
 .../development/libraries/gnu-efi/default.nix | 62 +++++++++++++------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index a675633b503d..837cbe3c4188 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -1,15 +1,26 @@
-{ lib, stdenv, buildPackages, fetchFromGitHub, pciutils
-, gitUpdater, fwupd-efi, ipxe, refind, syslinux }:
+{
+  lib,
+  stdenv,
+  buildPackages,
+  fetchFromGitHub,
+  pciutils,
+  fwupd-efi,
+  ipxe,
+  refind,
+  syslinux,
+}:
 
-stdenv.mkDerivation rec {
+assert lib.assertMsg stdenv.hostPlatform.isEfi "gnu-efi may only be built for EFI platforms";
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnu-efi";
-  version = "3.0.18";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "ncroxon";
     repo = "gnu-efi";
-    rev = version;
-    hash = "sha256-WTXUIBiyWEVCKfhUUWK5vrK6XmcvsAMl4CuhEw5oYWI=";
+    tag = finalAttrs.version;
+    hash = "sha256-vVtJkAPe5tPDLAFZibnJRC7G7WtOg11JT5QipdO+FIk=";
   };
 
   buildInputs = [ pciutils ];
@@ -27,21 +38,32 @@ stdenv.mkDerivation rec {
       --replace "-Werror" ""
   '';
 
-  passthru = {
-    updateScript = gitUpdater {
-      # No nicer place to find latest release.
-      url = "https://git.code.sf.net/p/gnu-efi/code";
-    };
-    tests = {
-      inherit fwupd-efi ipxe refind syslinux;
-    };
+  passthru.tests = {
+    inherit
+      fwupd-efi
+      ipxe
+      syslinux
+      ;
   };
 
-  meta = with lib; {
+  meta = {
     description = "GNU EFI development toolchain";
-    homepage = "https://sourceforge.net/projects/gnu-efi/";
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-    maintainers = [ ];
+    homepage = "https://github.com/ncroxon/gnu-efi";
+    license = with lib.licenses; [
+      # This is a mess, upstream is aware.
+      # The source for these is Fedora's SPDX identifier for this package.
+      # Fedora also has gpl2Only here, but 4.0.0 doesn't have gpl2Only code.
+      # However, both upstream and Fedora seems to have missed
+      # bsdAxisNoDisclaimerUnmodified and MIT.
+      bsd2
+      bsd2Patent
+      bsd3
+      bsdAxisNoDisclaimerUnmodified
+      bsdOriginal
+      gpl2Plus
+      mit
+    ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
   };
-}
+})

From 819f04e96985d4bd95245f447dce784a724414cb Mon Sep 17 00:00:00 2001
From: sanana <umutinanerdogan@pm.me>
Date: Mon, 10 Mar 2025 20:22:12 +0300
Subject: [PATCH 45/53] gnu-efi: move to by-name/

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

diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/by-name/gn/gnu-efi/package.nix
similarity index 100%
rename from pkgs/development/libraries/gnu-efi/default.nix
rename to pkgs/by-name/gn/gnu-efi/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9dcf99c47ce9..6c13fd742be3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9001,10 +9001,6 @@ with pkgs;
 
   qxmpp = qt6Packages.callPackage ../development/libraries/qxmpp { };
 
-  gnu-efi = if stdenv.hostPlatform.isEfi
-              then callPackage ../development/libraries/gnu-efi { }
-            else null;
-
   gnutls = callPackage ../development/libraries/gnutls {
     inherit (darwin.apple_sdk.frameworks) Security;
     util-linux = util-linuxMinimal; # break the cyclic dependency

From 9fadf9802a05faa9cbd20c3caa08fabad92b6da4 Mon Sep 17 00:00:00 2001
From: sanana <umutinanerdogan@pm.me>
Date: Wed, 12 Mar 2025 18:09:46 +0300
Subject: [PATCH 46/53] gnu-efi: add lzcunt as maintainer

---
 pkgs/by-name/gn/gnu-efi/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gn/gnu-efi/package.nix b/pkgs/by-name/gn/gnu-efi/package.nix
index 837cbe3c4188..4c61c8d4c3a3 100644
--- a/pkgs/by-name/gn/gnu-efi/package.nix
+++ b/pkgs/by-name/gn/gnu-efi/package.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
       mit
     ];
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ lzcunt ];
   };
 })

From 4d057a7924668c163aa2675c1c1705b0ff77daaa Mon Sep 17 00:00:00 2001
From: sanana <umutinanerdogan@pm.me>
Date: Sun, 16 Mar 2025 13:43:25 +0300
Subject: [PATCH 47/53] gnu-efi_3: init at 3.0.19

GNU-EFI was updated to 4.0.0, however rEFInd does not support 4.0.0 yet,
so we have to keep GNU-EFI 3.
---
 pkgs/by-name/gn/gnu-efi_3/package.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 pkgs/by-name/gn/gnu-efi_3/package.nix

diff --git a/pkgs/by-name/gn/gnu-efi_3/package.nix b/pkgs/by-name/gn/gnu-efi_3/package.nix
new file mode 100644
index 000000000000..ad04a677616e
--- /dev/null
+++ b/pkgs/by-name/gn/gnu-efi_3/package.nix
@@ -0,0 +1,20 @@
+{
+  fetchFromGitHub,
+  gnu-efi,
+  refind,
+}:
+
+gnu-efi.overrideAttrs (
+  finalAttrs: prevAttrs: {
+    version = "3.0.19";
+    src = fetchFromGitHub {
+      owner = "ncroxon";
+      repo = "gnu-efi";
+      rev = finalAttrs.version;
+      hash = "sha256-xtiKglLXm9m4li/8tqbOsyM6ThwGhyu/g4kw5sC4URY=";
+    };
+    passthru.tests = {
+      inherit refind;
+    };
+  }
+)

From 52918060b954949e22a71e65534938b464bb5871 Mon Sep 17 00:00:00 2001
From: sanana <umutinanerdogan@pm.me>
Date: Mon, 10 Mar 2025 20:23:36 +0300
Subject: [PATCH 48/53] refind: fix build by using `gnu-efi_3` instead of
 `gnu-efi`

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

diff --git a/pkgs/by-name/re/refind/package.nix b/pkgs/by-name/re/refind/package.nix
index 2b77b5b7916e..24c108f1423a 100644
--- a/pkgs/by-name/re/refind/package.nix
+++ b/pkgs/by-name/re/refind/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  gnu-efi,
+  gnu-efi_3,
   nixosTests,
   efibootmgr,
   openssl,
@@ -54,17 +54,17 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ gnu-efi ];
+  buildInputs = [ gnu-efi_3 ];
 
   hardeningDisable = [ "stackprotector" ];
 
   makeFlags =
     [
       "prefix="
-      "EFIINC=${gnu-efi}/include/efi"
-      "EFILIB=${gnu-efi}/lib"
-      "GNUEFILIB=${gnu-efi}/lib"
-      "EFICRT0=${gnu-efi}/lib"
+      "EFIINC=${gnu-efi_3}/include/efi"
+      "EFILIB=${gnu-efi_3}/lib"
+      "GNUEFILIB=${gnu-efi_3}/lib"
+      "EFICRT0=${gnu-efi_3}/lib"
       "HOSTARCH=${hostarch}"
       "ARCH=${hostarch}"
     ]

From d43fa3231a38e272ffcb0df42af97e782553c8ce Mon Sep 17 00:00:00 2001
From: sanana <umutinanerdogan@pm.me>
Date: Sun, 16 Mar 2025 14:12:34 +0300
Subject: [PATCH 49/53] refind: add johnrtitor as maintainer

Authored-By: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 pkgs/by-name/re/refind/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/refind/package.nix b/pkgs/by-name/re/refind/package.nix
index 24c108f1423a..29f684f86ef8 100644
--- a/pkgs/by-name/re/refind/package.nix
+++ b/pkgs/by-name/re/refind/package.nix
@@ -173,7 +173,7 @@ stdenv.mkDerivation rec {
       Linux kernels that provide EFI stub support.
     '';
     homepage = "http://refind.sourceforge.net/";
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ johnrtitor ];
     platforms = [
       "i686-linux"
       "x86_64-linux"

From 1a2bbb15872ef1e4ac93cad4c902a4267a2d4d31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 16 Mar 2025 10:12:29 +0000
Subject: [PATCH 50/53] klipper: 0.12.0-unstable-2025-02-28 ->
 0.12.0-unstable-2025-03-12

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

diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index 9985e8ade473..ec6f9539fac9 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "klipper";
-  version = "0.12.0-unstable-2025-02-28";
+  version = "0.12.0-unstable-2025-03-12";
 
   src = fetchFromGitHub {
     owner = "KevinOConnor";
     repo = "klipper";
-    rev = "730e5951bc453d7c08b9b2a066479f2c0cd25842";
-    sha256 = "sha256-u1M4vvm5fBLseHU+rLD0aoDMjpbFsZM1G1MLIUxwlho=";
+    rev = "d886c1761bbdfd23833996489afba6b75f312a4a";
+    sha256 = "sha256-I8Epwh0NcWtz2T2qAuKOv6iXBO8GmNdCR86HOgUPKCU=";
   };
 
   sourceRoot = "${src.name}/klippy";

From 974b11fd85a74ed2efac36b6d57b0aeb40ca4f7c Mon Sep 17 00:00:00 2001
From: Ashley Ruglys <ashley.ruglys@gmail.com>
Date: Tue, 20 Feb 2024 12:42:37 +1300
Subject: [PATCH 51/53] opensubdiv: Get building on windows

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 pkgs/by-name/op/opensubdiv/package.nix | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix
index 3f0282a20a0a..d35b64188d2c 100644
--- a/pkgs/by-name/op/opensubdiv/package.nix
+++ b/pkgs/by-name/op/opensubdiv/package.nix
@@ -44,9 +44,11 @@ stdenv.mkDerivation rec {
     ];
   buildInputs =
     [
+      python3
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isUnix [
       libGLU
       libGL
-      python3
       # FIXME: these are not actually needed, but the configure script wants them.
       glew
       xorg.libX11
@@ -56,7 +58,7 @@ stdenv.mkDerivation rec {
       xorg.libXinerama
       xorg.libXi
     ]
-    ++ lib.optionals (openclSupport && !stdenv.hostPlatform.isDarwin) [ ocl-icd ]
+    ++ lib.optionals (openclSupport && stdenv.hostPlatform.isLinux) [ ocl-icd ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin (
       with darwin.apple_sdk.frameworks;
       [
@@ -87,11 +89,12 @@ stdenv.mkDerivation rec {
       "-DNO_TUTORIALS=1"
       "-DNO_REGRESSION=1"
       "-DNO_EXAMPLES=1"
+      (lib.cmakeBool "NO_DX" stdenv.hostPlatform.isWindows)
       (lib.cmakeBool "NO_METAL" (!stdenv.hostPlatform.isDarwin))
       (lib.cmakeBool "NO_OPENCL" (!openclSupport))
       (lib.cmakeBool "NO_CUDA" (!cudaSupport))
     ]
-    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    ++ lib.optionals (stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin) [
       "-DGLEW_INCLUDE_DIR=${glew.dev}/include"
       "-DGLEW_LIBRARY=${glew.dev}/lib"
     ]
@@ -109,15 +112,21 @@ stdenv.mkDerivation rec {
       NIX_BUILD_CORES=$(( NIX_BUILD_CORES < ${toString maxBuildCores} ? NIX_BUILD_CORES : ${toString maxBuildCores} ))
     '';
 
-  postInstall = ''
-    moveToOutput "lib/*.a" $static
-  '';
+  postInstall =
+    if stdenv.hostPlatform.isWindows then
+      ''
+        ln -s $out $static
+      ''
+    else
+      ''
+        moveToOutput "lib/*.a" $static
+      '';
 
   meta = {
     description = "Open-Source subdivision surface library";
     homepage = "http://graphics.pixar.com/opensubdiv";
     broken = openclSupport && cudaSupport;
-    platforms = lib.platforms.unix;
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
     maintainers = [ ];
     license = lib.licenses.asl20;
   };

From 694debe6f896b59ab8cba3e789326e5b38a3cabd Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:25:52 +0530
Subject: [PATCH 52/53] opensubdiv: move python3 to nativeBuildInputs

opensubdiv requires the python interpreter in order to generate a few things, but no python libraries so this can be a native dependency

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 pkgs/by-name/op/opensubdiv/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix
index d35b64188d2c..f44e4420313f 100644
--- a/pkgs/by-name/op/opensubdiv/package.nix
+++ b/pkgs/by-name/op/opensubdiv/package.nix
@@ -38,15 +38,13 @@ stdenv.mkDerivation rec {
     [
       cmake
       pkg-config
+      python3
     ]
     ++ lib.optional cudaSupport [
       cudaPackages.cuda_nvcc
     ];
   buildInputs =
-    [
-      python3
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isUnix [
+    lib.optionals stdenv.hostPlatform.isUnix [
       libGLU
       libGL
       # FIXME: these are not actually needed, but the configure script wants them.

From 026f12895cb6a0005b95f2dc945a9e0e9d4906da Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:43:01 +0530
Subject: [PATCH 53/53] opensubdiv: modernize package

rec -> finalAttrs
sha256 -> hash
rev -> tag

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 pkgs/by-name/op/opensubdiv/package.nix | 36 +++++++++++++-------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/op/opensubdiv/package.nix b/pkgs/by-name/op/opensubdiv/package.nix
index f44e4420313f..588993c98e37 100644
--- a/pkgs/by-name/op/opensubdiv/package.nix
+++ b/pkgs/by-name/op/opensubdiv/package.nix
@@ -17,15 +17,15 @@
   darwin,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "opensubdiv";
   version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "PixarAnimationStudios";
     repo = "OpenSubdiv";
-    rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "sha256-liy6pQyWMk7rw0usrCoLGzZLO7RAg0z2pV/GF2NnOkE=";
+    tag = "v${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    hash = "sha256-liy6pQyWMk7rw0usrCoLGzZLO7RAg0z2pV/GF2NnOkE=";
   };
 
   outputs = [
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       pkg-config
       python3
     ]
-    ++ lib.optional cudaSupport [
+    ++ lib.optionals cudaSupport [
       cudaPackages.cuda_nvcc
     ];
   buildInputs =
@@ -84,21 +84,21 @@ stdenv.mkDerivation rec {
 
   cmakeFlags =
     [
-      "-DNO_TUTORIALS=1"
-      "-DNO_REGRESSION=1"
-      "-DNO_EXAMPLES=1"
-      (lib.cmakeBool "NO_DX" stdenv.hostPlatform.isWindows)
-      (lib.cmakeBool "NO_METAL" (!stdenv.hostPlatform.isDarwin))
-      (lib.cmakeBool "NO_OPENCL" (!openclSupport))
-      (lib.cmakeBool "NO_CUDA" (!cudaSupport))
+      (lib.mapAttrsToList lib.cmakeBool {
+        NO_TUTORIALS = true;
+        NO_REGRESSION = true;
+        NO_EXAMPLES = true;
+        NO_DX = stdenv.hostPlatform.isWindows;
+        NO_METAL = !stdenv.hostPlatform.isDarwin;
+        NO_OPENCL = !openclSupport;
+        NO_CUDA = !cudaSupport;
+      })
     ]
     ++ lib.optionals (stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isDarwin) [
-      "-DGLEW_INCLUDE_DIR=${glew.dev}/include"
-      "-DGLEW_LIBRARY=${glew.dev}/lib"
-    ]
-    ++ lib.optionals cudaSupport [
-    ]
-    ++ lib.optionals (!openclSupport) [
+      (lib.mapAttrsToList lib.cmakeFeature {
+        GLEW_INCLUDE_DIR = "${glew.dev}/include";
+        GLEW_LIBRARY = "${glew.dev}/lib";
+      })
     ];
 
   preBuild =
@@ -128,4 +128,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     license = lib.licenses.asl20;
   };
-}
+})