From 4481ce601f188d383f2c3cb7a0ddd4d0309525f7 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 7 Jan 2024 16:22:24 +0100
Subject: [PATCH 01/72] nixos/mailman: increase nginx proxy timeout

In my experience, just after boot, the default timeout of 60 seconds
often isn't quite enough for Mailman.  It's better for the user to
have the request take a little longer than it is to 504.
---
 nixos/modules/services/mail/mailman.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix
index 76035625fbe1..49cce6a5f8ab 100644
--- a/nixos/modules/services/mail/mailman.nix
+++ b/nixos/modules/services/mail/mailman.nix
@@ -445,6 +445,7 @@ in {
           "${removeSuffix "/" cfg.serve.virtualRoot}/static/".alias = webSettings.STATIC_ROOT + "/";
         };
       });
+      proxyTimeout = mkDefault "120s";
     };
 
     environment.systemPackages = [ (pkgs.buildEnv {

From 92a6247bc23a9242a59b4656e7ea635cb4640197 Mon Sep 17 00:00:00 2001
From: Istvan Ruzman <istvan@ruzman.eu>
Date: Sun, 26 May 2024 17:50:19 +0200
Subject: [PATCH 02/72] nixos/ssh: don't write addressfamily with default value
 in config

---
 nixos/modules/programs/ssh.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 0692dd46f7d0..f2ef248d7866 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -293,9 +293,9 @@ in
 
         # Generated options from other settings
         Host *
-        AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
         GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}
 
+        ${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"}
         ${lib.optionalString cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"}
         ${lib.optionalString (cfg.forwardX11 != null) "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"}
 

From 42b1bc89a230a74d5cf7a7db6d60a78621a0b036 Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Mon, 24 Jun 2024 20:44:08 +0530
Subject: [PATCH 03/72] firefly-iii: Streamlined derivation

- Removed firefly-iii-assets package and compressed build into one
- Added PatrickDaG as maintainer in addition to myself
- Added update script
---
 pkgs/by-name/fi/firefly-iii/package.nix | 69 ++++++++++++++++++-------
 1 file changed, 50 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index 0a15b4eaa921..d8495f64e299 100644
--- a/pkgs/by-name/fi/firefly-iii/package.nix
+++ b/pkgs/by-name/fi/firefly-iii/package.nix
@@ -1,8 +1,12 @@
 { lib
 , fetchFromGitHub
-, buildNpmPackage
+, stdenvNoCC
+, nodejs
+, fetchNpmDeps
+, buildPackages
 , php83
 , nixosTests
+, nix-update-script
 , dataDir ? "/var/lib/firefly-iii"
 }:
 
@@ -10,6 +14,7 @@ let
   pname = "firefly-iii";
   version = "6.1.18";
   phpPackage = php83;
+  npmDepsHash = "sha256-MoxkNxfVeIFkiNVzfehQ9FpC65kBj8ZmvwaRf4MVRIg=";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
@@ -17,36 +22,62 @@ let
     rev = "v${version}";
     hash = "sha256-mA7gvKhHouUUz1Aix7253O/+VcufoEFwdcJeZxnazEo=";
   };
-
-  assets = buildNpmPackage {
-    pname = "${pname}-assets";
-    inherit version src;
-    npmDepsHash = "sha256-MoxkNxfVeIFkiNVzfehQ9FpC65kBj8ZmvwaRf4MVRIg=";
-    dontNpmBuild = true;
-    installPhase = ''
-      runHook preInstall
-      npm run prod --workspace=v1
-      npm run build --workspace=v2
-      cp -r ./public $out/
-      runHook postInstall
-    '';
-  };
 in
 
-phpPackage.buildComposerProject (finalAttrs: {
+stdenvNoCC.mkDerivation (finalAttrs: {
   inherit pname src version;
 
+  buildInputs = [ phpPackage ];
+
+  nativeBuildInputs = [
+    nodejs
+    nodejs.python
+    buildPackages.npmHooks.npmConfigHook
+    phpPackage.composerHooks.composerInstallHook
+    phpPackage.packages.composer-local-repo-plugin
+  ];
+
+  composerNoDev = true;
+  composerNoPlugins = true;
+  composerNoScripts = true;
+  composerStrictValidation = true;
+  strictDeps = true;
+
   vendorHash = "sha256-EpMypgj6lZDz6T94bGoCUH9IVwh7VB4Ds08AcCsreRw=";
 
+  npmDeps = fetchNpmDeps {
+    inherit src;
+    name = "${pname}-npm-deps";
+    hash = npmDepsHash;
+  };
+
+  composerRepository = phpPackage.mkComposerRepository {
+    inherit (finalAttrs)
+      pname
+      src
+      vendorHash
+      version
+      ;
+    composerNoDev = true;
+    composerNoPlugins = true;
+    composerNoScripts = true;
+    composerStrictValidation = true;
+  };
+
+  preInstall = ''
+    npm run prod --workspace=v1
+    npm run build --workspace=v2
+  '';
+
   passthru = {
     inherit phpPackage;
     tests = nixosTests.firefly-iii;
+    updateScript = nix-update-script { };
   };
 
   postInstall = ''
     mv $out/share/php/${pname}/* $out/
-    rm -R $out/share $out/storage $out/bootstrap/cache $out/public
-    cp -a ${assets} $out/public
+    rm -R $out/share $out/storage $out/bootstrap/cache $out/node_modules
     ln -s ${dataDir}/storage $out/storage
     ln -s ${dataDir}/cache $out/bootstrap/cache
   '';
@@ -56,6 +87,6 @@ phpPackage.buildComposerProject (finalAttrs: {
     description = "Firefly III: a personal finances manager";
     homepage = "https://github.com/firefly-iii/firefly-iii";
     license = lib.licenses.agpl3Only;
-    maintainers = [ lib.maintainers.savyajha ];
+    maintainers = [ lib.maintainers.savyajha lib.maintainers.patrickdag ];
   };
 })

From c9196e150a1597d8acbbd1d966cbdabf06c99b35 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 4 Jul 2024 17:56:36 +0200
Subject: [PATCH 04/72] spade: 0.8.0 -> 0.9.0

Changelog: https://gitlab.com/spade-lang/spade/-/blob/v0.9.0/CHANGELOG.md
---
 pkgs/by-name/sp/spade/Cargo.lock  | 632 ++++++++++++++++--------------
 pkgs/by-name/sp/spade/package.nix |   5 +-
 2 files changed, 348 insertions(+), 289 deletions(-)

diff --git a/pkgs/by-name/sp/spade/Cargo.lock b/pkgs/by-name/sp/spade/Cargo.lock
index f97ada67faba..604659a01e9e 100644
--- a/pkgs/by-name/sp/spade/Cargo.lock
+++ b/pkgs/by-name/sp/spade/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -37,50 +37,51 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.4"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.4"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.2"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+checksum = "a64c907d4e79225ac72e2a354c9ce84d50ebb4586dee56c82b3ee73004f537f5"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.1"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -89,28 +90,17 @@ version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9"
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
 dependencies = [
  "addr2line",
  "cc",
@@ -123,18 +113,9 @@ dependencies = [
 
 [[package]]
 name = "base64"
-version = "0.21.5"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
-
-[[package]]
-name = "basic-toml"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f2139706359229bfa8f19142ac1155b4b80beafb7a60471ac5dd109d4a19778"
-dependencies = [
- "serde",
-]
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "beef"
@@ -144,27 +125,18 @@ checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
 
 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f"
 
 [[package]]
 name = "cfg-if"
@@ -174,9 +146,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "clap"
-version = "4.4.7"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -184,9 +156,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.7"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
@@ -196,11 +168,11 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "syn",
@@ -208,9 +180,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "codespan"
@@ -243,9 +215,9 @@ dependencies = [
 
 [[package]]
 name = "color-eyre"
-version = "0.6.2"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204"
+checksum = "55146f5e46f237f7423d74111267d4597b59b0dad0ffaf7303bce9945d843ad5"
 dependencies = [
  "backtrace",
  "color-spantrace",
@@ -258,9 +230,9 @@ dependencies = [
 
 [[package]]
 name = "color-spantrace"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce"
+checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2"
 dependencies = [
  "once_cell",
  "owo-colors",
@@ -270,9 +242,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "colored"
@@ -286,21 +258,21 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "cxx"
-version = "1.0.110"
+version = "1.0.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7129e341034ecb940c9072817cd9007974ea696844fc4dd582dc1653a7fbe2e8"
+checksum = "bb497fad022245b29c2a0351df572e2d67c1046bcef2260ebc022aec81efea82"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -310,9 +282,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.110"
+version = "1.0.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2a24f3f5f8eed71936f21e570436f024f5c2e25628f7496aa7ccd03b90109d5"
+checksum = "9327c7f9fbd6329a200a5d4aa6f674c60ab256525ff0084b52a889d4e4c60cee"
 dependencies = [
  "cc",
  "codespan-reporting 0.11.1",
@@ -325,15 +297,15 @@ dependencies = [
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.110"
+version = "1.0.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06fdd177fc61050d63f67f5bd6351fac6ab5526694ea8e359cd9cd3b75857f44"
+checksum = "688c799a4a846f1c0acb9f36bb9c6272d9b3d9457f3633c7753c6057270df13c"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.110"
+version = "1.0.122"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f"
+checksum = "928bc249a7e3cd554fd2e8e08a426e9670c50bbfc9a621653cfa9accc9641783"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -359,9 +331,9 @@ checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 
 [[package]]
 name = "encode_unicode"
@@ -370,10 +342,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
-name = "eyre"
-version = "0.6.8"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
 dependencies = [
  "indenter",
  "once_cell",
@@ -387,9 +365,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "gimli"
-version = "0.28.0"
+version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
 [[package]]
 name = "glob"
@@ -397,6 +375,12 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -404,13 +388,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
 [[package]]
-name = "hermit-abi"
-version = "0.1.19"
+name = "heck"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indenter"
@@ -419,38 +400,53 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
 [[package]]
-name = "indoc"
-version = "2.0.4"
+name = "indexmap"
+version = "2.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "indoc"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "insta"
-version = "1.34.0"
+version = "1.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d64600be34b2fcfc267740a243fa7744441bb4947a619ac4e5bb6507f35fbfc"
+checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5"
 dependencies = [
  "console",
  "lazy_static",
  "linked-hash-map",
  "similar",
- "yaml-rust",
 ]
 
 [[package]]
-name = "itertools"
-version = "0.12.0"
+name = "is_terminal_polyfill"
+version = "1.70.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
+[[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.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "lazy_static"
@@ -460,9 +456,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.149"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "link-cplusplus"
@@ -492,9 +488,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -502,38 +498,39 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "logos"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c000ca4d908ff18ac99b93a062cb8958d331c3220719c52e77cb19cc6ac5d2c1"
+checksum = "161971eb88a0da7ae0c333e1063467c5b5727e7fb6b710b8db4814eade3a42e8"
 dependencies = [
  "logos-derive",
 ]
 
 [[package]]
 name = "logos-codegen"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc487311295e0002e452025d6b580b77bb17286de87b57138f3b5db711cded68"
+checksum = "8e31badd9de5131fdf4921f6473d457e3dd85b11b7f091ceb50e4df7c3eeb12a"
 dependencies = [
  "beef",
  "fnv",
+ "lazy_static",
  "proc-macro2",
  "quote",
- "regex-syntax 0.6.29",
+ "regex-syntax 0.8.3",
  "syn",
 ]
 
 [[package]]
 name = "logos-derive"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbfc0d229f1f42d790440136d941afd806bc9e949e2bcb8faa813b0f00d1267e"
+checksum = "1c2a69b3eb68d5bd595107c9ee58d7e07fe2bb5e360cc85b0f084dedac80de0a"
 dependencies = [
  "logos-codegen",
 ]
@@ -555,24 +552,24 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "memchr"
-version = "2.6.4"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "memoffset"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
 dependencies = [
  "adler",
 ]
@@ -594,10 +591,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "num"
-version = "0.4.1"
+name = "nu-ansi-term"
+version = "0.49.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+checksum = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -609,11 +615,10 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
  "serde",
@@ -621,9 +626,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
  "serde",
@@ -631,19 +636,18 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.43"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -652,11 +656,10 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -665,27 +668,27 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "overload"
@@ -710,9 +713,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -720,22 +723,28 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+
+[[package]]
+name = "portable-atomic"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
 
 [[package]]
 name = "pretty_assertions"
@@ -759,18 +768,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.69"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.20.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0"
+checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
 dependencies = [
  "cfg-if",
  "eyre",
@@ -778,6 +787,7 @@ dependencies = [
  "libc",
  "memoffset",
  "parking_lot",
+ "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
@@ -786,9 +796,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.20.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be"
+checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -796,9 +806,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.20.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1"
+checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -806,9 +816,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.20.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3"
+checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -818,44 +828,45 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.20.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f"
+checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
+ "pyo3-build-config",
  "quote",
  "syn",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.3",
- "regex-syntax 0.8.2",
+ "regex-automata 0.4.6",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
@@ -869,13 +880,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.2",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
@@ -886,9 +897,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "ron"
@@ -897,22 +908,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94"
 dependencies = [
  "base64",
- "bitflags 2.4.1",
+ "bitflags",
  "serde",
  "serde_derive",
 ]
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "ryu"
-version = "1.0.15"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "scopeguard"
@@ -928,18 +939,18 @@ checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152"
 
 [[package]]
 name = "serde"
-version = "1.0.190"
+version = "1.0.202"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.190"
+version = "1.0.202"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -948,15 +959,24 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "itoa",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -968,21 +988,20 @@ dependencies = [
 
 [[package]]
 name = "similar"
-version = "2.3.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aeaf503862c419d66959f5d7ca015337d864e9c49485d771b732e2a20453597"
+checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "spade"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
- "atty",
  "clap",
  "codespan",
  "codespan-reporting 0.12.0",
@@ -995,6 +1014,7 @@ dependencies = [
  "prettydiff",
  "ron",
  "serde",
+ "serde_json",
  "spade-ast",
  "spade-ast-lowering",
  "spade-common",
@@ -1014,7 +1034,7 @@ dependencies = [
 
 [[package]]
 name = "spade-ast"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "num",
  "spade-common",
@@ -1022,7 +1042,7 @@ dependencies = [
 
 [[package]]
 name = "spade-ast-lowering"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "itertools",
  "local-impl",
@@ -1040,7 +1060,7 @@ dependencies = [
 
 [[package]]
 name = "spade-common"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "codespan",
  "codespan-reporting 0.12.0",
@@ -1066,7 +1086,7 @@ dependencies = [
 
 [[package]]
 name = "spade-diagnostics"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "codespan",
  "codespan-reporting 0.12.0",
@@ -1084,7 +1104,7 @@ dependencies = [
 
 [[package]]
 name = "spade-hir"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "codespan-reporting 0.12.0",
  "colored",
@@ -1102,7 +1122,7 @@ dependencies = [
 
 [[package]]
 name = "spade-hir-lowering"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "codespan",
  "codespan-reporting 0.12.0",
@@ -1128,7 +1148,7 @@ dependencies = [
 
 [[package]]
 name = "spade-macros"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1138,7 +1158,7 @@ dependencies = [
 
 [[package]]
 name = "spade-mir"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "codespan",
  "codespan-reporting 0.12.0",
@@ -1159,7 +1179,7 @@ dependencies = [
 
 [[package]]
 name = "spade-parser"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "codespan",
  "colored",
@@ -1177,7 +1197,7 @@ dependencies = [
 
 [[package]]
 name = "spade-python"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "codespan-reporting 0.12.0",
  "color-eyre",
@@ -1206,7 +1226,7 @@ dependencies = [
 
 [[package]]
 name = "spade-simulation-ext"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "codespan-reporting 0.12.0",
  "color-eyre",
@@ -1234,7 +1254,7 @@ dependencies = [
 
 [[package]]
 name = "spade-tests"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "codespan-reporting 0.12.0",
  "colored",
@@ -1262,7 +1282,7 @@ dependencies = [
 
 [[package]]
 name = "spade-typeinference"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "assert_matches",
  "codespan",
@@ -1285,7 +1305,7 @@ dependencies = [
 
 [[package]]
 name = "spade-types"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "num",
  "serde",
@@ -1294,7 +1314,7 @@ dependencies = [
 
 [[package]]
 name = "spade-wordlength-inference"
-version = "0.8.0"
+version = "0.9.0"
 dependencies = [
  "codespan",
  "codespan-reporting 0.12.0",
@@ -1316,15 +1336,15 @@ dependencies = [
 
 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.38"
+version = "2.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1339,33 +1359,33 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.12"
+version = "0.12.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
+checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "termcolor"
-version = "1.3.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
 
 [[package]]
 name = "thiserror"
-version = "1.0.50"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.50"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1374,14 +1394,48 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
 ]
 
+[[package]]
+name = "toml"
+version = "0.8.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
 [[package]]
 name = "tracing"
 version = "0.1.40"
@@ -1426,9 +1480,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.4"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
  "log",
  "once_cell",
@@ -1437,12 +1491,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
  "matchers",
- "nu-ansi-term",
+ "nu-ansi-term 0.46.0",
  "once_cell",
  "regex",
  "sharded-slab",
@@ -1455,11 +1509,11 @@ dependencies = [
 
 [[package]]
 name = "tracing-tree"
-version = "0.2.0"
-source = "git+https://github.com/jonathanmorley/tracing-tree?rev=8b97ec6e50e3f755644d1a0aaf4c45a2112607b2#8b97ec6e50e3f755644d1a0aaf4c45a2112607b2"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65139ecd2c3f6484c3b99bc01c77afe21e95473630747c7aca525e78b0666675"
 dependencies = [
- "ansi_term",
- "atty",
+ "nu-ansi-term 0.49.0",
  "tracing-core",
  "tracing-log",
  "tracing-subscriber",
@@ -1467,17 +1521,16 @@ dependencies = [
 
 [[package]]
 name = "trybuild"
-version = "1.0.85"
+version = "1.0.96"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "196a58260a906cedb9bf6d8034b6379d0c11f552416960452f267402ceeddff1"
+checksum = "33a5f13f11071020bb12de7a16b925d2d58636175c20c11dc5f96cb64bb6c9b3"
 dependencies = [
- "basic-toml",
  "glob",
- "once_cell",
  "serde",
  "serde_derive",
  "serde_json",
  "termcolor",
+ "toml",
 ]
 
 [[package]]
@@ -1488,9 +1541,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6"
 
 [[package]]
 name = "unindent"
@@ -1553,11 +1606,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1566,15 +1619,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -1585,18 +1629,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows-targets"
-version = "0.42.2"
+name = "windows-sys"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -1615,10 +1653,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
+name = "windows-targets"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
+]
 
 [[package]]
 name = "windows_aarch64_gnullvm"
@@ -1627,10 +1675,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
+name = "windows_aarch64_gnullvm"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -1639,10 +1687,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
+name = "windows_aarch64_msvc"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -1651,10 +1699,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
+name = "windows_i686_gnu"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -1663,10 +1717,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
+name = "windows_i686_msvc"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -1675,10 +1729,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
+name = "windows_x86_64_gnu"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -1687,10 +1741,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
+name = "windows_x86_64_gnullvm"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -1699,12 +1753,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
-name = "yaml-rust"
-version = "0.4.5"
+name = "windows_x86_64_msvc"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "winnow"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d"
 dependencies = [
- "linked-hash-map",
+ "memchr",
 ]
 
 [[package]]
diff --git a/pkgs/by-name/sp/spade/package.nix b/pkgs/by-name/sp/spade/package.nix
index e1d133841f6b..2a3eb725e2d7 100644
--- a/pkgs/by-name/sp/spade/package.nix
+++ b/pkgs/by-name/sp/spade/package.nix
@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "spade";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchFromGitLab {
     owner = "spade-lang";
     repo = "spade";
     rev = "v${version}";
-    hash = "sha256-J3AdXuN1WLKFED9YeBly68umPlx05Wl+mhT2YbBsJVk=";
+    hash = "sha256-DVvdCt/t7aA2IAs+cL6wT129PX8s3P5gHawcLAvAAGw=";
     # only needed for vatch, which contains test data
     fetchSubmodules = true;
   };
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "codespan-0.12.0" = "sha256-3F2006BR3hyhxcUTaQiOjzTEuRECKJKjIDyXonS/lrE=";
-      "tracing-tree-0.2.0" = "sha256-/JNeAKjAXmKPh0et8958yS7joORDbid9dhFB0VUAhZc=";
     };
   };
 

From 646d8a4577477acd8f07db6d93bde17129f1507c Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Mon, 8 Jul 2024 21:07:05 +0200
Subject: [PATCH 05/72] python311Packages.mayavi: unbreak, set mainProgram

All removed patches have been merged and tagged in this release.
Docs are no longer built by default as of 4.8.0
---
 .../python-modules/mayavi/default.nix         | 30 +------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix
index b9fa608772b7..32929cfe2353 100644
--- a/pkgs/development/python-modules/mayavi/default.nix
+++ b/pkgs/development/python-modules/mayavi/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   envisage,
   fetchPypi,
-  fetchpatch,
   numpy,
   packaging,
   pyface,
@@ -19,7 +18,6 @@
 
 buildPythonPackage rec {
   pname = "mayavi";
-  # TODO: Remove meta.broken on next release.
   version = "4.8.2";
   format = "setuptools";
 
@@ -30,30 +28,6 @@ buildPythonPackage rec {
     hash = "sha256-sQ/pFF8hxI5JAvDnRrNgOzy2lNEUVlFaRoIPIaCnQik=";
   };
 
-  patches = [
-    # Adds compatibility with Python 3.11.
-    # https://github.com/enthought/mayavi/pull/1199
-    (fetchpatch {
-      name = "python311-compat.patch";
-      url = "https://github.com/enthought/mayavi/commit/50c0cbfcf97560be69c84b7c924635a558ebf92f.patch";
-      hash = "sha256-zZOT6on/f5cEjnDBrNGog/wPQh7rBkaFqrxkBYDUQu0=";
-      includes = [ "tvtk/src/*" ];
-    })
-    # Fixes an incompatible function pointer conversion error
-    # https://github.com/enthought/mayavi/pull/1266
-    (fetchpatch {
-      name = "incompatible-pointer-conversion.patch";
-      url = "https://github.com/enthought/mayavi/commit/887adc8fe2b076a368070f5b1d564745b03b1964.patch";
-      hash = "sha256-88H1NNotd4pO0Zw1oLrYk5WNuuVrmTU01HJgsTRfKlo=";
-    })
-  ];
-
-  postPatch = ''
-    # building the docs fails with the usual Qt xcb error, so skip:
-    substituteInPlace setup.py \
-      --replace "build.build.run(self)" "build.build.run(self); return"
-  '';
-
   nativeBuildInputs = [ wrapQtAppsHook ];
 
   propagatedBuildInputs = [
@@ -84,8 +58,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/enthought/mayavi";
     license = licenses.bsdOriginal;
     maintainers = with maintainers; [ knedlsepp ];
-    # Should be fixed in a version from after March 26, see:
-    # https://github.com/enthought/mayavi/issues/1284#issuecomment-2020631244
-    broken = pythonAtLeast "3.12";
+    mainProgram = "mayavi2";
   };
 }

From 3ded32777177c123f2a717caa244bbe9e2e4dd40 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 10 Jul 2024 17:50:01 +0200
Subject: [PATCH 06/72] anki: disable test_create_open

Fails in nix-portable with bwrap, where it is able to attach `/attachroot.anki2` when it shouldn't
---
 pkgs/games/anki/default.nix | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 9247337621bf..5f4677c301b1 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -250,13 +250,26 @@ python3.pkgs.buildPythonApplication {
   '';
 
   # mimic https://github.com/ankitects/anki/blob/76d8807315fcc2675e7fa44d9ddf3d4608efc487/build/ninja_gen/src/python.rs#L232-L250
-  checkPhase = ''
+  checkPhase = let
+    disabledTestsString = lib.pipe [
+      # assumes / is not writeable, somehow fails on nix-portable brwap
+      "test_create_open"
+    ] [
+      (lib.map (test: "not ${test}"))
+      (lib.concatStringsSep " and ")
+      lib.escapeShellArg
+    ];
+
+  in ''
+    runHook preCheck
     HOME=$TMP ANKI_TEST_MODE=1 PYTHONPATH=$PYTHONPATH:$PWD/out/pylib \
-      pytest -p no:cacheprovider pylib/tests
+      pytest -p no:cacheprovider pylib/tests -k ${disabledTestsString}
     HOME=$TMP ANKI_TEST_MODE=1 PYTHONPATH=$PYTHONPATH:$PWD/out/pylib:$PWD/pylib:$PWD/out/qt \
-      pytest -p no:cacheprovider qt/tests
+      pytest -p no:cacheprovider qt/tests -k ${disabledTestsString}
+    runHook postCheck
   '';
 
+
   preInstall = ''
     mkdir dist
     mv out/wheels/* dist

From 2d50c5eb6860ea49ac0f3995448fef3b268c39ef Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Thu, 11 Jul 2024 15:25:24 +0200
Subject: [PATCH 07/72] molecule: 24.6.1 -> 24.7.0

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

diff --git a/pkgs/development/python-modules/molecule/default.nix b/pkgs/development/python-modules/molecule/default.nix
index e2861df3571f..67100465874e 100644
--- a/pkgs/development/python-modules/molecule/default.nix
+++ b/pkgs/development/python-modules/molecule/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "molecule";
-  version = "24.6.1";
+  version = "24.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-QcGQOllyl8JgK9BZ4Qe17y4yydokeX3LeP+Yc8ZhXuY=";
+    hash = "sha256-2yx/pZkj6b8j1hqSpbGdaIHsnuX+lu2enp1wCwJyPwM=";
   };
 
   nativeBuildInputs = [

From b5228d2b3a77368ac5faa57403509ac88f80f44c Mon Sep 17 00:00:00 2001
From: sodiboo <git@sodi.boo>
Date: Thu, 11 Jul 2024 19:36:33 +0200
Subject: [PATCH 08/72] xwayland-satellite: correctly pass xwayland dependency
 in PATH

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

diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix
index bf8f60dc095f..89eae39fafd8 100644
--- a/pkgs/by-name/xw/xwayland-satellite/package.nix
+++ b/pkgs/by-name/xw/xwayland-satellite/package.nix
@@ -6,6 +6,7 @@
 , xcb-util-cursor
 , libxcb
 , nix-update-script
+, makeWrapper
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -24,10 +25,10 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     pkg-config
     rustPlatform.bindgenHook
+    makeWrapper
   ];
 
   buildInputs = [
-    xwayland
     libxcb
     xcb-util-cursor
   ];
@@ -43,6 +44,11 @@ rustPlatform.buildRustPackage rec {
     "--skip=toplevel_flow"
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/xwayland-satellite \
+      --prefix PATH : "${lib.makeBinPath [xwayland]}"
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {

From 2a5de4b0eedba3f52332360e292e10b0b48183da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Jul 2024 00:42:05 +0000
Subject: [PATCH 09/72] python312Packages.manhole: 1.8.0 -> 1.8.1

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

diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix
index 8dab6aa75520..7f26b648d9cf 100644
--- a/pkgs/development/python-modules/manhole/default.nix
+++ b/pkgs/development/python-modules/manhole/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "manhole";
-  version = "1.8.0";
+  version = "1.8.1";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "bada20a25b547b395d472e2e08928f0437df26bbdbda4797c55863198e29a21f";
+    sha256 = "sha256-Nmj9r4OzPJQ9tOdQ4MVU4xwg9jM4SWiV3U1kEGgNnEs=";
   };
 
   # test_help expects architecture-dependent Linux signal numbers.

From 581eb8bcc8f1b7cb969156267c7fdccbd38c1188 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Jul 2024 02:01:53 +0000
Subject: [PATCH 10/72] rinutils: 0.10.2 -> 0.10.3

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

diff --git a/pkgs/development/libraries/rinutils/default.nix b/pkgs/development/libraries/rinutils/default.nix
index ccc4df86ecd1..c7f5303c5b0b 100644
--- a/pkgs/development/libraries/rinutils/default.nix
+++ b/pkgs/development/libraries/rinutils/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rinutils";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchurl {
     url = "https://github.com/shlomif/${pname}/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-2H/hGZcit/qb1QjhNTg/8HiPvX1lXL75dXwjIS+MIXs=";
+    sha256 = "sha256-+eUn03psyMe4hwraY8qiTzKrDSn9ERbfPrtoZYMDCVU=";
   };
 
   nativeBuildInputs = [ cmake perl ];

From e6b4fde9918d81d5c4a66c9c6d9eb68239a50e1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Jul 2024 02:48:37 +0000
Subject: [PATCH 11/72] linuxkit: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix
index 87ca62ac5f48..7ed18a3056d0 100644
--- a/pkgs/development/tools/misc/linuxkit/default.nix
+++ b/pkgs/development/tools/misc/linuxkit/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "linuxkit";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "linuxkit";
     repo = "linuxkit";
     rev = "v${version}";
-    sha256 = "sha256-PrHGIP74mDt+mJDRaCsroiJ4QEW4/tzgsZI2JlZ8TEA=";
+    sha256 = "sha256-FK8aJGVIVu7nd6VwMlgs9daqr9rgz81OczbcHUGW89w=";
   };
 
   vendorHash = null;

From d6eb80a5214d5ccc1ee5b0ccf8a22ea681ac97ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Jul 2024 02:48:45 +0000
Subject: [PATCH 12/72] pioneer: 20240314 -> 20240710

---
 pkgs/games/pioneer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix
index c5f1a3142631..57518f084bc3 100644
--- a/pkgs/games/pioneer/default.nix
+++ b/pkgs/games/pioneer/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pioneer";
-  version = "20240314";
+  version = "20240710";
 
   src = fetchFromGitHub{
     owner = "pioneerspacesim";
     repo = "pioneer";
     rev = version;
-    hash = "sha256-CUaiQPRufo8Ng70w5KWlLugySMaTaUuZno/ckyU1w2w=";
+    hash = "sha256-zuPm5odMn6C3JqkgqQdgSztwxWjMmLVWUalYbEbAZro=";
   };
 
   postPatch = ''

From 9bb024aa1f864f77112299d7ac170a797d15d480 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Jul 2024 04:27:23 +0000
Subject: [PATCH 13/72] firewalld-gui: 2.1.2 -> 2.2.0

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

diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix
index 0743e7541d35..9c0053051db1 100644
--- a/pkgs/applications/networking/firewalld/default.nix
+++ b/pkgs/applications/networking/firewalld/default.nix
@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "firewalld";
-  version = "2.1.2";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "firewalld";
     repo = "firewalld";
     rev = "v${version}";
-    sha256 = "sha256-bCLMTWtgEay3fLKOFWUoWpOL1iGDHRR5hu+v06bLxLs=";
+    sha256 = "sha256-MaBYJLNVlDEsMlnyNtf8G8D1Tnvcfv0/bXQ/8f7kBao=";
   };
 
   patches = [

From cce045c5207ef83ff8caacc9dabfc0c579ab43a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Jul 2024 04:43:59 +0000
Subject: [PATCH 14/72] libsolv: 0.7.29 -> 0.7.30

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

diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix
index d8c49efd43ca..a0f5cd610e34 100644
--- a/pkgs/development/libraries/libsolv/default.nix
+++ b/pkgs/development/libraries/libsolv/default.nix
@@ -17,14 +17,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.29";
+  version = "0.7.30";
   pname = "libsolv";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "libsolv";
     rev = version;
-    hash = "sha256-867sCGFvKib1As9BCiCi6LYVrLUK0pjtM5Bw9Yuu0D8=";
+    hash = "sha256-De2lQu80MjKvjnN0W3/Y9JwFbA8g7tleflVXC9Lib5Y=";
   };
 
   cmakeFlags = [

From 535597b70c6c43b94408961be7680623e23b8d63 Mon Sep 17 00:00:00 2001
From: sodiboo <git@sodi.boo>
Date: Fri, 12 Jul 2024 08:11:30 +0200
Subject: [PATCH 15/72] xwayland-satellite: add sodiboo as maintainer

---
 pkgs/by-name/xw/xwayland-satellite/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/xw/xwayland-satellite/package.nix b/pkgs/by-name/xw/xwayland-satellite/package.nix
index 89eae39fafd8..428cc3a86598 100644
--- a/pkgs/by-name/xw/xwayland-satellite/package.nix
+++ b/pkgs/by-name/xw/xwayland-satellite/package.nix
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
     description = "Rootless Xwayland integration to any Wayland compositor implementing xdg_wm_base";
     homepage = "https://github.com/Supreeeme/xwayland-satellite";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ if-loop69420 ];
+    maintainers = with maintainers; [ if-loop69420 sodiboo ];
     mainProgram = "xwayland-satellite";
     platforms = platforms.linux;
   };

From 8d9ef57935f30d4e4c8d94f41e8c8b19ee1d1183 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 4 Jul 2024 19:51:40 +0200
Subject: [PATCH 16/72] python311Packages.whenever: 0.5.2 -> 0.6.1

Diff: https://github.com/ariebovenberg/whenever/compare/refs/tags/0.5.2...0.6.1

Changelog: https://github.com/ariebovenberg/whenever/blob/refs/tags/0.6.1/CHANGELOG.rst
---
 .../python-modules/whenever/default.nix       | 48 +++++++++++++------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/whenever/default.nix b/pkgs/development/python-modules/whenever/default.nix
index 00fbeb703bf6..184d987f63a7 100644
--- a/pkgs/development/python-modules/whenever/default.nix
+++ b/pkgs/development/python-modules/whenever/default.nix
@@ -1,11 +1,15 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   pythonOlder,
+  rustPlatform,
+  cargo,
+  rustc,
+  libiconv,
   buildPythonPackage,
-  poetry-core,
-  backports-zoneinfo,
-  tzdata,
+  setuptools,
+  setuptools-rust,
   pytestCheckHook,
   pytest-mypy-plugins,
   hypothesis,
@@ -14,38 +18,54 @@
 
 buildPythonPackage rec {
   pname = "whenever";
-  version = "0.5.2";
+  version = "0.6.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "ariebovenberg";
     repo = "whenever";
     rev = "refs/tags/${version}";
-    hash = "sha256-bG8LV+r5MjA1JwBHWy9/Io4daldAlyEGYNLW+5ITuOw=";
+    hash = "sha256-uUjQtaqPO/Ie7vVddQhc3dxORX2PxNRaDJzCr+vieUo=";
   };
 
-  postPatch = ''
-    # unrecognized arguments since we don't use pytest-benchmark in nixpkgs
-    substituteInPlace pytest.ini \
-      --replace-fail '--benchmark-disable' '#--benchmark-disable'
-  '';
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    hash = "sha256-8U3pGKY9UQ0JpzUn3Ny6YSD3wzXPDi1pupD5fpEJFvw=";
+  };
 
-  build-system = [ poetry-core ];
+  build-system = [
+    setuptools
+    setuptools-rust
+    rustPlatform.cargoSetupHook
+    cargo
+    rustc
+  ];
 
-  dependencies = [ tzdata ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];
+  buildInputs = lib.optionals stdenv.isDarwin [
+    libiconv
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
     pytest-mypy-plugins
+    # pytest-benchmark # developer sanity check, should not block distribution
     hypothesis
     freezegun
   ];
 
+  disabledTestPaths = [
+    # benchmarks
+    "benchmarks/python/test_date.py"
+    "benchmarks/python/test_instant.py"
+    "benchmarks/python/test_local_datetime.py"
+    "benchmarks/python/test_zoned_datetime.py"
+  ];
+
   pythonImportsCheck = [ "whenever" ];
 
-  # early TDD, many tests are failing
+  # a bunch of failures, including an assumption of what the timezone on the host is
   # TODO: try enabling on bump
   doCheck = false;
 

From ddc35970180d2ecfb6e214da458461c9af5363c7 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 14 Jul 2024 15:16:48 +0200
Subject: [PATCH 17/72] tomcat9: 9.0.90 -> 9.0.91

https://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.91_(remm)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index eb7be6d9de04..141f3d92a6a8 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -39,8 +39,8 @@ let
 
 in {
   tomcat9 = common {
-    version = "9.0.90";
-    hash = "sha256-MYSRxL5DSU5ocrUnfEDKyFBpAddErQnTffYuiFQ/YiM=";
+    version = "9.0.91";
+    hash = "sha256-DFspyh06Mbu4+ratH+7Yo3Au0yXRSDlVCmd0x2yQuFY=";
   };
 
   tomcat10 = common {

From eda65c2b4348500d33917c48e11622aba3e5b4ff Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 14 Jul 2024 15:17:26 +0200
Subject: [PATCH 18/72] tomcat10: 10.1.25 -> 10.1.26

https://tomcat.apache.org/tomcat-10.1-doc/changelog.html#Tomcat_10.1.26_(schultz)
---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 141f3d92a6a8..ba9d88164dfe 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -44,7 +44,7 @@ in {
   };
 
   tomcat10 = common {
-    version = "10.1.25";
-    hash = "sha256-8SQKMrh5xEWkpEGcm23YdYG9uW+KUfewyhk1Fkux6EI=";
+    version = "10.1.26";
+    hash = "sha256-9z92dgE3gzszBd+xjtF0+H/qw6t49lKJoINahR18/rI=";
   };
 }

From 8c1f535d375efa70a6957b94e9a69fc1911fccfa Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 14 Jul 2024 15:18:12 +0200
Subject: [PATCH 19/72] tomcat: add passthru.updateScript

---
 pkgs/servers/http/tomcat/default.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index ba9d88164dfe..9e9966643ce0 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -1,4 +1,4 @@
-{ stdenvNoCC, lib, fetchurl, nixosTests, testers, jre }:
+{ stdenvNoCC, lib, fetchurl, nixosTests, testers, jre, gitUpdater }:
 
 let
   common = { version, hash }: stdenvNoCC.mkDerivation (finalAttrs: {
@@ -19,11 +19,18 @@ let
         mv $out/webapps $webapps/
       '';
 
-    passthru.tests = {
-      inherit (nixosTests) tomcat;
-      version = testers.testVersion {
-        package = finalAttrs.finalPackage;
-        command = "JAVA_HOME=${jre} ${finalAttrs.finalPackage}/bin/version.sh";
+    passthru = {
+      updateScript = gitUpdater {
+        url = "https://github.com/apache/tomcat.git";
+        allowedVersions = "^${lib.versions.major version}\\.";
+        ignoredVersions = "-M.*";
+      };
+      tests = {
+        inherit (nixosTests) tomcat;
+        version = testers.testVersion {
+          package = finalAttrs.finalPackage;
+          command = "JAVA_HOME=${jre} ${finalAttrs.finalPackage}/bin/version.sh";
+        };
       };
     };
 

From 4796b6afabeb2ea993bae1472970f30859c2461c Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 14 Jul 2024 15:21:35 +0200
Subject: [PATCH 20/72] tomcat: format with nixfmt-rfc-style, remove `with
 lib;`

---
 pkgs/servers/http/tomcat/default.nix | 79 ++++++++++++++++------------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 9e9966643ce0..8dc11535d1ae 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -1,50 +1,63 @@
-{ stdenvNoCC, lib, fetchurl, nixosTests, testers, jre, gitUpdater }:
+{
+  fetchurl,
+  gitUpdater,
+  jre,
+  lib,
+  nixosTests,
+  stdenvNoCC,
+  testers,
+}:
 
 let
-  common = { version, hash }: stdenvNoCC.mkDerivation (finalAttrs: {
-    pname = "apache-tomcat";
-    inherit version;
+  common =
+    { version, hash }:
+    stdenvNoCC.mkDerivation (finalAttrs: {
+      pname = "apache-tomcat";
+      inherit version;
 
-    src = fetchurl {
-      url = "mirror://apache/tomcat/tomcat-${lib.versions.major version}/v${version}/bin/apache-tomcat-${version}.tar.gz";
-      inherit hash;
-    };
+      src = fetchurl {
+        url = "mirror://apache/tomcat/tomcat-${lib.versions.major version}/v${version}/bin/apache-tomcat-${version}.tar.gz";
+        inherit hash;
+      };
 
-    outputs = [ "out" "webapps" ];
-    installPhase =
-      ''
+      outputs = [
+        "out"
+        "webapps"
+      ];
+      installPhase = ''
         mkdir $out
         mv * $out
         mkdir -p $webapps/webapps
         mv $out/webapps $webapps/
       '';
 
-    passthru = {
-      updateScript = gitUpdater {
-        url = "https://github.com/apache/tomcat.git";
-        allowedVersions = "^${lib.versions.major version}\\.";
-        ignoredVersions = "-M.*";
-      };
-      tests = {
-        inherit (nixosTests) tomcat;
-        version = testers.testVersion {
-          package = finalAttrs.finalPackage;
-          command = "JAVA_HOME=${jre} ${finalAttrs.finalPackage}/bin/version.sh";
+      passthru = {
+        updateScript = gitUpdater {
+          url = "https://github.com/apache/tomcat.git";
+          allowedVersions = "^${lib.versions.major version}\\.";
+          ignoredVersions = "-M.*";
+        };
+        tests = {
+          inherit (nixosTests) tomcat;
+          version = testers.testVersion {
+            package = finalAttrs.finalPackage;
+            command = "JAVA_HOME=${jre} ${finalAttrs.finalPackage}/bin/version.sh";
+          };
         };
       };
-    };
 
-    meta = with lib; {
-      homepage = "https://tomcat.apache.org/";
-      description = "Implementation of the Java Servlet and JavaServer Pages technologies";
-      platforms = jre.meta.platforms;
-      maintainers = with maintainers; [ anthonyroussel ];
-      license = [ licenses.asl20 ];
-      sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    };
-  });
+      meta = {
+        homepage = "https://tomcat.apache.org/";
+        description = "Implementation of the Java Servlet and JavaServer Pages technologies";
+        platforms = jre.meta.platforms;
+        maintainers = with lib.maintainers; [ anthonyroussel ];
+        license = lib.licenses.asl20;
+        sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+      };
+    });
 
-in {
+in
+{
   tomcat9 = common {
     version = "9.0.91";
     hash = "sha256-DFspyh06Mbu4+ratH+7Yo3Au0yXRSDlVCmd0x2yQuFY=";

From e5d65aefac6778f21734bda0d0feead36dca6d84 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Sun, 14 Jul 2024 19:37:23 +0200
Subject: [PATCH 21/72] keymapp: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix
index fabe1f149958..a9ab9ceb19aa 100644
--- a/pkgs/by-name/ke/keymapp/package.nix
+++ b/pkgs/by-name/ke/keymapp/package.nix
@@ -25,11 +25,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "keymapp";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchurl {
     url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz";
-    hash = "sha256-kl/2faWbn1sF7AzgkyM6C9xzXTYh8HJf81xIY4Zf3IY=";
+    hash = "sha256-e02EOJH7QXm8ue7pZt++tyUjAC+DFga4MWNoeVfJjy8=";
   };
 
   nativeBuildInputs = [

From aec02f12cb361dfbc8f4451373338f30ec36c817 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Sun, 14 Jul 2024 20:40:26 +0000
Subject: [PATCH 22/72] application-title-bar: 0.6.7 -> 0.6.8

---
 pkgs/by-name/ap/application-title-bar/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix
index 1b37d55560c0..90808d7ec6b5 100644
--- a/pkgs/by-name/ap/application-title-bar/package.nix
+++ b/pkgs/by-name/ap/application-title-bar/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "application-title-bar";
-  version = "0.6.7";
+  version = "0.6.8";
 
   src = fetchFromGitHub {
     owner = "antroids";
     repo = "application-title-bar";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6k8bVVrCzrUno7m9NJWlFpwHsWLNRWudhw5mhpsMxRU=";
+    hash = "sha256-pwCmkFEhxz7ZtNZNnIK2cTo+GDlIRIZ3VQ76n6qJ0Ac=";
   };
 
   propagatedUserEnvPkgs = with kdePackages; [ kconfig ];

From 32fcc3bd85396bb2d7f6b6bcefc71fe33f4d5e70 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <IAm.HeitorALN@proton.me>
Date: Sun, 14 Jul 2024 20:41:07 +0000
Subject: [PATCH 23/72] application-title-bar: add passthru.updateScript

---
 pkgs/by-name/ap/application-title-bar/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix
index 90808d7ec6b5..b8a7da2b27a3 100644
--- a/pkgs/by-name/ap/application-title-bar/package.nix
+++ b/pkgs/by-name/ap/application-title-bar/package.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , kdePackages
+, nix-update-script
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -26,6 +27,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "KDE Plasma6 widget with window controls";
     homepage = "https://github.com/antroids/application-title-bar";

From 89f29219567e98772c5e7029ee17d13ca2178152 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <matteo@codecraft.it>
Date: Fri, 12 Jul 2024 16:40:32 +0100
Subject: [PATCH 24/72] pcsx2-bin: added passthru.updateScript

---
 pkgs/by-name/pc/pcsx2-bin/package.nix | 20 +++++++++++++-------
 pkgs/by-name/pc/pcsx2-bin/update.sh   |  8 ++++++++
 2 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100755 pkgs/by-name/pc/pcsx2-bin/update.sh

diff --git a/pkgs/by-name/pc/pcsx2-bin/package.nix b/pkgs/by-name/pc/pcsx2-bin/package.nix
index a3c868de23bf..ec71fc9955ec 100644
--- a/pkgs/by-name/pc/pcsx2-bin/package.nix
+++ b/pkgs/by-name/pc/pcsx2-bin/package.nix
@@ -32,16 +32,22 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru = {
+    updateScript = ./update.sh;
+  };
+
   meta = {
-    inherit (pcsx2.meta) homepage longDescription license changelog downloadPage;
+    inherit (pcsx2.meta)
+      homepage
+      longDescription
+      license
+      changelog
+      downloadPage
+      ;
     description = "Playstation 2 emulator; precompiled binary for MacOS, repacked from official website";
-    maintainers = with lib.maintainers; [
-      matteopacini
-    ];
+    maintainers = with lib.maintainers; [ matteopacini ];
     mainProgram = "pcsx2-qt";
-    platforms = lib.systems.inspect.patternLogicalAnd
-      lib.systems.inspect.patterns.isDarwin
-      lib.systems.inspect.patterns.isx86_64;
+    platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isDarwin lib.systems.inspect.patterns.isx86_64;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })
diff --git a/pkgs/by-name/pc/pcsx2-bin/update.sh b/pkgs/by-name/pc/pcsx2-bin/update.sh
new file mode 100755
index 000000000000..0450ad205744
--- /dev/null
+++ b/pkgs/by-name/pc/pcsx2-bin/update.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq gnused common-updater-scripts
+
+set -eou pipefail
+
+LATEST_VERSION="$(curl --silent --fail ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/PCSX2/pcsx2/releases" | jq '.[0].tag_name' --raw-output | sed 's/^v//')"
+
+update-source-version pcsx2-bin "$LATEST_VERSION"

From e259e0aec6a228b0d291fd9423d65d035677d2fa Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 13:05:43 -0400
Subject: [PATCH 25/72] binary: 0.3 -> 0.3.1

Changelog: https://github.com/fizzyizzy05/binary/releases/tag/0.3.1
Diff: https://github.com/fizzyizzy05/binary/compare/0.3...0.3.1
---
 pkgs/by-name/bi/binary/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/binary/package.nix b/pkgs/by-name/bi/binary/package.nix
index 1a908e526565..fef93db98987 100644
--- a/pkgs/by-name/bi/binary/package.nix
+++ b/pkgs/by-name/bi/binary/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   python3Packages,
   appstream,
+  blueprint-compiler,
   desktop-file-utils,
   glib,
   gobject-introspection,
@@ -15,18 +16,19 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "binary";
-  version = "0.3";
+  version = "0.3.1";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "fizzyizzy05";
     repo = "binary";
     rev = "refs/tags/${version}";
-    hash = "sha256-bR0oCqbnyUTCueT4f0Ij7qbwjNnN4eMDAOUK9MnCEJ0=";
+    hash = "sha256-4Ep7d5grMXCCy9tL8wquJsx13jVIp+piDPeJh6mYFpI=";
   };
 
   nativeBuildInputs = [
     appstream
+    blueprint-compiler
     desktop-file-utils
     glib # need glib-compile-schemas
     gobject-introspection

From f5f90aa6968dce4e62d4f579857ec2aa116b82cf Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 13:12:20 -0400
Subject: [PATCH 26/72] diesel-cli: 2.1.1 -> 2.2.1

Changelog: https://github.com/diesel-rs/diesel/releases/tag/v2.2.1
Diff: https://github.com/diesel-rs/diesel/compare/v2.1.1...v2.2.1
---
 pkgs/by-name/di/diesel-cli/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index 0349ec8ac84d..ad626b57903a 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.1.1";
+  version = "2.2.1";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-fpvC9C30DJy5ih+sFTTMoiykUHqG6OzDhF9jvix1Ctg=";
+    hash = "sha256-B+AHTJgOBUGVc4J2VcwuqVwAbm0wpsFHc9+gc5g2RAM=";
   };
 
-  cargoHash = "sha256-nPmUCww8sOJwnG7+uIflLPgT87xPX0s7g0AcuDKhY2I=";
+  cargoHash = "sha256-HFhkePq2fZ7MxZfH0jLlS5B10jqf15+RUcGZnDbML5Q=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -76,6 +76,9 @@ rustPlatform.buildRustPackage rec {
   ];
   cargoCheckFeatures = buildFeatures;
 
+  # Tests currently fail due to *many* duplicate definition errors
+  doCheck = false;
+
   postInstall = ''
     installShellCompletion --cmd diesel \
       --bash <($out/bin/diesel completions bash) \

From 53212869d0f4ea179faefaeeca2ce96c60547046 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 13:35:55 -0400
Subject: [PATCH 27/72] flite: add updateScript

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

diff --git a/pkgs/by-name/fl/flite/package.nix b/pkgs/by-name/fl/flite/package.nix
index f39e1257185a..1edb95c2d4b8 100644
--- a/pkgs/by-name/fl/flite/package.nix
+++ b/pkgs/by-name/fl/flite/package.nix
@@ -5,6 +5,7 @@
   fetchpatch,
   alsa-lib,
   libpulseaudio,
+  nix-update-script,
   testers,
   audioBackend ? "pulseaudio",
 }:
@@ -62,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
       command = "flite --help";
       package = finalAttrs.finalPackage;
     };
+
+    updateScript = nix-update-script { };
   };
 
   meta = {

From f40faf76f348ddc4b6a2beae0e50e965932c752b Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:04:22 -0400
Subject: [PATCH 28/72] clippy-sarif: 0.4.2 -> 0.5.0

Diff: https://github.com/psastras/sarif-rs/compare/clippy-sarif-v0.4.2...clippy-sarif-v0.5.0
---
 pkgs/by-name/cl/clippy-sarif/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix
index 551530dcc9c3..73a0b882f36e 100644
--- a/pkgs/by-name/cl/clippy-sarif/package.nix
+++ b/pkgs/by-name/cl/clippy-sarif/package.nix
@@ -8,16 +8,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "clippy-sarif";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "psastras";
     repo = "sarif-rs";
     rev = "clippy-sarif-v${version}";
-    hash = "sha256-EzWzDeIeSJ11CVcVyAhMjYQJcKHnieRrFkULc5eXAno=";
+    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
   };
 
-  cargoHash = "sha256-F3NrqkqLdvMRIuozCMMqwlrrf5QrnmcEhy4TGSzPhiU=";
+  cargoHash = "sha256-F97Cwk87M3SpLqXSECH5nZ8x+3c3oz28zxlPvQUZWlg=";
   cargoBuildFlags = [
     "--package"
     "clippy-sarif"

From 4bfca03fcb785eec4863a74da7bdd9c7c296cd5c Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:04:45 -0400
Subject: [PATCH 29/72] shellcheck-sarif: 0.4.2 -> 0.5.0

Diff: https://github.com/psastras/sarif-rs/compare/shellcheck-sarif-v0.4.2...shellcheck-sarif-v0.5.0
---
 pkgs/by-name/sh/shellcheck-sarif/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix
index f5614143bd8f..63f9ca933c59 100644
--- a/pkgs/by-name/sh/shellcheck-sarif/package.nix
+++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "shellcheck-sarif";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "psastras";
     repo = "sarif-rs";
     rev = "shellcheck-sarif-v${version}";
-    hash = "sha256-EzWzDeIeSJ11CVcVyAhMjYQJcKHnieRrFkULc5eXAno=";
+    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
   };
 
-  cargoHash = "sha256-JuE/Z0qrS/3BRlb0jTGDfV0TYk74Q75X1wv/IERxqeQ=";
+  cargoHash = "sha256-HiZt3AxFMqIpRkg0TFpm8GDFCX6zYWTllO+xtVj7fjY=";
   cargoBuildFlags = [
     "--package"
     "shellcheck-sarif"

From 183b8e644fd081c55be0268787d346d05f9e5331 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:05:00 -0400
Subject: [PATCH 30/72] hadolint-sarif: 0.4.2 -> 0.5.0

Diff: https://github.com/psastras/sarif-rs/compare/hadolint-sarif-v0.4.2...hadolint-sarif-v0.5.0
---
 pkgs/by-name/ha/hadolint-sarif/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix
index bf8f43429633..94d34e2d4a1c 100644
--- a/pkgs/by-name/ha/hadolint-sarif/package.nix
+++ b/pkgs/by-name/ha/hadolint-sarif/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "hadolint-sarif";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "psastras";
     repo = "sarif-rs";
     rev = "hadolint-sarif-v${version}";
-    hash = "sha256-EzWzDeIeSJ11CVcVyAhMjYQJcKHnieRrFkULc5eXAno=";
+    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
   };
 
-  cargoHash = "sha256-AMRL1XANyze8bJe3fdgZvBnl/NyuWP13jixixqiPmiw=";
+  cargoHash = "sha256-x2JHMc8OcOVCJ0X68tTyMI8P7bM8javjkYlrHBLMjus=";
   cargoBuildFlags = [
     "--package"
     "hadolint-sarif"

From 58a32702852fbaceac080f5952574290cac432f8 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:05:13 -0400
Subject: [PATCH 31/72] sarif-fmt: 0.4.2 -> 0.5.0

Diff: https://github.com/psastras/sarif-rs/compare/sarif-fmt-v0.4.2...sarif-fmt-v0.5.0
---
 pkgs/by-name/sa/sarif-fmt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix
index ad273bca0d64..455e8b105f6d 100644
--- a/pkgs/by-name/sa/sarif-fmt/package.nix
+++ b/pkgs/by-name/sa/sarif-fmt/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sarif-fmt";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "psastras";
     repo = "sarif-rs";
     rev = "sarif-fmt-v${version}";
-    hash = "sha256-EzWzDeIeSJ11CVcVyAhMjYQJcKHnieRrFkULc5eXAno=";
+    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
   };
 
-  cargoHash = "sha256-dHOxVLXtnqSHMX5r1wFxqogDf9QdnOZOjTyYFahru34=";
+  cargoHash = "sha256-VonkXSeyp8Kxo5mE+eI5ialgqcCFvDALv/XXl2i8DZ0=";
   cargoBuildFlags = [
     "--package"
     "sarif-fmt"

From 799eff71f63fd5cfc478839aa9667729ccf86d6d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:13:56 -0400
Subject: [PATCH 32/72] clippy-sarif: fetchFromGitHub -> fetchCrate

this makes things much easier to build as we don't need to account for
the monorepo
---
 pkgs/by-name/cl/clippy-sarif/package.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix
index 73a0b882f36e..6be420f5bf27 100644
--- a/pkgs/by-name/cl/clippy-sarif/package.nix
+++ b/pkgs/by-name/cl/clippy-sarif/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchCrate,
   rustPlatform,
   clippy,
   clippy-sarif,
@@ -10,19 +10,12 @@ rustPlatform.buildRustPackage rec {
   pname = "clippy-sarif";
   version = "0.5.0";
 
-  src = fetchFromGitHub {
-    owner = "psastras";
-    repo = "sarif-rs";
-    rev = "clippy-sarif-v${version}";
-    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-ylfL4N1BtbB1R7+Glwtgn5E6/v3wQ6oXWdmeyKNHdOw=";
   };
 
-  cargoHash = "sha256-F97Cwk87M3SpLqXSECH5nZ8x+3c3oz28zxlPvQUZWlg=";
-  cargoBuildFlags = [
-    "--package"
-    "clippy-sarif"
-  ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoHash = "sha256-O0bLgj7rWwbEswVMfexsBGgJyObxseOohYht21Y6HpU=";
 
   passthru = {
     tests.version = testers.testVersion { package = clippy-sarif; };

From 22ccac6ba7db781977cd50e0c913ba81d8d8d902 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:15:39 -0400
Subject: [PATCH 33/72] clippy-sarif: add updateScript

---
 pkgs/by-name/cl/clippy-sarif/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix
index 6be420f5bf27..819dd6177dac 100644
--- a/pkgs/by-name/cl/clippy-sarif/package.nix
+++ b/pkgs/by-name/cl/clippy-sarif/package.nix
@@ -4,6 +4,7 @@
   rustPlatform,
   clippy,
   clippy-sarif,
+  nix-update-script,
   testers,
 }:
 rustPlatform.buildRustPackage rec {
@@ -19,14 +20,15 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     tests.version = testers.testVersion { package = clippy-sarif; };
+    updateScript = nix-update-script { };
   };
 
   meta = {
     description = "A CLI tool to convert clippy diagnostics into SARIF";
-    mainProgram = "clippy-sarif";
     homepage = "https://psastras.github.io/sarif-rs";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "clippy-sarif";
     inherit (clippy.meta) platforms;
   };
 }

From 6dc9daef05be0d5e98f56aee01400da92e581c05 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:20:34 -0400
Subject: [PATCH 34/72] shellcheck-sarif: fetchFromGitHub -> fetchCrate

this makes things much easier to build as we don't need to account for
the monorepo
---
 pkgs/by-name/sh/shellcheck-sarif/package.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix
index 63f9ca933c59..245c1c7b9efe 100644
--- a/pkgs/by-name/sh/shellcheck-sarif/package.nix
+++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchCrate,
   rustPlatform,
   shellcheck-sarif,
   testers,
@@ -9,19 +9,12 @@ rustPlatform.buildRustPackage rec {
   pname = "shellcheck-sarif";
   version = "0.5.0";
 
-  src = fetchFromGitHub {
-    owner = "psastras";
-    repo = "sarif-rs";
-    rev = "shellcheck-sarif-v${version}";
-    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-PFMakiV9vXzMqVh1WeVTDwGpN7RVfFQlVWKkaD6ef+Q=";
   };
 
-  cargoHash = "sha256-HiZt3AxFMqIpRkg0TFpm8GDFCX6zYWTllO+xtVj7fjY=";
-  cargoBuildFlags = [
-    "--package"
-    "shellcheck-sarif"
-  ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoHash = "sha256-kkSTRoouuIh4Bsh+zqhtTwIGLxDE+3u8SuP+8i+lw5Q=";
 
   passthru = {
     tests.version = testers.testVersion { package = shellcheck-sarif; };

From e52dcd90a446082c63b2df97e2986cebb625871a Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:22:23 -0400
Subject: [PATCH 35/72] shellcheck-sarif: testers.testVersion ->
 versionCheckHook

this results in less ugly recursion
---
 pkgs/by-name/sh/shellcheck-sarif/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix
index 245c1c7b9efe..1a3e8ef4a358 100644
--- a/pkgs/by-name/sh/shellcheck-sarif/package.nix
+++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix
@@ -2,8 +2,7 @@
   lib,
   fetchCrate,
   rustPlatform,
-  shellcheck-sarif,
-  testers,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "shellcheck-sarif";
@@ -16,9 +15,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-kkSTRoouuIh4Bsh+zqhtTwIGLxDE+3u8SuP+8i+lw5Q=";
 
-  passthru = {
-    tests.version = testers.testVersion { package = shellcheck-sarif; };
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
 
   meta = {
     description = "CLI tool to convert shellcheck diagnostics into SARIF";

From 0ee138df823fc200f18cbdcce22affb5396107e7 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:25:42 -0400
Subject: [PATCH 36/72] clippy-sarif: testers.testVersion -> versionCheckHook

this results in less ugly recursion
---
 pkgs/by-name/cl/clippy-sarif/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clippy-sarif/package.nix b/pkgs/by-name/cl/clippy-sarif/package.nix
index 819dd6177dac..6b4a1aa1afdd 100644
--- a/pkgs/by-name/cl/clippy-sarif/package.nix
+++ b/pkgs/by-name/cl/clippy-sarif/package.nix
@@ -3,9 +3,8 @@
   fetchCrate,
   rustPlatform,
   clippy,
-  clippy-sarif,
   nix-update-script,
-  testers,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "clippy-sarif";
@@ -18,8 +17,10 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-O0bLgj7rWwbEswVMfexsBGgJyObxseOohYht21Y6HpU=";
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru = {
-    tests.version = testers.testVersion { package = clippy-sarif; };
     updateScript = nix-update-script { };
   };
 

From ee0085a562c876966234cea936afd57cc62d843d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:29:04 -0400
Subject: [PATCH 37/72] hadolint-sarif: fetchFromGitHub -> fetchCrate

this makes things much easier to build as we don't need to account for
the monorepo
---
 pkgs/by-name/ha/hadolint-sarif/package.nix | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix
index 94d34e2d4a1c..926d459dbab5 100644
--- a/pkgs/by-name/ha/hadolint-sarif/package.nix
+++ b/pkgs/by-name/ha/hadolint-sarif/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchFromGitHub,
+  fetchCrate,
   rustPlatform,
   hadolint-sarif,
   testers,
@@ -9,19 +9,12 @@ rustPlatform.buildRustPackage rec {
   pname = "hadolint-sarif";
   version = "0.5.0";
 
-  src = fetchFromGitHub {
-    owner = "psastras";
-    repo = "sarif-rs";
-    rev = "hadolint-sarif-v${version}";
-    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-Zh3y31Q+ue1TqncZpdX+fAp2yfEnv8W8jkzUW7UvrKg=";
   };
 
-  cargoHash = "sha256-x2JHMc8OcOVCJ0X68tTyMI8P7bM8javjkYlrHBLMjus=";
-  cargoBuildFlags = [
-    "--package"
-    "hadolint-sarif"
-  ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoHash = "sha256-bwEQ9lZXvZL6JN24N8gRdbV5gcFiH1fQ59PQILfW1z8=";
 
   passthru = {
     tests.version = testers.testVersion { package = hadolint-sarif; };

From 0734b8fa1c5aadfe78b0762d0cc61e2e8f486922 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:23:56 -0400
Subject: [PATCH 38/72] shellcheck-sarif: add updateScript

---
 pkgs/by-name/sh/shellcheck-sarif/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shellcheck-sarif/package.nix b/pkgs/by-name/sh/shellcheck-sarif/package.nix
index 1a3e8ef4a358..20d157f7efe7 100644
--- a/pkgs/by-name/sh/shellcheck-sarif/package.nix
+++ b/pkgs/by-name/sh/shellcheck-sarif/package.nix
@@ -2,6 +2,7 @@
   lib,
   fetchCrate,
   rustPlatform,
+  nix-update-script,
   versionCheckHook,
 }:
 rustPlatform.buildRustPackage rec {
@@ -18,11 +19,15 @@ rustPlatform.buildRustPackage rec {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "CLI tool to convert shellcheck diagnostics into SARIF";
     homepage = "https://psastras.github.io/sarif-rs";
-    mainProgram = "shellcheck-sarif";
-    maintainers = with lib.maintainers; [ getchoo ];
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "shellcheck-sarif";
   };
 }

From 8960ca71be59d29e9920160806f9cae7b929cf2e Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:29:45 -0400
Subject: [PATCH 39/72] hadolint-sarif: add updateScript

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

diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix
index 926d459dbab5..5996be333c13 100644
--- a/pkgs/by-name/ha/hadolint-sarif/package.nix
+++ b/pkgs/by-name/ha/hadolint-sarif/package.nix
@@ -3,6 +3,7 @@
   fetchCrate,
   rustPlatform,
   hadolint-sarif,
+  nix-update-script,
   testers,
 }:
 rustPlatform.buildRustPackage rec {
@@ -18,13 +19,14 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     tests.version = testers.testVersion { package = hadolint-sarif; };
+    updateScript = nix-update-script { };
   };
 
   meta = {
     description = "A CLI tool to convert hadolint diagnostics into SARIF";
     homepage = "https://psastras.github.io/sarif-rs";
-    mainProgram = "hadolint-sarif";
-    maintainers = with lib.maintainers; [ getchoo ];
     license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "hadolint-sarif";
   };
 }

From 9cb1661a00e58d7760e400313e237f4a19133a5a Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:30:31 -0400
Subject: [PATCH 40/72] hadolint-sarif: testers.testVersion -> versionCheckHook

this results in less ugly recursion
---
 pkgs/by-name/ha/hadolint-sarif/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/hadolint-sarif/package.nix b/pkgs/by-name/ha/hadolint-sarif/package.nix
index 5996be333c13..870d3d833acc 100644
--- a/pkgs/by-name/ha/hadolint-sarif/package.nix
+++ b/pkgs/by-name/ha/hadolint-sarif/package.nix
@@ -2,9 +2,8 @@
   lib,
   fetchCrate,
   rustPlatform,
-  hadolint-sarif,
   nix-update-script,
-  testers,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "hadolint-sarif";
@@ -17,8 +16,10 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-bwEQ9lZXvZL6JN24N8gRdbV5gcFiH1fQ59PQILfW1z8=";
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru = {
-    tests.version = testers.testVersion { package = hadolint-sarif; };
     updateScript = nix-update-script { };
   };
 

From f06ed2b167df8f14cc2bc169063077fe6a09625c Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:35:32 -0400
Subject: [PATCH 41/72] sarif-fmt: fetchFromGitHub -> fetchCrate

this makes things much easier to build as we don't need to account for
the monorepo
---
 pkgs/by-name/sa/sarif-fmt/package.nix | 30 ++++++++-------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix
index 455e8b105f6d..ae9082e546da 100644
--- a/pkgs/by-name/sa/sarif-fmt/package.nix
+++ b/pkgs/by-name/sa/sarif-fmt/package.nix
@@ -1,9 +1,8 @@
 {
   lib,
   stdenv,
-  fetchFromGitHub,
+  fetchCrate,
   rustPlatform,
-  clippy,
   sarif-fmt,
   testers,
 }:
@@ -11,37 +10,26 @@ rustPlatform.buildRustPackage rec {
   pname = "sarif-fmt";
   version = "0.5.0";
 
-  src = fetchFromGitHub {
-    owner = "psastras";
-    repo = "sarif-rs";
-    rev = "sarif-fmt-v${version}";
-    hash = "sha256-RnoJfmkrqdhOioGkB7rTzHQ3kx9vIRfWDJN30/8JAvM=";
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-QiIAo9q8pcon/Os7ih8jJyDLvKPrLD70LkMAQfgwDNM=";
   };
 
-  cargoHash = "sha256-VonkXSeyp8Kxo5mE+eI5ialgqcCFvDALv/XXl2i8DZ0=";
-  cargoBuildFlags = [
-    "--package"
-    "sarif-fmt"
-  ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoHash = "sha256-RlINf/8P+OpZffvqbkKoafeolioDGABWS71kpGcX/cs=";
 
   # `test_clippy` (the only test we enable) is broken on Darwin
   # because `--enable-profiler` is not enabled in rustc on Darwin
   # error[E0463]: can't find crate for profiler_builtins
   doCheck = !stdenv.isDarwin;
 
-  nativeCheckInputs = [
-    # `test_clippy`
-    clippy
-  ];
-
   checkFlags = [
-    # this test uses nix so...no go
+    # these tests use nix so...no go
     "--skip=test_clang_tidy"
-    # ditto
     "--skip=test_hadolint"
-    # ditto
     "--skip=test_shellcheck"
+
+    # requires files not present in the crates.io tarball
+    "--skip=test_clipp"
   ];
 
   passthru = {

From 870b2353d28380be990ac2a4395c7010ed0f947b Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:36:11 -0400
Subject: [PATCH 42/72] sarif-fmt: add updateScript

---
 pkgs/by-name/sa/sarif-fmt/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix
index ae9082e546da..78e0ac9c058f 100644
--- a/pkgs/by-name/sa/sarif-fmt/package.nix
+++ b/pkgs/by-name/sa/sarif-fmt/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchCrate,
   rustPlatform,
+  nix-update-script,
   sarif-fmt,
   testers,
 }:
@@ -34,6 +35,7 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     tests.version = testers.testVersion { package = sarif-fmt; };
+    updateScript = nix-update-script { };
   };
 
   meta = {

From f3d6c633b452c02de29019a93f3c28dff6de2b4d Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Mon, 15 Jul 2024 14:37:28 -0400
Subject: [PATCH 43/72] sarif-fmt: testers.testVersion -> versionCheckHook

this results in less ugly recursion
---
 pkgs/by-name/sa/sarif-fmt/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sa/sarif-fmt/package.nix b/pkgs/by-name/sa/sarif-fmt/package.nix
index 78e0ac9c058f..aa61af8f1375 100644
--- a/pkgs/by-name/sa/sarif-fmt/package.nix
+++ b/pkgs/by-name/sa/sarif-fmt/package.nix
@@ -4,8 +4,7 @@
   fetchCrate,
   rustPlatform,
   nix-update-script,
-  sarif-fmt,
-  testers,
+  versionCheckHook,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sarif-fmt";
@@ -33,8 +32,10 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_clipp"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru = {
-    tests.version = testers.testVersion { package = sarif-fmt; };
     updateScript = nix-update-script { };
   };
 

From 5b0bddfae6b39cfe48b3a50ce8a629ca737616a7 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 15 Jul 2024 17:03:57 -0600
Subject: [PATCH 44/72] scrcpy: 2.4 -> 2.5

---
 pkgs/misc/scrcpy/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix
index 30adbf2c62b5..2f41aea56fad 100644
--- a/pkgs/misc/scrcpy/default.nix
+++ b/pkgs/misc/scrcpy/default.nix
@@ -16,12 +16,12 @@
 }:
 
 let
-  version = "2.4";
+  version = "2.5";
   prebuilt_server = fetchurl {
     name = "scrcpy-server";
     inherit version;
     url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
-    hash = "sha256-k8Jyt0OGBcBV4Sf3REBk7Xj6nKSfgRVnd/0gHnnOe6M=";
+    hash = "sha256-FIixEF1q/1NIc6Jr9hDNKuoG7oZ916TZxrssCROW6xU=";
   };
 in
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "Genymobile";
     repo = "scrcpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-x1feZgCR3ZUi40/YZSjDULYk4W9Pjo17cn8RqcOoeoE=";
+    hash = "sha256-VdZZ23tlWYvDgETfce7kYy/kdwDGBEBzB6UfplorAbE=";
   };
 
   #   display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.
@@ -63,17 +63,17 @@ stdenv.mkDerivation rec {
       --replace "/bin/bash" "${runtimeShell}"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Display and control Android devices over USB or TCP/IP";
     homepage = "https://github.com/Genymobile/scrcpy";
     changelog = "https://github.com/Genymobile/scrcpy/releases/tag/v${version}";
-    sourceProvenance = with sourceTypes; [
+    sourceProvenance = with lib.sourceTypes; [
       fromSource
       binaryBytecode # server
     ];
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ deltaevo ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ deltaevo ryand56 ];
     mainProgram = "scrcpy";
   };
 }

From 4d13a2f09ce0bc06b21bfa498abfa0daa46e96b9 Mon Sep 17 00:00:00 2001
From: Frank Doepper <woffs@woffs.de>
Date: Tue, 16 Jul 2024 09:13:12 +0200
Subject: [PATCH 45/72] tuxpaint: 0.9.31 -> 0.9.32

---
 pkgs/games/tuxpaint/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix
index f2332d6027fa..90c99ed60e27 100644
--- a/pkgs/games/tuxpaint/default.nix
+++ b/pkgs/games/tuxpaint/default.nix
@@ -25,17 +25,17 @@
 
 let
   stamps = fetchurl {
-    url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2023-07-20/tuxpaint-stamps-2023.07.20.tar.gz";
-    hash = "sha256-D7QgYXRRdZpN3Ni/4lXoXCtsJORT+T2hHaLUFpgDeEI=";
+    url = "mirror://sourceforge/project/tuxpaint/tuxpaint-stamps/2024-01-29/tuxpaint-stamps-2024.01.29.tar.gz";
+    hash = "sha256-GwJx9tqaX7I623tJQYO53iiaApZtYsTLQw2ptBIFlKk=";
   };
 in
 stdenv.mkDerivation rec {
-  version = "0.9.31";
+  version = "0.9.32";
   pname = "tuxpaint";
 
   src = fetchurl {
     url = "mirror://sourceforge/tuxpaint/${version}/tuxpaint-${version}.tar.gz";
-    hash = "sha256-GoXAT6XJrms//Syo+oaoTAyLRitQWfofwsRFtc+oV+4=";
+    hash = "sha256-CcziIkFIHcE2D8S8XU2h0xgV16JWO56fohemcrqXS/I=";
   };
 
   patches = [
@@ -98,7 +98,6 @@ stdenv.mkDerivation rec {
     tar xzf ${stamps}
     cd tuxpaint-stamps-*
     make install-all PREFIX=$out
-    rm -rf $out/share/tuxpaint/stamps/military
 
     # Requirements for tuxpaint-import
     wrapProgram $out/bin/tuxpaint-import \

From 09eb68f745b7a6641f6d04e8913c844723274ae8 Mon Sep 17 00:00:00 2001
From: "Ian M. Jones" <ian@ianmjones.com>
Date: Tue, 16 Jul 2024 08:40:08 +0100
Subject: [PATCH 46/72] snippetexpander: 1.0.2 -> 1.0.3

---
 pkgs/by-name/sn/snippetexpander/package.nix    | 2 +-
 pkgs/by-name/sn/snippetexpanderd/package.nix   | 6 +++---
 pkgs/by-name/sn/snippetexpandergui/package.nix | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sn/snippetexpander/package.nix b/pkgs/by-name/sn/snippetexpander/package.nix
index 334864bb8e57..31c1a59f84a0 100644
--- a/pkgs/by-name/sn/snippetexpander/package.nix
+++ b/pkgs/by-name/sn/snippetexpander/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
 
   pname = "snippetexpander";
 
-  vendorHash = "sha256-W9NkENdZRzqSAONI9QS2EI5aERK+AaPqwYwITKLwXQE=";
+  vendorHash = "sha256-2nLO/b6XQC88VXE+SewhgKpkRtIHsva+fDudgKpvZiY=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/sn/snippetexpanderd/package.nix b/pkgs/by-name/sn/snippetexpanderd/package.nix
index 7e4099b8a99a..fbaa7541e8fe 100644
--- a/pkgs/by-name/sn/snippetexpanderd/package.nix
+++ b/pkgs/by-name/sn/snippetexpanderd/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "snippetexpanderd";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromSourcehut {
     owner = "~ianmjones";
     repo = "snippetexpander";
     rev = "v${version}";
-    hash = "sha256-iEoBri+NuFfLkARUBA+D/Fe9xk6PPV62N/YRqPv9C/A=";
+    hash = "sha256-NIMuACrq8RodtjeBbBY42VJ8xqj7fZvdQ2w/5QsjjJI=";
   };
 
-  vendorHash = "sha256-W9NkENdZRzqSAONI9QS2EI5aERK+AaPqwYwITKLwXQE=";
+  vendorHash = "sha256-2nLO/b6XQC88VXE+SewhgKpkRtIHsva+fDudgKpvZiY=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix
index ef58bc920542..7a7606e3d36b 100644
--- a/pkgs/by-name/sn/snippetexpandergui/package.nix
+++ b/pkgs/by-name/sn/snippetexpandergui/package.nix
@@ -17,7 +17,7 @@ buildGoModule rec {
 
   pname = "snippetexpandergui";
 
-  vendorHash = "sha256-W9NkENdZRzqSAONI9QS2EI5aERK+AaPqwYwITKLwXQE=";
+  vendorHash = "sha256-2nLO/b6XQC88VXE+SewhgKpkRtIHsva+fDudgKpvZiY=";
 
   proxyVendor = true;
 

From 4329250e0ff710e941d7ae44667389cdd9c9cd4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Tue, 16 Jul 2024 12:51:55 +0200
Subject: [PATCH 47/72] wamr: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/development/interpreters/wamr/default.nix b/pkgs/development/interpreters/wamr/default.nix
index 06fc84eeae7e..e5b9b904a061 100644
--- a/pkgs/development/interpreters/wamr/default.nix
+++ b/pkgs/development/interpreters/wamr/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wamr";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasm-micro-runtime";
     rev = "WAMR-${finalAttrs.version}";
-    hash = "sha256-2jZnvfW/f928DxVwd+z/BVPNPWfbyV8Rjek23NQhFz8=";
+    hash = "sha256-/DQ+dZ3VoijL7FdgRgPg3H7whhXhjIzjhCaqpjPYw4k=";
   };
 
   nativeBuildInputs = [ cmake ];

From 5a2806141ae8aa852a04fb672128dbc0832fb62b Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Tue, 16 Jul 2024 19:25:32 +0200
Subject: [PATCH 48/72] jasp-desktop: format with nixfmt

---
 pkgs/by-name/ja/jasp-desktop/modules.nix | 559 ++++++++++++++++++++---
 pkgs/by-name/ja/jasp-desktop/package.nix |  80 ++--
 2 files changed, 552 insertions(+), 87 deletions(-)

diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix
index 379b06234c40..528c0fe39816 100644
--- a/pkgs/by-name/ja/jasp-desktop/modules.nix
+++ b/pkgs/by-name/ja/jasp-desktop/modules.nix
@@ -1,8 +1,9 @@
-{ R
-, rPackages
-, fetchFromGitHub
-, jasp-src
-, jasp-version
+{
+  R,
+  rPackages,
+  fetchFromGitHub,
+  jasp-src,
+  jasp-version,
 }:
 
 with rPackages;
@@ -21,7 +22,18 @@ let
     src = jasp-src;
     sourceRoot = "${jasp-src.name}/Engine/jaspGraphs";
 
-    propagatedBuildInputs = [ ggplot2 gridExtra gtable lifecycle jsonlite R6 RColorBrewer rlang scales viridisLite ];
+    propagatedBuildInputs = [
+      ggplot2
+      gridExtra
+      gtable
+      lifecycle
+      jsonlite
+      R6
+      RColorBrewer
+      rlang
+      scales
+      viridisLite
+    ];
   };
 
   jaspBase = buildRPackage {
@@ -41,7 +53,31 @@ let
       cp -r --no-preserve=all ${jaspColumnEncoder-src} inst/include/jaspColumnEncoder
     '';
 
-    propagatedBuildInputs = [ cli codetools ggplot2 gridExtra gridGraphics jaspGraphs jsonlite lifecycle modules officer pkgbuild plyr qgraph ragg R6 Rcpp renv remotes rjson rvg svglite systemfonts withr ];
+    propagatedBuildInputs = [
+      cli
+      codetools
+      ggplot2
+      gridExtra
+      gridGraphics
+      jaspGraphs
+      jsonlite
+      lifecycle
+      modules
+      officer
+      pkgbuild
+      plyr
+      qgraph
+      ragg
+      R6
+      Rcpp
+      renv
+      remotes
+      rjson
+      rvg
+      svglite
+      systemfonts
+      withr
+    ];
   };
 
   stanova = buildRPackage {
@@ -52,7 +88,13 @@ let
       rev = "988ad8e07cda1674b881570a85502be7795fbd4e";
       hash = "sha256-tAeHqTHao2KVRNFBDWmuF++H31aNN6O1ss1Io500QBY=";
     };
-    propagatedBuildInputs = [ emmeans lme4 coda rstan MASS ];
+    propagatedBuildInputs = [
+      emmeans
+      lme4
+      coda
+      rstan
+      MASS
+    ];
   };
 
   bstats = buildRPackage {
@@ -63,7 +105,11 @@ let
       rev = "42d34c18df08d233825bae34fdc0dfa0cd70ce8c";
       hash = "sha256-N2KmbTPbyvzsZTWBRE2x7bteccnzokUWDOB4mOWUdJk=";
     };
-    propagatedBuildInputs = [ hypergeo purrr SuppDists ];
+    propagatedBuildInputs = [
+      hypergeo
+      purrr
+      SuppDists
+    ];
   };
 
   flexplot = buildRPackage {
@@ -74,7 +120,25 @@ let
       rev = "4223ad5fb56028018b964d6f9f5aa5bac8710821";
       hash = "sha256-L+Ed2bIWjq3ZIAGookp8dAjDSeldEbcwynwFVVZ9IcU=";
     };
-    propagatedBuildInputs = [ cowplot MASS tibble withr dplyr magrittr forcats purrr plyr R6 ggplot2 patchwork ggsci lme4 party mgcv rlang ];
+    propagatedBuildInputs = [
+      cowplot
+      MASS
+      tibble
+      withr
+      dplyr
+      magrittr
+      forcats
+      purrr
+      plyr
+      R6
+      ggplot2
+      patchwork
+      ggsci
+      lme4
+      party
+      mgcv
+      rlang
+    ];
   };
 
   # conting has been removed from CRAN
@@ -86,52 +150,443 @@ let
       rev = "03a4eb9a687e015d602022a01d4e638324c110c8";
       hash = "sha256-Sp09YZz1WGyefn31Zy1qGufoKjtuEEZHO+wJvoLArf0=";
     };
-    propagatedBuildInputs = [ mvtnorm gtools tseries coda ];
+    propagatedBuildInputs = [
+      mvtnorm
+      gtools
+      tseries
+      coda
+    ];
   };
 
-  buildJaspModule = name: deps: buildRPackage {
-    name = "${name}-${jasp-version}";
-    version = jasp-version;
-    src = jasp-src;
-    sourceRoot = "${jasp-src.name}/Modules/${name}";
-    propagatedBuildInputs = deps;
-  };
+  buildJaspModule =
+    name: deps:
+    buildRPackage {
+      name = "${name}-${jasp-version}";
+      version = jasp-version;
+      src = jasp-src;
+      sourceRoot = "${jasp-src.name}/Modules/${name}";
+      propagatedBuildInputs = deps;
+    };
 in
 {
-  engine = { inherit jaspBase jaspGraphs; };
+  engine = {
+    inherit jaspBase jaspGraphs;
+  };
+
   modules = rec {
-    jaspAcceptanceSampling = buildJaspModule "jaspAcceptanceSampling" [ abtest BayesFactor conting' ggplot2 jaspBase jaspGraphs plyr stringr vcd vcdExtra AcceptanceSampling ];
-    jaspAnova = buildJaspModule "jaspAnova" [ afex BayesFactor boot car colorspace emmeans ggplot2 jaspBase jaspDescriptives jaspGraphs jaspTTests KernSmooth matrixStats multcomp onewaytests plyr stringi stringr restriktor ];
-    jaspAudit = buildJaspModule "jaspAudit" [ bstats extraDistr ggplot2 ggrepel jaspBase jaspGraphs jfa ];
-    jaspBain = buildJaspModule "jaspBain" [ bain lavaan ggplot2 semPlot stringr jaspBase jaspGraphs jaspSem ];
-    jaspBsts = buildJaspModule "jaspBsts" [ Boom bsts ggplot2 jaspBase jaspGraphs matrixStats reshape2 ];
-    jaspCircular = buildJaspModule "jaspCircular" [ jaspBase jaspGraphs circular ggplot2 ];
-    jaspCochrane = buildJaspModule "jaspCochrane" [ jaspBase jaspGraphs jaspDescriptives jaspMetaAnalysis ];
-    jaspDescriptives = buildJaspModule "jaspDescriptives" [ ggplot2 ggrepel jaspBase jaspGraphs ];
-    jaspDistributions = buildJaspModule "jaspDistributions" [ car fitdistrplus ggplot2 goftest gnorm jaspBase jaspGraphs MASS sgt sn ];
-    jaspEquivalenceTTests = buildJaspModule "jaspEquivalenceTTests" [ BayesFactor ggplot2 jaspBase jaspGraphs metaBMA TOSTER jaspTTests ];
-    jaspFactor = buildJaspModule "jaspFactor" [ ggplot2 jaspBase jaspGraphs jaspSem lavaan psych qgraph reshape2 semPlot GPArotation Rcsdp semTools ];
-    jaspFrequencies = buildJaspModule "jaspFrequencies" [ abtest BayesFactor conting' multibridge ggplot2 jaspBase jaspGraphs plyr stringr vcd vcdExtra ];
-    jaspJags = buildJaspModule "jaspJags" [ coda ggplot2 ggtext hexbin jaspBase jaspGraphs rjags scales stringr ];
-    jaspLearnBayes = buildJaspModule "jaspLearnBayes" [ extraDistr ggplot2 HDInterval jaspBase jaspGraphs MASS MCMCpack MGLM scales ggalluvial ragg runjags ggdist png posterior ];
-    jaspLearnStats = buildJaspModule "jaspLearnStats" [ extraDistr ggplot2 jaspBase jaspGraphs jaspDistributions jaspDescriptives jaspTTests ggforce tidyr igraph ];
-    jaspMachineLearning = buildJaspModule "jaspMachineLearning" [ kknn AUC cluster colorspace DALEX dbscan e1071 fpc gbm Gmedian ggparty ggdendro ggnetwork ggplot2 ggrepel ggridges glmnet jaspBase jaspGraphs MASS mvnormalTest neuralnet network partykit plyr randomForest rpart ROCR Rtsne signal ];
-    jaspMetaAnalysis = buildJaspModule "jaspMetaAnalysis" [ dplyr ggplot2 jaspBase jaspGraphs MASS metaBMA metafor psych purrr rstan stringr tibble tidyr weightr BayesTools RoBMA metamisc ggmcmc pema ];
-    jaspMixedModels = buildJaspModule "jaspMixedModels" [ afex emmeans ggplot2 ggpol jaspBase jaspGraphs lme4 loo mgcv rstan rstanarm stanova withr ];
-    jaspNetwork = buildJaspModule "jaspNetwork" [ bootnet BDgraph corpcor dplyr foreach ggplot2 gtools HDInterval huge IsingSampler jaspBase jaspGraphs mvtnorm qgraph reshape2 snow stringr ];
-    jaspPower = buildJaspModule "jaspPower" [ pwr jaspBase jaspGraphs ];
-    jaspPredictiveAnalytics = buildJaspModule "jaspPredictiveAnalytics" [ jaspBase jaspGraphs bsts bssm precrec reshape2 Boom lubridate prophet BART EBMAforecast imputeTS ];
-    jaspProcess = buildJaspModule "jaspProcess" [ dagitty ggplot2 ggraph jaspBase jaspGraphs ];
-    jaspProphet = buildJaspModule "jaspProphet" [ rstan ggplot2 jaspBase jaspGraphs prophet scales ];
-    jaspQualityControl = buildJaspModule "jaspQualityControl" [ car cowplot daewr desirability DoE_base EnvStats FAdist fitdistrplus FrF2 ggplot2 ggrepel goftest ggpp irr jaspBase jaspDescriptives jaspGraphs mle_tools psych qcc rsm Rspc tidyr tibble vipor weibullness ];
-    jaspRegression = buildJaspModule "jaspRegression" [ BAS boot bstats combinat emmeans ggplot2 ggrepel hmeasure jaspAnova jaspBase jaspDescriptives jaspGraphs jaspTTests lmtest logistf MASS matrixStats mdscore ppcor purrr Rcpp statmod VGAM ];
-    jaspReliability = buildJaspModule "jaspReliability" [ Bayesrel coda ggplot2 ggridges irr jaspBase jaspGraphs LaplacesDemon lme4 MASS psych ];
-    jaspRobustTTests = buildJaspModule "jaspRobustTTests" [ RoBTT ggplot2 jaspBase jaspGraphs ];
-    jaspSem = buildJaspModule "jaspSem" [ forcats ggplot2 jaspBase jaspGraphs lavaan cSEM reshape2 semPlot semTools stringr tibble tidyr ];
-    jaspSummaryStatistics = buildJaspModule "jaspSummaryStatistics" [ BayesFactor bstats jaspBase jaspFrequencies jaspGraphs jaspRegression jaspTTests jaspAnova jaspDescriptives SuppDists bayesplay ];
-    jaspSurvival = buildJaspModule "jaspSurvival" [ survival survminer jaspBase jaspGraphs ];
-    jaspTTests = buildJaspModule "jaspTTests" [ BayesFactor car ggplot2 jaspBase jaspGraphs logspline plotrix plyr ];
-    jaspTimeSeries = buildJaspModule "jaspTimeSeries" [ jaspBase jaspGraphs forecast ];
-    jaspVisualModeling = buildJaspModule "jaspVisualModeling" [ flexplot jaspBase jaspGraphs ];
+    jaspAcceptanceSampling = buildJaspModule "jaspAcceptanceSampling" [
+      abtest
+      BayesFactor
+      conting'
+      ggplot2
+      jaspBase
+      jaspGraphs
+      plyr
+      stringr
+      vcd
+      vcdExtra
+      AcceptanceSampling
+    ];
+    jaspAnova = buildJaspModule "jaspAnova" [
+      afex
+      BayesFactor
+      boot
+      car
+      colorspace
+      emmeans
+      ggplot2
+      jaspBase
+      jaspDescriptives
+      jaspGraphs
+      jaspTTests
+      KernSmooth
+      matrixStats
+      multcomp
+      onewaytests
+      plyr
+      stringi
+      stringr
+      restriktor
+    ];
+    jaspAudit = buildJaspModule "jaspAudit" [
+      bstats
+      extraDistr
+      ggplot2
+      ggrepel
+      jaspBase
+      jaspGraphs
+      jfa
+    ];
+    jaspBain = buildJaspModule "jaspBain" [
+      bain
+      lavaan
+      ggplot2
+      semPlot
+      stringr
+      jaspBase
+      jaspGraphs
+      jaspSem
+    ];
+    jaspBsts = buildJaspModule "jaspBsts" [
+      Boom
+      bsts
+      ggplot2
+      jaspBase
+      jaspGraphs
+      matrixStats
+      reshape2
+    ];
+    jaspCircular = buildJaspModule "jaspCircular" [
+      jaspBase
+      jaspGraphs
+      circular
+      ggplot2
+    ];
+    jaspCochrane = buildJaspModule "jaspCochrane" [
+      jaspBase
+      jaspGraphs
+      jaspDescriptives
+      jaspMetaAnalysis
+    ];
+    jaspDescriptives = buildJaspModule "jaspDescriptives" [
+      ggplot2
+      ggrepel
+      jaspBase
+      jaspGraphs
+    ];
+    jaspDistributions = buildJaspModule "jaspDistributions" [
+      car
+      fitdistrplus
+      ggplot2
+      goftest
+      gnorm
+      jaspBase
+      jaspGraphs
+      MASS
+      sgt
+      sn
+    ];
+    jaspEquivalenceTTests = buildJaspModule "jaspEquivalenceTTests" [
+      BayesFactor
+      ggplot2
+      jaspBase
+      jaspGraphs
+      metaBMA
+      TOSTER
+      jaspTTests
+    ];
+    jaspFactor = buildJaspModule "jaspFactor" [
+      ggplot2
+      jaspBase
+      jaspGraphs
+      jaspSem
+      lavaan
+      psych
+      qgraph
+      reshape2
+      semPlot
+      GPArotation
+      Rcsdp
+      semTools
+    ];
+    jaspFrequencies = buildJaspModule "jaspFrequencies" [
+      abtest
+      BayesFactor
+      conting'
+      multibridge
+      ggplot2
+      jaspBase
+      jaspGraphs
+      plyr
+      stringr
+      vcd
+      vcdExtra
+    ];
+    jaspJags = buildJaspModule "jaspJags" [
+      coda
+      ggplot2
+      ggtext
+      hexbin
+      jaspBase
+      jaspGraphs
+      rjags
+      scales
+      stringr
+    ];
+    jaspLearnBayes = buildJaspModule "jaspLearnBayes" [
+      extraDistr
+      ggplot2
+      HDInterval
+      jaspBase
+      jaspGraphs
+      MASS
+      MCMCpack
+      MGLM
+      scales
+      ggalluvial
+      ragg
+      runjags
+      ggdist
+      png
+      posterior
+    ];
+    jaspLearnStats = buildJaspModule "jaspLearnStats" [
+      extraDistr
+      ggplot2
+      jaspBase
+      jaspGraphs
+      jaspDistributions
+      jaspDescriptives
+      jaspTTests
+      ggforce
+      tidyr
+      igraph
+    ];
+    jaspMachineLearning = buildJaspModule "jaspMachineLearning" [
+      kknn
+      AUC
+      cluster
+      colorspace
+      DALEX
+      dbscan
+      e1071
+      fpc
+      gbm
+      Gmedian
+      ggparty
+      ggdendro
+      ggnetwork
+      ggplot2
+      ggrepel
+      ggridges
+      glmnet
+      jaspBase
+      jaspGraphs
+      MASS
+      mvnormalTest
+      neuralnet
+      network
+      partykit
+      plyr
+      randomForest
+      rpart
+      ROCR
+      Rtsne
+      signal
+    ];
+    jaspMetaAnalysis = buildJaspModule "jaspMetaAnalysis" [
+      dplyr
+      ggplot2
+      jaspBase
+      jaspGraphs
+      MASS
+      metaBMA
+      metafor
+      psych
+      purrr
+      rstan
+      stringr
+      tibble
+      tidyr
+      weightr
+      BayesTools
+      RoBMA
+      metamisc
+      ggmcmc
+      pema
+    ];
+    jaspMixedModels = buildJaspModule "jaspMixedModels" [
+      afex
+      emmeans
+      ggplot2
+      ggpol
+      jaspBase
+      jaspGraphs
+      lme4
+      loo
+      mgcv
+      rstan
+      rstanarm
+      stanova
+      withr
+    ];
+    jaspNetwork = buildJaspModule "jaspNetwork" [
+      bootnet
+      BDgraph
+      corpcor
+      dplyr
+      foreach
+      ggplot2
+      gtools
+      HDInterval
+      huge
+      IsingSampler
+      jaspBase
+      jaspGraphs
+      mvtnorm
+      qgraph
+      reshape2
+      snow
+      stringr
+    ];
+    jaspPower = buildJaspModule "jaspPower" [
+      pwr
+      jaspBase
+      jaspGraphs
+    ];
+    jaspPredictiveAnalytics = buildJaspModule "jaspPredictiveAnalytics" [
+      jaspBase
+      jaspGraphs
+      bsts
+      bssm
+      precrec
+      reshape2
+      Boom
+      lubridate
+      prophet
+      BART
+      EBMAforecast
+      imputeTS
+    ];
+    jaspProcess = buildJaspModule "jaspProcess" [
+      dagitty
+      ggplot2
+      ggraph
+      jaspBase
+      jaspGraphs
+    ];
+    jaspProphet = buildJaspModule "jaspProphet" [
+      rstan
+      ggplot2
+      jaspBase
+      jaspGraphs
+      prophet
+      scales
+    ];
+    jaspQualityControl = buildJaspModule "jaspQualityControl" [
+      car
+      cowplot
+      daewr
+      desirability
+      DoE_base
+      EnvStats
+      FAdist
+      fitdistrplus
+      FrF2
+      ggplot2
+      ggrepel
+      goftest
+      ggpp
+      irr
+      jaspBase
+      jaspDescriptives
+      jaspGraphs
+      mle_tools
+      psych
+      qcc
+      rsm
+      Rspc
+      tidyr
+      tibble
+      vipor
+      weibullness
+    ];
+    jaspRegression = buildJaspModule "jaspRegression" [
+      BAS
+      boot
+      bstats
+      combinat
+      emmeans
+      ggplot2
+      ggrepel
+      hmeasure
+      jaspAnova
+      jaspBase
+      jaspDescriptives
+      jaspGraphs
+      jaspTTests
+      lmtest
+      logistf
+      MASS
+      matrixStats
+      mdscore
+      ppcor
+      purrr
+      Rcpp
+      statmod
+      VGAM
+    ];
+    jaspReliability = buildJaspModule "jaspReliability" [
+      Bayesrel
+      coda
+      ggplot2
+      ggridges
+      irr
+      jaspBase
+      jaspGraphs
+      LaplacesDemon
+      lme4
+      MASS
+      psych
+    ];
+    jaspRobustTTests = buildJaspModule "jaspRobustTTests" [
+      RoBTT
+      ggplot2
+      jaspBase
+      jaspGraphs
+    ];
+    jaspSem = buildJaspModule "jaspSem" [
+      forcats
+      ggplot2
+      jaspBase
+      jaspGraphs
+      lavaan
+      cSEM
+      reshape2
+      semPlot
+      semTools
+      stringr
+      tibble
+      tidyr
+    ];
+    jaspSummaryStatistics = buildJaspModule "jaspSummaryStatistics" [
+      BayesFactor
+      bstats
+      jaspBase
+      jaspFrequencies
+      jaspGraphs
+      jaspRegression
+      jaspTTests
+      jaspAnova
+      jaspDescriptives
+      SuppDists
+      bayesplay
+    ];
+    jaspSurvival = buildJaspModule "jaspSurvival" [
+      survival
+      survminer
+      jaspBase
+      jaspGraphs
+    ];
+    jaspTTests = buildJaspModule "jaspTTests" [
+      BayesFactor
+      car
+      ggplot2
+      jaspBase
+      jaspGraphs
+      logspline
+      plotrix
+      plyr
+    ];
+    jaspTimeSeries = buildJaspModule "jaspTimeSeries" [
+      jaspBase
+      jaspGraphs
+      forecast
+    ];
+    jaspVisualModeling = buildJaspModule "jaspVisualModeling" [
+      flexplot
+      jaspBase
+      jaspGraphs
+    ];
   };
 }
diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix
index 1b33536dc7d4..1b68239439d1 100644
--- a/pkgs/by-name/ja/jasp-desktop/package.nix
+++ b/pkgs/by-name/ja/jasp-desktop/package.nix
@@ -1,19 +1,20 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, callPackage
-, buildEnv
-, linkFarm
-, substituteAll
-, R
-, rPackages
-, cmake
-, ninja
-, pkg-config
-, boost
-, libarchive
-, readstat
-, qt6
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  callPackage,
+  buildEnv,
+  linkFarm,
+  substituteAll,
+  R,
+  rPackages,
+  cmake,
+  ninja,
+  pkg-config,
+  boost,
+  libarchive,
+  readstat,
+  qt6,
 }:
 
 let
@@ -27,10 +28,14 @@ let
     fetchSubmodules = true;
   };
 
-  inherit (callPackage ./modules.nix {
-    jasp-src = src;
-    jasp-version = version;
-  }) engine modules;
+  inherit
+    (callPackage ./modules.nix {
+      jasp-src = src;
+      jasp-version = version;
+    })
+    engine
+    modules
+    ;
 
   # Merges ${R}/lib/R with all used R packages (even propagated ones)
   customREnv = buildEnv {
@@ -42,8 +47,12 @@ let
     ] ++ lib.attrValues modules;
   };
 
-  modulesDir = linkFarm "jasp-${version}-modules"
-    (lib.mapAttrsToList (name: drv: { name = name; path = "${drv}/library"; }) modules);
+  modulesDir = linkFarm "jasp-${version}-modules" (
+    lib.mapAttrsToList (name: drv: {
+      name = name;
+      path = "${drv}/library";
+    }) modules
+  );
 in
 stdenv.mkDerivation {
   pname = "jasp-desktop";
@@ -76,18 +85,20 @@ stdenv.mkDerivation {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    customREnv
-    boost
-    libarchive
-    readstat
-  ] ++ (with qt6; [
-    qtbase
-    qtdeclarative
-    qtwebengine
-    qtsvg
-    qt5compat
-  ]);
+  buildInputs =
+    [
+      customREnv
+      boost
+      libarchive
+      readstat
+    ]
+    ++ (with qt6; [
+      qtbase
+      qtdeclarative
+      qtwebengine
+      qtsvg
+      qt5compat
+    ]);
 
   env.NIX_LDFLAGS = "-L${rPackages.RInside}/library/RInside/lib";
 
@@ -121,4 +132,3 @@ stdenv.mkDerivation {
     platforms = lib.platforms.linux;
   };
 }
-

From 5122379565d7f5c759f049244dda4ce4a5210407 Mon Sep 17 00:00:00 2001
From: savedram <michael.savedra@ovo.com>
Date: Tue, 16 Jul 2024 18:40:33 +0100
Subject: [PATCH 49/72] clipse: 1.0.7 -> 1.0.9

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

diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix
index 6bf93f1d9400..074587dd7221 100644
--- a/pkgs/by-name/cl/clipse/package.nix
+++ b/pkgs/by-name/cl/clipse/package.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "clipse";
-  version = "1.0.7";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "savedra1";
     repo = "clipse";
     rev = "v${version}";
-    hash = "sha256-G26xPABF2Cdxk1N71EaMjKzju0jl5tDJ1WrISjebZVM=";
+    hash = "sha256-Kpe/LiAreZXRqh6BHvUIn0GcHloKo3A0WOdlRF2ygdc=";
   };
 
-  vendorHash = "sha256-QEBRlwNS8K44chB3fMOJZxYnIaWMnuDySIhKfF7XtxM=";
+  vendorHash = "sha256-Hdr9NRqHJxpfrV2G1KuHGg3T+cPLKhZXEW02f1ptgsw=";
 
   meta = {
     description = "Useful clipboard manager TUI for Unix";

From b3de6e585b4181da2e7bc9032fa50d3fe56370be Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Tue, 16 Jul 2024 20:36:21 +0200
Subject: [PATCH 50/72] jasp-desktop: 0.18.3 -> 0.19.0

---
 pkgs/by-name/ja/jasp-desktop/modules.nix | 23 +++++++++--
 pkgs/by-name/ja/jasp-desktop/package.nix | 50 ++++++++++--------------
 2 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix
index 528c0fe39816..46dd282c6f38 100644
--- a/pkgs/by-name/ja/jasp-desktop/modules.nix
+++ b/pkgs/by-name/ja/jasp-desktop/modules.nix
@@ -1,5 +1,4 @@
 {
-  R,
   rPackages,
   fetchFromGitHub,
   jasp-src,
@@ -117,8 +116,8 @@ let
     src = fetchFromGitHub {
       owner = "dustinfife";
       repo = "flexplot";
-      rev = "4223ad5fb56028018b964d6f9f5aa5bac8710821";
-      hash = "sha256-L+Ed2bIWjq3ZIAGookp8dAjDSeldEbcwynwFVVZ9IcU=";
+      rev = "303a03968f677e71c99a5e22f6352c0811b7b2fb";
+      hash = "sha256-iT5CdtNk0Oi8gga76L6YtyWGACAwpN8A/yTBy7JJERc=";
     };
     propagatedBuildInputs = [
       cowplot
@@ -194,6 +193,7 @@ in
       car
       colorspace
       emmeans
+      effectsize
       ggplot2
       jaspBase
       jaspDescriptives
@@ -202,6 +202,8 @@ in
       KernSmooth
       matrixStats
       multcomp
+      multcompView
+      mvShapiroTest
       onewaytests
       plyr
       stringi
@@ -253,6 +255,13 @@ in
       ggrepel
       jaspBase
       jaspGraphs
+      jaspTTests
+      forecast
+      flexplot
+      ggrain
+      ggpp
+      ggtext
+      dplyr
     ];
     jaspDistributions = buildJaspModule "jaspDistributions" [
       car
@@ -292,6 +301,7 @@ in
     jaspFrequencies = buildJaspModule "jaspFrequencies" [
       abtest
       BayesFactor
+      bridgesampling
       conting'
       multibridge
       ggplot2
@@ -310,6 +320,7 @@ in
       jaspBase
       jaspGraphs
       rjags
+      runjags
       scales
       stringr
     ];
@@ -325,6 +336,7 @@ in
       scales
       ggalluvial
       ragg
+      rjags
       runjags
       ggdist
       png
@@ -449,11 +461,14 @@ in
       imputeTS
     ];
     jaspProcess = buildJaspModule "jaspProcess" [
+      blavaan
       dagitty
       ggplot2
       ggraph
       jaspBase
       jaspGraphs
+      jaspJags
+      runjags
     ];
     jaspProphet = buildJaspModule "jaspProphet" [
       rstan
@@ -581,12 +596,14 @@ in
     jaspTimeSeries = buildJaspModule "jaspTimeSeries" [
       jaspBase
       jaspGraphs
+      jaspDescriptives
       forecast
     ];
     jaspVisualModeling = buildJaspModule "jaspVisualModeling" [
       flexplot
       jaspBase
       jaspGraphs
+      jaspDescriptives
     ];
   };
 }
diff --git a/pkgs/by-name/ja/jasp-desktop/package.nix b/pkgs/by-name/ja/jasp-desktop/package.nix
index 1b68239439d1..a444b361127f 100644
--- a/pkgs/by-name/ja/jasp-desktop/package.nix
+++ b/pkgs/by-name/ja/jasp-desktop/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  callPackage,
   buildEnv,
   linkFarm,
   substituteAll,
@@ -18,24 +17,23 @@
 }:
 
 let
-  version = "0.18.3";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "jasp-stats";
     repo = "jasp-desktop";
     rev = "v${version}";
-    hash = "sha256-eKBxCIamNhUig+0vUEqXYbPjiaOsZk6QnOw8cnpjKFY=";
+    hash = "sha256-G84bmR+40W9RV+OIXYuMmwdEFE0iPMp/wEOcRHYUoj8=";
     fetchSubmodules = true;
   };
 
-  inherit
-    (callPackage ./modules.nix {
-      jasp-src = src;
-      jasp-version = version;
-    })
-    engine
-    modules
-    ;
+  moduleSet = import ./modules.nix {
+    inherit fetchFromGitHub rPackages;
+    jasp-src = src;
+    jasp-version = version;
+  };
+
+  inherit (moduleSet) engine modules;
 
   # Merges ${R}/lib/R with all used R packages (even propagated ones)
   customREnv = buildEnv {
@@ -75,9 +73,6 @@ stdenv.mkDerivation {
     "-DCUSTOM_R_PATH=${customREnv}"
   ];
 
-  # necessary for R 4.4.0
-  hardeningDisable = [ "format" ];
-
   nativeBuildInputs = [
     cmake
     ninja
@@ -85,20 +80,17 @@ stdenv.mkDerivation {
     qt6.wrapQtAppsHook
   ];
 
-  buildInputs =
-    [
-      customREnv
-      boost
-      libarchive
-      readstat
-    ]
-    ++ (with qt6; [
-      qtbase
-      qtdeclarative
-      qtwebengine
-      qtsvg
-      qt5compat
-    ]);
+  buildInputs = [
+    customREnv
+    boost
+    libarchive
+    readstat
+    qt6.qtbase
+    qt6.qtdeclarative
+    qt6.qtwebengine
+    qt6.qtsvg
+    qt6.qt5compat
+  ];
 
   env.NIX_LDFLAGS = "-L${rPackages.RInside}/library/RInside/lib";
 
@@ -109,7 +101,7 @@ stdenv.mkDerivation {
     # Remove flatpak proxy script
     rm $out/bin/org.jaspstats.JASP
     substituteInPlace $out/share/applications/org.jaspstats.JASP.desktop \
-        --replace "Exec=org.jaspstats.JASP" "Exec=JASP"
+        --replace-fail "Exec=org.jaspstats.JASP" "Exec=JASP"
 
     # symlink modules from the store
     ln -s ${modulesDir} $out/Modules

From 8f0ca4cdf42739df6751fd54f9f4db9795594941 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <matteo@codecraft.it>
Date: Mon, 15 Jul 2024 23:56:27 +0100
Subject: [PATCH 51/72] nzbhydra2: 7.2.3 -> 7.3.0

---
 pkgs/servers/nzbhydra2/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/nzbhydra2/default.nix b/pkgs/servers/nzbhydra2/default.nix
index ab51aebed1be..080a147931ed 100644
--- a/pkgs/servers/nzbhydra2/default.nix
+++ b/pkgs/servers/nzbhydra2/default.nix
@@ -9,11 +9,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nzbhydra2";
-  version = "7.2.3";
+  version = "7.3.0";
 
   src = fetchzip {
     url = "https://github.com/theotherp/${pname}/releases/download/v${version}/${pname}-${version}-generic.zip";
-    hash = "sha256-gGTEOqqnVSgsKvEjd6b5aG8EM2M8u0FdpIebYNQFP50=";
+    hash = "sha256-ybI6nCw8yY2XceXiMkION7/p7gl58lrAPpUq6EpManU=";
     stripRoot = false;
   };
 
@@ -37,12 +37,12 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Usenet meta search";
     homepage = "https://github.com/theotherp/nzbhydra2";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ matteopacini ];
-    platforms = with platforms; linux;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ matteopacini ];
+    platforms = lib.platforms.linux;
     mainProgram = "nzbhydra2";
   };
 }

From 2354d26c6040d8f801ed36144f7467a1efd50173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= <shesselm@redhat.com>
Date: Wed, 17 Jul 2024 00:52:31 +0200
Subject: [PATCH 52/72] rhoas: fix shell completion install

---
 pkgs/tools/admin/rhoas/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/admin/rhoas/default.nix b/pkgs/tools/admin/rhoas/default.nix
index 7400558a5887..aedfd490a661 100644
--- a/pkgs/tools/admin/rhoas/default.nix
+++ b/pkgs/tools/admin/rhoas/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, rhoas }:
+{ lib, buildGoModule, fetchFromGitHub, stdenv, installShellFiles, testers, rhoas }:
 
 buildGoModule rec {
   pname = "rhoas";
@@ -24,11 +24,11 @@ buildGoModule rec {
   # Networking tests fail.
   doCheck = false;
 
-  postInstall = ''
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd rhoas \
-      --bash <($out/bin/rhoas completion bash) \
-      --fish <($out/bin/rhoas completion fish) \
-      --zsh <($out/bin/rhoas completion zsh)
+      --bash <(HOME=$TMP $out/bin/rhoas completion bash) \
+      --fish <(HOME=$TMP $out/bin/rhoas completion fish) \
+      --zsh <(HOME=$TMP $out/bin/rhoas completion zsh)
   '';
 
   passthru.tests.version = testers.testVersion {

From 8c69ea2cb6d5bd0820304c3a4e060c5003f5cdef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Wed, 17 Jul 2024 12:21:05 +0200
Subject: [PATCH 53/72] wasm-tools: 1.213.0 -> 1.214.0

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

diff --git a/pkgs/tools/misc/wasm-tools/default.nix b/pkgs/tools/misc/wasm-tools/default.nix
index e0fe673e59f5..f0ec6169ca57 100644
--- a/pkgs/tools/misc/wasm-tools/default.nix
+++ b/pkgs/tools/misc/wasm-tools/default.nix
@@ -5,19 +5,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasm-tools";
-  version = "1.213.0";
+  version = "1.214.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-EuDy1lLh2GhRFkmkfyIdxXRwiCXVfSeQAFTp6peKNh0=";
+    hash = "sha256-YVb1SXwksmhvK6FqsKoT9SB6CglcW6A2/Zt6GXvioF4=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
-  cargoHash = "sha256-g5djZoPYJXJ+AN0BKl6i8wmkGY/dAuie/twkaNcSZ+Q=";
+  cargoHash = "sha256-Mdjsng49/LdNzxZMz5py0thHQ8e786uKuI63rPor3g0=";
   cargoBuildFlags = [ "--package" "wasm-tools" ];
   cargoTestFlags = [ "--all" ];
 

From 84092365a1b08743e7845c35bc406ac47f88a152 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 18 Jul 2024 01:02:28 +0800
Subject: [PATCH 54/72] emacsPackages.texpresso: trivialBuild -> melpaBuild

---
 .../elisp-packages/manual-packages/texpresso/default.nix  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix
index cd449ab0f5d9..87863dd276ad 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix
@@ -1,15 +1,13 @@
 { lib
-, trivialBuild
+, melpaBuild
 , texpresso
 }:
-trivialBuild {
+melpaBuild {
   pname = "texpresso";
   version = texpresso.version;
   src = texpresso.src;
 
-  preInstall = ''
-    cd emacs
-  '';
+  files = ''("emacs/*.el")'';
 
   meta = {
     inherit (texpresso.meta) homepage license;

From 337b4af74b3e43f4d1b91f84985896bde88f07f3 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 18 Jul 2024 01:04:07 +0800
Subject: [PATCH 55/72] emacsPackages.texpresso: format using nixfmt-rfc-style

---
 .../elisp-packages/manual-packages/texpresso/default.nix   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix
index 87863dd276ad..ca83eb04a336 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/texpresso/default.nix
@@ -1,6 +1,7 @@
-{ lib
-, melpaBuild
-, texpresso
+{
+  lib,
+  melpaBuild,
+  texpresso,
 }:
 melpaBuild {
   pname = "texpresso";

From fcc04127fc282c2c092a34c5584ad44b69693dfb Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 18 Jul 2024 01:55:14 +0800
Subject: [PATCH 56/72] emacsPackages.font-lock-plus: trivialBuild ->
 melpaBuild

---
 .../manual-packages/font-lock-plus/default.nix           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix
index be52cf155e5b..4182f43c2269 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix
@@ -1,10 +1,11 @@
 { lib
 , fetchFromGitHub
-, trivialBuild
+, melpaBuild
 }:
 
-trivialBuild {
+melpaBuild {
   pname = "font-lock-plus";
+  ename = "font-lock+";
   version = "208-unstable-2018-01-01";
 
   src = fetchFromGitHub {
@@ -14,9 +15,9 @@ trivialBuild {
     hash = "sha256-lFmdVMXIIXZ9ZohAJw5rhxpTv017qIyzmpuKOWDdeJ4=";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/emacsmirror/font-lock-plus";
     description = "Enhancements to standard library font-lock.el";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
   };
 }

From bc466268d5a9214880157f45a193e85047a5b934 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Thu, 18 Jul 2024 01:55:53 +0800
Subject: [PATCH 57/72] emacsPackages.font-lock-plus: format using
 nixfmt-rfc-style

---
 .../manual-packages/font-lock-plus/default.nix             | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix
index 4182f43c2269..1360d3bff7f7 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix
@@ -1,6 +1,7 @@
-{ lib
-, fetchFromGitHub
-, melpaBuild
+{
+  lib,
+  fetchFromGitHub,
+  melpaBuild,
 }:
 
 melpaBuild {

From 2ab27f2619e04ea987b3312bc369cebcf68d3524 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 18 Jul 2024 15:06:23 +0200
Subject: [PATCH 58/72] melonDS: Add qtwayland for Qt wayland plugin

Otherwise it fails to start on Wayland:

qt.qpa.plugin: Could not find the Qt platform plugin "wayland" in ""
---
 pkgs/by-name/me/melonDS/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index c86eb061c267..ff1b20f151d1 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -20,6 +20,7 @@ let
   inherit (qt6)
     qtbase
     qtmultimedia
+    qtwayland
     wrapQtAppsHook;
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -50,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     zstd
   ] ++ lib.optionals stdenv.isLinux [
     wayland
+    qtwayland
   ];
 
   cmakeFlags = [

From f1eb0feecf01b4a5ea8df3c042fac1735300991f Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Thu, 18 Jul 2024 07:28:39 -0700
Subject: [PATCH 59/72] rofi-emoji: 3.3.0 -> 3.4.0

---
 pkgs/applications/misc/rofi-emoji/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix
index 3b0aaefc83c2..71d7ee69b1dc 100644
--- a/pkgs/applications/misc/rofi-emoji/default.nix
+++ b/pkgs/applications/misc/rofi-emoji/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rofi-emoji";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "Mange";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Y+E5TViKFVtqXMLVEcq1VMLPzG04vfZyThUM7a/fFGM=";
+    hash = "sha256-tF3yAKRUix+if+45rxg5vq83Pu33TQ6oUKWPIs/l4X0=";
   };
 
   patches = [

From 5199655527e93d696f568b8a7858560ccb665889 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jul 2024 22:01:56 +0000
Subject: [PATCH 60/72] cosmic-icons: 0-unstable-2024-05-21 ->
 0-unstable-2024-07-17

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

diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix
index 40fbd905de84..4af5db06b4ac 100644
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "cosmic-icons";
-  version = "0-unstable-2024-05-21";
+  version = "0-unstable-2024-07-17";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = pname;
-    rev = "9aad1ab6d5538938e69955b5f74576ac020be425";
-    sha256 = "sha256-ln2spVA8dlXi/B0ro/FIoWiIClPmwH9E9IqhrKPedys=";
+    rev = "73be037ba266b08a2fa7b544d78e7f143a2894c5";
+    sha256 = "sha256-Lyn9VneGr7RcfMPREOs3tP/HzpoRcnmw/nyo7kzOKCw=";
   };
 
   nativeBuildInputs = [ just ];

From 7768267ae7e3a4ead7d3f28d291c32367951bd12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jul 2024 23:38:35 +0000
Subject: [PATCH 61/72] csvkit: 2.0.0 -> 2.0.1

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

diff --git a/pkgs/by-name/cs/csvkit/package.nix b/pkgs/by-name/cs/csvkit/package.nix
index ff45738f90f7..f9b3c6f3c71f 100644
--- a/pkgs/by-name/cs/csvkit/package.nix
+++ b/pkgs/by-name/cs/csvkit/package.nix
@@ -5,7 +5,7 @@
 
 let
   pname = "csvkit";
-  version = "2.0.0";
+  version = "2.0.1";
   pythonEnv = python3;
 in
 pythonEnv.pkgs.buildPythonApplication {
@@ -14,7 +14,7 @@ pythonEnv.pkgs.buildPythonApplication {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MR8heHYVqRZWiX4hfGKrJshEbWcwm2G9AT40WzWBb98=";
+    hash = "sha256-qpRgJm1XE/8xKkFO0+3Ybgw6MdqbLidYy+VkP+EUbdE=";
   };
 
   propagatedBuildInputs = with pythonEnv.pkgs; [

From 2c6dbf0e9bdb5d02457f66e232d89c02a0a158cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 18 Jul 2024 23:44:32 +0000
Subject: [PATCH 62/72] python312Packages.dbt-semantic-interfaces: 0.6.0 ->
 0.6.2

---
 .../python-modules/dbt-semantic-interfaces/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
index 5f6a9d41fc4d..1c25c806de05 100644
--- a/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
+++ b/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "dbt-semantic-interfaces";
-  version = "0.6.0";
+  version = "0.6.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "dbt-labs";
     repo = "dbt-semantic-interfaces";
     rev = "refs/tags/v${version}";
-    hash = "sha256-77WKfegchgHIxgzL3Yhtx/4S5pYi6HeVCQH/19YscWA=";
+    hash = "sha256-V6yMT9Fkug+T3smBEu0Szg5GPMRxEOZc4gtJybWXbrs=";
   };
 
   pythonRelaxDeps = [ "importlib-metadata" ];

From b70ffe64df11f83705ca963c5819ec6457d63d9a Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Wed, 26 Jun 2024 12:29:09 +0900
Subject: [PATCH 63/72] bpftrace: 0.20.4 -> 0.21.2

Remove the custom patches that are no longer needed, and update the ones
that still are to fetchpatch of merged PRs (the files no longer apply
because of indentation changes)
---
 .../kheaders-not-found-message-fix.patch      |  59 -----
 ...ders-not-found-message-only-on-error.patch | 220 ------------------
 .../bp/bpftrace/override-system-headers.patch |  94 --------
 pkgs/by-name/bp/bpftrace/package.nix          |  26 ++-
 .../bp/bpftrace/runqlat-bt-no-includes.patch  |  45 ----
 .../bp/bpftrace/tcp-bt-no-includes.patch      | 114 ---------
 6 files changed, 14 insertions(+), 544 deletions(-)
 delete mode 100644 pkgs/by-name/bp/bpftrace/kheaders-not-found-message-fix.patch
 delete mode 100644 pkgs/by-name/bp/bpftrace/kheaders-not-found-message-only-on-error.patch
 delete mode 100644 pkgs/by-name/bp/bpftrace/override-system-headers.patch
 delete mode 100644 pkgs/by-name/bp/bpftrace/runqlat-bt-no-includes.patch
 delete mode 100644 pkgs/by-name/bp/bpftrace/tcp-bt-no-includes.patch

diff --git a/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-fix.patch b/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-fix.patch
deleted file mode 100644
index 31d99c420386..000000000000
--- a/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-fix.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 76950d08a3da13dd9e51b2fbef3532c3de79265b Mon Sep 17 00:00:00 2001
-From: Dominique Martinet <asmadeus@codewreck.org>
-Date: Fri, 14 Jun 2024 23:19:05 +0900
-Subject: [PATCH] utils: fix kernel headers not found warning (#3242)
-
-The code would make ksrc and kobj empty then try to print them,
-this would always print empty strings.
-Store is_dir() checks as bool instead and use these, the strings
-cannot be empty if the check passed.
-
-(cherry picked from commit f937803c2ad156ab90b9194965dbfb62bef1ff80)
----
-(mostly to avoid conflicts with the next patch)
- src/utils.cpp | 21 +++++++--------------
- 1 file changed, 7 insertions(+), 14 deletions(-)
-
-diff --git a/src/utils.cpp b/src/utils.cpp
-index bda722136588..c358a401fc83 100644
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -738,15 +738,11 @@ std::tuple<std::string, std::string> get_kernel_dirs(
-   auto ksrc = kdir + "/source";
-   auto kobj = kdir + "/build";
- 
--  // if one of source/ or build/ is not present - try to use the other one for both.
--  if (!is_dir(ksrc)) {
--    ksrc = "";
--  }
--  if (!is_dir(kobj)) {
--    kobj = "";
--  }
--  if (ksrc.empty() && kobj.empty())
--  {
-+  // if one of source/ or build/ is not present - try to use the other one for
-+  // both.
-+  auto has_ksrc = is_dir(ksrc);
-+  auto has_kobj = is_dir(kobj);
-+  if (!has_ksrc && !has_kobj) {
-     LOG(WARNING) << "Could not find kernel headers in " << ksrc << " or "
-                  << kobj
-                  << ". To specify a particular path to kernel headers, set the "
-@@ -757,12 +753,9 @@ std::tuple<std::string, std::string> get_kernel_dirs(
-                     "file at /sys/kernel/kheaders.tar.xz";
-     return std::make_tuple("", "");
-   }
--  if (ksrc.empty())
--  {
-+  if (!has_ksrc) {
-     ksrc = kobj;
--  }
--  else if (kobj.empty())
--  {
-+  } else if (!has_kobj) {
-     kobj = ksrc;
-   }
- 
--- 
-2.45.2
-
diff --git a/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-only-on-error.patch b/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-only-on-error.patch
deleted file mode 100644
index 38eb34be5b98..000000000000
--- a/pkgs/by-name/bp/bpftrace/kheaders-not-found-message-only-on-error.patch
+++ /dev/null
@@ -1,220 +0,0 @@
-From 5208c6275e65d94d0ed169ca2b253602c78c15a8 Mon Sep 17 00:00:00 2001
-From: Dominique Martinet <asmadeus@codewreck.org>
-Date: Fri, 14 Jun 2024 22:32:43 +0900
-Subject: [PATCH] kernel headers: only print kheaders not found warning if
- parsing failed
-
-Current code would print kheaders not found as soon as the code has any
-include, even if the include worked.
-
-This delays printing the warning until we know if parsing succeeded or
-not, and only prints it if parsing failed.
-
-Also update the message to give clearer extraction instructions
----
- CHANGELOG.md       |  2 ++
- src/CMakeLists.txt |  3 ++-
- src/main.cpp       | 40 ++++++++++++++++++++++++----------------
- src/utils.cpp      | 45 +++++++++++++++++++++------------------------
- src/utils.h        |  5 +++--
- 5 files changed, 52 insertions(+), 43 deletions(-)
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index a4aca8b6c85d..181c1bffc9f3 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -10,6 +10,8 @@ ## Unreleased
- 
- #### Added
- #### Changed
-+- Only print kernel headers not found message if parsing fails
-+  - [#3265](https://github.com/bpftrace/bpftrace/pull/3265)
- #### Deprecated
- #### Removed
- #### Fixed
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index eadb11207052..7b637835afd9 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -90,11 +90,12 @@ endif()
- 
- if (KERNEL_HEADERS_DIR)
-   MESSAGE(STATUS "Using KERNEL_HEADERS_DIR=${KERNEL_HEADERS_DIR}")
--  target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}")
- endif()
-+target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}")
- if (NOT SYSTEM_INCLUDE_PATHS EQUAL "auto")
-   MESSAGE(STATUS "Using SYSTEM_INCLUDE_PATHS=${SYSTEM_INCLUDE_PATHS}")
- endif()
-+target_compile_definitions(runtime PUBLIC SYSTEM_INCLUDE_PATHS="${SYSTEM_INCLUDE_PATHS}")
- 
- execute_process(
-   COMMAND git describe --abbrev=4 --dirty --tags
-diff --git a/src/main.cpp b/src/main.cpp
-index 3c532b3aa767..7918f90b90ab 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -420,24 +420,20 @@ static std::optional<struct timespec> get_delta_taitime()
- 
-   bool should_clang_parse = !(driver.root.get()->c_definitions.empty() &&
-                               bpftrace.btf_set_.empty());
--
--  if (should_clang_parse)
--  {
-+  if (should_clang_parse) {
-     ClangParser clang;
-+    bool found_kernel_headers;
-+    std::string ksrc, kobj;
-+    struct utsname utsname;
-     std::vector<std::string> extra_flags;
--    {
--      struct utsname utsname;
--      uname(&utsname);
--      std::string ksrc, kobj;
--      auto kdirs = get_kernel_dirs(utsname);
--      ksrc = std::get<0>(kdirs);
--      kobj = std::get<1>(kdirs);
-+    uname(&utsname);
-+    found_kernel_headers = get_kernel_dirs(utsname, ksrc, kobj);
- 
--      if (ksrc != "")
--      {
--        extra_flags = get_kernel_cflags(
--            utsname.machine, ksrc, kobj, bpftrace.kconfig);
--      }
-+    if (found_kernel_headers)
-+    {
-+      extra_flags = get_kernel_cflags(
-+          utsname.machine, ksrc, kobj, bpftrace.kconfig);
-+      found_kernel_headers = true;
-     }
-     extra_flags.push_back("-include");
-     extra_flags.push_back(CLANG_WORKAROUNDS_H);
-@@ -453,8 +449,20 @@ static std::optional<struct timespec> get_delta_taitime()
-       extra_flags.push_back(file);
-     }
- 
--    if (!clang.parse(driver.root.get(), bpftrace, extra_flags))
-+    if (!clang.parse(driver.root.get(), bpftrace, extra_flags)) {
-+      if (!found_kernel_headers) {
-+        LOG(WARNING)
-+            << "Could not find kernel headers in " << ksrc << " / " << kobj
-+            << ". To specify a particular path to kernel headers, set the env "
-+            << "variables BPFTRACE_KERNEL_SOURCE and, optionally, "
-+            << "BPFTRACE_KERNEL_BUILD if the kernel was built in a different "
-+            << "directory than its source. You can also point the variable to "
-+            << "a directory with built-in headers extracted from the following "
-+            << "snippet:\nmodprobe kheaders && tar -C <directory> -xf "
-+            << "/sys/kernel/kheaders.tar.xz";
-+      }
-       return nullptr;
-+    }
-   }
- 
-   err = driver.parse();
-diff --git a/src/utils.cpp b/src/utils.cpp
-index c358a401fc83..06d7fa95ff6e 100644
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -700,8 +700,8 @@ bool is_dir(const std::string& path)
-   return std_filesystem::is_directory(buf, ec);
- }
- 
--// get_kernel_dirs returns {ksrc, kobj} - directories for pristine and
--// generated kernel sources.
-+// get_kernel_dirs fills {ksrc, kobj} - directories for pristine and
-+// generated kernel sources - and returns if they were found.
- //
- // When the kernel was built in its source tree ksrc == kobj, however when
- // the kernel was build in a different directory than its source, ksrc != kobj.
-@@ -714,44 +714,41 @@ bool is_dir(const std::string& path)
- //
- //   /lib/modules/`uname -r`/build/
- //
--// {"", ""} is returned if no trace of kernel headers was found at all.
--// Both ksrc and kobj are guaranteed to be != "", if at least some trace of kernel sources was found.
--std::tuple<std::string, std::string> get_kernel_dirs(
--    const struct utsname &utsname)
-+// false is returned if no trace of kernel headers was found at all, with the guessed
-+// location set anyway for later warning.
-+// Both ksrc and kobj are guaranteed to be != ""
-+bool get_kernel_dirs(const struct utsname &utsname,
-+                     std::string &ksrc,
-+                     std::string &kobj)
- {
--#ifdef KERNEL_HEADERS_DIR
--  return {KERNEL_HEADERS_DIR, KERNEL_HEADERS_DIR};
--#endif
-+  ksrc = kobj = std::string(KERNEL_HEADERS_DIR);
-+  if (!ksrc.empty())
-+    return true;
- 
-   const char *kpath_env = ::getenv("BPFTRACE_KERNEL_SOURCE");
-   if (kpath_env)
-   {
-+    ksrc = std::string(kpath_env);
-     const char *kpath_build_env = ::getenv("BPFTRACE_KERNEL_BUILD");
--    if (!kpath_build_env)
-+    if (kpath_build_env)
-     {
--      kpath_build_env = kpath_env;
-+      kobj = std::string(kpath_build_env);
-+    } else {
-+      kobj = ksrc;
-     }
--    return std::make_tuple(kpath_env, kpath_build_env);
-+    return true;
-   }
- 
-   std::string kdir = std::string("/lib/modules/") + utsname.release;
--  auto ksrc = kdir + "/source";
--  auto kobj = kdir + "/build";
-+  ksrc = kdir + "/source";
-+  kobj = kdir + "/build";
- 
-   // if one of source/ or build/ is not present - try to use the other one for
-   // both.
-   auto has_ksrc = is_dir(ksrc);
-   auto has_kobj = is_dir(kobj);
-   if (!has_ksrc && !has_kobj) {
--    LOG(WARNING) << "Could not find kernel headers in " << ksrc << " or "
--                 << kobj
--                 << ". To specify a particular path to kernel headers, set the "
--                    "env variables BPFTRACE_KERNEL_SOURCE and, optionally, "
--                    "BPFTRACE_KERNEL_BUILD if the kernel was built in a "
--                    "different directory than its source. To create kernel "
--                    "headers run 'modprobe kheaders', which will create a tar "
--                    "file at /sys/kernel/kheaders.tar.xz";
--    return std::make_tuple("", "");
-+    return false;
-   }
-   if (!has_ksrc) {
-     ksrc = kobj;
-@@ -759,7 +756,7 @@ std::tuple<std::string, std::string> get_kernel_dirs(
-     kobj = ksrc;
-   }
- 
--  return std::make_tuple(ksrc, kobj);
-+  return true;
- }
- 
- const std::string &is_deprecated(const std::string &str)
-diff --git a/src/utils.h b/src/utils.h
-index bc78bd2176b5..9bd5395eab22 100644
---- a/src/utils.h
-+++ b/src/utils.h
-@@ -186,8 +186,9 @@ std::vector<int> get_online_cpus();
- std::vector<int> get_possible_cpus();
- bool is_dir(const std::string &path);
- bool file_exists_and_ownedby_root(const char *f);
--std::tuple<std::string, std::string> get_kernel_dirs(
--    const struct utsname &utsname);
-+bool get_kernel_dirs(const struct utsname &utsname,
-+                     std::string &ksrc,
-+                     std::string &kobj);
- std::vector<std::string> get_kernel_cflags(const char *uname_machine,
-                                            const std::string &ksrc,
-                                            const std::string &kobj,
--- 
-2.45.2
-
diff --git a/pkgs/by-name/bp/bpftrace/override-system-headers.patch b/pkgs/by-name/bp/bpftrace/override-system-headers.patch
deleted file mode 100644
index 624c4d6c7eff..000000000000
--- a/pkgs/by-name/bp/bpftrace/override-system-headers.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From c1737d4ab6ab263932caa9e3ac170ebe3e28d404 Mon Sep 17 00:00:00 2001
-From: Dominique Martinet <asmadeus@codewreck.org>
-Date: Fri, 14 Jun 2024 21:56:46 +0900
-Subject: [PATCH] clang_parser system_include_paths: allow overriding at
- compile time
-
-While bpftrace depends on libclang it can be installed without a clang
-frontend, so some distributions might want to make these paths fixed as
-they are unlikely to change.
-
-In particular, this is necessary to include system libraries as used by
-older versions of tcpaccept.bt (they now no longer require these since
-#3152, but that illustrate this was a recurring problem)
-
-(cherry picked from commit 5bf5f86313600b16c8c23e03b31337941cbefdd0)
----
- CMakeLists.txt       |  2 ++
- src/CMakeLists.txt   |  4 +++-
- src/clang_parser.cpp | 19 +++++++++++++++----
- 3 files changed, 20 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cd620d0e56e5..ade33c503efb 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -21,6 +21,8 @@ set(VENDOR_GTEST OFF CACHE BOOL "Clone gtest from github")
- set(BUILD_FUZZ OFF CACHE BOOL "Build bpftrace for fuzzing")
- set(USE_LIBFUZZER OFF CACHE BOOL "Use libfuzzer for fuzzing")
- set(FUZZ_TARGET "codegen" CACHE STRING "Fuzzing target")
-+set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory")
-+set(SYSTEM_INCLUDE_PATHS "auto" CACHE STRING "Hard-code system include paths (colon separated, the default value \"auto\" queries clang at runtime)")
- 
- set(ENABLE_SKB_OUTPUT ON CACHE BOOL "Enable skb_output, will include libpcap")
- 
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 88f5928c8a75..eadb11207052 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -88,11 +88,13 @@ endif()
- 
- # compile definitions
- 
--set(KERNEL_HEADERS_DIR "" CACHE PATH "Hard-code kernel headers directory")
- if (KERNEL_HEADERS_DIR)
-   MESSAGE(STATUS "Using KERNEL_HEADERS_DIR=${KERNEL_HEADERS_DIR}")
-   target_compile_definitions(runtime PUBLIC KERNEL_HEADERS_DIR="${KERNEL_HEADERS_DIR}")
- endif()
-+if (NOT SYSTEM_INCLUDE_PATHS EQUAL "auto")
-+  MESSAGE(STATUS "Using SYSTEM_INCLUDE_PATHS=${SYSTEM_INCLUDE_PATHS}")
-+endif()
- 
- execute_process(
-   COMMAND git describe --abbrev=4 --dirty --tags
-diff --git a/src/clang_parser.cpp b/src/clang_parser.cpp
-index 8b6689454267..9367e6692eb0 100644
---- a/src/clang_parser.cpp
-+++ b/src/clang_parser.cpp
-@@ -882,11 +882,9 @@ std::string ClangParser::get_arch_include_path()
-   return "/usr/include/" + std::string(utsname.machine) + "-linux-gnu";
- }
- 
--std::vector<std::string> ClangParser::system_include_paths()
-+static void query_clang_include_dirs(std::vector<std::string> &result)
- {
--  std::vector<std::string> result;
--  try
--  {
-+  try {
-     auto clang = "clang-" + std::to_string(LLVM_VERSION_MAJOR);
-     auto cmd = clang + " -Wp,-v -x c -fsyntax-only /dev/null 2>&1";
-     auto check = exec_system(cmd.c_str());
-@@ -902,6 +900,19 @@ std::vector<std::string> ClangParser::system_include_paths()
-   catch (std::runtime_error &)
-   { // If exec_system fails, just ignore it
-   }
-+}
-+
-+std::vector<std::string> ClangParser::system_include_paths()
-+{
-+  std::vector<std::string> result;
-+  std::istringstream lines(SYSTEM_INCLUDE_PATHS);
-+  std::string line;
-+  while (std::getline(lines, line, ':')) {
-+    if (line == "auto")
-+      query_clang_include_dirs(result);
-+    else
-+      result.push_back(trim(line));
-+  }
- 
-   if (result.empty())
-     result = { "/usr/local/include", "/usr/include" };
--- 
-2.45.2
-
diff --git a/pkgs/by-name/bp/bpftrace/package.nix b/pkgs/by-name/bp/bpftrace/package.nix
index 654e379f2ec5..f1dc1bb4fd7d 100644
--- a/pkgs/by-name/bp/bpftrace/package.nix
+++ b/pkgs/by-name/bp/bpftrace/package.nix
@@ -4,18 +4,19 @@
 , cereal, asciidoctor
 , cmake, pkg-config, flex, bison
 , util-linux
+, fetchpatch
 , nixosTests
 }:
 
 stdenv.mkDerivation rec {
   pname = "bpftrace";
-  version = "0.20.4";
+  version = "0.21.2";
 
   src = fetchFromGitHub {
     owner = "iovisor";
     repo  = "bpftrace";
     rev   = "v${version}";
-    hash  = "sha256-GJSUHMOp3vCWj8C+1mBHcnUgxLUWUz8Jd8wpq7u0q3s=";
+    hash  = "sha256-/2m+5iFE7R+ZEc/VcgWAhkLD/jEK88roUUOUyYODi0U=";
   };
 
 
@@ -45,16 +46,17 @@ stdenv.mkDerivation rec {
   ];
 
   patches = [
-    # https://github.com/bpftrace/bpftrace/pull/3243 (merged)
-    ./override-system-headers.patch
-    # https://github.com/bpftrace/bpftrace/pull/3152 (merged)
-    ./tcp-bt-no-includes.patch
-    # https://github.com/bpftrace/bpftrace/pull/3262 (merged)
-    ./runqlat-bt-no-includes.patch
-    # https://github.com/bpftrace/bpftrace/pull/3242 (merged)
-    ./kheaders-not-found-message-fix.patch
-    # https://github.com/bpftrace/bpftrace/pull/3265
-    ./kheaders-not-found-message-only-on-error.patch
+    (fetchpatch {
+      name = "runqlat-bt-no-includes.patch";
+      url = "https://github.com/bpftrace/bpftrace/pull/3262.patch";
+      hash = "sha256-9yqaZeG1Uf2cC9Aa40c2QUTQRl8n2NO1nq278hf9P4M=";
+    })
+    (fetchpatch {
+      name = "kheaders-not-found-message-only-on-error.patch";
+      url = "https://github.com/bpftrace/bpftrace/pull/3265.patch";
+      hash = "sha256-8AICMzwq5Evy9+hmZhFjccw/HmgZ9t+YIoHApjLv6Uc=";
+      excludes = [ "CHANGELOG.md" ];
+    })
   ];
 
   # Pull BPF scripts into $PATH (next to their bcc program equivalents), but do
diff --git a/pkgs/by-name/bp/bpftrace/runqlat-bt-no-includes.patch b/pkgs/by-name/bp/bpftrace/runqlat-bt-no-includes.patch
deleted file mode 100644
index 659e4bc4bbfd..000000000000
--- a/pkgs/by-name/bp/bpftrace/runqlat-bt-no-includes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 9b5f22854297aabb924969c25af66461d8d2fcb9 Mon Sep 17 00:00:00 2001
-From: Dominique Martinet <asmadeus@codewreck.org>
-Date: Fri, 21 Jun 2024 21:02:09 +0900
-Subject: [PATCH] tools/runqlat: provide TASK_RUNNING as a define
-
-runqlat requires kernel headers to run even with BTF, just because of a
-define.
-TASK_RUNNING isn't part of the stable API but it's never changed in all
-of the linux git history so let's pretend it's stable and just define
-it.
-
-If we find a way to handle kheaders again in the future we might want to
-consider reverting this.
-
-Fixes: #3255
-(cherry picked from commit aa041d9d85f9ec11235c39fdcb5833412ec27083)
----
- tools/runqlat.bt | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/tools/runqlat.bt b/tools/runqlat.bt
-index 3d71b76062eb..1298f399aee7 100755
---- a/tools/runqlat.bt
-+++ b/tools/runqlat.bt
-@@ -11,7 +11,17 @@
-  * 17-Sep-2018	Brendan Gregg	Created this.
-  */
- 
-+#ifndef BPFTRACE_HAVE_BTF
- #include <linux/sched.h>
-+#else
-+/*
-+ * With BTF providing types, full headers are not needed.
-+ * We only need to supply the preprocessor defines used in this script.
-+ * TASK_RUNNING is not arch-dependant and has not changed in the linux
-+ * git history (it is not part of the stable API though)
-+ */
-+#define TASK_RUNNING 0
-+#endif
- 
- BEGIN
- {
--- 
-2.45.2
-
diff --git a/pkgs/by-name/bp/bpftrace/tcp-bt-no-includes.patch b/pkgs/by-name/bp/bpftrace/tcp-bt-no-includes.patch
deleted file mode 100644
index fa2052358103..000000000000
--- a/pkgs/by-name/bp/bpftrace/tcp-bt-no-includes.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From ebb12512f6ea0a1113ad8ddf30db26128f7a3426 Mon Sep 17 00:00:00 2001
-From: Dominique Martinet <asmadeus@codewreck.org>
-Date: Sun, 23 Jun 2024 20:41:01 +0900
-Subject: [PATCH] With BTF, users do not need libc headers installed for
- AF_INET/AF_INET6
-
-Signed-off-by: Bernhard Kaindl <bernhardkaindl7@gmail.com>
-(cherry picked from commit c0b9d252a43f99b9091245dedb178a6874803306)
----
- tools/tcpaccept.bt  | 8 +++++++-
- tools/tcpconnect.bt | 8 +++++++-
- tools/tcpdrop.bt    | 8 +++++++-
- tools/tcplife.bt    | 8 +++++++-
- tools/tcpretrans.bt | 8 +++++++-
- 5 files changed, 35 insertions(+), 5 deletions(-)
-
-diff --git a/tools/tcpaccept.bt b/tools/tcpaccept.bt
-index 08e6af0158fc..cbffe36889ee 100755
---- a/tools/tcpaccept.bt
-+++ b/tools/tcpaccept.bt
-@@ -20,7 +20,13 @@
- #include <linux/socket.h>
- #include <net/sock.h>
- #else
--#include <sys/socket.h>
-+/*
-+ * With BTF providing types, socket headers are not needed.
-+ * We only need to supply the preprocessor defines in this script.
-+ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI
-+ */
-+#define AF_INET   2
-+#define AF_INET6 10
- #endif
- 
- BEGIN
-diff --git a/tools/tcpconnect.bt b/tools/tcpconnect.bt
-index 1ac1eb99e9ad..636337275cd8 100755
---- a/tools/tcpconnect.bt
-+++ b/tools/tcpconnect.bt
-@@ -22,7 +22,13 @@
- #include <linux/socket.h>
- #include <net/sock.h>
- #else
--#include <sys/socket.h>
-+/*
-+ * BTF provides the types, we just need to define AF_INET and AF_INET6.
-+ * These are Linux ABI defines, and are not architecture-specific.
-+ * With BTF, this allows tcpconnect.bt to work without glibc headers:
-+ */
-+#define AF_INET   2 /* IPv4 */
-+#define AF_INET6 10 /* IPv6 */
- #endif
- 
- BEGIN
-diff --git a/tools/tcpdrop.bt b/tools/tcpdrop.bt
-index fd3e55f490bf..a56bf69fcc6c 100755
---- a/tools/tcpdrop.bt
-+++ b/tools/tcpdrop.bt
-@@ -24,7 +24,13 @@
- #include <linux/socket.h>
- #include <net/sock.h>
- #else
--#include <sys/socket.h>
-+/*
-+ * With BTF providing types, socket headers are not needed.
-+ * We only need to supply the preprocessor defines in this script.
-+ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI
-+ */
-+#define AF_INET   2
-+#define AF_INET6 10
- #endif
- 
- BEGIN
-diff --git a/tools/tcplife.bt b/tools/tcplife.bt
-index dd4c1d68284e..d5a09c4e5da9 100755
---- a/tools/tcplife.bt
-+++ b/tools/tcplife.bt
-@@ -19,7 +19,13 @@
- #include <linux/socket.h>
- #include <linux/tcp.h>
- #else
--#include <sys/socket.h>
-+/*
-+ * With BTF providing types, socket headers are not needed.
-+ * We only need to supply the preprocessor defines in this script.
-+ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI
-+ */
-+#define AF_INET   2
-+#define AF_INET6 10
- #endif
- 
- BEGIN
-diff --git a/tools/tcpretrans.bt b/tools/tcpretrans.bt
-index ee2975d6e545..32a11bfa81b2 100755
---- a/tools/tcpretrans.bt
-+++ b/tools/tcpretrans.bt
-@@ -21,7 +21,13 @@
- #include <linux/socket.h>
- #include <net/sock.h>
- #else
--#include <sys/socket.h>
-+/*
-+ * With BTF providing types, socket headers are not needed.
-+ * We only need to supply the preprocessor defines in this script.
-+ * AF_INET/AF_INET6 are part of the stable arch-independent Linux ABI
-+ */
-+#define AF_INET   2
-+#define AF_INET6 10
- #endif
- 
- BEGIN
--- 
-2.45.2
-

From 9678f404a3f71a0635267478c356a5df88a84a81 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 19 Jul 2024 08:51:28 -0300
Subject: [PATCH 64/72] emacsPackages: delete perl-completion

The upstream is not updated since its inception.
---
 .../emacs/elisp-packages/manual-packages.nix  |  3 +--
 .../perl-completion/default.nix               | 20 -------------------
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index d5758e178319..219f7d979201 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -73,8 +73,6 @@ in
 
   ott-mode = callPackage ./manual-packages/ott-mode { };
 
-  perl-completion = callPackage ./manual-packages/perl-completion { };
-
   pod-mode = callPackage ./manual-packages/pod-mode { };
 
   prisma-mode = callPackage ./manual-packages/prisma-mode { };
@@ -124,4 +122,5 @@ in
   ess-R-object-popup = throw "emacsPackages.ess-R-object-popup was deleted, since the upstream repo looks abandoned."; # Added 2024-07-15
   ghc-mod = throw "emacsPackages.ghc-mod was deleted because it is deprecated, use haskell-language-server instead."; # Added 2024-07-17
   haskell-unicode-input-method = throw "emacsPackages.haskell-unicode-input-method is contained in emacsPackages.haskell-mode, please use that instead."; # Added 2024-07-17
+  perl-completion = throw "emacsPackages.perl-completion was removed, since it is broken."; # Added 2024-07-19
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix
deleted file mode 100644
index dea18e30dcd8..000000000000
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/perl-completion/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ trivialBuild
-, fetchurl
-}:
-
-trivialBuild {
-  pname = "perl-completion";
-
-  src = fetchurl {
-    url = "http://emacswiki.org/emacs/download/perl-completion.el";
-    sha256 = "0x6qsgs4hm87k0z9q3g4p6508kc3y123j5jayll3jf3lcl2vm6ks";
-  };
-
-  version = "1.10";
-
-  meta = {
-    broken = true;
-    description = "Minor mode provides useful features for editing perl codes";
-    homepage = "http://emacswiki.org/emacs/PerlCompletion";
-  };
-}

From d3fe63d9755cea374520208a845d19c2399c00bc Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 19 Jul 2024 08:58:30 -0300
Subject: [PATCH 65/72] emacsPackages.control-lock: trivialBuild -> melpaBuild

---
 .../manual-packages/control-lock/default.nix       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix
index 279c2b74d1d9..5a352c5c3bc4 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix
@@ -1,18 +1,22 @@
-{ lib, trivialBuild, fetchurl }:
+{
+  lib,
+  fetchurl,
+  melpaBuild,
+}:
 
-trivialBuild {
+melpaBuild {
   pname = "control-lock";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/185fdc34fb1e02b43759ad933d3ee5646b0e78f8/control-lock.el";
     hash = "sha256-JCrmS3FSGDHSR+eAR0X/uO0nAgd3TUmFxwEVH5+KV+4=";
   };
 
-  version = "1.1.2";
-
   meta = {
-    description = "Like caps-lock, but for your control key.  Give your pinky a rest!";
     homepage = "https://www.emacswiki.org/emacs/control-lock.el";
+    description = "Like caps-lock, but for your control key";
+    license = lib.licenses.free;
     platforms = lib.platforms.all;
   };
 }

From 3b26c3384f0a377dbcfd0e7b6ddf802038e5341a Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 19 Jul 2024 09:03:37 -0300
Subject: [PATCH 66/72] emacsPackages.yes-no: trivialBuild -> melpaBuild

---
 .../manual-packages/yes-no/default.nix        | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix
index 2cb229a4e1e3..2981cb8f4711 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix
@@ -1,19 +1,22 @@
-{ lib, fetchurl, trivialBuild }:
+{
+  lib,
+  fetchurl,
+  melpaBuild,
+}:
 
-trivialBuild {
+melpaBuild {
   pname = "yes-no";
   version = "0-unstable-2017-10-01";
 
   src = fetchurl {
     url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/143bcaeb679a8fa8a548e92a5a9d5c2baff50d9c/yes-no.el";
-    sha256 = "03w4wfx885y89ckyd5d95n2571nmmzrll6kr0yan3ip2aw28xq3i";
+    hash = "sha256-ceCOBFfixmGVB3kaSvOv1YZThC2pleYnS8gXhLrjhA8=";
   };
 
-  meta = with lib; {
-    description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis";
+  meta = {
     homepage = "https://www.emacswiki.org/emacs/yes-no.el";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jcs090218 ];
-    platforms = platforms.all;
+    description = "Specify use of `y-or-n-p' or `yes-or-no-p' on a case-by-case basis";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ jcs090218 ];
   };
 }

From 5af0c1343d3f33acaaa98289a84574564a673c6e Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 19 Jul 2024 09:04:54 -0300
Subject: [PATCH 67/72] emacsPackages.sv-kalender: trivialBuild -> melpaBuild

---
 .../manual-packages/sv-kalender/default.nix   | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix
index 48cc866029a8..0227fcefc152 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix
@@ -1,19 +1,22 @@
-{ fetchurl, lib, trivialBuild }:
+{
+  lib,
+  fetchurl,
+  melpaBuild,
+}:
 
-trivialBuild {
+melpaBuild {
   pname = "sv-kalender";
   version = "1.11";
 
   src = fetchurl {
     url = "https://raw.githubusercontent.com/emacsmirror/emacswiki.org/ec4fa36bdba5d2c5c4f5e0400a70768c10e969e8/sv-kalender.el";
-    sha256 = "0mcx7g1pg6kfp0i4b9rh3q9csgdf3054ijswy368bxwdxsjgfz2m";
+    hash = "sha256-VXz3pO6N94XM8FzLSAoYrj3NEh4wp0UiuG6ad8M7nVU=";
   };
 
-  meta = with lib; {
-    description = "Swedish calendar for Emacs";
+  meta = {
     homepage = "https://www.emacswiki.org/emacs/sv-kalender.el";
-    platforms = platforms.all;
-    license = licenses.gpl3Plus;
-    maintainers = [ maintainers.rycee ];
+    description = "Swedish calendar for Emacs";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.rycee ];
   };
 }

From 4ff96312ba8210120b0db86856a6297c375250f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2024 12:38:03 +0000
Subject: [PATCH 68/72] bcachefs-tools: 1.9.3 -> 1.9.4

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

diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix
index 3f37b633f9ee..d755b2aaf785 100644
--- a/pkgs/by-name/bc/bcachefs-tools/package.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bcachefs-tools";
-  version = "1.9.3";
+  version = "1.9.4";
 
   src = fetchFromGitHub {
     owner = "koverstreet";
     repo = "bcachefs-tools";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-vKRjxehwqbvvgq+EMHoF3KRiPIxay06MpZRjapBFdVU=";
+    hash = "sha256-qPnlSl1s9QWkODqbrfzIVFLXtDVEmTOihBlDmvHoknY=";
   };
 
   nativeBuildInputs = [
@@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     src = finalAttrs.src;
-    hash = "sha256-JOfS3vCkqI5wvFWgGkw1PIfmzW9yuP/Zp/x98MPdbUQ=";
+    hash = "sha256-ufzxFEgeOaOcZKEPx7kT64Pj2oz6m35exqXQlKxXGb4=";
   };
 
   makeFlags = [

From 8c08052cc0dd800c1f6ad868dc29d5be45890566 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 19 Jul 2024 10:07:46 -0300
Subject: [PATCH 69/72] emacsPackages.lspce: rework

- detach Rust module to module.nix
- trivialBuild -> melpaBuild
- updateScript
- adopt (by AndersonTorres)

Co-authored-by: Lin Jian <me@linj.tech>
---
 .../manual-packages/lspce/default.nix         | 69 +++++--------------
 .../manual-packages/lspce/module.nix          | 40 +++++++++++
 2 files changed, 59 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix
index 97a9bea4f96c..78325d90bf78 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix
@@ -1,65 +1,34 @@
-{ lib
-, emacs
-, f
-, fetchFromGitHub
-, markdown-mode
-, rustPlatform
-, trivialBuild
-, yasnippet
+{
+  lib,
+  callPackage,
+  f,
+  markdown-mode,
+  melpaBuild,
+  nix-update-script,
+  yasnippet,
 }:
 
 let
-  version = "1.0.0-unstable-2024-02-03";
-
-  src = fetchFromGitHub {
-    owner = "zbelial";
-    repo = "lspce";
-    rev = "543dcf0ea9e3ff5c142c4365d90b6ae8dc27bd15";
-    hash = "sha256-LZWRQOKkTjNo8jecBRholW9SHpiK0SWcV8yObojpvxo=";
-  };
-
-  meta = {
-    homepage = "https://github.com/zbelial/lspce";
-    description = "LSP Client for Emacs implemented as a module using rust";
-    license = lib.licenses.gpl3Only;
-    maintainers = [ ];
-    inherit (emacs.meta) platforms;
-  };
-
-  lspce-module = rustPlatform.buildRustPackage {
-    inherit version src meta;
-    pname = "lspce-module";
-
-    cargoHash = "sha256-W9rsi7o4KvyRoG/pqRKOBbJtUoSW549Sh8+OV9sLcxs=";
-
-    checkFlags = [
-      # flaky test
-      "--skip=msg::tests::serialize_request_with_null_params"
-    ];
-
-    postInstall = ''
-      mkdir -p $out/share/emacs/site-lisp
-      for f in $out/lib/*; do
-        mv $f $out/share/emacs/site-lisp/lspce-module.''${f##*.}
-      done
-      rmdir $out/lib
-    '';
-  };
+  lspce-module = callPackage ./module.nix { };
 in
-trivialBuild rec {
-  inherit version src meta;
+melpaBuild {
   pname = "lspce";
+  inherit (lspce-module) version src meta;
 
-  buildInputs = propagatedUserEnvPkgs;
-
-  propagatedUserEnvPkgs = [
+  packageRequires = [
     f
     markdown-mode
     yasnippet
-    lspce-module
   ];
 
+  # to compile lspce.el, it needs lspce-module.so
+  files = ''(:defaults "${lib.getLib lspce-module}/lib/lspce-module.*")'';
+
   passthru = {
     inherit lspce-module;
+    updateScript = nix-update-script {
+      attrPath = "emacsPackages.lspce.lspce-module";
+      extraArgs = [ "--version=branch" ];
+    };
   };
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
new file mode 100644
index 000000000000..0302b7b2692a
--- /dev/null
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "lspce-module";
+  version = "1.1.0-unstable-2024-02-03";
+
+  src = fetchFromGitHub {
+    owner = "zbelial";
+    repo = "lspce";
+    rev = "543dcf0ea9e3ff5c142c4365d90b6ae8dc27bd15";
+    hash = "sha256-LZWRQOKkTjNo8jecBRholW9SHpiK0SWcV8yObojpvxo=";
+  };
+
+  cargoHash = "sha256-pjDh7epCjqVN+QMzOIwujJ2MmNYS08QcVy/2VxGZsb0=";
+
+  checkFlags = [
+    # flaky test
+    "--skip=msg::tests::serialize_request_with_null_params"
+  ];
+
+  # rename module without changing either suffix or location
+  # use for loop because there seems to be two modules on darwin systems
+  # https://github.com/zbelial/lspce/issues/7#issue-1783708570
+  postInstall = ''
+    for f in $out/lib/*; do
+      mv --verbose $f $out/lib/lspce-module.''${f##*.}
+    done
+  '';
+
+  meta = {
+    homepage = "https://github.com/zbelial/lspce";
+    description = "LSP Client for Emacs implemented as a module using Rust";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+  };
+}

From 92ebcc173ea133f996ed0c389cd3e42ab250910b Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 19 Jul 2024 10:12:56 -0300
Subject: [PATCH 70/72] emacsPackages.lspce: 1.0.0-unstable-2024-02-03 ->
 1.1.0-unstable-2024-07-13

---
 .../emacs/elisp-packages/manual-packages/lspce/module.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
index 0302b7b2692a..10f25af5ba40 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/module.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "lspce-module";
-  version = "1.1.0-unstable-2024-02-03";
+  version = "1.1.0-unstable-2024-07-13";
 
   src = fetchFromGitHub {
     owner = "zbelial";
     repo = "lspce";
-    rev = "543dcf0ea9e3ff5c142c4365d90b6ae8dc27bd15";
-    hash = "sha256-LZWRQOKkTjNo8jecBRholW9SHpiK0SWcV8yObojpvxo=";
+    rev = "01b77a4f544a912409857083842db51a20bfdbf3";
+    hash = "sha256-oew5EujNYGjk/agBw3ECAVe7GZl8rw/4M5t32JM+1T8=";
   };
 
-  cargoHash = "sha256-pjDh7epCjqVN+QMzOIwujJ2MmNYS08QcVy/2VxGZsb0=";
+  cargoHash = "sha256-YLcSaFHsm/Iw7Q3y/YkfdbYKUPW0DRmaZnZ1A9vKR14=";
 
   checkFlags = [
     # flaky test

From ba8988dcbd23bda627c7408d13c11f05b8645783 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2024 02:24:56 +0000
Subject: [PATCH 71/72] cinnamon.nemo: 6.2.3 -> 6.2.4

---
 pkgs/desktops/cinnamon/nemo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix
index a7e5e3c04272..b2f7a8a9a949 100644
--- a/pkgs/desktops/cinnamon/nemo/default.nix
+++ b/pkgs/desktops/cinnamon/nemo/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nemo";
-  version = "6.2.3";
+  version = "6.2.4";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    sha256 = "sha256-wyz2pzwJGYMFKoKVqrhLnkJqXG8Qg2+BygpOm2yegpM=";
+    sha256 = "sha256-mlu/bC1+2rhEQvqIAcTBgYii8t4ELsLc1x0ApcBqx6o=";
   };
 
   patches = [

From b940e73dd326eaf3aad5bca202bcb3024235a024 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2024 15:37:15 +0000
Subject: [PATCH 72/72] python312Packages.django-crispy-forms: 2.2 -> 2.3

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

diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix
index 823bf6efd994..2406715f4f24 100644
--- a/pkgs/development/python-modules/django-crispy-forms/default.nix
+++ b/pkgs/development/python-modules/django-crispy-forms/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "django-crispy-forms";
-  version = "2.2";
+  version = "2.3";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "django-crispy-forms";
     repo = "django-crispy-forms";
     rev = "refs/tags/${version}";
-    hash = "sha256-6S/Pscwi6AEQnmJf6JTT5Q5vxoZ3PC65ZjT2XszwVZM=";
+    hash = "sha256-R2s2dUsVw5p7xn4yWeFcE7au8yHWXjFgS5jjCBveg04=";
   };
 
   propagatedBuildInputs = [