Merge staging-next into staging

.git-blame-ignore-revs

@@ -186,3 +186,6 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9
 
 # fetchurl: nixfmt-rfc-style
 ce21e97a1f20dee15da85c084f9d1148d84f853b
+
+# percona: apply nixfmt
+8d14fa2886fec877690c6d28cfcdba4503dbbcea

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -177,6 +177,8 @@
 
 - [Immich](https://github.com/immich-app/immich), a self-hosted photo and video backup solution. Available as [services.immich](#opt-services.immich.enable).
 
+- [saunafs](https://saunafs.com) Distributed POSIX file system. Available as [services.saunafs](options.html#opt-services.saunafs).
+
 - [obs-studio](https://obsproject.com/), Free and open source software for video recording and live streaming. Available as [programs.obs-studio.enable](#opt-programs.obs-studio.enable).
 
 - [Veilid](https://veilid.com), a headless server that enables privacy-focused data sharing and messaging on a peer-to-peer network. Available as [services.veilid](#opt-services.veilid.enable).
@@ -189,6 +191,9 @@
 
 - The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver.
 
+- The `(buildPythonPackage { ... }).override` attribute is now deprecated and removed in favour of `overridePythonAttrs`.
+  This change does not affect the override interface of most Python packages, as [`<pkg>.override`](https://nixos.org/manual/nixpkgs/unstable/#sec-pkg-override) provided by `callPackage` shadows such a locally-defined `override` attribute.
+
 - All Cinnamon and XApp packages have been moved to top-level (i.e., `cinnamon.nemo` is now `nemo`).
 
 - All GNOME packages have been moved to top-level (i.e., `gnome.nautilus` is now `nautilus`).
@@ -229,6 +234,11 @@
   Also be aware that if you have set additional options in `services.wstunnel.{clients,servers}.<name>.extraArgs`,
   that those might have been removed or modified upstream.
 
+- `percona-server_8_4` and `mysql84` now have password authentication via the deprecated `mysql_native_password` disabled by default. This authentication plugin can be enabled via a CLI argument again, for detailed instructions and alternative authentication methods [see upstream documentation](https://dev.mysql.com/doc/refman/8.4/en/native-pluggable-authentication.html). The config file directive `default_authentication_plugin` has been removed.
+
+- Percona has decided not to follow the LTS/ Innovation release scheme of upstream MySQL and thus [will only create releases for MySQL LTS versions](https://www.percona.com/blog/no-mysql-9-x-innovation-releases-from-percona/). Hence, the package names `percona-server_lts`, `percona-server_innovation`, `percona-xtrabackup_lts` and `percona-xtrabackup_innovation` are deprecated.
+  - `percona-server` and `percona-server_lts` now point towards the new LTS release `percona-server_8_4`. The previous LTS continues to be supported and is available as `percona-server_8_0`. The same is true for the supporting `percona-xtrabackup` tooling.
+
 - `clang-tools_<version>` packages have been moved into `llvmPackages_<version>` (i.e. `clang-tools_18` is now `llvmPackages_18.clang-tools`).
   - For convenience, the top-level `clang-tools` attribute remains and is now bound to `llvmPackages.clang-tools`.
   - Top-level `clang_tools_<version>` attributes are now aliases; these will be removed in a future release.

nixos/modules/module-list.nix

@@ -965,6 +965,7 @@
   ./services/network-filesystems/rsyncd.nix
   ./services/network-filesystems/samba-wsdd.nix
   ./services/network-filesystems/samba.nix
+  ./services/network-filesystems/saunafs.nix
   ./services/network-filesystems/tahoe.nix
   ./services/network-filesystems/u9fs.nix
   ./services/network-filesystems/webdav-server-rs.nix

nixos/modules/services/network-filesystems/saunafs.nix

@@ -0,0 +1,287 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.saunafs;
+
+  settingsFormat =
+    let
+      listSep = " ";
+      allowedTypes = with lib.types; [
+        bool
+        int
+        float
+        str
+      ];
+      valueToString =
+        val:
+        if lib.isList val then
+          lib.concatStringsSep listSep (map (x: valueToString x) val)
+        else if lib.isBool val then
+          (if val then "1" else "0")
+        else
+          toString val;
+
+    in
+    {
+      type =
+        let
+          valueType =
+            lib.types.oneOf (
+              [
+                (lib.types.listOf valueType)
+              ]
+              ++ allowedTypes
+            )
+            // {
+              description = "Flat key-value file";
+            };
+        in
+        lib.types.attrsOf valueType;
+
+      generate =
+        name: value:
+        pkgs.writeText name (
+          lib.concatStringsSep "\n" (lib.mapAttrsToList (key: val: "${key} = ${valueToString val}") value)
+        );
+    };
+
+  initTool = pkgs.writeShellScriptBin "sfsmaster-init" ''
+    if [ ! -e ${cfg.master.settings.DATA_PATH}/metadata.sfs ]; then
+      cp --update=none ${pkgs.saunafs}/var/lib/saunafs/metadata.sfs.empty ${cfg.master.settings.DATA_PATH}/metadata.sfs
+      chmod +w ${cfg.master.settings.DATA_PATH}/metadata.sfs
+    fi
+  '';
+
+  # master config file
+  masterCfg = settingsFormat.generate "sfsmaster.cfg" cfg.master.settings;
+
+  # metalogger config file
+  metaloggerCfg = settingsFormat.generate "sfsmetalogger.cfg" cfg.metalogger.settings;
+
+  # chunkserver config file
+  chunkserverCfg = settingsFormat.generate "sfschunkserver.cfg" cfg.chunkserver.settings;
+
+  # generic template for all daemons
+  systemdService = name: extraConfig: configFile: {
+    wantedBy = [ "multi-user.target" ];
+    wants = [ "network-online.target" ];
+    after = [
+      "network.target"
+      "network-online.target"
+    ];
+
+    serviceConfig = {
+      Type = "forking";
+      ExecStart = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} start";
+      ExecStop = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} stop";
+      ExecReload = "${pkgs.saunafs}/bin/sfs${name} -c ${configFile} reload";
+    } // extraConfig;
+  };
+
+in
+{
+  ###### interface
+
+  options = {
+    services.saunafs = {
+      masterHost = lib.mkOption {
+        type = lib.types.str;
+        default = null;
+        description = "IP or hostname name of master host.";
+      };
+
+      sfsUser = lib.mkOption {
+        type = lib.types.str;
+        default = "saunafs";
+        description = "Run daemons as user.";
+      };
+
+      client.enable = lib.mkEnableOption "Saunafs client";
+
+      master = {
+        enable = lib.mkOption {
+          type = lib.types.bool;
+          description = ''
+            Enable Saunafs master daemon.
+
+            You need to run `sfsmaster-init` on a freshly installed master server to
+            initialize the `DATA_PATH` directory.
+          '';
+          default = false;
+        };
+
+        exports = lib.mkOption {
+          type = with lib.types; listOf str;
+          default = null;
+          description = "Paths to exports file (see {manpage}`sfsexports.cfg(5)`).";
+          example = lib.literalExpression ''
+            [ "* / rw,alldirs,admin,maproot=0:0" ];
+          '';
+        };
+
+        openFirewall = lib.mkOption {
+          type = lib.types.bool;
+          description = "Whether to automatically open the necessary ports in the firewall.";
+          default = false;
+        };
+
+        settings = lib.mkOption {
+          type = lib.types.submodule {
+            freeformType = settingsFormat.type;
+
+            options.DATA_PATH = lib.mkOption {
+              type = lib.types.str;
+              default = "/var/lib/saunafs/master";
+              description = "Data storage directory.";
+            };
+          };
+
+          description = "Contents of config file ({manpage}`sfsmaster.cfg(5)`).";
+        };
+      };
+
+      metalogger = {
+        enable = lib.mkEnableOption "Saunafs metalogger daemon";
+
+        settings = lib.mkOption {
+          type = lib.types.submodule {
+            freeformType = settingsFormat.type;
+
+            options.DATA_PATH = lib.mkOption {
+              type = lib.types.str;
+              default = "/var/lib/saunafs/metalogger";
+              description = "Data storage directory";
+            };
+          };
+
+          description = "Contents of metalogger config file (see {manpage}`sfsmetalogger.cfg(5)`).";
+        };
+      };
+
+      chunkserver = {
+        enable = lib.mkEnableOption "Saunafs chunkserver daemon";
+
+        openFirewall = lib.mkOption {
+          type = lib.types.bool;
+          description = "Whether to automatically open the necessary ports in the firewall.";
+          default = false;
+        };
+
+        hdds = lib.mkOption {
+          type = with lib.types; listOf str;
+          default = null;
+
+          example = lib.literalExpression ''
+            [ "/mnt/hdd1" ];
+          '';
+
+          description = ''
+            Mount points to be used by chunkserver for storage (see {manpage}`sfshdd.cfg(5)`).
+
+            Note, that these mount points must writeable by the user defined by the saunafs user.
+          '';
+        };
+
+        settings = lib.mkOption {
+          type = lib.types.submodule {
+            freeformType = settingsFormat.type;
+
+            options.DATA_PATH = lib.mkOption {
+              type = lib.types.str;
+              default = "/var/lib/saunafs/chunkserver";
+              description = "Directory for chunck meta data";
+            };
+          };
+
+          description = "Contents of chunkserver config file (see {manpage}`sfschunkserver.cfg(5)`).";
+        };
+      };
+    };
+  };
+
+  ###### implementation
+
+  config =
+    lib.mkIf (cfg.client.enable || cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable)
+      {
+
+        warnings = [
+          (lib.mkIf (cfg.sfsUser == "root") "Running saunafs services as root is not recommended.")
+        ];
+
+        # Service settings
+        services.saunafs = {
+          master.settings = lib.mkIf cfg.master.enable {
+            WORKING_USER = cfg.sfsUser;
+            EXPORTS_FILENAME = toString (
+              pkgs.writeText "sfsexports.cfg" (lib.concatStringsSep "\n" cfg.master.exports)
+            );
+          };
+
+          metalogger.settings = lib.mkIf cfg.metalogger.enable {
+            WORKING_USER = cfg.sfsUser;
+            MASTER_HOST = cfg.masterHost;
+          };
+
+          chunkserver.settings = lib.mkIf cfg.chunkserver.enable {
+            WORKING_USER = cfg.sfsUser;
+            MASTER_HOST = cfg.masterHost;
+            HDD_CONF_FILENAME = toString (
+              pkgs.writeText "sfshdd.cfg" (lib.concatStringsSep "\n" cfg.chunkserver.hdds)
+            );
+          };
+        };
+
+        # Create system user account for daemons
+        users =
+          lib.mkIf
+            (cfg.sfsUser != "root" && (cfg.master.enable || cfg.metalogger.enable || cfg.chunkserver.enable))
+            {
+              users."${cfg.sfsUser}" = {
+                isSystemUser = true;
+                description = "saunafs daemon user";
+                group = "saunafs";
+              };
+              groups."${cfg.sfsUser}" = { };
+            };
+
+        environment.systemPackages =
+          (lib.optional cfg.client.enable pkgs.saunafs) ++ (lib.optional cfg.master.enable initTool);
+
+        networking.firewall.allowedTCPPorts =
+          (lib.optionals cfg.master.openFirewall [
+            9419
+            9420
+            9421
+          ])
+          ++ (lib.optional cfg.chunkserver.openFirewall 9422);
+
+        # Ensure storage directories exist
+        systemd.tmpfiles.rules =
+          lib.optional cfg.master.enable "d ${cfg.master.settings.DATA_PATH} 0700 ${cfg.sfsUser} ${cfg.sfsUser} -"
+          ++ lib.optional cfg.metalogger.enable "d ${cfg.metalogger.settings.DATA_PATH} 0700 ${cfg.sfsUser} ${cfg.sfsUser} -"
+          ++ lib.optional cfg.chunkserver.enable "d ${cfg.chunkserver.settings.DATA_PATH} 0700 ${cfg.sfsUser} ${cfg.sfsUser} -";
+
+        # Service definitions
+        systemd.services.sfs-master = lib.mkIf cfg.master.enable (
+          systemdService "master" {
+            TimeoutStartSec = 1800;
+            TimeoutStopSec = 1800;
+            Restart = "no";
+          } masterCfg
+        );
+
+        systemd.services.sfs-metalogger = lib.mkIf cfg.metalogger.enable (
+          systemdService "metalogger" { Restart = "on-abort"; } metaloggerCfg
+        );
+
+        systemd.services.sfs-chunkserver = lib.mkIf cfg.chunkserver.enable (
+          systemdService "chunkserver" { Restart = "on-abort"; } chunkserverCfg
+        );
+      };
+}

nixos/tests/all-tests.nix

@@ -889,6 +889,7 @@ in {
   samba-wsdd = handleTest ./samba-wsdd.nix {};
   sane = handleTest ./sane.nix {};
   sanoid = handleTest ./sanoid.nix {};
+  saunafs = handleTest ./saunafs.nix {};
   scaphandre = handleTest ./scaphandre.nix {};
   schleuder = handleTest ./schleuder.nix {};
   scion-freestanding-deployment = handleTest ./scion/freestanding-deployment {};

nixos/tests/mysql/common.nix

@@ -4,7 +4,7 @@
     inherit (pkgs) mysql80;
   };
   perconaPackages = {
-    inherit (pkgs) percona-server_lts percona-server_innovation;
+    inherit (pkgs) percona-server_8_0 percona-server_8_4;
   };
   mkTestName = pkg: "mariadb_${builtins.replaceStrings ["."] [""] (lib.versions.majorMinor pkg.version)}";
 }

nixos/tests/networking/networkd-and-scripted.nix

@@ -132,10 +132,6 @@ let
               client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q '192.168.2'")
               client.wait_until_succeeds("ip addr show dev enp2s0 | grep -q 'fd00:1234:5678:2:'")
 
-          with subtest("Wait until we have received the nameservers"):
-              client.wait_until_succeeds("grep -q 2001:db8::1 /etc/resolv.conf")
-              client.wait_until_succeeds("grep -q 192.168.2.1 /etc/resolv.conf")
-
           with subtest("Test vlan 1"):
               client.wait_until_succeeds("ping -c 1 192.168.1.1")
               client.wait_until_succeeds("ping -c 1 fd00:1234:5678:1::1")

nixos/tests/networking/networkmanager.nix

@@ -121,7 +121,6 @@ let
         static.wait_for_unit("NetworkManager.service")
 
         dynamic.wait_until_succeeds("cat /etc/resolv.conf | grep -q '192.168.1.1'")
-        dynamic.wait_until_succeeds("cat /etc/resolv.conf | grep -q '2001:db8::1'")
         static.wait_until_succeeds("cat /etc/resolv.conf | grep -q '10.10.10.10'")
         static.wait_until_fails("cat /etc/resolv.conf | grep -q '192.168.1.1'")
       '';

nixos/tests/networking/router.nix

@@ -72,7 +72,6 @@
           AdvSendAdvert on;
           AdvManagedFlag on;
           AdvOtherConfigFlag on;
-          RDNSS 2001:db8::1 {};
 
           prefix fd00:1234:5678:${toString n}::/64 {
             AdvAutonomous off;

nixos/tests/saunafs.nix

@@ -0,0 +1,122 @@
+import ./make-test-python.nix (
+  { pkgs, lib, ... }:
+
+  let
+    master =
+      { pkgs, ... }:
+      {
+        # data base is stored in memory
+        # server may crash with default memory size
+        virtualisation.memorySize = 1024;
+
+        services.saunafs.master = {
+          enable = true;
+          openFirewall = true;
+          exports = [
+            "* / rw,alldirs,maproot=0:0"
+          ];
+        };
+      };
+
+    chunkserver =
+      { pkgs, ... }:
+      {
+        virtualisation.emptyDiskImages = [ 4096 ];
+        boot.initrd.postDeviceCommands = ''
+          ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
+        '';
+
+        fileSystems = pkgs.lib.mkVMOverride {
+          "/data" = {
+            device = "/dev/disk/by-label/data";
+            fsType = "ext4";
+          };
+        };
+
+        services.saunafs = {
+          masterHost = "master";
+          chunkserver = {
+            openFirewall = true;
+            enable = true;
+            hdds = [ "/data" ];
+
+            # The test image is too small and gets set to "full"
+            settings.HDD_LEAVE_SPACE_DEFAULT = "100M";
+          };
+        };
+      };
+
+    metalogger =
+      { pkgs, ... }:
+      {
+        services.saunafs = {
+          masterHost = "master";
+          metalogger.enable = true;
+        };
+      };
+
+    client =
+      { pkgs, lib, ... }:
+      {
+        services.saunafs.client.enable = true;
+        # systemd.tmpfiles.rules = [ "d /sfs 755 root root -" ];
+        systemd.network.enable = true;
+
+        # Use networkd to have properly functioning
+        # network-online.target
+        networking = {
+          useDHCP = false;
+          useNetworkd = true;
+        };
+
+        systemd.mounts = [
+          {
+            requires = [ "network-online.target" ];
+            after = [ "network-online.target" ];
+            wantedBy = [ "remote-fs.target" ];
+            type = "saunafs";
+            what = "master:/";
+            where = "/sfs";
+          }
+        ];
+      };
+
+  in
+  {
+    name = "saunafs";
+
+    meta.maintainers = [ lib.maintainers.markuskowa ];
+
+    nodes = {
+      inherit master metalogger;
+      chunkserver1 = chunkserver;
+      chunkserver2 = chunkserver;
+      client1 = client;
+      client2 = client;
+    };
+
+    testScript = ''
+      # prepare master server
+      master.start()
+      master.wait_for_unit("multi-user.target")
+      master.succeed("sfsmaster-init")
+      master.succeed("systemctl restart sfs-master")
+      master.wait_for_unit("sfs-master.service")
+
+      metalogger.wait_for_unit("sfs-metalogger.service")
+
+      # Setup chunkservers
+      for chunkserver in [chunkserver1, chunkserver2]:
+          chunkserver.wait_for_unit("multi-user.target")
+          chunkserver.succeed("chown saunafs:saunafs /data")
+          chunkserver.succeed("systemctl restart sfs-chunkserver")
+          chunkserver.wait_for_unit("sfs-chunkserver.service")
+
+      for client in [client1, client2]:
+          client.wait_for_unit("multi-user.target")
+
+      client1.succeed("echo test > /sfs/file")
+      client2.succeed("grep test /sfs/file")
+    '';
+  }
+)

pkgs/applications/audio/miniaudicle/default.nix

@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "miniaudicle";
-  version = "1.5.2.0";
+  version = "1.5.3.0";
 
   src = fetchFromGitHub {
     owner = "ccrma";
     repo = "miniAudicle";
     rev = "chuck-${finalAttrs.version}";
-    hash = "sha256-jpPF2Qx/6tiotsj92m1XmxsEUgtm5029ijpu3O8B9qM=";
+    hash = "sha256-iLmTliJXaYDM5X+s3HsXLFO2qonh18BaiWiTdDXKWjk=";
     fetchSubmodules = true;
   };
 

pkgs/applications/editors/vim/plugins/generated.nix

@@ -18636,5 +18636,15 @@ final: prev:
     meta.homepage = "https://github.com/jhradilek/vim-snippets/";
   };
 
-
+  leetcode-nvim = buildVimPlugin {
+    pname = "leetcode.nvim";
+    version = "2024-06-27";
+    src = fetchFromGitHub {
+      owner = "kawre";
+      repo = "leetcode.nvim";
+      rev = "02fb2c855658ad6b60e43671f6b040c812181a1d";
+      sha256 = "sha256-YoFRd9Uf+Yv4YM6/l7MVLMjfRqhroSS3RCmZvNowIAo=";
+    };
+    meta.homepage = "https://github.com/kawre/leetcode.nvim/";
+  };
 }

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -2651,6 +2651,17 @@ in
     nvimRequireCheck = "yazi";
   };
 
+  leetcode-nvim = super.leetcode-nvim.overrideAttrs {
+    dependencies = with self; [
+      nui-nvim
+      plenary-nvim
+      telescope-nvim
+    ];
+
+    doInstallCheck = true;
+    nvimRequireCheck = "leetcode";
+  };
+
   YouCompleteMe = super.YouCompleteMe.overrideAttrs {
     buildPhase = ''
       substituteInPlace plugin/youcompleteme.vim \

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -475,6 +475,7 @@ https://github.com/Julian/lean.nvim/,,
 https://github.com/leanprover/lean.vim/,,
 https://github.com/ggandor/leap-ast.nvim/,HEAD,
 https://github.com/ggandor/leap.nvim/,HEAD,
+https://github.com/kawre/leetcode.nvim/,HEAD,
 https://github.com/mrjones2014/legendary.nvim/,HEAD,
 https://github.com/camspiers/lens.vim/,,
 https://github.com/thirtythreeforty/lessspace.vim/,,

pkgs/applications/editors/vscode/extensions/default.nix

@@ -1644,8 +1644,8 @@ let
         mktplcRef = {
           name = "elixir-ls";
           publisher = "JakeBecker";
-          version = "0.24.0";
-          hash = "sha256-zNiKtOeZEO9zVpyF4AE/3FjiEy4jtCSCjB9T8e8PjRE=";
+          version = "0.24.1";
+          hash = "sha256-C6p5IBJ6aKH2/AainIBwIWTPEALtHMkAd9+QnFCzA7c=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog";

pkgs/applications/misc/cubiomes-viewer/default.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cubiomes-viewer";
-  version = "4.0.1";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "Cubitect";
     repo = pname;
     rev = version;
-    hash = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo=";
+    hash = "sha256-ORTFddzVGKXpy5V6zXJgCnwLwn/8cWKklpcoHkc6u34=";
     fetchSubmodules = true;
   };
 

pkgs/applications/misc/debian-goodies/default.nix

@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   pname = "debian-goodies";
-  version = "0.88.1";
+  version = "0.88.2";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "debian";
     repo = "debian-goodies";
     rev = "debian/${version}";
-    sha256 = "sha256-g1xeWhCkC7HEHHOJpcZ6JFA9jmavJE0lUX1Cmp5A0QQ=";
+    sha256 = "sha256-KPPRxYmCEYwlUAR29tc8w4rerXpswO/rbpEjXPoDV4Q=";
   };
 
   postPatch = ''

pkgs/applications/networking/cluster/zarf/default.nix

@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "zarf";
-  version = "0.40.1";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "defenseunicorns";
     repo = "zarf";
     rev = "v${version}";
-    hash = "sha256-tSMaDb8lflkedDa5ICXthqMpWBkHg+UQ20aTrF4+hUQ=";
+    hash = "sha256-rY9xWqJ+2Yfs6VRHTF89LmuEruAavDI7MgBm4UFEuBs=";
   };
 
-  vendorHash = "sha256-7G+gROPw8Ab6iGMr7vnmC7jAm7jLPd5pbLOkKqDKIDc=";
+  vendorHash = "sha256-Cz+w0tOEamCxf61hvQ03X/kXPY+qrmdBN8s26lr/wZ8=";
   proxyVendor = true;
 
   nativeBuildInputs = [ installShellFiles ];

pkgs/applications/networking/instant-messengers/wire-desktop/default.nix

@@ -57,6 +57,7 @@ let
     homepage = "https://wire.com/";
     downloadPage = "https://wire.com/download/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    knownVulnerabilities = [ "CVE-2024-6775" ];
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [
       arianvp

pkgs/applications/networking/termius/default.nix

@@ -15,8 +15,8 @@
 
 stdenv.mkDerivation rec {
   pname = "termius";
-  version = "9.6.1";
-  revision = "204";
+  version = "9.7.2";
+  revision = "205";
 
   src = fetchurl {
     # find the latest version with
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     # and the sha512 with
     # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
     url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap";
-    hash = "sha512-ok3B/h+d0Q7k5i+IjgGB+4S5g2kzrQT/b4dYz4k07OnyfjJRgJ4X4f7BFFrwKLd+IbIC5OIibrvivWnkSWU3Ew==";
+    hash = "sha512-LihbkFIFpulewNIHl1oiXJF1npuqNLvVjN8CAmDDf46PAXdpaiMMluHWIJ4NljAACh6d4Uw6m2pKgEDfFN1y6g==";
   };
 
   desktopItem = makeDesktopItem {

pkgs/applications/radio/sdrangel/default.nix

@@ -52,13 +52,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdrangel";
-  version = "7.22.0";
+  version = "7.22.1";
 
   src = fetchFromGitHub {
     owner = "f4exb";
     repo = "sdrangel";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cF6vKwAWz32/XYUWvq/4Wu73TFQ2jaGIFxWmeXmlPCE=";
+    hash = "sha256-Vhxs1KVUDCbl/9abZByUuy230PV4RrYrRjEXgYc8oZU=";
   };
 
   nativeBuildInputs = [

pkgs/applications/system/supergfxctl/default.nix

@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "supergfxctl";
-  version = "5.2.1";
+  version = "5.2.4";
 
   src = fetchFromGitLab {
     owner = "asus-linux";
     repo = "supergfxctl";
     rev = version;
-    hash = "sha256-gjMLyT3pvQhmjz9SFbYlDAqg+tCX5ORkCkcnyBzO5ws=";
+    hash = "sha256-ie5JPHBvypUtPStwA/aO4GeQ/qbHTzUJF3T4QuW6JNc=";
   };
 
-  cargoHash = "sha256-ndugyiAYPDyue2Ajxx22BNvYc9iBTxZqP5OxaqmC7U0=";
+  cargoHash = "sha256-qZC4axeRnKgUNGDFzmdvN/mwkcqsh8KwLlM6oGT19e8=";
 
   postPatch = ''
     substituteInPlace data/supergfxd.service --replace /usr/bin/supergfxd $out/bin/supergfxd

pkgs/applications/version-management/gitlab/data.json

@@ -1,15 +1,15 @@
 {
-  "version": "17.2.8",
-  "repo_hash": "172ba8vlaqphyhi6d5r9j3km7krxcis81dzlr5xch4i0apd0yyag",
+  "version": "17.2.9",
+  "repo_hash": "060d5rzbcnhr1fsvbaiirgjm5rjr5c5r6yi601lxvksffyn5hmxw",
   "yarn_hash": "10y540bxwaz355p9r4q34199aibadrd5p4d9ck2y3n6735k0hm74",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v17.2.8-ee",
+  "rev": "v17.2.9-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "17.2.8",
-    "GITLAB_PAGES_VERSION": "17.2.8",
+    "GITALY_SERVER_VERSION": "17.2.9",
+    "GITLAB_PAGES_VERSION": "17.2.9",
     "GITLAB_SHELL_VERSION": "14.37.0",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.2.0",
-    "GITLAB_WORKHORSE_VERSION": "17.2.8"
+    "GITLAB_WORKHORSE_VERSION": "17.2.9"
   }
 }

pkgs/applications/version-management/gitlab/gitaly/default.nix

@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "17.2.8";
+  version = "17.2.9";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -20,7 +20,7 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-3LaBETnwWmiIi7r68NB8LeJ7fo6oP28fS3TbU5JanOE=";
+      hash = "sha256-UgNQtM3NdAUJVP+vvTHtZWSjCmVzsHlEtXQroxKorIY=";
     };
 
     vendorHash = "sha256-FqnGVRldhevJgBBvJcvGXzRaYWqSHzZiXIQmCNzJv+4=";

pkgs/applications/version-management/gitlab/gitlab-pages/default.nix

@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "17.2.8";
+  version = "17.2.9";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-NaLRCLmgDI4ArJyntkmYICVEpwZtAU6XVTmXAh4kOSc=";
+    hash = "sha256-ggfPZ/PMjgfRzzPZdVCVydd/4mdCfh2xh7QWGjp5U/0=";
   };
 
   vendorHash = "sha256-yNHeM8MExcLwv2Ga4vtBmPFBt/Rj7Gd4QQYDlnAIo+c=";

pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix

@@ -5,7 +5,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "17.2.8";
+  version = "17.2.9";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {

pkgs/by-name/al/alpaca/package.nix

@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "2.6.0";
+  version = "2.6.5";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     rev = "refs/tags/${version}";
-    hash = "sha256-XXxfbchQ1l6L8KflqjlGIiyRbG/dI5ok0ExlROavXYg=";
+    hash = "sha256-tXUM2XxYXUTXsycfq0hmkzc4quHKh7+0qit1YuKdCeQ=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/el/elektroid/package.nix

@@ -14,7 +14,7 @@
 }:
 
 let
-  version = "3.0.1";
+  version = "3.1";
 in
 stdenv.mkDerivation {
   inherit version;
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     owner = "dagargo";
     repo = "elektroid";
     rev = version;
-    hash = "sha256-Qv4jvk6N0IMgYGCPWNYGDZJKGA+UPzhHeYfSrkq5hy4=";
+    hash = "sha256-YJcvJlnRUhwjQ6P3jgjyDtoJhuije1uY77mGNGZure0=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/fc/fcp/0001-update-Cargo.lock.patch

@@ -0,0 +1,889 @@
+From ffb3ab5b45301a7848ccd53ab077e37d0e8382c3 Mon Sep 17 00:00:00 2001
+From: wxt <3264117476@qq.com>
+Date: Sat, 28 Sep 2024 10:09:27 +0800
+Subject: [PATCH] update Cargo.lock
+
+---
+ Cargo.lock | 465 +++++++++++++++++++++++++++++------------------------
+ 1 file changed, 254 insertions(+), 211 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 6829f6f..8ae6c05 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -2,6 +2,15 @@
+ # It is not intended for manual editing.
+ version = 3
+ 
++[[package]]
++name = "aho-corasick"
++version = "1.1.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
++dependencies = [
++ "memchr",
++]
++
+ [[package]]
+ name = "atty"
+ version = "0.2.14"
+@@ -15,48 +24,42 @@ dependencies = [
+ 
+ [[package]]
+ name = "autocfg"
+-version = "1.0.1"
++version = "1.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+ 
+ [[package]]
+ name = "bitflags"
+-version = "1.2.1"
++version = "1.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+ 
+ [[package]]
+-name = "bstr"
+-version = "0.2.16"
++name = "bumpalo"
++version = "3.16.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279"
+-dependencies = [
+- "lazy_static",
+- "memchr",
+- "regex-automata",
+- "serde",
+-]
++checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+ 
+ [[package]]
+-name = "bumpalo"
+-version = "3.7.0"
++name = "byteorder"
++version = "1.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631"
++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+ 
+ [[package]]
+ name = "cast"
+-version = "0.2.7"
++version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a"
+-dependencies = [
+- "rustc_version",
+-]
++checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+ 
+ [[package]]
+ name = "cc"
+-version = "1.0.69"
++version = "1.1.22"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
++checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
++dependencies = [
++ "shlex",
++]
+ 
+ [[package]]
+ name = "cfg-if"
+@@ -66,9 +69,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+ 
+ [[package]]
+ name = "clap"
+-version = "2.33.3"
++version = "2.34.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002"
++checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+ dependencies = [
+  "bitflags",
+  "textwrap",
+@@ -77,16 +80,16 @@ dependencies = [
+ 
+ [[package]]
+ name = "criterion"
+-version = "0.3.4"
++version = "0.3.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23"
++checksum = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f"
+ dependencies = [
+  "atty",
+  "cast",
+  "clap",
+  "criterion-plot",
+  "csv",
+- "itertools 0.10.1",
++ "itertools",
+  "lazy_static",
+  "num-traits",
+  "oorandom",
+@@ -103,65 +106,45 @@ dependencies = [
+ 
+ [[package]]
+ name = "criterion-plot"
+-version = "0.4.3"
++version = "0.4.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d"
++checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876"
+ dependencies = [
+  "cast",
+- "itertools 0.9.0",
+-]
+-
+-[[package]]
+-name = "crossbeam-channel"
+-version = "0.5.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+-dependencies = [
+- "cfg-if",
+- "crossbeam-utils",
++ "itertools",
+ ]
+ 
+ [[package]]
+ name = "crossbeam-deque"
+-version = "0.8.0"
++version = "0.8.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
++checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
+ dependencies = [
+- "cfg-if",
+  "crossbeam-epoch",
+  "crossbeam-utils",
+ ]
+ 
+ [[package]]
+ name = "crossbeam-epoch"
+-version = "0.9.5"
++version = "0.9.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd"
++checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+ dependencies = [
+- "cfg-if",
+  "crossbeam-utils",
+- "lazy_static",
+- "memoffset",
+- "scopeguard",
+ ]
+ 
+ [[package]]
+ name = "crossbeam-utils"
+-version = "0.8.5"
++version = "0.8.20"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
+-dependencies = [
+- "cfg-if",
+- "lazy_static",
+-]
++checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+ 
+ [[package]]
+ name = "csv"
+-version = "1.1.6"
++version = "1.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
++checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe"
+ dependencies = [
+- "bstr",
+  "csv-core",
+  "itoa",
+  "ryu",
+@@ -170,9 +153,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "csv-core"
+-version = "0.1.10"
++version = "0.1.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90"
++checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70"
+ dependencies = [
+  "memchr",
+ ]
+@@ -192,9 +175,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "either"
+-version = "1.6.1"
++version = "1.13.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
++checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+ 
+ [[package]]
+ name = "fcp"
+@@ -208,9 +191,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "getrandom"
+-version = "0.2.3"
++version = "0.2.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
++checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+ dependencies = [
+  "cfg-if",
+  "libc",
+@@ -219,9 +202,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "half"
+-version = "1.7.1"
++version = "1.8.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3"
++checksum = "1b43ede17f21864e81be2fa654110bf1e793774238d86ef8555c37e6519c0403"
+ 
+ [[package]]
+ name = "hermit-abi"
+@@ -234,78 +217,66 @@ dependencies = [
+ 
+ [[package]]
+ name = "itertools"
+-version = "0.9.0"
++version = "0.10.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
+-dependencies = [
+- "either",
+-]
+-
+-[[package]]
+-name = "itertools"
+-version = "0.10.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
++checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+ dependencies = [
+  "either",
+ ]
+ 
+ [[package]]
+ name = "itoa"
+-version = "0.4.7"
++version = "1.0.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
++checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+ 
+ [[package]]
+ name = "js-sys"
+-version = "0.3.51"
++version = "0.3.70"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062"
++checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+ dependencies = [
+  "wasm-bindgen",
+ ]
+ 
+ [[package]]
+ name = "lazy_static"
+-version = "1.4.0"
++version = "1.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+ 
+ [[package]]
+ name = "libc"
+-version = "0.2.98"
++version = "0.2.159"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
++checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+ 
+ [[package]]
+ name = "log"
+-version = "0.4.14"
++version = "0.4.22"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
+-dependencies = [
+- "cfg-if",
+-]
++checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
+ 
+ [[package]]
+ name = "memchr"
+-version = "2.4.0"
++version = "2.7.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+ 
+ [[package]]
+ name = "memoffset"
+-version = "0.6.4"
++version = "0.6.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
++checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce"
+ dependencies = [
+  "autocfg",
+ ]
+ 
+ [[package]]
+ name = "nix"
+-version = "0.22.0"
++version = "0.22.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187"
++checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
+ dependencies = [
+  "bitflags",
+  "cc",
+@@ -316,34 +287,30 @@ dependencies = [
+ 
+ [[package]]
+ name = "num-traits"
+-version = "0.2.14"
++version = "0.2.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
++checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+ dependencies = [
+  "autocfg",
+ ]
+ 
+ [[package]]
+-name = "num_cpus"
+-version = "1.13.0"
++name = "once_cell"
++version = "1.19.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
+-dependencies = [
+- "hermit-abi",
+- "libc",
+-]
++checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+ 
+ [[package]]
+ name = "oorandom"
+-version = "11.1.3"
++version = "11.1.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
++checksum = "b410bbe7e14ab526a0e86877eb47c6996a2bd7746f027ba551028c925390e4e9"
+ 
+ [[package]]
+ name = "plotters"
+-version = "0.3.1"
++version = "0.3.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a"
++checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+ dependencies = [
+  "num-traits",
+  "plotters-backend",
+@@ -354,53 +321,55 @@ dependencies = [
+ 
+ [[package]]
+ name = "plotters-backend"
+-version = "0.3.2"
++version = "0.3.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c"
++checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+ 
+ [[package]]
+ name = "plotters-svg"
+-version = "0.3.1"
++version = "0.3.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9"
++checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+ dependencies = [
+  "plotters-backend",
+ ]
+ 
+ [[package]]
+ name = "ppv-lite86"
+-version = "0.2.10"
++version = "0.2.20"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
++checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
++dependencies = [
++ "zerocopy",
++]
+ 
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.27"
++version = "1.0.86"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
++checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+ dependencies = [
+- "unicode-xid",
++ "unicode-ident",
+ ]
+ 
+ [[package]]
+ name = "quote"
+-version = "1.0.9"
++version = "1.0.37"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
++checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+ dependencies = [
+  "proc-macro2",
+ ]
+ 
+ [[package]]
+ name = "rand"
+-version = "0.8.4"
++version = "0.8.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
++checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+ dependencies = [
+  "libc",
+  "rand_chacha",
+  "rand_core",
+- "rand_hc",
+ ]
+ 
+ [[package]]
+@@ -415,22 +384,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "rand_core"
+-version = "0.6.3"
++version = "0.6.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+ dependencies = [
+  "getrandom",
+ ]
+ 
+-[[package]]
+-name = "rand_hc"
+-version = "0.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
+-dependencies = [
+- "rand_core",
+-]
+-
+ [[package]]
+ name = "rand_pcg"
+ version = "0.3.1"
+@@ -442,64 +402,58 @@ dependencies = [
+ 
+ [[package]]
+ name = "rayon"
+-version = "1.5.1"
++version = "1.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90"
++checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+ dependencies = [
+- "autocfg",
+- "crossbeam-deque",
+  "either",
+  "rayon-core",
+ ]
+ 
+ [[package]]
+ name = "rayon-core"
+-version = "1.9.1"
++version = "1.12.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e"
++checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+ dependencies = [
+- "crossbeam-channel",
+  "crossbeam-deque",
+  "crossbeam-utils",
+- "lazy_static",
+- "num_cpus",
+ ]
+ 
+ [[package]]
+ name = "regex"
+-version = "1.5.4"
++version = "1.10.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
++checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+ dependencies = [
++ "aho-corasick",
++ "memchr",
++ "regex-automata",
+  "regex-syntax",
+ ]
+ 
+ [[package]]
+ name = "regex-automata"
+-version = "0.1.10"
++version = "0.4.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
++checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
++dependencies = [
++ "aho-corasick",
++ "memchr",
++ "regex-syntax",
++]
+ 
+ [[package]]
+ name = "regex-syntax"
+-version = "0.6.25"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
+-
+-[[package]]
+-name = "rustc_version"
+-version = "0.4.0"
++version = "0.8.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+-dependencies = [
+- "semver",
+-]
++checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+ 
+ [[package]]
+ name = "ryu"
+-version = "1.0.5"
++version = "1.0.18"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
++checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+ 
+ [[package]]
+ name = "same-file"
+@@ -510,32 +464,20 @@ dependencies = [
+  "winapi-util",
+ ]
+ 
+-[[package]]
+-name = "scopeguard"
+-version = "1.1.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+-
+-[[package]]
+-name = "semver"
+-version = "1.0.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5f3aac57ee7f3272d8395c6e4f502f434f0e289fcd62876f70daa008c20dcabe"
+-
+ [[package]]
+ name = "serde"
+-version = "1.0.126"
++version = "1.0.210"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
++checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+ dependencies = [
+  "serde_derive",
+ ]
+ 
+ [[package]]
+ name = "serde_cbor"
+-version = "0.11.1"
++version = "0.11.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622"
++checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5"
+ dependencies = [
+  "half",
+  "serde",
+@@ -543,9 +485,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "serde_derive"
+-version = "1.0.126"
++version = "1.0.210"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
++checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -554,24 +496,31 @@ dependencies = [
+ 
+ [[package]]
+ name = "serde_json"
+-version = "1.0.64"
++version = "1.0.128"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79"
++checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+ dependencies = [
+  "itoa",
++ "memchr",
+  "ryu",
+  "serde",
+ ]
+ 
++[[package]]
++name = "shlex"
++version = "1.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
++
+ [[package]]
+ name = "syn"
+-version = "1.0.73"
++version = "2.0.79"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
++checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "unicode-xid",
++ "unicode-ident",
+ ]
+ 
+ [[package]]
+@@ -594,53 +543,53 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "unicode-width"
+-version = "0.1.8"
++name = "unicode-ident"
++version = "1.0.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
++checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+ 
+ [[package]]
+-name = "unicode-xid"
+-version = "0.2.2"
++name = "unicode-width"
++version = "0.1.14"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
++checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+ 
+ [[package]]
+ name = "walkdir"
+-version = "2.3.2"
++version = "2.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
++checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+ dependencies = [
+  "same-file",
+- "winapi",
+  "winapi-util",
+ ]
+ 
+ [[package]]
+ name = "wasi"
+-version = "0.10.2+wasi-snapshot-preview1"
++version = "0.11.0+wasi-snapshot-preview1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+ 
+ [[package]]
+ name = "wasm-bindgen"
+-version = "0.2.74"
++version = "0.2.93"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
++checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+ dependencies = [
+  "cfg-if",
++ "once_cell",
+  "wasm-bindgen-macro",
+ ]
+ 
+ [[package]]
+ name = "wasm-bindgen-backend"
+-version = "0.2.74"
++version = "0.2.93"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900"
++checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+ dependencies = [
+  "bumpalo",
+- "lazy_static",
+  "log",
++ "once_cell",
+  "proc-macro2",
+  "quote",
+  "syn",
+@@ -649,9 +598,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro"
+-version = "0.2.74"
++version = "0.2.93"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4"
++checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+ dependencies = [
+  "quote",
+  "wasm-bindgen-macro-support",
+@@ -659,9 +608,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro-support"
+-version = "0.2.74"
++version = "0.2.93"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97"
++checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -672,15 +621,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-shared"
+-version = "0.2.74"
++version = "0.2.93"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f"
++checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+ 
+ [[package]]
+ name = "web-sys"
+-version = "0.3.51"
++version = "0.3.70"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582"
++checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+ dependencies = [
+  "js-sys",
+  "wasm-bindgen",
+@@ -704,11 +653,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+ 
+ [[package]]
+ name = "winapi-util"
+-version = "0.1.5"
++version = "0.1.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
++checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+ dependencies = [
+- "winapi",
++ "windows-sys",
+ ]
+ 
+ [[package]]
+@@ -716,3 +665,97 @@ name = "winapi-x86_64-pc-windows-gnu"
+ version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
++
++[[package]]
++name = "windows-sys"
++version = "0.59.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
++dependencies = [
++ "windows-targets",
++]
++
++[[package]]
++name = "windows-targets"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
++dependencies = [
++ "windows_aarch64_gnullvm",
++ "windows_aarch64_msvc",
++ "windows_i686_gnu",
++ "windows_i686_gnullvm",
++ "windows_i686_msvc",
++ "windows_x86_64_gnu",
++ "windows_x86_64_gnullvm",
++ "windows_x86_64_msvc",
++]
++
++[[package]]
++name = "windows_aarch64_gnullvm"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
++
++[[package]]
++name = "windows_aarch64_msvc"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
++
++[[package]]
++name = "windows_i686_gnu"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
++
++[[package]]
++name = "windows_i686_gnullvm"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
++
++[[package]]
++name = "windows_i686_msvc"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
++
++[[package]]
++name = "windows_x86_64_gnu"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
++
++[[package]]
++name = "windows_x86_64_gnullvm"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
++
++[[package]]
++name = "windows_x86_64_msvc"
++version = "0.52.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
++
++[[package]]
++name = "zerocopy"
++version = "0.7.35"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
++dependencies = [
++ "byteorder",
++ "zerocopy-derive",
++]
++
++[[package]]
++name = "zerocopy-derive"
++version = "0.7.35"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn",
++]
+-- 
+2.46.0
+

pkgs/by-name/fc/fcp/package.nix

@@ -0,0 +1,53 @@
+{
+  expect,
+  fetchFromGitHub,
+  lib,
+  rustPlatform,
+  stdenv,
+  fetchpatch,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "fcp";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "svetlitski";
+    repo = "fcp";
+    rev = "refs/tags/v${version}";
+    sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x";
+  };
+
+  cargoPatches = [
+    (fetchpatch {
+      url = "https://github.com/Svetlitski/fcp/commit/1988f88be54a507b804b037cb3887fecf11bb571.patch";
+      hash = "sha256-fafpy1tviT1rV+jv1Yxg6xEsFZ9qXWQi5LykagDA5xI=";
+    })
+    (fetchpatch {
+      url = "https://github.com/Svetlitski/fcp/commit/89bcfc9aa1055dcf541da7a6477ffd3107023f48.patch";
+      hash = "sha256-NJ9MMeWf6Ywu+p5uDSWWpAcb01PoMbuSAZ3Qxl9jEaY=";
+    })
+    ./0001-update-Cargo.lock.patch
+  ];
+
+  cargoHash = "sha256-wFXvaARflHsT1xz3muC/BPRmhnXEEIk2pBsu87E7Wo8=";
+
+  nativeBuildInputs = [ expect ];
+
+  # character_device fails with "File name too long" on darwin
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  postPatch = ''
+    patchShebangs tests/*.exp
+  '';
+
+  meta = {
+    description = "Significantly faster alternative to the classic Unix cp(1) command";
+    homepage = "https://github.com/svetlitski/fcp";
+    changelog = "https://github.com/svetlitski/fcp/releases/tag/v${version}";
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ figsoda ];
+    mainProgram = "fcp";
+  };
+}

pkgs/by-name/fe/felix-fm/package.nix

@@ -1,37 +1,28 @@
-{ lib
-, rustPlatform
-, fetchFromGitHub
-, fetchpatch2
-, pkg-config
-, bzip2
-, libgit2
-, nix-update-script
-, zlib
-, zstd
-, zoxide
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  bzip2,
+  libgit2,
+  nix-update-script,
+  zlib,
+  zstd,
+  zoxide,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "felix";
-  version = "2.13.0";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner = "kyoheiu";
     repo = "felix";
-    rev = "v${version}";
-    hash = "sha256-7KuL3YkKhjcZSMSipbNITaA9/MGo54f3lz3fVOgy52s=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-PcC0lZ41qTVE4V3VdwBq83qYfEJO3RJouuS2+bpcBfo=";
   };
 
-  cargoPatches = [
-    # https://github.com/kyoheiu/felix/pull/292
-    (fetchpatch2 {
-      name = "update-cargo.lock-for-2.13.0.patch";
-      url = "https://github.com/kyoheiu/felix/commit/5085b147103878ee8138d4fcf7b204223ba2c3eb.patch";
-      hash = "sha256-7Bga9hcJCXExA/jnrR/HuZgOOVBbWs1tdTwxldcvdU8=";
-    })
-  ];
-
-  cargoHash = "sha256-FX3AsahU5ZLMuylwo1jihP9G4Dw1SFv1oMXcuOqDTF8=";
+  cargoHash = "sha256-4tvk7H2CrTx9m1f0PLnNv+LWg6oIGTUfirRhIaz2lHo=";
 
   nativeBuildInputs = [ pkg-config ];
 

pkgs/by-name/ha/hatch/package.nix

@@ -1,27 +1,26 @@
 {
   lib,
+  stdenv,
   python3Packages,
   fetchFromGitHub,
   replaceVars,
   git,
   cargo,
-  stdenv,
+  versionCheckHook,
   darwin,
   nix-update-script,
-  testers,
-  hatch,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "hatch";
-  version = "1.12.0";
+  version = "1.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pypa";
     repo = "hatch";
     rev = "refs/tags/hatch-v${version}";
-    hash = "sha256-HW2vDVsFrdFRRaPNuGDg9DZpJd8OuYDIqA3KQRa3m9o=";
+    hash = "sha256-jD8mr0PXlGK9YkBPZhNTimuxmq6dJG7cfQP/UEmHTZY=";
   };
 
   patches = [ (replaceVars ./paths.patch { uv = lib.getExe python3Packages.uv; }) ];
@@ -61,11 +60,16 @@ python3Packages.buildPythonApplication rec {
       pytest-xdist
       setuptools
     ]
-    ++ [ cargo ]
+    ++ [
+      cargo
+      versionCheckHook
+    ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       darwin.ps
     ];
 
+  versionCheckProgramArg = [ "--version" ];
+
   preCheck = ''
     export HOME=$(mktemp -d);
   '';
@@ -101,9 +105,6 @@ python3Packages.buildPythonApplication rec {
       "test_new_selected_python"
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # https://github.com/NixOS/nixpkgs/issues/209358
-      "test_scripts_no_environment"
-
       # This test assumes it is running on macOS with a system shell on the PATH.
       # It is not possible to run it in a nix build using a /nix/store shell.
       # See https://github.com/pypa/hatch/pull/709 for the relevant code.
@@ -126,8 +127,12 @@ python3Packages.buildPythonApplication rec {
   ];
 
   passthru = {
-    tests.version = testers.testVersion { package = hatch; };
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "hatch-v([0-9.]+)"
+      ];
+    };
   };
 
   meta = {

pkgs/by-name/ju/justbuild/package.nix

@@ -11,7 +11,7 @@
   openssl,
 
   pkg-config,
-  protobuf_25,
+  protobuf,
   grpc,
   pandoc,
   python3,
@@ -23,18 +23,23 @@
 
   curl,
   libarchive,
+
+  nix-update-script,
+  testers,
+  justbuild,
 }:
-let stdenv = gccStdenv;
+let
+  stdenv = gccStdenv;
 in
 stdenv.mkDerivation rec {
   pname = "justbuild";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "just-buildsystem";
     repo = "justbuild";
-    rev = "v${version}";
-    hash = "sha256-kv7HpDEYZml5uk06s8Cxt5rEpxaJBz9s+or6Od1q4Io=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-N9K1n2ttxhD0q2BXprt/nQdQseUtpaFmEZUcxRJV5C8=";
   };
 
   bazelapi = fetchurl {
@@ -47,68 +52,69 @@ stdenv.mkDerivation rec {
     hash = "sha256-W7awJTzPZLU9bHJJYlp+P2w7xkAqvVLTd4v6SCWHA6A=";
   };
 
-  nativeBuildInputs =
-    [
-      # Tools for the bootstrap process
-      jq
-      pkg-config
-      python3
-      unzip
-      wget
-      coreutils
+  nativeBuildInputs = [
+    # Tools for the bootstrap process
+    jq
+    pkg-config
+    python3
+    unzip
+    wget
+    coreutils
 
-      # Dependencies of just
-      cli11
-      # Using fmt 10 because this is the same version upstream currently
-      # uses for bundled builds
-      # For future updates: The currently used version can be found in the file
-      # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json
-      # under the key .repositories.fmt
-      fmt_10
-      microsoft-gsl
-      nlohmann_json
+    # Dependencies of just
+    cli11
+    # Using fmt 10 because this is the same version upstream currently
+    # uses for bundled builds
+    # For future updates: The currently used version can be found in the file
+    # etc/repos.json: https://github.com/just-buildsystem/justbuild/blob/master/etc/repos.json
+    # under the key .repositories.fmt
+    fmt_10
+    microsoft-gsl
+    nlohmann_json
 
-      # Dependencies of the compiled just-mr
-      curl
-      libarchive
-    ];
+    # Dependencies of the compiled just-mr
+    curl
+    libarchive
+  ];
 
   buildInputs = [
     grpc
     libgit2
     openssl
-    protobuf_25
+    protobuf
     python3
   ];
 
-  postPatch = ''
-    sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py
-    sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py
-    jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf_25}"' etc/repos.json > etc/repos.json.patched
-    mv etc/repos.json.patched etc/repos.json
-    jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched
-    mv etc/repos.json.patched etc/repos.json
-    jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched
-    mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py
-  '';
+  postPatch =
+    ''
+      sed -ie 's|\./bin/just-mr.py|${python3}/bin/python3 ./bin/just-mr.py|' bin/bootstrap.py
+      sed -ie 's|#!/usr/bin/env python3|#!${python3}/bin/python3|' bin/parallel-bootstrap-traverser.py
+      jq '.repositories.protobuf.pkg_bootstrap.local_path = "${protobuf}"' etc/repos.json > etc/repos.json.patched
+      mv etc/repos.json.patched etc/repos.json
+      jq '.repositories.com_github_grpc_grpc.pkg_bootstrap.local_path = "${grpc}"' etc/repos.json > etc/repos.json.patched
+      mv etc/repos.json.patched etc/repos.json
+      jq '.unknown.PATH = []' etc/toolchain/CC/TARGETS > etc/toolchain/CC/TARGETS.patched
+      mv etc/toolchain/CC/TARGETS.patched etc/toolchain/CC/TARGETS
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      sed -ie 's|-Wl,-z,stack-size=8388608|-Wl,-stack_size,0x800000|' bin/bootstrap.py
+    '';
 
-  /* The build phase follows the bootstrap procedure that is explained in
-     https://github.com/just-buildsystem/justbuild/blob/master/INSTALL.md
+  /*
+    The build phase follows the bootstrap procedure that is explained in
+    https://github.com/just-buildsystem/justbuild/blob/master/INSTALL.md
 
-     The bootstrap of the just binary depends on two proto libraries, which are
-     supplied as external distfiles.
+    The bootstrap of the just binary depends on two proto libraries, which are
+    supplied as external distfiles.
 
-     The microsoft-gsl library does not provide a pkg-config file, so one is
-     created here. In case also the GNU Scientific Library would be used (which
-     has also the pkg-config name gsl) this would cause a conflict. However, it
-     is very unlikely that a build tool will ever depend on a GPL math library.
-
-     The extra build flags (ADD_CFLAGS and ADD_CXXFLAGS) are only needed in the
-     current version of just, the next release will contain a fix from upstream.
-     https://github.com/just-buildsystem/justbuild/commit/5abcd4140a91236c7bda1c21ce69e76a28da7c8a
+    The microsoft-gsl library does not provide a pkg-config file, so one is
+    created here. In case also the GNU Scientific Library would be used (which
+    has also the pkg-config name gsl) this would cause a conflict. However, it
+    is very unlikely that a build tool will ever depend on a GPL math library.
 
+    The extra build flags (ADD_CFLAGS and ADD_CXXFLAGS) are only needed in the
+    current version of just, the next release will contain a fix from upstream.
+    https://github.com/just-buildsystem/justbuild/commit/5abcd4140a91236c7bda1c21ce69e76a28da7c8a
   */
 
   buildPhase = ''
@@ -165,11 +171,22 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion {
+      package = justbuild;
+      command = "just version";
+      version = builtins.replaceStrings [ "." ] [ "," ] version;
+    };
+  };
+
+  meta = {
     broken = stdenv.hostPlatform.isDarwin;
     description = "Generic build tool";
     homepage = "https://github.com/just-buildsystem/justbuild";
-    license = licenses.asl20;
-    maintainers = with maintainers; [clkamp];
+    changelog = "https://github.com/just-buildsystem/justbuild/releases/tag/v${version}";
+    mainProgram = "just";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ clkamp ];
   };
 }

pkgs/by-name/lo/local-ai/package.nix

@@ -147,8 +147,8 @@ let
         src = fetchFromGitHub {
           owner = "ggerganov";
           repo = "llama.cpp";
-          rev = "70392f1f81470607ba3afef04aa56c9f65587664";
-          hash = "sha256-PgdH3Q4lM45a7aLeN/19i0Ld4NuTfzh/caYOSdooFao=";
+          rev = "96776405a17034dcfd53d3ddf5d142d34bdbb657";
+          hash = "sha256-V5Z+8cpllhDR0s4InoXyEU59a/qo2b5Xj8oeZd0rtGk=";
           fetchSubmodules = true;
         };
         postPatch =
@@ -299,8 +299,8 @@ let
     src = fetchFromGitHub {
       owner = "ggerganov";
       repo = "whisper.cpp";
-      rev = "0d2e2aed80109e8696791083bde3b58e190b7812";
-      hash = "sha256-HE9FLwLGVCggEF7VjWtdNhNnhe7c1RQp30spEIkK4TI=";
+      rev = "fdbfb460ed546452a5d53611bba66d10d842e719";
+      hash = "sha256-ZLSVPQUw1sp7sETk2w38qKq8ut7XNGuof2TUvFzjdPk=";
     };
 
     nativeBuildInputs = [
@@ -431,12 +431,12 @@ let
       stdenv;
 
   pname = "local-ai";
-  version = "2.21.1";
+  version = "2.22.0";
   src = fetchFromGitHub {
     owner = "go-skynet";
     repo = "LocalAI";
     rev = "v${version}";
-    hash = "sha256-UlXBg/FKv/GNz2PCEVvzhILNdyQvTfkw157sNpunf2I=";
+    hash = "sha256-EwBgw0WXnK3E3ZyA1+Xk/o7Te7OCJWi7njefA4PDUJ0=";
   };
 
   prepare-sources =

pkgs/by-name/mi/mingtest/package.nix

@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   name = "mingtest";
-  version = "0.1.9";
+  version = "0.2.1";
   src = fetchFromGitHub {
     owner = "craflin";
     repo = "mingtest";
     rev = "refs/tags/${version}";
-    hash = "sha256-Iy2KvFCFk+uoztTVxTY7HMdc5GI4gSGqGmbJePJ5CO8=";
+    hash = "sha256-buFr5w+3YJ2gJeQ8YTsFrUMU9hWq/iAJ6cW6ykvETfM=";
   };
 
   postPatch = ''

pkgs/by-name/mj/mjmap/package.nix

@@ -0,0 +1,42 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromSourcehut,
+  unstableGitUpdater,
+}:
+
+buildGoModule {
+  pname = "mjmap";
+  version = "0.1.0-unstable-2023-11-13";
+
+  src = fetchFromSourcehut {
+    owner = "~rockorager";
+    repo = "mjmap";
+    rev = "d54badae8152b4db6eec8b03a7bd7c5ff1724aa7";
+    hash = "sha256-yFYYnklNNOHTfoT54kOIVoM4t282/0Ir4l72GmqlGSY=";
+  };
+
+  vendorHash = "sha256-fJuPrzjRH0FpYj2D9CsFdsdzYT0C3/D2PhmJIZTsgfQ=";
+
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $out/bin/mjmap --version >/dev/null
+
+    runHook postInstallCheck
+  '';
+
+  passthru.updateScript = unstableGitUpdater {
+    tagPrefix = "v.";
+  };
+
+  meta = {
+    description = "Sendmail‐compatible JMAP client";
+    homepage = "https://git.sr.ht/~rockorager/mjmap";
+    license = lib.licenses.mpl20;
+    sourceProvenance = [ lib.sourceTypes.fromSource ];
+    maintainers = [ lib.maintainers.emily ];
+    mainProgram = "mjmap";
+    platforms = lib.platforms.unix;
+  };
+}

pkgs/by-name/ne/nemu/package.nix

@@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    busybox # for start-stop-daemon
     coreutils
     dbus
     gettext

pkgs/by-name/ne/netscanner/package.nix

@@ -6,7 +6,7 @@
 }:
 let
   pname = "netscanner";
-  version = "0.5.3";
+  version = "0.6.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "Chleba";
     repo = "netscanner";
     rev = "refs/tags/v${version}";
-    hash = "sha256-rqUGi7UF9y3VZ0KoctCesQVgJbR1WfqhFA6aYFFimNk=";
+    hash = "sha256-p7ajWY/eGWHPosxFXOKs2YeMAny+/PJ68IAU2NNgm0w=";
   };
 
-  cargoHash = "sha256-VP6L3lXDXadimSWC2L4yfzTRfTcUilJtZ7TeHARAKAY=";
+  cargoHash = "sha256-F6titbFM0zsbbwZKcSx3U4cknea83TCITiGm7rPXmFE=";
 
   postFixup = ''
     wrapProgram $out/bin/netscanner \

pkgs/by-name/oq/oqs-provider/package.nix

@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "open-quantum-safe";
     repo  = "oqs-provider";
     rev = finalAttrs.version;
-    hash = "sha256-2+TpYpZwC8vx6tGgS2waD/BQDfnbq0PJIwvX5wDDBEg=";
+    hash = "sha256-v7YIE5uzBvQHfi2hqkkRrW0F3K4haZyuoKHxAtRqQDA=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/or/ord/package.nix

@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ord";
-  version = "0.20.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "ordinals";
     repo = "ord";
     rev = version;
-    hash = "sha256-qTTAViVZEw4XgYADoonsVZPulp43lFFkX2xE5OFbL3s=";
+    hash = "sha256-gnwlNDgYEcqbwflQAvPb92pJ8kOpiPHB1co7QyMJ/xA=";
   };
 
-  cargoHash = "sha256-QSeAAaT1LbcWLmML8i2sgRtTnimZfKgLq6qhnpQr8cc=";
+  cargoHash = "sha256-6Phq3buWE+jHWrYsIhV9u5RTGtKqYkkyb/RjrdX1ETw=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/pr/proton-pass/package.nix

@@ -8,11 +8,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
-  version = "1.23.0";
+  version = "1.23.1";
 
   src = fetchurl {
     url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-ewrPk3v1jgF87uY+7P8oQdWARcuFKdfiM1BzulMPBpg=";
+    hash = "sha256-D4OFHL9AS8oAwMZHoXaDpHKfMBQEaOd18eWAwVW4EJA=";
   };
 
   dontConfigure = true;

pkgs/by-name/ra/radicale/package.nix

@@ -6,20 +6,16 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "radicale";
-  version = "3.2.3";
+  version = "3.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "Radicale";
     rev = "refs/tags/v${version}";
-    hash = "sha256-1IlnXVetQQuKBt6+QVKNeMM6qBQAiUhqc+4x3xOnSdE=";
+    hash = "sha256-S9/bPgItbr6rRr4WX+hmyU1RvKn5gz9FdZjYlr0hnd0=";
   };
 
-  postPatch = ''
-    sed -i '/addopts/d' setup.cfg
-  '';
-
   build-system = with python3.pkgs; [
     setuptools
   ];
@@ -36,7 +32,7 @@ python3.pkgs.buildPythonApplication rec {
   __darwinAllowLocalNetworking = true;
 
   nativeCheckInputs = with python3.pkgs; [
-    pytest7CheckHook
+    pytestCheckHook
     waitress
   ];
 

pkgs/by-name/sa/saunafs/package.nix

@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  nixosTests,
   fetchFromGitHub,
   cmake,
   asciidoc,
@@ -60,8 +61,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = lib.optionalString (!stdenv.hostPlatform.isStatic) ''
     rm $out/lib/*.a
+
+    ln -s $out/bin/sfsmount $out/bin/mount.saunafs
   '';
 
+  passthru.tests = nixosTests.saunafs;
+
   meta = with lib; {
     description = "Distributed POSIX file system";
     homepage = "https://saunafs.com";

pkgs/by-name/se/seabios/package.nix

@@ -1,11 +1,37 @@
-{ lib
-, stdenv
-, fetchgit
-, acpica-tools
-, python3
-, writeText
+{
+  lib,
+  acpica-tools,
+  fetchgit,
+  python3,
+  stdenv,
+  writeText,
+  # Configurable options
+  ___build-type ? "csm",
 }:
 
+assert lib.elem (___build-type) [
+  "coreboot"
+  # SeaBIOS with CSM (Compatible Support Module) support; learn more at
+  # https://www.electronicshub.org/what-is-csm-bios/
+  "csm"
+  "qemu"
+];
+let
+  biosfile =
+    {
+      "coreboot" = "bios.bin.elf";
+      "csm" = "Csm16.bin";
+      "qemu" = "bios.bin";
+    }
+    .${___build-type};
+  configuration-string =
+    {
+      "coreboot" = "CONFIG_COREBOOT";
+      "csm" = "CONFIG_CSM";
+      "qemu" = "CONFIG_QEMU";
+    }
+    .${___build-type};
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "seabios";
   version = "1.16.3";
@@ -16,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-hWemj83cxdY8p+Jhkh5GcPvI0Sy5aKYZJCsKDjHTUUk=";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [
+    "out"
+    "doc"
+  ];
 
   nativeBuildInputs = [ python3 ];
 
@@ -29,31 +58,42 @@ stdenv.mkDerivation (finalAttrs: {
     "EXTRAVERSION=\"-nixpkgs\""
   ];
 
-  hardeningDisable = [ "pic" "stackprotector" "fortify" ];
+  hardeningDisable = [
+    "fortify"
+    "pic"
+    "stackprotector"
+  ];
 
-  postConfigure = let
-    config = writeText "config.txt" (lib.generators.toKeyValue { } {
-      # SeaBIOS with CSM (Compatible Support Module) support; learn more at
-      # https://www.electronicshub.org/what-is-csm-bios/
-      "CONFIG_CSM" = "y";
-      "CONFIG_PERMIT_UNALIGNED_PCIROM" = "y";
-      "CONFIG_QEMU_HARDWARE" = "y";
-    });
-  in ''
-    cp ${config} .config
-    make olddefconfig
-  '';
+  postConfigure =
+    let
+      config = writeText "config.txt" (
+        lib.generators.toKeyValue { } {
+          "${configuration-string}" = "y";
+          "CONFIG_PERMIT_UNALIGNED_PCIROM" = "y";
+          "CONFIG_QEMU_HARDWARE" = "y";
+        }
+      );
+    in
+    ''
+      cp ${config} .config
+      make olddefconfig
+    '';
 
   installPhase = ''
     runHook preInstall
 
-    mkdir -pv $doc/share/doc/seabios-${finalAttrs.version}/
-    cp -v docs/* $doc/share/doc/seabios-${finalAttrs.version}/
-    install -Dm644 out/Csm16.bin -t $out/share/seabios/
+    mkdir -pv ''${!outputDoc}/share/doc/seabios-${finalAttrs.version}/
+    cp -v docs/* ''${!outputDoc}/share/doc/seabios-${finalAttrs.version}/
+    install -Dm644 out/${biosfile} -t $out/share/seabios/
 
     runHook postInstall
   '';
 
+  passthru = {
+    build-type = ___build-type;
+    firmware = "${finalAttrs.finalPackage}/share/seabios/${biosfile}";
+  };
+
   meta = {
     homepage = "https://www.seabios.org";
     description = "Open source implementation of a 16bit x86 BIOS";
@@ -64,9 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ lgpl3Plus ];
     maintainers = with lib.maintainers; [ AndersonTorres ];
-    platforms = lib.systems.inspect.patternLogicalAnd
-      lib.systems.inspect.patterns.isUnix
-      lib.systems.inspect.patterns.isx86;
+    platforms = lib.systems.inspect.patternLogicalAnd lib.systems.inspect.patterns.isUnix lib.systems.inspect.patterns.isx86;
     badPlatforms = [ lib.systems.inspect.patterns.isDarwin ];
   };
 })

pkgs/by-name/sw/sway-assign-cgroups/package.nix

@@ -5,12 +5,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "sway-assign-cgroups";
-  version = "0.4.0";
+  version = "0.4.1";
   src = fetchFromGitHub {
     owner = "alebastr";
     repo = "sway-systemd";
-    rev = "v${version}";
-    hash = "sha256-wznYE1/lVJtvf5Nq96gbPYisxc2gWLahVydwcH1vwoQ=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-AJ87/sPy8IVJgb5YehfUfNTOFEDithLfiTxgZfZf238=";
   };
   format = "other";
 

pkgs/by-name/tt/ttop/package.nix

@@ -1,14 +1,19 @@
-{ lib, buildNimPackage, fetchFromGitHub, testers }:
+{
+  lib,
+  buildNimPackage,
+  fetchFromGitHub,
+  testers,
+}:
 
 buildNimPackage (finalAttrs: {
   pname = "ttop";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "inv2004";
     repo = "ttop";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/rs5JjTXxptVHXL3fY8qP6Be3r5N871CEbUH7w6zx4A=";
+    hash = "sha256-KfPlO0RmahavA3dsxNDozuNOXIRAwDTtT+zFaF6hYd0=";
   };
 
   lockFile = ./lock.json;
@@ -29,7 +34,10 @@ buildNimPackage (finalAttrs: {
     changelog = "https://github.com/inv2004/ttop/releases/tag/${finalAttrs.src.rev}";
     license = licenses.mit;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ figsoda sikmir ];
+    maintainers = with maintainers; [
+      figsoda
+      sikmir
+    ];
     mainProgram = "ttop";
   };
 })

pkgs/by-name/un/unrar-free/package.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unrar-free";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitLab {
     owner = "bgermann";
     repo = "unrar-free";
     rev = finalAttrs.version;
-    hash = "sha256-hVUEvlaVx2Ai1lYXU6hwiLToEMhCPWlSIh1WrbYKmco=";
+    hash = "sha256-Dg+KGZcqbE1nBPaemZlWQPaUQQJmaSe0nyDQRXJzwuE=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

pkgs/by-name/yo/yofi/package.nix

@@ -1,12 +1,14 @@
-{ lib
-, fetchFromGitHub
-, rustPlatform
-, autoPatchelfHook
-, fontconfig
-, libxkbcommon
-, pkg-config
-, libgcc
-, wayland
+{
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  rustPlatform,
+  autoPatchelfHook,
+  fontconfig,
+  libxkbcommon,
+  pkg-config,
+  libgcc,
+  wayland,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "yofi";
@@ -19,7 +21,16 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cepAZyA4RBgqeF20g6YOlZTM0aRqErw17yuQ3U24UEg=";
   };
 
-  cargoHash = "sha256-iSy/y1iwhR8x3wDIfazMeROSrJ8uRyA10hoNo6y2OQc=";
+  cargoPatches = [
+    (fetchpatch {
+      name = "bump-time-1.80.0.patch";
+      url = "https://github.com/l4l/yofi/commit/438e180bf5132d29a6846e830d7227cb996ade3e.patch";
+      hash = "sha256-o/kwQRIG6MASGYnepb96pL1qfI+/CNTqc5maDPjSZXk=";
+    })
+  ];
+
+  cargoHash = "sha256-GA6rFet0GIYFR/8WsWteMDwVRz/KyyxlFQOz/lNX7Rk=";
+
   nativeBuildInputs = [
     autoPatchelfHook
     pkg-config
@@ -31,7 +42,10 @@ rustPlatform.buildRustPackage rec {
   ];
 
   appendRunpaths = [
-    (lib.makeLibraryPath [ fontconfig wayland ])
+    (lib.makeLibraryPath [
+      fontconfig
+      wayland
+    ])
   ];
 
   checkFlags = [

pkgs/development/compilers/llvm/common/bolt/default.nix

@@ -3,6 +3,7 @@
   stdenv,
   llvm_meta,
   monorepoSrc,
+  release_version,
   runCommand,
   cmake,
   libxml2,
@@ -20,16 +21,22 @@ stdenv.mkDerivation (finalAttrs: {
   inherit version patches;
 
   # Blank llvm dir just so relative path works
-  src = runCommand "bolt-src-${finalAttrs.version}" { } ''
-    mkdir $out
-    cp -r ${monorepoSrc}/cmake "$out"
-    cp -r ${monorepoSrc}/${finalAttrs.pname} "$out"
-    cp -r ${monorepoSrc}/third-party "$out"
+  src = runCommand "bolt-src-${finalAttrs.version}" { } (
+    ''
+      mkdir $out
+    ''
+    + lib.optionalString (lib.versionAtLeast release_version "14") ''
+      cp -r ${monorepoSrc}/cmake "$out"
+    ''
+    + ''
+      cp -r ${monorepoSrc}/${finalAttrs.pname} "$out"
+      cp -r ${monorepoSrc}/third-party "$out"
 
-    # tablegen stuff, probably not the best way but it works...
-    cp -r ${monorepoSrc}/llvm/ "$out"
-    chmod -R +w $out/llvm
-  '';
+      # tablegen stuff, probably not the best way but it works...
+      cp -r ${monorepoSrc}/llvm/ "$out"
+      chmod -R +w $out/llvm
+    ''
+  );
 
   sourceRoot = "${finalAttrs.src.name}/bolt";
 

pkgs/development/compilers/llvm/common/clang/default.nix

@@ -24,12 +24,14 @@ let
   pname = "clang";
 
   src' = if monorepoSrc != null then
-    runCommand "${pname}-src-${version}" {} ''
+    runCommand "${pname}-src-${version}" {} (''
       mkdir -p "$out"
+    '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
       cp -r ${monorepoSrc}/cmake "$out"
+    '' + ''
       cp -r ${monorepoSrc}/${pname} "$out"
       cp -r ${monorepoSrc}/clang-tools-extra "$out"
-    '' else src;
+    '') else src;
 
   self = stdenv.mkDerivation (finalAttrs: rec {
     inherit pname version patches;

pkgs/development/compilers/llvm/common/compiler-rt/default.nix

@@ -56,11 +56,13 @@ let
       apple-sdk.override { enableBootstrap = true; };
 
   src' = if monorepoSrc != null then
-    runCommand "${baseName}-src-${version}" {} ''
+    runCommand "${baseName}-src-${version}" {} (''
       mkdir -p "$out"
+    '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
       cp -r ${monorepoSrc}/cmake "$out"
+    '' + ''
       cp -r ${monorepoSrc}/${baseName} "$out"
-    '' else src;
+    '') else src;
 
   preConfigure = lib.optionalString (!haveLibc) ''
     cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")

pkgs/development/compilers/llvm/common/default.nix

@@ -346,13 +346,7 @@ let
   tools = lib.makeExtensible (
     tools:
     let
-      callPackage = newScope (
-        tools
-        // args
-        // metadata
-        # Previously monorepoSrc was erroneously not being passed through.
-        // lib.optionalAttrs (lib.versionOlder metadata.release_version "14") { monorepoSrc = null; } # Preserve a bug during #307211, TODO: remove; causes llvm 13 rebuild.
-      );
+      callPackage = newScope (tools // args // metadata);
       clangVersion =
         if (lib.versionOlder metadata.release_version "16") then
           metadata.release_version

pkgs/development/compilers/llvm/common/libclc.nix

@@ -22,11 +22,17 @@ stdenv.mkDerivation rec {
   pname = "libclc";
   inherit version;
 
-  src = runCommand "${pname}-src-${version}" { } ''
-    mkdir -p "$out"
-    cp -r ${monorepoSrc}/cmake "$out"
-    cp -r ${monorepoSrc}/${pname} "$out"
-  '';
+  src = runCommand "${pname}-src-${version}" { } (
+    ''
+      mkdir -p "$out"
+    ''
+    + lib.optionalString (lib.versionAtLeast release_version "14") ''
+      cp -r ${monorepoSrc}/cmake "$out"
+    ''
+    + ''
+      cp -r ${monorepoSrc}/${pname} "$out"
+    ''
+  );
 
   sourceRoot = "${src.name}/${pname}";
 

pkgs/development/compilers/llvm/common/libunwind/default.nix

@@ -19,7 +19,9 @@ let
   src' = if monorepoSrc != null then
     runCommand "${pname}-src-${version}" {} (''
       mkdir -p "$out"
+    '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
       cp -r ${monorepoSrc}/cmake "$out"
+    '' + ''
       cp -r ${monorepoSrc}/${pname} "$out"
       mkdir -p "$out/libcxx"
       cp -r ${monorepoSrc}/libcxx/cmake "$out/libcxx"

pkgs/development/compilers/llvm/common/lld/default.nix

@@ -19,21 +19,23 @@ let
   pname = "lld";
   src' =
     if monorepoSrc != null then
-      runCommand "lld-src-${version}" {} ''
+      runCommand "lld-src-${version}" {} (''
         mkdir -p "$out"
+      '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
         cp -r ${monorepoSrc}/cmake "$out"
+      '' + ''
         cp -r ${monorepoSrc}/${pname} "$out"
         mkdir -p "$out/libunwind"
         cp -r ${monorepoSrc}/libunwind/include "$out/libunwind"
         mkdir -p "$out/llvm"
-      '' else src;
+      '') else src;
 
   postPatch = lib.optionalString (lib.versions.major release_version == "12") ''
     substituteInPlace MachO/CMakeLists.txt --replace \
       '(''${LLVM_MAIN_SRC_DIR}/' '('
     mkdir -p libunwind/include
     tar -xf "${libunwind.src}" --wildcards -C libunwind/include --strip-components=2 "libunwind-*/include/"
-  '' + lib.optionalString (lib.versions.major release_version == "13" && stdenv.hostPlatform.isDarwin) ''
+  '' + lib.optionalString (lib.versions.major release_version == "13") ''
     substituteInPlace MachO/CMakeLists.txt --replace \
       '(''${LLVM_MAIN_SRC_DIR}/' '(../'
   '';
@@ -75,4 +77,4 @@ stdenv.mkDerivation (rec {
       of several different linkers.
     '';
   };
-} // (if (postPatch == "" && lib.versions.major release_version != "13") then {} else { inherit postPatch; }))
+} // (lib.optionalAttrs (postPatch != "") { inherit postPatch; }))

pkgs/development/compilers/llvm/common/lldb.nix

@@ -32,7 +32,9 @@ let
     if monorepoSrc != null then
       runCommand "lldb-src-${version}" { } (''
         mkdir -p "$out"
+      '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
         cp -r ${monorepoSrc}/cmake "$out"
+      '' + ''
         cp -r ${monorepoSrc}/lldb "$out"
       '' + lib.optionalString (lib.versionAtLeast release_version "19" && enableManpages) ''
         mkdir -p "$out/llvm"

pkgs/development/compilers/llvm/common/llvm/default.nix

@@ -83,11 +83,15 @@ let
 
   pname = "llvm";
 
+  # TODO: simplify versionAtLeast condition for cmake and third-party via rebuild
   src' = if monorepoSrc != null then
     runCommand "${pname}-src-${version}" {} (''
       mkdir -p "$out"
+    '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
       cp -r ${monorepoSrc}/cmake "$out"
+    '' + ''
       cp -r ${monorepoSrc}/${pname} "$out"
+    '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
       cp -r ${monorepoSrc}/third-party "$out"
     '' + lib.optionalString enablePolly ''
       chmod u+w "$out/${pname}/tools"

pkgs/development/compilers/llvm/common/mlir/default.nix

@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , llvm_meta
+, release_version
 , buildLlvmTools
 , monorepoSrc
 , runCommand
@@ -18,14 +19,16 @@ stdenv.mkDerivation rec {
   inherit version doCheck;
 
   # Blank llvm dir just so relative path works
-  src = runCommand "${pname}-src-${version}" { } ''
+  src = runCommand "${pname}-src-${version}" { } (''
     mkdir -p "$out"
+  '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
     cp -r ${monorepoSrc}/cmake "$out"
+  '' + ''
     cp -r ${monorepoSrc}/mlir "$out"
     cp -r ${monorepoSrc}/third-party "$out/third-party"
 
     mkdir -p "$out/llvm"
-  '';
+  '');
 
   sourceRoot = "${src.name}/mlir";
 

pkgs/development/compilers/llvm/common/openmp/default.nix

@@ -21,11 +21,13 @@ let
   pname = "openmp";
   src' =
     if monorepoSrc != null then
-      runCommand "${pname}-src-${version}" {} ''
+      runCommand "${pname}-src-${version}" {} (''
         mkdir -p "$out"
+      '' + lib.optionalString (lib.versionAtLeast release_version "14") ''
         cp -r ${monorepoSrc}/cmake "$out"
+      '' + ''
         cp -r ${monorepoSrc}/${pname} "$out"
-      '' else src;
+      '') else src;
 in
 stdenv.mkDerivation (rec {
   inherit pname version patches;

pkgs/development/interpreters/python/mk-python-derivation.nix

@@ -215,23 +215,6 @@ let
 
   isSetuptoolsDependency = isSetuptoolsDependency' (attrs.pname or null);
 
-  passthru =
-    attrs.passthru or { }
-    // {
-      updateScript = let
-        filename = head (splitString ":" self.meta.position);
-      in attrs.passthru.updateScript or [ update-python-libraries filename ];
-    }
-    // optionalAttrs (dependencies != []) {
-      inherit dependencies;
-    }
-    // optionalAttrs (optional-dependencies != {}) {
-      inherit optional-dependencies;
-    }
-    // optionalAttrs (build-system != []) {
-      inherit build-system;
-    };
-
   # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
   self = toPythonModule (stdenv.mkDerivation ((cleanAttrs attrs) // {
 
@@ -324,7 +307,21 @@ let
 
     outputs = outputs ++ optional withDistOutput "dist";
 
-    inherit passthru;
+    passthru = attrs.passthru or { }
+    // {
+      updateScript = let
+        filename = head (splitString ":" self.meta.position);
+      in attrs.passthru.updateScript or [ update-python-libraries filename ];
+    }
+    // optionalAttrs (dependencies != []) {
+      inherit dependencies;
+    }
+    // optionalAttrs (optional-dependencies != {}) {
+      inherit optional-dependencies;
+    }
+    // optionalAttrs (build-system != []) {
+      inherit build-system;
+    };
 
     meta = {
       # default to python's platforms
@@ -351,5 +348,5 @@ let
 
 in extendDerivation
   (disabled -> throw "${name} not supported for interpreter ${python.executable}")
-  passthru
+  { }
   self

pkgs/development/interpreters/python/python-packages-base.nix

@@ -37,15 +37,15 @@ let
   else
     ./python2/mk-python-derivation.nix;
 
-  buildPythonPackage = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation {
+  buildPythonPackage = makeOverridablePythonPackage (callPackage mkPythonDerivation {
     inherit namePrefix;     # We want Python libraries to be named like e.g. "python3.6-${name}"
     inherit toPythonModule; # Libraries provide modules
-  }));
+  });
 
-  buildPythonApplication = makeOverridablePythonPackage (lib.makeOverridable (callPackage mkPythonDerivation {
+  buildPythonApplication = makeOverridablePythonPackage (callPackage mkPythonDerivation {
     namePrefix = "";        # Python applications should not have any prefix
     toPythonModule = x: x;  # Application does not provide modules.
-  }));
+  });
 
   # Check whether a derivation provides a Python module.
   hasPythonModule = drv: drv?pythonModule && drv.pythonModule == python;

pkgs/development/interpreters/python/tests.nix

@@ -75,7 +75,7 @@ let
         is_virtualenv = "False";
       };
 
-    } // lib.optionalAttrs (python.pythonAtLeast "3.8") {
+    } // {
       # Venv built using Python Nix environment (python.buildEnv)
       # TODO: Cannot create venv from a  nix env
       # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1.
@@ -105,22 +105,24 @@ let
 
   # Integration tests involving the package set.
   # All PyPy package builds are broken at the moment
-  integrationTests = lib.optionalAttrs (!python.isPyPy) (
-    lib.optionalAttrs (python.isPy3k && !stdenv.hostPlatform.isDarwin) { # darwin has no split-debug
-      cpython-gdb = callPackage ./tests/test_cpython_gdb {
-        interpreter = python;
-      };
-    } // lib.optionalAttrs (python.pythonAtLeast "3.7") {
-      # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages
-      nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix {
-        interpreter = python;
-      };
-      # Make sure tkinter is importable. See https://github.com/NixOS/nixpkgs/issues/238990
-      tkinter = callPackage ./tests/test_tkinter {
-        interpreter = python;
-      };
-    }
-  );
+  integrationTests = lib.optionalAttrs (!python.isPyPy) ({
+    # Make sure tkinter is importable. See https://github.com/NixOS/nixpkgs/issues/238990
+    tkinter = callPackage ./tests/test_tkinter {
+      interpreter = python;
+    };
+  } // lib.optionalAttrs (python.isPy3k && python.pythonOlder "3.13" && !stdenv.hostPlatform.isDarwin) { # darwin has no split-debug
+    # fails on python3.13
+    cpython-gdb = callPackage ./tests/test_cpython_gdb {
+      interpreter = python;
+    };
+  } // lib.optionalAttrs (python.isPy3k && python.pythonOlder "3.13") {
+    # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages
+    # mypy does not yet support python3.13
+    # https://github.com/python/mypy/issues/17264
+    nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix {
+      interpreter = python;
+    };
+  });
 
   # Test editable package support
   editableTests = let

pkgs/development/libraries/nng/default.nix

@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nng";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "nanomsg";
     repo = "nng";
     rev = "v${version}";
-    hash = "sha256-E2uosZrmxO3fqwlLuu5e36P70iGj5xUlvhEb+1aSvOA=";
+    hash = "sha256-N1ZMILrFhdkwU4PK/zlSCgGjOm0748fgvZRrk7I9YVg=";
   };
 
   nativeBuildInputs = [ cmake ninja ]

pkgs/development/python-modules/accelerate/default.nix

@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "accelerate";
-  version = "0.34.2";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "accelerate";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4kDNLta6gGev16A4hNOArTpoD8p6LMRwqwHS/DZjtz0=";
+    hash = "sha256-XVJqyhDSUPQDHdaB6GDxHhuC6EWCSZNArjzyLpvhQHI=";
   };
 
   buildInputs = [ llvmPackages.openmp ];

pkgs/development/python-modules/cohere/default.nix

@@ -15,6 +15,7 @@
   pydantic,
   pydantic-core,
   requests,
+  sagemaker,
   tokenizers,
   types-requests,
   typing-extensions,
@@ -22,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "cohere";
-  version = "5.10.0";
+  version = "5.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cohere-ai";
     repo = "cohere-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-9d72JWEz2L8yyZQKkdwQMgwQM3nz4yVHnmVCERaa5C8=";
+    hash = "sha256-KhONCdIGKYbIcFG+zv6uXSiX+crsmgPZUU+5NsSWaA8=";
   };
 
   build-system = [ poetry-core ];
@@ -43,6 +44,7 @@ buildPythonPackage rec {
     pydantic
     pydantic-core
     requests
+    sagemaker
     tokenizers
     types-requests
     typing-extensions

pkgs/development/python-modules/django-mdeditor/Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch

@@ -0,0 +1,63 @@
+From c5af641cccf663dffb4a47d32e28404f609badce Mon Sep 17 00:00:00 2001
+From: Tomo <tomodachi94@protonmail.com>
+Date: Sat, 12 Oct 2024 03:39:12 +0000
+Subject: [PATCH 1/2] chore(KaTeX): bump to 0.7.1
+
+Many bugfixes. This KaTeX is still quite old,
+but versions beyond this have backwards-incompatibilities
+(starting in 0.8).
+---
+ mdeditor/static/mdeditor/js/editormd.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mdeditor/static/mdeditor/js/editormd.js b/mdeditor/static/mdeditor/js/editormd.js
+index be0005d..8aacb56 100644
+--- a/mdeditor/static/mdeditor/js/editormd.js
++++ b/mdeditor/static/mdeditor/js/editormd.js
+@@ -4179,8 +4179,8 @@
+     // 使用国外的CDN，加载速度有时会很慢，或者自定义URL
+     // You can custom KaTeX load url.
+     editormd.katexURL  = {
+-        css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.3.0/katex.min",
+-        js  : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.3.0/katex.min"
++        css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min",
++        js  : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min"
+     };
+     
+     editormd.kaTeXLoaded = false;
+-- 
+2.46.2
+
+
+From 3d082a738262b057d33b9aa8c777d50113143952 Mon Sep 17 00:00:00 2001
+From: Tomo <tomodachi94@protonmail.com>
+Date: Mon, 7 Oct 2024 17:44:39 -0700
+Subject: [PATCH 2/2] fix(KaTeX): Use jsdelivr instead of bootcdn
+
+Bootcdn was compromised by a malicious actor:
+https://sansec.io/research/polyfill-supply-chain-attack
+
+KaTeX recommends using jsdelivr, so I used that:
+https://katex.org/docs/browser
+---
+ mdeditor/static/mdeditor/js/editormd.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mdeditor/static/mdeditor/js/editormd.js b/mdeditor/static/mdeditor/js/editormd.js
+index 8aacb56..a31e817 100644
+--- a/mdeditor/static/mdeditor/js/editormd.js
++++ b/mdeditor/static/mdeditor/js/editormd.js
+@@ -4179,8 +4179,8 @@
+     // 使用国外的CDN，加载速度有时会很慢，或者自定义URL
+     // You can custom KaTeX load url.
+     editormd.katexURL  = {
+-        css : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min",
+-        js  : "//cdn.bootcdn.net/ajax/libs/KaTeX/0.7.1/katex.min"
++        css : "//cdn.jsdelivr.net/npm/katex@0.7.1/dist/katex.min.css",
++        js  : "//cdn.jsdelivr.net/npm/katex@0.7.1/dist/katex.min.js"
+     };
+     
+     editormd.kaTeXLoaded = false;
+-- 
+2.46.2
+

pkgs/development/python-modules/django-mdeditor/default.nix

@@ -18,6 +18,10 @@ buildPythonPackage {
     hash = "sha256-t57j1HhjNQtBwlbqe4mAHQ9WiNcIhMKYmrZkiqh+k5k=";
   };
 
+  patches = [
+    ./Bump-KaTeX-and-replace-bootcdn-with-jsdelivr.patch
+  ];
+
   propagatedBuildInputs = [ django ];
 
   # no tests

pkgs/development/python-modules/gios/default.nix

@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "gios";
-  version = "4.0.0";
+  version = "5.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "bieniu";
     repo = "gios";
     rev = "refs/tags/${version}";
-    hash = "sha256-rjC4zWWtaPxuBcjiO9dVsXD4dTa47iwkKuSFx+QXeXw=";
+    hash = "sha256-J+LCu7wMuc3dYghvkKq58GcBAa76X5IPUWe7qCQwjjI=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/gotenberg-client/default.nix

@@ -9,7 +9,7 @@
 }:
 buildPythonPackage rec {
   pname = "gotenberg-client";
-  version = "0.6.0";
+  version = "0.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "stumpylog";
     repo = "gotenberg-client";
     rev = "refs/tags/${version}";
-    hash = "sha256-rF4msWYWgNUtOnMAB11vdAPNWZeAoeglnzMPWEM503I=";
+    hash = "sha256-pkxu9WIsyHW2iTepv5B2naKkK+yw8lT+i3EwobE+u1M=";
   };
 
   nativeBuildInputs = [ hatchling ];

pkgs/development/python-modules/ipytablewidgets/default.nix

@@ -12,20 +12,18 @@
   pandas,
   setuptools,
   traitlets,
-  traittypes,
-  wheel,
 }:
 
 buildPythonPackage rec {
   pname = "ipytablewidgets";
-  version = "0.3.1";
-  format = "pyproject";
+  version = "0.3.2";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-14vIih+r/PHLxhgG29YtwuosSBLpewD2CluWpH2+pLc=";
+    hash = "sha256-CGkb//mLUmkyv+hmVJX5+04JGCfw+TtfBxMTXW0bhsw=";
   };
 
   # Opened https://github.com/progressivis/ipytablewidgets/issues/3 to ask if
@@ -37,20 +35,18 @@ buildPythonPackage rec {
       --replace 'jupyterlab>=3.0.0,<3.7' 'jupyterlab>=3.0.0'
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     jupyter-packaging
     jupyterlab
     setuptools
-    wheel
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     ipywidgets
     lz4
     numpy
     pandas
     traitlets
-    traittypes
   ];
 
   nativeCheckInputs = [ pytestCheckHook ];

pkgs/development/python-modules/lxmf/default.nix

@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "lxmf";
-  version = "0.5.5";
+  version = "0.5.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "lxmf";
     rev = "refs/tags/${version}";
-    hash = "sha256-1zZRONzKafXfnmszRl7oCRTFBsy9U1bUaOzWwt7jLzY=";
+    hash = "sha256-nhi15afsvzM0LCvtI5/dq5zOHmhM4Wk53lj6fKgx9NA=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/meshtastic/default.nix

@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "meshtastic";
-  version = "2.5.1";
+  version = "2.5.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "meshtastic";
     repo = "Meshtastic-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-LyWb7BWwRi0Q/dOZkFu/FwOBIqR2mPr3c8/mpsqw/ec=";
+    hash = "sha256-k2i6oZudY59CmFt5qlWCCtZgywcbLHR9OUYIannSZ20=";
   };
 
   pythonRelaxDeps = [

pkgs/development/python-modules/mypy-boto3/default.nix

@@ -58,8 +58,8 @@ rec {
       "sha256-kdakfB1uRg5K+FZyeNSQxvBYj0+ztJrDTq4Dkh6dqAA=";
 
   mypy-boto3-acm-pca =
-    buildMypyBoto3Package "acm-pca" "1.35.0"
-      "sha256-YU4Djb4Z9//5WYvkSgv9vlv4oG8Da6dP/Oktpuff4q0=";
+    buildMypyBoto3Package "acm-pca" "1.35.38"
+      "sha256-9hJo5ZV8ckN5+V/L6MOowyWr2eZoroVRmzooMDDA6WE=";
 
   mypy-boto3-amp =
     buildMypyBoto3Package "amp" "1.35.0"
@@ -102,8 +102,8 @@ rec {
       "sha256-jwjD2mkz6YpUEOwEHMNiIzBNoVwYUUONQjKZemGFEl8=";
 
   mypy-boto3-appflow =
-    buildMypyBoto3Package "appflow" "1.35.0"
-      "sha256-tNCfrUzsRHhpfIY+D2Y+OscMnYw7lGeYhFvs+wHq9zk=";
+    buildMypyBoto3Package "appflow" "1.35.39"
+      "sha256-W5GJoGRQUcjTBUYAWJjBgMKcAKRdn63deVsyU6ezRIU=";
 
   mypy-boto3-appintegrations =
     buildMypyBoto3Package "appintegrations" "1.35.0"
@@ -294,8 +294,8 @@ rec {
       "sha256-UJmPVW20ofQmmer9/IYwaFIU2+xhXcT+0s2aUxFDGZY=";
 
   mypy-boto3-codepipeline =
-    buildMypyBoto3Package "codepipeline" "1.35.33"
-      "sha256-hnmb6+m1iiVfzNjm1AxGlAkEjSbAslPe4st7i52Kj3w=";
+    buildMypyBoto3Package "codepipeline" "1.35.37"
+      "sha256-DHNj6IzWxg5qHpT0QaHQHNPkYk344fo/2/vUGLl8Kfg=";
 
   mypy-boto3-codestar =
     buildMypyBoto3Package "codestar" "1.35.0"
@@ -414,8 +414,8 @@ rec {
       "sha256-yJ3ApQy6xeEdxNcRQG5mekfK1aP7FPdR79TfbRZkESo=";
 
   mypy-boto3-dms =
-    buildMypyBoto3Package "dms" "1.35.0"
-      "sha256-mTwE5mn8GTCMuidyk8cYnZEk3PkrnP2ykVZgn2geMTo=";
+    buildMypyBoto3Package "dms" "1.35.38"
+      "sha256-b9AA9n1WWgk4HV1U/3L/eVl4eualNyhYCjbFw+QvHV4=";
 
   mypy-boto3-docdb =
     buildMypyBoto3Package "docdb" "1.35.0"
@@ -446,8 +446,8 @@ rec {
       "sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.35.34"
-      "sha256-gi80wl0sVQmaeYdAiPIeeL2Uc8dwQuGDTFKRvbGh6Co=";
+    buildMypyBoto3Package "ec2" "1.35.38"
+      "sha256-AwY1//39/3P8l+zEsunb7Mun//B1wiR8ae+ZxGulzRo=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.35.0"
@@ -462,8 +462,8 @@ rec {
       "sha256-KXtN44KAIDXjMgv3ICG8rXYfEjcZ85pQ+qdvN2Yiq3g=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.35.21"
-      "sha256-DSmCf9/TXUfoEYppEZOxAJOxuOCZK5p6GRIKWIa3aPQ=";
+    buildMypyBoto3Package "ecs" "1.35.38"
+      "sha256-udIe50T9ae7esIkpVqmMvRtTwv4xDJTiwkR94cX+2M4=";
 
   mypy-boto3-efs =
     buildMypyBoto3Package "efs" "1.35.0"
@@ -474,8 +474,8 @@ rec {
       "sha256-w+uJ5Jqfbnj3ykj59C8sbhitp5MyTIE+PnZXrlIkOag=";
 
   mypy-boto3-elastic-inference =
-    buildMypyBoto3Package "elastic-inference" "1.35.0"
-      "sha256-GpOOU/ritDu+hDZL8adN5fLYhYt0bgBTqCv2mDjt1T0=";
+    buildMypyBoto3Package "elastic-inference" "1.35.38"
+      "sha256-D+Ecu2+03ua8vs8C2NdGtDVSUpyM0SozHIb2PbRO2+g=";
 
   mypy-boto3-elasticache =
     buildMypyBoto3Package "elasticache" "1.35.36"
@@ -494,12 +494,12 @@ rec {
       "sha256-fw/vfzKXXQSG7xj9FolkJgzciHBz4ELlFh2MlEJ6wQI=";
 
   mypy-boto3-elbv2 =
-    buildMypyBoto3Package "elbv2" "1.35.18"
-      "sha256-BlHZi/WM1rKK0QWbAYfHmdpZmgm8ZpWZPZQ4gz0k4oY=";
+    buildMypyBoto3Package "elbv2" "1.35.39"
+      "sha256-k7IgKkdS2h5p+Xl+UhiQRtk9fjCZQMzc2FXRRTjscTc=";
 
   mypy-boto3-emr =
-    buildMypyBoto3Package "emr" "1.35.18"
-      "sha256-yXm2k6pDyJ1N93q6ltz6jvQy17AKpKsKhVFMpS1oGaI=";
+    buildMypyBoto3Package "emr" "1.35.39"
+      "sha256-PAVHgUn9cbnu7EPOO2+SNbT+WrayTP/mmIoqt3Kw29E=";
 
   mypy-boto3-emr-containers =
     buildMypyBoto3Package "emr-containers" "1.35.4"
@@ -594,8 +594,8 @@ rec {
       "sha256-U0sYInE/1XsjwQCxmcYLVvmEQf4R6drtdSqTr0b+3OM=";
 
   mypy-boto3-guardduty =
-    buildMypyBoto3Package "guardduty" "1.35.22"
-      "sha256-+Ro4QM8DwrDlbroFb6YV6fZGYPieHB0B5+EgdNrnIzQ=";
+    buildMypyBoto3Package "guardduty" "1.35.39"
+      "sha256-6+k3i6IdCsHW8xTy/AG2JcfDqpGGj67JSihC6OPjXYE=";
 
   mypy-boto3-health =
     buildMypyBoto3Package "health" "1.35.0"
@@ -674,8 +674,8 @@ rec {
       "sha256-Hse02blZttIxqJovJ3h6yCEi+jN3e+pfznIXjBAid1k=";
 
   mypy-boto3-iotfleetwise =
-    buildMypyBoto3Package "iotfleetwise" "1.35.0"
-      "sha256-VQCFJX2wZYKWey8yxEBoAK29uDxb/xn5+EuZH739DV8=";
+    buildMypyBoto3Package "iotfleetwise" "1.35.38"
+      "sha256-vkQmyoPMcf2ZBnJ1TJba2uNJL3GaVVZI9h3R75C3uR8=";
 
   mypy-boto3-iotsecuretunneling =
     buildMypyBoto3Package "iotsecuretunneling" "1.35.0"
@@ -994,8 +994,8 @@ rec {
       "sha256-PdOH3KaQn9d455qCR565qFlyCb8t7R8x8wXBebHgtt8=";
 
   mypy-boto3-outposts =
-    buildMypyBoto3Package "outposts" "1.35.0"
-      "sha256-CFULIBMCKb4mUQ7ogh5hvfewDMpsP1jnQEJmtuArCck=";
+    buildMypyBoto3Package "outposts" "1.35.38"
+      "sha256-Adb8A8DVn3T00xuEtXXT+LHxwM4jh0IG3JLUiAi02ds=";
 
   mypy-boto3-panorama =
     buildMypyBoto3Package "panorama" "1.35.0"
@@ -1126,8 +1126,8 @@ rec {
       "sha256-3DVLn61w42L8qwyQB1WbOPjOZXqXalLZ9rITcmcDkQI=";
 
   mypy-boto3-robomaker =
-    buildMypyBoto3Package "robomaker" "1.35.0"
-      "sha256-Yl7v7zQHeixpG244Qld1vceR8ZazGjcUc26LUuane3I=";
+    buildMypyBoto3Package "robomaker" "1.35.39"
+      "sha256-kh/KojcYdBfGA7BRorshz34R/Lx8e/WTa0kWpW78PcY=";
 
   mypy-boto3-rolesanywhere =
     buildMypyBoto3Package "rolesanywhere" "1.35.0"
@@ -1154,8 +1154,8 @@ rec {
       "sha256-pM5+b6he5Gp9DuD2Uz/x+SYmVzxhZIh/gJ626S9I19g=";
 
   mypy-boto3-route53resolver =
-    buildMypyBoto3Package "route53resolver" "1.35.0"
-      "sha256-F0ixOVQ8zmCrspV3+a5QmuJdvc5NOV8WiWdepiIeW9E=";
+    buildMypyBoto3Package "route53resolver" "1.35.38"
+      "sha256-MVADJUXYj6HvnJIZZJVfi/rMRCJFE1BZfcoQKvlg69Y=";
 
   mypy-boto3-rum =
     buildMypyBoto3Package "rum" "1.35.0"

pkgs/development/python-modules/optimum/default.nix

@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "optimum";
-  version = "1.22.0";
+  version = "1.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     owner = "huggingface";
     repo = "optimum";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fVpSoa6s7puYO8BiA6aSAhSOTfiZJgaX5iwYkd9VdVo=";
+    hash = "sha256-1A430tvuUsMiVmDbISdj2g5l05D6FswGKsjdUBpZrP0=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/pynitrokey/default.nix

@@ -16,16 +16,16 @@
   python-dateutil,
   pyusb,
   requests,
-  spsdk,
   tqdm,
   tlv8,
   typing-extensions,
-  pyserial,
-  protobuf,
   click-aliases,
   semver,
   nethsm,
   importlib-metadata,
+  nitrokey,
+  pyscard,
+  asn1crypto,
 }:
 
 let
@@ -43,7 +43,11 @@ buildPythonPackage {
     hash = "sha256-pY6ATORZDPGRnkN6dse1s/DzQRpplDbPAGUHU4E7U9M=";
   };
 
-  propagatedBuildInputs = [
+  nativeBuildInputs = [ installShellFiles ];
+
+  build-system = [ flit-core ];
+
+  dependencies = [
     certifi
     cffi
     click
@@ -55,21 +59,16 @@ buildPythonPackage {
     python-dateutil
     pyusb
     requests
-    spsdk
     tqdm
     tlv8
     typing-extensions
-    pyserial
-    protobuf
     click-aliases
     semver
     nethsm
     importlib-metadata
-  ];
-
-  nativeBuildInputs = [
-    flit-core
-    installShellFiles
+    nitrokey
+    pyscard
+    asn1crypto
   ];
 
   pythonRelaxDeps = true;

pkgs/development/python-modules/rns/default.nix

@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "rns";
-  version = "0.8.3";
+  version = "0.8.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "Reticulum";
     rev = "refs/tags/${version}";
-    hash = "sha256-A1ZDyYHjbC2jz+m4EHRPlOMzkpwCCxo902bMK4I/+I4=";
+    hash = "sha256-uonOifCGvSKJhxTAqD49BOHDdN69pRexcb2ny1GwqjA=";
   };
 
   patches = [

pkgs/development/python-modules/tencentcloud-sdk-python/default.nix

@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1248";
+  version = "3.0.1249";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-w0iM9Pq3A7uJ3Q29Oo+YEhN2vPNJINjCwIoGaDwHK2A=";
+    hash = "sha256-I3/nEiCgZaAX32Kj2w+qWPwL5frxOdpLGF7dzBsptr8=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/testcontainers/default.nix

@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "testcontainers";
-  version = "4.8.1";
+  version = "4.8.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "testcontainers";
     repo = "testcontainers-python";
     rev = "refs/tags/testcontainers-v${version}";
-    hash = "sha256-UCT0AmpDWMiAeRuW4BadZl4cJFCQPDogHOSkTYi/tqM=";
+    hash = "sha256-cfvhTNUadx7zRmDPAv9Djsx+jWgBIAf9dMmwop/8oa0=";
   };
 
   postPatch = ''

pkgs/development/python-modules/types-pytz/default.nix

@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "types-pytz";
-  version = "2024.2.0.20240913";
+  version = "2024.2.0.20241003";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-RDO130pvxYe77UFxbYalul2DK0N45Qb0DTS8nIHfLCQ=";
+    hash = "sha256-V13DjzhakiohK6wAp9bS4W4UETKjyVUHj0pP0T7Wy0Q=";
   };
 
   build-system = [ setuptools ];

pkgs/development/python-modules/xarray/default.nix

@@ -42,10 +42,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "xarray" ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/pydata/xarray/blob/${src.rev}/doc/whats-new.rst";
     description = "N-D labeled arrays and datasets in Python";
     homepage = "https://github.com/pydata/xarray";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      doronbehar
+    ];
   };
 }

pkgs/development/tools/build-managers/bear/default.nix

@@ -1,21 +1,23 @@
-{ lib, stdenv
-, fetchFromGitHub
-, cmake
-, ninja
-, pkg-config
-, grpc
-, protobuf
-, openssl
-, nlohmann_json
-, gtest
-, spdlog
-, c-ares
-, zlib
-, sqlite
-, re2
-, lit
-, python3
-, coreutils
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  pkg-config,
+  grpc,
+  protobuf_25,
+  openssl,
+  nlohmann_json,
+  gtest,
+  spdlog,
+  c-ares,
+  zlib,
+  sqlite,
+  re2,
+  lit,
+  python3,
+  coreutils,
 }:
 
 stdenv.mkDerivation rec {
@@ -41,7 +43,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     grpc
-    protobuf
+    protobuf_25
     openssl
     nlohmann_json
     gtest

pkgs/development/tools/misc/texlab/default.nix

@@ -15,16 +15,21 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "texlab";
-  version = "5.19.0";
+  version = "5.20.0";
 
   src = fetchFromGitHub {
     owner = "latex-lsp";
     repo = "texlab";
     rev = "refs/tags/v${version}";
-    hash = "sha256-iH7KqZddP4uKwTBxLLMURUtWBsuEtLHGQppVgGFaWZQ=";
+    hash = "sha256-hKQdc9p69L0t2MwCR4Fy20Nl+2qQk5JJoCaB4O43DNY=";
   };
 
-  cargoHash = "sha256-QW+q869bVAMYv4SCj/2eKrADoDonrvQuaHuanZHIjMo=";
+  cargoHash = "sha256-A/stdJ1baV0hdDXTdLd9gi8+JO7qPgQbNiYjHkp1GPQ=";
+
+  # https://github.com/latex-lsp/texlab/pull/1237
+  preBuild = ''
+    rm .cargo/config.toml
+  '';
 
   outputs = [ "out" ] ++ lib.optional (!isCross) "man";
 
@@ -41,7 +46,7 @@ rustPlatform.buildRustPackage rec {
   # generate the man page
   postInstall = lib.optionalString (!isCross) ''
     # TexLab builds man page separately in CI:
-    # https://github.com/latex-lsp/texlab/blob/v5.16.1/.github/workflows/publish.yml#L117-L121
+    # https://github.com/latex-lsp/texlab/blob/v5.20.0/.github/workflows/publish.yml#L110-L114
     help2man --no-info "$out/bin/texlab" > texlab.1
     installManPage texlab.1
   '';

pkgs/development/tools/rust/cargo-binstall/default.nix

@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-binstall";
-  version = "1.10.5";
+  version = "1.10.7";
 
   src = fetchFromGitHub {
     owner = "cargo-bins";
     repo = "cargo-binstall";
     rev = "v${version}";
-    hash = "sha256-VhmyfGVO1rDcorOznovkUu0GHgUSwKHhk/3jqg1pDZk=";
+    hash = "sha256-bQYKOo11zVIXNHdoD60oEdzSSYeLKppPJBen6wdrXq8=";
   };
 
-  cargoHash = "sha256-rgr++LD6YsTlrxKmNRtn2gdT5a1ul6A5UrXgKmpWC7w=";
+  cargoHash = "sha256-Tr++ui715adP1taqj+Sms2yO3hF5SZl7zCrAkPYlSdY=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/games/exult/default.nix

@@ -3,6 +3,8 @@
 , fetchFromGitHub
 , SDL2
 , autoconf
+, autoconf-archive
+, autoreconfHook
 , automake
 , libogg
 , libtool
@@ -10,21 +12,31 @@
 , pkg-config
 , zlib
 , enableTools ? false
+# Darwin-specific
+, AudioUnit
 }:
 
 stdenv.mkDerivation rec {
   pname = "exult";
-  version = "1.8";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "exult";
     repo = "exult";
     rev = "v${version}";
-    hash = "sha256-Y7FpgiGuqR4ZG/PNSfLcNcRWeeC7GebUTighXsCfy+E=";
+    hash = "sha256-NlvtYtmJNYhOC1BtIxIij3NEQHWAGOeD4XgRq7evjzE=";
   };
 
+  # We can't use just DESTDIR because with it we'll have /nix/store/...-exult-1.10.1/nix/store/...-exult-1.10.1/bin
+  postPatch = ''
+    substituteInPlace macosx/macosx.am \
+      --replace-fail DESTDIR NIX_DESTDIR
+  '';
+
   nativeBuildInputs = [
     autoconf
+    autoconf-archive
+    autoreconfHook
     automake
     libtool
     pkg-config
@@ -35,12 +47,13 @@ stdenv.mkDerivation rec {
     libogg
     libvorbis
     zlib
+  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    AudioUnit
   ];
 
-  preConfigure = ''
-    ./autogen.sh
-  '';
+  enableParallelBuilding = true;
 
+  makeFlags = [ "NIX_DESTDIR=$(out)" ]; # see postPatch
   configureFlags = lib.optional (!enableTools) "--disable-tools";
 
   meta = with lib; {
@@ -58,5 +71,6 @@ stdenv.mkDerivation rec {
     homepage = "http://exult.info";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ azahi ];
+    mainProgram = "exult";
   };
 }

pkgs/games/minetest/default.nix

@@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "BUILD_CLIENT" buildClient)
     (lib.cmakeBool "BUILD_SERVER" buildServer)
+    (lib.cmakeBool "BUILD_UNITTESTS" (finalAttrs.doCheck or false))
     (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer)
     (lib.cmakeBool "USE_SDL2" useSDL2)
     # Ensure we use system libraries
@@ -91,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
     gmp
     libspatialindex
   ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
     OpenGL
     OpenAL
@@ -118,7 +119,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
-    substituteInPlace src/filesys.cpp --replace "/bin/rm" "${coreutils}/bin/rm"
+    substituteInPlace src/filesys.cpp \
+      --replace-fail "/bin/rm" "${coreutils}/bin/rm"
   '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
     sed -i '/pagezero_size/d;/fixup_bundle/d' src/CMakeLists.txt
   '';
@@ -130,6 +132,8 @@ stdenv.mkDerivation (finalAttrs: {
     mv $out/minetest.app $out/Applications
   '';
 
+  doCheck = true;
+
   passthru.updateScript = gitUpdater {
     allowedVersions = "\\.";
     ignoredVersions = "-android$";
@@ -141,5 +145,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.lgpl21Plus;
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ pyrolagus fpletz fgaz ];
+    mainProgram = if buildClient then "minetest" else "minetestserver";
   };
 })

pkgs/kde/misc/klevernotes/default.nix

@@ -7,11 +7,11 @@
 }:
 mkKdeDerivation rec {
   pname = "klevernotes";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz";
-    hash = "sha256-9nXOaa2/DyJO3nXGbnvPaYjXFrVoAgx52th67l5geOU=";
+    hash = "sha256-YkIBYlTvweSg4CMqj+sHoNyZJXuwpCAMNZUZUyH2dYE=";
   };
 
   extraBuildInputs = [

pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh

@@ -102,21 +102,32 @@ while [ "$#" -gt 0 ]; do
       --use-substitutes|--substitute-on-destination|-s)
         copyFlags+=("-s")
         ;;
-      -I|--max-jobs|-j|--cores|--builders|--log-format)
+      --builders)
         j="$1"; shift 1
         extraBuildFlags+=("$i" "$j")
         ;;
-      --accept-flake-config|-j*|--quiet|--print-build-logs|-L|--no-build-output|-Q| --show-trace|--keep-going|-k|--keep-failed|-K|--fallback|--refresh|--repair|--impure|--offline|--no-net)
+      --I|--max-jobs|-j|--cores|--log-format)
+        j="$1"; shift 1
+        extraBuildFlags+=("$i" "$j")
+        copyFlags+=("$i" "$j")
+        ;;
+      --accept-flake-config|-j*|--quiet|--print-build-logs|-L|--no-build-output|-Q|--show-trace|--refresh|--impure|--offline|--no-net)
         extraBuildFlags+=("$i")
         ;;
+      --keep-going|-k|--keep-failed|-K|--fallback|--repair)
+        extraBuildFlags+=("$i")
+        copyFlags+=("$i")
+        ;;
       --verbose|-v|-vv|-vvv|-vvvv|-vvvvv)
         verboseScript="true"
         extraBuildFlags+=("$i")
+        copyFlags+=("$i")
         ;;
       --option)
         j="$1"; shift 1
         k="$1"; shift 1
         extraBuildFlags+=("$i" "$j" "$k")
+        copyFlags+=("$i" "$j" "$k")
         ;;
       --fast)
         buildNix=

pkgs/servers/sickbeard/sickgear.nix

@@ -4,13 +4,13 @@ let
   pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]);
 in stdenv.mkDerivation rec {
   pname = "sickgear";
-  version = "3.32.7";
+  version = "3.32.10";
 
   src = fetchFromGitHub {
     owner = "SickGear";
     repo = "SickGear";
     rev = "release_${version}";
-    hash = "sha256-7kVT/aBL9EAx7oGeXEY9eL72dZGtuJUGlQ7bPyt/JZg=";
+    hash = "sha256-dgaSFTrBg3CM320M75AA2qQaKDkh3LycNqNgO8ewSrw=";
   };
 
   patches = [

pkgs/servers/sql/percona-server/8_0.nix

@@ -1,24 +1,63 @@
-{ lib, stdenv, fetchurl, bison, cmake, pkg-config
-, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2
-, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests
-, coreutils, procps, gnused, gnugrep, hostname, makeWrapper
-# Percona-specific deps
-, cyrus_sasl, gnumake, openldap
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bison,
+  cmake,
+  pkg-config,
+  boost,
+  icu,
+  libedit,
+  libevent,
+  lz4,
+  ncurses,
+  openssl,
+  perl,
+  protobuf,
+  re2,
+  readline,
+  zlib,
+  zstd,
+  libfido2,
+  numactl,
+  cctools,
+  CoreServices,
+  developer_cmds,
+  libtirpc,
+  rpcsvc-proto,
+  curl,
+  DarwinTools,
+  nixosTests,
+  coreutils,
+  procps,
+  gnused,
+  gnugrep,
+  hostname,
+  makeWrapper,
+  # Percona-specific deps
+  cyrus_sasl,
+  gnumake,
+  openldap,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "percona-server_lts";
-  version = "8.0.36-28";
+  pname = "percona-server";
+  version = "8.0.37-29";
 
   src = fetchurl {
     url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
-    hash = "sha256-iktEvZz3mjjmJ16PX51OjSwwiFS3H9W/XRco//Q6aEQ=";
+    hash = "sha256-zZgq3AxCRYdte3dTUJiuMvVGdl9U01s8jxcAqDxZiNM=";
   };
 
   nativeBuildInputs = [
-    bison cmake pkg-config makeWrapper
+    bison
+    cmake
+    pkg-config
+    makeWrapper
     # required for scripts/CMakeLists.txt
-    coreutils gnugrep procps
+    coreutils
+    gnugrep
+    procps
   ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
 
   patches = [
@@ -36,16 +75,41 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --"
   '';
 
-  buildInputs = [
-    boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
-    zstd libfido2 openldap perl cyrus_sasl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    numactl libtirpc
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools CoreServices developer_cmds DarwinTools
-  ];
+  buildInputs =
+    [
+      boost
+      (curl.override { inherit openssl; })
+      icu
+      libedit
+      libevent
+      lz4
+      ncurses
+      openssl
+      protobuf
+      re2
+      readline
+      zlib
+      zstd
+      libfido2
+      openldap
+      perl
+      cyrus_sasl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      numactl
+      libtirpc
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      cctools
+      CoreServices
+      developer_cmds
+      DarwinTools
+    ];
 
-  outputs = [ "out" "static" ];
+  outputs = [
+    "out"
+    "static"
+  ];
 
   cmakeFlags = [
     # Percona-specific flags.
@@ -78,11 +142,39 @@ stdenv.mkDerivation (finalAttrs: {
     so=${stdenv.hostPlatform.extensions.sharedLibrary}
     ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so
 
-    wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]}
-    wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]}
-    wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
-    wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
-    wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
+    wrapProgram $out/bin/mysqld_safe --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        procps
+        gnugrep
+        gnused
+        hostname
+      ]
+    }
+    wrapProgram $out/bin/mysql_config --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnused
+      ]
+    }
+    wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnugrep
+      ]
+    }
+    wrapProgram $out/bin/ps-admin --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnugrep
+      ]
+    }
+    wrapProgram $out/bin/mysqld_multi --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gnugrep
+      ]
+    }
   '';
 
   passthru = {
@@ -98,8 +190,9 @@ stdenv.mkDerivation (finalAttrs: {
     description = ''
       A free, fully compatible, enhanced, open source drop-in replacement for
       MySQL® that provides superior performance, scalability and instrumentation.
+      Long-term support release.
     '';
-    license = licenses.gpl2Plus;
+    license = licenses.gpl2Only;
     maintainers = teams.flyingcircus.members;
     platforms = platforms.unix;
   };

pkgs/servers/sql/percona-server/8_4.nix

@@ -0,0 +1,221 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bison,
+  cmake,
+  pkg-config,
+  boost,
+  icu,
+  libedit,
+  libevent,
+  lz4,
+  ncurses,
+  openssl,
+  perl,
+  protobuf,
+  re2,
+  readline,
+  zlib,
+  zstd,
+  libfido2,
+  numactl,
+  cctools,
+  CoreServices,
+  developer_cmds,
+  libtirpc,
+  rpcsvc-proto,
+  curl,
+  DarwinTools,
+  nixosTests,
+  coreutils,
+  procps,
+  gnused,
+  gnugrep,
+  hostname,
+  makeWrapper,
+  systemd,
+  # Percona-specific deps
+  cyrus_sasl,
+  gnumake,
+  openldap,
+  # optional: different malloc implementations
+  withJemalloc ? false,
+  withTcmalloc ? false,
+  jemalloc,
+  gperftools,
+}:
+
+assert !(withJemalloc && withTcmalloc);
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "percona-server";
+  version = "8.4.0-1";
+
+  src = fetchurl {
+    url = "https://downloads.percona.com/downloads/Percona-Server-${lib.versions.majorMinor finalAttrs.version}/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
+    hash = "sha256-76PXXqTNBVsD7RX2vhp7RyESiFpJL0h0zG9ucNfy3uQ=";
+  };
+
+  nativeBuildInputs = [
+    bison
+    cmake
+    pkg-config
+    makeWrapper
+    # required for scripts/CMakeLists.txt
+    coreutils
+    gnugrep
+    procps
+  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
+
+  patches = [
+    ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
+  ];
+
+  ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
+  postPatch = ''
+    substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
+    substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
+    # The rocksdb setup script is called with `env -i` and cannot find anything in PATH.
+    patchShebangs storage/rocksdb/get_rocksdb_files.sh
+    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp
+    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE"
+    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --"
+  '';
+
+  buildInputs =
+    [
+      boost
+      (curl.override { inherit openssl; })
+      icu
+      libedit
+      libevent
+      lz4
+      ncurses
+      openssl
+      protobuf
+      re2
+      readline
+      zlib
+      zstd
+      libfido2
+      openldap
+      perl
+      cyrus_sasl
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      numactl
+      libtirpc
+      systemd
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      cctools
+      CoreServices
+      developer_cmds
+      DarwinTools
+    ]
+    ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc
+    ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools;
+
+  outputs = [
+    "out"
+    "static"
+  ];
+
+  cmakeFlags =
+    [
+      # Percona-specific flags.
+      "-DPORTABLE=1"
+      "-DWITH_LDAP=system"
+      "-DROCKSDB_DISABLE_AVX2=1"
+      "-DROCKSDB_DISABLE_MARCH_NATIVE=1"
+
+      # Flags taken from mysql package.
+      "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
+      "-DWITH_ROUTER=OFF" # It may be packaged separately.
+      "-DWITH_SYSTEM_LIBS=ON"
+      "-DWITH_UNIT_TESTS=OFF"
+      "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
+      "-DMYSQL_DATADIR=/var/lib/mysql"
+      "-DINSTALL_INFODIR=share/mysql/docs"
+      "-DINSTALL_MANDIR=share/man"
+      "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
+      "-DINSTALL_INCLUDEDIR=include/mysql"
+      "-DINSTALL_DOCREADMEDIR=share/mysql"
+      "-DINSTALL_SUPPORTFILESDIR=share/mysql"
+      "-DINSTALL_MYSQLSHAREDIR=share/mysql"
+      "-DINSTALL_MYSQLTESTDIR="
+      "-DINSTALL_DOCDIR=share/mysql/docs"
+      "-DINSTALL_SHAREDIR=share/mysql"
+
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      "-DWITH_SYSTEMD=1"
+      "-DWITH_SYSTEMD_DEBUG=1"
+    ]
+    ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1"
+    ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1";
+
+  postInstall =
+    ''
+      moveToOutput "lib/*.a" $static
+      so=${stdenv.hostPlatform.extensions.sharedLibrary}
+      ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so
+
+      wrapProgram $out/bin/mysqld_safe --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          procps
+          gnugrep
+          gnused
+          hostname
+        ]
+      }
+      wrapProgram $out/bin/mysql_config --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          gnused
+        ]
+      }
+      wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          gnugrep
+        ]
+      }
+      wrapProgram $out/bin/ps-admin --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          gnugrep
+        ]
+      }
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      wrapProgram $out/bin/mysqld_multi --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          gnugrep
+        ]
+      }
+    '';
+
+  passthru = {
+    client = finalAttrs.finalPackage;
+    connector-c = finalAttrs.finalPackage;
+    server = finalAttrs.finalPackage;
+    mysqlVersion = lib.versions.majorMinor finalAttrs.version;
+    tests = nixosTests.mysql.percona-server_innovation;
+  };
+
+  meta = with lib; {
+    homepage = "https://www.percona.com/software/mysql-database/percona-server";
+    description = ''
+      A free, fully compatible, enhanced, open source drop-in replacement for
+      MySQL® that provides superior performance, scalability and instrumentation.
+      Long-term support release.
+    '';
+    license = licenses.gpl2Only;
+    maintainers = teams.flyingcircus.members;
+    platforms = platforms.unix;
+  };
+})

pkgs/servers/sql/percona-server/default.nix

@@ -1,15 +1,18 @@
 pkgs: {
-  percona-server_lts = pkgs.callPackage ./lts.nix {
+  # old lts
+  percona-server_8_0 = pkgs.callPackage ./8_0.nix {
     inherit (pkgs.darwin) developer_cmds DarwinTools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
     boost = pkgs.boost177; # Configure checks for specific version.
     icu = pkgs.icu69;
+    # newer versions cause linking failures against `libabsl_spinlock_wait`
     protobuf = pkgs.protobuf_21;
   };
-  percona-server_innovation = pkgs.callPackage ./innovation.nix {
+  percona-server_8_4 = pkgs.callPackage ./8_4.nix {
     inherit (pkgs.darwin) developer_cmds DarwinTools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
     # newer versions cause linking failures against `libabsl_spinlock_wait`
     protobuf = pkgs.protobuf_21;
   };
+  percona-server = pkgs.percona-server_8_4;
 }

pkgs/servers/sql/percona-server/innovation.nix

@@ -1,123 +0,0 @@
-{ lib, stdenv, fetchurl, bison, cmake, pkg-config
-, boost, icu, libedit, libevent, lz4, ncurses, openssl, perl, protobuf, re2, readline, zlib, zstd, libfido2
-, numactl, cctools, CoreServices, developer_cmds, libtirpc, rpcsvc-proto, curl, DarwinTools, nixosTests
-, coreutils, procps, gnused, gnugrep, hostname, makeWrapper
-, systemd
-# Percona-specific deps
-, cyrus_sasl, gnumake, openldap
-# optional: different malloc implementations
-, withJemalloc ? false, withTcmalloc ? false, jemalloc, gperftools
-}:
-
-assert !(withJemalloc && withTcmalloc);
-
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "percona-server_innovation";
-  version = "8.3.0-1";
-
-  src = fetchurl {
-    url = "https://downloads.percona.com/downloads/percona-distribution-mysql-ps/percona-distribution-mysql-ps-${builtins.head (lib.strings.split "-" finalAttrs.version)}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
-    hash = "sha256-GeuifzqCkStmb4qYa8147XBHvMogYwfsn0FyHdO4WEg";
-  };
-
-  nativeBuildInputs = [
-    bison cmake pkg-config makeWrapper
-    # required for scripts/CMakeLists.txt
-    coreutils gnugrep procps
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
-
-  patches = [
-    ./no-force-outline-atomics.patch # Do not force compilers to turn on -moutline-atomics switch
-  ];
-
-  ## NOTE: MySQL upstream frequently twiddles the invocations of libtool. When updating, you might proactively grep for libtool references.
-  postPatch = ''
-    substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool
-    substituteInPlace cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool
-    # The rocksdb setup script is called with `env -i` and cannot find anything in PATH.
-    patchShebangs storage/rocksdb/get_rocksdb_files.sh
-    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace mktemp ${coreutils}/bin/mktemp
-    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "rm $MKFILE" "${coreutils}/bin/rm $MKFILE"
-    substituteInPlace storage/rocksdb/get_rocksdb_files.sh --replace "make --" "${gnumake}/bin/make --"
-  '';
-
-  buildInputs = [
-    boost (curl.override { inherit openssl; }) icu libedit libevent lz4 ncurses openssl protobuf re2 readline zlib
-    zstd libfido2 openldap perl cyrus_sasl
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    numactl libtirpc systemd
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools CoreServices developer_cmds DarwinTools
-  ]
-  ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) jemalloc
-  ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) gperftools;
-
-  outputs = [ "out" "static" ];
-
-  cmakeFlags = [
-    # Percona-specific flags.
-    "-DPORTABLE=1"
-    "-DWITH_LDAP=system"
-    "-DROCKSDB_DISABLE_AVX2=1"
-    "-DROCKSDB_DISABLE_MARCH_NATIVE=1"
-
-    # Flags taken from mysql package.
-    "-DFORCE_UNSUPPORTED_COMPILER=1" # To configure on Darwin.
-    "-DWITH_ROUTER=OFF" # It may be packaged separately.
-    "-DWITH_SYSTEM_LIBS=ON"
-    "-DWITH_UNIT_TESTS=OFF"
-    "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock"
-    "-DMYSQL_DATADIR=/var/lib/mysql"
-    "-DINSTALL_INFODIR=share/mysql/docs"
-    "-DINSTALL_MANDIR=share/man"
-    "-DINSTALL_PLUGINDIR=lib/mysql/plugin"
-    "-DINSTALL_INCLUDEDIR=include/mysql"
-    "-DINSTALL_DOCREADMEDIR=share/mysql"
-    "-DINSTALL_SUPPORTFILESDIR=share/mysql"
-    "-DINSTALL_MYSQLSHAREDIR=share/mysql"
-    "-DINSTALL_MYSQLTESTDIR="
-    "-DINSTALL_DOCDIR=share/mysql/docs"
-    "-DINSTALL_SHAREDIR=share/mysql"
-
-
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
-    "-DWITH_SYSTEMD=1"
-    "-DWITH_SYSTEMD_DEBUG=1"
-  ]
-  ++ lib.optional (stdenv.hostPlatform.isLinux && withJemalloc) "-DWITH_JEMALLOC=1"
-  ++ lib.optional (stdenv.hostPlatform.isLinux && withTcmalloc) "-DWITH_TCMALLOC=1";
-
-  postInstall = ''
-    moveToOutput "lib/*.a" $static
-    so=${stdenv.hostPlatform.extensions.sharedLibrary}
-    ln -s libmysqlclient$so $out/lib/libmysqlclient_r$so
-
-    wrapProgram $out/bin/mysqld_safe --prefix PATH : ${lib.makeBinPath [ coreutils procps gnugrep gnused hostname ]}
-    wrapProgram $out/bin/mysql_config --prefix PATH : ${lib.makeBinPath [ coreutils gnused ]}
-    wrapProgram $out/bin/ps_mysqld_helper --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
-    wrapProgram $out/bin/ps-admin --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
-  '' + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    wrapProgram $out/bin/mysqld_multi --prefix PATH : ${lib.makeBinPath [ coreutils gnugrep ]}
-  '';
-
-  passthru = {
-    client = finalAttrs.finalPackage;
-    connector-c = finalAttrs.finalPackage;
-    server = finalAttrs.finalPackage;
-    mysqlVersion = lib.versions.majorMinor finalAttrs.version;
-    tests = nixosTests.mysql.percona-server_innovation;
-  };
-
-
-  meta = with lib; {
-    homepage = "https://www.percona.com/software/mysql-database/percona-server";
-    description = ''
-      A free, fully compatible, enhanced, open source drop-in replacement for
-      MySQL® that provides superior performance, scalability and instrumentation.
-    '';
-    license = licenses.gpl2;
-    maintainers = teams.flyingcircus.members;
-    platforms = platforms.unix;
-  };
-})

pkgs/shells/nushell/plugins/net.nix

@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nu-plugin-net";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "fennewald";
     repo = "nu_plugin_net";
     rev = "refs/tags/${version}";
-    hash = "sha256-GOF2CSlsjI8PAmIxj/+mR01X5XMviEM8gj7ZYTbeX7I=";
+    hash = "sha256-nKcB919M9FkDloulh9IusWYPhf8vlhUmKVs6Gd6w3Bw=";
   };
 
-  cargoHash = "sha256-2FjKGirjTb6ZjDmhK9ciQzVtWCF8CcYeA+YXcr1oMP4=";
+  cargoHash = "sha256-3FMalpgKYZ4xM2fHXTFOVu5I8yS06K1bDiKg4we7jF4=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 

pkgs/tools/backup/percona-xtrabackup/8_0.nix

@@ -0,0 +1,20 @@
+{ callPackage, ... }@args:
+
+callPackage ./generic.nix (
+  args
+  // {
+    version = "8.0.35-31";
+    hash = "sha256-KHfgSi9bQlqsi5aDRBlSpdZgMfOrAwHK51k8KhQ9Udg=";
+
+    # includes https://github.com/Percona-Lab/libkmip.git
+    fetchSubmodules = true;
+
+    extraPatches = [
+      ./abi-check.patch
+    ];
+
+    extraPostInstall = ''
+      rm -r "$out"/docs
+    '';
+  }
+)

pkgs/tools/backup/percona-xtrabackup/8_4.nix

@@ -0,0 +1,18 @@
+{ callPackage, ... }@args:
+
+callPackage ./generic.nix (
+  args
+  // {
+    version = "8.4.0-1";
+    hash = "sha256-2tWRRYH0P0HZsWTxeuvDeVWvDwqjjdv6J7YiZwoTKtM=";
+
+    # includes https://github.com/Percona-Lab/libkmip.git
+    fetchSubmodules = true;
+
+    extraPatches =
+      [
+      ];
+
+    extraPostInstall = '''';
+  }
+)

pkgs/tools/backup/percona-xtrabackup/default.nix

@@ -1,6 +1,7 @@
 pkgs: {
-  percona-xtrabackup_lts = pkgs.callPackage ./lts.nix {
+  percona-xtrabackup_8_0 = pkgs.callPackage ./8_0.nix {
     boost = pkgs.boost177;
   };
-  percona-xtrabackup_innovation = pkgs.callPackage ./innovation.nix { };
+  percona-xtrabackup_8_4 = pkgs.callPackage ./8_4.nix { };
+  percona-xtrabackup = pkgs.percona-xtrabackup_8_4;
 }

pkgs/tools/backup/percona-xtrabackup/generic.nix

@@ -1,8 +1,36 @@
-{ lib, stdenv, fetchFromGitHub, bison, boost, cmake, makeWrapper, pkg-config
-, curl, cyrus_sasl, libaio, libedit, libev, libevent, libgcrypt, libgpg-error, lz4
-, ncurses, numactl, openssl, procps, protobuf, valgrind, xxd, zlib
-, perlPackages
-, version, hash, fetchSubmodules ? false, extraPatches ? [], extraPostInstall ? "", ...
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  bison,
+  boost,
+  cmake,
+  makeWrapper,
+  pkg-config,
+  curl,
+  cyrus_sasl,
+  libaio,
+  libedit,
+  libev,
+  libevent,
+  libgcrypt,
+  libgpg-error,
+  lz4,
+  ncurses,
+  numactl,
+  openssl,
+  procps,
+  protobuf,
+  valgrind,
+  xxd,
+  zlib,
+  perlPackages,
+  version,
+  hash,
+  fetchSubmodules ? false,
+  extraPatches ? [ ],
+  extraPostInstall ? "",
+  ...
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,12 +44,39 @@ stdenv.mkDerivation (finalAttrs: {
     inherit hash fetchSubmodules;
   };
 
-  nativeBuildInputs = [ bison boost cmake makeWrapper pkg-config ];
+  nativeBuildInputs = [
+    bison
+    boost
+    cmake
+    makeWrapper
+    pkg-config
+  ];
 
-  buildInputs = [
-    (curl.override { inherit openssl; }) cyrus_sasl libaio libedit libevent libev libgcrypt libgpg-error lz4
-    ncurses numactl openssl procps protobuf valgrind xxd zlib
-  ] ++ (with perlPackages; [ perl DBI DBDmysql ]);
+  buildInputs =
+    [
+      (curl.override { inherit openssl; })
+      cyrus_sasl
+      libaio
+      libedit
+      libevent
+      libev
+      libgcrypt
+      libgpg-error
+      lz4
+      ncurses
+      numactl
+      openssl
+      procps
+      protobuf
+      valgrind
+      xxd
+      zlib
+    ]
+    ++ (with perlPackages; [
+      perl
+      DBI
+      DBDmysql
+    ]);
 
   patches = extraPatches;
 
@@ -42,17 +97,19 @@ stdenv.mkDerivation (finalAttrs: {
     "-DWITH_MAN_PAGES=OFF"
   ];
 
-  postInstall = ''
-    wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB
-    rm -r "$out"/lib/plugin/debug
-  '' + extraPostInstall;
+  postInstall =
+    ''
+      wrapProgram "$out"/bin/xtrabackup --prefix PERL5LIB : $PERL5LIB
+      rm -r "$out"/lib/plugin/debug
+    ''
+    + extraPostInstall;
 
   passthru.mysqlVersion = lib.versions.majorMinor finalAttrs.version;
 
   meta = with lib; {
     description = "Non-blocking backup tool for MySQL";
     homepage = "http://www.percona.com/software/percona-xtrabackup";
-    license = licenses.lgpl2;
+    license = licenses.gpl2Only;
     platforms = platforms.linux;
     maintainers = teams.flyingcircus.members ++ [ maintainers.izorkin ];
   };

pkgs/tools/backup/percona-xtrabackup/innovation.nix

@@ -1,15 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  version = "8.3.0-1";
-  hash = "sha256-qZM2AFhpwrN0BR+DdozYn7s2I+c1tWpD5QvppTEfGEY=";
-
-  # includes https://github.com/Percona-Lab/libkmip.git
-  fetchSubmodules = true;
-
-  extraPatches = [
-  ];
-
-  extraPostInstall = ''
-  '';
-})

pkgs/tools/backup/percona-xtrabackup/lts.nix

@@ -1,17 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  version = "8.0.35-30";
-  hash = "sha256-yagqBKU057Gk5pEyT2R3c5DtxNG/+TSPenFgbxUiHPo=";
-
-  # includes https://github.com/Percona-Lab/libkmip.git
-  fetchSubmodules = true;
-
-  extraPatches = [
-    ./abi-check.patch
-  ];
-
-  extraPostInstall = ''
-    rm -r "$out"/docs
-  '';
-})

pkgs/tools/misc/fcp/default.nix

@@ -1,34 +0,0 @@
-{ expect, fetchFromGitHub, lib, rustPlatform, stdenv }:
-
-rustPlatform.buildRustPackage rec {
-  pname = "fcp";
-  version = "0.2.1";
-
-  src = fetchFromGitHub {
-    owner = "svetlitski";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x";
-  };
-
-  cargoHash = "sha256-iS3H87kTS7Iq0FhHE47zBOozPKC1mG9eHiATxp18hz8=";
-
-  nativeBuildInputs = [ expect ];
-
-  # character_device fails with "File name too long" on darwin
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
-  postPatch = ''
-    patchShebangs tests/*.exp
-  '';
-
-  meta = with lib; {
-    description = "Significantly faster alternative to the classic Unix cp(1) command";
-    homepage = "https://github.com/svetlitski/fcp";
-    changelog = "https://github.com/svetlitski/fcp/releases/tag/v${version}";
-    license = licenses.bsd3;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ figsoda ];
-    mainProgram = "fcp";
-  };
-}