From dd8b2cc974c5b6dfdec4fe1a79d633671b619648 Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Tue, 8 Oct 2024 14:32:19 +1100
Subject: [PATCH 01/36] ruby_3_4: init at 3.4.0.preview2

Release notes: https://www.ruby-lang.org/en/news/2024/10/07/ruby-3-4-0-preview2-released/
---
 pkgs/development/interpreters/ruby/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 369d242192ac..f0308d334257 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -318,4 +318,9 @@ in {
     cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk=";
   };
 
+  ruby_3_4 = generic {
+    version = rubyVersion "3" "4" "0" "preview2";
+    hash = "sha256-RDzX7FSt5HhryXTOn11J8XKmD47chLWXt/4r0qlLg3E=";
+    cargoHash = "sha256-kdfNY8wVmSRR+cwEDYge/HDPRvdTNKLk/BhgqQeelOg=";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 787f20384e3c..0c5a3c14376d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16608,7 +16608,8 @@ with pkgs;
     mkRuby
     ruby_3_1
     ruby_3_2
-    ruby_3_3;
+    ruby_3_3
+    ruby_3_4;
 
   ruby = ruby_3_3;
   rubyPackages = rubyPackages_3_3;
@@ -16616,6 +16617,7 @@ with pkgs;
   rubyPackages_3_1 = recurseIntoAttrs ruby_3_1.gems;
   rubyPackages_3_2 = recurseIntoAttrs ruby_3_2.gems;
   rubyPackages_3_3 = recurseIntoAttrs ruby_3_3.gems;
+  rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems;
 
   mruby = callPackage ../development/compilers/mruby { };
 

From b00742f5fb462caac9f3768dc157f78df8dca3b2 Mon Sep 17 00:00:00 2001
From: Petr Kozorezov <petr.kozorezov@gmail.com>
Date: Thu, 10 Oct 2024 15:52:06 +0300
Subject: [PATCH 02/36] maintainers: add petrkozorezov

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ffe0c78b9573..28d65b5ebd30 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -16487,6 +16487,13 @@
     githubId = 28323;
     name = "Peter Simons";
   };
+  petrkozorezov = {
+    email = "petr.kozorezov@gmail.com";
+    github = "petrkozorezov";
+    githubId = 645017;
+    name = "Petr Kozorezov";
+    keys = [ { fingerprint = "7F1A 353D 3D6D 9CEF 63A9  B5C6 699F 32D5 9999 7C90"; } ];
+  };
   petrosagg = {
     email = "petrosagg@gmail.com";
     github = "petrosagg";

From daf88706ecaff34e9babbd724ee55ae405b067e0 Mon Sep 17 00:00:00 2001
From: hauskens <hauskens-git@disp.lease>
Date: Mon, 14 Oct 2024 20:38:59 +0200
Subject: [PATCH 03/36] seq-cli: init at 2024.3.922

---
 pkgs/by-name/se/seq-cli/deps.nix    | 23 ++++++++++++++++
 pkgs/by-name/se/seq-cli/package.nix | 42 +++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/by-name/se/seq-cli/deps.nix
 create mode 100644 pkgs/by-name/se/seq-cli/package.nix

diff --git a/pkgs/by-name/se/seq-cli/deps.nix b/pkgs/by-name/se/seq-cli/deps.nix
new file mode 100644
index 000000000000..d99b2edc3be7
--- /dev/null
+++ b/pkgs/by-name/se/seq-cli/deps.nix
@@ -0,0 +1,23 @@
+# This file was automatically generated by passthru.fetch-deps.
+# Please dont edit it manually, your changes might get overwritten!
+
+{ fetchNuGet }: [
+  (fetchNuGet { pname = "Autofac"; version = "8.1.1"; hash = "sha256-///N/c/OmCa7DUVz9/hIA/rFsaJ4TMltqdrVk7Ycmq8="; })
+  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.3"; hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="; })
+  (fetchNuGet { pname = "Seq.Api"; version = "2024.3.0"; hash = "sha256-OUBZ9VV7C5p/CzW0hoN3N9m1RAEGg24wNYFZgfJgk4s="; })
+  (fetchNuGet { pname = "Seq.Apps"; version = "2023.4.0"; hash = "sha256-PLN0KYbxH9aQkMCTOSmb16NcGD+XDooJdU4QIej1i+0="; })
+  (fetchNuGet { pname = "Seq.Syntax"; version = "1.0.0"; hash = "sha256-FcDdFhRE2EIgQjoTHDjKLq/Pl9mKzezL/B75pGhvk9s="; })
+  (fetchNuGet { pname = "Serilog"; version = "4.0.2"; hash = "sha256-vkd4s/PsKnnVzN1+f9haIP5LoxNWxnhdv3mBQYl/2Hc="; })
+  (fetchNuGet { pname = "Serilog.Expressions"; version = "5.0.0"; hash = "sha256-xpAT8U0pzTvRGa/qBd2M3YOQDD1xgAHCMVN9NEz0L4E="; })
+  (fetchNuGet { pname = "Serilog.Formatting.Compact"; version = "3.0.0"; hash = "sha256-nejEYqJEMG9P2iFZvbsCUPr5LZRtxbdUTLCI9N71jHY="; })
+  (fetchNuGet { pname = "Serilog.Formatting.Compact.Reader"; version = "4.0.0"; hash = "sha256-89+SaaXp9Pt8YTkTwVuMV3PzlPMg9mOHiFBKs3oHOUs="; })
+  (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "6.0.0"; hash = "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="; })
+  (fetchNuGet { pname = "Serilog.Sinks.File"; version = "5.0.0"; hash = "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="; })
+  (fetchNuGet { pname = "Serilog.Sinks.Seq"; version = "8.0.0"; hash = "sha256-1AEtDLODwS9WBkJ2yrmjKl2Rq3q2VPs1H9bQCUhC05s="; })
+  (fetchNuGet { pname = "SerilogTracing"; version = "2.1.2"; hash = "sha256-fhSiUgk21s7kiz4QYF2fy9YLC1X0YHibi95x2flPqMM="; })
+  (fetchNuGet { pname = "Superpower"; version = "3.0.0"; hash = "sha256-5MNmhBDYyOs+sTH364Qdn+Ck328BAQaVC1KMQ7yK2Vw="; })
+  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.1"; hash = "sha256-zmwHjcJgKcbkkwepH038QhcnsWMJcHys+PEbFGC0Jgo="; })
+  (fetchNuGet { pname = "System.Reactive"; version = "6.0.1"; hash = "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; })
+  (fetchNuGet { pname = "Tavis.UriTemplates"; version = "2.0.0"; hash = "sha256-Rd3VH55GFiXhMDbUcnKri2jDVIA1M7CQ+6Fjdsn/PSE="; })
+]
diff --git a/pkgs/by-name/se/seq-cli/package.nix b/pkgs/by-name/se/seq-cli/package.nix
new file mode 100644
index 000000000000..bec066fcced9
--- /dev/null
+++ b/pkgs/by-name/se/seq-cli/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildDotnetModule,
+  fetchFromGitHub,
+  dotnetCorePackages,
+  testers,
+}:
+
+buildDotnetModule (finalAttrs: {
+  pname = "seq-cli";
+  version = "2024.3.922";
+
+  src = fetchFromGitHub {
+    owner = "datalust";
+    repo = "seqcli";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-qqvuxG/QkkYjYw+p5QxLBWYHyltKDWT3JT167bEAdEI=";
+  };
+
+  projectFile = "src/SeqCli/SeqCli.csproj";
+  nugetDeps = ./deps.nix;
+  dotnetInstallFlags = "-f net8.0";
+
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.runtime_8_0;
+
+  executables = [ "seqcli" ];
+
+  passthru.tests.version = testers.testVersion {
+    package = finalAttrs.finalPackage;
+    command = "seqcli version";
+  };
+
+  meta = {
+    description = "The Seq command-line client. Administer, log, ingest, search, from any OS";
+    homepage = "https://github.com/datalust/seqcli";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hausken ];
+    mainProgram = "seqcli";
+    platforms = lib.platforms.all;
+  };
+})

From 3f97d8bba281ff8362d258b26d23b784f7c16331 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 15 Oct 2024 22:31:10 +0200
Subject: [PATCH 04/36] opencomposite: use vendored OpenXR

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/op/opencomposite/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/op/opencomposite/package.nix b/pkgs/by-name/op/opencomposite/package.nix
index 50877ded84ca..f78e6a9de933 100644
--- a/pkgs/by-name/op/opencomposite/package.nix
+++ b/pkgs/by-name/op/opencomposite/package.nix
@@ -5,7 +5,6 @@
   jsoncpp,
   lib,
   libGL,
-  openxr-loader,
   python3,
   stdenv,
   unstableGitUpdater,
@@ -22,7 +21,8 @@ stdenv.mkDerivation {
     owner = "znixian";
     repo = "OpenOVR";
     rev = "f969a972e9a151de776fa8d1bd6e67056f0a5d5d";
-    hash = "sha256-CE+ushwNv8kQSXtrQ6K5veBmpQvQaMKk6P9G1wV2uvM=";
+    fetchSubmodules = true;
+    hash = "sha256-3Aar7HGhn9nd/EtJoeUbQTkUR16jx946ZXMNDOXSdfQ=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -31,7 +31,6 @@ stdenv.mkDerivation {
     glm
     jsoncpp
     libGL
-    openxr-loader
     python3
     vulkan-headers
     vulkan-loader
@@ -40,7 +39,8 @@ stdenv.mkDerivation {
 
   cmakeFlags = [
     (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security")
-    (lib.cmakeBool "USE_SYSTEM_OPENXR" true)
+    # See https://gitlab.com/znixian/OpenOVR/-/issues/416
+    (lib.cmakeBool "USE_SYSTEM_OPENXR" false)
     (lib.cmakeBool "USE_SYSTEM_GLM" true)
   ];
 

From a63367cfcdb886bee208f50db8b069f61158861d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 16 Oct 2024 14:44:35 +0200
Subject: [PATCH 05/36] obs-studio: enable debug info

---
 pkgs/applications/video/obs-studio/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 520bcb3bb8cc..4ca4f675bbd7 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -73,6 +73,8 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  separateDebugInfo = true;
+
   patches = [
     # Lets obs-browser build against CEF 90.1.0+
     ./Enable-file-access-and-universal-access-for-file-URL.patch

From 58d3118e612e65d7a19ad7dd76132b9ed0a20767 Mon Sep 17 00:00:00 2001
From: Petr Kozorezov <petr.kozorezov@gmail.com>
Date: Thu, 10 Oct 2024 15:55:04 +0300
Subject: [PATCH 06/36] couchbase-shell: init at 1.0.0

---
 pkgs/by-name/co/couchbase-shell/package.nix | 52 +++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/by-name/co/couchbase-shell/package.nix

diff --git a/pkgs/by-name/co/couchbase-shell/package.nix b/pkgs/by-name/co/couchbase-shell/package.nix
new file mode 100644
index 000000000000..1b610b641b28
--- /dev/null
+++ b/pkgs/by-name/co/couchbase-shell/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  testers,
+  nix-update-script,
+  couchbase-shell,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "couchbase-shell";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "couchbaselabs";
+    repo = "couchbase-shell";
+    rev = "v${version}";
+    hash = "sha256-ksAyi7yMz56de1lA2LYVNdsn02GNrcJVoRLcK1zFppE=";
+  };
+
+  cargoHash = "sha256-efy1M4Q9dBfEq0YYUKn4y1Rz/dPbBYLapcPXJLI9X+Q=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  # tests need couchbase server
+  doCheck = false;
+
+  passthru = {
+    tests.version = testers.testVersion {
+      package = couchbase-shell;
+    };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Shell for Couchbase Server and Cloud";
+    homepage = "https://couchbase.sh/";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ petrkozorezov ];
+    mainProgram = "cbsh";
+    platforms = lib.platforms.linux;
+  };
+}

From b9c2a2ca2a85347a704465251592fb4f5078d75b Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Mon, 14 Oct 2024 16:38:22 +0800
Subject: [PATCH 07/36] qcm: 1.0.5 -> 1.1.2

Diff: https://github.com/hypengw/Qcm/compare/v1.0.5...v1.1.1
Changelog:
https://github.com/hypengw/Qcm/releases/tag/v1.1.0
https://github.com/hypengw/Qcm/releases/tag/v1.1.1
---
 pkgs/by-name/qc/qcm/package.nix | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/qc/qcm/package.nix b/pkgs/by-name/qc/qcm/package.nix
index c3a6bd8ca47d..9b8d9c92caa7 100644
--- a/pkgs/by-name/qc/qcm/package.nix
+++ b/pkgs/by-name/qc/qcm/package.nix
@@ -1,27 +1,30 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, pkg-config
-, qt6
-, curl
-, ffmpeg
-, cubeb
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  qt6,
+  curl,
+  ffmpeg,
+  cubeb,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qcm";
-  version = "1.0.5";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "hypengw";
     repo = "Qcm";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-/FOT2xK01JbJbTd5AT5Dk/5EF9qUyLvPTnw8PMtHYoQ=";
+    hash = "sha256-41GsG+NKCMw+LuRUf31ilRso/SkKYVV3IrMSviOZdWs=";
   };
 
-  patches = [ ./remove_cubeb_vendor.patch ];
+  patches = [
+    ./remove_cubeb_vendor.patch
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -32,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     qt6.qtbase
     qt6.qtdeclarative
+    qt6.qtsvg
     qt6.qtwayland
     curl
     ffmpeg
@@ -40,8 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Correct qml import path
   postInstall = ''
-    mkdir $out/lib/qt-6
-    mv $out/lib/qml $out/lib/qt-6/qml
+    mv $out/lib/qt6 $out/lib/qt-6
   '';
 
   qtWrapperArgs = [

From 6c47ba6fda41ad43b670be941b64c4092adb38f8 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sat, 19 Oct 2024 21:25:16 +0200
Subject: [PATCH 08/36] tigervnc: fix a regression in VncAuth security type

tigervnc v1.14.0 introduced a regression
in its list of supported security types:
Due to a missing comma in the code,
the VncAuth security type (i.e. simple password check) isn't
tried unless it is explicitely requested on the command line:

https://github.com/TigerVNC/tigervnc/issues/1789

The commit at hand adds a patch from upstream
(which will most likely be part of the next release)
to fix this oversight.
---
 pkgs/tools/admin/tigervnc/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index c54ce8bfe142..0e6e1daa66e2 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , xorg
 , xkeyboard_config
 , zlib
@@ -33,6 +34,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-TgVV/4MRsQHYKpDf9L5eHMLVpdwvNy1KPDIe7xMlQ9o=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "vncauth-security-type.patch";
+      url = "https://github.com/TigerVNC/tigervnc/commit/4f6a3521874da5a67fd746389cfa9b6199eb3582.diff";
+      hash = "sha256-lSkR8e+jsBwkQUJZmA0tb8nM5iSbYtO8uVXtgk5wdF8=";
+    })
+  ];
+
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
     sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${xkeyboard_config}/etc/X11/xkb";' unix/vncserver/vncserver.in
     fontPath=

From ed4014cdecb8d73d4fed22a087a22159ec094b2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Oct 2024 19:59:24 +0000
Subject: [PATCH 09/36] python312Packages.griffe: 1.4.1 -> 1.5.1

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

diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix
index 208f6a7c827b..aed63cf3ef41 100644
--- a/pkgs/development/python-modules/griffe/default.nix
+++ b/pkgs/development/python-modules/griffe/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "griffe";
-  version = "1.4.1";
+  version = "1.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "mkdocstrings";
     repo = "griffe";
     rev = "refs/tags/${version}";
-    hash = "sha256-DgfoaRvgU4WWbCirbLld8f/C2bPrW576aX0HglaRjEU=";
+    hash = "sha256-DeXmKswapXPYGTiJLq2yvCwJywCNl79XYHSau0VCCIY=";
   };
 
   build-system = [ pdm-backend ];

From bbbd930f123b6042fd6b00c7ad7b2db05c72b26f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Oct 2024 20:00:49 +0000
Subject: [PATCH 10/36] obs-cmd: 0.17.8 -> 0.17.9

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

diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix
index 466d776194c6..a0a495247172 100644
--- a/pkgs/by-name/ob/obs-cmd/package.nix
+++ b/pkgs/by-name/ob/obs-cmd/package.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "obs-cmd";
-  version = "0.17.8";
+  version = "0.17.9";
 
   src = fetchFromGitHub {
     owner = "grigio";
     repo = "obs-cmd";
     rev = "v${version}";
-    hash = "sha256-IOGdy3X0/r/kuEXAvLeJk2HXtcGI+vbh4Dn1/yOpkmM=";
+    hash = "sha256-R3zGYVa5ux3pcniuXzKwxJK/5/7YrVOrqC2H42P2fK0=";
   };
 
-  cargoHash = "sha256-oCu/ygjZxEqxE+5Vca3l1mZP3hd+r+5gi2iogQMnEcU=";
+  cargoHash = "sha256-bFOaR48xdc4+DvlFnXCWtzqMbE1cTo7xrsf/aIBlRX0=";
 
   meta = with lib; {
     description = "Minimal CLI to control OBS Studio via obs-websocket";

From c33a48f49c82072334dad3c6f5a435832348e8fa Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sat, 19 Oct 2024 15:52:24 -0500
Subject: [PATCH 11/36] vimPlugins.cmp-nixpkgs-maintainers: 2024-10-15 ->
 2024-10-19

Some important bug fixes
---
 pkgs/applications/editors/vim/plugins/generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 4f59990f42c8..3b135a0ac326 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -1915,12 +1915,12 @@ final: prev:
 
   cmp-nixpkgs-maintainers = buildVimPlugin {
     pname = "cmp-nixpkgs-maintainers";
-    version = "2024-10-15";
+    version = "2024-10-19";
     src = fetchFromGitHub {
       owner = "GaetanLepage";
       repo = "cmp-nixpkgs-maintainers";
-      rev = "828040c309972f044346e0bf43d0f92623b60d65";
-      sha256 = "0wnqhsfinzz3xf746sd731gy6sj05c5z7c09w4lrdchbrxx3zgrb";
+      rev = "86711e7d3e92097b26e53f0b146b93863176377d";
+      sha256 = "sha256-NZuDbrKL/ukLIMxbqVzVgzKkKTnw2Zu1/qD/MTIVO2Q=";
     };
     meta.homepage = "https://github.com/GaetanLepage/cmp-nixpkgs-maintainers/";
   };

From 80af6cbc2097531d9a260eadde971ca5393886c1 Mon Sep 17 00:00:00 2001
From: FliegendeWurst <2012gdwu+github@posteo.de>
Date: Sat, 19 Oct 2024 23:18:54 +0200
Subject: [PATCH 12/36] pgmodeler: add desktop file

---
 pkgs/applications/misc/pgmodeler/default.nix | 21 ++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix
index 35777a0b2563..08835ba6a08a 100644
--- a/pkgs/applications/misc/pgmodeler/default.nix
+++ b/pkgs/applications/misc/pgmodeler/default.nix
@@ -1,6 +1,8 @@
 { lib
 , stdenv
+, copyDesktopItems
 , fetchFromGitHub
+, makeDesktopItem
 , wrapQtAppsHook
 , pkg-config
 , qmake
@@ -22,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-axw0/QFQfnEc2P8tFRtSY5vVUJTqv+kRn68GXdZ5SeQ=";
   };
 
-  nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook ];
+  nativeBuildInputs = [ pkg-config qmake wrapQtAppsHook copyDesktopItems ];
   qmakeFlags = [ "pgmodeler.pro" "CONFIG+=release" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "PGSQL_INC=${lib.getDev postgresql}/include"
     "PGSQL_LIB=${lib.getLib postgresql}/lib/libpq.dylib"
@@ -36,7 +38,22 @@ stdenv.mkDerivation rec {
     ++ lib.optionals stdenv.hostPlatform.isLinux [ qtwayland ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ cups libxml2 ];
 
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+  desktopItems = [
+    (makeDesktopItem {
+      name = "pgModeler";
+      exec = "pgmodeler";
+      icon = "pgmodeler";
+      desktopName = "PgModeler";
+      genericName = "PgModeler";
+      comment = meta.description;
+      categories = [ "Development" ];
+      startupWMClass = "pgmodeler";
+    })
+  ];
+
+  postInstall = ''
+    install -Dm444 apps/pgmodeler/res/windows_ico.ico $out/share/icons/hicolor/256x256/apps/pgmodeler.ico
+  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/bin
     for item in pgmodeler pgmodeler-{cli,se,ch}
     do

From 61dab424a56efd008508bed9db90816f6da4db28 Mon Sep 17 00:00:00 2001
From: Abhishek Singh <abhisheksingh0x558@proton.me>
Date: Thu, 17 Oct 2024 21:43:28 +0530
Subject: [PATCH 13/36] vimPlugins.unimpaired-nvim: init at 2024-10-17

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 01c5e79950e4..595f3d8587da 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -18624,6 +18624,18 @@ final: prev:
     meta.homepage = "https://github.com/tomtom/tinykeymap_vim/";
   };
 
+  unimpaired-nvim = buildVimPlugin {
+    pname = "unimpaired.nvim";
+    version = "2024-10-17";
+    src = fetchFromGitHub {
+      owner = "tummetott";
+      repo = "unimpaired.nvim";
+      rev = "8e504ba95dd10a687f4e4dacd5e19db221b88534";
+      sha256 = "sha256-CNU4cigMjbvOdUzUXze9ZDmTZRuYtj4dCuuLVZkMTQg=";
+    };
+    meta.homepage = "https://github.com/tummetott/unimpaired.nvim/";
+  };
+
   vim-advanced-sorters = buildVimPlugin {
     pname = "vim-advanced-sorters";
     version = "2024-08-16";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index c4d547e962e4..dc82bcb5c0bb 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1053,6 +1053,7 @@ https://github.com/altermo/ultimate-autopair.nvim/,HEAD,
 https://github.com/SirVer/ultisnips/,,
 https://github.com/mbbill/undotree/,,
 https://github.com/chrisbra/unicode.vim/,,
+https://github.com/tummetott/unimpaired.nvim/,HEAD,
 https://github.com/unisonweb/unison/,,
 https://github.com/Shougo/unite.vim/,,
 https://github.com/sontungexpt/url-open/,HEAD,

From 1cdd25c9cdd78dcb9d0ae97c6fbc919045a3d191 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sat, 19 Oct 2024 17:59:55 -0400
Subject: [PATCH 14/36] calibre: 7.16.0 -> 7.20.0

---
 pkgs/applications/misc/calibre/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index b5e8c469b408..9285a2bacd51 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -3,6 +3,7 @@
 , fetchurl
 , cmake
 , fetchpatch
+, ffmpeg
 , fontconfig
 , hunspell
 , hyphen
@@ -14,6 +15,7 @@
 , libstemmer
 , libuchardet
 , libusb1
+, piper-tts
 , pkg-config
 , podofo
 , poppler_utils
@@ -33,11 +35,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "calibre";
-  version = "7.16.0";
+  version = "7.20.0";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
-    hash = "sha256-EWQfaoTwO9BdZQgJQrxfj6b8tmtukvlW5hFo/USjNhU=";
+    hash = "sha256-BhJEJsQKk/kJxycm/1mbtlrSaeFQPvWGGB9DUMidgII=";
   };
 
   patches = [
@@ -50,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     (fetchpatch {
       name = "0007-Hardening-Qt-code.patch";
       url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch";
-      hash = "sha256-a6yyG0RUsQJBBNxeJsTtQSBV2lxdzz1hnTob88O+SKg=";
+      hash = "sha256-8tOxFCmZal+JxOz6LeuUr+TgX7IaxC9Ow73bMgFJPt8=";
     })
   ]
   ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
@@ -75,6 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    ffmpeg
     fontconfig
     hunspell
     hyphen
@@ -86,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     libstemmer
     libuchardet
     libusb1
+    piper-tts
     podofo
     poppler_utils
     qtbase
@@ -148,6 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
     export PODOFO_LIB_DIR=${podofo.lib}/lib
     export XDG_DATA_HOME=$out/share
     export XDG_UTILS_INSTALL_MODE="user"
+    export PIPER_TTS_DIR=${piper-tts}/bin
 
     python setup.py install --root=$out \
       --prefix=$out \

From 7d1cb8d6a24a1564a005b82eba7772b1159d6ea3 Mon Sep 17 00:00:00 2001
From: aftix <aftix@aftix.xyz>
Date: Sat, 19 Oct 2024 17:21:26 -0500
Subject: [PATCH 15/36] maintainers: add aftix

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bf22ce202add..92aab142d919 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -662,6 +662,13 @@
     githubId = 4296804;
     name = "Alex Franchuk";
   };
+  aftix = {
+    name = "Wyatt Campbell";
+    email = "aftix@aftix.xyz";
+    matrix = "@aftix:matrix.org";
+    github = "aftix";
+    githubId = 4008299;
+  };
   agbrooks = {
     email = "andrewgrantbrooks@gmail.com";
     github = "agbrooks";

From 4522ebfc6a13e932cbc9a98414cfd563038625fe Mon Sep 17 00:00:00 2001
From: aftix <aftix@aftix.xyz>
Date: Sat, 19 Oct 2024 17:35:16 -0500
Subject: [PATCH 16/36] nushellPlugins.dbus: init at 0.12.0

---
 pkgs/shells/nushell/plugins/dbus.nix    | 52 +++++++++++++++++++++++++
 pkgs/shells/nushell/plugins/default.nix |  3 +-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/shells/nushell/plugins/dbus.nix

diff --git a/pkgs/shells/nushell/plugins/dbus.nix b/pkgs/shells/nushell/plugins/dbus.nix
new file mode 100644
index 000000000000..374f008548e7
--- /dev/null
+++ b/pkgs/shells/nushell/plugins/dbus.nix
@@ -0,0 +1,52 @@
+{
+  stdenv,
+  runCommand,
+  lib,
+  rustPlatform,
+  pkg-config,
+  nix-update-script,
+  fetchFromGitHub,
+  dbus,
+  nushell,
+  nushell_plugin_dbus,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "nu_plugin_dbus";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "devyn";
+    repo = pname;
+    rev = version;
+    hash = "sha256-I6FB2Hu/uyA6lBGRlC6Vwxad7jrl2OtlngpmiyhblKs=";
+  };
+
+  cargoHash = "sha256-WwdeDiFVyk8ixxKS1v3P274E1wp+v70qCk+rNEpoce4=";
+
+  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
+  buildInputs = [ dbus ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.check =
+      let
+        nu = lib.getExe nushell;
+        plugin = lib.getExe nushell_plugin_dbus;
+      in
+      runCommand "${pname}-test" { } ''
+        touch $out
+        ${nu} -n -c "plugin add --plugin-config $out ${plugin}"
+        ${nu} -n -c "plugin use --plugin-config $out dbus"
+      '';
+  };
+
+  meta = with lib; {
+    description = "Nushell plugin for communicating with D-Bus";
+    mainProgram = "nu_plugin_dbus";
+    homepage = "https://github.com/devyn/nu_plugin_dbus";
+    license = licenses.mit;
+    maintainers = with maintainers; [ aftix ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/shells/nushell/plugins/default.nix b/pkgs/shells/nushell/plugins/default.nix
index 5cfa7c3ed3ff..7aa271e82e3b 100644
--- a/pkgs/shells/nushell/plugins/default.nix
+++ b/pkgs/shells/nushell/plugins/default.nix
@@ -1,4 +1,4 @@
-{ lib, newScope, IOKit, CoreFoundation, Foundation, Security }:
+{ lib, newScope, dbus, IOKit, CoreFoundation, Foundation, Security }:
 
 lib.makeScope newScope (self: with self; {
   gstat = callPackage ./gstat.nix { inherit Security; };
@@ -9,4 +9,5 @@ lib.makeScope newScope (self: with self; {
   net = callPackage ./net.nix { inherit IOKit CoreFoundation; };
   units = callPackage ./units.nix { };
   highlight = callPackage ./highlight.nix { };
+  dbus = callPackage ./dbus.nix { inherit dbus; nushell_plugin_dbus = self.dbus; };
 })

From eaaca55ee2cf64f83f7c6a5a35e22990e804b177 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sat, 19 Oct 2024 20:19:24 -0400
Subject: [PATCH 17/36] calibre: migrate to by-name

---
 .../ca}/calibre/dont_build_unrar_plugin.patch       |  0
 .../default.nix => by-name/ca/calibre/package.nix}  | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)
 rename pkgs/{applications/misc => by-name/ca}/calibre/dont_build_unrar_plugin.patch (100%)
 rename pkgs/{applications/misc/calibre/default.nix => by-name/ca/calibre/package.nix} (98%)

diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/by-name/ca/calibre/dont_build_unrar_plugin.patch
similarity index 100%
rename from pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
rename to pkgs/by-name/ca/calibre/dont_build_unrar_plugin.patch
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/by-name/ca/calibre/package.nix
similarity index 98%
rename from pkgs/applications/misc/calibre/default.nix
rename to pkgs/by-name/ca/calibre/package.nix
index 9285a2bacd51..41479111b2ae 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -20,12 +20,9 @@
 , podofo
 , poppler_utils
 , python3Packages
-, qmake
-, qtbase
-, qtwayland
+, qt6
 , speechd-minimal
 , sqlite
-, wrapQtAppsHook
 , xdg-utils
 , wrapGAppsHook3
 , popplerSupport ? true
@@ -71,9 +68,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qmake
+    qt6.qmake
+    qt6.wrapQtAppsHook
     wrapGAppsHook3
-    wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -92,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
     piper-tts
     podofo
     poppler_utils
-    qtbase
-    qtwayland
+    qt6.qtbase
+    qt6.qtwayland
     sqlite
     (python3Packages.python.withPackages
       (ps: with ps; [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a80d2fc17fa1..72d2ea9f345a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28365,7 +28365,7 @@ with pkgs;
 
   calculix = callPackage ../applications/science/math/calculix { };
 
-  calibre = qt6Packages.callPackage ../applications/misc/calibre {
+  calibre = callPackage ../by-name/ca/calibre/package.nix {
     podofo = podofo010;
   };
 

From 74af7e5c2279f0fc368f6677dcf6f87668ab1dcf Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sat, 19 Oct 2024 20:20:42 -0400
Subject: [PATCH 18/36] calibre: format with nixfmt-rfc-style

---
 pkgs/by-name/ca/calibre/package.nix | 92 +++++++++++++++--------------
 1 file changed, 48 insertions(+), 44 deletions(-)

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index 41479111b2ae..d0b604fd2f1c 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -1,33 +1,34 @@
-{ lib
-, stdenv
-, fetchurl
-, cmake
-, fetchpatch
-, ffmpeg
-, fontconfig
-, hunspell
-, hyphen
-, icu
-, imagemagick
-, libjpeg
-, libmtp
-, libpng
-, libstemmer
-, libuchardet
-, libusb1
-, piper-tts
-, pkg-config
-, podofo
-, poppler_utils
-, python3Packages
-, qt6
-, speechd-minimal
-, sqlite
-, xdg-utils
-, wrapGAppsHook3
-, popplerSupport ? true
-, speechSupport ? true
-, unrarSupport ? false
+{
+  lib,
+  stdenv,
+  fetchurl,
+  cmake,
+  fetchpatch,
+  ffmpeg,
+  fontconfig,
+  hunspell,
+  hyphen,
+  icu,
+  imagemagick,
+  libjpeg,
+  libmtp,
+  libpng,
+  libstemmer,
+  libuchardet,
+  libusb1,
+  piper-tts,
+  pkg-config,
+  podofo,
+  poppler_utils,
+  python3Packages,
+  qt6,
+  speechd-minimal,
+  sqlite,
+  xdg-utils,
+  wrapGAppsHook3,
+  popplerSupport ? true,
+  speechSupport ? true,
+  unrarSupport ? false,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -51,8 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch";
       hash = "sha256-8tOxFCmZal+JxOz6LeuUr+TgX7IaxC9Ow73bMgFJPt8=";
     })
-  ]
-  ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
+  ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
 
   prePatch = ''
     sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \
@@ -92,8 +92,10 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtbase
     qt6.qtwayland
     sqlite
-    (python3Packages.python.withPackages
-      (ps: with ps; [
+    (python3Packages.python.withPackages (
+      ps:
+      with ps;
+      [
         (apsw.overrideAttrs (oldAttrs: {
           setupPyBuildFlags = [ "--enable=load_extension" ];
         }))
@@ -125,13 +127,17 @@ stdenv.mkDerivation (finalAttrs: {
         xxhash
         # the following are distributed with calibre, but we use upstream instead
         odfpy
-      ] ++ lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms) [
-        # much of calibre's functionality is usable without a web
-        # browser, so we enable building on platforms which qtwebengine
-        # does not support by simply omitting qtwebengine.
-        pyqt6-webengine
-      ] ++ lib.optional (unrarSupport) unrardll)
-    )
+      ]
+      ++
+        lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms)
+          [
+            # much of calibre's functionality is usable without a web
+            # browser, so we enable building on platforms which qtwebengine
+            # does not support by simply omitting qtwebengine.
+            pyqt6-webengine
+          ]
+      ++ lib.optional (unrarSupport) unrardll
+    ))
     xdg-utils
   ] ++ lib.optional (speechSupport) speechd-minimal;
 
@@ -221,9 +227,7 @@ stdenv.mkDerivation (finalAttrs: {
       free and open source and great for both casual users and computer experts.
     '';
     changelog = "https://github.com/kovidgoyal/calibre/releases/tag/v${finalAttrs.version}";
-    license = if unrarSupport
-              then lib.licenses.unfreeRedistributable
-              else lib.licenses.gpl3Plus;
+    license = if unrarSupport then lib.licenses.unfreeRedistributable else lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ pSub ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;

From babd3fd21cf4a95ed5c07fd41f93a4d88b399359 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Oct 2024 05:44:40 +0000
Subject: [PATCH 19/36] python312Packages.pyais: 2.8.0 -> 2.8.1

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

diff --git a/pkgs/development/python-modules/pyais/default.nix b/pkgs/development/python-modules/pyais/default.nix
index 2ed166b9a78b..7fe8e47b694f 100644
--- a/pkgs/development/python-modules/pyais/default.nix
+++ b/pkgs/development/python-modules/pyais/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyais";
-  version = "2.8.0";
+  version = "2.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "M0r13n";
     repo = "pyais";
     rev = "refs/tags/v${version}";
-    hash = "sha256-qggtwz6cSz5mLKLVY0i7gWs09EcOoxlWWQoHZv+TDc8=";
+    hash = "sha256-aIpIeDJGMfNVzeXY8GaPOYKam2HxcdHgSOhOoGmGDoc=";
   };
 
   build-system = [ setuptools ];

From 138bb97c3fd11fcd89a732af87244fac6dbf0557 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Oct 2024 06:10:24 +0000
Subject: [PATCH 20/36] mountpoint-s3: 1.9.1 -> 1.10.0

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

diff --git a/pkgs/by-name/mo/mountpoint-s3/package.nix b/pkgs/by-name/mo/mountpoint-s3/package.nix
index 68533127f9ba..4fff930fc22f 100644
--- a/pkgs/by-name/mo/mountpoint-s3/package.nix
+++ b/pkgs/by-name/mo/mountpoint-s3/package.nix
@@ -8,17 +8,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mountpoint-s3";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "awslabs";
     repo = "mountpoint-s3";
     rev = "v${version}";
-    hash = "sha256-8t/gAz08jFRuF0q3bo4y8tiIq4iYgAkXf5udYNIccu0=";
+    hash = "sha256-sMxggPe3m1fzfcfwsr2lUECswZ7pFSAJ8b0cURwXFmw=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-Fz7LfAn78JVip0QshoL5KMAEHMtG8bkLzz4v95/qt3E=";
+  cargoHash = "sha256-Gsp/AmxSobEut0jYakK0ymmSpStriAop+Abnl3GlSF4=";
 
   # thread 'main' panicked at cargo-auditable/src/collect_audit_data.rs:77:9:
   # cargo metadata failure: error: none of the selected packages contains these features: libfuse3

From 0660912af86ed7142124d82c74a287aa7b4ddb4e Mon Sep 17 00:00:00 2001
From: Julius Michaelis <gitter@liftm.de>
Date: Sun, 20 Oct 2024 13:01:14 +0900
Subject: [PATCH 21/36] rdkafka: use finalAttrs pattern, ensure downloaded
 source is from a tag

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

diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 0f9cf4466261..569752ceaa81 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, zlib, zstd, pkg-config, python3, openssl, which, curl }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rdkafka";
   version = "2.5.3";
 
   src = fetchFromGitHub {
     owner = "confluentinc";
     repo = "librdkafka";
-    rev = "v${version}";
+    rev = "refs/tags/v${finalAttrs.version}";
     sha256 = "sha256-2AURPvhpgdIm034KEMm7Tmf8Zx/XER76aT6SiINs6wg=";
   };
 
@@ -30,4 +30,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ commandodev ];
   };
-}
+})

From 14cdc1dfb008996aa0b339ff5aeeb9af0331f431 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Oct 2024 06:42:20 +0000
Subject: [PATCH 22/36] eksctl: 0.191.0 -> 0.193.0

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

diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index 4122de8675c4..646b18a5c178 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.191.0";
+  version = "0.193.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = pname;
     rev = version;
-    hash = "sha256-ypHBvaCvQ1FZiQmKTkQ5h024pLBOpISZooSkIDa1OeQ=";
+    hash = "sha256-Le/RDF4vhHmCdzuOJaIehqWYnfGH1tHAlSCjwgHXMiE=";
   };
 
   vendorHash = "sha256-mdGkdiYjcmsmYnM6fbyUeTC4Zb/Q1+geZrqJELv5i+4=";

From 9a1c9681018f9d73317661dcc4b25cfb8c1c0b2b Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Sun, 20 Oct 2024 15:07:44 +0800
Subject: [PATCH 23/36] maintainers: update Guanran928

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 5d2d0e1c0e9f..1e22fc7eab36 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8182,7 +8182,8 @@
     email = "guanran928@outlook.com";
     github = "Guanran928";
     githubId = 68757440;
-    name = "Guanran928";
+    name = "Guanran Wang";
+    keys = [ { fingerprint = "7835 BC13 4560 0660 0448  5A2C 91F9 7D9E D126 39CF"; } ];
   };
   guekka = {
     github = "Guekka";

From d7981a51883aadd18cda092608726b47ac407e89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Oct 2024 07:14:03 +0000
Subject: [PATCH 24/36] podman-tui: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/by-name/po/podman-tui/package.nix b/pkgs/by-name/po/podman-tui/package.nix
index c92ea01778d0..6b21ebe35345 100644
--- a/pkgs/by-name/po/podman-tui/package.nix
+++ b/pkgs/by-name/po/podman-tui/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "podman-tui";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman-tui";
     rev = "v${version}";
-    hash = "sha256-ldFlW0QNjOvuJGyd2SzmMWA3ofS2ZW5krvCJRU83NXs=";
+    hash = "sha256-IINxDP0ajQdqbHTjeUeFqPbLTSCTl9gEhPxUWOe6zQs=";
   };
 
   vendorHash = null;

From 470908bd5d24fb7dd555849d24dffa6e17350738 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Oct 2024 07:14:55 +0000
Subject: [PATCH 25/36] pipet: 0.2.2 -> 0.3.0

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

diff --git a/pkgs/by-name/pi/pipet/package.nix b/pkgs/by-name/pi/pipet/package.nix
index 335b6256d969..0fe776b6837a 100644
--- a/pkgs/by-name/pi/pipet/package.nix
+++ b/pkgs/by-name/pi/pipet/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pipet";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "bjesus";
     repo = "pipet";
     rev = version;
-    hash = "sha256-NhqrNehmL6LLLEOVT/s2PdQ7HtSCfoM4MST1IHVrJXE=";
+    hash = "sha256-pu+2sHdLz9TvYHBwvGTtFr/oAD+CreOR8io82YQANxc=";
   };
 
   vendorHash = "sha256-jNIjF5jxcpNLAjuWo7OG/Ac4l6NpQNCKzYUgdAoL+C4=";

From 64d3fc6e4f7333e5c3fa91bd5e19a56bbb378997 Mon Sep 17 00:00:00 2001
From: jacekpoz <jacekpoz@proton.me>
Date: Sat, 19 Oct 2024 20:29:37 +0200
Subject: [PATCH 26/36] waycorner: add missing updateScript

---
 pkgs/by-name/wa/waycorner/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/wa/waycorner/package.nix b/pkgs/by-name/wa/waycorner/package.nix
index 4ca5ca58b04c..6be599fbd96d 100644
--- a/pkgs/by-name/wa/waycorner/package.nix
+++ b/pkgs/by-name/wa/waycorner/package.nix
@@ -5,6 +5,7 @@
   pkg-config,
   fetchFromGitHub,
   wayland,
+  gitUpdater,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "waycorner";
@@ -30,6 +31,8 @@ rustPlatform.buildRustPackage rec {
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ wayland ]}
   '';
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     description = "Hot corners for Wayland";
     mainProgram = "waycorner";

From c3e243641cc893a1c005ebe09c00319fef20ee88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Oct 2024 01:18:42 +0000
Subject: [PATCH 27/36] libthreadar: 1.4.0 -> 1.5.0

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

diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix
index 8c93e414ed5d..bd6a7b1a49b5 100644
--- a/pkgs/development/libraries/libthreadar/default.nix
+++ b/pkgs/development/libraries/libthreadar/default.nix
@@ -1,12 +1,12 @@
 { lib, stdenv, fetchurl, gcc-unwrapped }:
 
 stdenv.mkDerivation rec {
-  version = "1.4.0";
+  version = "1.5.0";
   pname = "libthreadar";
 
   src = fetchurl {
     url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz";
-    sha256 = "sha256-LkcVF4AnuslzpIg/S8sGNJQye6iGcQRGqCqAhg8aN5E=";
+    sha256 = "sha256-wJAkIUGK7Ud6n2p1275vNkSx/W7LlgKWXQaDevetPko=";
   };
 
   outputs = [ "out" "dev" ];

From cc080216d3108ee0f4bc66bdc0c148407eebcd87 Mon Sep 17 00:00:00 2001
From: Saturn745 <gitcommits.8lvon@passinbox.com>
Date: Sat, 12 Oct 2024 12:05:40 -0700
Subject: [PATCH 28/36] netbird: 0.30.0 -> 0.30.2

Diff: https://github.com/netbirdio/netbird/compare/v0.30.1...0.30.2

Changelog: https://github.com/netbirdio/netbird/releases/tag/v0.30.2
---
 pkgs/tools/networking/netbird/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix
index 31214a2295a7..07a1e906dad3 100644
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@@ -31,16 +31,16 @@ let
 in
 buildGoModule rec {
   pname = "netbird";
-  version = "0.30.0";
+  version = "0.30.2";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     rev = "v${version}";
-    hash = "sha256-YtKGiF45fNoiYQFTE3NReUaosRGDJOyjfqtc+tBKopI=";
+    hash = "sha256-8PIReuWnD7iMesSWAo6E4J+mWNAa7lHKwBWsCsXUG+E=";
   };
 
-  vendorHash = "sha256-t6kqEmL2lKKYlqxaQ1OsAvB3BSmmyfogghGoE9jw+AI=";
+  vendorHash = "sha256-KScynPcMZ90XZy/N5X3aQfKuVl/JOCJmd8luNxChkZk=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional ui pkg-config;
 

From 23c4c1954152235eea57502366dab58ac6e49899 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Oct 2024 17:29:32 +0000
Subject: [PATCH 29/36] monetdb: 11.49.11 -> 11.51.3

---
 pkgs/servers/sql/monetdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 9e9b2b7f95c1..deb1f13f48c4 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "monetdb";
-  version = "11.49.11";
+  version = "11.51.3";
 
   src = fetchurl {
     url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-tnGRNTx/SH7Yj8xvaFUxKr8af+7b8ZouU4PdmKEMkKk=";
+    hash = "sha256-ql6J4e62sL/g6s6cr2xMoxmlsLyovapaGtpcQIZ9tOU=";
   };
 
   nativeBuildInputs = [ bison cmake python3 ];

From 3ca92ac2258051f7b2e8baca65aeaa1e4a9149c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 16 Oct 2024 19:14:46 +0200
Subject: [PATCH 30/36] global-platform-pro: 20.01.23 -> 24.10.15

* Update jdk from v8 to v11 to keep it building.
* There are no jreMAJOR_headless versions above MAJOR=8 and jre_minimal
  doesn't work[1], so switch to jre_headless (currently v21 on
  nixpkgs-unstable) to keep it running. The newer jre causes a big
  package closure size difference: 153 MiB -> 627 MiB.
* Upstream changed the way `git describe` info gets built into the
  artifacts, so add a postPatch snippet to handle that.
  (Fixes `Error: inStream parameter is null` issue that happens
  otherwise.)
  Upstream asked for a suffix to the version string to differentiate
  from official builds; use "-nixpkgs" for that.

[1] $ gp -i
    Error: Unable to initialize main class pro.javacard.gptool.GPTool
    Caused by: java.lang.NoClassDefFoundError: javax/smartcardio/CardException
---
 .../tools/global-platform-pro/default.nix     | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix
index b35cc4998f67..4a55908214c6 100644
--- a/pkgs/development/tools/global-platform-pro/default.nix
+++ b/pkgs/development/tools/global-platform-pro/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite, proot, zlib }:
+{ lib, stdenv, fetchFromGitHub, jdk11, maven, makeWrapper, jre_headless, pcsclite, proot, zlib }:
 
 let
   defineMvnWrapper = ''
@@ -14,20 +14,20 @@ let
 in
 maven.buildMavenPackage rec {
   pname = "global-platform-pro";
-  version = "20.01.23";
-  GPPRO_VERSION = "v20.01.23-0-g5ad373b"; # git describe --tags --always --long --dirty
+  version = "24.10.15";
+  GPPRO_VERSION = "v24.10.15-0-gf2af9ef"; # git describe --tags --always --long --dirty
 
   src = fetchFromGitHub {
     owner = "martinpaljak";
     repo = "GlobalPlatformPro";
     rev = "v${version}";
-    sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY=";
+    sha256 = "sha256-yy2WOLDetBrbNRf6HvvPdNPD51ujXomI2a2Hj6eVx1Q=";
   };
 
-  mvnJdk = jdk8;
-  mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A=";
+  mvnJdk = jdk11;
+  mvnHash = "sha256-vTlOxFBjEZRD23ldMF+VRKZx6jyZ6YvgvZM353FWrWQ=";
 
-  nativeBuildInputs = [ jdk8 makeWrapper ];
+  nativeBuildInputs = [ jdk11 makeWrapper ];
 
   # Fix build error due to missing .git directory:
   #  Failed to execute goal pl.project13.maven:git-commit-id-plugin:4.0.0:revision (retrieve-git-info) on project gppro: .git directory is not found! Please specify a valid [dotGitDirectory] in your pom.xml -> [Help 1]
@@ -37,12 +37,20 @@ maven.buildMavenPackage rec {
     preConfigure = defineMvnWrapper;
   };
 
+  postPatch = ''
+    git_properties_file="./library/target/classes/pro/javacard/gp/git.properties"
+    mkdir -p "$(dirname "$git_properties_file")"
+    # Suffix to differentiate from upstream builds.
+    distro_suffix=-nixpkgs
+    echo "git.commit.id.describe=''${GPPRO_VERSION}''${distro_suffix}" > "$git_properties_file"
+  '';
+
   preConfigure = defineMvnWrapper;
 
   installPhase = ''
     mkdir -p "$out/lib/java" "$out/share/java"
     cp tool/target/gp.jar "$out/share/java"
-    makeWrapper "${jre8_headless}/bin/java" "$out/bin/gp" \
+    makeWrapper "${jre_headless}/bin/java" "$out/bin/gp" \
       --add-flags "-jar '$out/share/java/gp.jar'" \
       --prefix LD_LIBRARY_PATH : "${lib.getLib pcsclite}/lib"
   '';

From bfc41e8ba30fe4513918c733f048ddf9cad1845b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Oct 2024 07:59:15 +0000
Subject: [PATCH 31/36] warp-terminal: 0.2024.10.15.08.02.stable_02 ->
 0.2024.10.15.08.02.stable_03

---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index 705fb3478892..bc420f89b33c 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-5SAOjGlMD9Lt+z6NjtIbZM7ES2xw8PBudG10lD4DnVk=",
-    "version": "0.2024.10.15.08.02.stable_02"
+    "hash": "sha256-6cPn6ukGPpEdzCcENGUT5h+UPSo8rrEZEjeLEHJTG/4=",
+    "version": "0.2024.10.15.08.02.stable_03"
   },
   "linux_x86_64": {
-    "hash": "sha256-i5YWruFxbKNC0PxeUCb3uhWpcr0ukiQFdPuJBzwLwR0=",
-    "version": "0.2024.10.15.08.02.stable_02"
+    "hash": "sha256-ftTBelAaGWxrOlpDGtEeNT9GjtS4XZdvzUsWxEnrGzs=",
+    "version": "0.2024.10.15.08.02.stable_03"
   },
   "linux_aarch64": {
-    "hash": "sha256-hnn7DGPKi0wDtpY4HYJxgO5TbkSAZVmaPfB0S2oTJ2E=",
-    "version": "0.2024.10.15.08.02.stable_02"
+    "hash": "sha256-y7oSCc+bsRj7BSF8MiYpNJ73M5xBBTIRhotHdRPsfqk=",
+    "version": "0.2024.10.15.08.02.stable_03"
   }
 }

From 0653083b486f897a5794d9d9cb888735b4ff4083 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Oct 2024 04:23:30 +0000
Subject: [PATCH 32/36] yggdrasil: 0.5.8 -> 0.5.9

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

diff --git a/pkgs/by-name/yg/yggdrasil/package.nix b/pkgs/by-name/yg/yggdrasil/package.nix
index 73df89af5295..f1f15c9d3bee 100644
--- a/pkgs/by-name/yg/yggdrasil/package.nix
+++ b/pkgs/by-name/yg/yggdrasil/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "yggdrasil";
-  version = "0.5.8";
+  version = "0.5.9";
 
   src = fetchFromGitHub {
     owner = "yggdrasil-network";
     repo = "yggdrasil-go";
     rev = "v${version}";
-    hash = "sha256-3sX1xNfblmIXI1hiXL9bhA4+CobUZ5xhpJFKugzwlGE=";
+    hash = "sha256-Xyuqvz3/3RgSY6LSXUSNX0f6SuRdmmgScW8URVOPijo=";
   };
 
-  vendorHash = "sha256-HBl30BnSERivIHb3dbfhDwwBvs3MUkltDf+R790vSGE=";
+  vendorHash = "sha256-EO+ab4bptcDxGTx7y1rEvYJLtiTalXyyR71U6O9OkEA=";
 
   subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ];
 

From 2b54f256dc69bb874429c20d91c00c192609a1c3 Mon Sep 17 00:00:00 2001
From: oli <benmoreosm@gmail.com>
Date: Sat, 19 Oct 2024 21:14:30 +0100
Subject: [PATCH 33/36] maintainers: update olifloof

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a1764bd8f054..561763c52299 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15910,6 +15910,12 @@
     githubId = 72201;
     name = "Ole Jørgen Brønner";
   };
+  olifloof = {
+    email = "benmoreosm@gmail.com";
+    github = "olifloof";
+    githubId = 35699052;
+    name = "oli";
+  };
   oliver-koss = {
     email = "oliver.koss06@gmail.com";
     github = "oliver-koss";
@@ -16840,12 +16846,6 @@
     name = "Jelle Besseling";
     keys = [ { fingerprint = "A3A3 65AE 16ED A7A0 C29C  88F1 9712 452E 8BE3 372E"; } ];
   };
-  pinkcreeper100 = {
-    email = "benmoreosm@gmail.com";
-    github = "pinkcreeper100";
-    githubId = 35699052;
-    name = "Oliver Samuel Morris";
-  };
   pinpox = {
     email = "mail@pablo.tools";
     github = "pinpox";

From 60b972f0082d623cfacce44ef94016d558d85fbe Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sat, 19 Oct 2024 15:34:24 +0200
Subject: [PATCH 34/36] aliases: keep the `utillinux` alias until `node2nix` is
 phased out

The code generated by `node2nix` checks that `pkgs.utillinux` exist and
uses it over `pkgs.util-linux`. Replacing the alias by a `throw`, as was
done in commit a9e1f4e0abe8f8b5f6b6169323d990a0954280e4, makes packages
generated using `node2nix` fail.

This removes the alias removal until `node2nix` has been phased out,
which is a work in progress started in
https://github.com/NixOS/nixpkgs/issues/229475.
---
 pkgs/top-level/aliases.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a4c0b5ec8dee..e81c4ed0645b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1674,7 +1674,7 @@ mapAliases {
   usbguard-nox = throw "'usbguard-nox' has been renamed to/replaced by 'usbguard'"; # Converted to throw 2023-09-10
   utahfs = throw "utahfs has been removed, as it is broken and lack of maintenance from upstream"; # Added 2023-09-29
   util-linuxCurses = util-linux; # Added 2022-04-12
-  utillinux = throw "'utillinux' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2024-10-17
+  utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475
 
   ### V ###
 

From c304b7a22f52c1b397233ba0cf17ecf8eef488b6 Mon Sep 17 00:00:00 2001
From: lukts30 <llukas21307@gmail.com>
Date: Sat, 19 Oct 2024 16:37:59 +0200
Subject: [PATCH 35/36] virt-v2v: init at 2.6.0

---
 pkgs/by-name/vi/virt-v2v/package.nix | 106 +++++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 pkgs/by-name/vi/virt-v2v/package.nix

diff --git a/pkgs/by-name/vi/virt-v2v/package.nix b/pkgs/by-name/vi/virt-v2v/package.nix
new file mode 100644
index 000000000000..4d6ce4e63f54
--- /dev/null
+++ b/pkgs/by-name/vi/virt-v2v/package.nix
@@ -0,0 +1,106 @@
+{
+  stdenv,
+  lib,
+  testers,
+  fetchurl,
+  pkg-config,
+  makeWrapper,
+  autoreconfHook,
+  bash-completion,
+  OVMF,
+  qemu,
+  ocamlPackages,
+  perl,
+  cpio,
+  getopt,
+  libosinfo,
+  pcre2,
+  libxml2,
+  jansson,
+  glib,
+  libguestfs-with-appliance,
+  cdrkit,
+  nbdkit,
+  withWindowsGuestSupport ? true,
+  pkgsCross, # for rsrvany
+  virtio-win,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "virt-v2v";
+  version = "2.6.0";
+
+  src = fetchurl {
+    url = "https://download.libguestfs.org/virt-v2v/${lib.versions.majorMinor finalAttrs.version}-stable/virt-v2v-${finalAttrs.version}.tar.gz";
+    sha256 = "sha256-W7t/n1QO9UebyH85abtnSY5i7kH/6h8JIAlFQoD1vkU=";
+  };
+
+  postPatch = ''
+    substituteInPlace common/mlv2v/uefi.ml \
+        --replace-fail '/usr/share/OVMF/OVMF_CODE.fd' "${OVMF.firmware}" \
+        --replace-fail '/usr/share/OVMF/OVMF_VARS.fd' "${OVMF.variables}"
+
+    patchShebangs .
+  '';
+
+  nativeBuildInputs =
+    [
+      pkg-config
+      autoreconfHook
+      makeWrapper
+      bash-completion
+      perl
+      libguestfs-with-appliance
+      qemu
+      cpio
+      cdrkit
+      getopt
+    ]
+    ++ (with ocamlPackages; [
+      ocaml
+      findlib
+    ]);
+
+  buildInputs =
+    [
+      libosinfo
+      pcre2
+      libxml2
+      jansson
+      glib
+    ]
+    ++ (with ocamlPackages; [
+      ocaml_libvirt
+      nbd
+    ]);
+
+  postInstall =
+    ''
+      for bin in $out/bin/*; do
+      wrapProgram "$bin" \
+        --prefix PATH : "$out/bin:${
+          lib.makeBinPath [
+            nbdkit
+            qemu
+          ]
+        }"
+      done
+    ''
+    + lib.optionalString withWindowsGuestSupport ''
+      ln -s "${virtio-win}" $out/share/virtio-win
+      ln -s "${pkgsCross.mingwW64.rhsrvany}/bin/" $out/share/virt-tools
+    '';
+
+  PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions";
+
+  passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+
+  meta = {
+    homepage = "https://github.com/libguestfs/virt-v2v";
+    description = "Convert guests from foreign hypervisors to run on KVM";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ lukts30 ];
+    platforms = lib.platforms.linux;
+    mainProgram = "virt-v2v";
+  };
+})

From e00474e398d2173c3e519e36cf920652e7f16142 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sun, 20 Oct 2024 21:10:35 +1000
Subject: [PATCH 36/36] virt-what: 1.26 -> 1.27 (#348760)

---
 pkgs/applications/virtualization/virt-what/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-what/default.nix b/pkgs/applications/virtualization/virt-what/default.nix
index 3d553acd48ff..05c5268b087e 100644
--- a/pkgs/applications/virtualization/virt-what/default.nix
+++ b/pkgs/applications/virtualization/virt-what/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "virt-what";
-  version = "1.26";
+  version = "1.27";
 
   src = fetchurl {
     url = "https://people.redhat.com/~rjones/virt-what/files/${pname}-${version}.tar.gz";
-    sha256 = "sha256-qoap0xO1yQSK+a2aA4fkr/I4uw6kLzuDARTotQzTFTU=";
+    sha256 = "sha256-1Nm9nUrlkJVZdEP6xmNJUxXH60MwuHKqXwYt84rGm/E=";
   };
 
   meta = with lib; {