Merge staging-next into staging

2024-12-04 00:16:05 +00:00
parent 505a8b6a91 1c73cafe94
commit 331228b648
107 changed files with 1236 additions and 1016 deletions
@@ -8663,6 +8663,13 @@
    githubId = 5317234;
    name = "Raphael Megzari";
  };
+  harbiinger = {
+    email = "theo.godin@protonmail.com";
+    matrix = "@hrbgr:matrix.org";
+    github = "harbiinger";
+    githubId = 55398594;
+    name = "Theo Godin";
+  };
  hardselius = {
    email = "martin@hardselius.dev";
    github = "hardselius";
@@ -17977,6 +17984,12 @@
    githubId = 5636;
    name = "Steve Purcell";
  };
+  purpole = {
+    email = "mail@purpole.io";
+    github = "purpole";
+    githubId = 101905225;
+    name = "David Schneider";
+  };
  purrpurrn = {
    email = "scrcpynovideoaudiocodecraw+nixpkgs@gmail.com";
    github = "purrpurrn";
@@ -18643,7 +18656,7 @@
  };
  returntoreality = {
    email = "linus@lotz.li";
-    github = "retuntoreality";
+    github = "returntoreality";
    githubId = 255667;
    name = "Linus Karl";
  };
@@ -499,21 +499,21 @@ in {
            '';
          };
          preGetSourcesScript = mkOption {
-            type = types.nullOr types.path;
+            type = types.nullOr (types.either types.str types.path);
            default = null;
            description = ''
              Runner-specific command script executed before code is pulled.
            '';
          };
          postGetSourcesScript = mkOption {
-            type = types.nullOr types.path;
+            type = types.nullOr (types.either types.str types.path);
            default = null;
            description = ''
              Runner-specific command script executed after code is pulled.
            '';
          };
          preBuildScript = mkOption {
-            type = types.nullOr types.path;
+            type = types.nullOr (types.either types.str types.path);
            default = null;
            description = ''
              Runner-specific command script executed after code is pulled,
@@ -521,7 +521,7 @@ in {
            '';
          };
          postBuildScript = mkOption {
-            type = types.nullOr types.path;
+            type = types.nullOr (types.either types.str types.path);
            default = null;
            description = ''
              Runner-specific command script executed after code is pulled
@@ -93,8 +93,9 @@ in {

    systemd.services.loki = {
      description = "Loki Service Daemon";
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];

      serviceConfig = let
        conf = if cfg.configFile == null
@@ -100,7 +100,7 @@ in {
    systemd.services.connman = {
      description = "Connection service";
      wantedBy = [ "multi-user.target" ];
-      after = [ "syslog.target" ] ++ lib.optional enableIwd "iwd.service";
+      after = lib.optional enableIwd "iwd.service";
      requires = lib.optional enableIwd "iwd.service";
      serviceConfig = {
        Type = "dbus";
@@ -119,7 +119,6 @@ in {
    systemd.services.connman-vpn = lib.mkIf cfg.enableVPN {
      description = "ConnMan VPN service";
      wantedBy = [ "multi-user.target" ];
-      after = [ "syslog.target" ];
      before = [ "connman.service" ];
      serviceConfig = {
        Type = "dbus";
@@ -1,21 +1,19 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
  cfg = config.services.fireqos;
-  fireqosConfig = pkgs.writeText "fireqos.conf" "${cfg.config}";
-in {
+  fireqosConfig = pkgs.writeText "fireqos.conf" cfg.config;
+in
+{
  options.services.fireqos = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      description = ''
-        If enabled, FireQOS will be launched with the specified
-        configuration given in `config`.
-      '';
-    };
+    enable = lib.mkEnableOption "FireQOS";

    config = lib.mkOption {
-      type = lib.types.str;
-      default = "";
+      type = lib.types.lines;
      example = ''
        interface wlp3s0 world-in input rate 10mbit ethernet
          class web commit 50kbit
@@ -26,7 +24,7 @@ in {
            match tcp ports 80,443
      '';
      description = ''
-        The FireQOS configuration goes here.
+        The FireQOS configuration.
      '';
    };
  };
@@ -35,6 +33,7 @@ in {
    systemd.services.fireqos = {
      description = "FireQOS";
      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
      serviceConfig = {
        Type = "oneshot";
        RemainAfterExit = true;
@@ -308,7 +308,7 @@ in

    systemd.timers.keepalived-boot-delay = {
      description = "Keepalive Daemon delay to avoid instant transition to MASTER state";
-      after = [ "network.target" "network-online.target" "syslog.target" ];
+      after = [ "network.target" "network-online.target" ];
      requires = [ "network-online.target" ];
      wantedBy = [ "multi-user.target" ];
      timerConfig = {
@@ -321,7 +321,7 @@ in
      finalConfigFile = if cfg.secretFile == null then keepalivedConf else "/run/keepalived/keepalived.conf";
    in {
      description = "Keepalive Daemon (LVS and VRRP)";
-      after = [ "network.target" "network-online.target" "syslog.target" ];
+      after = [ "network.target" "network-online.target" ];
      wants = [ "network-online.target" ];
      serviceConfig = {
        Type = "forking";
@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:

-with lib;
-
 let
+  inherit (lib) mkIf mkOption types optionalAttrs;
+  inherit (lib.types) nullOr listOf str attrsOf submodule;
  cfg = config.services.nbd;
  iniFields = with types; attrsOf (oneOf [ bool int float str ]);
  # The `[generic]` section must come before all the others in the
@@ -19,12 +19,12 @@ let
    }));
  };
  exportSections =
-    mapAttrs
+    lib.mapAttrs
      (_: { path, allowAddresses, extraOptions }:
        extraOptions // {
          exportname = path;
        } // (optionalAttrs (allowAddresses != null) {
-          authfile = pkgs.writeText "authfile" (concatStringsSep "\n" allowAddresses);
+          authfile = pkgs.writeText "authfile" (lib.concatStringsSep "\n" allowAddresses);
        }))
      cfg.server.exports;
  serverConfig =
@@ -33,9 +33,9 @@ let
      ${lib.generators.toINI {} exportSections}
    '';
  splitLists =
-    partition
-      (path: hasPrefix "/dev/" path)
-      (mapAttrsToList (_: { path, ... }: path) cfg.server.exports);
+    lib.partition
+      (path: lib.hasPrefix "/dev/" path)
+      (lib.mapAttrsToList (_: { path, ... }: path) cfg.server.exports);
  allowedDevices = splitLists.right;
  boundPaths = splitLists.wrong;
 in
@@ -43,7 +43,7 @@ in
  options = {
    services.nbd = {
      server = {
-        enable = mkEnableOption "the Network Block Device (nbd) server";
+        enable = lib.mkEnableOption "the Network Block Device (nbd) server";

        listenPort = mkOption {
          type = types.port;
@@ -65,7 +65,7 @@ in
        exports = mkOption {
          description = "Files or block devices to make available over the network.";
          default = { };
-          type = with types; attrsOf
+          type = attrsOf
            (submodule {
              options = {
                path = mkOption {
@@ -97,7 +97,7 @@ in
        };

        listenAddress = mkOption {
-          type = with types; nullOr str;
+          type = nullOr str;
          description = "Address to listen on. If not specified, the server will listen on all interfaces.";
          default = null;
          example = "10.10.0.1";
@@ -110,11 +110,7 @@ in
        description = "Intel Architectural Enclave Service Manager";
        wantedBy = [ "multi-user.target" ];

-        after = [
-          "auditd.service"
-          "network.target"
-          "syslog.target"
-        ];
+        after = [ "auditd.service" "network.target" ];

        environment = {
          NAME = "aesm_service";
@@ -2844,16 +2844,11 @@ let
        ];
      };

-      systemd.services."systemd-network-wait-online@" = {
-        description = "Wait for Network Interface %I to be Configured";
-        conflicts = [ "shutdown.target" ];
-        requisite = [ "systemd-networkd.service" ];
-        after = [ "systemd-networkd.service" ];
-        serviceConfig = {
-          Type = "oneshot";
-          RemainAfterExit = true;
-          ExecStart = "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %I ${utils.escapeSystemdExecArgs cfg.wait-online.extraArgs}";
-        };
+      systemd.services."systemd-networkd-wait-online@" = {
+        serviceConfig.ExecStart = [
+          ""
+          "${config.systemd.package}/lib/systemd/systemd-networkd-wait-online -i %i ${utils.escapeSystemdExecArgs cfg.wait-online.extraArgs}"
+        ];
      };

    })
@@ -2873,6 +2868,7 @@ let

      systemd.additionalUpstreamSystemUnits = [
        "systemd-networkd-wait-online.service"
+        "systemd-networkd-wait-online@.service"
        "systemd-networkd.service"
        "systemd-networkd.socket"
        "systemd-networkd-persistent-storage.service"
@@ -96,7 +96,11 @@ in import ./make-test-python.nix ({pkgs, ... }: {
  };
 testScript = ''
    start_all()
+    node1.succeed("systemctl start systemd-networkd-wait-online@eth1.service")
+    node1.wait_for_unit("systemd-networkd-wait-online@eth1.service")
    node1.wait_for_unit("systemd-networkd-wait-online.service")
+    node2.succeed("systemctl start systemd-networkd-wait-online@eth1.service")
+    node2.wait_for_unit("systemd-networkd-wait-online@eth1.service")
    node2.wait_for_unit("systemd-networkd-wait-online.service")

    # ================================
@@ -7,12 +7,12 @@
  nix-update-script,
 }:
 let
-  version = "0.6.2";
+  version = "0.7.1";
  src = fetchFromGitHub {
    owner = "Saghen";
    repo = "blink.cmp";
    rev = "refs/tags/v${version}";
-    hash = "sha256-uAIO8Q9jQvZ36Ngz9dURH7Jo7+WX/swauhj3ltIkZ5c=";
+    hash = "sha256-IHl+XIldo2kculpbiOuLIJ6RJbFODiRlQU4x8hvE7pI=";
  };
  libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
  blink-fuzzy-lib = rustPlatform.buildRustPackage {
@@ -38,12 +38,12 @@
  };
  apex = buildGrammar {
    language = "apex";
-    version = "0.0.0+rev=46d4a12";
+    version = "0.0.0+rev=f5a1d21";
    src = fetchFromGitHub {
      owner = "aheber";
      repo = "tree-sitter-sfapex";
-      rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074";
-      hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY=";
+      rev = "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5";
+      hash = "sha256-iNoMqyZmS3CoazDQv9/hJb1CRXojEM4IyE5ReqHV4k8=";
    };
    location = "apex";
    meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
@@ -548,12 +548,12 @@
  };
  editorconfig = buildGrammar {
    language = "editorconfig";
-    version = "0.0.0+rev=5f4f84f";
+    version = "0.0.0+rev=3288aa4";
    src = fetchFromGitHub {
      owner = "ValdezFOmar";
      repo = "tree-sitter-editorconfig";
-      rev = "5f4f84f0e79049e4526c0a1db669378092ecb256";
-      hash = "sha256-SjH1g2a7/wc9WNkscDVgffzOc0I2ULBH70CntIAlsuE=";
+      rev = "3288aa46e30e1295133bd6f303c00ac71b4f61ad";
+      hash = "sha256-hVCp4cRgc3ALVbpRAd8wYTZ77wZMDAQGmGddt0QuOFY=";
    };
    meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
  };
@@ -581,12 +581,12 @@
  };
  elixir = buildGrammar {
    language = "elixir";
-    version = "0.0.0+rev=5345854";
+    version = "0.0.0+rev=d301895";
    src = fetchFromGitHub {
      owner = "elixir-lang";
      repo = "tree-sitter-elixir";
-      rev = "53458546e3bb717beee1d15df30724c81eb41d1c";
-      hash = "sha256-Zuqjv4QEeCiHYCxGT9HYAXlqrRFTi8V88wAsot6O5TI=";
+      rev = "d30189581a8b2802f237884287fdb7c40f32a041";
+      hash = "sha256-xaQ9NZUt0eE7IB1SmhBZqMM8KluI5mid//jJNsLuS4M=";
    };
    meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
  };
@@ -735,12 +735,12 @@
  };
  fortran = buildGrammar {
    language = "fortran";
-    version = "0.0.0+rev=4c96c4d";
+    version = "0.0.0+rev=6f16bab";
    src = fetchFromGitHub {
      owner = "stadelmanma";
      repo = "tree-sitter-fortran";
-      rev = "4c96c4d00b5c17b109028e8627407971085034ce";
-      hash = "sha256-c/UfQOUfIAL6BVprefuWmCSZJXP90cRN64OgPgWJgN0=";
+      rev = "6f16bab7455cd2906a86679a1be83dd4f378db81";
+      hash = "sha256-WsAKQ1R9wDjgrC/5t3RRZFSszehtgxY3uHtv9JKrgV4=";
    };
    meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
  };
@@ -1309,12 +1309,12 @@
  };
  inko = buildGrammar {
    language = "inko";
-    version = "0.0.0+rev=aecabed";
+    version = "0.0.0+rev=a6fb0b0";
    src = fetchFromGitHub {
      owner = "inko-lang";
      repo = "tree-sitter-inko";
-      rev = "aecabede39b0db05678e2d4686258d4f71b00a51";
-      hash = "sha256-29vt7zf/prmbjPBJoItzJz2sOp40ySqiqtwlaBobjoQ=";
+      rev = "a6fb0b0bfee5dede688968fd91282da799e5aa8e";
+      hash = "sha256-Egigdlesj5gaHk+nfc2y7+qFuNl7RzTGrzsPCssHHQk=";
    };
    meta.homepage = "https://github.com/inko-lang/tree-sitter-inko";
  };
@@ -1530,12 +1530,12 @@
  };
  ledger = buildGrammar {
    language = "ledger";
-    version = "0.0.0+rev=19699bd";
+    version = "0.0.0+rev=d313153";
    src = fetchFromGitHub {
      owner = "cbarrete";
      repo = "tree-sitter-ledger";
-      rev = "19699bd9fe0bacf90d464747aab9b6179fc7b1c0";
-      hash = "sha256-5kTLVwakxAph33nWqMvGcHERJaSzvUGImxv7obLGz1E=";
+      rev = "d313153eef68c557ba4538b20de2d0e92f3ef6f8";
+      hash = "sha256-/dE3Uqi5zuTWtbjPAm9j7+z6RnTKJeXdS5na+XoGCE0=";
    };
    meta.homepage = "https://github.com/cbarrete/tree-sitter-ledger";
  };
@@ -1662,24 +1662,24 @@
  };
  markdown = buildGrammar {
    language = "markdown";
-    version = "0.0.0+rev=5cdc549";
+    version = "0.0.0+rev=c89a30c";
    src = fetchFromGitHub {
      owner = "MDeiml";
      repo = "tree-sitter-markdown";
-      rev = "5cdc549ab8f461aff876c5be9741027189299cec";
-      hash = "sha256-dLj233xHPCJbawUVqkxxhHXbu/CrJIHcCyLXTgsWMFo=";
+      rev = "c89a30ce556a5ea5552e816e5dc2f2c0de96237d";
+      hash = "sha256-v1M6CBOjBwtxkO2k1hksQS4ZkdFNcoXmu1nc7X8OKG0=";
    };
    location = "tree-sitter-markdown";
    meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
  };
  markdown_inline = buildGrammar {
    language = "markdown_inline";
-    version = "0.0.0+rev=5cdc549";
+    version = "0.0.0+rev=c89a30c";
    src = fetchFromGitHub {
      owner = "MDeiml";
      repo = "tree-sitter-markdown";
-      rev = "5cdc549ab8f461aff876c5be9741027189299cec";
-      hash = "sha256-dLj233xHPCJbawUVqkxxhHXbu/CrJIHcCyLXTgsWMFo=";
+      rev = "c89a30ce556a5ea5552e816e5dc2f2c0de96237d";
+      hash = "sha256-v1M6CBOjBwtxkO2k1hksQS4ZkdFNcoXmu1nc7X8OKG0=";
    };
    location = "tree-sitter-markdown-inline";
    meta.homepage = "https://github.com/MDeiml/tree-sitter-markdown";
@@ -1730,12 +1730,12 @@
  };
  mlir = buildGrammar {
    language = "mlir";
-    version = "0.0.0+rev=3362ba5";
+    version = "0.0.0+rev=72929ac";
    src = fetchFromGitHub {
      owner = "artagnon";
      repo = "tree-sitter-mlir";
-      rev = "3362ba5caab4de11f42b4a736a0e2bcdc9343480";
-      hash = "sha256-LyjGD0aND/ErSDc80zvA89TbWvvMcJGd+r43aEw3BZk=";
+      rev = "72929ac13d7e1c46010114202262b7102a821293";
+      hash = "sha256-lJzZAWYjqX7HG/fbYCIoYWBjpndhlUV5c7ukFvXvRLQ=";
    };
    generate = true;
    meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -1819,12 +1819,12 @@
  };
  nix = buildGrammar {
    language = "nix";
-    version = "0.0.0+rev=0eca4c5";
+    version = "0.0.0+rev=21897cc";
    src = fetchFromGitHub {
      owner = "cstrahan";
      repo = "tree-sitter-nix";
-      rev = "0eca4c5cb06196cca6d9e81a64cb4b73bdab1c87";
-      hash = "sha256-Vi+hdH6gAAXsqOsTjEzzwU2TvpBqxO4Jxfa7omUtJ5o=";
+      rev = "21897cc3dcd15325303e46b85295b743742af6ab";
+      hash = "sha256-B2DSacC5+FwyBtzsKaelr19Osc93we7BSH8HG1uIksk=";
    };
    meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";
  };
@@ -1852,12 +1852,12 @@
  };
  nu = buildGrammar {
    language = "nu";
-    version = "0.0.0+rev=74e6037";
+    version = "0.0.0+rev=41a1c57";
    src = fetchFromGitHub {
      owner = "nushell";
      repo = "tree-sitter-nu";
-      rev = "74e6037383ce3a77ed6fdb8281bbd69316c723a4";
-      hash = "sha256-gkHPhTy/GxsYekMwVKTbSPpN6zyU0QWuhAdqOeF3u5M=";
+      rev = "41a1c570b57987386ed9a928fc214928f8ddc669";
+      hash = "sha256-wHehCdT79O5f0pRSuCG1Feo3hZ6xJ+c70i4NS44fnKE=";
    };
    meta.homepage = "https://github.com/nushell/tree-sitter-nu";
  };
@@ -2554,12 +2554,12 @@
  };
  sflog = buildGrammar {
    language = "sflog";
-    version = "0.0.0+rev=46d4a12";
+    version = "0.0.0+rev=f5a1d21";
    src = fetchFromGitHub {
      owner = "aheber";
      repo = "tree-sitter-sfapex";
-      rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074";
-      hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY=";
+      rev = "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5";
+      hash = "sha256-iNoMqyZmS3CoazDQv9/hJb1CRXojEM4IyE5ReqHV4k8=";
    };
    location = "sflog";
    meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
@@ -2621,35 +2621,35 @@
  };
  solidity = buildGrammar {
    language = "solidity";
-    version = "0.0.0+rev=ee5a2d2";
+    version = "0.0.0+rev=bf26872";
    src = fetchFromGitHub {
      owner = "JoranHonig";
      repo = "tree-sitter-solidity";
-      rev = "ee5a2d2ba30b487c4bbf613d2ef310a454c09c7c";
-      hash = "sha256-q9SFHnxBUDet65WuxxYFS3N8xDHuQz7K2LWED7uSaWA=";
+      rev = "bf268722bc6406429776f71f012e6d1a88801931";
+      hash = "sha256-mpKLES5tHhQFMldjOYLzh7a29DbtImENwM2+y0wJ3hk=";
    };
    meta.homepage = "https://github.com/JoranHonig/tree-sitter-solidity";
  };
  soql = buildGrammar {
    language = "soql";
-    version = "0.0.0+rev=46d4a12";
+    version = "0.0.0+rev=f5a1d21";
    src = fetchFromGitHub {
      owner = "aheber";
      repo = "tree-sitter-sfapex";
-      rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074";
-      hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY=";
+      rev = "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5";
+      hash = "sha256-iNoMqyZmS3CoazDQv9/hJb1CRXojEM4IyE5ReqHV4k8=";
    };
    location = "soql";
    meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
  };
  sosl = buildGrammar {
    language = "sosl";
-    version = "0.0.0+rev=46d4a12";
+    version = "0.0.0+rev=f5a1d21";
    src = fetchFromGitHub {
      owner = "aheber";
      repo = "tree-sitter-sfapex";
-      rev = "46d4a12e4e90b10a575b7b16ea3b6ead50322074";
-      hash = "sha256-vPSdx//9PZXDV9wzkMobaSVl88+iVGi/E+t7EA2yyCY=";
+      rev = "f5a1d2188ff711a06c6a8daa65bbf2f17c8378a5";
+      hash = "sha256-iNoMqyZmS3CoazDQv9/hJb1CRXojEM4IyE5ReqHV4k8=";
    };
    location = "sosl";
    meta.homepage = "https://github.com/aheber/tree-sitter-sfapex";
@@ -2678,12 +2678,12 @@
  };
  sql = buildGrammar {
    language = "sql";
-    version = "0.0.0+rev=3d516e6";
+    version = "0.0.0+rev=035354e";
    src = fetchFromGitHub {
      owner = "derekstride";
      repo = "tree-sitter-sql";
-      rev = "3d516e6ae778bd41f9d5178823798ff6af96da60";
-      hash = "sha256-5lmnH4ro4+M5dCpW8GnnOHEuSCCQMCqhlK3bnzEr518=";
+      rev = "035354ea51c835cfe8fc9abf81bb081965a42b4c";
+      hash = "sha256-EUOR8VP1u0Sz0HSg+IUSInQ6pD/1k5e3a/r7lPPShYo=";
    };
    meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
  };
@@ -2733,12 +2733,12 @@
  };
  styled = buildGrammar {
    language = "styled";
-    version = "0.0.0+rev=2e0e623";
+    version = "0.0.0+rev=75d3ad2";
    src = fetchFromGitHub {
      owner = "mskelton";
      repo = "tree-sitter-styled";
-      rev = "2e0e6231348d8cb0a82406490771825b8ac80422";
-      hash = "sha256-RwhHCWK1ckXdPgIVZ4NC5zCBna91NBYub2MlrIwHeGk=";
+      rev = "75d3ad20818c30c49b445ca2cb35999c278b3453";
+      hash = "sha256-2GMOHPO1vDqeXazAlQw35XhrOXrAmZnITibIfe0hscA=";
    };
    meta.homepage = "https://github.com/mskelton/tree-sitter-styled";
  };
@@ -2755,12 +2755,12 @@
  };
  superhtml = buildGrammar {
    language = "superhtml";
-    version = "0.0.0+rev=dbb0d1f";
+    version = "0.0.0+rev=1fda813";
    src = fetchFromGitHub {
      owner = "kristoff-it";
      repo = "superhtml";
-      rev = "dbb0d1fc54f8525f41289a413ea6c0722e92bf9c";
-      hash = "sha256-c0JjQ3RZyKtP4ayDT9M+riYhK6JlMF/oVJfkfY17/7k=";
+      rev = "1fda813bd9dc108e962e018e6a327434767ad616";
+      hash = "sha256-+32toY540h92Xk5xoYvZaMYNDxXWI4pRbkrBnU4xRjM=";
    };
    location = "tree-sitter-superhtml";
    meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -2800,12 +2800,12 @@
  };
  swift = buildGrammar {
    language = "swift";
-    version = "0.0.0+rev=6accc2f";
+    version = "0.0.0+rev=77fbac9";
    src = fetchFromGitHub {
      owner = "alex-pinkus";
      repo = "tree-sitter-swift";
-      rev = "6accc2f720c7ff8573f6956a34ea22f50c44d839";
-      hash = "sha256-SFzOo7Nx7kjQ69KUIH9raGj4zYYI0HPeagECAZJGfww=";
+      rev = "77fbac9b574105a12d08dde1ed8d6273331e7d13";
+      hash = "sha256-K5NuZX5/MZrA3fZQxZcUWrM4BhRvuN9WV7jAU1EY1Kk=";
    };
    generate = true;
    meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -2834,12 +2834,12 @@
  };
  t32 = buildGrammar {
    language = "t32";
-    version = "0.0.0+rev=476f0d8";
+    version = "0.0.0+rev=7c85796";
    src = fetchFromGitLab {
      owner = "xasc";
      repo = "tree-sitter-t32";
-      rev = "476f0d8ab4b012d3b6f9598890217ada70f1a8ba";
-      hash = "sha256-zyMThhLjjiL/wtz5DGmjbfGTfcIj4JNSVCKfBIEw/0w=";
+      rev = "7c8579685e34116c61971240780b316c54be698b";
+      hash = "sha256-WfF0Eczk+n/xCxxeYlfv+KG3LSErBwceih2n7ddfces=";
    };
    meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git";
  };
@@ -2979,12 +2979,12 @@
  };
  toml = buildGrammar {
    language = "toml";
-    version = "0.0.0+rev=16a30c8";
+    version = "0.0.0+rev=64b5683";
    src = fetchFromGitHub {
      owner = "tree-sitter-grammars";
      repo = "tree-sitter-toml";
-      rev = "16a30c83ce427385b8d14939c45c137fcfca6c42";
-      hash = "sha256-VYsPM0NVxegfanVaaKkSkEzJ502xkKSjZWrsJpDmack=";
+      rev = "64b56832c2cffe41758f28e05c756a3a98d16f41";
+      hash = "sha256-m9RlGkHiOL/PNENrdEPqtPlahSqGymsx7gZrCoN/Lsk=";
    };
    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-toml";
  };
@@ -3048,12 +3048,12 @@
  };
  typespec = buildGrammar {
    language = "typespec";
-    version = "0.0.0+rev=0ee0554";
+    version = "0.0.0+rev=53d892f";
    src = fetchFromGitHub {
      owner = "happenslol";
      repo = "tree-sitter-typespec";
-      rev = "0ee05546d73d8eb64635ed8125de6f35c77759fe";
-      hash = "sha256-qXA87soeEdlpzj8svEao8L0F5V14NSZc1WsX9z0PVB0=";
+      rev = "53d892fd975da3f81374f7732af3cd3abb6b85d9";
+      hash = "sha256-vosf8sf+8FSOSFpdkxy99e0jGgzwjEf0ViCxC1CDWnk=";
    };
    meta.homepage = "https://github.com/happenslol/tree-sitter-typespec";
  };
@@ -3182,12 +3182,12 @@
  };
  vhdl = buildGrammar {
    language = "vhdl";
-    version = "0.0.0+rev=0703da9";
+    version = "0.0.0+rev=c438173";
    src = fetchFromGitHub {
      owner = "jpt13653903";
      repo = "tree-sitter-vhdl";
-      rev = "0703da905ba3b7331f4431790951bd347539e6f1";
-      hash = "sha256-dy31BjTaSho84jyGy7kLft1MgnF7dhBvi/pPBQKuNX0=";
+      rev = "c438173a3cbb92b349c994f2acf822a0f3b961a0";
+      hash = "sha256-R4Gcs1EA3iFCOSuXwUrSgvKlt9t+l9kqZC58EtureV8=";
    };
    meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
  };
@@ -3315,12 +3315,12 @@
  };
  xresources = buildGrammar {
    language = "xresources";
-    version = "0.0.0+rev=ce8129b";
+    version = "0.0.0+rev=1fffefe";
    src = fetchFromGitHub {
      owner = "ValdezFOmar";
      repo = "tree-sitter-xresources";
-      rev = "ce8129b03f03413f18f8cd989f88c05c59151bb5";
-      hash = "sha256-r/3aFqq6e8LYUOQ5HggqL84jlovixBdUzTzWXYjFN0E=";
+      rev = "1fffefe05bb7f37016f2ada74b50a29e9820b52f";
+      hash = "sha256-kNAq9sR6Y/vN1tHZ4Bl61PRCs0WT9qp57OeOV1jsPfA=";
    };
    meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
  };
@@ -204,7 +204,7 @@ in
        pname = "avante-nvim-lib";
        inherit (oldAttrs) version src;

-        cargoHash = "sha256-aB+KhqSTGTiZKml6G+cte94EAWNWo1dP8igfFOIfHXA=";
+        cargoHash = "sha256-PApZwqlu7GgCEvdTZVm1uB6ny6KSje1rL4Bzjt+iKF4=";

        nativeBuildInputs = [
          pkg-config
@@ -433,7 +433,7 @@ https://github.com/nvimtools/hydra.nvim/,HEAD,
 https://github.com/mboughaba/i3config.vim/,,
 https://github.com/cocopon/iceberg.vim/,,
 https://github.com/idris-hackers/idris-vim/,,
-https://github.com/ShinKage/idris2-nvim/,,
+https://github.com/idris-community/idris2-nvim/,,
 https://github.com/edwinb/idris2-vim/,,
 https://github.com/3rd/image.nvim/,HEAD,
 https://github.com/HakonHarnes/img-clip.nvim/,HEAD,
@@ -10,43 +10,43 @@

 let
  pname = "1password";
-  version = if channel == "stable" then "8.10.48" else "8.10.50-8.BETA";
+  version = if channel == "stable" then "8.10.54" else "8.10.56-1.BETA";

  sources = {
    stable = {
      x86_64-linux = {
        url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
-        hash = "sha256-6yC7wDYd6FJluiVXyc6O03GiZkG48ttRl1N1A9djI9A=";
+        hash = "sha256-kpFO59DPBCgD3EdYxq1tom/5/misBsafbsJS+Wj2l3I=";
      };
      aarch64-linux = {
        url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
-        hash = "sha256-RN3FC7JIAJvd1hWdVH1CAOUsYr5rpq9o3JVbyfwWWKk=";
+        hash = "sha256-ZZKuPxshI9yLSUMccpXaQDbu8gTvFCaS68tqMstZHJE=";
      };
      x86_64-darwin = {
        url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
-        hash = "sha256-iJkIzVeI/mqFbBAGqQPABq1sAeS9k0j+EuUND1VYWJQ=";
+        hash = "sha256-Xha7aOuBvG+R1K48gdPj/v4URuIEYv2le+TCxwDnCwk=";
      };
      aarch64-darwin = {
        url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
-        hash = "sha256-LZ56dIJ5vXJ1SbCI8hdeldKJwzkfM0Tp8d9eZ4tQ9/k=";
+        hash = "sha256-ukfx7V8totRIyHpmjWDR2O9IDkAY3uq/0jtGPXiZ5Bw=";
      };
    };
    beta = {
      x86_64-linux = {
        url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
-        hash = "sha256-Wm8TZjPVkqn+Y0PvSxTBAGduQNBAWUvy0AEGveVvMS0=";
+        hash = "sha256-25vBmc3AJv4NTI2oOrnTR5pMBMK+wx1s/eg5g8jjtb8=";
      };
      aarch64-linux = {
        url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
-        hash = "sha256-pF1DmzfcfyT/JVJx97dykbFwEjgOMpTvofTaZvwIIvE=";
+        hash = "sha256-MLnXEqJM9E+2GAXlqX2dGUzFVk0xv5pmUzLdncakWf8=";
      };
      x86_64-darwin = {
        url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
-        hash = "sha256-MOilWgFZazVrMc6cCHqZO03KmBP8HCPevrxcKAMKEoE=";
+        hash = "sha256-W7VA7DFpIY2D+0ZqNaLfOzTTqryqpA1iy0+yACNrPlg=";
      };
      aarch64-darwin = {
        url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
-        hash = "sha256-TBA2OJXSjKzAR+gvVPCetSc7MVCNoyw4xo6w+9EIayc=";
+        hash = "sha256-ZH7xuL0SrkncxI/ngDIYHf4bLwUyTQC4Ki3HgUVza+I=";
      };
    };
  };
@@ -175,8 +175,8 @@ stdenv.mkDerivation (finalAttrs: {
      "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}"
      "-DPYTHON_LIBPATH=${python3}/lib"
      "-DPYTHON_LIBRARY=${python3.libPrefix}"
-      "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy}/${python3.sitePackages}/numpy/core/include"
-      "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python3.sitePackages}"
+      "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy_1}/${python3.sitePackages}/numpy/core/include"
+      "-DPYTHON_NUMPY_PATH=${python3Packages.numpy_1}/${python3.sitePackages}"
      "-DPYTHON_VERSION=${python3.pythonVersion}"
      "-DWITH_ALEMBIC=ON"
      "-DWITH_BUILDINFO=OFF"
@@ -342,7 +342,7 @@ stdenv.mkDerivation (finalAttrs: {
    in
    [
      ps.materialx
-      ps.numpy
+      ps.numpy_1
      ps.requests
      ps.zstandard
    ]
@@ -22,11 +22,11 @@

 stdenv.mkDerivation rec {
  pname = "evolution-ews";
-  version = "3.54.1";
+  version = "3.54.2";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-oeM9aED4GLdLv+iafb2jcpXdgUWn30JlrS2yQUU4kDo=";
+    hash = "sha256-77UZ2inoIX58t3dNQ9BGJiSMO+WKGUbIpjwyDl2IPNQ=";
  };

  patches = [
@@ -45,11 +45,11 @@

 stdenv.mkDerivation rec {
  pname = "evolution";
-  version = "3.54.1";
+  version = "3.54.2";

  src = fetchurl {
    url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-qEQzdJd6AcY70Dr9tcY+c6SOZ0XX1Fm08mgj3Vz5lxs=";
+    hash = "sha256-7eopEv/bZZnA6gKJw6muIBe/43oI14IjWEUhqlaGtXY=";
  };

  nativeBuildInputs = [
@@ -53,13 +53,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "sdrangel";
-  version = "7.22.2";
+  version = "7.22.4";

  src = fetchFromGitHub {
    owner = "f4exb";
    repo = "sdrangel";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-HFAQ+Pjl//F18O4TryU1zIiAqtb/mBXKipaqNCeeqQo=";
+    hash = "sha256-+7s2VFxqyk9zLxztpYqV9eqGWA7clphKq8JVwIUPb4c=";
  };

  nativeBuildInputs = [
@@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "git-lfs";
-  version = "3.5.1";
+  version = "3.6.0";

  src = fetchFromGitHub {
    owner = "git-lfs";
    repo = "git-lfs";
    rev = "v${version}";
-    hash = "sha256-xSLXbAvIoY3c341qi89pTrjBZdXh/bPrweJD2O2gkjY=";
+    hash = "sha256-PpNdbvtDAZDT43yyEkUvnhfUTAMM+mYImb3dVbAVPic=";
  };

-  vendorHash = "sha256-N8HB2qwBxjzfNucftHxmX2W9srCx62pjmkCWzwiCj/I=";
+  vendorHash = "sha256-JT0r/hs7ZRtsYh4aXy+v8BjwiLvRJ10e4yRirqmWVW0=";

  nativeBuildInputs = [ asciidoctor installShellFiles ];

@@ -0,0 +1,62 @@
+{
+  appimageTools,
+  fetchurl,
+  lib,
+}:
+let
+  pname = "ankama-launcher";
+  version = "3.12.24";
+
+  # The original URL for the launcher is:
+  # https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage
+  # As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL.
+  # To update the client, head to web.archive.org and create a new snapshot of the download page.
+  src = fetchurl {
+    url = "https://web.archive.org/web/20241202103051/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage";
+    hash = "sha256-jI/qcIIrNU9ViaZ/LKMkUETXZpintDsofSgiRfe4GOU=";
+  };
+
+  appimageContents = appimageTools.extract { inherit pname version src; };
+
+in
+
+appimageTools.wrapType2 {
+  inherit pname version src;
+  extraPkgs = pkgs: [ pkgs.wine ];
+
+  extraInstallCommands = ''
+    desktop_file="${appimageContents}/zaap.desktop"
+
+    nix_version="${version}"
+    archive_version=$(grep -oP '(?<=X-AppImage-Version=).*' $desktop_file)
+
+    if [[ "$archive_version" != "$nix_version"* ]]; then
+      echo "ERROR - Version mismatch:"
+      echo -e "\t- Expected (pkgs.ankama-launcher.version): $nix_version"
+      echo -e "\t- Version found in 'zaap.desktop': $archive_version"
+      echo -e "\n-> Update the version attribute of the derivation."
+      echo "-> Note: Ignore the last part of the version: Do not write '3.12.24.19260' but '3.12.24'."
+      exit 1
+    fi
+
+    install -m 444 -D "$desktop_file" $out/share/applications/ankama-launcher.desktop
+    sed -i 's/.*Exec.*/Exec=ankama-launcher/' $out/share/applications/ankama-launcher.desktop
+    install -m 444 -D ${appimageContents}/zaap.png $out/share/icons/hicolor/256x256/apps/zaap.png
+  '';
+
+  meta = {
+    description = "Ankama Launcher";
+    longDescription = ''
+      Ankama Launcher is a portal that allows you to access Ankama's video games, VOD animations, webtoons, and livestreams, as well as download updates, stay up to date with the latest news, and chat with your friends.
+
+      If you encounter a `wine` error while running *Dofus*, delete or rename the `cinematics/` directory:
+      - Go to the directory where you installed the game and run: `mv content/gfx/cinematics content/gfx/cinematics_DISABLE`
+    '';
+    homepage = "https://www.ankama.com/en/launcher";
+    license = lib.licenses.unfree;
+    mainProgram = "ankama-launcher";
+    maintainers = with lib.maintainers; [ harbiinger ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "armadillo";
-  version = "14.0.3";
+  version = "14.2.1";

  src = fetchurl {
    url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    hash = "sha256-69YhXusB7kEv7QeMip9/h9Th9hh+vNwbwJ9GCVpPQAM=";
+    hash = "sha256-JJWBXPnRMPcP/7ahJzPQ3K+Gy6rFHotLgq0lGD7aHdU=";
  };

  nativeBuildInputs = [ cmake ];
@@ -11,14 +11,14 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "aws-sam-cli";
-  version = "1.127.0";
+  version = "1.131.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "aws";
    repo = "aws-sam-cli";
    rev = "refs/tags/v${version}";
-    hash = "sha256-5/zXvO5xrNkhPCei4O/nMXA/e18VNrED2lpBbflaJLQ=";
+    hash = "sha256-xA0scuj7R/lA2UCogWYaYSgxzk5i6QI+IxuM/TkBpBs=";
  };

  build-system = with python3.pkgs; [ setuptools ];
@@ -2,14 +2,14 @@

 rustPlatform.buildRustPackage rec {
  pname = "cargo-lock";
-  version = "9.0.0";
+  version = "10.0.1";

  src = fetchCrate {
    inherit pname version;
-    hash = "sha256-SMxM66qo3Xmst+SVXu4LYZ0Zzn15wqVVNqqHzAkip/s=";
+    hash = "sha256-Ui/Z4syhSxemV1R815R+yytDwN2YJBcHGscUYUp/0zE=";
  };

-  cargoHash = "sha256-wUp4zBY64MvD4anGlVsJrI3pyfwVSQGnn6YuweTeYNk=";
+  cargoHash = "sha256-5Hg0y723wjV13rdEExK2II7EPpzAR29ZCqVgOeuJpO0=";

  buildFeatures = [ "cli" ];

@@ -13,13 +13,13 @@ in

  stdenvNoCC.mkDerivation {
    inherit pname;
-    version = "0-unstable-2024-10-10";
+    version = "0-unstable-2024-10-25";

    src = fetchFromGitHub {
      owner = "catppuccin";
      repo = "Kvantum";
-      rev = "bdaa531318d5756cea5674a750a99134dad0bbbc";
-      hash = "sha256-O85y8Gg0l+xQP1eQi9GizuKfLEGePZ3wPdBNR+0V4ZQ=";
+      rev = "a87694e0a3c97644dbb34f8835112d17b54ace68";
+      hash = "sha256-eQmEeKC+L408ajlNg3oKMnDK6Syy2GV6FrR2TN5ZBCg=";
    };

    installPhase = ''
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  pname = "chrpath";
-  version = "0.17";
+  version = "0.18";

  src = fetchurl {
    url = "https://codeberg.org/pere/chrpath/archive/release-${version}.tar.gz";
-    hash = "sha256-Sh2syR9OrxyMP3Z/2IHrH+OlCaINBii/l2DZCsEkvQw=";
+    hash = "sha256-8JxJ8GGGYMoR/G2VgN3ekExyJNTG0Pby0fm83JECyao=";
  };

  nativeBuildInputs = [
@@ -1,10 +1,12 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, openssl
-, pkg-config
-, rustPlatform
-, Security
+{
+  lib,
+  stdenv,
+  darwin,
+  fetchFromGitHub,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  versionCheckHook,
 }:

 rustPlatform.buildRustPackage rec {
@@ -13,31 +15,36 @@ rustPlatform.buildRustPackage rec {

  src = fetchFromGitHub {
    owner = "mayeranalytics";
-    repo = pname;
-    rev = "v${version}";
+    repo = "coinlive";
+    rev = "refs/tags/v${version}";
    hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs=";
  };

  cargoHash = "sha256-T1TgwnohUDvfpn6GXNP4xJGHM3aenMK+ORxE3z3PPA4=";

-  nativeBuildInputs = [
-    pkg-config
-  ];
+  nativeBuildInputs = [ pkg-config ];

-  buildInputs = [
-    openssl
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    Security
-  ];
+  buildInputs =
+    [
+      openssl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      darwin.apple_sdk.frameworks.Security
+    ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];

  checkFlags = [
-    # requires network access
+    # Test requires network access
    "--skip=utils::test_get_infos"
  ];

+  doInstallCheck = true;
+
  meta = with lib; {
    description = "Live cryptocurrency prices CLI";
    homepage = "https://github.com/mayeranalytics/coinlive";
+    changelog = "https://github.com/mayeranalytics/coinlive/releases/tag/v${version}";
    license = licenses.gpl3Only;
    maintainers = with maintainers; [ fab ];
    mainProgram = "coinlive";
@@ -8,19 +8,25 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "cplay-ng";
-  version = "5.2.0";
+  version = "5.3.1";

  src = fetchFromGitHub {
    owner = "xi";
    repo = "cplay-ng";
    rev = version;
-    hash = "sha256-M9WpB59AWSaGMnGrO37Fc+7O6pVBc2BDAv/BGlPmo8E=";
+    hash = "sha256-6mphhoLDkGZ2r+elzLlPl3B8fNz3loqrQB8x8276AHI=";
  };

  nativeBuildInputs = [
    makeWrapper
  ];

+  build-system = [
+    python3.pkgs.setuptools
+  ];
+
+  pyproject = true;
+
  postInstall = ''
    wrapProgram $out/bin/cplay-ng \
      --prefix PATH : ${lib.makeBinPath [ mpv pulseaudio ]}
@@ -5,10 +5,10 @@
  (fetchNuGet { pname = "CoderPatros.AntPathMatching"; version = "0.1.1"; hash = "sha256-U6xUTX5iuCM84QfwOpOtYK5RfKqojYcPfYQtw1+EPak="; })
  (fetchNuGet { pname = "coverlet.collector"; version = "3.1.2"; hash = "sha256-v7ZoEFZyhF8VcRZj1uim4HNiRsG+XdJ4x/dwPBIWUz8="; })
  (fetchNuGet { pname = "CsvHelper"; version = "29.0.0"; hash = "sha256-nELjcMLQgfUxzOSWX8Z62pqGcfZvuf+0QLFnLEsfsXQ="; })
-  (fetchNuGet { pname = "CycloneDX.Core"; version = "7.0.0"; hash = "sha256-OzsHjO5V3rN2N2Zo35W2iboVR2iEOw0KKQ0cSu+1WkM="; })
-  (fetchNuGet { pname = "CycloneDX.Spdx"; version = "7.0.0"; hash = "sha256-RkD17CBuXSdte2kOZpUtKbp0mdM1jMQo9/uoYQAFCkM="; })
-  (fetchNuGet { pname = "CycloneDX.Spdx.Interop"; version = "7.0.0"; hash = "sha256-cPeSfJPRdLZWBhkyvVvgPLp4ueQw0AJUvQsP8s40Q4U="; })
-  (fetchNuGet { pname = "CycloneDX.Utils"; version = "7.0.0"; hash = "sha256-iwQPhNI4H1WxvWtZGuQnpX74aLPFE1XvCIkxtNvB4e4="; })
+  (fetchNuGet { pname = "CycloneDX.Core"; version = "8.0.3"; hash = "sha256-d9GiOXYxQ1Sv35rN5jywhgTS+HKHSydHVcJNbKs7Htg="; })
+  (fetchNuGet { pname = "CycloneDX.Spdx"; version = "8.0.3"; hash = "sha256-86E8rIXeE6gu+W3yK33abZ5w5zwuDR0Qv5texxJnsv0="; })
+  (fetchNuGet { pname = "CycloneDX.Spdx.Interop"; version = "8.0.3"; hash = "sha256-WpM0VZAjhN2f/IckRIzIeMIkpir9ZNAW+0ZGxL2cBNY="; })
+  (fetchNuGet { pname = "CycloneDX.Utils"; version = "8.0.3"; hash = "sha256-CW6e3uPmCP1U98fcQsiDvn3fLkQOGcchPiUNq4aXDbQ="; })
  (fetchNuGet { pname = "JetBrains.Annotations"; version = "2021.2.0"; hash = "sha256-NtTiowrMQgoTiQQheioseb/eGGLH+qR/NXDFAsWrO08="; })
  (fetchNuGet { pname = "Json.More.Net"; version = "1.9.0"; hash = "sha256-ySIEHWZJLk6LeWYdAA9Ci3coKXkRgpu4N79MD4pRXdk="; })
  (fetchNuGet { pname = "JsonPointer.Net"; version = "3.0.3"; hash = "sha256-fWR1aCDWyc6flBLFaGSJmXg9vg2qMlAIN5wnj2RYqLY="; })
@@ -29,8 +29,8 @@
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "12.0.3"; hash = "sha256-PSHK+Qn52ytdEySdZyjCUGxV5y4hI/vir2WgVsCgv50="; })
  (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; hash = "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="; })
  (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; })
-  (fetchNuGet { pname = "protobuf-net"; version = "3.2.26"; hash = "sha256-C1tvk/KSswIr2hxWK7kR8VKfx90TSeOZkhw/aLshj9U="; })
-  (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.26"; hash = "sha256-vJwiCTQkLzwcXsl8YkDl6oY/SQsL0bmCCM6q9jwaOfM="; })
+  (fetchNuGet { pname = "protobuf-net"; version = "3.2.45"; hash = "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA="; })
+  (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.45"; hash = "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ="; })
  (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; hash = "sha256-4PGZqyWhZ6/HCTF2KddDsbmTTjxs2oW79YfkberDZS8="; })
  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; hash = "sha256-8yLKFt2wQxkEf7fNfzB+cPUCjYn2qbqNgQ1+EeY2h/I="; })
  (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; hash = "sha256-dsmTLGvt8HqRkDWP8iKVXJCS+akAzENGXKPV18W2RgI="; })
@@ -164,8 +164,8 @@
  (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; hash = "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="; })
  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; hash = "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="; })
  (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; hash = "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="; })
-  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "7.0.0"; hash = "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="; })
-  (fetchNuGet { pname = "System.Text.Json"; version = "7.0.2"; hash = "sha256-bkfxuc3XPxtYcOJTGRMc/AkJiyIU+fTLK7PxtbuN3sQ="; })
+  (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; hash = "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo="; })
+  (fetchNuGet { pname = "System.Text.Json"; version = "6.0.2"; hash = "sha256-YLpB48NRiQ8oCuUx0AHJzqUHYgUwXW/60shFkkN/5tM="; })
  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; hash = "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="; })
  (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; hash = "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="; })
  (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; hash = "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="; })
@@ -6,16 +6,16 @@

 buildDotnetModule rec {
  pname = "cyclonedx-cli";
-  version = "0.25.1";
+  version = "0.27.2";

  src = fetchFromGitHub {
    owner = "CycloneDX";
    repo = "cyclonedx-cli";
    rev = "refs/tags/v${version}";
-    hash = "sha256-9G9g4bfH6EGSTZQlaiLsRjnryl+mQ3uNXdBUBVcKwlg=";
+    hash = "sha256-QU/MaT8iIf/9VpOb2mixOfOtG/J+sE7S0mT6BKYQnlI=";
  };

-  dotnet-sdk = dotnetCorePackages.sdk_6_0;
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
  nugetDeps = ./deps.nix;

  preFixup = ''
@@ -23,11 +23,16 @@ buildDotnetModule rec {
    find . ! -name 'cyclonedx' -type f -exec rm -f {} +
  '';

+  postPatch = ''
+    substituteInPlace src/cyclonedx/cyclonedx.csproj tests/cyclonedx.tests/cyclonedx.tests.csproj \
+      --replace-fail 'net6.0' 'net8.0'
+  '';
+
  meta = with lib; {
    description = "CycloneDX CLI tool for SBOM analysis, merging, diffs and format conversions";
    homepage = "https://github.com/CycloneDX/cyclonedx-cli";
    changelog = "https://github.com/CycloneDX/cyclonedx-cli/releases/tag/v${version}";
-    maintainers = with maintainers; [ thillux ];
+    maintainers = (with maintainers; [ thillux ]) ++ teams.cyberus.members;
    license = licenses.asl20;
    platforms = with platforms; (linux ++ darwin);
    mainProgram = "cyclonedx";
@@ -49,13 +49,13 @@

 stdenv.mkDerivation rec {
  pname = "evolution-data-server";
-  version = "3.54.1";
+  version = "3.54.2";

  outputs = [ "out" "dev" ];

  src = fetchurl {
    url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz";
-    hash = "sha256-JbM2xIprq8NjIdiAlLOCrq8Yq8urSpQ4s//5DCnhBa4=";
+    hash = "sha256-EfAlMInIq/RWz/2j/mWKNaDeK4rpPY8lfWsCCueWPSA=";
  };

  patches = [
@@ -7,14 +7,14 @@
 }:
 python3Packages.buildPythonApplication {
  pname = "exo";
-  version = "0-unstable-2024-11-14";
+  version = "0-unstable-2024-11-30";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "exo-explore";
    repo = "exo";
-    rev = "f1eec9fa64a0c14e0ef2eec092b799009b3d4a1e";
-    hash = "sha256-WrJrhMtq+S5VD3oyW1k3fkOHunTzdFk0HavjOXLhIKU=";
+    rev = "fcce9c347404e37921890e85f8d251e17025acc0";
+    hash = "sha256-ROWNhQuAwjKfcEWYWSJTPaksXdxQZ9nOoR7Ft63Kx2A=";
  };

  build-system = with python3Packages; [ setuptools ];
@@ -27,13 +27,14 @@ python3Packages.buildPythonApplication {
    aiohttp
    aiohttp-cors
    aiofiles
-    blobfile
    grpcio
    grpcio-tools
    jinja2
    netifaces
    numpy
+    nuitka
    nvidia-ml-py
+    opencv-python
    pillow
    prometheus-client
    protobuf
@@ -41,7 +42,6 @@ python3Packages.buildPythonApplication {
    pydantic
    requests
    rich
-    safetensors
    tenacity
    tqdm
    transformers
@@ -16,20 +16,18 @@
 , gnome
 , gtk4
 , libadwaita
-, libhandy
 , json-glib
 , libarchive
-, libportal-gtk4
 , nautilus
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "file-roller";
-  version = "44.3";
+  version = "44.4";

  src = fetchurl {
    url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz";
-    hash = "sha256-BMinRiX+yEJn/exAMGr7QQS9My2FBh4NNtSrBTOt+ko=";
+    hash = "sha256-uMMJ2jqnhMcZVYw0ZkAjePSj1sro7XfPaEmqzVbOuew=";
  };

  nativeBuildInputs = [
@@ -50,10 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
    glib
    gtk4
    libadwaita
-    libhandy
    json-glib
    libarchive
-    libportal-gtk4
    nautilus
  ];

@@ -7,11 +7,11 @@

 stdenv.mkDerivation rec {
  pname = "gerrit";
-  version = "3.10.3";
+  version = "3.11.0";

  src = fetchurl {
    url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
-    hash = "sha256-pVI5YZihvJNuaboh2dLe/Aw371rNPiGbaLUd0ALpANQ=";
+    hash = "sha256-wFUks4yGzO4obPWIIfCgL+/ZF37RDgXKvlOMSFvU5Bk=";
  };

  buildCommand = ''
@@ -21,13 +21,13 @@

 stdenv.mkDerivation rec {
  pname = "ghex";
-  version = "46.0";
+  version = "46.1";

  outputs = [ "out" "dev" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/ghex/${lib.versions.major version}/ghex-${version}.tar.xz";
-    hash = "sha256-ocRvMCDLNYuDIwJds6U5yX2ZSkxG9wH0jtxjV/f7y9E=";
+    hash = "sha256-ihOXVHTu4ncZsprXY/GyR2Chrt5tfaS2I3AwcLwm6f0=";
  };

  nativeBuildInputs = [
@@ -30,11 +30,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-maps";
-  version = "47.1";
+  version = "47.2";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
-    hash = "sha256-TwLtLo44GeWdptm0rIgA6GY1349GpHzyqv2ThsgwEwM=";
+    hash = "sha256-WFHnhtrsZY8h5FeiBv8KmtFlnzdBqtlJCxvzGSFU/ps=";
  };

  doCheck = !stdenv.hostPlatform.isDarwin;
@@ -76,6 +76,16 @@ stdenv.mkDerivation (finalAttrs: {
    ''}"
  ];

+  postPatch = ''
+    # The .service file isn't wrapped with the correct environment
+    # so misses GIR files when started. By re-pointing from the gjs
+    # entry point to the wrapped binary we get back to a wrapped
+    # binary.
+    substituteInPlace "data/org.gnome.Maps.service.in" \
+      --replace-fail "Exec=@pkgdatadir@/@app-id@" \
+                     "Exec=$out/bin/gnome-maps"
+  '';
+
  preCheck = ''
    # “time.js” included by “timeTest” and “translationsTest” depends on “org.gnome.desktop.interface” schema.
    export XDG_DATA_DIRS="${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:$XDG_DATA_DIRS"
@@ -48,11 +48,11 @@ in

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-software";
-  version = "47.1";
+  version = "47.2";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
-    hash = "sha256-k8pQA2YxZ0VZTvBfytHAXPQ/Au+PZggMF/fruMo/NL8=";
+    hash = "sha256-ESM4+KmOflEl3j9XIphzU0IVt37u830/1CYvAhUcfOo=";
  };

  patches = [
@@ -24,11 +24,11 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gnome-text-editor";
-  version = "47.1";
+  version = "47.2";

  src = fetchurl {
    url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-3pVkLitA/yZf7s2GuTng/QGOTrK6SZNQ8rrSv8xUAQw=";
+    hash = "sha256-fQQDmxYXTsX9Zf6i9Efz/r2f3yqjbpmXq8b/mSzDHjg=";
  };

  nativeBuildInputs = [
@@ -2,8 +2,7 @@
  lib,
  buildGoModule,
  fetchFromGitHub,
-  gotestwaf,
-  testers,
+  versionCheckHook,
 }:

 buildGoModule rec {
@@ -19,8 +18,7 @@ buildGoModule rec {

  vendorHash = "sha256-mPqCphweDF9RQibdjTaXXfXdO8NENHVMdIPxrJEw2g4=";

-  # Some tests require networking as of v0.4.0
-  doCheck = false;
+  nativeInstallCheckInputs = [ versionCheckHook ];

  ldflags = [
    "-w"
@@ -28,11 +26,12 @@ buildGoModule rec {
    "-X=github.com/wallarm/gotestwaf/internal/version.Version=v${version}"
  ];

-  passthru.tests.version = testers.testVersion {
-    command = "gotestwaf --version";
-    package = gotestwaf;
-    version = "v${version}";
-  };
+  # Tests require network access
+  doCheck = false;
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];

  meta = with lib; {
    description = "Tool for API and OWASP attack simulation";
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
    description = "Grab images from a Wayland compositor";
    license = lib.licenses.mit;
    mainProgram = "grim";
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ khaneliman ];
    platforms = lib.platforms.linux;
  };
 })
@@ -28,11 +28,11 @@ let
  sslPkg = sslPkgs.${sslLibrary};
 in stdenv.mkDerivation (finalAttrs: {
  pname = "haproxy";
-  version = "3.0.5";
+  version = "3.1.0";

  src = fetchurl {
    url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-rjgiHoWuugOKcl7771v+XnZnG6eVnl63TDn9B55dAC4";
+    hash = "sha256-VqFGhXSrQR3Kveg3+WvqbPPC65DieUafde0dzccPzhE=";
  };

  buildInputs = [ sslPkg zlib libxcrypt ]
@@ -34,13 +34,13 @@ in

 stdenv.mkDerivation rec {
  pname = "janus-gateway";
-  version = "1.2.4";
+  version = "1.3.0";

  src = fetchFromGitHub {
    owner = "meetecho";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-oUX9PxiNdmrC03p+DAGkxD+mbi2jzuCgwlgd2JZ4Gwo=";
+    sha256 = "sha256-11UdQ4FYB8bjkD0U1C/5Ukd9F9oGl065gAvGo6L4Xpc=";
  };

  nativeBuildInputs = [
@@ -1,21 +1,28 @@
-{ stdenv, lib, fetchFromGitHub, buildGoModule, installShellFiles, go }:
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  installShellFiles,
+  testers,
+  kubelogin,
+}:

 buildGoModule rec {
  pname = "kubelogin";
-  version = "0.1.4";
+  version = "0.1.5";

  src = fetchFromGitHub {
    owner = "Azure";
    repo = pname;
    rev = "v${version}";
-    sha256 = "sha256-DRXvnIOETNlZ50oa8PbLSwmq6VJJcerUe1Ir7s4/7Kw=";
+    sha256 = "sha256-/qA/M0Z71j3h5zKDMUWsni9lgbrCcjYHpnhFPVRJ1qA=";
  };

-  vendorHash = "sha256-K/GfRJ0KbizsVmKa6V3/ZLDKivJttEsqA3Q84S0S4KI=";
+  vendorHash = "sha256-qz51x1d8Uk3N5vrDMVgJxFIxXTMiDCPplI7SmJjZ3sI=";

  ldflags = [
-    "-X main.version=${version}"
-    "-X main.goVersion=${lib.getVersion go}"
+    "-X main.gitTag=v${version}"
  ];

  nativeBuildInputs = [ installShellFiles ];
@@ -27,6 +34,11 @@ buildGoModule rec {
    installShellCompletion kubelogin.{bash,fish,zsh}
  '';

+  passthru.tests.version = testers.testVersion {
+    package = kubelogin;
+    version = "v${version}";
+  };
+
  __darwinAllowLocalNetworking = true;

  meta = with lib; {
@@ -2,14 +2,14 @@

 stdenv.mkDerivation rec {
  pname = "lftp";
-  version = "4.9.2";
+  version = "4.9.3";

  src = fetchurl {
    urls = [
      "https://lftp.yar.ru/ftp/${pname}-${version}.tar.xz"
      "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz"
      ];
-    sha256 = "03b7y0h3mf4jfq5y8zw6hv9v44z3n6i8hc1iswax96y3z7sc85y5";
+    sha256 = "sha256-lucZnXk1vjPPaxFh6VWyqrQKt37N8qGc6k/BGT9Fftw=";
  };

  nativeBuildInputs = [ pkg-config ];
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
    description = "Library that can be used to easily add the RIST protocol to your application";
    homepage = "https://code.videolan.org/rist/librist";
    license = with licenses; [ bsd2 mit isc ];
-    maintainers = with maintainers; [ raphaelr sebtm ];
+    maintainers = with maintainers; [ raphaelr ];
    platforms = platforms.all;
  };
 }
@@ -18,7 +18,7 @@

 stdenv.mkDerivation rec {
  pname = "libspelling";
-  version = "0.4.4";
+  version = "0.4.5";

  outputs = [ "out" "dev" "devdoc" ];

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
    owner = "GNOME";
    repo = "libspelling";
    rev = version;
-    hash = "sha256-6ggegeDR4UBP2LKn6lj0pOB1Iz7MwLEf9usIB28SEMA=";
+    hash = "sha256-+WjhBg98s5RxQfd85FtMNuoVWjw9Hap9yDqnpYNAGgw=";
  };

  nativeBuildInputs = [
@@ -8,27 +8,37 @@

 let
  hlsJs = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.15/dist/hls.min.js";
-    hash = "sha256-qRwhj9krOcLJKbGghAC8joXfNKXUdN7OkgEDosUWdd8=";
+    url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.17/dist/hls.min.js";
+    hash = "sha256-SEBU6M0D0/bReB+39AK9wxjYpMUn+TOpXGJOJ8yalHA=";
  };
 in
 buildGoModule rec {
  pname = "mediamtx";
  # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.9.2";
+  version = "1.9.3";

  src = fetchFromGitHub {
    owner = "bluenviron";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-aHVSGyrLuLX/RYf1I1dDackmOeU3m24QcwBus4Uly0I=";
+    hash = "sha256-2qFJujfnlpmiOAmDBPl3hrbbHDOZOWFy8Yh2VOU0FEI=";
  };

-  vendorHash = "sha256-YpwbFCfI2kfmX3nI1G9OGUv5qpZ/JMis5VyUkqsESZA=";
+  vendorHash = "sha256-6MHtYrHZF3Oo53MV1Di0wGw9Xk+2CMei2XeoI0OcKsQ=";

  postPatch = ''
    cp ${hlsJs} internal/servers/hls/hls.min.js
    echo "v${version}" > internal/core/VERSION
+
+    # disable binary-only rpi camera support
+    substituteInPlace internal/staticsources/rpicamera/camera_disabled.go \
+      --replace-fail '!linux || (!arm && !arm64)' 'linux'
+    substituteInPlace internal/staticsources/rpicamera/{component,camera,params_serialize,pipe}.go \
+      --replace-fail '(linux && arm) || (linux && arm64)' 'linux && !linux'
+    substituteInPlace internal/staticsources/rpicamera/component_32.go \
+      --replace-fail 'linux && arm' 'linux && !linux'
+    substituteInPlace internal/staticsources/rpicamera/component_64.go \
+      --replace-fail 'linux && arm64' 'linux && !linux'
  '';

  subPackages = [ "." ];
@@ -41,7 +51,7 @@ buildGoModule rec {
  };

  meta = with lib; {
-    description = "Ready-to-use RTSP server and RTSP proxy that allows to read and publish video and audio streams";
+    description = "SRT, WebRTC, RTSP, RTMP, LL-HLS media server and media proxy";
    inherit (src.meta) homepage;
    license = licenses.mit;
    mainProgram = "mediamtx";
@@ -6,19 +6,19 @@

 rustPlatform.buildRustPackage rec {
  pname = "meow";
-  version = "2.1.3";
+  version = "2.1.4";

  src = fetchFromGitHub {
    owner = "PixelSergey";
    repo = "meow";
    rev = "v${version}";
-    hash = "sha256-PB871c137uxxPaYbV6NB8kECVUrQWTeVz0ciVLHrph4=";
+    hash = "sha256-iskpT0CU/cGp+8myWaVmdw/uC0VoP8Sv+qbjpDDKS3o=";
  };

-  cargoHash = "sha256-4BoKZUgt4jf8jy2HU3J6RuT0GXNqkJnBUR09wNlNm7E=";
+  cargoHash = "sha256-/XzXgbmgJ1EN3cQmgWNMUpYtNWRlwJ0mvaQWCsP3FMk=";

  postInstall = ''
-    ln -s $out/bin/meow-cli $out/bin/meow
+    mv $out/bin/meow-cli $out/bin/meow
  '';

  meta = {
@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  darwin,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "nbtscanner";
+  version = "0.0.2";
+
+  src = fetchFromGitHub {
+    owner = "jonkgrimes";
+    repo = "nbtscanner";
+    rev = "refs/tags/${version}";
+    hash = "sha256-lnTTutOc829COwfNhBkSK8UpiNnGsm7Da53b+eSBt1Q=";
+  };
+
+  cargoHash = "sha256-NffNQXKJ+b1w7Ar2M6UDev/AxruDEf8IGQ+mNdvU6e4=";
+
+  cargoPatches = [
+    ./Cargo.lock.patch
+  ];
+
+  postPatch = ''
+    # https://github.com/jonkgrimes/nbtscanner/issues/4
+    substituteInPlace src/main.rs \
+      --replace-fail '.version("0.1")' '.version("${version}")'
+  '';
+
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = with lib; {
+    description = "NetBIOS scanner written in Rust";
+    homepage = "https://github.com/jonkgrimes/nbtscanner";
+    changelog = "https://github.com/jonkgrimes/nbtscanner/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+    mainProgram = "nbtscanner";
+  };
+}
@@ -2,7 +2,8 @@
  lib,
  stdenv,
  fetchzip,
-  cmake,
+  meson,
+  ninja,
  pkg-config,
  boost,
  howard-hinnant-date,
@@ -17,15 +18,16 @@
 let nix = if nixOverride != null then nixOverride else nixVersions.nix_2_24;
 in stdenv.mkDerivation (finalAttrs: {
  pname = "nix-plugin-pijul";
-  version = "0.1.5";
+  version = "0.1.6";

  src = fetchzip {
    url = "https://dblsaiko.net/pub/nix-plugin-pijul/nix-plugin-pijul-${finalAttrs.version}.tar.gz";
-    hash = "sha256-1BJZ0lv7XDgT/AiXmJ2Z5Jn0tEa1Yerp9YYcjVCHqoI=";
+    hash = "sha256-BOuBaFvejv1gffhBlAJADLtd5Df71oQbuCnniU07nF4=";
  };

  nativeBuildInputs = [
-    cmake
+    meson
+    ninja
    pkg-config
  ];

@@ -14,16 +14,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "ntpd-rs";
-  version = "1.3.0";
+  version = "1.3.1";

  src = fetchFromGitHub {
    owner = "pendulum-project";
    repo = "ntpd-rs";
    rev = "refs/tags/v${version}";
-    hash = "sha256-0fbl50kugqYHeS+9a/kCkwy1wPDqDCYwPIGZ37NFa/Y=";
+    hash = "sha256-WN+6Ba3oGnoiH5SC0ZHBHqS4F/XPqEyC3J71Fj+3CrQ=";
  };

-  cargoHash = "sha256-9HLbGC6j0Wq/lG//CeEAfnYzlGG14CnDpmluL1moHWQ=";
+  cargoHash = "sha256-IksW8a6OGZzgEInX0P2sS/UMH8XaPRwXCesq7qxvURk=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
    darwin.apple_sdk_11_0.frameworks.Security
@@ -5,7 +5,7 @@
 }:
 let
  pname = "nuclear";
-  version = "0.6.39";
+  version = "0.6.40";

  src = fetchurl {
    # Nuclear currenntly only publishes AppImage releases for x86_64, which is hardcoded in
@@ -13,7 +13,7 @@ let
    # provide more arches, we should use stdenv.hostPlatform to determine the arch and choose
    # source URL accordingly.
    url = "https://github.com/nukeop/nuclear/releases/download/v${version}/${pname}-v${version}-x86_64.AppImage";
-    hash = "sha256-X5IQ9NlFTFTEYDhuCyrzkPGmvNK66nCSdbmJZxObkBo=";
+    hash = "sha256-OzTT4f+cdMzmSwdTHk8LXGg3AQcWw1ItIBbrfp16qAw=";
  };

  appimageContents = appimageTools.extract { inherit pname version src; };
@@ -92,9 +92,11 @@ python312.pkgs.buildPythonApplication rec {
    ftfy
    google-generativeai
    googleapis-common-protos
+    iso-639
    langchain
    langchain-chroma
    langchain-community
+    langdetect
    langfuse
    ldap3
    markdown
@@ -28,13 +28,13 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "orca";
-  version = "47.1";
+  version = "47.2";

  format = "other";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-0H16zehWVUaXOp8pcwcy8xcmq2vJ3Mzq0uEgTX2ARO0=";
+    hash = "sha256-XmevNX9xmOoApEOByrTE+U5oJtbtgAZo85QWziqrjlo=";
  };

  patches = [
@@ -5,16 +5,16 @@

 buildGoModule rec {
  pname = "otpauth";
-  version = "0.5.2";
+  version = "0.5.3";

  src = fetchFromGitHub {
    owner = "dim13";
    repo = "otpauth";
    rev = "v${version}";
-    sha256 = "sha256-1+A1oXY5sKMr9dVa/4vB+ZkfZSDdhag5y5LfM7OJmKo=";
+    sha256 = "sha256-q6QQST3SDskEXd6X55A4VgOM8tZITUrpHfI/NV+NSwk=";
  };

-  vendorHash = "sha256-ZRCwZGlWzlWh+E3KUH83639Tfck7bwE36wXVnG7EQIE=";
+  vendorHash = "sha256-lATdsuqSM2EaclhvNN9BmJ6NC2nghDfggRrwvRjF7us=";

  meta = with lib; {
    description = "Google Authenticator migration decoder";
@@ -38,13 +38,13 @@

 let
  pname = "pcloud";
-  version = "1.14.7";
-  code = "XZhPkU0Zh5gulxHfMn4j1dYBS4dh45iDQHby";
+  version = "1.14.8";
+  code = "XZ6qNX5ZgodGJnOmGT5jY4UaBxqEVVbaUzGX";

  # Archive link's codes: https://www.pcloud.com/release-notes/linux.html
  src = fetchzip {
    url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip";
-    hash = "sha256-fzQVuCI3mK93Y3Fwzc0WM5rti0fTZhRm+Qj1CHC8CJ4=";
+    hash = "sha256-o26HI1v6VzF14d261M1rWp8wlM4O6uL4YJ/cmkwqRXU=";
  };

  appimageContents = appimageTools.extractType2 {
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  darwin,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rates";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "lunush";
+    repo = "rates";
+    rev = "refs/tags/${version}";
+    hash = "sha256-zw2YLTrvqbGKR8Dg5W+kJTDKIfro+MNyjHXfZMXZhaw=";
+  };
+
+  cargoHash = "sha256-5EcTeMfa1GNp1q60qSgEi/I3298hXUD1Vc1K55XGW4I=";
+
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = with lib; {
+    description = "CLI tool that brings currency exchange rates right into your terminal";
+    homepage = "https://github.com/lunush/rates";
+    changelog = "https://github.com/lunush/rates/releases/tag/${version}";
+    license = with licenses; [
+      asl20
+      mit
+    ];
+    maintainers = with maintainers; [ fab ];
+    mainProgram = "rates";
+  };
+}
@@ -1,19 +0,0 @@
-diff --git a/apple-codesign/src/cli/mod.rs b/apple-codesign/src/cli/mod.rs
-index 53e9649271..82d4d061a6 100644
--- a/apple-codesign/src/cli/mod.rs
-+++ b/apple-codesign/src/cli/mod.rs
-@@ -2499,9 +2499,11 @@
-         _ => LevelFilter::Trace,
-     };
- 
-    let mut builder = env_logger::Builder::from_env(
-        env_logger::Env::default().default_filter_or(log_level.as_str()),
-    );
-+    let mut builder = env_logger::Builder::new();
-+
-+    builder
-+        .filter_level(log_level)
-+        .parse_default_env();
- 
-     // Disable log context except at higher log levels.
-     if log_level <= LevelFilter::Info {
@@ -8,28 +8,21 @@

 rustPlatform.buildRustPackage rec {
  pname = "rcodesign";
-  version = "0.27.0";
+  version = "0.28.0";

  src = fetchFromGitHub {
    owner = "indygreg";
    repo = "apple-platform-rs";
    rev = "apple-codesign/${version}";
-    hash = "sha256-F6Etl3Zbpmh3A/VeCcSXIy3W1WYFg8WUSJBJV/akCxU=";
+    hash = "sha256-xyjq5mdc29OwzlUAQZWSg1k68occ81i7KBGUiiq0ke0=";
  };

-  cargoPatches = [
-    # Update time to a version that is compatible with Rust 1.80
-    ./update-time-rs-in-cargo-lock.patch
-  ];
-
  patches = [
-    # Fix rcodesign’s verbosity level to set the logging level as intended. Needed for cli_tests.
-    ./fix-verbosity-level.patch
    # Disable cli_tests test that requires network access.
    ./disable-sign-for-notarization-test.patch
  ];

-  cargoHash = "sha256-VrexypkCW58asvzXo3wj/Rgi72tiGuchA31BkEZoYpI=";
+  cargoHash = "sha256-xMhyKovXoBPZp6epWQ+CYODpyvHgpv6eZfdWPTuDnK8=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ];

@@ -1,47 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 3a5dd6d244..787b048829 100644
--- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -2257,6 +2257,12 @@
- ]
- 
- [[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"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-@@ -3605,12 +3611,13 @@
- 
- [[package]]
- name = "time"
-version = "0.3.31"
-+version = "0.3.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e"
-+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
- dependencies = [
-  "deranged",
-  "itoa",
-+ "num-conv",
-  "powerfmt",
-  "serde",
-  "time-core",
-@@ -3625,10 +3632,11 @@
- 
- [[package]]
- name = "time-macros"
-version = "0.2.16"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f"
-+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
- dependencies = [
-+ "num-conv",
-  "time-core",
- ]
- 
@@ -35,11 +35,11 @@

 stdenv.mkDerivation rec {
  pname = "rhythmbox";
-  version = "3.4.7";
+  version = "3.4.8";

  src = fetchurl {
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "L21WwT/BpkxTT1AHiPtIKTbOVHs0PtkMZ94fK84M+n4=";
+    sha256 = "IBaoqNKpWcB6RnrJaCxu1gW6iIP7dgQQ1otoq4ON+fI=";
  };

  nativeBuildInputs = [
@@ -15,7 +15,7 @@
 , stdenv
 }:
 let
-  version = "2.0-1470";
+  version = "2.0-1483";
  urlVersion = builtins.replaceStrings [ "." "-" ] [ "00" "0" ] version;
 in
 stdenv.mkDerivation {
@@ -24,7 +24,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
-    hash = "sha256-esaxrSdvl1qUNfotOSs8Tj/AUg6hFpl23DGbji/uFO8=";
+    hash = "sha256-y8MYiWlc3HfF7a3n7yrs84H/9KbEoANd8+7t2ORIm6w=";
  };

  dontConfigure = true;
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  darwin,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rustcat";
+  version = "3.0.0";
+
+  src = fetchFromGitHub {
+    owner = "robiot";
+    repo = "rustcat";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/6vNFh7n6WvYerrL8m9sgUKsO2KKj7/f8xc4rzHy9Io=";
+  };
+
+  cargoHash = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg=";
+
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  versionCheckProgram = [ "${placeholder "out"}/bin/rcat" ];
+
+  meta = with lib; {
+    description = "Port listener and reverse shell";
+    homepage = "https://github.com/robiot/rustcat";
+    changelog = "https://github.com/robiot/rustcat/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+    mainProgram = "rcat";
+  };
+}
@@ -0,0 +1,49 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "sccmhunter";
+  version = "1.0.6-unstable-2024-11-07";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "garrettfoster13";
+    repo = "sccmhunter";
+    rev = "33c23f0d71e48127a0b03b06a019148df71049ef";
+    hash = "sha256-mU3GKgX8gcuJ+YT3xL0/dDds34uhFD+Rc3m15W7zoKc=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    cmd2
+    cryptography
+    impacket
+    ldap3
+    pandas
+    pyasn1
+    pyasn1-modules
+    requests
+    requests-ntlm
+    requests-toolbelt
+    rich
+    tabulate
+    typer
+    urllib3
+    pyopenssl
+    pycryptodome
+  ];
+
+  meta = {
+    description = "Post exploitation tool to identify and attack SCCM related assets in an Active Directory domain";
+    homepage = "https://github.com/garrettfoster13/sccmhunter";
+    changelog = "https://github.com/garrettfoster13/sccmhunter/blob/${src.rev}/changelog.md";
+    license = lib.licenses.mit;
+    mainProgram = "sccmhunter.py";
+    maintainers = with lib.maintainers; [ purpole ];
+  };
+}
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  darwin,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "slowlorust";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "MJVL";
+    repo = "slowlorust";
+    rev = "refs/tags/${version}";
+    hash = "sha256-c4NWkQ/QvlUo1YoV2s7rWB6wQskAP5Qp1WVM23wvV3c=";
+  };
+
+  cargoHash = "sha256-Wu1mm+yJw2SddddxC5NfnMWLr+dplnRxH3AJ1/mTAKM=";
+
+  postPatch = ''
+    # https://github.com/MJVL/slowlorust/issues/2
+    substituteInPlace src/main.rs \
+      --replace-fail 'version = "1.0"' 'version = "${version}"'
+  '';
+
+  buildInputs = lib.optional stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  versionCheckProgramArg = [ "--version" ];
+
+  meta = with lib; {
+    description = "Lightweight slowloris (HTTP DoS) tool";
+    homepage = "https://github.com/MJVL/slowlorust";
+    changelog = "https://github.com/MJVL/slowlorust/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+    mainProgram = "slowlorust";
+  };
+}
@@ -1,17 +1,21 @@
 {
-  "version": "0.1.15",
+  "version": "0.1.17",
  "assets": {
    "x86_64-linux": {
-      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.15/starpls-linux-amd64",
-      "hash": "sha256-6rLYCRg7K36xKxW0nI86w6u1MjAPGTtJQbY5HCSukTE="
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-linux-amd64",
+      "hash": "sha256-LGW7KBC0/q/JMdpQSaTjqSqjjNqH49WoZJQMXKOkq5c="
    },
    "aarch64-linux": {
-      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.15/starpls-linux-aarch64",
-      "hash": "sha256-sHyPcaBlhZrepfnVGE5CxvZZOrBMT0qDP9hHj78CXJQ="
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-linux-aarch64",
+      "hash": "sha256-qsS0J4qiaj7nuC9Gv2hZHAuZ3L+GZFaZAazkxOlZvAc="
+    },
+    "x86_64-darwin": {
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-darwin-amd64",
+      "hash": "sha256-VB2Y8UMyVxkPmeA0wTlIq/0Rc4Yei9PZrMz86m111GA="
    },
    "aarch64-darwin": {
-      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.15/starpls-darwin-arm64",
-      "hash": "sha256-Q8U+Vagwb9F63N5UA8sAOd+tfCvyZMdtAmZcNgtwiSo="
+      "url": "https://github.com/withered-magic/starpls/releases/download/v0.1.17/starpls-darwin-arm64",
+      "hash": "sha256-JSJ6gypX1bcPJ57f4XIB5DCL2HynhhIlG6pwbJjpVCE="
    }
  }
 }
@@ -11,6 +11,7 @@ import httpx
 platforms = {
    "x86_64-linux": "linux-amd64",
    "aarch64-linux": "linux-aarch64",
+    "x86_64-darwin": "darwin-amd64",
    "aarch64-darwin": "darwin-arm64",
 }

@@ -10,16 +10,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "static-web-server";
-  version = "2.33.0";
+  version = "2.33.1";

  src = fetchFromGitHub {
    owner = "static-web-server";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-WR8fzpeN6zufvakanJBSMtgTpfDRqCyaTfEzE5NqFOA=";
+    hash = "sha256-2vkRLQ4FKw/gkv4GuwFVcL8oDV4cNuKualQVc/X2B/Y=";
  };

-  cargoHash = "sha256-AasNva4SOTSrvBTrGHX/jOPjcjt3o8KUsFL7e4uhW6M=";
+  cargoHash = "sha256-wRDYzm6mYze9CX+Ug53M3wuf3Ry6l3NGTDyCL7rbdc8=";

  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Security ];

@@ -2,15 +2,15 @@

 rustPlatform.buildRustPackage rec {
  pname = "svgbob";
-  version = "0.7.2";
+  version = "0.7.4";

  src = fetchCrate {
    inherit version;
    crateName = "svgbob_cli";
-    hash = "sha256-QWDi6cpADm5zOzz8hXuqOBtVrqb0DteWmiDXC6PsLS4=";
+    hash = "sha256-qSY12WjSPMoWqJHkYnPvhCtZAuI3eq+sA+/Yr9Yssp8=";
  };

-  cargoHash = "sha256-Fj1qjG4SKlchUWW4q0tBC+9fHFFuY6MHngJCFz6J5JY=";
+  cargoHash = "sha256-dgOEztAlX823M+bc+vnrOvmeWtxxCsCR6+k1Yho82EM=";

  postInstall = ''
    mv $out/bin/svgbob_cli $out/bin/svgbob
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://git.sr.ht/~tsdh/swayr#a-idswayrbarswayrbara";
    license = with licenses; [ gpl3Plus ];
    platforms = platforms.linux;
-    maintainers = with maintainers; [ sebtm ];
+    maintainers = with maintainers; [];
    mainProgram = "swayrbar";
  };
 }
@@ -13,6 +13,8 @@
 , secp256k1
 , zlib
 , nix-update-script
+, darwinMinVersionHook
+, apple-sdk_11
 }:

 stdenv.mkDerivation rec {
@@ -44,14 +46,15 @@ stdenv.mkDerivation rec {
    readline
    secp256k1
    zlib
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
+    (darwinMinVersionHook "10.13")
+    apple-sdk_11
  ];

  passthru.updateScript = nix-update-script { };

  meta = with lib; {
-    # The build fails on darwin as:
-    #   error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
-    broken = stdenv.hostPlatform.isDarwin;
    description = "Fully decentralized layer-1 blockchain designed by Telegram";
    homepage = "https://ton.org/";
    changelog = "https://github.com/ton-blockchain/ton/blob/v${version}/Changelog.md";
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
    description = "Auto toggle keyboard back-lighting on Thinkpads (and maybe other laptops) for Linux";
    homepage = "https://github.com/saibotd/tp-auto-kbbl";
    license = licenses.mit;
-    maintainers = with maintainers; [ sebtm ];
+    maintainers = with maintainers; [];
    platforms = platforms.linux;
    mainProgram = "tp-auto-kbbl";
  };
@@ -6,6 +6,7 @@
 , bzip2
 , bzip3
 , lz4
+, makeWrapper
 , pcre2
 , testers
 , xz
@@ -15,15 +16,17 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ugrep";
-  version = "7.1.0";
+  version = "7.1.1";

  src = fetchFromGitHub {
    owner = "Genivia";
    repo = "ugrep";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-H2c2PpdgjzPwR2aOFgQSLTeyxCBg4Ngibf0t1aT3xl8=";
+    hash = "sha256-l/AHt0OLI76AEOOziFXdfQdJlx6HqdFoEJ27YhwUJnQ=";
  };

+  nativeBuildInputs = [ makeWrapper ];
+
  buildInputs = [
    boost
    brotli
@@ -36,6 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
    zstd
  ];

+  postFixup = ''
+    for i in ug+ ugrep+; do
+      wrapProgram "$out/bin/$i" --prefix PATH : "$out/bin"
+    done
+  '';
+
  passthru.tests = {
    version = testers.testVersion {
      package = finalAttrs.finalPackage;
@@ -1,21 +1,24 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3,
 }:

 python3.pkgs.buildPythonApplication rec {
  pname = "wafw00f";
  version = "2.2.0";
-  format = "setuptools";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "EnableSecurity";
-    repo = pname;
+    repo = "wafw00f";
    rev = "refs/tags/v${version}";
-    sha256 = "sha256-wJZ1/aRMFpE6Q5YAtGxXwxe2G9H/de+l3l0C5rwEWA8=";
+    hash = "sha256-wJZ1/aRMFpE6Q5YAtGxXwxe2G9H/de+l3l0C5rwEWA8=";
  };

-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ setuptools ];
+
+  dependencies = with python3.pkgs; [
    requests
    pluginbase
  ];
@@ -23,15 +26,14 @@ python3.pkgs.buildPythonApplication rec {
  # Project has no tests
  doCheck = false;

-  pythonImportsCheck = [
-    "wafw00f"
-  ];
+  pythonImportsCheck = [ "wafw00f" ];

  meta = with lib; {
    description = "Tool to identify and fingerprint Web Application Firewalls (WAF)";
-    mainProgram = "wafw00f";
    homepage = "https://github.com/EnableSecurity/wafw00f";
-    license = with licenses; [ bsd3 ];
+    changelog = "https://github.com/EnableSecurity/wafw00f/releases/tag/v${version}";
+    license = licenses.bsd3;
    maintainers = with maintainers; [ fab ];
+    mainProgram = "wafw00f";
  };
 }
@@ -1,5 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, openssl, rustPlatform, libiconv
-, Security, makeWrapper, bash }:
+{
+  lib,
+  stdenv,
+  bash,
+  darwin,
+  fetchFromGitHub,
+  libiconv,
+  makeWrapper,
+  openssl,
+  pkg-config,
+  rustPlatform,
+  versionCheckHook,
+}:

 rustPlatform.buildRustPackage rec {
  pname = "websocat";
@@ -7,21 +18,31 @@ rustPlatform.buildRustPackage rec {

  src = fetchFromGitHub {
    owner = "vi";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-v5+9cbKe3c12/SrW7mgN6tvQIiAuweqvMIl46Ce9f2A=";
+    repo = "websocat";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-v5+9cbKe3c12/SrW7mgN6tvQIiAuweqvMIl46Ce9f2A=";
  };

  cargoHash = "sha256-2THUFcaM4niB7YiQiRXJQuaQu02fpgZKPWrejfhmRQ0=";

-  nativeBuildInputs = [ pkg-config makeWrapper ];
-  buildInputs = [ openssl ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv Security ];
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+
+  buildInputs =
+    [ openssl ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      libiconv
+      darwin.apple_sdk.frameworks.Security
+    ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];

  buildFeatures = [ "ssl" ];

  # Needed to get openssl-sys to use pkg-config.
-  OPENSSL_NO_VENDOR=1;
+  OPENSSL_NO_VENDOR = 1;

  # The wrapping is required so that the "sh-c" option of websocat works even
  # if sh is not in the PATH (as can happen, for instance, when websocat is
@@ -31,12 +52,17 @@ rustPlatform.buildRustPackage rec {
      --prefix PATH : ${lib.makeBinPath [ bash ]}
  '';

+  doInstallCheck = true;
+
  meta = with lib; {
-    homepage = "https://github.com/vi/websocat";
    description = "Command-line client for WebSockets (like netcat/socat)";
+    homepage = "https://github.com/vi/websocat";
    changelog = "https://github.com/vi/websocat/releases/tag/v${version}";
    license = licenses.mit;
-    maintainers = with maintainers; [ thoughtpolice Br1ght0ne ];
+    maintainers = with maintainers; [
+      thoughtpolice
+      Br1ght0ne
+    ];
    mainProgram = "websocat";
  };
 }
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
    description = "Xprop clone for wlroots based compositors";
    homepage = "https://gist.github.com/crispyricepc/f313386043395ff06570e02af2d9a8e0";
    license = licenses.mit;
-    maintainers = with maintainers; [ sebtm ];
+    maintainers = with maintainers; [];
    platforms = platforms.linux;
    mainProgram = "wlprop";
  };
@@ -17,13 +17,13 @@ python3Packages.buildPythonApplication rec {
  # The websites yt-dlp deals with are a very moving target. That means that
  # downloads break constantly. Because of that, updates should always be backported
  # to the latest stable release.
-  version = "2024.11.18";
+  version = "2024.12.3";
  pyproject = true;

  src = fetchPypi {
    inherit version;
    pname = "yt_dlp";
-    hash = "sha256-uKTCPTya/X5Ha824fzi2wOjhLjojnXmI8TrLQ0IA9U0=";
+    hash = "sha256-Nav/UcV2IDMQPyMwugqKH0jEOIpBOi2M3JuEZC/o7dQ=";
  };

  build-system = with python3Packages; [
@@ -102,7 +102,7 @@ def make_version_policy(

 def find_versions(package_name: str, version_policy: VersionPolicy) -> List[Version]:
    # The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762
-    cache = json.loads(requests.get(f"https://ftp.gnome.org/pub/GNOME/sources/{package_name}/cache.json").text)
+    cache = json.loads(requests.get(f"https://download.gnome.org/sources/{package_name}/cache.json").text)
    if type(cache) != list or cache[0] != 4:
        raise Exception("Unknown format of cache.json file.")

@@ -117,7 +117,7 @@ parser = argparse.ArgumentParser(
 )
 parser.add_argument(
    "package-name",
-    help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.",
+    help="Name of the directory in https://download.gnome.org/sources/ containing the package.",
 )
 parser.add_argument(
    "version-policy",
@@ -24,13 +24,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "gtksourceview";
-  version = "5.14.1";
+  version = "5.14.2";

  outputs = [ "out" "dev" "devdoc" ];

  src = fetchurl {
    url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz";
-    hash = "sha256-AJhi6HuSnaWnJOzgefAfjO4p50eXoeysNJ9YwVo8vFg=";
+    hash = "sha256-Gm04emgHX4rv1OdSz0hxd8SmgjsU/4pDSYaFiurvYmQ=";
  };

  patches = [
@@ -48,8 +48,8 @@ stdenv.mkDerivation rec {

  postInstall = ''
    substituteInPlace "$out"/bin/HepMC3-config \
-      --replace 'greadlink' '${coreutils}/bin/readlink' \
-      --replace 'readlink' '${coreutils}/bin/readlink'
+      --replace-fail '$(greadlink' '$(${coreutils}/bin/readlink' \
+      --replace-fail '$(readlink' '$(${coreutils}/bin/readlink'
  '';

  pythonImportsCheck = [ "pyHepMC3" ];
@@ -1,7 +1,7 @@
 { lib
 , buildDunePackage
 , fetchurl
-, mirage-crypto
+, digestif
 , mirage-clock
 , x509
 , logs
@@ -13,19 +13,19 @@

 buildDunePackage rec {
  pname = "ca-certs-nss";
-  version = "3.103";
+  version = "3.107";

-  minimalOCamlVersion = "4.08";
+  minimalOCamlVersion = "4.13";

  src = fetchurl {
    url = "https://github.com/mirage/ca-certs-nss/releases/download/v${version}/ca-certs-nss-${version}.tbz";
-    hash = "sha256-ZBwPBUwYuBBuzukgocEHBoqorotLmzHkjUYCmWRqYAw=";
+    hash = "sha256-VIT5cIa+MWpQlTLtywPp6Qx5jgCyNEyHRQcQWvXw/GA=";
  };

  propagatedBuildInputs = [
-    mirage-crypto
    mirage-clock
    x509
+    digestif
  ];

  buildInputs = [
@@ -22,20 +22,22 @@
  pysdl2,
  pyside2,
  pyqt5,
+  reportlab,
+  av,

  mesa,
 }:

 buildPythonPackage rec {
  pname = "moderngl-window";
-  version = "3.0.2";
+  version = "3.0.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "moderngl";
    repo = "moderngl_window";
    rev = "refs/tags/${version}";
-    hash = "sha256-J7vcEuJC0fVYyalSm9jDT44mLThoMw78Xmj5Ap3Q9ME=";
+    hash = "sha256-WXHQVJJCE+7FQJjRgjnmpoGGnF20OQ6/X6Fnrzsp2fA=";
  };

  pythonRelaxDeps = [
@@ -64,6 +66,8 @@ buildPythonPackage rec {
    PySDL2 = [ pysdl2 ];
    PySide2 = [ pyside2 ];
    pyqt5 = [ pyqt5 ];
+    pdf = [ reportlab ];
+    av = [ av ];
  };

  # Tests need a display to run.
@@ -206,12 +206,12 @@ rec {
      "sha256-FytBZE72zKuoagYWnfv77mS7Wx6WcE427Spd/2h78kc=";

  mypy-boto3-chime-sdk-voice =
-    buildMypyBoto3Package "chime-sdk-voice" "1.35.16"
-      "sha256-O7mrqn+S0rDcOnhxXI10mB/NHzI+f23HqNXoO5gxiPc=";
+    buildMypyBoto3Package "chime-sdk-voice" "1.35.72"
+      "sha256-KWtXvo/mX4FbAg3WG0g4SAsGaGb2VT8ENeREzap5BMY=";

  mypy-boto3-cleanrooms =
-    buildMypyBoto3Package "cleanrooms" "1.35.56"
-      "sha256-9klgPrVKNaG6PWOIZkvsXNP98+TOgJfVPT5aPV3SDtI=";
+    buildMypyBoto3Package "cleanrooms" "1.35.72"
+      "sha256-1EcmHpvpqH23RxsDS/TgfszwSeETfFLXuenPwPYc2qc=";

  mypy-boto3-cloud9 =
    buildMypyBoto3Package "cloud9" "1.35.0"
@@ -338,8 +338,8 @@ rec {
      "sha256-qycjnRcrEJ2P3dpciMVFPno1wz3tEJ6pa6z8TlLwTME=";

  mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.35.70"
-      "sha256-oq3BEKupaGgOJd3zlXSaglG4SaPfRuU++XEai2N8vRs=";
+    buildMypyBoto3Package "connect" "1.35.72"
+      "sha256-fGo6vO49IgOCiRqAChO/33HU+hRjkdWnu77EG40PrRY=";

  mypy-boto3-connect-contact-lens =
    buildMypyBoto3Package "connect-contact-lens" "1.35.0"
@@ -366,8 +366,8 @@ rec {
      "sha256-YEm3nBfWCSzwPZ3Yvm4Nf3cMxaTccvHdBrs84g7KE4g=";

  mypy-boto3-customer-profiles =
-    buildMypyBoto3Package "customer-profiles" "1.35.64"
-      "sha256-ZF9Vuw2lXjo4n1jsd4Xwmc4olte2DZaP0HZDrbMxdiY=";
+    buildMypyBoto3Package "customer-profiles" "1.35.72"
+      "sha256-QWgwS2PBsWUSNz2wAFL+prgB3874X4cYv69ElCSL48Q=";

  mypy-boto3-databrew =
    buildMypyBoto3Package "databrew" "1.35.0"
@@ -446,8 +446,8 @@ rec {
      "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU=";

  mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.35.70"
-      "sha256-k/ndrawwPWPzTNTApgpoLACNZV07LPp00SNPvemgtAE=";
+    buildMypyBoto3Package "ec2" "1.35.72"
+      "sha256-0v9DrRxCZVy8uwbRHf90s4J1A9gKmaeAmKtSug+7cjU=";

  mypy-boto3-ec2-instance-connect =
    buildMypyBoto3Package "ec2-instance-connect" "1.35.0"
@@ -462,16 +462,16 @@ rec {
      "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g=";

  mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.35.66"
-      "sha256-0DmtbDZK4a4BjvhPcFEWIzWF8L+hCRYW+OF+cRhl0Rc=";
+    buildMypyBoto3Package "ecs" "1.35.72"
+      "sha256-jplX7a1Rql7+97/chlK4bd1PECDUD5OqELNt5ErhDFg=";

  mypy-boto3-efs =
    buildMypyBoto3Package "efs" "1.35.65"
      "sha256-Pf+g7g5cjPoIqAL5sJqqMtPWU0hqGDQnfzwoxNgL5OE=";

  mypy-boto3-eks =
-    buildMypyBoto3Package "eks" "1.35.57"
-      "sha256-efYfxn51rtR6LCnAU3k7ct78OuNnSecGSwYi0OIidt8=";
+    buildMypyBoto3Package "eks" "1.35.72"
+      "sha256-YTMrjEKtexM+4I6u/5qw3TnI1koVwqnA5k5chBVLggo=";

  mypy-boto3-elastic-inference =
    buildMypyBoto3Package "elastic-inference" "1.35.38"
@@ -518,8 +518,8 @@ rec {
      "sha256-ad5PQgRxRqEQ4QOjM0wPGe/4JXPNqlB5exRHacx7YKw=";

  mypy-boto3-events =
-    buildMypyBoto3Package "events" "1.35.0"
-      "sha256-IXJGXd/J+EwN1FcHofPq9AatYysD6FRrny39MzqF6yY=";
+    buildMypyBoto3Package "events" "1.35.72"
+      "sha256-hm9IcgtcrJLJ4wq5BFTOQHzCkWp0I8Isbi7X7gQrnOY=";

  mypy-boto3-evidently =
    buildMypyBoto3Package "evidently" "1.35.0"
@@ -558,8 +558,8 @@ rec {
      "sha256-dUbtx84rCJ5zRHxmdpGFAychNH/F98eviwdwqmslPLk=";

  mypy-boto3-fsx =
-    buildMypyBoto3Package "fsx" "1.35.71"
-      "sha256-niDZs6XFOHHFSVxFNNbHqTeEiFqIpAYrOSd/A0I/FbI=";
+    buildMypyBoto3Package "fsx" "1.35.72"
+      "sha256-J2Vkx1tNMM+0GBKAQD1HWFN6jmJwY+XkghmKgP21NP0=";

  mypy-boto3-gamelift =
    buildMypyBoto3Package "gamelift" "1.35.59"
@@ -594,8 +594,8 @@ rec {
      "sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM=";

  mypy-boto3-guardduty =
-    buildMypyBoto3Package "guardduty" "1.35.55"
-      "sha256-4iTPGfSTkel+xJtH/7/oPxbtmuZJk6p9FrZR3rKMaLA=";
+    buildMypyBoto3Package "guardduty" "1.35.72"
+      "sha256-khmU1gjVuni8d1qUVIETdPhQBEyqtMOuf/HfOkWtY10=";

  mypy-boto3-health =
    buildMypyBoto3Package "health" "1.35.67"
@@ -614,8 +614,8 @@ rec {
      "sha256-wHm7wHBhEX3c29MwZtbZPXH1su5MsAzLmj5h8V3/3V0=";

  mypy-boto3-imagebuilder =
-    buildMypyBoto3Package "imagebuilder" "1.35.46"
-      "sha256-eWIWfLQql7QVkg1CfOrfs46h3UqIQxpmpn4+yYsUZRQ=";
+    buildMypyBoto3Package "imagebuilder" "1.35.72"
+      "sha256-BiU7oalSHsdxJV1KXAChTABpge4GuZcZU83jZLje4h8=";

  mypy-boto3-importexport =
    buildMypyBoto3Package "importexport" "1.35.0"
@@ -810,8 +810,8 @@ rec {
      "sha256-6Vs5eRibHCZvDDIcIEThPa6T1OmfJXjLg4GAZlworsM=";

  mypy-boto3-logs =
-    buildMypyBoto3Package "logs" "1.35.67"
-      "sha256-zyKW1rPjwwXr2B+9L72BlZbpdWHjWfCHberXoA5VQZQ=";
+    buildMypyBoto3Package "logs" "1.35.72"
+      "sha256-YIi6QAIdgiUQZ0aCNaQ8ESpqlBBx+xxSHQB5myqF4Eo=";

  mypy-boto3-lookoutequipment =
    buildMypyBoto3Package "lookoutequipment" "1.35.0"
@@ -898,8 +898,8 @@ rec {
      "sha256-u+GgBEtw2AVonu+XqL8gDIJig9foiUufz1++qmrfx00=";

  mypy-boto3-memorydb =
-    buildMypyBoto3Package "memorydb" "1.35.36"
-      "sha256-WLbTMLs4KXOtoesqSm6X4MK/BcCAqcCxH7mbBBisYzQ=";
+    buildMypyBoto3Package "memorydb" "1.35.72"
+      "sha256-idcq48WzunZVghmxe/LJ/gdVDg0jZD+7aofYlu2nCdM=";

  mypy-boto3-meteringmarketplace =
    buildMypyBoto3Package "meteringmarketplace" "1.35.0"
@@ -970,8 +970,8 @@ rec {
      "sha256-/IGDrv1Yyk0eeDfdQTVkxhrANPPCqnfjatSRItkGWRM=";

  mypy-boto3-opensearch =
-    buildMypyBoto3Package "opensearch" "1.35.58"
-      "sha256-8D48c4NG00r6zpgcoK8FjQqCpOBB4DNE653lwn/K36k=";
+    buildMypyBoto3Package "opensearch" "1.35.72"
+      "sha256-gk+hOc05mEusC1o3pQaRvIDXJR3sPc5W2Af7l1SL1sk=";

  mypy-boto3-opensearchserverless =
    buildMypyBoto3Package "opensearchserverless" "1.35.52"
@@ -986,8 +986,8 @@ rec {
      "sha256-qyUZN9Gz8Q6TBDg1LW+M58TLwDlmqJ9aCr4021LbSL0=";

  mypy-boto3-organizations =
-    buildMypyBoto3Package "organizations" "1.35.60"
-      "sha256-xOhCq83c8jf6Nn4lLHiHidFtIk3qzBkCQ/NCV6vq7v0=";
+    buildMypyBoto3Package "organizations" "1.35.72"
+      "sha256-sIQ3HrziVY2CE/+sIk0IRAhhI3PaCwFwxwK75K0oH/s=";

  mypy-boto3-osis =
    buildMypyBoto3Package "osis" "1.35.0"
@@ -1086,8 +1086,8 @@ rec {
      "sha256-12AIEWhTwK3YdCUhImozJeO83Ye9G2D1VaKMeqbV/pE=";

  mypy-boto3-rds =
-    buildMypyBoto3Package "rds" "1.35.66"
-      "sha256-CFDLW93aGFPGukS7jcG/DTA+pHKfjN+YLQ5NkfCKstk=";
+    buildMypyBoto3Package "rds" "1.35.72"
+      "sha256-TDReYWp3Z5UyhKDVSrbbq9iwaP41OzQZS3k2S0cXa2E=";

  mypy-boto3-rds-data =
    buildMypyBoto3Package "rds-data" "1.35.64"
@@ -1162,12 +1162,12 @@ rec {
      "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw=";

  mypy-boto3-s3 =
-    buildMypyBoto3Package "s3" "1.35.69"
-      "sha256-l/eUSoSkpJKCglvvFIOiVoDc3OddpgF3RdcJ0s8qocA=";
+    buildMypyBoto3Package "s3" "1.35.72"
+      "sha256-Vx5lnB01VJnV5QcPM+YToeJR5vXSpX1TXF6u9S67aoY=";

  mypy-boto3-s3control =
-    buildMypyBoto3Package "s3control" "1.35.55"
-      "sha256-9gTlb+iIU+IT+2jAIU7l62gN4VenI4JLaTEFJCbgiAc=";
+    buildMypyBoto3Package "s3control" "1.35.73"
+      "sha256-FITxvFeoOEHAVVYyyC1xnjkj5lks74SEOT1YWltMliI=";

  mypy-boto3-s3outposts =
    buildMypyBoto3Package "s3outposts" "1.35.0"
@@ -1222,8 +1222,8 @@ rec {
      "sha256-w30YExW6ENhUaHIwTX8mbnRhQpsI5jUHwjzFCMPvQmQ=";

  mypy-boto3-securityhub =
-    buildMypyBoto3Package "securityhub" "1.35.29"
-      "sha256-RQXlvvSr0DNC2eXEVTQjx4TCR6A/v9qsRArIfg9Mq+w=";
+    buildMypyBoto3Package "securityhub" "1.35.72"
+      "sha256-+AeLQrA2MHQ94z4Rwq5/mhYc1+uJ0qZI1pm1FSnQOqM=";

  mypy-boto3-securitylake =
    buildMypyBoto3Package "securitylake" "1.35.40"
@@ -1370,8 +1370,8 @@ rec {
      "sha256-pRyowqpW9cqiZe0aCDvcJAqIaRkEhG8DFRxP89daIPo=";

  mypy-boto3-transfer =
-    buildMypyBoto3Package "transfer" "1.35.40"
-      "sha256-uJ15ZsA5oQgzjNTqX2Zhg+K29HBfyK40BVlG0GicyRA=";
+    buildMypyBoto3Package "transfer" "1.35.72"
+      "sha256-1lLzmlLLKOVAWu49Sc6QdWkpJ+nC/yX5VMgQORhVjew=";

  mypy-boto3-translate =
    buildMypyBoto3Package "translate" "1.35.0"
@@ -1386,8 +1386,8 @@ rec {
      "sha256-mxpiis9WGSEclfaHOxFJxGIAO42R2c5zc58xQo4MOn0=";

  mypy-boto3-vpc-lattice =
-    buildMypyBoto3Package "vpc-lattice" "1.35.0"
-      "sha256-hjsCIge5vyWpgeklpO+u3QGPwCbpdnZcfJErYrPPyeA=";
+    buildMypyBoto3Package "vpc-lattice" "1.35.72"
+      "sha256-+lBkc6lWYMQU8six/6cPy1+J0ACZ0a3JL/VW7O98Qtk=";

  mypy-boto3-waf =
    buildMypyBoto3Package "waf" "1.35.0"
@@ -0,0 +1,34 @@
+{
+  alsa-lib,
+  buildPythonPackage,
+  fetchPypi,
+  lib,
+}:
+
+buildPythonPackage rec {
+  pname = "pyalsaaudio";
+  version = "0.11.0";
+  format = "setuptools";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-p4qdyjNSSyyQZLNOIfWrh0JyMTzzJKmndZLzlqXg/dw=";
+  };
+
+  buildInputs = [
+    alsa-lib
+  ];
+
+  pythonImportsCheck = [ "alsaaudio" ];
+
+  # Unit tests exist in test.py, but they require hardware (and therefore /dev) access.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "ALSA wrappers for Python";
+    homepage = "https://github.com/larsimmisch/pyalsaaudio";
+    changelog = "https://github.com/larsimmisch/pyalsaaudio/blob/${version}/CHANGES.md";
+    license = licenses.psfl;
+    maintainers = with maintainers; [ timschumi ];
+  };
+}
@@ -15,7 +15,7 @@

 buildPythonPackage rec {
  pname = "pyhepmc";
-  version = "2.13.4";
+  version = "2.14.0";
  format = "pyproject";

  disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "scikit-hep";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-86LDk0G9ckbV+/pNtLJa9EsA6plxerKI3ygxq680IKo=";
+    hash = "sha256-yh02Z1nPGjghZYHkPBlClDEztq4VQsW3H+kuco/lBpk=";
    fetchSubmodules = true;
  };

@@ -1,5 +1,6 @@
 {
  lib,
+  stdenv,
  buildPythonPackage,
  fetchFromGitHub,

@@ -16,21 +17,18 @@
  onnx,
  pytestCheckHook,
  torchvision,
-
-  pythonAtLeast,
-  stdenv,
 }:

 buildPythonPackage rec {
  pname = "pytorch-pfn-extras";
-  version = "0.7.7";
+  version = "0.8.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pfnet";
    repo = "pytorch-pfn-extras";
    rev = "refs/tags/v${version}";
-    hash = "sha256-0+ltkm7OH18hlpHYyZCmy1rRleF52IM2BjLoW44tJUY=";
+    hash = "sha256-6KHVsUHN2KDKAaMdhBpZgTq0XILWUsHJPgeRD0m9m20=";
  };

  build-system = [ setuptools ];
@@ -52,9 +50,6 @@ buildPythonPackage rec {
    # Requires CUDA access which is not possible in the nix environment.
    "-m 'not gpu and not mpi'"
    "-Wignore::DeprecationWarning"
-
-    # FutureWarning: You are using `torch.load` with `weights_only=False` (the current default value), which uses the default pickle module implicitly...
-    "-Wignore::FutureWarning"
  ];

  pythonImportsCheck = [ "pytorch_pfn_extras" ];
@@ -90,11 +85,10 @@ buildPythonPackage rec {

      # RuntimeError: No Op registered for Gradient with domain_version of 9
      "tests/pytorch_pfn_extras_tests/onnx_tests/test_grad.py"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.12") [
-      # RuntimeError: Dynamo is not supported on Python 3.12+
+
+      # torch._dynamo.exc.BackendCompilerFailed: backend='compiler_fn' raised:
+      # AttributeError: module 'torch.fx.experimental.proxy_tensor' has no attribute 'maybe_disable_fake_tensor_mode'
      "tests/pytorch_pfn_extras_tests/dynamo_tests/test_compile.py"
-      "tests/pytorch_pfn_extras_tests/test_ops/test_register.py"
    ]
    ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
      # torch.distributed is not available on darwin
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "readchar";
-  version = "4.2.0";
+  version = "4.2.1";
  pyproject = true;

  # Don't use wheels on PyPI
@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "magmax";
    repo = "python-${pname}";
    rev = "refs/tags/v${version}";
-    hash = "sha256-xha3bGuDYt4gLcK3x62ym+zCAQVyZjlV1HyKh8kHe64=";
+    hash = "sha256-r+dKGv0a7AU+Ef94AGCCJLQolLqTTxaNmqRQYkxk15s=";
  };

  postPatch = ''
@@ -11,7 +11,7 @@

 buildPythonPackage rec {
  pname = "thinqconnect";
-  version = "1.0.1";
+  version = "1.0.2";
  pyproject = true;

  disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "thinq-connect";
    repo = "pythinqconnect";
    rev = "refs/tags/${version}";
-    hash = "sha256-kKmC2RMxJpNIX8bhHlPnFwP+0l7+MC+mWlCRjACy4cg=";
+    hash = "sha256-Y/L/PhTBTUF8INqLgIi1llRrticlGPb8F/sPq3XWxN4=";
  };

  build-system = [ setuptools ];
@@ -1,37 +1,55 @@
-{ lib, stdenv, fetchFromGitHub, darwin, python3 }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  darwin,
+  makeWrapper,
+  python3,
+}:

 stdenv.mkDerivation rec {
-  version = "1.4.1";
+  version = "1.5.4";
  pname = "iproute2mac";

  src = fetchFromGitHub {
    owner = "brona";
    repo = "iproute2mac";
    rev = "v${version}";
-    sha256 = "sha256-MaL8eb9UOZ71BL4Jvc6Od+EJ+F6j96n9a+vRnHeveIU=";
+    hash = "sha256-hmSqJ2gc0DOXUuFrp1ZG8usjFdo07zjV/1JLs5r/E04=";
  };

+  nativeBuildInputs = [ makeWrapper ];
+
  buildInputs = [ python3 ];

  postPatch = ''
-    substituteInPlace src/ip.py \
-      --replace /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \
-      --replace /sbin/route ${darwin.network_cmds}/bin/route \
-      --replace /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \
-      --replace /usr/sbin/ndp ${darwin.network_cmds}/bin/ndp \
-      --replace /usr/sbin/arp ${darwin.network_cmds}/bin/arp \
-      --replace /usr/sbin/networksetup ${darwin.network_cmds}/bin/networksetup
-  '';
-  installPhase = ''
-    mkdir -p $out/bin
-    install -D -m 755 src/ip.py $out/bin/ip
+    substituteInPlace src/iproute2mac.py \
+      --replace-fail /sbin/ifconfig ${darwin.network_cmds}/bin/ifconfig \
+      --replace-fail /sbin/route ${darwin.network_cmds}/bin/route \
+      --replace-fail /usr/sbin/netstat ${darwin.network_cmds}/bin/netstat \
+      --replace-fail /usr/sbin/ndp ${darwin.network_cmds}/bin/ndp \
+      --replace-fail /usr/sbin/arp ${darwin.network_cmds}/bin/arp \
+      --replace-fail /usr/sbin/networksetup ${darwin.network_cmds}/bin/networksetup
  '';

-  meta = with lib; {
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/libexec
+    install -D -m 755 src/iproute2mac.py $out/libexec/iproute2mac.py
+    install -D -m 755 src/ip.py $out/libexec/ip
+    install -D -m 755 src/bridge.py $out/libexec/bridge
+    makeWrapper $out/libexec/ip $out/bin/ip
+    makeWrapper $out/libexec/bridge $out/bin/bridge
+
+    runHook postInstall
+  '';
+
+  meta = {
    homepage = "https://github.com/brona/iproute2mac";
    description = "CLI wrapper for basic network utilites on Mac OS X inspired with iproute2 on Linux systems - ip command";
-    license = licenses.mit;
-    maintainers = with maintainers; [ jiegec ];
-    platforms = platforms.darwin;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jiegec ];
+    platforms = lib.platforms.darwin;
  };
 }
@@ -32,31 +32,31 @@
    "6.1": {
        "patch": {
            "extra": "-hardened1",
-            "name": "linux-hardened-v6.1.118-hardened1.patch",
-            "sha256": "0jk1ndy7xw6x425v1q945gawyi44bygryq71jxpf33z99xyqbyid",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.118-hardened1/linux-hardened-v6.1.118-hardened1.patch"
+            "name": "linux-hardened-v6.1.119-hardened1.patch",
+            "sha256": "0ns3c2qdpxipyk3i9127rfmadi99dnr43lr06vgw0p0ymqgjccj7",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.1.119-hardened1/linux-hardened-v6.1.119-hardened1.patch"
        },
-        "sha256": "0k12d4l03ziiba1b4f6jfxv5ir0lrd6kshlasr62rhv1f6yq81q1",
-        "version": "6.1.118"
+        "sha256": "0y1j8bz99d5vkxklzpwhns5r77lpz2prszf6whfahi58s0wszkdf",
+        "version": "6.1.119"
    },
    "6.11": {
        "patch": {
            "extra": "-hardened1",
-            "name": "linux-hardened-v6.11.9-hardened1.patch",
-            "sha256": "1w3c7vni6pwlyav796fanj5cx5k3w7gsdpwihnniskyy9j1pvi4g",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.11.9-hardened1/linux-hardened-v6.11.9-hardened1.patch"
+            "name": "linux-hardened-v6.11.10-hardened1.patch",
+            "sha256": "10m3xkanix9yhj95p1qr5dk3gydq1hbnbnibrlp4ag9yqd5ki7d4",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.11.10-hardened1/linux-hardened-v6.11.10-hardened1.patch"
        },
-        "sha256": "1d44yfk105bsf9f853f2fpnzqd0xbqn8drg1dv4ri5dxldx8lrbm",
-        "version": "6.11.9"
+        "sha256": "0xzynjyyr16my0wrla4ggpjbh4g7nsqixaimz5hrsqlhaa8q9hab",
+        "version": "6.11.10"
    },
    "6.6": {
        "patch": {
            "extra": "-hardened1",
-            "name": "linux-hardened-v6.6.62-hardened1.patch",
-            "sha256": "1rk6plakzwa4bsi0cibl1l3g13bzry65533wk2khbgsikqnyi9fq",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.62-hardened1/linux-hardened-v6.6.62-hardened1.patch"
+            "name": "linux-hardened-v6.6.63-hardened1.patch",
+            "sha256": "1nsg9f6fgh1yfa95gwrdh8g8kwywbczl2rv8j06qsk0y6b79kmw1",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.6.63-hardened1/linux-hardened-v6.6.63-hardened1.patch"
        },
-        "sha256": "0dlkgph6chvqrask746wjijqp62vmvrp3n2dkldr8d2mfw8mdhz2",
-        "version": "6.6.62"
+        "sha256": "0d8q0vwv3lcix3wiq2n53rir3h298flg2l0ghpify4rlh2s4l1fi",
+        "version": "6.6.63"
    }
 }
@@ -1,7 +1,7 @@
 {
    "testing": {
-        "version": "6.12-rc7",
-        "hash": "sha256:1rsglb7zwbn4f6wv4g95jl8ra1wbs03k7xyfdlmwzl3vgzx3bnzv"
+        "version": "6.13-rc1",
+        "hash": "sha256:0k3fj9wia9z0pv0vn3hzfzsrbp0lc84yjmww63ygac0fdvkml6l5"
    },
    "6.1": {
        "version": "6.1.119",
@@ -6,7 +6,7 @@
 , ... } @ args:

 let
-  version = "5.10.225-rt117"; # updated by ./update-rt.sh
+  version = "5.10.229-rt121"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "0770757ildcc0cs6alnb5cspg6ysg2wqly9z5q1vjf3mh0xbzmw5";
+    sha256 = "1q6di05rk4bsy91r03zw6vz14zzcpvv25dv7gw0yz1gzpgkbb9h8";
  };

  kernelPatches = let rt-patch = {
    name = "rt";
    patch = fetchurl {
      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "1c14gm4wzcbkhzgdm5lwq1as9is784yra7bc226bz3bqs3h7vmw2";
+      sha256 = "0bjmnk2nx50spyad2fq1l67jwp63yzxc7s39mx8sih6hm21d8y77";
    };
  }; in [ rt-patch ] ++ kernelPatches;

@@ -6,7 +6,7 @@
 , ... } @ args:

 let
-  version = "5.4.278-rt91"; # updated by ./update-rt.sh
+  version = "5.4.285-rt93"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -15,14 +15,14 @@ in buildLinux (args // {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "1245zf7vk2fyprw9fspljqy9wlzma9bayri7xx2g8iam2430d875";
+    sha256 = "1722sc365ajxmqyr4r49yp73mzdckay3rx5c2gx29xzny9zc6cmy";
  };

  kernelPatches = let rt-patch = {
    name = "rt";
    patch = fetchurl {
      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0s1ars3d18jg55kpvk6q5b6rk66c74d2khd2mxzdm5ifgm47047k";
+      sha256 = "1vj7b47cb7a94xmkdcfbqhx44g3ivqd7fif3vg256ikqlid8cl4q";
    };
  }; in [ rt-patch ] ++ kernelPatches;

@@ -6,7 +6,7 @@
 , ... } @ args:

 let
-  version = "6.1.112-rt43"; # updated by ./update-rt.sh
+  version = "6.1.119-rt45"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -19,14 +19,14 @@ in buildLinux (args // {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-    sha256 = "094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b";
+    sha256 = "0y1j8bz99d5vkxklzpwhns5r77lpz2prszf6whfahi58s0wszkdf";
  };

  kernelPatches = let rt-patch = {
    name = "rt";
    patch = fetchurl {
      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0qvil92xkbwmyrmj0zlg0ssg95ncscmr4ga4380903bqhhh74d6h";
+      sha256 = "0a7qga7xadp9ghhzz4iifdhap7vm288b789mv0xr9y8gnnk7cc9m";
    };
  }; in [ rt-patch ] ++ kernelPatches;

@@ -6,7 +6,7 @@
 , ... } @ args:

 let
-  version = "6.6.58-rt45"; # updated by ./update-rt.sh
+  version = "6.6.63-rt46"; # updated by ./update-rt.sh
  branch = lib.versions.majorMinor version;
  kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -19,14 +19,14 @@ in buildLinux (args // {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-    sha256 = "1nwrd017l5m4w12yrcf31y3g0l9xqm5b0fzcqdgan3ypi3jq3pz7";
+    sha256 = "0d8q0vwv3lcix3wiq2n53rir3h298flg2l0ghpify4rlh2s4l1fi";
  };

  kernelPatches = let rt-patch = {
    name = "rt";
    patch = fetchurl {
      url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0npvydlk2z33c5xqhg31xky045s5rvjnvfqml30nycmzbsmqjc7c";
+      sha256 = "1p0kbkz21m2y9yjcyhbrnnnw9x885l3zamykjkmgxgg3s8awg025";
    };
  }; in [ rt-patch ] ++ kernelPatches;

@@ -16,11 +16,11 @@

 stdenv.mkDerivation rec {
  pname = "deconz";
-  version = "2.28.0";
+  version = "2.28.1";

  src = fetchurl {
    url = "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-${version}-qt5.deb";
-    sha256 = "sha256-/lsPhpG8z4nNRuk55n7Xo1Q97muWk33Uo3vmX5GxPxU=";
+    sha256 = "sha256-uHbo0XerUx81o7gXK570iJKiotkQ0aCXUVcyYelMu4k=";
  };

  nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper wrapQtAppsHook ];
@@ -2753,10 +2753,10 @@
    platforms = [];
    source = {
      remotes = ["https://rubygems.org"];
-      sha256 = "0rr145mvjgc4n28lfy0gw87aw3ab680h83bdi5i102ik8mixk3zn";
+      sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p";
      type = "gem";
    };
-    version = "3.3.8";
+    version = "3.3.9";
  };
  rotp = {
    groups = ["default"];
@@ -1,7 +1,7 @@
 # This file was generated by pkgs.mastodon.updateScript.
 { fetchFromGitHub, applyPatches, patches ? [] }:
 let
-  version = "4.3.1";
+  version = "4.3.2";
 in
 (
  applyPatches {
@@ -9,7 +9,7 @@ in
      owner = "mastodon";
      repo = "mastodon";
      rev = "v${version}";
-      hash = "sha256-JlpQGyVPTLcB3RcWMBrmYc1AAUT1JLfS4IDas9ZoWh4=";
+      hash = "sha256-A1sSUBtlztKFsZ3TY/c9CXFV8LhttRW2JmSU0QSVOIg=";
    };
    patches = patches ++ [];
  }) // {
--- a/Show More
+++ b/Show More