From da2f0b1628e3ebe2f075bb14832b2a562e4bfaeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theo1.bori@epitech.eu>
Date: Tue, 16 Sep 2025 02:50:10 +0200
Subject: [PATCH 01/47] websurfx: 1.24.22 -> 1.24.27

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

diff --git a/pkgs/by-name/we/websurfx/package.nix b/pkgs/by-name/we/websurfx/package.nix
index 4b48981c76ed..7f08b0e5b105 100644
--- a/pkgs/by-name/we/websurfx/package.nix
+++ b/pkgs/by-name/we/websurfx/package.nix
@@ -6,7 +6,7 @@
   pkg-config,
 }:
 let
-  version = "1.24.22";
+  version = "1.24.27";
 in
 rustPlatform.buildRustPackage {
   pname = "websurfx";
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage {
     owner = "neon-mmd";
     repo = "websurfx";
     tag = "v${version}";
-    hash = "sha256-l04M2veWipVmmR4lN5+8mHpL2/16JMd3biRzEIacgac=";
+    hash = "sha256-+nd4CchLAC0QbXDCCCdeLUsTyQDXprLHkWDFSljzFLY=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage {
     openssl
   ];
 
-  cargoHash = "sha256-ekosi4t0InWh1c14jEe2MAWPCQ4qnqwPFvTAtAlwiuw=";
+  cargoHash = "sha256-mkkBJBd17Ct0xpXGK1k+TZf5GqDIUW8EgFtokTDe8Vw=";
 
   postPatch = ''
     substituteInPlace src/handler.rs \

From 58949b9cb84084fdf487c6637b35db980c5ab5b1 Mon Sep 17 00:00:00 2001
From: cyclopentane <cyclopentane@aidoskyneen.eu>
Date: Mon, 29 Sep 2025 21:09:38 +0200
Subject: [PATCH 02/47] friture: 0.51 -> 0.54

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

diff --git a/pkgs/by-name/fr/friture/package.nix b/pkgs/by-name/fr/friture/package.nix
index 127e163f4735..c3900ab28336 100644
--- a/pkgs/by-name/fr/friture/package.nix
+++ b/pkgs/by-name/fr/friture/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "friture";
-  version = "0.51";
+  version = "0.54";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tlecomte";
     repo = "friture";
     rev = "v${version}";
-    hash = "sha256-1Swkk7bhQTSo17Gj0i1VNiIt+fSXgDIeWfJ9LpoUEHg=";
+    hash = "sha256-KWj2AhPloomjYwd7besX5QIG8snZe1L2hATEfm/HaIE=";
   };
 
   postPatch = ''
@@ -34,6 +34,8 @@ python3Packages.buildPythonApplication rec {
   buildInputs = with qt5; [ qtquickcontrols2 ];
 
   propagatedBuildInputs = with python3Packages; [
+    platformdirs
+    pyinstaller
     sounddevice
     pyopengl
     pyopengl-accelerate

From fdf9328b6930bda5cdb7c05bea7a88cba70b8eeb Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 2 Oct 2025 17:04:33 +0100
Subject: [PATCH 03/47] stripe-cli: 1.30.0 -> 1.31.0

Diff: https://github.com/stripe/stripe-cli/compare/v1.30.0...v1.31.0

Changelog: https://github.com/stripe/stripe-cli/releases/tag/v1.31.0
---
 pkgs/by-name/st/stripe-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index f588a73911da..e51a6cfe4f14 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "stripe-cli";
-  version = "1.30.0";
+  version = "1.31.0";
 
   src = fetchFromGitHub {
     owner = "stripe";
     repo = "stripe-cli";
     rev = "v${version}";
-    hash = "sha256-qDrEDP3gDHggXxavMVuVitFN+OWz5WlamePS/1/zlq8=";
+    hash = "sha256-fvemd1yo8WOWob/l3TU9lHcFc7OAI/oaX5XEK38vDwo=";
   };
   vendorHash = "sha256-EDdRgApJ7gv/4ma/IfaHi+jjpTPegsUfqHbvoFMn048=";
 

From 69fd8feb5b9828423df45a3c88fbc26848590595 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 2 Oct 2025 17:07:01 +0100
Subject: [PATCH 04/47] stripe-cli: move to finalAttrs

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

diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index e51a6cfe4f14..c5241ca7aeab 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -6,14 +6,14 @@
   stdenv,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "stripe-cli";
   version = "1.31.0";
 
   src = fetchFromGitHub {
     owner = "stripe";
     repo = "stripe-cli";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-fvemd1yo8WOWob/l3TU9lHcFc7OAI/oaX5XEK38vDwo=";
   };
   vendorHash = "sha256-EDdRgApJ7gv/4ma/IfaHi+jjpTPegsUfqHbvoFMn048=";
@@ -23,7 +23,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/stripe/stripe-cli/pkg/version.Version=${version}"
+    "-X github.com/stripe/stripe-cli/pkg/version.Version=${finalAttrs.version}"
   ];
 
   preCheck = ''
@@ -64,13 +64,13 @@ buildGoModule rec {
   installCheckPhase = ''
     runHook preInstallCheck
     $out/bin/stripe --help
-    $out/bin/stripe --version | grep "${version}"
+    $out/bin/stripe --version | grep "${finalAttrs.version}"
     runHook postInstallCheck
   '';
 
   meta = {
     homepage = "https://stripe.com/docs/stripe-cli";
-    changelog = "https://github.com/stripe/stripe-cli/releases/tag/v${version}";
+    changelog = "https://github.com/stripe/stripe-cli/releases/tag/v${finalAttrs.version}";
     description = "Command-line tool for Stripe";
     longDescription = ''
       The Stripe CLI helps you build, test, and manage your Stripe integration
@@ -90,4 +90,4 @@ buildGoModule rec {
     ];
     mainProgram = "stripe";
   };
-}
+})

From 73301e6606efd5b6068b106cef5d69df73b8e1f2 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 2 Oct 2025 17:07:38 +0100
Subject: [PATCH 05/47] stripe-cli: fetch src by tag

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

diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index c5241ca7aeab..db34eda2e1a7 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -13,7 +13,7 @@ buildGoModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "stripe";
     repo = "stripe-cli";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-fvemd1yo8WOWob/l3TU9lHcFc7OAI/oaX5XEK38vDwo=";
   };
   vendorHash = "sha256-EDdRgApJ7gv/4ma/IfaHi+jjpTPegsUfqHbvoFMn048=";
@@ -70,7 +70,7 @@ buildGoModule (finalAttrs: {
 
   meta = {
     homepage = "https://stripe.com/docs/stripe-cli";
-    changelog = "https://github.com/stripe/stripe-cli/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/stripe/stripe-cli/releases/tag/${finalAttrs.src.tag}";
     description = "Command-line tool for Stripe";
     longDescription = ''
       The Stripe CLI helps you build, test, and manage your Stripe integration

From 6d17d94fa766a606e9145a9fe487330da0c0819e Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 2 Oct 2025 17:16:13 +0100
Subject: [PATCH 06/47] stripe-cli: fix completion when cross-compiling

---
 pkgs/by-name/st/stripe-cli/package.nix | 30 +++++++++++++++-----------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index db34eda2e1a7..47f1e6039b2b 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   installShellFiles,
   stdenv,
+
+  buildPackages,
 }:
 
 buildGoModule (finalAttrs: {
@@ -54,19 +56,21 @@ buildGoModule (finalAttrs: {
         rm pkg/plugins/plugin_test.go
       '';
 
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd stripe \
-      --bash <($out/bin/stripe completion --write-to-stdout --shell bash) \
-      --zsh <($out/bin/stripe completion --write-to-stdout --shell zsh)
-  '';
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    runHook preInstallCheck
-    $out/bin/stripe --help
-    $out/bin/stripe --version | grep "${finalAttrs.version}"
-    runHook postInstallCheck
-  '';
+  postInstall =
+    let
+      inherit (finalAttrs.meta) mainProgram;
+      exe =
+        if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
+          "$out/bin/${mainProgram}"
+        else
+          lib.getExe buildPackages.stripe-cli;
+    in
+    ''
+      # only outputs bash and zsh completion
+      installShellCompletion --cmd ${mainProgram} \
+        --bash <(${exe} completion --write-to-stdout --shell bash) \
+        --zsh <(${exe} completion --write-to-stdout --shell zsh)
+    '';
 
   meta = {
     homepage = "https://stripe.com/docs/stripe-cli";

From 35b85dde9961c51400a5f35665737877a4595536 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Thu, 2 Oct 2025 17:44:41 +0100
Subject: [PATCH 07/47] stripe-cli: properly skip tests and fix for darwin
 sandbox

---
 pkgs/by-name/st/stripe-cli/package.nix | 36 +++++++++++++++++++-------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/st/stripe-cli/package.nix b/pkgs/by-name/st/stripe-cli/package.nix
index 47f1e6039b2b..f1da78fc4789 100644
--- a/pkgs/by-name/st/stripe-cli/package.nix
+++ b/pkgs/by-name/st/stripe-cli/package.nix
@@ -5,6 +5,8 @@
   installShellFiles,
   stdenv,
 
+  writableTmpDirAsHomeHook,
+
   buildPackages,
 }:
 
@@ -12,6 +14,9 @@ buildGoModule (finalAttrs: {
   pname = "stripe-cli";
   version = "1.31.0";
 
+  # required for tests
+  __darwinAllowLocalNetworking = true;
+
   src = fetchFromGitHub {
     owner = "stripe";
     repo = "stripe-cli";
@@ -28,34 +33,45 @@ buildGoModule (finalAttrs: {
     "-X github.com/stripe/stripe-cli/pkg/version.Version=${finalAttrs.version}"
   ];
 
+  nativeCheckInputs = [
+    # required by pkg/rpcservice/sample_create_test.go
+    writableTmpDirAsHomeHook
+  ];
+
   preCheck = ''
     # the tests expect the Version ldflag not to be set
     unset ldflags
-
-    # requires internet access
-    rm pkg/cmd/plugin_cmds_test.go
-    rm pkg/cmd/resources_test.go
-    rm pkg/cmd/root_test.go
-
-    # TODO: no clue why it's broken (1.17.1), remove for now.
-    rm pkg/login/client_login_test.go
-    rm pkg/git/editor_test.go
-    rm pkg/rpcservice/sample_create_test.go
   ''
   +
     lib.optionalString
       (
         # delete plugin tests on all platforms but exact matches
         # https://github.com/stripe/stripe-cli/issues/850
+        # https://github.com/stripe/stripe-cli/blob/e3020d2e2df9c731b2f51df3aa53bf16383e863f/pkg/plugins/test_artifacts/plugins.toml
         !lib.lists.any (platform: lib.meta.platformMatch stdenv.hostPlatform platform) [
           "x86_64-linux"
           "x86_64-darwin"
+          "aarch64-darwin"
         ]
       )
       ''
         rm pkg/plugins/plugin_test.go
       '';
 
+  checkFlags =
+    let
+      skippedTests = [
+        # network access
+        "TestConflictWithPluginCommand"
+        "TestLogin"
+
+        # not providing git or the various editors it wants to call
+        "TestGetOpenEditorCommand"
+        "TestGetDefaultGitEditor"
+      ];
+    in
+    [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ];
+
   postInstall =
     let
       inherit (finalAttrs.meta) mainProgram;

From a3b8d7a91529fd663f2142b7c8f620a2c29a7579 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 24 Nov 2025 00:26:58 +0000
Subject: [PATCH 08/47] python3Packages.reportlab: 4.4.3 -> 4.4.5

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

diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix
index c6bed3f383fb..ed2388dc2dc5 100644
--- a/pkgs/development/python-modules/reportlab/default.nix
+++ b/pkgs/development/python-modules/reportlab/default.nix
@@ -17,7 +17,7 @@ let
 in
 buildPythonPackage rec {
   pname = "reportlab";
-  version = "4.4.3";
+  version = "4.4.5";
   pyproject = true;
 
   # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BzsJddq2lTas0yUYWOawUk7T4IfnHx0NGJWstQrPnHs=";
+    hash = "sha256-BFfWQqp233s2sCNTSZBMWNj5xgaockVu0EQ2qvrcFRA=";
   };
 
   postPatch = ''

From a66fa14050f28665ec7eafc514f379fa1d8405e8 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Mon, 24 Nov 2025 20:12:49 +0100
Subject: [PATCH 09/47] bottles-unwrapped: 52.1 -> 60.1

---
 pkgs/by-name/bo/bottles-unwrapped/package.nix    |  5 +++--
 pkgs/by-name/bo/bottles-unwrapped/terminal.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/bo/bottles-unwrapped/terminal.patch

diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix
index 181cd0efb4a6..50008f517427 100644
--- a/pkgs/by-name/bo/bottles-unwrapped/package.nix
+++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix
@@ -32,19 +32,20 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bottles-unwrapped";
-  version = "52.1";
+  version = "60.1";
 
   src = fetchFromGitHub {
     owner = "bottlesdevs";
     repo = "bottles";
     tag = version;
-    hash = "sha256-KRSFljHUB5JEk2saCb0voIukekeUSySinBICBrzY9eQ=";
+    hash = "sha256-d9nRT6AvFxnhI/theJtPg79EdmA+9UFS4OWDlkV03sA=";
   };
 
   patches = [
     ./vulkan_icd.patch
     ./redirect-bugtracker.patch
     ./remove-flatpak-check.patch
+    ./terminal.patch # Needed for `Launch with Terminal`
   ]
   ++ (
     if removeWarningPopup then
diff --git a/pkgs/by-name/bo/bottles-unwrapped/terminal.patch b/pkgs/by-name/bo/bottles-unwrapped/terminal.patch
new file mode 100644
index 000000000000..42d58518f839
--- /dev/null
+++ b/pkgs/by-name/bo/bottles-unwrapped/terminal.patch
@@ -0,0 +1,13 @@
+diff --git a/bottles/backend/utils/terminal.py b/bottles/backend/utils/terminal.py
+index 1f28e093..cca8018a 100644
+--- a/bottles/backend/utils/terminal.py
++++ b/bottles/backend/utils/terminal.py
+@@ -138,7 +138,7 @@ class TerminalUtils:
+                 full_cmd = f"{template} {cmd_for_shell}"
+
+         elif term_bin in ["kitty", "foot", "konsole", "gnome-terminal"]:
+-            cmd_for_shell = shlex.quote(f"sh -c {command}")
++            cmd_for_shell = f"sh -c {command}"
+             try:
+                 full_cmd = template % cmd_for_shell
+             except Exception:

From 394c692f65131fb587d48578e10ff195869bfafa Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 25 Nov 2025 11:48:13 +0100
Subject: [PATCH 10/47] aseq2json: fix sourceRoot

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

diff --git a/pkgs/by-name/as/aseq2json/package.nix b/pkgs/by-name/as/aseq2json/package.nix
index d975ca8164ba..b15ca24b85e4 100644
--- a/pkgs/by-name/as/aseq2json/package.nix
+++ b/pkgs/by-name/as/aseq2json/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
     rev = "8572e6313a0d7ec95492dcab04a46c5dd30ef33a";
     hash = "sha256-LQ9LLVumi3GN6c9tuMSOd1Bs2pgrwrLLQbs5XF+NZeA=";
   };
-  sourceRoot = "source/aseq2json";
+  sourceRoot = "${finalAttrs.src.name}/aseq2json";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [

From 019ebb771b1574eaa96216c04d3b7ac26dcd3f4f Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 25 Nov 2025 11:48:37 +0100
Subject: [PATCH 11/47] intel-ipsec-mb: fix sourceRoot

---
 pkgs/by-name/in/intel-ipsec-mb/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/in/intel-ipsec-mb/package.nix b/pkgs/by-name/in/intel-ipsec-mb/package.nix
index b7a503daca89..0b713d3a0f48 100644
--- a/pkgs/by-name/in/intel-ipsec-mb/package.nix
+++ b/pkgs/by-name/in/intel-ipsec-mb/package.nix
@@ -5,18 +5,18 @@
   nasm,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "intel-ipsec-mb";
   version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "intel-ipsec-mb";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-k/NoPMKbiWZ25tdomsPpv2gfhQuBHxzX6KRT1UY88Ko=";
   };
 
-  sourceRoot = "source/lib";
+  sourceRoot = "${finalAttrs.src.name}/lib";
 
   nativeBuildInputs = [ nasm ];
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     "NOLDCONFIG=y"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Intel Multi-Buffer Crypto for IPsec Library";
     longDescription = ''
       Intel Multi-Buffer Crypto for IPsec Library provides software crypto
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
       and MPEG DRM.
     '';
     homepage = "https://github.com/intel/intel-ipsec-mb";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     platforms = [ "x86_64-linux" ];
     maintainers = [ ];
   };
-}
+})

From be37853732137e299bc804baa7b0a3198eb6d8e4 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 25 Nov 2025 11:49:10 +0100
Subject: [PATCH 12/47] sendgmail: fix sourceRoot

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

diff --git a/pkgs/by-name/se/sendgmail/package.nix b/pkgs/by-name/se/sendgmail/package.nix
index 11b38387fae3..18a7c91dc167 100644
--- a/pkgs/by-name/se/sendgmail/package.nix
+++ b/pkgs/by-name/se/sendgmail/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   nix-update-script,
 }:
-buildGoModule {
+buildGoModule (finalAttrs: {
   pname = "sendgmail";
   version = "0-unstable-2025-03-06";
 
@@ -15,7 +15,7 @@ buildGoModule {
     hash = "sha256-bzbTU9SA4dJKtQVkqESvV5o3l3MY4Uy7HDqo7jI3dhM=";
   };
 
-  sourceRoot = "source/go/sendgmail";
+  sourceRoot = "${finalAttrs.src.name}/go/sendgmail";
 
   vendorHash = "sha256-0pjcO2Ati+mUSw614uEL3CatHSgbgDUfOBE8bWpjmcw=";
 
@@ -29,4 +29,4 @@ buildGoModule {
     platforms = lib.platforms.unix;
     mainProgram = "sendgmail";
   };
-}
+})

From 553f4fcf23055aa40ee99a26e9a3d0a2d09b11e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Nov 2025 14:16:57 +0000
Subject: [PATCH 13/47] gdscript-formatter: 0.18.0 -> 0.18.1

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

diff --git a/pkgs/by-name/gd/gdscript-formatter/package.nix b/pkgs/by-name/gd/gdscript-formatter/package.nix
index cd8a10e22e25..e5aac5e11991 100644
--- a/pkgs/by-name/gd/gdscript-formatter/package.nix
+++ b/pkgs/by-name/gd/gdscript-formatter/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gdscript-formatter";
-  version = "0.18.0";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "GDQuest";
     repo = "GDScript-formatter";
     tag = finalAttrs.version;
-    hash = "sha256-DO8ctTmPUkB+XZ1iEkv3HLWprCH6IHdGXIWvn08PL+A=";
+    hash = "sha256-16ASwYNnAtOVB0xxomjyuopya5rtmZriOE4H4W1v6nE=";
     # Needed due to .gitattributes being used for the Godot addon and export-ignoring all files
     deepClone = true;
   };
 
-  cargoHash = "sha256-b1seQakW2hZkclzkXX7DcTn+8TLinl2h0XMmdLHUT1A=";
+  cargoHash = "sha256-HWPSZFe78+NjIV79Un2e06S4AKpw1xJbJuX0fh1YJdo=";
 
   cargoBuildFlags = [
     "--bin=gdscript-formatter"

From b7e4c0b382f6ffdbb8a3f3795ebed956f3a7c8ea Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 22 Nov 2025 17:50:13 +0400
Subject: [PATCH 14/47] telegram-desktop: add missing runtime geo deps

This solves the following error when opening location picker:

```
Could not load 'libgeoclue-2.so.0'! Error: libgeoclue-2.so.0: cannot open shared object file: No such file or directory
```
---
 .../telegram/telegram-desktop/default.nix                   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
index 96b84b979a89..85597e015e99 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@@ -14,6 +14,7 @@
   libjxl,
   wrapGAppsHook3,
   wrapQtAppsHook,
+  geoclue2,
   glib-networking,
   webkitgtk_4_1,
   withWebkit ? true,
@@ -53,7 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
     "--prefix"
     "LD_LIBRARY_PATH"
     ":"
-    (lib.makeLibraryPath [ webkitgtk_4_1 ])
+    (lib.makeLibraryPath [
+      geoclue2
+      webkitgtk_4_1
+    ])
   ];
 
   dontUnpack = true;

From e29a4015f2256f0b3d3f547f25acdfd2dde70de6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 27 Nov 2025 23:22:57 +0000
Subject: [PATCH 15/47] boxflat: 1.34.4 -> 1.35.2

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

diff --git a/pkgs/by-name/bo/boxflat/package.nix b/pkgs/by-name/bo/boxflat/package.nix
index 8d5736ee9357..377ce8b80459 100644
--- a/pkgs/by-name/bo/boxflat/package.nix
+++ b/pkgs/by-name/bo/boxflat/package.nix
@@ -14,14 +14,14 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "boxflat";
-  version = "1.34.4";
+  version = "1.35.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lawstorant";
     repo = "boxflat";
     tag = "v${version}";
-    hash = "sha256-QuBGEOAMVR70JDpD1VVASuCJJdwbWDzK8qmo/BOOua0=";
+    hash = "sha256-7JIIFti8LHBIDBr+GywImlP2l3Ct/hq4pb5+2/q+F0k=";
   };
 
   build-system = [ python3Packages.setuptools ];

From c2567773ede31c5cfc057bb83b8e91f3a4436ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 27 Nov 2025 22:51:27 -0800
Subject: [PATCH 16/47] qutebrowser: 3.6.1 -> 3.6.2

Diff: https://github.com/qutebrowser/qutebrowser/compare/v3.6.1...v3.6.2

Changelog: https://github.com/qutebrowser/qutebrowser/blob/v3.6.2/doc/changelog.asciidoc
---
 pkgs/by-name/qu/qutebrowser/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix
index 9d364f64eba3..0757bd74a18a 100644
--- a/pkgs/by-name/qu/qutebrowser/package.nix
+++ b/pkgs/by-name/qu/qutebrowser/package.nix
@@ -26,15 +26,15 @@ let
   isQt6 = lib.versions.major qt6Packages.qtbase.version == "6";
   pdfjs =
     let
-      version = "5.4.296";
+      version = "5.4.394";
     in
     fetchzip {
       url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
-      hash = "sha256-UQ7sYOh7s95mfzH2ZbfDyEvUZiXr7MI3u0WY8WNHWv4=";
+      hash = "sha256-KMpSwF5MmoWdNoIUd4ZOwbJZZmjkid8wUoFKw7XjQFA=";
       stripRoot = false;
     };
 
-  version = "3.6.1";
+  version = "3.6.2";
 in
 
 python3.pkgs.buildPythonApplication {
@@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
 
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
-    hash = "sha256-9b31UPJzmsGCXmCAIb+8XMEjKnvFIEO0MozWluHYbZA=";
+    hash = "sha256-GfSkVluSwcCAvLPlW49QLmyWblTrnW9Qgqne0Qy8JJM=";
   };
 
   # Needs tox

From c9036b1199815695f904ddbb9f99c46dd85e6461 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Nov 2025 16:52:15 +0000
Subject: [PATCH 17/47] terragrunt: 0.93.10 -> 0.93.11

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

diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index bbfa4234fcae..898fbe1c3eed 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "terragrunt";
-  version = "0.93.10";
+  version = "0.93.11";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "terragrunt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aq3Q+PsKtkFXvBxZ1dpXsXWcQFEBTR1T/q/svWsEljg=";
+    hash = "sha256-Ff56GmIgi95BIRFUJ5KJGiqeioCfHY/ZseZ3Q4YzrtU=";
   };
 
   nativeBuildInputs = [

From 758ba3dfcce6775d1c88e1845122b2a237caf2d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Nov 2025 20:20:40 +0000
Subject: [PATCH 18/47] kodiPackages.arteplussept: 1.4.3 -> 1.4.4

---
 pkgs/applications/video/kodi/addons/arteplussept/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix
index 59b20970943c..8197e5ec000d 100644
--- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix
+++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix
@@ -12,11 +12,11 @@
 buildKodiAddon rec {
   pname = "arteplussept";
   namespace = "plugin.video.arteplussept";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchzip {
     url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip";
-    hash = "sha256-05k0ijTp0JDtHdxTJ5I8ff47F6LXGP78rInyX0nD7W8=";
+    hash = "sha256-jFIcLhglfOqkFLtlIJKB1o++mWfnpWKS3w1wD0S3+CE=";
   };
 
   propagatedBuildInputs = [

From b744f8ab1c6195bd64d013d57eee73fff7af5cbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Nov 2025 12:26:35 +0000
Subject: [PATCH 19/47] tsidp: 0.0.6 -> 0.0.7

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

diff --git a/pkgs/by-name/ts/tsidp/package.nix b/pkgs/by-name/ts/tsidp/package.nix
index 5861a235bd75..04bc37a65d86 100644
--- a/pkgs/by-name/ts/tsidp/package.nix
+++ b/pkgs/by-name/ts/tsidp/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "tsidp";
-  version = "0.0.6";
+  version = "0.0.7";
 
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tsidp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qOZJkCVAgR6xXZryysyFbf/P8zrLhe2iHYWFlIadiBM=";
+    hash = "sha256-7VOTrIYwNnayjQ4s/dFIIUj58XG5LTRvdLXdGpeW0CY=";
   };
 
   vendorHash = "sha256-iBy+osK+2LdkTzXhrkSaB6nWpUCpr8VkxJTtcfVCFuw=";

From 8e2d270ae2748021d94f25b4281292ae4e713813 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Nov 2025 15:33:15 +0000
Subject: [PATCH 20/47] files-cli: 2.15.152 -> 2.15.156

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

diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index 359e81225772..39b6028d6161 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "files-cli";
-  version = "2.15.152";
+  version = "2.15.156";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${version}";
-    hash = "sha256-0rXDVLr1V54+nXiqzhRsQJhF1JSreyQC9GcW3Sj2IcM=";
+    hash = "sha256-sVvo0LAdcJvxCSOdmjB2BiFxXscIn3d7yiZrcb7FVI8=";
   };
 
-  vendorHash = "sha256-BijznllCTXFgjADT/OZrgNYRM4aRXhxsIQu+jZngcFM=";
+  vendorHash = "sha256-gEoes1Q3ARAC2Fz0H9clNT/0LQ5RCfpLrQljgsMhOhA=";
 
   ldflags = [
     "-s"

From 71cb937c51f49554692593d76ccdccf41db42e56 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 29 Nov 2025 10:45:45 -0500
Subject: [PATCH 21/47] multipass: remove unmaintained package and module

---
 nixos/modules/module-list.nix                 |   1 -
 nixos/modules/rename.nix                      |   3 +
 nixos/modules/virtualisation/multipass.nix    |  66 ---------
 nixos/tests/all-tests.nix                     |   1 -
 nixos/tests/multipass.nix                     |  39 -----
 .../by-name/mu/multipass/cmake_no_fetch.patch |  13 --
 pkgs/by-name/mu/multipass/cmake_warning.patch |  14 --
 pkgs/by-name/mu/multipass/gui.nix             |  83 -----------
 .../mu/multipass/lxd_socket_path.patch        |  13 --
 pkgs/by-name/mu/multipass/multipassd.nix      | 139 ------------------
 pkgs/by-name/mu/multipass/package.nix         |  61 --------
 pkgs/by-name/mu/multipass/pubspec.lock.json   |   1 -
 .../mu/multipass/test_unreachable_call.patch  |  12 --
 pkgs/by-name/mu/multipass/update.sh           |  61 --------
 .../mu/multipass/vcpkg_no_install.patch       |  14 --
 pkgs/top-level/aliases.nix                    |   1 +
 16 files changed, 4 insertions(+), 518 deletions(-)
 delete mode 100644 nixos/modules/virtualisation/multipass.nix
 delete mode 100644 nixos/tests/multipass.nix
 delete mode 100644 pkgs/by-name/mu/multipass/cmake_no_fetch.patch
 delete mode 100644 pkgs/by-name/mu/multipass/cmake_warning.patch
 delete mode 100644 pkgs/by-name/mu/multipass/gui.nix
 delete mode 100644 pkgs/by-name/mu/multipass/lxd_socket_path.patch
 delete mode 100644 pkgs/by-name/mu/multipass/multipassd.nix
 delete mode 100644 pkgs/by-name/mu/multipass/package.nix
 delete mode 100644 pkgs/by-name/mu/multipass/pubspec.lock.json
 delete mode 100644 pkgs/by-name/mu/multipass/test_unreachable_call.patch
 delete mode 100755 pkgs/by-name/mu/multipass/update.sh
 delete mode 100644 pkgs/by-name/mu/multipass/vcpkg_no_install.patch

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index cc94d98c4120..50323f0dd888 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1945,7 +1945,6 @@
   ./virtualisation/libvirtd.nix
   ./virtualisation/lxc.nix
   ./virtualisation/lxcfs.nix
-  ./virtualisation/multipass.nix
   ./virtualisation/nixos-containers.nix
   ./virtualisation/oci-containers.nix
   ./virtualisation/oci-options.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index f0733111a995..5733f0b4bf9c 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -441,6 +441,9 @@ in
       to periodically collect random data from the device and mix it
       into the kernel's RNG.
     '')
+    (mkRemovedOptionModule [ "virtualisation" "multipass" ] ''
+      virtualisation.multipass has been removed since it was unmaintained in nixpkgs
+    '')
     # Do NOT add any option renames here, see top of the file
   ];
 }
diff --git a/nixos/modules/virtualisation/multipass.nix b/nixos/modules/virtualisation/multipass.nix
deleted file mode 100644
index 9613010f0f93..000000000000
--- a/nixos/modules/virtualisation/multipass.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.virtualisation.multipass;
-in
-{
-  options = {
-    virtualisation.multipass = {
-      enable = lib.mkEnableOption "Multipass, a simple manager for virtualised Ubuntu instances";
-
-      logLevel = lib.mkOption {
-        type = lib.types.enum [
-          "error"
-          "warning"
-          "info"
-          "debug"
-          "trace"
-        ];
-        default = "debug";
-        description = ''
-          The logging verbosity of the multipassd binary.
-        '';
-      };
-
-      package = lib.mkPackageOption pkgs "multipass" { };
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = [ cfg.package ];
-
-    systemd.services.multipass = {
-      description = "Multipass orchestrates virtual Ubuntu instances.";
-
-      wantedBy = [ "multi-user.target" ];
-      wants = [ "network-online.target" ];
-      after = [ "network-online.target" ];
-
-      environment = {
-        "XDG_DATA_HOME" = "/var/lib/multipass/data";
-        "XDG_CACHE_HOME" = "/var/lib/multipass/cache";
-        "XDG_CONFIG_HOME" = "/var/lib/multipass/config";
-      };
-
-      serviceConfig = {
-        ExecStart = "${cfg.package}/bin/multipassd --logger platform --verbosity ${cfg.logLevel}";
-        SyslogIdentifier = "multipassd";
-        Restart = "on-failure";
-        TimeoutStopSec = 300;
-        Type = "simple";
-
-        WorkingDirectory = "/var/lib/multipass";
-
-        StateDirectory = "multipass";
-        StateDirectoryMode = "0750";
-        CacheDirectory = "multipass";
-        CacheDirectoryMode = "0750";
-      };
-    };
-  };
-}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2dbe012709bf..9902d3e7e686 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -983,7 +983,6 @@ in
   mpd = runTest ./mpd.nix;
   mpv = runTest ./mpv.nix;
   mtp = runTest ./mtp.nix;
-  multipass = runTest ./multipass.nix;
   mumble = runTest ./mumble.nix;
   munge = runTest ./munge.nix;
   munin = runTest ./munin.nix;
diff --git a/nixos/tests/multipass.nix b/nixos/tests/multipass.nix
deleted file mode 100644
index f5151f4acbde..000000000000
--- a/nixos/tests/multipass.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ pkgs, lib, ... }:
-
-let
-  multipass-image = import ../release.nix {
-    configuration = {
-      # Building documentation makes the test unnecessarily take a longer time:
-      documentation.enable = lib.mkForce false;
-    };
-  };
-
-in
-{
-  name = "multipass";
-
-  meta.maintainers = [ ];
-
-  nodes.machine =
-    { lib, ... }:
-    {
-      virtualisation = {
-        cores = 1;
-        memorySize = 1024;
-        diskSize = 4096;
-
-        multipass.enable = true;
-      };
-    };
-
-  testScript = ''
-    machine.wait_for_unit("sockets.target")
-    machine.wait_for_unit("multipass.service")
-    machine.wait_for_file("/var/lib/multipass/data/multipassd/network/multipass_subnet")
-
-    # Wait for Multipass to settle
-    machine.sleep(1)
-
-    machine.succeed("multipass list")
-  '';
-}
diff --git a/pkgs/by-name/mu/multipass/cmake_no_fetch.patch b/pkgs/by-name/mu/multipass/cmake_no_fetch.patch
deleted file mode 100644
index 6981a0dd33f7..000000000000
--- a/pkgs/by-name/mu/multipass/cmake_no_fetch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 52bd407f..a1100112 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -28,7 +28,7 @@ FetchContent_Declare(googletest
- )
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
- set(INSTALL_GTEST OFF CACHE BOOL "")
--FetchContent_MakeAvailable(googletest)
-+# FetchContent_MakeAvailable(googletest)
- 
- add_executable(multipass_tests
-   blueprint_test_lambdas.cpp
diff --git a/pkgs/by-name/mu/multipass/cmake_warning.patch b/pkgs/by-name/mu/multipass/cmake_warning.patch
deleted file mode 100644
index 846cba0690fb..000000000000
--- a/pkgs/by-name/mu/multipass/cmake_warning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/cert/CMakeLists.txt b/src/cert/CMakeLists.txt
-index d44a0b09..de440f24 100644
---- a/src/cert/CMakeLists.txt
-+++ b/src/cert/CMakeLists.txt
-@@ -22,7 +22,7 @@ add_library(cert STATIC
- target_include_directories(cert PRIVATE
-   ${OPENSSL_INCLUDE_DIR})
- 
--foreach(flag -Wno-nested-anon-types -Wno-gnu -Wno-pedantic -Wno-ignored-qualifiers)
-+foreach(flag -Wno-nested-anon-types -Wno-gnu -Wno-pedantic -Wno-ignored-qualifiers -Wno-ignored-attributes)
-   check_cxx_compiler_flag(${flag} SUPPORTED)
-   if(SUPPORTED)
-     target_compile_options(cert PRIVATE ${flag})
-
diff --git a/pkgs/by-name/mu/multipass/gui.nix b/pkgs/by-name/mu/multipass/gui.nix
deleted file mode 100644
index eacb8962aa7b..000000000000
--- a/pkgs/by-name/mu/multipass/gui.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  commonMeta,
-  multipass_src,
-  multipassd,
-  version,
-
-  autoPatchelfHook,
-  flutter332,
-  gtkmm3,
-  keybinder3,
-  lib,
-  libayatana-appindicator,
-  libnotify,
-  protobuf,
-  protoc-gen-dart,
-  qt6,
-}:
-flutter332.buildFlutterApplication {
-  inherit version;
-  pname = "multipass-gui";
-  src = multipass_src;
-
-  sourceRoot = "${multipass_src.name}/src/client/gui";
-
-  pubspecLock = lib.importJSON ./pubspec.lock.json;
-
-  gitHashes = {
-    dartssh2 = "sha256-9XrxxOamy0uS7kUz6mwWwp4yIBHLX/GSoyxMk/Wwa+4=";
-    hotkey_manager_linux = "sha256-aO0h94YZvgV/ggVupNw8GjyZsnXrq3qTHRDtuhNv3oI=";
-    tray_menu = "sha256-TAlRW7VkZWAoHAVlrPeDqS3BsqhQTyCekYQ2b4AEqjU=";
-    window_size = "sha256-71PqQzf+qY23hTJvcm0Oye8tng3Asr42E2vfF1nBmVA=";
-    xterm = "sha256-h8vIonTPUVnNqZPk/A4ZV7EYCMyM0rrErL9ZOMe4ZBE=";
-  };
-
-  buildInputs = [
-    gtkmm3
-    keybinder3
-    libayatana-appindicator
-    libnotify
-    qt6.qtbase
-    qt6.qtwayland
-  ];
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    protobuf
-    protoc-gen-dart
-    qt6.wrapQtAppsHook
-  ];
-
-  preBuild = ''
-    # Temporary fix which can be removed in the next release.
-    # Already addressed upstream, but part of a larger patch
-    # that did not trivially apply.
-    substituteInPlace lib/main.dart --replace-fail 'TabBarTheme(' 'TabBarThemeData('
-
-    mkdir -p lib/generated
-
-    # Generate the Dart gRPC code for the Multipass GUI.
-    protoc \
-      --plugin=protoc-gen-dart=${lib.getExe protoc-gen-dart} \
-      --dart_out=grpc:lib/generated \
-      -I ../../rpc \
-      ../../rpc/multipass.proto \
-      google/protobuf/timestamp.proto
-  '';
-
-  runtimeDependencies = [ multipassd ];
-
-  postFixup = ''
-    mv $out/bin/multipass_gui $out/bin/multipass.gui
-
-    install -Dm444 $out/app/multipass-gui/data/flutter_assets/assets/icon.png \
-      $out/share/icons/hicolor/256x256/apps/multipass.gui.png
-
-    cp $out/share/applications/multipass.gui.autostart.desktop \
-      $out/share/applications/multipass.gui.desktop
-  '';
-
-  meta = commonMeta // {
-    description = "Flutter frontend application for managing Ubuntu VMs";
-  };
-}
diff --git a/pkgs/by-name/mu/multipass/lxd_socket_path.patch b/pkgs/by-name/mu/multipass/lxd_socket_path.patch
deleted file mode 100644
index e23e8f72dcd7..000000000000
--- a/pkgs/by-name/mu/multipass/lxd_socket_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/platform/backends/lxd/lxd_request.h b/src/platform/backends/lxd/lxd_request.h
-index 4b5e8840..5e673ad7 100644
---- a/src/platform/backends/lxd/lxd_request.h
-+++ b/src/platform/backends/lxd/lxd_request.h
-@@ -27,7 +27,7 @@
- 
- namespace multipass
- {
--const QUrl lxd_socket_url{"unix:///var/snap/lxd/common/lxd/unix.socket@1.0"};
-+const QUrl lxd_socket_url{"unix:///var/lib/lxd/unix.socket@1.0"};
- const QString lxd_project_name{"multipass"};
- 
- class NetworkAccessManager;
diff --git a/pkgs/by-name/mu/multipass/multipassd.nix b/pkgs/by-name/mu/multipass/multipassd.nix
deleted file mode 100644
index a2b6fece2e09..000000000000
--- a/pkgs/by-name/mu/multipass/multipassd.nix
+++ /dev/null
@@ -1,139 +0,0 @@
-{
-  commonMeta,
-  multipass_src,
-  version,
-
-  cmake,
-  dnsmasq,
-  fetchFromGitHub,
-  fmt,
-  git,
-  grpc,
-  gtest,
-  iproute2,
-  iptables,
-  lib,
-  libapparmor,
-  libvirt,
-  libxml2,
-  openssl,
-  OVMF,
-  pkg-config,
-  poco,
-  protobuf,
-  qemu-utils,
-  qemu,
-  qt6,
-  slang,
-  stdenv,
-  xterm,
-}:
-
-stdenv.mkDerivation {
-  inherit version;
-  pname = "multipassd";
-  src = multipass_src;
-
-  patches = [
-    # Multipass is usually only delivered as a snap package on Linux, and it expects that
-    # the LXD backend will also be delivered via a snap - in which cases the LXD socket
-    # is available at '/var/snap/lxd/...'. Here we patch to ensure that Multipass uses the
-    # LXD socket location on NixOS in '/var/lib/...'
-    ./lxd_socket_path.patch
-    # The upstream cmake file attempts to fetch googletest using FetchContent, which fails
-    # in the Nix build environment. This patch disables the fetch in favour of providing
-    # the googletest library from nixpkgs.
-    ./cmake_no_fetch.patch
-    # As of Multipass 1.14.0, the upstream started using vcpkg for grabbing C++ dependencies,
-    # which doesn't work in the nix build environment. This patch reverts that change, in favour
-    # of providing those dependencies manually in this derivation.
-    ./vcpkg_no_install.patch
-    # The compiler flags used in nixpkgs surface an error in the test suite where an
-    # unreachable path was not annotated as such - this patch adds the annotation to ensure
-    # that the test suite passes in the nix build process.
-    ./test_unreachable_call.patch
-  ];
-
-  postPatch = ''
-    # Make sure the version is reported correctly in the compiled binary.
-    substituteInPlace ./CMakeLists.txt \
-      --replace-fail "determine_version(MULTIPASS_VERSION)" "" \
-      --replace-fail 'set(MULTIPASS_VERSION ''${MULTIPASS_VERSION})' 'set(MULTIPASS_VERSION "v${version}")'
-
-    # Don't build the GUI .desktop file, do that in the gui derivation instead
-    substituteInPlace ./CMakeLists.txt --replace-fail "add_subdirectory(data)" ""
-
-    # Don't build/use vcpkg
-    rm -rf 3rd-party/vcpkg
-
-    # Patch the patch of the OVMF binaries to use paths from the nix store.
-    substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \
-      --replace-fail "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \
-      --replace-fail "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd"
-
-    # Configure CMake to use gtest from the nix store since we disabled fetching from the internet.
-    cat >> tests/CMakeLists.txt <<'EOF'
-      add_library(gtest INTERFACE)
-      target_include_directories(gtest INTERFACE ${gtest.dev}/include)
-      target_link_libraries(gtest INTERFACE ${gtest}/lib/libgtest.so ''${CMAKE_THREAD_LIBS_INIT})
-      add_dependencies(gtest GMock)
-
-      add_library(gtest_main INTERFACE)
-      target_include_directories(gtest_main INTERFACE ${gtest.dev}/include)
-      target_link_libraries(gtest_main INTERFACE ${gtest}/lib/libgtest_main.so gtest)
-
-      add_library(gmock INTERFACE)
-      target_include_directories(gmock INTERFACE ${gtest.dev}/include)
-      target_link_libraries(gmock INTERFACE ${gtest}/lib/libgmock.so gtest)
-
-      add_library(gmock_main INTERFACE)
-      target_include_directories(gmock_main INTERFACE ${gtest.dev}/include)
-      target_link_libraries(gmock_main INTERFACE ${gtest}/lib/libgmock_main.so gmock gtest_main)
-    EOF
-  '';
-
-  # We'll build the flutter application separately using buildFlutterApplication
-  cmakeFlags = [ "-DMULTIPASS_ENABLE_FLUTTER_GUI=false" ];
-
-  buildInputs = [
-    fmt
-    grpc
-    gtest
-    libapparmor
-    libvirt
-    libxml2
-    openssl
-    poco.dev
-    protobuf
-    qt6.qtbase
-    qt6.qtwayland
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    git
-    pkg-config
-    qt6.wrapQtAppsHook
-    slang
-  ];
-
-  nativeCheckInputs = [ gtest ];
-
-  postInstall = ''
-    wrapProgram $out/bin/multipassd --prefix PATH : ${
-      lib.makeBinPath [
-        dnsmasq
-        iproute2
-        iptables
-        OVMF.fd
-        qemu
-        qemu-utils
-        xterm
-      ]
-    }
-  '';
-
-  meta = commonMeta // {
-    description = "Backend server & client for managing on-demand Ubuntu VMs";
-  };
-}
diff --git a/pkgs/by-name/mu/multipass/package.nix b/pkgs/by-name/mu/multipass/package.nix
deleted file mode 100644
index 527b9964101b..000000000000
--- a/pkgs/by-name/mu/multipass/package.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  callPackage,
-  fetchFromGitHub,
-  lib,
-  nixosTests,
-  stdenv,
-  symlinkJoin,
-}:
-
-let
-  name = "multipass";
-  version = "1.16.1";
-
-  multipass_src = fetchFromGitHub {
-    owner = "canonical";
-    repo = "multipass";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-DryVXuyAdjk+KhJZYqGh/r1H50rwM16vJ9igLtftgDY=";
-    fetchSubmodules = true;
-  };
-
-  commonMeta = {
-    homepage = "https://multipass.run";
-    license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
-    platforms = [ "x86_64-linux" ];
-  };
-
-  multipassd = callPackage ./multipassd.nix {
-    inherit commonMeta multipass_src version;
-  };
-
-  multipass-gui = callPackage ./gui.nix {
-    inherit
-      commonMeta
-      multipass_src
-      multipassd
-      version
-      ;
-  };
-in
-symlinkJoin {
-  inherit version;
-  pname = name;
-
-  paths = [
-    multipassd
-    multipass-gui
-  ];
-
-  passthru = {
-    tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
-      inherit (nixosTests) multipass;
-    };
-    updateScript = ./update.sh;
-  };
-
-  meta = commonMeta // {
-    description = "Ubuntu VMs on demand for any workstation";
-  };
-}
diff --git a/pkgs/by-name/mu/multipass/pubspec.lock.json b/pkgs/by-name/mu/multipass/pubspec.lock.json
deleted file mode 100644
index 86e75668ed87..000000000000
--- a/pkgs/by-name/mu/multipass/pubspec.lock.json
+++ /dev/null
@@ -1 +0,0 @@
-{"packages":{"args":{"dependency":"transitive","description":{"name":"args","sha256":"d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04","url":"https://pub.dev"},"source":"hosted","version":"2.7.0"},"asn1lib":{"dependency":"transitive","description":{"name":"asn1lib","sha256":"9a8f69025044eb466b9b60ef3bc3ac99b4dc6c158ae9c56d25eeccf5bc56d024","url":"https://pub.dev"},"source":"hosted","version":"1.6.5"},"async":{"dependency":"direct main","description":{"name":"async","sha256":"758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb","url":"https://pub.dev"},"source":"hosted","version":"2.13.0"},"basics":{"dependency":"direct main","description":{"name":"basics","sha256":"41ff8aded84ae174d1df5cce0bcac3ab9070caac9f7da35fd2cc638dfee6163f","url":"https://pub.dev"},"source":"hosted","version":"0.10.0"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"built_collection":{"dependency":"direct main","description":{"name":"built_collection","sha256":"376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803","url":"https://pub.dev"},"source":"hosted","version":"1.4.0"},"clock":{"dependency":"transitive","description":{"name":"clock","sha256":"fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b","url":"https://pub.dev"},"source":"hosted","version":"1.1.2"},"collection":{"dependency":"direct main","description":{"name":"collection","sha256":"2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76","url":"https://pub.dev"},"source":"hosted","version":"1.19.1"},"convert":{"dependency":"transitive","description":{"name":"convert","sha256":"b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68","url":"https://pub.dev"},"source":"hosted","version":"3.1.2"},"cross_file":{"dependency":"transitive","description":{"name":"cross_file","sha256":"7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670","url":"https://pub.dev"},"source":"hosted","version":"0.3.4+2"},"crypto":{"dependency":"transitive","description":{"name":"crypto","sha256":"1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855","url":"https://pub.dev"},"source":"hosted","version":"3.0.6"},"dartssh2":{"dependency":"direct main","description":{"path":".","ref":"2.12.0+mp","resolved-ref":"1d924a068e4a4fa8ca51706192f91221a392144a","url":"https://github.com/canonical/dartssh2.git"},"source":"git","version":"2.12.0"},"equatable":{"dependency":"transitive","description":{"name":"equatable","sha256":"567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7","url":"https://pub.dev"},"source":"hosted","version":"2.0.7"},"extended_text":{"dependency":"direct main","description":{"name":"extended_text","sha256":"d8f4a6e2676505b54dc0d5f5e8de9020667b402e9c1b3a8b030a83e568c99654","url":"https://pub.dev"},"source":"hosted","version":"15.0.2"},"extended_text_library":{"dependency":"transitive","description":{"name":"extended_text_library","sha256":"13d99f8a10ead472d5e2cf4770d3d047203fe5054b152e9eb5dc692a71befbba","url":"https://pub.dev"},"source":"hosted","version":"12.0.1"},"ffi":{"dependency":"direct main","description":{"name":"ffi","sha256":"289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"file":{"dependency":"transitive","description":{"name":"file","sha256":"a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4","url":"https://pub.dev"},"source":"hosted","version":"7.0.1"},"file_selector":{"dependency":"direct main","description":{"name":"file_selector","sha256":"5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"file_selector_android":{"dependency":"transitive","description":{"name":"file_selector_android","sha256":"6bba3d590ee9462758879741abc132a19133600dd31832f55627442f1ebd7b54","url":"https://pub.dev"},"source":"hosted","version":"0.5.1+14"},"file_selector_ios":{"dependency":"transitive","description":{"name":"file_selector_ios","sha256":"94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420","url":"https://pub.dev"},"source":"hosted","version":"0.5.3+1"},"file_selector_linux":{"dependency":"transitive","description":{"name":"file_selector_linux","sha256":"54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+2"},"file_selector_macos":{"dependency":"transitive","description":{"name":"file_selector_macos","sha256":"8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+3"},"file_selector_platform_interface":{"dependency":"transitive","description":{"name":"file_selector_platform_interface","sha256":"a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b","url":"https://pub.dev"},"source":"hosted","version":"2.6.2"},"file_selector_web":{"dependency":"transitive","description":{"name":"file_selector_web","sha256":"c4c0ea4224d97a60a7067eca0c8fd419e708ff830e0c83b11a48faf566cec3e7","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+2"},"file_selector_windows":{"dependency":"transitive","description":{"name":"file_selector_windows","sha256":"320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+4"},"fixnum":{"dependency":"transitive","description":{"name":"fixnum","sha256":"b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"fl_chart":{"dependency":"direct main","description":{"name":"fl_chart","sha256":"577aeac8ca414c25333334d7c4bb246775234c0e44b38b10a82b559dd4d764e7","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1","url":"https://pub.dev"},"source":"hosted","version":"6.0.0"},"flutter_riverpod":{"dependency":"direct main","description":{"name":"flutter_riverpod","sha256":"9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1","url":"https://pub.dev"},"source":"hosted","version":"2.6.1"},"flutter_svg":{"dependency":"direct main","description":{"name":"flutter_svg","sha256":"cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845","url":"https://pub.dev"},"source":"hosted","version":"2.2.0"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"fpdart":{"dependency":"direct main","description":{"name":"fpdart","sha256":"1b84ce64453974159f08046f5d05592020d1fcb2099d7fe6ec58da0e7337af77","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"google_identity_services_web":{"dependency":"transitive","description":{"name":"google_identity_services_web","sha256":"5d187c46dc59e02646e10fe82665fc3884a9b71bc1c90c2b8b749316d33ee454","url":"https://pub.dev"},"source":"hosted","version":"0.3.3+1"},"googleapis_auth":{"dependency":"transitive","description":{"name":"googleapis_auth","sha256":"b81fe352cc4a330b3710d2b7ad258d9bcef6f909bb759b306bf42973a7d046db","url":"https://pub.dev"},"source":"hosted","version":"2.0.0"},"grpc":{"dependency":"direct main","description":{"name":"grpc","sha256":"2dde469ddd8bbd7a33a0765da417abe1ad2142813efce3a86c512041294e2b26","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"hotkey_manager":{"dependency":"direct main","description":{"name":"hotkey_manager","sha256":"06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd","url":"https://pub.dev"},"source":"hosted","version":"0.2.3"},"hotkey_manager_linux":{"dependency":"direct overridden","description":{"path":"packages/hotkey_manager_linux","ref":"no-cooked-accel","resolved-ref":"7e5a662615fbc9f077c1567fd7a66ec34ad52b5e","url":"https://github.com/canonical/hotkey_manager.git"},"source":"git","version":"0.2.0"},"hotkey_manager_macos":{"dependency":"transitive","description":{"name":"hotkey_manager_macos","sha256":"03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_platform_interface":{"dependency":"transitive","description":{"name":"hotkey_manager_platform_interface","sha256":"98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"hotkey_manager_windows":{"dependency":"transitive","description":{"name":"hotkey_manager_windows","sha256":"0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"http":{"dependency":"transitive","description":{"name":"http","sha256":"2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b","url":"https://pub.dev"},"source":"hosted","version":"1.4.0"},"http2":{"dependency":"transitive","description":{"name":"http2","sha256":"382d3aefc5bd6dc68c6b892d7664f29b5beb3251611ae946a98d35158a82bbfa","url":"https://pub.dev"},"source":"hosted","version":"2.3.1"},"http_parser":{"dependency":"transitive","description":{"name":"http_parser","sha256":"178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571","url":"https://pub.dev"},"source":"hosted","version":"4.1.2"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5","url":"https://pub.dev"},"source":"hosted","version":"0.20.2"},"js":{"dependency":"transitive","description":{"name":"js","sha256":"53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc","url":"https://pub.dev"},"source":"hosted","version":"0.7.2"},"json_annotation":{"dependency":"transitive","description":{"name":"json_annotation","sha256":"1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1","url":"https://pub.dev"},"source":"hosted","version":"4.9.0"},"lints":{"dependency":"transitive","description":{"name":"lints","sha256":"a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0","url":"https://pub.dev"},"source":"hosted","version":"6.0.0"},"local_notifier":{"dependency":"direct main","description":{"name":"local_notifier","sha256":"f6cfc933c6fbc961f4e52b5c880f68e41b2d3cd29aad557cc654fd211093a025","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"logger":{"dependency":"direct main","description":{"name":"logger","sha256":"2621da01aabaf223f8f961e751f2c943dbb374dc3559b982f200ccedadaa6999","url":"https://pub.dev"},"source":"hosted","version":"2.6.0"},"matcher":{"dependency":"transitive","description":{"name":"matcher","sha256":"dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2","url":"https://pub.dev"},"source":"hosted","version":"0.12.17"},"material_color_utilities":{"dependency":"transitive","description":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"meta":{"dependency":"transitive","description":{"name":"meta","sha256":"e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c","url":"https://pub.dev"},"source":"hosted","version":"1.16.0"},"path":{"dependency":"transitive","description":{"name":"path","sha256":"75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5","url":"https://pub.dev"},"source":"hosted","version":"1.9.1"},"path_parsing":{"dependency":"transitive","description":{"name":"path_parsing","sha256":"883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"path_provider":{"dependency":"direct main","description":{"name":"path_provider","sha256":"50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd","url":"https://pub.dev"},"source":"hosted","version":"2.1.5"},"path_provider_android":{"dependency":"transitive","description":{"name":"path_provider_android","sha256":"d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9","url":"https://pub.dev"},"source":"hosted","version":"2.2.17"},"path_provider_foundation":{"dependency":"transitive","description":{"name":"path_provider_foundation","sha256":"4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"path_provider_linux":{"dependency":"transitive","description":{"name":"path_provider_linux","sha256":"f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279","url":"https://pub.dev"},"source":"hosted","version":"2.2.1"},"path_provider_platform_interface":{"dependency":"transitive","description":{"name":"path_provider_platform_interface","sha256":"88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"path_provider_windows":{"dependency":"transitive","description":{"name":"path_provider_windows","sha256":"bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"petitparser":{"dependency":"transitive","description":{"name":"petitparser","sha256":"07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646","url":"https://pub.dev"},"source":"hosted","version":"6.1.0"},"pinenacl":{"dependency":"transitive","description":{"name":"pinenacl","sha256":"57e907beaacbc3c024a098910b6240758e899674de07d6949a67b52fd984cbdf","url":"https://pub.dev"},"source":"hosted","version":"0.6.0"},"platform":{"dependency":"transitive","description":{"name":"platform","sha256":"5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984","url":"https://pub.dev"},"source":"hosted","version":"3.1.6"},"plugin_platform_interface":{"dependency":"transitive","description":{"name":"plugin_platform_interface","sha256":"4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02","url":"https://pub.dev"},"source":"hosted","version":"2.1.8"},"pointycastle":{"dependency":"transitive","description":{"name":"pointycastle","sha256":"4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe","url":"https://pub.dev"},"source":"hosted","version":"3.9.1"},"protobuf":{"dependency":"direct main","description":{"name":"protobuf","sha256":"579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"quiver":{"dependency":"transitive","description":{"name":"quiver","sha256":"ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"riverpod":{"dependency":"transitive","description":{"name":"riverpod","sha256":"59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959","url":"https://pub.dev"},"source":"hosted","version":"2.6.1"},"rxdart":{"dependency":"direct main","description":{"name":"rxdart","sha256":"5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962","url":"https://pub.dev"},"source":"hosted","version":"0.28.0"},"screen_retriever":{"dependency":"transitive","description":{"name":"screen_retriever","sha256":"570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"screen_retriever_linux":{"dependency":"transitive","description":{"name":"screen_retriever_linux","sha256":"f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"screen_retriever_macos":{"dependency":"transitive","description":{"name":"screen_retriever_macos","sha256":"71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"screen_retriever_platform_interface":{"dependency":"transitive","description":{"name":"screen_retriever_platform_interface","sha256":"ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"screen_retriever_windows":{"dependency":"transitive","description":{"name":"screen_retriever_windows","sha256":"449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"shared_preferences":{"dependency":"direct main","description":{"name":"shared_preferences","sha256":"6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5","url":"https://pub.dev"},"source":"hosted","version":"2.5.3"},"shared_preferences_android":{"dependency":"transitive","description":{"name":"shared_preferences_android","sha256":"20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac","url":"https://pub.dev"},"source":"hosted","version":"2.4.10"},"shared_preferences_foundation":{"dependency":"transitive","description":{"name":"shared_preferences_foundation","sha256":"6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03","url":"https://pub.dev"},"source":"hosted","version":"2.5.4"},"shared_preferences_linux":{"dependency":"transitive","description":{"name":"shared_preferences_linux","sha256":"580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_platform_interface":{"dependency":"transitive","description":{"name":"shared_preferences_platform_interface","sha256":"57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_web":{"dependency":"transitive","description":{"name":"shared_preferences_web","sha256":"c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019","url":"https://pub.dev"},"source":"hosted","version":"2.4.3"},"shared_preferences_windows":{"dependency":"transitive","description":{"name":"shared_preferences_windows","sha256":"94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c","url":"https://pub.dev"},"source":"hosted","version":"1.10.1"},"sprintf":{"dependency":"transitive","description":{"name":"sprintf","sha256":"1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1","url":"https://pub.dev"},"source":"hosted","version":"1.12.1"},"state_notifier":{"dependency":"transitive","description":{"name":"state_notifier","sha256":"b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"stream_channel":{"dependency":"transitive","description":{"name":"stream_channel","sha256":"969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"string_scanner":{"dependency":"transitive","description":{"name":"string_scanner","sha256":"921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43","url":"https://pub.dev"},"source":"hosted","version":"1.4.1"},"synchronized":{"dependency":"direct main","description":{"name":"synchronized","sha256":"0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6","url":"https://pub.dev"},"source":"hosted","version":"3.3.1"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e","url":"https://pub.dev"},"source":"hosted","version":"1.2.2"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00","url":"https://pub.dev"},"source":"hosted","version":"0.7.6"},"tray_menu":{"dependency":"direct main","description":{"path":".","ref":"cef5b8f","resolved-ref":"cef5b8f60d7b2717c6f2eef2163a8e11de3b8d3d","url":"https://github.com/canonical/tray_menu.git"},"source":"git","version":"0.0.1"},"two_dimensional_scrollables":{"dependency":"direct main","description":{"name":"two_dimensional_scrollables","sha256":"f02e99bae8b457f710c2a717dfbd0a32a5bbe332c0814bc559d9549a5b117db3","url":"https://pub.dev"},"source":"hosted","version":"0.3.6"},"typed_data":{"dependency":"transitive","description":{"name":"typed_data","sha256":"f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006","url":"https://pub.dev"},"source":"hosted","version":"1.4.0"},"uni_platform":{"dependency":"transitive","description":{"name":"uni_platform","sha256":"e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84","url":"https://pub.dev"},"source":"hosted","version":"0.1.3"},"url_launcher":{"dependency":"direct main","description":{"name":"url_launcher","sha256":"9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603","url":"https://pub.dev"},"source":"hosted","version":"6.3.1"},"url_launcher_android":{"dependency":"transitive","description":{"name":"url_launcher_android","sha256":"8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79","url":"https://pub.dev"},"source":"hosted","version":"6.3.16"},"url_launcher_ios":{"dependency":"transitive","description":{"name":"url_launcher_ios","sha256":"7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb","url":"https://pub.dev"},"source":"hosted","version":"6.3.3"},"url_launcher_linux":{"dependency":"transitive","description":{"name":"url_launcher_linux","sha256":"4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"url_launcher_macos":{"dependency":"transitive","description":{"name":"url_launcher_macos","sha256":"17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"url_launcher_platform_interface":{"dependency":"transitive","description":{"name":"url_launcher_platform_interface","sha256":"552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"url_launcher_web":{"dependency":"transitive","description":{"name":"url_launcher_web","sha256":"4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"url_launcher_windows":{"dependency":"transitive","description":{"name":"url_launcher_windows","sha256":"3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77","url":"https://pub.dev"},"source":"hosted","version":"3.1.4"},"uuid":{"dependency":"transitive","description":{"name":"uuid","sha256":"a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff","url":"https://pub.dev"},"source":"hosted","version":"4.5.1"},"vector_graphics":{"dependency":"transitive","description":{"name":"vector_graphics","sha256":"a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6","url":"https://pub.dev"},"source":"hosted","version":"1.1.19"},"vector_graphics_codec":{"dependency":"transitive","description":{"name":"vector_graphics_codec","sha256":"99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146","url":"https://pub.dev"},"source":"hosted","version":"1.1.13"},"vector_graphics_compiler":{"dependency":"transitive","description":{"name":"vector_graphics_compiler","sha256":"557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331","url":"https://pub.dev"},"source":"hosted","version":"1.1.17"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"web":{"dependency":"transitive","description":{"name":"web","sha256":"868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"win32":{"dependency":"direct main","description":{"name":"win32","sha256":"66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03","url":"https://pub.dev"},"source":"hosted","version":"5.14.0"},"window_manager":{"dependency":"direct main","description":{"name":"window_manager","sha256":"51d50168ab267d344b975b15390426b1243600d436770d3f13de67e55b05ec16","url":"https://pub.dev"},"source":"hosted","version":"0.5.0"},"window_size":{"dependency":"direct main","description":{"path":"plugins/window_size","ref":"6c66ad2","resolved-ref":"6c66ad23ee79749f30a8eece542cf54eaf157ed8","url":"https://github.com/google/flutter-desktop-embedding.git"},"source":"git","version":"0.1.0"},"xdg_directories":{"dependency":"transitive","description":{"name":"xdg_directories","sha256":"7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"xml":{"dependency":"transitive","description":{"name":"xml","sha256":"b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"xterm":{"dependency":"direct main","description":{"path":".","ref":"4.0.0+mp","resolved-ref":"ff2309c1581c025ba8b9f65e6619fe2fe2252827","url":"https://github.com/levkropp/xterm.dart"},"source":"git","version":"4.0.0"},"zmodem":{"dependency":"transitive","description":{"name":"zmodem","sha256":"3b7e5b29f3a7d8aee472029b05165a68438eff2f3f7766edf13daba1e297adbf","url":"https://pub.dev"},"source":"hosted","version":"0.0.6"}},"sdks":{"dart":">=3.8.0 <4.0.0","flutter":">=3.29.0"}}
diff --git a/pkgs/by-name/mu/multipass/test_unreachable_call.patch b/pkgs/by-name/mu/multipass/test_unreachable_call.patch
deleted file mode 100644
index a692362df8ef..000000000000
--- a/pkgs/by-name/mu/multipass/test_unreachable_call.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/tests/test_common_callbacks.cpp b/tests/test_common_callbacks.cpp
-index ccae78e0..f9ab4423 100644
---- a/tests/test_common_callbacks.cpp
-+++ b/tests/test_common_callbacks.cpp
-@@ -73,6 +73,7 @@ struct TestLoggingSpinnerCallbacks : public TestSpinnerCallbacks, public WithPar
-         default:
-             assert(false && "shouldn't be here");
-         }
-+        __builtin_unreachable();
-     }
- };
- 
diff --git a/pkgs/by-name/mu/multipass/update.sh b/pkgs/by-name/mu/multipass/update.sh
deleted file mode 100755
index 34e945abb579..000000000000
--- a/pkgs/by-name/mu/multipass/update.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl jq nix-prefetch-github yj git
-# shellcheck shell=bash
-
-set -euo pipefail
-
-cd $(readlink -e $(dirname "${BASH_SOURCE[0]}"))
-
-# Download the latest pubspec.lock (which is a YAML file), convert it to JSON and write it to
-# the package directory as pubspec.lock.json
-update_pubspec_json() {
-    local version; version="$1"
-    echo "Updating pubspec.lock.json"
-
-    curl -s \
-        "https://raw.githubusercontent.com/canonical/multipass/refs/tags/v${version}/src/client/gui/pubspec.lock" \
-        | yj > pubspec.lock.json
-}
-
-# Update the SRI hash of a particular overridden Dart package in the Nix expression
-update_dart_pkg_hash() {
-    local pkg_name; pkg_name="$1"
-    local owner; owner="$2";
-    local repo; repo="$3";
-    echo "Updating dart package hash: $pkg_name"
-
-    resolved_ref="$(jq -r --arg PKG "$pkg_name" '.packages[$PKG].description."resolved-ref"' pubspec.lock.json)"
-    hash="$(nix-prefetch-github --rev "$resolved_ref" "$owner" "$repo" | jq '.hash')"
-    sed -i "s|${pkg_name} = \".*\";|${pkg_name} = $hash;|" gui.nix
-}
-
-# Update the hash of the multipass source code in the Nix expression.
-update_multipass_source() {
-    local version; version="$1"
-    echo "Updating multipass source"
-
-    sri_hash="$(nix-prefetch-github canonical multipass --rev "refs/tags/v${version}" --fetch-submodules | jq -r '.hash')"
-
-    sed -i "s|version = \".*$|version = \"$version\";|" package.nix
-    sed -i "s|hash = \".*$|hash = \"${sri_hash}\";|" package.nix
-}
-
-LATEST_TAG="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/canonical/multipass/releases/latest | jq -r '.tag_name')"
-LATEST_VERSION="$(expr "$LATEST_TAG" : 'v\(.*\)')"
-CURRENT_VERSION="$(grep -Po "version = \"\K[^\"]+" package.nix)"
-
-if [[ "$CURRENT_VERSION" == "$LATEST_VERSION" ]]; then
-    echo "multipass is up to date: ${CURRENT_VERSION}"
-    exit 0
-fi
-
-update_pubspec_json "$LATEST_VERSION"
-
-update_dart_pkg_hash dartssh2 canonical dartssh2
-update_dart_pkg_hash hotkey_manager_linux canonical hotkey_manager
-update_dart_pkg_hash tray_menu canonical tray_menu
-update_dart_pkg_hash window_size google flutter-desktop-embedding
-update_dart_pkg_hash xterm levkropp xterm.dart
-
-update_multipass_source "$LATEST_VERSION"
-
diff --git a/pkgs/by-name/mu/multipass/vcpkg_no_install.patch b/pkgs/by-name/mu/multipass/vcpkg_no_install.patch
deleted file mode 100644
index ecfe7001524a..000000000000
--- a/pkgs/by-name/mu/multipass/vcpkg_no_install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git i/CMakeLists.txt w/CMakeLists.txt
-index fd8d446c8..870a2c19c 100644
---- i/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -83,9 +83,6 @@ else()
-   message(STATUS "Bootstrapping vcpkg completed successfully.")
- endif()
- 
--set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/3rd-party/vcpkg/scripts/buildsystems/vcpkg.cmake"
--  CACHE STRING "Vcpkg toolchain file")
--
- project(Multipass)
- 
- option(MULTIPASS_ENABLE_TESTS "Build tests" ON)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 30b57ae69cbd..29e46a4cf09d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1084,6 +1084,7 @@ mapAliases {
   mrxvt = throw "'mrxvt' has been removed due to lack of maintainence upstream"; # Added 2025-09-25
   msgpack = throw "msgpack has been split into msgpack-c and msgpack-cxx"; # Added 2025-09-14
   msp430NewlibCross = throw "'msp430NewlibCross' has been renamed to/replaced by 'msp430Newlib'"; # Converted to throw 2025-10-27
+  multipass = throw "multipass was dropped since it was unmaintained."; # Added 2025-11-29
   mumps_par = throw "'mumps_par' has been renamed to/replaced by 'mumps-mpi'"; # Converted to throw 2025-10-27
   mustache-tcl = throw "'mustache-tcl' has been renamed to/replaced by 'tclPackages.mustache-tcl'"; # Converted to throw 2025-10-27
   mutt-with-sidebar = throw "'mutt-with-sidebar' has been renamed to/replaced by 'mutt'"; # Converted to throw 2025-10-27

From f7992c4ba22cbcb58e00d9c2d7d05a5122af89b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Nov 2025 16:09:48 +0000
Subject: [PATCH 22/47] python3Packages.django-filer: 3.3.3 -> 3.4.1

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

diff --git a/pkgs/development/python-modules/django-filer/default.nix b/pkgs/development/python-modules/django-filer/default.nix
index 84ce11b3b5f1..3fd211048560 100644
--- a/pkgs/development/python-modules/django-filer/default.nix
+++ b/pkgs/development/python-modules/django-filer/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "django-filer";
-  version = "3.3.3";
+  version = "3.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "django-cms";
     repo = "django-filer";
     tag = version;
-    hash = "sha256-EAiqGRdmUii86QwHkZ2BT5vBRaiXpNWbr9INmuYW444=";
+    hash = "sha256-lbt7Tk+BJX9sesIPjZ0bIpE0RzO4nH/TAdimowfYtkA=";
   };
 
   build-system = [ setuptools ];

From 1e72a6b3bc123a85d301792f71026dbdf06693f1 Mon Sep 17 00:00:00 2001
From: naash <dev@naa.sh>
Date: Sat, 29 Nov 2025 17:27:25 +0100
Subject: [PATCH 23/47] calligraplan: fix build for CMake 4

---
 pkgs/by-name/ca/calligraplan/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ca/calligraplan/package.nix b/pkgs/by-name/ca/calligraplan/package.nix
index 89394f1c697d..0a6f049da2ad 100644
--- a/pkgs/by-name/ca/calligraplan/package.nix
+++ b/pkgs/by-name/ca/calligraplan/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
   qt5,
   libsForQt5,
   cmake,
@@ -21,6 +22,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-szPdRxbzJ2+nmgp+1FwmKZwHEDV8EtbDW/3jsw4J6HI=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://invent.kde.org/office/calligraplan/-/commit/cdd85c895b487a8b3837bf8b864103997e0af544.patch";
+      hash = "sha256-IMoJvvszPuIdWedeU7PQw8ngYmMA7k//wXfT+mZQP88=";
+    })
+  ];
+
   buildInputs = [
     qt5.qtbase
     libsForQt5.kdbusaddons

From e053936e710c7a42600fb5b03c2818845ba5d872 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Nov 2025 17:20:13 +0000
Subject: [PATCH 24/47] trealla: 2.85.9 -> 2.86.5

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

diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix
index 0d6ec42ad0ec..b290d4bccc5b 100644
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.85.9";
+  version = "2.86.5";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-RBHak1YAUUV0Kb3CejEXh49WDDAaBpxavOUqELRVdrs=";
+    hash = "sha256-0r73id/Yy9CrLM56x66iJtzrC7WCC/VSA+rRKiz9cDk=";
   };
 
   postPatch = ''

From 4dd10767bd2d0ca54b2b2f6784fea700dc1d56af Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sat, 29 Nov 2025 19:30:34 +0200
Subject: [PATCH 25/47] arandr: use pyproject format

---
 pkgs/by-name/ar/arandr/package.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ar/arandr/package.nix b/pkgs/by-name/ar/arandr/package.nix
index 2f10c9a42c2b..129a6b013825 100644
--- a/pkgs/by-name/ar/arandr/package.nix
+++ b/pkgs/by-name/ar/arandr/package.nix
@@ -11,12 +11,17 @@
 }:
 
 let
-  inherit (python3Packages) buildPythonApplication docutils pygobject3;
+  inherit (python3Packages)
+    buildPythonApplication
+    setuptools
+    docutils
+    pygobject3
+    ;
 in
 buildPythonApplication rec {
   pname = "arandr";
   version = "0.1.11";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitLab {
     owner = "arandr";
@@ -35,13 +40,15 @@ buildPythonApplication rec {
   ];
 
   buildInputs = [
-    docutils
     gsettings-desktop-schemas
     gtk3
+    xrandr
   ];
 
-  propagatedBuildInputs = [
-    xrandr
+  build-system = [ setuptools ];
+
+  dependencies = [
+    docutils
     pygobject3
   ];
 

From 35b537a74fd67c4f3f889bc1d15d74d655de30bf Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sat, 29 Nov 2025 19:33:34 +0200
Subject: [PATCH 26/47] arandr: don't double-wrap executables

---
 pkgs/by-name/ar/arandr/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ar/arandr/package.nix b/pkgs/by-name/ar/arandr/package.nix
index 129a6b013825..be87a929b0af 100644
--- a/pkgs/by-name/ar/arandr/package.nix
+++ b/pkgs/by-name/ar/arandr/package.nix
@@ -59,6 +59,12 @@ buildPythonApplication rec {
   # no tests
   doCheck = false;
 
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex=(\\d.*)"

From 4f5fe642fa587599c088d41115e73f9923468703 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sat, 29 Nov 2025 19:39:27 +0200
Subject: [PATCH 27/47] arandr: the license is GPL-3.0-or-later

https://gitlab.com/arandr/arandr/-/blob/0.1.11/README#L135
---
 pkgs/by-name/ar/arandr/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/arandr/package.nix b/pkgs/by-name/ar/arandr/package.nix
index be87a929b0af..e1384ce83682 100644
--- a/pkgs/by-name/ar/arandr/package.nix
+++ b/pkgs/by-name/ar/arandr/package.nix
@@ -75,7 +75,7 @@ buildPythonApplication rec {
     changelog = "https://gitlab.com/arandr/arandr/-/blob/${src.tag}/ChangeLog";
     description = "Simple visual front end for XRandR";
     homepage = "https://christian.amsuess.com/tools/arandr/";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "arandr";
     maintainers = with lib.maintainers; [
       gepbird

From 13da77230e792635e01de205c8fbdec55b5f27d9 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sat, 29 Nov 2025 19:23:18 +0100
Subject: [PATCH 28/47] protonvpn-gui: migrate to pkgs/by-name

---
 .../pr/protonvpn-gui/package.nix}             | 24 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 16 deletions(-)
 rename pkgs/{applications/networking/protonvpn-gui/default.nix => by-name/pr/protonvpn-gui/package.nix} (87%)

diff --git a/pkgs/applications/networking/protonvpn-gui/default.nix b/pkgs/by-name/pr/protonvpn-gui/package.nix
similarity index 87%
rename from pkgs/applications/networking/protonvpn-gui/default.nix
rename to pkgs/by-name/pr/protonvpn-gui/package.nix
index ae888ee750e9..49a7b2669187 100644
--- a/pkgs/applications/networking/protonvpn-gui/default.nix
+++ b/pkgs/by-name/pr/protonvpn-gui/package.nix
@@ -1,26 +1,16 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
   gobject-introspection,
-  setuptools,
   wrapGAppsHook3,
   libnotify,
-  dbus-python,
-  packaging,
-  proton-core,
-  proton-keyring-linux,
-  proton-vpn-api-core,
-  proton-vpn-local-agent,
-  proton-vpn-network-manager,
-  pycairo,
-  pygobject3,
   withIndicator ? true,
   libappindicator-gtk3,
   libayatana-appindicator,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "protonvpn-gui";
   version = "4.12.0";
   pyproject = true;
@@ -48,11 +38,11 @@ buildPythonApplication rec {
     libayatana-appindicator
   ];
 
-  build-system = [
+  build-system = with python3Packages; [
     setuptools
   ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     dbus-python
     packaging
     proton-core
@@ -64,6 +54,12 @@ buildPythonApplication rec {
     pygobject3
   ];
 
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   postInstall = ''
     mkdir -p $out/share/{applications,pixmaps}
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 594372aac537..48e98f52bfae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11901,8 +11901,6 @@ with pkgs;
     // (config.profanity or { })
   );
 
-  protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { };
-
   psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
 
   psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { };

From 385979548c9b9c351137f8915ed5178676840f12 Mon Sep 17 00:00:00 2001
From: Jappie3 <jappie3+git@jappie.dev>
Date: Sat, 29 Nov 2025 19:53:32 +0100
Subject: [PATCH 29/47] libirc: fix build for cmake4

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

diff --git a/pkgs/development/libraries/libirc/default.nix b/pkgs/development/libraries/libirc/default.nix
index d14179fd571a..69f934e9604a 100644
--- a/pkgs/development/libraries/libirc/default.nix
+++ b/pkgs/development/libraries/libirc/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail 'cmake_minimum_required(VERSION 3.0)' 'cmake_minimum_required(VERSION 3.10)'
+  '';
+
   cmakeFlags = [
     "-DQT5_BUILD=1"
     "-DQt5Core_DIR=${qtbase.dev}/lib/cmake/Qt5Core"

From b38ec51ba5df20692c924847b004cff80689c590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 29 Nov 2025 11:33:02 -0800
Subject: [PATCH 30/47] python3Packages.django-filer: remove disabled

---
 pkgs/development/python-modules/django-filer/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/django-filer/default.nix b/pkgs/development/python-modules/django-filer/default.nix
index 3fd211048560..3981823ce144 100644
--- a/pkgs/development/python-modules/django-filer/default.nix
+++ b/pkgs/development/python-modules/django-filer/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   django,
-  pythonOlder,
   pytestCheckHook,
   django-polymorphic,
   setuptools,
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "3.4.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "django-cms";
     repo = "django-filer";

From ec479bf5ec4cb7859d85a1184d025dc61e597ee6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 29 Nov 2025 11:34:06 -0800
Subject: [PATCH 31/47] python3Packages.django-filer: add meta.changelog

---
 pkgs/development/python-modules/django-filer/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/django-filer/default.nix b/pkgs/development/python-modules/django-filer/default.nix
index 3981823ce144..4642e9302cbd 100644
--- a/pkgs/development/python-modules/django-filer/default.nix
+++ b/pkgs/development/python-modules/django-filer/default.nix
@@ -49,6 +49,7 @@ buildPythonPackage rec {
   '';
 
   meta = {
+    changelog = "https://github.com/django-cms/django-filer/blob/${src.tag}/CHANGELOG.rst";
     description = "File management application for Django";
     homepage = "https://github.com/django-cms/django-filer";
     license = lib.licenses.mit;

From dbacbfb117bd9db796e1fb72ec59ba94bf1ee428 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 29 Nov 2025 14:51:51 -0500
Subject: [PATCH 32/47] binserve: mark vulnerable

See https://redirect.github.com/mufeedvh/binserve/issues/49

Web servers are quite security-sensitive, so we should warn our users that
this one is unmaintained.
---
 pkgs/by-name/bi/binserve/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/bi/binserve/package.nix b/pkgs/by-name/bi/binserve/package.nix
index dc4235c56c44..f069f7341bb2 100644
--- a/pkgs/by-name/bi/binserve/package.nix
+++ b/pkgs/by-name/bi/binserve/package.nix
@@ -25,6 +25,11 @@ rustPlatform.buildRustPackage rec {
   meta = with lib; {
     description = "Fast production-ready static web server";
     homepage = "https://github.com/mufeedvh/binserve";
+    knownVulnerabilities = [
+      "CVE-2025-4432"
+      "CVE-2024-32650"
+      "This web server is unmaintained. Consider using maintained alternatives instead."
+    ];
     longDescription = ''
       A fast production-ready static web server with TLS
       (HTTPS), routing, hot reloading, caching, templating, and security in a

From b91a5cea24c60e6e9458337df23f2a30834c554f Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 29 Nov 2025 14:58:31 -0500
Subject: [PATCH 33/47] binserve: drop

Unmaintained upstream, see https://redirect.github.com/mufeedvh/binserve/issues/49
---
 pkgs/by-name/bi/binserve/Cargo.lock  | 2273 --------------------------
 pkgs/by-name/bi/binserve/package.nix |   43 -
 pkgs/top-level/aliases.nix           |    1 +
 3 files changed, 1 insertion(+), 2316 deletions(-)
 delete mode 100644 pkgs/by-name/bi/binserve/Cargo.lock
 delete mode 100644 pkgs/by-name/bi/binserve/package.nix

diff --git a/pkgs/by-name/bi/binserve/Cargo.lock b/pkgs/by-name/bi/binserve/Cargo.lock
deleted file mode 100644
index 3575eb817e0d..000000000000
--- a/pkgs/by-name/bi/binserve/Cargo.lock
+++ /dev/null
@@ -1,2273 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "actix-codec"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57a7559404a7f3573127aab53c08ce37a6c6a315c374a31070f3c91cd1b4a7fe"
-dependencies = [
- "bitflags",
- "bytes",
- "futures-core",
- "futures-sink",
- "log",
- "memchr",
- "pin-project-lite",
- "tokio",
- "tokio-util",
-]
-
-[[package]]
-name = "actix-files"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e04dcf7654254676d434b0285e2298d577ed4826f67f536e7a39bb0f64721164"
-dependencies = [
- "actix-http",
- "actix-service",
- "actix-utils",
- "actix-web",
- "askama_escape",
- "bitflags",
- "bytes",
- "derive_more",
- "futures-core",
- "http-range",
- "log",
- "mime",
- "mime_guess",
- "percent-encoding",
- "pin-project-lite",
-]
-
-[[package]]
-name = "actix-http"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd2e9f6794b5826aff6df65e3a0d0127b271d1c03629c774238f3582e903d4e4"
-dependencies = [
- "actix-codec",
- "actix-rt",
- "actix-service",
- "actix-tls",
- "actix-utils",
- "ahash",
- "base64",
- "bitflags",
- "brotli",
- "bytes",
- "bytestring",
- "derive_more",
- "encoding_rs",
- "flate2",
- "futures-core",
- "h2",
- "http",
- "httparse",
- "httpdate",
- "itoa 1.0.2",
- "language-tags",
- "local-channel",
- "mime",
- "percent-encoding",
- "pin-project-lite",
- "rand",
- "sha1",
- "smallvec",
- "tracing",
- "zstd",
-]
-
-[[package]]
-name = "actix-macros"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "465a6172cf69b960917811022d8f29bc0b7fa1398bc4f78b3c466673db1213b6"
-dependencies = [
- "quote",
- "syn",
-]
-
-[[package]]
-name = "actix-router"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb60846b52c118f2f04a56cc90880a274271c489b2498623d58176f8ca21fa80"
-dependencies = [
- "bytestring",
- "firestorm",
- "http",
- "log",
- "regex",
- "serde",
-]
-
-[[package]]
-name = "actix-rt"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ea16c295198e958ef31930a6ef37d0fb64e9ca3b6116e6b93a8bdae96ee1000"
-dependencies = [
- "futures-core",
- "tokio",
-]
-
-[[package]]
-name = "actix-server"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0da34f8e659ea1b077bb4637948b815cd3768ad5a188fdcd74ff4d84240cd824"
-dependencies = [
- "actix-rt",
- "actix-service",
- "actix-utils",
- "futures-core",
- "futures-util",
- "mio 0.8.4",
- "num_cpus",
- "socket2",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "actix-service"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a"
-dependencies = [
- "futures-core",
- "paste",
- "pin-project-lite",
-]
-
-[[package]]
-name = "actix-tls"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297"
-dependencies = [
- "actix-codec",
- "actix-rt",
- "actix-service",
- "actix-utils",
- "futures-core",
- "log",
- "pin-project-lite",
- "tokio-rustls",
- "tokio-util",
- "webpki-roots",
-]
-
-[[package]]
-name = "actix-utils"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e491cbaac2e7fc788dfff99ff48ef317e23b3cf63dbaf7aaab6418f40f92aa94"
-dependencies = [
- "local-waker",
- "pin-project-lite",
-]
-
-[[package]]
-name = "actix-web"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27e8fe9ba4ae613c21f677c2cfaf0696c3744030c6f485b34634e502d6bb379"
-dependencies = [
- "actix-codec",
- "actix-http",
- "actix-macros",
- "actix-router",
- "actix-rt",
- "actix-server",
- "actix-service",
- "actix-tls",
- "actix-utils",
- "actix-web-codegen",
- "ahash",
- "bytes",
- "bytestring",
- "cfg-if 1.0.0",
- "cookie",
- "derive_more",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "itoa 1.0.2",
- "language-tags",
- "log",
- "mime",
- "once_cell",
- "pin-project-lite",
- "regex",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "smallvec",
- "socket2",
- "time",
- "url",
-]
-
-[[package]]
-name = "actix-web-codegen"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f270541caec49c15673b0af0e9a00143421ad4f118d2df7edcb68b627632f56"
-dependencies = [
- "actix-router",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "actix-web-lab"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "483a1012828ff6bca5b67e5a97099dd99ef699fbd911d39e7bcdc3b40e48aaa4"
-dependencies = [
- "actix-files",
- "actix-http",
- "actix-router",
- "actix-service",
- "actix-utils",
- "actix-web",
- "actix-web-lab-derive",
- "ahash",
- "arc-swap",
- "async-trait",
- "bytes",
- "csv",
- "derive_more",
- "digest 0.10.3",
- "futures-core",
- "futures-util",
- "generic-array 0.14.5",
- "hmac",
- "local-channel",
- "mime",
- "once_cell",
- "pin-project-lite",
- "serde",
- "serde_html_form",
- "serde_json",
- "subtle",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "actix-web-lab-derive"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44a15d9ddb31a4f41decd22f743a154e519fb326120e8133ef9ea6283335ad2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "ahash"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-dependencies = [
- "getrandom",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2"
-dependencies = [
- "alloc-no-stdlib",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704"
-
-[[package]]
-name = "arc-swap"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f"
-
-[[package]]
-name = "askama_escape"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
-
-[[package]]
-name = "async-trait"
-version = "0.1.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96cf8829f67d2eab0b2dfa42c5d0ef737e0724e4a82b01b3e292456202b19716"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "base64"
-version = "0.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
-
-[[package]]
-name = "binserve"
-version = "0.2.0"
-dependencies = [
- "actix-files",
- "actix-web",
- "actix-web-lab",
- "ahash",
- "anyhow",
- "clap",
- "colored",
- "compact_str",
- "dashmap",
- "env_logger",
- "etag",
- "handlebars",
- "jwalk",
- "minify-html-onepass",
- "new_mime_guess",
- "notify",
- "num_cpus",
- "once_cell",
- "parking_lot",
- "rustls",
- "rustls-pemfile",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324"
-dependencies = [
- "generic-array 0.14.5",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
-[[package]]
-name = "brotli"
-version = "3.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
-[[package]]
-name = "bstr"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
-dependencies = [
- "lazy_static",
- "memchr",
- "regex-automata",
- "serde",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ccbd214614c6783386c1af30caf03192f17891059cecc394b4fb119e363de3"
-
-[[package]]
-name = "byte-tools"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
-
-[[package]]
-name = "byteorder"
-version = "1.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
-
-[[package]]
-name = "bytes"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
-
-[[package]]
-name = "bytestring"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b6a75fd3048808ef06af5cd79712be8111960adaf89d90250974b38fc3928a"
-dependencies = [
- "bytes",
-]
-
-[[package]]
-name = "castaway"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
-dependencies = [
- "rustversion",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
-dependencies = [
- "jobserver",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "clap"
-version = "3.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f1fe12880bae935d142c8702d500c63a4e8634b6c3c57ad72bf978fc7b6249a"
-dependencies = [
- "atty",
- "bitflags",
- "clap_lex",
- "indexmap",
- "strsim",
- "termcolor",
- "textwrap",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87eba3c8c7f42ef17f6c659fc7416d0f4758cd3e58861ee63c5fa4a4dde649e4"
-dependencies = [
- "os_str_bytes",
-]
-
-[[package]]
-name = "colored"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
-dependencies = [
- "atty",
- "lazy_static",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "compact_str"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb6f80f92629b81f5b17b616a99f72870556ca457bbbd99aeda7bb5d194316a2"
-dependencies = [
- "castaway",
- "itoa 1.0.2",
- "ryu",
-]
-
-[[package]]
-name = "convert_case"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
-
-[[package]]
-name = "cookie"
-version = "0.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05"
-dependencies = [
- "percent-encoding",
- "time",
- "version_check",
-]
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc32fast"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "crossbeam"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-channel"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d"
-dependencies = [
- "autocfg",
- "cfg-if 1.0.0",
- "crossbeam-utils",
- "memoffset",
- "once_cell",
- "scopeguard",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f25d8400f4a7a5778f0e4e52384a48cbd9b5c495d110786187fc750075277a2"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83"
-dependencies = [
- "cfg-if 1.0.0",
- "once_cell",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8"
-dependencies = [
- "generic-array 0.14.5",
- "typenum",
-]
-
-[[package]]
-name = "csv"
-version = "1.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
-dependencies = [
- "bstr",
- "csv-core",
- "itoa 0.4.8",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "csv-core"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3495912c9c1ccf2e18976439f4443f3fee0fd61f424ff99fde6a66b15ecb448f"
-dependencies = [
- "cfg-if 1.0.0",
- "hashbrown",
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "derive_more"
-version = "0.99.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "rustc_version",
- "syn",
-]
-
-[[package]]
-name = "digest"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5"
-dependencies = [
- "generic-array 0.12.4",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506"
-dependencies = [
- "block-buffer 0.10.2",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "either"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2cf0344971ee6c64c31be0d530793fba457d322dfec2810c453d0ef228f9c3"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
-[[package]]
-name = "etag"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aec9f8918ec91bd35f3068e33da01b72a295ac8a7baacb0290b56ffeeec9d88f"
-dependencies = [
- "str-buf",
- "xxhash-rust",
-]
-
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
-[[package]]
-name = "filetime"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "firestorm"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c5f6c2c942da57e2aaaa84b8a521489486f14e75e7fa91dab70aba913975f98"
-
-[[package]]
-name = "flate2"
-version = "1.0.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
-dependencies = [
- "crc32fast",
- "miniz_oxide",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191"
-dependencies = [
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "fsevent"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab7d1bd1bd33cc98b0889831b72da23c0aa4df9cec7e0702f46ecea04b35db6"
-dependencies = [
- "bitflags",
- "fsevent-sys",
-]
-
-[[package]]
-name = "fsevent-sys"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f41b048a94555da0f42f1d632e2e19510084fb8e303b0daa2816e733fb3644a0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
-[[package]]
-name = "futures-core"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
-
-[[package]]
-name = "futures-sink"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
-
-[[package]]
-name = "futures-task"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
-
-[[package]]
-name = "futures-util"
-version = "0.3.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
-dependencies = [
- "futures-core",
- "futures-task",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd"
-dependencies = [
- "typenum",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "handlebars"
-version = "4.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b66d0c1b6e3abfd1e72818798925e16e02ed77e1b47f6c25a95a23b377ee4299"
-dependencies = [
- "log",
- "pest",
- "pest_derive",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db0d4cf898abf0081f964436dc980e96670a0f36863e4b83aaacdb65c9d7ccc3"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest 0.10.3",
-]
-
-[[package]]
-name = "http"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399"
-dependencies = [
- "bytes",
- "fnv",
- "itoa 1.0.2",
-]
-
-[[package]]
-name = "http-range"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
-
-[[package]]
-name = "httparse"
-version = "1.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c"
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indexmap"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "inotify"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4816c66d2c8ae673df83366c18341538f234a26d65a9ecea5c348b453ac1d02f"
-dependencies = [
- "bitflags",
- "inotify-sys",
- "libc",
-]
-
-[[package]]
-name = "inotify-sys"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
-
-[[package]]
-name = "itoa"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d"
-
-[[package]]
-name = "jobserver"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "js-sys"
-version = "0.3.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "jwalk"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "172752e853a067cbce46427de8470ddf308af7fd8ceaf9b682ef31a5021b6bb9"
-dependencies = [
- "crossbeam",
- "rayon",
-]
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "language-tags"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
-[[package]]
-name = "libc"
-version = "0.2.126"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
-
-[[package]]
-name = "local-channel"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c"
-dependencies = [
- "futures-core",
- "futures-sink",
- "futures-util",
- "local-waker",
-]
-
-[[package]]
-name = "local-waker"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1"
-
-[[package]]
-name = "lock_api"
-version = "0.4.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "maplit"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
-
-[[package]]
-name = "matches"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f"
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "memoffset"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "mime"
-version = "0.3.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d"
-
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "minify-html-onepass"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd67af681d200d6cb524fbd4bda8276878d52c91508fc1954a29a9f12ffe6da3"
-dependencies = [
- "aho-corasick",
- "lazy_static",
- "memchr",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f5c75688da582b8ffc1f1799e9db273f32133c49e048f614d22ec3256773ccc"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
-dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log",
- "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys",
-]
-
-[[package]]
-name = "mio-extras"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19"
-dependencies = [
- "lazycell",
- "log",
- "mio 0.6.23",
- "slab",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
-[[package]]
-name = "net2"
-version = "0.2.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "new_mime_guess"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2d684d1b59e0dc07b37e2203ef576987473288f530082512aff850585c61b1f"
-dependencies = [
- "mime",
- "unicase",
-]
-
-[[package]]
-name = "notify"
-version = "4.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae03c8c853dba7bfd23e571ff0cff7bc9dceb40a4cd684cd1681824183f45257"
-dependencies = [
- "bitflags",
- "filetime",
- "fsevent",
- "fsevent-sys",
- "inotify",
- "libc",
- "mio 0.6.23",
- "mio-extras",
- "walkdir",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"
-dependencies = [
- "parking_lot_core",
-]
-
-[[package]]
-name = "opaque-debug"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
-
-[[package]]
-name = "os_str_bytes"
-version = "6.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
-dependencies = [
- "cfg-if 1.0.0",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-sys",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc"
-
-[[package]]
-name = "percent-encoding"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
-
-[[package]]
-name = "pest"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
-dependencies = [
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d"
-dependencies = [
- "maplit",
- "pest",
- "sha-1",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "rayon"
-version = "1.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d"
-dependencies = [
- "autocfg",
- "crossbeam-deque",
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f"
-dependencies = [
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-utils",
- "num_cpus",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42"
-dependencies = [
- "bitflags",
-]
-
-[[package]]
-name = "regex"
-version = "1.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
- "web-sys",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustls"
-version = "0.20.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033"
-dependencies = [
- "log",
- "ring",
- "sct",
- "webpki",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9"
-dependencies = [
- "base64",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf"
-
-[[package]]
-name = "ryu"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
-
-[[package]]
-name = "sct"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a41d061efea015927ac527063765e73601444cdc344ba855bc7bd44578b25e1c"
-
-[[package]]
-name = "serde"
-version = "1.0.137"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.137"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_html_form"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3312ac3bf56e70cb7082a85db89d127940607b6acf39bd537cc06c8212124927"
-dependencies = [
- "form_urlencoded",
- "indexmap",
- "itoa 1.0.2",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c"
-dependencies = [
- "itoa 1.0.2",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa 1.0.2",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha-1"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df"
-dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f"
-dependencies = [
- "cfg-if 1.0.0",
- "cpufeatures",
- "digest 0.10.3",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"
-
-[[package]]
-name = "smallvec"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc88c725d61fc6c3132893370cac4a0200e3fedf5da8331c570664b1987f5ca2"
-
-[[package]]
-name = "socket2"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
-dependencies = [
- "libc",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "str-buf"
-version = "2.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0873cb29201126440dcc78d0b1f5a13d917e78831778429a7920ca9c7f3dae1e"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "syn"
-version = "1.0.98"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
-
-[[package]]
-name = "thiserror"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "time"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72c91f41dcb2f096c05f0873d667dceec1087ce5bcf984ec8ffb19acddbb3217"
-dependencies = [
- "itoa 1.0.2",
- "libc",
- "num_threads",
- "time-macros",
-]
-
-[[package]]
-name = "time-macros"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42657b1a6f4d817cda8e7a0ace261fe0cc946cf3a80314390b22cc61ae080792"
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
-
-[[package]]
-name = "tokio"
-version = "1.19.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
-dependencies = [
- "bytes",
- "libc",
- "memchr",
- "mio 0.8.4",
- "once_cell",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.23.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
-dependencies = [
- "rustls",
- "tokio",
- "webpki",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "tracing"
-version = "0.1.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a400e31aa60b9d44a52a8ee0343b5b18566b03a8321e0d321f695cf56e940160"
-dependencies = [
- "cfg-if 1.0.0",
- "log",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b7358be39f2f274f322d2aaed611acc57f382e8eb1e5b48cb9ae30933495ce7"
-dependencies = [
- "once_cell",
-]
-
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
-
-[[package]]
-name = "unicase"
-version = "2.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81dee68f85cab8cf68dec42158baf3a79a1cdc065a8b103025965d6ccb7f6cbd"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "url"
-version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c"
-dependencies = [
- "form_urlencoded",
- "idna",
- "matches",
- "percent-encoding",
-]
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "walkdir"
-version = "2.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
-dependencies = [
- "same-file",
- "winapi 0.3.9",
- "winapi-util",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
-dependencies = [
- "cfg-if 1.0.0",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
-dependencies = [
- "bumpalo",
- "lazy_static",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
-
-[[package]]
-name = "web-sys"
-version = "0.3.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.22.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d8de8415c823c8abd270ad483c6feeac771fad964890779f9a8cb24fbbc1bf"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
-dependencies = [
- "winapi 0.3.9",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
-[[package]]
-name = "xxhash-rust"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "074914ea4eec286eb8d1fd745768504f420a1f7b7919185682a4a267bed7d2e7"
-
-[[package]]
-name = "zstd"
-version = "0.11.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4"
-dependencies = [
- "zstd-safe",
-]
-
-[[package]]
-name = "zstd-safe"
-version = "5.0.2+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db"
-dependencies = [
- "libc",
- "zstd-sys",
-]
-
-[[package]]
-name = "zstd-sys"
-version = "2.0.1+zstd.1.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b"
-dependencies = [
- "cc",
- "libc",
-]
diff --git a/pkgs/by-name/bi/binserve/package.nix b/pkgs/by-name/bi/binserve/package.nix
deleted file mode 100644
index f069f7341bb2..000000000000
--- a/pkgs/by-name/bi/binserve/package.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "binserve";
-  version = "0.2.0";
-
-  src = fetchFromGitHub {
-    owner = "mufeedvh";
-    repo = "binserve";
-    rev = "v${version}";
-    hash = "sha256-Chm2xPB0BrLXSZslg9wnbDyHSJRQAvOtpH0Rw6w1q1s=";
-  };
-
-  cargoLock.lockFile = ./Cargo.lock;
-  postPatch = ''
-    cp ${./Cargo.lock} Cargo.lock
-  '';
-
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Fast production-ready static web server";
-    homepage = "https://github.com/mufeedvh/binserve";
-    knownVulnerabilities = [
-      "CVE-2025-4432"
-      "CVE-2024-32650"
-      "This web server is unmaintained. Consider using maintained alternatives instead."
-    ];
-    longDescription = ''
-      A fast production-ready static web server with TLS
-      (HTTPS), routing, hot reloading, caching, templating, and security in a
-      single-binary you can set up with zero code
-    '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ snapdgn ];
-    platforms = platforms.unix;
-    mainProgram = "binserve";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2b5ede7e710a..ef985cd3dc17 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -345,6 +345,7 @@ mapAliases {
   belr = throw "'belr' has been moved to 'linphonePackages.belr'"; # Added 2025-09-20
   bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   bindle = throw "bindle has been removed since it is vulnerable to CVE-2025-62518 and upstream has been archived"; # Added 2025-10-24
+  binserve = throw "'binserve' has been removed because it is unmaintained upstream."; # Added 2025-11-29
   bitbucket-server-cli = throw "bitbucket-server-cli has been removed due to lack of maintenance upstream."; # Added 2025-05-27
   bitcoin-abc = throw "bitcoin-abc has been removed due to a lack of maintanance"; # Added 2025-06-17
   bitcoind-abc = throw "bitcoind-abc has been removed due to a lack of maintanance"; # Added 2025-06-17

From 18bcb6c30e981b520e99a35af8013219c868c12d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Nov 2025 20:16:15 +0000
Subject: [PATCH 34/47] xenia-canary: 0-unstable-2025-11-22 ->
 0-unstable-2025-11-29

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

diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix
index 9658664b0740..41db2c1fdde7 100644
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -19,14 +19,14 @@
 }:
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2025-11-22";
+  version = "0-unstable-2025-11-29";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "07501cfcb9f592c3f99eeb7a8d8f10294755a980";
-    hash = "sha256-dacGpGAK4At0KXdANY6ibEAjxWcY4bUbyFraXO+kK/0=";
+    rev = "ce5100cbf384d441f7ccfd0269938616a345722f";
+    hash = "sha256-v2RFsOFbsM14lGo//7Qf25neRfM9mSbC8cJZP1xCsms=";
   };
 
   dontConfigure = true;

From 8f75ca3dcc7fb16ae6b2ff7849fb2b6e0b8ba484 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 29 Nov 2025 12:19:48 -0800
Subject: [PATCH 35/47] qutebrowser: fix loading libwayland-client

Previously `qutebrowser --version` resulted in

    Qt Platform: wayland (Error: wayland-client library not found)
---
 pkgs/by-name/qu/qutebrowser/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix
index 0757bd74a18a..5dbda57817f2 100644
--- a/pkgs/by-name/qu/qutebrowser/package.nix
+++ b/pkgs/by-name/qu/qutebrowser/package.nix
@@ -15,6 +15,7 @@
   pipewireSupport ? stdenv.hostPlatform.isLinux,
   pipewire,
   qt6Packages,
+  wayland,
   enableWideVine ? false,
   widevine-cdm,
   # can cause issues on some graphics chips
@@ -104,6 +105,11 @@ python3.pkgs.buildPythonApplication {
   ''
   + lib.optionalString withPdfReader ''
     sed -i "s,/usr/share/pdf.js,${pdfjs},g" qutebrowser/browser/pdfjs.py
+  ''
+  + lib.optionalString (lib.meta.availableOn stdenv.hostPlatform wayland) ''
+    substituteInPlace qutebrowser/misc/wmname.py \
+      --replace-fail '_load_library("wayland-client")' \
+                     'ctypes.CDLL("${lib.getLib wayland}/lib/libwayland-client${stdenv.hostPlatform.extensions.sharedLibrary}")'
   '';
 
   installPhase = ''

From 4b1e2882e4e2c55fcc207d965728f01000f5e040 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Nov 2025 20:25:39 +0000
Subject: [PATCH 36/47] tigerbeetle: 0.16.65 -> 0.16.66

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

diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index f70357347d4f..4fd5f8cb9fc2 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-4Z2+uUewnnzUkxU/yJQfiwYfS065TMInP/orBO0Qm0c=";
-    "x86_64-linux" = "sha256-YnD2M9GsLBAUzKxE3NrkZUwmYUjEyItIIBL6YjP1znQ=";
-    "aarch64-linux" = "sha256-zjbl/4iExFvQrtOYro/E7/mvxButrBo7fSHFq52jQCw=";
+    "universal-macos" = "sha256-q+s04xXqmKZfd4If4xMl4It5roHwW2IQeYykz2FzHmI=";
+    "x86_64-linux" = "sha256-5jBzNCpu4xrMlbRbFLUg57QtXqivfeYpx9hanoS6nIQ=";
+    "aarch64-linux" = "sha256-/V3tV6f0RY5ymb5zQy81Irox6zgQx0wjuWmB/5QsOQQ=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.16.65";
+  version = "0.16.66";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

From dcd19686f08ed9629aab49e352f0deed2ea8f4b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Nov 2025 21:48:46 +0000
Subject: [PATCH 37/47] python3Packages.niapy: 2.6.0 -> 2.6.1

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

diff --git a/pkgs/development/python-modules/niapy/default.nix b/pkgs/development/python-modules/niapy/default.nix
index 7536d709964f..15a1736b2703 100644
--- a/pkgs/development/python-modules/niapy/default.nix
+++ b/pkgs/development/python-modules/niapy/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "niapy";
-  version = "2.6.0";
+  version = "2.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "NiaOrg";
     repo = "NiaPy";
     tag = "v${version}";
-    hash = "sha256-o/JHFPsYMHxSkUMfRbR3SJawbzTsoh6ae0pyxLd1bAs=";
+    hash = "sha256-5Cxxug/FyucU+MkWXMtH43AembfZ/kj5r8nId5664z8=";
   };
 
   build-system = [ poetry-core ];

From 773490de39afb75689ff5bc1bb75247b97e160f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Nov 2025 21:57:55 +0000
Subject: [PATCH 38/47] fastmail-desktop: 1.0.4 -> 1.0.5

---
 pkgs/by-name/fa/fastmail-desktop/sources.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fa/fastmail-desktop/sources.nix b/pkgs/by-name/fa/fastmail-desktop/sources.nix
index d5d7f802508b..d0e895a6cbaf 100644
--- a/pkgs/by-name/fa/fastmail-desktop/sources.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/sources.nix
@@ -1,19 +1,19 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-11-11
+# Last updated: 2025-11-29
 { fetchurl, fetchzip }:
 {
   aarch64-darwin = {
-    version = "1.0.4";
+    version = "1.0.5";
     src = fetchurl {
-      url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.4-arm64-mac.zip";
-      hash = "sha512-DoBG2pY8a1BjNby0/PFAmRnEdMzX3n/JNlGW1/uHvi8lmzDMfEK5F0RAE4bNW08TPnaomjQOMRnqcas/9SecuA==";
+      url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.5-arm64-mac.zip";
+      hash = "sha512-/QozVRmwVxOf97GI6TOoR/pAepSVQn/cVd9jdIi9yoOh82/pHUtHZAiL8K+YmxhjfKGumR9oG7rVbAzgrE+jRg==";
     };
   };
   x86_64-linux = {
-    version = "1.0.4";
+    version = "1.0.5";
     src = fetchurl {
-      url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.0.4.AppImage";
-      hash = "sha512-lavGgtrIRiYL4NQEecpppvcTLZCgp54sTDFyVgySzBZmB6bcwCk9Kpjgepjma6iCUtUQYkN5ydtEYLZqTcSw4Q==";
+      url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.0.5.AppImage";
+      hash = "sha512-p9g9K6hi4tceNlyAIgdkpc7VITwfSifsUBqXQWqMJU3aLAM5SH0WZcFQmcn94DWoq6e3bx3Z+7lCV1twhVLiyw==";
     };
   };
 }

From 4d8e1ac56ede4cb651017afb871854a555e8f210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 29 Nov 2025 13:35:54 -0800
Subject: [PATCH 39/47] hatch: 1.14.2 -> 1.16.1

Diff: https://github.com/pypa/hatch/compare/hatch-v1.14.2...hatch-v1.16.1

Changelog: https://github.com/pypa/hatch/blob/hatch-v1.16.1/docs/history/hatch.md
---
 pkgs/by-name/ha/hatch/package.nix | 65 ++++++++++++++++++++-----------
 pkgs/by-name/ha/hatch/paths.patch | 46 +++++++++++-----------
 2 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/pkgs/by-name/ha/hatch/package.nix b/pkgs/by-name/ha/hatch/package.nix
index 4b3f0c4ebbc2..fcaa9017b260 100644
--- a/pkgs/by-name/ha/hatch/package.nix
+++ b/pkgs/by-name/ha/hatch/package.nix
@@ -14,14 +14,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "hatch";
-  version = "1.14.2";
+  version = "1.16.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "hatch";
     tag = "hatch-v${version}";
-    hash = "sha256-LrfPDgpb9AQsaiYVb2MNdOfoIBbStZMKmESCbVhfn+s=";
+    hash = "sha256-HreVb+RZzQV3p9TaoHDZLHBQFifyH+hocP01u5yU+ms=";
   };
 
   patches = [ (replaceVars ./paths.patch { uv = lib.getExe python3Packages.uv; }) ];
@@ -33,28 +33,34 @@ python3Packages.buildPythonApplication rec {
 
   pythonRemoveDeps = [ "uv" ];
 
-  dependencies = with python3Packages; [
-    click
-    hatchling
-    httpx
-    hyperlink
-    keyring
-    packaging
-    pexpect
-    platformdirs
-    rich
-    shellingham
-    tomli-w
-    tomlkit
-    userpath
-    virtualenv
-    zstandard
-  ];
+  dependencies =
+    with python3Packages;
+    [
+      click
+      hatchling
+      httpx
+      hyperlink
+      keyring
+      packaging
+      pexpect
+      platformdirs
+      pyproject-hooks
+      rich
+      shellingham
+      tomli-w
+      tomlkit
+      userpath
+      virtualenv
+    ]
+    ++ lib.optionals (pythonOlder "3.14") [
+      backports-zstd
+    ];
 
   nativeCheckInputs =
     with python3Packages;
     [
       binary
+      flit-core
       git
       pytestCheckHook
       pytest-mock
@@ -123,10 +129,23 @@ python3Packages.buildPythonApplication rec {
   ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "test_resolve" ];
 
   disabledTestPaths = [
-    # ModuleNotFoundError: No module named 'hatchling.licenses.parse'
-    # https://github.com/pypa/hatch/issues/1850
-    "tests/backend/licenses/test_parse.py"
-    "tests/backend/licenses/test_supported.py"
+    # httpx.ConnectError: [Errno -3] Temporary failure in name resolution
+    "tests/workspaces/test_config.py"
+
+    # additional comment `-*- coding: utf-8 -*-` in output
+    "tests/backend/builders/test_sdist.py"
+
+    # missing output `Syncing dependencies`
+    "tests/cli/build/test_build.py"
+    "tests/cli/project/test_metadata.py"
+    "tests/cli/version/test_version.py"
+
+    # AttributeError: 'WheelBuilderConfig' object has no attribute 'sbom_files'
+    "tests/backend/builders/test_wheel.py::TestSBOMFiles"
+
+    # some issue with the version of `binary`
+    "tests/dep/test_sync.py::test_dependency_not_found"
+    "tests/dep/test_sync.py::test_marker_unmet"
 
     # AssertionError on the version metadata
     # https://github.com/pypa/hatch/issues/1877
diff --git a/pkgs/by-name/ha/hatch/paths.patch b/pkgs/by-name/ha/hatch/paths.patch
index 60aeec4e4971..51845d3406cb 100644
--- a/pkgs/by-name/ha/hatch/paths.patch
+++ b/pkgs/by-name/ha/hatch/paths.patch
@@ -1,58 +1,58 @@
 diff --git a/src/hatch/env/virtual.py b/src/hatch/env/virtual.py
-index 285edb32..90bd94e6 100644
+index 72605e58..546b6ad1 100644
 --- a/src/hatch/env/virtual.py
 +++ b/src/hatch/env/virtual.py
-@@ -106,26 +106,7 @@ class VirtualEnvironment(EnvironmentInterface):
+@@ -108,26 +108,7 @@ class VirtualEnvironment(EnvironmentInterface):
          if self.explicit_uv_path:
              return self.explicit_uv_path
  
 -        from hatch.env.internal import is_default_environment
 -
--        env_name = 'hatch-uv'
+-        env_name = "hatch-uv"
 -        if not (
 -            # Prevent recursive loop
 -            self.name == env_name
 -            # Only if dependencies have been set by the user
 -            or is_default_environment(env_name, self.app.project.config.internal_envs[env_name])
 -        ):
--            uv_env = self.app.get_environment(env_name)
--            self.app.prepare_environment(uv_env)
+-            uv_env = self.app.project.get_environment(env_name)
+-            self.app.project.prepare_environment(uv_env)
 -            with uv_env:
--                return self.platform.modules.shutil.which('uv')
+-                return self.platform.modules.shutil.which("uv")
 -
 -        import sysconfig
 -
--        scripts_dir = sysconfig.get_path('scripts')
--        old_path = os.environ.get('PATH', os.defpath)
--        new_path = f'{scripts_dir}{os.pathsep}{old_path}'
--        return self.platform.modules.shutil.which('uv', path=new_path)
-+        return '@uv@'
+-        scripts_dir = sysconfig.get_path("scripts")
+-        old_path = os.environ.get("PATH", os.defpath)
+-        new_path = f"{scripts_dir}{os.pathsep}{old_path}"
+-        return self.platform.modules.shutil.which("uv", path=new_path)
++        return "@uv@"
  
-     @staticmethod
-     def get_option_types() -> dict:
+     @cached_property
+     def distributions(self) -> InstalledDistributions:
 diff --git a/src/hatch/venv/core.py b/src/hatch/venv/core.py
-index d1303f03..e1e60871 100644
+index d8c6379e..874f8936 100644
 --- a/src/hatch/venv/core.py
 +++ b/src/hatch/venv/core.py
 @@ -131,7 +131,7 @@ class TempVirtualEnv(VirtualEnv):
  
  class UVVirtualEnv(VirtualEnv):
      def create(self, python, *, allow_system_packages=False):
--        command = [os.environ.get('HATCH_UV', 'uv'), 'venv', str(self.directory), '--python', python]
-+        command = [os.environ.get('HATCH_UV', '@uv@'), 'venv', str(self.directory), '--python', python]
+-        command = [os.environ.get("HATCH_UV", "uv"), "venv", str(self.directory), "--python", python]
++        command = [os.environ.get("HATCH_UV", "@uv@"), "venv", str(self.directory), "--python", python]
          if allow_system_packages:
-             command.append('--system-site-packages')
+             command.append("--system-site-packages")
  
 diff --git a/tests/conftest.py b/tests/conftest.py
-index e8fe663a..6066316d 100644
+index 44681a10..d7e91d36 100644
 --- a/tests/conftest.py
 +++ b/tests/conftest.py
-@@ -203,7 +203,7 @@ def python_on_path():
+@@ -205,7 +205,7 @@ def python_on_path():
  
- @pytest.fixture(scope='session', autouse=True)
+ @pytest.fixture(scope="session", autouse=True)
  def uv_on_path():
--    return shutil.which('uv')
-+    return '@uv@'
+-    return shutil.which("uv")
++    return "@uv@"
  
  
- @pytest.fixture(scope='session')
+ @pytest.fixture(scope="session")

From 2f378e713cf473b5ae3494784c66b6fec6910867 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 29 Nov 2025 23:15:06 +0000
Subject: [PATCH 40/47] libdaq: 3.0.22 -> 3.0.23

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

diff --git a/pkgs/by-name/li/libdaq/package.nix b/pkgs/by-name/li/libdaq/package.nix
index 8600e8992f11..3ecb104cab49 100644
--- a/pkgs/by-name/li/libdaq/package.nix
+++ b/pkgs/by-name/li/libdaq/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdaq";
-  version = "3.0.22";
+  version = "3.0.23";
 
   src = fetchFromGitHub {
     owner = "snort3";
     repo = "libdaq";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bx+NBUz+LpX4kOvCOCN+6rRilMreMAGeFGD33xLdfv0=";
+    hash = "sha256-P57eH301oOSY43LyryFar1aoPcDrd+WNxTResWGOD/I=";
   };
 
   nativeBuildInputs = [

From acff77306f17481e7c3f99e35ebed87ea7a0e447 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 30 Nov 2025 01:17:42 +0100
Subject: [PATCH 41/47] bottles: add support for wine-wayland

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

diff --git a/pkgs/by-name/bo/bottles/package.nix b/pkgs/by-name/bo/bottles/package.nix
index 26e448ddffbc..f9ff26adcf71 100644
--- a/pkgs/by-name/bo/bottles/package.nix
+++ b/pkgs/by-name/bo/bottles/package.nix
@@ -54,6 +54,11 @@ let
             gst-plugins-bad
             gst-libav
           ];
+        waylandDeps =
+          pkgs: with pkgs; [
+            libxkbcommon
+            wayland
+          ];
       in
       pkgs:
       with pkgs;
@@ -106,7 +111,8 @@ let
       ]
       ++ xorgDeps pkgs
       ++ gstreamerDeps pkgs
-      ++ extraLibraries pkgs;
+      ++ extraLibraries pkgs
+      ++ waylandDeps pkgs;
   };
 in
 symlinkJoin {

From 3204cf8ee6c32aec9c1e8a02619d31c729c3948a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Nov 2025 01:42:12 +0000
Subject: [PATCH 42/47] terraform-providers.hashicorp_google: 7.11.0 -> 7.12.0

---
 .../networking/cluster/terraform-providers/providers.json     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 795ae9c81fa6..b01ae280a031 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -561,11 +561,11 @@
     "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
   },
   "hashicorp_google": {
-    "hash": "sha256-MrQ16YJBPm0f89lYbbDSPrqSFhB0eShN6VUM1lPI2D4=",
+    "hash": "sha256-d9rFR5ND72GIqwjusfKgzUozSJY/Dg+yL3AoPxIVExI=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "repo": "terraform-provider-google",
-    "rev": "v7.11.0",
+    "rev": "v7.12.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-bpyTtuK3kcntk9hzCU2d+RZ0K0jfFtUlEZezyZHvFW8="
   },

From 57d0e1900d5861ec26ddf7d9e0ae1bc05a371a84 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 30 Nov 2025 02:16:24 +0000
Subject: [PATCH 43/47] svg2tikz: 3.3.3 -> 3.3.4

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

diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix
index f6df893a41e2..e9caf8ad705e 100644
--- a/pkgs/development/python-modules/svg2tikz/default.nix
+++ b/pkgs/development/python-modules/svg2tikz/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "svg2tikz";
-  version = "3.3.3";
+  version = "3.3.4";
 
   pyproject = true;
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "xyz2tex";
     repo = "svg2tikz";
     tag = "v${version}";
-    hash = "sha256-wc5yzfWWixzO73s+jADpoQli0f3bmu2tBrGgj6DYnUM=";
+    hash = "sha256-hIVxrUqT9g3e8eKdz1xPqRBiN62BPLav+xPHm6WCAqw=";
   };
 
   build-system = [

From 0085dba62a358855d5188efef7a4c6a919bd840b Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 29 Nov 2025 21:42:44 -0500
Subject: [PATCH 44/47] hello-go: bump go version

---
 pkgs/by-name/he/hello-go/src/go.mod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/he/hello-go/src/go.mod b/pkgs/by-name/he/hello-go/src/go.mod
index 4dc8dec9f4d0..d66551163c90 100644
--- a/pkgs/by-name/he/hello-go/src/go.mod
+++ b/pkgs/by-name/he/hello-go/src/go.mod
@@ -1,3 +1,3 @@
 module hello-go
 
-go 1.22.7
+go 1.25.4

From fd3a8eddcb44829c3e5aded7d768e0f7b27fb2f6 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sat, 29 Nov 2025 12:31:44 -0500
Subject: [PATCH 45/47] nixos/miniflux: don't require DATABASE_URL if not
 createDatabaseLocally

For example, if providing through EnvironmentFile due to secrets then we
need to allow the env to build without this config.

Fixes this error:

    error: The option `services.miniflux.config.DATABASE_URL' was accessed but has no value defined. Try setting the option.
---
 nixos/modules/services/web-apps/miniflux.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix
index 03447395fef6..bad9c0d95337 100644
--- a/nixos/modules/services/web-apps/miniflux.nix
+++ b/nixos/modules/services/web-apps/miniflux.nix
@@ -64,8 +64,13 @@ in
               example = "127.0.0.1:8080, 127.0.0.1:8081";
             };
             DATABASE_URL = mkOption {
-              type = types.str;
-              defaultText = "user=miniflux host=/run/postgresql dbname=miniflux";
+              type = types.nullOr types.str;
+              defaultText = literalExpression ''
+                if createDatabaseLocally then "user=miniflux host=/run/postgresql dbname=miniflux" else null
+              '';
+              default =
+                if cfg.createDatabaseLocally then "user=miniflux host=/run/postgresql dbname=miniflux" else null;
+
               description = ''
                 Postgresql connection parameters.
                 See [lib/pq](https://pkg.go.dev/github.com/lib/pq#hdr-Connection_String_Parameters) for more details.
@@ -116,9 +121,6 @@ in
         message = "services.miniflux.adminCredentialsFile must be set if services.miniflux.config.CREATE_ADMIN is 1";
       }
     ];
-    services.miniflux.config = {
-      DATABASE_URL = lib.mkIf cfg.createDatabaseLocally "user=miniflux host=/run/postgresql dbname=miniflux";
-    };
 
     services.postgresql = lib.mkIf cfg.createDatabaseLocally {
       enable = true;
@@ -202,7 +204,7 @@ in
         UMask = "0077";
       };
 
-      environment = lib.mapAttrs (_: toString) cfg.config;
+      environment = lib.mapAttrs (_: toString) (lib.filterAttrs (_: v: v != null) cfg.config);
     };
     environment.systemPackages = [ cfg.package ];
 

From 7bf3aa9d0da46f585c58f818bd718f116ca78128 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sat, 29 Nov 2025 20:25:21 -0800
Subject: [PATCH 46/47] doc/javascript: move nodePackages information back to
 README.md

Adding new packages here is discouraged, for reasons enumerated in
https://github.com/NixOS/nixpkgs/issues/229475, so let's move this
(mostly developer-facing) documentation back into its original location
in pkgs/development/node-packages/README.md.
---
 .../javascript.section.md                     | 87 -------------------
 doc/redirects.json                            |  9 --
 pkgs/development/node-packages/README.md      | 85 +++++++++++++++++-
 3 files changed, 84 insertions(+), 97 deletions(-)

diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md
index d19884154438..360124bbcdac 100644
--- a/doc/languages-frameworks/javascript.section.md
+++ b/doc/languages-frameworks/javascript.section.md
@@ -95,93 +95,6 @@ The node_modules abstraction can be also used to build some web framework fronte
 For an example of this see how [plausible](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/web-apps/plausible/default.nix) is built. `mkYarnModules` to make the derivation containing node_modules.
 Then when building the frontend you can just symlink the node_modules directory.
 
-## Javascript packages inside nixpkgs {#javascript-packages-nixpkgs}
-
-The [pkgs/development/node-packages](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages) folder contains a generated collection of [npm packages](https://npmjs.com/) that can be installed with the Nix package manager.
-
-As a rule of thumb, the package set should only provide _end-user_ software packages, such as command-line utilities.
-Libraries should only be added to the package set if there is a non-npm package that requires it.
-
-When it is desired to use npm libraries in a development project, use the `node2nix` generator directly on the `package.json` configuration file of the project.
-
-The package set provides support for the official stable Node.js versions.
-The latest stable LTS release in `nodePackages`, as well as the latest stable current release in `nodePackages_latest`.
-
-If your package uses native addons, you need to examine what kind of native build system it uses. Here are some examples:
-
-- `node-gyp`
-- `node-gyp-builder`
-- `node-pre-gyp`
-
-After you have identified the correct system, you need to override your package expression while adding in build system as a build input.
-For example, `dat` requires `node-gyp-build`, so we override its expression in [pkgs/development/node-packages/overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/overrides.nix):
-
-```nix
-{
-  dat = prev.dat.override (oldAttrs: {
-    buildInputs = [
-      final.node-gyp-build
-      pkgs.libtool
-      pkgs.autoconf
-      pkgs.automake
-    ];
-    meta = oldAttrs.meta // {
-      broken = since "12";
-    };
-  });
-}
-```
-
-### Adding and updating JavaScript packages in Nixpkgs {#javascript-adding-or-updating-packages}
-
-To add a package from npm to Nixpkgs:
-
-1. Modify [pkgs/development/node-packages/node-packages.json](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/node-packages.json) to add, update or remove package entries to have it included in `nodePackages` and `nodePackages_latest`.
-2. Run the script:
-
-   ```sh
-   ./pkgs/development/node-packages/generate.sh
-   ```
-
-3. Build your new package to test your changes:
-
-   ```sh
-   nix-build -A nodePackages.<new-or-updated-package>
-   ```
-
-    To build against the latest stable Current Node.js version (e.g. 18.x):
-
-    ```sh
-    nix-build -A nodePackages_latest.<new-or-updated-package>
-    ```
-
-    If the package doesn't build, you may need to add an override as explained above.
-4. If the package's name doesn't match any of the executables it provides, add an entry in [pkgs/development/node-packages/main-programs.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/main-programs.nix). This will be the case for all scoped packages, e.g., `@angular/cli`.
-5. Add and commit all modified and generated files.
-
-For more information about the generation process, consult the [README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` tool.
-
-To update npm packages in Nixpkgs, run the same `generate.sh` script:
-
-```sh
-./pkgs/development/node-packages/generate.sh
-```
-
-#### Git protocol error {#javascript-git-error}
-
-Some packages may have Git dependencies from GitHub specified with `git://`.
-GitHub has [disabled unencrypted Git connections](https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git), so you may see the following error when running the generate script:
-
-```
-The unauthenticated git protocol on port 9418 is no longer supported
-```
-
-Use the following Git configuration to resolve the issue:
-
-```sh
-git config --global url."https://github.com/".insteadOf git://github.com/
-```
-
 ## Tool-specific instructions {#javascript-tool-specific}
 
 ### buildNpmPackage {#javascript-buildNpmPackage}
diff --git a/doc/redirects.json b/doc/redirects.json
index 890d5db0f321..f0e7f455d6a5 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -3425,15 +3425,6 @@
   "javascript-using-node_modules": [
     "index.html#javascript-using-node_modules"
   ],
-  "javascript-packages-nixpkgs": [
-    "index.html#javascript-packages-nixpkgs"
-  ],
-  "javascript-adding-or-updating-packages": [
-    "index.html#javascript-adding-or-updating-packages"
-  ],
-  "javascript-git-error": [
-    "index.html#javascript-git-error"
-  ],
   "javascript-tool-specific": [
     "index.html#javascript-tool-specific"
   ],
diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md
index 38d1ff2018c4..13d083f21d0a 100644
--- a/pkgs/development/node-packages/README.md
+++ b/pkgs/development/node-packages/README.md
@@ -1 +1,84 @@
-Moved to [/doc/languages-frameworks/javascript.section.md](/doc/languages-frameworks/javascript.section.md)
+This folder contains a generated collection of [npm packages](https://npmjs.com/) that can be installed with the Nix package manager.
+
+As a rule of thumb, the package set should only provide _end-user_ software packages, such as command-line utilities.
+Libraries should only be added to the package set if there is a non-npm package that requires it.
+
+When it is desired to use npm libraries in a development project, use the `node2nix` generator directly on the `package.json` configuration file of the project.
+
+The package set provides support for the official stable Node.js versions.
+The latest stable LTS release in `nodePackages`, as well as the latest stable current release in `nodePackages_latest`.
+
+If your package uses native addons, you need to examine what kind of native build system it uses. Here are some examples:
+
+- `node-gyp`
+- `node-gyp-builder`
+- `node-pre-gyp`
+
+After you have identified the correct system, you need to override your package expression while adding in build system as a build input.
+For example, `dat` requires `node-gyp-build`, so we override its expression in [pkgs/development/node-packages/overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/overrides.nix):
+
+```nix
+{
+  dat = prev.dat.override (oldAttrs: {
+    buildInputs = [
+      final.node-gyp-build
+      pkgs.libtool
+      pkgs.autoconf
+      pkgs.automake
+    ];
+    meta = oldAttrs.meta // {
+      broken = since "12";
+    };
+  });
+}
+```
+
+### Adding and updating JavaScript packages in Nixpkgs
+
+To add a package from npm to Nixpkgs:
+
+1. Modify [pkgs/development/node-packages/node-packages.json](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/node-packages.json) to add, update or remove package entries to have it included in `nodePackages` and `nodePackages_latest`.
+2. Run the script:
+
+   ```sh
+   ./pkgs/development/node-packages/generate.sh
+   ```
+
+3. Build your new package to test your changes:
+
+   ```sh
+   nix-build -A nodePackages.<new-or-updated-package>
+   ```
+
+    To build against the latest stable Current Node.js version (e.g. 18.x):
+
+    ```sh
+    nix-build -A nodePackages_latest.<new-or-updated-package>
+    ```
+
+    If the package doesn't build, you may need to add an override as explained above.
+4. If the package's name doesn't match any of the executables it provides, add an entry in [pkgs/development/node-packages/main-programs.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/node-packages/main-programs.nix). This will be the case for all scoped packages, e.g., `@angular/cli`.
+5. Add and commit all modified and generated files.
+
+For more information about the generation process, consult the [README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` tool.
+
+To update npm packages in Nixpkgs, run the same `generate.sh` script:
+
+```sh
+./pkgs/development/node-packages/generate.sh
+```
+
+#### Git protocol error
+
+Some packages may have Git dependencies from GitHub specified with `git://`.
+GitHub has [disabled unencrypted Git connections](https://github.blog/2021-09-01-improving-git-protocol-security-github/#no-more-unauthenticated-git), so you may see the following error when running the generate script:
+
+```
+The unauthenticated git protocol on port 9418 is no longer supported
+```
+
+Use the following Git configuration to resolve the issue:
+
+```sh
+git config --global url."https://github.com/".insteadOf git://github.com/
+```

From a8ea7b38dac6de7fd22d4f0c102f4f4cdb13028d Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Sat, 29 Nov 2025 20:31:23 -0800
Subject: [PATCH 47/47] nodePackages: update docs to discourage adding new
 packages

---
 pkgs/development/node-packages/README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md
index 13d083f21d0a..8f82ad73a0fc 100644
--- a/pkgs/development/node-packages/README.md
+++ b/pkgs/development/node-packages/README.md
@@ -1,3 +1,7 @@
+> [!IMPORTANT]
+> There is currently an active project to [remove packages from `nodePackages`](https://github.com/NixOS/nixpkgs/issues/229475).
+> Please consider adding new packages using [another method](https://nixos.org/manual/nixpkgs/unstable/#javascript-tool-specific).
+
 This folder contains a generated collection of [npm packages](https://npmjs.com/) that can be installed with the Nix package manager.
 
 As a rule of thumb, the package set should only provide _end-user_ software packages, such as command-line utilities.