From 2d8cc6df922a09f2d29f4270a0e9653b2d007a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Sat, 21 Sep 2024 14:30:41 +0200
Subject: [PATCH 01/50] webdav: 5.1.0 -> 5.3.0

---
 pkgs/servers/webdav/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/webdav/default.nix b/pkgs/servers/webdav/default.nix
index 9349b9abfe7b..c1c72db242dc 100644
--- a/pkgs/servers/webdav/default.nix
+++ b/pkgs/servers/webdav/default.nix
@@ -1,17 +1,17 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGo123Module }:
 
-buildGoModule rec {
+buildGo123Module rec {
   pname = "webdav";
-  version = "5.1.0";
+  version = "5.3.0";
 
   src = fetchFromGitHub {
     owner = "hacdias";
     repo = "webdav";
     rev = "v${version}";
-    sha256 = "sha256-6hDMu3IgyQeRSxo1z3TAjrEH/XwdfHvoLVjyVwa0LdU=";
+    sha256 = "sha256-F7ehl7Q/66ah6/N06U8Ld3bUjuF5tpJlNS/aWEorQaI=";
   };
 
-  vendorHash = "sha256-LQePicQUm55c0lzVCF6au2v3BfXvGIJHNn2SpTQEjpU=";
+  vendorHash = "sha256-FvTDqGr3B05osuJvLj7J04JMeamZc/X6YeLY24ej7Ak=";
 
   meta = with lib; {
     description = "Simple WebDAV server";

From 3e163dcb093d2d5f7269a3079a31247960857a4d Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Thu, 3 Oct 2024 21:46:46 +0900
Subject: [PATCH 02/50] clean-css-cli: 5.6.2 -> 5.6.3

---
 .../tools/clean-css-cli/default.nix           | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/clean-css-cli/default.nix b/pkgs/development/tools/clean-css-cli/default.nix
index 62782c311d62..195aa7537d1b 100644
--- a/pkgs/development/tools/clean-css-cli/default.nix
+++ b/pkgs/development/tools/clean-css-cli/default.nix
@@ -1,20 +1,23 @@
-{ lib
-, buildNpmPackage
-, fetchFromGitHub
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
 }:
 
-buildNpmPackage rec {
-  pname = "clean-css-cli";
-  version = "5.6.2";
-
+let
+  version = "5.6.3";
   src = fetchFromGitHub {
     owner = "clean-css";
     repo = "clean-css-cli";
     rev = "v${version}";
-    hash = "sha256-ONWJn6mehXeNwRVEEM+Ad/heXwNWC9E9yA5eUQsi98A=";
+    hash = "sha256-tsFNcQg55uY2gL5xLLLS6INLlYzbsU6M3hnsYeOFGEw=";
   };
+in
+buildNpmPackage {
+  pname = "clean-css-cli";
+  inherit version src;
 
-  npmDepsHash = "sha256-eVd6YSTHhp6qzGYn5PlikUgjNS+GJoRwfm6KPrEJKGE=";
+  npmDepsHash = "sha256-uvI9esVVOE18syHUCJpoiDY+Vh3hJO+GsMOTZSYJaxg=";
 
   dontNpmBuild = true;
 
@@ -24,6 +27,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/clean-css/clean-css-cli";
     license = lib.licenses.mit;
     mainProgram = "cleancss";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ momeemt ];
   };
 }

From e0945356c781ee6a5f2ed532f6e9906e626f8037 Mon Sep 17 00:00:00 2001
From: Mutsuha Asada <me@momee.mt>
Date: Thu, 3 Oct 2024 21:47:47 +0900
Subject: [PATCH 03/50] clean-css-cli: moved to by-name

---
 .../default.nix => by-name/cl/clean-css-cli/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/clean-css-cli/default.nix => by-name/cl/clean-css-cli/package.nix} (100%)

diff --git a/pkgs/development/tools/clean-css-cli/default.nix b/pkgs/by-name/cl/clean-css-cli/package.nix
similarity index 100%
rename from pkgs/development/tools/clean-css-cli/default.nix
rename to pkgs/by-name/cl/clean-css-cli/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 131cca72e54e..457115d1fffb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17413,8 +17413,6 @@ with pkgs;
 
   cl-launch = callPackage ../development/tools/misc/cl-launch { };
 
-  clean-css-cli = callPackage ../development/tools/clean-css-cli { };
-
   cloud-nuke = callPackage ../development/tools/cloud-nuke { };
 
   cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { };

From 931d7f929d700819e4f9e61a2931355768eefdc7 Mon Sep 17 00:00:00 2001
From: SharzyL <me@sharzy.in>
Date: Sat, 5 Oct 2024 23:55:48 +0800
Subject: [PATCH 04/50] mathematica: fix incorrect matchesDoc with #343491

With mathematica 14 came into nixpkgs with #343491, there are two types
of file names of local-doc installer, "Wolfram_*_LIN_Bndl.sh" and
"Mathematica_*_BNDL_LINUX.sh". However, the modified matchesDoc
implementation failed to match the later type, causing evaluation
errors.
---
 pkgs/applications/science/math/mathematica/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index 9d0a308f4435..617fd46b050e 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -51,10 +51,7 @@ let versions = callPackage ./versions.nix { };
           sublist = l: lib.sublist 0 n l;
       in lib.compareLists lib.compare (sublist as) (sublist bs) == 0;
 
-    matchesDoc = v:
-      builtins.match (if webdoc
-                      then ".*[0-9]_LIN(UX)?.sh"
-                      else ".*_B[Nn][Dd][Ll].sh") v.src.name != null;
+    matchesDoc = v: (builtins.match ".*[0-9]_LIN(UX)?.sh" v.src.name != null) == webdoc;
 
 in
 

From 878f43f915ebbbc81c88f9362b58bd4c33a4de90 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sat, 5 Oct 2024 21:57:43 +0200
Subject: [PATCH 05/50] zabbix-cli: migrate to pkgs/by-name, reformat with
 nixfmt-rfc-style

---
 .../default.nix => by-name/za/zabbix-cli/package.nix}      | 7 ++++---
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename pkgs/{tools/misc/zabbix-cli/default.nix => by-name/za/zabbix-cli/package.nix} (95%)

diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/by-name/za/zabbix-cli/package.nix
similarity index 95%
rename from pkgs/tools/misc/zabbix-cli/default.nix
rename to pkgs/by-name/za/zabbix-cli/package.nix
index 49f8d504d701..8103e81c3fd8 100644
--- a/pkgs/tools/misc/zabbix-cli/default.nix
+++ b/pkgs/by-name/za/zabbix-cli/package.nix
@@ -1,6 +1,7 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8630eb31bed5..de6e0d626bcd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7285,8 +7285,6 @@ with pkgs;
 
   z-lua = callPackage ../tools/misc/z-lua { };
 
-  zabbix-cli = callPackage ../tools/misc/zabbix-cli { };
-
   zabbixctl = callPackage ../tools/misc/zabbixctl { };
 
   zee = callPackage ../applications/editors/zee {

From 9209761f2cdeba2ec398d62d5a6ed09cb7ad8b18 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sat, 5 Oct 2024 22:11:35 +0200
Subject: [PATCH 06/50] zabbix-cli: 2.3.2 -> 3.1.2

https://github.com/unioslo/zabbix-cli/compare/2.3.2...3.1.2
---
 pkgs/by-name/za/zabbix-cli/package.nix | 62 ++++++++++++++++++++------
 1 file changed, 48 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/za/zabbix-cli/package.nix b/pkgs/by-name/za/zabbix-cli/package.nix
index 8103e81c3fd8..6229187599a8 100644
--- a/pkgs/by-name/za/zabbix-cli/package.nix
+++ b/pkgs/by-name/za/zabbix-cli/package.nix
@@ -1,40 +1,74 @@
 {
   lib,
   fetchFromGitHub,
-  python3,
+  python3Packages,
+  testers,
+  zabbix-cli,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "zabbix-cli";
-  version = "2.3.2";
-  format = "setuptools";
+  version = "3.1.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "usit-gd";
     repo = "zabbix-cli";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-B5t/vxCmPdRR9YKOc2htI57Kmk1ZrpwPUln4JoUrK6g=";
+    hash = "sha256-It0SVbGNIxf2i4gleqVRAZCIks/Tf/WYSAgipOC+HwE=";
   };
 
-  propagatedBuildInputs = with python3.pkgs; [
-    packaging
-    requests
+  pythonRelaxDeps = [ "click-repl" ];
+
+  build-system = with python3Packages; [
+    hatchling
   ];
 
-  nativeCheckInputs = with python3.pkgs; [
+  dependencies =
+    with python3Packages;
+    [
+      click-repl
+      httpx
+      httpx.optional-dependencies.socks
+      packaging
+      platformdirs
+      pydantic
+      requests
+      rich
+      strenum
+      tomli
+      tomli-w
+      typer
+      typing-extensions
+    ]
+    ++ lib.optionals (pythonOlder "3.10") [
+      importlib-metadata
+    ];
+
+  nativeCheckInputs = with python3Packages; [
+    freezegun
+    inline-snapshot
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # TypeError: option values must be strings
-    "test_descriptor_del"
-    "test_initialize"
-  ];
+  # Otherwise tests will fail to create directory
+  # Permission denied: '/homeless-shelter'
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  pythonImportsCheck = [ "zabbix_cli" ];
+
+  passthru.tests.version = testers.testVersion {
+    package = zabbix-cli;
+    command = "HOME=$(mktemp -d) zabbix-cli --version";
+  };
 
   meta = with lib; {
     description = "Command-line interface for Zabbix";
     homepage = "https://github.com/unioslo/zabbix-cli";
     license = licenses.gpl3Plus;
+    mainProgram = "zabbix-cli";
     maintainers = [ ];
   };
 }

From ae7e7534cdf2160ff0dfe9fff64df697c8c7b969 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sat, 5 Oct 2024 22:13:42 +0200
Subject: [PATCH 07/50] zabbix-cli: add anthonyroussel to maintainers

---
 pkgs/by-name/za/zabbix-cli/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/za/zabbix-cli/package.nix b/pkgs/by-name/za/zabbix-cli/package.nix
index 6229187599a8..16fd8c84b642 100644
--- a/pkgs/by-name/za/zabbix-cli/package.nix
+++ b/pkgs/by-name/za/zabbix-cli/package.nix
@@ -69,6 +69,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/unioslo/zabbix-cli";
     license = licenses.gpl3Plus;
     mainProgram = "zabbix-cli";
-    maintainers = [ ];
+    maintainers = [ maintainers.anthonyroussel ];
   };
 }

From 7bd2b837539061f6445137bdd16e9f9f576e1c8c Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sun, 6 Oct 2024 20:57:31 +0200
Subject: [PATCH 08/50] open62541: 1.4.4 -> 1.4.6

https://github.com/open62541/open62541/releases/tag/v1.4.5
https://github.com/open62541/open62541/releases/tag/v1.4.6
---
 pkgs/by-name/op/open62541/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/open62541/package.nix b/pkgs/by-name/op/open62541/package.nix
index dd32cfbe844c..62afb6eef95c 100644
--- a/pkgs/by-name/op/open62541/package.nix
+++ b/pkgs/by-name/op/open62541/package.nix
@@ -30,13 +30,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "open62541";
-  version = "1.4.4";
+  version = "1.4.6";
 
   src = fetchFromGitHub {
     owner = "open62541";
     repo = "open62541";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-S0hMxP+jIosI6siw0vt2KO84AQuL7JIPLPTBBXZPwpQ=";
+    hash = "sha256-9fbTOJWnjiOy7Ge5n9jfwHDzUicTAXN8VqelPr8mMDI=";
     fetchSubmodules = true;
   };
 

From 8a9cd8765d281489467e7e1a5b6cbc951afad641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theo1.bori@epitech.eu>
Date: Sun, 6 Oct 2024 22:25:27 +0200
Subject: [PATCH 09/50] supermariowar: Fix GUI applications wrapping

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

diff --git a/pkgs/by-name/su/supermariowar/package.nix b/pkgs/by-name/su/supermariowar/package.nix
index 4ebeef24ce7d..cede9b658164 100644
--- a/pkgs/by-name/su/supermariowar/package.nix
+++ b/pkgs/by-name/su/supermariowar/package.nix
@@ -11,6 +11,7 @@
   SDL2_mixer,
   zlib,
   unstableGitUpdater,
+  makeWrapper,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -28,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
+    makeWrapper
   ];
 
   buildInputs = [
@@ -45,17 +47,15 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir -p $out/bin
 
     for app in smw smw-leveledit smw-worldedit; do
-      chmod +x $out/games/$app
-
-      cat << EOF > $out/bin/$app
-      $out/games/$app --datadir $out/share/games/smw
-    EOF
-      chmod +x $out/bin/$app
+      makeWrapper $out/games/$app $out/bin/$app \
+        --add-flags "--datadir $out/share/games/smw"
     done
 
     ln -s $out/games/smw-server $out/bin/smw-server
   '';
+
   passthru.updateScript = unstableGitUpdater { };
+
   meta = {
     description = "A fan-made multiplayer Super Mario Bros. style deathmatch game";
     homepage = "https://github.com/mmatyas/supermariowar";

From 50631a06cf6d0b9e36fbbb9efb21ed5a445204ce Mon Sep 17 00:00:00 2001
From: dr56ekgbb <dr56ekgbb@mozmail.com>
Date: Mon, 7 Oct 2024 17:18:42 +0800
Subject: [PATCH 10/50] keyguard: 1.6.1 -> 1.6.2

---
 pkgs/by-name/ke/keyguard/deps.json   | 14 ++++++------
 pkgs/by-name/ke/keyguard/package.nix | 32 ++++++++++++++++------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json
index 3017ea8f5d9b..e4537313413f 100644
--- a/pkgs/by-name/ke/keyguard/deps.json
+++ b/pkgs/by-name/ke/keyguard/deps.json
@@ -562,9 +562,9 @@
    "module": "sha256-+zlsWwe1d5qQ0kC9H2hm+B+ANhnjgTku0ZxxzeWjtw4=",
    "pom": "sha256-pLWsZsp+eXmLWodQv0wst1w49OU561YWT8m5wxPb354="
   },
-  "androidx/profileinstaller#profileinstaller/1.4.0": {
-   "module": "sha256-Ob+ZeijY7tLLMZgZ9vNSobo6eLnJeQBPvgXia499Fgs=",
-   "pom": "sha256-1f45mBo7S3w5WFEw2gv8k4NQVMg0pDjT5j4GXl94vlU="
+  "androidx/profileinstaller#profileinstaller/1.4.1": {
+   "module": "sha256-bxHPZeS/hESZXMc+WqP4GwgtZucgwFkrxfyA0/c4UPc=",
+   "pom": "sha256-bd5DgntAU15AU9HFLUsiekEVVsKJ5lQAyaHMYeK0HOM="
   },
   "androidx/room#room-common/2.6.1": {
    "module": "sha256-DqB+9xQ6tSYswOSOgvO63WrfFks3AasqwPbwmej2PTs=",
@@ -641,11 +641,11 @@
   "com/android/application#com.android.application.gradle.plugin/8.7.0": {
    "pom": "sha256-7h5ZwC4JeVS67atxKbxn0cANSSfoAFPMLT2TB1hiPQU="
   },
-  "com/android/billingclient#billing-ktx/7.1.0": {
-   "pom": "sha256-j0sHmA2e27XbWm6gZ01a8znZkylNFaleKlHzr6pKKdE="
+  "com/android/billingclient#billing-ktx/7.1.1": {
+   "pom": "sha256-PMPwTqj+PMOAi75eG0Y/3jQzM1RDOqeRERHQzK6Dt9g="
   },
-  "com/android/billingclient#billing/7.1.0": {
-   "pom": "sha256-OxlqMhxa5qAsnRjnu6t87dmLNrnxkEDk2LwIo52jh1I="
+  "com/android/billingclient#billing/7.1.1": {
+   "pom": "sha256-S+5D2uFUS1LoqOUCefEyBPcrve1/ECdDCbG4ekhLdgU="
   },
   "com/android/databinding#baseLibrary/8.7.0": {
    "jar": "sha256-eUETcJ2rIbBsJis3lec8twj7rK5hcV80Nh4a9iN6GHA=",
diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix
index 513d55f1763c..75e7e438343c 100644
--- a/pkgs/by-name/ke/keyguard/package.nix
+++ b/pkgs/by-name/ke/keyguard/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   gradle,
   binutils,
-  dpkg,
   fakeroot,
   jdk17,
   fontconfig,
@@ -17,31 +16,42 @@
   cups,
   lcms2,
   alsa-lib,
+  makeDesktopItem,
+  copyDesktopItems,
 }:
 let
-  gradleBuildTask = ":desktopApp:packageDeb";
+  gradleBuildTask = ":desktopApp:createDistributable";
   gradleUpdateTask = gradleBuildTask;
+  desktopItems = [
+    (makeDesktopItem {
+      name = "Keyguard";
+      exec = "Keyguard";
+      icon = "Keyguard";
+      comment = "Keyguard";
+      desktopName = "Keyguard";
+    })
+  ];
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "keyguard";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "AChep";
     repo = "keyguard-app";
-    rev = "25b505f7679e40bd42f5ff59218deb0f2aac2083";
-    hash = "sha256-+WXeHcILukCheUzD59ffP+eMLXF8T5qm3NWNUugWIqg=";
+    rev = "eb36b853a7ac67a0f72d5684e6751d41969b07dd";
+    hash = "sha256-tMNc8OlYsiYmVtac2jngvrFZjgI7eNFVIxXUfIJUdK4=";
   };
 
-  inherit gradleBuildTask gradleUpdateTask;
+  inherit gradleBuildTask gradleUpdateTask desktopItems;
 
   nativeBuildInputs = [
     gradle
     binutils
-    dpkg
     fakeroot
     jdk17
     autoPatchelfHook
+    copyDesktopItems
   ];
 
   mitmCache = gradle.fetchDeps {
@@ -75,13 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
 
     mkdir -p $out/
-    dpkg -x ./desktopApp/build/compose/binaries/main/deb/*.deb $out
-    mv $out/opt/keyguard/* -t $out/
-    rm -r $out/opt
-    install -Dm0644 $out/lib/*-Keyguard.desktop $out/share/applications/Keyguard.desktop
-    substituteInPlace $out/share/applications/Keyguard.desktop \
-      --replace-fail 'Exec=/opt/keyguard/bin/Keyguard' 'Exec=Keyguard' \
-      --replace-fail 'Icon=/opt/keyguard/lib/Keyguard.png' 'Icon=Keyguard'
+    cp -a ./desktopApp/build/compose/binaries/main/app/*/* $out/
     install -Dm0644 $out/lib/Keyguard.png $out/share/pixmaps/Keyguard.png
 
     runHook postInstall

From 42b9d038489b36c4995cae6ba673fdb095f5699b Mon Sep 17 00:00:00 2001
From: Michael Adler <therisen06@gmail.com>
Date: Mon, 30 Sep 2024 17:04:01 +0200
Subject: [PATCH 11/50] notmuch-mailmover: migrate to pkgs/by-name, format, add
 updateScript

---
 .../no/notmuch-mailmover/package.nix}         | 19 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 13 insertions(+), 7 deletions(-)
 rename pkgs/{applications/networking/mailreaders/notmuch/notmuch-mailmover.nix => by-name/no/notmuch-mailmover/package.nix} (80%)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix b/pkgs/by-name/no/notmuch-mailmover/package.nix
similarity index 80%
rename from pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix
rename to pkgs/by-name/no/notmuch-mailmover/package.nix
index 3b6d2ee9285f..cccb07af7796 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/notmuch-mailmover.nix
+++ b/pkgs/by-name/no/notmuch-mailmover/package.nix
@@ -1,8 +1,10 @@
-{ notmuch
-, lib
-, fetchFromGitHub
-, rustPlatform
-, installShellFiles
+{
+  notmuch,
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  installShellFiles,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "notmuch-mailmover";
@@ -29,12 +31,17 @@ rustPlatform.buildRustPackage rec {
       --zsh share/_notmuch-mailmover
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Application to assign notmuch tagged mails to IMAP folders";
     mainProgram = "notmuch-mailmover";
     homepage = "https://github.com/michaeladler/notmuch-mailmover/";
     license = licenses.asl20;
-    maintainers = with maintainers; [ michaeladler archer-65 ];
+    maintainers = with maintainers; [
+      michaeladler
+      archer-65
+    ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fff5e8a232b1..70aa238415da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31656,7 +31656,6 @@ with pkgs;
     pythonPackages = python3Packages;
   };
 
-  notmuch-mailmover = callPackage ../applications/networking/mailreaders/notmuch/notmuch-mailmover.nix { };
 
   notmuch-mutt = callPackage ../applications/networking/mailreaders/notmuch/mutt.nix { };
 

From be2e87f600d37da727538d9c609276ef8bc3f1ad Mon Sep 17 00:00:00 2001
From: Michael Adler <therisen06@gmail.com>
Date: Mon, 7 Oct 2024 11:35:23 +0200
Subject: [PATCH 12/50] notmuch-mailmover: 0.3.0 -> 0.4.0

---
 pkgs/by-name/no/notmuch-mailmover/package.nix | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/no/notmuch-mailmover/package.nix b/pkgs/by-name/no/notmuch-mailmover/package.nix
index cccb07af7796..6d7c1120cdc5 100644
--- a/pkgs/by-name/no/notmuch-mailmover/package.nix
+++ b/pkgs/by-name/no/notmuch-mailmover/package.nix
@@ -3,28 +3,40 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  pkg-config,
+  lua5_4,
   installShellFiles,
   nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "notmuch-mailmover";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "michaeladler";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-b+6vQ7m49+9RQ+GA75VgOAJej/2zeu5JAje/OazsEsk=";
+    hash = "sha256-MqDmojVkSPNhpls+O5CrFuo2b7lfFfg1cLDg5PjCF7U=";
   };
 
-  cargoHash = "sha256-qHSmfR5iUBXq8OQJkGCVA4JnExXisN2OIAVKiVMUaZo=";
+  cargoHash = "sha256-xFnA6f0X5BAmZEDwR4/hKwIKTr5yNK+CJbo3/o5MmoI=";
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+  ];
 
-  buildInputs = [ notmuch ];
+  buildInputs = [
+    notmuch
+    lua5_4
+  ];
 
   postInstall = ''
     installManPage share/notmuch-mailmover.1.gz
+
+    mkdir -p $out/share/notmuch-mailmover
+    cp -dR example $out/share/notmuch-mailmover/
+
     installShellCompletion --cmd notmuch-mailmover \
       --bash share/notmuch-mailmover.bash \
       --fish share/notmuch-mailmover.fish \

From 96dfef02283a82b229404d96bb7064ab61082276 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 7 Oct 2024 19:11:35 -0600
Subject: [PATCH 13/50] wrangler: 3.72.1 -> 3.80.1

---
 pkgs/by-name/wr/wrangler/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index 0ad2886cbb69..c18ef2dd972b 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -13,18 +13,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wrangler";
-  version = "3.72.1";
+  version = "3.80.1";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "workers-sdk";
     rev = "wrangler@${finalAttrs.version}";
-    hash = "sha256-LidJr+sYXArsnHGjR0akFm557SIHP6gzErifYkZqsRk=";
+    hash = "sha256-9ClosoDIT+yP2dvNenHW2RSxLimOT3znXD+Pq+N6cQA=";
   };
 
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-USMDUz+qId6aSoCNxmzPMi3YCiakZ9jyLjEhujhVD8I=";
+    hash = "sha256-ld2+WUVJ2DtiwWmsxkYsU3ft3knHJvjMwSwZlk7reG8=";
   };
 
   buildInputs = [
@@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   # so I simply removed it
   postBuild = ''
     rm -fr packages/vitest-pool-workers
+    NODE_ENV="production" pnpm --filter workers-shared run build
     NODE_ENV="production" pnpm --filter miniflare run build
     NODE_ENV="production" pnpm --filter wrangler run build
   '';
@@ -62,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     cp -r node_modules $out/lib
     cp -r packages/miniflare $out/lib/packages
     cp -r packages/workers-tsconfig $out/lib/packages
+    cp -r packages/workers-shared $out/lib/packages
     cp -r packages/wrangler/node_modules $out/lib/packages/wrangler
     cp -r packages/wrangler/templates $out/lib/packages/wrangler
     cp -r packages/wrangler/wrangler-dist $out/lib/packages/wrangler

From 06f6a156af6a30023deeeefc4bb30395873881d6 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Tue, 8 Oct 2024 06:09:38 -0700
Subject: [PATCH 14/50] corerad: 1.3.0 -> 1.3.1

Release notes posted at https://github.com/mdlayher/corerad/releases/tag/v1.3.1
---
 pkgs/tools/networking/corerad/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix
index 4caad92fc489..fd6fee9a2a7c 100644
--- a/pkgs/tools/networking/corerad/default.nix
+++ b/pkgs/tools/networking/corerad/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "corerad";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "mdlayher";
     repo = "corerad";
     rev = "v${version}";
-    hash = "sha256-vIKmE9Lq8We7BTMUHIgnOU370ZnNW7YG75WALWdG+4A=";
+    hash = "sha256-tVK4chDV26vpuTaqVWe498j8ijZN2OOhe97LLE+xK9Y=";
   };
 
-  vendorHash = "sha256-dsqFleXpL8yAcdigqxJsk/Sxvp9OTqbGK3xDEiHkM8A=";
+  vendorHash = "sha256-cmfRN7mU99TBtYmCsuHzliYqdfUHzDOFvKbnTZJqhLg=";
 
   # Since the tarball pulled from GitHub doesn't contain git tag information,
   # we fetch the expected tag's timestamp from a file in the root of the

From 4e6315a94441bb105c77e162781ec9d585bbe642 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Tue, 8 Oct 2024 06:11:43 -0700
Subject: [PATCH 15/50] corerad: add updateScript

---
 pkgs/tools/networking/corerad/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix
index fd6fee9a2a7c..b0a65f59189c 100644
--- a/pkgs/tools/networking/corerad/default.nix
+++ b/pkgs/tools/networking/corerad/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, nixosTests }:
+{ lib, buildGoModule, fetchFromGitHub, nixosTests, gitUpdater }:
 
 buildGoModule rec {
   pname = "corerad";
@@ -21,8 +21,11 @@ buildGoModule rec {
     ldflags+=" -X github.com/mdlayher/corerad/internal/build.linkTimestamp=$(<.gittagtime)"
   '';
 
-  passthru.tests = {
-    inherit (nixosTests) corerad;
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "v"; };
+    tests = {
+      inherit (nixosTests) corerad;
+    };
   };
 
   meta = with lib; {

From 664765284f883f4f7e38197f1312dc535ce0f702 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Tue, 8 Oct 2024 06:15:33 -0700
Subject: [PATCH 16/50] corerad: move to pkgs/by-name

---
 .../corerad/default.nix => by-name/co/corerad/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/networking/corerad/default.nix => by-name/co/corerad/package.nix} (100%)

diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/by-name/co/corerad/package.nix
similarity index 100%
rename from pkgs/tools/networking/corerad/default.nix
rename to pkgs/by-name/co/corerad/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 787f20384e3c..0901cf3c9535 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25566,8 +25566,6 @@ with pkgs;
 
   coredns = callPackage ../servers/dns/coredns { };
 
-  corerad = callPackage ../tools/networking/corerad { };
-
   cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { };
 
   cpupower-gui = python3Packages.callPackage ../os-specific/linux/cpupower-gui {

From dc0278581562cbcf8fc38e40a2c6e2887c5fa29e Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Tue, 8 Oct 2024 06:15:59 -0700
Subject: [PATCH 17/50] corerad: nixfmt

---
 pkgs/by-name/co/corerad/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/corerad/package.nix b/pkgs/by-name/co/corerad/package.nix
index b0a65f59189c..462cd493e830 100644
--- a/pkgs/by-name/co/corerad/package.nix
+++ b/pkgs/by-name/co/corerad/package.nix
@@ -1,4 +1,10 @@
-{ lib, buildGoModule, fetchFromGitHub, nixosTests, gitUpdater }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nixosTests,
+  gitUpdater,
+}:
 
 buildGoModule rec {
   pname = "corerad";
@@ -32,7 +38,10 @@ buildGoModule rec {
     homepage = "https://github.com/mdlayher/corerad";
     description = "Extensible and observable IPv6 NDP RA daemon";
     license = licenses.asl20;
-    maintainers = with maintainers; [ mdlayher jmbaur ];
+    maintainers = with maintainers; [
+      mdlayher
+      jmbaur
+    ];
     platforms = platforms.linux;
     mainProgram = "corerad";
   };

From 33ea4759f56907971893d4aadc0f6aaface1e39f Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 9 Oct 2024 08:34:00 +0800
Subject: [PATCH 18/50] libime: 1.1.8 -> 1.1.9

Diff: https://github.com/fcitx/libime/compare/1.1.8...1.1.9
---
 pkgs/development/libraries/libime/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix
index a1f7f50a2575..c7bd59d016cf 100644
--- a/pkgs/development/libraries/libime/default.nix
+++ b/pkgs/development/libraries/libime/default.nix
@@ -13,29 +13,29 @@
 let
   tableVer = "20240108";
   table = fetchurl {
-    url = "https://download.fcitx-im.org/data/table-${tableVer}.tar.gz";
-    hash = "sha256-cpxZbYaQfecnx00Pw/0kHEBsXevStMt07v4CI4funa4=";
+    url = "https://download.fcitx-im.org/data/table-${tableVer}.tar.zst";
+    hash = "sha256-Pp2HsEo5PxMXI0csjqqGDdI8N4o9T2qQBVE7KpWzYUs=";
   };
-  arpaVer = "20230712";
+  arpaVer = "20241001";
   arpa = fetchurl {
-    url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.xz";
-    hash = "sha256-ut1iwWxjc3h6D9qPCc1FLRL2DVhohW9lHO7PGge6ujI=";
+    url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.zst";
+    hash = "sha256-VJNOc5Zus46k/o6unGHf5IavN9octTFqBrGcfSieMGM=";
   };
-  dictVer = "20240416";
+  dictVer = "20241001";
   dict = fetchurl {
     url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.zst";
-    hash = "sha256-nCYsv6MGy0w7BVmRt+IrRT4PJn8gzrXZ2eX4++Ty02c=";
+    hash = "sha256-0zE7iKaGIKI7yNX5VkzxtniEjcevVBxPXwIZjlo2hr8=";
   };
 in
 stdenv.mkDerivation rec {
   pname = "libime";
-  version = "1.1.8";
+  version = "1.1.9";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "libime";
     rev = version;
-    hash = "sha256-uT0V1CXPaF2FctsndxVszS7Qske6vObbOA4aOnmbdQY=";
+    hash = "sha256-Ky4ERYQRUiPn+EYrgfmfHxdVp31a1oD4nevDniPOT20=";
     fetchSubmodules = true;
   };
 

From 5405b9ab5777dd21f53621ffe6c5737accfc9579 Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 9 Oct 2024 08:34:07 +0800
Subject: [PATCH 19/50] fcitx5: 5.1.10 -> 5.1.11

Diff: https://github.com/fcitx/fcitx5/compare/5.1.10...5.1.11
---
 pkgs/tools/inputmethods/fcitx5/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index 7fdee4f166a3..2a591c0d68d0 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -44,13 +44,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "fcitx5";
-  version = "5.1.10";
+  version = "5.1.11";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-rMtCzFe3imF/uY0kXM2ivyt11r5qNTNab7GkWzdeC/g=";
+    hash = "sha256-8J2gr2quZvJELd3zzhgwZUowjkOylpM6VZGJ1G3VomI=";
   };
 
   prePatch = ''

From 24f05c2a4e9b441326433682eead9511bcad4797 Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 9 Oct 2024 08:34:14 +0800
Subject: [PATCH 20/50] fcitx5-anthy: 5.1.4 -> 5.1.5

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
index afe410f9e295..ea9a20944110 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-anthy";
-  version = "5.1.4";
+  version = "5.1.5";
 
   src = fetchurl {
     url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.zst";
-    hash = "sha256-e0X00plXfRgoSkhTDVJfububin8h+NiGzrnOSIaSa7g=";
+    hash = "sha256-heSO2eArdSnOmIg7JG8vOo5y3g5dSPOuXkUfeNqKzSA=";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules pkg-config zstd ];

From 878b47bfcf847f8b4d622a1482294c2a1c7b5a88 Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 9 Oct 2024 08:34:18 +0800
Subject: [PATCH 21/50] fcitx5-chewing: 5.1.5 -> 5.1.6

Diff: https://github.com/fcitx/fcitx5-chewing/compare/5.1.5...5.1.6
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
index d7e03bafdb89..550efad6264e 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-chewing";
-  version = "5.1.5";
+  version = "5.1.6";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-qXIcIByfgfWRe0rhetTHRyA7RqUHIP6FATwvtrfXNwQ=";
+    hash = "sha256-WSu78k0udlXxiQ1sAqB/LKmVfThxizshH5C9q2CfZLI=";
   };
 
   nativeBuildInputs = [

From ca3bb44ee2a05e04cda3e228b2cbd8ae8b8565c4 Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 9 Oct 2024 08:34:22 +0800
Subject: [PATCH 22/50] fcitx5-chinese-addons: 5.1.6 -> 5.1.7

Diff: https://github.com/fcitx/fcitx5-chinese-addons/compare/5.1.6...5.1.7
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
index 2ad2ef25b9d8..a9f5cf311613 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
@@ -32,13 +32,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-chinese-addons";
-  version = "5.1.6";
+  version = "5.1.7";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-Vq7/5UBoejylXLiUIbpxZ7P3HI8+YNVDweP+uOMnCWc=";
+    hash = "sha256-vtIzm8ia5hC0JdsGNopIHdAd8RDVgrbtVvj1Jh+gE94=";
   };
 
   nativeBuildInputs = [

From 1279ee714f313955f7a5ee83b019aff47608880d Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 9 Oct 2024 08:34:26 +0800
Subject: [PATCH 23/50] fcitx5-configtool: 5.1.6 -> 5.1.7

Diff: https://github.com/fcitx/fcitx5-configtool/compare/5.1.6...5.1.7
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
index 432ee0a6e73e..a34a2e418f00 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-configtool";
-  version = "5.1.6";
+  version = "5.1.7";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-ZB0YH5IYYjYunsVQtFaVVBW+zkTn/bgtMEWE376IoiU=";
+    hash = "sha256-6Slh1uZglRNBLQ1ziKf2xaP+NK6Abug/6TZcYy2HFPQ=";
   };
 
   cmakeFlags = [

From c5ae0643de7c7bd378fcc2b586ae4d58652979af Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 9 Oct 2024 08:34:31 +0800
Subject: [PATCH 24/50] fcitx5-hangul: 5.1.4 -> 5.1.5

Diff: https://github.com/fcitx/fcitx5-hangul/compare/5.1.4...5.1.5
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
index 96741f898cda..b2511be8de1d 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-hangul";
-  version = "5.1.4";
+  version = "5.1.5";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-v5XZqsQqA74NSXTPBU77C6GFlnyC/wFFPOOYn8lqidc=";
+    hash = "sha256-+IXsMT87Dc+Ad4r6/U+NLYo+04j+I58Cqz99v4Yr0uc=";
   };
 
   nativeBuildInputs = [

From b3adf6299d2186368f408817126493dcf21fba34 Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 9 Oct 2024 08:34:36 +0800
Subject: [PATCH 25/50] fcitx5-m17n: 5.1.1 -> 5.1.2

Diff: https://github.com/fcitx/fcitx5-m17n/compare/5.1.1...5.1.2
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
index d1e96090000d..ff3c2124a8d6 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-m17n";
-  version = "5.1.1";
+  version = "5.1.2";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-5zXLbKHcTMrX+Ux9aN2jl15Go58m7Fr7ZkFyvDGWKaw=";
+    hash = "sha256-LBFPkkBaKcVtTLKswLlr1EdCoY63nToa8I7ea1/MZeg=";
   };
 
   nativeBuildInputs = [

From 2f04f70dab63cc60fb3f95eee535a0922a3a9186 Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 9 Oct 2024 08:34:40 +0800
Subject: [PATCH 26/50] libsForQt5.fcitx5-qt: 5.1.6 -> 5.1.7

Diff: https://github.com/fcitx/fcitx5-qt/compare/5.1.6...5.1.7
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index d6e76af14d66..4e8eaa788782 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -14,13 +14,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "fcitx5-qt${majorVersion}";
-  version = "5.1.6";
+  version = "5.1.7";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-qt";
     rev = version;
-    hash = "sha256-ptAJNc7zhXQ+nFfjmVQd5nZvN5lyk0jV6AHBKQkUGOM=";
+    hash = "sha256-C/LRpC6w/2cb/+xAwsmOVEvWmHMtJKD1pAwMoeLVIYY=";
   };
 
   postPatch = ''

From 676a38df651e8d59f5fd42607c55bbaf88458a7c Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 9 Oct 2024 08:34:47 +0800
Subject: [PATCH 27/50] fcitx5-rime: 5.1.8 -> 5.1.9

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
index e9a042852b08..1b34b1260aac 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-rime";
-  version = "5.1.8";
+  version = "5.1.9";
 
   src = fetchurl {
     url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.zst";
-    hash = "sha256-nnYk/nGbNGbl7Y39AueIltYA2fd43Gb1SmQu5VZRycM=";
+    hash = "sha256-+aIb7ktmhKb6ixhvzCG6GLeEUfS3QHJmEZ3YGE5YrZg=";
   };
 
   cmakeFlags = [

From bccbf436e3c2ba34f80ed0e8e27d7902af9edf9d Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 9 Oct 2024 08:34:51 +0800
Subject: [PATCH 28/50] fcitx5-skk: 5.1.4 -> 5.1.5

Diff: https://github.com/fcitx/fcitx5-skk/compare/5.1.4...5.1.5
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
index ae43cd73e510..c2679dbcd71d 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-skk";
-  version = "5.1.4";
+  version = "5.1.5";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-K+AblsG/LwE1httvRCukMEa1KEDaAUWNLUl7MWyy2ow=";
+    hash = "sha256-wv5vX9eFlBUY7x4v9U+OuhKgX6V/b3iTaCvAIwJO10o=";
   };
 
   nativeBuildInputs = [

From ca170430fc213247ab3180bf95247f25facbc64b Mon Sep 17 00:00:00 2001
From: Vonfry <mail@vonfry.name>
Date: Wed, 9 Oct 2024 08:34:57 +0800
Subject: [PATCH 29/50] fcitx5-unikey: 5.1.4 -> 5.1.5

Diff: https://github.com/fcitx/fcitx5-unikey/compare/5.1.4...5.1.5
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
index ef9658570593..23b19f21a05a 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-unikey";
-  version = "5.1.4";
+  version = "5.1.5";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-unikey";
     rev = version;
-    hash = "sha256-BwKlhb3nIzBgD3XSuDOH6f2sFbtx8cc4R4qC5ZQrZus=";
+    hash = "sha256-CcyDK+knBXh2P+g3aB0Cv8F5BX7uCRbYwHjMEYo9k8A=";
   };
 
   nativeBuildInputs = [

From 304eea6256d6f1377e452dab6ce0f7722b32ef95 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Wed, 9 Oct 2024 00:15:22 +0200
Subject: [PATCH 30/50] =?UTF-8?q?tomato-c:=202023-8-21=20=E2=86=92=202024-?=
 =?UTF-8?q?4-19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/to/tomato-c/package.nix | 43 ++++++++++++----------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/to/tomato-c/package.nix b/pkgs/by-name/to/tomato-c/package.nix
index 243b21b574ef..613dcfec4b51 100644
--- a/pkgs/by-name/to/tomato-c/package.nix
+++ b/pkgs/by-name/to/tomato-c/package.nix
@@ -1,39 +1,29 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, fetchpatch
-, libnotify
-, makeWrapper
-, mpv
-, ncurses
-, pkg-config
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  libnotify,
+  makeWrapper,
+  mpv,
+  ncurses,
+  pkg-config,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tomato-c";
-  version = "unstable-2023-08-21";
+  version = "0-unstable-2024-04-19";
 
   src = fetchFromGitHub {
     owner = "gabrielzschmitz";
     repo = "Tomato.C";
-    rev = "6e43e85aa15f3d96811311a3950eba8ce9715634";
-    hash = "sha256-RpKkQ7xhM2XqfZdXra0ju0cTBL3Al9NMVQ/oleFydDs=";
+    rev = "b3b85764362a7c120f3312f5b618102a4eac9f01";
+    hash = "sha256-7i+vn1dAK+bAGpBlKTnSBUpyJyRiPc7AiUF/tz+RyTI=";
   };
 
-  patches = [
-    # Adds missing function declarations required by newer versions of clang.
-    (fetchpatch {
-      url = "https://github.com/gabrielzschmitz/Tomato.C/commit/ad6d4c385ae39d655a716850653cd92431c1f31e.patch";
-      hash = "sha256-3ormv59Ce4rOmeyL30QET3CCUIOrRYMquub+eIQsMW8=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace Makefile \
       --replace-fail "sudo " ""
-    # Need to define _ISOC99_SOURCE to use `snprintf` on Darwin
-    substituteInPlace config.mk \
-      --replace-fail -D_POSIX_C_SOURCE -D_ISOC99_SOURCE
     substituteInPlace notify.c \
       --replace-fail "/usr/local" "${placeholder "out"}"
     substituteInPlace util.c \
@@ -65,7 +55,12 @@ stdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     for file in $out/bin/*; do
       wrapProgram $file \
-        --prefix PATH : ${lib.makeBinPath [ libnotify mpv ]}
+        --prefix PATH : ${
+          lib.makeBinPath [
+            libnotify
+            mpv
+          ]
+        }
     done
   '';
 

From 39d103862d80a053e21df95454e78b2fc234ab1e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 10 Oct 2024 15:52:09 +0200
Subject: [PATCH 31/50] python312Packages.django_5: 5.1.1 -> 5.1.2

https://docs.djangoproject.com/en/5.1/releases/5.1.2/
---
 pkgs/development/python-modules/django/5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/5.nix b/pkgs/development/python-modules/django/5.nix
index 6cf85445c402..39be46703e68 100644
--- a/pkgs/development/python-modules/django/5.nix
+++ b/pkgs/development/python-modules/django/5.nix
@@ -43,7 +43,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.1.1";
+  version = "5.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-4w5MSu3xdF9Pl0iRcD6bOgUF0tLMiZdCWt3JKsx/Rqc=";
+    hash = "sha256-HQt7et2PBG5rPCFCl64CIr+jTpty0a5IxJ0rKP6QCBM=";
   };
 
   patches =

From a6a3f79adb3ce9314fc81eb08fae373e7a0791a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Tue, 8 Oct 2024 23:25:38 +0200
Subject: [PATCH 32/50] wasm-tools: 1.217.0 -> 1.219.1

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

diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix
index ebfa6875a6f6..ff4c2a198a7f 100644
--- a/pkgs/tools/misc/wasm-tools/default.nix
+++ b/pkgs/tools/misc/wasm-tools/default.nix
@@ -5,19 +5,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-tools";
-  version = "1.217.0";
+  version = "1.219.1";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-nxfYoR0ba0As00WbahSVFNItSlleMmITqs8eJabjD/U=";
+    hash = "sha256-9FAq6wcTXXFdQ5kcpkj2KqTcd8C8zXmhRWW/ajCJUMI=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
-  cargoHash = "sha256-mBSRJYSE3HmeWhnW4nFF8uFnUJaZ6wdqsq+GnL6SZWc=";
+  cargoHash = "sha256-moBRkUbcIGZaVdcE3yDtREtG4unN4n5yA7edpnrUFg4=";
   cargoBuildFlags = [ "--package" "wasm-tools" ];
   cargoTestFlags = [ "--all" ] ++
     # Due to https://github.com/bytecodealliance/wasm-tools/issues/1820

From 3bc8c4ab7cd4a7a9ff25cd41297f38b1c0bfb726 Mon Sep 17 00:00:00 2001
From: Philip White <philip@0xfff.me>
Date: Sat, 12 Oct 2024 23:02:03 -0700
Subject: [PATCH 33/50] oink: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/by-name/oi/oink/package.nix b/pkgs/by-name/oi/oink/package.nix
index 405e807e4c33..fb39bf80247c 100644
--- a/pkgs/by-name/oi/oink/package.nix
+++ b/pkgs/by-name/oi/oink/package.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "oink";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "rlado";
     repo = "oink";
     rev = "v${version}";
-    hash = "sha256-nA1M+TIj2mWhaftS5y4D2zIs7HAI4eDRjSdmLUifGKg=";
+    hash = "sha256-MBNEMIrpJdXzMjmNwmKXTIzPNNGalElhIxmMU4y6zXo=";
   };
 
   vendorHash = null;
@@ -25,6 +25,6 @@ buildGoModule rec {
     homepage = "https://github.com/rlado/oink";
     license = lib.licenses.mit;
     mainProgram = "oink";
-    maintainers = with lib.maintainers; [ jtbx ];
+    maintainers = with lib.maintainers; [ jtbx pmw ];
   };
 }

From 2263b9182713b26996d48e14d9f43e58e2c56031 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Oct 2024 10:11:19 +0000
Subject: [PATCH 34/50] pbpctrl: 0.1.5 -> 0.1.6

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

diff --git a/pkgs/applications/audio/pbpctrl/default.nix b/pkgs/applications/audio/pbpctrl/default.nix
index 9567a75de613..282fa976def7 100644
--- a/pkgs/applications/audio/pbpctrl/default.nix
+++ b/pkgs/applications/audio/pbpctrl/default.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pbpctrl";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "qzed";
     repo = "${pname}";
     rev = "v${version}";
-    hash = "sha256-tOdKXYfeO+HsYIDDU3fDb76ytRHVOcIqffEjFnLwOTI=";
+    hash = "sha256-V7wfEXJ0tVQNsi1OFU1Dk2d9ImsNFRriGutpJzh2tV8=";
   };
 
-  cargoHash = "sha256-yP4tsXCAPE1KUDU5oBIejL4kACK1dNXK7Kmw37VMexM=";
+  cargoHash = "sha256-8D+WD5bOxoUhw4a7SUr+D2gn1NA7OkmoCcALO9HY8Qk=";
 
   nativeBuildInputs = [ pkg-config protobuf ];
   buildInputs = [ dbus ];

From a8c8ff50e637b6b18e0d223ead9c5a2bc547a129 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Oct 2024 10:35:31 +0000
Subject: [PATCH 35/50] cargo-benchcmp: 0.4.4 -> 0.4.5

---
 pkgs/development/tools/rust/cargo-benchcmp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-benchcmp/default.nix b/pkgs/development/tools/rust/cargo-benchcmp/default.nix
index 4ab9cb65d6f5..132aa0bc2ffc 100644
--- a/pkgs/development/tools/rust/cargo-benchcmp/default.nix
+++ b/pkgs/development/tools/rust/cargo-benchcmp/default.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-benchcmp";
-  version = "0.4.4";
+  version = "0.4.5";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "cargo-benchcmp";
     rev = version;
-    hash = "sha256-pg3/VUC1DQ7GbSQDfVZ0WNisXvzXy0O0pr2ik2ar2h0=";
+    hash = "sha256-J8KFI0V/mOhUlYtVnFAQgPIpXL9/dLhOFxSly4bR00I=";
   };
 
-  cargoHash = "sha256-vxy9Ym3Twx034I1E5fWNnbP1ttfLolMbO1IgRiPfhRw=";
+  cargoHash = "sha256-2V9ILHnDsUI+x3f5o+V7p8rPUKf33PAkpyTabCPdd0g=";
 
   patches = [
     # patch the binary path so tests can find the binary when `--target` is present

From e9a36b94f80b2d8076400b204bfe05ac15f98cbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Oct 2024 10:35:35 +0000
Subject: [PATCH 36/50] qmk_hid: 0.1.11 -> 0.1.12

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

diff --git a/pkgs/tools/misc/qmk_hid/default.nix b/pkgs/tools/misc/qmk_hid/default.nix
index f838f1b8ece4..f620dabb19cd 100644
--- a/pkgs/tools/misc/qmk_hid/default.nix
+++ b/pkgs/tools/misc/qmk_hid/default.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "qmk_hid";
-  version = "0.1.11";
+  version = "0.1.12";
 
   src = fetchFromGitHub {
     owner = "FrameworkComputer";
     repo = "qmk_hid";
     rev = "v${version}";
-    hash = "sha256-k5cZcrjen7nNJM9mKQEwNTVfBPawXwbwNlCyTARdH/g=";
+    hash = "sha256-wJi7FQrvMbdTwvbbjBnzmxupMbEuM8TeZ0JIK5ulQKI=";
   };
 
-  cargoHash = "sha256-GrerrNDoSFtOEAf0vB9MlkBl+yLnzd/szrpFsAmkB6s=";
+  cargoHash = "sha256-X8pBv4dFiiLDKDjyW3XpVOdzq5c5/4GcRL6jnJ8Rf1A=";
 
   nativeBuildInputs = [
     pkg-config

From 7ac7bd10e8c58a3fb96988c03f56b873222fbd00 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 12 Oct 2024 15:51:59 +0200
Subject: [PATCH 37/50] eslint_d: 14.0.3 -> 14.1.1

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

diff --git a/pkgs/development/tools/eslint_d/default.nix b/pkgs/development/tools/eslint_d/default.nix
index 6cd40d882f3b..2db75a73cffc 100644
--- a/pkgs/development/tools/eslint_d/default.nix
+++ b/pkgs/development/tools/eslint_d/default.nix
@@ -2,16 +2,16 @@
 
 buildNpmPackage rec {
   pname = "eslint_d";
-  version = "14.0.3";
+  version = "14.1.1";
 
   src = fetchFromGitHub {
     owner = "mantoni";
     repo = "eslint_d.js";
     rev = "v${version}";
-    hash = "sha256-r0pb9qbWfyVUHuHrNhiYm+0zlF5WId3dH7QCubzZDts=";
+    hash = "sha256-r+AQFFzB3PhvER6oVHpqQiFuaHuT+2O8gL2zu8aCTbs=";
   };
 
-  npmDepsHash = "sha256-0Db18y7MUnnnr8v+bBOUhGBCsZcZ9OGtGqSVH7/wYQc=";
+  npmDepsHash = "sha256-XOFRzGPrisXE8GyqVO5xms+o9OwA9w0y+uJkcdyX+z0=";
 
   dontNpmBuild = true;
 

From e7c04b24148a11d25a6157db7e07264520f24328 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 12 Oct 2024 16:05:16 +0200
Subject: [PATCH 38/50] eslint_d: Add passthru.tests.version

---
 pkgs/development/tools/eslint_d/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/eslint_d/default.nix b/pkgs/development/tools/eslint_d/default.nix
index 2db75a73cffc..6e6607372db9 100644
--- a/pkgs/development/tools/eslint_d/default.nix
+++ b/pkgs/development/tools/eslint_d/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildNpmPackage, fetchFromGitHub }:
+{ lib, buildNpmPackage, fetchFromGitHub, eslint_d, testers }:
 
 buildNpmPackage rec {
   pname = "eslint_d";
@@ -15,6 +15,8 @@ buildNpmPackage rec {
 
   dontNpmBuild = true;
 
+  passthru.tests.version = testers.testVersion { package = eslint_d; version = src.rev; };
+
   meta = with lib; {
     description = "Makes eslint the fastest linter on the planet";
     homepage = "https://github.com/mantoni/eslint_d.js";

From 79ad10e0f4e477fe9e6dc4a89a080490ccc7e5fe Mon Sep 17 00:00:00 2001
From: L-Trump <37738631+L-Trump@users.noreply.github.com>
Date: Sun, 13 Oct 2024 21:52:28 +0800
Subject: [PATCH 39/50] easytier: 2.0.0 -> 2.0.3

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

diff --git a/pkgs/by-name/ea/easytier/package.nix b/pkgs/by-name/ea/easytier/package.nix
index 68f63261c8a6..c994c1eec670 100644
--- a/pkgs/by-name/ea/easytier/package.nix
+++ b/pkgs/by-name/ea/easytier/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "easytier";
-  version = "2.0.0";
+  version = "2.0.3";
 
   src = fetchFromGitHub {
     owner = "EasyTier";
     repo = "EasyTier";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Qej6g9oxY6Wvv7jbyK9TN7QE7sfrdref7XPj10mSKUg=";
+    hash = "sha256-0bS2VzddRZcFGmHugR0yXHjHqz06tpL4+IhQ6ReaU4Y=";
   };
 
-  cargoHash = "sha256-UegTL9ZdqLQYtcg8sJSGkie3ezt9OFMX0iVm/B1D91I=";
+  cargoHash = "sha256-AkEgEymgq2asxT4oR+NtGe8bUEPRUskVvwIJYrCD7xs=";
 
   nativeBuildInputs = [ protobuf ];
 

From 6b6ffbd802e4086a9555259a456e6f0da1f8a88f Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sun, 13 Oct 2024 15:45:46 +0200
Subject: [PATCH 40/50] eslint_d: Move to pkgs/by-name/ folder

---
 .../eslint_d/default.nix => by-name/es/eslint_d/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/tools/eslint_d/default.nix => by-name/es/eslint_d/package.nix} (100%)

diff --git a/pkgs/development/tools/eslint_d/default.nix b/pkgs/by-name/es/eslint_d/package.nix
similarity index 100%
rename from pkgs/development/tools/eslint_d/default.nix
rename to pkgs/by-name/es/eslint_d/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d21ffc081ef..74f0815f04ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -745,8 +745,6 @@ with pkgs;
 
   erosmb = callPackage ../tools/security/erosmb { };
 
-  eslint_d = callPackage ../development/tools/eslint_d { };
-
   oauth2c = callPackage ../tools/security/oauth2c { };
 
   octodns = python3Packages.callPackage ../tools/networking/octodns { };

From 25ede4e8fdbf6552ebb73a4a087e9e819ce87f17 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 13 Oct 2024 11:52:16 -0300
Subject: [PATCH 41/50] luakit: clear input parameters

---
 pkgs/applications/networking/browsers/luakit/default.nix | 5 ++++-
 pkgs/top-level/all-packages.nix                          | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix
index 95b6958cd51c..dbdf7bd97988 100644
--- a/pkgs/applications/networking/browsers/luakit/default.nix
+++ b/pkgs/applications/networking/browsers/luakit/default.nix
@@ -7,12 +7,15 @@
 , glib-networking
 , gst_all_1
 , gtk3
-, luafilesystem
+, luajitPackages
 , luajit
 , sqlite
 , webkitgtk_4_0
 }:
 
+let
+  inherit (luajitPackages) luafilesystem;
+in
 stdenv.mkDerivation rec {
   pname = "luakit";
   version = "2.3.3";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b15df4f0cfde..525acadddf3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30778,9 +30778,7 @@ with pkgs;
 
   lime = callPackage ../development/libraries/lime { };
 
-  luakit = callPackage ../applications/networking/browsers/luakit {
-    inherit (luajitPackages) luafilesystem;
-  };
+  luakit = callPackage ../applications/networking/browsers/luakit { };
 
   looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { };
 

From d41f0ad3d8002f1024b13305679753c9be7bbf80 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 13 Oct 2024 11:58:23 -0300
Subject: [PATCH 42/50] luakit: migrate to by-name

---
 .../luakit/default.nix => by-name/lu/luakit/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/browsers/luakit/default.nix => by-name/lu/luakit/package.nix} (100%)

diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/by-name/lu/luakit/package.nix
similarity index 100%
rename from pkgs/applications/networking/browsers/luakit/default.nix
rename to pkgs/by-name/lu/luakit/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 525acadddf3c..55f73d0d6e9a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30778,8 +30778,6 @@ with pkgs;
 
   lime = callPackage ../development/libraries/lime { };
 
-  luakit = callPackage ../applications/networking/browsers/luakit { };
-
   looking-glass-client = callPackage ../applications/virtualization/looking-glass-client { };
 
   ltc-tools = callPackage ../applications/audio/ltc-tools { };

From 3539d051c12187589158f2b0af68b5c57101887e Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sun, 13 Oct 2024 12:11:10 -0300
Subject: [PATCH 43/50] luakit: hammer

- nixfmt-rfc-style
- finalAttrs
- strictDeps
- no nested with
---
 pkgs/by-name/lu/luakit/package.nix | 99 ++++++++++++++++--------------
 1 file changed, 53 insertions(+), 46 deletions(-)

diff --git a/pkgs/by-name/lu/luakit/package.nix b/pkgs/by-name/lu/luakit/package.nix
index dbdf7bd97988..d9f46d3b79b9 100644
--- a/pkgs/by-name/lu/luakit/package.nix
+++ b/pkgs/by-name/lu/luakit/package.nix
@@ -1,53 +1,58 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, pkg-config
-, wrapGAppsHook3
-, help2man
-, glib-networking
-, gst_all_1
-, gtk3
-, luajitPackages
-, luajit
-, sqlite
-, webkitgtk_4_0
+{
+  lib,
+  fetchFromGitHub,
+  glib-networking,
+  gst_all_1,
+  gtk3,
+  help2man,
+  luajit,
+  luajitPackages,
+  pkg-config,
+  sqlite,
+  stdenv,
+  webkitgtk_4_0,
+  wrapGAppsHook3,
 }:
 
 let
   inherit (luajitPackages) luafilesystem;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "luakit";
   version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "luakit";
-    repo = pname;
-    rev = version;
+    repo = "luakit";
+    rev = finalAttrs.version;
     hash = "sha256-DtoixcLq+ddbacTAo+Qq6q4k1i6thirACw1zqUeOxXo=";
   };
 
   nativeBuildInputs = [
+    luajit
     pkg-config
     help2man
     wrapGAppsHook3
   ];
-  buildInputs = [
-    gtk3
-    glib-networking # TLS support
-    luafilesystem
-    luajit
-    sqlite
-    webkitgtk_4_0
-  ] ++ ( with gst_all_1; [
-    gstreamer
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-bad
-    gst-plugins-ugly
-    gst-libav
-  ]);
 
+  buildInputs =
+    [
+      glib-networking # TLS support
+      gtk3
+      luafilesystem
+      sqlite
+      webkitgtk_4_0
+    ]
+    ++ (with gst_all_1; [
+      gst-libav
+      gst-plugins-bad
+      gst-plugins-base
+      gst-plugins-good
+      gst-plugins-ugly
+      gstreamer
+    ]);
+
+  strictDeps = true;
 
   # build-utils/docgen/gen.lua:2: module 'lib.lousy.util' not found
   # TODO: why is not this the default? The test runner adds
@@ -66,20 +71,21 @@ stdenv.mkDerivation rec {
     "XDGPREFIX=${placeholder "out"}/etc/xdg"
   ];
 
-  preFixup = let
-    luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua";
-  in ''
-    gappsWrapperArgs+=(
-      --prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
-      --prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH"
-      --prefix LUA_CPATH ';' "$LUA_CPATH"
-    )
-  '';
+  preFixup =
+    let
+      luaKitPath = "$out/share/luakit/lib/?/init.lua;$out/share/luakit/lib/?.lua";
+    in
+    ''
+      gappsWrapperArgs+=(
+        --prefix XDG_CONFIG_DIRS : "$out/etc/xdg"
+        --prefix LUA_PATH ';' "${luaKitPath};$LUA_PATH"
+        --prefix LUA_CPATH ';' "$LUA_CPATH"
+      )
+    '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://luakit.github.io/";
     description = "Fast, small, webkit-based browser framework extensible in Lua";
-    mainProgram = "luakit";
     longDescription = ''
       Luakit is a highly configurable browser framework based on the WebKit web
       content engine and the GTK+ toolkit. It is very fast, extensible with Lua,
@@ -87,8 +93,9 @@ stdenv.mkDerivation rec {
       power users, developers and anyone who wants to have fine-grained control
       over their web browser’s behaviour and interface.
     '';
-    license     = licenses.gpl3Only;
-    maintainers = [ maintainers.AndersonTorres ];
-    platforms   = platforms.unix;
+    license = lib.licenses.gpl3Only;
+    mainProgram = "luakit";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.unix;
   };
-}
+})

From 6572a49f3c8ba5e1e3aba47c3e86a9c313fa8171 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Wed, 2 Oct 2024 16:24:17 -0400
Subject: [PATCH 44/50] natscli: set `main.version=${version}`

Otherwise, `natscli --version` reports its version as "development"
instead of the version number.

Adds versionCheckHook to verify.
---
 pkgs/tools/system/natscli/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/tools/system/natscli/default.nix b/pkgs/tools/system/natscli/default.nix
index 613976bcbd9e..68787caff7b2 100644
--- a/pkgs/tools/system/natscli/default.nix
+++ b/pkgs/tools/system/natscli/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildGoModule
 , fetchFromGitHub
+, versionCheckHook
 }:
 
 buildGoModule rec {
@@ -16,6 +17,14 @@ buildGoModule rec {
 
   vendorHash = "sha256-T6VcyklwfRS012ZRzqxkahn9YYrQGky/znTqLIkAoK0=";
 
+  ldflags = [
+    "-X main.version=${version}"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/nats";
+
   meta = with lib; {
     description = "NATS Command Line Interface";
     homepage = "https://github.com/nats-io/natscli";

From b8ec1309e6995dd5504b5b6f69b7a5ac256115e9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 13 Oct 2024 18:48:14 +0200
Subject: [PATCH 45/50] python312Packages.sagemaker-mlflow: init at 0.1.0

---
 .../sagemaker-mlflow/default.nix              | 74 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 76 insertions(+)
 create mode 100644 pkgs/development/python-modules/sagemaker-mlflow/default.nix

diff --git a/pkgs/development/python-modules/sagemaker-mlflow/default.nix b/pkgs/development/python-modules/sagemaker-mlflow/default.nix
new file mode 100644
index 000000000000..152ef3b78eb3
--- /dev/null
+++ b/pkgs/development/python-modules/sagemaker-mlflow/default.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  boto3,
+  mlflow,
+
+  # tests
+  pytestCheckHook,
+  scikit-learn,
+}:
+
+buildPythonPackage rec {
+  pname = "sagemaker-mlflow";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "aws";
+    repo = "sagemaker-mlflow";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-1bonIqZ+cFxCOxoFWn1MLBOIiB1wUX69/lUTPPupJaw=";
+  };
+
+  postPatch = ''
+    substituteInPlace VERSION \
+      --replace-fail "${version}.dev0" "${version}"
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    boto3
+    mlflow
+  ];
+
+  pythonImportsCheck = [
+    "sagemaker_mlflow"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    scikit-learn
+  ];
+
+  disabledTests = [
+    # AssertionError: assert 's3' in '/build/source/not implemented/0/d3c16d2bad4245bf9fc68f86d2e7599d/artifacts'
+    "test_log_metric"
+
+    # AssertionError: assert 'not implemented' == 'mw'
+    "test_request_header"
+
+    # Require internet access
+    "test_auth_provider_returns_correct_sigv4"
+    "test_log_artifact"
+    "test_presigned_url"
+    "test_presigned_url_with_fields"
+  ];
+
+  meta = {
+    description = "MLFlow plugin for SageMaker";
+    homepage = "https://github.com/aws/sagemaker-mlflow";
+    changelog = "https://github.com/aws/sagemaker-mlflow/releases/tag/v${version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b3a7fb14646b..ab4e0784c5b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13962,6 +13962,8 @@ self: super: with self; {
 
   sagemaker-core = callPackage ../development/python-modules/sagemaker-core { };
 
+  sagemaker-mlflow = callPackage ../development/python-modules/sagemaker-mlflow { };
+
   salib = callPackage ../development/python-modules/salib { };
 
   salmon-mail = callPackage ../development/python-modules/salmon-mail { };

From 59adbcdfb5086dd0ba2c571a44ac93ae846ed582 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 13 Oct 2024 18:02:56 +0200
Subject: [PATCH 46/50] python312Packages.sagemaker: 2.232.1 -> 2.232.2

Diff: https://github.com/aws/sagemaker-python-sdk/compare/refs/tags/v2.232.1...v2.232.2

Changelog: https://github.com/aws/sagemaker-python-sdk/blob/v2.232.2/CHANGELOG.md
---
 .../python-modules/sagemaker/default.nix      | 21 +++++--------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 7c3b26cbb25c..582ddd93f0f2 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   hatchling,
@@ -25,6 +24,7 @@
   pyyaml,
   requests,
   sagemaker-core,
+  sagemaker-mlflow,
   schema,
   smdebug-rulesconfig,
   tblib,
@@ -38,29 +38,16 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.232.1";
+  version = "2.232.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-python-sdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-I+iZKx1CnZIGYgYuYhhs8BnY84KPyKOGw8M0He26DGU=";
+    hash = "sha256-q0JxQi1kUnp5L/hexxpGhR4t0v53l8iVuc9H6N0K6Y4=";
   };
 
-  patches = [
-    # Distutils removal, fix build with python 3.12
-    # https://github.com/aws/sagemaker-python-sdk/pull/4544
-    (fetchpatch {
-      url = "https://github.com/aws/sagemaker-python-sdk/commit/84447ba59e544c810aeb842fd058e20d89e3fc74.patch";
-      hash = "sha256-B8Q18ViB7xYy1F5LoL1NvXj2lnFPgt+C9wssSODyAXM=";
-    })
-    (fetchpatch {
-      url = "https://github.com/aws/sagemaker-python-sdk/commit/e9e08a30cb42d4b2d7299c1c4b42d680a8c78110.patch";
-      hash = "sha256-uGPtXSXfeaIvt9kkZZKQDuiZfoRgw3teffuxai1kKlY=";
-    })
-  ];
-
   build-system = [
     hatchling
   ];
@@ -69,6 +56,7 @@ buildPythonPackage rec {
     "boto3"
     "cloudpickle"
     "importlib-metadata"
+    "protobuf"
   ];
 
   dependencies = [
@@ -89,6 +77,7 @@ buildPythonPackage rec {
     pyyaml
     requests
     sagemaker-core
+    sagemaker-mlflow
     schema
     smdebug-rulesconfig
     tblib

From 5539ab4a22b75b4519a2395959cf4790bfb6585b Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Mon, 14 Oct 2024 01:11:53 +0800
Subject: [PATCH 47/50] emacsPackages.clingo-mode: fix build

https://hydra.nixos.org/build/274788540/nixlog/1
---
 .../editors/emacs/elisp-packages/melpa-packages.nix  | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 0a12189bdb05..ed745d5708a8 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -861,6 +861,18 @@ let
           '';
         });
 
+        clingo-mode = super.clingo-mode.overrideAttrs (
+          finalAttrs: previousAttrs: {
+            patches = previousAttrs.patches or [ ] ++ [
+              (pkgs.fetchpatch {
+                name = "add-missing-end-parenthesis.patch";
+                url = "https://github.com/llaisdy/clingo-mode/pull/3/commits/063445a24afb176c3f16af7a2763771dbdc4ecf6.patch";
+                hash = "sha256-OYP5LaZmCUJFgFk1Pf30e7sml8fC+xI4HSyDz7lck7E=";
+              })
+            ];
+          }
+        );
+
         # https://github.com/atilaneves/cmake-ide/issues/176
         cmake-ide = addPackageRequires super.cmake-ide [ self.dash ];
 

From 4ac131ac49173049a06da68605bae17af6d98510 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 13 Oct 2024 20:17:53 +0200
Subject: [PATCH 48/50] firefox-esr-115-unwrapped: drop

This release series has reached its end of life. Users need to upgrade to
either the 128 release series or mainline.
---
 .../networking/browsers/firefox/packages.nix  | 30 -------------------
 pkgs/top-level/aliases.nix                    |  2 ++
 pkgs/top-level/all-packages.nix               |  7 -----
 3 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix
index 74504e0ede53..382ae3e10a65 100644
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@@ -122,34 +122,4 @@
       versionSuffix = "esr";
     };
   };
-
-  firefox-esr-115 = (buildMozillaMach rec {
-    pname = "firefox-esr-115";
-    version = "115.16.1esr";
-    applicationName = "Mozilla Firefox ESR";
-    src = fetchurl {
-      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "eca42b3494fdab73e67d5c8e8b76520729adb75b5cad85172953dba56b225b0f05dcfea70fe8cc3e1bf1cd3d7103159cc20095d5480bb1b0e6d3ec90588988a8";
-    };
-
-    meta = {
-      changelog = "https://www.mozilla.org/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/";
-      description = "Web browser built from Firefox Extended Support Release source tree";
-      homepage = "http://www.mozilla.com/en-US/firefox/";
-      maintainers = with lib.maintainers; [ hexa ];
-      platforms = lib.platforms.unix;
-      badPlatforms = lib.platforms.darwin;
-      broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
-                                             # not in `badPlatforms` because cross-compilation on 64-bit machine might work.
-      license = lib.licenses.mpl20;
-      mainProgram = "firefox";
-    };
-    tests = [ nixosTests.firefox-esr-115 ];
-    updateScript = callPackage ./update.nix {
-      attrPath = "firefox-esr-115-unwrapped";
-      versionPrefix = "115";
-      versionSuffix = "esr";
-    };
-  })
-   .override { python3 = python311; };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 44e8fd7a7982..3fd0f241dc6f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -491,6 +491,8 @@ mapAliases {
   findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10
   finger_bsd = bsd-finger;
   fingerd_bsd = bsd-fingerd;
+  firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead.";
+  firefox-esr-115-unwrapped = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-128-unwrapped` instead.";
   firefox-wayland = firefox; # Added 2022-11-15
   firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09
   fishfight = jumpy; # Added 2022-08-03
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2d21ffc081ef..ab6282dbc474 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29386,7 +29386,6 @@ with pkgs;
   firefox-unwrapped = firefoxPackages.firefox;
   firefox-beta-unwrapped = firefoxPackages.firefox-beta;
   firefox-devedition-unwrapped = firefoxPackages.firefox-devedition;
-  firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115;
   firefox-esr-128-unwrapped = firefoxPackages.firefox-esr-128;
   firefox-esr-unwrapped = firefoxPackages.firefox-esr-128;
 
@@ -29412,12 +29411,6 @@ with pkgs;
     wmClass = "firefox-esr";
     icon = "firefox-esr";
   };
-  firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped {
-    nameSuffix = "-esr";
-    desktopName = "Firefox ESR";
-    wmClass = "firefox-esr";
-    icon = "firefox-esr";
-  };
   firefox-esr = firefox-esr-128;
 
   firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {

From fb12a8942d05d454f7560b434fadbab7b64e2265 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 13 Oct 2024 21:28:47 +0300
Subject: [PATCH 49/50] home-assistant-custom-components.smartthinq-sensors:
 0.40.0 -> 0.40.1

Diff: https://github.com/ollo69/ha-smartthinq-sensors/compare/v0.40.0...v0.40.1

Changelog: https://github.com/ollo69/ha-smartthinq-sensors/releases/tag/v0.40.1
---
 .../custom-components/smartthinq-sensors/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix
index 5ee30efeaa3c..348b6aa7d288 100644
--- a/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/smartthinq-sensors/default.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "ollo69";
   domain = "smartthinq_sensors";
-  version = "0.40.0";
+  version = "0.40.1";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "ha-smartthinq-sensors";
     rev = "v${version}";
-    hash = "sha256-2uahTfRmhEqcazz6SzG2abR0e15POsIe/gKs62AITB8=";
+    hash = "sha256-15s4xQKNsjrhae8Cp6U0Ay3s/o8L9BjLvc+1Tu+ss1s=";
   };
 
   propagatedBuildInputs = [

From 196fbd43c2e25fb30fa034e526c4e2055db7f865 Mon Sep 17 00:00:00 2001
From: crertel <chris@kedagital.com>
Date: Wed, 9 Oct 2024 15:51:23 -0500
Subject: [PATCH 50/50] lmstudio: 0.3.3 -> 0.3.4

---
 pkgs/by-name/lm/lmstudio/darwin.nix  | 4 ++--
 pkgs/by-name/lm/lmstudio/linux.nix   | 4 ++--
 pkgs/by-name/lm/lmstudio/package.nix | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix
index bd2fd80824c8..8df1035f4881 100644
--- a/pkgs/by-name/lm/lmstudio/darwin.nix
+++ b/pkgs/by-name/lm/lmstudio/darwin.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation {
   inherit meta pname version;
 
   src = fetchurl {
-    url = "https://releases.lmstudio.ai/darwin/arm64/${version}/LM-Studio-${version}-arm64.dmg";
-    hash = "sha256-PmXekM7rHY8EIp6l2XiLQlxyIB00MJS5C0gzFfe1i70=";
+    url = "https://releases.lmstudio.ai/darwin/arm64/${version}/3/LM-Studio-${version}-arm64.dmg";
+    hash = "sha256-b9QJMZl42D3TL8nzoQ+Dtxhit8uzGp9gByeCCHyu6gw=";
   };
 
   nativeBuildInputs = [ undmg ];
diff --git a/pkgs/by-name/lm/lmstudio/linux.nix b/pkgs/by-name/lm/lmstudio/linux.nix
index 6058350f8dd5..acc49ee0381a 100644
--- a/pkgs/by-name/lm/lmstudio/linux.nix
+++ b/pkgs/by-name/lm/lmstudio/linux.nix
@@ -6,8 +6,8 @@
 }:
 let
   src = fetchurl {
-    url = "https://releases.lmstudio.ai/linux/x86/${version}/1/LM_Studio-${version}.AppImage";
-    hash = "sha256-B+V0MOn/07IEzUXiubO2TG/XvfDZDgttnK/buL/nHQY=";
+    url = "https://releases.lmstudio.ai/linux/x86/${version}/3/LM_Studio-${version}.AppImage";
+    hash = "sha256-5yArraRyNY1TLmgGSe/1Zsirm093w+6tvXJr4+xiVtY=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index d69b44d284cf..31a6adcbde46 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "lmstudio";
-  version = "0.3.3";
+  version = "0.3.4";
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
     homepage = "https://lmstudio.ai/";