From 814cecf7451a6c28e469b09894b70e3a8d5f017e Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Thu, 25 Jul 2024 20:25:00 +0200
Subject: [PATCH 01/71] bump2version: move to python-modules

---
 .../python-modules}/bump2version/default.nix  | 24 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  2 ++
 3 files changed, 18 insertions(+), 10 deletions(-)
 rename pkgs/{applications/version-management => development/python-modules}/bump2version/default.nix (72%)

diff --git a/pkgs/applications/version-management/bump2version/default.nix b/pkgs/development/python-modules/bump2version/default.nix
similarity index 72%
rename from pkgs/applications/version-management/bump2version/default.nix
rename to pkgs/development/python-modules/bump2version/default.nix
index 86d1618cc48d..c7bbb8f327f9 100644
--- a/pkgs/applications/version-management/bump2version/default.nix
+++ b/pkgs/development/python-modules/bump2version/default.nix
@@ -1,24 +1,29 @@
-{ lib
-, buildPythonApplication
-, fetchFromGitHub
-, pytestCheckHook
-, pythonOlder
-, testfixtures
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  testfixtures,
 }:
 
-buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "bump2version";
   version = "1.0.1";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "c4urself";
-    repo = pname;
-    rev = "v${version}";
+    repo = "bump2version";
+    rev = "refs/tags/v${version}";
     sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU=";
   };
 
+  build-system = [ setuptools ];
+
   nativeCheckInputs = [
     pytestCheckHook
     testfixtures
@@ -40,6 +45,7 @@ buildPythonApplication rec {
       all version strings in your source code by the correct increment.
     '';
     homepage = "https://github.com/c4urself/bump2version";
+    changelog = "https://github.com/c4urself/bump2version/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ jefflabonte ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0d3e8e80c3f5..de766359e319 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2147,7 +2147,7 @@ with pkgs;
 
   bitbucket-server-cli = callPackage ../applications/version-management/bitbucket-server-cli { };
 
-  bump2version = python3Packages.callPackage ../applications/version-management/bump2version { };
+  bump2version = with python3Packages; toPythonApplication bump2version;
 
   cgit = callPackage ../applications/version-management/cgit { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9320c4ec1ff9..fd6b7e342a8d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1893,6 +1893,8 @@ self: super: with self; {
 
   buildcatrust = callPackage ../development/python-modules/buildcatrust { };
 
+  bump2version = callPackage ../development/python-modules/bump2version { };
+
   bumps = callPackage ../development/python-modules/bumps { };
 
   bunch = callPackage ../development/python-modules/bunch { };

From 9c17b9b05f575a9f45d72426c39433a75b830512 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Thu, 25 Jul 2024 23:05:28 +0200
Subject: [PATCH 02/71] nanoemoji: move to python-modules

---
 .../python-modules}/nanoemoji/default.nix     | 58 ++++++++++++++-----
 .../python-modules}/nanoemoji/fix-test.patch  |  0
 .../nanoemoji/test-pythonpath.patch           |  0
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  2 +
 5 files changed, 47 insertions(+), 15 deletions(-)
 rename pkgs/{tools/misc => development/python-modules}/nanoemoji/default.nix (61%)
 rename pkgs/{tools/misc => development/python-modules}/nanoemoji/fix-test.patch (100%)
 rename pkgs/{tools/misc => development/python-modules}/nanoemoji/test-pythonpath.patch (100%)

diff --git a/pkgs/tools/misc/nanoemoji/default.nix b/pkgs/development/python-modules/nanoemoji/default.nix
similarity index 61%
rename from pkgs/tools/misc/nanoemoji/default.nix
rename to pkgs/development/python-modules/nanoemoji/default.nix
index 88b1cad12234..9d2dfffcaf9f 100644
--- a/pkgs/tools/misc/nanoemoji/default.nix
+++ b/pkgs/development/python-modules/nanoemoji/default.nix
@@ -1,19 +1,38 @@
-{ lib
-, python3
-, fetchFromGitHub
-, resvg
-, pngquant
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+  resvg,
+  pngquant,
+  absl-py,
+  fonttools,
+  lxml,
+  ninja,
+  picosvg,
+  pillow,
+  regex,
+  toml,
+  tomlkit,
+  ufo2ft,
+  ufolib2,
+  zopfli,
 }:
-python3.pkgs.buildPythonApplication rec {
+
+buildPythonPackage rec {
   pname = "nanoemoji";
   version = "0.15.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googlefonts";
-    repo = pname;
-    rev = "v${version}";
+    repo = "nanoemoji";
+    rev = "refs/tags/v${version}";
     hash = "sha256-P/lT0PnjTdYzyttICzszu4OL5kj+X8GHZ8doL3tpXQM=";
   };
+
   patches = [
     # this is necessary because the tests clear PATH/PYTHONPATH otherwise
     ./test-pythonpath.patch
@@ -21,17 +40,23 @@ python3.pkgs.buildPythonApplication rec {
     ./fix-test.patch
   ];
 
-  nativeBuildInputs = with python3.pkgs; [
+  build-system = [
+    setuptools
     setuptools-scm
+  ];
 
+  nativeBuildInputs = [
     pngquant
     resvg
   ];
 
   # these two packages are just prebuilt wheels containing the respective binaries
-  pythonRemoveDeps = [ "pngquant-cli" "resvg-cli" ];
+  pythonRemoveDeps = [
+    "pngquant-cli"
+    "resvg-cli"
+  ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = [
     absl-py
     fonttools
     lxml
@@ -46,15 +71,19 @@ python3.pkgs.buildPythonApplication rec {
     zopfli
   ];
 
-  nativeCheckInputs = with python3.pkgs; [
+  nativeCheckInputs = [
     pytestCheckHook
-
     ninja
     picosvg
   ];
 
   makeWrapperArgs = [
-    "--prefix PATH : ${lib.makeBinPath [ pngquant resvg ]}"
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        pngquant
+        resvg
+      ]
+    }"
   ];
 
   preCheck = ''
@@ -65,6 +94,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Wee tool to build color fonts";
     homepage = "https://github.com/googlefonts/nanoemoji";
+    changelog = "https://github.com/googlefonts/nanoemoji/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ _999eagle ];
   };
diff --git a/pkgs/tools/misc/nanoemoji/fix-test.patch b/pkgs/development/python-modules/nanoemoji/fix-test.patch
similarity index 100%
rename from pkgs/tools/misc/nanoemoji/fix-test.patch
rename to pkgs/development/python-modules/nanoemoji/fix-test.patch
diff --git a/pkgs/tools/misc/nanoemoji/test-pythonpath.patch b/pkgs/development/python-modules/nanoemoji/test-pythonpath.patch
similarity index 100%
rename from pkgs/tools/misc/nanoemoji/test-pythonpath.patch
rename to pkgs/development/python-modules/nanoemoji/test-pythonpath.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de766359e319..590c4ced10bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9676,7 +9676,7 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  nanoemoji = python3Packages.callPackage ../tools/misc/nanoemoji { };
+  nanoemoji = with python3Packages; toPythonApplication nanoemoji;
 
   nagelfar = callPackage ../development/tools/nagelfar { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fd6b7e342a8d..394520d66ac1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8976,6 +8976,8 @@ self: super: with self; {
 
   nanobind = callPackage ../development/python-modules/nanobind { };
 
+  nanoemoji = callPackage ../development/python-modules/nanoemoji { };
+
   nanoid = callPackage ../development/python-modules/nanoid { };
 
   nanoleaf = callPackage ../development/python-modules/nanoleaf { };

From bcd82a2c121fba395e55be2e82100a607d4b9ca5 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Wed, 24 Jul 2024 21:03:19 +0200
Subject: [PATCH 03/71] python3Packages.ufomerge: init at 1.7.0

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

diff --git a/pkgs/development/python-modules/ufomerge/default.nix b/pkgs/development/python-modules/ufomerge/default.nix
new file mode 100644
index 000000000000..94afd71cd71d
--- /dev/null
+++ b/pkgs/development/python-modules/ufomerge/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonRelaxDepsHook,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+  fonttools,
+  fontfeatures,
+  ufolib2,
+}:
+
+buildPythonPackage rec {
+  pname = "ufomerge";
+  version = "1.7.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "googlefonts";
+    repo = "ufomerge";
+    rev = "refs/tags/${version}";
+    hash = "sha256-0izeb2PeGIYbzzQ+/K0Dz/9fVWFcPizQI39X/EQF5bU=";
+  };
+
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
+
+  pythonRelaxDeps = [ "fonttools" ];
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    fonttools
+    ufolib2
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    fontfeatures
+  ];
+
+  disabledTestPaths = [
+    # Failing due to fonttools being to old
+    "tests/test_layout.py"
+  ];
+
+  pythonImportsCheck = [ "ufomerge" ];
+
+  meta = {
+    description = "Command line utility and Python library that merges two UFO source format fonts into a single file";
+    homepage = "https://github.com/googlefonts/ufomerge";
+    changelog = "https://github.com/googlefonts/ufomerge/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 394520d66ac1..dffde22b75d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17012,6 +17012,8 @@ self: super: with self; {
 
   ufolint = callPackage ../development/python-modules/ufolint { };
 
+  ufomerge = callPackage ../development/python-modules/ufomerge { };
+
   ufonormalizer = callPackage ../development/python-modules/ufonormalizer { };
 
   ufoprocessor = callPackage ../development/python-modules/ufoprocessor { };

From 4bd737554e672ee3e357a1ed0d17ff3a1203fda0 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sat, 27 Jul 2024 19:29:14 +0200
Subject: [PATCH 04/71] python3Packages.opentype-feature-freezer: init at
 0-unstable-2022-07-09

---
 .../opentype-feature-freezer/default.nix      | 63 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/python-modules/opentype-feature-freezer/default.nix

diff --git a/pkgs/development/python-modules/opentype-feature-freezer/default.nix b/pkgs/development/python-modules/opentype-feature-freezer/default.nix
new file mode 100644
index 000000000000..3d7d953dce5f
--- /dev/null
+++ b/pkgs/development/python-modules/opentype-feature-freezer/default.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  pytestCheckHook,
+  fonttools,
+  poetry-core,
+  configparser,
+  biplist,
+}:
+
+buildPythonPackage {
+  pname = "opentype-feature-freezer";
+  version = "0-unstable-2022-07-09";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "twardoch";
+    repo = "fonttools-opentype-feature-freezer";
+    rev = "2ae16853bc724c3e377726f81d9fc661d3445827";
+    hash = "sha256-mIWQF9LTVKxIkwHLCTVK1cOuiaduJyX8pyBZ/0RKIVE=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail poetry.masonry.api poetry.core.masonry.api \
+      --replace-fail "poetry>=" "poetry-core>="
+  '';
+
+  build-system = [
+    poetry-core
+    configparser
+  ];
+
+  dependencies = [ fonttools ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    biplist
+  ];
+
+  disabledTestPaths = [
+    # Wants to check path outside of nix store
+    "src/opentype_feature_freezer/cli.py"
+    # NameError: name 'defines' is not defined
+    "app/dmgbuild_settings.py"
+    # Missing module
+    "app/OTFeatureFreezer.py"
+    # AttributeError: 'types.SimpleNamespace' object has no attribute 'suffix'
+    "tests/test_rename.py"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Permanently \"apply\" OpenType features to fonts, by remapping their Unicode assignments";
+    homepage = "https://github.com/twardoch/fonttools-opentype-feature-freezer";
+    license = lib.licenses.asl20;
+    mainProgram = "pyftfeatfreeze";
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dffde22b75d3..4c799c4946d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10137,6 +10137,8 @@ self: super: with self; {
 
   openapi-core = callPackage ../development/python-modules/openapi-core { };
 
+  opentype-feature-freezer = callPackage ../development/python-modules/opentype-feature-freezer { };
+
   openusd = callPackage ../development/python-modules/openusd {
     alembic = pkgs.alembic;
   };

From 9dc55ca46c8a04c334a5e49a9ec5f3f185d0b9b1 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sat, 27 Jul 2024 19:26:15 +0200
Subject: [PATCH 05/71] python3Packages.paintcompiler: init 0.3.4

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

diff --git a/pkgs/development/python-modules/paintcompiler/default.nix b/pkgs/development/python-modules/paintcompiler/default.nix
new file mode 100644
index 000000000000..c2e6009fa4f7
--- /dev/null
+++ b/pkgs/development/python-modules/paintcompiler/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  fonttools,
+  black,
+}:
+
+buildPythonPackage rec {
+  pname = "paintcompiler";
+  version = "0.3.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simoncozens";
+    repo = "paintcompiler";
+    rev = "v${version}";
+    hash = "sha256-dmVBQUUyFc71zq8fXBQ4ii/llrGdtUCOponCzSeut6g=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    fonttools
+    black
+  ];
+
+  pythonImportsCheck = [
+    "paintcompiler"
+    "paintdecompiler"
+  ];
+
+  meta = {
+    description = "Paint compiler for COLRv1 fonts";
+    homepage = "https://github.com/simoncozens/paintcompiler";
+    license = lib.licenses.asl20;
+    mainProgram = "paintcompiler";
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4c799c4946d5..70b93a5ce620 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9807,6 +9807,8 @@ self: super: with self; {
   paho-mqtt_2 = callPackage ../development/python-modules/paho-mqtt/default.nix { };
   paho-mqtt = paho-mqtt_1;
 
+  paintcompiler = callPackage ../development/python-modules/paintcompiler { };
+
   palace = callPackage ../development/python-modules/palace { };
 
   palettable = callPackage ../development/python-modules/palettable { };

From 3185dca35e6c33cb49993d5a14472e3724884bc0 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Thu, 25 Jul 2024 19:21:22 +0200
Subject: [PATCH 06/71] python3Packages.blackrenderer: init at 0.6.0

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

diff --git a/pkgs/development/python-modules/blackrenderer/default.nix b/pkgs/development/python-modules/blackrenderer/default.nix
new file mode 100644
index 000000000000..98e404c2dbd6
--- /dev/null
+++ b/pkgs/development/python-modules/blackrenderer/default.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+  fonttools,
+  uharfbuzz,
+  pycairo,
+  pillow,
+}:
+
+buildPythonPackage rec {
+  pname = "blackrenderer";
+  version = "0.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "BlackFoundryCom";
+    repo = "black-renderer";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-b2W0M32Y4HUyxObjvh0yMUBe5gfcSDXnw1GfhW7hoZk=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    fonttools
+    uharfbuzz
+  ];
+
+  optional-dependencies = {
+    cairo = [ pycairo ];
+  };
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pillow
+  ];
+
+  disabledTestPaths = [
+    # Wants None existing fonts
+    "Tests/test_mainprog.py"
+    "Tests/test_glyph_render.py"
+  ];
+
+  pythonImportsCheck = [ "blackrenderer" ];
+
+  meta = {
+    description = "Renderer for OpenType COLR fonts, with multiple backends";
+    homepage = "https://github.com/BlackFoundryCom/black-renderer";
+    changelog = "https://github.com/BlackFoundryCom/black-renderer/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    mainProgram = "blackrenderer";
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 70b93a5ce620..2cfc78d6dd1e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1654,6 +1654,8 @@ self: super: with self; {
 
   black-macchiato = callPackage ../development/python-modules/black-macchiato { };
 
+  blackrenderer = callPackage ../development/python-modules/blackrenderer { };
+
   bleach = callPackage ../development/python-modules/bleach { };
 
   bleach-allowlist = callPackage ../development/python-modules/bleach-allowlist { };

From 185f7f400830b1f056c23aeecd103a2b74ecb23c Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Thu, 25 Jul 2024 19:38:36 +0200
Subject: [PATCH 07/71] python3Packages.diffenator2: init at 0.4.3

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

diff --git a/pkgs/development/python-modules/diffenator2/default.nix b/pkgs/development/python-modules/diffenator2/default.nix
new file mode 100644
index 000000000000..e5297364fc18
--- /dev/null
+++ b/pkgs/development/python-modules/diffenator2/default.nix
@@ -0,0 +1,95 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonRelaxDepsHook,
+  pytestCheckHook,
+  poetry-core,
+  poetry-dynamic-versioning,
+  blackrenderer,
+  fonttools,
+  freetype-py,
+  gflanguages,
+  glyphsets,
+  jinja2,
+  ninja,
+  pillow,
+  protobuf,
+  pyahocorasick,
+  python-bidi,
+  selenium,
+  tqdm,
+  uharfbuzz,
+  unicodedata2,
+  youseedee,
+  numpy,
+}:
+
+buildPythonPackage rec {
+  pname = "diffenator2";
+  version = "0.4.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "googlefonts";
+    repo = "diffenator2";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-zeNcNR14ieY6Inp4kOwIPXd6S+/wFdMFp6wbiqgB/iA=";
+  };
+
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
+
+  pythonRelaxDeps = [ "protobuf" ];
+
+  build-system = [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
+
+  dependencies = [
+    blackrenderer
+    fonttools
+    freetype-py
+    gflanguages
+    glyphsets
+    jinja2
+    ninja
+    pillow
+    protobuf
+    pyahocorasick
+    python-bidi
+    selenium
+    tqdm
+    uharfbuzz
+    unicodedata2
+    youseedee
+    numpy
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTests = [
+    # requires internet
+    "test_download_google_fonts_family_to_file"
+    "test_download_google_fonts_family_to_bytes"
+    "test_download_google_fonts_family_not_existing"
+    "test_download_latest_github_release"
+  ];
+
+  disabledTestPaths = [
+    # Want the files downloaded by the tests above
+    "tests/test_functional.py"
+    "tests/test_html.py"
+    "tests/test_matcher.py"
+    "tests/test_font.py"
+  ];
+
+  meta = {
+    description = "Font comparison tool that will not stop until your fonts are exhaustively compared";
+    homepage = "https://github.com/googlefonts/diffenator2";
+    changelog = "https://github.com/googlefonts/diffenator2/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    mainProgram = "diffenator2";
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2cfc78d6dd1e..0407a0f6aeb8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3121,6 +3121,8 @@ self: super: with self; {
 
   diff-match-patch = callPackage ../development/python-modules/diff-match-patch { };
 
+  diffenator2 = callPackage ../development/python-modules/diffenator2 { };
+
   diffimg = callPackage ../development/python-modules/diffimg { };
 
   diffsync = callPackage ../development/python-modules/diffsync { };

From dc997637aebe7f9da5dda1219187c3926223ff9e Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Thu, 25 Jul 2024 20:17:52 +0200
Subject: [PATCH 08/71] python3Packages.vttlib: init at 0.12.0

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

diff --git a/pkgs/development/python-modules/vttlib/default.nix b/pkgs/development/python-modules/vttlib/default.nix
new file mode 100644
index 000000000000..d90b9c3c3bfd
--- /dev/null
+++ b/pkgs/development/python-modules/vttlib/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+  fonttools,
+  pyparsing,
+  ufolib2,
+  ufo2ft,
+}:
+
+buildPythonPackage rec {
+  pname = "vttlib";
+  version = "0.12.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "daltonmaag";
+    repo = "vttLib";
+    rev = "v${version}";
+    hash = "sha256-ChsuzeFRQFDYGlAE4TWzE+et7yGLOfha1VqGcOdayOs=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    fonttools
+    pyparsing
+    ufolib2
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    ufo2ft
+  ];
+
+  pythonImportsCheck = [ "vttLib" ];
+
+  meta = {
+    description = "Dump, merge and compile Visual TrueType data in UFO3 with FontTools";
+    homepage = "https://github.com/daltonmaag/vttLib";
+    changelog = "https://github.com/daltonmaag/vttLib/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0407a0f6aeb8..704555f8ec11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17391,6 +17391,8 @@ self: super: with self; {
     enablePython = true;
   });
 
+  vttlib = callPackage ../development/python-modules/vttlib { };
+
   vulcan-api = callPackage ../development/python-modules/vulcan-api { };
 
   vultr = callPackage ../development/python-modules/vultr { };

From 1b3f672a3f7bd691b0c5c52820e9bf9aae7ad5a8 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Thu, 25 Jul 2024 20:38:00 +0200
Subject: [PATCH 09/71] python3Packages.bumpfontversion: init at 0.4.0

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

diff --git a/pkgs/development/python-modules/bumpfontversion/default.nix b/pkgs/development/python-modules/bumpfontversion/default.nix
new file mode 100644
index 000000000000..8ee90f9795a5
--- /dev/null
+++ b/pkgs/development/python-modules/bumpfontversion/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonRelaxDepsHook,
+  poetry-core,
+  fonttools,
+  openstep-plist,
+  ufolib2,
+  glyphslib,
+  bump2version,
+}:
+
+buildPythonPackage rec {
+  pname = "bumpfontversion";
+  version = "0.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "simoncozens";
+    repo = "bumpfontversion";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-qcKZGv/KeeSRBq4SdnuZlurp0CUs40iEQjw9/1LltUg=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'poetry>=' 'poetry-core>=' \
+      --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api'
+  '';
+
+  nativeBuildInputs = [ pythonRelaxDepsHook ];
+
+  pythonRelaxDeps = [ "glyphslib" ];
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    fonttools
+    openstep-plist
+    ufolib2
+    glyphslib
+    bump2version
+  ];
+
+  meta = {
+    description = "Version-bump your font sources";
+    homepage = "https://github.com/simoncozens/bumpfontversion";
+    license = lib.licenses.asl20;
+    mainProgram = "bumpfontversion";
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 704555f8ec11..ab9f2a0071da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1897,6 +1897,8 @@ self: super: with self; {
 
   bump2version = callPackage ../development/python-modules/bump2version { };
 
+  bumpfontversion = callPackage ../development/python-modules/bumpfontversion { };
+
   bumps = callPackage ../development/python-modules/bumps { };
 
   bunch = callPackage ../development/python-modules/bunch { };

From 9264afd8f0f96c69d4479cf136c81aa39066a356 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Fri, 26 Jul 2024 08:09:24 +0200
Subject: [PATCH 10/71] python3Packages.gftools: init at 0.9.68

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

diff --git a/pkgs/development/python-modules/gftools/default.nix b/pkgs/development/python-modules/gftools/default.nix
new file mode 100644
index 000000000000..9418d7c1acd4
--- /dev/null
+++ b/pkgs/development/python-modules/gftools/default.nix
@@ -0,0 +1,207 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+  absl-py,
+  afdko,
+  axisregistry,
+  babelfont,
+  beautifulsoup4,
+  black,
+  brotli,
+  bumpfontversion,
+  coreutils,
+  diffenator2,
+  font-v,
+  fontbakery,
+  fontfeatures,
+  fontmake,
+  fonttools,
+  gflanguages,
+  gfsubsets,
+  glyphsets,
+  glyphslib,
+  harfbuzz,
+  jinja2,
+  nanoemoji,
+  networkx,
+  ninja,
+  opentype-feature-freezer,
+  ots-python,
+  packaging,
+  paintcompiler,
+  pillow,
+  protobuf,
+  pycairo,
+  pygit2,
+  pygithub,
+  pytest,
+  pyyaml,
+  requests,
+  rich,
+  ruamel-yaml,
+  skia-pathops,
+  statmake,
+  strictyaml,
+  tabulate,
+  ttfautohint-py,
+  ufomerge,
+  unidecode,
+  vharfbuzz,
+  vttlib,
+  python,
+}:
+
+let
+  fontmake' = python.withPackages (ps: [ ps.fontmake ] ++ ps.fontmake.optional-dependencies.json);
+  fonttools' = python.withPackages (ps: [ ps.fonttools ] ++ ps.fonttools.optional-dependencies.ufo);
+in
+buildPythonPackage rec {
+  pname = "gftools";
+  version = "0.9.68";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "googlefonts";
+    repo = "gftools";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-xdpfRCtZDxRmrGodXUg8J0T5l5gd7Mvl290BXwNLzvY=";
+  };
+
+  postPatch = ''
+    substituteInPlace \
+      Lib/gftools/builder/operations/{buildTTF,glyphs2ds,buildVariable,buildOTF}.py \
+      --replace-fail '"fontmake' '"${lib.getExe' fontmake' "fontmake"}'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/instantiateUfo.py \
+      --replace-fail "'fontmake" "'${lib.getExe' fontmake' "fontmake"}"
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/{compress,subspace}.py \
+      --replace-fail '"fonttools' '"${lib.getExe' fonttools' "fonttools"}'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/hbsubset.py \
+      --replace-fail '"pyftsubset"' '"${lib.getExe' fonttools' "pyftsubset"}"' \
+      --replace-fail '"hb-subset"' '"${lib.getExe' harfbuzz "hb-subset"}"'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/autohintOTF.py \
+      --replace-fail '"otfautohint' '"${lib.getExe' afdko "otfautohint"}'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/paintcompiler.py \
+      --replace-fail '"paintcompiler' '"${lib.getExe paintcompiler}'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/featureFreeze.py \
+      --replace-fail '"pyftfeatfreeze' '"${lib.getExe opentype-feature-freezer}'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/copy.py \
+      --replace-fail '"cp' '"${lib.getExe' coreutils "cp"}'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/{fix,remap,autohint,buildStat,addSubset,remapLayout,buildVTT}.py \
+      --replace-fail '"gftools' '"${placeholder "out"}/bin/gftools'
+
+    substituteInPlace \
+      Lib/gftools/builder/operations/rename.py \
+      --replace-fail "'gftools" "'${placeholder "out"}t/bin/gftools"
+  '';
+
+  pythonRelaxDeps = [
+    "protobuf"
+    "pygit2"
+  ];
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    absl-py
+    afdko
+    axisregistry
+    babelfont
+    beautifulsoup4
+    brotli
+    bumpfontversion
+    font-v
+    fontfeatures
+    fontmake
+    fonttools
+    gflanguages
+    gfsubsets
+    glyphsets
+    glyphslib
+    jinja2
+    nanoemoji
+    networkx
+    ninja
+    ots-python
+    packaging
+    pillow
+    protobuf
+    pygit2
+    pygithub
+    pyyaml
+    requests
+    rich
+    ruamel-yaml
+    setuptools
+    skia-pathops
+    statmake
+    strictyaml
+    tabulate
+    ttfautohint-py
+    ufomerge
+    unidecode
+    vharfbuzz
+    vttlib
+  ] ++ fonttools.optional-dependencies.ufo ++ fontmake.optional-dependencies.json;
+
+  optional-dependencies = {
+    qa = [
+      diffenator2
+      fontbakery
+      pycairo
+    ];
+    test = [
+      black
+      pytest
+    ];
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTestPaths = [
+    # Wants none exsiting module
+    "bin/test_args.py"
+    # Requires internet
+    "tests/push/test_items.py"
+    "tests/test_gfgithub.py"
+    "tests/test_usage.py"
+    "tests/push/test_servers.py"
+    # Can't find directory
+    "tests/test_builder.py"
+    "tests/test_dependencies.py"
+    "tests/test_fix.py"
+  ];
+
+  pythonImportsCheck = [ "gftools" ];
+
+  meta = with lib; {
+    description = "Misc tools for working with the Google Fonts library";
+    homepage = "https://github.com/googlefonts/gftools";
+    changelog = "https://github.com/googlefonts/gftools/releases/tag/v${version}";
+    license = licenses.asl20;
+    mainProgram = "gftools";
+    maintainers = with maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ab9f2a0071da..a78ea9ad7291 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4979,6 +4979,8 @@ self: super: with self; {
 
   gfsubsets = callPackage ../development/python-modules/gfsubsets { };
 
+  gftools = callPackage ../development/python-modules/gftools { };
+
   gguf = callPackage ../development/python-modules/gguf { };
 
   ghapi = callPackage ../development/python-modules/ghapi { };

From 2ae2834863b579bdaba1f843a497d91566d30ba7 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Fri, 30 Aug 2024 23:09:30 -0700
Subject: [PATCH 11/71] nixos/ups: add system-ups.slice

Part of #279915
---
 nixos/modules/services/monitoring/ups.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix
index 0d157afd51a0..938f62465a7b 100644
--- a/nixos/modules/services/monitoring/ups.nix
+++ b/nixos/modules/services/monitoring/ups.nix
@@ -502,6 +502,11 @@ in
         else lib.unique (lib.forEach cfg.upsd.listen (listen: listen.port));
     };
 
+    systemd.slices.system-ups = {
+      description = "Network UPS Tools (NUT) Slice";
+      documentation = [ "https://networkupstools.org/" ];
+    };
+
     systemd.services.upsmon = let
       secrets = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}") cfg.upsmon.monitor;
       createUpsmonConf = installSecrets upsmonConf "/run/nut/upsmon.conf" secrets;
@@ -516,6 +521,7 @@ in
         ExecStart = "${pkgs.nut}/sbin/upsmon";
         ExecReload = "${pkgs.nut}/sbin/upsmon -c reload";
         LoadCredential = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}:${monitor.passwordFile}") cfg.upsmon.monitor;
+        Slice = "system-ups.slice";
       };
       environment.NUT_CONFPATH = "/etc/nut";
       environment.NUT_STATEPATH = "/var/lib/nut";
@@ -536,6 +542,7 @@ in
         ExecStart = "${pkgs.nut}/sbin/upsd -u root";
         ExecReload = "${pkgs.nut}/sbin/upsd -c reload";
         LoadCredential = lib.mapAttrsToList (name: user: "upsdusers_password_${name}:${user.passwordFile}") cfg.users;
+        Slice = "system-ups.slice";
       };
       environment.NUT_CONFPATH = "/etc/nut";
       environment.NUT_STATEPATH = "/var/lib/nut";
@@ -554,6 +561,7 @@ in
         RemainAfterExit = true;
         # TODO: replace 'root' by another username.
         ExecStart = "${pkgs.nut}/bin/upsdrvctl -u root start";
+        Slice = "system-ups.slice";
       };
       environment.NUT_CONFPATH = "/etc/nut";
       environment.NUT_STATEPATH = "/var/lib/nut";

From 50afd1e1d3a057a1a4bd91afefeed8a5d14ffc13 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sat, 31 Aug 2024 12:53:52 -0700
Subject: [PATCH 12/71] nixos/bacula: add system-bacula.slice

Part of #279915
---
 nixos/modules/services/backup/bacula.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index 94f6e6ba4fd5..f7a86915d5bc 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -656,6 +656,11 @@ in {
   };
 
   config = mkIf (fd_cfg.enable || sd_cfg.enable || dir_cfg.enable) {
+    systemd.slices.system-bacula = {
+      description = "Bacula Slice";
+      documentation = [ "man:bacula(8)" "https://www.bacula.org/" ];
+    };
+
     systemd.services.bacula-fd = mkIf fd_cfg.enable {
       after = [ "network.target" ];
       description = "Bacula File Daemon";
@@ -666,6 +671,7 @@ in {
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         LogsDirectory = "bacula";
         StateDirectory = "bacula";
+        Slice = "system-bacula.slice";
       };
     };
 
@@ -679,6 +685,7 @@ in {
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         LogsDirectory = "bacula";
         StateDirectory = "bacula";
+        Slice = "system-bacula.slice";
       };
     };
 
@@ -694,6 +701,7 @@ in {
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         LogsDirectory = "bacula";
         StateDirectory = "bacula";
+        Slice = "system-bacula.slice";
       };
       preStart = ''
         if ! test -e "${libDir}/db-created"; then

From 3342258555640322a18589c549828d5c374d614f Mon Sep 17 00:00:00 2001
From: Zhong Jianxin <azuwis@gmail.com>
Date: Thu, 5 Sep 2024 18:30:22 +0800
Subject: [PATCH 13/71] home-assistant-custom-components.xiaomi_gateway3: 4.0.5
 -> 4.0.6

Changelog: https://github.com/AlexxIT/XiaomiGateway3/releases/tag/v4.0.6

Also fix meta.changelog
---
 .../custom-components/xiaomi_gateway3/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix
index 40899c8926ea..fc659ba68e47 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/default.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "AlexxIT";
   domain = "xiaomi_gateway3";
-  version = "4.0.5";
+  version = "4.0.6";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "XiaomiGateway3";
     rev = "v${version}";
-    hash = "sha256-C8aY23e6iWANbhCRQYNHx+3fomVO+7qdxj+qfv+K3JM=";
+    hash = "sha256-E3BekX0Xbp1R36+dYmOlsI2BTrdGjFsMoYYRIiBi1qU=";
   };
 
   propagatedBuildInputs = [ zigpy ];
@@ -25,7 +25,7 @@ buildHomeAssistantComponent rec {
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    changelog = "https://github.com/AlexxIT/XiaomiGateway3/releases/tag/v{version}";
+    changelog = "https://github.com/AlexxIT/XiaomiGateway3/releases/tag/v${version}";
     description = "Home Assistant custom component for control Xiaomi Multimode Gateway (aka Gateway 3), Xiaomi Multimode Gateway 2, Aqara Hub E1 on default firmwares over LAN";
     homepage = "https://github.com/AlexxIT/XiaomiGateway3";
     maintainers = with maintainers; [ azuwis ];

From 34ca65ef1d859d771d7b0a2a41be7d6d761c077d Mon Sep 17 00:00:00 2001
From: mksafavi <mksafavi@gmail.com>
Date: Sun, 15 Sep 2024 19:38:13 +0330
Subject: [PATCH 14/71] termsonic: 0-unstable-2024-02-02 ->
 0-unstable-2024-09-15

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

diff --git a/pkgs/by-name/te/termsonic/package.nix b/pkgs/by-name/te/termsonic/package.nix
index dda1c016fa31..a91433762f60 100644
--- a/pkgs/by-name/te/termsonic/package.nix
+++ b/pkgs/by-name/te/termsonic/package.nix
@@ -7,14 +7,14 @@
 }:
 buildGoModule rec {
   name = "termsonic";
-  version = "0-unstable-2024-02-02";
+  version = "0-unstable-2024-09-15";
 
   src = fetchzip {
-    url = "https://git.sixfoisneuf.fr/termsonic/snapshot/termsonic-7a3aabee59e1a427aff755fc69759265ad9d0adc.zip";
-    hash = "sha256-C5/4679qw4CAdUt9lXpPIR3yejrPdddvmjgbpLF3SvA=";
+    url = "https://git.sixfoisneuf.fr/termsonic/snapshot/termsonic-93328e0ca6c0ed2424550c7a164b4b1212a554b6.zip";
+    hash = "sha256-qn0EB1lCU8nvgwcIuZ0Xt9yGTBz5bSnJelPF8mG6D1k=";
   };
 
-  vendorHash = "sha256-wCtQD9f1mbN/0qUZnamPoVn9p4Ra5dQ34vlT+XjPF3k=";
+  vendorHash = "sha256-hBYgRKL9ZFzYy/wLCWacw8I6aqtD5O7lLsB9U5RmLjw=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 33192365879e6dc14bf9b15180bad38ca9978070 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 18 Sep 2024 09:12:25 +0000
Subject: [PATCH 15/71] openfga: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index 2c97f9849b10..0fc5da79bfbf 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "openfga";
-  version = "1.6.0";
+  version = "1.6.1";
 in
 
 buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "openfga";
     repo = "openfga";
     rev = "v${version}";
-    hash = "sha256-Y0ffBbNQFPGoLq2B9HtImU1tH0JqhvPYgftNCUQtcJo=";
+    hash = "sha256-NdMv81XUHawey/xO7UUsTpbBF/4F77N7VtyYCKZjjkU=";
   };
 
-  vendorHash = "sha256-+awhoYHstxLarPRDIzETAx0wR8TqoyDz3iFSQxH2vG4=";
+  vendorHash = "sha256-4f681Qq6cAAQpla+xcvDXCYwa0ZBqsYSWWDyq5jbdd0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 2d5cfa3180946159a9a379056f9b106d53cbc7df Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Thu, 19 Sep 2024 19:44:17 +0400
Subject: [PATCH 16/71] =?UTF-8?q?osm2pgsql:=201.11.0=20=E2=86=92=202.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix
index 0ddfb737fcee..85bd3dcac2e7 100644
--- a/pkgs/by-name/os/osm2pgsql/package.nix
+++ b/pkgs/by-name/os/osm2pgsql/package.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , cmake
 , expat
-, fmt
+, fmt_11
 , proj
 , bzip2
 , cli11
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osm2pgsql";
-  version = "1.11.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "osm2pgsql-dev";
     repo = "osm2pgsql";
     rev = finalAttrs.version;
-    hash = "sha256-95B4WVaf3AwaC+S6dCJpUq/1J47rOZjWUBxmRqHCu4w=";
+    hash = "sha256-YtG/cwEyCIsNjoEhDikMoI/SUqx8fEtPuolpNkLGTlE=";
   };
 
   postPatch = ''
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     bzip2
     cli11
     expat
-    fmt
+    fmt_11
     libosmium
     nlohmann_json
     opencv

From 1c1a3fc9b6c03d2dbb9a12a925f916919c1aa985 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 04:20:45 +0000
Subject: [PATCH 17/71] hextazy: 0.6 -> 0.7

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

diff --git a/pkgs/by-name/he/hextazy/package.nix b/pkgs/by-name/he/hextazy/package.nix
index e78780cde00a..eb17fd568766 100644
--- a/pkgs/by-name/he/hextazy/package.nix
+++ b/pkgs/by-name/he/hextazy/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hextazy";
-  version = "0.6";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "0xfalafel";
     repo = "hextazy";
     rev = "${version}";
-    hash = "sha256-unZAW5ErHaEPpPwlo20/3//qhTpCjcmj0ses9FKgVJc=";
+    hash = "sha256-j8KY8OTYG+Hl86OppbMyAFBSA89TO7hc8mcNgTGTlgM=";
   };
 
-  cargoHash = "sha256-4JpgUGthCbXSn98f4RrPoTcaGSCyZeuJqMVdLH7gKgs=";
+  cargoHash = "sha256-Ue7ukYkpNkoD9IRy/EWMsB5kMzwWny8onVNeN+3WWgQ=";
 
   meta = {
     description = "TUI hexeditor in Rust with colored bytes";

From 965a11b6e13d8610bc04b8e710bd5bb4d435467f Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Fri, 20 Sep 2024 08:50:57 +0000
Subject: [PATCH 18/71] onlyoffice-bin: 8.1.0 -> 8.1.1; rename to
 onlyoffice-desktopeditors

---
 .../package.nix                               | 87 ++++++++++---------
 .../update.sh                                 |  0
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 46 insertions(+), 42 deletions(-)
 rename pkgs/by-name/on/{onlyoffice-bin => onlyoffice-desktopeditors}/package.nix (86%)
 rename pkgs/by-name/on/{onlyoffice-bin => onlyoffice-desktopeditors}/update.sh (100%)

diff --git a/pkgs/by-name/on/onlyoffice-bin/package.nix b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
similarity index 86%
rename from pkgs/by-name/on/onlyoffice-bin/package.nix
rename to pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
index fdab6d29f6d2..0670385f2c42 100644
--- a/pkgs/by-name/on/onlyoffice-bin/package.nix
+++ b/pkgs/by-name/on/onlyoffice-desktopeditors/package.nix
@@ -1,39 +1,40 @@
-{ stdenv
-, lib
-, fetchurl
-, buildFHSEnv
+{
+  stdenv,
+  lib,
+  fetchurl,
+  buildFHSEnv,
   # Alphabetic ordering below
-, alsa-lib
-, at-spi2-atk
-, atk
-, autoPatchelfHook
-, cairo
-, curl
-, dbus
-, dconf
-, dpkg
-, fontconfig
-, gcc-unwrapped
-, gdk-pixbuf
-, glib
-, glibc
-, gsettings-desktop-schemas
-, gst_all_1
-, gtk2
-, gtk3
-, libpulseaudio
-, libudev0-shim
-, libdrm
-, makeWrapper
-, mesa
-, noto-fonts-cjk-sans
-, nspr
-, nss
-, pulseaudio
-, qt5
-, wrapGAppsHook3
-, xkeyboard_config
-, xorg
+  alsa-lib,
+  at-spi2-atk,
+  atk,
+  autoPatchelfHook,
+  cairo,
+  curl,
+  dbus,
+  dconf,
+  dpkg,
+  fontconfig,
+  gcc-unwrapped,
+  gdk-pixbuf,
+  glib,
+  glibc,
+  gsettings-desktop-schemas,
+  gst_all_1,
+  gtk2,
+  gtk3,
+  libpulseaudio,
+  libudev0-shim,
+  libdrm,
+  makeWrapper,
+  mesa,
+  noto-fonts-cjk-sans,
+  nspr,
+  nss,
+  pulseaudio,
+  qt5,
+  wrapGAppsHook3,
+  xkeyboard_config,
+  xorg,
 }:
 let
 
@@ -65,11 +66,11 @@ let
 
   derivation = stdenv.mkDerivation rec {
     pname = "onlyoffice-desktopeditors";
-    version = "8.1.0";
+    version = "8.1.1";
     minor = null;
     src = fetchurl {
       url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb";
-      hash = "sha256-hS1+gLN17sP3EFud3fQXRWeFiQbrumBONLjqXEl89Js=";
+      hash = "sha256-RwWIYcbYljDqWRJcXCDODjVeYnp9xreNGO2l2aqWJ9w=";
     };
 
     nativeBuildInputs = [
@@ -184,15 +185,17 @@ buildFHSEnv {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Office suite that combines text, spreadsheet and presentation editors allowing to create, view and edit local documents";
-    mainProgram = "onlyoffice-desktopeditors";
     homepage = "https://www.onlyoffice.com/";
     downloadPage = "https://github.com/ONLYOFFICE/DesktopEditors/releases";
     changelog = "https://github.com/ONLYOFFICE/DesktopEditors/blob/master/CHANGELOG.md";
     platforms = [ "x86_64-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ nh2 gtrunsec ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.agpl3Plus;
+    maintainers = with lib.maintainers; [
+      nh2
+      gtrunsec
+    ];
   };
 }
diff --git a/pkgs/by-name/on/onlyoffice-bin/update.sh b/pkgs/by-name/on/onlyoffice-desktopeditors/update.sh
similarity index 100%
rename from pkgs/by-name/on/onlyoffice-bin/update.sh
rename to pkgs/by-name/on/onlyoffice-desktopeditors/update.sh
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f56074aae5a3..8a883f079d7a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1181,6 +1181,7 @@ mapAliases ({
   optparse-bash = throw "'optparse-bash' (GitHub: nk412/optparse) has been removed. Use 'argparse' instead"; # Added 2024-01-12
   orchis = orchis-theme; # Added 2021-06-09
   oni2 = throw "oni2 was removed, because it is unmaintained and was abandoned years ago."; #Added 2024-01-15
+  onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20
   onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03
   onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
   onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03

From fd81e768a72290bc0b8a65ec9c81b053da0cbca7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 16 Sep 2024 15:52:36 +0200
Subject: [PATCH 19/71] nixos-install-tools: make nixos-install/enter
 overridable

---
 pkgs/tools/nix/nixos-install-tools/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/nix/nixos-install-tools/default.nix b/pkgs/tools/nix/nixos-install-tools/default.nix
index 6e98df7890a5..cef57884ab6f 100644
--- a/pkgs/tools/nix/nixos-install-tools/default.nix
+++ b/pkgs/tools/nix/nixos-install-tools/default.nix
@@ -6,6 +6,8 @@
   # TODO: replace indirect self-reference by proper self-reference
   #       https://github.com/NixOS/nixpkgs/pull/119942
   nixos-install-tools,
+  nixos-install,
+  nixos-enter,
   runCommand,
   nixosTests,
   binlore,
@@ -18,9 +20,8 @@ in
   name = "nixos-install-tools-${version}";
   paths = lib.attrValues {
     # See nixos/modules/installer/tools/tools.nix
-    inherit (config.system.build)
-      nixos-install nixos-generate-config nixos-enter;
-
+    inherit (config.system.build) nixos-generate-config;
+    inherit nixos-install nixos-enter;
     inherit (config.system.build.manual) nixos-configuration-reference-manpage;
   };
 

From 44b9691b378a2a255020ca90d4f9c856213ffa64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 16 Sep 2024 15:53:42 +0200
Subject: [PATCH 20/71] disko: depend on nixos-install rather than
 nixos-install-tools

this avoids rebuilds.
---
 pkgs/by-name/di/disko/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix
index 1436404bd9a1..068194ec9491 100644
--- a/pkgs/by-name/di/disko/package.nix
+++ b/pkgs/by-name/di/disko/package.nix
@@ -4,7 +4,7 @@
 , fetchFromGitHub
 , bash
 , nix
-, nixos-install-tools
+, nixos-install
 , coreutils
 }:
 
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     for i in disko disko-install; do
       sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i"
       chmod 755 "$out/bin/$i"
-      wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install-tools ]}
+      wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils nixos-install ]}
     done
     runHook postInstall
   '';

From 4cf4459eb6ec4b869291f6db9eab4fca2c295598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 16 Sep 2024 16:32:51 +0200
Subject: [PATCH 21/71] nixos-enter: set PATH

otherwise util-linux may be missing.
---
 pkgs/by-name/ni/nixos-enter/nixos-enter.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ni/nixos-enter/nixos-enter.sh b/pkgs/by-name/ni/nixos-enter/nixos-enter.sh
index 9141cc285702..214ab7dfbda4 100755
--- a/pkgs/by-name/ni/nixos-enter/nixos-enter.sh
+++ b/pkgs/by-name/ni/nixos-enter/nixos-enter.sh
@@ -3,6 +3,8 @@
 
 set -e
 
+export PATH=@path@:$PATH
+
 # Re-exec ourselves in a private mount namespace so that our bind
 # mounts get cleaned up automatically.
 if [ -z "$NIXOS_ENTER_REEXEC" ]; then

From 98826e3b125786c9610fbe7a89028f53348c8278 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 10:40:14 +0000
Subject: [PATCH 22/71] gogdl: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/games/gogdl/default.nix b/pkgs/games/gogdl/default.nix
index dacf8a2f9fc5..0f96f0e4e36a 100644
--- a/pkgs/games/gogdl/default.nix
+++ b/pkgs/games/gogdl/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonApplication rec {
   pname = "gogdl";
-  version = "1.1.1";
+  version = "1.1.2";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "heroic-gogdl";
-    rev = "b1d9792f4b6c60382a88f09d03d6ed63afcc0310";
-    hash = "sha256-/J50pRbc3iua86HES/3RUIeamz/abh8wo0c/yegC4cM=";
+    rev = "1ff09820915f855ea764c6e49ea2def63e86b3bb";
+    hash = "sha256-pK6JeTJeBq9qVfflNSYs3s4HuD0Kz6k9DDUVHL81FV0=";
   };
 
   disabled = pythonOlder "3.8";

From c528c18094a7ad7e4918a58c7622a4eccf33f9ff Mon Sep 17 00:00:00 2001
From: RockWolf <git@rockwolf.eu>
Date: Fri, 20 Sep 2024 13:15:31 +0200
Subject: [PATCH 23/71] stackit-cli: 0.15.0 -> 0.16.0

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

diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index 28e895fddc70..70a4f00290c5 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "stackit-cli";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${version}";
-    hash = "sha256-dyMkqD2Fdopv620p9bzOXxiG3vp4t0H+x5UDelbpMko=";
+    hash = "sha256-9s7F3pcamzwAESA/mKnCnSPpSmAX+L81fDoDpR71gzA=";
   };
 
-  vendorHash = "sha256-FLMF0JTSTSkwI86i4StkY1r/W+x43TwlcLsmNYO7YnE=";
+  vendorHash = "sha256-QNi98VRy5BtML8jTxaDR3ZQfkXqjmfCf5IrcvGKE+rc=";
 
   subPackages = [ "." ];
 

From b98d61bfe8ad139f46c595b8b2c577c6fa36aee7 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 20 Sep 2024 14:39:28 +0300
Subject: [PATCH 24/71] raycast: 1.82.5 -> 1.83.1

Changelog: https://www.raycast.com/changelog/1-83-0
---
 pkgs/os-specific/darwin/raycast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix
index 5d27c9a72cac..3c384ee359ef 100644
--- a/pkgs/os-specific/darwin/raycast/default.nix
+++ b/pkgs/os-specific/darwin/raycast/default.nix
@@ -11,12 +11,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raycast";
-  version = "1.82.5";
+  version = "1.83.1";
 
   src = fetchurl {
     name = "Raycast.dmg";
     url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
-    hash = "sha256-wqX61h6iF3yhZePLvtGL+gsGOrRIwZ1w2i1F7M52bsw=";
+    hash = "sha256-3EJAhjMEkQgyGMshCeV7Ci//tflEbhcOOFIdAsTIfh0=";
   };
 
   dontPatch = true;

From f6814d36b6fe463f3b68c81f59ae27d9a9d917ad Mon Sep 17 00:00:00 2001
From: DataHearth <dev@antoine-langlois.net>
Date: Fri, 20 Sep 2024 12:46:18 +0200
Subject: [PATCH 25/71] rio: 0.1.13 -> 0.1.15

---
 pkgs/applications/terminal-emulators/rio/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix
index 5c867120aa94..00c1e9aa1ffb 100644
--- a/pkgs/applications/terminal-emulators/rio/default.nix
+++ b/pkgs/applications/terminal-emulators/rio/default.nix
@@ -55,16 +55,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "rio";
-  version = "0.1.13";
+  version = "0.1.15";
 
   src = fetchFromGitHub {
     owner = "raphamorim";
     repo = "rio";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-JrmjQjKpL9di66z4IYTcWhNBL0CgalqOhQgVDpkh6b0=";
+    rev = "v${version}";
+    hash = "sha256-aLqWhRaNqi7gMDxBITLU/Tj//h7RURycLSZXOOq83As=";
   };
 
-  cargoHash = "sha256-KWdkpQY1F0RU3JViFrXEp+JW6xdaofEmp2SlAkzPMPU=";
+  cargoHash = "sha256-4nqJbz2vauO4jRuUSDjBV1pVrAJMhIP4+eUwS1+GecU=";
 
   nativeBuildInputs = [
     ncurses

From b4a068397a9b02d28d499c9c7ea49e2924e4d4ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 13:45:13 +0000
Subject: [PATCH 26/71] diswall: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/applications/networking/diswall/default.nix b/pkgs/applications/networking/diswall/default.nix
index 6afe93fee471..76be6f3f75ce 100644
--- a/pkgs/applications/networking/diswall/default.nix
+++ b/pkgs/applications/networking/diswall/default.nix
@@ -5,20 +5,20 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "diswall";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "dis-works";
     repo = "diswall-rs";
     rev = "v${version}";
-    sha256 = "sha256-HoIkozwRV0xz14mOTM4BXDzPShRAp8a3quhvtWwnQ2I=";
+    sha256 = "sha256-iZln/cgYGSFYwXDvD1CkQdfwBDXj897X1il1m5HfFJs=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [
     Security
   ];
 
-  cargoHash = "sha256-KA2hwaEhY2G+H4+xVgin6xhmRfnGcJBBWj9xWtD0h9I=";
+  cargoHash = "sha256-5PPI7fnG71xkQCY+OLLk83XZb+4DoPX81bAtKRp/H8U=";
 
   doCheck = false;
 

From 12edf528bef9b3a09a3744613ef66770563e3132 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 15:02:55 +0000
Subject: [PATCH 27/71] hyprland-activewindow: 1.0.3 -> 1.0.4

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

diff --git a/pkgs/by-name/hy/hyprland-activewindow/package.nix b/pkgs/by-name/hy/hyprland-activewindow/package.nix
index 82de87a7ccb9..13f9920c23f5 100644
--- a/pkgs/by-name/hy/hyprland-activewindow/package.nix
+++ b/pkgs/by-name/hy/hyprland-activewindow/package.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hyprland-activewindow";
-  version = "1.0.3";
+  version = "1.0.4";
 
   src = fetchFromGitHub {
     owner = "FieldOfClay";
     repo = "hyprland-activewindow";
     rev = "v${version}";
-    hash = "sha256-kRxA2DLbbABPJFwv/L7yeNJ8eqNUbuV6U/PB5iJNoAw=";
+    hash = "sha256-2pIOZMBPqheqAz3YEvHP2ehLXhqIclOXXAFa5EXXZPk=";
   };
 
-  cargoHash = "sha256-s3Ho0+OzuLuWqFvaBu9NLXoasByHSuun9eJGAAISOJc=";
+  cargoHash = "sha256-5JhNBgP6VQX7TVPaFUGvknDWrn6F06Mm3mGfuajg9yQ=";
 
   meta = with lib; {
     description = "Multi-monitor-aware Hyprland workspace widget helper";

From 811016f570bd0b13536c1b32ee3e5f9dd9b1ed17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 15:15:53 +0000
Subject: [PATCH 28/71] faustPhysicalModeling: 2.74.6 -> 2.75.7

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

diff --git a/pkgs/applications/audio/faustPhysicalModeling/default.nix b/pkgs/applications/audio/faustPhysicalModeling/default.nix
index 8b00ca2252a6..1b7372d5d904 100644
--- a/pkgs/applications/audio/faustPhysicalModeling/default.nix
+++ b/pkgs/applications/audio/faustPhysicalModeling/default.nix
@@ -1,13 +1,13 @@
 { stdenv, lib, fetchFromGitHub, faust2jaqt, faust2lv2 }:
 stdenv.mkDerivation rec {
   pname = "faustPhysicalModeling";
-  version = "2.74.6";
+  version = "2.75.7";
 
   src = fetchFromGitHub {
     owner = "grame-cncm";
     repo = "faust";
     rev = version;
-    sha256 = "sha256-2qgw7pauDZBvEb5iySNiq2Fq+T+qw+AjVTwxaSQ9Eko=";
+    sha256 = "sha256-j5Qg/H7aMBZ6A8gh6v6+ICxmCZ7ya2tVF2FjueVtvHo=";
   };
 
   buildInputs = [ faust2jaqt faust2lv2 ];

From 8acb91888a909cf41d13932c25e3e52c2a6d16b3 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Fri, 20 Sep 2024 19:49:49 +0300
Subject: [PATCH 29/71] arc-browser: 1.58.1-53264 -> 1.61.0-53949

Changelog: https://arc.net/e/2ADFA60D-66AF-42A2-9775-DA1E8152D050
---
 pkgs/by-name/ar/arc-browser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index 017cac0157b6..ec1c9db783fb 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arc-browser";
-  version = "1.58.1-53264";
+  version = "1.61.0-53949";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-xX2Wn0bhPeTn/flz5GiDJ8pnQj3HREc8wqJDlsjI+hs=";
+    hash = "sha256-FuRWi4+vPt31bd3muMDEn3Fu20h9oWEd1XuPJU7W1OU=";
   };
 
   nativeBuildInputs = [ undmg ];

From 95d652982dfbe623802834d2ded878c92c113613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 20 Sep 2024 11:25:46 +0200
Subject: [PATCH 30/71] nix-enter: add meta

---
 pkgs/by-name/ni/nixos-enter/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixos-enter/package.nix b/pkgs/by-name/ni/nixos-enter/package.nix
index a548eed4092e..38fe2de663fd 100644
--- a/pkgs/by-name/ni/nixos-enter/package.nix
+++ b/pkgs/by-name/ni/nixos-enter/package.nix
@@ -24,5 +24,11 @@ substituteAll {
     installManPage ${./nixos-enter.8}
   '';
 
-  meta.mainProgram = "nixos-enter";
+  meta = {
+    description = "Run a command in a NixOS chroot environment";
+    homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nixos-install";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "nixos-enter";
+  };
 }

From 0f6ced7fefbef98eadbdd73f57c53a316a64b061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 20 Sep 2024 11:26:25 +0200
Subject: [PATCH 31/71] nixos-install: add meta

---
 pkgs/by-name/ni/nixos-install/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixos-install/package.nix b/pkgs/by-name/ni/nixos-install/package.nix
index 0d8ee638acc1..fbe75619674e 100644
--- a/pkgs/by-name/ni/nixos-install/package.nix
+++ b/pkgs/by-name/ni/nixos-install/package.nix
@@ -29,5 +29,10 @@ substituteAll {
     installManPage ${./nixos-install.8}
   '';
 
-  meta.mainProgram = "nixos-install";
+  meta = {
+    description = "Install bootloader and NixOS";
+    homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/by-name/ni/nixos-install";
+    license = lib.licenses.mit;
+    mainProgram = "nixos-install";
+  };
 }

From 3115573f29eee151e6a72481c3fc89bb2e328350 Mon Sep 17 00:00:00 2001
From: Quag <quaggy@gmail.com>
Date: Sun, 24 Sep 2023 15:32:35 -0700
Subject: [PATCH 32/71] zutty: init at 0.16-unstable-2024-08-18

---
 maintainers/maintainer-list.nix    |  6 +++
 nixos/tests/terminal-emulators.nix |  2 +
 pkgs/by-name/zu/zutty/package.nix  | 59 ++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+)
 create mode 100644 pkgs/by-name/zu/zutty/package.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b231c46fa684..fdfc664c7cb1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17754,6 +17754,12 @@
     githubId = 17805516;
     name = "Rohan Rao";
   };
+  rolfschr = {
+    email = "rolf.schr@posteo.de";
+    github = "rolfschr";
+    githubId = 1188465;
+    name = "Rolf Schröder";
+  };
   rollf = {
     email = "rolf.schroeder@limbus-medtec.com";
     github = "rollf";
diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix
index 3cf99fe7fc2f..5972885ae48f 100644
--- a/nixos/tests/terminal-emulators.nix
+++ b/nixos/tests/terminal-emulators.nix
@@ -117,6 +117,8 @@ let tests = {
       xfce4-terminal.pkg = p: p.xfce.xfce4-terminal;
 
       xterm.pkg = p: p.xterm;
+
+      zutty.pkg = p: p.zutty;
     };
 in mapAttrs (name: { pkg, executable ? name, cmd ? "SHELL=$command ${executable}", colourTest ? true, pinkValue ? "#FF0087", kill ? false }: makeTest
 {
diff --git a/pkgs/by-name/zu/zutty/package.nix b/pkgs/by-name/zu/zutty/package.nix
new file mode 100644
index 000000000000..4a931a1c4eb0
--- /dev/null
+++ b/pkgs/by-name/zu/zutty/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchgit,
+  pkg-config,
+  freetype,
+  wafHook,
+  python3,
+  libXmu,
+  glew,
+  ucs-fonts,
+  nixosTests,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zutty";
+  version = "0.16-unstable-2024-08-18";
+
+  src = fetchgit {
+    url = "https://git.hq.sig7.se/zutty.git";
+    rev = "04b2ca3b3aaa070c41583247f8112c31b6003886"; # 20240818
+    hash = "sha256-izUbn2B3RqIIOW9tuL7DFLqJdektCftxnpQssJMYxC8=";
+  };
+
+  postPatch =
+    let
+      fontpaths = [
+        "/run/current-system/sw/share/X11/fonts" # available if fonts.fontDir.enable = true
+        "${ucs-fonts}/share/fonts"
+      ];
+    in
+    ''
+      substituteInPlace src/options.h \
+        --replace-fail /usr/share/fonts ${builtins.concatStringsSep ":" fontpaths}
+    '';
+
+  nativeBuildInputs = [
+    pkg-config
+    wafHook
+    python3
+  ];
+
+  buildInputs = [
+    freetype
+    libXmu
+    glew
+  ];
+
+  passthru = {
+    tests = lib.optionalAttrs stdenv.isLinux { default = nixosTests.terminal-emulators.zutty; };
+  };
+
+  meta = {
+    homepage = "https://tomscii.sig7.se/zutty/";
+    description = "X terminal emulator rendering through OpenGL ES Compute Shaders";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.rolfschr ];
+    platforms = lib.platforms.linux;
+  };
+})

From 1bef9437362c8fd63c2901ddfb8512872f03943e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 18:23:44 +0000
Subject: [PATCH 33/71] prometheus-elasticsearch-exporter: 1.7.0 -> 1.8.0

---
 .../pr/prometheus-elasticsearch-exporter/package.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
index 7c8718e81b3f..45df05913b85 100644
--- a/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-elasticsearch-exporter/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "elasticsearch_exporter";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "elasticsearch_exporter";
     rev = "v${version}";
-    hash = "sha256-a70huy6J0Ob9LkLuCSVZqJChTo/4cPufbkq1v/QcKE4=";
+    hash = "sha256-8WPDBlp6ftBmY/lu0wuuvs3A9KAzEM/A6RqSvYYLm7w=";
   };
 
-  vendorHash = "sha256-5uQfeDRi7EMcUCkXdbNlSe1IUpv6e5ueXtZ4C5SWAmw=";
+  vendorHash = "sha256-jbPFxwrXWwxPamMnbBxFvGBrt38YG7N5fTweAYULEYQ=";
 
   meta = with lib; {
     description = "Elasticsearch stats exporter for Prometheus";

From 80cafc9988961a538e76ed2e484d6f7d5fff4ae2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 18:48:42 +0000
Subject: [PATCH 34/71] protoc-gen-connect-go: 1.16.2 -> 1.17.0

---
 pkgs/development/tools/protoc-gen-connect-go/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/development/tools/protoc-gen-connect-go/default.nix
index 516aa5927b97..36a5bb15e35c 100644
--- a/pkgs/development/tools/protoc-gen-connect-go/default.nix
+++ b/pkgs/development/tools/protoc-gen-connect-go/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "protoc-gen-connect-go";
-  version = "1.16.2";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "connectrpc";
     repo = "connect-go";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Ej8ya2sKtRVRQdMr63YpPbqzwtV0ZsqO+7xiif3gFr0=";
+    hash = "sha256-GF7J21Y27LmKuDjuk2omQo2xV5pDo2GQXyu9SLwG0fs=";
   };
 
-  vendorHash = "sha256-OKTRxExgJ2V3736fIVvQX3FEa44jGngwCi2D/uk0F58=";
+  vendorHash = "sha256-j5T1Ho3K0kPZOo5LA6Md06W/gF6DmEElGt9BvceBtTo=";
 
   subPackages = [
     "cmd/protoc-gen-connect-go"

From 00cc352311acebecf0cbb487edc3e27388853281 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 20 Sep 2024 19:51:32 +0200
Subject: [PATCH 35/71] hoppscotch: fix meta.changelog

---
 pkgs/by-name/ho/hoppscotch/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix
index c37211ee91a0..5fd0dfe9e150 100644
--- a/pkgs/by-name/ho/hoppscotch/package.nix
+++ b/pkgs/by-name/ho/hoppscotch/package.nix
@@ -4,7 +4,6 @@
   fetchurl,
   appimageTools,
   undmg,
-  copyDesktopItems,
 }:
 
 let
@@ -39,7 +38,7 @@ let
     '';
     homepage = "https://hoppscotch.com";
     downloadPage = "https://hoppscotch.com/downloads";
-    changelog = "https://github.com/hoppscotch/hoppscotch/releases/tag/2024.8.1";
+    changelog = "https://github.com/hoppscotch/hoppscotch/releases/tag/20${lib.head (lib.splitString "-" version)}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ DataHearth ];
     mainProgram = "hoppscotch";

From 4b585d516135533526d01f3f344bc48f01b27500 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 19:10:23 +0000
Subject: [PATCH 36/71] python312Packages.python-gnupg: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix
index 32c9ccd33a9a..77a960e88958 100644
--- a/pkgs/development/python-modules/python-gnupg/default.nix
+++ b/pkgs/development/python-modules/python-gnupg/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "python-gnupg";
-  version = "0.5.2";
+  version = "0.5.3";
 
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AdgBOTHJ+j9Fgku+pwVMA9bhHyWKcufghuFo28uRhUw=";
+    hash = "sha256-KQ2N25zWPfls/pKEubJl8Z/W4UXlWC3Fj9cnHwJtCkc=";
   };
 
   postPatch = ''

From c04358b80fa153912d99e1a39f10ea1ed1887f0c Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Wed, 28 Aug 2024 21:00:30 +0200
Subject: [PATCH 37/71] python3Packages.notobuilder: init at
 0-unstable-2024-08-03

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

diff --git a/pkgs/development/python-modules/notobuilder/default.nix b/pkgs/development/python-modules/notobuilder/default.nix
new file mode 100644
index 000000000000..0dce59c8d16b
--- /dev/null
+++ b/pkgs/development/python-modules/notobuilder/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  setuptools,
+  setuptools-scm,
+  fonttools,
+  ufomerge,
+  fontmake,
+  glyphslib,
+  ttfautohint-py,
+  ufo2ft,
+  gftools,
+  fontbakery,
+  diffenator2,
+  chevron,
+  sh,
+  ninja,
+}:
+
+buildPythonPackage {
+  pname = "notobuilder";
+  version = "0-unstable-2024-08-03";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "notofonts";
+    repo = "notobuilder";
+    rev = "d7bcfc8e5c5ee9b273e7b1eeb2dd6d619da68c33";
+    hash = "sha256-1tdHbJixd1s1grGh0enqXhp+u5TEic6/W88X/f8vagM=";
+  };
+
+  postPatch = ''
+    substituteInPlace Lib/notobuilder/__main__.py \
+      --replace-fail '"ninja"' '"${lib.getExe ninja}"'
+  '';
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    fonttools
+    ufomerge
+    fontmake
+    glyphslib
+    ttfautohint-py
+    ufo2ft
+    gftools
+    fontbakery
+    diffenator2
+    chevron
+    sh
+  ] ++ gftools.optional-dependencies.qa;
+
+  pythonImportsCheck = [
+    "notobuilder"
+    "notoqa"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Python module for building Noto fonts";
+    homepage = "https://github.com/notofonts/notobuilder";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ jopejoe1 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a78ea9ad7291..7eef728999cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9294,6 +9294,8 @@ self: super: with self; {
     inherit (pkgs) notmuch;
   };
 
+  notobuilder = callPackage ../development/python-modules/notobuilder { };
+
   nototools = callPackage ../development/python-modules/nototools { };
 
   notus-scanner = callPackage ../development/python-modules/notus-scanner { };

From 74437ce96449c0140f0d8cfda31cd17b10d16f43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 20 Sep 2024 21:55:13 +0000
Subject: [PATCH 38/71] rasm: 2.2.6 -> 2.2.7

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

diff --git a/pkgs/by-name/ra/rasm/package.nix b/pkgs/by-name/ra/rasm/package.nix
index e31e4c0354a2..787de21b448c 100644
--- a/pkgs/by-name/ra/rasm/package.nix
+++ b/pkgs/by-name/ra/rasm/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rasm";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchFromGitHub {
     owner = "EdouardBERGE";
     repo = "rasm";
     rev = "v${version}";
-    hash = "sha256-DX+i9G+HK0Iek6qmsYQFbieHUtRazKkcyv+gYQ748X0=";
+    hash = "sha256-X3GEQJdfw4znqVyUIi2teUkQZpOV5X1EpF5Zob9g8PI=";
   };
 
   # by default the EXEC variable contains `rasm.exe`

From f8066873a68a432166eb5f79736bc5b5038e2862 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 00:02:28 +0000
Subject: [PATCH 39/71] mob: 5.1.1 -> 5.2.0

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

diff --git a/pkgs/applications/misc/mob/default.nix b/pkgs/applications/misc/mob/default.nix
index 9fa453cacdbf..8a74624d616a 100644
--- a/pkgs/applications/misc/mob/default.nix
+++ b/pkgs/applications/misc/mob/default.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "mob";
-  version = "5.1.1";
+  version = "5.2.0";
 
   src = fetchFromGitHub {
     owner = "remotemobprogramming";
     repo = "mob";
     rev = "v${version}";
-    hash = "sha256-+v48znHCfu2qBFB0JhYT1vnce0wSHMULTlwaLv0237Q=";
+    hash = "sha256-LktA7GMOWAl12PRLgX8VTyYZ00sh6AHsgw9NdyjAJ64=";
   };
 
   vendorHash = null;

From bebbda4ec3d5ef6ac9af28ac240c713e651b70eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 00:03:53 +0000
Subject: [PATCH 40/71] python312Packages.mozart-api: 3.4.1.8.7 -> 3.4.1.8.8

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

diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix
index 25fa7c882b49..053b922c148b 100644
--- a/pkgs/development/python-modules/mozart-api/default.nix
+++ b/pkgs/development/python-modules/mozart-api/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "mozart-api";
-  version = "3.4.1.8.7";
+  version = "3.4.1.8.8";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "mozart_api";
     inherit version;
-    hash = "sha256-RMhc/rFXFGt2GBium3NlPg3TYIMxvpEAb1Hqj1oVqpM=";
+    hash = "sha256-Lonv9f7/FSEdisKOuL+T1gKbxpog22DcNZTaK9L84Mc=";
   };
 
   build-system = [ poetry-core ];

From c231f3caeb5486756ed3e1b64fe2a1990d24ac8d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 01:04:29 +0000
Subject: [PATCH 41/71] twilio-cli: 5.22.0 -> 5.22.1

---
 pkgs/development/tools/twilio-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix
index 465fbcfa8c8e..defdf1ed92b4 100644
--- a/pkgs/development/tools/twilio-cli/default.nix
+++ b/pkgs/development/tools/twilio-cli/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "twilio-cli";
-  version = "5.22.0";
+  version = "5.22.1";
 
   src = fetchzip {
     url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-6VGxfbo/44iOuG5VG1uevgeRrgP0ThyrNts1iR5VLCk=";
+    hash = "sha256-PxAc9sC44HBcm3Zv5dsN35cTZWfSYP0F46PFZ48xhrw=";
   };
 
   buildInputs = [ nodejs-slim ];

From 82ec791318c97e87a7a68c7dfc79dcb0fbd4c80b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 01:20:40 +0000
Subject: [PATCH 42/71] cirrus-cli: 0.126.0 -> 0.126.1

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

diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix
index d28d85c99a0c..a77ea92b6521 100644
--- a/pkgs/by-name/ci/cirrus-cli/package.nix
+++ b/pkgs/by-name/ci/cirrus-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "cirrus-cli";
-  version = "0.126.0";
+  version = "0.126.1";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-9HjZI3MQBI24Ut3CI2hMOlRtZExoJtMXfd/HmSSICx0=";
+    hash = "sha256-A894AUmsJjCCvN6cI2qoTPyOeQx6h2uukzxtlvWZVn8=";
   };
 
   vendorHash = "sha256-PecNBlSoo8WN2FKXN/UpkqpqbsJkOPHKILy76YWgNlw=";

From 3fdf8a8f68b98831a068736d220f920dca4460ed Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Thu, 25 Jul 2024 13:28:29 -0700
Subject: [PATCH 43/71] sourceHighlight: fix tests with llvm

---
 pkgs/tools/text/source-highlight/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix
index 07ed74f91c73..715b9d8ce91d 100644
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/pkgs/tools/text/source-highlight/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchpatch, fetchurl, boost, updateAutotoolsGnuConfigScriptsHook }:
+{ lib, stdenv, fetchpatch, fetchurl, boost, updateAutotoolsGnuConfigScriptsHook, llvmPackages }:
 
 stdenv.mkDerivation rec {
   pname = "source-highlight";
@@ -46,7 +46,10 @@ stdenv.mkDerivation rec {
   # necessary to build on FreeBSD native pending inclusion of
   # https://git.savannah.gnu.org/cgit/config.git/commit/?id=e4786449e1c26716e3f9ea182caf472e4dbc96e0
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
-  buildInputs = [ boost ];
+  buildInputs = [ boost ]
+    ++ lib.optional (stdenv.targetPlatform.useLLVM or false) (llvmPackages.compiler-rt.override {
+      doFakeLibgcc = true;
+    });
 
   configureFlags = [
     "--with-boost=${boost.out}"
@@ -71,4 +74,7 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [ SuperSandro2000 ];
   };
+} // lib.optionalAttrs (stdenv.targetPlatform.useLLVM or false) {
+  # Force linking to "libgcc" so tests pass
+  NIX_CFLAGS_COMPILE = "-lgcc";
 }

From 7bc8fbcbe0b0abb8e2e4d1028dab3aefb11b8e30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 02:15:45 +0000
Subject: [PATCH 44/71] python312Packages.great-tables: 0.11.0 -> 0.11.1

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

diff --git a/pkgs/development/python-modules/great-tables/default.nix b/pkgs/development/python-modules/great-tables/default.nix
index 14f242ed0683..bca215084c16 100644
--- a/pkgs/development/python-modules/great-tables/default.nix
+++ b/pkgs/development/python-modules/great-tables/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "great-tables";
-  version = "0.11.0";
+  version = "0.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "great-tables";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ccS//fSFa6sytKv0izRxIdnHoNICr7P90Eo+v62RmVA=";
+    hash = "sha256-IlukgnhOT8NF1WxRJCnNuNEI31DByWoNzbk/x458atA=";
   };
 
   build-system = [

From 634d74deb091761622f03aaeaf30d6a32cfa9ef9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 03:02:58 +0000
Subject: [PATCH 45/71] ytarchive: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/tools/misc/ytarchive/default.nix b/pkgs/tools/misc/ytarchive/default.nix
index fd26b0f5d28c..9f16680759a2 100644
--- a/pkgs/tools/misc/ytarchive/default.nix
+++ b/pkgs/tools/misc/ytarchive/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ytarchive";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "Kethsar";
     repo = "ytarchive";
     rev = "v${version}";
-    hash = "sha256-mQgpwuTIEHeDv/PzBHpK1sraxFj8Ef3y8vN5bLw5E94=";
+    hash = "sha256-Y1frd7iJJuNFvLL/C1Y+RrqYC/1LF7P3J9rkPAThp9c=";
   };
 
-  vendorHash = "sha256-sjwQ/zEYJRkeWUDB7TzV8z+kET8lVRnQkXYbZbcUeHY=";
+  vendorHash = "sha256-hVAiWJKdDQB+6UlARFdjVATCMiGrEK2US62KAxCquvU=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 

From e13ecfb12f4672a11a7831aba44d9a150f17a4d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Fri, 20 Sep 2024 21:30:21 -0700
Subject: [PATCH 46/71] python312Packages.pysmlight: 0.1.0 -> 0.1.1

Diff: https://github.com/smlight-tech/pysmlight/compare/refs/tags/v0.1.0...v0.1.1

Changelog: https://github.com/smlight-tech/pysmlight/releases/tag/v0.1.1
---
 pkgs/development/python-modules/pysmlight/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysmlight/default.nix b/pkgs/development/python-modules/pysmlight/default.nix
index b0d7af3acaef..d334e099908f 100644
--- a/pkgs/development/python-modules/pysmlight/default.nix
+++ b/pkgs/development/python-modules/pysmlight/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pysmlight";
-  version = "0.1.0";
+  version = "0.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "smlight-tech";
     repo = "pysmlight";
     rev = "refs/tags/v${version}";
-    hash = "sha256-qpE2bKEuCfhELKtYEstGAL5h01J/8qH3mE5c0LQtaHE=";
+    hash = "sha256-b1f17jOEDQFtwBJa2zhbI8j2rRoMNJy8/WsVWanf6BI=";
   };
 
   build-system = [ poetry-core ];

From 6b72d38b8a3733d52d1e0d90cb2e771128809b6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=97=8D+85CD?= <50108258+kwaa@users.noreply.github.com>
Date: Sat, 21 Sep 2024 13:00:02 +0800
Subject: [PATCH 47/71] cloud-utils: 0.32 -> 0.33

---
 pkgs/tools/misc/cloud-utils/default.nix | 52 ++++++++++++++++++-------
 1 file changed, 38 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/cloud-utils/default.nix b/pkgs/tools/misc/cloud-utils/default.nix
index 32ef248ca854..294746ae9a36 100644
--- a/pkgs/tools/misc/cloud-utils/default.nix
+++ b/pkgs/tools/misc/cloud-utils/default.nix
@@ -1,26 +1,46 @@
-{ lib, stdenv, fetchurl, makeWrapper
-, gawk, gnused, util-linux, file
-, wget, python3, qemu-utils
-, e2fsprogs, cdrkit
-, gptfdisk }:
-
+{ lib
+, stdenv
+, fetchFromGitHub
+, gitUpdater
+, makeWrapper
+, gawk
+, gnused
+, util-linux
+, file
+, wget
+, python3
+, qemu-utils
+, e2fsprogs
+, cdrkit
+, gptfdisk
+}:
 let
   # according to https://packages.debian.org/sid/cloud-image-utils + https://packages.debian.org/sid/admin/cloud-guest-utils
   guestDeps = [
-    e2fsprogs gptfdisk gawk gnused util-linux
+    e2fsprogs
+    gptfdisk
+    gawk
+    gnused
+    util-linux
   ];
   binDeps = guestDeps ++ [
-    wget file qemu-utils cdrkit
+    wget
+    file
+    qemu-utils
+    cdrkit
   ];
-in stdenv.mkDerivation rec {
+in
+stdenv.mkDerivation rec {
   # NOTICE: if you bump this, make sure to run
   # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops
   # growpart is needed in initrd in nixos/system/boot/grow-partition.nix
   pname = "cloud-utils";
-  version = "0.32";
-  src = fetchurl {
-    url = "https://launchpad.net/cloud-utils/trunk/${version}/+download/cloud-utils-${version}.tar.gz";
-    sha256 = "0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk";
+  version = "0.33";
+  src = fetchFromGitHub {
+    owner = "canonical";
+    repo = "cloud-utils";
+    rev = "refs/tags/${version}";
+    hash = "sha256-YqfkmYclPZu6Mc2bFYxtiuH7uvfa3V4YlD0aHuKn1hw=";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ python3 ];
@@ -29,7 +49,7 @@ in stdenv.mkDerivation rec {
   # $guest output contains all executables needed for cloud-init and $out the rest + $guest
   # This is similar to debian's package split into cloud-image-utils and cloud-guest-utils
   # The reason is to reduce the closure size
-  outputs = [ "out" "guest"];
+  outputs = [ "out" "guest" ];
 
   postFixup = ''
     moveToOutput bin/ec2metadata $guest
@@ -48,7 +68,11 @@ in stdenv.mkDerivation rec {
 
   dontBuild = true;
 
+  passthru.updateScript = gitUpdater { };
+
   meta = with lib; {
+    description = "Useful set of utilities for interacting with a cloud";
+    homepage = "https://github.com/canonical/cloud-utils";
     platforms = platforms.unix;
     license = licenses.gpl3;
   };

From f33dd654c669600569e67121717fc0db53e4ac7d Mon Sep 17 00:00:00 2001
From: liam-murphy14 <liam.murphy137@gmail.com>
Date: Fri, 20 Sep 2024 22:15:53 -0700
Subject: [PATCH 48/71] python3Packages.nodriver: refactor to use fetchPypi

---
 pkgs/development/python-modules/nodriver/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/nodriver/default.nix b/pkgs/development/python-modules/nodriver/default.nix
index b91737a2d745..9a19815af991 100644
--- a/pkgs/development/python-modules/nodriver/default.nix
+++ b/pkgs/development/python-modules/nodriver/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
+  fetchPypi,
   pythonOlder,
   deprecated,
   mss,
@@ -9,16 +9,14 @@
   setuptools,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "nodriver";
   version = "0.37";
   pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "ultrafunkamsterdam";
-    repo = "nodriver";
-    rev = "1bb6003c7f0db4d3ec05fdf3fc8c8e0804260103";
-    hash = "sha256-8q+9RX9ugrT6/fjlTSIecVcR6lPdZwg7nF+cSTSLlEc=";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-FF/E0hNZvo26Urtgw+nBH5Rmk7UCaqAsckCLDMuCK0A=";
   };
 
   disabled = pythonOlder "3.9";

From 1ded0c6d933a9049ff219c643c669bb936459458 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 05:16:59 +0000
Subject: [PATCH 49/71] esphome: 2024.8.3 -> 2024.9.0

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

diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix
index 59649a048e6d..54664196d2c3 100644
--- a/pkgs/tools/misc/esphome/default.nix
+++ b/pkgs/tools/misc/esphome/default.nix
@@ -21,14 +21,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2024.8.3";
+  version = "2024.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-AeiEP1D2u2u8LMNKdBvoA2M3uO6Z9oSG2i5HwGin80M=";
+    hash = "sha256-K28H2kbfiebJfW31CF3M+Vi823wFPWNk6qLPlSaljkk=";
   };
 
   nativeBuildInputs = with python.pkgs; [

From 926d62deca61e490803ce74fc3143883455c8d56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 05:41:32 +0000
Subject: [PATCH 50/71] graphw00f: 1.1.17 -> 1.1.18

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

diff --git a/pkgs/tools/security/graphw00f/default.nix b/pkgs/tools/security/graphw00f/default.nix
index da0bd6b2a3ad..0cbe774695b4 100644
--- a/pkgs/tools/security/graphw00f/default.nix
+++ b/pkgs/tools/security/graphw00f/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "graphw00f";
-  version = "1.1.17";
+  version = "1.1.18";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "dolevf";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-VeTFwn4PANGoW2Cb/IJ1KJb4YkjjDpaU7DLv0YwRwDU=";
+    hash = "sha256-gM6I3TLCuVKO1dTHl2jrXtmLOv29pTqrV18nGW5TYFY=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 52cd0dbdf0bc06671c18c38160cd2d177bd3e5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sat, 21 Sep 2024 01:31:16 -0600
Subject: [PATCH 51/71] davix: unvendor rapidjson

Unbreaks build after gcc 14 update

https://hydra.nixos.org/build/273238461
---
 pkgs/tools/networking/davix/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix
index d3ae2cd02c27..13926c2d7d62 100644
--- a/pkgs/tools/networking/davix/default.nix
+++ b/pkgs/tools/networking/davix/default.nix
@@ -10,6 +10,7 @@
 , libuuid
 , curl
 , gsoap
+, rapidjson
 , Security
 , enableTools ? true
   # Use libcurl instead of libneon
@@ -30,10 +31,11 @@ stdenv.mkDerivation rec {
   pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy";
   nativeBuildInputs = [ cmake pkg-config python3 ];
   buildInputs = [
-    openssl
-    libxml2
     boost
     curl
+    libxml2
+    openssl
+    rapidjson
   ]
   ++ lib.optional stdenv.isDarwin Security
   ++ lib.optional (!stdenv.isDarwin) libuuid

From a50a0a046aad4019307554e0e2ca0fdae3567cd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 08:05:48 +0000
Subject: [PATCH 52/71] s3scanner: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/by-name/s3/s3scanner/package.nix b/pkgs/by-name/s3/s3scanner/package.nix
index b28c021240d1..dde1360b2bfc 100644
--- a/pkgs/by-name/s3/s3scanner/package.nix
+++ b/pkgs/by-name/s3/s3scanner/package.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "s3scanner";
-  version = "3.1.0";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "sa7mon";
     repo = "s3scanner";
     rev = "v${version}";
-    hash = "sha256-yQymMtXQam/PMNZMBeKWtDtdrFikjvE/Nh5K61NUaYI=";
+    hash = "sha256-RS/+m/snJIm8OxCgvh/Bn1u9ghvRgS8tYvy1v1DV02I=";
   };
 
   ldflags = [ "-s -w" ];
 
-  vendorHash = "sha256-Y7eIvZIUtp+sOENiaG/eliZEl41qTHN2k3vJCXsjlIw=";
+  vendorHash = "sha256-Ik5B01QnbhFQISAY3Bdb1g85Din+Ifcg1vbGZcbb1OY=";
 
   # Requires networking
   doCheck = false;

From 2cab2f6c426008a232deacb2c7c78c470f68b8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sat, 21 Sep 2024 02:12:53 -0600
Subject: [PATCH 53/71] gle: format

---
 pkgs/development/libraries/gle/default.nix | 33 +++++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix
index f9ef65197bd5..dbdc4d699233 100644
--- a/pkgs/development/libraries/gle/default.nix
+++ b/pkgs/development/libraries/gle/default.nix
@@ -1,8 +1,32 @@
-{lib, stdenv, fetchurl, libglut, libX11, libXt, libXmu, libXi, libXext, libGL, libGLU}:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  libglut,
+  libX11,
+  libXt,
+  libXmu,
+  libXi,
+  libXext,
+  libGL,
+  libGLU,
+}:
+
 stdenv.mkDerivation rec {
   pname = "gle";
   version = "3.1.0";
-  buildInputs = [libGLU libGL libglut libX11 libXt libXmu libXi libXext];
+
+  buildInputs = [
+    libGLU
+    libGL
+    libglut
+    libX11
+    libXt
+    libXmu
+    libXi
+    libXext
+  ];
+
   src = fetchurl {
     urls = [
       "mirror://sourceforge/project/gle/gle/gle-${version}/gle-${version}.tar.gz"
@@ -10,10 +34,11 @@ stdenv.mkDerivation rec {
       ];
     sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw";
   };
+
   meta = {
     description = "Tubing and extrusion library";
-    license = lib.licenses.gpl2 ;
-    maintainers = [lib.maintainers.raskin];
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.raskin ];
     platforms = lib.platforms.linux;
   };
 }

From 3c28377e51cf5af8fb9166443711e7305f2861bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sat, 21 Sep 2024 02:06:41 -0600
Subject: [PATCH 54/71] =?UTF-8?q?gle:=203.1.0=20=E2=86=92=203.1.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/gle/default.nix | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix
index dbdc4d699233..b1b064fdb17c 100644
--- a/pkgs/development/libraries/gle/default.nix
+++ b/pkgs/development/libraries/gle/default.nix
@@ -1,7 +1,8 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoreconfHook,
   libglut,
   libX11,
   libXt,
@@ -14,7 +15,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gle";
-  version = "3.1.0";
+  version = "3.1.2";
 
   buildInputs = [
     libGLU
@@ -27,12 +28,15 @@ stdenv.mkDerivation rec {
     libXext
   ];
 
-  src = fetchurl {
-    urls = [
-      "mirror://sourceforge/project/gle/gle/gle-${version}/gle-${version}.tar.gz"
-      "https://www.linas.org/gle/pub/gle-${version}.tar.gz"
-      ];
-    sha256 = "09zs1di4dsssl9k322nzildvf41jwipbzhik9p43yb1bcfsp92nw";
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  src = fetchFromGitHub {
+    owner = "linas";
+    repo = "glextrusion";
+    rev = "refs/tags/${pname}-${version}";
+    sha256 = "sha256-yvCu0EOwxOMN6upeHX+C2sIz1YVjjB/320g+Mf24S6g=";
   };
 
   meta = {

From 7273a5d35af744cf7b19dc0daa6daa8eb33544e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 08:29:54 +0000
Subject: [PATCH 55/71] jx: 3.10.154 -> 3.10.155

---
 pkgs/applications/networking/cluster/jx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix
index 9d71c2070708..8d8ad429cb2a 100644
--- a/pkgs/applications/networking/cluster/jx/default.nix
+++ b/pkgs/applications/networking/cluster/jx/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "jx";
-  version = "3.10.154";
+  version = "3.10.155";
 
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
     rev = "v${version}";
-    sha256 = "sha256-BrCErGsHJq9h2AijwhG8MwCxXGJ9sCDpCOqazsmi8hs=";
+    sha256 = "sha256-9dRYPeVWwJCbxkjPVI0B4FLaFNHRyGIdKd/ubJbP9tI=";
   };
 
   vendorHash = "sha256-AIaZVkWdNj1Vsrv2k4B5lLE0lOFuiTD7lwS/DikmC14=";

From 48991cb789c49641d985153d73f89d3995789783 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 21 Sep 2024 10:57:40 +0200
Subject: [PATCH 56/71] graphw00f: refactor

---
 pkgs/tools/security/graphw00f/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/security/graphw00f/default.nix b/pkgs/tools/security/graphw00f/default.nix
index 0cbe774695b4..bb5b3a36d56d 100644
--- a/pkgs/tools/security/graphw00f/default.nix
+++ b/pkgs/tools/security/graphw00f/default.nix
@@ -1,6 +1,7 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -10,14 +11,12 @@ python3.pkgs.buildPythonApplication rec {
 
   src = fetchFromGitHub {
     owner = "dolevf";
-    repo = pname;
+    repo = "graphw00f";
     rev = "refs/tags/${version}";
     hash = "sha256-gM6I3TLCuVKO1dTHl2jrXtmLOv29pTqrV18nGW5TYFY=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
-    requests
-  ];
+  dependencies = with python3.pkgs; [ requests ];
 
   installPhase = ''
     runHook preInstall
@@ -28,11 +27,12 @@ python3.pkgs.buildPythonApplication rec {
 
     runHook postInstall
   '';
+
   meta = with lib; {
     description = "GraphQL Server Engine Fingerprinting utility";
-    mainProgram = "graphw00f";
     homepage = "https://github.com/dolevf/graphw00f";
     license = licenses.bsd3;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "graphw00f";
   };
 }

From 1f24291cc975207a21bdce471834ae94068541f1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 21 Sep 2024 11:01:14 +0200
Subject: [PATCH 57/71] gitleaks: 8.19.0 -> 8.19.2

Diff: https://github.com/zricethezav/gitleaks/compare/refs/tags/v8.19.0...v8.19.2

Changelog: https://github.com/zricethezav/gitleaks/releases/tag/v8.19.2
---
 pkgs/tools/security/gitleaks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/gitleaks/default.nix b/pkgs/tools/security/gitleaks/default.nix
index 3d1a186b14be..d8aee0952d68 100644
--- a/pkgs/tools/security/gitleaks/default.nix
+++ b/pkgs/tools/security/gitleaks/default.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "gitleaks";
-  version = "8.19.0";
+  version = "8.19.2";
 
   src = fetchFromGitHub {
     owner = "zricethezav";
     repo = "gitleaks";
     rev = "refs/tags/v${version}";
-    hash = "sha256-p4Va6qI/khXetN1ECRvFrsza5vqPVKKoUobhERWxDhI=";
+    hash = "sha256-VC8Bf6jcxXdBws7IParh9Srk34JiYVx5Tk2LLilrNJ4=";
   };
 
   vendorHash = "sha256-DgCtWRo5KNuFCdhGJvzoH2v8n7mIxNk8eHyZFPUPo24=";

From 67830228e3edad48eeb43174dd913908a5d03e15 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 21 Sep 2024 11:06:47 +0200
Subject: [PATCH 58/71] python312Packages.pysqueezebox: 0.8.1 -> 0.9.2

Diff: https://github.com/rajlaud/pysqueezebox/compare/refs/tags/v0.8.1...v0.9.2
---
 pkgs/development/python-modules/pysqueezebox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix
index 9c485b2c0de5..7e518109291d 100644
--- a/pkgs/development/python-modules/pysqueezebox/default.nix
+++ b/pkgs/development/python-modules/pysqueezebox/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pysqueezebox";
-  version = "0.8.1";
+  version = "0.9.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "rajlaud";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-d+8/YyA6tTBxZpiR9pu/5K1v0FOiSrR7RZ7MMBwOzdA=";
+    hash = "sha256-gHv1dSWU0erzesneodMhCR1LQYutpDVithZ5M1lgk3I=";
   };
 
   propagatedBuildInputs = [ aiohttp ];

From e5d8c15cbfce36194e8516b633556cfe60e1d0b2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 21 Sep 2024 11:09:11 +0200
Subject: [PATCH 59/71] python312Packages.pysqueezebox: refactor

---
 .../python-modules/pysqueezebox/default.nix      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix
index 7e518109291d..06b755717601 100644
--- a/pkgs/development/python-modules/pysqueezebox/default.nix
+++ b/pkgs/development/python-modules/pysqueezebox/default.nix
@@ -1,29 +1,36 @@
 {
   lib,
   aiohttp,
+  async-timeout,
   buildPythonPackage,
   fetchFromGitHub,
   pytest-asyncio,
   pytestCheckHook,
   pythonAtLeast,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pysqueezebox";
   version = "0.9.2";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "rajlaud";
-    repo = pname;
+    repo = "pysqueezebox";
     rev = "refs/tags/v${version}";
     hash = "sha256-gHv1dSWU0erzesneodMhCR1LQYutpDVithZ5M1lgk3I=";
   };
 
-  propagatedBuildInputs = [ aiohttp ];
+  build-system = [ setuptools ];
+
+  dependencies = [
+    async-timeout
+    aiohttp
+  ];
 
   nativeCheckInputs = [
     pytest-asyncio
@@ -45,6 +52,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Asynchronous library to control Logitech Media Server";
     homepage = "https://github.com/rajlaud/pysqueezebox";
+    changelog = "https://github.com/rajlaud/pysqueezebox/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ nyanloutre ];
   };

From de35272571ce04dc78923507e8aab377278cd665 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 11:46:49 +0000
Subject: [PATCH 60/71] sgt-puzzles: 20240909.53ceb98 -> 20240911.cd97968

---
 pkgs/games/sgt-puzzles/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index 0f82433fad6c..866cc83942d9 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "sgt-puzzles";
-  version = "20240909.53ceb98";
+  version = "20240911.cd97968";
 
   src = fetchurl {
     url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz";
-    hash = "sha256-BRbTm6dnogzkAVYZjQ8/YTEB4A8edNa2yymR3KlqAE4=";
+    hash = "sha256-l1QDe/PRQnaEBenR3NcSthtDzCcQ1ZOGz6RCserGfjs=";
   };
 
   sgt-puzzles-menu = fetchurl {

From 110d71aa98372d68513578ebde4e4312c947db95 Mon Sep 17 00:00:00 2001
From: Brendan Golden <git@brendan.ie>
Date: Wed, 28 Aug 2024 13:45:28 +0100
Subject: [PATCH 61/71] sieve-editor-gui: init at 0.6.1

A GUI sieve script editor that integrates with Thunderbird.
Previously it used to be a plugin for Thunderbird but got split off into its own thing, partly because plugin support waned in thunderbird as well as to make it better cross platform compatible.
---
 pkgs/by-name/si/sieve-editor-gui/package.nix | 70 ++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 pkgs/by-name/si/sieve-editor-gui/package.nix

diff --git a/pkgs/by-name/si/sieve-editor-gui/package.nix b/pkgs/by-name/si/sieve-editor-gui/package.nix
new file mode 100644
index 000000000000..ee374f835169
--- /dev/null
+++ b/pkgs/by-name/si/sieve-editor-gui/package.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  electron,
+  nodejs_20,
+  nodePackages,
+  makeDesktopItem,
+  copyDesktopItems,
+}:
+buildNpmPackage rec {
+  pname = "sieve-editor-gui";
+  version = "0.6.1-unstable-2024-01-06";
+  nodejs = nodejs_20;
+
+  src = fetchFromGitHub {
+    owner = "thsmi";
+    repo = "sieve";
+    rev = "5879679ed8d16a34af760ee56bfec16a1a322b4e";
+    hash = "sha256-wl6dwKoGan+DrpXk2p1fD/QN/C2qT4h/g3N73gF8sOI=";
+  };
+
+  npmDepsHash = "sha256-a2I9csxFZJekG1uCOHqdRaLLi5v/BLTz4SU+uBd855A=";
+
+  nativeBuildInputs = [
+    electron
+    copyDesktopItems
+    nodePackages.gulp
+  ];
+
+  dontNpmBuild = true;
+
+  buildPhase = ''
+    gulp -LLLL app:package
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mv build/ $out
+    runHook postInstall
+  '';
+
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
+  };
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "sieve-editor-gui";
+      exec = "sieve-editor-gui";
+      desktopName = "Sieve Editor";
+      icon = "sieve-editor-gui";
+      categories = [ "Utility" ];
+    })
+  ];
+
+  postInstall = ''
+    makeWrapper ${lib.getExe electron} $out/bin/sieve-editor-gui \
+      --add-flags $out/electron/resources/main_esm.js
+  '';
+
+  meta = {
+    description = "Activate, edit, delete and add Sieve scripts with a convenient interface";
+    homepage = "https://github.com/thsmi/sieve";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ Silver-Golden ];
+    platforms = lib.platforms.linux;
+    mainProgram = "sieve-editor-gui";
+  };
+}

From cb4e198872c8925d13b4e45608caa3b952dc4cf2 Mon Sep 17 00:00:00 2001
From: hellodword <46193371+hellodword@users.noreply.github.com>
Date: Sat, 21 Sep 2024 12:21:57 +0000
Subject: [PATCH 62/71] sing-box: 1.9.5 -> 1.9.6

---
 pkgs/tools/networking/sing-box/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix
index fb0e8600c459..8d034c1d118c 100644
--- a/pkgs/tools/networking/sing-box/default.nix
+++ b/pkgs/tools/networking/sing-box/default.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "sing-box";
-  version = "1.9.5";
+  version = "1.9.6";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-yPIlijm5NBtBT2+bkS0sJvPb/Lwqq/ZOcl5g848BvRA=";
+    hash = "sha256-A9FfATNCS3UaW6YLORIApsgj0VK2jPyg+Ha2gcq6Keo=";
   };
 
   vendorHash = "sha256-/lp+3mPkGMABpvnxqpuC/7NiKrmcEWYQ80Wb7Ng1eBI=";

From 5dcbab6b74178077d22f7f716d1080d45e999439 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 21 Sep 2024 12:25:25 +0300
Subject: [PATCH 63/71] nixos/tools: continue cleanup

- remove with lib
- shuffle some things around for readability
- add separate options for each tool
---
 nixos/modules/installer/tools/tools.nix | 328 ++++++++++++------------
 1 file changed, 170 insertions(+), 158 deletions(-)

diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 3c5816858a46..0a01d6bb9b69 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -3,8 +3,6 @@
 
 { config, lib, pkgs, ... }:
 
-with lib;
-
 let
   makeProg = args: pkgs.substituteAll (args // {
     dir = "bin";
@@ -17,11 +15,6 @@ let
     '';
   });
 
-  inherit (pkgs) nixos-build-vms;
-
-  nixos-install = pkgs.nixos-install.override { nix = config.nix.package; };
-  nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package.out; };
-
   nixos-generate-config = makeProg {
     name = "nixos-generate-config";
     src = ./nixos-generate-config.pl;
@@ -34,8 +27,6 @@ let
     manPage = ./manpages/nixos-generate-config.8;
   };
 
-  inherit (pkgs) nixos-option;
-
   nixos-version = makeProg {
     name = "nixos-version";
     src = ./nixos-version.sh;
@@ -44,23 +35,141 @@ let
     inherit (config.system) configurationRevision;
     json = builtins.toJSON ({
       nixosVersion = config.system.nixos.version;
-    } // optionalAttrs (config.system.nixos.revision != null) {
+    } // lib.optionalAttrs (config.system.nixos.revision != null) {
       nixpkgsRevision = config.system.nixos.revision;
-    } // optionalAttrs (config.system.configurationRevision != null) {
+    } // lib.optionalAttrs (config.system.configurationRevision != null) {
       configurationRevision = config.system.configurationRevision;
     });
     manPage = ./manpages/nixos-version.8;
   };
 
-  inherit (pkgs) nixos-enter;
+  nixos-install = pkgs.nixos-install.override { nix = config.nix.package; };
+  nixos-rebuild = pkgs.nixos-rebuild.override { nix = config.nix.package; };
+
+  defaultConfigTemplate = ''
+    # Edit this configuration file to define what should be installed on
+    # your system. Help is available in the configuration.nix(5) man page, on
+    # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
+
+    { config, lib, pkgs, ... }:
+
+    {
+      imports =
+        [ # Include the results of the hardware scan.
+          ./hardware-configuration.nix
+        ];
+
+    $bootLoaderConfig
+      # networking.hostName = "nixos"; # Define your hostname.
+      # Pick only one of the below networking options.
+      # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
+      # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
+
+      # Set your time zone.
+      # time.timeZone = "Europe/Amsterdam";
+
+      # Configure network proxy if necessary
+      # networking.proxy.default = "http://user:password\@proxy:port/";
+      # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
+
+      # Select internationalisation properties.
+      # i18n.defaultLocale = "en_US.UTF-8";
+      # console = {
+      #   font = "Lat2-Terminus16";
+      #   keyMap = "us";
+      #   useXkbConfig = true; # use xkb.options in tty.
+      # };
+
+    $xserverConfig
+
+    $desktopConfiguration
+      # Configure keymap in X11
+      # services.xserver.xkb.layout = "us";
+      # services.xserver.xkb.options = "eurosign:e,caps:escape";
+
+      # Enable CUPS to print documents.
+      # services.printing.enable = true;
+
+      # Enable sound.
+      # hardware.pulseaudio.enable = true;
+      # OR
+      # services.pipewire = {
+      #   enable = true;
+      #   pulse.enable = true;
+      # };
+
+      # Enable touchpad support (enabled default in most desktopManager).
+      # services.libinput.enable = true;
+
+      # Define a user account. Don't forget to set a password with ‘passwd’.
+      # users.users.alice = {
+      #   isNormalUser = true;
+      #   extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
+      #   packages = with pkgs; [
+      #     firefox
+      #     tree
+      #   ];
+      # };
+
+      # List packages installed in system profile. To search, run:
+      # \$ nix search wget
+      # environment.systemPackages = with pkgs; [
+      #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+      #   wget
+      # ];
+
+      # Some programs need SUID wrappers, can be configured further or are
+      # started in user sessions.
+      # programs.mtr.enable = true;
+      # programs.gnupg.agent = {
+      #   enable = true;
+      #   enableSSHSupport = true;
+      # };
+
+      # List services that you want to enable:
+
+      # Enable the OpenSSH daemon.
+      # services.openssh.enable = true;
+
+      # Open ports in the firewall.
+      # networking.firewall.allowedTCPPorts = [ ... ];
+      # networking.firewall.allowedUDPPorts = [ ... ];
+      # Or disable the firewall altogether.
+      # networking.firewall.enable = false;
+
+      # Copy the NixOS configuration file and link it from the resulting system
+      # (/run/current-system/configuration.nix). This is useful in case you
+      # accidentally delete configuration.nix.
+      # system.copySystemConfiguration = true;
+
+      # This option defines the first version of NixOS you have installed on this particular machine,
+      # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
+      #
+      # Most users should NEVER change this value after the initial install, for any reason,
+      # even if you've upgraded your system to a new NixOS release.
+      #
+      # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
+      # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
+      # to actually do that.
+      #
+      # This value being lower than the current NixOS release does NOT mean your system is
+      # out of date, out of support, or vulnerable.
+      #
+      # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
+      # and migrated your data accordingly.
+      #
+      # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
+      system.stateVersion = "${config.system.nixos.release}"; # Did you read the comment?
+
+    }
+  '';
 in
-
 {
-
   options.system.nixos-generate-config = {
-    configuration = mkOption {
+    configuration = lib.mkOption {
       internal = true;
-      type = types.str;
+      type = lib.types.str;
+      default = defaultConfigTemplate;
       description = ''
         The NixOS module that `nixos-generate-config`
         saves to `/etc/nixos/configuration.nix`.
@@ -74,9 +183,9 @@ in
       '';
     };
 
-    desktopConfiguration = mkOption {
+    desktopConfiguration = lib.mkOption {
       internal = true;
-      type = types.listOf types.lines;
+      type = lib.types.listOf lib.types.lines;
       default = [];
       description = ''
         Text to preseed the desktop configuration that `nixos-generate-config`
@@ -92,9 +201,9 @@ in
     };
   };
 
-  options.system.disableInstallerTools = mkOption {
+  options.system.disableInstallerTools = lib.mkOption {
     internal = true;
-    type = types.bool;
+    type = lib.types.bool;
     default = false;
     description = ''
       Disable nixos-rebuild, nixos-generate-config, nixos-installer
@@ -104,145 +213,48 @@ in
     '';
   };
 
-  config = lib.mkMerge [ (lib.mkIf (config.nix.enable && !config.system.disableInstallerTools) {
+  imports = let
+    mkToolModule = { name, package ? pkgs.${name} }: { config, ... }: {
+      options.system.tools.${name}.enable = lib.mkEnableOption "${name} script" // {
+        default = true;
+        internal = true;
+      };
 
-    system.nixos-generate-config.configuration = mkDefault ''
-      # Edit this configuration file to define what should be installed on
-      # your system. Help is available in the configuration.nix(5) man page, on
-      # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
-
-      { config, lib, pkgs, ... }:
-
-      {
-        imports =
-          [ # Include the results of the hardware scan.
-            ./hardware-configuration.nix
-          ];
-
-      $bootLoaderConfig
-        # networking.hostName = "nixos"; # Define your hostname.
-        # Pick only one of the below networking options.
-        # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-        # networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
-
-        # Set your time zone.
-        # time.timeZone = "Europe/Amsterdam";
-
-        # Configure network proxy if necessary
-        # networking.proxy.default = "http://user:password\@proxy:port/";
-        # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-        # Select internationalisation properties.
-        # i18n.defaultLocale = "en_US.UTF-8";
-        # console = {
-        #   font = "Lat2-Terminus16";
-        #   keyMap = "us";
-        #   useXkbConfig = true; # use xkb.options in tty.
-        # };
-
-      $xserverConfig
-
-      $desktopConfiguration
-        # Configure keymap in X11
-        # services.xserver.xkb.layout = "us";
-        # services.xserver.xkb.options = "eurosign:e,caps:escape";
-
-        # Enable CUPS to print documents.
-        # services.printing.enable = true;
-
-        # Enable sound.
-        # hardware.pulseaudio.enable = true;
-        # OR
-        # services.pipewire = {
-        #   enable = true;
-        #   pulse.enable = true;
-        # };
-
-        # Enable touchpad support (enabled default in most desktopManager).
-        # services.libinput.enable = true;
-
-        # Define a user account. Don't forget to set a password with ‘passwd’.
-        # users.users.alice = {
-        #   isNormalUser = true;
-        #   extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-        #   packages = with pkgs; [
-        #     firefox
-        #     tree
-        #   ];
-        # };
-
-        # List packages installed in system profile. To search, run:
-        # \$ nix search wget
-        # environment.systemPackages = with pkgs; [
-        #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-        #   wget
-        # ];
-
-        # Some programs need SUID wrappers, can be configured further or are
-        # started in user sessions.
-        # programs.mtr.enable = true;
-        # programs.gnupg.agent = {
-        #   enable = true;
-        #   enableSSHSupport = true;
-        # };
-
-        # List services that you want to enable:
-
-        # Enable the OpenSSH daemon.
-        # services.openssh.enable = true;
-
-        # Open ports in the firewall.
-        # networking.firewall.allowedTCPPorts = [ ... ];
-        # networking.firewall.allowedUDPPorts = [ ... ];
-        # Or disable the firewall altogether.
-        # networking.firewall.enable = false;
-
-        # Copy the NixOS configuration file and link it from the resulting system
-        # (/run/current-system/configuration.nix). This is useful in case you
-        # accidentally delete configuration.nix.
-        # system.copySystemConfiguration = true;
-
-        # This option defines the first version of NixOS you have installed on this particular machine,
-        # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
-        #
-        # Most users should NEVER change this value after the initial install, for any reason,
-        # even if you've upgraded your system to a new NixOS release.
-        #
-        # This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
-        # so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
-        # to actually do that.
-        #
-        # This value being lower than the current NixOS release does NOT mean your system is
-        # out of date, out of support, or vulnerable.
-        #
-        # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
-        # and migrated your data accordingly.
-        #
-        # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
-        system.stateVersion = "${config.system.nixos.release}"; # Did you read the comment?
-
-      }
-    '';
-
-    environment.systemPackages =
-      [ nixos-build-vms
-        nixos-install
-        nixos-rebuild
-        nixos-generate-config
-        nixos-option
-        nixos-version
-        nixos-enter
-      ];
-
-    documentation.man.man-db.skipPackages = [ nixos-version ];
-
-  })
-
-  # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally.
-  ({
-    system.build = {
-      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-enter;
+      config = lib.mkIf config.system.tools.${name}.enable {
+        environment.systemPackages = [ package ];
+      };
     };
-  })];
+  in [
+    (mkToolModule { name = "nixos-build-vms"; })
+    (mkToolModule { name = "nixos-enter"; })
+    (mkToolModule { name = "nixos-generate-config"; package = nixos-generate-config; })
+    (mkToolModule { name = "nixos-install"; package = nixos-install; })
+    (mkToolModule { name = "nixos-option"; })
+    (mkToolModule { name = "nixos-rebuild"; package = nixos-rebuild; })
+    (mkToolModule { name = "nixos-version"; package = nixos-version; })
+  ];
 
+  config = lib.mkMerge [
+    (lib.mkIf config.system.disableInstallerTools {
+      system.tools = {
+        nixos-build-vms.enable = false;
+        nixos-enter.enable = false;
+        nixos-generate-config.enable = false;
+        nixos-install.enable = false;
+        nixos-option.enable = false;
+        nixos-rebuild.enable = false;
+        nixos-version.enable = false;
+      };
+    })
+    {
+      documentation.man.man-db.skipPackages = [ nixos-version ];
+
+      # These may be used in auxiliary scripts (ie not part of toplevel), so they are defined unconditionally.
+      system.build = {
+        inherit nixos-generate-config nixos-install nixos-rebuild;
+        nixos-option = lib.warn "Accessing nixos-option through `config.system.build` is deprecated, use `pkgs.nixos-option` instead." pkgs.nixos-option;
+        nixos-enter = lib.warn "Accessing nixos-enter through `config.system.build` is deprecated, use `pkgs.nixos-enter` instead." pkgs.nixos-enter;
+      };
+    }
+  ];
 }

From 1f9fc918cedc855bd106696d9b2038a0dbdcf52c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 21 Sep 2024 12:44:04 +0300
Subject: [PATCH 64/71] treewide: use pkgs.nixos-enter instead of
 config.system.build.nixos-enter

---
 nixos/doc/manual/development/testing-installer.chapter.md | 4 ++--
 nixos/lib/make-disk-image.nix                             | 2 +-
 nixos/lib/make-multi-disk-zfs-image.nix                   | 2 +-
 nixos/lib/make-single-disk-zfs-image.nix                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/development/testing-installer.chapter.md b/nixos/doc/manual/development/testing-installer.chapter.md
index 2eaa01614920..92c759a8559a 100644
--- a/nixos/doc/manual/development/testing-installer.chapter.md
+++ b/nixos/doc/manual/development/testing-installer.chapter.md
@@ -6,13 +6,13 @@ tedious, so here is a quick way to see if the installer works properly:
 ```ShellSession
 # mount -t tmpfs none /mnt
 # nixos-generate-config --root /mnt
-$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install
+$ nix-build '<nixpkgs>' -A nixos-install
 # ./result/bin/nixos-install
 ```
 
 To start a login shell in the new NixOS installation in `/mnt`:
 
 ```ShellSession
-$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter
+$ nix-build '<nixpkgs>' -A nixos-enter
 # ./result/bin/nixos-enter
 ```
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 208eaf59dc5c..a943edb7b574 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -321,7 +321,7 @@ let format' = format; in let
       e2fsprogs
       lkl
       config.system.build.nixos-install
-      config.system.build.nixos-enter
+      nixos-enter
       nix
       systemdMinimal
     ]
diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix
index 077bb8f22707..1dac232e2b8c 100644
--- a/nixos/lib/make-multi-disk-zfs-image.nix
+++ b/nixos/lib/make-multi-disk-zfs-image.nix
@@ -124,7 +124,7 @@ let
 
   tools = lib.makeBinPath (
     with pkgs; [
-      config.system.build.nixos-enter
+      nixos-enter
       config.system.build.nixos-install
       dosfstools
       e2fsprogs
diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix
index 585fa93b7fa0..e37b79797dca 100644
--- a/nixos/lib/make-single-disk-zfs-image.nix
+++ b/nixos/lib/make-single-disk-zfs-image.nix
@@ -112,7 +112,7 @@ let
 
   tools = lib.makeBinPath (
     with pkgs; [
-      config.system.build.nixos-enter
+      nixos-enter
       config.system.build.nixos-install
       dosfstools
       e2fsprogs

From 790e9c6e7b324b25549fe621777bd33e2cd7c3ce Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Sat, 21 Sep 2024 15:26:11 +0200
Subject: [PATCH 65/71] tippecanoe: 2.62.2 -> 2.62.3

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

diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix
index b73fcdeafb02..f869dd452325 100644
--- a/pkgs/by-name/ti/tippecanoe/package.nix
+++ b/pkgs/by-name/ti/tippecanoe/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tippecanoe";
-  version = "2.62.2";
+  version = "2.62.3";
 
   src = fetchFromGitHub {
     owner = "felt";
     repo = "tippecanoe";
     rev = finalAttrs.version;
-    hash = "sha256-x8+UJZYdtiwYAoMgJeDKtXbrT0A96jRu5pbkA6WOce4=";
+    hash = "sha256-1rj2nfp18EZL9aSiUs1ASJnAqHyM9lztsfkak7Ipy6o=";
   };
 
   buildInputs = [ sqlite zlib ];

From 5a9dcfd10ac62bfe826624aaf193a2c79d91b6ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <Mic92@users.noreply.github.com>
Date: Sat, 21 Sep 2024 17:26:29 +0200
Subject: [PATCH 66/71] nix-serve: 77ffa33d8 -> 0.0.2 (#343319)

nix-serve: make sure that we use the same perl for bindings and nix-serve
---
 pkgs/tools/package-management/nix-serve/default.nix | 2 +-
 pkgs/tools/package-management/nix/nix-perl.nix      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index acff56e8c015..f8e181e9fa21 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -3,7 +3,6 @@
 , fetchFromGitHub
 , bzip2
 , nixVersions
-, perl
 , makeWrapper
 , nixosTests
 , fetchpatch
@@ -13,6 +12,7 @@ let
   rev = "77ffa33d83d2c7c6551c5e420e938e92d72fec24";
   sha256 = "sha256-MJRdVO2pt7wjOu5Hk0eVeNbk5bK5+Uo/Gh9XfO4OlMY=";
   nix = nixVersions.nix_2_24;
+  inherit (nix.perl-bindings) perl;
 in
 
 stdenv.mkDerivation {
diff --git a/pkgs/tools/package-management/nix/nix-perl.nix b/pkgs/tools/package-management/nix/nix-perl.nix
index f80ce5698a2e..4c93fcef564a 100644
--- a/pkgs/tools/package-management/nix/nix-perl.nix
+++ b/pkgs/tools/package-management/nix/nix-perl.nix
@@ -87,4 +87,6 @@ in stdenv.mkDerivation (finalAttrs: {
   ];
 
   preConfigure = "export NIX_STATE_DIR=$TMPDIR";
+
+  passthru = { inherit perl; };
 })

From aff940f761c4bbcdde9a5aad3321979cc9ffc5a3 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sun, 8 Sep 2024 02:32:31 +0200
Subject: [PATCH 67/71] conserve: 23.11.0 -> 24.8.0

Diff: https://github.com/sourcefrog/conserve/compare/v23.11.0...v24.8.0
---
 pkgs/tools/backup/conserve/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/conserve/default.nix b/pkgs/tools/backup/conserve/default.nix
index a3f4dc3f734c..12250ee2b6fd 100644
--- a/pkgs/tools/backup/conserve/default.nix
+++ b/pkgs/tools/backup/conserve/default.nix
@@ -5,16 +5,23 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "conserve";
-  version = "23.11.0";
+  version = "24.8.0";
 
   src = fetchFromGitHub {
     owner = "sourcefrog";
     repo = "conserve";
     rev = "v${version}";
-    hash = "sha256-Ck2+3etwfZiDMZHzI2hIBuUKn7L0ZTGEe9yJjXjoRIM=";
+    hash = "sha256-rdZTx0wFFtWt3EcpvWHY6m+8TEHEj53vhVpdRp5wbos=";
   };
 
-  cargoHash = "sha256-tMj1icGNTFpouts1TE6BIiABexV3vmOW9r5Y/7ynUMM=";
+  cargoHash = "sha256-IP9x3n5RdI+TKOhMBWEfw9P2CROcC0SmEsmMVaXjiDE=";
+
+  checkFlags = [
+    # expected to panic if unix user has no secondary group,
+    # which is the case in the nix sandbox
+    "--skip=test_fixtures::test::arbitrary_secondary_group_is_found"
+    "--skip=chgrp_reported_as_changed"
+  ];
 
   meta = with lib; {
     description = "Robust portable backup tool in Rust";

From af46c5cc90be31e0d672c0c7bedfc79814258e70 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sat, 21 Sep 2024 18:07:05 +0200
Subject: [PATCH 68/71] skia: 124-unstable-2024-05-22 ->
 129-unstable-2024-09-18

---
 .../sk/skia/export-SkFontMgr_New_FontConfig.patch   | 12 ------------
 pkgs/by-name/sk/skia/package.nix                    | 13 +++----------
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch

diff --git a/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch b/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch
deleted file mode 100644
index 1609e7347fde..000000000000
--- a/pkgs/by-name/sk/skia/export-SkFontMgr_New_FontConfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
-index 7d6fd62..2cca01d 100644
---- a/src/ports/SkFontMgr_fontconfig.cpp
-+++ b/src/ports/SkFontMgr_fontconfig.cpp
-@@ -16,6 +16,7 @@
- #include "include/core/SkString.h"
- #include "include/core/SkTypeface.h"
- #include "include/core/SkTypes.h"
-+#include "include/ports/SkFontMgr_fontconfig.h"
- #include "include/private/base/SkDebug.h"
- #include "include/private/base/SkMutex.h"
- #include "include/private/base/SkTArray.h"
diff --git a/pkgs/by-name/sk/skia/package.nix b/pkgs/by-name/sk/skia/package.nix
index 6c70e99bb2fb..a6972b628bd8 100644
--- a/pkgs/by-name/sk/skia/package.nix
+++ b/pkgs/by-name/sk/skia/package.nix
@@ -26,22 +26,15 @@ stdenv.mkDerivation (finalAttrs: {
   # Version from https://skia.googlesource.com/skia/+/refs/heads/main/RELEASE_NOTES.md
   # or https://chromiumdash.appspot.com/releases
   # plus date of the tip of the corresponding chrome/m$version branch
-  version = "124-unstable-2024-05-22";
+  version = "129-unstable-2024-09-18";
 
   src = fetchgit {
     url = "https://skia.googlesource.com/skia.git";
     # Tip of the chrome/m$version branch
-    rev = "a747f7ea37db6ea3871816dbaf2eb41b5776c826";
-    hash = "sha256-zHfv4OZK/nVJc2rl+dBSCc4f6qndpAKcFZtThw06+LY=";
+    rev = "dda581d538cb6532cda841444e7b4ceacde01ec9";
+    hash = "sha256-NZiZFsABebugszpYsBusVlTYnYda+xDIpT05cZ8Jals=";
   };
 
-  patches = [
-    # Package ladybird uses SkFontMgr_New_FontConfig, but this version of skia
-    # does not export it.
-    # https://skia.googlesource.com/skia/+/4bf56844d4a661d7317882cc545ecd978715a11e%5E!/?
-    ./export-SkFontMgr_New_FontConfig.patch
-  ];
-
   postPatch = ''
     # System zlib detection bug workaround
     substituteInPlace BUILD.gn \

From 05958843a85c20c8d9cbdc081064571f1a35d0af Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sat, 21 Sep 2024 18:07:29 +0200
Subject: [PATCH 69/71] ladybird: 0-unstable-2024-09-08 ->
 0-unstable-2024-09-21

---
 .../applications/networking/browsers/ladybird/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix
index be22339417bd..c77e70f01aa1 100644
--- a/pkgs/applications/networking/browsers/ladybird/default.nix
+++ b/pkgs/applications/networking/browsers/ladybird/default.nix
@@ -10,6 +10,7 @@
 , cmake
 , ninja
 , pkg-config
+, curl
 , libavif
 , libjxl
 , libwebp
@@ -57,13 +58,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladybird";
-  version = "0-unstable-2024-09-08";
+  version = "0-unstable-2024-09-21";
 
   src = fetchFromGitHub {
     owner = "LadybirdWebBrowser";
     repo = "ladybird";
-    rev = "8d6f36f8d6c0aea0253df8c84746f8c99bf79b4d";
-    hash = "sha256-EB26SAh9eckpq/HrO8O+PivMMmLpFtCdCNkOJcLQvZw=";
+    rev = "44f672bacf6779f6bbe5972d84e210f953f14598";
+    hash = "sha256-Qku6W1kETOXQh8Kxn0wabe0Xc4gkpxrGbDFwIik34eY=";
   };
 
   postPatch = ''
@@ -133,6 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = with qt6Packages; [
+    curl
     ffmpeg
     libavif
     libjxl

From aa1433bbe50da30269e90fab9f3a9c96eb2233cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 12:00:35 +0000
Subject: [PATCH 70/71] organicmaps: 2024.08.16-5 -> 2024.09.08-7

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

diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix
index 06014f6f479d..c95ccd139acf 100644
--- a/pkgs/applications/misc/organicmaps/default.nix
+++ b/pkgs/applications/misc/organicmaps/default.nix
@@ -30,13 +30,13 @@ let
   };
 in stdenv.mkDerivation rec {
   pname = "organicmaps";
-  version = "2024.08.16-5";
+  version = "2024.09.08-7";
 
   src = fetchFromGitHub {
     owner = "organicmaps";
     repo = "organicmaps";
     rev = "${version}-android";
-    hash = "sha256-qVLeZySVdncHEwA0aTiScGJ/RAIpvVVVse3O/sXLto0=";
+    hash = "sha256-X1dmk1IBjqM2AUVkvSDNZyVtV5Ens9ninZvMvsRc334=";
     fetchSubmodules = true;
   };
 

From 9357f4f23713673f310988025d9dc261c20e70c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 11:26:42 +0000
Subject: [PATCH 71/71] plexRaw: 1.40.5.8921-836b34c27 -> 1.41.0.8992-8463ad060

---
 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 8bb35851774f..bd2ee5b23da7 100644
--- a/pkgs/servers/plex/raw.nix
+++ b/pkgs/servers/plex/raw.nix
@@ -12,16 +12,16 @@
 # server, and the FHS userenv and corresponding NixOS module should
 # automatically pick up the changes.
 stdenv.mkDerivation rec {
-  version = "1.40.5.8921-836b34c27";
+  version = "1.41.0.8992-8463ad060";
   pname = "plexmediaserver";
 
   # Fetch the source
   src = if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_arm64.deb";
-    sha256 = "1jf47mmwvvj4c64ksbvnx3g14x7qn9h08p3xbixha7nk4nhxpqcv";
+    sha256 = "1hv8bg2cy1s6cn1yp5s75kma5v2fr3dncbslglvpn3srba1xafgz";
   } else fetchurl {
     url = "https://downloads.plex.tv/plex-media-server-new/${version}/debian/plexmediaserver_${version}_amd64.deb";
-    sha256 = "0fia2d6gxlxv1my5031wnp3ihc3knfra1yrwadz44khh03zkvxq7";
+    sha256 = "0gwwlh47rfnayra3k8lwi794wiayl30crjjvzhqkg5zad77lkl4m";
   };
 
   outputs = [ "out" "basedb" ];