From 4a938f0428699b46a421ee973ce996acd01abb1b Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Sat, 29 Jun 2024 18:28:03 -0400
Subject: [PATCH 01/47] coc-clangd: migrate from nodePackages

---
 .../editors/vim/plugins/overrides.nix         |  7 ++++-
 pkgs/by-name/co/coc-clangd/package.nix        | 27 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 -------------
 5 files changed, 34 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-clangd/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 133200a982cc..d1a6bd5e4711 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -17,6 +17,7 @@
 , # Misc dependencies
   arrow-cpp
 , Cocoa
+, coc-clangd
 , coc-diagnostic
 , code-minimap
 , dasht
@@ -337,6 +338,11 @@
     dependencies = with self; [ nvim-cmp zsh ];
   };
 
+  coc-clangd = buildVimPlugin {
+    inherit (coc-clangd) pname version meta;
+    src = "${coc-clangd}/lib/node_modules/coc-clangd";
+  };
+
   coc-diagnostic = buildVimPlugin {
     inherit (coc-diagnostic) pname version meta;
     src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
@@ -2121,7 +2127,6 @@
   // (
   let
     nodePackageNames = [
-      "coc-clangd"
       "coc-cmake"
       "coc-css"
       "coc-docker"
diff --git a/pkgs/by-name/co/coc-clangd/package.nix b/pkgs/by-name/co/coc-clangd/package.nix
new file mode 100644
index 000000000000..032df2f18d7e
--- /dev/null
+++ b/pkgs/by-name/co/coc-clangd/package.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage {
+  pname = "coc-clangd";
+  version = "0.31.0";
+
+  src = fetchFromGitHub {
+    owner = "clangd";
+    repo = "coc-clangd";
+    # Upstream has no tagged versions
+    rev = "3a85a36f1ac08454deab1ed8d2553e0cae00cc1c";
+    hash = "sha256-uxK0nciLq4ZKFCoMJrO4dR0tuOBHYpgdZUc/KJ+JA/I=";
+  };
+
+  npmDepsHash = "sha256-93MEug2eEL/Hum+RFmXx0JYO6jUygF8QRmL5nTTFyrs=";
+
+  meta = {
+    description = "clangd extension for coc.nvim";
+    homepage = "https://github.com/clangd/coc-clangd";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 5bbe69039d84..9d522ba93339 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -68,6 +68,7 @@ mapAliases {
   castnow = pkgs.castnow; # added 2023-07-30
   inherit (pkgs) clean-css-cli; # added 2023-08-18
   inherit (pkgs) clubhouse-cli; # added 2023-08-18
+  inherit (pkgs) coc-clangd; # added 2024-06-29
   inherit (pkgs) coc-diagnostic; # added 2024-06-29
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
   coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 4a23f5a83649..a165c4234ed5 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -28,7 +28,6 @@
 , "cdk8s-cli"
 , "cdktf-cli"
 , "clipboard-cli"
-, "coc-clangd"
 , "coc-cmake"
 , "coc-css"
 , "coc-docker"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 1613637d8afb..5cc168bba0b2 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -62769,24 +62769,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-clangd = nodeEnv.buildNodePackage {
-    name = "coc-clangd";
-    packageName = "coc-clangd";
-    version = "0.31.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-clangd/-/coc-clangd-0.31.0.tgz";
-      sha512 = "4t6rVLxFrHp5L8/fSGMG1A4UEnAa41JwwczOBTnETOVQI9vYVL+PkXHCnYtx0e+yJZyCizpj/9IsbSPSDVmzag==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "clangd extension for coc.nvim";
-      homepage = "https://github.com/clangd/coc-clangd#readme";
-      license = "Apache-2.0 WITH LLVM-exception";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-cmake = nodeEnv.buildNodePackage {
     name = "coc-cmake";
     packageName = "coc-cmake";

From d0bc8f58fdf82ea7c149e7b2936bfea0ef5f9267 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 Aug 2024 09:00:16 +0000
Subject: [PATCH 02/47] syncthing-relay: 1.27.9 -> 1.27.10

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index c30bb61a410f..79a597e29097 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -13,13 +13,13 @@ let
   common = { stname, target, postInstall ? "" }:
     buildGoModule rec {
       pname = stname;
-      version = "1.27.9";
+      version = "1.27.10";
 
       src = fetchFromGitHub {
         owner = "syncthing";
         repo = "syncthing";
         rev = "v${version}";
-        hash = "sha256-9PKx5jxntG1QjDA+6XySxGahE1IrKKBl/Xk5ZaCAf5I=";
+        hash = "sha256-GcsmwdQwiwbDaTouwAX4MS61UVt5lHeCj0vGciacmK8=";
       };
 
       vendorHash = "sha256-Xv5x+/1lx8nyXw72eEHz7+qnkyZfPAnBtDRrOrD2l+g=";

From 0b76fa46e5f907345f2393ba88ab92f78d2f665c Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Thu, 15 Aug 2024 19:28:32 +0200
Subject: [PATCH 03/47] shadowsocks-rust: 1.20.3 -> 1.20.4

Changes: https://github.com/shadowsocks/shadowsocks-rust/releases/tag/v1.20.4
---
 pkgs/tools/networking/shadowsocks-rust/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix
index 7a82ea8ac524..d9c834e0820a 100644
--- a/pkgs/tools/networking/shadowsocks-rust/default.nix
+++ b/pkgs/tools/networking/shadowsocks-rust/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "shadowsocks-rust";
-  version = "1.20.3";
+  version = "1.20.4";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "shadowsocks";
     repo = pname;
-    hash = "sha256-TVD6yI/I6R2sZGdyE0JsbuN9u5e23MRQCsKpi85JEGM=";
+    hash = "sha256-UDr1/5PlK395CnWbp3eDTniltZYrFZ6raVBiqsVaCZs=";
   };
 
-  cargoHash = "sha256-4OXue0KsGxc0EOLRTdr9uTA5t1dl09YJKvavezJ/mxM=";
+  cargoHash = "sha256-xrD0vImCZwaAaoVWC/Wlj6Gvm0COwmINJdlBlud9+7Y=";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ];
 

From 9c79955b9fb55f28f0064d726fb372e98e4428ea Mon Sep 17 00:00:00 2001
From: Martin Knudsen <martin.knudsen@otto.de>
Date: Tue, 20 Aug 2024 16:28:03 +0200
Subject: [PATCH 04/47] shortcat: 0.11.0 -> 0.11.4

---
 pkgs/os-specific/darwin/shortcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/shortcat/default.nix b/pkgs/os-specific/darwin/shortcat/default.nix
index 59009fede2b2..e67e230a46b9 100644
--- a/pkgs/os-specific/darwin/shortcat/default.nix
+++ b/pkgs/os-specific/darwin/shortcat/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "shortcat";
-  version = "0.11.0";
+  version = "0.11.4";
 
   src = fetchurl {
     url = "https://files.shortcat.app/releases/v${version}/Shortcat.zip";
-    sha256 = "sha256-P8NQy9odWOD8wRHBTmaNH7OCXXvgQsMiI169KfsAABU=";
+    sha256 = "sha256-0uhAGU5y98oOLAlM7Uu4dWyK85RfNR5c8z3U7LHi8g8=";
   };
 
   sourceRoot = "Shortcat.app";

From 58d3b54da2174108a80b3f3d484d2df5a7381e9d Mon Sep 17 00:00:00 2001
From: Viacheslav Lotsmanov <lotsmanov89@gmail.com>
Date: Wed, 21 Aug 2024 14:11:52 +0300
Subject: [PATCH 05/47] =?UTF-8?q?rancher:=202.7.7=20=E2=86=92=202.9.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/applications/networking/cluster/rancher/default.nix b/pkgs/applications/networking/cluster/rancher/default.nix
index ab781a71ec7e..820cc94d9313 100644
--- a/pkgs/applications/networking/cluster/rancher/default.nix
+++ b/pkgs/applications/networking/cluster/rancher/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "rancher";
-  version = "2.7.7";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner  = "rancher";
     repo   = "cli";
     rev    = "v${version}";
-    hash   = "sha256-HgLV4iuZXkL6BOKtUul1pFuIWv09VnUSPbdrtFd6Khk=";
+    hash   = "sha256-YyNzqihoQNMmROLeD7/KOU6mTe/UMKgRwGPxCjIglDM=";
   };
 
   ldflags = [
@@ -19,7 +19,7 @@ buildGoModule rec {
     "-static"
   ];
 
-  vendorHash = "sha256-mXLZMnGJ1m5gFroJcSoE4SbVvsyuS73hfXFeWBRtUdI=";
+  vendorHash = "sha256-BvT5Awn4o8AbCSaUPLuAIsayC2oj2to4VSZpxQlKKSM=";
 
   postInstall = ''
     mv $out/bin/cli $out/bin/rancher

From 079282d04a8fd36c5f49537f7f0148f3ba7385b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 14:55:30 +0000
Subject: [PATCH 06/47] git-cliff: 2.4.0 -> 2.5.0

---
 pkgs/applications/version-management/git-cliff/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix
index 7307988693b6..5cdc41af2b6e 100644
--- a/pkgs/applications/version-management/git-cliff/default.nix
+++ b/pkgs/applications/version-management/git-cliff/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-cliff";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = "git-cliff";
     rev = "v${version}";
-    hash = "sha256-JRFd84DR0pLimAslr+LTC2N09sjOuFCXU71hRsEriOs=";
+    hash = "sha256-d6IawXBumA5ZJiigMTx4IZgOFrH5bNrbRsNHfT4Ik3w=";
   };
 
-  cargoHash = "sha256-pLbz2z+l8E/R+GffseOacKrjr6ERZf1ETh8tVQjI4TU=";
+  cargoHash = "sha256-zXcVOE+yTD4SsVNTYhXnKy6et5en9jzYXPKPVnCOixI=";
 
   # attempts to run the program on .git in src which is not deterministic
   doCheck = false;

From eaff6e79d4131635b4b1e500fc135b044c418cd3 Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Sun, 14 Jul 2024 14:14:01 -0400
Subject: [PATCH 07/47] coc-pyright: migrate from nodePackages

---
 .../editors/vim/plugins/overrides.nix         |  8 ++++-
 pkgs/by-name/co/coc-pyright/package.nix       | 27 +++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 30 -------------------
 5 files changed, 35 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-pyright/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index fe85fcf4b567..6d313a17da44 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -18,6 +18,7 @@
   arrow-cpp
 , Cocoa
 , coc-diagnostic
+, coc-pyright
 , code-minimap
 , dasht
 , deno
@@ -349,6 +350,12 @@
     src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
   };
 
+  coc-pyright = buildVimPlugin {
+    pname = "coc-pyright";
+    inherit (coc-pyright) version meta;
+    src = "${coc-pyright}/lib/node_modules/coc-pyright";
+  };
+
   coc-nginx = buildVimPlugin {
     pname = "coc-nginx";
     inherit (nodePackages."@yaegassy/coc-nginx") version meta;
@@ -2234,7 +2241,6 @@
       "coc-metals"
       "coc-pairs"
       "coc-prettier"
-      "coc-pyright"
       "coc-python"
       "coc-r-lsp"
       "coc-rls"
diff --git a/pkgs/by-name/co/coc-pyright/package.nix b/pkgs/by-name/co/coc-pyright/package.nix
new file mode 100644
index 000000000000..34bcf59b756d
--- /dev/null
+++ b/pkgs/by-name/co/coc-pyright/package.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage {
+  pname = "coc-pyright";
+  version = "1.1.371";
+
+  src = fetchFromGitHub {
+    owner = "fannheyward";
+    repo = "coc-pyright";
+    # No tagged releases, this commit corresponds to the latest release of the package.
+    rev = "d4cfda2f530622962a2a6e3ac1ddb2ad83ea2387";
+    hash = "sha256-oNixIW63DhPn2LYJ5t/R4xcReZR3W6nqqFBnCUmo/Wo=";
+  };
+
+  npmDepsHash = "sha256-cTAt02RdQbKurP6H/JWwVp+VpoIysbFt9le9R69+DL4=";
+
+  meta = {
+    description = "Pyright extension for coc.nvim";
+    homepage = "https://github.com/fannheyward/coc-pyright";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index ba7301f63c5d..47ebb3c9aaa0 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -71,6 +71,7 @@ mapAliases {
   inherit (pkgs) clubhouse-cli; # added 2023-08-18
   inherit (pkgs) coc-diagnostic; # added 2024-06-29
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
+  inherit (pkgs) coc-pyright; # added 2024-07-14
   coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
   coffee-script = pkgs.coffeescript; # added 2023-08-18
   inherit (pkgs) concurrently; # added 2024-08-05
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 1cdca49cd02f..f0c66c4c7c99 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -49,7 +49,6 @@
 , "coc-metals"
 , "coc-pairs"
 , "coc-prettier"
-, "coc-pyright"
 , "coc-python"
 , "coc-r-lsp"
 , "coc-rls"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 1a36b419534c..17b5363ea806 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -43875,15 +43875,6 @@ let
         sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==";
       };
     };
-    "pyright-1.1.373" = {
-      name = "pyright";
-      packageName = "pyright";
-      version = "1.1.373";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pyright/-/pyright-1.1.373.tgz";
-        sha512 = "ZJSjqnHbeZowUnuAiojZqCLeY1XVzRIc2GvMFFNy/z6YSyJXwChPDQL5Jl2bavTvXNO0ITRmMBVvoKCRN7cc3g==";
-      };
-    };
     "q-1.5.1" = {
       name = "q";
       packageName = "q";
@@ -63416,27 +63407,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-pyright = nodeEnv.buildNodePackage {
-    name = "coc-pyright";
-    packageName = "coc-pyright";
-    version = "1.1.371";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.371.tgz";
-      sha512 = "8vgKSjuMVpylSoHIwdzP9edeHwmjUFY+ZyBkcLQMdyjdZtEc3+6OblXS0Dm5nXosjLY/ATc+w+38ITIssqm76g==";
-    };
-    dependencies = [
-      sources."pyright-1.1.373"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Pyright extension for coc.nvim, static type checker for Python";
-      homepage = "https://github.com/fannheyward/coc-pyright#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-python = nodeEnv.buildNodePackage {
     name = "coc-python";
     packageName = "coc-python";

From ad56f28d301073ecf5a5948555176fb9b4f1e22e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 Aug 2024 13:01:57 +0000
Subject: [PATCH 08/47] emptty: 0.12.1 -> 0.13.0

---
 pkgs/applications/display-managers/emptty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/display-managers/emptty/default.nix b/pkgs/applications/display-managers/emptty/default.nix
index eb25c1b10905..de14859c983f 100644
--- a/pkgs/applications/display-managers/emptty/default.nix
+++ b/pkgs/applications/display-managers/emptty/default.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "emptty";
-  version = "0.12.1";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "tvrzna";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-9qNAQBmcFKPpJ+AqfOy3emA1fvqI/XaT39KwI5fpXHU=";
+    hash = "sha256-xZfR4sn20fDaTNAxuxVflpr+8AFg5Z7vesO7P8Jxw6A=";
   };
 
   buildInputs = [ pam libX11 ];

From 1d5acdc4f4268607ced81c111a5383b9f38003ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 Aug 2024 23:28:02 +0000
Subject: [PATCH 09/47] python312Packages.pefile: 2023.2.7 -> 2024.8.26

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

diff --git a/pkgs/development/python-modules/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix
index c5eadd8e5cd1..cd8a45b9a0c4 100644
--- a/pkgs/development/python-modules/pefile/default.nix
+++ b/pkgs/development/python-modules/pefile/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pefile";
-  version = "2023.2.7";
+  version = "2024.8.26";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
   # DON'T fetch from github, the repo is >60 MB due to test artifacts, which we cannot use
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-guYRQASz1pEcd8OVPjg4ZUsEURuLZuhYPbcMZZmAF9w=";
+    hash = "sha256-P/bF2LQ+jDe7bm3VCFZY1linoL3NILagex/PwcTp1jI=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From ea13ffa819b733d6cadcd14ffdeb10883680c7b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 Aug 2024 04:44:45 +0000
Subject: [PATCH 10/47] python312Packages.univers: 30.12.0 -> 30.12.1

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

diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix
index 7caf42337978..6c3133d649d5 100644
--- a/pkgs/development/python-modules/univers/default.nix
+++ b/pkgs/development/python-modules/univers/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "univers";
-  version = "30.12.0";
+  version = "30.12.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-NbsoYfTk5SWyUQZnOdm+ZCXK7wD+DV/updRHqHoU49c=";
+    hash = "sha256-whuUM3IHnuK5bkXJ8SPrMoO3cRnm0yxKBPxBSfeQIFY=";
   };
 
   build-system = [

From 5a8609b1c97115bec86d5d9682a8bc344225c15c Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:49:58 +0200
Subject: [PATCH 11/47] python312Packages.linode-api: fix dependencies and
 tests

---
 .../python-modules/linode-api/default.nix         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index 816c72e5f288..c05d3bbc75a2 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -5,8 +5,10 @@
   pythonOlder,
   setuptools,
   requests,
+  polling,
   pytestCheckHook,
   mock,
+  httpretty,
 }:
 
 buildPythonPackage rec {
@@ -26,11 +28,20 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools ];
 
-  propagatedBuildInputs = [ requests ];
+  propagatedBuildInputs = [
+    requests
+    polling
+  ];
 
   nativeCheckInputs = [
-    mock
     pytestCheckHook
+    mock
+    httpretty
+  ];
+
+  disabledTestPaths = [
+    # needs api token
+    "test/integration"
   ];
 
   pythonImportsCheck = [ "linode_api4" ];

From b2c270d4046cb9725a86c6ad28fe35eebde98a26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 28 Aug 2024 15:23:16 +0000
Subject: [PATCH 12/47] python312Packages.pytest-check: 2.3.1 -> 2.4.1

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

diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix
index c9f7b131c9d4..e73940edb312 100644
--- a/pkgs/development/python-modules/pytest-check/default.nix
+++ b/pkgs/development/python-modules/pytest-check/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "pytest-check";
-  version = "2.3.1";
+  version = "2.4.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "pytest_check";
     inherit version;
-    hash = "sha256-UbjxiozKpCbF2RPE4ORvAUqqdXlIHqA9Itfh9Jj2ibI=";
+    hash = "sha256-UiTvzvBZv38M2iU/jQ9icEtIGf9IyT9RxnWupqAU9lA=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 94092f98a242d6b5793571338de47b8604717ac5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 29 Aug 2024 15:04:49 +0000
Subject: [PATCH 13/47] python312Packages.albucore: 0.0.13 -> 0.0.14

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

diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix
index 335c10e103b3..799d460ef7b5 100644
--- a/pkgs/development/python-modules/albucore/default.nix
+++ b/pkgs/development/python-modules/albucore/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "albucore";
-  version = "0.0.13";
+  version = "0.0.14";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "albumentations-team";
     repo = "albucore";
     rev = "refs/tags/${version}";
-    hash = "sha256-TqEOey6PxVesk1Xs9YvnFto8LrSVsfTMq+MqP/mwYCA=";
+    hash = "sha256-6c6QiChP3SLTEj1SKlb/AcjQbLX4L9Fdlxem70cxiXM=";
   };
 
   pythonRemoveDeps = [ "opencv-python" ];

From 1b9bd8dd0fd5b8be7fc3435f7446272354624b01 Mon Sep 17 00:00:00 2001
From: Chandler Swift <chandler@chandlerswift.com>
Date: Thu, 29 Aug 2024 21:25:58 -0500
Subject: [PATCH 14/47] factorio: 1.1.109 -> 1.1.110

---
 pkgs/games/factorio/versions.json | 48 +++++++++++++++----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/games/factorio/versions.json b/pkgs/games/factorio/versions.json
index 0e436ed4a741..60e88c026f9d 100644
--- a/pkgs/games/factorio/versions.json
+++ b/pkgs/games/factorio/versions.json
@@ -2,56 +2,56 @@
   "x86_64-linux": {
     "alpha": {
       "experimental": {
-        "name": "factorio_alpha_x64-1.1.109.tar.xz",
+        "name": "factorio_alpha_x64-1.1.110.tar.xz",
         "needsAuth": true,
-        "sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h",
+        "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.109/alpha/linux64",
-        "version": "1.1.109"
+        "url": "https://factorio.com/get-download/1.1.110/alpha/linux64",
+        "version": "1.1.110"
       },
       "stable": {
-        "name": "factorio_alpha_x64-1.1.109.tar.xz",
+        "name": "factorio_alpha_x64-1.1.110.tar.xz",
         "needsAuth": true,
-        "sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h",
+        "sha256": "0ndhb94lh47n09a7wshm2inv52fd6rjfa7fk7nk9b7zzh84i7f4x",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.109/alpha/linux64",
-        "version": "1.1.109"
+        "url": "https://factorio.com/get-download/1.1.110/alpha/linux64",
+        "version": "1.1.110"
       }
     },
     "demo": {
       "experimental": {
-        "name": "factorio_demo_x64-1.1.109.tar.xz",
+        "name": "factorio_demo_x64-1.1.110.tar.xz",
         "needsAuth": false,
-        "sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx",
+        "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.109/demo/linux64",
-        "version": "1.1.109"
+        "url": "https://factorio.com/get-download/1.1.110/demo/linux64",
+        "version": "1.1.110"
       },
       "stable": {
-        "name": "factorio_demo_x64-1.1.109.tar.xz",
+        "name": "factorio_demo_x64-1.1.110.tar.xz",
         "needsAuth": false,
-        "sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx",
+        "sha256": "0dasxgrybl00vrabgrlarsvg0hdg5rvn3y4hsljhqc4zpbf93nxx",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.109/demo/linux64",
-        "version": "1.1.109"
+        "url": "https://factorio.com/get-download/1.1.110/demo/linux64",
+        "version": "1.1.110"
       }
     },
     "headless": {
       "experimental": {
-        "name": "factorio_headless_x64-1.1.109.tar.xz",
+        "name": "factorio_headless_x64-1.1.110.tar.xz",
         "needsAuth": false,
-        "sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh",
+        "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.109/headless/linux64",
-        "version": "1.1.109"
+        "url": "https://factorio.com/get-download/1.1.110/headless/linux64",
+        "version": "1.1.110"
       },
       "stable": {
-        "name": "factorio_headless_x64-1.1.109.tar.xz",
+        "name": "factorio_headless_x64-1.1.110.tar.xz",
         "needsAuth": false,
-        "sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh",
+        "sha256": "0sk4g9y051xjhiwdhj1yz808308zwsbpq3nps1ywvpp56vdycps8",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/1.1.109/headless/linux64",
-        "version": "1.1.109"
+        "url": "https://factorio.com/get-download/1.1.110/headless/linux64",
+        "version": "1.1.110"
       }
     }
   }

From 14b7ee1e0728fb18b2e2a424c5c0d54d415919bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Aug 2024 03:57:18 +0000
Subject: [PATCH 15/47] python312Packages.distributed: 2024.8.1 -> 2024.8.2

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

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 1d5c939de414..78610bb9a9a6 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2024.8.1";
+  version = "2024.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     owner = "dask";
     repo = "distributed";
     rev = "refs/tags/${version}";
-    hash = "sha256-LKf0z/xGvMVjoG02G2doS/XOiDN2/PmR72rCmwaQqtM=";
+    hash = "sha256-RvaWczbj/afOqTo9WPLJBkPG6li/TUwe84NS08zQMtY=";
   };
 
   postPatch = ''

From 5a60378393d76d640b6865493408993c145df351 Mon Sep 17 00:00:00 2001
From: brokenpip3 <brokenpip3@gmail.com>
Date: Fri, 30 Aug 2024 09:37:42 +0200
Subject: [PATCH 16/47] tuir: 1.29.0 -> 1.31.0

---
 pkgs/applications/misc/tuir/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix
index a1c4f60c4e65..80e7682df340 100644
--- a/pkgs/applications/misc/tuir/default.nix
+++ b/pkgs/applications/misc/tuir/default.nix
@@ -3,13 +3,13 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "tuir";
-  version = "1.29.0";
+  version = "1.31.0";
 
   src = fetchFromGitLab {
-    owner = "ajak";
+    owner = "Chocimier";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1fqp6bvq8kzdsf3nna4mn1phdcixpx76bya43xrivxjbzsfl59ib";
+    hash = "sha256-VYBtD3Ex6+iIRNvX6jF0b0iPvno41/58xCRydiyssvk=";
   };
 
   # Tests try to access network
@@ -21,12 +21,12 @@ buildPythonApplication rec {
 
   nativeCheckInputs = [ coverage coveralls docopt mock pylint pytest vcrpy ];
 
-  propagatedBuildInputs = [ beautifulsoup4 decorator kitchen requests six ];
+  propagatedBuildInputs = [ beautifulsoup4 decorator kitchen mailcap-fix requests six ];
 
   meta = with lib; {
     description = "Browse Reddit from your Terminal (fork of rtv)";
     mainProgram = "tuir";
-    homepage = "https://gitlab.com/ajak/tuir/";
+    homepage = "https://gitlab.com/Chocimier/tuir";
     license = licenses.mit;
     maintainers = with maintainers; [ Br1ght0ne matthiasbeyer ];
   };

From 29c0b3c35314147486d08bc1d7a898833363f917 Mon Sep 17 00:00:00 2001
From: David Hummel <6109326+hummeltech@users.noreply.github.com>
Date: Sat, 31 Aug 2024 10:56:28 -0700
Subject: [PATCH 17/47] mapnik: 4.0.0 -> 4.0.2

---
 pkgs/development/libraries/mapnik/default.nix   |  4 ++--
 .../mapnik/export-pkg-config-full-paths.patch   | 17 ++++++++++++++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix
index cd13cc850a15..c41ebde0241e 100644
--- a/pkgs/development/libraries/mapnik/default.nix
+++ b/pkgs/development/libraries/mapnik/default.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mapnik";
-  version = "4.0.0";
+  version = "4.0.2";
 
   src = fetchFromGitHub {
     owner = "mapnik";
     repo = "mapnik";
     rev = "v${version}";
-    hash = "sha256-CNFNGMJU3kzkRrOGsf8/uv5ebHPEQ0tkA+5OubRVEjs=";
+    hash = "sha256-U5QQ7I7ZBNlMm74Vpvv8lvJ4EefM3+jHURFAP03Lmvw=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch b/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch
index ec80423689d3..8da5dcd5b474 100644
--- a/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch
+++ b/pkgs/development/libraries/mapnik/export-pkg-config-full-paths.patch
@@ -1,13 +1,24 @@
 diff --git a/cmake/MapnikExportPkgConfig.cmake b/cmake/MapnikExportPkgConfig.cmake
-index e459f80ef..ec18a71a2 100644
+index f12ed57f1..548e1e6e9 100644
 --- a/cmake/MapnikExportPkgConfig.cmake
 +++ b/cmake/MapnikExportPkgConfig.cmake
-@@ -65,8 +65,8 @@ prefix=@CMAKE_INSTALL_PREFIX@
+@@ -3,7 +3,7 @@ function(create_pkg_config_file _target _lib_name _description)
+ prefix=@CMAKE_INSTALL_PREFIX@
  exec_prefix=${prefix}
  includedir=${prefix}/include
- libdir=${exec_prefix}/lib
+-libdir=${exec_prefix}/@MAPNIK_LIB_DIR@
++libdir=${exec_prefix}@MAPNIK_LIB_DIR@
+ 
+ Name: @_lib_name@
+ Description: @_description@
+@@ -64,9 +64,9 @@ function(create_pkg_config_file_mapnik _lib_name _description)
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}
+ includedir=${prefix}/include
+-libdir=${exec_prefix}/@MAPNIK_LIB_DIR@
 -fonts_dir=${prefix}/@FONTS_INSTALL_DIR@
 -plugins_dir=${prefix}/@PLUGINS_INSTALL_DIR@
++libdir=${exec_prefix}@MAPNIK_LIB_DIR@
 +fonts_dir=@FONTS_INSTALL_DIR@
 +plugins_dir=@PLUGINS_INSTALL_DIR@
  

From e6e452ff00e9d6219cdcc9c8aa7abac6882ff315 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 08:21:52 +0000
Subject: [PATCH 18/47] microsoft-edge: 128.0.2739.42 -> 128.0.2739.54

---
 .../networking/browsers/microsoft-edge/default.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix
index 6f899c924ff2..2dee22ef74fe 100644
--- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix
+++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix
@@ -1,20 +1,20 @@
 {
   beta = import ./browser.nix {
     channel = "beta";
-    version = "128.0.2739.42";
+    version = "129.0.2792.12";
     revision = "1";
-    hash = "sha256-VcBn2WL4rdAeEa62XT/dhC2OFLsV0Q/Sp6hqgmc/e0Y=";
+    hash = "sha256-LWu5DKCoGSFqUZqgvKx3aoZRzAf6FR3hJnk/agAV9sI=";
   };
   dev = import ./browser.nix {
     channel = "dev";
-    version = "129.0.2779.0";
+    version = "129.0.2792.10";
     revision = "1";
-    hash = "sha256-hlamsHTpBMGwOICga0k874q8+xuaZFMofFLG/EvB0NU=";
+    hash = "sha256-jw/muaunLlrtZADrD7asVH+o/u3cp3NyvjRXqPWyHJI=";
   };
   stable = import ./browser.nix {
     channel = "stable";
-    version = "128.0.2739.42";
+    version = "128.0.2739.54";
     revision = "1";
-    hash = "sha256-AwdZX2Ens2+rhHLYV0efYsXYBTs2a57HyGz2k+IDMeQ=";
+    hash = "sha256-qiLZExLU3f6l+qPEGiqOuDgjqOtSyhPwSt7kQfBBSyg=";
   };
 }

From c98ab14e32d8e43c7dad7dcc14425307e892afd9 Mon Sep 17 00:00:00 2001
From: brokenpip3 <brokenpip3@gmail.com>
Date: Sun, 1 Sep 2024 10:37:39 +0200
Subject: [PATCH 19/47] tuir: Add brokenpip3 as maintainer

---
 pkgs/applications/misc/tuir/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix
index 80e7682df340..3cc36bf8ae3c 100644
--- a/pkgs/applications/misc/tuir/default.nix
+++ b/pkgs/applications/misc/tuir/default.nix
@@ -28,6 +28,6 @@ buildPythonApplication rec {
     mainProgram = "tuir";
     homepage = "https://gitlab.com/Chocimier/tuir";
     license = licenses.mit;
-    maintainers = with maintainers; [ Br1ght0ne matthiasbeyer ];
+    maintainers = with maintainers; [ Br1ght0ne matthiasbeyer brokenpip3 ];
   };
 }

From cc2ad05f411f36e61071776ec2751a1f01baaa09 Mon Sep 17 00:00:00 2001
From: cheeseecake <chaneln95@gmail.com>
Date: Sun, 1 Sep 2024 20:25:47 +0800
Subject: [PATCH 20/47] maintainers: add cheesecake

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 493e2848ddf0..4bd85aa3cee6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3536,6 +3536,12 @@
     matrix = "@chayleaf:matrix.pavluk.org";
     name = "Anna Pavlyuk";
   };
+  cheeseecake = {
+    email = "chanelnjw@gmail.com";
+    github = "cheeseecake";
+    githubId = 34784816;
+    name = "Chanel";
+  };
   chekoopa = {
     email = "chekoopa@mail.ru";
     github = "chekoopa";

From b0381962830e1cb1dffe12df1966edeedeb1fcc1 Mon Sep 17 00:00:00 2001
From: cheeseecake <chaneln95@gmail.com>
Date: Sun, 1 Sep 2024 20:26:00 +0800
Subject: [PATCH 21/47] logseq: add maintainer cheesecake

---
 pkgs/by-name/lo/logseq/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix
index 72bedaf64f36..6c0e0dd0d7bc 100644
--- a/pkgs/by-name/lo/logseq/package.nix
+++ b/pkgs/by-name/lo/logseq/package.nix
@@ -92,7 +92,7 @@ in {
     changelog = "https://github.com/logseq/logseq/releases/tag/${version}";
     license = lib.licenses.agpl3Plus;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ cheeseecake ];
     platforms = [ "x86_64-linux" ] ++ lib.platforms.darwin;
     mainProgram = "logseq";
   };

From 876e47e9e91630c7b70f8408707c6d8bcbbf38d5 Mon Sep 17 00:00:00 2001
From: Sebastian Gabriel Trzpiot <dev@trzpiot.de>
Date: Mon, 2 Sep 2024 21:47:04 +0200
Subject: [PATCH 22/47] affine: copy license to docs

Moving just to $out can result in collisions.
Best practise is to move the license files to the docs directory.

See:
https://discourse.nixos.org/t/collision-between-2-license-txt-from-2-different-packages/22071
---
 pkgs/by-name/af/affine/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix
index af1e981e0ca5..413c622f55da 100644
--- a/pkgs/by-name/af/affine/package.nix
+++ b/pkgs/by-name/af/affine/package.nix
@@ -29,7 +29,8 @@ in {
   postInstall = ''
     mkdir -p $out/lib
     cp -r ./resources/* -t $out/lib/
-    cp LICENSE* $out/
+    mkdir -p $out/share/doc/affine/
+    cp LICENSE* $out/share/doc/affine/
     install -Dm644 ${icon} $out/share/pixmaps/affine.png
     makeWrapper "${electron}/bin/electron" $out/bin/affine \
       --inherit-argv0 \

From bbb4f627d26d5a15e9c9f88bcc48de40aca79bcc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 04:37:54 +0000
Subject: [PATCH 23/47] micronaut: 4.5.1 -> 4.6.1

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

diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix
index 099e56ce47e4..e99eb82398d5 100644
--- a/pkgs/development/tools/micronaut/default.nix
+++ b/pkgs/development/tools/micronaut/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "micronaut";
-  version = "4.5.1";
+  version = "4.6.1";
 
   src = fetchzip {
     url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
-    sha256 = "sha256-7l/SMJ+sTfz7/73ufQIB3q607yBHkUkHcFo9OkmCiwo=";
+    sha256 = "sha256-hIjFKYuA5OBHQuNu4BzGhO1USs3adLeQvCv3I/2WkGs=";
   };
 
   nativeBuildInputs = [ makeWrapper installShellFiles ];

From 912531f664518f12da64f0a3c55a827d363c8a93 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 5 Sep 2024 13:02:01 +0100
Subject: [PATCH 24/47] edencommon: patch to increase test discovery timeout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For some reason, this build is incredibly flaky on `x86_64-darwin`,
possibly because of the recent `staging-next` merge, failing with a
test discovery timeout error both on Hydra and locally. The default
discovery timeout is apparently 5 seconds, so let’s try giving it
5 times as long and see if that helps.
---
 .../libraries/edencommon/default.nix          |  5 +++++
 .../increase-test-discovery-timeout.patch     | 20 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/libraries/edencommon/increase-test-discovery-timeout.patch

diff --git a/pkgs/development/libraries/edencommon/default.nix b/pkgs/development/libraries/edencommon/default.nix
index 97406f81c47a..fa10344826af 100644
--- a/pkgs/development/libraries/edencommon/default.nix
+++ b/pkgs/development/libraries/edencommon/default.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-1z4QicS98juv4bUEbHBkCjVJHEhnoJyLYp4zMHmDbMg=";
   };
 
+  patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
+    # Test discovery timeout is bizarrely flaky on `x86_64-darwin`
+    ./increase-test-discovery-timeout.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = lib.optionals stdenv.isDarwin [
diff --git a/pkgs/development/libraries/edencommon/increase-test-discovery-timeout.patch b/pkgs/development/libraries/edencommon/increase-test-discovery-timeout.patch
new file mode 100644
index 000000000000..a79efe36d2e4
--- /dev/null
+++ b/pkgs/development/libraries/edencommon/increase-test-discovery-timeout.patch
@@ -0,0 +1,20 @@
+diff --git a/eden/common/os/test/CMakeLists.txt b/eden/common/os/test/CMakeLists.txt
+index a9f71443f8..be1423c455 100644
+--- a/eden/common/os/test/CMakeLists.txt
++++ b/eden/common/os/test/CMakeLists.txt
+@@ -18,4 +18,4 @@
+     ${LIBGMOCK_LIBRARIES}
+ )
+ 
+-gtest_discover_tests(os_test)
++gtest_discover_tests(os_test DISCOVERY_TIMEOUT 25)
+diff --git a/eden/common/utils/test/CMakeLists.txt b/eden/common/utils/test/CMakeLists.txt
+index 0cac73e569..ff08ecccb8 100644
+--- a/eden/common/utils/test/CMakeLists.txt
++++ b/eden/common/utils/test/CMakeLists.txt
+@@ -34,4 +34,4 @@
+     ${LIBGMOCK_LIBRARIES}
+ )
+ 
+-gtest_discover_tests(utils_test)
++gtest_discover_tests(utils_test DISCOVERY_TIMEOUT 25)

From 0cf866ffd8a07f12accaf6767e57553f89342cf3 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 5 Sep 2024 15:01:45 -0400
Subject: [PATCH 25/47] bitwarden-desktop: Add updateScript

---
 pkgs/by-name/bi/bitwarden-desktop/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index e34bd5ea696f..b0d400614ae1 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -13,6 +13,7 @@
 , makeDesktopItem
 , makeWrapper
 , napi-rs-cli
+, nix-update-script
 , nodejs_20
 , patchutils_0_4_2
 , pkg-config
@@ -195,6 +196,12 @@ in buildNpmPackage rec {
     })
   ];
 
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [ "--commit" "--version=stable" "--version-regex=^desktop-v(.*)$" ];
+    };
+  };
+
   meta = {
     changelog = "https://github.com/bitwarden/clients/releases/tag/${src.rev}";
     inherit description;

From 8cca925a466d271f3cbbf881b34f0ae362196f4b Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 5 Sep 2024 15:01:23 -0400
Subject: [PATCH 26/47] bitwarden-cli: Add updateScript

---
 pkgs/by-name/bi/bitwarden-cli/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index 6f3187cddb27..25b7afe6ec4f 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -5,6 +5,7 @@
 , fetchFromGitHub
 , python3
 , cctools
+, nix-update-script
 , nixosTests
 , xcbuild
 }:
@@ -58,8 +59,13 @@ buildNpmPackage rec {
 
   npmFlags = [ "--legacy-peer-deps" ];
 
-  passthru.tests = {
-    vaultwarden = nixosTests.vaultwarden.sqlite;
+  passthru = {
+    tests = {
+      vaultwarden = nixosTests.vaultwarden.sqlite;
+    };
+    updateScript = nix-update-script {
+      extraArgs = [ "--commit" "--version=stable" "--version-regex=^cli-v(.*)$" ];
+    };
   };
 
   meta = with lib; {

From 5a917406275ee76a0ccdd9f598a6eed57d7f5cff Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 5 Sep 2024 19:08:38 +0000
Subject: [PATCH 27/47] bitwarden-desktop: 2024.8.1 -> 2024.8.2

Diff: https://github.com/bitwarden/clients/compare/desktop-v2024.8.1...desktop-v2024.8.2

Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2024.8.2
---
 pkgs/by-name/bi/bitwarden-desktop/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index b0d400614ae1..104abfb85505 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -29,13 +29,13 @@ let
   electron = electron_31;
 in buildNpmPackage rec {
   pname = "bitwarden-desktop";
-  version = "2024.8.1";
+  version = "2024.8.2";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "desktop-v${version}";
-    hash = "sha256-FBNqgPjWSY8SCIGyKpoOl7I3pWQxDbWiFtcPZScDE4A=";
+    hash = "sha256-KATT4W2pP7VTcoHeshGx5VrBwlg3UqzKPcRY0Rzo7II=";
   };
 
   patches = [
@@ -52,7 +52,7 @@ in buildNpmPackage rec {
   makeCacheWritable = true;
   npmFlags = [ "--engine-strict" "--legacy-peer-deps" ];
   npmWorkspace = "apps/desktop";
-  npmDepsHash = "sha256-8cxhor90GqgO34AD8Jhd3N7PCnBnbhg8h7agVq0i3jk=";
+  npmDepsHash = "sha256-SnrK26QaxHYKX0532rGBASjx9PwxKSsVFRzZ3Cs2GPk=";
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     name = "${pname}-${version}";
@@ -68,7 +68,7 @@ in buildNpmPackage rec {
       patches;
     patchFlags = [ "-p4" ];
     sourceRoot = "${src.name}/${cargoRoot}";
-    hash = "sha256-zc5AarCbrJixcin8t+Ws8fH0ULM9rp3sUFsDb0htPuM=";
+    hash = "sha256-MjGKQky6LGtpG1maBWd+WkMZlnZfdl9Sm2dlvdD8ANw=";
   };
   cargoRoot = "apps/desktop/desktop_native";
 

From c0348dcf9c670092fd5ae6fc5437950f1f735549 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 5 Sep 2024 19:10:23 +0000
Subject: [PATCH 28/47] bitwarden-cli: 2024.8.1 -> 2024.8.2

Diff: https://github.com/bitwarden/clients/compare/cli-v2024.8.1...cli-v2024.8.2

Changelog: https://github.com/bitwarden/clients/releases/tag/cli-v2024.8.2
---
 pkgs/by-name/bi/bitwarden-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index 25b7afe6ec4f..e4a4ce8a5c2c 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -12,13 +12,13 @@
 
 buildNpmPackage rec {
   pname = "bitwarden-cli";
-  version = "2024.8.1";
+  version = "2024.8.2";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "cli-v${version}";
-    hash = "sha256-l9fLh1YFivVcMs688vM0pHoN0Um2r/EDpo7dvwvZFwY=";
+    hash = "sha256-F/UbaNKkyf8AoTSa0B0Ipdr5Z8qAkbk7tJ0Cdq7gk+U=";
   };
 
   postPatch = ''
@@ -28,7 +28,7 @@ buildNpmPackage rec {
 
   nodejs = nodejs_20;
 
-  npmDepsHash = "sha256-/6yWdTy6/GvYy8u5eZB+x5KRG6vhPVE0DIn+RUAO5MI=";
+  npmDepsHash = "sha256-SnrK26QaxHYKX0532rGBASjx9PwxKSsVFRzZ3Cs2GPk=";
 
   nativeBuildInputs = [
     (python3.withPackages (ps: with ps; [ setuptools ]))

From aa2031c2916073d90e8fda6d8b5e15917a89d172 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Sep 2024 02:35:18 +0000
Subject: [PATCH 29/47] python312Packages.simplesat: 0.8.2 -> 0.9.0

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

diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix
index f0981334e217..804ba76255a6 100644
--- a/pkgs/development/python-modules/simplesat/default.nix
+++ b/pkgs/development/python-modules/simplesat/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "0.8.2";
+  version = "0.9.0";
   format = "setuptools";
 
   versionFile = writeText "simplesat_ver" ''
@@ -34,8 +34,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "enthought";
     repo = "sat-solver";
-    rev = "v${version}";
-    hash = "sha256-6BQn1W2JGrMmNqgxi+sXx06XzNMcvwqYGMkpD0SSpT8=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-8sUOV42MLM3otG3EKvVzKKGAUpSlaTj850QZxZa62bE=";
   };
 
   preConfigure = ''

From a6ceac1a03f1908200f330855959752b3257ca30 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Fri, 6 Sep 2024 14:44:33 +0200
Subject: [PATCH 30/47] waagent: fix storage rules

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 .../networking/cluster/waagent/default.nix    | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/applications/networking/cluster/waagent/default.nix
index 39e8958d1242..d8966da7bddf 100644
--- a/pkgs/applications/networking/cluster/waagent/default.nix
+++ b/pkgs/applications/networking/cluster/waagent/default.nix
@@ -1,11 +1,12 @@
-{ coreutils
-, fetchFromGitHub
-, lib
-, python39
+{
+  coreutils,
+  fetchFromGitHub,
+  lib,
+  python39,
+  bash,
 }:
 
 let
-  inherit (lib) makeBinPath;
   # the latest python version that waagent test against according to https://github.com/Azure/WALinuxAgent/blob/28345a55f9b21dae89472111635fd6e41809d958/.github/workflows/ci_pr.yml#L75
   python = python39;
 
@@ -26,12 +27,14 @@ python.pkgs.buildPythonApplication rec {
   ];
   doCheck = false;
 
-  # azure-product-uuid chmod rule invokes chmod to change the mode of
-  # product_uuid (which is not a device itself).
-  # Replace this with an absolute path.
+  # Replace tools used in udev rules with their full path and ensure they are present.
   postPatch = ''
+    substituteInPlace config/66-azure-storage.rules \
+      --replace-fail readlink ${coreutils}/bin/readlink \
+      --replace-fail cut ${coreutils}/bin/cut \
+      --replace-fail /bin/sh ${bash}/bin/sh
     substituteInPlace config/99-azure-product-uuid.rules \
-      --replace "/bin/chmod" "${coreutils}/bin/chmod"
+      --replace-fail "/bin/chmod" "${coreutils}/bin/chmod"
   '';
 
   propagatedBuildInputs = [ python.pkgs.distro ];

From d300e2a889f16212635161600a013f5ba83dd59c Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Fri, 6 Sep 2024 15:55:33 +0200
Subject: [PATCH 31/47] waagent: move to by-name

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 .../cluster => by-name/wa}/waagent/dont-configure-sshd.patch    | 0
 .../waagent/default.nix => by-name/wa/waagent/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/cluster => by-name/wa}/waagent/dont-configure-sshd.patch (100%)
 rename pkgs/{applications/networking/cluster/waagent/default.nix => by-name/wa/waagent/package.nix} (100%)

diff --git a/pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch b/pkgs/by-name/wa/waagent/dont-configure-sshd.patch
similarity index 100%
rename from pkgs/applications/networking/cluster/waagent/dont-configure-sshd.patch
rename to pkgs/by-name/wa/waagent/dont-configure-sshd.patch
diff --git a/pkgs/applications/networking/cluster/waagent/default.nix b/pkgs/by-name/wa/waagent/package.nix
similarity index 100%
rename from pkgs/applications/networking/cluster/waagent/default.nix
rename to pkgs/by-name/wa/waagent/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e69ca4d78f5b..4afbc9a5de7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17025,8 +17025,6 @@ with pkgs;
 
   eltclsh = callPackage ../development/tools/eltclsh { };
 
-  waagent = callPackage ../applications/networking/cluster/waagent { };
-
   wasm = ocamlPackages.wasm;
 
   wasm3 = callPackage ../development/interpreters/wasm3 { };

From 9d726f0356fb8a5b602775a912f40e2ba34a24b7 Mon Sep 17 00:00:00 2001
From: ozwaldorf <self@ossian.dev>
Date: Fri, 6 Sep 2024 13:10:56 -0400
Subject: [PATCH 32/47] lutgen: 0.10.1 -> 0.11.0

---
 pkgs/by-name/lu/lutgen/package.nix | 33 ++++++++++++++++--------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix
index e415d0c8a14c..5c1cd965ef22 100644
--- a/pkgs/by-name/lu/lutgen/package.nix
+++ b/pkgs/by-name/lu/lutgen/package.nix
@@ -1,38 +1,41 @@
-{ lib
-, fetchFromGitHub
-, rustPlatform
-, stdenv
-, installShellFiles
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  stdenv,
+  installShellFiles,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "lutgen";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "ozwaldorf";
     repo = "lutgen-rs";
     rev = "v${version}";
-    hash = "sha256-Rj6y8ZiNWQsGn8B+iNMZvuE/U2703oYbJW+ZSdV3fl4=";
+    hash = "sha256-ybaapL9OUUQ+sO8P0JH1MuxCFmTihKp9gXJpM7KLY7U=";
   };
 
-  cargoHash = "sha256-7yNr6Zc5A7rj6sUnplo2gB2xNUgZ3TLwUuBEfVKZfIQ=";
+  cargoHash = "sha256-Fxecnq7QKcDe6aAsKj9uye3sFdfkgFEKYmdqnvQDiAQ=";
 
-  nativeBuildInputs = [
-    installShellFiles
-  ];
+  nativeBuildInputs = [ installShellFiles ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd lutgen \
-      --bash <($out/bin/lutgen completions bash) \
-      --fish <($out/bin/lutgen completions fish) \
-      --zsh <($out/bin/lutgen completions zsh)
+      --bash <($out/bin/lutgen --bpaf-complete-style-bash) \
+      --fish <($out/bin/lutgen --bpaf-complete-style-fish) \
+      --zsh <($out/bin/lutgen --bpaf-complete-style-zsh)
   '';
 
   meta = with lib; {
     description = "Blazingly fast interpolated LUT generator and applicator for arbitrary and popular color palettes";
     homepage = "https://github.com/ozwaldorf/lutgen-rs";
-    maintainers = with maintainers; [ ozwaldorf zzzsy donovanglover ];
+    maintainers = with maintainers; [
+      ozwaldorf
+      zzzsy
+      donovanglover
+    ];
     mainProgram = "lutgen";
     license = licenses.mit;
   };

From 95e172d7c0f4fbdcc117760fe973507e61a6d550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Fri, 6 Sep 2024 13:14:03 -0400
Subject: [PATCH 33/47] valgrind-light: set meta.description to clarify
 difference to valgrind

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 283595a80944..f9dfd2adb316 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19123,7 +19123,9 @@ with pkgs;
   valgrind = callPackage ../development/tools/analysis/valgrind {
     inherit (buildPackages.darwin) xnu bootstrap_cmds;
   };
-  valgrind-light = res.valgrind.override { gdb = null; };
+  valgrind-light = (res.valgrind.override { gdb = null; }).overrideAttrs (oldAttrs: {
+    meta.description = "${oldAttrs.meta.description} (without GDB)";
+  });
 
   qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind { };
 

From ea09de722f144a47f440ab10895ba454d063c864 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Fri, 6 Sep 2024 12:12:45 -0700
Subject: [PATCH 34/47] python312Packages.openai: 1.43.0 -> 1.44.0

Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.43.0...v1.44.0

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

diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index 9ac534aea72b..2f50fadc7c69 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -35,7 +35,7 @@
 
 buildPythonPackage rec {
   pname = "openai";
-  version = "1.43.0";
+  version = "1.44.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7.1";
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     owner = "openai";
     repo = "openai-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cB+ToAFWRy5oaHVHYdmTcr0MRddg+xvZQglheX2hCdE=";
+    hash = "sha256-HD7gqdWREULH0GQ1xNRh/TJEOzo82ghHC9gTrx7qxxU=";
   };
 
   build-system = [

From 4ff98df73fcab54c637e76d2e0149f65939bcf4c Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sat, 7 Sep 2024 09:40:34 +0900
Subject: [PATCH 35/47] python312Packages.simplesat: modernize

---
 .../python-modules/simplesat/default.nix      | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/simplesat/default.nix b/pkgs/development/python-modules/simplesat/default.nix
index 804ba76255a6..3f81b311c811 100644
--- a/pkgs/development/python-modules/simplesat/default.nix
+++ b/pkgs/development/python-modules/simplesat/default.nix
@@ -4,14 +4,16 @@
   writeText,
   lib,
   attrs,
-  six,
+  mock,
   okonomiyaki,
+  pytestCheckHook,
+  pyyaml,
+  setuptools,
+  six,
 }:
 
 let
   version = "0.9.0";
-  format = "setuptools";
-
   versionFile = writeText "simplesat_ver" ''
     version = '${version}'
     full_version = '${version}'
@@ -24,12 +26,7 @@ in
 buildPythonPackage rec {
   pname = "simplesat";
   inherit version;
-
-  propagatedBuildInputs = [
-    attrs
-    six
-    okonomiyaki
-  ];
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "enthought";
@@ -41,10 +38,25 @@ buildPythonPackage rec {
   preConfigure = ''
     cp ${versionFile} simplesat/_version.py
   '';
-  dontUseSetuptoolsCheck = true;
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    attrs
+    okonomiyaki
+    six
+  ];
 
   pythonImportsCheck = [ "simplesat" ];
 
+  nativeCheckInputs = [
+    mock
+    pytestCheckHook
+    pyyaml
+  ];
+
+  pytestFlagsArray = [ "simplesat/tests" ];
+
   meta = with lib; {
     homepage = "https://github.com/enthought/sat-solver";
     description = "Prototype for SAT-based dependency handling";

From 4f758949c8ac3b30f4532fefd722067dbee957f1 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sat, 7 Sep 2024 09:58:30 +0900
Subject: [PATCH 36/47] python312Packages.univers: update meta.homepage

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

diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix
index 6c3133d649d5..3e0c0d3094f4 100644
--- a/pkgs/development/python-modules/univers/default.nix
+++ b/pkgs/development/python-modules/univers/default.nix
@@ -58,8 +58,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Library for parsing version ranges and expressions";
-    homepage = "https://github.com/nexB/univers";
-    changelog = "https://github.com/nexB/univers/blob/v${version}/CHANGELOG.rst";
+    homepage = "https://github.com/aboutcode-org/univers";
+    changelog = "https://github.com/aboutcode-org/univers/blob/v${version}/CHANGELOG.rst";
     license = with licenses; [
       asl20
       bsd3

From 44e46e87600b5fec74fbb54eedec6ce4d27cc77e Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sat, 7 Sep 2024 11:17:43 +0900
Subject: [PATCH 37/47] python312Packages.pefile: refactor

---
 pkgs/development/python-modules/pefile/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix
index cd8a45b9a0c4..34b0970ce545 100644
--- a/pkgs/development/python-modules/pefile/default.nix
+++ b/pkgs/development/python-modules/pefile/default.nix
@@ -1,16 +1,15 @@
 {
   lib,
   buildPythonPackage,
-  future,
   fetchPypi,
-  setuptools-scm,
+  setuptools,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pefile";
   version = "2024.8.26";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.6";
 
@@ -20,9 +19,7 @@ buildPythonPackage rec {
     hash = "sha256-P/bF2LQ+jDe7bm3VCFZY1linoL3NILagex/PwcTp1jI=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
-
-  propagatedBuildInputs = [ future ];
+  build-system = [ setuptools ];
 
   # Test data contains properitary executables and malware, and is therefore encrypted
   doCheck = false;

From 84c1b25a7821a51bf1ab007da66629406335c381 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sat, 7 Sep 2024 11:02:15 +0800
Subject: [PATCH 38/47] decibels: add gst-libav to support more format

---
 pkgs/by-name/de/decibels/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/de/decibels/package.nix b/pkgs/by-name/de/decibels/package.nix
index 2921c1897356..ebacf8ea3ffc 100644
--- a/pkgs/by-name/de/decibels/package.nix
+++ b/pkgs/by-name/de/decibels/package.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
     gst_all_1.gst-plugins-base # for GstVideo
     gst_all_1.gst-plugins-bad # for GstPlay
     gst_all_1.gst-plugins-good # for scaletempo
+    gst_all_1.gst-libav
     libadwaita
   ];
 

From 16f1b86118b5a04ff5207d4ea2aea3d7891d117a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Sep 2024 12:30:20 +0000
Subject: [PATCH 39/47] broot: 1.43.0 -> 1.44.0

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

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 03854f99770f..9097f4e335ec 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -19,16 +19,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.43.0";
+  version = "1.44.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-x6PDewUCcy8uf0unG8FiePrP1FKbgvjx/NhkodYva00=";
+    hash = "sha256-0YZma3+Qk2P8lvVS7+Uma0YayuHxtK8lFTZXjTmPIuY=";
   };
 
-  cargoHash = "sha256-6SeOd4yNLFqkm47ELqmqaLl0BZS1+gVKHjphdcFdtoY=";
+  cargoHash = "sha256-QsUHJpSdI0Vz8hbK0Nqn3gxEpCkMGcj1R1CCgLIyEtE=";
 
   nativeBuildInputs = [
     installShellFiles

From b6be74e9fdb077e77f1fc8b71dc0e928e6ca2f01 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sat, 7 Sep 2024 20:16:38 +0200
Subject: [PATCH 40/47] panoply: 5.5.0 -> 5.5.1

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

diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix
index c107b32c7e1e..af1cdd3d7218 100644
--- a/pkgs/tools/misc/panoply/default.nix
+++ b/pkgs/tools/misc/panoply/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "panoply";
-  version = "5.5.0";
+  version = "5.5.1";
 
   src = fetchurl {
     url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz";
-    sha256 = "sha256-dBWWKSNlmTWX7egOoWpp+kn5KYIMrIfHBA6SMIhWj+M=";
+    sha256 = "sha256-FBlr4t2Dch5HXfoLIwhZueECv9zGIRlTbs7L+Ny7u5Y=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 77136e1d5cd687bc48370364f0670b339dbe1eca Mon Sep 17 00:00:00 2001
From: RockWolf <git@rockwolf.eu>
Date: Sat, 7 Sep 2024 21:21:41 +0200
Subject: [PATCH 41/47] stackit-cli: 0.14.0 -> 0.15.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 ee54e12bbc56..28e895fddc70 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.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${version}";
-    hash = "sha256-AUr/2360mhn3MFj6hCH6CGajYOtVKu84Cu5ShOvyEC4=";
+    hash = "sha256-dyMkqD2Fdopv620p9bzOXxiG3vp4t0H+x5UDelbpMko=";
   };
 
-  vendorHash = "sha256-QKUTUJguSg/wLEvqK+R8vdsEBiaXgie9Hv4kBxK6fbc=";
+  vendorHash = "sha256-FLMF0JTSTSkwI86i4StkY1r/W+x43TwlcLsmNYO7YnE=";
 
   subPackages = [ "." ];
 

From cf616388d25a644efe31b199e8e64463dde142a9 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Fri, 6 Sep 2024 17:58:11 -0400
Subject: [PATCH 42/47] xfce.tumbler: enable webp thumbnailer support

---
 pkgs/desktops/xfce/core/tumbler/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix
index f43a465ed98b..302a635f0904 100644
--- a/pkgs/desktops/xfce/core/tumbler/default.nix
+++ b/pkgs/desktops/xfce/core/tumbler/default.nix
@@ -8,6 +8,7 @@
 , libgsf
 , poppler
 , gst_all_1
+, webp-pixbuf-loader
 , libxfce4util
 }:
 
@@ -32,6 +33,12 @@ mkXfceDerivation {
     poppler # technically the glib binding
   ];
 
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix XDG_DATA_DIRS : "${webp-pixbuf-loader}/share"
+    )
+  '';
+
   # WrapGAppsHook won't touch this binary automatically, so we wrap manually.
   postFixup = ''
     wrapProgram $out/lib/tumbler-1/tumblerd "''${gappsWrapperArgs[@]}"

From eaec79b5bd03ea5053901e0ffc402dd85da0cac2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Sep 2024 21:44:11 +0000
Subject: [PATCH 43/47] spotifyd: 0.3.5-unstable-2024-08-13 ->
 0.3.5-unstable-2024-09-05

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

diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix
index 0d2b6c185ca5..2a9bd5394eb0 100644
--- a/pkgs/by-name/sp/spotifyd/package.nix
+++ b/pkgs/by-name/sp/spotifyd/package.nix
@@ -24,16 +24,16 @@
 
 rustPackages.rustPlatform.buildRustPackage rec {
   pname = "spotifyd";
-  version = "0.3.5-unstable-2024-08-13";
+  version = "0.3.5-unstable-2024-09-05";
 
   src = fetchFromGitHub {
     owner = "Spotifyd";
     repo = "spotifyd";
-    rev = "e342328550779423382f35cd10a18b1c76b81f40";
-    hash = "sha256-eP783ZNdzePQuhQE8SWYHwqK8J4+fperDYXAHWM0hz8=";
+    rev = "e280d84124d854af3c2f9509ba496b1c2ba6a1ae";
+    hash = "sha256-RFfM/5DY7IG0E79zc8IuXpSNAIjloMWI3ZVbyLxh4O8=";
   };
 
-  cargoHash = "sha256-jmsfB96uWX4CzEsS2Grr2FCptMIebj2DSA5z6zG9AJg=";
+  cargoHash = "sha256-z3zcQD2v71FZg6nEvKfaMiQU/aRAPFNt69b9Rm+jpuY=";
 
   nativeBuildInputs = [ pkg-config ];
 

From ebde8bf633869d56b18d83828e0a0d0ddd53f865 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Sat, 7 Sep 2024 22:21:34 +0000
Subject: [PATCH 44/47] woodpecker-server: 2.7.0 -> 2.7.1

---
 .../tools/continuous-integration/woodpecker/common.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index 1bb8d45f7c44..15b74b0a43e0 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -1,7 +1,7 @@
 { lib, fetchzip }:
 let
-  version = "2.7.0";
-  srcHash = "sha256-A9F+kKR4oM4IEA5qLqMaQiW9KAjuQgyvv3peXos3gX8=";
+  version = "2.7.1";
+  srcHash = "sha256-x9eCBxrujIJ0kwN5jyn7FKu7uyN+pIBCVDLckhiUzmM=";
   # The tarball contains vendored dependencies
   vendorHash = null;
 in

From 91173a41da357a904977374e32ce2e9d7857b0ac Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 7 Sep 2024 16:28:36 -0600
Subject: [PATCH 45/47] dynisland: init at 0.1.3

---
 pkgs/by-name/dy/dynisland/package.nix | 63 +++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/dy/dynisland/package.nix

diff --git a/pkgs/by-name/dy/dynisland/package.nix b/pkgs/by-name/dy/dynisland/package.nix
new file mode 100644
index 000000000000..9c78c061352a
--- /dev/null
+++ b/pkgs/by-name/dy/dynisland/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  dbus,
+  openssl,
+  gtk4,
+  gtk4-layer-shell,
+  glib,
+  pkg-config,
+  wrapGAppsHook4,
+  installShellFiles,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "dynisland";
+  version = "0.1.3";
+
+  src = fetchFromGitHub {
+    owner = "cr3eperall";
+    repo = "dynisland";
+    rev = "refs/tags/${version}";
+    hash = "sha256-HqwykR6BXxtYSxNUYdegmjCwSVTW29pqP7qLWbcqLeg=";
+    fetchSubmodules = true;
+  };
+
+  cargoHash = "sha256-p67h67fRNcfiQyhCUY5Y11xTTqQbl0Ngx1EhYfaSJmw=";
+
+  buildFeatures = [ "completions" ];
+
+  buildInputs = [
+    dbus
+    openssl
+    gtk4
+    gtk4-layer-shell
+  ];
+
+  nativeBuildInputs = [
+    glib
+    rustPlatform.bindgenHook
+    rustPlatform.cargoSetupHook
+    pkg-config
+    wrapGAppsHook4
+    installShellFiles
+  ];
+
+  postInstall = ''
+    installShellCompletion --cmd dynisland \
+      --bash ./target/dynisland.bash \
+      --fish ./target/dynisland.fish \
+      --zsh ./target/_dynisland
+  '';
+
+  meta = {
+    description = "Dynamic and extensible GTK4 layer-shell, written in Rust";
+    homepage = "https://github.com/cr3eperall/dynisland";
+    changelog = "https://github.com/cr3eperall/dynisland/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ryand56 ];
+    mainProgram = "dynisland";
+    platforms = lib.platforms.linux;
+  };
+}

From 036d05a466090682660a3120ab09196712ed2651 Mon Sep 17 00:00:00 2001
From: Yuxuan Shui <yshuiv7@gmail.com>
Date: Sun, 8 Sep 2024 00:26:27 +0100
Subject: [PATCH 46/47] nixos/samba: fix migration guide for securityType

---
 nixos/modules/services/network-filesystems/samba.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 02688afb8aa5..b98c0c126bb0 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -29,7 +29,7 @@ in
     '')
     (lib.mkRemovedOptionModule [ "services" "samba" "extraConfig" ] "Use services.samba.settings instead.")
     (lib.mkRenamedOptionModule [ "services" "samba" "invalidUsers" ] [ "services" "samba" "settings" "global" "invalid users" ])
-    (lib.mkRenamedOptionModule [ "services" "samba" "securityType" ] [ "services" "samba" "settings" "global" "security type" ])
+    (lib.mkRenamedOptionModule [ "services" "samba" "securityType" ] [ "services" "samba" "settings" "global" "security" ])
     (lib.mkRenamedOptionModule [ "services" "samba" "shares" ] [ "services" "samba" "settings" ])
 
     (lib.mkRenamedOptionModule [ "services" "samba" "enableWinbindd" ] [ "services" "samba" "winbindd" "enable" ])

From 2b804161efeeb0a797c2f34935fe9afe0954802d Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Sun, 8 Sep 2024 09:20:40 +0900
Subject: [PATCH 47/47] python312Packages.albucore: remove unused input

---
 pkgs/development/python-modules/albucore/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/albucore/default.nix b/pkgs/development/python-modules/albucore/default.nix
index 799d460ef7b5..aea9b5ab6954 100644
--- a/pkgs/development/python-modules/albucore/default.nix
+++ b/pkgs/development/python-modules/albucore/default.nix
@@ -7,7 +7,6 @@
   pytestCheckHook,
   numpy,
   opencv4,
-  tomli,
   typing-extensions,
 }:
 
@@ -32,7 +31,6 @@ buildPythonPackage rec {
   dependencies = [
     numpy
     opencv4
-    tomli
     typing-extensions
   ];