Merge staging-next into staging

2024-11-23 07:23:20 +00:00 · 2024-08-09 12:01:41 +00:00 · 2024-08-09 12:01:41 +00:00 · 66aaee2b83
commit 66aaee2b83
parent 4d495fe155 7b86eb63e7
61 changed files with 10682 additions and 1994 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@ -141,13 +141,13 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @raitobezarius
 /pkgs/top-level/release-python.nix                      @natsukium

 # Haskell
-/doc/languages-frameworks/haskell.section.md  @sternenseemann @maralorn @ncfavier
-/maintainers/scripts/haskell                  @sternenseemann @maralorn @ncfavier
-/pkgs/development/compilers/ghc               @sternenseemann @maralorn @ncfavier
-/pkgs/development/haskell-modules             @sternenseemann @maralorn @ncfavier
-/pkgs/test/haskell                            @sternenseemann @maralorn @ncfavier
-/pkgs/top-level/release-haskell.nix           @sternenseemann @maralorn @ncfavier
-/pkgs/top-level/haskell-packages.nix          @sternenseemann @maralorn @ncfavier
+/doc/languages-frameworks/haskell.section.md  @sternenseemann @maralorn
+/maintainers/scripts/haskell                  @sternenseemann @maralorn
+/pkgs/development/compilers/ghc               @sternenseemann @maralorn
+/pkgs/development/haskell-modules             @sternenseemann @maralorn
+/pkgs/test/haskell                            @sternenseemann @maralorn
+/pkgs/top-level/release-haskell.nix           @sternenseemann @maralorn
+/pkgs/top-level/haskell-packages.nix          @sternenseemann @maralorn

 # Perl
 /pkgs/development/interpreters/perl @stigtsp @zakame @marcusramberg
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@ -149,6 +149,24 @@
  nvimpager settings: user commands in `-c` and `--cmd` now override the
  respective default settings because they are executed later.

+- Kubernetes `featureGates` have changed from a `listOf str` to `attrsOf bool`.
+  This refactor makes it possible to also disable feature gates, without having
+  to use `extraOpts` flags.
+
+  A previous configuration may have looked like this:
+  ```nix
+  featureGates = [ "EphemeralContainers" ];
+  extraOpts = pkgs.lib.concatStringsSep " " (
+  [
+    ''--feature-gates="CSIMigration=false"''
+  });
+  ```
+
+  Using an AttrSet instead, the new configuration would be:
+  ```nix
+  featureGates = {EphemeralContainers = true; CSIMigration=false;};
+  ```
+
 - `pkgs.nextcloud27` has been removed since it's EOL.

 - `services.forgejo.mailerPasswordFile` has been deprecated by the drop-in replacement `services.forgejo.secrets.mailer.PASSWD`,
--- a/nixos/modules/services/cluster/kubernetes/apiserver.nix
+++ b/nixos/modules/services/cluster/kubernetes/apiserver.nix
@ -159,10 +159,10 @@ in
    };

    featureGates = mkOption {
-      description = "List set of feature gates";
+      description = "Attribute set of feature gates.";
      default = top.featureGates;
      defaultText = literalExpression "config.${otop.featureGates}";
-      type = listOf str;
+      type = attrsOf bool;
    };

    kubeletClientCaFile = mkOption {
@ -349,8 +349,8 @@ in
                "--etcd-certfile=${cfg.etcd.certFile}"} \
              ${optionalString (cfg.etcd.keyFile != null)
                "--etcd-keyfile=${cfg.etcd.keyFile}"} \
-              ${optionalString (cfg.featureGates != [])
-                "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
+              ${optionalString (cfg.featureGates != {})
+                "--feature-gates=${(concatStringsSep "," (builtins.attrValues (mapAttrs (n: v: "${n}=${trivial.boolToString v}") cfg.featureGates)))}"} \
              ${optionalString (cfg.basicAuthFile != null)
                "--basic-auth-file=${cfg.basicAuthFile}"} \
              ${optionalString (cfg.kubeletClientCaFile != null)
--- a/nixos/modules/services/cluster/kubernetes/controller-manager.nix
+++ b/nixos/modules/services/cluster/kubernetes/controller-manager.nix
@ -44,10 +44,10 @@ in
    };

    featureGates = mkOption {
-      description = "List set of feature gates";
+      description = "Attribute set of feature gates.";
      default = top.featureGates;
      defaultText = literalExpression "config.${otop.featureGates}";
-      type = listOf str;
+      type = attrsOf bool;
    };

    kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager";
@ -121,8 +121,8 @@ in
          --bind-address=${cfg.bindAddress} \
          ${optionalString (cfg.clusterCidr!=null)
            "--cluster-cidr=${cfg.clusterCidr}"} \
-          ${optionalString (cfg.featureGates != [])
-            "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
+          ${optionalString (cfg.featureGates != {})
+            "--feature-gates=${concatStringsSep "," (builtins.attrValues (mapAttrs (n: v: "${n}=${trivial.boolToString v}") cfg.featureGates))}"} \
          --kubeconfig=${top.lib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \
          --leader-elect=${boolToString cfg.leaderElect} \
          ${optionalString (cfg.rootCaFile!=null)
--- a/nixos/modules/services/cluster/kubernetes/default.nix
+++ b/nixos/modules/services/cluster/kubernetes/default.nix
@ -155,8 +155,8 @@ in {

    featureGates = mkOption {
      description = "List set of feature gates.";
-      default = [];
-      type = types.listOf types.str;
+      default = {};
+      type = types.attrsOf types.bool;
    };

    masterAddress = mkOption {
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@ -65,7 +65,7 @@ let
    // lib.optionalAttrs (cfg.tlsKeyFile != null)   { tlsPrivateKeyFile = cfg.tlsKeyFile; }
    // lib.optionalAttrs (cfg.clusterDomain != "")  { clusterDomain = cfg.clusterDomain; }
    // lib.optionalAttrs (cfg.clusterDns != "")     { clusterDNS = [ cfg.clusterDns ] ; }
-    // lib.optionalAttrs (cfg.featureGates != [])   { featureGates = cfg.featureGates; }
+    // lib.optionalAttrs (cfg.featureGates != {})   { featureGates = cfg.featureGates; }
  ));

  manifestPath = "kubernetes/manifests";
@ -185,10 +185,10 @@ in
    };

    featureGates = mkOption {
-      description = "List set of feature gates";
+      description = "Attribute set of feature gate";
      default = top.featureGates;
      defaultText = literalExpression "config.${otop.featureGates}";
-      type = listOf str;
+      type = attrsOf bool;
    };

    healthz = {
--- a/nixos/modules/services/cluster/kubernetes/proxy.nix
+++ b/nixos/modules/services/cluster/kubernetes/proxy.nix
@ -30,10 +30,10 @@ in
    };

    featureGates = mkOption {
-      description = "List set of feature gates";
+      description = "Attribute set of feature gates.";
      default = top.featureGates;
      defaultText = literalExpression "config.${otop.featureGates}";
-      type = listOf str;
+      type = attrsOf bool;
    };

    hostname = mkOption {
@ -69,8 +69,8 @@ in
          --bind-address=${cfg.bindAddress} \
          ${optionalString (top.clusterCidr!=null)
            "--cluster-cidr=${top.clusterCidr}"} \
-          ${optionalString (cfg.featureGates != [])
-            "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
+          ${optionalString (cfg.featureGates != {})
+            "--feature-gates=${concatStringsSep "," (builtins.attrValues (mapAttrs (n: v: "${n}=${trivial.boolToString v}") cfg.featureGates))}"} \
          --hostname-override=${cfg.hostname} \
          --kubeconfig=${top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \
          ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
--- a/nixos/modules/services/cluster/kubernetes/scheduler.nix
+++ b/nixos/modules/services/cluster/kubernetes/scheduler.nix
@ -26,10 +26,10 @@ in
    };

    featureGates = mkOption {
-      description = "List set of feature gates";
+      description = "Attribute set of feature gates.";
      default = top.featureGates;
      defaultText = literalExpression "config.${otop.featureGates}";
-      type = listOf str;
+      type = attrsOf bool;
    };

    kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes scheduler";
@ -67,8 +67,8 @@ in
        Slice = "kubernetes.slice";
        ExecStart = ''${top.package}/bin/kube-scheduler \
          --bind-address=${cfg.address} \
-          ${optionalString (cfg.featureGates != [])
-            "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
+          ${optionalString (cfg.featureGates != {})
+            "--feature-gates=${concatStringsSep "," (builtins.attrValues (mapAttrs (n: v: "${n}=${trivial.boolToString v}") cfg.featureGates))}"} \
          --kubeconfig=${top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \
          --leader-elect=${boolToString cfg.leaderElect} \
          --secure-port=${toString cfg.port} \
--- a/nixos/modules/services/networking/mosquitto.nix
+++ b/nixos/modules/services/networking/mosquitto.nix
@ -483,7 +483,7 @@ let

    listeners = mkOption {
      type = listOf listenerOptions;
-      default = {};
+      default = [];
      description = ''
        Listeners to configure on this broker.
      '';
--- a/nixos/tests/kubernetes/base.nix
+++ b/nixos/tests/kubernetes/base.nix
@ -59,6 +59,10 @@ let
                  securePort = 443;
                  advertiseAddress = master.ip;
                };
+                # NOTE: what featureGates are useful for testing might change in
+                # the future, see link below to find new ones
+                # https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/
+                featureGates = {CPUManager = true; AppArmor= false;};
                masterAddress = "${masterName}.${config.networking.domain}";
              };
            }
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
--- a/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/developer-edition_sources.nix
--- a/pkgs/applications/networking/browsers/firefox/packages.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages.nix
@ -35,11 +35,11 @@

  firefox-beta = buildMozillaMach rec {
    pname = "firefox-beta";
-    version = "129.0b9";
+    version = "130.0b2";
    applicationName = "Mozilla Firefox Beta";
    src = fetchurl {
      url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "f4f9efb640c7db12301b1b7d23b417e6786a9072f617d2e8a1bdbcaaa4d50d6a4d49d06566d3fff7b066b32ad39aeb0dcd003721c110c2add77dbd3d68df6a0c";
+      sha512 = "bfba17643923ec10686df7d0047e0fcba7716f96a645722869cc472f68bb42415e63ce37905a7d41f1bb3aa139ee7d336ac838bbbff105b3785eb522ebcb7eb0";
    };

    meta = {
@ -64,13 +64,13 @@

  firefox-devedition = buildMozillaMach rec {
    pname = "firefox-devedition";
-    version = "129.0b9";
+    version = "130.0b2";
    applicationName = "Mozilla Firefox Developer Edition";
    requireSigning = false;
    branding = "browser/branding/aurora";
    src = fetchurl {
      url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-      sha512 = "225c7abd58b7dd1e6c54e4a5172b7dc4ea19f9f90930d6823d15f2f80524f4f910eb4cb7cf3f863722490447ac8f146654ab129ee89766306b4a6992e2706b20";
+      sha512 = "ef26fa3dad6fdafe8e8e2d9d88101b75244b3f21a499d0b61c4a2c9a0addbcd3184274096a34da958b0ab2489ecf6c3d7684a1f507ed687648b96f9e9e2b123c";
    };

    meta = {
--- a/pkgs/by-name/di/dim/Cargo.lock
+++ b/pkgs/by-name/di/dim/Cargo.lock
@ -643,7 +643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8"
 dependencies = [
 "percent-encoding",
- "time 0.3.30",
+ "time 0.3.36",
 "version_check",
 ]

@ -2156,6 +2156,12 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@ -3300,12 +3306,13 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.30"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
 "deranged",
 "itoa",
+ "num-conv",
 "powerfmt",
 "serde",
 "time-core",
@ -3320,10 +3327,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

 [[package]]
 name = "time-macros"
-version = "0.2.15"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
+ "num-conv",
 "time-core",
 ]

@ -3538,7 +3546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
 dependencies = [
 "crossbeam-channel",
- "time 0.3.30",
+ "time 0.3.36",
 "tracing-subscriber",
 ]

--- a/pkgs/by-name/mc/mcumgr-client/Cargo.lock
+++ b/pkgs/by-name/mc/mcumgr-client/Cargo.lock
@ -1,965 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "anstream"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
-dependencies = [
- "windows-sys",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
-dependencies = [
- "anstyle",
- "windows-sys",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.81"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
-
-[[package]]
-name = "autocfg"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
-
-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
-[[package]]
-name = "bincode"
-version = "1.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "clap"
-version = "4.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn 2.0.58",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
-[[package]]
-name = "console"
-version = "0.15.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
-dependencies = [
- "encode_unicode",
- "lazy_static",
- "libc",
- "unicode-width",
- "windows-sys",
-]
-
-[[package]]
-name = "core-foundation-sys"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crc16"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "deranged"
-version = "0.3.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-dependencies = [
- "powerfmt",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "encode_unicode"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi",
-]
-
-[[package]]
-name = "half"
-version = "1.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hex"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
-
-[[package]]
-name = "indicatif"
-version = "0.17.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
-dependencies = [
- "console",
- "instant",
- "number_prefix",
- "portable-atomic",
- "unicode-width",
-]
-
-[[package]]
-name = "instant"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "io-kit-sys"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "617ee6cf8e3f66f3b4ea67a4058564628cde41901316e19f559e14c7c72c5e7b"
-dependencies = [
- "core-foundation-sys",
- "mach2",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.153"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
-
-[[package]]
-name = "libudev"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b324152da65df7bb95acfcaab55e3097ceaab02fb19b228a9eb74d55f135e0"
-dependencies = [
- "libc",
- "libudev-sys",
-]
-
-[[package]]
-name = "libudev-sys"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
-[[package]]
-name = "log"
-version = "0.4.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
-
-[[package]]
-name = "mach2"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b955cdeb2a02b9117f121ce63aa52d08ade45de53e48fe6a38b39c10f6f709"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "mcumgr-client"
-version = "0.0.4"
-dependencies = [
- "anyhow",
- "base64",
- "bincode",
- "byteorder",
- "clap",
- "crc16",
- "hex",
- "humantime",
- "indicatif",
- "lazy_static",
- "log",
- "num",
- "num-derive",
- "num-traits",
- "rand",
- "serde",
- "serde_bytes",
- "serde_cbor",
- "serde_json",
- "serde_repr",
- "serialport",
- "sha2",
- "simplelog",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
-
-[[package]]
-name = "nix"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
-dependencies = [
- "bitflags 1.3.2",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "num"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
-dependencies = [
- "num-bigint",
- "num-complex",
- "num-integer",
- "num-iter",
- "num-rational",
- "num-traits",
-]
-
-[[package]]
-name = "num-bigint"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-complex"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-conv"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-
-[[package]]
-name = "num-derive"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "num-integer"
-version = "0.1.46"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "num-iter"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-rational"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-dependencies = [
- "autocfg",
- "num-bigint",
- "num-integer",
- "num-traits",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "num_threads"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "number_prefix"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
-
-[[package]]
-name = "pkg-config"
-version = "0.3.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
-
-[[package]]
-name = "portable-atomic"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
-
-[[package]]
-name = "powerfmt"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
-
-[[package]]
-name = "regex"
-version = "1.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
-
-[[package]]
-name = "ryu"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "serde"
-version = "1.0.197"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_bytes"
-version = "0.11.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "serde_cbor"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
-dependencies = [
- "half",
- "serde",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.197"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.58",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.115"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_repr"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.58",
-]
-
-[[package]]
-name = "serialport"
-version = "4.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f5a15d0be940df84846264b09b51b10b931fb2f275becb80934e3568a016828"
-dependencies = [
- "bitflags 2.5.0",
- "cfg-if",
- "core-foundation-sys",
- "io-kit-sys",
- "libudev",
- "mach2",
- "nix",
- "regex",
- "scopeguard",
- "unescaper",
- "winapi",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "simplelog"
-version = "0.12.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
-dependencies = [
- "log",
- "termcolor",
- "time",
-]
-
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.58",
-]
-
-[[package]]
-name = "time"
-version = "0.3.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
-dependencies = [
- "deranged",
- "itoa",
- "libc",
- "num-conv",
- "num_threads",
- "powerfmt",
- "serde",
- "time-core",
- "time-macros",
-]
-
-[[package]]
-name = "time-core"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
-
-[[package]]
-name = "time-macros"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
-dependencies = [
- "num-conv",
- "time-core",
-]
-
-[[package]]
-name = "typenum"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
-
-[[package]]
-name = "unescaper"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0adf6ad32eb5b3cadff915f7b770faaac8f7ff0476633aa29eb0d9584d889d34"
-dependencies = [
- "thiserror",
-]
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
-
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
--- a/pkgs/by-name/mc/mcumgr-client/package.nix
+++ b/pkgs/by-name/mc/mcumgr-client/package.nix
@ -2,6 +2,7 @@
  lib,
  rustPlatform,
  fetchFromGitHub,
+  nix-update-script,
  pkg-config,
  udev,
  stdenv,
@ -10,22 +11,18 @@

 rustPlatform.buildRustPackage rec {
  pname = "mcumgr-client";
-  version = "0.0.4";
+  version = "0.0.7";

  src = fetchFromGitHub {
    owner = "vouch-opensource";
    repo = "mcumgr-client";
    rev = "v${version}";
-    hash = "sha256-MTNMnA5/CzwVrhNhDrfaXOatT4BFmc4nOPhIxTyc248=";
+    hash = "sha256-P5ykIVdWAxuCblMe7kzjswEca/+MsqpizCGUHIpR4qc=";
  };

-  cargoLock = {
-    lockFile = ./Cargo.lock;
-  };
+  cargoHash = "sha256-9jlthe7YQJogcjGv+TOk+O2YW3Xrq6h9tTjXdKHG99k=";

-  postPatch = ''
-    ln -s ${./Cargo.lock} Cargo.lock
-  '';
+  passthru.updateScript = nix-update-script { };

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/by-name/md/mdbook-d2/package.nix
+++ b/pkgs/by-name/md/mdbook-d2/package.nix
@ -7,16 +7,17 @@

 rustPlatform.buildRustPackage rec {
  pname = "mdbook-d2";
-  version = "unstable-2023-03-30";
+  version = "0.3.0";

  src = fetchFromGitHub {
    owner = "danieleades";
    repo = "mdbook-d2";
-    rev = "93f3037ad9730d134c929cfc90d9bd592a48a1a9";
-    hash = "sha256-cmmOmJHARIBCQQEsffnBh4nc2XEDPBzLPcCrOwfTKS8=";
+    rev = "v${version}";
+    hash = "sha256-IkMydlmUQrZbOZYzQFxzROhdwlcO0H6MzQo42fBEYQE=";
  };

-  cargoHash = "sha256-ACwEWK5upeRLo7HU+1kKunecnEeZm0ufUaQjJkXM/4I=";
+  cargoHash = "sha256-xc00/FOQtAg2u8bZxaTbk8+gX7r+q9O8DKgWchPnOJc=";
+  doCheck = false;

  buildInputs = lib.optionals stdenv.isDarwin [
    darwin.apple_sdk.frameworks.CoreFoundation
--- a/pkgs/by-name/of/offat/package.nix
+++ b/pkgs/by-name/of/offat/package.nix
@ -6,14 +6,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "offat";
-  version = "0.19.1";
+  version = "0.19.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "OWASP";
    repo = "OFFAT";
    rev = "refs/tags/v${version}";
-    hash = "sha256-USSvUtY5THzsWlJtVYxrCquRJWfAoD7b7NHP7pB27sg=";
+    hash = "sha256-LZd9nMeI+TMd95r6CuNAB7eMqrE97ne0ioPjuIbtK7w=";
  };

  sourceRoot = "${src.name}/src";
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@ -1,71 +1,65 @@
-{ lib
-, stdenv
-, fetchurl
-, cmake
-, extra-cmake-modules
-, qttools
-, wrapQtAppsHook
-, exiv2
-, graphicsmagick
-, libarchive
-, libraw
-, mpv
-, poppler
-, pugixml
-, qtbase
-, qtcharts
-, qtdeclarative
-, qtimageformats
-, qtlocation
-, qtmultimedia
-, qtpositioning
-, qtsvg
-, zxing-cpp
-, qtwayland
+{
+  lib,
+  stdenv,
+  fetchurl,
+  cmake,
+  extra-cmake-modules,
+  exiv2,
+  graphicsmagick,
+  libarchive,
+  libraw,
+  mpv,
+  pugixml,
+  qt6,
+  qt6Packages,
+  zxing-cpp,
 }:

 stdenv.mkDerivation rec {
  pname = "photoqt";
-  version = "4.5";
+  version = "4.6";

  src = fetchurl {
    url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz";
-    hash = "sha256-QFziMNRhiM4LaNJ8RkJ0iCq/8J82wn0F594qJeSN3Lw=";
+    hash = "sha256-5VbGMJ1B9yDbTiri7SZ+r+c9LdfG/C1c0/01QBUvbCY=";
  };

  nativeBuildInputs = [
    cmake
    extra-cmake-modules
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
  ];

-  buildInputs = [
-    exiv2
-    graphicsmagick
-    libarchive
-    libraw
-    mpv
-    poppler
-    pugixml
-    qtbase
-    qtcharts
-    qtdeclarative
-    qtimageformats
-    qtlocation
-    qtmultimedia
-    qtpositioning
-    qtsvg
-    zxing-cpp
-  ] ++ lib.optionals stdenv.isLinux [
-    qtwayland
-  ];
+  buildInputs =
+    [
+      exiv2
+      graphicsmagick
+      libarchive
+      libraw
+      pugixml
+      qt6.qtbase
+      qt6.qtcharts
+      qt6.qtdeclarative
+      qt6.qtimageformats
+      qt6.qtlocation
+      qt6.qtmultimedia
+      qt6.qtpositioning
+      qt6.qtsvg
+      qt6Packages.poppler
+      zxing-cpp
+    ]
+    ++ lib.optionals stdenv.isLinux [
+      mpv
+      qt6.qtwayland
+    ];

  cmakeFlags = [
    (lib.cmakeBool "DEVIL" false)
    (lib.cmakeBool "CHROMECAST" false)
    (lib.cmakeBool "FREEIMAGE" false)
    (lib.cmakeBool "IMAGEMAGICK" false)
+    (lib.cmakeBool "VIDEO_MPV" (!stdenv.isDarwin))
  ];

  env.MAGICK_LOCATION = "${graphicsmagick}/include/GraphicsMagick";
--- a/pkgs/by-name/pi/pioasm/package.nix
+++ b/pkgs/by-name/pi/pioasm/package.nix
@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "pioasm";
-  version = "1.5.1";
+  version = "2.0.0";

  src = fetchFromGitHub {
    owner = "raspberrypi";
    repo = "pico-sdk";
    rev = finalAttrs.version;
-    hash = "sha256-JNcxd86XNNiPkvipVFR3X255boMmq+YcuJXUP4JwInU=";
+    hash = "sha256-d6mEjuG8S5jvJS4g8e90gFII3sEqUVlT2fgd9M9LUkA=";
  };
  sourceRoot = "${finalAttrs.src.name}/tools/pioasm";

--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "stevenblack-blocklist";
-  version = "3.14.90";
+  version = "3.14.95";

  src = fetchFromGitHub {
    owner = "StevenBlack";
    repo = "hosts";
    rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-0/niQ0qWzGesqWIe/NZ2SD0Pdvk3GRsY1mT24eFMpt8=";
+    hash = "sha256-AEwBEWem50+NhMhHRoPLAxrN5N85RLIW+7iFXugn2Ek=";
  };

  outputs = [
--- a/pkgs/by-name/ub/ubuntu-sans/package.nix
+++ b/pkgs/by-name/ub/ubuntu-sans/package.nix
@ -8,13 +8,13 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "ubuntu-sans";
-  version = "1.004";
+  version = "1.006";

  src = fetchFromGitHub {
    owner = "canonical";
    repo = "Ubuntu-Sans-fonts";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-TJHhRGBPDrYOAmOKyMaLcL2ugr4Bw2J6ErovglNx648=";
+    hash = "sha256-PvDNQaOgJUb3/ubhqVSUMfinxfbhuQ0BnqYs3xshrhc=";
  };

  installPhase = ''
--- a/pkgs/by-name/ve/veloren/Cargo.lock
+++ b/pkgs/by-name/ve/veloren/Cargo.lock
--- a/pkgs/by-name/ve/veloren/fix-assets-path.patch
+++ b/pkgs/by-name/ve/veloren/fix-assets-path.patch
@ -0,0 +1,24 @@
+commit 3048885aa749774b5677ab8df8f1a3eeff125d7a
+Author: rnhmjoj <rnhmjoj@inventati.org>
+Date:   Tue Aug 6 08:36:38 2024 +0200
+
+    Fix assets path on NixOS
+
+diff --git a/common/assets/src/lib.rs b/common/assets/src/lib.rs
+index 03746dc4..c69d607b 100644
+--- a/common/assets/src/lib.rs
+++ b/common/assets/src/lib.rs
+@@ -400,6 +400,13 @@ lazy_static! {
+             }
+         }
+ 
+        // 5. NixOS path
+        if let Some(executable) = std::env::args().nth(0).map(PathBuf::from) {
+            if let Some(package) = executable.ancestors().nth(2) {
+                paths.push(package.join("share/veloren"));
+            }
+        }
+
+         tracing::trace!("Possible asset locations paths={:?}", paths);
+ 
+         for mut path in paths.clone() {
--- a/pkgs/by-name/ve/veloren/fix-on-rust-stable.patch
+++ b/pkgs/by-name/ve/veloren/fix-on-rust-stable.patch
@ -0,0 +1,440 @@
+commit 0829b00ec1a14c8248e1aadca22b132a1b21c40f
+Author: rnhmjoj <rnhmjoj@inventati.org>
+Date:   Mon Aug 5 00:34:55 2024 +0200
+
+    update toolchain to `2024-05-14`
+    
+    Backport of 6ec900cf to v0.16.0
+
+diff --git a/.cargo/config b/.cargo/config.toml
+similarity index 100%
+rename from .cargo/config
+rename to .cargo/config.toml
+diff --git a/Cargo.lock b/Cargo.lock
+index d0f84803..6f90da69 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -45,17 +45,6 @@ version = "0.4.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0453232ace82dee0dd0b4c87a59bd90f7b53b314f3e0f61fe2ee7c8a16482289"
+ 
+-[[package]]
+-name = "ahash"
+-version = "0.7.8"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+-dependencies = [
+- "getrandom 0.2.12",
+- "once_cell",
+- "version_check",
+-]
+-
+ [[package]]
+ name = "ahash"
+ version = "0.8.11"
+@@ -4538,16 +4527,6 @@ dependencies = [
+  "ttf-parser",
+ ]
+ 
+-[[package]]
+-name = "packed_simd"
+-version = "0.3.9"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1f9f08af0c877571712e2e3e686ad79efad9657dbf0f7c3c8ba943ff6c38932d"
+-dependencies = [
+- "cfg-if 1.0.0",
+- "num-traits",
+-]
+-
+ [[package]]
+ name = "parking"
+ version = "2.2.0"
+@@ -5870,8 +5849,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+ 
+ [[package]]
+ name = "shred"
+-version = "0.15.0"
+-source = "git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85"
+version = "0.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "656294f5bdcf6d33f0cf89e88a72b58595e3fca0e77e4a4b9e9026179757fb1e"
+ dependencies = [
+  "ahash 0.8.11",
+  "arrayvec",
+@@ -5884,8 +5864,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "shred-derive"
+-version = "0.6.3"
+-source = "git+https://github.com/amethyst/shred.git?rev=5d52c6fc390dd04c12158633e77591f6523d1f85#5d52c6fc390dd04c12158633e77591f6523d1f85"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69760b786f8b40361c10663eb63c81fa7d828008527d26aa7595b99c53ab3a8d"
+ dependencies = [
+  "proc-macro2 1.0.79",
+  "quote 1.0.35",
+@@ -6019,10 +6000,9 @@ dependencies = [
+ [[package]]
+ name = "specs"
+ version = "0.20.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a60eabdfd5a80e458c3e7bcc9f1076d6ce3cc8ddb71d69691f00fc0de735a635"
+source = "git+https://github.com/amethyst/specs.git?rev=4e2da1df29ee840baa9b936593c45592b7c9ae27#4e2da1df29ee840baa9b936593c45592b7c9ae27"
+ dependencies = [
+- "ahash 0.7.8",
+ "ahash 0.8.11",
+  "crossbeam-queue",
+  "hibitset",
+  "log",
+@@ -6904,9 +6884,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "vek"
+-version = "0.16.1"
+version = "0.17.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c85158043f3bc1fac596d59a77e07948da340b9951b451ed4cb4a8c480aa2157"
+checksum = "cb40015035f83ba23d647e647f8be060d0f6f99b7c7687989fbca3e3d65e7234"
+ dependencies = [
+  "approx 0.5.1",
+  "num-integer",
+@@ -6936,7 +6916,7 @@ dependencies = [
+  "specs",
+  "tokio",
+  "tracing",
+- "vek 0.16.1",
+ "vek 0.17.0",
+  "veloren-client-i18n",
+  "veloren-common",
+  "veloren-common-base",
+@@ -7007,7 +6987,7 @@ dependencies = [
+  "tracing",
+  "tracing-subscriber",
+  "uuid",
+- "vek 0.16.1",
+ "vek 0.17.0",
+  "veloren-common-assets",
+  "veloren-common-base",
+  "veloren-common-i18n",
+@@ -7092,7 +7072,7 @@ dependencies = [
+  "specs",
+  "sum_type",
+  "tracing",
+- "vek 0.16.1",
+ "vek 0.17.0",
+  "veloren-common",
+ ]
+ 
+@@ -7116,7 +7096,7 @@ dependencies = [
+  "timer-queue",
+  "toml 0.8.12",
+  "tracing",
+- "vek 0.16.1",
+ "vek 0.17.0",
+  "veloren-common",
+  "veloren-common-assets",
+  "veloren-common-base",
+@@ -7136,7 +7116,7 @@ dependencies = [
+  "rayon",
+  "specs",
+  "tracing",
+- "vek 0.16.1",
+ "vek 0.17.0",
+  "veloren-common",
+  "veloren-common-base",
+  "veloren-common-ecs",
+@@ -7208,7 +7188,7 @@ dependencies = [
+  "serde",
+  "slotmap",
+  "tracing",
+- "vek 0.16.1",
+ "vek 0.17.0",
+  "veloren-common",
+  "veloren-world",
+ ]
+@@ -7251,7 +7231,7 @@ dependencies = [
+  "strum 0.24.1",
+  "tokio",
+  "tracing",
+- "vek 0.16.1",
+ "vek 0.17.0",
+  "veloren-common",
+  "veloren-common-base",
+  "veloren-common-ecs",
+@@ -7272,7 +7252,7 @@ dependencies = [
+  "lazy_static",
+  "rand 0.8.5",
+  "specs",
+- "vek 0.16.1",
+ "vek 0.17.0",
+  "veloren-common",
+  "veloren-common-dynlib",
+  "veloren-rtsim",
+@@ -7368,7 +7348,7 @@ dependencies = [
+  "tokio",
+  "tracing",
+  "treeculler",
+- "vek 0.16.1",
+ "vek 0.17.0",
+  "veloren-client",
+  "veloren-client-i18n",
+  "veloren-common",
+@@ -7396,7 +7376,7 @@ version = "0.10.0"
+ dependencies = [
+  "bytemuck",
+  "lazy_static",
+- "vek 0.16.1",
+ "vek 0.17.0",
+  "veloren-common",
+  "veloren-common-dynlib",
+ ]
+@@ -7452,7 +7432,6 @@ dependencies = [
+  "num 0.4.1",
+  "num-traits",
+  "ordered-float 3.9.2",
+- "packed_simd",
+  "rand 0.8.5",
+  "rand_chacha 0.3.1",
+  "rayon",
+@@ -7465,7 +7444,7 @@ dependencies = [
+  "svg_fmt",
+  "tracing",
+  "tracing-subscriber",
+- "vek 0.16.1",
+ "vek 0.17.0",
+  "veloren-common",
+  "veloren-common-base",
+  "veloren-common-dynlib",
+diff --git a/Cargo.toml b/Cargo.toml
+index c8d02902..02521745 100644
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -1,5 +1,3 @@
+-cargo-features = ["named-profiles", "profile-overrides"]
+-
+ [workspace]
+ resolver = "2"
+ members = [
+@@ -141,7 +139,7 @@ crossbeam-channel = { version = "0.5"}
+ ordered-float = { version = "3", default-features = true }
+ num = { version = "0.4" }
+ num-traits = { version = "0.2" }
+-vek = { version = "0.16.1", features = ["serde"] }
+vek = { version = "0.17.0", features = ["serde"] }
+ itertools = { version = "0.10" }
+ 
+ serde = { version = "1.0.118", features = ["derive"] }
+@@ -158,7 +156,7 @@ sha2 = "0.10"
+ hex = "0.4.3"
+ 
+ [patch.crates-io]
+-shred = { git = "https://github.com/amethyst/shred.git", rev = "5d52c6fc390dd04c12158633e77591f6523d1f85" }
+specs = { git = "https://github.com/amethyst/specs.git", rev = "4e2da1df29ee840baa9b936593c45592b7c9ae27" }
+ # This is needed because of:
+ # * an issue with spirv & naga in wgpu 0.18 (I assume this is fixed upstream but not in 0.18)
+ # * an issue with uint in uniforms for gl. (potentially fixed in 0.19?)
+diff --git a/client/i18n/src/error.rs b/client/i18n/src/error.rs
+index 99f47bad..37eaa097 100644
+--- a/client/i18n/src/error.rs
+++ b/client/i18n/src/error.rs
+@@ -45,6 +45,7 @@ pub enum ResourceErr {
+         #[allow(dead_code)] // false-positive
+         err: String,
+     },
+    #[allow(dead_code)] // false-positive
+     BundleError(String),
+ }
+ 
+diff --git a/rtsim/src/lib.rs b/rtsim/src/lib.rs
+index 11477390..ef62db65 100644
+--- a/rtsim/src/lib.rs
+++ b/rtsim/src/lib.rs
+@@ -7,7 +7,8 @@
+     binary_heap_drain_sorted,
+     fn_traits,
+     unboxed_closures,
+-    tuple_trait
+    tuple_trait,
+    trait_upcasting
+ )]
+ 
+ pub mod ai;
+diff --git a/rust-toolchain b/rust-toolchain
+index f1273305..e426a2f8 100644
+--- a/rust-toolchain
+++ b/rust-toolchain
+@@ -1 +1 @@
+-nightly-2024-01-17
+nightly-2024-05-14
+diff --git a/server/agent/src/lib.rs b/server/agent/src/lib.rs
+index 420bd5ff..4a927c74 100644
+--- a/server/agent/src/lib.rs
+++ b/server/agent/src/lib.rs
+@@ -1,4 +1,4 @@
+-#![feature(exclusive_range_pattern, let_chains)]
+#![feature(let_chains)]
+ #![allow(
+     clippy::needless_pass_by_ref_mut //until we find a better way for specs
+ )]
+diff --git a/server/src/persistence/models.rs b/server/src/persistence/models.rs
+index df148742..70baed42 100644
+--- a/server/src/persistence/models.rs
+++ b/server/src/persistence/models.rs
+@@ -1,5 +1,6 @@
+ pub struct Character {
+     pub character_id: i64,
+    #[allow(dead_code)]
+     pub player_uuid: String,
+     pub alias: String,
+     pub waypoint: Option<String>,
+@@ -16,6 +17,7 @@ pub struct Item {
+ }
+ 
+ pub struct Body {
+    #[allow(dead_code)]
+     pub body_id: i64,
+     pub variant: String,
+     pub body_data: String,
+@@ -38,6 +40,7 @@ pub struct Pet {
+ }
+ 
+ pub struct AbilitySets {
+    #[allow(dead_code)]
+     pub entity_id: i64,
+     pub ability_sets: String,
+ }
+diff --git a/voxygen/src/credits.rs b/voxygen/src/credits.rs
+index 2de54687..be49ac97 100644
+--- a/voxygen/src/credits.rs
+++ b/voxygen/src/credits.rs
+@@ -7,6 +7,7 @@ use std::path::PathBuf;
+ 
+ // See best practices for attribution: https://wiki.creativecommons.org/wiki/Best_practices_for_attribution
+ 
+#[allow(dead_code)]
+ #[derive(Clone, Deserialize)]
+ pub struct Art {
+     /// Name of the art.
+diff --git a/voxygen/src/hud/mod.rs b/voxygen/src/hud/mod.rs
+index e62250ca..6be79389 100755
+--- a/voxygen/src/hud/mod.rs
+++ b/voxygen/src/hud/mod.rs
+@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)] // because of WidgetCommon derive
+ mod animation;
+ mod bag;
+ mod buffs;
+diff --git a/voxygen/src/render/renderer/rain_occlusion_map.rs b/voxygen/src/render/renderer/rain_occlusion_map.rs
+index bdc44f98..68026806 100644
+--- a/voxygen/src/render/renderer/rain_occlusion_map.rs
+++ b/voxygen/src/render/renderer/rain_occlusion_map.rs
+@@ -11,7 +11,6 @@ pub struct RainOcclusionMapRenderer {
+ 
+     pub terrain_pipeline: rain_occlusion::RainOcclusionPipeline,
+     pub figure_pipeline: rain_occlusion::RainOcclusionFigurePipeline,
+-    pub layout: rain_occlusion::RainOcclusionLayout,
+ }
+ 
+ pub enum RainOcclusionMap {
+@@ -31,13 +30,10 @@ impl RainOcclusionMap {
+         if let (Some(terrain_pipeline), Some(figure_pipeline), Some(depth)) =
+             (directed, figure, view)
+         {
+-            let layout = rain_occlusion::RainOcclusionLayout::new(device);
+-
+             Self::Enabled(RainOcclusionMapRenderer {
+                 depth,
+                 terrain_pipeline,
+                 figure_pipeline,
+-                layout,
+             })
+         } else {
+             Self::Disabled(Self::create_dummy_tex(device, queue))
+diff --git a/voxygen/src/render/renderer/shadow_map.rs b/voxygen/src/render/renderer/shadow_map.rs
+index 7b5ab16e..b15a2da3 100644
+--- a/voxygen/src/render/renderer/shadow_map.rs
+++ b/voxygen/src/render/renderer/shadow_map.rs
+@@ -12,7 +12,6 @@ pub struct ShadowMapRenderer {
+     pub terrain_directed_pipeline: shadow::ShadowPipeline,
+     pub figure_directed_pipeline: shadow::ShadowFigurePipeline,
+     pub debug_directed_pipeline: shadow::ShadowDebugPipeline,
+-    pub layout: shadow::ShadowLayout,
+ }
+ 
+ pub enum ShadowMap {
+@@ -43,8 +42,6 @@ impl ShadowMap {
+         {
+             let (point_depth, directed_depth) = shadow_views;
+ 
+-            let layout = shadow::ShadowLayout::new(device);
+-
+             Self::Enabled(ShadowMapRenderer {
+                 directed_depth,
+                 point_depth,
+@@ -53,8 +50,6 @@ impl ShadowMap {
+                 terrain_directed_pipeline,
+                 figure_directed_pipeline,
+                 debug_directed_pipeline,
+-
+-                layout,
+             })
+         } else {
+             let (dummy_point, dummy_directed) = Self::create_dummy_shadow_tex(device, queue);
+diff --git a/voxygen/src/ui/widgets/mod.rs b/voxygen/src/ui/widgets/mod.rs
+index e7ce5ee8..622e7e9e 100644
+--- a/voxygen/src/ui/widgets/mod.rs
+++ b/voxygen/src/ui/widgets/mod.rs
+@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)] // because of WidgetCommon derive
+ pub mod ghost_image;
+ pub mod image_frame;
+ pub mod image_slider;
+diff --git a/world/Cargo.toml b/world/Cargo.toml
+index 92bd288f..6ff2e79e 100644
+--- a/world/Cargo.toml
+++ b/world/Cargo.toml
+@@ -7,11 +7,11 @@ edition = "2021"
+ [features]
+ use-dyn-lib = ["common-dynlib"]
+ be-dyn-lib = []
+-simd = ["vek/platform_intrinsics", "packed_simd"]
+simd = ["vek/platform_intrinsics"]
+ bin_compression = ["lz-fear", "deflate", "flate2", "image/jpeg", "num-traits", "fallible-iterator", "rstar", "cli"]
+ cli = ["clap", "signal-hook", "indicatif"]
+ 
+-default = ["simd"]
+default = []
+ 
+ [dependencies]
+ common = { package = "veloren-common", path = "../common" }
+@@ -36,7 +36,6 @@ tracing = { workspace = true }
+ rand = { workspace = true }
+ rand_chacha = { workspace = true }
+ arr_macro = "0.2.1"
+-packed_simd = { version = "0.3.9", optional = true }
+ rayon = { workspace = true }
+ serde = { workspace = true }
+ ron = { workspace = true }
+diff --git a/world/src/site2/gen.rs b/world/src/site2/gen.rs
+index 59c57766..0800ccee 100644
+--- a/world/src/site2/gen.rs
+++ b/world/src/site2/gen.rs
+@@ -1415,18 +1415,6 @@ impl<'a, const N: usize> PrimitiveTransform for [PrimitiveRef<'a>; N] {
+     }
+ }
+ 
+-pub trait PrimitiveGroupFill<const N: usize> {
+-    fn fill_many(self, fills: [Fill; N]);
+-}
+-
+-impl<const N: usize> PrimitiveGroupFill<N> for [PrimitiveRef<'_>; N] {
+-    fn fill_many(self, fills: [Fill; N]) {
+-        for i in 0..N {
+-            self[i].fill(fills[i].clone());
+-        }
+-    }
+-}
+-
+ pub trait Structure {
+     #[cfg(feature = "use-dyn-lib")]
+     const UPDATE_FN: &'static [u8];
--- a/pkgs/by-name/ve/veloren/package.nix
+++ b/pkgs/by-name/ve/veloren/package.nix
@ -0,0 +1,122 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitLab,
+  pkg-config,
+  vulkan-loader,
+  alsa-lib,
+  udev,
+  shaderc,
+  xorg,
+  libxkbcommon,
+}:
+
+let
+  # Note: use this to get the release metadata
+  # https://gitlab.com/api/v4/projects/10174980/repository/tags/v{version}
+  version = "0.16.0";
+  date = "2023-03-30-03:28";
+  rev = "80fe5ca64b40fbf3e0e393a44f8880a79a6a5380";
+in
+
+rustPlatform.buildRustPackage {
+  pname = "veloren";
+  inherit version;
+
+  src = fetchFromGitLab {
+    owner = "veloren";
+    repo = "veloren";
+    inherit rev;
+    hash = "sha256-h2hLO227aeK2oEFfdGMgmtMkA9cn9AgQ9w6myb+8W8c=";
+  };
+
+  cargoLock.lockFile = ./Cargo.lock;
+  cargoLock.outputHashes = {
+    # Hashes of dependencies pinned to a git commit
+    "auth-common-0.1.0" = "sha256-6tUutHLY309xSBT2D7YueAmsAWyVn410XNKFT8yuTgA=";
+    "conrod_core-0.63.0" = "sha256-GxakbJBVTFgbtUsa2QB105xgd+aULuWLBlv719MIzQY=";
+    "egui_wgpu_backend-0.26.0" = "sha256-47XZoE7bFRv/TG4EmM2qit5L21qsKT6Nt/t1y/NMneQ=";
+    "fluent-0.16.0" = "sha256-xN+DwObqoToqprLDy3yvTiqclIIOsuUtpAQ6W1mdf0I=";
+    "iced_core-0.4.0" = "sha256-5s6IXcitoGcHS0FUx/cujx9KLBpaUuMnugmBged1cLA=";
+    "keyboard-keynames-0.1.2" = "sha256-5I70zT+Lwt0JXJgTAy/VygHdxIBuE/u3pq8LP8NkRdE=";
+    "naga-0.14.2" = "sha256-yyLrJNhbu/RIVr0hM7D7Rwd7vH3xX8Dns+u6m8NEU2M=";
+    "portpicker-0.1.0" = "sha256-or1907XdrDIyFzHNmW6me2EIyEQ8sjVIowfGsypa4jU=";
+    "shaderc-0.8.0" = "sha256-BU736g075i3GqlyyB9oyoVlQqNcWbZEGa8cdge1aMq0=";
+    "specs-0.20.0" = "sha256-OHnlag6SJ1rlAYnlmVD+uqY+kFNsbQ42W21RrEa8Xn0=";
+  };
+  cargoPatches = [
+    ./fix-on-rust-stable.patch
+    ./fix-assets-path.patch
+  ];
+
+  postPatch = ''
+    # Force vek to build in unstable mode
+    cat <<'EOF' | tee "$cargoDepsCopy"/vek-*/build.rs
+    fn main() {
+      println!("cargo:rustc-check-cfg=cfg(nightly)");
+      println!("cargo:rustc-cfg=nightly");
+    }
+    EOF
+  '';
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [
+    alsa-lib
+    udev
+    xorg.libxcb
+    libxkbcommon
+  ];
+
+  buildNoDefaultFeatures = true;
+  buildFeatures = [ "default-publish" ];
+
+  env = {
+    # Enable unstable features, see https://gitlab.com/veloren/veloren/-/issues/264
+    RUSTC_BOOTSTRAP = true;
+
+    # Set version info, required by veloren-common
+    NIX_GIT_TAG = "v${version}";
+    NIX_GIT_HASH = "${lib.substring 0 7 rev}/${date}";
+
+    # Save game data under user's home directory,
+    # otherwise it defaults to $out/bin/../userdata
+    VELOREN_USERDATA_STRATEGY = "system";
+
+    # Use system shaderc
+    SHADERC_LIB_DIR = "${shaderc.lib}/lib";
+  };
+
+  # Some tests require internet access
+  doCheck = false;
+
+  postFixup = ''
+    # Add required but not explicitly requested libraries
+    patchelf --add-rpath '${
+      lib.makeLibraryPath [
+        xorg.libX11
+        xorg.libXi
+        xorg.libXcursor
+        xorg.libXrandr
+        vulkan-loader
+      ]
+    }' "$out/bin/veloren-voxygen"
+  '';
+
+  postInstall = ''
+    # Icons
+    install -Dm644 assets/voxygen/net.veloren.veloren.desktop -t "$out/share/applications"
+    install -Dm644 assets/voxygen/net.veloren.veloren.png "$out/share/pixmaps"
+    install -Dm644 assets/voxygen/net.veloren.veloren.metainfo.xml "$out/share/metainfo"
+    # Assets directory
+    mkdir -p "$out/share/veloren"; cp -ar assets "$out/share/veloren/"
+  '';
+
+  meta = with lib; {
+    description = "An open world, open source voxel RPG";
+    homepage = "https://www.veloren.net";
+    license = licenses.gpl3;
+    mainProgram = "veloren-voxygen";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ rnhmjoj tomodachi94 ];
+  };
+}
--- a/pkgs/development/compilers/rust/1_80.nix
+++ b/pkgs/development/compilers/rust/1_80.nix
@ -46,8 +46,8 @@ let
 in
 import ./default.nix
  {
-    rustcVersion = "1.80.0";
-    rustcSha256 = "sha256-b2BsGT8jD2ssrkV297JNUPX5sl3/Edv5si94fTUh1nI=";
+    rustcVersion = "1.80.1";
+    rustcSha256 = "sha256-LAuPZDlC3LgQy8xQ8pJWSxtuRNtdX0UJEVOZbfldLcQ=";

    llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
    llvmSharedForHost = llvmSharedFor pkgsBuildHost;
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@ -2,7 +2,7 @@
 , llvmShared, llvmSharedForBuild, llvmSharedForHost, llvmSharedForTarget, llvmPackages
 , runCommandLocal, fetchurl, file, python3
 , darwin, cargo, cmake, rustc, rustfmt
-, pkg-config, openssl, xz
+, pkg-config, openssl, xz, zlib
 , libiconv
 , which, libffi
 , withBundledLLVM ? false
@ -255,7 +255,7 @@ in stdenv.mkDerivation (finalAttrs: {
    ++ optionals fastCross [ lndir makeWrapper ];

  buildInputs = [ openssl ]
-    ++ optionals stdenv.isDarwin [ libiconv Security ]
+    ++ optionals stdenv.isDarwin [ libiconv Security zlib ]
    ++ optional (!withBundledLLVM) llvmShared.lib
    ++ optional (useLLVM && !withBundledLLVM) [
      llvmPackages.libunwind
--- a/pkgs/development/libraries/elpa/default.nix
+++ b/pkgs/development/libraries/elpa/default.nix
@ -101,7 +101,5 @@ stdenv.mkDerivation rec {
    license = licenses.lgpl3Only;
    platforms = platforms.linux;
    maintainers = [ maintainers.markuskowa ];
-    broken = true;  # At 2024-06-25. 49 unit tests fail.
-                    # https://hydra.nixos.org/build/263906391/nixlog/1
  };
 }
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@ -2443,14 +2443,14 @@ buildLuarocksPackage {
 lz-n = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
  pname = "lz.n";
-  version = "1.4.3-1";
+  version = "1.4.4-1";
  knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/lz.n-1.4.3-1.rockspec";
-    sha256 = "09nxw0yqqgg4i04fqs0q3c17b3grhz71irr1105m4gms9a292j4v";
+    url    = "mirror://luarocks/lz.n-1.4.4-1.rockspec";
+    sha256 = "15sslyvzwkfj3mz6z9by7slj063vxj52pyx9y7xqjsrrq1s54446";
  }).outPath;
  src = fetchzip {
-    url    = "https://github.com/nvim-neorocks/lz.n/archive/v1.4.3.zip";
-    sha256 = "11ic8hylck3dvlp6d9kzblingbi167j2kcid155x4hpc2hhqf2aj";
+    url    = "https://github.com/nvim-neorocks/lz.n/archive/v1.4.4.zip";
+    sha256 = "0aiqyybjhn2y4zzgr8lqvlvky2sr7fgp8nw4sh65pwki139ky2qh";
  };

  disabled = luaOlder "5.1";
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@ -8,7 +8,7 @@

 buildPythonPackage rec {
  pname = "adafruit-platformdetect";
-  version = "3.72.1";
+  version = "3.73.0";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -16,7 +16,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "adafruit_platformdetect";
    inherit version;
-    hash = "sha256-o2DMtf3f5gzlIwS7LVpTRZk98DmX4zt/0txl5Rw58Cw=";
+    hash = "sha256-IwkJityP+Hs9mkpdOu6+P3t/VasOE9Get1/6hl82+rg=";
  };

  build-system = [ setuptools-scm ];
--- a/pkgs/development/python-modules/bloodyad/default.nix
+++ b/pkgs/development/python-modules/bloodyad/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "bloodyad";
-  version = "2.0.5";
+  version = "2.0.6";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "CravateRouge";
    repo = "bloodyAD";
    rev = "refs/tags/v${version}";
-    hash = "sha256-svWFzq/maRqAcAoH3+PKlR6sbiU/hijzxobWd5pQ3o0=";
+    hash = "sha256-o035D6GYG1Uf59tFAAMsMF9kiY3yE15EDOCkg4V4tr4=";
  };

  build-system = [ hatchling ];
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@ -366,7 +366,7 @@

 buildPythonPackage rec {
  pname = "boto3-stubs";
-  version = "1.34.156";
+  version = "1.34.157";
  pyproject = true;

  disabled = pythonOlder "3.7";
@ -374,7 +374,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "boto3_stubs";
    inherit version;
-    hash = "sha256-w0IgoAtr0Ao80ya8XX4ylrfR2rGhVmDfb4+6SuMH/zk=";
+    hash = "sha256-paCANr9V+SblJzvHRTW9WL1uaNO5Hx3FEWBf4h8Mzz4=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/container-inspector/default.nix
+++ b/pkgs/development/python-modules/container-inspector/default.nix
@ -13,27 +13,21 @@

 buildPythonPackage rec {
  pname = "container-inspector";
-  version = "33.0.0";
-  format = "setuptools";
+  version = "33.0.1";
+  pyproject = true;

  disabled = pythonOlder "3.6";

  src = fetchFromGitHub {
    owner = "nexB";
-    repo = pname;
+    repo = "container-inspector";
    rev = "refs/tags/v${version}";
-    hash = "sha256-vtC42yq59vTE+4tF5CSm9zszj8goOP5i6+NMF2n4T1Q=";
+    hash = "sha256-bXJ4UIDVhiU0DurEeRiyLlSUrNRgwoMqAxXxGb/CcJs=";
  };

  dontConfigure = true;

-  postPatch = ''
-    # PEP440 support was removed in newer setuptools, https://github.com/nexB/container-inspector/pull/51
-    substituteInPlace setup.cfg \
-      --replace ">=3.7.*" ">=3.7"
-  '';
-
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];

  propagatedBuildInputs = [
    attrs
--- a/pkgs/development/python-modules/dm-control/default.nix
+++ b/pkgs/development/python-modules/dm-control/default.nix
@ -30,7 +30,7 @@

 buildPythonPackage rec {
  pname = "dm-control";
-  version = "1.0.21";
+  version = "1.0.22";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -39,7 +39,7 @@ buildPythonPackage rec {
    owner = "google-deepmind";
    repo = "dm_control";
    rev = "refs/tags/${version}";
-    hash = "sha256-yY75QpvZ0fAW2W0GVM7fzmXKmTdDyukCVC/1cyU5IjQ=";
+    hash = "sha256-Tw4VZmunSeb0H7ltPnLCEidSZ2cvcoWLei1DB32vWpw=";
  };

  build-system = [
--- a/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-appengine-logging/default.nix
@ -15,19 +15,20 @@

 buildPythonPackage rec {
  pname = "google-cloud-appengine-logging";
-  version = "1.4.4";
+  version = "1.4.5";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-i0Qn8G+6ZpqVn9VMjaY1YP9M8vjiwVjCDVR5sIiQR5U=";
+    pname = "google_cloud_appengine_logging";
+    inherit version;
+    hash = "sha256-3n12bl1nsZ/Fgzl0tQWzLSpbvfsoP9lB4yDnz9rky4M=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    google-api-core
    grpc-google-iam-v1
    proto-plus
--- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix
@ -15,19 +15,20 @@

 buildPythonPackage rec {
  pname = "google-cloud-bigquery-logging";
-  version = "1.4.4";
+  version = "1.4.5";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-t6u/PkEH7BC719Qv7ES+VKhknNTCYRfZ3srYSMtR+ko=";
+    pname = "google_cloud_bigquery_logging";
+    inherit version;
+    hash = "sha256-XrBXr0Y1vpxWceSR59ERQJKziMBI4+QBoHWK0Wt1cec=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    google-api-core
    grpc-google-iam-v1
    proto-plus
--- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
@ -15,19 +15,20 @@

 buildPythonPackage rec {
  pname = "google-cloud-iam-logging";
-  version = "1.3.4";
+  version = "1.3.5";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ZxNJV7jMqaMaN4Obt5sToUBmcXsfQHJPkNYnt8K+jf4=";
+    pname = "google_cloud_iam_logging";
+    inherit version;
+    hash = "sha256-B/OE8m6CpTddR+nAv9OP/y1V1c32/cUZPzfptAOuMrw=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    google-api-core
    grpc-google-iam-v1
    proto-plus
--- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
@ -15,19 +15,20 @@

 buildPythonPackage rec {
  pname = "google-cloud-vpc-access";
-  version = "1.10.4";
+  version = "1.10.5";
  pyproject = true;

  disabled = pythonOlder "3.8";

  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-FmCNw0esH7WbH0v4YzHyvc0lyRhJp3ywJNe+gMePdTU=";
+    pname = "google_cloud_vpc_access";
+    inherit version;
+    hash = "sha256-ee0O0MDo3VEUuansbm0Io35g/8aRA2ShoZh+IfwQAww=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    google-api-core
    google-auth
    proto-plus
--- a/pkgs/development/python-modules/google-cloud-workflows/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix
@ -14,19 +14,20 @@

 buildPythonPackage rec {
  pname = "google-cloud-workflows";
-  version = "1.14.4";
+  version = "1.14.5";
  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-qylBTJ2yAJGZt+xv9hRyYvP4zlTibhIIHVJF9J67d9c=";
+    pname = "google_cloud_workflows";
+    inherit version;
+    hash = "sha256-HNur2TEVRf8+sg6r8qmE62ZsOP0lF2ma1Fpp85lmfoM=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    google-api-core
    proto-plus
    protobuf
--- a/pkgs/development/python-modules/google-cloud-workstations/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix
@ -16,19 +16,20 @@

 buildPythonPackage rec {
  pname = "google-cloud-workstations";
-  version = "0.5.7";
+  version = "0.5.8";
  pyproject = true;

  disabled = pythonOlder "3.8";

  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-KQrTGUor4So+FqCiiUazqPRdYIY+G/OeOMjtOov7oxk=";
+    pname = "google_cloud_workstations";
+    inherit version;
+    hash = "sha256-Xu7oL5R/K3oHMea1xCwRLPoxgPNMFRSMYCQ73K9sMgQ=";
  };

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

-  propagatedBuildInputs = [
+  dependencies = [
    google-api-core
    google-auth
    grpc-google-iam-v1
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@ -22,7 +22,7 @@

 buildPythonPackage rec {
  pname = "plugwise";
-  version = "0.38.3";
+  version = "1.0.0";
  pyproject = true;

  disabled = pythonOlder "3.11";
@ -31,7 +31,7 @@ buildPythonPackage rec {
    owner = "plugwise";
    repo = "python-plugwise";
    rev = "refs/tags/v${version}";
-    hash = "sha256-DFHKycFWtR8moLyGaiDVqnrlg+ydgR8/UVgkUpzqAuY=";
+    hash = "sha256-OEEk0rMhvk99EVouotcNQlSfx5Xv23WswCQ5ZN5M3A4=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/pyegps/default.nix
+++ b/pkgs/development/python-modules/pyegps/default.nix
@ -0,0 +1,41 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  pyusb,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "pyegps";
+  version = "0.2.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "gnumpi";
+    repo = "pyegps";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-iixk2sFa4KAayKFmQKtPjvoIYgxCMXnfkliKhyO2ba4=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [ pyusb ];
+
+  pythonImportsCheck = [ "pyegps" ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    changelog = "https://github.com/gnumpi/pyEGPS/releases/tag/v${version}";
+    description = "Controlling Energenie Power Strips with python";
+    homepage = "https://github.com/gnumpi/pyegps";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
--- a/pkgs/development/python-modules/pyelectra/default.nix
+++ b/pkgs/development/python-modules/pyelectra/default.nix
@ -0,0 +1,37 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pyelectra";
+  version = "1.2.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jafar-atili";
+    repo = "pyelectra";
+    rev = "refs/tags/${version}";
+    hash = "sha256-3g+6AXbHMStk77k+1Qh5kgDswUZ8I627YiA/PguUGBg=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ aiohttp ];
+
+  pythonImportsCheck = [ "electrasmart" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/jafar-atili/pyElectra/releases/tag/${version}";
+    description = "Electra Smart Python Integration";
+    homepage = "https://github.com/jafar-atili/pyelectra";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
--- a/pkgs/development/python-modules/pyngo/default.nix
+++ b/pkgs/development/python-modules/pyngo/default.nix
@ -20,7 +20,7 @@

 buildPythonPackage rec {
  pname = "pyngo";
-  version = "2.1.0";
+  version = "2.2.0";
  pyproject = true;

  disabled = pythonOlder "3.10";
@ -29,7 +29,7 @@ buildPythonPackage rec {
    owner = "yezz123";
    repo = "pyngo";
    rev = "refs/tags/${version}";
-    hash = "sha256-w5gOwaQeNX9Ca6V2rxi1UGi2aO+/Eaz2uyw4x/JVOxc=";
+    hash = "sha256-vzqm+g/jYkxue5DiUe+iYA5x0zMKLKQtAatOSKCUWzs=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/qcodes/default.nix
+++ b/pkgs/development/python-modules/qcodes/default.nix
@ -36,7 +36,6 @@
  websockets,
  wrapt,
  xarray,
-  importlib-metadata,

  # optional-dependencies
  jinja2,
@ -64,16 +63,16 @@

 buildPythonPackage rec {
  pname = "qcodes";
-  version = "0.46.0";
+  version = "0.47.0";
  pyproject = true;

-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.10";

  src = fetchFromGitHub {
    owner = "microsoft";
    repo = "Qcodes";
    rev = "refs/tags/v${version}";
-    hash = "sha256-CeAX3sBE21v68KnCe8z28WTc7zMPA7usRRGh+dNijjo=";
+    hash = "sha256-Gp+HeYJGWyW49jisadnavjIpzu7C2uS2qWn7eC6okqg=";
  };

  build-system = [
@ -108,7 +107,7 @@ buildPythonPackage rec {
    websockets
    wrapt
    xarray
-  ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ];
+  ];

  optional-dependencies = {
    docs = [
--- a/pkgs/development/tools/gauge/plugins/dotnet/default.nix
+++ b/pkgs/development/tools/gauge/plugins/dotnet/default.nix
@ -1,6 +1,7 @@
 { lib
 , makeGaugePlugin
 , gauge-unwrapped
+, stdenv
 }:

 makeGaugePlugin {
@ -11,6 +12,8 @@ makeGaugePlugin {
  releasePrefix = "gauge-dotnet-";
  isCrossArch = true;

+  buildInputs = [ stdenv.cc.cc.lib ];
+
  meta = {
    description = "Gauge plugin that lets you write tests in C#";
    homepage = "https://github.com/getgauge/gauge-dotnet/";
--- a/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix
+++ b/pkgs/development/tools/gauge/plugins/make-gauge-plugin.nix
@ -2,6 +2,7 @@
 , fetchzip
 , lib
 , writeScript
+, autoPatchelfHook
 }:

 { pname
@ -33,6 +34,8 @@ stdenvNoCC.mkDerivation (finalAttrs: (lib.recursiveUpdate {
    stripRoot = false;
  };

+  nativeBuildInputs = [ autoPatchelfHook ];
+
  installPhase = ''
    mkdir -p "$out/share/gauge-plugins/${pname}/${finalAttrs.version}"
    cp -r . "$out/share/gauge-plugins/${pname}/${finalAttrs.version}"
--- a/pkgs/servers/computing/slurm/default.nix
+++ b/pkgs/servers/computing/slurm/default.nix
@ -14,7 +14,7 @@

 stdenv.mkDerivation rec {
  pname = "slurm";
-  version = "24.05.0.1";
+  version = "24.05.2.1";

  # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
  # because the latter does not keep older releases.
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
    repo = "slurm";
    # The release tags use - instead of .
    rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}";
-    hash = "sha256-nPTgasNajSzSTv+64V7ykwFV5eZt300KMWQDlqNIz44=";
+    hash = "sha256-GQbZCMS9FWS0w4mgqqdQ+G8wm/g0PPFKSH60q7U9DiI=";
  };

  outputs = [ "out" "dev" ];
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@ -1037,7 +1037,8 @@
    "eight_sleep" = ps: with ps; [
    ];
    "electrasmart" = ps: with ps; [
-    ]; # missing inputs: pyElectra
+      pyelectra
+    ];
    "electric_kiwi" = ps: with ps; [
      fnv-hash-fast
      psutil-home-assistant
@ -1095,7 +1096,8 @@
      sqlalchemy
    ];
    "energenie_power_sockets" = ps: with ps; [
-    ]; # missing inputs: pyegps
+      pyegps
+    ];
    "energie_vanons" = ps: with ps; [
    ];
    "energy" = ps: with ps; [
@ -5412,6 +5414,7 @@
    "edl21"
    "efergy"
    "eight_sleep"
+    "electrasmart"
    "elgato"
    "elkm1"
    "elmax"
@ -5419,6 +5422,7 @@
    "emulated_hue"
    "emulated_kasa"
    "emulated_roku"
+    "energenie_power_sockets"
    "energy"
    "energyzero"
    "enigma2"
--- a/pkgs/servers/redpanda/default.nix
+++ b/pkgs/servers/redpanda/default.nix
@ -6,12 +6,12 @@
 , stdenv
 }:
 let
-  version = "24.1.13";
+  version = "24.2.2";
  src = fetchFromGitHub {
    owner = "redpanda-data";
    repo = "redpanda";
    rev = "v${version}";
-    sha256 = "sha256-7XDtQYuAVo3WvL59KHrROYlRH68/tAAU/7IGwtTS/+Q=";
+    sha256 = "sha256-hVgmAFut2jGgXGeMKLX12TlASLIpr6YozINKRbvfDSg=";
  };
 in
 buildGoModule rec {
@ -19,7 +19,7 @@ buildGoModule rec {
  inherit doCheck src version;
  modRoot = "./src/go/rpk";
  runVend = false;
-  vendorHash = "sha256-mpzWKJwE5ghySiiOdJO81w8Jvk1k34lb3Gvj+p5U1FU=";
+  vendorHash = "sha256-8vwmxUi4oWmHzb2QkIS5sU1NgJmJSV1+2I48TDAo2a0=";

  ldflags = [
    ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"''
--- a/pkgs/servers/soft-serve/default.nix
+++ b/pkgs/servers/soft-serve/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "soft-serve";
-  version = "0.7.4";
+  version = "0.7.6";

  src = fetchFromGitHub {
    owner = "charmbracelet";
    repo = "soft-serve";
    rev = "v${version}";
-    hash = "sha256-sPsyZpmk0DJoM2Qn+hvv/FZZkogyi1fa7eEW68Vwf+g=";
+    hash = "sha256-Ga1RpBkEzuPTu0j+dGg2WX6E3y9hcUJTRPx6XPz4bfk=";
  };

-  vendorHash = "sha256-1Fy/DwCnWg8VNonRSAnm4M9EHwMUBhBxcWBoMqHPuHQ=";
+  vendorHash = "sha256-eri/GAsJgsmT73orTawCMS6o/FYCBv33yVb1qA+/LqY=";

  doCheck = false;

--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@ -309,10 +309,10 @@ let
  ]);
  inherit (ceph-python-env.python) sitePackages;

-  version = "18.2.1";
+  version = "18.2.4";
  src = fetchurl {
    url = "https://download.ceph.com/tarballs/ceph-${version}.tar.gz";
-    hash = "sha256-gHWwNHf0KtI7Hv0MwaCqP6A3YR/AWakfUZTktRyddko=";
+    hash = "sha256-EFqteP3Jo+hASXVesH6gkjDjFO7/1RN151tIf/lQ06s=";
  };
 in rec {
  ceph = stdenv.mkDerivation {
--- a/pkgs/tools/security/fingerprintx/default.nix
+++ b/pkgs/tools/security/fingerprintx/default.nix
@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "fingerprintx";
-  version = "1.1.13";
+  version = "1.1.14";

  src = fetchFromGitHub {
    owner = "praetorian-inc";
    repo = "fingerprintx";
    rev = "refs/tags/v${version}";
-    hash = "sha256-kWMwadE3ZJTqwEgtrXvXlyc/2+cf1NGhubwZuYpDMBQ=";
+    hash = "sha256-o0u6UOrdzORnTgfOlc0kSQ5diDtNHjjbwfuyvPoHHKs=";
  };

  vendorHash = "sha256-TMy6FwAFlo+ARvm+RiRqly0xIk4lBCXuZrtdnNSMSxw=";
--- a/pkgs/tools/security/metasploit/Gemfile
+++ b/pkgs/tools/security/metasploit/Gemfile
@ -1,4 +1,4 @@
 # frozen_string_literal: true
 source "https://rubygems.org"

-gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.20"
+gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.21"
--- a/pkgs/tools/security/metasploit/Gemfile.lock
+++ b/pkgs/tools/security/metasploit/Gemfile.lock
@ -1,9 +1,9 @@
 GIT
  remote: https://github.com/rapid7/metasploit-framework
-  revision: c364b32438a2e9844762afb4fd178ad98e72822f
-  ref: refs/tags/6.4.20
+  revision: 91e46e232df4f94407147a93fe737ebde4babcb7
+  ref: refs/tags/6.4.21
  specs:
-    metasploit-framework (6.4.20)
+    metasploit-framework (6.4.21)
      aarch64
      abbrev
      actionpack (~> 7.0.0)
--- a/pkgs/tools/security/metasploit/default.nix
+++ b/pkgs/tools/security/metasploit/default.nix
@ -15,13 +15,13 @@ let
  };
 in stdenv.mkDerivation rec {
  pname = "metasploit-framework";
-  version = "6.4.20";
+  version = "6.4.21";

  src = fetchFromGitHub {
    owner = "rapid7";
    repo = "metasploit-framework";
    rev = "refs/tags/${version}";
-    hash = "sha256-fmWe4vyGwUPof3bBRGYBnarPulx3kL3QW7yQQdi9LEQ=";
+    hash = "sha256-0qo7uxE6ovB3lqE4igmyJeMEtxgsEop6azt3EibDBmM=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/security/metasploit/gemset.nix
+++ b/pkgs/tools/security/metasploit/gemset.nix
@ -724,12 +724,12 @@
    platforms = [];
    source = {
      fetchSubmodules = false;
-      rev = "c364b32438a2e9844762afb4fd178ad98e72822f";
-      sha256 = "0i1cppc4345wbg8bv43pbjxczalx05k49hbngzl47hc6zki9wrby";
+      rev = "91e46e232df4f94407147a93fe737ebde4babcb7";
+      sha256 = "0qq6qck14xrvddx8l4ic32vh9qr5n84qlf51jrvz18is26xkpanj";
      type = "git";
      url = "https://github.com/rapid7/metasploit-framework";
    };
-    version = "6.4.20";
+    version = "6.4.21";
  };
  metasploit-model = {
    groups = ["default"];
--- a/pkgs/tools/typesetting/tectonic/default.nix
+++ b/pkgs/tools/typesetting/tectonic/default.nix
@ -16,6 +16,7 @@
 , openssl
 , pkg-config
 , icu
+, fetchpatch2
 }:

 rustPlatform.buildRustPackage rec {
@ -29,7 +30,15 @@ rustPlatform.buildRustPackage rec {
    sha256 = "sha256-xZHYiaQ8ASUwu0ieHIXcjRaH06SQoB6OR1y7Ok+FjAs=";
  };

-  cargoHash = "sha256-niMgb4zsTWHw5yaa4kJOZzpOzO5gMG4k3cTHwSV+wmY=";
+  cargoPatches = [
+    # fix build with rust 1.80
+    (fetchpatch2 {
+      url = "https://github.com/tectonic-typesetting/tectonic/commit/6b49ca8db40aaca29cb375ce75add3e575558375.patch";
+      hash = "sha256-i1L3XaSuBbsmgOSXIWVqr6EHlHGs8A+6v06kJ3C50sk=";
+    })
+  ];
+
+  cargoHash = "sha256-Zn+xU6NJOY+jDYrSGsbYGAVqprQ6teEdNvlTNDXuzKs=";

  nativeBuildInputs = [ pkg-config ];

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -9633,8 +9633,6 @@ with pkgs;

  mdbook-cmdrun = callPackage ../tools/text/mdbook-cmdrun { };

-  mdbook-d2 = callPackage ../tools/text/mdbook-d2 { };
-
  mdbook-pagetoc = callPackage ../tools/text/mdbook-pagetoc { };

  mdbook-graphviz = callPackage ../tools/text/mdbook-graphviz {
@ -32898,7 +32896,9 @@ with pkgs;

  phantomsocks = callPackage ../tools/networking/phantomsocks { };

-  photoqt = qt6Packages.callPackage ../applications/graphics/photoqt { };
+  photoqt = callPackage ../by-name/ph/photoqt/package.nix {
+    stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv;
+  };

  photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { };

--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -11312,8 +11312,12 @@ self: super: with self; {

  pyefergy = callPackage ../development/python-modules/pyefergy { };

+  pyegps = callPackage ../development/python-modules/pyegps { };
+
  pyeight = callPackage ../development/python-modules/pyeight { };

+  pyelectra = callPackage ../development/python-modules/pyelectra { };
+
  pyelftools = callPackage ../development/python-modules/pyelftools { };

  pyemby = callPackage ../development/python-modules/pyemby { };