From cff7937495d8a37a2436a6b0cf31cd2cf28849bd Mon Sep 17 00:00:00 2001
From: haruki7049 <tontonkirikiri@gmail.com>
Date: Sat, 6 Jul 2024 14:57:03 +0900
Subject: [PATCH 01/88] algia: init at 0.0.74

---
 pkgs/by-name/al/algia/package.nix | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/by-name/al/algia/package.nix

diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix
new file mode 100644
index 0000000000000..e9d27cedebd79
--- /dev/null
+++ b/pkgs/by-name/al/algia/package.nix
@@ -0,0 +1,28 @@
+{
+  pkgs,
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "algia";
+  version = "0.0.74";
+
+  src = fetchFromGitHub {
+    owner = "mattn";
+    repo = "algia";
+    rev = "v${version}";
+    hash = "sha256-t6XDw40FTa7QkZmOkgAufWV1aFjQrLWmycp+zcVYQWs=";
+  };
+
+  vendorHash = "sha256-fko9WC/Rh5fmoypqBuFKiuIuIJYMbKV+1uQKf5tFil0=";
+
+  meta = {
+    description = "CLI application for nostr";
+    homepage = "https://github.com/mattn/algia";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ haruki7049 ];
+    mainProgram = "algia";
+  };
+}

From ff0cde38b126fbc9f3e4ca5b14a55ba37159fa23 Mon Sep 17 00:00:00 2001
From: ifurther <55025025+ifurther@users.noreply.github.com>
Date: Wed, 14 Aug 2024 01:31:22 +0800
Subject: [PATCH 02/88] python312Packages.jianpu-ly: init at 1.801

---
 .../python-modules/jianpu-ly/default.nix      | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/jianpu-ly/default.nix

diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix
new file mode 100644
index 0000000000000..411f7df5ee458
--- /dev/null
+++ b/pkgs/development/python-modules/jianpu-ly/default.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  lilypond,
+}:
+
+buildPythonPackage rec {
+  pname = "jianpu-ly";
+  version = "1.801";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "jianpu_ly";
+    hash = "sha256-piK9Ym94cKdaHGz/ogX7ylyAF1ww0jCdRXnHN6lu2MI=";
+  };
+
+  dependencies = [ lilypond ];
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "jianpu_ly" ];
+
+  # no tests in shipped with upstream
+  doCheck = false;
+
+  meta = {
+    homepage = "https://ssb22.user.srcf.net/mwrhome/jianpu-ly.html";
+    description = "Assists with printing jianpu";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ ifurther ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ac6b04ff3897d..a332b2953d933 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6285,6 +6285,8 @@ self: super: with self; {
 
   jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { };
 
+  jianpu-ly = callPackage ../development/python-modules/jianpu-ly { };
+
   jieba = callPackage ../development/python-modules/jieba { };
 
   jinja2 = callPackage ../development/python-modules/jinja2 { };

From 91309f479121361bd01310caa57f8051680eac00 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Sun, 15 Sep 2024 23:43:55 +0200
Subject: [PATCH 03/88] python3Packages.pyvex: fix cross

---
 pkgs/development/python-modules/pyvex/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index eb0b5a212c605..509ab241477f3 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   bitstring,
   buildPythonPackage,
+  buildPackages,
   cffi,
   fetchPypi,
   pycparser,
@@ -30,6 +31,10 @@ buildPythonPackage rec {
     pycparser
   ];
 
+  depsBuildBuild = [ buildPackages.stdenv.cc ];
+
+  nativeBuildInputs = [ cffi ];
+
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace vex/Makefile-gcc \
       --replace-fail '/usr/bin/ar' 'ar'

From 5588cd1dfeca91fb9369336b70362d554572a87d Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Mon, 15 Jan 2024 14:15:16 +0100
Subject: [PATCH 04/88] wgnlpy: init at 0.1.5

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

diff --git a/pkgs/development/python-modules/wgnlpy/default.nix b/pkgs/development/python-modules/wgnlpy/default.nix
new file mode 100644
index 0000000000000..11cb4e38b0466
--- /dev/null
+++ b/pkgs/development/python-modules/wgnlpy/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  cryptography,
+  pyroute2,
+}:
+
+buildPythonPackage rec {
+  pname = "wgnlpy";
+  version = "0.1.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ArgosyLabs";
+    repo = "wgnlpy";
+    rev = "v${version}";
+    hash = "sha256-5XAfBiKx4SqouA57PxmaCb0ea7mT2VeUI1tgnQE/ZwQ=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    cryptography
+    pyroute2
+  ];
+
+  pythonImportsCheck = [
+    "wgnlpy"
+    "wgnlpy.nlas"
+  ];
+
+  meta = {
+    description = "Netlink connector to WireGuard";
+    homepage = "https://github.com/ArgosyLabs/wgnlpy";
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ marcel ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9999d745e3acc..4fd1de15c5d1a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17678,6 +17678,8 @@ self: super: with self; {
 
   wget = callPackage ../development/python-modules/wget { };
 
+  wgnlpy = callPackage ../development/python-modules/wgnlpy { };
+
   whatthepatch = callPackage ../development/python-modules/whatthepatch { };
 
   wheel = callPackage ../development/python-modules/wheel { };

From 6540042e2767330be35a276315079618cce520e8 Mon Sep 17 00:00:00 2001
From: KSJ2000 <katsho123@outlook.com>
Date: Thu, 14 Nov 2024 10:45:26 +0200
Subject: [PATCH 05/88] lzfse: modernize derivation

---
 pkgs/by-name/lz/lzfse/package.nix | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/lz/lzfse/package.nix b/pkgs/by-name/lz/lzfse/package.nix
index dd2144a168493..ce89b500accd7 100644
--- a/pkgs/by-name/lz/lzfse/package.nix
+++ b/pkgs/by-name/lz/lzfse/package.nix
@@ -1,19 +1,24 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{
+  cmake,
+  fetchFromGitHub,
+  lib,
+  stdenv,
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lzfse";
   version = "1.0";
 
   src = fetchFromGitHub {
     owner = "lzfse";
     repo = "lzfse";
-    rev = "lzfse-${version}";
-    sha256 = "1mfh6y6vpvxsdwmqmfbkqkwvxc0pz2dqqc72c6fk9sbsrxxaghd5";
+    rev = "lzfse-${finalAttrs.version}";
+    hash = "sha256-pcGnes966TSdYeIwjJv4F7C++cRzuYorb7rvu4030NU=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lzfse/lzfse";
     description = "Reference C implementation of the LZFSE compressor";
     longDescription = ''
@@ -21,9 +26,9 @@ stdenv.mkDerivation rec {
       LZFSE is a Lempel-Ziv style data compression algorithm using Finite State Entropy coding.
       It targets similar compression rates at higher compression and decompression speed compared to deflate using zlib.
     '';
-    platforms = platforms.unix;
-    license = licenses.bsd3;
-    maintainers = [ ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ KSJ2000 ];
     mainProgram = "lzfse";
   };
-}
+})

From 6728211ec862cd7c4865d4c87103abc7e2845a74 Mon Sep 17 00:00:00 2001
From: Patrick <patrick@failmail.dev>
Date: Mon, 11 Nov 2024 15:29:40 +0100
Subject: [PATCH 06/88] nixos/kanidm: allow origin url ending without slash

---
 nixos/modules/services/security/kanidm.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/security/kanidm.nix b/nixos/modules/services/security/kanidm.nix
index a368b6eee2a6e..3f90ad99b7700 100644
--- a/nixos/modules/services/security/kanidm.nix
+++ b/nixos/modules/services/security/kanidm.nix
@@ -502,13 +502,13 @@ in
               };
 
               originUrl = mkOption {
-                description = "The origin URL of the service. OAuth2 redirects will only be allowed to sites under this origin. Must end with a slash.";
+                description = "The redirect URL of the service. These need to exactly match the OAuth2 redirect target";
                 type =
                   let
-                    originStrType = types.strMatching ".*://.*/$";
+                    originStrType = types.strMatching ".*://.*$";
                   in
                   types.either originStrType (types.nonEmptyListOf originStrType);
-                example = "https://someservice.example.com/";
+                example = "https://someservice.example.com/auth/login";
               };
 
               originLanding = mkOption {

From 6c4d710b94524c2b2c55adf79b571a8a42964a06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 16 Nov 2024 11:41:05 -0800
Subject: [PATCH 07/88] rustPlatform.buildRustPackage: allow specifying
 cargoDeps

---
 .../rust/build-rust-package/default.nix             | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 0b77df55ba72e..0498161a7a629 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -38,6 +38,7 @@
 , buildType ? "release"
 , meta ? {}
 , useFetchCargoVendor ? false
+, cargoDeps ? null
 , cargoLock ? null
 , cargoVendorDir ? null
 , checkType ? buildType
@@ -60,14 +61,15 @@
 , buildAndTestSubdir ? null
 , ... } @ args:
 
-assert cargoVendorDir == null && cargoLock == null
+assert cargoVendorDir == null && cargoDeps == null && cargoLock == null
     -> !(args ? cargoSha256 && args.cargoSha256 != null) && !(args ? cargoHash && args.cargoHash != null)
-    -> throw "cargoHash, cargoVendorDir, or cargoLock must be set";
+    -> throw "cargoHash, cargoVendorDir, cargoDeps, or cargoLock must be set";
 
 let
 
-  cargoDeps =
+  cargoDeps' =
     if cargoVendorDir != null then null
+    else if cargoDeps != null then cargoDeps
     else if cargoLock != null then importCargoLock cargoLock
     else if useFetchCargoVendor then (fetchCargoVendor {
       inherit src srcs sourceRoot preUnpack unpackPhase postUnpack;
@@ -102,7 +104,7 @@ in
 # See https://os.phil-opp.com/testing/ for more information.
 assert useSysroot -> !(args.doCheck or true);
 
-stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "cargoLock" ]) // lib.optionalAttrs useSysroot {
+stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "cargoDeps" "cargoLock" ]) // lib.optionalAttrs useSysroot {
   RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or "");
 } // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && buildType == "debug") {
   RUSTFLAGS =
@@ -110,7 +112,8 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
     + lib.optionalString useSysroot "--sysroot ${sysroot} "
     + (args.RUSTFLAGS or "");
 } // {
-  inherit buildAndTestSubdir cargoDeps;
+  cargoDeps = cargoDeps';
+  inherit buildAndTestSubdir;
 
   cargoBuildType = buildType;
 

From 55a51905434f3b52c729f6f9a38dab9313dfeb37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Sat, 16 Nov 2024 11:37:47 -0800
Subject: [PATCH 08/88] libdeltachat: use fetchCargoVendor

---
 pkgs/by-name/de/deltachat-repl/package.nix     |  2 +-
 .../de/deltachat-rpc-server/package.nix        |  2 +-
 pkgs/by-name/li/libdeltachat/package.nix       | 18 ++++++------------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/de/deltachat-repl/package.nix b/pkgs/by-name/de/deltachat-repl/package.nix
index eedda8a397aff..2cf3bc5f42cca 100644
--- a/pkgs/by-name/de/deltachat-repl/package.nix
+++ b/pkgs/by-name/de/deltachat-repl/package.nix
@@ -6,7 +6,7 @@
 rustPlatform.buildRustPackage {
   pname = "deltachat-repl";
 
-  inherit (libdeltachat) version src cargoLock buildInputs;
+  inherit (libdeltachat) version src cargoDeps buildInputs;
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/de/deltachat-rpc-server/package.nix b/pkgs/by-name/de/deltachat-rpc-server/package.nix
index 1e1e95796771c..7dfd75ef8f661 100644
--- a/pkgs/by-name/de/deltachat-rpc-server/package.nix
+++ b/pkgs/by-name/de/deltachat-rpc-server/package.nix
@@ -6,7 +6,7 @@
 rustPlatform.buildRustPackage {
   pname = "deltachat-rpc-server";
 
-  inherit (libdeltachat) version src cargoLock buildInputs;
+  inherit (libdeltachat) version src cargoDeps buildInputs;
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index a5df231b86577..c8f40db5b6600 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -18,16 +18,7 @@
 , libiconv
 }:
 
-let
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "email-0.0.20" = "sha256-rV4Uzqt2Qdrfi5Ti1r+Si1c2iW1kKyWLwOgLkQ5JGGw=";
-      "encoded-words-0.2.0" = "sha256-KK9st0hLFh4dsrnLd6D8lC6pRFFs8W+WpZSGMGJcosk=";
-      "lettre-0.9.2" = "sha256-+hU1cFacyyeC9UGVBpS14BWlJjHy90i/3ynMkKAzclk=";
-    };
-  };
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "libdeltachat";
   version = "1.148.7";
 
@@ -42,7 +33,11 @@ in stdenv.mkDerivation rec {
     ./no-static-lib.patch
   ];
 
-  cargoDeps = rustPlatform.importCargoLock cargoLock;
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    pname = "deltachat-core-rust";
+    inherit version src;
+    hash = "sha256-eDj8DIvvWWj+tfHuzR35WXlKY5klGxW+MixdN++vugk=";
+  };
 
   nativeBuildInputs = [
     cmake
@@ -78,7 +73,6 @@ in stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    inherit cargoLock;
     tests = {
       inherit deltachat-desktop deltachat-repl deltachat-rpc-server;
       python = python3.pkgs.deltachat;

From a37d2451bc5922a908021bedd5950a94fd98d5f8 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Tue, 19 Nov 2024 06:12:30 +0100
Subject: [PATCH 09/88] fossil: 2.24 -> 2.25

- remove tclPackages.tcllib from nativeBuildInputs
  to disable the failing tests.
---
 .../version-management/fossil/default.nix     | 28 ++-----------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index 77658b58f2603..8d470d3f852f7 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -3,7 +3,6 @@
 , tcl
 , libiconv
 , fetchurl
-, fetchpatch
 , buildPackages
 , zlib
 , openssl
@@ -18,17 +17,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fossil";
-  version = "2.24";
+  version = "2.25";
 
   src = fetchurl {
     url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz";
-    hash = "sha256-lc08F2g1vrm4lwdvpYFx/jCwspH2OHu1R0nvvfqWL0w=";
+    hash = "sha256-5O6ceBUold+yp13pET/5NB17Del1wDOzUQYLv0DS/KE=";
   };
 
   # required for build time tool `./tools/translate.c`
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
-  nativeBuildInputs = [ installShellFiles tcl tclPackages.tcllib ];
+  nativeBuildInputs = [ installShellFiles tcl ];
 
   buildInputs = [ zlib openssl readline which ed ]
     ++ lib.optional stdenv.hostPlatform.isDarwin libiconv
@@ -42,27 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optional (!withInternalSqlite) "--disable-internal-sqlite"
     ++ lib.optional withJson "--json";
 
-  patches = [
-    (fetchpatch {
-       url = "https://fossil-scm.org/home/vpatch?from=8be0372c10510437&to=5ad708085a90365f";
-       extraPrefix = "";
-       hash = "sha256-KxF40wiEY3R1RFM0/YOmdNiedQHzs+vyMXslnqLtqQ4=";
-       name = "fossil-disable-tests.patch";
-    })
-    (fetchpatch {
-       url = "https://fossil-scm.org/home/vpatch?from=fb4e90b662803e47&to=17c01c549e73c6b8";
-       extraPrefix = "";
-       hash = "sha256-b0JSDWEBTlLWFr5rO+g0biPzUfVsdeAw71DR7/WQKzU=";
-       name = "fossil-fix-json-test.patch";
-    })
-    (fetchpatch {
-       url = "https://fossil-scm.org/home/vpatch?from=5ad708085a90365f&to=fb4e90b662803e47";
-       extraPrefix = "";
-       hash = "sha256-bbWUrlhPxC/DQQDeC3gG0jGfxQ6F7YkxINqg3baf+j0=";
-       name = "fossil-comment-utf-tests.patch";
-    })
-  ];
-
   preBuild = ''
     export USER=nonexistent-but-specified-user
   '';

From b859583f0019e72477f3e0e9b61b9cf25529c755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 19 Nov 2024 15:42:18 -0800
Subject: [PATCH 10/88] nostui: use upstream lock file

---
 pkgs/by-name/no/nostui/Cargo.lock  | 3234 ----------------------------
 pkgs/by-name/no/nostui/package.nix |    2 -
 2 files changed, 3236 deletions(-)
 delete mode 100644 pkgs/by-name/no/nostui/Cargo.lock

diff --git a/pkgs/by-name/no/nostui/Cargo.lock b/pkgs/by-name/no/nostui/Cargo.lock
deleted file mode 100644
index aef6111a857e0..0000000000000
--- a/pkgs/by-name/no/nostui/Cargo.lock
+++ /dev/null
@@ -1,3234 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aead"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
-dependencies = [
- "crypto-common",
- "generic-array",
-]
-
-[[package]]
-name = "aes"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
-dependencies = [
- "cfg-if",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "allocator-api2"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
-
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
-[[package]]
-name = "android_system_properties"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "async-utility"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a349201d80b4aa18d17a34a182bdd7f8ddf845e9e57d2ea130a12e10ef1e3a47"
-dependencies = [
- "futures-util",
- "gloo-timers",
- "tokio",
- "wasm-bindgen-futures",
-]
-
-[[package]]
-name = "async-wsocket"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d253e375ea899cb131b92a474587e217634e7ea927c24d8098eecbcad0c5c97a"
-dependencies = [
- "async-utility",
- "futures-util",
- "thiserror",
- "tokio",
- "tokio-rustls 0.25.0",
- "tokio-socks",
- "tokio-tungstenite",
- "url",
- "wasm-ws",
- "webpki-roots 0.26.2",
-]
-
-[[package]]
-name = "async_io_stream"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c"
-dependencies = [
- "futures",
- "pharos",
- "rustc_version",
-]
-
-[[package]]
-name = "atomic-destructor"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4653a42bf04120a1d4e92452e006b4e3af4ab4afff8fb4af0f1bbb98418adf3e"
-dependencies = [
- "tracing",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "backtrace"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "base64ct"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
-
-[[package]]
-name = "bech32"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
-
-[[package]]
-name = "better-panic"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa9e1d11a268684cbd90ed36370d7577afb6c62d912ddff5c15fc34343e5036"
-dependencies = [
- "backtrace",
- "console",
-]
-
-[[package]]
-name = "bip39"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f"
-dependencies = [
- "bitcoin_hashes 0.11.0",
- "serde",
- "unicode-normalization",
-]
-
-[[package]]
-name = "bitcoin"
-version = "0.30.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1945a5048598e4189e239d3f809b19bdad4845c4b2ba400d304d2dcf26d2c462"
-dependencies = [
- "bech32",
- "bitcoin-private",
- "bitcoin_hashes 0.12.0",
- "hex_lit",
- "secp256k1",
- "serde",
-]
-
-[[package]]
-name = "bitcoin-private"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57"
-
-[[package]]
-name = "bitcoin_hashes"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4"
-
-[[package]]
-name = "bitcoin_hashes"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501"
-dependencies = [
- "bitcoin-private",
- "serde",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "block-padding"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
-
-[[package]]
-name = "cassowary"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
-
-[[package]]
-name = "castaway"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc"
-dependencies = [
- "rustversion",
-]
-
-[[package]]
-name = "cbc"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.83"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "chacha20"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
-dependencies = [
- "cfg-if",
- "cipher",
- "cpufeatures",
-]
-
-[[package]]
-name = "chacha20poly1305"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
-dependencies = [
- "aead",
- "chacha20",
- "cipher",
- "poly1305",
- "zeroize",
-]
-
-[[package]]
-name = "chrono"
-version = "0.4.38"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
-dependencies = [
- "android-tzdata",
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "windows-targets 0.52.0",
-]
-
-[[package]]
-name = "cipher"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
-dependencies = [
- "crypto-common",
- "inout",
- "zeroize",
-]
-
-[[package]]
-name = "clap"
-version = "4.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
- "terminal_size",
- "unicase",
- "unicode-width",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
-
-[[package]]
-name = "color-eyre"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
-dependencies = [
- "backtrace",
- "color-spantrace",
- "eyre",
- "indenter",
- "once_cell",
- "owo-colors",
- "tracing-error",
-]
-
-[[package]]
-name = "color-spantrace"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
-dependencies = [
- "once_cell",
- "owo-colors",
- "tracing-core",
- "tracing-error",
-]
-
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
-[[package]]
-name = "compact_str"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f"
-dependencies = [
- "castaway",
- "cfg-if",
- "itoa",
- "ryu",
- "serde",
- "static_assertions",
-]
-
-[[package]]
-name = "config"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be"
-dependencies = [
- "async-trait",
- "convert_case",
- "json5",
- "lazy_static",
- "nom",
- "pathdiff",
- "ron",
- "rust-ini",
- "serde",
- "serde_json",
- "toml",
- "yaml-rust",
-]
-
-[[package]]
-name = "console"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "const-random"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a"
-dependencies = [
- "const-random-macro",
-]
-
-[[package]]
-name = "const-random-macro"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
-dependencies = [
- "getrandom",
- "once_cell",
- "tiny-keccak",
-]
-
-[[package]]
-name = "convert_case"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crossterm"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
-dependencies = [
- "bitflags 2.4.2",
- "crossterm_winapi",
- "futures-core",
- "libc",
- "mio",
- "parking_lot",
- "serde",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "crunchy"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "rand_core",
- "typenum",
-]
-
-[[package]]
-name = "data-encoding"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
-
-[[package]]
-name = "derive_deref"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcdbcee2d9941369faba772587a565f4f534e42cb8d17e5295871de730163b2b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "diff"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "directories"
-version = "5.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "dlv-list"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
-dependencies = [
- "const-random",
-]
-
-[[package]]
-name = "either"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
-
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "equivalent"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
-
-[[package]]
-name = "errno"
-version = "0.3.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "eyre"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
-[[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.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
-
-[[package]]
-name = "futures-task"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
-
-[[package]]
-name = "futures-timer"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-
-[[package]]
-name = "futures-util"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
-dependencies = [
- "cfg-if",
- "js-sys",
- "libc",
- "wasi",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "gimli"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-
-[[package]]
-name = "glob"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
-
-[[package]]
-name = "gloo-timers"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "h2"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http 0.2.11",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
-dependencies = [
- "ahash",
- "allocator-api2",
-]
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c62115964e08cb8039170eb33c1d0e2388a256930279edca206fff675f82c3"
-
-[[package]]
-name = "hex_lit"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
-
-[[package]]
-name = "hmac"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
-dependencies = [
- "digest",
-]
-
-[[package]]
-name = "http"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-dependencies = [
- "bytes",
- "http 0.2.11",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "human-panic"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c5d0e9120f6bca6120d142c7ede1ba376dd6bf276d69dd3dbe6cbeb7824179"
-dependencies = [
- "anstream",
- "anstyle",
- "backtrace",
- "os_info",
- "serde",
- "serde_derive",
- "toml",
- "uuid",
-]
-
-[[package]]
-name = "hyper"
-version = "0.14.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http 0.2.11",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
-dependencies = [
- "futures-util",
- "http 0.2.11",
- "hyper",
- "rustls 0.21.11",
- "tokio",
- "tokio-rustls 0.24.1",
-]
-
-[[package]]
-name = "iana-time-zone"
-version = "0.1.60"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
-dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "wasm-bindgen",
- "windows-core",
-]
-
-[[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "idna"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indenter"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
-
-[[package]]
-name = "indexmap"
-version = "2.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
-dependencies = [
- "equivalent",
- "hashbrown 0.14.3",
-]
-
-[[package]]
-name = "inout"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
-dependencies = [
- "block-padding",
- "generic-array",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
-
-[[package]]
-name = "js-sys"
-version = "0.3.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "json5"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96b0db21af676c1ce64250b5f40f3ce2cf27e4e47cb91ed91eb6fe9350b430c1"
-dependencies = [
- "pest",
- "pest_derive",
- "serde",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "libc"
-version = "0.2.155"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-
-[[package]]
-name = "libredox"
-version = "0.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
-dependencies = [
- "bitflags 2.4.2",
- "libc",
- "redox_syscall",
-]
-
-[[package]]
-name = "linked-hash-map"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
-
-[[package]]
-name = "lnurl-pay"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b628658116d331c9567f6cb22415d726125ff6e328d1fb1b422b1b58afeaec21"
-dependencies = [
- "bech32",
- "reqwest",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
-
-[[package]]
-name = "lru"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22"
-dependencies = [
- "hashbrown 0.14.3",
-]
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
-dependencies = [
- "libc",
- "log",
- "wasi",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "negentropy"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e664971378a3987224f7a0e10059782035e89899ae403718ee07de85bec42afe"
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "nostr"
-version = "0.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25e4e34578e8cc2b4050c6224a0c422b23ba1e61f2602b4e320c221ac3cbbc2e"
-dependencies = [
- "aes",
- "base64",
- "bip39",
- "bitcoin",
- "cbc",
- "chacha20",
- "chacha20poly1305",
- "getrandom",
- "instant",
- "js-sys",
- "negentropy",
- "once_cell",
- "reqwest",
- "scrypt",
- "serde",
- "serde_json",
- "tracing",
- "unicode-normalization",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "nostr-database"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e15ab55f96ea5e560af0c75f1d942b1064266d443d11b2afbe51ca9ad78a018"
-dependencies = [
- "async-trait",
- "lru",
- "nostr",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "nostr-relay-pool"
-version = "0.29.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8efc437bcf8c433887a9897dfb6f99914170f656a2a66398e737b3050c2aa34"
-dependencies = [
- "async-utility",
- "async-wsocket",
- "atomic-destructor",
- "nostr",
- "nostr-database",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "nostr-sdk"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81ed0ab9cbc3b20d3dba99337f2e0739f052ebe32133d690e212022a06a22044"
-dependencies = [
- "async-utility",
- "lnurl-pay",
- "nostr",
- "nostr-database",
- "nostr-relay-pool",
- "nostr-signer",
- "nostr-zapper",
- "nwc",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "nostr-signer"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "307bdc7c26887d7e65632e66872989a19892dfe9f2c6dbd9a1d3f959c5c524d5"
-dependencies = [
- "async-utility",
- "nostr",
- "nostr-relay-pool",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "nostr-zapper"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "061d5eb00b430747a984ea9e41cd82c849832151b4263d8230c9c220dc2c62f8"
-dependencies = [
- "async-trait",
- "nostr",
- "thiserror",
-]
-
-[[package]]
-name = "nostui"
-version = "0.1.0"
-dependencies = [
- "better-panic",
- "chrono",
- "clap",
- "color-eyre",
- "config",
- "crossterm",
- "derive_deref",
- "directories",
- "futures",
- "human-panic",
- "json5",
- "lazy_static",
- "libc",
- "log",
- "nostr-sdk",
- "pretty_assertions",
- "ratatui",
- "regex",
- "rstest",
- "serde",
- "serde_json",
- "signal-hook",
- "sorted-vec",
- "strip-ansi-escapes",
- "strum",
- "thousands",
- "tokio",
- "tokio-util",
- "tracing",
- "tracing-error",
- "tracing-subscriber",
- "tui-textarea",
- "tui-widget-list",
- "unicode-width",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "nwc"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1894ffe54a1e5adf8dbb22b5a290c0748ec4a88aa07fa69c4359010edea49ed"
-dependencies = [
- "async-utility",
- "nostr",
- "nostr-relay-pool",
- "nostr-zapper",
- "thiserror",
- "tracing",
-]
-
-[[package]]
-name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
-
-[[package]]
-name = "opaque-debug"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
-
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
-[[package]]
-name = "ordered-multimap"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e"
-dependencies = [
- "dlv-list",
- "hashbrown 0.13.2",
-]
-
-[[package]]
-name = "os_info"
-version = "3.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e"
-dependencies = [
- "log",
- "serde",
- "winapi",
-]
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "owo-colors"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
-
-[[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.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "password-hash"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
-dependencies = [
- "base64ct",
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
-
-[[package]]
-name = "pathdiff"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
-
-[[package]]
-name = "pbkdf2"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
-dependencies = [
- "digest",
- "hmac",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-
-[[package]]
-name = "pest"
-version = "2.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219c0dcc30b6a27553f9cc242972b67f75b60eb0db71f0b5462f38b058c41546"
-dependencies = [
- "memchr",
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e1288dbd7786462961e69bfd4df7848c1e37e8b74303dbdab82c3a9cdd2809"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0934d6907f148c22a3acbda520c7eed243ad7487a30f51f6ce52b58b7077a8a"
-dependencies = [
- "once_cell",
- "pest",
- "sha2",
-]
-
-[[package]]
-name = "pharos"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414"
-dependencies = [
- "futures",
- "rustc_version",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "poly1305"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
-dependencies = [
- "cpufeatures",
- "opaque-debug",
- "universal-hash",
-]
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "pretty_assertions"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66"
-dependencies = [
- "diff",
- "yansi",
-]
-
-[[package]]
-name = "proc-macro-crate"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
-dependencies = [
- "toml_edit 0.21.1",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.78"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
-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.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "ratatui"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef"
-dependencies = [
- "bitflags 2.4.2",
- "cassowary",
- "compact_str",
- "crossterm",
- "itertools",
- "lru",
- "paste",
- "serde",
- "stability",
- "strum",
- "unicode-segmentation",
- "unicode-truncate",
- "unicode-width",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4"
-dependencies = [
- "getrandom",
- "libredox",
- "thiserror",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.4.5",
- "regex-syntax 0.8.2",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.8.2",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-
-[[package]]
-name = "relative-path"
-version = "1.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e898588f33fdd5b9420719948f9f2a32c922a246964576f71ba7f24f80610fbc"
-
-[[package]]
-name = "reqwest"
-version = "0.11.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251"
-dependencies = [
- "base64",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http 0.2.11",
- "http-body",
- "hyper",
- "hyper-rustls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls 0.21.11",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "sync_wrapper",
- "system-configuration",
- "tokio",
- "tokio-rustls 0.24.1",
- "tokio-socks",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots 0.25.4",
- "winreg",
-]
-
-[[package]]
-name = "ring"
-version = "0.17.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
-dependencies = [
- "cc",
- "getrandom",
- "libc",
- "spin",
- "untrusted",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "ron"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
-dependencies = [
- "base64",
- "bitflags 2.4.2",
- "serde",
- "serde_derive",
-]
-
-[[package]]
-name = "rstest"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682"
-dependencies = [
- "futures",
- "futures-timer",
- "rstest_macros",
- "rustc_version",
-]
-
-[[package]]
-name = "rstest_macros"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d"
-dependencies = [
- "cfg-if",
- "glob",
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "regex",
- "relative-path",
- "rustc_version",
- "syn 2.0.48",
- "unicode-ident",
-]
-
-[[package]]
-name = "rust-ini"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091"
-dependencies = [
- "cfg-if",
- "ordered-multimap",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
-[[package]]
-name = "rustc_version"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
-dependencies = [
- "semver",
-]
-
-[[package]]
-name = "rustix"
-version = "0.38.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
-dependencies = [
- "bitflags 2.4.2",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "rustls"
-version = "0.21.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4"
-dependencies = [
- "log",
- "ring",
- "rustls-webpki 0.101.7",
- "sct",
-]
-
-[[package]]
-name = "rustls"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-dependencies = [
- "log",
- "ring",
- "rustls-pki-types",
- "rustls-webpki 0.102.4",
- "subtle",
- "zeroize",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-dependencies = [
- "base64",
-]
-
-[[package]]
-name = "rustls-pki-types"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
-
-[[package]]
-name = "rustls-webpki"
-version = "0.101.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.102.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff448f7e92e913c4b7d4c6d8e4540a1724b319b4152b8aef6d4cf8339712b33e"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
-[[package]]
-name = "rustversion"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
-
-[[package]]
-name = "ryu"
-version = "1.0.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
-
-[[package]]
-name = "salsa20"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
-dependencies = [
- "cipher",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "scrypt"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
-dependencies = [
- "password-hash",
- "pbkdf2",
- "salsa20",
- "sha2",
-]
-
-[[package]]
-name = "sct"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "secp256k1"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
-dependencies = [
- "bitcoin_hashes 0.12.0",
- "rand",
- "secp256k1-sys",
- "serde",
-]
-
-[[package]]
-name = "secp256k1-sys"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "semver"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0"
-
-[[package]]
-name = "send_wrapper"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
-
-[[package]]
-name = "serde"
-version = "1.0.204"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.204"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.120"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
-dependencies = [
- "indexmap",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_spanned"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
-dependencies = [
- "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",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha1"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "signal-hook"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
-dependencies = [
- "libc",
- "mio",
- "signal-hook",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
-
-[[package]]
-name = "socket2"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
-dependencies = [
- "libc",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "sorted-vec"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6734caf0b6f51addd5eeacca12fb39b2c6c14e8d4f3ac42f3a78955c0467458"
-
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-
-[[package]]
-name = "stability"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a"
-dependencies = [
- "quote",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-
-[[package]]
-name = "strip-ansi-escapes"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ff8ef943b384c414f54aefa961dd2bd853add74ec75e7ac74cf91dba62bcfa"
-dependencies = [
- "vte",
-]
-
-[[package]]
-name = "strsim"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
-
-[[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-dependencies = [
- "strum_macros",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "subtle"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.48"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "terminal_size"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
-dependencies = [
- "rustix",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "thousands"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820"
-
-[[package]]
-name = "thread_local"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tiny-keccak"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
-dependencies = [
- "crunchy",
-]
-
-[[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.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "tokio"
-version = "1.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
-dependencies = [
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "num_cpus",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls 0.21.11",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
-dependencies = [
- "rustls 0.22.4",
- "rustls-pki-types",
- "tokio",
-]
-
-[[package]]
-name = "tokio-socks"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0"
-dependencies = [
- "either",
- "futures-util",
- "thiserror",
- "tokio",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38"
-dependencies = [
- "futures-util",
- "log",
- "rustls 0.22.4",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls 0.25.0",
- "tungstenite",
- "webpki-roots 0.26.2",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "toml"
-version = "0.8.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.22.4",
-]
-
-[[package]]
-name = "toml_datetime"
-version = "0.6.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-dependencies = [
- "indexmap",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c9ffdf896f8daaabf9b66ba8e77ea1ed5ed0f72821b398aba62352e95062951"
-dependencies = [
- "indexmap",
- "serde",
- "serde_spanned",
- "toml_datetime",
- "winnow",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
-dependencies = [
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-error"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e"
-dependencies = [
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
-dependencies = [
- "log",
- "once_cell",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "serde",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
-[[package]]
-name = "tui-textarea"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e38ced1f941a9cfc923fbf2fe6858443c42cc5220bfd35bdd3648371e7bd8e"
-dependencies = [
- "crossterm",
- "ratatui",
- "unicode-width",
-]
-
-[[package]]
-name = "tui-widget-list"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a872e33bd14ffe44e0332bab251ce58846e3a9a9d6e4a6929ce8f7f7d7d137d6"
-dependencies = [
- "ratatui",
-]
-
-[[package]]
-name = "tungstenite"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1"
-dependencies = [
- "byteorder",
- "bytes",
- "data-encoding",
- "http 1.1.0",
- "httparse",
- "log",
- "rand",
- "rustls 0.22.4",
- "rustls-pki-types",
- "sha1",
- "thiserror",
- "url",
- "utf-8",
-]
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
-
-[[package]]
-name = "unicase"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
-
-[[package]]
-name = "unicode-truncate"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5fbabedabe362c618c714dbefda9927b5afc8e2a8102f47f081089a9019226"
-dependencies = [
- "itertools",
- "unicode-width",
-]
-
-[[package]]
-name = "unicode-width"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
-
-[[package]]
-name = "universal-hash"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
-dependencies = [
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "untrusted"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
-
-[[package]]
-name = "url"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
- "serde",
-]
-
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
-[[package]]
-name = "uuid"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "vte"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5022b5fbf9407086c180e9557be968742d839e68346af7792b8592489732197"
-dependencies = [
- "utf8parse",
- "vte_generate_state_changes",
-]
-
-[[package]]
-name = "vte_generate_state_changes"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
-dependencies = [
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[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.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn 2.0.48",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.41"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.48",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.91"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838"
-
-[[package]]
-name = "wasm-ws"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5b3a482e27ff54809c0848629d9033179705c5ea2f58e26cf45dc77c34c4984"
-dependencies = [
- "async_io_stream",
- "futures",
- "js-sys",
- "pharos",
- "send_wrapper",
- "thiserror",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.25.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
-
-[[package]]
-name = "webpki-roots"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3"
-dependencies = [
- "rustls-pki-types",
-]
-
-[[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-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[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-core"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
-dependencies = [
- "windows-targets 0.52.0",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets 0.52.0",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
-dependencies = [
- "windows_aarch64_gnullvm 0.48.5",
- "windows_aarch64_msvc 0.48.5",
- "windows_i686_gnu 0.48.5",
- "windows_i686_msvc 0.48.5",
- "windows_x86_64_gnu 0.48.5",
- "windows_x86_64_gnullvm 0.48.5",
- "windows_x86_64_msvc 0.48.5",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
-
-[[package]]
-name = "winnow"
-version = "0.5.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5389a154b01683d28c77f8f68f49dea75f0a4da32557a58f68ee51ebba472d29"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "yaml-rust"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-dependencies = [
- "linked-hash-map",
-]
-
-[[package]]
-name = "yansi"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-
-[[package]]
-name = "zerocopy"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.7.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.48",
-]
-
-[[package]]
-name = "zeroize"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/pkgs/by-name/no/nostui/package.nix b/pkgs/by-name/no/nostui/package.nix
index 9c4f32004849c..364d5154007e1 100644
--- a/pkgs/by-name/no/nostui/package.nix
+++ b/pkgs/by-name/no/nostui/package.nix
@@ -30,8 +30,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-8ciA1FoGdnU+GWRcYJc8zU2FpUgGwTZSZynvAi1luYo=";
 
-  cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
-
   meta = with lib; {
     homepage = "https://github.com/akiomik/nostui";
     description = "TUI client for Nostr";

From 68abfed4469dd0da9a060a69fbf0a80e5a94cdec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Wed, 20 Nov 2024 10:37:19 +0000
Subject: [PATCH 11/88] ferdium: 6.7.7 -> 7.0.0

---
 .../networking/instant-messengers/ferdium/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/ferdium/default.nix b/pkgs/applications/networking/instant-messengers/ferdium/default.nix
index f42b519f26a43..e67a46cdf5028 100644
--- a/pkgs/applications/networking/instant-messengers/ferdium/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdium/default.nix
@@ -6,14 +6,14 @@ let
     aarch64-linux = "arm64";
   }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   hash = {
-    amd64-linux_hash = "sha256-5OW10sABNNYQNUgorM634j5oiBhJJby1ymH6UcmknRg=";
-    arm64-linux_hash = "sha256-zbO/8RU2SDV1h4gKdxKbvNFFSj6p3ybmPkpKsrup4No=";
+    amd64-linux_hash = "sha256-Ey2FhekQVSYB0ki4U3HyuKs/URgtZMCl41jkPsZMNrQ=";
+    arm64-linux_hash = "sha256-oiimMFwwkBOwqlCSFoGQSYHsDpcjTQingyuBkYz8fvA=";
   }."${arch}-linux_hash";
 in
 mkFranzDerivation rec {
   pname = "ferdium";
   name = "Ferdium";
-  version = "6.7.7";
+  version = "7.0.0";
   src = fetchurl {
     url = "https://github.com/ferdium/ferdium-app/releases/download/v${version}/Ferdium-linux-${version}-${arch}.deb";
     inherit hash;

From 7a8b3506edceed433a1aac74e24fe53772f735df Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 31 Aug 2024 00:58:49 +0200
Subject: [PATCH 12/88] snis: update to the latest commit

---
 pkgs/by-name/sn/snis/package.nix | 91 ++++++++++++++++++--------------
 1 file changed, 50 insertions(+), 41 deletions(-)

diff --git a/pkgs/by-name/sn/snis/package.nix b/pkgs/by-name/sn/snis/package.nix
index 2b1d168467cfb..cf81e96dde9ee 100644
--- a/pkgs/by-name/sn/snis/package.nix
+++ b/pkgs/by-name/sn/snis/package.nix
@@ -1,43 +1,44 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, pkg-config
-, coreutils
-, portaudio
-, libbsd
-, libpng
-, libvorbis
-, SDL2
-, makeWrapper
-, lua5_2
-, glew
-, openssl
-, picotts
-, alsa-utils
-, espeak-classic
-, sox
-, libopus
-, openscad
-, libxcrypt
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  coreutils,
+  portaudio,
+  libbsd,
+  libpng,
+  libvorbis,
+  SDL2,
+  makeWrapper,
+  lua5_2,
+  glew,
+  openssl,
+  picotts,
+  alsa-utils,
+  espeak-classic,
+  sox,
+  libopus,
+  openscad,
+  libxcrypt-legacy,
 }:
 
 stdenv.mkDerivation {
   pname = "snis_launcher";
-  version = "unstable-2021-10-17";
+  version = "unstable-2024-08-02";
 
   src = fetchFromGitHub {
     owner = "smcameron";
     repo = "space-nerds-in-space";
-    rev = "e70d3c63e33c940feb53c8d818ce2d8ea2aadf00";
-    sha256 = "sha256-HVCb1iFn7GWNpedtFCgLyd0It8s4PEmUwDfb8ap1TDc=";
+    rev = "1dadfca31513561cf95f1229af34341bd1a1bb2a";
+    sha256 = "sha256-Qi4lbq1rsayMdRWMAF44K2DNtlZxNUyjnO6kXCW5QhA=";
   };
 
+  enableParallelBuilding = true;
+
   postPatch = ''
     substituteInPlace Makefile \
       --replace "OPUSARCHIVE=libopus.a" "OPUSARCHIVE=" \
       --replace "-I./opus-1.3.1/include" "-I${libopus.dev}/include/opus"
-    substituteInPlace snis_launcher \
-      --replace "PREFIX=." "PREFIX=$out"
     substituteInPlace snis_text_to_speech.sh \
       --replace "pico2wave" "${sox}/bin/pico2wave" \
       --replace "espeak" "${espeak-classic}/bin/espeak" \
@@ -46,23 +47,31 @@ stdenv.mkDerivation {
       --replace "/bin/rm" "${coreutils}/bin/rm"
   '';
 
-  nativeBuildInputs = [ pkg-config openscad makeWrapper ];
-  buildInputs = [ coreutils portaudio libbsd libpng libvorbis SDL2 lua5_2 glew openssl picotts sox alsa-utils libopus libxcrypt ];
+  nativeBuildInputs = [
+    pkg-config
+    openscad
+    makeWrapper
+  ];
 
-  postBuild = ''
-    make models -j$NIX_BUILD_CORES
-  '';
+  buildInputs = [
+    coreutils
+    portaudio
+    libbsd
+    libpng
+    libvorbis
+    SDL2
+    lua5_2
+    glew
+    openssl
+    picotts
+    sox
+    alsa-utils
+    libopus
+    libxcrypt-legacy
+  ];
 
-  installPhase = ''
-    runHook preInstall
-    mkdir -p $out
-    cp -R share $out/share
-    cp -R bin $out/bin
-    cp snis_launcher $out/bin/
-    # without this, snis_client crashes on Wayland
-    wrapProgram $out/bin/snis_client --set SDL_VIDEODRIVER x11
-    runHook postInstall
-  '';
+  makeFlags = [ "PREFIX=$(out)" ];
+  buildTargets = [ "models" ];
 
   meta = with lib; {
     description = "Space Nerds In Space, a multi-player spaceship bridge simulator";

From 1b7b747e03104f2d22f71dd567a9aab2b8877c98 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Wed, 20 Nov 2024 21:30:23 +0100
Subject: [PATCH 13/88] snis: add assets

---
 pkgs/by-name/sn/snis-assets/manifest.txt   | 810 +++++++++++++++++++++
 pkgs/by-name/sn/snis-assets/package.nix    |  55 ++
 pkgs/by-name/sn/snis-unwrapped/package.nix |  86 +++
 pkgs/by-name/sn/snis/package.nix           |  91 +--
 4 files changed, 971 insertions(+), 71 deletions(-)
 create mode 100644 pkgs/by-name/sn/snis-assets/manifest.txt
 create mode 100644 pkgs/by-name/sn/snis-assets/package.nix
 create mode 100644 pkgs/by-name/sn/snis-unwrapped/package.nix

diff --git a/pkgs/by-name/sn/snis-assets/manifest.txt b/pkgs/by-name/sn/snis-assets/manifest.txt
new file mode 100644
index 0000000000000..03ea9c02d74bc
--- /dev/null
+++ b/pkgs/by-name/sn/snis-assets/manifest.txt
@@ -0,0 +1,810 @@
+sjOw4TTK5Z3VR3TRlKn2ZXkqYxmKgrmTet5/0Mptji4=  share/snis/replacement-files/asteroid3-1.png
+GJUaKbdAiIUrPOGbKEwL/Tpl5e1J3aIxwdMNrO/4oKE=  share/snis/replacement-files/cargocontainer.png
+5T0UY00RwSeimTTStaZhD5ZCqrGS2u5tdem6+pmo/34=  share/snis/replacement-files/asteroid3-3.png
+p/FXO9QCmsACU6aUU9glVBCJES1LMKhYplDBnkwrz/A=  share/snis/replacement-files/default-assets.txt
+aL9xwQM63RIrO67fLHnbxBhQhd3suKmUUiNzGYSpdjw=  share/snis/replacement-files/asteroid3-5.png
+HH53P+DTtbVpDlQdjwqdZ5pJnZadPl5KHpUD78Sc7J4=  share/snis/replacement-files/Attribution.txt
+uNx3bqm/YO+/g9Ry4FmUEIvvhXOJoX2C4EjunL694Dg=  share/snis/replacement-files/asteroid3-2.png
+NDndMpnUcvBeD/7WX3CjyqB++7lCnuRpghXQOBWM3eY=  share/snis/replacement-files/asteroid3-4.png
+j5TX9zHhyprGk5yVjEl2D3vBL/HOnwlLEt5PpLh9bOs=  share/snis/replacement-files/asteroid3-0.png
+le/Q9RBlNupL/FpO+DYDKuzH5LjSgKcUU7q46MGDF00=  share/snis/replacement_assets.txt
+C71kMWifWo8QtMvylnc+T0A9EPnIGik5Ir86IUziF6M=  share/snis/solarsystems/tau-scorpii/image2.png
+B5zg4F2MLmLUJcvemLbRq9q6QuPj5lFHJD5Srmh2olA=  share/snis/solarsystems/tau-scorpii/rustywall0.png
++DdaRv3zMir6szFMjdrkW7A8DtjXtKJxchqhl1XK6B8=  share/snis/solarsystems/tau-scorpii/rocky1-rgb-3.png
+mre/vZjS4xPOk8JZ9zAOtDxaBvVpAgURjlx+eTsfQOU=  share/snis/solarsystems/tau-scorpii/image1.png
+X3UMV+tEqus+6Og289IJl9g4zxqnYIsOj8/SX9bfNeE=  share/snis/solarsystems/tau-scorpii/erth-2.png
+LAgRRKkMZ7/6+6ePVNBwbwaqqXU0DPBCUYPPrTwhbXw=  share/snis/solarsystems/tau-scorpii/image4.png
+ogJqbuhH9cHjRVCAn5m0mCJncrw/BZoSZfcfqgpXsCc=  share/snis/solarsystems/tau-scorpii/sun.png
+T3Dp6T0Qq6rTVXN4grHLpVfae4o1RP/x+GUhZP+WCqI=  share/snis/solarsystems/tau-scorpii/bluish2.png
++f71U9Om+hi3HzBPvyyScaVU+gRNLc6oFfUim0rydSI=  share/snis/solarsystems/tau-scorpii/rocky1-rgb-1.png
+HahmNn6qdGxfp5kx/7FqVmSlUaJv1aH0/L0yZvRE0m4=  share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-1.png
+8bexz5SuTFse8sUAO7viJTcNzvcf7NZyPoRiMdQY++8=  share/snis/solarsystems/tau-scorpii/gasgiant-d-1.png
+QzIjiiEyfsAuaU8NEzUu8TVLM6sgSqBwQXtSxSi1BKE=  share/snis/solarsystems/tau-scorpii/gasgiant-d-0.png
+4M9pCloqsUg0ZaKdq1K4jwZcs17I5LZ3CwSK0mpbTJ4=  share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-3.png
+kHxbIuXVUVIjHsUFvRGwtwZxdksledJs2RifOlHotQg=  share/snis/solarsystems/tau-scorpii/jungle3.png
+zhxkaO+fpav5pYHvBziCG7KJqGnbxxijmoBltrFYu0M=  share/snis/solarsystems/tau-scorpii/bluish5.png
+UKswAtwyu7LF+nnGPh4/5RiK04ZBl4Zvc9tLleVtGRU=  share/snis/solarsystems/tau-scorpii/rocky1-rgb-5.png
+vXcNeFnv9ci+aDJ5s9m1qX0ymT7CoGMVQ2EdsoJo7js=  share/snis/solarsystems/tau-scorpii/rustywall3.png
+/Yn5syDR7RHaa+B3jLUOw+9bUMwMB5mWyE/MtwjRrPI=  share/snis/solarsystems/tau-scorpii/erth-0.png
+cMqsnhf7ht9uBW9DgpHBM1910jGMR33QDeONwUXMAAM=  share/snis/solarsystems/tau-scorpii/rustywall1.png
+EXXYG5LvzUJoIlo7v3V1pLKqOT7ZouOPaBinVVaoM2w=  share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-5.png
+91gD8EcdcZU9KYyl+WyqmwmfzuCMp/wmF8+T+rHQlgg=  share/snis/solarsystems/tau-scorpii/bluish4.png
+lQANFKE3EukGDv90xIetNGtsxyEIRnk/g7b+O/A7vKc=  share/snis/solarsystems/tau-scorpii/jungle5.png
+QsbH7rMQzckt98ZTB/xw3C2qwcWiV1RAjyO+E3YW9pI=  share/snis/solarsystems/tau-scorpii/rocky1-rgb-4.png
+1SImVY09TWyqdBTbio6TsRJUsdva8+OMWIN9TjTLy5k=  share/snis/solarsystems/tau-scorpii/erth-4.png
+nlUGG6W5WGEO6FCqO0NA+4fa7lCi8S1KOSSiMqu/PWo=  share/snis/solarsystems/tau-scorpii/Attribution.txt
+0WQEbu5yLerSMJNV8po0Igt6XDGpu6dO/5VXl005iqk=  share/snis/solarsystems/tau-scorpii/rocky1-rgb-2.png
+4oJGgGCmiLww20eTPSx+Efs3Y+usttkH7ZrRDMKEVs8=  share/snis/solarsystems/tau-scorpii/rocky1-rgb-0.png
+vzHOkng55CIlKP6iUwSMMEI4p3wmEHCfsBSf4X70T0s=  share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-0.png
+Zx4sBxQpSwrhklTHOnamnGJJYU3W8C9Gd+3pOg0kC9g=  share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-4.png
+3VD8Fn5HXcIK9rNWRS7sSjhFKZIl62oJNvyPUn+uTXs=  share/snis/solarsystems/tau-scorpii/gasgiant-d-2.png
+dxm4SULnf3udF+54Q9SUBkobp/cVO+6AlBGe16RH3oA=  share/snis/solarsystems/tau-scorpii/bluish0.png
+2ZLk/7xX4fzs3GmTaSub8YubTyy1x6jCrHG+Tj83JSc=  share/snis/solarsystems/tau-scorpii/bluish3.png
+moudMzqKg+zKA2kFUP4sgbW43jsW3m70ikGFXl2Nh9I=  share/snis/solarsystems/tau-scorpii/rustywall4.png
+Sns8FlObo7AEqOU3f2WUxtx6c691qgv+v2jZnJTww2I=  share/snis/solarsystems/tau-scorpii/assets.txt
+UbYREhAf2Row2PXQPfDI77fTVqj34AeAzBZ9AU84QLc=  share/snis/solarsystems/tau-scorpii/bluish1.png
+i4ZCxzAAIeolg/v2x7eseNeMYuFYJZHDjJjl4XFu+wg=  share/snis/solarsystems/tau-scorpii/erth-1.png
+LlFGwZkV2ti5saZ8l67+30QhVxGsV8lvS+DVKpEsTRk=  share/snis/solarsystems/tau-scorpii/erth-5.png
+23VPjuRbYu6J0CbP04pmohsMVhl2e6NFhy5lPjhYadc=  share/snis/solarsystems/tau-scorpii/image5.png
+c3fiFEoGvidQeRnAblTUhwB+gyaRZaXwIvsloQ4nqh0=  share/snis/solarsystems/tau-scorpii/gasgiant-d-5.png
+npIg5gbJpvvVKbyl6oGPZShGAEbQ8mmM3thrzalEIKk=  share/snis/solarsystems/tau-scorpii/erth-3.png
+y4ZlyuY7UylLSYB2JK3YZuXoWArtCf5s2cZb4iniu3A=  share/snis/solarsystems/tau-scorpii/rocky1-normalmap-rgb-2.png
+CSMsoNJaLM7DwgyftUzzt+PDzJxQp12GymSdr6dPSWE=  share/snis/solarsystems/tau-scorpii/rustywall2.png
+OFdhugrs+lk0hAcMe5rrUMIPpJgDVg1LiNCy209FrTc=  share/snis/solarsystems/tau-scorpii/jungle2.png
+gdebjVi9iZJVz/moavujdR2P4qpCI1ZpeVckiq/Zxzc=  share/snis/solarsystems/tau-scorpii/gasgiant-d-3.png
+Cgyv3cMNT/c9m/Fa6hM1X8U5Hc9apwAGJcGSZzI2rlo=  share/snis/solarsystems/tau-scorpii/jungle0.png
+Bd/juNW8ixHzrK1q4z+jRxxMOGxFEU2m8+a5j2tluL8=  share/snis/solarsystems/tau-scorpii/image3.png
+t0bgh90qvRbcJ7CF5Kh5Mu7fSVnlU6Tsv+GWn4l/HQE=  share/snis/solarsystems/tau-scorpii/rustywall5.png
+frLIT38RTxtmkPrpk4rFV/wBVQWSWWZaVVD38rC7QuA=  share/snis/solarsystems/tau-scorpii/image0.png
+WnBnha8YClNoGzwxY6dhLCEkESxxtcU+cGEW/IpI3r0=  share/snis/solarsystems/tau-scorpii/jungle4.png
+tgXWEUab+5QiqfNZtCt8ci7NZ9C3OR6vgorUDSg5oa0=  share/snis/solarsystems/tau-scorpii/gasgiant-d-4.png
+8XOmxpTiIZCCKFKnBah93kMLsdaztXZJ0QFr6IZxUJo=  share/snis/solarsystems/tau-scorpii/jungle1.png
+cjOxxQoY3ukMclMiGcVUc9Pfd/IDOrX0EMAbuPveqgc=  share/snis/solarsystems/karado/maurz1.png
+JA7DukfwN7EJT7rQ3I3cJUlvQyEjgHhHOHdRqeqZUfw=  share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-2.png
+w9HP4HpW3lWlNR5+N1UeeC8PwhycteQs7EJX6cp5fek=  share/snis/solarsystems/karado/ounii-normalmap-masked3.png
+ZBUhZKybhHW7GweOOQHRMW76T7jEZoDNF1U3i4B8lTU=  share/snis/solarsystems/karado/maurz3.png
+RinAAet1RTbqfBdQ30LQG4gOYsk8zhAuYhLkH7jjXtM=  share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-1.png
+PnZmAoT3W+uxcobndKiHkakNWLbF1Rac5mwGz9akwrA=  share/snis/solarsystems/karado/maurz-normalmap0.png
+RWThrArd3WTfh6cTEXM1FDY6EFzA5obEL/29fShvt4Y=  share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-0.png
+Y5DLC48a0E8uqQwfA/eGntMD6E1A+V9thYV5OPflkrU=  share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-1.png
+14iLpLU0s35gowiRjSACDCHwZKuDMqEt9wDHmqN9pJk=  share/snis/solarsystems/karado/sun.png
+yh1dkDIDuayS2SKotKB+1H3blC+F+/oA2tkWZFuXHDk=  share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-5.png
+2M1dHDNvDjELPngfdDsH1UeOVWjcM13vo6JFBuVrQkk=  share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-4.png
+yEFIDxnMm641GesZCRDqlF2zmaXUNeZ6FbbXzq7w+oo=  share/snis/solarsystems/karado/kolaron1.png
+GdlVdQ+gvvRw/0UgYVKcyvq8NNY5UYiSWNbtHpqkk5s=  share/snis/solarsystems/karado/skybox-4.png
+N5nykk1TRl0n5cmUaEzAJ8QNia9YS0YuuvxTlRuw+Bc=  share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-0.png
+Iv5GAs8X8J3EinXErg24YW1akOhBC8J6Me1xxK23/VU=  share/snis/solarsystems/karado/tounah-normalmap1.png
+bL6WHvF2rzB0Yiqhs8eYM1NWml0PHY/2trCbY2tvn5g=  share/snis/solarsystems/karado/ounii-with-clouds-0.png
+9lMDCFq6Pn12CBuv5WGjlyIuEsXY+/SVIOeBdziKewM=  share/snis/solarsystems/karado/tounah3.png
+BjBFiOIekiDH1unfKJZwnyh4FsKa7hyDK6+tPVDk0dA=  share/snis/solarsystems/karado/tounah-normalmap3.png
+DgXtZtj48sxP2gMfKQ6kuisBmiiQvaiW9b9nHo0cKUE=  share/snis/solarsystems/karado/skybox-0.png
+JR16aeqQ28v4sgBYYPZJ2JyYpXSQ9SUxTlRQjjmMYJY=  share/snis/solarsystems/karado/ounii-normalmap-masked0.png
+3plkE7cBhcS2onMeBrRomwK6xGubM4toGv+h6yAznNc=  share/snis/solarsystems/karado/norphi5.png
+eSxWcYTH3mz5L39oJuDJLry+Q8vHpF1HrqXDvRIumgk=  share/snis/solarsystems/karado/maurz5.png
+jyI/fdAeKFNCm4fJlTETwZG+4VyL+CRXGboyxZQYxSo=  share/snis/solarsystems/karado/norphi-normalmap4.png
+8w5uI8/KKVIGcPNWv1C+SwA4xfyorL7UwcNYOzznaYs=  share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-5.png
+u4lCbrVm3UnL8TvvnHgyMmqSwHdyA2BBSu4/Oas3KyE=  share/snis/solarsystems/karado/ounii-with-clouds-4.png
+sqyByb/XbSy65hWGpDWmmBEppzhYxJbPGFjz770thWI=  share/snis/solarsystems/karado/kolaron3.png
+HO+3JBz384geu4RyeJvvl/82n5au+Ntp7L8EmhgNdVw=  share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-3.png
+WhRN3Ef/NsoOBzRDeiEmv8EIK1FQ9dcUR9QA8x5FCGI=  share/snis/solarsystems/karado/kolaron4.png
+eoKlgavlafYSnuGi4dtQaz7czPt5zC6hHpTGZeMt80g=  share/snis/solarsystems/karado/maurz-normalmap3.png
+NpcnSI5gr1OMWYVit8qb4V94yhuF3bomy/5LCL7aXGQ=  share/snis/solarsystems/karado/maurz0.png
+OeazFTVT6nNiu3o1rvY+2sKMIZpImY/lfnq7oTCaYG4=  share/snis/solarsystems/karado/norphi4.png
+wUgdl8IKV7Tn6WdaCQGjh0F/uxH4oS4Sxuvo5Dsaqk4=  share/snis/solarsystems/karado/tounah1.png
+9CNWfsodxC8om8vUByFdjyJHo+lz/qDikcQrsYR/+Uo=  share/snis/solarsystems/karado/ounii-normalmap-masked1.png
+NvTkAOZ5qcG311dUEHUHpNbpLFXCtK1arN9D8bh2mSk=  share/snis/solarsystems/karado/kolaron5.png
+7dSfrm6Lgm4H9b1xc8H13S+EjhbmvZgdICLGKM/1zBQ=  share/snis/solarsystems/karado/kolaron0.png
+y5DauNIPTxnWOD+AHqjgJNVpOYVSjswKs6z2YRFuDBY=  share/snis/solarsystems/karado/skybox-2.png
+3oClYVJc1+e4evArG4ZOJiNuytxzEHSgLUmHrBPSKFA=  share/snis/solarsystems/karado/maurz-normalmap4.png
+JXn4j6ZQWXj3pPOq3yGY/uOvlLSbR0ZVVwNOvijPTpc=  share/snis/solarsystems/karado/maurz-normalmap5.png
+BzF/YVrzb7Rv94oBhLfmA7P3RWnnN5nzBvoi2QEf1sg=  share/snis/solarsystems/karado/skybox-3.png
+k64xflcXPLhOV7i9LvdZvSFbks/RAy+f7bsl9REfxCE=  share/snis/solarsystems/karado/ounii-with-clouds-2.png
+1y6lDCz+N2omPkZ2l1t+0q0J/w14//Z/Ewq7+G0mMdM=  share/snis/solarsystems/karado/ounii-with-clouds-5.png
+ldSkzeahDlNZnwlgxOmSs58RZ27lCzmvVQQJS5BXQdo=  share/snis/solarsystems/karado/tounah-normalmap0.png
+Uu8ZseislfkYfxqmPPSHuJ+mgyj7zdQ02EDKMKDIeVc=  share/snis/solarsystems/karado/skybox-1.png
+eSL0yROs572/a16mT790Q+xon9AZhjWEut/loTIMU18=  share/snis/solarsystems/karado/Attribution.txt
+d1CWAWEAIjxiXZTSnml7/bdNzV1OCSeie/+asy+DKk0=  share/snis/solarsystems/karado/ounii-normalmap-masked2.png
+AYc/uhxerl++taDUCZ836cbr17VKsSI3ShzIu9HsWqc=  share/snis/solarsystems/karado/norphi-normalmap5.png
+1vKjxAgNcuRKBZ5Tr94ICodqpXuZX/2cGy8Sx8yqGzc=  share/snis/solarsystems/karado/tounah4.png
+bA5NFdtGWTkY2CMoAYEkl54FyMy3Ft4J7iUvCB28RhI=  share/snis/solarsystems/karado/tounah0.png
+EDwWGkYcKyoGnXkOiAFAsDNjXG7vRV6VhC16dyHLqe0=  share/snis/solarsystems/karado/ounii-with-clouds-1.png
+WkJ6h3j78FSu39N2K+pTC2ISC3vdyqFbFLp8y7L534o=  share/snis/solarsystems/karado/skybox-5.png
+/479dJqdJZedoX/k3+dJo8diAnvJNORAZeiFPNrrJZg=  share/snis/solarsystems/karado/ounii-with-clouds-3.png
+GPcVRzOlVGciu+MpFu3qcDfr683gmIKXL63291IEAKs=  share/snis/solarsystems/karado/norphi-normalmap0.png
+OCzM7Omev6AzO+wO43/NBs6oWo97wwzuet3r4cs5j1Y=  share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-3.png
+bPyHQyescyDQfVyrqiQDqb5QDsRKA92lnrLbROs7J+8=  share/snis/solarsystems/karado/tounah2.png
+lXThLDuEbH3PzHv+gtEqTwpb0gTPVsoGBQKIUdMzA8Y=  share/snis/solarsystems/karado/norphi-normalmap1.png
+LDtnTIx/E71pDdc1PlzKDpFDdkxDZaQxYNw1+M1ZqhQ=  share/snis/solarsystems/karado/assets.txt
+nqN4db1OS5mMUOW89Y5qH7tx7NtsHEISq1B+SjJngg0=  share/snis/solarsystems/karado/norphi0.png
+NOdBbewc3kDH36OLSQzt5FK2hl6T+AtnAfMyR/gPRjk=  share/snis/solarsystems/karado/maurz-normalmap2.png
+0UcErE67TYJhPAm6EvueDe5AO6Jc8s/+Jty8reo8G7w=  share/snis/solarsystems/karado/maurz2.png
+feXt3aiJYDebd7sfijzkVQ++6mRqptxZv/P7oe8zS2I=  share/snis/solarsystems/karado/maurz-normalmap1.png
+Px46fgE4Da5qrxAdzLzBCMm7xmk46ULMUotU40JazL4=  share/snis/solarsystems/karado/norphi1.png
+LUWvUAS5XYhiLfWVKSpHaTAAuYdcctMXV2S7Y0bttHo=  share/snis/solarsystems/karado/norphi-normalmap2.png
+W8Du6C1jWmOM8EoIFBGvEmY33c7EPANCNhyCvcEkWv8=  share/snis/solarsystems/karado/kolaron2.png
+7r6POKa0wwzc8VNjzwOkQDQdl0zYN4+M60ygoESf2VE=  share/snis/solarsystems/karado/earthlike1-normalmap-masked-rgb-2.png
+LDHCSW/tkpI5cxqSi38ecuKJ2Yn1bGVJl7wClqyPIyY=  share/snis/solarsystems/karado/maurz4.png
+iaiMLBLN5XlLs1qiKnxmXvlF3XR5GSvIOqvC0U8Nw4I=  share/snis/solarsystems/karado/tounah-normalmap4.png
+kZLLzolKmFcy856LMgXzdKHvzZTParhtOP3XR2Cvuz8=  share/snis/solarsystems/karado/tounah-normalmap5.png
+JI9Ej0PyDTqNtvtaQwnWTBQiKujoY0cyk+UBgZEhE6Q=  share/snis/solarsystems/karado/norphi2.png
+9RvzLm1UA/kkoa0++cbfyaDh1OcFRwhc2tGzLQ9A8Aw=  share/snis/solarsystems/karado/ounii-normalmap-masked5.png
+99god8h1yAo8HY32bZXXIXrE7sbGWADBTV2U2Tj9ElY=  share/snis/solarsystems/karado/norphi3.png
+GHn/28itRbFZRWNrBn5fOe3w/t+2iXJSw1UME0NXDPI=  share/snis/solarsystems/karado/earthlike1-with-clouds-rgb-4.png
+XRFWZCP0hLkjXg+LNR6n7cffZDGGxhNfjAX2e5l9L20=  share/snis/solarsystems/karado/ounii-normalmap-masked4.png
+486du5aoVCgiJxrsmnqcoLekT1VHF19C8JZPSezZLzM=  share/snis/solarsystems/karado/norphi-normalmap3.png
+y9btB0QKqoHs4z+rDM7ujjyiA/3WTfa+K2RowRQSR1w=  share/snis/solarsystems/karado/tounah5.png
+0VGEbUJwf9bfJjB7G85qbC3wqPFjJ4NxXymu1+nX06M=  share/snis/solarsystems/karado/tounah-normalmap2.png
+pCJmzEWA/dF/F1i67N2VzQwPOkWigxKS54d+EVNRlwk=  share/snis/solarsystems/zolon/p32.png
+RWpBFnQCyuj1FGbA89t7b/XR433KyCxYue9WbLB8U0A=  share/snis/solarsystems/zolon/e1-normalmap5.png
+1CZnBW62bZTL0VonTUM6ToIMXQm7DpJQA/Lydmtk8Ek=  share/snis/solarsystems/zolon/p54.png
+1pHrVkyrCnKGOUzFmP1OyzUDAGLdyRDpIVBpCb886v4=  share/snis/solarsystems/zolon/p3-normalmap4.png
+ICmySzuzck56LI6lG8FmihWuI2eV/t38arZLlM1YV3s=  share/snis/solarsystems/zolon/p3-normalmap3.png
+NQxWQADuLmz0dn9tqeXVRj90qzlq+p4wF50PaCv4M8Q=  share/snis/solarsystems/zolon/p60.png
+QwNYP4iUGPZAD6UWn5mfPWYVkvJH+ObI2VGUEbt/AB8=  share/snis/solarsystems/zolon/e14.png
+qE7fCliK95DIOxtRklA3pXTxJdX1Jmzvk2bKyaUjPl8=  share/snis/solarsystems/zolon/p3-normalmap0.png
+orTtjzh9MBeNS7uPoEyKhXpBruTqeaHbq/VyjSQVOZ0=  share/snis/solarsystems/zolon/p22.png
+2A43kXfM6dUyeZFtLwzUxAlNJcdbEmX2Jtq+UQLhclQ=  share/snis/solarsystems/zolon/p013.png
+W2zOTkttEZMlyHowGmCcgjJGFZVUvjR9JJ0C98Glg2g=  share/snis/solarsystems/zolon/e13.png
+dHkumWSOWeJeXXaHq9h8kNG0l9sDfreWZSVYzJ2SbS8=  share/snis/solarsystems/zolon/e11.png
+AC2qXLc+ml1oNW6KmOeIZ8qSHgbK0Lk0jbXKU/U7sYU=  share/snis/solarsystems/zolon/e12.png
+2D+Rgrr1TUk7JrP5mdEw4XhQxQzgBrGCBF/20FFc9+c=  share/snis/solarsystems/zolon/p52.png
+3p/Uy1lb+I+lz7lB+b2Iicnxb0/mkgppVr3xjtroysM=  share/snis/solarsystems/zolon/e1-normalmap2.png
+tMc3wIiR4ula2Ouwbppgr+T082XkBBg6ak0bcOzgM9U=  share/snis/solarsystems/zolon/p62.png
+SCYTxGiq2VXG47tepRfyUvsUS+YSt1o90qH3Ugrnw9w=  share/snis/solarsystems/zolon/skybox2.png
+Y2b14W37pku1bO8YZyfRrsqYlwwJnC3FZWyeWknujW0=  share/snis/solarsystems/zolon/p30.png
+fcfUDI4Fhj+dFYE+oW8ktuysXWnP/2IAeYKNZwXteI0=  share/snis/solarsystems/zolon/p51.png
+bV9Lt6BjUUCoI8aCc7opbLJ6UgDVEbyTNQj200vbsAc=  share/snis/solarsystems/zolon/skybox4.png
+etW4gNw6vDKvgChi5KXIQYLIzKyE+97Ur/zVWFSAbB8=  share/snis/solarsystems/zolon/p23.png
+YQAkzhgMWt7M6ZtCrM5G3nDhI/nY0oRGVD81bu4878A=  share/snis/solarsystems/zolon/p20.png
+1fjiJG142meeinsvpo3H03i057chuOmrJLSbmgAbkSE=  share/snis/solarsystems/zolon/p010.png
+XmMloYE+ANsPPDyYnFoROaUGb9Ur0gRRraBLjGMKWcY=  share/snis/solarsystems/zolon/e1-normalmap1.png
+ntNEzKfWV7cvydVMbpjem/OPXz4WctXKlx+pqjFPxeE=  share/snis/solarsystems/zolon/p31.png
+rDoyk3FoxMvC1BhjFaRGRHpGz3jS7PRy/tsBu0BjeQ4=  share/snis/solarsystems/zolon/p015.png
+hpmBkeOV90lTELjki+jSKyODML4WysRR9Vt+ZeDJPFo=  share/snis/solarsystems/zolon/redstar.png
+lZQnQNNWajjDg/G7sSveKDjawdzFqPzMSY3XxWYlXp4=  share/snis/solarsystems/zolon/skybox5.png
+UwNEZrEaG9X8VyeE95ZmKzzHhVK9ZCo4iKZWnzMDQw4=  share/snis/solarsystems/zolon/p012.png
+HC1NCJaJO39nfr66mqR/k5WrtqVYAHL1lOdGzZrsF8k=  share/snis/solarsystems/zolon/Attribution.txt
+u3S3jNMGs7uMmNzyOhnj6bP/AIgKaHQfrgUy+JtcMzg=  share/snis/solarsystems/zolon/p65.png
+ZdQ0KPE61oNj2RuFR/JMIKX9FL+wmmq4GEMZzmfOwhI=  share/snis/solarsystems/zolon/p64.png
+hqIaSYp1nZF4K3u69O06AF+yAn5hesDbilzde3eOSIQ=  share/snis/solarsystems/zolon/p24.png
+AjmPDQPSCR+z+32ZvfHITVLxEhfer2V+0C+aTyMDZbY=  share/snis/solarsystems/zolon/p3-normalmap5.png
+QyAVTD71r5W6DFZKSMBQkV/pBfpEzB/8k1Scp04K+zY=  share/snis/solarsystems/zolon/p50.png
+nu3SQROyOZn744vgUefRw3Oi86qADVm4V7JqI0TmanQ=  share/snis/solarsystems/zolon/e10.png
+BrEm/kf5Ear4DNVvu6N3dTMFy7rHy3XTJDoaLqL8mQo=  share/snis/solarsystems/zolon/p014.png
+dX6zkx3PrG0apVP1CFCy4KcMyc1D2l2Fg6TxLL43OqE=  share/snis/solarsystems/zolon/p011.png
+eXgbTz66XXXxIZ64Z6A+HduuUZXKawjhuaMGcxl6IWQ=  share/snis/solarsystems/zolon/e15.png
+VSmivKXuN1Aq5cBNtZkmTcm4N53KGn2/kdj+BGFoH6M=  share/snis/solarsystems/zolon/p53.png
+7z8NcIHYOhIZzp6VEJ+mJPsUozlMrqdUM2t7qHKmBfk=  share/snis/solarsystems/zolon/p3-normalmap2.png
+L0Y8iAZoJdLejrZOgl4HPJOxRUtVpEqXKWNrfuS0J60=  share/snis/solarsystems/zolon/p3-normalmap1.png
+4/Xxz7rvtNX6zd7XCu2NjzZg4nQuYCgGroTJCdUXqJE=  share/snis/solarsystems/zolon/e1-normalmap3.png
+GxO2tUU4jf7CF3dMKDNJCJSzvFcagO9VGAy3hJ7Q2Ug=  share/snis/solarsystems/zolon/assets.txt
+iFCYvHqjYpl/LODnJHcFH2w8eG8lXwkTMepaaKEP/uw=  share/snis/solarsystems/zolon/skybox0.png
+0HR0TKmJSMndKEjWGw8jykahzwVMFXiJcQ8CvbMZZTQ=  share/snis/solarsystems/zolon/p61.png
+yV8kSM9mWev/Dh96Iu3jbXGQIj1NOesR+f2NSV2/Zzc=  share/snis/solarsystems/zolon/p33.png
+CP511Wcv68tIBiuqnNTM3wmEZHhlKNm19lyS2WkTKz8=  share/snis/solarsystems/zolon/p34.png
+Rh/uMBBk5RtbbB5arHlTd4ZmbbKjmzBNVFzvrvn9KMM=  share/snis/solarsystems/zolon/skybox1.png
+e8RPc4RZTEcczhoeRSrrjTHFzuLeJ4RHWH0/bv+7l88=  share/snis/solarsystems/zolon/e1-normalmap0.png
+QE6fRspyXXw5iG1j/xV+rVkya9F24sttV0bHJtda/Jk=  share/snis/solarsystems/zolon/e1-normalmap4.png
+CqIOPO7ELMmh5U/ulb1znkL/4qmnb6rcRjTc12rKfgU=  share/snis/solarsystems/zolon/p35.png
+2o86QuhI/CtDBXcCF0fm1r4CtKb+Ri/Zs7TWAbURltU=  share/snis/solarsystems/zolon/p63.png
+KrNWfrpklVxXqBJePdKCEioQiHMwGgOzgcptFD53ECI=  share/snis/solarsystems/zolon/p25.png
+gVjWgNp69yd7chjDa8y4Y1rwI5iYCieTYnYAXOlDzdg=  share/snis/solarsystems/zolon/p55.png
+pqR0ZfDPrwuLe6rPObo5gE74UBTXGRIXGl6rw6EzADY=  share/snis/solarsystems/zolon/skybox3.png
+qicxB/X/ERyWCQVAYZeP1TWCitHs6NmIVxDZouBlAGk=  share/snis/solarsystems/zolon/p21.png
+qUGExE3srvvIv7FQeUbX5T+IiHSBnB7kXArmg2PCv20=  share/snis/solarsystems/zaurno/planetx4.png
+r5mQPyTyjUnC4xVMukbunYbBdNDH8QRXxw0T/WvOGR8=  share/snis/solarsystems/zaurno/rustyplanet-normalmap3.png
+x33aVFuYXOjZr+bj+CDTTwSVXEsjamsEQGzjJCdAqfs=  share/snis/solarsystems/zaurno/rustyplanet0.png
+qtRGWcoWSKQLix9KiSha6MSNr48I+s/9wxV5jLwA4oI=  share/snis/solarsystems/zaurno/blueplanet21.png
+bVG7NtkyqWr64mAVxZAo6dsBkBmGat+YF+MyOoMedhY=  share/snis/solarsystems/zaurno/planetx-normalmap4.png
+GuYtK+QiGtdsbPq1vCiX2+fzfUGarr9hs58wgayHOmk=  share/snis/solarsystems/zaurno/eplanet-with-clouds-3.png
+fgSUV8N5uQ/SA74U/wM/flQvPvnsTxZUb7O0PEDCgZY=  share/snis/solarsystems/zaurno/blue-planet22.png
+zpz/hXjC3wkDltH2uwPGULtEi/M7htTxW+8kK9zKhhM=  share/snis/solarsystems/zaurno/blueplanet24.png
+rIHzD0vOiLuI2GuEnVU9UELQBlt4Fy+oFzJToJNAIuI=  share/snis/solarsystems/zaurno/green-planet21.png
+tYtr38t3R15KX+Zx3h4heh3jL2HGWTqXFApcEDUpziI=  share/snis/solarsystems/zaurno/rustyplanet-normalmap5.png
+FVmNDB6ejTWwevd23iA3PLg8ksBFW5i3jvAHzMlfNuw=  share/snis/solarsystems/zaurno/rustyplanet4.png
+c1V/CyfQ2+7xzsIubaSlpAD9TEihnbxTSP/iCkkRLjo=  share/snis/solarsystems/zaurno/blue-planet24.png
+eF+kzNCtcYuJ/ynfEF12y2qbUJZx8KLlN7YTxo1XOc8=  share/snis/solarsystems/zaurno/purpleplanet22.png
+QRDnG3PEBejVHRJvO2YXGQIBGq3aW1lcg6Y1/fMD9/8=  share/snis/solarsystems/zaurno/eplanet-normalmap-masked3.png
+mgEzfAiH8Z+jxT8JnW4DKeMU3+ry0MaSSebrV26IOTA=  share/snis/solarsystems/zaurno/planetx3.png
+V9mK/oH2+a+Bq4bWhh2hJSdn03pO1SX4qz4C9Shw2bw=  share/snis/solarsystems/zaurno/eplanet-with-clouds-5.png
+tYtr38t3R15KX+Zx3h4heh3jL2HGWTqXFApcEDUpziI=  share/snis/solarsystems/zaurno/planetx-normalmap5.png
+Q/4RpA6oIdTX+cEfpDnwtriO3GTMzk0xuMM8i4Kp7+8=  share/snis/solarsystems/zaurno/blueplanet23.png
+W8MKskwHORQtP/UaOoT+7DLZIJDRasQs7i1m4dlWoug=  share/snis/solarsystems/zaurno/skybox2.png
+pwwkU8wttRHLhCNB0xQyWzsvkNrdvXJyQCBqtOASffA=  share/snis/solarsystems/zaurno/blueplanet25.png
+Alu9xtYT9W+HnGxcavenrd39+14pbZNkQscytg6jWKs=  share/snis/solarsystems/zaurno/skybox4.png
+ETZC9jOUvc5LiLQ0oQlh7gh7XFaFL0SpyppwCf5mJuk=  share/snis/solarsystems/zaurno/rustyplanet2.png
+OWF44jjgPIhbSkBW+ifeSiNlLU2V3+ZiZ4PKsgPjjb0=  share/snis/solarsystems/zaurno/green-planet22.png
+sNaxfrTvk3UeocBWDf4LVjlEDXLwEXMfd0HMcqzI104=  share/snis/solarsystems/zaurno/planetx-normalmap2.png
+fO9JRdr2ZFJtmdhDQcGQs4Jv6hEanwslFXWQD3ddYqo=  share/snis/solarsystems/zaurno/planetx1.png
+v4MDx2rG3FSh6fPTu2MzmlzCduDDeqY5c4d1kfZvzN0=  share/snis/solarsystems/zaurno/eplanet-normalmap-masked1.png
+VNL3xiEsVIUUR501DKjYIM9NCdPNL58oKahSSmJav0o=  share/snis/solarsystems/zaurno/green-planet24.png
+PKGIYxmb8A2/mh9Mxi5Op2Hup+5Q5/KarlQEC6Kj4UE=  share/snis/solarsystems/zaurno/eplanet-with-clouds-2.png
+cRxilkV9X1xXn0UmiWuVSvf7fNuXpEi/km211AB4nWI=  share/snis/solarsystems/zaurno/eplanet-normalmap-masked0.png
+Ay7Nn5zSsKbWbRgeqVvsMLC0vguTW3GfufFn0QP5PY4=  share/snis/solarsystems/zaurno/planetx0.png
+juX/RJ5L+Vr+n1L37ixC0rBDBawDWGCnnZ0D2NgSgEc=  share/snis/solarsystems/zaurno/green-planet20.png
++ZMGxjBfuwGbF4rwIabZXouvN89jw2pJsoZ/JJOGBI8=  share/snis/solarsystems/zaurno/skybox5.png
+yqbi0dTnAIYx2d9XUWZDDrYl3sP4FcfUX1sjkQRpVxY=  share/snis/solarsystems/zaurno/green-planet2.png
+FuutGNlvZ7J8/6yo4imN5dPISZB0iq5mo3FxzrIFQBg=  share/snis/solarsystems/zaurno/eplanet-normalmap-masked2.png
+VAB5VLGLv4pHbcXPSTwF6/biawlHsh3s56fIYkYofSc=  share/snis/solarsystems/zaurno/planetx-normalmap1.png
+Yr3d7WehefaFEM7YKB5TL3Sg8JuHu7abkEM4gwXZ4V4=  share/snis/solarsystems/zaurno/purpleplanet23.png
+NXOoyEYyfCpHo8KK933CsuSgypwUSYwNIWoe/vPx70g=  share/snis/solarsystems/zaurno/blue-planet21.png
+AKBqxRC0o+M28L7G3cQuib7+aQiEiUTFKerb1pHoZdU=  share/snis/solarsystems/zaurno/purpleplanet20.png
+CB+MvvkyDJH66fQUJCXSXmr9qWrZYO9Wm7Z4u3pImuM=  share/snis/solarsystems/zaurno/blueplanet20.png
+bVn0PZHqYqKH0Md7zBtYZEMP+4VWWEGYEKZ/lOI2jWw=  share/snis/solarsystems/zaurno/Attribution.txt
+sNaxfrTvk3UeocBWDf4LVjlEDXLwEXMfd0HMcqzI104=  share/snis/solarsystems/zaurno/rustyplanet-normalmap2.png
+zNu4ac+NJ11uZWxFUGqS1skiWIRQhSSsMYBG1xs+Eak=  share/snis/solarsystems/zaurno/blue-planet23.png
+GAQL5XP1eH1Ngv3vRDDMqmWCJ7kFiMrd//7NA8HnTuM=  share/snis/solarsystems/zaurno/rustyplanet-normalmap0.png
+VCIyMe8MW5LnxXBhLwmZBc4z2gscUjonDbYwTiA1pSQ=  share/snis/solarsystems/zaurno/blue-planet25.png
+G9qsbvwDqQ446m2Xl2SsLzQsJ3ppnMHbw6y/GhEXHZw=  share/snis/solarsystems/zaurno/blue-planet20.png
+n7dLBIYvD649WRxRbQlvZs5pSQUJLbECwYZ7U8eRnN8=  share/snis/solarsystems/zaurno/eplanet-normalmap-masked4.png
+VAB5VLGLv4pHbcXPSTwF6/biawlHsh3s56fIYkYofSc=  share/snis/solarsystems/zaurno/rustyplanet-normalmap1.png
+Ao4cWPX1u4gARf6Ux5CEpx+rlNjzWdW3trsVfB6vLa0=  share/snis/solarsystems/zaurno/eplanet-normalmap-masked5.png
+3xIbtf8CqbAku0yId4OwDZDwbJFZaP/xj0qdzfngfXk=  share/snis/solarsystems/zaurno/planetx2.png
+pigv1/HBbULhBPZGHyCqKgFW6OLqkh5GHwsQTbRrBYE=  share/snis/solarsystems/zaurno/assets.txt
+8G3yQMTr2ljatAbpTSDW5Eo5biUfw8HhfxnbzYOu3Ug=  share/snis/solarsystems/zaurno/skybox0.png
+OTWLNbPt08nczBE+Le6LleTaqm1DY0e5yzzszPe/HI8=  share/snis/solarsystems/zaurno/rustyplanet3.png
+ZYrTbkHiAs7LGGtD7vlxY+/phGr1EBfIFz7AyoBrRMg=  share/snis/solarsystems/zaurno/rustyplanet1.png
+9sHTLZNMTSOejmvNXUeRW2I866mX2kj87uegXQsENHk=  share/snis/solarsystems/zaurno/planetx5.png
+n4RyZtk5J6Abr6Cf7fcRszKbG1hExxIql+O0K/LFoxU=  share/snis/solarsystems/zaurno/purpleplanet24.png
+bVG7NtkyqWr64mAVxZAo6dsBkBmGat+YF+MyOoMedhY=  share/snis/solarsystems/zaurno/rustyplanet-normalmap4.png
+r5mQPyTyjUnC4xVMukbunYbBdNDH8QRXxw0T/WvOGR8=  share/snis/solarsystems/zaurno/planetx-normalmap3.png
+gVsulMCOnqkjzv3dxkRMXDY8G8LQwjxi0Yw5wCQaTqs=  share/snis/solarsystems/zaurno/eplanet-with-clouds-4.png
+KQqP0nX9PO1KM+OC8lSn8/x89JEd2OAzCXROGE9sxow=  share/snis/solarsystems/zaurno/skybox1.png
+d652OsBsI/l9woHkKsTJlsTT6v2LjFb7SEb3v7dWfwA=  share/snis/solarsystems/zaurno/eplanet-with-clouds-0.png
+8nkAtwZ/pujSppKi5ecTetsJbO3TaueoJSsisl5WR04=  share/snis/solarsystems/zaurno/purpleplanet25.png
+GAQL5XP1eH1Ngv3vRDDMqmWCJ7kFiMrd//7NA8HnTuM=  share/snis/solarsystems/zaurno/planetx-normalmap0.png
+i8nUMFG7u+wvJW3ojPjEwIndDmv8+oBBp/T9XumLzyU=  share/snis/solarsystems/zaurno/blueplanet22.png
+TUbTrWVJPH2gNEnOPVS0oI55TBM+nVbmfagQlOZnmcI=  share/snis/solarsystems/zaurno/eplanet-with-clouds-1.png
+hEn0fkaK496Zf4ubtRifJ1VYwQTVfG+8nIpTNxb3JwQ=  share/snis/solarsystems/zaurno/rustyplanet5.png
+gqnO96sSyoZj/p1Bl2BCvLcaGLsPPFhCrcFe89sVWzc=  share/snis/solarsystems/zaurno/purpleplanet21.png
+HixBGDr7SMvgvOOJ7nsdXraYaSdwe30U/VYAwuwfW9M=  share/snis/solarsystems/zaurno/green-planet23.png
+TyLru2RLAR6XD4w0Wyc2+1FV2RsFa+HD+zMbhjFxIUM=  share/snis/solarsystems/zaurno/green-planet25.png
+N01r8nUusMlrRP2kJ2ljx9wHHRnCcQARulvR8IozSxI=  share/snis/solarsystems/zaurno/zaurno.png
+tnAAF5HEcUYQ9ZLnQm349t6LsF3aqYpiQ8ywuyyccGk=  share/snis/solarsystems/zaurno/skybox3.png
+VAB5VLGLv4pHbcXPSTwF6/biawlHsh3s56fIYkYofSc=  share/snis/solarsystems/default/dorjna-normalmap1.png
+sIXr0Bj4VfkmueCi99V+Cyu2DcJDX0JTjVMxHlDbRfI=  share/snis/solarsystems/default/dorjna4.png
+5KJIuBAE1QM6JKI5p8lL0tkZdSGzTX5OTnFdnvY2BqQ=  share/snis/solarsystems/default/doobion-with-clouds-4.png
+9yvHoWDCYr71kgS/JVe0dl0tTcnJHwmLcPyRXWT4m1c=  share/snis/solarsystems/default/dorjna0.png
+zO6CzsXEQQhnddEF+C7wWaEs8OUgU8t5vr1FFv2PjAs=  share/snis/solarsystems/default/dorjna5.png
+nwohqXZFyDjM4WhmYyCDHX3A7h9XrQv52o2uEfNDd+Q=  share/snis/solarsystems/default/doobion-normalmap-masked5.png
+k7+yV4PTzTLAgencwzTVmA+l/sH8wnpoYIQZyOlA0BE=  share/snis/solarsystems/default/doobion-normalmap-masked3.png
+GAQL5XP1eH1Ngv3vRDDMqmWCJ7kFiMrd//7NA8HnTuM=  share/snis/solarsystems/default/dorjna-normalmap0.png
+r5mQPyTyjUnC4xVMukbunYbBdNDH8QRXxw0T/WvOGR8=  share/snis/solarsystems/default/dorjna-normalmap3.png
+zjyld77VeakgNxjsP5QMvTQRKGQW7WHvmC0n998+LLc=  share/snis/solarsystems/default/dorjna2.png
+c3ONINYNvRueU4fQ11YVhwuczEvnHR4ojywOjqj/sio=  share/snis/solarsystems/default/Attribution.txt
+7uIMMaCaxtTrcdpn7OC7b7thjVI4DcIcdMazlFULqvE=  share/snis/solarsystems/default/doobion-with-clouds-3.png
+xamy7rEb/miCg5YkYWq1xlrcStBTni6udNE8UEptKwM=  share/snis/solarsystems/default/doobion-normalmap-masked0.png
+Rw5vvnELq7zQfee0TQGH2VpwOVzLtenoVT9ce7aN2pM=  share/snis/solarsystems/default/doobion-with-clouds-1.png
+p6TqlUk2CQgcQ61dc2NyqvHb4musgcmeuA7TaZJ8YqY=  share/snis/solarsystems/default/doobion-with-clouds-2.png
+tYtr38t3R15KX+Zx3h4heh3jL2HGWTqXFApcEDUpziI=  share/snis/solarsystems/default/dorjna-normalmap5.png
+6IDBbqRLs2EDcYhiyCcYAY0Qc+gbuoflCipyrIU5Zgg=  share/snis/solarsystems/default/doobion-normalmap-masked1.png
+tsDC31yeqLRdhwimLmfSvC+CwRxQc3xhCpKrk0vGN24=  share/snis/solarsystems/default/dorjna1.png
+UyBlhUkxDMo/I1U0NBMopuARzwFzeMG7H2WSu+eV6Vs=  share/snis/solarsystems/default/doobion-normalmap-masked4.png
+sNaxfrTvk3UeocBWDf4LVjlEDXLwEXMfd0HMcqzI104=  share/snis/solarsystems/default/dorjna-normalmap2.png
+8OSKN0W/qMsVt+WnovWMQG8PB7sizZ/bVCqZP/R/b3o=  share/snis/solarsystems/default/dorjna3.png
+H6Gy4m8U5jF6xUylI/9luYMSJww9T+l5xYcD0seVgY4=  share/snis/solarsystems/default/doobion-with-clouds-5.png
+bVG7NtkyqWr64mAVxZAo6dsBkBmGat+YF+MyOoMedhY=  share/snis/solarsystems/default/dorjna-normalmap4.png
+xUqXbIomxf0Aa/WBuugG8AUPSu8C0wLMXO6ula59UlQ=  share/snis/solarsystems/default/doobion-normalmap-masked2.png
+DSPYnoHjPQMAahf6IM0ecH+u8lA+/T3etenKBUVq050=  share/snis/solarsystems/default/doobion-with-clouds-0.png
+FAMy4WIyKLVcQuIIYuArdZk8E3n7Og4KwtPlUOreQT4=  share/snis/solarsystems/sirius/hedas-normal1.png
+HYzl8w3bgbZaGce2EWJ//6bYWT3vnFBuuCUg/N3PM/I=  share/snis/solarsystems/sirius/hedas5.png
+VnZDvtQTbhQ7JQHDdxXHkzVaexgoOPFQfM6++aEd1uA=  share/snis/solarsystems/sirius/hedas2.png
+/Vjv29yT47sXGrMrt07DMpqxjCqA2xDmhMKysQCnfdw=  share/snis/solarsystems/sirius/kadar0.png
+hTLzcczwDwuC6LIJriOjszzxjDdeOSZfAbmE4XiXGP8=  share/snis/solarsystems/sirius/kadar4.png
+LcdL7SKjZDz98Px+X7ZRJbI1qZdWY0dKNcSf4MYux40=  share/snis/solarsystems/sirius/corealto0.png
+aEd4aergJW9VlRvbncaLbMbyN6TsftLFLKH9yXCLCj4=  share/snis/solarsystems/sirius/zukon5.png
+/1hdDuZhP9BoiTYyTtRs1/h8sSBOWrYydEAnrgXvohQ=  share/snis/solarsystems/sirius/sun.png
+2WXEu6aMY7u7OLzTVEXTU1LRWhAB/SAlw94Vn+cKzD0=  share/snis/solarsystems/sirius/ourck-with-clouds-4.png
+ebF5ex1gi6+Pr3qDp76zQY0yf+F5nRdBsmmwvotKtq0=  share/snis/solarsystems/sirius/greenhaze5.png
+oWC/wCmxpTNP/9tohpojGDViEufcrNWZMCpGgKSXpl4=  share/snis/solarsystems/sirius/hedas-normal4.png
+WqMJMjwIkO0lrj8U/wlBanrFhkpGoHNtfax8P6kcQfA=  share/snis/solarsystems/sirius/corealto1.png
+jFxrrOLlIFvqA9RIeGM596Hflgot/UaJmwLi4HwbR90=  share/snis/solarsystems/sirius/ourck-with-clouds-5.png
+3Hd+/FQUzcHjXmtd4lmW5usRTuMDY5qoy9GdHJIqOZs=  share/snis/solarsystems/sirius/corealto2.png
+fJcSWL0wQOxovlD6cOKS/eIQ8YJVy27hr28UXK4aNaM=  share/snis/solarsystems/sirius/corealto4.png
+v/m3G2kd11bo/Q+KJGiXlj9BdFWH1o1LNKjTGNjhni4=  share/snis/solarsystems/sirius/greenhaze3.png
+2qNUcfu3rrGmouw2J021pke3CFLVRTPM+xSoiy+J0FY=  share/snis/solarsystems/sirius/vorloxx1.png
+bSpKmVOFBUDAcE/OEZIi2+glsLqW865UgS4xBSL8KjQ=  share/snis/solarsystems/sirius/kadar3.png
+VduM1PTe3LRT9oSKFoaQHMzFRKx2sHofcVW3awA7HKk=  share/snis/solarsystems/sirius/greenhaze2.png
+j8s01LQ5hrhqtm3OpuguusGd1iR7lB+yJHmgujEIn98=  share/snis/solarsystems/sirius/corealto5.png
+kVx6rVDuLywLCM8gXJRgEaFSW5ZoldJESdBVQkzbd+Q=  share/snis/solarsystems/sirius/corealto3.png
+ApYBrbMNPtUC5yshGeqJgGig02eGqN9DHjaUUNB0G1k=  share/snis/solarsystems/sirius/ourck-with-clouds-3.png
+HOrHbDAAopA3wLoQm2+Bbxub9s2dbfeB0QYVggyM3TQ=  share/snis/solarsystems/sirius/hedas0.png
+b7cvV9/6vK5fyHu5DWeZNR2IuyexvNZLLozioD1FKFk=  share/snis/solarsystems/sirius/hedas-normal5.png
+Eqm+1LPTBJYcnfCAhLw1Qo1Pje6UFHurUhYlnAtQ9rE=  share/snis/solarsystems/sirius/kadar1.png
+Xt7GRzMaXaTqXWLq7jtnxtowiUSER2Uft72h0h+yv7Q=  share/snis/solarsystems/sirius/hedas1.png
+zjGjVCQkMP0lfx3SYH2oeqNDJPGCExFSmMsrqrZC6Jc=  share/snis/solarsystems/sirius/ourck-with-clouds-2.png
+7pbF7oWOvkMLMughk4PDUUcrJ/UBE/1ajyVamLJ//Po=  share/snis/solarsystems/sirius/vorloxx2.png
+rKqNFsPmghfA6aNU/24EQACr2vq7tSgewvDY1n+V/eg=  share/snis/solarsystems/sirius/Attribution.txt
+u2NtWoyYZ4aDbKdqQfUawMQ4i9xhFmsL7bQJw05FBG0=  share/snis/solarsystems/sirius/zukon0.png
+/2B5NKM7TdpqwGLutEd4t26bzNw3aX6OZ/8/IUVjgJs=  share/snis/solarsystems/sirius/zukon3.png
+d2O/P1s7HZk/L33BcB1rL5w4/loz8c7mfOcLPP2JONQ=  share/snis/solarsystems/sirius/greenhaze4.png
+KgVhir+0buTtrUmTea48i8NaLeJ/IytovxVJFcUqJLs=  share/snis/solarsystems/sirius/hedas4.png
+4becAyUHYeGshvGvbeuSFOrt6jl2O9+RS7Wy92xjL64=  share/snis/solarsystems/sirius/greenhaze1.png
+hEI0dp/7CDIpP/JGNPy3ib1bMvF2bF/9pw0BpyxY46g=  share/snis/solarsystems/sirius/assets.txt
+5D0AfPTDRcgt3HqkWgE9vOVSd1KVeNTA0XcF3Hiv1Qc=  share/snis/solarsystems/sirius/kadar5.png
+4giKwYbDgQqAIW+wRaQm0PbfIpi2VsEMAH7qke0P5ic=  share/snis/solarsystems/sirius/hedas-normal2.png
+rkgVlAL6bFFbOzXsB16BrSzKc4EkcuOjv2FgvgIwIBo=  share/snis/solarsystems/sirius/zukon4.png
+35jmZnOzC8myHLR/tiWhaxPQqlsnpkCpT4GDJAeoYdQ=  share/snis/solarsystems/sirius/zukon1.png
+20GYo3frFjE1tMXNtzfAdXOZX67jDcYUk7N+CgnWxKA=  share/snis/solarsystems/sirius/vorloxx3.png
+ZqtblU2UEq2XVmFeQv+fx31w9ePUbc1++U8a26XaQqg=  share/snis/solarsystems/sirius/ourck-with-clouds-1.png
+KP31+2Wh4E1J6wSiPbvxDqG212QoYZyF/sN5pnMypRs=  share/snis/solarsystems/sirius/zukon2.png
+NMJA3wZh2jS+QZYpgvBGgv5vLgqbRk7cHel5/K2x/qQ=  share/snis/solarsystems/sirius/hedas-normal0.png
+OLZBmMS6AAuKXrvj5JqP7O+da3JazfLDDJGts6tWpu8=  share/snis/solarsystems/sirius/greenhaze0.png
+jvdgIwPyS187U392KjKujMfaRY7Rwf8EampqZ9COh/U=  share/snis/solarsystems/sirius/ourck-with-clouds-0.png
+lGvRL9acky+8DyOuMLDQ4Ilt4389ihSPlHjE34Vgw2M=  share/snis/solarsystems/sirius/vorloxx0.png
++jGXPd3L1U+pTPj1TInZbMaAeomvsJlgkT+qeWZwBXg=  share/snis/solarsystems/sirius/vorloxx5.png
+96S107ZhXChmMJCMsU+WsVM2BBSgmEfJp9WRl/eTDqY=  share/snis/solarsystems/sirius/hedas-normal3.png
+GJpeF5TnySNxXeYHdjhV64MeO9FbyxxH2IfAgw1yyVA=  share/snis/solarsystems/sirius/vorloxx4.png
+ZZJevH4WlEaFW2K7fiHlZaOKUSDOVxzie8okz9X5r/E=  share/snis/solarsystems/sirius/hedas3.png
+XeBQUaNINp+mNOe96dHC9LJEwpspvA//KaTuoo2HwfE=  share/snis/solarsystems/sirius/kadar2.png
+45kNBDay9iflwV5ZJMidr05Z1B8Og3d6GQpyi7V1/Os=  share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-2.png
+J+8gHsNquDS/TBHOr/tWqBLFnipaYPJeVq+jSgOGFtI=  share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-1.png
+qTWQrRPCAj2QiKxZ8T5y77lVkBmSMvZaV840T5nIj0I=  share/snis/solarsystems/varco/rocky1-rgb-3.png
+aig7metG82KALgB65zs9cqr4Jf1vjtPQd4xR+abgz2Y=  share/snis/solarsystems/varco/earthlike2-normalmap-rgb-1.png
+iE7g2ycanvRlGSzn8bKIZ2qw/emZyKfHwFT5dVRVxvo=  share/snis/solarsystems/varco/rocky2-rgb-3.png
+iCXdBH1kbTej3LSYEFgvoeT4kC5oGxnCTQc9V0MMn28=  share/snis/solarsystems/varco/rocky1-rgb-1.png
+OL5IpXvvudBstbfIeXf4ayoUDwzLP/1fJ20zV4dCgW4=  share/snis/solarsystems/varco/rocky2-rgb-2.png
+DiPXSd/PxqGiykJYTN72CwIlgU1AJAR94oS1L5UUc/0=  share/snis/solarsystems/varco/rocky1-normalmap-rgb-1.png
+IbwHIOoPVY50TGK89ZC4r7urFn9RK05epPjy0N7TDKk=  share/snis/solarsystems/varco/earthlike1-normalmap-rgb-5.png
+EElmDoBRdnQ74CYYnjYgftBdf6+pfwuTIWdXUK/poaE=  share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-5.png
+bPBP53VR2DWLuc6tphFv9iRyUxOu+VkKRNCOwzyH9zs=  share/snis/solarsystems/varco/rocky2-rgb-4.png
+ebJsQQwlTddriqbEr3HxnbQQlhXuQfd6bYZJ2hZw+DI=  share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-0.png
+zhloJokjnL69H2P3s6KuHBIB4GukFLAtNzFHxt2IqkY=  share/snis/solarsystems/varco/gasgiant2-rgb-2.png
+GxyRwRguF9IzY28DKS6dYlTh/DLm5ka0Cwg/nZwzqWE=  share/snis/solarsystems/varco/rocky1-normalmap-rgb-3.png
++jONm1AIkMov5YCwyhRhjazT7VCpzt/UG3fLclwiUX8=  share/snis/solarsystems/varco/gasgiant2-rgb-5.png
+tYNgF2nz7BXK8ePEQreK7wJ4VqB66fExCvZh6QmMbf0=  share/snis/solarsystems/varco/rocky2-normalmap-rgb-2.png
+NwGEBxalgracq4y8qVohziZc/C6wup79+qFH41RDwdU=  share/snis/solarsystems/varco/earthlike2-normalmap-rgb-4.png
+GDDm6l7PiTMR9oSzyAQ8RUJKIf+KSf78ZiWPoa9geUE=  share/snis/solarsystems/varco/rocky2-normalmap-rgb-1.png
+tmpC6S/HMDtFUkAAJupnuo/D4Rm8datqzi5brhEonC8=  share/snis/solarsystems/varco/skybox2.png
+JEL/QGY4XeJlWOiPnMNM70kq0RDlkUSzbYvd8/CVve4=  share/snis/solarsystems/varco/rocky1-rgb-5.png
+dY1xG/oJexnnnohp4jcZtHNPfVtV04M8CQ5HDWOkoHQ=  share/snis/solarsystems/varco/earthlike2-normalmap-rgb-2.png
+qJGGUbEAdmsZv729EkGlio67QEBvzlpfPMUHvQireHw=  share/snis/solarsystems/varco/skybox4.png
+9x0mSj/Hrt58utVWTJMxrbEx13jG6G/VYLuOcjJECys=  share/snis/solarsystems/varco/rocky2-normalmap-rgb-5.png
+5ZuqshgZ8RUTllah/pbPeLLr5GY63am8gJqBxOQhzrE=  share/snis/solarsystems/varco/gasgiant2-rgb-0.png
+5WCIzB4JeSClLCYd6sj3MICNXVZ0IcIsbTqbZNC8188=  share/snis/solarsystems/varco/earthlike1-normalmap-rgb-0.png
+/cX3f5Mp2JeuXgHt3Go9OlfkdZLJeeL2ImZ+sL0n4vk=  share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-5.png
+/ZElOlR6oUJWi23MTH68pTAG4r2WQu6bmaFvlqXx4RI=  share/snis/solarsystems/varco/earthlike2-normalmap-rgb-5.png
+iqdyiT4tMbzDBp0vneccU+G6lpWOKPJzjoxH8qiQxjo=  share/snis/solarsystems/varco/earthlike2-normalmap-rgb-0.png
+tuCrg2Vt7VgnJlrvTwEoMSlw2vVr71aDabuaXjEjt8M=  share/snis/solarsystems/varco/rocky1-normalmap-rgb-5.png
+4KowrbPo46fcxXEXk4hzyB1EfuApgxTieYPCM2CaqzI=  share/snis/solarsystems/varco/skybox5.png
+0VD5iTGUFQuB5qShWUr4+dSatY8K8taF3yIwB/E86ew=  share/snis/solarsystems/varco/earthlike1-normalmap-rgb-2.png
+FOUi83ck5URgBeYbMcVqZnQ6KoCDR9ogtlKflyV4Uqo=  share/snis/solarsystems/varco/rocky1-rgb-4.png
+2eJ8YB8sBTgIYOH56sOwxS09phwjjKH7q8rnmgDKv2A=  share/snis/solarsystems/varco/earthlike1-normalmap-rgb-4.png
+k0M7y3TOmKF9wBa2xHmzm0+Odl5qOkJFIcq0CEw2JBo=  share/snis/solarsystems/varco/cyansun.png
+avIQ9AmsfvIFa+CeUAoVwMf0XVFEQEHhLcKQKaZfQq0=  share/snis/solarsystems/varco/gasgiant1-rgb-2.png
+ZGmm07cAWnab6YNI4804xKa1uhtanPWJhLSYUCKdnB0=  share/snis/solarsystems/varco/rocky2-normalmap-rgb-4.png
+0HYgrYu4GZz1twT3MQuIFLAAX1N5MsDoDUIhygtzITs=  share/snis/solarsystems/varco/Attribution.txt
++QtWehf6QEbGOdCwxoRijW0N13vMhZr5+mg/UjVQfXI=  share/snis/solarsystems/varco/rocky1-rgb-2.png
+tqQibk3qJ9DLFT2fommVsShJZ6ZU/In0yn/E5vEzVjg=  share/snis/solarsystems/varco/rocky2-rgb-1.png
+tk4v4ML5qS9PsMdBxfRkGDzl6VHeu7nqyZ9WDkRhQgM=  share/snis/solarsystems/varco/rocky1-rgb-0.png
+fdvOUX5NSBAC0N6UhBM80KwSq7PqT57TDXrDjGniq04=  share/snis/solarsystems/varco/rocky1-normalmap-rgb-0.png
+CMhKXNM86d0uxrGMkbOV/XCYhldzfJXXLkhvwZ/oRQw=  share/snis/solarsystems/varco/rocky1-normalmap-rgb-4.png
+B4/x5htXm734f42CY7b1w6aA4EdG86r4aAV93u1ioH0=  share/snis/solarsystems/varco/gasgiant2-rgb-4.png
+PE+3P2LmEJKrcfRsiS3PaHoUobPV2v/FBjCsYoTERnI=  share/snis/solarsystems/varco/gasgiant1-rgb-4.png
+D/Uogk3SsiSCf4PzIim5qjgOfSgW7M9w4enpRPv/PxU=  share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-3.png
+x9E/9JHenQOXmYEDAmzxBXY0Y7MMK0hCKaKLuSlbJwA=  share/snis/solarsystems/varco/rocky2-rgb-5.png
+nqBawbQrLij82Y7ngpFeNAbSAr78s3kg9nqm7RcCq9U=  share/snis/solarsystems/varco/assets.txt
+Ho92BAcS3dnxajTd7+10N/r2i0FsPCAqik70c0JOT1c=  share/snis/solarsystems/varco/skybox0.png
++WtUZCl+eRckhs1aN1+SRGyKbusip793IQMrZPSwHiw=  share/snis/solarsystems/varco/gasgiant1-rgb-3.png
+y25+up8Oqh7mlBGP2X3mdvZCc+8O7StgrtxO1+MFC64=  share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-0.png
+bp1+7ihRZpoukBNHF6sAcfY3EdIXeJPYIOedSma2qU0=  share/snis/solarsystems/varco/earthlike1-normalmap-rgb-3.png
+kbF82UuRkOVa7vUF3WqLJbyNNed8z//cTn/u5hz+2k0=  share/snis/solarsystems/varco/rocky2-normalmap-rgb-0.png
+ROpzG2+NRxKYQvNu6oVk6/LZEhLjsqk1YabklQXD8oI=  share/snis/solarsystems/varco/gasgiant2-rgb-3.png
+3R4ZX8Lj152xkDnH/xTnRq5CWrv7EvRUnF2Ju7ZSJB4=  share/snis/solarsystems/varco/rocky1-normalmap-rgb-2.png
+Cg/yGwXLLFSeD+TjKBaDErt/vA8KH9fCLcm1/5MhsJE=  share/snis/solarsystems/varco/earthlike1-normalmap-rgb-1.png
+DNqrIZym09ahYmh8lYSPZ62fqm4jXcsupOZkVp71ks8=  share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-2.png
+BGxt7lC1xQCdF4RA308rt8BBZa1klNbIgQrE1GQ+30Q=  share/snis/solarsystems/varco/skybox1.png
+hiQd0EMWTTL3tqoxd1CA4WOSAAUZwIeLqLPQZ4J1NF0=  share/snis/solarsystems/varco/earthlike1-with-clouds-rgb-4.png
+qbjV/XbwRyz3/60c1zRGuZIJrt+W0TBkiwjjQ18g5Vo=  share/snis/solarsystems/varco/gasgiant1-rgb-5.png
+TFAQKo5AO089kIPgD1TC7Oq1re5kIbaugMNr1kv268k=  share/snis/solarsystems/varco/earthlike2-normalmap-rgb-3.png
++8ZY/UHbNxBYdMdNVv6dgXi4zN8onGkNeFR18rjeb6k=  share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-4.png
+hIeMJEvU8QS62m5bZxtWDU/DGKKIBzz5XhmO7e9JzIw=  share/snis/solarsystems/varco/gasgiant2-rgb-1.png
+VA1xIe2MfpKlk0sq46Ku+WBBwXyzyVy7dnXWPHPRL30=  share/snis/solarsystems/varco/gasgiant1-rgb-1.png
+JBfcPnjAjipuvh8fmPREAoXjrLT8PUwEW8uzPy16qo4=  share/snis/solarsystems/varco/gasgiant1-rgb-0.png
+sLJOdLCg/WKqhYr+xP49WGVB+MzTI1VLGSMTQKbLBgw=  share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-3.png
+1Mm3XBhOG3rwO3/zitFDXQEQp33ITKV4IgkaeSTHKqM=  share/snis/solarsystems/varco/skybox3.png
+vr8X76f5YDEAbfA0UgnXvEP3oAOx31h6XQnSDGV0g6w=  share/snis/solarsystems/varco/earthlike2-with-clouds-rgb-1.png
+yCBh2pxU+wOHaDKWzW6Elk1WDZSAALhWi2NFNyNCgU4=  share/snis/solarsystems/varco/rocky2-rgb-0.png
+AfjOAN/53eI1+Sl218R1jRE4CGJpvsS0XI/Im6Rxigc=  share/snis/solarsystems/varco/rocky2-normalmap-rgb-3.png
+iwtnl97wonMty289zCdlXtm73XFG9YYtXS+kbAk3mQA=  share/snis/solarsystems/polaris/albara1.png
+oDrUBGPPAKZ3ow6ZFXRsk+TkF/q5+Rip0SwllSTmXto=  share/snis/solarsystems/polaris/nemalta0.png
+dOOgkAgI+zUN5Nhn01POWLbfqRyQXc1FHd3XALsvzJs=  share/snis/solarsystems/polaris/vedekri4.png
+d57loKDnKdOkYtbbenYHY6lyB7cyuw0BBgZ0oRMD8V8=  share/snis/solarsystems/polaris/violethaze4.png
+caBJqZR1MZ54PWZAcT7di0suxEDws7dHc/bSdzQLOUE=  share/snis/solarsystems/polaris/nemalta5.png
++9bFZQUxDuRyTTkTwK97HHeiV+Uqfx2WoyJZrmDDLHs=  share/snis/solarsystems/polaris/violethaze0.png
+E5KCx1ct154qS5ICUzy+AJENTGtYr+ml21ZBTdZz6BM=  share/snis/solarsystems/polaris/sun.png
+hLRypc7xzmUOfAm7p21qe7pQPgLyzAkywi/e69kHGWY=  share/snis/solarsystems/polaris/elibon5.png
+7+MamM9cC/9sYPvtZ0+MLhlxUWvqHS0gkMrNUQ0vAGA=  share/snis/solarsystems/polaris/violethaze3.png
+R/3vac/SJy0EVKeoWX9hSJ67T0TjLQ1VkamyG5u0auo=  share/snis/solarsystems/polaris/elibon4.png
+KD5J+DWwdFQSXycJtdvGXThP3zqZUboSXcM9yy8RUgc=  share/snis/solarsystems/polaris/zebina-with-clouds-4.png
+sYRLAnoRQWMoQWmghNq0B9eeUzWyUHTGklaKWzxIWYY=  share/snis/solarsystems/polaris/aronov1.png
+noCTDPnEDaBGacEuzv61ue5wkpkXLFmvSYaro8NBAPk=  share/snis/solarsystems/polaris/aronov0.png
+0FOWT7CRIVr4Lwu1a2Jc4ptEAVTXgdS2YkKXZ6bGMKw=  share/snis/solarsystems/polaris/albara2.png
+nMcEM59k5gtlH8jI5vryOqJzZ1mQZKDP4acV+goUyQ0=  share/snis/solarsystems/polaris/nemalta2.png
+cgmo8BensHPQ322h0ODREEPj+KkzlxutodrMM9lImTc=  share/snis/solarsystems/polaris/zebina-with-clouds-5.png
+mTyFx3CbbWZ2TsKS0tA4YZQcu1aqM+W7y3o1Sssx91I=  share/snis/solarsystems/polaris/aronov2.png
+tdA3YFJigRNgqEQtero+2sbpUGRX5mAsWqccTHK0CgI=  share/snis/solarsystems/polaris/nemalta4.png
+/NufHzjKjG3ouOojRmVaVDOWRh0tC1pBtrS/oBhYYwM=  share/snis/solarsystems/polaris/albara5.png
+uojpbLVHA/D7Ow42NKfftBQUUctOq7FaTRO1Kxh0n3g=  share/snis/solarsystems/polaris/violethaze5.png
+AjombVeB7jyAG4dPuo8m4OVTfJ5i+1OZW3eBCsCRViY=  share/snis/solarsystems/polaris/zebina-with-clouds-3.png
+q778f3nY8CAEZsaq8RhdIu9m+r0A+WDkSZtNMKvQxtU=  share/snis/solarsystems/polaris/zebina-with-clouds-0.png
+aO7AA3JAo6kd4gp1JeJ1E+mLG2lCQeXwh4CFoYOehHw=  share/snis/solarsystems/polaris/zebina-with-clouds-1.png
+2jYJdFmXYBf/qFizewZNy72of41F+U0OI/vxzXHwiO0=  share/snis/solarsystems/polaris/albara4.png
+HW7fALZFUtkyjONohXmESF8g+wnK4NYqWyng9DQO06I=  share/snis/solarsystems/polaris/vedekri1.png
+FgmF4SZdKr9PDnLsUukv5UOz5V8OPm2yrPuNz5/zWVY=  share/snis/solarsystems/polaris/zebina-with-clouds-2.png
+JBR3NyPGWNWWAtcd/u/ccBJUIgwLALWTTLYuDBr68w0=  share/snis/solarsystems/polaris/elibon1.png
+zbp2xS/oyV47vDz3UZK9Bd1p74qQf+m/CtnmHGVwUXY=  share/snis/solarsystems/polaris/Attribution.txt
+TynfucWGYJseinaYbRub1D9z+N5+NC4juPX31Dsmq3I=  share/snis/solarsystems/polaris/vedekri2.png
+cmR2DoifrhWcMn4s+JWWd8Hst7wPc1NCnPw86JFTY9o=  share/snis/solarsystems/polaris/vedekri5.png
+f3oNTlGd/Ywahzfkct1+3L3dlI2AVuaQGyrQh41uw+8=  share/snis/solarsystems/polaris/aronov4.png
+ttOCTjJ8pIBAnISlnvqfPvYHv37B/jBNjtwJABt7zvU=  share/snis/solarsystems/polaris/nemalta3.png
+jc2UAQJ8IJ7yAfOiXRC/9EotnP22Z+Zo9LnSgPge6Ts=  share/snis/solarsystems/polaris/aronov3.png
+nLIebY4F9LQQmuIdQwVvoJeZPuLHZsTunJQWQkTB1Dc=  share/snis/solarsystems/polaris/violethaze2.png
+ob6EARWyo5dWlgP/hTkRuUbDdXPlKxwBHAtFpEuMNvY=  share/snis/solarsystems/polaris/assets.txt
+0my0COe4DcS35GWF/5RFNIAXPZRSWak7Ez+fiPB3o00=  share/snis/solarsystems/polaris/nemalta1.png
+UaR8GWaLGCYgFmd1oTwFN3DUa1D1glwVGydF54biFmA=  share/snis/solarsystems/polaris/elibon0.png
+r/YdXNGNfipb/lRzRi2t28kVNZ4+izx0e/o3k8eoNNc=  share/snis/solarsystems/polaris/aronov5.png
+xpJ+m0heCjoEZOKC2DOcK58fQi93X5n1pKiWjDD1z10=  share/snis/solarsystems/polaris/elibon2.png
+VqW6BjQRVDqDLAXmE8dDzRet3RsyW8cNFcgojpyP4Es=  share/snis/solarsystems/polaris/vedekri3.png
+8AQw5nZnjrfSHIMbpf7buENdL8lpug7/0njLe+4AwiU=  share/snis/solarsystems/polaris/albara3.png
+wAnczRkVAmRwMNK4zG7z9kjMjhP+p3Sf0G2mI6/9fTs=  share/snis/solarsystems/polaris/elibon3.png
+Vpa1GoMtkBpMlT+ClTxQ1fBYF2OrGIlDNIQAhUuMub8=  share/snis/solarsystems/polaris/albara0.png
+OtAfS3JP370KbVdpwUwpS2HeFC9OCuC/am0HyVnPMEU=  share/snis/solarsystems/polaris/violethaze1.png
+XEGeXVOjBipOFQor77wbkSm+hQYBPaFE5s6jq8B0uVQ=  share/snis/solarsystems/polaris/vedekri0.png
+PLF1+3KtXYIXEccW1HLCXrKoPdBHgEJowAcnEfbZN58=  share/snis/solarsystems/quidgebo/kratoria5.png
+jBAyj1QG+vyVA2UgTNoYIPz96+VxxKpdgWJwp/dHgf8=  share/snis/solarsystems/quidgebo/kang-with-clouds-0.png
+dSlKRwxv0BAIWEwYUqe1BRTjYNnDYDKVDeqrLhoNuJc=  share/snis/solarsystems/quidgebo/kratoria-normalmap3.png
+MSBCWsYas6LdAmy7Yy+tE9hUiEDoIv6yKbBm3QFKGbY=  share/snis/solarsystems/quidgebo/kang-normalmap-masked4.png
+b9v7ffSTCB9ZFDenAAhwgLHH3jE5lHbG3+Yyd8fsom4=  share/snis/solarsystems/quidgebo/lettek2.png
+YsJ/StaidIAVdoHlRgGi2PlZ8GWtZQiPmVlOQl2jUSw=  share/snis/solarsystems/quidgebo/sun.png
+fAjzv2lBvZeQTtEzTh5G3pc5vIaYmnbitbgZB9EuxlY=  share/snis/solarsystems/quidgebo/bluegreen-skybox4.png
+r+EH9cPN/dbWINA3Q0pE7nO9M1GUwDSaNaynBjZ3S+E=  share/snis/solarsystems/quidgebo/lettek5.png
+fJ9Cvfgpjv/rNGbQVTDK/2jMNQVsXvJPEGEKltKKxaE=  share/snis/solarsystems/quidgebo/kang-normalmap-masked5.png
+6f/B4HFLh5d1iajseINB+C2uyd24MNOem1t+lMB7Soo=  share/snis/solarsystems/quidgebo/guleldob2.png
+1EWkSq7803Dzv5mRkHSrQRkRRHz0bviQu8TVrxwf44U=  share/snis/solarsystems/quidgebo/lettek4.png
+QjRMGnpOeRIqwd50/OfVgKziHvinWBgAxvp7UULfK3w=  share/snis/solarsystems/quidgebo/kojax-normal-masked3.png
+0jnYlfpRV3+jQcbyYvBPJyc7M034ttq0RY+s+//esG0=  share/snis/solarsystems/quidgebo/lettek-normalmap1.png
+f534Qf91Cd/5Lh0xZftuTWbZqnypU3bZgDoRgchBpy0=  share/snis/solarsystems/quidgebo/kojax-normal-masked4.png
+wAM1cWZbO5tGqQDLhkf4VWhLBGE9GxGTX3t9hZkz9pE=  share/snis/solarsystems/quidgebo/behko2.png
+Sc7YCiE8borxZr0b2MmR3SWmK3mIlOGF4p+uj8lXeLI=  share/snis/solarsystems/quidgebo/behko3.png
+lfOTubdM1u9ksbN0vx7sqPSDqzDstyzeCfqDICJPF1M=  share/snis/solarsystems/quidgebo/behko0.png
+4fDkozTa9t2rZk56GNLolw12auy0r/Wtcm5Bbit1liE=  share/snis/solarsystems/quidgebo/kratoria2.png
+wgFTS+fmaDJ9YKt6RXPkx/X2Oq3+fZgie3Uss6zyT+0=  share/snis/solarsystems/quidgebo/lettek-normalmap0.png
+kfzGVJjwqfxvNUp3uoFDmj2pYuY0kh652uH7SdfF3sQ=  share/snis/solarsystems/quidgebo/lettek-normalmap4.png
+UMtH4lm8Er2rbcW/a3Uoxg68vMkoY4cbwkF+QDyW7eY=  share/snis/solarsystems/quidgebo/kojax-with-clouds-5.png
+31gF7oRhj5RGLj7IZhZRQ1v3Rbty7NLgP933lM0FoSg=  share/snis/solarsystems/quidgebo/kojax-normal-masked5.png
+KJdABvovoFXOJaLDswGV6a5lKFfV2qJtf/xSdEwOcMc=  share/snis/solarsystems/quidgebo/kojax-normal-masked2.png
+JLGPe0LfjGvlzREaaCyw+/aVf62ZO8C/zMwcnJgGRko=  share/snis/solarsystems/quidgebo/kratoria-normalmap2.png
+Swi2R+JYzp4Z5RK64HSIRvXRvM93pNNtlbMRMxYruAE=  share/snis/solarsystems/quidgebo/lettek-normalmap2.png
+nARQLNdm090STkB37Mif6ZV7mq37WJARxc/HCez9AmE=  share/snis/solarsystems/quidgebo/behko1.png
+Oib/X3EV4iLmuhsYleRbofbPtx1yx/dKqbJhYUDB+UM=  share/snis/solarsystems/quidgebo/kratoria1.png
+osHNjGV7NDdTz7a6shoizSi/4QSZ18we3lvx3rBW5po=  share/snis/solarsystems/quidgebo/kojax-normal-masked1.png
+5Rru/MmfP/Pob5I80jmHLm49SXSv4AU0rIQzOKSwnUk=  share/snis/solarsystems/quidgebo/bluegreen-skybox5.png
+DWmRJs/21oU3nhIvLbO7U+eIDdliwtFWirxNFpJcmqo=  share/snis/solarsystems/quidgebo/kojax-with-clouds-3.png
+CgKZcLW7Xl4FMJzTyV7x9QhqOPOZu8Y21tPeEJNT25o=  share/snis/solarsystems/quidgebo/kojax-with-clouds-2.png
+9rsxpZS2At9axrGJHGgtcWwkPfupNmIdwEihvf5GzTo=  share/snis/solarsystems/quidgebo/lettek3.png
+qcHt3XlbJ7F6SELiaLAxLvkv2aReEnGraxzZ7xgaY6A=  share/snis/solarsystems/quidgebo/kratoria4.png
+DeggS/E4+5+iHKtPfvQl59+dhGLcHMvnLKgBr03a8eA=  share/snis/solarsystems/quidgebo/kojax-normal-masked0.png
+lso/dzDCbgQP5x9tTcU4ML2VFiYW4jeDSdebyJR98jY=  share/snis/solarsystems/quidgebo/lettek0.png
+BLHKiarFEmGTx4R68P75CSAOuLugon6cWLP/dXFYsCQ=  share/snis/solarsystems/quidgebo/kratoria3.png
+oFO5Ix91NzHmpQSmFMVLwxso2QFGVN/+GTK+8RrOd4o=  share/snis/solarsystems/quidgebo/kang-with-clouds-2.png
+r03/Uy3lOLY3hRJZni/OUxa0M/mr4Ond0o934CM/yUY=  share/snis/solarsystems/quidgebo/guleldob3.png
+OGTZEm3WBbmxdU6uwnKN1IzA6/2a+fV3v504DsVC4iM=  share/snis/solarsystems/quidgebo/guleldob1.png
+UNHhth48Za0zyt3XZgqaoB6q3gY5CbzBDNZNQPMQ1kE=  share/snis/solarsystems/quidgebo/behko5.png
+WiEdV0h+nKRVsBV3I/v1iYIWJ29Tx6Mr/LhxEug4unQ=  share/snis/solarsystems/quidgebo/bluegreen-skybox3.png
+uoJWB8xb0BNjsLaqpXkJOTNF/VH6ar0z5QyVvYiNRFE=  share/snis/solarsystems/quidgebo/kratoria-normalmap0.png
+VPGH+wECFyCTfGcAvVIvmdCpwqonMeiZtRNodtINFYw=  share/snis/solarsystems/quidgebo/kang-normalmap-masked3.png
+9c5qWUY2aPTm09yvnSayVCq18EFlyKCxdzpWWmZ3J9w=  share/snis/solarsystems/quidgebo/kang-with-clouds-1.png
+6XoVD0lBTnkge9cOQAcfq0btoo0yI5b5gOZ+yMEDRXo=  share/snis/solarsystems/quidgebo/lettek1.png
+veUt12SvQJSIJnLOIJe/s8vRNhe1zlg9OYo6EoLNrPI=  share/snis/solarsystems/quidgebo/Attribution.txt
+OJNtO63OKGJlXwu1Gnvx9NQMqWmBnHP6vfrwPzpU7UQ=  share/snis/solarsystems/quidgebo/kang-with-clouds-4.png
+WJLthEAZusoPiYv5fPig2ONNj/DbbuAkHNK2Neiy9jE=  share/snis/solarsystems/quidgebo/guleldob0.png
+yPoEl85Gu8hMdc/oWYF82lNcycLsQUgPXICcQwhWuwQ=  share/snis/solarsystems/quidgebo/kang-normalmap-masked0.png
+T8s9H9FvUZsBtwv33iB/wjRFb9vMXMW1iAmGB5r+KBk=  share/snis/solarsystems/quidgebo/bluegreen-skybox2.png
+LPV3+nFgZgRZNT+6Di0pDr7rfll8/hRJzwWB4VhSGVM=  share/snis/solarsystems/quidgebo/kratoria-normalmap1.png
+y1OQxl5hFLckgpi5kuCxozJIyNFSTFRUkeRtEKINzpc=  share/snis/solarsystems/quidgebo/bluegreen-skybox1.png
+NHfKqLAqL/MARWO4BSUnr3poFO2heQRDOrjA/zEH+io=  share/snis/solarsystems/quidgebo/assets.txt
+KM8qPvcPfsMGBb7IUhAOIZzDJEx/DNNaKREA9HGMaSg=  share/snis/solarsystems/quidgebo/kang-normalmap-masked2.png
+cz1efSK3P00vX/WXvuqZTVFbySYw+4klIteWBrjzWLI=  share/snis/solarsystems/quidgebo/guleldob5.png
+Pku+HjQb+blTFNjVAZFlNegZBz/ZF8gj/NvKftqr8x4=  share/snis/solarsystems/quidgebo/kang-with-clouds-5.png
+2cQLVBJh1hO0K84H9ZgefLbnYdLdRCMp7sZhq7eNGlI=  share/snis/solarsystems/quidgebo/kratoria-normalmap4.png
+lI8w7Plg2irGWlaWclRY5YqrvgHoXwDF9QYnlPY+A7Y=  share/snis/solarsystems/quidgebo/guleldob4.png
+jqRaqmzC6x9F/CrGkchIvcIw/ANsUc24bW+8nFbXN68=  share/snis/solarsystems/quidgebo/bluegreen-skybox0.png
+nLd1rP2Pt/osQa0TzvLqoiJ9oUQV6KFO/kNb0adEDHQ=  share/snis/solarsystems/quidgebo/kang-with-clouds-3.png
+Q18PMVjD/FMt8ZnM6aNKqwC/juYvPqdTC2VyQNr12mc=  share/snis/solarsystems/quidgebo/kratoria-normalmap5.png
+935dU6dDMOnsKKxIyVvwRWXnKruG2I4wpHk4WTolNhE=  share/snis/solarsystems/quidgebo/kojax-with-clouds-1.png
+OAMOoPAuW5lDhQI278RI+cutMQbZzCwLXgRWCXoFRI4=  share/snis/solarsystems/quidgebo/behko4.png
+Jfzo+iQOqlH7UXivhihqxb8ansmdx81TxF0YHbXEF1g=  share/snis/solarsystems/quidgebo/lettek-normalmap3.png
+3SUjwxItKA2fNc2GMN+aLbVmWmEF6hS2RA4IMWJJqBI=  share/snis/solarsystems/quidgebo/kojax-with-clouds-0.png
+Hz7rt0FZsMftl9c/npTgvdKma6peOTFvnlxmjSWZUa0=  share/snis/solarsystems/quidgebo/lettek-normalmap5.png
+WwjfojhGTX1LyujM5SYGDgr4seRM80RoYXNiFGdqPsg=  share/snis/solarsystems/quidgebo/kratoria0.png
+nXq3Shk5Ych83l4bgbr3Hkdx0W6scBPF0V7scnXb37E=  share/snis/solarsystems/quidgebo/kang-normalmap-masked1.png
+dZfp5pRqDOdn6NJ4XwLoecpj+INCp4AUmUVo8Nm7YT0=  share/snis/solarsystems/quidgebo/kojax-with-clouds-4.png
+kBMBUOWEc3+q93oiqnUjH456Lro6pWUYhlwN5z0Apqo=  share/snis/textures/nebula4.png
+bL2QLHimTgHgMcCWXjABNNWAeYZjfYcSMG69Fe8NNqk=  share/snis/textures/image2.png
+b7DXIzd+nWDSRWbk8DQ7//qw2MQeuPlOzyjSdbEXzK4=  share/snis/textures/asteroid1-1.png
+W7nfdb9VMbOKGdqV9TaTcdG4zNtSli2SSjcBSm1GDZE=  share/snis/textures/shield-effect-5.png
+feegihOIQG+xoKvmDVShGBw3LMKR167sRb1AxaC9UlQ=  share/snis/textures/docking_port_emit.png
+tsSFJS0rPmfjZ/4vVm7OMQBe2Wz0deR9R/yxBimD6SQ=  share/snis/textures/test0.png
+/PIgiWpw1O0OEq2QIKYrFAugwg0LcmHcmlfJ1MGVCDU=  share/snis/textures/image1.png
+NLvU/59v05tYPC9aRQ2BX6LzgKUNBgCOQRJ45vak2RE=  share/snis/textures/SearchTex.h
+2k/LQHxaE/xCvzOCE6TYLa5uWCUudkypBi7qCjO2z0M=  share/snis/textures/red-laser-texture.png
+5W0Rrv0uY9lHl6Iw/sEmMudao9mfHpdyjrY79Ixzjjg=  share/snis/textures/image4.png
+b3doaoh0jEx1/QyFLRFgywywdgZLg7bHhOoWxMOzOA8=  share/snis/textures/nebula1.png
+qa+GMZIFUsi0alvpPK6/x5trzi1uCh4s7XGVFyRb7l8=  share/snis/textures/planet-texture2-2.png
+OPgWwgxcS/1b3THaFrtNnzYt+99K9B6dWC7oUCs32Ko=  share/snis/textures/spacemonster_emit.png
+1fp2JpcUTe67K59cqJArUYfd92M9Y0RKkyr/GMhbhZ4=  share/snis/textures/planet-texture4-2.png
+wPh3eMWNFOnV0lTcukc5Q/nWYcie8psvzQKhPsmchWE=  share/snis/textures/laserflash.png
+wuV4OTamtbsgjwyuwGkMhfU5uo1lbeq7/kO0I4KR5II=  share/snis/textures/sun.png
+wAQxZvLuWOYmjcuxXItq74gXRHbiIynmimqAabkS1Y0=  share/snis/textures/asteroid1-4.png
+/i2k0BycH0BjQRnET8t4Xu922o32opuUaXUfCWZQbAA=  share/snis/textures/planet-texture4-0.png
+aa/sAw9XYjnlMWjhVa7VPsOHuRx6ZJL4v33K4+X6LSk=  share/snis/textures/orange-haze1.png
+JUsA8yAlIcrqPj/8uV9jje9p8/ZFfNafSuvhjK+3WTE=  share/snis/textures/orange-haze4.png
+uRpM1zUVx9v/BpzOzIsErChjRFWX1qGTrplbO1J2YZk=  share/snis/textures/planet-texture2.png
+voVPrggGISbkzaT+cRogpazpuz5Ne+lFzUwYlMYX9pE=  share/snis/textures/shield-effect-1.png
+owLzXsDKnWs7MzLR870qGzjLtaS1sjqyn5EyRWpdguk=  share/snis/textures/planet-texture3-2.png
+5YQoYXRPmMCZesHY2vOLwrKZNCGYEPXPIEdMPzSXu1s=  share/snis/textures/planet-texture1-5.png
+9kqPPo3QACOiODvDpMedgliJNH0AXEXhupk75xwDV2A=  share/snis/textures/asteroid2-1.png
+rBFPOm85oxatWFk10GqW2adMvur0e+6sH8jMaexieh0=  share/snis/textures/docking_port_texture.png
+NOHJklr2vy7n3gcCtZ15+wB03B/mwQl9xiWk3zsXucw=  share/snis/textures/planet-texture1-0.png
+ve8rIg6fQKd1bl5A0nNsy8KToA6+yQdiVhzMD4G9HNU=  share/snis/textures/warpgate_emit.png
+yGWnyrjkJwmM2QLLuOwzk0defPeoYntdU94b+T2rIKk=  share/snis/textures/planet-texture0.png
+tG/Md9d9DKqpGnBs6bxloJQ2c53TbFGPdewrLwVnxvU=  share/snis/textures/warp-effect.png
+WOe3mrkFNULfde8Os6CwkapWPnoYxa1nTCvAjRlaOh0=  share/snis/textures/planet-texture2-1.png
+SXczITkM31MVG282IGBGRBrQSiXW68GinNumxy4pKlQ=  share/snis/textures/planet-texture3-4.png
+9Dhmsk+ghc0tK3yeOb9+bC0W5MkBs6wcmu0F+bqMEZs=  share/snis/textures/planet-texture2-5.png
+t3aV9sHRKm0U6xayfyaauS8D9YSMAe/ka270tyA6JAs=  share/snis/textures/asteroid1-2.png
+Gn01DUplOZYicSMwnTGM/Zv0C4rFoG7iv/u9p18RJo8=  share/snis/textures/shield-effect-0.png
+oY2FYcveIasOV17y1VIEp/gXRhX6vsZiB8eP+ekUby0=  share/snis/textures/spacemonster_tentacle_texture.png
+Gg5pfg1VAhwpJihcAh2a5we5J51v0OgXUhRza1f5ljk=  share/snis/textures/planet-texture1-1.png
+iT0RupvQ2De8n1lZiPNH9iUbR91tDIipsukKTUT1nkY=  share/snis/textures/asteroid2-3.png
+XCxxYpC/SwJvRbeJcNdYxoaKzeUhe9jZJManDee/m0I=  share/snis/textures/planet-texture1.png
+Naq8wd8scSEYKG6cVgbvyxlHaQYBLY/VSIAsxYut9gk=  share/snis/textures/planet-texture3-3.png
+5m2KMC48kMJkkwE2OezWQIsjzxkCoOfjJ4Mfo9AQDgs=  share/snis/textures/test3.png
+Gdy3R4/Cy+6hIXdC5Vm+vNJA+6A2u0ygncA4sNdAu+c=  share/snis/textures/shield-effect-3.png
+JuZa9PqoVj2CDW9FQUf0URuGdNRjs0T1TUOlAJigVJg=  share/snis/textures/planet-texture4-1.png
+7JmkvpneenxcJTqGegRR1bpS8wVJlLf77pLX9xEkFOc=  share/snis/textures/thrustyellow.png
+ZtclgRtGBoVC3zFOVt9iwor62ykWDqE7Gt+xYoU7A60=  share/snis/textures/orange-haze2.png
+sxU2loGuXwL8sXOXoDZHZuJwlvO8OYiebE26lC7+1gY=  share/snis/textures/planet-texture3-0.png
+7hxqo6H36Z1Y8st5iAs76FV21jHexzrz0SfXsCFLFZE=  share/snis/textures/planet-texture3.png
+0yeR1oiabw34pMhqaCTAS0v9JYGo3bkfzolxy1gVBJ4=  share/snis/textures/asteroid2-4.png
+pwwdS8LBUqJPEQ9z9LMsv2i7UzIl1eQVosWCqeTMQk0=  share/snis/textures/planet-texture0-3.png
+hhr5x4ldUKGu4h/HYT/OYPAupSEAXAC3lX2xnNlHcJk=  share/snis/textures/planet-texture0-2.png
+CaqJmkUepAE/9XwchABVq9qw+YVAemIFtRanMaBTy4k=  share/snis/textures/snis-splash.png
+j5Zu+URDtGDmBMyWJCJFrCGi6yoQl6yN0poCJpjnPiw=  share/snis/textures/asteroid1-3.png
+ptMqPDagFV5ByB9SOhHMi8v1MYI06rrir/hpTcW/8ak=  share/snis/textures/shield-effect-2.png
+3t7DYfH3UFIMziOoeo1S/quImsFujuWt0yZAZlg3utU=  share/snis/textures/test5.png
+nA/khdo2xQUIeT/8OrJ8IsuC0QZEW0s10D/PF+igjoE=  share/snis/textures/planet-texture3-5.png
+CWxKTsAMnghzp9x+HvL/lUHIKUTPhs+TaKkJLMSZ4Ok=  share/snis/textures/asteroid2-0.png
+PSBtm8dv1Vrux9NouwJcaxyIBXo/wycjk5JBULkq0Aw=  share/snis/textures/planet-texture0-1.png
+ztlnzpogbeURJd+s+35g+rBU21IcZX1G/ypLUBdrkpQ=  share/snis/textures/nebula0.png
+LZASA8tymfnSe6yHTEKARdtFsB1ld6fNBWqIZU5yfpo=  share/snis/textures/spaceplateemit.png
+uwjrhAuKKOa5oI3IEdOYjgcD94eb0SIbAnb/CVx+gto=  share/snis/textures/orange-haze0.png
+ZiQ2WTzBnfzxlKP95jzRWp6Or8sH5GLyhzFs+DzJCHA=  share/snis/textures/black_hole.png
+6EibwBx7mB4hiQhdpzhDBrKcc71V1w7JH8roJWhCeek=  share/snis/textures/planet-texture1-2.png
+pNgkfKcRmgg+V9A4Rx9gSOm15m8w8A3r2/Dc1tHeArg=  share/snis/textures/green-laser-texture.png
+DR4OvjL8ufLgr/8qgByf+C2UZZ5Yu5Q/yDZegUXaRYw=  share/snis/textures/space-blue-plasma.png
+/Q2L1u/FdupRZ+n+atY3WFS0aS9aZ1Q9YRVzVzPZD84=  share/snis/textures/test1.png
+BNfw7Xu1/+c0J+yVnBwyH8iUkrKFRXiw6bYuBCD9FBM=  share/snis/textures/spaceplate_small.png
+SHkdQE7qE1yITbv/+IDJy0p5QdoiyGI6lzeWL7rOlIg=  share/snis/textures/wormhole.png
+uGbZCQTfxPcD1hH/Qvv8igPMgNWPUVTzU0pggXRkCW4=  share/snis/textures/nebula2.png
+6L9z71blRXrSBZ8BQ3BCNeRk+wcedBRLwf0ABzPQk7U=  share/snis/textures/planet-texture2-3.png
+95SsABCf3Z7i/Bk9nC/ZhG/1xyojtmS0qITXejNBvpE=  share/snis/textures/missile_texture.png
+gBzdRXag8Vck4/bhs3bjwVljB52r97vM6Dp6KXJiUZk=  share/snis/textures/Attribution.txt
+zpYzUcnGqk41Wqyqc6npGE3wxnOXBHwwJCU8O+nOoYw=  share/snis/textures/warp-tunnel.png
+3GFnC6NCI/IcECWu4xSAsYewu2wx+tczNxOXJCtXQYk=  share/snis/textures/thrustred.png
+My+PtVBAWSEcf45XOdzJcUm7P1HpM/SaAp9BDUAG/8A=  share/snis/textures/orange-haze3.png
+A3qz9q0y2rblriaOgzVV0vZw50SnN9M6OYDldwXJQnE=  share/snis/textures/green-burst.png
+VMlOSXA8axqkHvzypyqFZCLhTOWFenhcWlmFP6S3CqI=  share/snis/textures/shield-effect-4.png
+w58o5Iyca4xOVFWO5gQb+hFJhvntQ7P1ma/Ef+DGFsw=  share/snis/textures/spacemonster_tentacle_emit.png
+ilj59TckPx6ajaJYigTaF5gwEhNJFc9ArRMF7ueM3SQ=  share/snis/textures/thrustgreen.png
+X8pGQCpoI3L7X2CVlYFNIiS7xdq3lYmvt0b00lt/0jA=  share/snis/textures/spaceplate.png
+TXXk9FKF5QU350JafBDJOfzmYbg51UWY19TASNxaGFY=  share/snis/textures/spaceplate_small_emit.png
+4FqB9Y/+wj0QXQmbOPHuMzFKXRHlN+OAFtib+8I+gHQ=  share/snis/textures/planet-texture0-0.png
+JoGKUw73Pk+sLm0hkLkp+p2eDySZNhAbOgcSF/jtCOI=  share/snis/textures/thrust.png
+tc7uDnh4NBpAuluvVCy+E+3rG9n11RBTv0D64znMTrU=  share/snis/textures/red-torpedo-texture.png
+HHIQ/ad1iMCcyz6ecTKdlxBREkPFrXVnOSkjqTRr6OA=  share/snis/textures/planet-texture4-4.png
+45Uo93rnr/shVSubbiEEd5Apic8U11zd1SPOvrCmVpc=  share/snis/textures/spacemonster_texture.png
+VYYA8t08+Zf6eTWbWc+DELnqNskO12rucmWiYQQ8zDI=  share/snis/textures/planet-texture0-5.png
+Nm7HChSSNgv1NPoh0uOKzHapg1VZdXXv1hswKbI/eTE=  share/snis/textures/image5.png
+ne7cK9xjNp0TnB60xuc80HbtVjsjQGoKUKESBMwQlig=  share/snis/textures/nebula3.png
+Yt+H9/UlHzJH8sO7bqhogS3+fkja/l5CkD3U9meKPQU=  share/snis/textures/planet-texture2-4.png
+Uhfs2DKZ/hWurebH1SPdo1alVtYeFjSyNMMa/9OUtAk=  share/snis/textures/test4.png
+q0SvA9m1ippSHPvEvpowWXD3JJinyGDB0XSnncc56LQ=  share/snis/textures/asteroid2-5.png
+rtHEKMD4UjmW15AOGUToti/IQOYW+DdMRXRGNVcI7pc=  share/snis/textures/thrustviolet.png
+gYiz/GPlAQ0mjHAb/AWFAeqlXxf+uSlDUNWjr3Zyk0E=  share/snis/textures/asteroid2-2.png
+yrh5TIvvcyWUnn6pMV1HvUwpvvF2LjTDdEbO/vOOwGs=  share/snis/textures/blue-tractor-texture.png
+unhj+PvE4o9KrqOxrlRIlgH+p4fVKTkZVxzfiqBU+Lc=  share/snis/textures/planetary-ring0.png
+rx3P/9vVkyJ0Rdn0SshUpnDCIimm2aocGwYeeMBVp6w=  share/snis/textures/green-spark.png
+haxAJCl2GlOqmcVk4DIimSeJyI6k3QlAIwK0fCfC3BU=  share/snis/textures/planet-texture3-1.png
+y3Y/adrgA6lvTrH6DTd6nV2CvQVLoY4FTsqFFFchvI4=  share/snis/textures/planet-texture1-3.png
+1f1b6fo/pdell2aQJC4dUdHU/Nh+HUMTOyzopyObUPE=  share/snis/textures/test2.png
+sA2gp9PL5W8dC2dhD5pMPrxTrO+1VheCBS+GMmabjmo=  share/snis/textures/thrustblue.png
+6AjSTtLE/nBSuRfIV62pz1ehHTwenunC4Bmd0kB1wes=  share/snis/textures/planet-texture0-4.png
+7htWUMHShDuD6/2HISWkabC5DNrfK+RQ6tojClMOAso=  share/snis/textures/asteroid1-5.png
+JyViATMb/oIRvvsn6TuMy55hvPDZYom5tGfb1z0YwF0=  share/snis/textures/planet-texture1-4.png
+LPCcBs9F3JchXn/GC/Om3/lS83kGEEWXpTJ4zsoF8Bo=  share/snis/textures/planet-texture4-3.png
+Wh2sQl00I5MrG90MTszGg49mvUT4WPxM1CI0GcxnpLA=  share/snis/textures/orange-haze5.png
+8oOAQ8QdEN8I63f0TO038P4LKvK/uki3HggGuNiaQUI=  share/snis/textures/AreaTex.h
++IFK3O9cCGTHz6TwI55eWXt7OqjMGlRCoYqkXIagUUg=  share/snis/textures/warpgate_texture.png
+tga4EBDAxQZ8s77XkwJhAxZseKcnZrI/Lv1g6HsGby0=  share/snis/textures/planet-texture4-5.png
+uwA6q5a5bz83tVj0y6/RmHqysXcgCwGQzhB33xIqWzg=  share/snis/textures/planet-texture2-0.png
+aTAJfiPS21rNKKkiuVrDj6LOkFGUaYdIY1FXhfXB/nE=  share/snis/textures/spark-texture.png
+IBnxZWhqS8Fj6CHlHba2yfBAXb/8J0SYo3nrO8Vc2UU=  share/snis/textures/image3.png
+PSZIRVnPrAMDprYiMJsB8lmEukf+QTh322sYrPO8jfM=  share/snis/textures/image0.png
+QJS0T/lJngrJzpUlyjyE043e/ugOZnph7bEz/k9/l3s=  share/snis/textures/nebula5.png
+CxYDZH5UWzGdN1EVKucT/zoKxe6vygqUdITQ4aMNCwA=  share/snis/textures/asteroid1-0.png
+M3w0qG8Auz2fuxzZU8HSHGHWuxbd7IlAAaBwojIvuIM=  share/snis/sounds/warpdrive.ogg
+62vHepCtfezI2OL5K9Tw6j1tkhuRUT1s76Lxs5jqxC4=  share/snis/sounds/flak_gun_sound.ogg
+aSugcnnCHsivuunEXPUYdUrdQNF0xe0BxQnwMMT/o0o=  share/snis/sounds/hull-creak-8.ogg
+lMSgVlq5FA54KmLsgunTT6aL0NRMMU0tt+YvCz5PRWI=  share/snis/sounds/ui16.ogg
+zMYjh+1jm9IvWYHo/u1Yj1VuFvMJ8Iwb7CN0+VDoJig=  share/snis/sounds/dangerous-radiation.ogg
+wSgcpszHLNfaxJLmNO7XYmiomLLzZ2ZtwV0TRvKOXYI=  share/snis/sounds/missile_launch.ogg
+XxVoCkrZgGurURqHY4sFLyPAuHQbDXSXwS+2D6cIKMY=  share/snis/sounds/ui22.ogg
+XcAgZrNcd+n7RgAC0dyn2t5jjaB4UCHAEzgylw6jfDw=  share/snis/sounds/incoming-fire-detected.ogg
+hetNQl4T013LTFC2F1j0AN7dgaWQNQN77TYTFs4mybw=  share/snis/sounds/lower-shields-and-hit-lights.ogg
+MpL0mRob1jPCCtSr/pPHHF6fUyTrL7GGInVeMPfLnV0=  share/snis/sounds/ui21.ogg
+vBfcd8VRYLyFNmXtTauqDC3C/AxwoQDe1htJcaFzJZM=  share/snis/sounds/ui3.ogg
+yNZ91msi1zqfg5Ula2ic4Y9xOiKuv3j/sokOFD2ivzk=  share/snis/sounds/ui8.ogg
+F63fHH+D0PxV8Hk+VTGUnvsGCSudlD4A+ndhUswQWFk=  share/snis/sounds/ui17.ogg
+JO6gnvjr4nwqJ5tjzXm5hihyk5P8lFdRQVltk7HP5Rg=  share/snis/sounds/big_explosion.ogg
+3fhHYOSUUbMMMAIxyL2Sl39qM+nDRw6B0z5JbS1lli0=  share/snis/sounds/new-starship.ogg
+VS45opPywO/V6la5E6ibPVGU3RXGrpLoKP3bPBuIeSU=  share/snis/sounds/mining-bot-standing-by.ogg
+37720d7H6hXQ3iDOo3aycRT+oj14XJixDi26TF+Qm90=  share/snis/sounds/docking-system-engaged.ogg
+OSKIkdz8+mYqju6o9X/2FRitt+xrFBuw+o3RjbY3+IU=  share/snis/sounds/quindar-outro.ogg
+DTBDto+t0skvJVkEnXmvqVS1WrYgEAolFIZL3zfij8w=  share/snis/sounds/hull-creak-9.ogg
+bB8jW2pjOmjkKmUdG10KE/zkPe9ZBkfql+ekYW5h+tU=  share/snis/sounds/hull-creak-3.ogg
+GbZbjqnXgZdELVpmcv6UTVHS0+mDbYac9NoMznUnIj0=  share/snis/sounds/ui12.ogg
+lDH3PDcYRw5vHDrr76LYjCuHvz/gvkBuUULQG5j/cJA=  share/snis/sounds/ui1.ogg
+UuLLgvRsgVEU/bNunir0jR4vRScyhAMtnCUXfQBxLfA=  share/snis/sounds/hull-creak-2.ogg
+mCVOXTLHB9QTD9nZ/lZrgSfB6wQPO91xwXtoEZ3XBoU=  share/snis/sounds/admiral-thompson-msg-3.ogg
+GmJXF9hiiQhEGENq0rZUAfQKRvPp1wc3BoqA+P+SfTs=  share/snis/sounds/too-far-away.ogg
+ZYNZkH1CCUqQNCClQs1Ql+ioUOQoxMy/kka+TLnoVME=  share/snis/sounds/science-data-acquired.ogg
+FbSSyqJLEmVFtZYrDM85oBcHAaW6zsS3wC2h6dXyGFY=  share/snis/sounds/ui20.ogg
+dFeSEAOfIyOZ9NduuIBXM9h+92nP8B/HOTKTyW2U54g=  share/snis/sounds/onscreen.ogg
+x+iE3J6qD2C1WrnKjdIzXjgI0yQp5x6lpWciGSoCnNE=  share/snis/sounds/hull-creak-0.ogg
+NVGnh4o64IrS3wwKzpAnSkkfZ1ySA9vj5t9FFH20FVE=  share/snis/sounds/ui10.ogg
+KOEMtSC+szli1eXEuYjuprQn2hANzLywd9E27pxCAPQ=  share/snis/sounds/ui23.ogg
+qHHyg8zMVHfy65ZKU4EzzHu6AyzXBQGc+y88Kyc4wy8=  share/snis/sounds/bigshotlaser.ogg
+wcuiI4KG+nrKt27FVvq5i9w1RlLlsB2XbYyp6xN6E6g=  share/snis/sounds/entering-high-security-area.ogg
+6UozVwDXgR0gLMWhke1VuyrMjYRtkT2nKZt9up+YYuA=  share/snis/sounds/changescreen.ogg
+cDeoyDoVEi++APEaZShuKA153BMsPvsgoMOgn7U92LA=  share/snis/sounds/mining-bot-deployed.ogg
+sY5H6X+BtCDNHCF0HdqtOTHrRSqbgXqxrYL0A5a1gV0=  share/snis/sounds/ui25.ogg
+Aa0UYl62UcXNwPS/iv0eIbMrqEdYn18wai3c0PczhLQ=  share/snis/sounds/ui26.ogg
+QTrI549AI9iqot3E1dOe9YnbG5uF4RXrg3YP9AM/ODQ=  share/snis/sounds/ui15.ogg
+rxT45RNv0iaX19dzKZ6ztbqNtC7RGXPwYzDNentgU5k=  share/snis/sounds/ui9.ogg
+JP1byeSOzXpeD9AcWigPMZbPO7+PKlOYaazi4zcCRbE=  share/snis/sounds/tty-chatter.ogg
+LlxVnlR5ZEmEjYmx9RrdrsBR6bBe+tOaUWuICX7UY6Q=  share/snis/sounds/transporter-sound.ogg
+hJK8wU7Ou+bKyYAtxvdt5c3naGJgk2FSlYvCsE+UmCQ=  share/snis/sounds/ui24.ogg
+HzO1nHFz8nFH0BQ570/R4Fb8j7V2x3Wb8QRKPUbIkNM=  share/snis/sounds/admiral-thompson-msg-2.ogg
+Dsw2OIM2fY77XIFee+bCYcLyjYjSHpP5sqVvSsIKfUc=  share/snis/sounds/red-alert.ogg
+jUcyAUHF1ZfE1Y69R4NMBirgACyI5UPABgrDXGJK6rE=  share/snis/sounds/ui7.ogg
+Y96lZp9UYrIs0yuwtzactjMrBc/K2sQwrtj8/LJz6fA=  share/snis/sounds/wombat-clear-to-depart.ogg
+M6/b5s/q85+M46C1m7I47pJiUe8TYMKfQVSBw/QvX7s=  share/snis/sounds/permission-to-dock-denied.ogg
+I2rpkcSnFp7E3iIiwxvOsYPYhE46yA3Tb4o+gxPpp5E=  share/snis/sounds/hull-creak-5.ogg
+B7C0bHJrFjVaTtvGZtARQuvGzO+wFsjL9tzxHsYjsgI=  share/snis/sounds/ui27.ogg
+fC3HQU+0R8pQhUOaXvEgBBh6Hqqrbx2p/tJFAWxOKdE=  share/snis/sounds/atmospheric-friction.ogg
+Xi99nPux36r2gs48NgvH1oXslfAMiorb/5UDCuDNWJE=  share/snis/sounds/laser-fail.ogg
+u6Y4Sv+K7xUeGu35Rn5Gk3yZH7PzezNaBsZ0O8uGvf8=  share/snis/sounds/hull-creak-6.ogg
+SI6WgFEWvhAfPXHRNXkZaJW0T4qvuaMtK/RETHJDmPM=  share/snis/sounds/ui19.ogg
+IO/Bnaopag3yqYqlhTDMBEqr9P62QrZfY0dHs5K/bhw=  share/snis/sounds/ui28.ogg
++PoUsFmqU46EDTd9dy8Vrtuh94fH0IQ3aQWZmamVBuE=  share/snis/sounds/fuel-levels-critical.ogg
+S1XDYaz1S21zFlgu49VcOSw0G8f3QzgYQgB/v/mR7fg=  share/snis/sounds/science-probe.ogg
+jV1giKFKU6HyOkswYjxyICWJu9VgmsIUdLLucCV6OYs=  share/snis/sounds/spaceship-crash.ogg
+l/gs4KL7yfVhe022w/wRYZfXHq0afDIaj8JYv1ZgPvA=  share/snis/sounds/hull-creak-7.ogg
+m6RJLsU600W5cE62CRc3YPJXpHN3Tna6DVnQV4aKgd0=  share/snis/sounds/torpedo-loading.ogg
+J29bTFpvcj76HuXask4cCWUgaRVCjZi5U5KhKp2NTz8=  share/snis/sounds/Attribution.txt
+HKbh7frj2RRjznHtfEM52b3GvOSjyJTULWoCfyVqtPM=  share/snis/sounds/permission-to-dock-granted.ogg
+dtxJIatbBd0oo69QLyJXuWE8qMPmAGqsPxFeY8cofWI=  share/snis/sounds/admiral-thompson-msg-1.ogg
+8PKVRRE9MKjsc4XWcbzaRhdY5TXQOxnpZmGPJEqGvss=  share/snis/sounds/permission-to-dock-has-expired.ogg
++UUCF4s6zcXDSk5OdnhK9tnkxO8HF1sC64S2mQSfJXw=  share/snis/sounds/alarm_buzzer.ogg
+TgpAlop/PjMQZ0tdVIyYM2EkFWdvWIgxg2TMsif9wTg=  share/snis/sounds/slider-noise.ogg
+D7nFmIgGwYBCdTFVxoUUnO26gyZVxO58GLxSpsOlgeA=  share/snis/sounds/atlas_rocket_sample.ogg
+wrQ8oxfGgi2CU94MxsvjH4XUvnHA2F+FqI7S4ikTTH0=  share/snis/sounds/robot-remove-component.ogg
+ErOZM6hPxAiQ0quCZ/qsdMx47hI9iaqrMTHWpeuM4Kk=  share/snis/sounds/ui18.ogg
+AbpHGcgLb+kRsJGnwFEktk7uzpZOCcBY74+YBdrKVGs=  share/snis/sounds/.gitignore
+HFw3Y9tECsE4EIgO3EpxW0LAQb6IqKmEZmwWsJQqzHw=  share/snis/sounds/crewmember-has-joined.ogg
+stbsVMZbvmUXpN/UaaGiSv40poGPmIenbP9kW/jHUqk=  share/snis/sounds/spacemonster_slap.ogg
+AcO73sTqhfaKsDrq4sW+n3j/jaUzmPWyoNtjeAoNmC0=  share/snis/sounds/ui5.ogg
+O5EtUcOTKsVTwDEGyn2VD/B5vGkOxuIsDmoPQQ6aLJs=  share/snis/sounds/ui13.ogg
+VEF2hHz9zWUK0Go0JJn1rXzI7jcZ/yCcJly84UNWRI4=  share/snis/sounds/leaving-high-security-area.ogg
+95s2aGzB4eMcxVkHuSEv1RewrvthJRnFfKbtsZXAeJ0=  share/snis/sounds/admiral-thompson-msg-4.ogg
+ZgWbO9P0rAi1nyTEgksvXgpUA7zNuhuAOlN1BBwZmXI=  share/snis/sounds/docking-system-disengaged.ogg
+jdUxacVMD/2GjfdeSRTAky5lxP+DVT1SYxcnPVIgpbA=  share/snis/sounds/warning-hull-breach-imminent.ogg
+xF4P6tuRW5S4le1X2FUU1zY8DYgG0cAZfKHawhDe2QE=  share/snis/sounds/ui29.ogg
+Il128EgLTTz5QY6s+oI42DWsLtVs0W1jDzANzmjmtzk=  share/snis/sounds/ui14.ogg
+cA+vw8MrPNzgXNCR3i5w5hj1X7xj/Ogim+8R5uRJBOw=  share/snis/sounds/warp-drive-fumble.ogg
+7obOHtqTvy4EokgZyOOI2zOuVzsatyH9IyDv15LyxDU=  share/snis/sounds/ui4.ogg
+zIOlRvU3ipx2E+zPXvbo0+oL2W1smOmZbHIbDrurVNk=  share/snis/sounds/comms-hail.ogg
+YNbfTWkx18z/k7CLkYbJuB4esR16vdYNjVMMOyjnKu8=  share/snis/sounds/quindar-intro.ogg
+isYjrKmyfr+pIv+A64XG1s4T25i2DwC+4uKAozwyWHk=  share/snis/sounds/hull-creak-4.ogg
+VkSEd4RnpgCpOvP6BCeZf3fdkgNzEo9Mxt1B2dhD7ZI=  share/snis/sounds/mining-bot-stowed.ogg
+yjsXJuRNERzsEwys8PveeFxD9iWfp9AISHJPnm+1UG4=  share/snis/sounds/ui2.ogg
+AJDpU8jHPRPn+vNR070eaYKx1Firm8oPvqGBu8b6qSw=  share/snis/sounds/short-warpdrive.ogg
+7OxYJni0/YO0zqo3bQE3nTWuOl6FPnR7DttabqSqfcg=  share/snis/sounds/ui6.ogg
+LB3ii6IxRCfUOw3O/DdsluAle8OWsRvOXW5oVem7aiY=  share/snis/sounds/docking-sound.ogg
++ZWq894h5qmkABEkpDZq1rF7ndzvQQyi+rm4pUaL9Pk=  share/snis/sounds/offscreen.ogg
+f/Eib5QZ37pZ6vn2phnthLR3eVAvZxDaHGM2eRn9NM0=  share/snis/sounds/ui11.ogg
+kkzmh1bGfUaBfRWTj5eu6ETOyjfRfjAbmiSSLlpl2qc=  share/snis/sounds/term_ready.ogg
+Nee451qKNDAhvOeN5QYEeDEDaTR4xER08yRNAy0MUPs=  share/snis/sounds/maneuvering_thruster.ogg
+ngeI6CXcbW/GQz0O+hAwknKOQz4djqCeLB0R4wCn92E=  share/snis/sounds/reverse.ogg
+JS/yUyuYwypcy00E3D0DfONyfgA2V5hw9NhZnZ+AwiA=  share/snis/sounds/proximity-alert.ogg
+MnRA39onaLzm2rXRKp2DS4mClIpcutmZrAOAyQw4UP0=  share/snis/sounds/welcome-to-starbase.ogg
+0TLz3pMG+j8snPVo3RQBx+aO9E3mlKSyoA/CHvrkqEM=  share/snis/sounds/term_reboot.ogg
+br+y2UEhv5wVEj6fS5Q+z07a/cHaj34jJn7nvg5boI4=  share/snis/sounds/hull-creak-1.ogg
+elHA3oDhlCDRW9bBhP4HE9IRZzlhUnFI4BNkZ8ggjJY=  share/snis/sounds/robot-insert-component.ogg
+k6nsIygzYVrngPTq4X2zpcPEsMZf6CcC9c96DNtnJR8=  share/snis/sounds/flak_hit.ogg
+4SM0tn49+sgBfbrEkLd/hSBp7M0G9w4R+eZj8WC02Dc=  share/snis/models/destroyer.scad_params.h
+aQoNlN7oYyb24vWfxbtx63tIGYr38aoS57qXAg+4DuM=  share/snis/models/dreadknight/dreadknight.mtl
+hQ2mYWh41srrD8fbo/T52+c66UTvhIcVZIyveYDgdf0=  share/snis/models/dreadknight/dreadknight.obj
+ivzypSOWxxT9CL6WwwDA0wtemGXgF2c4C1rvBdR8PZQ=  share/snis/models/dreadknight/dreadknightlights.png
+EVJTZPmnPbEbR0b/inMQUteTPAArQPUYLV+Z7EKvw34=  share/snis/models/dreadknight/dreadknight-exhaust-plumes.h
+Jbh5f3hXc8CbEvqpd8tcGxF9T9/nVkBft+/9Dbscl1o=  share/snis/models/dreadknight/dreadknight.png
+00EpW1J+nYarLBElWWSG08wnx6KIuwnWWSwVvGvXxso=  share/snis/models/scrambler.scad_params.h
+3KcLByqnDm1JBX2gOK/bN4SYOxbOkMs91C01FqyE1ls=  share/snis/models/battlestar.scad_params.h
+6dsu43LBlz10kSh5GF22GCzqfnnfEWJdB+ZcElIAbYI=  share/snis/models/spaceship2.scad_params.h
+h7+qegmO8ifXFX0HAM/qKKwbagfqNGf4hIjReih/D0I=  share/snis/models/starbase5.scad_params.h
+WppubL8BzxjkbBGQWRoLUECSAl/QqLfihGhBuozyx6E=  share/snis/models/swordfish.scad_params.h
+ClIE4b7hI3WlK4D7F3EgDIElz344DqKqSUbIU8MjXuU=  share/snis/models/missile.scad_params.h
+vn6y23k9Zr6Frxeglh2VFuCOYWTYK1N0LYK1f3GwHvs=  share/snis/models/research-vessel.scad_params.h
+0iZfzuSf2hG/wovW4mgeZWAEk3s96uqlhDfDSdnb4NE=  share/snis/models/disruptor.scad_params.h
+bG4MPZiUG9BAB2L2zr1WhIVg9rHGb8xwf1+zr4U8M/A=  share/snis/models/disruptor/disruptor.png
+i8liNlQ0IehELSMk8ClhnUevZamo1vKEd3kmVHasfnE=  share/snis/models/disruptor/disruptor.mtl
+gDswiLtyCHStzmvDktzxqx1FrNepqJY1zULliViiqYU=  share/snis/models/disruptor/disruptorlights.png
+n2EDbPD+GBstmlZQIgUmOLqucn7mVOVqTjPdMaXpfYs=  share/snis/models/disruptor/disruptor.obj
+iUVp2H2z5YpOGETcdM4vm4zo4Ccw3EMBJqFSaCmB83A=  share/snis/models/tanker.scad_params.h
+5/D+3pQ7PG0LHNs65EWhJqo1LnTCY+QTt9Z1NEokyQQ=  share/snis/models/battlestar/battlestar_normal.png
+Vs/+Al0B0YlHtYrt+gR9A2oaN7kRQ//isVSV0ADGWu4=  share/snis/models/battlestar/license.txt
+QMw9CkEvogVWuHgRcZvJdTEmcwv1kbduzfWnb/NmREs=  share/snis/models/battlestar/battlestar_emission.png
+SfZKS5JUjsTT6iThcBwcNFFgCZl0o/WIEOWNg4Ip/B0=  share/snis/models/battlestar/battlestar.mtl
+lp2voLpqU/R4QR041FCdN3h9waPkIEcc9tS9tEcNn40=  share/snis/models/battlestar/battlestar_diffuse.png
+r8tZGQ2QwzMXNxuH6xKGMYW/f/BjWSdyhZ5XKLtbiZ8=  share/snis/models/battlestar/battlestar_specular.png
+6NZk6tJfFoeocVwTf0YBsgLJZnwgNP5sMDa0fpYxAUw=  share/snis/models/battlestar/battlestar.obj
+eycmBh9OBER8KDIdJBzhmWvcYBbIeW88GGyCTgeC7m0=  share/snis/models/carrier/carrier01_emission.png
+DDd3En+pSQltDOsx1jfjO7LXIlj+4ITLqgiJsMG5n8I=  share/snis/models/carrier/license.txt
+/hSXxmS/jf2mXhXQhFu53Q2ZU/VS+Sar+3crW7S+hAw=  share/snis/models/carrier/carrier01_diffuse.png
+9fW5rC4y06mG2l64ZF1acETdha3bhTk/LyBwuXyl3lM=  share/snis/models/carrier/carrier01_specular.png
+q62h3qkvbsmcYLTHawlQyrodRIxZTK0qnY2XW9LfJBY=  share/snis/models/carrier/carrier01.obj
+phh8zTry1CxS4jzA4UZSGVTbC1ExqJw1O4t9xi+u0xg=  share/snis/models/carrier/carrier01.mtl
+mFgiL+aEG1fVHbsH92PbVcN70fLTRuztrbqFGwAzkbk=  share/snis/models/carrier/carrier01_normal.png
+4BQJdaEuaKMi0XvqtSVDyWvFXqT4E2Mi4nUAH+w/44k=  share/snis/models/carrier/carrier.scad_params.h
+NJHvywL4JEM6fUvbBOy6NbVz2okloHeS9t08Um4yAwc=  share/snis/models/wombat.scad_params.h
+0/6Z2JGKVfj5wJr6VDcNQIK03NgbmHq0b5tJRCflKHM=  share/snis/models/enforcer.scad_params.h
+fQqYCjFWIGXW3YIxzWPOxdb8/YGJONXz7iPehhBSNbA=  share/snis/models/conqueror/conquerorlights.png
+8/1xXyxXPDP/WF15y5+kogGOMYL3nC8xl6EtJljnRhM=  share/snis/models/conqueror/conqueror.obj
+N8REjR+jbR7pptHQw0n2YJoeeigPnADzQ0KJF8iczJ0=  share/snis/models/conqueror/conqueror.png
+TSk0BX5uZ+KKkgfiINd86TiNSuHL9yD/QbkP4nao3do=  share/snis/models/conqueror/conqueror.mtl
+dt8dkwhHdrY17VE4HZxpZ0PK4K3lf0t13WgQirPouFI=  share/snis/models/asteroid-miner.scad_params.h
+sQqvPcJPsYoGMc14nuQQ5JC2dSZxWGaWelOYFXPGIf8=  share/snis/models/starbase2/starbase2-lighting.png
+SfA3vzZjJTqhfpMmd2P7FTQtbeb8Nl0aOK8Ahi72Ja8=  share/snis/models/starbase2/starbase2.obj
+6VJrGLd9e2xbRF/QylQDP3fMufOaE9OoxStT+fUUEDg=  share/snis/models/starbase2/starbase2.mtl
+JERd1e/04vxOzguRo6wxRVE2lA8dd/fRFpw3bP5y4Wk=  share/snis/models/starbase2/starbase2.png
+SPpdavzu1mIYBWZ7k8MurOKqomrLudQ/w+hpEywQGlA=  share/snis/models/transport.scad_params.h
+IvQB5JfGu72JyMY/VCuWCbb5prN4l50is2D0XCJJuyQ=  share/snis/models/spaceship3.scad_params.h
+1llp0sIB0j/bMcS6TLPd2GuHh4tFMdwKQ1JFGwXn4BU=  share/snis/models/spaceship.scad_params.h
+vExK3t9dNZyApXb9dpWU32KoTCbGh+YBjZ/6fv45/Cg=  share/snis/models/freighter.scad_params.h
+V9OtwxUEU/d1akq6lNjWqWXc2/NyJQUIilsxR7CH3vc=  share/snis/models/skorpio.scad_params.h
+pj2rSZW73/ByWCcd3oPlUtqw3iTwgpalJGeFairE9WY=  share/snis/models/cargocontainer/cargocontainer.png
+g79l4GF9d6RoSUK6tgGhDw63axXfQD5g4dTJF/am6VM=  share/snis/models/cargocontainer/cargocontainer.mtl
+ejOEV9+f8ZifoxttJAHBsfdgUccADVgNJTeQkfJjpC4=  share/snis/models/cargocontainer/cargocontainer.obj
+laEqDNPt8s+1AP29Mja2nA5G9pG7pn0KezfuJKUFRZM=  share/snis/models/cargocontainer/LICENSE
+YnH/ahz38kZ4QnpuwsSwzeQI9fY40AooMM2autwFSr4=  share/snis/models/wombat/snis3006lights.png
+J2ITCLPl//7kBY19LAfA6vXNQ6C7bMz7jSa1lNHjWh0=  share/snis/models/wombat/snis3006.obj
+IVeO66j21TOqPNvr4UISTcfs9IoJz0VREBKpelurkzk=  share/snis/models/wombat/snis3006.mtl
+T2xvBU+qbg7gSuR06HbGPfuaEwaRfDhwI9Q/+aeYWLI=  share/snis/models/wombat/snis3006.png
+tZUd0fg7gzU8Yg3Oc2KR/oSpogeeQe1Hj6fTddHyTT0=  share/snis/models/cruiser.scad_params.h
+FK641cM9Cn3HrzxDzz+0+MBA9NMsiEaVpL7PkKpY+10=  share/snis/models/vanquisher.scad_params.h
+iSxkdU2+fCDobdSaH+65ZaN1XOx9nv9Pv01eN9JbqP0=  share/snis/models/mantis.scad_params.h
++gyWpxtCPZDK4SjKAMBYnXgwvktwOtEK0GCNWPi4/OM=  share/snis/models/enforcer/enforcer.png
+037Rxd7G89RRYD/sKy+1K6LVQbhNzm4PxmR2xmZOqxY=  share/snis/models/enforcer/enforcer.mtl
+0iqatsYJNqoLONjqz4QrFY71lPUjm5l+uIiPdTDZ8qE=  share/snis/models/enforcer/enforcer.obj
+qI8pk3yex9c9NCNZCFzok4jdokRUe9awP49XCnY/vTE=  share/snis/models/research-vessel/research-vessel.mtl
+o+lB6nXxZcmrr6GoswoUv8ULY3pbkL/tc3n7dDuf8iA=  share/snis/models/research-vessel/research-vessel.obj
+xqwZ1a6qJ2JYQwjzP6IJuMWafdvVWMcKqrxvl8YfJzk=  share/snis/models/research-vessel/research-vessel.png
+Rn6FK2QXFzJrzTJ/4XTSZ9/shg4eAqwEeuqav6ktkTM=  share/snis/models/starbase/starbase.mtl
+saHGlegSC8YLUq/9LFBU+jh4vkxKiO8m0eqdOA+SiYY=  share/snis/models/starbase/starbase-lighting.png
+xHYqm7W/f3lHTbjcEslxna3JUTr/lASichFar5JkF6A=  share/snis/models/starbase/starbase.png
+GxlsExc94q4j/CG9a02TrQBxtf2zFWMxt6qdYb4T0tk=  share/snis/models/starbase/starbase.obj
+8Ql80Ex6EPNYG924uh4MLJFFt81pRdBopqocbyxufwM=  share/snis/models/conqueror.scad_params.h
+YB1UcmKP0SN0qYfJZH21+jZ+Ih/Z3B2KMmWGW/lkcRU=  share/snis/models/dragonhawk.scad_params.h
+zbRK2eGImSTOiyKnntKfLxCT1bN3NBhKSRLV01OQYMo=  share/snis/models/escapepod.scad_params.h
diff --git a/pkgs/by-name/sn/snis-assets/package.nix b/pkgs/by-name/sn/snis-assets/package.nix
new file mode 100644
index 0000000000000..6fb49f5377af9
--- /dev/null
+++ b/pkgs/by-name/sn/snis-assets/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+}:
+
+let
+  # Original manifest file at https://spacenerdsinspace.com/snis-assets/manifest.txt transformed using
+  # awk '{print $2}' manifest.txt | grep -v -E '\.stl$' | xargs cksum -a sha256 --base64 --untagged
+  manifest = ./manifest.txt;
+  assets = lib.lists.init (lib.strings.splitString "\n" (builtins.readFile manifest));
+  ASSET_URL = "https://spacenerdsinspace.com/snis-assets";
+in
+stdenv.mkDerivation {
+  pname = "snis_assets";
+  version = "2024-08-02";
+
+  srcs = map (
+    line:
+    let
+      asset = lib.strings.splitString "  " line;
+    in
+    fetchurl {
+      url = "${ASSET_URL}/${builtins.elemAt asset 1}";
+      hash = "sha256-${builtins.elemAt asset 0}";
+    }
+  ) assets;
+
+  dontUnpack = true;
+
+  installPhase = ''
+    mkdir -p $out
+    read -r -a store_paths <<< "$srcs"
+    mapfile -t out_paths < <(awk '{print $2}' ${manifest})
+
+    for i in ''${!store_paths[@]}
+    do
+      install -m 444 -D ''${store_paths[$i]} $out/''${out_paths[$i]}
+    done
+  '';
+
+  meta = with lib; {
+    description = "Assets for Space Nerds In Space, a multi-player spaceship bridge simulator";
+    homepage = "https://smcameron.github.io/space-nerds-in-space/";
+    license = [
+      licenses.cc-by-sa-30
+      licenses.cc-by-30
+      licenses.cc0
+      licenses.publicDomain
+    ];
+    maintainers = with maintainers; [ alyaeanyx ];
+    platforms = platforms.linux;
+    hydraPlatforms = [ ];
+  };
+}
diff --git a/pkgs/by-name/sn/snis-unwrapped/package.nix b/pkgs/by-name/sn/snis-unwrapped/package.nix
new file mode 100644
index 0000000000000..07ae89fa3c04f
--- /dev/null
+++ b/pkgs/by-name/sn/snis-unwrapped/package.nix
@@ -0,0 +1,86 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  coreutils,
+  portaudio,
+  libbsd,
+  libpng,
+  libvorbis,
+  SDL2,
+  makeWrapper,
+  lua5_2,
+  glew,
+  openssl,
+  picotts,
+  alsa-utils,
+  espeak-classic,
+  sox,
+  libopus,
+  openscad,
+  libxcrypt-legacy,
+}:
+
+stdenv.mkDerivation {
+  pname = "snis_launcher";
+  version = "2024-08-02";
+
+  src = fetchFromGitHub {
+    owner = "smcameron";
+    repo = "space-nerds-in-space";
+    rev = "1dadfca31513561cf95f1229af34341bd1a1bb2a";
+    sha256 = "sha256-Qi4lbq1rsayMdRWMAF44K2DNtlZxNUyjnO6kXCW5QhA=";
+  };
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace "OPUSARCHIVE=libopus.a" "OPUSARCHIVE=" \
+      --replace "-I./opus-1.3.1/include" "-I${libopus.dev}/include/opus"
+    substituteInPlace snis_text_to_speech.sh \
+      --replace "pico2wave" "${sox}/bin/pico2wave" \
+      --replace "espeak" "${espeak-classic}/bin/espeak" \
+      --replace "play" "${sox}/bin/play" \
+      --replace "aplay" "${alsa-utils}/bin/aplay" \
+      --replace "/bin/rm" "${coreutils}/bin/rm"
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+    openscad
+    makeWrapper
+  ];
+
+  buildInputs = [
+    coreutils
+    portaudio
+    libbsd
+    libpng
+    libvorbis
+    SDL2
+    lua5_2
+    glew
+    openssl
+    picotts
+    sox
+    alsa-utils
+    libopus
+    libxcrypt-legacy
+  ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+  buildFlags = [
+    "all"
+    "models"
+  ];
+
+  meta = with lib; {
+    description = "Space Nerds In Space, a multi-player spaceship bridge simulator";
+    homepage = "https://smcameron.github.io/space-nerds-in-space/";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ alyaeanyx ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/sn/snis/package.nix b/pkgs/by-name/sn/snis/package.nix
index cf81e96dde9ee..4db2fb5f39571 100644
--- a/pkgs/by-name/sn/snis/package.nix
+++ b/pkgs/by-name/sn/snis/package.nix
@@ -1,83 +1,32 @@
 {
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  pkg-config,
-  coreutils,
-  portaudio,
-  libbsd,
-  libpng,
-  libvorbis,
-  SDL2,
+  buildEnv,
+  snis-unwrapped,
+  snis-assets,
   makeWrapper,
-  lua5_2,
-  glew,
-  openssl,
-  picotts,
-  alsa-utils,
-  espeak-classic,
-  sox,
-  libopus,
-  openscad,
-  libxcrypt-legacy,
 }:
+buildEnv {
+  name = "snis-${snis-unwrapped.version}";
 
-stdenv.mkDerivation {
-  pname = "snis_launcher";
-  version = "unstable-2024-08-02";
+  nativeBuildInputs = [ makeWrapper ];
 
-  src = fetchFromGitHub {
-    owner = "smcameron";
-    repo = "space-nerds-in-space";
-    rev = "1dadfca31513561cf95f1229af34341bd1a1bb2a";
-    sha256 = "sha256-Qi4lbq1rsayMdRWMAF44K2DNtlZxNUyjnO6kXCW5QhA=";
-  };
-
-  enableParallelBuilding = true;
-
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace "OPUSARCHIVE=libopus.a" "OPUSARCHIVE=" \
-      --replace "-I./opus-1.3.1/include" "-I${libopus.dev}/include/opus"
-    substituteInPlace snis_text_to_speech.sh \
-      --replace "pico2wave" "${sox}/bin/pico2wave" \
-      --replace "espeak" "${espeak-classic}/bin/espeak" \
-      --replace "play" "${sox}/bin/play" \
-      --replace "aplay" "${alsa-utils}/bin/aplay" \
-      --replace "/bin/rm" "${coreutils}/bin/rm"
-  '';
-
-  nativeBuildInputs = [
-    pkg-config
-    openscad
-    makeWrapper
+  paths = [
+    snis-unwrapped
+    snis-assets
   ];
 
-  buildInputs = [
-    coreutils
-    portaudio
-    libbsd
-    libpng
-    libvorbis
-    SDL2
-    lua5_2
-    glew
-    openssl
-    picotts
-    sox
-    alsa-utils
-    libopus
-    libxcrypt-legacy
+  pathsToLink = [
+    "/"
+    "/bin"
   ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
-  buildTargets = [ "models" ];
+  postBuild = ''
+    for i in $out/bin/*; do
+      wrapProgram "$i" \
+        --set SNIS_ASSET_DIR "$out/share/snis"
+    done
+  '';
 
-  meta = with lib; {
-    description = "Space Nerds In Space, a multi-player spaceship bridge simulator";
-    homepage = "https://smcameron.github.io/space-nerds-in-space/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ alyaeanyx ];
-    platforms = platforms.linux;
+  meta = snis-unwrapped // {
+    hydraPlatforms = [ ];
   };
 }

From 3b2787f1aa804da7da1ddee6f148c3d9760f65a2 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 20 Nov 2024 19:39:32 +0100
Subject: [PATCH 14/88] linuxKernel.packages.linux_6_11.evdi: autoformat with
 nixfmt

---
 pkgs/os-specific/linux/evdi/default.nix | 32 ++++++++++++++++---------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index fb664e92cf176..e088246ff3de1 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -1,15 +1,18 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, kernel
-, libdrm
-, python3
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  kernel,
+  libdrm,
+  python3,
 }:
 
 let
-  python3WithLibs = python3.withPackages (ps: with ps; [
-    pybind11
-  ]);
+  python3WithLibs = python3.withPackages (
+    ps: with ps; [
+      pybind11
+    ]
+  );
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "evdi";
@@ -41,7 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
     "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
   ];
 
-  hardeningDisable = [ "format" "pic" "fortify" ];
+  hardeningDisable = [
+    "format"
+    "pic"
+    "fortify"
+  ];
 
   installPhase = ''
     runHook preInstall
@@ -57,7 +64,10 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${finalAttrs.version}";
     description = "Extensible Virtual Display Interface";
     homepage = "https://www.displaylink.com/";
-    license = with licenses; [ lgpl21Only gpl2Only ];
+    license = with licenses; [
+      lgpl21Only
+      gpl2Only
+    ];
     maintainers = [ ];
     platforms = platforms.linux;
   };

From 7e6a62051ed61a16904144f3593fe706bfad5999 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 20 Nov 2024 19:41:43 +0100
Subject: [PATCH 15/88] linuxKernel.packages.linux_6_11.evdi: set broken for
 kernel >= 6.12

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

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index e088246ff3de1..e865b25ae9a3a 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -59,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
-    broken = kernel.kernelOlder "4.19";
+  meta = {
+    broken = kernel.kernelOlder "4.19" || kernel.kernelAtLeast "6.12";
     changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${finalAttrs.version}";
     description = "Extensible Virtual Display Interface";
     homepage = "https://www.displaylink.com/";

From 63e45baa95b5300c3ee2463f1797a9dac3766931 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 20 Nov 2024 19:45:55 +0100
Subject: [PATCH 16/88] linuxKernel.packages.linux_6_11.evdi: adopt maintenance

---
 pkgs/os-specific/linux/evdi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/evdi/default.nix b/pkgs/os-specific/linux/evdi/default.nix
index e865b25ae9a3a..e65790ef26080 100644
--- a/pkgs/os-specific/linux/evdi/default.nix
+++ b/pkgs/os-specific/linux/evdi/default.nix
@@ -64,11 +64,11 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/DisplayLink/evdi/releases/tag/v${finalAttrs.version}";
     description = "Extensible Virtual Display Interface";
     homepage = "https://www.displaylink.com/";
-    license = with licenses; [
+    license = with lib.licenses; [
       lgpl21Only
       gpl2Only
     ];
-    maintainers = [ ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ drupol ];
+    platforms = lib.platforms.linux;
   };
 })

From 31b9d15443de70e17e6cdd31b9b268c3bf7b77e4 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Nov 2024 22:17:24 +0100
Subject: [PATCH 17/88] postgresqlPackages.postgis: remove wolfgangwalther from
 maintainers

I am now notified as member of the NixOS/postgres team about changes.
---
 pkgs/servers/sql/postgresql/ext/postgis.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix
index cca196dab006b..673ddf4b9eac2 100644
--- a/pkgs/servers/sql/postgresql/ext/postgis.nix
+++ b/pkgs/servers/sql/postgresql/ext/postgis.nix
@@ -149,13 +149,7 @@ buildPostgresqlExtension (finalAttrs: {
     homepage = "https://postgis.net/";
     changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${finalAttrs.version}/NEWS";
     license = licenses.gpl2Plus;
-    maintainers =
-      with maintainers;
-      teams.geospatial.members
-      ++ [
-        marcweber
-        wolfgangwalther
-      ];
+    maintainers = with maintainers; teams.geospatial.members ++ [ marcweber ];
     inherit (postgresql.meta) platforms;
   };
 })

From 1596e0aa7dcfefa869eba720d3137154c29d97ed Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Nov 2024 22:14:50 +0100
Subject: [PATCH 18/88] OWNERS: add postgres team to own cargo-pgrx

This is exclusively used to built PostgreSQL extensions.
---
 ci/OWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/OWNERS b/ci/OWNERS
index 9795b76eef46f..8e0f5baeb993b 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -241,6 +241,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 
 # PostgreSQL and related stuff
 /pkgs/servers/sql/postgresql @NixOS/postgres
+/pkgs/development/tools/rust/cargo-pgrx @NixOS/postgres
 /nixos/modules/services/databases/postgresql.md @NixOS/postgres
 /nixos/modules/services/databases/postgresql.nix @NixOS/postgres
 /nixos/tests/postgresql @NixOS/postgres

From 9e81eb8444f62085e30f2ed5cad453b215b1c4ed Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Nov 2024 22:22:18 +0100
Subject: [PATCH 19/88] cargo-pgrx: 0.11.2 -> 0.12.6

Just move the top-level attribute to the latest stable version currently
available in nixpkgs.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ce2bde8f8cd1..285353983ce25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7009,7 +7009,7 @@ with pkgs;
     cargo-pgrx_0_12_0_alpha_1
     cargo-pgrx_0_12_6
     ;
-  cargo-pgrx = cargo-pgrx_0_11_2;
+  cargo-pgrx = cargo-pgrx_0_12_6;
 
   buildPgrxExtension = callPackage ../development/tools/rust/cargo-pgrx/buildPgrxExtension.nix {
     inherit (darwin.apple_sdk.frameworks) Security;

From c8de5e8d85b10b19fa2cc1c08ebef979ff70ff8c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Nov 2024 22:22:54 +0100
Subject: [PATCH 20/88] cargo-pgrx_0_10_2: remove

Unused in nixpkgs.
---
 pkgs/development/tools/rust/cargo-pgrx/default.nix | 6 ------
 pkgs/top-level/all-packages.nix                    | 1 -
 2 files changed, 7 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix
index 5752f9535f80d..65d80ccc5396c 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@@ -54,12 +54,6 @@ let
     };
 in
 {
-  cargo-pgrx_0_10_2 = generic {
-    version = "0.10.2";
-    hash = "sha256-FqjfbJmSy5UCpPPPk4bkEyvQCnaH9zYtkI7txgIn+ls=";
-    cargoHash = "sha256-syZ3cQq8qDHBLvqmNDGoxeK6zXHJ47Jwkw3uhaXNCzI=";
-  };
-
   cargo-pgrx_0_11_2 = generic {
     version = "0.11.2";
     hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 285353983ce25..1aaf3fbf984e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7003,7 +7003,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration;
   };
   inherit (callPackages ../development/tools/rust/cargo-pgrx { })
-    cargo-pgrx_0_10_2
     cargo-pgrx_0_11_2
     cargo-pgrx_0_11_3
     cargo-pgrx_0_12_0_alpha_1

From 7faa64b0aa79fa16de9a983a0906de89ae0da097 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Nov 2024 22:23:19 +0100
Subject: [PATCH 21/88] cargo-pgrx_0_11_2: remove

Unused in nixpkgs.
---
 pkgs/development/tools/rust/cargo-pgrx/default.nix | 6 ------
 pkgs/top-level/all-packages.nix                    | 1 -
 2 files changed, 7 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix
index 65d80ccc5396c..b5a741cbf420f 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@@ -54,12 +54,6 @@ let
     };
 in
 {
-  cargo-pgrx_0_11_2 = generic {
-    version = "0.11.2";
-    hash = "sha256-8NlpMDFaltTIA8G4JioYm8LaPJ2RGKH5o6sd6lBHmmM=";
-    cargoHash = "sha256-qTb3JV3u42EilaK2jP9oa5D09mkuHyRbGGRs9Rg4TzI=";
-  };
-
   cargo-pgrx_0_11_3 = generic {
     version = "0.11.3";
     hash = "sha256-UHIfwOdXoJvR4Svha6ud0FxahP1wPwUtviUwUnTmLXU=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1aaf3fbf984e4..843cf961573f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7003,7 +7003,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration;
   };
   inherit (callPackages ../development/tools/rust/cargo-pgrx { })
-    cargo-pgrx_0_11_2
     cargo-pgrx_0_11_3
     cargo-pgrx_0_12_0_alpha_1
     cargo-pgrx_0_12_6

From 3903e1897ab692d3d63f9bd33916a63d7e40935d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 20 Nov 2024 22:24:57 +0100
Subject: [PATCH 22/88] cargo-pgrx_0_11_3: remove

Unused in nixpkgs.
---
 pkgs/development/tools/rust/cargo-pgrx/default.nix | 6 ------
 pkgs/top-level/all-packages.nix                    | 1 -
 2 files changed, 7 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix
index b5a741cbf420f..019255e593550 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@@ -54,12 +54,6 @@ let
     };
 in
 {
-  cargo-pgrx_0_11_3 = generic {
-    version = "0.11.3";
-    hash = "sha256-UHIfwOdXoJvR4Svha6ud0FxahP1wPwUtviUwUnTmLXU=";
-    cargoHash = "sha256-j4HnD8Zt9uhlV5N7ldIy9564o9qFEqs5KfXHmnQ1WEw=";
-  };
-
   cargo-pgrx_0_12_0_alpha_1 = generic {
     version = "0.12.0-alpha.1";
     hash = "sha256-0m9oaqjU42RYyttkTihADDrRMjr2WoK/8sInZALeHws=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 843cf961573f3..3691a618fa335 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7003,7 +7003,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security SystemConfiguration;
   };
   inherit (callPackages ../development/tools/rust/cargo-pgrx { })
-    cargo-pgrx_0_11_3
     cargo-pgrx_0_12_0_alpha_1
     cargo-pgrx_0_12_6
     ;

From 7eac7962100ea534cf13211c6ba302542f596034 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Nov 2024 21:43:38 +0000
Subject: [PATCH 23/88] operator-sdk: 1.37.0 -> 1.38.0

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

diff --git a/pkgs/by-name/op/operator-sdk/package.nix b/pkgs/by-name/op/operator-sdk/package.nix
index 9f21ff46889a4..7a4596e620fdd 100644
--- a/pkgs/by-name/op/operator-sdk/package.nix
+++ b/pkgs/by-name/op/operator-sdk/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "operator-sdk";
-  version = "1.37.0";
+  version = "1.38.0";
 
   src = fetchFromGitHub {
     owner = "operator-framework";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-ANG9KpyEO+fpjelYU+HNTkbg2S0vFNyPzPRFjcLoLOI=";
+    hash = "sha256-YCYieXT+3LCpae3V/vub/TAKUG03HjB9FdHEhDVP4uM=";
   };
 
-  vendorHash = "sha256-pr3WTUZetps/Gof8lttN2beomiobVPCgX0j9V77g5sI=";
+  vendorHash = "sha256-8qNrXLmp3FKb6ByrIWa7VupEhW4Wc4xZCJmURqt/mfw=";
 
   nativeBuildInputs = [
     makeWrapper

From d3b4ec2ec0a1cb48c9970ae1bd986ec942bca687 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 20 Nov 2024 22:58:10 +0000
Subject: [PATCH 24/88] openai-whisper-cpp: 1.7.1 -> 1.7.2

---
 pkgs/tools/audio/openai-whisper-cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/openai-whisper-cpp/default.nix b/pkgs/tools/audio/openai-whisper-cpp/default.nix
index a041635746b40..e65d909b41f86 100644
--- a/pkgs/tools/audio/openai-whisper-cpp/default.nix
+++ b/pkgs/tools/audio/openai-whisper-cpp/default.nix
@@ -25,13 +25,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "whisper-cpp";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "ggerganov";
     repo = "whisper.cpp";
     rev = "refs/tags/v${finalAttrs.version}" ;
-    hash = "sha256-EDFUVjud79ZRCzGbOh9L9NcXfN3ikvsqkVSOME9F9oo=";
+    hash = "sha256-y30ZccpF3SCdRGa+P3ddF1tT1KnvlI4Fexx81wZxfTk=";
   };
 
   # The upstream download script tries to download the models to the

From 95fc06c959446938021835bd5054bdae64347611 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Thu, 21 Nov 2024 07:35:57 +0800
Subject: [PATCH 25/88] ecapture: 0.8.9 -> 0.8.10

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

diff --git a/pkgs/by-name/ec/ecapture/package.nix b/pkgs/by-name/ec/ecapture/package.nix
index 379a7d5061d8d..bd29649bfb5f0 100644
--- a/pkgs/by-name/ec/ecapture/package.nix
+++ b/pkgs/by-name/ec/ecapture/package.nix
@@ -21,13 +21,13 @@
 
 buildGoModule rec {
   pname = "ecapture";
-  version = "0.8.9";
+  version = "0.8.10";
 
   src = fetchFromGitHub {
     owner = "gojue";
     repo = "ecapture";
     rev = "refs/tags/v${version}";
-    hash = "sha256-snq6ypEEyIVxD19pdc2qw/j6FPgmRS9l6lmdDcUljKw=";
+    hash = "sha256-vaksl9Bt7Yu62MDGtgkFB4nhH0zdZ29JhE0ypQkuv74=";
     fetchSubmodules = true;
   };
 

From cc6c634b45378708e9f39869cc9e7c38fa86c177 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Nov 2024 09:47:27 +0100
Subject: [PATCH 26/88] python312Packages.bluetooth-adapters: 0.20.0 -> 0.20.2

Diff: https://github.com/Bluetooth-Devices/bluetooth-adapters/compare/refs/tags/v0.20.0...v0.20.2

Changelog: https://github.com/bluetooth-devices/bluetooth-adapters/blob/v0.20.2/CHANGELOG.md
---
 .../development/python-modules/bluetooth-adapters/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bluetooth-adapters/default.nix b/pkgs/development/python-modules/bluetooth-adapters/default.nix
index 515c3f167e912..5bd7ca9b33a7b 100644
--- a/pkgs/development/python-modules/bluetooth-adapters/default.nix
+++ b/pkgs/development/python-modules/bluetooth-adapters/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "bluetooth-adapters";
-  version = "0.20.0";
+  version = "0.20.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "bluetooth-adapters";
     rev = "refs/tags/v${version}";
-    hash = "sha256-dQjoaBK+WMHQss/7nQRRCE8Jv4S0iq6awa/t3SMGUiE=";
+    hash = "sha256-JeYqzwlR0zY0BGC6iFCTu9EDlYnu+wdpGeje2xKwcVI=";
   };
 
   postPatch = ''

From f4b2553be7b3e17978f8bbcbe20827dd3dd6b792 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Nov 2024 12:03:28 +0100
Subject: [PATCH 27/88] python312Packages.restview: 3.0.1 -> 3.0.2

Changelog: https://github.com/mgedmin/restview/blob/3.0.2/CHANGES.rst
---
 pkgs/development/python-modules/restview/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix
index 485210d20b3f9..e194e777b7b0e 100644
--- a/pkgs/development/python-modules/restview/default.nix
+++ b/pkgs/development/python-modules/restview/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "restview";
-  version = "3.0.1";
+  version = "3.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jBoXHBWdRtFdVWn3cCGCiIOhIdb5uvdY1kH8HlSwWuU=";
+    hash = "sha256-i011oL7Xa2e0Vu9wEfTrbJilVsn4N2Qt8iAscxL8zBo=";
   };
 
   propagatedBuildInputs = [

From 6e7fc8cdeb6742c30cb788828419ef77f235dd14 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Nov 2024 12:04:38 +0100
Subject: [PATCH 28/88] python312Packages.strawberry-graphql: 0.243.1 ->
 0.251.0

Diff: https://github.com/strawberry-graphql/strawberry/compare/refs/tags/0.243.1...0.251.0

Changelog: https://github.com/strawberry-graphql/strawberry/blob/0.251.0/CHANGELOG.md
---
 .../development/python-modules/strawberry-graphql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/strawberry-graphql/default.nix b/pkgs/development/python-modules/strawberry-graphql/default.nix
index b17589b562abf..7850e0a18f507 100644
--- a/pkgs/development/python-modules/strawberry-graphql/default.nix
+++ b/pkgs/development/python-modules/strawberry-graphql/default.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "strawberry-graphql";
-  version = "0.243.1";
+  version = "0.251.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "strawberry-graphql";
     repo = "strawberry";
     rev = "refs/tags/${version}";
-    hash = "sha256-m+KaUd0rl0RRZzVPI+ldwW77YGLq45egkV5vYYz4dW8=";
+    hash = "sha256-khr4uwbRaO/7gw7N17qBRN1qnoMKw13lLzxEzBoB8TY=";
   };
 
   postPatch = ''

From f742f88460f78ac3219ae45bf4d86ecf7d438211 Mon Sep 17 00:00:00 2001
From: merrkry <merrkry@tsubasa.moe>
Date: Thu, 21 Nov 2024 13:54:28 +0100
Subject: [PATCH 29/88] tsukimi: 0.16.9 -> 0.17.3

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

diff --git a/pkgs/by-name/ts/tsukimi/package.nix b/pkgs/by-name/ts/tsukimi/package.nix
index a1cf6380d0c04..a9ebde1eb8541 100644
--- a/pkgs/by-name/ts/tsukimi/package.nix
+++ b/pkgs/by-name/ts/tsukimi/package.nix
@@ -10,23 +10,23 @@
   openssl,
   libepoxy,
   wrapGAppsHook4,
-  makeDesktopItem,
   stdenv,
   nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "tsukimi";
-  version = "0.16.9";
+  version = "0.17.3";
 
   src = fetchFromGitHub {
     owner = "tsukinaha";
     repo = "tsukimi";
     rev = "v${version}";
-    hash = "sha256-SeABeXg2dpGYxGiDDwn811egRe8BYVdxK8hz7qfBagQ=";
+    hash = "sha256-2AmDP4R06toNrtjV0HSO+Fj8mrXbLgC7bMQPvl10un0=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-o6FjBauHjdhxNXpqlJc/yNNTkRJyX3R4smAMrdFUjLA=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-3xu4h9ZHlqnaB6Pgn2ixyBF3VS6OF8ZkLaNU4unir7A=";
 
   nativeBuildInputs = [
     pkg-config

From 6838349887e145166d798b55352aed9083e9a99a Mon Sep 17 00:00:00 2001
From: Yi-Jyun Pan <pan93412@gmail.com>
Date: Thu, 21 Nov 2024 21:30:58 +0800
Subject: [PATCH 30/88] php84: 8.4.0RC4 -> 8.4.1

---
 pkgs/development/interpreters/php/8.4.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index e5abb6760978b..13c3b101f5aae 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -1,14 +1,11 @@
-{ callPackage, fetchurl, ... }@_args:
+{ callPackage, ... }@_args:
 
 let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.0RC4";
-      phpSrc = fetchurl {
-        url = "https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz";
-        hash = "sha256-s/ihnYRfSqVlAV/4YZZAfrUzKE60NlrFlT9edK5h3LA=";
-      };
+      version = "8.4.1";
+      hash = "sha256-74onARjtEot2X8MfGYx/RlDIFxQRsPajoaOroR/KzCM=";
     }
   );
 in

From 080b8f1f576d278a58319cfa35a41813fbe4c244 Mon Sep 17 00:00:00 2001
From: Yi-Jyun Pan <pan93412@gmail.com>
Date: Thu, 21 Nov 2024 21:31:28 +0800
Subject: [PATCH 31/88] php-packages: remove the merged soap patch

---
 pkgs/top-level/php-packages.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 74e9b08ec6ec6..5fbed020cacdd 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -684,13 +684,6 @@ in {
               url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
               hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
             })
-          ]
-          ++ lib.optionals (lib.versionAtLeast php.version "8.3") [
-            # https://github.com/php/php-src/pull/16733 (fix soap test)
-            (fetchpatch {
-              url = "https://github.com/php/php-src/commit/5c308d61db104854e4ff84ab123e3ea56e1b4046.patch";
-              hash = "sha256-xQ4Sg4kL0cgHYauRW2AzGgFXfcqtxeRVhI9zNh7CsoM=";
-            })
           ];
         }
         {

From c1e1a94f22ad2a4673bdc216ad91a36ef616fa36 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 21 Nov 2024 16:05:09 +0100
Subject: [PATCH 32/88] python312Packages.plotnine: 0.14.1 -> 0.14.2

Diff: https://github.com/has2k1/plotnine/compare/refs/tags/v0.14.1...v0.14.2

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

diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix
index 4490f4c5855ee..555199e326aec 100644
--- a/pkgs/development/python-modules/plotnine/default.nix
+++ b/pkgs/development/python-modules/plotnine/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "plotnine";
-  version = "0.14.1";
+  version = "0.14.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "plotnine";
     rev = "refs/tags/v${version}";
-    hash = "sha256-K2Feqg3UiffZ4izYzrCW+iu7dH61sItOUVtwvzTMth0=";
+    hash = "sha256-hO6HxzzCCFfZVvqCaFf7JfWYFFfU9umFgNM1+Z1HBuQ=";
   };
 
   postPatch = ''

From bcbc708ec83462e62bc61a6cbcc2092cbf18dc83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Nov 2024 16:47:13 +0000
Subject: [PATCH 33/88] soplex: 7.1.1 -> 712

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

diff --git a/pkgs/by-name/so/soplex/package.nix b/pkgs/by-name/so/soplex/package.nix
index 90d97c7077384..2ee0976e6c9d9 100644
--- a/pkgs/by-name/so/soplex/package.nix
+++ b/pkgs/by-name/so/soplex/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "soplex";
-  version = "7.1.1";
+  version = "712";
 
   src = fetchFromGitHub {
     owner = "scipopt";
     repo = "soplex";
     rev = "release-${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}";
-    hash = "sha256-f4PMJz/VHCx5Uk7M9JdE+4Qpf29X3S/umoiAo8NXYrU=";
+    hash = "sha256-8muN9wYDQX5CULifKBYO/t9whS2LsatrYB2khlV0akg=";
   };
 
   nativeBuildInputs = [ cmake ];

From edadf1c80fc4047aa6d963b6f5488df1fe4f5072 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Nov 2024 17:14:42 +0000
Subject: [PATCH 34/88] supermariowar: 2023-unstable-2024-09-21 ->
 2023-unstable-2024-10-17

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

diff --git a/pkgs/by-name/su/supermariowar/package.nix b/pkgs/by-name/su/supermariowar/package.nix
index cac54270548b4..f661e69d9b43e 100644
--- a/pkgs/by-name/su/supermariowar/package.nix
+++ b/pkgs/by-name/su/supermariowar/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "supermariowar";
-  version = "2023-unstable-2024-09-21";
+  version = "2023-unstable-2024-10-17";
 
   src = fetchFromGitHub {
     owner = "mmatyas";
     repo = "supermariowar";
-    rev = "7e7ebe39cadba5d0bd9d7e87a08264332c2f1f12";
-    hash = "sha256-kBwaqw0GZvLWE5GqgfieLRU4s8wYFtTZyl1MgwWGbMc=";
+    rev = "a04d6f4069d2ef90a76bf562d1fd937c9cf56140";
+    hash = "sha256-4WsjSjT3uN5hBqUtH6UaTxHUYkwvjiYrWzRqY3vBpAE=";
     fetchSubmodules = true;
   };
 

From 6c8ee2dfff97adc12d8ea95b6181855ed7ff0546 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Nov 2024 18:27:25 +0000
Subject: [PATCH 35/88] antimatter-dimensions: 0-unstable-2024-08-12 ->
 0-unstable-2024-10-16

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

diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix
index 8118a2d09731b..84c0348fdb6e7 100644
--- a/pkgs/by-name/an/antimatter-dimensions/package.nix
+++ b/pkgs/by-name/an/antimatter-dimensions/package.nix
@@ -18,12 +18,12 @@ let
 in
 buildNpmPackage rec {
   pname = "antimatter-dimensions";
-  version = "0-unstable-2024-08-12";
+  version = "0-unstable-2024-10-16";
   src = fetchFromGitHub {
     owner = "IvarK";
     repo = "AntimatterDimensionsSourceCode";
-    rev = "af840eef45bb2120bff4dcebb9b11c181067f9a8";
-    hash = "sha256-qlgu/Sw3LMn/ZSXJFi0DW6vYAZyF2D3cCpKmXhID3s4=";
+    rev = "b813542c2f77501d0b8d07ae8b0044df2a994e86";
+    hash = "sha256-1uZeY0Lgqbo9X9xbXed0aYy8mNApMBXJRlaoliZb/mA=";
   };
   nativeBuildInputs = [
     copyDesktopItems

From edc180ad4db9f47f8d949e2f880cfebb436a0378 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Nov 2024 18:32:50 +0000
Subject: [PATCH 36/88] remnote: 1.16.127 -> 1.17.21

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

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index 68b0e7d4fd386..bc1a729615aa0 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.16.127";
+  version = "1.17.21";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-VsS9RXbcu6aV7b+Bk3lB+x6/X/HxN5EoypFCn4qKNEk=";
+    hash = "sha256-VoEaBaHGBgkDpzk2n/LXlzR+xl2AXMv5zSAzB74YIuE=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From 68dd66c61e78417f4271144ac598ed78e79bce26 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Nov 2024 18:58:03 +0000
Subject: [PATCH 37/88] python312Packages.cftime: 1.6.4 -> 1.6.4.post1

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

diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix
index 443a7e8c1da60..ef33cb69e1ce3 100644
--- a/pkgs/development/python-modules/cftime/default.nix
+++ b/pkgs/development/python-modules/cftime/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "cftime";
-  version = "1.6.4";
+  version = "1.6.4.post1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4yVAYZN1in7WcwjetS5yd4KhnjhOGDN45/9iCYvgrtw=";
+    hash = "sha256-UKx2zJ8Qq3vUbkSnHFGmknBRtJm0QH308pqxPXQblC8=";
   };
 
   postPatch = ''

From 7926405c0d2454fea78393a812d55c27650dd36a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Nov 2024 20:16:16 +0000
Subject: [PATCH 38/88] miru: 5.5.8 -> 5.5.9

---
 pkgs/by-name/mi/miru/darwin.nix  | 2 +-
 pkgs/by-name/mi/miru/linux.nix   | 2 +-
 pkgs/by-name/mi/miru/package.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/miru/darwin.nix b/pkgs/by-name/mi/miru/darwin.nix
index 0e996826d007b..792282b44663d 100644
--- a/pkgs/by-name/mi/miru/darwin.nix
+++ b/pkgs/by-name/mi/miru/darwin.nix
@@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/mac-Miru-${version}-mac.zip";
-    hash = "sha256-GTw5RislcL5s6gwUeCmLglXt/BZEpq3aau/ij1E7kso=";
+    hash = "sha256-o/7CTkIVufD5ai99XZFyDUgCIV7r4PbUcqkYcMVZwKE=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/mi/miru/linux.nix b/pkgs/by-name/mi/miru/linux.nix
index cf935ffa7c85a..e31b02d79554c 100644
--- a/pkgs/by-name/mi/miru/linux.nix
+++ b/pkgs/by-name/mi/miru/linux.nix
@@ -19,7 +19,7 @@ appimageTools.wrapType2 rec {
   src = fetchurl {
     url = "https://github.com/ThaUnknown/miru/releases/download/v${version}/linux-Miru-${version}.AppImage";
     name = "${pname}-${version}.AppImage";
-    hash = "sha256-4ueVgIcIi/RIFRoDKStiNqszfaIXZ9dfagddzCVaSRs=";
+    hash = "sha256-AhaGiZ/Vx9nJmIXrzZ1JMLqjWfQDyoKpzl55NT712Ro=";
   };
 
   extraInstallCommands =
diff --git a/pkgs/by-name/mi/miru/package.nix b/pkgs/by-name/mi/miru/package.nix
index 3c325b038233e..f250c3a524f79 100644
--- a/pkgs/by-name/mi/miru/package.nix
+++ b/pkgs/by-name/mi/miru/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "miru";
-  version = "5.5.8";
+  version = "5.5.9";
   meta = {
     description = "Stream anime torrents, real-time with no waiting for downloads";
     homepage = "https://miru.watch";

From 74f7c2cd0214997958b5b0944437ea55399affb8 Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Thu, 21 Nov 2024 20:51:21 +0000
Subject: [PATCH 39/88] arc-browser: 1.69.0-55816 -> 1.70.0-56062

Changelog: https://arc.net/e/6A6E87BC-E130-43F5-9F4F-472B61231122
---
 pkgs/by-name/ar/arc-browser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/arc-browser/package.nix b/pkgs/by-name/ar/arc-browser/package.nix
index 9fd1bf8a475ad..0ed495eada6df 100644
--- a/pkgs/by-name/ar/arc-browser/package.nix
+++ b/pkgs/by-name/ar/arc-browser/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arc-browser";
-  version = "1.69.0-55816";
+  version = "1.70.0-56062";
 
   src = fetchurl {
     url = "https://releases.arc.net/release/Arc-${finalAttrs.version}.dmg";
-    hash = "sha256-v9tZE0/Kv90yR1vrflPAZH6n25bdI5AHskUSHz91USU=";
+    hash = "sha256-x+QHlBsZGkmJm05VeZx43XFxpRJR1crLjEqNIQJwitQ=";
   };
 
   nativeBuildInputs = [ undmg ];

From f865c76c3e2c9cfb650e435a8ebfe1b14768a417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viorel-C=C4=83t=C4=83lin=20R=C4=83pi=C8=9Beanu?=
 <rapiteanu.catalin@gmail.com>
Date: Fri, 22 Nov 2024 00:21:29 +0200
Subject: [PATCH 40/88] heroic: fix cursor issues

Fix the Xorg mouse issues initialy found with Lutris in:
https://github.com/NixOS/nixpkgs/pull/348533
---
 pkgs/games/heroic/fhsenv.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/games/heroic/fhsenv.nix b/pkgs/games/heroic/fhsenv.nix
index 7b0b67ad302e4..4c9f97fa05d14 100644
--- a/pkgs/games/heroic/fhsenv.nix
+++ b/pkgs/games/heroic/fhsenv.nix
@@ -44,6 +44,7 @@ buildFHSEnv {
     let
       xorgDeps =
         pkgs: with pkgs.xorg; [
+          libICE
           libpthreadstubs
           libSM
           libX11
@@ -53,11 +54,15 @@ buildFHSEnv {
           libXcursor
           libXdmcp
           libXext
+          libXfixes
           libXi
           libXinerama
           libXmu
           libXrandr
           libXrender
+          libXScrnSaver
+          libXt
+          libXtst
           libXv
           libXxf86vm
         ];

From 082273f5bb798434e6d9f32d5fc80309b500f3b8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Nov 2024 18:31:39 +0000
Subject: [PATCH 41/88] dcgm: use Ninja

---
 pkgs/by-name/dc/dcgm/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix
index 7573cb37ec226..85195864296bb 100644
--- a/pkgs/by-name/dc/dcgm/package.nix
+++ b/pkgs/by-name/dc/dcgm/package.nix
@@ -4,6 +4,7 @@
 , autoAddDriverRunpath
 , catch2
 , cmake
+, ninja
 , cudaPackages_10_2
 , cudaPackages_11_8
 , cudaPackages_12
@@ -104,6 +105,7 @@ in gcc11Stdenv.mkDerivation rec {
     autoAddDriverRunpath
 
     cmake
+    ninja
     git
     python3
   ];

From e75510817a5000bcc5db9dd7830d72ce9fdeea41 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Nov 2024 18:31:39 +0000
Subject: [PATCH 42/88] dcgm: 3.3.5 -> 3.3.9

Fixes the build and matches upstream in dropping CUDA 10.

Diff: https://github.com/NVIDIA/DCGM/compare/refs/tags/v3.3.5...v3.3.9
---
 pkgs/by-name/dc/dcgm/package.nix | 74 +++++++++++++-------------------
 1 file changed, 29 insertions(+), 45 deletions(-)

diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix
index 85195864296bb..556846383dd68 100644
--- a/pkgs/by-name/dc/dcgm/package.nix
+++ b/pkgs/by-name/dc/dcgm/package.nix
@@ -5,9 +5,9 @@
 , catch2
 , cmake
 , ninja
-, cudaPackages_10_2
 , cudaPackages_11_8
 , cudaPackages_12
+, boost
 , fmt_9
 , git
 , jsoncpp
@@ -21,26 +21,12 @@
 , static ? gcc11Stdenv.hostPlatform.isStatic
 }:
 let
-  # DCGM depends on 3 different versions of CUDA at the same time.
-  # The runtime closure, thankfully, is quite small because most things
-  # are statically linked.
-  cudaPackageSetByVersion = [
-    {
-      version = "10";
-      # Nixpkgs cudaPackages_10 doesn't have redist packages broken out.
-      pkgSet = [
-        cudaPackages_10_2.cudatoolkit
-        cudaPackages_10_2.cudatoolkit.lib
-      ];
-    }
-    {
-      version = "11";
-      pkgSet = getCudaPackages cudaPackages_11_8;
-    }
-    {
-      version = "12";
-      pkgSet = getCudaPackages cudaPackages_12;
-    }
+  # DCGM depends on 2 different versions of CUDA at the same time.
+  # The runtime closure, thankfully, is quite small as it does not
+  # include the CUDA libraries.
+  cudaPackageSets = [
+    cudaPackages_11_8
+    cudaPackages_12
   ];
 
   # Select needed redist packages from cudaPackages
@@ -55,45 +41,39 @@ let
     libcurand
   ];
 
-  # Builds CMake code to add CUDA paths for include and lib.
-  mkAppendCudaPaths = { version, pkgSet }:
+  # Builds CMake flags to add CUDA paths for include and lib.
+  mkCudaFlags = cudaPackages:
     let
+      version = cudaPackages.cudaMajorVersion;
       # The DCGM CMake assumes that the folder containing cuda.h contains all headers, so we must
       # combine everything together for headers to work.
-      # It would be more convenient to use symlinkJoin on *just* the include subdirectories
-      # of each package, but not all of them have an include directory and making that work
-      # is more effort than it's worth for this temporary, build-time package.
-      combined = symlinkJoin {
-        name = "cuda-combined-${version}";
-        paths = pkgSet;
+      headers = symlinkJoin {
+        name = "cuda-headers-combined-${version}";
+        paths = lib.map (pkg: "${lib.getInclude pkg}/include") (getCudaPackages cudaPackages);
       };
-      # The combined package above breaks the build for some reason so we just configure
-      # each package's library path.
-      libs = lib.concatMapStringsSep " " (x: ''"${x}/lib"'') pkgSet;
-    in ''
-      list(APPEND Cuda${version}_INCLUDE_PATHS "${combined}/include")
-      list(APPEND Cuda${version}_LIB_PATHS ${libs})
-    '';
+    in [
+      (lib.cmakeFeature "CUDA${version}_INCLUDE_DIR" "${headers}")
+      (lib.cmakeFeature "CUDA${version}_LIBS" "${cudaPackages.cuda_cudart.stubs}/lib/stubs/libcuda.so")
+      (lib.cmakeFeature "CUDA${version}_STATIC_LIBS" "${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so")
+      (lib.cmakeFeature "CUDA${version}_STATIC_CUBLAS_LIBS" (lib.concatStringsSep ";" [
+        "${lib.getLib cudaPackages.libcublas}/lib/libcublas.so"
+        "${lib.getLib cudaPackages.libcublas}/lib/libcublasLt.so"
+      ]))
+    ];
 
 # gcc11 is required by DCGM's very particular build system
 # C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/build.sh#L22
 in gcc11Stdenv.mkDerivation rec {
   pname = "dcgm";
-  version = "3.3.5"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version.
+  version = "3.3.9"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version.
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "DCGM";
     rev = "refs/tags/v${version}";
-    hash = "sha256-n/uWvgvxAGfr1X51XgtHfFGDOO5AMBSV5UWQQpsylpg=";
+    hash = "sha256-PysxuN5WT7GB0oOvT5ezYeOau6AMVDDWE5HOAcmqw/Y=";
   };
 
-  # Add our paths to the CUDA paths so FindCuda.cmake can find them.
-  EXTRA_CUDA_PATHS = lib.concatMapStringsSep "\n" mkAppendCudaPaths cudaPackageSetByVersion;
-  prePatch = ''
-    echo "$EXTRA_CUDA_PATHS"$'\n'"$(cat cmake/FindCuda.cmake)" > cmake/FindCuda.cmake
-  '';
-
   hardeningDisable = [ "all" ];
 
   strictDeps = true;
@@ -112,6 +92,7 @@ in gcc11Stdenv.mkDerivation rec {
 
   buildInputs = [
     # Header-only
+    boost
     catch2
     plog.dev
     tclap_1_4
@@ -125,7 +106,10 @@ in gcc11Stdenv.mkDerivation rec {
     (libevent.override { sslSupport = false; static = true; })
   ];
 
-  disallowedReferences = lib.concatMap (x: x.pkgSet) cudaPackageSetByVersion;
+  # Add our paths to the CMake flags so FindCuda.cmake can find them.
+  cmakeFlags = lib.concatMap mkCudaFlags cudaPackageSets;
+
+  disallowedReferences = lib.concatMap getCudaPackages cudaPackageSets;
 
   meta = with lib; {
     description = "Data Center GPU Manager (DCGM) is a daemon that allows users to monitor NVIDIA data-center GPUs";

From decc7e8faf78b117973238fa57dfc396843397b9 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Nov 2024 18:31:39 +0000
Subject: [PATCH 43/88] dcgm: remove static library cruft
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Static CUDA seems to be broken anyway, the upstream build system is
awkward and uncooperative, and it’s simpler to just patch it to
use dynamic libraries.
---
 pkgs/by-name/dc/dcgm/dynamic-libs.patch | 40 +++++++++++++++++++++++++
 pkgs/by-name/dc/dcgm/package.nix        | 17 +++++------
 2 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/by-name/dc/dcgm/dynamic-libs.patch

diff --git a/pkgs/by-name/dc/dcgm/dynamic-libs.patch b/pkgs/by-name/dc/dcgm/dynamic-libs.patch
new file mode 100644
index 0000000000000..fcc544c75bed5
--- /dev/null
+++ b/pkgs/by-name/dc/dcgm/dynamic-libs.patch
@@ -0,0 +1,40 @@
+diff --git a/cmake/FindJsoncpp.cmake b/cmake/FindJsoncpp.cmake
+index abedf7bb85..d7a52f5c7b 100644
+--- a/cmake/FindJsoncpp.cmake
++++ b/cmake/FindJsoncpp.cmake
+@@ -16,8 +16,8 @@
+ 
+ if (NOT TARGET JsonCpp::JsonCpp)
+     find_package(jsoncpp REQUIRED CONFIG)
+-    set(JSONCPP_STATIC_LIBS jsoncpp_static)
+-    set(JSONCPP_INCLUDE_PATH $<TARGET_PROPERTY:jsoncpp_static,INTERFACE_INCLUDE_DIRECTORIES>)
++    set(JSONCPP_STATIC_LIBS jsoncpp)
++    set(JSONCPP_INCLUDE_PATH $<TARGET_PROPERTY:jsoncpp,INTERFACE_INCLUDE_DIRECTORIES>)
+ endif()
+ # set(Jsoncpp_PATH_PREFIXES /usr/local "${Jsoncpp_ROOT}" "$ENV{HOME}")
+ # foreach(prefix ${Jsoncpp_PATH_PREFIXES})
+diff --git a/cmake/FindLibevent.cmake b/cmake/FindLibevent.cmake
+index 354d6f9b99..38aca9534e 100644
+--- a/cmake/FindLibevent.cmake
++++ b/cmake/FindLibevent.cmake
+@@ -26,16 +26,12 @@
+ endforeach()
+ 
+ find_path(LIBEVENT_INCLUDE_DIR evhttp.h event.h PATHS ${Libevent_INCLUDE_PATHS})
+-find_library(LIBEVENT_STATIC_LIB NAMES libevent.a libevent_core.a libevent_extra.a PATHS ${Libevent_LIB_PATHS})
+-find_library(LIBEVENT_PTHREAD_STATIC_LIB NAMES libevent_pthreads.a PATHS ${Libevent_LIB_PATHS})
++find_library(LIBEVENT_STATIC_LIB NAMES libevent.so libevent_core.so libevent_extra.so PATHS ${Libevent_LIB_PATHS})
++find_library(LIBEVENT_PTHREAD_STATIC_LIB NAMES libevent_pthreads.so PATHS ${Libevent_LIB_PATHS})
+ 
+-if (LIBEVENT_INCLUDE_DIR AND LIBEVENT_STATIC_LIB AND LIBEVENT_PTHREAD_STATIC_LIB)
++if (LIBEVENT_INCLUDE_DIR AND LIBEVENT_STATIC_LIB)
+     set(Libevent_FOUND TRUE)
+-    add_library(libevent_event_static STATIC IMPORTED)
+-    set_target_properties(libevent_event_static PROPERTIES IMPORTED_LOCATION ${LIBEVENT_STATIC_LIB})
+-    add_library(libevent_event_pthread STATIC IMPORTED)
+-    set_target_properties(libevent_event_pthread PROPERTIES IMPORTED_LOCATION ${LIBEVENT_PTHREAD_STATIC_LIB})
+-    set(LIBEVENT_STATIC_LIBS libevent_event_static libevent_event_pthread)
++    set(LIBEVENT_STATIC_LIBS ${LIBEVENT_STATIC_LIB} ${LIBEVENT_PTHREAD_STATIC_LIB})
+ else ()
+     set(Libevent_FOUND FALSE)
+ endif ()
diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix
index 556846383dd68..58ac8f2f4599e 100644
--- a/pkgs/by-name/dc/dcgm/package.nix
+++ b/pkgs/by-name/dc/dcgm/package.nix
@@ -17,8 +17,6 @@
 , symlinkJoin
 , tclap_1_4
 , yaml-cpp
-
-, static ? gcc11Stdenv.hostPlatform.isStatic
 }:
 let
   # DCGM depends on 2 different versions of CUDA at the same time.
@@ -74,6 +72,10 @@ in gcc11Stdenv.mkDerivation rec {
     hash = "sha256-PysxuN5WT7GB0oOvT5ezYeOau6AMVDDWE5HOAcmqw/Y=";
   };
 
+  patches = [
+    ./dynamic-libs.patch
+  ];
+
   hardeningDisable = [ "all" ];
 
   strictDeps = true;
@@ -97,13 +99,10 @@ in gcc11Stdenv.mkDerivation rec {
     plog.dev
     tclap_1_4
 
-    # Dependencies that can be either static or dynamic.
-    (fmt_9.override { enableShared = !static; }) # DCGM's build uses the static outputs regardless of enableShared
-    (yaml-cpp.override { inherit static; stdenv = gcc11Stdenv; })
-
-    # TODO: Dependencies that DCGM's CMake hard-codes to be static-only.
-    (jsoncpp.override { enableStatic = true; })
-    (libevent.override { sslSupport = false; static = true; })
+    fmt_9
+    (yaml-cpp.override { stdenv = gcc11Stdenv; })
+    jsoncpp
+    libevent
   ];
 
   # Add our paths to the CMake flags so FindCuda.cmake can find them.

From 2301651b8c56e00e4683001226214d27a7f42678 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Nov 2024 18:31:39 +0000
Subject: [PATCH 44/88] dcgm: patch for modern GCC

Just a few missing includes, really nothing too bad at all.
---
 pkgs/by-name/dc/dcgm/fix-includes.patch | 110 ++++++++++++++++++++++++
 pkgs/by-name/dc/dcgm/package.nix        |  13 +--
 2 files changed, 117 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/dc/dcgm/fix-includes.patch

diff --git a/pkgs/by-name/dc/dcgm/fix-includes.patch b/pkgs/by-name/dc/dcgm/fix-includes.patch
new file mode 100644
index 0000000000000..2f15ddca1f7eb
--- /dev/null
+++ b/pkgs/by-name/dc/dcgm/fix-includes.patch
@@ -0,0 +1,110 @@
+diff --git a/common/CudaWorker/DcgmDgemm.cpp b/common/CudaWorker/DcgmDgemm.cpp
+index 8d33a3256e..6b3284258d 100644
+--- a/common/CudaWorker/DcgmDgemm.cpp
++++ b/common/CudaWorker/DcgmDgemm.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include <exception>
+ #include <stdexcept>
++#include <cinttypes>
+ 
+ #define CU_CHK(op)                                               \
+     if (auto const status = op; status != CUBLAS_STATUS_SUCCESS) \
+@@ -122,4 +123,4 @@
+     return CUBLAS_STATUS_SUCCESS;
+ }
+ 
+-} // namespace DcgmNs
+\ No newline at end of file
++} // namespace DcgmNs
+diff --git a/common/DcgmError.h b/common/DcgmError.h
+index 8638cdceb1..e8d817c0d4 100644
+--- a/common/DcgmError.h
++++ b/common/DcgmError.h
+@@ -17,6 +17,7 @@
+ 
+ #include <sstream>
+ #include <string>
++#include <cinttypes>
+ 
+ #include <dcgm_agent.h>
+ #include <dcgm_errors.h>
+diff --git a/common/DcgmStringHelpers.cpp b/common/DcgmStringHelpers.cpp
+index b41917e3b7..1fe63980c7 100644
+--- a/common/DcgmStringHelpers.cpp
++++ b/common/DcgmStringHelpers.cpp
+@@ -17,6 +17,7 @@
+ 
+ #include <cstring>
+ #include <string>
++#include <algorithm>
+ 
+ /*****************************************************************************/
+ void dcgmTokenizeString(const std::string &src, const std::string &delimiter, std::vector<std::string> &tokens)
+diff --git a/dcgmi/CommandOutputController.cpp b/dcgmi/CommandOutputController.cpp
+index 5057205564..8520171efa 100644
+--- a/dcgmi/CommandOutputController.cpp
++++ b/dcgmi/CommandOutputController.cpp
+@@ -24,6 +24,7 @@
+ #include "dcgm_agent.h"
+ #include <DcgmStringHelpers.h>
+ #include <algorithm>
++#include <functional>
+ #include <cstdarg>
+ #include <iostream>
+ #include <string>
+diff --git a/dcgmi/Diag.h b/dcgmi/Diag.h
+index a326f7b949..563fb3c9c0 100755
+--- a/dcgmi/Diag.h
++++ b/dcgmi/Diag.h
+@@ -24,6 +24,7 @@
+ #define DIAG_H_
+ 
+ #include <optional>
++#include <functional>
+ 
+ #include "Command.h"
+ #include "CommandOutputController.h"
+diff --git a/hostengine/src/HostEngineOutput.cpp b/hostengine/src/HostEngineOutput.cpp
+index 23c6ca9f54..798b83b3e4 100644
+--- a/hostengine/src/HostEngineOutput.cpp
++++ b/hostengine/src/HostEngineOutput.cpp
+@@ -20,6 +20,7 @@
+ #include <iostream>
+ #include <limits>
+ #include <string_view>
++#include <unordered_map>
+ 
+ namespace
+ {
+@@ -365,4 +366,4 @@
+         }
+     }
+     os << std::endl;
+-}
+\ No newline at end of file
++}
+diff --git a/nvvs/src/NvvsCommon.cpp b/nvvs/src/NvvsCommon.cpp
+index 8f7888649b..1604d9dabe 100644
+--- a/nvvs/src/NvvsCommon.cpp
++++ b/nvvs/src/NvvsCommon.cpp
+@@ -15,6 +15,7 @@
+  */
+ #include <sstream>
+ #include <stdexcept>
++#include <algorithm>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
+diff --git a/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp b/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp
+index 9eebeaf1c4..6e21201229 100644
+--- a/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp
++++ b/sdk/nvidia/nvml/nvml_loader/nvml_loader.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <atomic>
+ #include <mutex>
++#include <cstdlib>
+ 
+ static void *g_nvmlLib                                     = 0;
+ static std::atomic_uint32_t g_nvmlStaticLibResetHooksCount = 1;
diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix
index 58ac8f2f4599e..ef7b1a70a324c 100644
--- a/pkgs/by-name/dc/dcgm/package.nix
+++ b/pkgs/by-name/dc/dcgm/package.nix
@@ -1,5 +1,5 @@
 { lib
-, gcc11Stdenv
+, stdenv
 , fetchFromGitHub
 , autoAddDriverRunpath
 , catch2
@@ -58,10 +58,7 @@ let
         "${lib.getLib cudaPackages.libcublas}/lib/libcublasLt.so"
       ]))
     ];
-
-# gcc11 is required by DCGM's very particular build system
-# C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/build.sh#L22
-in gcc11Stdenv.mkDerivation rec {
+in stdenv.mkDerivation rec {
   pname = "dcgm";
   version = "3.3.9"; # N.B: If you change this, be sure prometheus-dcgm-exporter supports this version.
 
@@ -73,6 +70,7 @@ in gcc11Stdenv.mkDerivation rec {
   };
 
   patches = [
+    ./fix-includes.patch
     ./dynamic-libs.patch
   ];
 
@@ -100,7 +98,7 @@ in gcc11Stdenv.mkDerivation rec {
     tclap_1_4
 
     fmt_9
-    (yaml-cpp.override { stdenv = gcc11Stdenv; })
+    yaml-cpp
     jsoncpp
     libevent
   ];
@@ -108,6 +106,9 @@ in gcc11Stdenv.mkDerivation rec {
   # Add our paths to the CMake flags so FindCuda.cmake can find them.
   cmakeFlags = lib.concatMap mkCudaFlags cudaPackageSets;
 
+  # Lots of dodgy C++.
+  env.NIX_CFLAGS_COMPILE = "-Wno-error";
+
   disallowedReferences = lib.concatMap getCudaPackages cudaPackageSets;
 
   meta = with lib; {

From 9d1d584c177fe5fcc0b3eddf052a554330eaedb2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 20 Nov 2024 19:17:36 +0000
Subject: [PATCH 45/88] dcgm: enable tests

---
 pkgs/by-name/dc/dcgm/package.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix
index ef7b1a70a324c..e0de192b3dafb 100644
--- a/pkgs/by-name/dc/dcgm/package.nix
+++ b/pkgs/by-name/dc/dcgm/package.nix
@@ -109,6 +109,30 @@ in stdenv.mkDerivation rec {
   # Lots of dodgy C++.
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
 
+  doCheck = true;
+
+  checkPhase = ''
+    runHook preCheck
+
+    ctest -j $NIX_BUILD_CORES --output-on-failure --exclude-regex ${
+      lib.escapeShellArg (
+        lib.concatMapStringsSep "|" (test: "^${lib.escapeRegex test}$") [
+          "DcgmModuleSysmon Watches"
+          "DcgmModuleSysmon maxSampleAge"
+          "DcgmModuleSysmon::CalculateCoreUtilization"
+          "DcgmModuleSysmon::ParseProcStatCpuLine"
+          "DcgmModuleSysmon::ParseThermalFileContentsAndStore"
+          "DcgmModuleSysmon::PopulateTemperatureFileMap"
+          "DcgmModuleSysmon::ReadCoreSpeed"
+          "DcgmModuleSysmon::ReadTemperature"
+          "Sysmon: initialize module"
+        ]
+      )
+    }
+
+    runHook postCheck
+  '';
+
   disallowedReferences = lib.concatMap getCudaPackages cudaPackageSets;
 
   meta = with lib; {

From 80996d5d59bf397b2789a5c09c1bf4dbf60a4229 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 20 Nov 2024 16:58:48 +0000
Subject: [PATCH 46/88] prometheus-dcgm-exporter: 3.3.5-3.4.0 -> 3.3.9-3.6.1

Diff: https://github.com/NVIDIA/dcgm-exporter/compare/refs/tags/3.3.5-3.4.0...3.3.9-3.6.1
---
 pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
index 05b210ac2efe9..df9ac3ef4d414 100644
--- a/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-dcgm-exporter/package.nix
@@ -9,13 +9,13 @@ buildGoModule rec {
 
   # The first portion of this version string corresponds to a compatible DCGM
   # version.
-  version = "3.3.5-3.4.0"; # N.B: If you change this, update dcgm as well to the matching version.
+  version = "3.3.9-3.6.1"; # N.B: If you change this, update dcgm as well to the matching version.
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-IOVPEK+9ogBZJYns2pTyJwHUBMN8JqG1THTJPvpCwdo=";
+    hash = "sha256-BAMN2yuIW5FcHY3o9MUIMgPnTEFFRCbqhoAkcaZDxcM=";
   };
 
   CGO_LDFLAGS = "-ldcgm";
@@ -28,7 +28,7 @@ buildGoModule rec {
   # symbols are available on startup.
   hardeningDisable = [ "bindnow" ];
 
-  vendorHash = "sha256-urKa0O8QZnM8cWjPcGVhoAWhx6fCdMmhRX0JOriRaig=";
+  vendorHash = "sha256-b7GyPsmSGHx7hK0pDa88FKA+ZKJES2cdAGjT2aAfX/A=";
 
   nativeBuildInputs = [
     autoAddDriverRunpath

From d9ee62b6aa6d63816cd39b56aa0636dc3b5fb6b3 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 20 Nov 2024 00:28:37 +0000
Subject: [PATCH 47/88] caffe: remove broken CUDA support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s been marked as broken for over a year and requires CUDA
10. Even the non‐CUDA variant of the package refused to evaluate
without enabling broken packages due to `cudnn`, so I’m not sure
anyone is using this package at all…
---
 .../science/math/caffe/default.nix            | 30 ++-----------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 ---
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  5 ----
 pkgs/top-level/release-cuda.nix               |  1 -
 6 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index f82cef9d881cb..65e039991b913 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -14,23 +14,11 @@
 , Accelerate, CoreGraphics, CoreVideo
 , lmdbSupport ? true, lmdb
 , leveldbSupport ? true, leveldb, snappy
-, cudaSupport ? config.cudaSupport, cudaPackages ? { }
-, cudnnSupport ? cudaSupport
-, ncclSupport ? false
 , pythonSupport ? false, python ? null, numpy ? null
 , substituteAll
 }:
 
 let
-  inherit (cudaPackages) backendStdenv cudatoolkit nccl;
-  # The default for cudatoolkit 10.1 is CUDNN 8.0.5, the last version to support CUDA 10.1.
-  # However, this caffe does not build with CUDNN 8.x, so we use CUDNN 7.6.5 instead.
-  # Earlier versions of cudatoolkit use pre-8.x CUDNN, so we use the default.
-  hasCudnn =
-    if lib.versionOlder cudatoolkit.version "10.1"
-    then cudaPackages ? cudnn
-    else cudaPackages ? cudnn_7_6;
-
   toggle = bool: if bool then "ON" else "OFF";
 
   test_model_weights = fetchurl {
@@ -57,20 +45,12 @@ stdenv.mkDerivation rec {
     # boost_python expects
     [ (if pythonSupport then "-Dpython_version=${python.pythonVersion}" else "-DBUILD_python=OFF")
       "-DBLAS=open"
-    ] ++ (if cudaSupport then [
-           "-DCUDA_ARCH_NAME=All"
-           "-DCUDA_HOST_COMPILER=${backendStdenv.cc}/bin/cc"
-         ] else [ "-DCPU_ONLY=ON" ])
-      ++ ["-DUSE_NCCL=${toggle ncclSupport}"]
-      ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"]
+      "-DCPU_ONLY=ON"
+    ] ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"]
       ++ ["-DUSE_LMDB=${toggle lmdbSupport}"];
 
   buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv4 blas ]
-                ++ lib.optional cudaSupport cudatoolkit
-                ++ lib.optional (lib.versionOlder cudatoolkit.version "10.1" && hasCudnn) cudaPackages.cudnn
-                ++ lib.optional (lib.versionAtLeast cudatoolkit.version "10.1" && hasCudnn) cudaPackages.cudnn_7_6
                 ++ lib.optional lmdbSupport lmdb
-                ++ lib.optional ncclSupport nccl
                 ++ lib.optionals leveldbSupport [ leveldb snappy ]
                 ++ lib.optionals pythonSupport [ python numpy ]
                 ++ lib.optionals stdenv.hostPlatform.isDarwin [ Accelerate CoreGraphics CoreVideo ]
@@ -105,9 +85,6 @@ stdenv.mkDerivation rec {
     substituteInPlace src/caffe/util/io.cpp --replace \
       'SetTotalBytesLimit(kProtoReadBytesLimit, 536870912)' \
       'SetTotalBytesLimit(kProtoReadBytesLimit)'
-  '' + lib.optionalString (cudaSupport && lib.versionAtLeast cudatoolkit.version "9.0") ''
-    # CUDA 9.0 doesn't support sm_20
-    sed -i 's,20 21(20) ,,' cmake/Cuda.cmake
   '';
 
   preConfigure = lib.optionalString pythonSupport ''
@@ -150,10 +127,7 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     broken =
       (pythonSupport && (python.isPy310))
-      || cudaSupport
       || !(leveldbSupport -> (leveldb != null && snappy != null))
-      || !(cudnnSupport -> (hasCudnn && cudaSupport))
-      || !(ncclSupport -> (cudaSupport && !nccl.meta.unsupported))
       || !(pythonSupport -> (python != null && numpy != null))
     ;
     license = licenses.bsd2;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 04ba2fdd74b8d..128d17bc0fa51 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -182,6 +182,7 @@ mapAliases {
 
   ### C ###
 
+  caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20
   calligra = kdePackages.calligra; # Added 2024-09-27
   callPackage_i686 = pkgsi686Linux.callPackage;
   cask = emacs.pkgs.cask; # Added 2022-11-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f21ca2c8c219..e800dbf0ba185 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18102,15 +18102,11 @@ with pkgs;
   ### SCIENCE / MATH
 
   caffe = callPackage ../applications/science/math/caffe ({
-    inherit (config) cudaSupport;
-    cudaPackages = cudaPackages_10_1;
     opencv4 = opencv4WithoutCuda; # Used only for image loading.
     blas = openblas;
     inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo;
   } // (config.caffe or {}));
 
-  caffeWithCuda = caffe.override { cudaSupport = true; };
-
   gap-minimal = lowPrio (gap.override { packageSet = "minimal"; });
 
   gap-full = lowPrio (gap.override { packageSet = "full"; });
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 27a73c44ae363..98f605fa667b4 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -101,6 +101,7 @@ mapAliases ({
   BTrees = btrees; # added 2023-02-19
   cacheyou = throw "cacheyou has been removed, as it was no longer used for the only consumer pdm"; # added 2023-12-21
   cadquery = throw "cadquery was removed, because it was disabled on all python version since 3.8 and marked as broken"; # added 2024-05-13
+  caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20
   can = python-can; # added 2024-08-12
   carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18
   case = throw "case has been removed, since it is an unused leaf package with a dependency on the nose test framework"; # added 2024-07-08
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ef8f266c85bf8..bf1370edb95bd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1989,11 +1989,6 @@ self: super: with self; {
     inherit (self) python numpy boost;
   });
 
-  caffeWithCuda = toPythonModule (pkgs.caffeWithCuda.override {
-    pythonSupport = true;
-    inherit (self) python numpy boost;
-  });
-
   caio = callPackage ../development/python-modules/caio { };
 
   cairocffi = callPackage ../development/python-modules/cairocffi { };
diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix
index f655114737e9e..945f0e6d2954e 100644
--- a/pkgs/top-level/release-cuda.nix
+++ b/pkgs/top-level/release-cuda.nix
@@ -118,7 +118,6 @@ let
       python3Packages = {
         boxx = linux;
         bpycv = linux;
-        caffe = linux;
         catboost = linux;
         chainer = linux;
         cupy = linux;

From e3d26a1815e6764b96b387fe9be2c3030cf762fa Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 19 Nov 2024 20:32:28 +0000
Subject: [PATCH 48/88] cudaPackages_10{,_0,_1,_2}: drop

---
 .../manual/release-notes/rl-2505.section.md   |   2 +
 .../cuda-modules/cudatoolkit/default.nix      | 173 +++++-------------
 .../cuda-modules/cudatoolkit/releases.nix     |  18 --
 .../cuda-modules/cudnn/releases.nix           |  91 ---------
 .../cuda-modules/cutensor/extension.nix       |   5 +-
 pkgs/development/cuda-modules/gpus.nix        |  17 --
 .../cuda-modules/nvcc-compatibilities.nix     |  22 ---
 .../cuda-modules/tensorrt/releases.nix        |  32 ----
 pkgs/test/cuda/default.nix                    |   5 -
 pkgs/top-level/aliases.nix                    |   4 +
 pkgs/top-level/all-packages.nix               |   5 -
 11 files changed, 57 insertions(+), 317 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 31d1777d30142..d55b5bfd42a7d 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -28,6 +28,8 @@
     After you run ALTER EXTENSION, you must run [this SQL script](https://github.com/timescale/timescaledb-extras/blob/master/utils/2.15.X-fix_hypertable_foreign_keys.sql). For more details, see the following pull requests [#6797](https://github.com/timescale/timescaledb/pull/6797).
     PostgreSQL 13 is no longer supported in TimescaleDB v2.16.
 
+- Support for CUDA 10 has been dropped, as announced in the 24.11 release notes.
+
 - `kanata` was updated to v1.7.0, which introduces several breaking changes.
   See the release notes of
   [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0)
diff --git a/pkgs/development/cuda-modules/cudatoolkit/default.nix b/pkgs/development/cuda-modules/cudatoolkit/default.nix
index f7be0aa9f4fd2..71a7451746005 100644
--- a/pkgs/development/cuda-modules/cudatoolkit/default.nix
+++ b/pkgs/development/cuda-modules/cudatoolkit/default.nix
@@ -69,26 +69,18 @@ backendStdenv.mkDerivation rec {
     "doc"
   ];
 
-  nativeBuildInputs =
-    [
-      perl
-      makeWrapper
-      rsync
-      addDriverRunpath
-      autoPatchelfHook
-      autoAddDriverRunpath
-      markForCudatoolkitRootHook
-    ]
-    ++ lib.optionals (lib.versionOlder version "11") [ libsForQt5.wrapQtAppsHook ]
-    ++ lib.optionals (lib.versionAtLeast version "11.8") [ qt6Packages.wrapQtAppsHook ];
+  nativeBuildInputs = [
+    perl
+    makeWrapper
+    rsync
+    addDriverRunpath
+    autoPatchelfHook
+    autoAddDriverRunpath
+    markForCudatoolkitRootHook
+  ] ++ lib.optionals (lib.versionAtLeast version "11.8") [ qt6Packages.wrapQtAppsHook ];
   propagatedBuildInputs = [ setupCudaHook ];
   buildInputs =
-    lib.optionals (lib.versionOlder version "11") [
-      libsForQt5.qt5.qtwebengine
-      libglut
-      libGLU
-    ]
-    ++ [
+    [
       # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
       gdk-pixbuf
 
@@ -168,105 +160,58 @@ backendStdenv.mkDerivation rec {
     "${placeholder "out"}/nvvm/lib64"
   ];
 
-  autoPatchelfIgnoreMissingDeps =
-    [
-      # This is the hardware-dependent userspace driver that comes from
-      # nvidia_x11 package. It must be deployed at runtime in
-      # /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather
-      # than pinned in runpath
-      "libcuda.so.1"
+  autoPatchelfIgnoreMissingDeps = [
+    # This is the hardware-dependent userspace driver that comes from
+    # nvidia_x11 package. It must be deployed at runtime in
+    # /run/opengl-driver/lib or pointed at by LD_LIBRARY_PATH variable, rather
+    # than pinned in runpath
+    "libcuda.so.1"
 
-      # The krb5 expression ships libcom_err.so.3 but cudatoolkit asks for the
-      # older
-      # This dependency is asked for by target-linux-x64/CollectX/RedHat/x86_64/libssl.so.10
-      # - do we even want to use nvidia-shipped libssl?
-      "libcom_err.so.2"
-    ]
-    ++ lib.optionals (lib.versionOlder version "10.1") [
-      # For Cuda 10.0, nVidia also shipped a jre implementation which needed
-      # two old versions of ffmpeg which are not available in nixpkgs
-      "libavcodec.so.54"
-      "libavcodec.so.53"
-      "libavformat.so.54"
-      "libavformat.so.53"
-    ];
+    # The krb5 expression ships libcom_err.so.3 but cudatoolkit asks for the
+    # older
+    # This dependency is asked for by target-linux-x64/CollectX/RedHat/x86_64/libssl.so.10
+    # - do we even want to use nvidia-shipped libssl?
+    "libcom_err.so.2"
+  ];
 
-  preFixup =
-    if (lib.versionAtLeast version "10.1" && lib.versionOlder version "11") then
-      ''
-        ${lib.getExe' patchelf "patchelf"} $out/targets/*/lib/libnvrtc.so --add-needed libnvrtc-builtins.so
-      ''
-    else
-      ''
-        ${lib.getExe' patchelf "patchelf"} $out/lib64/libnvrtc.so --add-needed libnvrtc-builtins.so
-      '';
+  preFixup = ''
+    ${lib.getExe' patchelf "patchelf"} $out/lib64/libnvrtc.so --add-needed libnvrtc-builtins.so
+  '';
 
   unpackPhase = ''
     sh $src --keep --noexec
-
-    ${lib.optionalString (lib.versionOlder version "10.1") ''
-      cd pkg/run_files
-      sh cuda-linux*.run --keep --noexec
-      sh cuda-samples*.run --keep --noexec
-      mv pkg ../../$(basename $src)
-      cd ../..
-      rm -rf pkg
-
-      for patch in $runPatches; do
-        sh $patch --keep --noexec
-        mv pkg $(basename $patch)
-      done
-    ''}
   '';
 
   installPhase =
     ''
       runHook preInstall
       mkdir $out
-      ${lib.optionalString (lib.versionOlder version "10.1") ''
-        cd $(basename $src)
-        export PERL5LIB=.
-        perl ./install-linux.pl --prefix="$out"
-        cd ..
-        for patch in $runPatches; do
-          cd $(basename $patch)
-          perl ./install_patch.pl --silent --accept-eula --installdir="$out"
-          cd ..
-        done
-      ''}
-      ${lib.optionalString (lib.versionAtLeast version "10.1" && lib.versionOlder version "11") ''
-        cd pkg/builds/cuda-toolkit
-        mv * $out/
-        rm -f $out/nsight-systems-*/host-linux-x64/libstdc++.so*
-      ''}
-      ${lib.optionalString (lib.versionAtLeast version "11") ''
-        mkdir -p $out/bin $out/lib64 $out/include $doc
-        for dir in pkg/builds/* pkg/builds/cuda_nvcc/nvvm pkg/builds/cuda_cupti/extras/CUPTI; do
-          if [ -d $dir/bin ]; then
-            mv $dir/bin/* $out/bin
-          fi
-          if [ -d $dir/doc ]; then
-            (cd $dir/doc && find . -type d -exec mkdir -p $doc/\{} \;)
-            (cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $doc/\{} \;)
-          fi
-          if [ -L $dir/include ] || [ -d $dir/include ]; then
-            (cd $dir/include && find . -type d -exec mkdir -p $out/include/\{} \;)
-            (cd $dir/include && find . \( -type f -o -type l \) -exec mv \{} $out/include/\{} \;)
-          fi
-          if [ -L $dir/lib64 ] || [ -d $dir/lib64 ]; then
-            (cd $dir/lib64 && find . -type d -exec mkdir -p $out/lib64/\{} \;)
-            (cd $dir/lib64 && find . \( -type f -o -type l \) -exec mv \{} $out/lib64/\{} \;)
-          fi
-        done
-        mv pkg/builds/cuda_nvcc/nvvm $out/nvvm
+      mkdir -p $out/bin $out/lib64 $out/include $doc
+      for dir in pkg/builds/* pkg/builds/cuda_nvcc/nvvm pkg/builds/cuda_cupti/extras/CUPTI; do
+        if [ -d $dir/bin ]; then
+          mv $dir/bin/* $out/bin
+        fi
+        if [ -d $dir/doc ]; then
+          (cd $dir/doc && find . -type d -exec mkdir -p $doc/\{} \;)
+          (cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $doc/\{} \;)
+        fi
+        if [ -L $dir/include ] || [ -d $dir/include ]; then
+          (cd $dir/include && find . -type d -exec mkdir -p $out/include/\{} \;)
+          (cd $dir/include && find . \( -type f -o -type l \) -exec mv \{} $out/include/\{} \;)
+        fi
+        if [ -L $dir/lib64 ] || [ -d $dir/lib64 ]; then
+          (cd $dir/lib64 && find . -type d -exec mkdir -p $out/lib64/\{} \;)
+          (cd $dir/lib64 && find . \( -type f -o -type l \) -exec mv \{} $out/lib64/\{} \;)
+        fi
+      done
+      mv pkg/builds/cuda_nvcc/nvvm $out/nvvm
 
-        mv pkg/builds/cuda_sanitizer_api $out/cuda_sanitizer_api
-        ln -s $out/cuda_sanitizer_api/compute-sanitizer/compute-sanitizer $out/bin/compute-sanitizer
+      mv pkg/builds/cuda_sanitizer_api $out/cuda_sanitizer_api
+      ln -s $out/cuda_sanitizer_api/compute-sanitizer/compute-sanitizer $out/bin/compute-sanitizer
 
-        mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64
-        mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64
-        rm $out/host-linux-x64/libstdc++.so*
-      ''}
+      mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64
+      mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64
+      rm $out/host-linux-x64/libstdc++.so*
         ${
           lib.optionalString (lib.versionAtLeast version "11.8" && lib.versionOlder version "12")
             # error: auto-patchelf could not satisfy dependency libtiff.so.5 wanted by /nix/store/.......-cudatoolkit-12.0.1/host-linux-x64/Plugins/imageformats/libqtiff.so
@@ -301,20 +246,10 @@ backendStdenv.mkDerivation rec {
 
       rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
 
-      ${lib.optionalString (lib.versionOlder version "10.1") ''
-        # let's remove the 32-bit libraries, they confuse the lib64->lib mover
-        rm -rf $out/lib
-      ''}
-
       ${lib.optionalString (lib.versionAtLeast version "12.0") ''
         rm $out/host-linux-x64/libQt6*
       ''}
 
-      # Remove some cruft.
-      ${lib.optionalString (
-        (lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1")
-      ) "rm $out/bin/uninstall*"}
-
       # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
       if [ -d "$out"/cuda-samples ]; then
           mv "$out"/cuda-samples "$out"/samples
@@ -343,19 +278,11 @@ backendStdenv.mkDerivation rec {
 
         # Remove OpenCL libraries as they are provided by ocl-icd and driver.
         rm -f $out/lib64/libOpenCL*
-        ${lib.optionalString (lib.versionAtLeast version "10.1" && (lib.versionOlder version "11")) ''
-          mv $out/lib64 $out/lib
-          mv $out/extras/CUPTI/lib64/libcupti* $out/lib
-        ''}
 
         # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
         wrapProgram $out/bin/nvprof \
           --prefix LD_LIBRARY_PATH : $out/lib
       ''
-    + lib.optionalString (lib.versionOlder version "8.0") ''
-      # Hack to fix building against recent Glibc/GCC.
-      echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook
-    ''
     # 11.8 includes a broken symlink, include/include, pointing to targets/x86_64-linux/include
     + lib.optionalString (lib.versions.majorMinor version == "11.8") ''
       rm $out/include/include
@@ -365,7 +292,7 @@ backendStdenv.mkDerivation rec {
     '';
 
   postInstall = ''
-    for b in nvvp ${lib.optionalString (lib.versionOlder version "11") "nsight"}; do
+    for b in nvvp; do
       wrapProgram "$out/bin/$b" \
         --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
     done
diff --git a/pkgs/development/cuda-modules/cudatoolkit/releases.nix b/pkgs/development/cuda-modules/cudatoolkit/releases.nix
index 05f7b144ec4b4..147bf89adf0ad 100644
--- a/pkgs/development/cuda-modules/cudatoolkit/releases.nix
+++ b/pkgs/development/cuda-modules/cudatoolkit/releases.nix
@@ -10,24 +10,6 @@
 # }
 # Releases = AttrSet CudaVersion Release
 {
-  "10.0" = {
-    version = "10.0.130";
-    url = "https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux";
-    sha256 = "16p3bv1lwmyqpxil8r951h385sy9asc578afrc7lssa68c71ydcj";
-  };
-
-  "10.1" = {
-    version = "10.1.243";
-    url = "https://developer.download.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.243_418.87.00_linux.run";
-    sha256 = "0caxhlv2bdq863dfp6wj7nad66ml81vasq2ayf11psvq2b12vhp7";
-  };
-
-  "10.2" = {
-    version = "10.2.89";
-    url = "http://developer.download.nvidia.com/compute/cuda/10.2/Prod/local_installers/cuda_10.2.89_440.33.01_linux.run";
-    sha256 = "04fasl9sjkb1jvchvqgaqxprnprcz7a8r52249zp2ijarzyhf3an";
-  };
-
   "11.0" = {
     version = "11.0.3";
     url = "https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run";
diff --git a/pkgs/development/cuda-modules/cudnn/releases.nix b/pkgs/development/cuda-modules/cudnn/releases.nix
index 2b4afc160abe7..586bdecf67c05 100644
--- a/pkgs/development/cuda-modules/cudnn/releases.nix
+++ b/pkgs/development/cuda-modules/cudnn/releases.nix
@@ -96,48 +96,6 @@
     ];
     # x86_64
     linux-x86_64 = [
-      {
-        version = "7.4.2.24";
-        minCudaVersion = "10.0";
-        maxCudaVersion = "10.0";
-        url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.4.2/cudnn-10.0-linux-x64-v7.4.2.24.tgz";
-        hash = "sha256-Lt/IagK1DRfojEeJVaMy5qHoF05+U6NFi06lH68C2qM=";
-      }
-      {
-        version = "7.6.5.32";
-        minCudaVersion = "10.0";
-        maxCudaVersion = "10.0";
-        url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.0-linux-x64-v7.6.5.32.tgz";
-        hash = "sha256-KDVeOV8LK5OsLIO2E2CzW6bNA3fkTni+GXtrYbS0kro=";
-      }
-      {
-        version = "7.6.5.32";
-        minCudaVersion = "10.1";
-        maxCudaVersion = "10.1";
-        url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.1-linux-x64-v7.6.5.32.tgz";
-        hash = "sha256-fq7IA5osMKsLx1jTA1iHZ2k972v0myJIWiwAvy4TbLM=";
-      }
-      {
-        version = "7.6.5.32";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        url = "https://developer.download.nvidia.com/compute/redist/cudnn/v7.6.5/cudnn-10.2-linux-x64-v7.6.5.32.tgz";
-        hash = "sha256-YAJn8squ0v1Y6yFLpmnY6jXzlqfRm5SCLms2+fcIjCA='";
-      }
-      {
-        version = "8.0.5.39";
-        minCudaVersion = "10.1";
-        maxCudaVersion = "10.1";
-        url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.1-linux-x64-v8.0.5.39.tgz";
-        hash = "sha256-kJCElSmIlrM6qVBjo0cfk8NmJ9esAcF9w211xl7qSgA=";
-      }
-      {
-        version = "8.0.5.39";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-10.2-linux-x64-v8.0.5.39.tgz";
-        hash = "sha256-IfhMBcZ78eyFnnfDjM1b8VSWT6HDCPRJlZvkw1bjgvM=";
-      }
       {
         version = "8.0.5.39";
         minCudaVersion = "11.0";
@@ -152,13 +110,6 @@
         url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.0.5/cudnn-11.1-linux-x64-v8.0.5.39.tgz";
         hash = "sha256-HQRr+nk5navMb2yxUHkYdUQ5RC6gyp4Pvs3URvmwDM4=";
       }
-      {
-        version = "8.1.1.33";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-10.2-linux-x64-v8.1.1.33.tgz";
-        hash = "sha256-Kkp7mabpv6aQ6xm7QeSVU/KnpJGls6v8rpAOFmxbbr0=";
-      }
       {
         version = "8.1.1.33";
         minCudaVersion = "11.0";
@@ -166,13 +117,6 @@
         url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.1.1/cudnn-11.2-linux-x64-v8.1.1.33.tgz";
         hash = "sha256-mKh4TpKGLyABjSDCgbMNSgzZUfk2lPZDPM9K6cUCumo=";
       }
-      {
-        version = "8.2.4.15";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-10.2-linux-x64-v8.2.4.15.tgz";
-        hash = "sha256-0jyUoxFaHHcRamwSfZF1+/WfcjNkN08mo0aZB18yIvE=";
-      }
       {
         version = "8.2.4.15";
         minCudaVersion = "11.0";
@@ -180,13 +124,6 @@
         url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.2.4/cudnn-11.4-linux-x64-v8.2.4.15.tgz";
         hash = "sha256-Dl0t+JC5ln76ZhnaQhMQ2XMjVlp58FoajLm3Fluq0Nc=";
       }
-      {
-        version = "8.3.3.40";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/10.2/cudnn-linux-x86_64-8.3.3.40_cuda10.2-archive.tar.xz";
-        hash = "sha256-2FVPKzLmKV1fyPOsJeaPlAWLAYyAHaucFD42gS+JJqs=";
-      }
       {
         version = "8.3.3.40";
         minCudaVersion = "11.0";
@@ -194,13 +131,6 @@
         url = "https://developer.download.nvidia.com/compute/redist/cudnn/v8.3.3/local_installers/11.5/cudnn-linux-x86_64-8.3.3.40_cuda11.5-archive.tar.xz";
         hash = "sha256-6r6Wx1zwPqT1N5iU2RTx+K4UzqsSGYnoSwg22Sf7dzE=";
       }
-      {
-        version = "8.4.1.50";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda10.2-archive.tar.xz";
-        hash = "sha256-I88qMmU6lIiLVmaPuX7TTbisgTav839mssxUo3lQNjg=";
-      }
       {
         version = "8.4.1.50";
         minCudaVersion = "11.0";
@@ -208,13 +138,6 @@
         url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.4.1.50_cuda11.6-archive.tar.xz";
         hash = "sha256-7JbSN22B/KQr3T1MPXBambKaBlurV/kgVhx2PinGfQE=";
       }
-      {
-        version = "8.5.0.96";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda10-archive.tar.xz";
-        hash = "sha256-1mzhbbzR40WKkHnQLtJHhg0vYgf7G8a0OBcCwIOkJjM=";
-      }
       {
         version = "8.5.0.96";
         minCudaVersion = "11.0";
@@ -222,13 +145,6 @@
         url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.5.0.96_cuda11-archive.tar.xz";
         hash = "sha256-VFSm/ZTwCHKMqumtrZk8ToXvNjAuJrzkO+p9RYpee20=";
       }
-      {
-        version = "8.6.0.163";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda10-archive.tar.xz";
-        hash = "sha256-t4sr/GrFqqdxu2VhaJQk5K1Xm/0lU4chXG8hVL09R9k=";
-      }
       {
         version = "8.6.0.163";
         minCudaVersion = "11.0";
@@ -236,13 +152,6 @@
         url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.6.0.163_cuda11-archive.tar.xz";
         hash = "sha256-u8OW30cpTGV+3AnGAGdNYIyxv8gLgtz0VHBgwhcRFZ4=";
       }
-      {
-        version = "8.7.0.84";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.7.0.84_cuda10-archive.tar.xz";
-        hash = "sha256-bZhaqc8+GbPV2FQvvbbufd8VnEJgvfkICc2N3/gitRg=";
-      }
       {
         version = "8.7.0.84";
         minCudaVersion = "11.0";
diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix
index 1f6ea36552425..2abffe025d63d 100644
--- a/pkgs/development/cuda-modules/cutensor/extension.nix
+++ b/pkgs/development/cuda-modules/cutensor/extension.nix
@@ -101,10 +101,7 @@ let
     (attrsets.attrByPath [
       pname
       redistArch
-    ] null feature) != null
-
-    # NOTE: This is an ad hoc hack; manifest schemas do not support version constraints yet
-    && !(lib.versionOlder cudaVersion "11.0" && lib.versionAtLeast redistrib.${pname}.version "2.0.2");
+    ] null feature) != null;
 
   # TODO(@connorbaker): With an auxilliary file keeping track of the CUDA versions each release supports,
   # we could filter out releases that don't support our CUDA version.
diff --git a/pkgs/development/cuda-modules/gpus.nix b/pkgs/development/cuda-modules/gpus.nix
index cf6e0a1eaf360..15f98be92cd09 100644
--- a/pkgs/development/cuda-modules/gpus.nix
+++ b/pkgs/development/cuda-modules/gpus.nix
@@ -27,23 +27,6 @@
 # Without your work, this would have been much more difficult.
 # https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/
 [
-  {
-    # GeForce 700, GT-730
-    archName = "Kepler";
-    computeCapability = "3.0";
-    isJetson = false;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = "10.2";
-    maxCudaVersion = "10.2";
-  }
-  {
-    archName = "Kepler";
-    computeCapability = "3.2";
-    isJetson = false;
-    minCudaVersion = "10.0";
-    dontDefaultAfter = "10.2";
-    maxCudaVersion = "10.2";
-  }
   {
     # Tesla K40
     archName = "Kepler";
diff --git a/pkgs/development/cuda-modules/nvcc-compatibilities.nix b/pkgs/development/cuda-modules/nvcc-compatibilities.nix
index d4189400e2fc9..eb73cd93edfed 100644
--- a/pkgs/development/cuda-modules/nvcc-compatibilities.nix
+++ b/pkgs/development/cuda-modules/nvcc-compatibilities.nix
@@ -22,28 +22,6 @@ let
   # attrs :: AttrSet CudaVersion CompilerCompatibilities
   attrs = {
     # Our baseline
-    # https://docs.nvidia.com/cuda/archive/10.0/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
-    "10.0" = {
-      clangMaxMajorVersion = "6";
-      clangMinMajorVersion = "6";
-      gccMaxMajorVersion = "7";
-      gccMinMajorVersion = "5";
-    };
-
-    # Added support for Clang 7 and GCC 8
-    # https://docs.nvidia.com/cuda/archive/10.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
-    "10.1" = attrs."10.0" // {
-      clangMaxMajorVersion = "7";
-      gccMaxMajorVersion = "8";
-    };
-
-    # Added clang 8
-    # https://docs.nvidia.com/cuda/archive/10.2/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
-    "10.2" = attrs."10.1" // {
-      clangMaxMajorVersion = "8";
-    };
-
-    # Added support for Clang 9 and GCC 9
     # https://docs.nvidia.com/cuda/archive/11.0/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
     "11.0" = {
       clangMaxMajorVersion = "9";
diff --git a/pkgs/development/cuda-modules/tensorrt/releases.nix b/pkgs/development/cuda-modules/tensorrt/releases.nix
index e8c75b6ccdee0..c42218eebe961 100644
--- a/pkgs/development/cuda-modules/tensorrt/releases.nix
+++ b/pkgs/development/cuda-modules/tensorrt/releases.nix
@@ -43,14 +43,6 @@
     ];
     # x86_64
     linux-x86_64 = [
-      {
-        version = "8.0.3.4";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        cudnnVersion = "8.2";
-        filename = "TensorRT-8.0.3.4.Linux.x86_64-gnu.cuda-10.2.cudnn8.2.tar.gz";
-        hash = "sha256-LxcXgwe1OCRfwDsEsNLIkeNsOcx3KuF5Sj+g2dY6WD0=";
-      }
       {
         version = "8.0.3.4";
         minCudaVersion = "11.0";
@@ -59,14 +51,6 @@
         filename = "TensorRT-8.0.3.4.Linux.x86_64-gnu.cuda-11.3.cudnn8.2.tar.gz";
         hash = "sha256-MXdDUCT/SqWm26jB7QarEcwOG/O7cS36Y6Q0IvQTE/M=";
       }
-      {
-        version = "8.2.5.1";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        cudnnVersion = "8.2";
-        filename = "TensorRT-8.2.5.1.Linux.x86_64-gnu.cuda-10.2.cudnn8.2.tar.gz";
-        hash = "sha256-XV2Bf2LH8OM2GEMjV80MDweb1hSVF/wFUcaW3KP2m8Q=";
-      }
       {
         # The docs claim this supports through 11.5 despite the file name indicating 11.4.
         version = "8.2.5.1";
@@ -76,14 +60,6 @@
         filename = "TensorRT-8.2.5.1.Linux.x86_64-gnu.cuda-11.4.cudnn8.2.tar.gz";
         hash = "sha256-LcNpYvDiT7AavqzK1MRlijo2qDN7jznigeS77US713E=";
       }
-      {
-        version = "8.4.3.1";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        cudnnVersion = "8.4";
-        filename = "TensorRT-8.4.3.1.Linux.x86_64-gnu.cuda-10.2.cudnn8.4.tar.gz";
-        hash = "sha256-2c3Zzt93FBWWQtrSIvpbzzS6BT9s0NzALzdwXGLOZEU=";
-      }
       {
         # The docs claim this supports through 11.7 despite the file name indicating 11.6.
         version = "8.4.3.1";
@@ -93,14 +69,6 @@
         filename = "TensorRT-8.4.3.1.Linux.x86_64-gnu.cuda-11.6.cudnn8.4.tar.gz";
         hash = "sha256-jXwghcFjncxzh1BIwjWYqFJs4wiRNoduMdkCWOSeT2E=";
       }
-      {
-        version = "8.5.3.1";
-        minCudaVersion = "10.2";
-        maxCudaVersion = "10.2";
-        cudnnVersion = "8.6";
-        filename = "TensorRT-8.5.3.1.Linux.x86_64-gnu.cuda-10.2.cudnn8.6.tar.gz";
-        hash = "sha256-WCt6yfOmFbrjqdYCj6AE2+s2uFpISwk6urP+2I0BnGQ=";
-      }
       {
         version = "8.5.3.1";
         minCudaVersion = "11.0";
diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix
index b6d9ec4294c02..02b72cdb83de3 100644
--- a/pkgs/test/cuda/default.nix
+++ b/pkgs/test/cuda/default.nix
@@ -4,11 +4,6 @@
 
   cudaPackages,
 
-  cudaPackages_10_0,
-  cudaPackages_10_1,
-  cudaPackages_10_2,
-  cudaPackages_10,
-
   cudaPackages_11_0,
   cudaPackages_11_1,
   cudaPackages_11_2,
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 128d17bc0fa51..3f2264bb7f961 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -237,6 +237,10 @@ mapAliases {
   containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09
   crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11
   critcl = tclPackages.critcl; # Added 2024-10-02
+  cudaPackages_10_0 = throw "CUDA 10.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
+  cudaPackages_10_1 = throw "CUDA 10.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
+  cudaPackages_10_2 = throw "CUDA 10.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
+  cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
   cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
   cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e800dbf0ba185..1d0e5c27a38c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3101,11 +3101,6 @@ with pkgs;
 
   cron = isc-cron;
 
-  cudaPackages_10_0 = callPackage ./cuda-packages.nix { cudaVersion = "10.0"; };
-  cudaPackages_10_1 = callPackage ./cuda-packages.nix { cudaVersion = "10.1"; };
-  cudaPackages_10_2 = callPackage ./cuda-packages.nix { cudaVersion = "10.2"; };
-  cudaPackages_10 = recurseIntoAttrs cudaPackages_10_2;
-
   cudaPackages_11_0 = callPackage ./cuda-packages.nix { cudaVersion = "11.0"; };
   cudaPackages_11_1 = callPackage ./cuda-packages.nix { cudaVersion = "11.1"; };
   cudaPackages_11_2 = callPackage ./cuda-packages.nix { cudaVersion = "11.2"; };

From 58fe14bdf96e887908a68bec4500b626ad80b968 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Thu, 21 Nov 2024 20:44:01 -0300
Subject: [PATCH 49/88] treewide: remove AndersonTorres from some packages'
 meta.maintainers

---
 pkgs/applications/terminal-emulators/st/siduck76-st.nix | 2 +-
 pkgs/by-name/ae/aegisub/package.nix                     | 2 +-
 pkgs/by-name/ar/argtable/package.nix                    | 2 +-
 pkgs/by-name/bl/bluez-alsa/package.nix                  | 2 +-
 pkgs/by-name/bl/bluez/package.nix                       | 2 +-
 pkgs/by-name/cl/clerk/package.nix                       | 1 -
 pkgs/by-name/cm/cmake/package.nix                       | 2 +-
 pkgs/by-name/de/debianutils/package.nix                 | 2 +-
 pkgs/by-name/ed/edbrowse/package.nix                    | 1 -
 pkgs/by-name/em/emulationstation/package.nix            | 1 -
 pkgs/by-name/fo/fondo/package.nix                       | 2 +-
 pkgs/by-name/ga/gay/package.nix                         | 2 +-
 pkgs/by-name/gn/gnucash/package.nix                     | 2 +-
 pkgs/by-name/ho/home-manager/package.nix                | 2 +-
 pkgs/by-name/j/j/package.nix                            | 2 +-
 pkgs/by-name/la/labwc-gtktheme/package.nix              | 2 +-
 pkgs/by-name/la/labwc-menu-generator/package.nix        | 2 +-
 pkgs/by-name/la/labwc-tweaks-gtk/package.nix            | 2 +-
 pkgs/by-name/li/libarchive/package.nix                  | 2 +-
 pkgs/by-name/li/libnbd/package.nix                      | 1 -
 pkgs/by-name/lo/loksh/package.nix                       | 2 +-
 pkgs/by-name/ma/magic-vlsi/package.nix                  | 2 +-
 pkgs/by-name/me/megatools/package.nix                   | 2 +-
 pkgs/by-name/me/meson/package.nix                       | 2 +-
 pkgs/by-name/mi/micro/package.nix                       | 1 -
 pkgs/by-name/ni/nickel/package.nix                      | 2 +-
 pkgs/by-name/no/nomacs/package.nix                      | 2 +-
 pkgs/by-name/no/notion/package.nix                      | 2 +-
 pkgs/by-name/ns/nsxiv/package.nix                       | 2 +-
 pkgs/by-name/po/poke/package.nix                        | 2 +-
 pkgs/by-name/rc/rc/package.nix                          | 2 +-
 pkgs/by-name/ro/robodoc/package.nix                     | 2 +-
 pkgs/by-name/sa/sakura/package.nix                      | 2 +-
 pkgs/by-name/sa/samurai/package.nix                     | 2 +-
 pkgs/by-name/se/seabios/package.nix                     | 2 +-
 pkgs/by-name/sw/sword/package.nix                       | 1 -
 pkgs/by-name/sx/sxhkd/package.nix                       | 2 +-
 pkgs/by-name/ta/taxi/package.nix                        | 2 +-
 pkgs/by-name/tl/tllist/package.nix                      | 2 +-
 pkgs/by-name/to/tomlc99/package.nix                     | 2 +-
 pkgs/by-name/ud/udevil/package.nix                      | 2 +-
 pkgs/by-name/ud/udiskie/package.nix                     | 2 +-
 pkgs/by-name/ud/udunits/package.nix                     | 2 +-
 pkgs/by-name/va/variety/package.nix                     | 2 +-
 pkgs/by-name/vl/vlc/package.nix                         | 2 +-
 pkgs/by-name/wa/waf/package.nix                         | 2 +-
 pkgs/by-name/xm/xmldiff/package.nix                     | 2 +-
 pkgs/by-name/zi/zile/package.nix                        | 2 +-
 pkgs/by-name/zx/zxing-cpp/package.nix                   | 2 +-
 pkgs/development/python-modules/duden/default.nix       | 1 -
 pkgs/tools/system/plan9port/default.nix                 | 2 +-
 51 files changed, 44 insertions(+), 51 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/st/siduck76-st.nix b/pkgs/applications/terminal-emulators/st/siduck76-st.nix
index cb4a9d77b5fd5..54ec7117e2111 100644
--- a/pkgs/applications/terminal-emulators/st/siduck76-st.nix
+++ b/pkgs/applications/terminal-emulators/st/siduck76-st.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/siduck76/st";
     description = "Fork of st with many add-ons";
     license = licenses.mit;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ae/aegisub/package.nix b/pkgs/by-name/ae/aegisub/package.nix
index da6bd31073126..d4c593fb5de12 100644
--- a/pkgs/by-name/ae/aegisub/package.nix
+++ b/pkgs/by-name/ae/aegisub/package.nix
@@ -165,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
       bsd3
     ];
     mainProgram = "aegisub";
-    maintainers = with lib.maintainers; [ AndersonTorres wegank ];
+    maintainers = with lib.maintainers; [ wegank ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ar/argtable/package.nix b/pkgs/by-name/ar/argtable/package.nix
index c4db49d20254d..eb751a2a12af2 100644
--- a/pkgs/by-name/ar/argtable/package.nix
+++ b/pkgs/by-name/ar/argtable/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
       are essential but tedious to implement for a robust CLI program.
     '';
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ AndersonTorres artuuge ];
+    maintainers = with lib.maintainers; [ artuuge ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/bl/bluez-alsa/package.nix b/pkgs/by-name/bl/bluez-alsa/package.nix
index 911efe4a56445..eb42c8402cab7 100644
--- a/pkgs/by-name/bl/bluez-alsa/package.nix
+++ b/pkgs/by-name/bl/bluez-alsa/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ mit ];
     mainProgram = "bluealsa";
-    maintainers = with lib.maintainers; [ AndersonTorres oxij ];
+    maintainers = with lib.maintainers; [ oxij ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix
index bd9a612416daf..4337cd90b5193 100644
--- a/pkgs/by-name/bl/bluez/package.nix
+++ b/pkgs/by-name/bl/bluez/package.nix
@@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/tree/ChangeLog?h=${finalAttrs.version}";
     license = with lib.licenses; [ bsd2 gpl2Plus lgpl21Plus mit ];
     mainProgram = "btinfo";
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/cl/clerk/package.nix b/pkgs/by-name/cl/clerk/package.nix
index 9ff0290a2379c..e9c719dbadc45 100644
--- a/pkgs/by-name/cl/clerk/package.nix
+++ b/pkgs/by-name/cl/clerk/package.nix
@@ -96,7 +96,6 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       anderspapitto
       rewine
-      AndersonTorres
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix
index 3b5caabec7092..3b6a80a550c4e 100644
--- a/pkgs/by-name/cm/cmake/package.nix
+++ b/pkgs/by-name/cm/cmake/package.nix
@@ -217,7 +217,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor finalAttrs.version}/release/${lib.versions.majorMinor finalAttrs.version}.html";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ttuegel lnl7 AndersonTorres ];
+    maintainers = with lib.maintainers; [ ttuegel lnl7 ];
     platforms = lib.platforms.all;
     mainProgram = "cmake";
     broken = (qt5UI && stdenv.hostPlatform.isDarwin);
diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix
index 785c67aba69b1..b52a77bab04d3 100644
--- a/pkgs/by-name/de/debianutils/package.nix
+++ b/pkgs/by-name/de/debianutils/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ gpl2Plus publicDomain smail ];
     mainProgram = "ischroot";
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ed/edbrowse/package.nix b/pkgs/by-name/ed/edbrowse/package.nix
index 154095e57cc8c..4561e0b902722 100644
--- a/pkgs/by-name/ed/edbrowse/package.nix
+++ b/pkgs/by-name/ed/edbrowse/package.nix
@@ -92,7 +92,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       schmitthenner
       equirosa
-      AndersonTorres
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/em/emulationstation/package.nix b/pkgs/by-name/em/emulationstation/package.nix
index 8be475d885fca..eb8c048d4ea17 100644
--- a/pkgs/by-name/em/emulationstation/package.nix
+++ b/pkgs/by-name/em/emulationstation/package.nix
@@ -80,7 +80,6 @@ stdenv.mkDerivation {
     license = with lib.licenses; [ mit ];
     mainProgram = "emulationstation";
     maintainers = with lib.maintainers; [
-      AndersonTorres
       edwtjo
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/fo/fondo/package.nix b/pkgs/by-name/fo/fondo/package.nix
index 46c2c72d91ad3..16fcd734286a3 100644
--- a/pkgs/by-name/fo/fondo/package.nix
+++ b/pkgs/by-name/fo/fondo/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/calo001/fondo";
     description = "Find the most beautiful wallpapers for your desktop";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members;
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
     platforms = platforms.linux;
     mainProgram = "com.github.calo001.fondo";
   };
diff --git a/pkgs/by-name/ga/gay/package.nix b/pkgs/by-name/ga/gay/package.nix
index d1129702f867a..341c620af4ffa 100644
--- a/pkgs/by-name/ga/gay/package.nix
+++ b/pkgs/by-name/ga/gay/package.nix
@@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/ms-jpq/gay";
     description = "Colour your text / terminal to be more gay";
     license = licenses.mit;
-    maintainers = with maintainers; [ AndersonTorres CodeLongAndProsper90 ];
+    maintainers = with maintainers; [ CodeLongAndProsper90 ];
     mainProgram = "gay";
   };
 }
diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix
index c7d7e6c51380e..a966522b9825c 100644
--- a/pkgs/by-name/gn/gnucash/package.nix
+++ b/pkgs/by-name/gn/gnucash/package.nix
@@ -163,7 +163,7 @@ stdenv.mkDerivation rec {
       - Financial Calculations
     '';
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ domenkozar AndersonTorres rski nevivurn ];
+    maintainers = with maintainers; [ domenkozar rski nevivurn ];
     platforms = platforms.unix;
     mainProgram = "gnucash";
   };
diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix
index 0b8e16ced6abb..bf91648b34113 100644
--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@@ -93,7 +93,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.mit;
     mainProgram = "home-manager";
-    maintainers = with lib.maintainers; [ AndersonTorres bryango ];
+    maintainers = with lib.maintainers; [ bryango ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/j/j/package.nix b/pkgs/by-name/j/j/package.nix
index f7b36dfa35396..3101b22bcb507 100644
--- a/pkgs/by-name/j/j/package.nix
+++ b/pkgs/by-name/j/j/package.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
       problems that are not already well understood.
     '';
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ raskin synthetica AndersonTorres ];
+    maintainers = with maintainers; [ raskin synthetica ];
     broken = stdenv.hostPlatform.isDarwin;
     platforms = platforms.all;
     mainProgram = "jconsole";
diff --git a/pkgs/by-name/la/labwc-gtktheme/package.nix b/pkgs/by-name/la/labwc-gtktheme/package.nix
index 0e9645e596289..0084a5a30a50d 100644
--- a/pkgs/by-name/la/labwc-gtktheme/package.nix
+++ b/pkgs/by-name/la/labwc-gtktheme/package.nix
@@ -49,6 +49,6 @@ python3Packages.buildPythonApplication rec {
     mainProgram = "labwc-gtktheme";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ AndersonTorres romildo ];
+    maintainers = with lib.maintainers; [ romildo ];
   };
 }
diff --git a/pkgs/by-name/la/labwc-menu-generator/package.nix b/pkgs/by-name/la/labwc-menu-generator/package.nix
index a7a4f781edd92..3ba8dd9668162 100644
--- a/pkgs/by-name/la/labwc-menu-generator/package.nix
+++ b/pkgs/by-name/la/labwc-menu-generator/package.nix
@@ -41,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "labwc-menu-generator";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ AndersonTorres romildo ];
+    maintainers = with lib.maintainers; [ romildo ];
   };
 })
diff --git a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
index fdf4420f1a814..f62013c98a586 100644
--- a/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
+++ b/pkgs/by-name/la/labwc-tweaks-gtk/package.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "labwc-tweaks-gtk";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ AndersonTorres romildo ];
+    maintainers = with lib.maintainers; [ romildo ];
   };
 })
diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index 8703c1a4faba0..306c92c6e71a1 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -121,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://github.com/libarchive/libarchive/releases/tag/v${finalAttrs.version}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ jcumming AndersonTorres ];
+    maintainers = with maintainers; [ jcumming ];
     platforms = platforms.all;
     inherit (acl.meta) badPlatforms;
   };
diff --git a/pkgs/by-name/li/libnbd/package.nix b/pkgs/by-name/li/libnbd/package.nix
index 76e94bcf04754..02b3cf734daa4 100644
--- a/pkgs/by-name/li/libnbd/package.nix
+++ b/pkgs/by-name/li/libnbd/package.nix
@@ -88,7 +88,6 @@ stdenv.mkDerivation rec {
     '';
     license = with licenses; lgpl21Plus;
     maintainers = with maintainers; [
-      AndersonTorres
       humancalico
     ];
     platforms = with platforms; linux;
diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix
index e82c803c56773..4d18fb08c93af 100644
--- a/pkgs/by-name/lo/loksh/package.nix
+++ b/pkgs/by-name/lo/loksh/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
       systems.
     '';
     license = with lib.licenses; [ publicDomain ];
-    maintainers = with lib.maintainers; [ AndersonTorres cameronnemo ];
+    maintainers = with lib.maintainers; [ cameronnemo ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix
index 04ec3c080279b..393694cfe623e 100644
--- a/pkgs/by-name/ma/magic-vlsi/package.nix
+++ b/pkgs/by-name/ma/magic-vlsi/package.nix
@@ -50,6 +50,6 @@ stdenv.mkDerivation rec {
     description = "VLSI layout tool written in Tcl";
     homepage    = "http://opencircuitdesign.com/magic/";
     license     = licenses.mit;
-    maintainers = with maintainers; [ thoughtpolice AndersonTorres ];
+    maintainers = with maintainers; [ thoughtpolice ];
   };
 }
diff --git a/pkgs/by-name/me/megatools/package.nix b/pkgs/by-name/me/megatools/package.nix
index aaf0549e8fd61..105abe6470898 100644
--- a/pkgs/by-name/me/megatools/package.nix
+++ b/pkgs/by-name/me/megatools/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "Command line client for Mega.co.nz";
     homepage = "https://megatools.megous.com/";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ viric AndersonTorres ];
+    maintainers = with maintainers; [ viric ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 419e489e2b2e1..2b68f1e5078ed 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -173,7 +173,7 @@ python3.pkgs.buildPythonApplication rec {
       code.
     '';
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ AndersonTorres qyliss ];
+    maintainers = with lib.maintainers; [ qyliss ];
     inherit (python3.meta) platforms;
   };
 }
diff --git a/pkgs/by-name/mi/micro/package.nix b/pkgs/by-name/mi/micro/package.nix
index 8f2bb8488db38..1573cc4c4bb41 100644
--- a/pkgs/by-name/mi/micro/package.nix
+++ b/pkgs/by-name/mi/micro/package.nix
@@ -83,7 +83,6 @@ let
       license = lib.licenses.mit;
       mainProgram = "micro";
       maintainers = with lib.maintainers; [
-        AndersonTorres
         pbsds
       ];
     };
diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix
index 5c82059e76417..70a2167bc56ec 100644
--- a/pkgs/by-name/ni/nickel/package.nix
+++ b/pkgs/by-name/ni/nickel/package.nix
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
     '';
     changelog = "https://github.com/tweag/nickel/blob/${version}/RELEASES.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ AndersonTorres felschr matthiasbeyer ];
+    maintainers = with maintainers; [ felschr matthiasbeyer ];
     mainProgram = "nickel";
   };
 }
diff --git a/pkgs/by-name/no/nomacs/package.nix b/pkgs/by-name/no/nomacs/package.nix
index 7387297b45c93..4c8a1465fc61d 100644
--- a/pkgs/by-name/no/nomacs/package.nix
+++ b/pkgs/by-name/no/nomacs/package.nix
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/nomacs/nomacs/releases/tag/${finalAttrs.src.rev}";
     license = with lib.licenses; [ gpl3Plus ];
     mainProgram = "nomacs";
-    maintainers = with lib.maintainers; [ AndersonTorres mindavi ];
+    maintainers = with lib.maintainers; [ mindavi ];
     inherit (libsForQt5.qtbase.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/no/notion/package.nix b/pkgs/by-name/no/notion/package.nix
index 9ee84b130bf46..f430d72c2737b 100644
--- a/pkgs/by-name/no/notion/package.nix
+++ b/pkgs/by-name/no/notion/package.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://notionwm.net";
     license = lib.licenses.lgpl21;
     mainProgram = "notion";
-    maintainers = with lib.maintainers; [ jfb AndersonTorres raboof ];
+    maintainers = with lib.maintainers; [ jfb raboof ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ns/nsxiv/package.nix b/pkgs/by-name/ns/nsxiv/package.nix
index b54c8ce55f4ea..b4059bbb2fa96 100644
--- a/pkgs/by-name/ns/nsxiv/package.nix
+++ b/pkgs/by-name/ns/nsxiv/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://codeberg.org/nsxiv/nsxiv/src/tag/${finalAttrs.src.rev}/etc/CHANGELOG.md";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ AndersonTorres sikmir ];
+    maintainers = with lib.maintainers; [ sikmir ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/po/poke/package.nix b/pkgs/by-name/po/poke/package.nix
index 5b078d263e481..66fa43394f2bc 100644
--- a/pkgs/by-name/po/poke/package.nix
+++ b/pkgs/by-name/po/poke/package.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://www.jemarch.net/poke";
     changelog = "https://git.savannah.gnu.org/cgit/poke.git/plain/ChangeLog?h=releases/poke-${finalAttrs.version}";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ AndersonTorres kira-bruneau ];
+    maintainers = with lib.maintainers; [ kira-bruneau ];
     platforms = lib.platforms.unix;
     hydraPlatforms = lib.platforms.linux; # build hangs on Darwin platforms, needs investigation
   };
diff --git a/pkgs/by-name/rc/rc/package.nix b/pkgs/by-name/rc/rc/package.nix
index 6484269c924b9..15b35211b3014 100644
--- a/pkgs/by-name/rc/rc/package.nix
+++ b/pkgs/by-name/rc/rc/package.nix
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Plan 9 shell";
     license = [ lib.licenses.zlib ];
     mainProgram = "rc";
-    maintainers = with lib.maintainers; [ ramkromberg AndersonTorres ];
+    maintainers = with lib.maintainers; [ ramkromberg ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ro/robodoc/package.nix b/pkgs/by-name/ro/robodoc/package.nix
index 4665548117208..8ebd078b9696a 100644
--- a/pkgs/by-name/ro/robodoc/package.nix
+++ b/pkgs/by-name/ro/robodoc/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
       Java -- basically any program in which you can use remarks/comments.
     '';
     license = with licenses; gpl3Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 })
diff --git a/pkgs/by-name/sa/sakura/package.nix b/pkgs/by-name/sa/sakura/package.nix
index d58eceae1654c..cc883a488d687 100644
--- a/pkgs/by-name/sa/sakura/package.nix
+++ b/pkgs/by-name/sa/sakura/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
       options. No more no less.
     '';
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [ astsmtl codyopel AndersonTorres ];
+    maintainers = with lib.maintainers; [ astsmtl codyopel ];
     platforms = lib.platforms.linux;
     mainProgram = "sakura";
  };
diff --git a/pkgs/by-name/sa/samurai/package.nix b/pkgs/by-name/sa/samurai/package.nix
index 675160751d1e0..15a20cd343f14 100644
--- a/pkgs/by-name/sa/samurai/package.nix
+++ b/pkgs/by-name/sa/samurai/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://github.com/michaelforney/samurai";
     license = with licenses; [ mit asl20 ]; # see LICENSE
-    maintainers = with maintainers; [ dtzWill AndersonTorres ];
+    maintainers = with maintainers; [ dtzWill ];
     mainProgram = "samu";
     platforms = platforms.all;
   };
diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix
index ac647e93b1958..a6070810332ba 100644
--- a/pkgs/by-name/se/seabios/package.nix
+++ b/pkgs/by-name/se/seabios/package.nix
@@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
       use of coreboot.
     '';
     license = with lib.licenses; [ lgpl3Plus ];
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
     platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isUnix lib.systems.inspect.patterns.isx86;
     badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
   };
diff --git a/pkgs/by-name/sw/sword/package.nix b/pkgs/by-name/sw/sword/package.nix
index d2be17e78d92a..7ee1646ad2277 100644
--- a/pkgs/by-name/sw/sword/package.nix
+++ b/pkgs/by-name/sw/sword/package.nix
@@ -117,7 +117,6 @@ stdenv.mkDerivation (
       '';
       license = lib.licenses.gpl2;
       maintainers = with lib.maintainers; [
-        AndersonTorres
         greg
       ];
       platforms = lib.platforms.all;
diff --git a/pkgs/by-name/sx/sxhkd/package.nix b/pkgs/by-name/sx/sxhkd/package.nix
index ea688c23e714b..2ae07339b4209 100644
--- a/pkgs/by-name/sx/sxhkd/package.nix
+++ b/pkgs/by-name/sx/sxhkd/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/baskerville/sxhkd";
     license = lib.licenses.bsd2;
     mainProgram = "sxhkd";
-    maintainers = with lib.maintainers; [ vyp AndersonTorres ncfavier ];
+    maintainers = with lib.maintainers; [ vyp ncfavier ];
     inherit (libxcb.meta) platforms;
   };
 })
diff --git a/pkgs/by-name/ta/taxi/package.nix b/pkgs/by-name/ta/taxi/package.nix
index 4b3303ecd0acd..9552afd1a635c 100644
--- a/pkgs/by-name/ta/taxi/package.nix
+++ b/pkgs/by-name/ta/taxi/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Alecaddd/taxi";
     description = "FTP Client that drives you anywhere";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ AndersonTorres ] ++ teams.pantheon.members;
+    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
     platforms = platforms.linux;
     mainProgram = "com.github.alecaddd.taxi";
   };
diff --git a/pkgs/by-name/tl/tllist/package.nix b/pkgs/by-name/tl/tllist/package.nix
index 62bcbf0241f3b..d800279a8a4c1 100644
--- a/pkgs/by-name/tl/tllist/package.nix
+++ b/pkgs/by-name/tl/tllist/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
       structs, enums and unions.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ fionera AndersonTorres ];
+    maintainers = with maintainers; [ fionera ];
     platforms = platforms.all;
   };
 })
diff --git a/pkgs/by-name/to/tomlc99/package.nix b/pkgs/by-name/to/tomlc99/package.nix
index 5ed4fd07b4720..2790e94b7c0dc 100644
--- a/pkgs/by-name/to/tomlc99/package.nix
+++ b/pkgs/by-name/to/tomlc99/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/cktan/tomlc99";
     description = "TOML v1.0.0-compliant library written in C99";
     license = licenses.mit;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ ];
     platforms = with platforms; unix;
   };
 }
diff --git a/pkgs/by-name/ud/udevil/package.nix b/pkgs/by-name/ud/udevil/package.nix
index 9c50b189cc150..0da470f9a99fd 100644
--- a/pkgs/by-name/ud/udevil/package.nix
+++ b/pkgs/by-name/ud/udevil/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     homepage = "https://ignorantguru.github.io/udevil/";
     description = "Mount without password";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ AndersonTorres ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix
index 58fa8054c67d7..50abfb13e57ed 100644
--- a/pkgs/by-name/ud/udiskie/package.nix
+++ b/pkgs/by-name/ud/udiskie/package.nix
@@ -106,6 +106,6 @@ python3Packages.buildPythonApplication rec {
       - password caching (requires python keyutils 0.3)
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ AndersonTorres dotlambda ];
+    maintainers = with maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/by-name/ud/udunits/package.nix b/pkgs/by-name/ud/udunits/package.nix
index 48ffb94175f98..394058a3315c5 100644
--- a/pkgs/by-name/ud/udunits/package.nix
+++ b/pkgs/by-name/ud/udunits/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
       converting values.
     '';
     license = licenses.asl20;
-    maintainers = with maintainers; [ AndersonTorres pSub ];
+    maintainers = with maintainers; [ pSub ];
     platforms = platforms.all;
     mainProgram = "udunits2";
   };
diff --git a/pkgs/by-name/va/variety/package.nix b/pkgs/by-name/va/variety/package.nix
index 748dd7fcf18e1..ddfa2f9ea8510 100644
--- a/pkgs/by-name/va/variety/package.nix
+++ b/pkgs/by-name/va/variety/package.nix
@@ -95,6 +95,6 @@ python3.pkgs.buildPythonApplication rec {
       blur, as well as options to layer quotes and a clock onto the background.
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ p3psi AndersonTorres zfnmxt ];
+    maintainers = with maintainers; [ p3psi zfnmxt ];
   };
 }
diff --git a/pkgs/by-name/vl/vlc/package.nix b/pkgs/by-name/vl/vlc/package.nix
index 427263200911f..2c005cbfa4342 100644
--- a/pkgs/by-name/vl/vlc/package.nix
+++ b/pkgs/by-name/vl/vlc/package.nix
@@ -305,7 +305,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Cross-platform media player and streaming server";
     homepage = "https://www.videolan.org/vlc/";
     license = lib.licenses.lgpl21Plus;
-    maintainers = with lib.maintainers; [ AndersonTorres alois31 ];
+    maintainers = with lib.maintainers; [ alois31 ];
     platforms = lib.platforms.linux;
     mainProgram = "vlc";
   };
diff --git a/pkgs/by-name/wa/waf/package.nix b/pkgs/by-name/wa/waf/package.nix
index 75fb3d74c2a71..bb3c4df40ef19 100644
--- a/pkgs/by-name/wa/waf/package.nix
+++ b/pkgs/by-name/wa/waf/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog  = "https://gitlab.com/ita1024/waf/blob/waf-${finalAttrs.version}/ChangeLog";
     license = lib.licenses.bsd3;
     mainProgram = "waf";
-    maintainers = with lib.maintainers; [ AndersonTorres ];
+    maintainers = with lib.maintainers; [ ];
     inherit (python3.meta) platforms;
     sourceProvenance = [ lib.sourceTypes.fromSource ];
   };
diff --git a/pkgs/by-name/xm/xmldiff/package.nix b/pkgs/by-name/xm/xmldiff/package.nix
index dc0885a71f3f5..6d9ce6076e336 100644
--- a/pkgs/by-name/xm/xmldiff/package.nix
+++ b/pkgs/by-name/xm/xmldiff/package.nix
@@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication {
       readable diffs in those situations.
     '';
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ AndersonTorres anpryl ];
+    maintainers = with lib.maintainers; [ anpryl ];
   };
 }
diff --git a/pkgs/by-name/zi/zile/package.nix b/pkgs/by-name/zi/zile/package.nix
index 35714e8d3c0e0..26f0f3484d444 100644
--- a/pkgs/by-name/zi/zile/package.nix
+++ b/pkgs/by-name/zi/zile/package.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
       every Emacs user should feel at home.
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ pSub AndersonTorres ];
+    maintainers = with maintainers; [ pSub ];
     platforms = platforms.unix;
     mainProgram = "zile";
   };
diff --git a/pkgs/by-name/zx/zxing-cpp/package.nix b/pkgs/by-name/zx/zxing-cpp/package.nix
index affac873f2cd3..30a304867d585 100644
--- a/pkgs/by-name/zx/zxing-cpp/package.nix
+++ b/pkgs/by-name/zx/zxing-cpp/package.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
       formats.
     '';
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ AndersonTorres lukegb ];
+    maintainers = with lib.maintainers; [ lukegb ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/development/python-modules/duden/default.nix b/pkgs/development/python-modules/duden/default.nix
index a4da49d62f179..dc47ee1e976ee 100644
--- a/pkgs/development/python-modules/duden/default.nix
+++ b/pkgs/development/python-modules/duden/default.nix
@@ -49,7 +49,6 @@ let
       license = with lib.licenses; [ mit ];
       mainProgram = "duden";
       maintainers = with lib.maintainers; [
-        AndersonTorres
         linuxissuper
       ];
     };
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index 6d1e778da376c..ebad0fda64ad7 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.mit;
     maintainers = with maintainers; [
-      AndersonTorres bbarker ehmry ftrvxmtrx kovirobi ylh
+      bbarker ehmry ftrvxmtrx kovirobi ylh
     ];
     mainProgram = "9";
     platforms = platforms.unix;

From b8c5802f8f3f5b0a82c0973f06841cf72fc2ca11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 02:06:10 +0000
Subject: [PATCH 50/88] gh-i: 0.0.8 -> 0.0.10

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

diff --git a/pkgs/by-name/gh/gh-i/package.nix b/pkgs/by-name/gh/gh-i/package.nix
index 7e78935ccc3bf..c4dbf1ba6aef6 100644
--- a/pkgs/by-name/gh/gh-i/package.nix
+++ b/pkgs/by-name/gh/gh-i/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gh-i";
-  version = "0.0.8";
+  version = "0.0.10";
 
   src = fetchFromGitHub {
     owner = "gennaro-tedesco";
     repo = "gh-i";
     rev = "v${version}";
-    hash = "sha256-fW9T7B/97kI8zjaTvJHOkEUGVVM+ysOxZzqVNeOfVkc=";
+    hash = "sha256-k1xfQxRh8T0SINtbFlIVNFEODYU0RhBAkjudOv1bLvw=";
   };
 
-  vendorHash = "sha256-TSl+7N3W3BeW8UWxUdTv3cob2P7eLvO+80BLqcbhanQ=";
+  vendorHash = "sha256-eqSAwHFrvBxLl5zcZyp3+1wTf7+JmpogFBDuVgzNm+w=";
 
   ldflags = [ "-s" ];
 

From 438da0034fa8fa1f12730db3912ca45633892c6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 02:07:54 +0000
Subject: [PATCH 51/88] goose: 3.22.1 -> 3.23.0

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

diff --git a/pkgs/by-name/go/goose/package.nix b/pkgs/by-name/go/goose/package.nix
index 058408ca9f2c3..2dca37b2259d5 100644
--- a/pkgs/by-name/go/goose/package.nix
+++ b/pkgs/by-name/go/goose/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "goose";
-  version = "3.22.1";
+  version = "3.23.0";
 
   src = fetchFromGitHub {
     owner = "pressly";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-rXh50Yv8UXJc+E32Fgg6Iy2K6x5+IM7dmxsvwFuCQ9U=";
+    hash = "sha256-xfCkhVUR/GXYQEpaAhaeBV6UfXMdHyzTn+mIJfuHjBA=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-xb3yBiV+XyOlMp42c+eCj27DpvJalP5qhEoKG1X2kG8=";
+  vendorHash = "sha256-kNe+qc1EIHqXRv0DAGfBK6XNahn/YNmz74mfWrG3+rc=";
 
   # skipping: end-to-end tests require a docker daemon
   postPatch = ''

From f7e6035cfec8f6b4c47eb2fa7c14f7b497dbdb10 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sat, 19 Oct 2024 07:02:04 +0000
Subject: [PATCH 52/88] starpls-bin: 0.1.14 -> 0.1.15

---
 pkgs/by-name/st/starpls-bin/manifest.json | 17 ++++++
 pkgs/by-name/st/starpls-bin/package.nix   | 49 +++++++++++------
 pkgs/by-name/st/starpls-bin/update.py     | 65 +++++++++++++++++++++++
 3 files changed, 114 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/by-name/st/starpls-bin/manifest.json
 create mode 100755 pkgs/by-name/st/starpls-bin/update.py

diff --git a/pkgs/by-name/st/starpls-bin/manifest.json b/pkgs/by-name/st/starpls-bin/manifest.json
new file mode 100644
index 0000000000000..99de0529906ff
--- /dev/null
+++ b/pkgs/by-name/st/starpls-bin/manifest.json
@@ -0,0 +1,17 @@
+{
+  "version": "0.1.15",
+  "assets": {
+    "x86_64-linux": {
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.15/starpls-linux-amd64",
+      "hash": "sha256-6rLYCRg7K36xKxW0nI86w6u1MjAPGTtJQbY5HCSukTE="
+    },
+    "aarch64-linux": {
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.15/starpls-linux-aarch64",
+      "hash": "sha256-sHyPcaBlhZrepfnVGE5CxvZZOrBMT0qDP9hHj78CXJQ="
+    },
+    "aarch64-darwin": {
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.15/starpls-darwin-arm64",
+      "hash": "sha256-Q8U+Vagwb9F63N5UA8sAOd+tfCvyZMdtAmZcNgtwiSo="
+    }
+  }
+}
diff --git a/pkgs/by-name/st/starpls-bin/package.nix b/pkgs/by-name/st/starpls-bin/package.nix
index 98ae3ffa31c5a..190ba9b7a4faf 100644
--- a/pkgs/by-name/st/starpls-bin/package.nix
+++ b/pkgs/by-name/st/starpls-bin/package.nix
@@ -1,19 +1,24 @@
-{ lib, stdenv, fetchurl, autoPatchelfHook }:
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
+  testers,
+  starpls-bin,
+}:
 
+let
+  manifest = lib.importJSON ./manifest.json;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "starpls-bin";
-  version = "0.1.14";
+  version = manifest.version;
 
-  src = {
-    x86_64-linux = fetchurl {
-      url = "https://github.com/withered-magic/starpls/releases/download/v${finalAttrs.version}/starpls-linux-amd64";
-      hash = "sha256-PYU+Jv3uaJqJKw6zSNOPl+NlIQgfm38cOrRqTdNXY+8=";
-    };
-    aarch64-darwin = fetchurl {
-      url = "https://github.com/withered-magic/starpls/releases/download/v${finalAttrs.version}/starpls-darwin-arm64";
-      hash = "sha256-9d1ybebguEUJu2PvMcToQEd8M4ajRrQUvBZqS6o0sbw=";
-    };
-  }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  src =
+    let
+      system = stdenv.hostPlatform.system;
+    in
+    fetchurl (manifest.assets.${system} or (throw "Unsupported system: ${system}"));
 
   dontUnpack = true;
   dontConfigure = true;
@@ -31,12 +36,22 @@ stdenv.mkDerivation (finalAttrs: {
     install -D $src $out/bin/starpls
   '';
 
-  meta = with lib; {
+  passthru = {
+    tests.version = testers.testVersion {
+      package = starpls-bin;
+      command = "starpls version";
+      version = "v${finalAttrs.version}";
+    };
+    updateScript = ./update.py;
+  };
+
+  meta = {
+    description = "Language server for Starlark";
     homepage = "https://github.com/withered-magic/starpls";
-    description = "A language server for Starlark";
-    license = licenses.asl20;
-    platforms = [ "aarch64-darwin" "x86_64-linux" ];
-    maintainers = with maintainers; [ aaronjheng ];
+    license = lib.licenses.asl20;
+    platforms = builtins.attrNames manifest.assets;
+    maintainers = with lib.maintainers; [ aaronjheng ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     mainProgram = "starpls";
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
diff --git a/pkgs/by-name/st/starpls-bin/update.py b/pkgs/by-name/st/starpls-bin/update.py
new file mode 100755
index 0000000000000..c019a893d1893
--- /dev/null
+++ b/pkgs/by-name/st/starpls-bin/update.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i python -p "python3.withPackages (ps: with ps; [ ps.httpx ps.socksio ])"
+
+import json
+import os
+import pathlib
+import subprocess
+
+import httpx
+
+platforms = {
+    "x86_64-linux": "linux-amd64",
+    "aarch64-linux": "linux-aarch64",
+    "aarch64-darwin": "darwin-arm64",
+}
+
+if __name__ == "__main__":
+    headers = {}
+    token = os.getenv("GITHUB_TOKEN")
+    if token is not None:
+        headers["Authorization"] = "Bearer {}".format(token)
+
+    resp = httpx.get(
+        "https://api.github.com/repos/withered-magic/starpls/releases/latest",
+        headers=headers,
+    )
+
+    latest_release = resp.json().get("tag_name")
+    version = latest_release.removeprefix("v")
+
+    assets = {
+        "version": version,
+        "assets": {},
+    }
+
+    for k, v in platforms.items():
+        url = "https://github.com/withered-magic/starpls/releases/download/v{}/starpls-{}".format(
+            version, v
+        )
+
+        process = subprocess.run(
+            ["nix-prefetch-url", "--type", "sha256", url],
+            capture_output=True,
+            text=True,
+        )
+
+        process.check_returncode()
+
+        process = subprocess.run(
+            ["nix-hash", "--type", "sha256", "--to-sri", process.stdout.rstrip()],
+            capture_output=True,
+            text=True,
+        )
+
+        process.check_returncode()
+
+        hash = process.stdout.rstrip()
+        assets["assets"][k] = {
+            "url": url,
+            "hash": hash,
+        }
+
+    (pathlib.Path(__file__).parent / "manifest.json").write_text(
+        json.dumps(assets, indent=2) + "\n"
+    )

From 0b7768a68c751c2765c36f38e36eaec89a7dd76f Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Wed, 30 Oct 2024 07:03:47 +0000
Subject: [PATCH 53/88] starpls: rename from starpls-bin

---
 pkgs/by-name/st/{starpls-bin => starpls}/manifest.json | 0
 pkgs/by-name/st/{starpls-bin => starpls}/package.nix   | 7 +++----
 pkgs/by-name/st/{starpls-bin => starpls}/update.py     | 0
 pkgs/top-level/aliases.nix                             | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/by-name/st/{starpls-bin => starpls}/manifest.json (100%)
 rename pkgs/by-name/st/{starpls-bin => starpls}/package.nix (90%)
 rename pkgs/by-name/st/{starpls-bin => starpls}/update.py (100%)

diff --git a/pkgs/by-name/st/starpls-bin/manifest.json b/pkgs/by-name/st/starpls/manifest.json
similarity index 100%
rename from pkgs/by-name/st/starpls-bin/manifest.json
rename to pkgs/by-name/st/starpls/manifest.json
diff --git a/pkgs/by-name/st/starpls-bin/package.nix b/pkgs/by-name/st/starpls/package.nix
similarity index 90%
rename from pkgs/by-name/st/starpls-bin/package.nix
rename to pkgs/by-name/st/starpls/package.nix
index 190ba9b7a4faf..7cbe984d31c79 100644
--- a/pkgs/by-name/st/starpls-bin/package.nix
+++ b/pkgs/by-name/st/starpls/package.nix
@@ -4,14 +4,14 @@
   fetchurl,
   autoPatchelfHook,
   testers,
-  starpls-bin,
+  starpls,
 }:
 
 let
   manifest = lib.importJSON ./manifest.json;
 in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "starpls-bin";
+  pname = "starpls";
   version = manifest.version;
 
   src =
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests.version = testers.testVersion {
-      package = starpls-bin;
+      package = starpls;
       command = "starpls version";
       version = "v${finalAttrs.version}";
     };
@@ -53,6 +53,5 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ aaronjheng ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     mainProgram = "starpls";
-    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
 })
diff --git a/pkgs/by-name/st/starpls-bin/update.py b/pkgs/by-name/st/starpls/update.py
similarity index 100%
rename from pkgs/by-name/st/starpls-bin/update.py
rename to pkgs/by-name/st/starpls/update.py
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 04ba2fdd74b8d..a68b0de88bfba 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1146,6 +1146,7 @@ mapAliases {
   sqldeveloper = throw "sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support"; # Added 2024-11-02
   srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09
   ssm-agent = amazon-ssm-agent; # Added 2023-10-17
+  starpls-bin = starpls;
   starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
   steamPackages = {
     steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable";

From 8ba6ec90fe5a2151d7b5485847df7008545df68c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 05:12:10 +0000
Subject: [PATCH 54/88] rekor-cli: 1.3.6 -> 1.3.7

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

diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix
index 054eec51a16c0..42bf787198dfb 100644
--- a/pkgs/tools/security/rekor/default.nix
+++ b/pkgs/tools/security/rekor/default.nix
@@ -4,13 +4,13 @@ let
   generic = { pname, packageToBuild, description }:
     buildGoModule rec {
       inherit pname;
-      version = "1.3.6";
+      version = "1.3.7";
 
       src = fetchFromGitHub {
         owner = "sigstore";
         repo = "rekor";
         rev = "v${version}";
-        hash = "sha256-CGRR+rOlcFTfvXRxx6x7m0qK6YE6HZGvmMx+X7zu1sQ=";
+        hash = "sha256-Y9hXCO82SvnoxGsk3l2YkoakzxpHGZXew3gnl3+kX1k=";
         # populate values that require us to use git. By doing this in postFetch we
         # can delete .git afterwards and maintain better reproducibility of the src.
         leaveDotGit = true;
@@ -23,7 +23,7 @@ let
         '';
       };
 
-      vendorHash = "sha256-PDf3nUvDDBg+POMpklx45VhhjlB55pUMRhQMlwq7lnI=";
+      vendorHash = "sha256-Gya0lTY3Im7b6HIkYoqb+nwNgOEqt1OookJZlbibBqs=";
 
       nativeBuildInputs = [ installShellFiles ];
 

From 9990b0764deaaceeabab27a3c62755f2affbe7d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 05:21:24 +0000
Subject: [PATCH 55/88] nomino: 1.3.5 -> 1.3.6

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

diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix
index ab4d1d0fbd234..8dd25227323db 100644
--- a/pkgs/by-name/no/nomino/package.nix
+++ b/pkgs/by-name/no/nomino/package.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nomino";
-  version = "1.3.5";
+  version = "1.3.6";
 
   src = fetchFromGitHub {
     owner = "yaa110";
     repo = pname;
     rev = version;
-    hash = "sha256-qznue5C/6Y+54/gV1lLgJPCezW0zF2Fe2ZlMvU57+Q0=";
+    hash = "sha256-HbI2XPYNSFBc/h+kEsNsOxJ8+7uq1Ia0ce98FKoUlng=";
   };
 
-  cargoHash = "sha256-28QXDhpcrW1flnU5WesAdbJSMrZAhIuFv2LSJHTk74Y=";
+  cargoHash = "sha256-zA5cTdW0x7k8/mAUfUBzbiBR1ypyeLr7AOyg+16Islk=";
 
   meta = with lib; {
     description = "Batch rename utility for developers";

From bd16ea0630ae07659884440edb0941a68004d4e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 05:44:47 +0000
Subject: [PATCH 56/88] kubedock: 0.17.0 -> 0.17.1

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

diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix
index b7103c18a2230..286f30a843f50 100644
--- a/pkgs/by-name/ku/kubedock/package.nix
+++ b/pkgs/by-name/ku/kubedock/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "kubedock";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "joyrex2001";
     repo = "kubedock";
     rev = version;
-    hash = "sha256-UfOFehpN9Qj4LKH61akSidikPytZS4QSFOUzDDw3OCI=";
+    hash = "sha256-413VUnVYPHKoy9r/XQ4An/TNfEjozsGANfKawFN7Y08=";
   };
 
-  vendorHash = "sha256-qPBqKDn6NFa35+f+s2iCeHKdLI7ihK1DUMlq2mldNEI=";
+  vendorHash = "sha256-S/0oyps1zrbncfy31C6SV13gt/oE+GeXGxD0KaKCn/s=";
 
   # config.Build not defined as it would break r-ryantm
   ldflags = [

From 613f4fff58b2a6f76a1b4588333a58d3388cae13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 05:47:23 +0000
Subject: [PATCH 57/88] python312Packages.pyenphase: 1.22.0 -> 1.23.0

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

diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix
index a96386890be15..7278ff2efc816 100644
--- a/pkgs/development/python-modules/pyenphase/default.nix
+++ b/pkgs/development/python-modules/pyenphase/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "pyenphase";
-  version = "1.22.0";
+  version = "1.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "pyenphase";
     repo = "pyenphase";
     rev = "refs/tags/v${version}";
-    hash = "sha256-letF0s/zJKdMT2nGnZpMFufja0bsL0zlwG+dCSK5BA4=";
+    hash = "sha256-nGOxGZxPTlU5/nI2m+MXzzcVA+twxfNL1Jf51xT0XLc=";
   };
 
   pythonRelaxDeps = [ "tenacity" ];

From 910bdb1c145e81e5977c9025dbac4ddb0aab3f59 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 06:40:57 +0000
Subject: [PATCH 58/88] python312Packages.datadog: 0.50.1 -> 0.50.2

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

diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix
index da178007ba92e..99b9e3d4a36aa 100644
--- a/pkgs/development/python-modules/datadog/default.nix
+++ b/pkgs/development/python-modules/datadog/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "datadog";
-  version = "0.50.1";
+  version = "0.50.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-V51NtUvW75GMUlAhftsVuAt7EVgrjiT85DcCdow/Li0=";
+    hash = "sha256-F3JXdL8rsKSPHQltknB0ksGH8krgiWCvCwwvqXlY/VE=";
   };
 
   nativeBuildInputs = [ hatchling ];

From 2cbca95e622cba4790345e87aea40cb75618c872 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 07:04:12 +0000
Subject: [PATCH 59/88] nuclei: 3.3.5 -> 3.3.6

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

diff --git a/pkgs/by-name/nu/nuclei/package.nix b/pkgs/by-name/nu/nuclei/package.nix
index 6f9eb684c2008..4d10cc6fbf005 100644
--- a/pkgs/by-name/nu/nuclei/package.nix
+++ b/pkgs/by-name/nu/nuclei/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "nuclei";
-  version = "3.3.5";
+  version = "3.3.6";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei";
     rev = "refs/tags/v${version}";
-    hash = "sha256-L8HOuPENnyM56ac1dqJRCYzqN9wRnGt4RoF8BZji0Z0=";
+    hash = "sha256-cR0eOWKr1RK2Tw3ct/3pev275NveWkcBM3EzTm3Qa1E=";
   };
 
-  vendorHash = "sha256-ZGFzZ/WpiVChtvMJQH3lR4k2it1KF0QwrMQchQz5XYw=";
+  vendorHash = "sha256-lxqVNhA8/iMx31Bbp4rIHVrh3nUARlxY2KDcCxOtO+I=";
   proxyVendor = true; # hash mismatch between Linux and Darwin
 
   subPackages = [ "cmd/nuclei/" ];

From 2b9249c6f803675de67c416873f9d8c47d30f3d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 07:06:50 +0000
Subject: [PATCH 60/88] superfile: 1.1.5 -> 1.1.6

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

diff --git a/pkgs/by-name/su/superfile/package.nix b/pkgs/by-name/su/superfile/package.nix
index d788afe3e88e3..f1d349af65494 100644
--- a/pkgs/by-name/su/superfile/package.nix
+++ b/pkgs/by-name/su/superfile/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "superfile";
-  version = "1.1.5";
+  version = "1.1.6";
 
   src = fetchFromGitHub {
     owner = "yorukot";
     repo = "superfile";
     rev = "v${version}";
-    hash = "sha256-/MdcfZpYr7vvPIq0rqLrPRPPU+cyp2y0EyxQPf9znwQ=";
+    hash = "sha256-3zQDErfst0CAE9tdOUtPGtGWuOo/K8x/M+r6+RPrlCM=";
   };
 
-  vendorHash = "sha256-8WGmksKH0rmfRH6Xxd0ACl1FS7YPphG7hsIB5/o38lQ=";
+  vendorHash = "sha256-DU0Twutepmk+8lkBM2nDChbsSHh4awt5m33ACUtH4AQ=";
 
   ldflags = ["-s" "-w"];
 

From b998723321461f1edfc373702dc57897d1cb6e44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 22 Nov 2024 08:25:36 +0100
Subject: [PATCH 61/88] ci/editorconfig-v2: useless use of cat

---
 .github/workflows/editorconfig-v2.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml
index b14f76637458c..f3f4d59eef9bf 100644
--- a/.github/workflows/editorconfig-v2.yml
+++ b/.github/workflows/editorconfig-v2.yml
@@ -38,7 +38,7 @@ jobs:
         nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz
     - name: Checking EditorConfig
       run: |
-        cat "$HOME/changed_files" | nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size'
+        < "$HOME/changed_files" nix-shell -p editorconfig-checker --run 'xargs -r editorconfig-checker -disable-indent-size'
     - if: ${{ failure() }}
       run: |
         echo "::error :: Hey! It looks like your changes don't follow our editorconfig settings. Read https://editorconfig.org/#download to configure your editor so you never see this error again."

From 26963eeeb35ef37bfff730d9136520268bb2d802 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 08:06:10 +0000
Subject: [PATCH 62/88] python312Packages.edk2-pytool-library: 0.22.2 -> 0.22.3

---
 .../python-modules/edk2-pytool-library/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix
index 67a309fcee042..0a1e330349b02 100644
--- a/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "edk2-pytool-library";
-  version = "0.22.2";
+  version = "0.22.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "tianocore";
     repo = "edk2-pytool-library";
     rev = "refs/tags/v${version}";
-    hash = "sha256-rauk8rY3i5fWUrE8lszyC9KBVjTZ7zhXO98cMhIiiz8=";
+    hash = "sha256-N2ATC/GALKd8JUrkvlvHe9JPzwzbB5GPTBavo17DW5Y=";
   };
 
   build-system = [

From 714edad78183cc26376a7011fa43fdb5cc955390 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Nov 2024 09:42:47 +0100
Subject: [PATCH 63/88] python312Packages.reolink-aio: 0.11.1 -> 0.11.2

Diff: https://github.com/starkillerOG/reolink_aio/compare/refs/tags/0.11.1...0.11.2

Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.11.2
---
 pkgs/development/python-modules/reolink-aio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 9e4f03008b11a..d5aff40fe5769 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.11.1";
+  version = "0.11.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "starkillerOG";
     repo = "reolink_aio";
     rev = "refs/tags/${version}";
-    hash = "sha256-cY5EEIab+6JzDI3QpsFbPPdf3mJ+Pax1pkZKNewVkTI=";
+    hash = "sha256-VHuZhnesfY/bGIGMiT3VWFQXSisntNfbdDJy3tH0SlU=";
   };
 
   build-system = [ setuptools ];

From a31265c0dfb0facf0ca572513ad2ae777928b08d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Nov 2024 09:48:45 +0100
Subject: [PATCH 64/88] python312Packages.restview: refactor

- update build-system
- update license
- relax readme-renderer
- update disabled
---
 .../python-modules/restview/default.nix       | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix
index e194e777b7b0e..c9ffbc56b4432 100644
--- a/pkgs/development/python-modules/restview/default.nix
+++ b/pkgs/development/python-modules/restview/default.nix
@@ -1,28 +1,33 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
   docutils,
-  readme-renderer,
+  fetchPypi,
   packaging,
   pygments,
   pytestCheckHook,
   pythonOlder,
+  readme-renderer,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "restview";
   version = "3.0.2";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-i011oL7Xa2e0Vu9wEfTrbJilVsn4N2Qt8iAscxL8zBo=";
   };
 
-  propagatedBuildInputs = [
+  pythonRelaxDeps = [ "readme-renderer" ];
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     docutils
     readme-renderer
     packaging
@@ -40,10 +45,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "ReStructuredText viewer";
-    mainProgram = "restview";
     homepage = "https://mg.pov.lt/restview/";
     changelog = "https://github.com/mgedmin/restview/blob/${version}/CHANGES.rst";
-    license = licenses.gpl3Only;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ koral ];
+    mainProgram = "restview";
   };
 }

From 015760bf02e1b10e48ae5b7a913895a4000cc86c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 09:13:22 +0000
Subject: [PATCH 65/88] plattenalbum: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/by-name/pl/plattenalbum/package.nix b/pkgs/by-name/pl/plattenalbum/package.nix
index 69a8b7cabf0fc..5d026704cdb5c 100644
--- a/pkgs/by-name/pl/plattenalbum/package.nix
+++ b/pkgs/by-name/pl/plattenalbum/package.nix
@@ -13,14 +13,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "plattenalbum";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "SoongNoonien";
     repo = "plattenalbum";
     rev = "refs/tags/v${version}";
-    hash = "sha256-WUhKNt6jAKHsLGy862DJqV4S34krNl9y43vyLiq5qss=";
+    hash = "sha256-tbgSgbj77GvTgnI5eGu4cxYDie1gNa+5z053c0Nnu+Y=";
   };
 
   nativeBuildInputs = [

From 494f142f79c3951d5150aa35e75a006079aa35c2 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Fri, 22 Nov 2024 11:43:57 +0100
Subject: [PATCH 66/88] lnav: add updateScript

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

diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix
index 55148ad29b91d..dbfaddc26d668 100644
--- a/pkgs/by-name/ln/lnav/package.nix
+++ b/pkgs/by-name/ln/lnav/package.nix
@@ -11,6 +11,7 @@
 , automake
 , curl
 , buildPackages
+, nix-update-script
 }:
 
 stdenv.mkDerivation rec {
@@ -47,6 +48,8 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     homepage = "https://github.com/tstack/lnav";
     description = "Logfile Navigator";

From 03c702d2115345c75b01b688aca9e859a3c2f728 Mon Sep 17 00:00:00 2001
From: Atemu <git@atemu.net>
Date: Fri, 22 Nov 2024 11:44:21 +0100
Subject: [PATCH 67/88] lnav: 0.12.2 -> 0.12.3

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

diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix
index dbfaddc26d668..4933e08796289 100644
--- a/pkgs/by-name/ln/lnav/package.nix
+++ b/pkgs/by-name/ln/lnav/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lnav";
-  version = "0.12.2";
+  version = "0.12.3";
 
   src = fetchFromGitHub {
     owner = "tstack";
     repo = "lnav";
     rev = "v${version}";
-    sha256 = "sha256-grEW3J50osKJzulNQFN7Gir5+wk1qFPc/YaT+EZMAqs=";
+    sha256 = "sha256-m0r7LAo9pYFpS+oimVCNCipojxPzMMsLLjhjkitEwow=";
   };
 
   enableParallelBuilding = true;

From 6b816b8d2f611251bc815bbbca47c3183a437a5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 11:32:39 +0000
Subject: [PATCH 68/88] darcs-to-git: 0-unstable-2024-09-30 ->
 0-unstable-2024-11-07

---
 pkgs/by-name/da/darcs-to-git/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/da/darcs-to-git/package.nix b/pkgs/by-name/da/darcs-to-git/package.nix
index 8ab4a7d63f85c..0c3111b0d2125 100644
--- a/pkgs/by-name/da/darcs-to-git/package.nix
+++ b/pkgs/by-name/da/darcs-to-git/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation {
   pname = "darcs-to-git";
-  version = "0-unstable-2024-09-30";
+  version = "0-unstable-2024-11-07";
 
   src = fetchFromGitHub {
     owner = "purcell";
     repo = "darcs-to-git";
-    rev = "9d556cb7daa06b9de3cb97487b98bab2869a7fe7";
-    hash = "sha256-0GKSzqgJgi1w4uZOqixp/F6i7hK2ZmuQI0px8FEDFXM=";
+    rev = "7b7bbc653c953772edffc2378cc0b2fe7632e1fa";
+    hash = "sha256-94tHR4zLaXERQM2Eyy/S3DW/f0jGasA0i3FMF8I5tIo=";
   };
 
   patchPhase =

From a3c2ca52b61195c73b127751bdec0aa20db1b50b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 22 Nov 2024 11:34:59 +0000
Subject: [PATCH 69/88] hysteria: 2.5.2 -> 2.6.0

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

diff --git a/pkgs/by-name/hy/hysteria/package.nix b/pkgs/by-name/hy/hysteria/package.nix
index 932d31c1f5e63..498f880f96dd0 100644
--- a/pkgs/by-name/hy/hysteria/package.nix
+++ b/pkgs/by-name/hy/hysteria/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "hysteria";
-  version = "2.5.2";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "apernet";
     repo = pname;
     rev = "app/v${version}";
-    hash = "sha256-ClWbA3cjQXK8tzXfmApBQ+TBnbRc6f36G1iIFcNQi7o=";
+    hash = "sha256-EdqFushE/G0kWOkks7m2nSQ9wXq1p1HjebSgb5tAzmo=";
   };
 
-  vendorHash = "sha256-I5SCr45IT8gl8eD9BburxHBodOpP+R5rk9Khczx5z8M=";
+  vendorHash = "sha256-P4BiWeGZCI/8zehAt+5OEZhQcA9usw+OSum9gEl/gSU=";
   proxyVendor = true;
 
   ldflags =

From 7eefb31cd135e3ac559898315227655ea70ddfe0 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 22 Nov 2024 12:36:27 +0100
Subject: [PATCH 70/88] php84Extensions.apcu: 5.1.23 -> 5.1.24

ChangeLog: https://github.com/krakjoe/apcu/releases/tag/v5.1.24
---
 .../development/php-packages/apcu/default.nix | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix
index 8a94ed44f0988..4d7c7b982e43d 100644
--- a/pkgs/development/php-packages/apcu/default.nix
+++ b/pkgs/development/php-packages/apcu/default.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "5.1.23";
+  version = "5.1.24";
 in
 buildPecl {
   inherit version;
@@ -17,25 +17,9 @@ buildPecl {
     owner = "krakjoe";
     repo = "apcu";
     rev = "v${version}";
-    sha256 = "sha256-UDKLLCCnYJj/lCD8ZkkDf2WYZMoIbcP75+0/IXo4vdQ=";
+    sha256 = "sha256-g+Oo6y+24VOWHaDZ23iItkGwOa5bTtKMAjZOmAi6EOo=";
   };
 
-  patches = [
-    # Fix broken test (apc_entry_002) with PHP 8.4 alpha1
-    # See https://github.com/krakjoe/apcu/issues/510
-    (fetchpatch {
-      url = "https://github.com/krakjoe/apcu/commit/9dad016db50cc46321afec592ea9b49520c1cf13.patch";
-      hash = "sha256-8CPUNhEGCVVSXWYridN1+4N4JzCfXZbmUIsPYs/9jfk=";
-    })
-
-    # Fix ZTS detection in tests with PHP 8.4
-    # https://github.com/krakjoe/apcu/pull/511
-    (fetchpatch {
-      url = "https://github.com/krakjoe/apcu/commit/15766e615264620427c2db37061ca9614d3b7319.patch";
-      hash = "sha256-gbSkx47Uo9E28CfJJj4+3ydcw8cXW9NNN/3FuYYTVPY=";
-    })
-  ];
-
   buildInputs = [ pcre2 ];
   doCheck = true;
   makeFlags = [ "phpincludedir=$(dev)/include" ];

From 219b984dfe32df632dbc8eb825a93d07ade12082 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 22 Nov 2024 13:17:37 +0100
Subject: [PATCH 71/88] python312Packages.apsystems-ez1: 2.3.0 -> 2.4.0

Diff: https://github.com/SonnenladenGmbH/APsystems-EZ1-API/compare/refs/tags/2.3.0...2.4.0

Changelog: https://github.com/SonnenladenGmbH/APsystems-EZ1-API/releases/tag/2.4.0
---
 pkgs/development/python-modules/apsystems-ez1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/apsystems-ez1/default.nix b/pkgs/development/python-modules/apsystems-ez1/default.nix
index f9a50715322b4..265526e5e7b0d 100644
--- a/pkgs/development/python-modules/apsystems-ez1/default.nix
+++ b/pkgs/development/python-modules/apsystems-ez1/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "apsystems-ez1";
-  version = "2.3.0";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SonnenladenGmbH";
     repo = "APsystems-EZ1-API";
     rev = "refs/tags/${version}";
-    hash = "sha256-CG+QpdJfZt1S6IDDjabRjwuRflURFc1QYo39kf/p0Zw=";
+    hash = "sha256-H4vhF4CgZmKmBF+v6SpnpIOlPBkFLL50W+Ua+gDr/7I=";
   };
 
   build-system = [ poetry-core ];

From 2adf40958121195ad7adb5d1926a876977fe7faa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 22 Nov 2024 08:31:48 +0100
Subject: [PATCH 72/88] ci/check-nixf-tidy: replace sed with variable
 substitution

Update .github/workflows/check-nixf-tidy.yml

Co-authored-by: Zhong Jianxin <azuwis@users.noreply.github.com>
---
 .github/workflows/check-nixf-tidy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml
index de74ae8b5372a..481ae2df4c31f 100644
--- a/.github/workflows/check-nixf-tidy.yml
+++ b/.github/workflows/check-nixf-tidy.yml
@@ -107,7 +107,7 @@ jobs:
                   echo "$errors"
                 else
                   # just print in plain text
-                  echo "$errors" | sed 's/^:://'
+                  echo "${errors/::/}"
                   echo # add one empty line
                 fi
                 failedFiles+=("$dest")

From eeb87082a9c5cd3eb72ecde71a06831256ef748b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 22 Nov 2024 08:32:01 +0100
Subject: [PATCH 73/88] add actionlint script

---
 .github/workflows/lint-actions.sh | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100755 .github/workflows/lint-actions.sh

diff --git a/.github/workflows/lint-actions.sh b/.github/workflows/lint-actions.sh
new file mode 100755
index 0000000000000..43d6e801caf68
--- /dev/null
+++ b/.github/workflows/lint-actions.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash actionlint shellcheck -I nixpkgs=../..
+set -euo pipefail
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+cd "$SCRIPT_DIR/../.."
+actionlint

From 4d832756997cb9c9c9fd45972709425c17b894a4 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 22 Nov 2024 08:30:12 -0500
Subject: [PATCH 74/88] python312Packages.accuweather: update disabled, drop
 with lib

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

diff --git a/pkgs/development/python-modules/accuweather/default.nix b/pkgs/development/python-modules/accuweather/default.nix
index 59c2f374c2d7d..aca3f8e522cc4 100644
--- a/pkgs/development/python-modules/accuweather/default.nix
+++ b/pkgs/development/python-modules/accuweather/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   version = "4.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "bieniu";
@@ -44,11 +44,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "accuweather" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python wrapper for getting weather data from AccuWeather servers";
     homepage = "https://github.com/bieniu/accuweather";
     changelog = "https://github.com/bieniu/accuweather/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ jamiemagee ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ jamiemagee ];
   };
 }

From 16a3151bcb8fed6662a87e74150860a5e4aa07ea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 22 Nov 2024 14:45:11 +0100
Subject: [PATCH 75/88] python312Packages.cffsubr: reset meta.broken

Darwin builds fine for me on the current version.
---
 pkgs/development/python-modules/cffsubr/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/cffsubr/default.nix b/pkgs/development/python-modules/cffsubr/default.nix
index 46dabb2711af7..28332b92d734e 100644
--- a/pkgs/development/python-modules/cffsubr/default.nix
+++ b/pkgs/development/python-modules/cffsubr/default.nix
@@ -1,5 +1,4 @@
 {
-  stdenv,
   lib,
   afdko,
   buildPythonPackage,
@@ -49,7 +48,6 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "cffsubr" ];
 
   meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
     changelog = "https://github.com/adobe-type-tools/cffsubr/releases/tag/v${version}";
     description = "Standalone CFF subroutinizer based on AFDKO tx";
     mainProgram = "cffsubr";

From 3156de49baadecb202abf9b0d0b879f698841f86 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Fri, 22 Nov 2024 15:48:08 +0100
Subject: [PATCH 76/88] nixos/postgresql: update docs with extraPlugins to
 extensions rename

---
 nixos/modules/services/databases/postgresql.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md
index 41b2e70f334e3..f055298499eb5 100644
--- a/nixos/modules/services/databases/postgresql.md
+++ b/nixos/modules/services/databases/postgresql.md
@@ -290,11 +290,11 @@ postgresql_15.pkgs.pg_partman        postgresql_15.pkgs.pgroonga
 ...
 ```
 
-To add plugins via NixOS configuration, set `services.postgresql.extraPlugins`:
+To add plugins via NixOS configuration, set `services.postgresql.extensions`:
 ```nix
 {
   services.postgresql.package = pkgs.postgresql_17;
-  services.postgresql.extraPlugins = ps: with ps; [
+  services.postgresql.extensions = ps: with ps; [
     pg_repack
     postgis
   ];

From 2f9f2895cf1aa802d8786bef8be9a14607384b3f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 22 Nov 2024 18:25:24 +0300
Subject: [PATCH 77/88] linux_6_12: 6.12 -> 6.12.1

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 4d6006943d5c0..7b6849627e1e7 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -28,7 +28,7 @@
         "hash": "sha256:1d44yfk105bsf9f853f2fpnzqd0xbqn8drg1dv4ri5dxldx8lrbm"
     },
     "6.12": {
-        "version": "6.12",
-        "hash": "sha256:1sr58vsh39hdwk0z27lg14isqwn4g8m4r7a8z2rsyhkfwlmmd8mi"
+        "version": "6.12.1",
+        "hash": "sha256:06f6y37fi7galj001wwrq5pz3vhdl9nryydf3f4yqwnkdpcb34q1"
     }
 }

From 5c617efdc8c32fa9318a50ebc82c9fbf6dda5963 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 22 Nov 2024 18:25:30 +0300
Subject: [PATCH 78/88] linux_6_11: 6.11.9 -> 6.11.10

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 7b6849627e1e7..71ef7046b0fe9 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -24,8 +24,8 @@
         "hash": "sha256:0dlkgph6chvqrask746wjijqp62vmvrp3n2dkldr8d2mfw8mdhz2"
     },
     "6.11": {
-        "version": "6.11.9",
-        "hash": "sha256:1d44yfk105bsf9f853f2fpnzqd0xbqn8drg1dv4ri5dxldx8lrbm"
+        "version": "6.11.10",
+        "hash": "sha256:0xzynjyyr16my0wrla4ggpjbh4g7nsqixaimz5hrsqlhaa8q9hab"
     },
     "6.12": {
         "version": "6.12.1",

From 0bbb3937269b8d62664215925c892da1490bfd5b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 22 Nov 2024 18:25:33 +0300
Subject: [PATCH 79/88] linux_6_6: 6.6.62 -> 6.6.63

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 71ef7046b0fe9..32fc8592f585c 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "hash": "sha256:0z48n7vahg318bgkccy8xqgl87vfb8zmn995cqh7z38fvzrm81qq"
     },
     "6.6": {
-        "version": "6.6.62",
-        "hash": "sha256:0dlkgph6chvqrask746wjijqp62vmvrp3n2dkldr8d2mfw8mdhz2"
+        "version": "6.6.63",
+        "hash": "sha256:0d8q0vwv3lcix3wiq2n53rir3h298flg2l0ghpify4rlh2s4l1fi"
     },
     "6.11": {
         "version": "6.11.10",

From 2f84e7307d079332767302353f5b2edc69a06401 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 22 Nov 2024 18:25:38 +0300
Subject: [PATCH 80/88] linux_6_1: 6.1.118 -> 6.1.119

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 32fc8592f585c..a2887cdb2b4ee 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -4,8 +4,8 @@
         "hash": "sha256:1rsglb7zwbn4f6wv4g95jl8ra1wbs03k7xyfdlmwzl3vgzx3bnzv"
     },
     "6.1": {
-        "version": "6.1.118",
-        "hash": "sha256:0k12d4l03ziiba1b4f6jfxv5ir0lrd6kshlasr62rhv1f6yq81q1"
+        "version": "6.1.119",
+        "hash": "sha256:0y1j8bz99d5vkxklzpwhns5r77lpz2prszf6whfahi58s0wszkdf"
     },
     "5.15": {
         "version": "5.15.173",

From b25360a7e552ca446d503856e8d059762fe17e40 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 22 Nov 2024 09:16:03 -0500
Subject: [PATCH 81/88] nixos/test-driver: apply ruff check suggestions

---
 nixos/lib/test-driver/test_driver/driver.py  | 21 +++++-----
 nixos/lib/test-driver/test_driver/logger.py  | 43 ++++++++++----------
 nixos/lib/test-driver/test_driver/machine.py | 29 ++++++-------
 3 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py
index 0f01bd6d0ab49..6f37af954bc52 100644
--- a/nixos/lib/test-driver/test_driver/driver.py
+++ b/nixos/lib/test-driver/test_driver/driver.py
@@ -3,9 +3,10 @@
 import signal
 import tempfile
 import threading
-from contextlib import contextmanager
+from collections.abc import Iterator
+from contextlib import AbstractContextManager, contextmanager
 from pathlib import Path
-from typing import Any, Callable, ContextManager, Dict, Iterator, List, Optional, Union
+from typing import Any, Callable, Optional, Union
 
 from colorama import Fore, Style
 
@@ -44,17 +45,17 @@ class Driver:
     and runs the tests"""
 
     tests: str
-    vlans: List[VLan]
-    machines: List[Machine]
-    polling_conditions: List[PollingCondition]
+    vlans: list[VLan]
+    machines: list[Machine]
+    polling_conditions: list[PollingCondition]
     global_timeout: int
     race_timer: threading.Timer
     logger: AbstractLogger
 
     def __init__(
         self,
-        start_scripts: List[str],
-        vlans: List[int],
+        start_scripts: list[str],
+        vlans: list[int],
         tests: str,
         out_dir: Path,
         logger: AbstractLogger,
@@ -73,7 +74,7 @@ def __init__(
             vlans = list(set(vlans))
             self.vlans = [VLan(nr, tmp_dir, self.logger) for nr in vlans]
 
-        def cmd(scripts: List[str]) -> Iterator[NixStartScript]:
+        def cmd(scripts: list[str]) -> Iterator[NixStartScript]:
             for s in scripts:
                 yield NixStartScript(s)
 
@@ -119,7 +120,7 @@ def subtest(self, name: str) -> Iterator[None]:
                 self.logger.error(f'Test "{name}" failed with error: "{e}"')
                 raise e
 
-    def test_symbols(self) -> Dict[str, Any]:
+    def test_symbols(self) -> dict[str, Any]:
         @contextmanager
         def subtest(name: str) -> Iterator[None]:
             return self.subtest(name)
@@ -277,7 +278,7 @@ def polling_condition(
         *,
         seconds_interval: float = 2.0,
         description: Optional[str] = None,
-    ) -> Union[Callable[[Callable], ContextManager], ContextManager]:
+    ) -> Union[Callable[[Callable], AbstractContextManager], AbstractContextManager]:
         driver = self
 
         class Poll:
diff --git a/nixos/lib/test-driver/test_driver/logger.py b/nixos/lib/test-driver/test_driver/logger.py
index 484829254b812..564d39f4f055c 100644
--- a/nixos/lib/test-driver/test_driver/logger.py
+++ b/nixos/lib/test-driver/test_driver/logger.py
@@ -5,10 +5,11 @@
 import time
 import unicodedata
 from abc import ABC, abstractmethod
+from collections.abc import Iterator
 from contextlib import ExitStack, contextmanager
 from pathlib import Path
 from queue import Empty, Queue
-from typing import Any, Dict, Iterator, List
+from typing import Any
 from xml.sax.saxutils import XMLGenerator
 from xml.sax.xmlreader import AttributesImpl
 
@@ -18,17 +19,17 @@
 
 class AbstractLogger(ABC):
     @abstractmethod
-    def log(self, message: str, attributes: Dict[str, str] = {}) -> None:
+    def log(self, message: str, attributes: dict[str, str] = {}) -> None:
         pass
 
     @abstractmethod
     @contextmanager
-    def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
+    def subtest(self, name: str, attributes: dict[str, str] = {}) -> Iterator[None]:
         pass
 
     @abstractmethod
     @contextmanager
-    def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
+    def nested(self, message: str, attributes: dict[str, str] = {}) -> Iterator[None]:
         pass
 
     @abstractmethod
@@ -68,11 +69,11 @@ def __init__(self, outfile: Path) -> None:
         self._print_serial_logs = True
         atexit.register(self.close)
 
-    def log(self, message: str, attributes: Dict[str, str] = {}) -> None:
+    def log(self, message: str, attributes: dict[str, str] = {}) -> None:
         self.tests[self.currentSubtest].stdout += message + os.linesep
 
     @contextmanager
-    def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
+    def subtest(self, name: str, attributes: dict[str, str] = {}) -> Iterator[None]:
         old_test = self.currentSubtest
         self.tests.setdefault(name, self.TestCaseState())
         self.currentSubtest = name
@@ -82,7 +83,7 @@ def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
         self.currentSubtest = old_test
 
     @contextmanager
-    def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
+    def nested(self, message: str, attributes: dict[str, str] = {}) -> Iterator[None]:
         self.log(message)
         yield
 
@@ -123,25 +124,25 @@ def close(self) -> None:
 
 
 class CompositeLogger(AbstractLogger):
-    def __init__(self, logger_list: List[AbstractLogger]) -> None:
+    def __init__(self, logger_list: list[AbstractLogger]) -> None:
         self.logger_list = logger_list
 
     def add_logger(self, logger: AbstractLogger) -> None:
         self.logger_list.append(logger)
 
-    def log(self, message: str, attributes: Dict[str, str] = {}) -> None:
+    def log(self, message: str, attributes: dict[str, str] = {}) -> None:
         for logger in self.logger_list:
             logger.log(message, attributes)
 
     @contextmanager
-    def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
+    def subtest(self, name: str, attributes: dict[str, str] = {}) -> Iterator[None]:
         with ExitStack() as stack:
             for logger in self.logger_list:
                 stack.enter_context(logger.subtest(name, attributes))
             yield
 
     @contextmanager
-    def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
+    def nested(self, message: str, attributes: dict[str, str] = {}) -> Iterator[None]:
         with ExitStack() as stack:
             for logger in self.logger_list:
                 stack.enter_context(logger.nested(message, attributes))
@@ -173,7 +174,7 @@ class TerminalLogger(AbstractLogger):
     def __init__(self) -> None:
         self._print_serial_logs = True
 
-    def maybe_prefix(self, message: str, attributes: Dict[str, str]) -> str:
+    def maybe_prefix(self, message: str, attributes: dict[str, str]) -> str:
         if "machine" in attributes:
             return f"{attributes['machine']}: {message}"
         return message
@@ -182,16 +183,16 @@ def maybe_prefix(self, message: str, attributes: Dict[str, str]) -> str:
     def _eprint(*args: object, **kwargs: Any) -> None:
         print(*args, file=sys.stderr, **kwargs)
 
-    def log(self, message: str, attributes: Dict[str, str] = {}) -> None:
+    def log(self, message: str, attributes: dict[str, str] = {}) -> None:
         self._eprint(self.maybe_prefix(message, attributes))
 
     @contextmanager
-    def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
+    def subtest(self, name: str, attributes: dict[str, str] = {}) -> Iterator[None]:
         with self.nested("subtest: " + name, attributes):
             yield
 
     @contextmanager
-    def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
+    def nested(self, message: str, attributes: dict[str, str] = {}) -> Iterator[None]:
         self._eprint(
             self.maybe_prefix(
                 Style.BRIGHT + Fore.GREEN + message + Style.RESET_ALL, attributes
@@ -241,12 +242,12 @@ def close(self) -> None:
     def sanitise(self, message: str) -> str:
         return "".join(ch for ch in message if unicodedata.category(ch)[0] != "C")
 
-    def maybe_prefix(self, message: str, attributes: Dict[str, str]) -> str:
+    def maybe_prefix(self, message: str, attributes: dict[str, str]) -> str:
         if "machine" in attributes:
             return f"{attributes['machine']}: {message}"
         return message
 
-    def log_line(self, message: str, attributes: Dict[str, str]) -> None:
+    def log_line(self, message: str, attributes: dict[str, str]) -> None:
         self.xml.startElement("line", attrs=AttributesImpl(attributes))
         self.xml.characters(message)
         self.xml.endElement("line")
@@ -260,7 +261,7 @@ def warning(self, *args, **kwargs) -> None:  # type: ignore
     def error(self, *args, **kwargs) -> None:  # type: ignore
         self.log(*args, **kwargs)
 
-    def log(self, message: str, attributes: Dict[str, str] = {}) -> None:
+    def log(self, message: str, attributes: dict[str, str] = {}) -> None:
         self.drain_log_queue()
         self.log_line(message, attributes)
 
@@ -273,7 +274,7 @@ def log_serial(self, message: str, machine: str) -> None:
 
         self.enqueue({"msg": message, "machine": machine, "type": "serial"})
 
-    def enqueue(self, item: Dict[str, str]) -> None:
+    def enqueue(self, item: dict[str, str]) -> None:
         self.queue.put(item)
 
     def drain_log_queue(self) -> None:
@@ -287,12 +288,12 @@ def drain_log_queue(self) -> None:
             pass
 
     @contextmanager
-    def subtest(self, name: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
+    def subtest(self, name: str, attributes: dict[str, str] = {}) -> Iterator[None]:
         with self.nested("subtest: " + name, attributes):
             yield
 
     @contextmanager
-    def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]:
+    def nested(self, message: str, attributes: dict[str, str] = {}) -> Iterator[None]:
         self.xml.startElement("nest", attrs=AttributesImpl({}))
         self.xml.startElement("head", attrs=AttributesImpl(attributes))
         self.xml.characters(message)
diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py
index 7a602ce6608fa..f4ec494beee23 100644
--- a/nixos/lib/test-driver/test_driver/machine.py
+++ b/nixos/lib/test-driver/test_driver/machine.py
@@ -12,10 +12,11 @@
 import tempfile
 import threading
 import time
+from collections.abc import Iterable
 from contextlib import _GeneratorContextManager, nullcontext
 from pathlib import Path
 from queue import Queue
-from typing import Any, Callable, Dict, Iterable, List, Optional, Tuple
+from typing import Any, Callable, Optional
 
 from test_driver.logger import AbstractLogger
 
@@ -91,7 +92,7 @@ def make_command(args: list) -> str:
 
 def _perform_ocr_on_screenshot(
     screenshot_path: str, model_ids: Iterable[int]
-) -> List[str]:
+) -> list[str]:
     if shutil.which("tesseract") is None:
         raise Exception("OCR requested but enableOCR is false")
 
@@ -260,7 +261,7 @@ class Machine:
     # Store last serial console lines for use
     # of wait_for_console_text
     last_lines: Queue = Queue()
-    callbacks: List[Callable]
+    callbacks: list[Callable]
 
     def __repr__(self) -> str:
         return f"<Machine '{self.name}'>"
@@ -273,7 +274,7 @@ def __init__(
         logger: AbstractLogger,
         name: str = "machine",
         keep_vm_state: bool = False,
-        callbacks: Optional[List[Callable]] = None,
+        callbacks: Optional[list[Callable]] = None,
     ) -> None:
         self.out_dir = out_dir
         self.tmp_dir = tmp_dir
@@ -314,7 +315,7 @@ def log(self, msg: str) -> None:
     def log_serial(self, msg: str) -> None:
         self.logger.log_serial(msg, self.name)
 
-    def nested(self, msg: str, attrs: Dict[str, str] = {}) -> _GeneratorContextManager:
+    def nested(self, msg: str, attrs: dict[str, str] = {}) -> _GeneratorContextManager:
         my_attrs = {"machine": self.name}
         my_attrs.update(attrs)
         return self.logger.nested(msg, my_attrs)
@@ -373,7 +374,7 @@ def check_active(_: Any) -> bool:
         ):
             retry(check_active, timeout)
 
-    def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]:
+    def get_unit_info(self, unit: str, user: Optional[str] = None) -> dict[str, str]:
         status, lines = self.systemctl(f'--no-pager show "{unit}"', user)
         if status != 0:
             raise Exception(
@@ -384,7 +385,7 @@ def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]
 
         line_pattern = re.compile(r"^([^=]+)=(.*)$")
 
-        def tuple_from_line(line: str) -> Tuple[str, str]:
+        def tuple_from_line(line: str) -> tuple[str, str]:
             match = line_pattern.match(line)
             assert match is not None
             return match[1], match[2]
@@ -424,7 +425,7 @@ def get_unit_property(
         assert match[1] == property, invalid_output_message
         return match[2]
 
-    def systemctl(self, q: str, user: Optional[str] = None) -> Tuple[int, str]:
+    def systemctl(self, q: str, user: Optional[str] = None) -> tuple[int, str]:
         """
         Runs `systemctl` commands with optional support for
         `systemctl --user`
@@ -481,7 +482,7 @@ def execute(
         check_return: bool = True,
         check_output: bool = True,
         timeout: Optional[int] = 900,
-    ) -> Tuple[int, str]:
+    ) -> tuple[int, str]:
         """
         Execute a shell command, returning a list `(status, stdout)`.
 
@@ -798,10 +799,10 @@ def port_is_closed(_: Any) -> bool:
         with self.nested(f"waiting for TCP port {port} on {addr} to be closed"):
             retry(port_is_closed, timeout)
 
-    def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]:
+    def start_job(self, jobname: str, user: Optional[str] = None) -> tuple[int, str]:
         return self.systemctl(f"start {jobname}", user)
 
-    def stop_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]:
+    def stop_job(self, jobname: str, user: Optional[str] = None) -> tuple[int, str]:
         return self.systemctl(f"stop {jobname}", user)
 
     def wait_for_job(self, jobname: str) -> None:
@@ -942,13 +943,13 @@ def dump_tty_contents(self, tty: str) -> None:
         """Debugging: Dump the contents of the TTY<n>"""
         self.execute(f"fold -w 80 /dev/vcs{tty} | systemd-cat")
 
-    def _get_screen_text_variants(self, model_ids: Iterable[int]) -> List[str]:
+    def _get_screen_text_variants(self, model_ids: Iterable[int]) -> list[str]:
         with tempfile.TemporaryDirectory() as tmpdir:
             screenshot_path = os.path.join(tmpdir, "ppm")
             self.send_monitor_command(f"screendump {screenshot_path}")
             return _perform_ocr_on_screenshot(screenshot_path, model_ids)
 
-    def get_screen_text_variants(self) -> List[str]:
+    def get_screen_text_variants(self) -> list[str]:
         """
         Return a list of different interpretations of what is currently
         visible on the machine's screen using optical character
@@ -1168,7 +1169,7 @@ def check_x(_: Any) -> bool:
         with self.nested("waiting for the X11 server"):
             retry(check_x, timeout)
 
-    def get_window_names(self) -> List[str]:
+    def get_window_names(self) -> list[str]:
         return self.succeed(
             r"xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'"
         ).splitlines()

From 42d4046e94dcb653eddc8e21556f72af28c207d5 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 22 Nov 2024 10:02:43 -0500
Subject: [PATCH 82/88] nixos/test-driver: format with nixfmt

---
 nixos/lib/test-driver/default.nix | 61 ++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix
index 26652db6016e6..b518a25dab289 100644
--- a/nixos/lib/test-driver/default.nix
+++ b/nixos/lib/test-driver/default.nix
@@ -1,17 +1,18 @@
-{ lib
-, python3Packages
-, enableOCR ? false
-, qemu_pkg ? qemu_test
-, coreutils
-, imagemagick_light
-, netpbm
-, qemu_test
-, socat
-, ruff
-, tesseract4
-, vde2
-, extraPythonPackages ? (_ : [])
-, nixosTests
+{
+  lib,
+  python3Packages,
+  enableOCR ? false,
+  qemu_pkg ? qemu_test,
+  coreutils,
+  imagemagick_light,
+  netpbm,
+  qemu_test,
+  socat,
+  ruff,
+  tesseract4,
+  vde2,
+  extraPythonPackages ? (_: [ ]),
+  nixosTests,
 }:
 let
   fs = lib.fileset;
@@ -29,17 +30,21 @@ python3Packages.buildPythonApplication {
   };
   pyproject = true;
 
-  propagatedBuildInputs = [
-    coreutils
-    netpbm
-    python3Packages.colorama
-    python3Packages.junit-xml
-    python3Packages.ptpython
-    qemu_pkg
-    socat
-    vde2
-  ]
-    ++ (lib.optionals enableOCR [ imagemagick_light tesseract4 ])
+  propagatedBuildInputs =
+    [
+      coreutils
+      netpbm
+      python3Packages.colorama
+      python3Packages.junit-xml
+      python3Packages.ptpython
+      qemu_pkg
+      socat
+      vde2
+    ]
+    ++ (lib.optionals enableOCR [
+      imagemagick_light
+      tesseract4
+    ])
     ++ extraPythonPackages python3Packages;
 
   nativeBuildInputs = [
@@ -51,7 +56,11 @@ python3Packages.buildPythonApplication {
   };
 
   doCheck = true;
-  nativeCheckInputs = with python3Packages; [ mypy ruff black ];
+  nativeCheckInputs = with python3Packages; [
+    mypy
+    ruff
+    black
+  ];
   checkPhase = ''
     echo -e "\x1b[32m## run mypy\x1b[0m"
     mypy test_driver extract-docstrings.py

From ef2d3c542a89f3100ef12f145972b30c74548b0c Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 22 Nov 2024 10:05:19 -0500
Subject: [PATCH 83/88] nixos/test-driver: modernize

---
 nixos/lib/test-driver/default.nix | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix
index b518a25dab289..cf60ebf9b0637 100644
--- a/nixos/lib/test-driver/default.nix
+++ b/nixos/lib/test-driver/default.nix
@@ -20,6 +20,8 @@ in
 python3Packages.buildPythonApplication {
   pname = "nixos-test-driver";
   version = "1.1";
+  pyproject = true;
+
   src = fs.toSource {
     root = ./.;
     fileset = fs.unions [
@@ -28,39 +30,45 @@ python3Packages.buildPythonApplication {
       ./extract-docstrings.py
     ];
   };
-  pyproject = true;
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies =
+    with python3Packages;
+    [
+      colorama
+      junit-xml
+      ptpython
+    ]
+    ++ extraPythonPackages python3Packages;
 
   propagatedBuildInputs =
     [
       coreutils
       netpbm
-      python3Packages.colorama
-      python3Packages.junit-xml
-      python3Packages.ptpython
       qemu_pkg
       socat
       vde2
     ]
-    ++ (lib.optionals enableOCR [
+    ++ lib.optionals enableOCR [
       imagemagick_light
       tesseract4
-    ])
-    ++ extraPythonPackages python3Packages;
-
-  nativeBuildInputs = [
-    python3Packages.setuptools
-  ];
+    ];
 
   passthru.tests = {
     inherit (nixosTests.nixos-test-driver) driver-timeout;
   };
 
   doCheck = true;
+
   nativeCheckInputs = with python3Packages; [
     mypy
     ruff
     black
   ];
+
   checkPhase = ''
     echo -e "\x1b[32m## run mypy\x1b[0m"
     mypy test_driver extract-docstrings.py

From e23f1733c6fc1b2fecc5e78eb14fa8cb7666daf0 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 22 Nov 2024 10:07:29 -0500
Subject: [PATCH 84/88] nixos/test-driver: use ruff format in place of black

---
 nixos/lib/test-driver/default.nix    | 7 +++----
 nixos/lib/test-driver/pyproject.toml | 5 -----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix
index cf60ebf9b0637..35471f74949c4 100644
--- a/nixos/lib/test-driver/default.nix
+++ b/nixos/lib/test-driver/default.nix
@@ -66,15 +66,14 @@ python3Packages.buildPythonApplication {
   nativeCheckInputs = with python3Packages; [
     mypy
     ruff
-    black
   ];
 
   checkPhase = ''
     echo -e "\x1b[32m## run mypy\x1b[0m"
     mypy test_driver extract-docstrings.py
-    echo -e "\x1b[32m## run ruff\x1b[0m"
+    echo -e "\x1b[32m## run ruff check\x1b[0m"
     ruff check .
-    echo -e "\x1b[32m## run black\x1b[0m"
-    black --check --diff .
+    echo -e "\x1b[32m## run ruff format\x1b[0m"
+    ruff format --check --diff .
   '';
 }
diff --git a/nixos/lib/test-driver/pyproject.toml b/nixos/lib/test-driver/pyproject.toml
index 714139bc1b25c..fe2ce75fd632c 100644
--- a/nixos/lib/test-driver/pyproject.toml
+++ b/nixos/lib/test-driver/pyproject.toml
@@ -35,11 +35,6 @@ ignore_missing_imports = true
 module = "junit_xml.*"
 ignore_missing_imports = true
 
-[tool.black]
-line-length = 88
-target-version = ['py39']
-include = '\.pyi?$'
-
 [tool.mypy]
 warn_redundant_casts = true
 disallow_untyped_calls = true

From 5b5f018586e760f5fd26b7269dadb78fe7095bf4 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 22 Nov 2024 10:09:09 -0500
Subject: [PATCH 85/88] ruff: add nixosTests.nixos-test-driver.busybox to
 passthru.tests

---
 pkgs/by-name/ru/ruff/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 8811d14822935..2449165caeb0e 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -11,6 +11,7 @@
   nix-update-script,
   versionCheckHook,
   libiconv,
+  nixosTests,
 }:
 
 python3Packages.buildPythonPackage rec {
@@ -76,6 +77,7 @@ python3Packages.buildPythonPackage rec {
   passthru = {
     tests = {
       inherit ruff-lsp;
+      nixos-test-driver-busybox = nixosTests.nixos-test-driver.busybox;
     };
     updateScript = nix-update-script { };
   };

From 172a35f8ce8d474f4e9e6ef57c369d660fb15ee4 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Fri, 22 Nov 2024 10:26:04 -0500
Subject: [PATCH 86/88] nixos/test-driver: target python 3.12

---
 nixos/lib/test-driver/pyproject.toml          |  1 +
 nixos/lib/test-driver/test_driver/driver.py   | 12 +++---
 nixos/lib/test-driver/test_driver/machine.py  | 42 +++++++++----------
 .../test_driver/polling_condition.py          |  8 ++--
 4 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/nixos/lib/test-driver/pyproject.toml b/nixos/lib/test-driver/pyproject.toml
index fe2ce75fd632c..ac83eed268d92 100644
--- a/nixos/lib/test-driver/pyproject.toml
+++ b/nixos/lib/test-driver/pyproject.toml
@@ -17,6 +17,7 @@ find = {}
 test_driver = ["py.typed"]
 
 [tool.ruff]
+target-version = "py312"
 line-length = 88
 
 lint.select = ["E", "F", "I", "U", "N"]
diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py
index 6f37af954bc52..ca778a576f722 100644
--- a/nixos/lib/test-driver/test_driver/driver.py
+++ b/nixos/lib/test-driver/test_driver/driver.py
@@ -3,10 +3,10 @@
 import signal
 import tempfile
 import threading
-from collections.abc import Iterator
+from collections.abc import Callable, Iterator
 from contextlib import AbstractContextManager, contextmanager
 from pathlib import Path
-from typing import Any, Callable, Optional, Union
+from typing import Any
 
 from colorama import Fore, Style
 
@@ -208,7 +208,7 @@ def create_machine(
         self,
         start_command: str | dict,
         *,
-        name: Optional[str] = None,
+        name: str | None = None,
         keep_vm_state: bool = False,
     ) -> Machine:
         # Legacy args handling
@@ -274,11 +274,11 @@ def check_polling_conditions(self) -> None:
 
     def polling_condition(
         self,
-        fun_: Optional[Callable] = None,
+        fun_: Callable | None = None,
         *,
         seconds_interval: float = 2.0,
-        description: Optional[str] = None,
-    ) -> Union[Callable[[Callable], AbstractContextManager], AbstractContextManager]:
+        description: str | None = None,
+    ) -> Callable[[Callable], AbstractContextManager] | AbstractContextManager:
         driver = self
 
         class Poll:
diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py
index f4ec494beee23..c423ad8a3fc07 100644
--- a/nixos/lib/test-driver/test_driver/machine.py
+++ b/nixos/lib/test-driver/test_driver/machine.py
@@ -12,11 +12,11 @@
 import tempfile
 import threading
 import time
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from contextlib import _GeneratorContextManager, nullcontext
 from pathlib import Path
 from queue import Queue
-from typing import Any, Callable, Optional
+from typing import Any
 
 from test_driver.logger import AbstractLogger
 
@@ -249,12 +249,12 @@ class Machine:
     start_command: StartCommand
     keep_vm_state: bool
 
-    process: Optional[subprocess.Popen]
-    pid: Optional[int]
-    monitor: Optional[socket.socket]
-    qmp_client: Optional[QMPSession]
-    shell: Optional[socket.socket]
-    serial_thread: Optional[threading.Thread]
+    process: subprocess.Popen | None
+    pid: int | None
+    monitor: socket.socket | None
+    qmp_client: QMPSession | None
+    shell: socket.socket | None
+    serial_thread: threading.Thread | None
 
     booted: bool
     connected: bool
@@ -274,7 +274,7 @@ def __init__(
         logger: AbstractLogger,
         name: str = "machine",
         keep_vm_state: bool = False,
-        callbacks: Optional[list[Callable]] = None,
+        callbacks: list[Callable] | None = None,
     ) -> None:
         self.out_dir = out_dir
         self.tmp_dir = tmp_dir
@@ -344,7 +344,7 @@ def send_monitor_command(self, command: str) -> str:
         return self.wait_for_monitor_prompt()
 
     def wait_for_unit(
-        self, unit: str, user: Optional[str] = None, timeout: int = 900
+        self, unit: str, user: str | None = None, timeout: int = 900
     ) -> None:
         """
         Wait for a systemd unit to get into "active" state.
@@ -374,7 +374,7 @@ def check_active(_: Any) -> bool:
         ):
             retry(check_active, timeout)
 
-    def get_unit_info(self, unit: str, user: Optional[str] = None) -> dict[str, str]:
+    def get_unit_info(self, unit: str, user: str | None = None) -> dict[str, str]:
         status, lines = self.systemctl(f'--no-pager show "{unit}"', user)
         if status != 0:
             raise Exception(
@@ -400,7 +400,7 @@ def get_unit_property(
         self,
         unit: str,
         property: str,
-        user: Optional[str] = None,
+        user: str | None = None,
     ) -> str:
         status, lines = self.systemctl(
             f'--no-pager show "{unit}" --property="{property}"',
@@ -425,7 +425,7 @@ def get_unit_property(
         assert match[1] == property, invalid_output_message
         return match[2]
 
-    def systemctl(self, q: str, user: Optional[str] = None) -> tuple[int, str]:
+    def systemctl(self, q: str, user: str | None = None) -> tuple[int, str]:
         """
         Runs `systemctl` commands with optional support for
         `systemctl --user`
@@ -481,7 +481,7 @@ def execute(
         command: str,
         check_return: bool = True,
         check_output: bool = True,
-        timeout: Optional[int] = 900,
+        timeout: int | None = 900,
     ) -> tuple[int, str]:
         """
         Execute a shell command, returning a list `(status, stdout)`.
@@ -549,7 +549,7 @@ def execute(
 
         return (rc, output.decode(errors="replace"))
 
-    def shell_interact(self, address: Optional[str] = None) -> None:
+    def shell_interact(self, address: str | None = None) -> None:
         """
         Allows you to directly interact with the guest shell. This should
         only be used during test development, not in production tests.
@@ -596,7 +596,7 @@ def console_interact(self) -> None:
                 break
             self.send_console(char.decode())
 
-    def succeed(self, *commands: str, timeout: Optional[int] = None) -> str:
+    def succeed(self, *commands: str, timeout: int | None = None) -> str:
         """
         Execute a shell command, raising an exception if the exit status is
         not zero, otherwise returning the standard output. Similar to `execute`,
@@ -613,7 +613,7 @@ def succeed(self, *commands: str, timeout: Optional[int] = None) -> str:
                 output += out
         return output
 
-    def fail(self, *commands: str, timeout: Optional[int] = None) -> str:
+    def fail(self, *commands: str, timeout: int | None = None) -> str:
         """
         Like `succeed`, but raising an exception if the command returns a zero
         status.
@@ -725,7 +725,7 @@ def tty_matches(last: bool) -> bool:
         with self.nested(f"waiting for {regexp} to appear on tty {tty}"):
             retry(tty_matches, timeout)
 
-    def send_chars(self, chars: str, delay: Optional[float] = 0.01) -> None:
+    def send_chars(self, chars: str, delay: float | None = 0.01) -> None:
         """
         Simulate typing a sequence of characters on the virtual keyboard,
         e.g., `send_chars("foobar\n")` will type the string `foobar`
@@ -799,10 +799,10 @@ def port_is_closed(_: Any) -> bool:
         with self.nested(f"waiting for TCP port {port} on {addr} to be closed"):
             retry(port_is_closed, timeout)
 
-    def start_job(self, jobname: str, user: Optional[str] = None) -> tuple[int, str]:
+    def start_job(self, jobname: str, user: str | None = None) -> tuple[int, str]:
         return self.systemctl(f"start {jobname}", user)
 
-    def stop_job(self, jobname: str, user: Optional[str] = None) -> tuple[int, str]:
+    def stop_job(self, jobname: str, user: str | None = None) -> tuple[int, str]:
         return self.systemctl(f"stop {jobname}", user)
 
     def wait_for_job(self, jobname: str) -> None:
@@ -1029,7 +1029,7 @@ def console_matches(_: Any) -> bool:
                     pass
 
     def send_key(
-        self, key: str, delay: Optional[float] = 0.01, log: Optional[bool] = True
+        self, key: str, delay: float | None = 0.01, log: bool | None = True
     ) -> None:
         """
         Simulate pressing keys on the virtual keyboard, e.g.,
diff --git a/nixos/lib/test-driver/test_driver/polling_condition.py b/nixos/lib/test-driver/test_driver/polling_condition.py
index 1cccaf2c71e74..1a8091cf44719 100644
--- a/nixos/lib/test-driver/test_driver/polling_condition.py
+++ b/nixos/lib/test-driver/test_driver/polling_condition.py
@@ -1,6 +1,6 @@
 import time
+from collections.abc import Callable
 from math import isfinite
-from typing import Callable, Optional
 
 from test_driver.logger import AbstractLogger
 
@@ -12,7 +12,7 @@ class PollingConditionError(Exception):
 class PollingCondition:
     condition: Callable[[], bool]
     seconds_interval: float
-    description: Optional[str]
+    description: str | None
     logger: AbstractLogger
 
     last_called: float
@@ -20,10 +20,10 @@ class PollingCondition:
 
     def __init__(
         self,
-        condition: Callable[[], Optional[bool]],
+        condition: Callable[[], bool | None],
         logger: AbstractLogger,
         seconds_interval: float = 2.0,
-        description: Optional[str] = None,
+        description: str | None = None,
     ):
         self.condition = condition  # type: ignore
         self.seconds_interval = seconds_interval

From ab6c0b73558fedfe7fed6e7205f4e4a701eb304f Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 22 Nov 2024 17:51:55 +0100
Subject: [PATCH 87/88] phpExtensions.soap: re-add soap patch

Closes #358188

But only for 8.3 since there's no release with this patch included. On
PHP 8.4 it's already there.
Partial revert of 080b8f1f576d278a58319cfa35a41813fbe4c244.
---
 pkgs/top-level/php-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 5fbed020cacdd..69661ef6f3c17 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -684,6 +684,13 @@ in {
               url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
               hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
             })
+          ]
+          ++ lib.optionals (lib.versionAtLeast php.version "8.3" && lib.versionOlder php.version "8.4") [
+            # https://github.com/php/php-src/pull/16733 (fix soap test)
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/5c308d61db104854e4ff84ab123e3ea56e1b4046.patch";
+              hash = "sha256-xQ4Sg4kL0cgHYauRW2AzGgFXfcqtxeRVhI9zNh7CsoM=";
+            })
           ];
         }
         {

From 8acb39b5a75cb882f72c16c7c78e7611002c49cc Mon Sep 17 00:00:00 2001
From: Bouke van der Bijl <i@bou.ke>
Date: Fri, 22 Nov 2024 17:54:39 +0100
Subject: [PATCH 88/88] meshoptimizer: add bouk to maintainers

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

diff --git a/pkgs/by-name/me/meshoptimizer/package.nix b/pkgs/by-name/me/meshoptimizer/package.nix
index c632932e5a53e..60d1e27e76a58 100644
--- a/pkgs/by-name/me/meshoptimizer/package.nix
+++ b/pkgs/by-name/me/meshoptimizer/package.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
     description = "Mesh optimization library that makes meshes smaller and faster to render";
     homepage = "https://github.com/zeux/meshoptimizer";
     license = licenses.mit;
-    maintainers = [ maintainers.lillycham ];
+    maintainers = with maintainers; [ bouk lillycham ];
     platforms = platforms.all;
     mainProgram = "gltfpack";
   };