From 83fccab40aec2e696e6b59842805d7711727a7bf Mon Sep 17 00:00:00 2001
From: Matt Field <matt@mild.systems>
Date: Mon, 12 May 2025 16:46:12 +0100
Subject: [PATCH 01/36] fluxcd-operator-mcp: init at 0.20.0

---
 .../fl/fluxcd-operator-mcp/package.nix        | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 pkgs/by-name/fl/fluxcd-operator-mcp/package.nix

diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
new file mode 100644
index 000000000000..90e984ce04a4
--- /dev/null
+++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  versionCheckHook,
+  nix-update-script,
+  stdenv,
+}:
+buildGoModule (finalAttrs: {
+  pname = "fluxcd-operator-mcp";
+  version = "0.20.0";
+
+  src = fetchFromGitHub {
+    owner = "controlplaneio-fluxcd";
+    repo = "fluxcd-operator";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-GGHufHUqTylgynK19aaj4KAawlzzuz3iSEHa+vVVPMM=";
+  };
+
+  vendorHash = "sha256-5uT/pcfXrinyJ1hXmQ+vmWNuyO33c6d5PAjm6kwOZmY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.VERSION=${finalAttrs.version}"
+  ];
+
+  subPackages = [ "cmd/mcp" ];
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/flux-operator-mcp";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  env.CGO_ENABLED = 0;
+
+  postInstall =
+    ''
+      mv $out/bin/mcp $out/bin/flux-operator-mcp
+    ''
+    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      for shell in bash fish zsh; do
+        installShellCompletion --cmd flux-operator-mcp \
+          --$shell <($out/bin/flux-operator-mcp completion $shell)
+      done
+    '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Kubernetes controller for managing the lifecycle of Flux CD";
+    homepage = "https://fluxcd.control-plane.io/mcp/";
+    downloadPage = "https://github.com/controlplaneio-fluxcd/flux-operator";
+    longDescription = ''
+      The Flux Operator is a Kubernetes CRD controller that manages the lifecycle of CNCF Flux CD
+      and the ControlPlane enterprise distribution. The operator extends Flux with self-service
+      capabilities and preview environments for GitLab and GitHub pull requests testing.
+    '';
+    changelog = "https://github.com/controlplaneio-fluxcd/flux-operator/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
+      mattfield
+    ];
+    mainProgram = "flux-operator-mcp";
+  };
+})

From caabf7b80a9ed6aac08ccef8a037a4554538feff Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 19 May 2025 22:17:51 +0200
Subject: [PATCH 02/36] freecad: add update script

---
 pkgs/by-name/fr/freecad/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index cd3e21f4533d..6f5462cb38d4 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -37,6 +37,7 @@
   qtVersion ? 5,
   qt5,
   qt6,
+  nix-update-script,
 }:
 let
   inherit (python311Packages)
@@ -210,7 +211,15 @@ freecad-utils.makeCustomizable (
       ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd
     '';
 
-    passthru.tests = callPackage ./tests { };
+    passthru = {
+      tests = callPackage ./tests { };
+      updateScript = nix-update-script {
+        extraArgs = [
+          "--version-regex"
+          "([0-9.]+)"
+        ];
+      };
+    };
 
     meta = {
       homepage = "https://www.freecad.org";

From 84fbb41ac80a6a74794633ef131f631c05ef990c Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 19 May 2025 22:29:48 +0200
Subject: [PATCH 03/36] freecad: add grimmauld to maintainers

---
 pkgs/by-name/fr/freecad/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 6f5462cb38d4..cc7c7138ad4b 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -241,7 +241,10 @@ freecad-utils.makeCustomizable (
         right at home with FreeCAD.
       '';
       license = lib.licenses.lgpl2Plus;
-      maintainers = with lib.maintainers; [ srounce ];
+      maintainers = with lib.maintainers; [
+        srounce
+        grimmauld
+      ];
       platforms = lib.platforms.linux;
     };
   })

From dd009f4a82e86d4a417ac5db59c5244b1c688742 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 19 May 2025 23:23:05 +0200
Subject: [PATCH 04/36] freecad: clean up dependencies

- libf2c: It was removed upstream in 2012 [1]. It was added to the nix package in 2011 in 60844f748802b546d1efb19ac0f4b3b501d4e203 and is no longer required.
- swig: move to nativeBuildInputs. `swig` is an interface compiler and is not required at runtime.
- doxygen: move to nativeBuildInputs. `doxygen` is required to build docs, but is unnecessary at runtime.

[1] https://github.com/FreeCAD/FreeCAD/commit/4af0ca1401716d47faec5d7111ffcd5281899f2c
---
 pkgs/by-name/fr/freecad/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index cc7c7138ad4b..c31e52cdd9f4 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -10,7 +10,6 @@
   gfortran,
   gts,
   hdf5,
-  libf2c,
   libGLU,
   libredwg,
   libsForQt5,
@@ -81,6 +80,8 @@ freecad-utils.makeCustomizable (
         ninja
         pkg-config
         gfortran
+        swig
+        doxygen
         wrapGAppsHook3
       ]
       ++ lib.optionals (qtVersion == 5) [
@@ -93,7 +94,6 @@ freecad-utils.makeCustomizable (
       [
         boost
         coin3d
-        doxygen
         eigen
         fmt
         gitpython # for addon manager
@@ -101,7 +101,6 @@ freecad-utils.makeCustomizable (
         hdf5
         libGLU
         libXmu
-        libf2c
         matplotlib
         medfile
         mpi
@@ -115,7 +114,6 @@ freecad-utils.makeCustomizable (
         python
         pyyaml # (at least for) PyrateWorkbench
         scipy
-        swig
         vtk
         xercesc
         yaml-cpp

From c08e5ee6d92552fb0ac40a3c821aa2e70aadad47 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <arne.keller@posteo.de>
Date: Mon, 19 May 2025 18:45:01 +0200
Subject: [PATCH 05/36] neo4j: fix and enable strictDeps

neo4j-admin is a bash script.
---
 pkgs/by-name/ne/neo4j/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ne/neo4j/package.nix b/pkgs/by-name/ne/neo4j/package.nix
index a6f80296a53f..6d70883fe9d6 100644
--- a/pkgs/by-name/ne/neo4j/package.nix
+++ b/pkgs/by-name/ne/neo4j/package.nix
@@ -7,6 +7,7 @@
   openjdk17,
   which,
   gawk,
+  bashNonInteractive,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,6 +20,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ bashNonInteractive ];
+  strictDeps = true;
 
   installPhase = ''
     mkdir -p "$out/share/neo4j"

From 1b8c739322e5fa4cd38133db978b4b6fcae3a4bc Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 20 May 2025 10:49:10 +0200
Subject: [PATCH 06/36] freecad: link doc path

`freecad` expects doc to exist in `$out/share/doc`,
or else the `About FreeCAD` menu complains:

```
10:49:34  QTextBrowser: No document for file:////nix/store/fspwhlqvj876sw05292780clfsphx1zj-freecad-1.0.0/share/doc/FreeCAD//ThirdPartyLibraries.html
```
---
 pkgs/by-name/fr/freecad/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index c31e52cdd9f4..8f7c0e80556d 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -205,6 +205,7 @@ freecad-utils.makeCustomizable (
 
     postFixup = ''
       mv $out/share/doc $out
+      ln -s $out/doc $out/share/doc
       ln -s $out/bin/FreeCAD $out/bin/freecad
       ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd
     '';

From 7cc2d38f25f15130971b87f117de68f34c105117 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Mon, 19 May 2025 23:37:53 +0200
Subject: [PATCH 07/36] freecad: 1.0.0 -> 1.0.1

Upstream release notes: https://github.com/FreeCAD/FreeCAD/releases/tag/1.0.1
Upstream diff: https://github.com/FreeCAD/FreeCAD/compare/1.0.0...1.0.1

The previously vendored patch didn't apply anymore.
However, the upstream PR was merged to main [1], so we can fetch that instead.

[1] https://github.com/FreeCAD/FreeCAD/pull/17660/commits/45056377f4bc575801f36a128c47100d618c9fc7
---
 ...take-in-account-module-path-argument.patch | 149 ------------------
 pkgs/by-name/fr/freecad/package.nix           |  10 +-
 2 files changed, 7 insertions(+), 152 deletions(-)
 delete mode 100644 pkgs/by-name/fr/freecad/0003-Gui-take-in-account-module-path-argument.patch

diff --git a/pkgs/by-name/fr/freecad/0003-Gui-take-in-account-module-path-argument.patch b/pkgs/by-name/fr/freecad/0003-Gui-take-in-account-module-path-argument.patch
deleted file mode 100644
index 1d274a373e96..000000000000
--- a/pkgs/by-name/fr/freecad/0003-Gui-take-in-account-module-path-argument.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 23ddb6ff148ec5c27da050ba0eb7a2e449b8450b Mon Sep 17 00:00:00 2001
-From: Yury Shvedov <yury.shvedov@kaspersky.com>
-Date: Mon, 4 Nov 2024 14:22:22 +0300
-Subject: [PATCH] Gui: take in account module-path argument
-
-Use paths passed with `--module-path` argument to search for preference
-packs
-
-Change-Id: If168dbd99a826757290ee6b918f5b712305fe2bb
----
- src/Gui/DlgPreferencePackManagementImp.cpp | 16 +++++----
- src/Gui/PreferencePackManager.cpp          | 39 +++++++++++++++++-----
- src/Gui/PreferencePackManager.h            |  5 +++
- 3 files changed, 44 insertions(+), 16 deletions(-)
-
-diff --git a/src/Gui/DlgPreferencePackManagementImp.cpp b/src/Gui/DlgPreferencePackManagementImp.cpp
-index a1a0dad41a..50f3982f21 100644
---- a/src/Gui/DlgPreferencePackManagementImp.cpp
-+++ b/src/Gui/DlgPreferencePackManagementImp.cpp
-@@ -54,7 +54,7 @@ void DlgPreferencePackManagementImp::showEvent(QShowEvent* event)
-     // but can only disable individual installed packs (though we can completely uninstall the pack's
-     // containing Addon by redirecting to the Addon Manager).
-     auto savedPreferencePacksDirectory = fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks";
--    auto modDirectory = fs::path(App::Application::getUserAppDataDir()) / "Mod";
-+    auto modDirectories = Application::Instance->prefPackManager()->modPaths();
-     auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui" / "PreferencePacks";
- 
-     // The displayed tree has two levels: at the toplevel is either "User-Saved Packs" or the name
-@@ -66,12 +66,14 @@ void DlgPreferencePackManagementImp::showEvent(QShowEvent* event)
-     auto builtinPacks = getPacksFromDirectory(resourcePath);
- 
-     std::map<std::string, std::vector<std::string>> installedPacks;
--    if (fs::exists(modDirectory) && fs::is_directory(modDirectory)) {
--        for (const auto& mod : fs::directory_iterator(modDirectory)) {
--            auto packs = getPacksFromDirectory(mod);
--            if (!packs.empty()) {
--                auto modName = mod.path().filename().string();
--                installedPacks.emplace(modName, packs);
-+    for (const auto& modDirectory : modDirectories) {
-+        if (fs::exists(modDirectory) && fs::is_directory(modDirectory)) {
-+            for (const auto& mod : fs::directory_iterator(modDirectory)) {
-+                auto packs = getPacksFromDirectory(mod);
-+                if (!packs.empty()) {
-+                    auto modName = mod.path().filename().string();
-+                    installedPacks.emplace(modName, packs);
-+                }
-             }
-         }
-     }
-diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp
-index dfc54240c0..83e32fa05e 100644
---- a/src/Gui/PreferencePackManager.cpp
-+++ b/src/Gui/PreferencePackManager.cpp
-@@ -30,6 +30,7 @@
- #endif
- 
- #include <boost/filesystem.hpp>
-+#include <boost/algorithm/string.hpp>
- #include <QDir>
- 
- #include "PreferencePackManager.h"
-@@ -134,12 +135,11 @@ void PreferencePack::applyConfigChanges() const
- }
- 
- PreferencePackManager::PreferencePackManager()
-+    : _preferencePackPaths(modPaths())
- {
--    auto modPath = fs::path(App::Application::getUserAppDataDir()) / "Mod";
-     auto savedPath = fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks";
-     auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui" / "PreferencePacks";
--    _preferencePackPaths.push_back(resourcePath);
--    _preferencePackPaths.push_back(modPath);
-+    _preferencePackPaths.insert(_preferencePackPaths.begin(), resourcePath);
-     _preferencePackPaths.push_back(savedPath);
-     rescan();
- 
-@@ -232,6 +232,26 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName,
-     rescan();
- }
- 
-+// TODO(Shvedov): Is this suitable place for this method? It is more generic,
-+// and maybe more suitable place at Application?
-+std::vector<boost::filesystem::path> Gui::PreferencePackManager::modPaths() const
-+{
-+    auto userModPath = fs::path(App::Application::getUserAppDataDir()) / "Mod";
-+
-+    auto& config = App::Application::Config();
-+    auto additionalModules = config.find("AdditionalModulePaths");
-+    std::vector<boost::filesystem::path> result;
-+
-+    if (additionalModules != config.end()) {
-+        boost::split(result,
-+                     additionalModules->second,
-+                     boost::is_any_of(";"),
-+                     boost::token_compress_on);
-+    }
-+    result.emplace_back(userModPath);
-+    return result;
-+}
-+
- void Gui::PreferencePackManager::FindPreferencePacksInPackage(const fs::path &mod)
- {
-     try {
-@@ -528,7 +548,6 @@ std::vector<PreferencePackManager::TemplateFile> PreferencePackManager::template
-     // (alternate spellings are provided for packages using CamelCase and snake_case, and both major English dialects)
- 
-     auto resourcePath = fs::path(App::Application::getResourceDir()) / "Gui";
--    auto modPath = fs::path(App::Application::getUserAppDataDir()) / "Mod";
- 
-     std::string group = "Built-In";
-     if (fs::exists(resourcePath) && fs::is_directory(resourcePath)) {
-@@ -536,11 +555,13 @@ std::vector<PreferencePackManager::TemplateFile> PreferencePackManager::template
-         std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles));
-     }
- 
--    if (fs::exists(modPath) && fs::is_directory(modPath)) {
--        for (const auto& mod : fs::directory_iterator(modPath)) {
--            group = mod.path().filename().string();
--            const auto localFiles = scanForTemplateFiles(group, mod);
--            std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles));
-+    for (const auto& modPath : modPaths()) {
-+        if (fs::exists(modPath) && fs::is_directory(modPath)) {
-+            for (const auto& mod : fs::directory_iterator(modPath)) {
-+                group = mod.path().filename().string();
-+                const auto localFiles = scanForTemplateFiles(group, mod);
-+                std::copy(localFiles.begin(), localFiles.end(), std::back_inserter(_templateFiles));
-+            }
-         }
-     }
- 
-diff --git a/src/Gui/PreferencePackManager.h b/src/Gui/PreferencePackManager.h
-index 301e160df2..e5776e47a0 100644
---- a/src/Gui/PreferencePackManager.h
-+++ b/src/Gui/PreferencePackManager.h
-@@ -191,6 +191,11 @@ namespace Gui {
-          */
-         void importConfig(const std::string &packName, const boost::filesystem::path &path);
- 
-+        /**
-+         * Get a list of all mod directories.
-+         */
-+        std::vector<boost::filesystem::path> modPaths() const;
-+
-     private:
- 
-         void FindPreferencePacksInPackage(const boost::filesystem::path& mod);
--- 
-2.44.1
-
diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 8f7c0e80556d..844285ba5bbc 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -6,6 +6,7 @@
   doxygen,
   eigen,
   fetchFromGitHub,
+  fetchpatch,
   fmt,
   gfortran,
   gts,
@@ -64,13 +65,13 @@ in
 freecad-utils.makeCustomizable (
   stdenv.mkDerivation (finalAttrs: {
     pname = "freecad";
-    version = "1.0.0";
+    version = "1.0.1";
 
     src = fetchFromGitHub {
       owner = "FreeCAD";
       repo = "FreeCAD";
       rev = finalAttrs.version;
-      hash = "sha256-u7RYSImUMAgKaAQSAGCFha++RufpZ/QuHAirbSFOUCI=";
+      hash = "sha256-VFTNawXxu2ofjj2Frg4OfVhiMKFywBhm7lZunP85ZEQ=";
       fetchSubmodules = true;
     };
 
@@ -151,7 +152,10 @@ freecad-utils.makeCustomizable (
     patches = [
       ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
       ./0002-FreeCad-OndselSolver-pkgconfig.patch
-      ./0003-Gui-take-in-account-module-path-argument.patch
+      (fetchpatch {
+        url = "https://github.com/FreeCAD/FreeCAD/commit/8e04c0a3dd9435df0c2dec813b17d02f7b723b19.patch?full_index=1";
+        hash = "sha256-H6WbJFTY5/IqEdoi5N+7D4A6pVAmZR4D+SqDglwS18c=";
+      })
     ];
 
     cmakeFlags =

From 869ae7345f037f264cbfad30217352af13e647e0 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 20 May 2025 18:05:16 +0200
Subject: [PATCH 08/36] cppfront: init at 0.8.1

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/cp/cppfront/package.nix | 105 +++++++++++++++++++++++++++
 1 file changed, 105 insertions(+)
 create mode 100644 pkgs/by-name/cp/cppfront/package.nix

diff --git a/pkgs/by-name/cp/cppfront/package.nix b/pkgs/by-name/cp/cppfront/package.nix
new file mode 100644
index 000000000000..415e1eda16f5
--- /dev/null
+++ b/pkgs/by-name/cp/cppfront/package.nix
@@ -0,0 +1,105 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  installShellFiles,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "cppfront";
+  version = "0.8.1";
+
+  src = fetchFromGitHub {
+    owner = "hsutter";
+    repo = "cppfront";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-QYjon2EpNexYa2fl09AePkpq0LkRVBOQM++eldcVMvI=";
+  };
+
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
+  # Remove with next release
+  postPatch = ''
+    substituteInPlace source/version.info \
+      --replace-fail "0.8.0" "0.8.1"
+  '';
+
+  dontConfigure = true;
+
+  buildPhase = ''
+    runHook preBuild
+
+    $CXX source/cppfront.cpp -std=c++20 -o cppfront
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    installBin cppfront
+    cp -r include $out/include
+
+    runHook postInstall
+  '';
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "-version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+
+    tests.hello-world = stdenv.mkDerivation (finalAttrs': {
+      pname = "${finalAttrs.pname}-hello-world-test";
+      inherit (finalAttrs) version src;
+
+      sourceRoot = "${finalAttrs'.src.name}/regression-tests";
+
+      nativeBuildInputs = [
+        finalAttrs.finalPackage
+        installShellFiles
+      ];
+
+      postBuild = ''
+        cppfront pure2-hello.cpp2
+        $CXX -std=c++20 -o pure2-hello{,.cpp}
+      '';
+
+      postInstall = ''
+        installBin pure2-hello
+      '';
+
+      doInstallCheck = true;
+      postInstallCheck = ''
+        $out/bin/pure2-hello | grep '^Hello \[world\]$' > /dev/null
+      '';
+
+      meta = {
+        inherit (finalAttrs.meta) maintainers platforms;
+        mainProgram = "pure2-hello";
+      };
+    });
+  };
+
+  meta = {
+    description = "Experimental compiler from a potential C++ 'syntax 2' (Cpp2) to today's 'syntax 1' (Cpp1)";
+    homepage = "https://hsutter.github.io/cppfront/";
+    changelog = "https://github.com/hsutter/cppfront/releases/tag/${finalAttrs.src.tag}";
+    mainProgram = "cppfront";
+    license = with lib.licenses; [
+      asl20
+      llvm-exception
+    ];
+    maintainers = with lib.maintainers; [
+      marcin-serwin
+    ];
+    platforms = lib.platforms.all;
+  };
+})

From 5813916b5766d6158a1f26633096e0450bab8f02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 06:53:37 +0000
Subject: [PATCH 09/36] bpfilter: 0.3.0 -> 0.4.0

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

diff --git a/pkgs/by-name/bp/bpfilter/package.nix b/pkgs/by-name/bp/bpfilter/package.nix
index 52474e7775e4..f76bfcb465d3 100644
--- a/pkgs/by-name/bp/bpfilter/package.nix
+++ b/pkgs/by-name/bp/bpfilter/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bpfilter";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "bpfilter";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-k8zl6WQ5htxu2nsubOoqMg69E/z+4TQTtywIfZG/G7U=";
+    hash = "sha256-Z0L4sY944cj/rqfOwwjNWOU0tZDAsZ1ocf4/djHad2Q=";
   };
 
   nativeBuildInputs = [

From de9c94c5a04fcbc774229c0af9935e87c8a832c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 13:59:34 +0000
Subject: [PATCH 10/36] vpl-gpu-rt: 25.2.1 -> 25.2.2

---
 pkgs/by-name/vp/vpl-gpu-rt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
index 7bfa075c2803..8b615395f77d 100644
--- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix
+++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vpl-gpu-rt";
-  version = "25.2.1";
+  version = "25.2.2";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "intel";
     repo = "vpl-gpu-rt";
     rev = "intel-onevpl-${version}";
-    hash = "sha256-K6w5A0LbQDTKM5y5AzZ/Hr/FwQLZqHov0tiJHbzUE4w=";
+    hash = "sha256-RUzDNJ22oJhOKM0q+wzMpNmqtNGxNsVai0Homj5XuBs=";
   };
 
   nativeBuildInputs = [

From 8a1a5d1b0f29483d7c821e784a0a24673b8b1dd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 14:27:09 +0000
Subject: [PATCH 11/36] media-downloader: 5.3.2 -> 5.3.3

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

diff --git a/pkgs/by-name/me/media-downloader/package.nix b/pkgs/by-name/me/media-downloader/package.nix
index dcd1b8e261fa..b855d9c21bba 100644
--- a/pkgs/by-name/me/media-downloader/package.nix
+++ b/pkgs/by-name/me/media-downloader/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "media-downloader";
-  version = "5.3.2";
+  version = "5.3.3";
 
   src = fetchFromGitHub {
     owner = "mhogomchungu";
     repo = "media-downloader";
     rev = finalAttrs.version;
-    hash = "sha256-rNcEPE1BoCltpV5A3ugc7NI2ASfLXuPC9NNbc4Gn8BA=";
+    hash = "sha256-vVTTICGtuSUWz10iEEsMUSLwlZmOjW+ffpZ3T7Hy+WU=";
   };
 
   nativeBuildInputs = [

From 64c913b11eac8a4f0fd420511221705cada683f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 14:32:40 +0000
Subject: [PATCH 12/36] nfpm: 2.42.0 -> 2.42.1

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

diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix
index 2da3eb5e7b6a..89cc40e3e21c 100644
--- a/pkgs/by-name/nf/nfpm/package.nix
+++ b/pkgs/by-name/nf/nfpm/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "nfpm";
-  version = "2.42.0";
+  version = "2.42.1";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-63vhxsoGK8YNs0wobFyViOHO9K3hSHgWJU/wbvUxJFw=";
+    hash = "sha256-uHtrxBlSlVBmpVqE645nRNQ3mL07Uj9YrmG/jAfuyyg=";
   };
 
-  vendorHash = "sha256-VA6/n89OIX+Au1JmCwWezh80xEtydUgBWYSlwpyXZtA=";
+  vendorHash = "sha256-pxOxiYYvzIAmXo4rRLpngG4ILUhc1f1DJqwNxXlCXtM=";
 
   ldflags = [
     "-s"

From 135f8cb73cc6ecb3c49c08f01247ba62af920347 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 21 May 2025 16:34:51 +0200
Subject: [PATCH 13/36] bind: 9.20.8 -> 9.20.9

https://downloads.isc.org/isc/bind9/cur/9.20/doc/arm/html/notes.html#notes-for-bind-9-20-9

Fixes: CVE-2025-40775
---
 pkgs/by-name/bi/bind/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index c98a55d66668..0d518a160cb1 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bind";
-  version = "9.20.8";
+  version = "9.20.9";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
-    hash = "sha256-MATZnEdr6rSamGwtSfkC4s13ZsmrGLJh6LNTyr86BLU=";
+    hash = "sha256-PSaQDtnJqFkHP/6puX4pLBJI2tGCebF7BfyyPDCR+G0=";
   };
 
   outputs = [

From 7f5b661595acb758b20f768471714a7d2c97676e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 21 May 2025 16:50:36 +0200
Subject: [PATCH 14/36] bind: make kubernetes passthru tests conditional on
 x86_64-linux

This unbreaks `nix-build -A knot.tests --eval system aarch64-linux`.
---
 pkgs/by-name/bi/bind/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index 0d518a160cb1..ede0e139e35d 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -136,13 +136,16 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru = {
-    tests = {
-      withCheck = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
-      inherit (nixosTests) bind;
-      prometheus-exporter = nixosTests.prometheus-exporters.bind;
-      kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node;
-      kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node;
-    };
+    tests =
+      {
+        withCheck = finalAttrs.finalPackage.overrideAttrs { doCheck = true; };
+        inherit (nixosTests) bind;
+        prometheus-exporter = nixosTests.prometheus-exporters.bind;
+      }
+      // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
+        kubernetes-dns-single-node = nixosTests.kubernetes.dns-single-node;
+        kubernetes-dns-multi-node = nixosTests.kubernetes.dns-multi-node;
+      };
 
     updateScript = gitUpdater {
       # No nicer place to find latest stable release.

From a3e38960d1b85fa1e0bff5e9eb0eb8ff6e63add0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 21 May 2025 16:58:51 +0200
Subject: [PATCH 15/36] bind: remove globin from maintainers

Added in 2019 but made no change since.
---
 pkgs/by-name/bi/bind/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index ede0e139e35d..f969a14feaef 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://downloads.isc.org/isc/bind9/cur/${lib.versions.majorMinor finalAttrs.version}/doc/arm/html/notes.html#notes-for-bind-${
       lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version
     }";
-    maintainers = with maintainers; [ globin ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.unix;
 
     outputsToInstall = [

From 8eb37d0bf5b60d876cc242acde0ebb091550d1a8 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 21 May 2025 18:28:26 +0200
Subject: [PATCH 16/36] nltk-data: add bengsparks to maintainers

---
 pkgs/tools/text/nltk-data/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/text/nltk-data/default.nix b/pkgs/tools/text/nltk-data/default.nix
index d9613b86637a..bdb1ad9af6de 100644
--- a/pkgs/tools/text/nltk-data/default.nix
+++ b/pkgs/tools/text/nltk-data/default.nix
@@ -15,7 +15,10 @@ let
       homepage = "https://github.com/nltk/nltk_data";
       license = licenses.asl20;
       platforms = platforms.all;
-      maintainers = with maintainers; [ happysalada ];
+      maintainers = with maintainers; [
+        bengsparks
+        happysalada
+      ];
     };
   };
   makeNltkDataPackage =

From 03639c657abaf39b7288dba212cd2ec8eb062626 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 21 May 2025 15:50:35 +0200
Subject: [PATCH 17/36] nltk-data: skip fixupPhase to avoid needless patching
 attempts

There are no scripts in the `package` folder, only datasets, models, etc.
---
 pkgs/tools/text/nltk-data/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/text/nltk-data/default.nix b/pkgs/tools/text/nltk-data/default.nix
index bdb1ad9af6de..b3e66f7fe4a7 100644
--- a/pkgs/tools/text/nltk-data/default.nix
+++ b/pkgs/tools/text/nltk-data/default.nix
@@ -10,6 +10,7 @@ let
     version = "0-unstable-2024-07-29";
     nativeBuildInputs = [ unzip ];
     dontBuild = true;
+    dontFixup = true;
     meta = with lib; {
       description = "NLTK Data";
       homepage = "https://github.com/nltk/nltk_data";

From 1657909e8e7b4bd84a967d9183c086efbd225372 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 21 May 2025 18:36:40 +0200
Subject: [PATCH 18/36] nltk-data: fix searchability

nltk-data is an attribute set, which leads to nixos search omitting it.
Wrapping it in `recurseIntoAttrs` remedies this.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12e622afedf0..efdd3ff8ec1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2344,7 +2344,7 @@ with pkgs;
 
   mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { };
 
-  nltk-data = callPackage ../tools/text/nltk-data { };
+  nltk-data = lib.recurseIntoAttrs (callPackage ../tools/text/nltk-data { });
 
   seabios-coreboot = seabios.override { ___build-type = "coreboot"; };
   seabios-csm = seabios.override { ___build-type = "csm"; };

From e0db6e1c5ccb0c23384bde0e4815527952c47654 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 19:29:29 +0000
Subject: [PATCH 19/36] sc-im: 0.8.4 -> 0.8.5

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

diff --git a/pkgs/by-name/sc/sc-im/package.nix b/pkgs/by-name/sc/sc-im/package.nix
index 43bd526db987..984d052b7ed1 100644
--- a/pkgs/by-name/sc/sc-im/package.nix
+++ b/pkgs/by-name/sc/sc-im/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sc-im";
-  version = "0.8.4";
+  version = "0.8.5";
 
   src = fetchFromGitHub {
     owner = "andmarti1424";
     repo = "sc-im";
     rev = "v${version}";
-    sha256 = "sha256-nNOifSYbmJjuw6c8TerIQRlhCwbs7GnzD2J7O3vs0gI=";
+    sha256 = "sha256-V2XwzZwn+plMxQuTCYxbeTaqdud69z77oMDDDi+7Jw0=";
   };
 
   sourceRoot = "${src.name}/src";

From 8815f5848d8567834aa593183f96e75dcfdee8f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 21:07:04 +0000
Subject: [PATCH 20/36] arkade: 0.11.38 -> 0.11.39

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

diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix
index 90e3c5ac8608..8705b3e6445e 100644
--- a/pkgs/by-name/ar/arkade/package.nix
+++ b/pkgs/by-name/ar/arkade/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "arkade";
-  version = "0.11.38";
+  version = "0.11.39";
 
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
     rev = version;
-    hash = "sha256-V6ms3Av0/g2S7Q2NLltz7CnnvE1m+cemmwoHKL1e0tM=";
+    hash = "sha256-ILiiK8WWuSB1QKTo89/JJ5ADCBKbRXVn9fNVL3c7y0s=";
   };
 
   env.CGO_ENABLED = 0;

From 5bd8b1082f6b58f9adb8640a4c080054e4d582df Mon Sep 17 00:00:00 2001
From: Savchenko Dmitriy <apicalium@gmail.com>
Date: Wed, 30 Apr 2025 13:03:44 +0300
Subject: [PATCH 21/36] git-cola: added .desktop file and icon

git-cola was missing its bubbles icon and was
displayed inconsistently in desktop environments
---
 pkgs/by-name/gi/git-cola/package.nix | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gi/git-cola/package.nix b/pkgs/by-name/gi/git-cola/package.nix
index ee9ef77c5dc2..caf300283fa0 100644
--- a/pkgs/by-name/gi/git-cola/package.nix
+++ b/pkgs/by-name/gi/git-cola/package.nix
@@ -7,6 +7,8 @@
   git,
   qt5,
   versionCheckHook,
+  copyDesktopItems,
+  imagemagick,
   nix-update-script,
 }:
 
@@ -38,7 +40,8 @@ python3Packages.buildPythonApplication rec {
     gettext
     qt5.wrapQtAppsHook
     python3Packages.setuptools-scm
-  ];
+    imagemagick
+  ] ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
 
   nativeCheckInputs = [
     git
@@ -57,6 +60,19 @@ python3Packages.buildPythonApplication rec {
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
+  desktopItems = [
+    "share/applications/git-cola-folder-handler.desktop"
+    "share/applications/git-cola.desktop"
+    "share/applications/git-dag.desktop"
+  ];
+
+  postInstall = ''
+    for i in 16 24 48 64 96 128 256 512; do
+      mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps
+      magick cola/icons/git-cola.svg -background none -resize ''${i}x''${i} $out/share/icons/hicolor/''${i}x''${i}/apps/${pname}.png
+    done
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From b7b2c7cb0292e63031df0eb6eec20a5b9905b422 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 21 May 2025 23:11:12 +0200
Subject: [PATCH 22/36] direnv: fix indentation of generated scripts

---
 nixos/modules/programs/direnv.nix | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/programs/direnv.nix b/nixos/modules/programs/direnv.nix
index 51f2c795433f..2be2059bcca3 100644
--- a/nixos/modules/programs/direnv.nix
+++ b/nixos/modules/programs/direnv.nix
@@ -119,7 +119,7 @@ in
 
       zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration ''
         if ${lib.boolToString cfg.loadInNixShell} || printenv PATH | grep -vqc '/nix/store'; then
-         eval "$(${lib.getExe cfg.finalPackage} hook zsh)"
+          eval "$(${lib.getExe cfg.finalPackage} hook zsh)"
         fi
       '';
 
@@ -127,14 +127,13 @@ in
       #$IN_NIX_SHELL for "nix-shell"
       bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration ''
         if ${lib.boolToString cfg.loadInNixShell} || [ -z "$IN_NIX_SHELL$NIX_GCROOT$(printenv PATH | grep '/nix/store')" ] ; then
-         eval "$(${lib.getExe cfg.finalPackage} hook bash)"
+          eval "$(${lib.getExe cfg.finalPackage} hook bash)"
         fi
       '';
 
       fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration ''
-        if ${lib.boolToString cfg.loadInNixShell};
-        or printenv PATH | grep -vqc '/nix/store';
-         ${lib.getExe cfg.finalPackage} hook fish | source
+        if ${lib.boolToString cfg.loadInNixShell}; or printenv PATH | grep -vqc '/nix/store';
+          ${lib.getExe cfg.finalPackage} hook fish | source
         end
       '';
 
@@ -169,18 +168,18 @@ in
             source ${cfg.nix-direnv.package}/share/nix-direnv/direnvrc
           ''}
 
-           #Load direnvrcExtra
-           ${cfg.direnvrcExtra}
+          #Load direnvrcExtra
+          ${cfg.direnvrcExtra}
 
-           #Load user-configuration if present (~/.direnvrc or ~/.config/direnv/direnvrc)
-           direnv_config_dir_home="''${DIRENV_CONFIG_HOME:-''${XDG_CONFIG_HOME:-$HOME/.config}/direnv}"
-           if [[ -f $direnv_config_dir_home/direnvrc ]]; then
-             source "$direnv_config_dir_home/direnvrc" >&2
-           elif [[ -f $HOME/.direnvrc ]]; then
-             source "$HOME/.direnvrc" >&2
-           fi
+          #Load user-configuration if present (~/.direnvrc or ~/.config/direnv/direnvrc)
+          direnv_config_dir_home="''${DIRENV_CONFIG_HOME:-''${XDG_CONFIG_HOME:-$HOME/.config}/direnv}"
+          if [[ -f $direnv_config_dir_home/direnvrc ]]; then
+            source "$direnv_config_dir_home/direnvrc" >&2
+          elif [[ -f $HOME/.direnvrc ]]; then
+            source "$HOME/.direnvrc" >&2
+          fi
 
-           unset direnv_config_dir_home
+          unset direnv_config_dir_home
         '';
 
         "direnv/lib/zz-user.sh".text = ''

From 4b08542fbef3ccd72ce5db2315e7510b7e603184 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 21 May 2025 23:18:54 +0200
Subject: [PATCH 23/36] treewide: nltk-data.punkt_tab -> nltk-data.punkt-tab

---
 pkgs/by-name/pa/paperless-ngx/package.nix              | 2 +-
 pkgs/development/python-modules/aider-chat/default.nix | 2 +-
 pkgs/development/python-modules/type-infer/default.nix | 2 +-
 pkgs/tools/text/nltk-data/default.nix                  | 2 +-
 pkgs/top-level/aliases.nix                             | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 41445394d5b8..d05b49ca16e2 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -313,7 +313,7 @@ python.pkgs.buildPythonApplication rec {
       tesseract5
       ;
     nltkData = with nltk-data; [
-      punkt_tab
+      punkt-tab
       snowball_data
       stopwords
     ];
diff --git a/pkgs/development/python-modules/aider-chat/default.nix b/pkgs/development/python-modules/aider-chat/default.nix
index 4aa6ae731311..bc4534b8da61 100644
--- a/pkgs/development/python-modules/aider-chat/default.nix
+++ b/pkgs/development/python-modules/aider-chat/default.nix
@@ -125,7 +125,7 @@ let
   aider-nltk-data = symlinkJoin {
     name = "aider-nltk-data";
     paths = [
-      nltk-data.punkt_tab
+      nltk-data.punkt-tab
       nltk-data.stopwords
     ];
   };
diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix
index 4ce88d3b049f..4b8ef9e99d5e 100644
--- a/pkgs/development/python-modules/type-infer/default.nix
+++ b/pkgs/development/python-modules/type-infer/default.nix
@@ -24,7 +24,7 @@ let
     name = "nltk-test-data";
     paths = [
       nltk-data.punkt
-      nltk-data.punkt_tab
+      nltk-data.punkt-tab
       nltk-data.stopwords
     ];
   };
diff --git a/pkgs/tools/text/nltk-data/default.nix b/pkgs/tools/text/nltk-data/default.nix
index b3e66f7fe4a7..e2256c75d087 100644
--- a/pkgs/tools/text/nltk-data/default.nix
+++ b/pkgs/tools/text/nltk-data/default.nix
@@ -61,7 +61,7 @@ lib.makeScope newScope (self: {
     location = "tokenizers";
     hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";
   };
-  punkt_tab = makeNltkDataPackage {
+  punkt-tab = makeNltkDataPackage {
     pname = "punkt_tab";
     location = "tokenizers";
     hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ebd3a2b31f29..8d1c3c3cf3b3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1349,6 +1349,7 @@ mapAliases {
   # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable.
 
   nixosTest = testers.nixosTest; # Added 2022-05-05
+  nltk-data.punkt_tab = nltk-data.punkt-tab; # Added 2025-05-21
   nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17
   noah = throw "'noah' has been removed because it was broken and its upstream archived"; # Added 2025-05-10
   nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23

From 869486464c9717d18a4cb68a4daee123c35dbdf4 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 21 May 2025 23:19:56 +0200
Subject: [PATCH 24/36] treewide: nltk-data.averaged_perceptron_tagger ->
 nltk-data.averaged-perceptron-tagger

---
 pkgs/by-name/un/unstructured-api/package.nix | 2 +-
 pkgs/tools/text/nltk-data/default.nix        | 2 +-
 pkgs/top-level/aliases.nix                   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/un/unstructured-api/package.nix b/pkgs/by-name/un/unstructured-api/package.nix
index 96a5a15584d8..adf9fa83dd96 100644
--- a/pkgs/by-name/un/unstructured-api/package.nix
+++ b/pkgs/by-name/un/unstructured-api/package.nix
@@ -152,7 +152,7 @@ let
 
     paths = [
       nltk-data.punkt
-      nltk-data.averaged_perceptron_tagger
+      nltk-data.averaged-perceptron-tagger
     ];
   };
 in
diff --git a/pkgs/tools/text/nltk-data/default.nix b/pkgs/tools/text/nltk-data/default.nix
index e2256c75d087..c4a99c0456c3 100644
--- a/pkgs/tools/text/nltk-data/default.nix
+++ b/pkgs/tools/text/nltk-data/default.nix
@@ -66,7 +66,7 @@ lib.makeScope newScope (self: {
     location = "tokenizers";
     hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";
   };
-  averaged_perceptron_tagger = makeNltkDataPackage {
+  averaged-perceptron-tagger = makeNltkDataPackage {
     pname = "averaged_perceptron_tagger";
     location = "taggers";
     hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8d1c3c3cf3b3..4019d2823ee3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1349,6 +1349,7 @@ mapAliases {
   # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable.
 
   nixosTest = testers.nixosTest; # Added 2022-05-05
+  nltk-data.averaged_perceptron_tagger = nltk-data.averaged-perceptron-tagger; # Added 2025-05-21
   nltk-data.punkt_tab = nltk-data.punkt-tab; # Added 2025-05-21
   nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17
   noah = throw "'noah' has been removed because it was broken and its upstream archived"; # Added 2025-05-10

From 60d135d45a865d8a64e57a7acabdab4a86c5cb5e Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 21 May 2025 23:20:49 +0200
Subject: [PATCH 25/36] treewide: nltk-data.averaged_perceptron_tagger_eng ->
 nltk-data.averaged-perceptron-tagger-eng

---
 nixos/modules/services/web-apps/mealie.nix                      | 2 +-
 pkgs/by-name/me/mealie/package.nix                              | 2 +-
 .../python-modules/ingredient-parser-nlp/default.nix            | 2 +-
 pkgs/tools/text/nltk-data/default.nix                           | 2 +-
 pkgs/top-level/aliases.nix                                      | 1 +
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/mealie.nix b/nixos/modules/services/web-apps/mealie.nix
index 46571fea4617..b8f65b1fb98e 100644
--- a/nixos/modules/services/web-apps/mealie.nix
+++ b/nixos/modules/services/web-apps/mealie.nix
@@ -76,7 +76,7 @@ in
         API_PORT = toString cfg.port;
         BASE_URL = "http://localhost:${toString cfg.port}";
         DATA_DIR = "/var/lib/mealie";
-        NLTK_DATA = pkgs.nltk-data.averaged_perceptron_tagger_eng;
+        NLTK_DATA = pkgs.nltk-data.averaged-perceptron-tagger-eng;
       } // (builtins.mapAttrs (_: val: toString val) cfg.settings);
 
       serviceConfig = {
diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix
index 0092eab6b5f3..6a7897f9a79f 100644
--- a/pkgs/by-name/me/mealie/package.nix
+++ b/pkgs/by-name/me/mealie/package.nix
@@ -109,7 +109,7 @@ pythonpkgs.buildPythonApplication rec {
 
   # Needed for tests
   preCheck = ''
-    export NLTK_DATA=${nltk-data.averaged_perceptron_tagger_eng}
+    export NLTK_DATA=${nltk-data.averaged-perceptron-tagger-eng}
   '';
 
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/ingredient-parser-nlp/default.nix b/pkgs/development/python-modules/ingredient-parser-nlp/default.nix
index 88d03d362361..ee07bd34acd3 100644
--- a/pkgs/development/python-modules/ingredient-parser-nlp/default.nix
+++ b/pkgs/development/python-modules/ingredient-parser-nlp/default.nix
@@ -44,7 +44,7 @@ buildPythonPackage rec {
 
   # Needed for tests
   preCheck = ''
-    export NLTK_DATA=${nltk-data.averaged_perceptron_tagger_eng}
+    export NLTK_DATA=${nltk-data.averaged-perceptron-tagger-eng}
   '';
 
   meta = {
diff --git a/pkgs/tools/text/nltk-data/default.nix b/pkgs/tools/text/nltk-data/default.nix
index c4a99c0456c3..96125bd351f2 100644
--- a/pkgs/tools/text/nltk-data/default.nix
+++ b/pkgs/tools/text/nltk-data/default.nix
@@ -71,7 +71,7 @@ lib.makeScope newScope (self: {
     location = "taggers";
     hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";
   };
-  averaged_perceptron_tagger_eng = makeNltkDataPackage {
+  averaged-perceptron-tagger-eng = makeNltkDataPackage {
     pname = "averaged_perceptron_tagger_eng";
     location = "taggers";
     hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4019d2823ee3..6585e44b1b47 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1350,6 +1350,7 @@ mapAliases {
 
   nixosTest = testers.nixosTest; # Added 2022-05-05
   nltk-data.averaged_perceptron_tagger = nltk-data.averaged-perceptron-tagger; # Added 2025-05-21
+  nltk-data.averaged_perceptron_tagger_eng = nltk-data.averaged-perceptron-tagger-eng; # Added 2025-05-21
   nltk-data.punkt_tab = nltk-data.punkt-tab; # Added 2025-05-21
   nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17
   noah = throw "'noah' has been removed because it was broken and its upstream archived"; # Added 2025-05-10

From 4375d986d6bd048ad9ccfe3af2cbb644a966c729 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 21 May 2025 23:21:19 +0200
Subject: [PATCH 26/36] treewide: nltk-data.snowball_data ->
 nltk-data.snowball-data

---
 pkgs/by-name/pa/paperless-ngx/package.nix | 2 +-
 pkgs/tools/text/nltk-data/default.nix     | 2 +-
 pkgs/top-level/aliases.nix                | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index d05b49ca16e2..3a1fa7f93294 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -314,7 +314,7 @@ python.pkgs.buildPythonApplication rec {
       ;
     nltkData = with nltk-data; [
       punkt-tab
-      snowball_data
+      snowball-data
       stopwords
     ];
     tests = { inherit (nixosTests) paperless; };
diff --git a/pkgs/tools/text/nltk-data/default.nix b/pkgs/tools/text/nltk-data/default.nix
index 96125bd351f2..1ee377e4757b 100644
--- a/pkgs/tools/text/nltk-data/default.nix
+++ b/pkgs/tools/text/nltk-data/default.nix
@@ -76,7 +76,7 @@ lib.makeScope newScope (self: {
     location = "taggers";
     hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";
   };
-  snowball_data = makeNltkDataPackage {
+  snowball-data = makeNltkDataPackage {
     pname = "snowball_data";
     location = "stemmers";
     hash = "sha256-mNefwOPVJGz9kXV3LV4DuV7FJpNir/Nwg4ujd0CogEk=";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 6585e44b1b47..07d2bfb5a6d2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1352,6 +1352,7 @@ mapAliases {
   nltk-data.averaged_perceptron_tagger = nltk-data.averaged-perceptron-tagger; # Added 2025-05-21
   nltk-data.averaged_perceptron_tagger_eng = nltk-data.averaged-perceptron-tagger-eng; # Added 2025-05-21
   nltk-data.punkt_tab = nltk-data.punkt-tab; # Added 2025-05-21
+  nltk-data.snowball_data = nltk-data.snowball-data; # Added 2025-05-21
   nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17
   noah = throw "'noah' has been removed because it was broken and its upstream archived"; # Added 2025-05-10
   nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23

From a7d3ac57c5c40c8a22ef892f4ff833d3bbac612a Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Wed, 21 May 2025 16:46:18 +0200
Subject: [PATCH 27/36] nltk-data: add all downloadables

---
 pkgs/tools/text/nltk-data/default.nix | 241 ++++++++++++++++++++++----
 1 file changed, 206 insertions(+), 35 deletions(-)

diff --git a/pkgs/tools/text/nltk-data/default.nix b/pkgs/tools/text/nltk-data/default.nix
index 1ee377e4757b..e4aa7f06c355 100644
--- a/pkgs/tools/text/nltk-data/default.nix
+++ b/pkgs/tools/text/nltk-data/default.nix
@@ -54,41 +54,212 @@ let
         '';
       }
     );
+
+  makeChunker =
+    pname:
+    makeNltkDataPackage {
+      inherit pname;
+      location = "chunkers";
+      hash = "sha256-kemjqaCM9hlKAdMw8oVJnp62EAC9rMQ50dKg7wlAwEc=";
+    };
+
+  makeCorpus =
+    pname:
+    makeNltkDataPackage {
+      inherit pname;
+      location = "corpora";
+      hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk=";
+    };
+
+  makeGrammar =
+    pname:
+    makeNltkDataPackage {
+      inherit pname;
+      location = "grammars";
+      hash = "sha256-pyLEcX3Azv8j1kCGvVYonuiNgVJxtWt7veU0S/yNbIM=";
+    };
+
+  makeHelp =
+    pname:
+    makeNltkDataPackage {
+      inherit pname;
+      location = "help";
+      hash = "sha256-97mYLNES5WujLF5gD8Ul4cJ6LqSzz+jDzclUsdBeHNE=";
+    };
+
+  makeMisc =
+    pname:
+    makeNltkDataPackage {
+      inherit pname;
+      location = "misc";
+      hash = "sha256-XtizfEsc8TYWqvvC/eSFdha2ClC5/ZiJM8nue0vXLb4=";
+    };
+
+  makeModel =
+    pname:
+    makeNltkDataPackage {
+      inherit pname;
+      location = "models";
+      hash = "sha256-iq3weEgCci6rgLW2j28F2eRLprJtInGXKe/awJPSVG4=";
+    };
+
+  makeTagger =
+    pname:
+    makeNltkDataPackage {
+      inherit pname;
+      location = "taggers";
+      hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";
+    };
+
+  makeTokenizer =
+    pname:
+    makeNltkDataPackage {
+      inherit pname;
+      location = "tokenizers";
+      hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";
+    };
+
+  makeStemmer =
+    pname:
+    makeNltkDataPackage {
+      inherit pname;
+      location = "stemmers";
+      hash = "sha256-mNefwOPVJGz9kXV3LV4DuV7FJpNir/Nwg4ujd0CogEk=";
+    };
 in
 lib.makeScope newScope (self: {
-  punkt = makeNltkDataPackage {
-    pname = "punkt";
-    location = "tokenizers";
-    hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";
-  };
-  punkt-tab = makeNltkDataPackage {
-    pname = "punkt_tab";
-    location = "tokenizers";
-    hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";
-  };
-  averaged-perceptron-tagger = makeNltkDataPackage {
-    pname = "averaged_perceptron_tagger";
-    location = "taggers";
-    hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";
-  };
-  averaged-perceptron-tagger-eng = makeNltkDataPackage {
-    pname = "averaged_perceptron_tagger_eng";
-    location = "taggers";
-    hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";
-  };
-  snowball-data = makeNltkDataPackage {
-    pname = "snowball_data";
-    location = "stemmers";
-    hash = "sha256-mNefwOPVJGz9kXV3LV4DuV7FJpNir/Nwg4ujd0CogEk=";
-  };
-  stopwords = makeNltkDataPackage {
-    pname = "stopwords";
-    location = "corpora";
-    hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk=";
-  };
-  wordnet = makeNltkDataPackage {
-    pname = "wordnet";
-    location = "corpora";
-    hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk=";
-  };
+  ## Chunkers
+  maxent-ne-chunker = makeChunker "maxent_ne_chunker";
+  maxent-ne-chunker-tab = makeChunker "maxent_ne_chunker_tab";
+
+  ## Corpora
+  abc = makeCorpus "abc";
+  alpino = makeCorpus "alpino";
+  bcp47 = makeCorpus "bcp47";
+  biocreative-ppi = makeCorpus "biocreative_ppi";
+  brown = makeCorpus "brown";
+  brown-tei = makeCorpus "brown_tei";
+  cess-cat = makeCorpus "cess_cat";
+  cess-esp = makeCorpus "cess_esp";
+  chat80 = makeCorpus "chat80";
+  city-database = makeCorpus "city_database";
+  cmudict = makeCorpus "cmudict";
+  comparative-sentences = makeCorpus "comparative_sentences";
+  comtrans = makeCorpus "comtrans";
+  conll2000 = makeCorpus "conll2000";
+  conll2002 = makeCorpus "conll2002";
+  conll2007 = makeCorpus "conll2007";
+  crubadan = makeCorpus "crubadan";
+  dependency-treebank = makeCorpus "dependency_treebank";
+  dolch = makeCorpus "dolch";
+  europarl-raw = makeCorpus "europarl_raw";
+  extended-omw = makeCorpus "extended_omw";
+  floresta = makeCorpus "floresta";
+  framenet-v15 = makeCorpus "framenet_v15";
+  framenet-v17 = makeCorpus "framenet_v17";
+  gazetteers = makeCorpus "gazetteers";
+  genesis = makeCorpus "genesis";
+  gutenberg = makeCorpus "gutenberg";
+  ieer = makeCorpus "ieer";
+  inaugural = makeCorpus "inaugural";
+  indian = makeCorpus "indian";
+  jeita = makeCorpus "jeita";
+  kimmo = makeCorpus "kimmo";
+  knbc = makeCorpus "knbc";
+  lin-thesaurus = makeCorpus "lin_thesaurus";
+  mac-morpho = makeCorpus "mac_morpho";
+  machado = makeCorpus "machado";
+  masc-tagged = makeCorpus "masc_tagged";
+  movie-reviews = makeCorpus "movie_reviews";
+  mte-teip5 = makeCorpus "mte_teip5";
+  names = makeCorpus "names";
+  nombank-1-0 = makeCorpus "nombank.1.0";
+  nonbreaking-prefixes = makeCorpus "nonbreaking_prefixes";
+  nps-chat = makeCorpus "nps_chat";
+  omw = makeCorpus "omw";
+  omw-1-4 = makeCorpus "omw-1.4";
+  opinion-lexicon = makeCorpus "opinion_lexicon";
+  panlex-swadesh = makeCorpus "panlex_swadesh";
+  paradigms = makeCorpus "paradigms";
+  pe08 = makeCorpus "pe08";
+  pil = makeCorpus "pil";
+  pl196x = makeCorpus "pl196x";
+  ppattach = makeCorpus "ppattach";
+  problem-reports = makeCorpus "problem_reports";
+  product-reviews-1 = makeCorpus "product_reviews_1";
+  product-reviews-2 = makeCorpus "product_reviews_2";
+  propbank = makeCorpus "propbank";
+  pros-cons = makeCorpus "pros_cons";
+  ptb = makeCorpus "ptb";
+  qc = makeCorpus "qc";
+  reuters = makeCorpus "reuters";
+  rte = makeCorpus "rte";
+  semcor = makeCorpus "semcor";
+  senseval = makeCorpus "senseval";
+  sentence-polarity = makeCorpus "sentence_polarity";
+  sentiwordnet = makeCorpus "sentiwordnet";
+  shakespeare = makeCorpus "shakespeare";
+  sinica-treebank = makeCorpus "sinica_treebank";
+  smultron = makeCorpus "smultron";
+  state-union = makeCorpus "state_union";
+  stopwords = makeCorpus "stopwords";
+  subjectivity = makeCorpus "subjectivity";
+  swadesh = makeCorpus "swadesh";
+  switchboard = makeCorpus "switchboard";
+  timit = makeCorpus "timit";
+  toolbox = makeCorpus "toolbox";
+  treebank = makeCorpus "treebank";
+  twitter-samples = makeCorpus "twitter_samples";
+  udhr = makeCorpus "udhr";
+  udhr2 = makeCorpus "udhr2";
+  unicode-samples = makeCorpus "unicode_samples";
+  universal-treebanks-v20 = makeCorpus "universal_treebanks_v20";
+  verbnet = makeCorpus "verbnet";
+  verbnet3 = makeCorpus "verbnet3";
+  webtext = makeCorpus "webtext";
+  wordnet = makeCorpus "wordnet";
+  wordnet-ic = makeCorpus "wordnet_ic";
+  wordnet2021 = makeCorpus "wordnet2021";
+  wordnet2022 = makeCorpus "wordnet2022";
+  wordnet31 = makeCorpus "wordnet31";
+  words = makeCorpus "words";
+  ycoe = makeCorpus "ycoe";
+
+  ## Grammars
+  basque-grammars = makeGrammar "basque_grammars";
+  book-grammars = makeGrammar "book_grammars";
+  large-grammars = makeGrammar "large_grammars";
+  sample-grammars = makeGrammar "sample_grammars";
+  spanish-grammars = makeGrammar "spanish_grammars";
+
+  ## Help
+  tagsets-json = makeHelp "tagsets_json";
+
+  ## Misc
+  mwa-ppdb = makeMisc "mwa_ppdb";
+  perluniprops = makeMisc "perluniprops";
+
+  ## Models
+  bllip-wsj-no-aux = makeModel "bllip_wsj_no_aux";
+  moses-sample = makeModel "moses_sample";
+  wmt15-eval = makeModel "wmt15_eval";
+  word2vec-sample = makeModel "word2vec_sample";
+
+  ## Taggers
+  averaged-perceptron-tagger = makeTagger "averaged_perceptron_tagger";
+  averaged-perceptron-tagger-eng = makeTagger "averaged_perceptron_tagger_eng";
+  averaged-perceptron-tagger-ru = makeTagger "averaged_perceptron_tagger_ru";
+  averaged-perceptron-tagger-rus = makeTagger "averaged_perceptron_tagger_rus";
+  maxent-treebank-pos-tagger = makeTagger "maxent_treebank_pos_tagger";
+  maxent-treebank-pos-tagger-tab = makeTagger "maxent_treebank_pos_tagger_tab";
+  universal-tagset = makeTagger "universal_tagset";
+
+  ## Tokenizers
+  punkt = makeTokenizer "punkt";
+  punkt-tab = makeTokenizer "punkt_tab";
+
+  ## Stemmers
+  porter-test = makeStemmer "porter_test";
+  rslp = makeStemmer "rslp";
+  snowball-data = makeStemmer "snowball_data";
 })

From 5953ae56d8550d2a5433aa54b62ec9fa3595915e Mon Sep 17 00:00:00 2001
From: Zhaofeng Li <hello@zhaofeng.li>
Date: Wed, 21 May 2025 16:53:08 -0600
Subject: [PATCH 28/36] Don't trigger the evaluation of apple-sdk in Linux
 stdenv

During the Apple SDK revamp of #346043, cc-wrapper and bintools-wrapper
were modified to automatically add a fallback SDK if $DEVELOPER_DIR is
not set [^1]. However, because of the order of the && operands,
apple-sdk is always evaluated even when it's not needed.

Flip the && operands so we only trigger the evaluation when targeting
Darwin.

[^1]: 51755b0c00881bfe1602db0eb689efd2c66bcc20
---
 pkgs/build-support/bintools-wrapper/default.nix | 2 +-
 pkgs/build-support/cc-wrapper/default.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 195a7091242a..4618b1cbba52 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -492,7 +492,7 @@ stdenvNoCC.mkDerivation {
         darwinMinVersionVariable
         ;
     }
-    // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {
+    // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
       # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
       fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
     };
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index f12fe4d18bec..b9df3fc1b2b0 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -889,7 +889,7 @@ stdenvNoCC.mkDerivation {
       # These will become empty strings when not targeting Darwin.
       inherit (targetPlatform) darwinMinVersion darwinMinVersionVariable;
     }
-    // lib.optionalAttrs (apple-sdk != null && stdenvNoCC.targetPlatform.isDarwin) {
+    // lib.optionalAttrs (stdenvNoCC.targetPlatform.isDarwin && apple-sdk != null) {
       # Wrapped compilers should do something useful even when no SDK is provided at `DEVELOPER_DIR`.
       fallback_sdk = apple-sdk.__spliced.buildTarget or apple-sdk;
     };

From f8483c358a734a9d88f838c58fa108c668878529 Mon Sep 17 00:00:00 2001
From: Shogo Takata <peshogo@gmail.com>
Date: Thu, 22 May 2025 08:06:49 +0900
Subject: [PATCH 29/36] circt: fix build failure on darwin

---
 pkgs/by-name/ci/circt/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/ci/circt/package.nix b/pkgs/by-name/ci/circt/package.nix
index c23ae3718d26..33bea2f71e8b 100644
--- a/pkgs/by-name/ci/circt/package.nix
+++ b/pkgs/by-name/ci/circt/package.nix
@@ -104,12 +104,6 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "check-circt check-circt-integration";
 
-  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    echo moving libarc-jit-env.dylib to '$lib' before check because archilator links to the output path
-    mkdir -pv $lib/lib
-    cp -v ./lib/libarc-jit-env.dylib $lib/lib
-  '';
-
   outputs = [
     "out"
     "lib"

From 70582d29dc8c08176009ca75c3ef7bdf8ad974f2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 21 May 2025 20:27:04 -0400
Subject: [PATCH 30/36] nixVersions.git: 2.29pre20250409_e76bbe41 ->
 2.30pre20250521_76a4d4c2

Changes: https://github.com/NixOS/nix/compare/e76bbe41...76a4d4c2
---
 pkgs/tools/package-management/nix/default.nix      | 6 +++---
 pkgs/tools/package-management/nix/dependencies.nix | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 713f8341f87f..9818b0c9a254 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -187,14 +187,14 @@ lib.makeExtensible (
       };
 
       nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.29pre20250409_${lib.substring 0 8 src.rev}";
+        version = "2.30pre20250521_${lib.substring 0 8 src.rev}";
         inherit (self.nix_2_24.meta) maintainers teams;
         otherSplices = generateSplicesForNixComponents "nixComponents_git";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "e76bbe413e86e3208bb9824e339d59af25327101";
-          hash = "sha256-Aqnj5+sA7B4ZRympuyfWPPK83iomKHEHMYhlwslI8iA=";
+          rev = "76a4d4c2913a1654dddd195b034ff7e66cb3e96f";
+          hash = "sha256-OA22Ig72oV6reHN8HMlimmnrsxpNzqyzi4h6YBVzzEA=";
         };
       };
 
diff --git a/pkgs/tools/package-management/nix/dependencies.nix b/pkgs/tools/package-management/nix/dependencies.nix
index 73bce4a9f04e..a736181cf563 100644
--- a/pkgs/tools/package-management/nix/dependencies.nix
+++ b/pkgs/tools/package-management/nix/dependencies.nix
@@ -72,6 +72,7 @@ regular@{
     aws-sdk-cpp =
       (regular.aws-sdk-cpp.override {
         apis = [
+          "identity-management"
           "s3"
           "transfer"
         ];

From 969a309a9123d1f9a29042db1cc842e5cffc47da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 00:39:18 +0000
Subject: [PATCH 31/36] crystal-dock: 2.12 -> 2.14

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

diff --git a/pkgs/by-name/cr/crystal-dock/package.nix b/pkgs/by-name/cr/crystal-dock/package.nix
index c263f3f7cb3c..c755886c5425 100644
--- a/pkgs/by-name/cr/crystal-dock/package.nix
+++ b/pkgs/by-name/cr/crystal-dock/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "crystal-dock";
-  version = "2.12";
+  version = "2.14";
 
   src = fetchFromGitHub {
     owner = "dangvd";
     repo = "crystal-dock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8QxewksN4iWFpIChRm0+QnU5MFuup0dO/QNxPBLlmPU=";
+    hash = "sha256-szW3zIgwy0a9NmEax6xemeCdjs3//r7BRfUDeLv+VxE=";
   };
 
   nativeBuildInputs = [

From 76340fb06e873bbc95807a4ed00a1e11b602dd60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 May 2025 02:00:09 +0000
Subject: [PATCH 32/36] rcp: 0.16.0 -> 0.17.0

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

diff --git a/pkgs/by-name/rc/rcp/package.nix b/pkgs/by-name/rc/rcp/package.nix
index 3bd769fc014a..436df90d68e9 100644
--- a/pkgs/by-name/rc/rcp/package.nix
+++ b/pkgs/by-name/rc/rcp/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rcp";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "wykurz";
     repo = "rcp";
     rev = "v${version}";
-    hash = "sha256-mMSO5twpuxiA6pMG/bNMn3WJjs3ZwuoOk62M0WIrRBk=";
+    hash = "sha256-mFFMxGu/r8xtfMkpDW2Rk/oTWQcS9oK6ngoRKCc+STo=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-uVBWPxGxNgiahywA78QjN8msNx3gZ6vOyX7AkOdK2EM=";
+  cargoHash = "sha256-2S3bygSu9ouT/RYCmafFGvFHHFJXVryb5E3PMmcZs0U=";
 
   RUSTFLAGS = "--cfg tokio_unstable";
 

From 9ec7451ac9ea50649ced078a9fbc582d5820df7b Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 22 May 2025 04:09:52 +0200
Subject: [PATCH 33/36] applyPatches: simplify src attribute inheritance.

This fixes the potential mismatch between a `applyPatches` with and without patches, as the latter would not merge the `meta` or `passthru` args.
This is technically a breaking change to the `applyPatches` interface, but there are no instances of this in nixpkgs.
---
 .../build-support/trivial-builders/default.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 96cc43157d38..4be06b5c4913 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -1022,6 +1022,12 @@ rec {
       postPatch ? "",
       ...
     }@args:
+    assert lib.assertMsg (
+      !args ? meta
+    ) "applyPatches will not merge 'meta', change it in 'src' instead";
+    assert lib.assertMsg (
+      !args ? passthru
+    ) "applyPatches will not merge 'passthru', change it in 'src' instead";
     if patches == [ ] && prePatch == "" && postPatch == "" then
       src # nothing to do, so use original src to avoid additional drv
     else
@@ -1051,19 +1057,17 @@ rec {
           phases = "unpackPhase patchPhase installPhase";
           installPhase = "cp -R ./ $out";
         }
-        # Carry and merge information from the underlying `src` if present.
-        // (optionalAttrs (src ? meta || args ? meta) {
-          meta = src.meta or { } // args.meta or { };
+        # Carry (and merge) information from the underlying `src` if present.
+        // (optionalAttrs (src ? meta) {
+          inherit (src) meta;
         })
-        // (optionalAttrs (extraPassthru != { } || src ? passthru || args ? passthru) {
-          passthru = extraPassthru // src.passthru or { } // args.passthru or { };
+        // (optionalAttrs (extraPassthru != { } || src ? passthru) {
+          passthru = extraPassthru // src.passthru or { };
         })
         # Forward any additional arguments to the derviation
         // (removeAttrs args [
           "src"
           "name"
-          "meta"
-          "passthru"
           "patches"
           "prePatch"
           "postPatch"

From 2f4fc457c5f6540edd395c077528ee426acd990b Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 14 Mar 2024 23:40:51 -0500
Subject: [PATCH 34/36] sbarlua: init at unstable-2024-08-12

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/sb/sbarlua/package.nix | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/sb/sbarlua/package.nix

diff --git a/pkgs/by-name/sb/sbarlua/package.nix b/pkgs/by-name/sb/sbarlua/package.nix
new file mode 100644
index 000000000000..1d7bdfc4a870
--- /dev/null
+++ b/pkgs/by-name/sb/sbarlua/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  fetchFromGitHub,
+  gcc,
+  lua54Packages,
+  readline,
+}:
+lua54Packages.buildLuaPackage {
+  pname = "sbarLua";
+  version = "0-unstable-2024-08-12";
+
+  src = fetchFromGitHub {
+    owner = "FelixKratz";
+    repo = "SbarLua";
+    rev = "437bd2031da38ccda75827cb7548e7baa4aa9978";
+    hash = "sha256-F0UfNxHM389GhiPQ6/GFbeKQq5EvpiqQdvyf7ygzkPg=";
+  };
+
+  nativeBuildInputs = [ gcc ];
+
+  buildInputs = [ readline ];
+
+  makeFlags = [ "INSTALL_DIR=$(out)/lib/lua/${lua54Packages.lua.luaversion}" ];
+
+  meta = {
+    description = "Lua API for SketchyBar";
+    homepage = "https://github.com/FelixKratz/SbarLua/";
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.khaneliman ];
+    platforms = lib.platforms.darwin;
+  };
+}

From efa98030f38bf5010d6faa72921ee84b21949881 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Wed, 21 May 2025 20:01:04 -0400
Subject: [PATCH 35/36] terraform: 1.12.0 -> 1.12.1

Diff: https://github.com/hashicorp/terraform/compare/v1.12.0...v1.12.1

Changelog: https://github.com/hashicorp/terraform/blob/v1.12.1/CHANGELOG.md
---
 pkgs/applications/networking/cluster/terraform/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 3f1a045b536f..b6ac750d8eb1 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -194,8 +194,8 @@ rec {
   mkTerraform = attrs: pluggable (generic attrs);
 
   terraform_1 = mkTerraform {
-    version = "1.12.0";
-    hash = "sha256-+EjsKl13kx3uJ50TrZIJLrvf4RBWDJsp1PD1dwtP6XA=";
+    version = "1.12.1";
+    hash = "sha256-ikpSkcP4zt91Lf9gziytlZ4P27A0IP2qL+H2Lp9Cspg=";
     vendorHash = "sha256-zWNLIurNP5e/AWr84kQCb2+gZIn6EAsuvr0ZnfSq7Zw=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = {

From c3ed7942c9a3db482806107d3bc3033e4d340e90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 21 May 2025 19:07:01 +0000
Subject: [PATCH 36/36] qmmp: 2.2.5 -> 2.2.6

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

diff --git a/pkgs/by-name/qm/qmmp/package.nix b/pkgs/by-name/qm/qmmp/package.nix
index afe7406a6a97..e9c91a1a10d6 100644
--- a/pkgs/by-name/qm/qmmp/package.nix
+++ b/pkgs/by-name/qm/qmmp/package.nix
@@ -54,11 +54,11 @@
 
 stdenv.mkDerivation rec {
   pname = "qmmp";
-  version = "2.2.5";
+  version = "2.2.6";
 
   src = fetchurl {
     url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2";
-    hash = "sha256-WCEfMnrDhau8fXXmpdjdZLzbXMDxEZMp8pJ9FjEJfhg=";
+    hash = "sha256-Jw7Kb9co2aC8fxnpTg4OH2o8RNreZI3/pYoNu3OWy0s=";
   };
 
   nativeBuildInputs = [