Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -9176,6 +9176,12 @@
     githubId = 1498782;
     name = "Jesse Haber-Kucharsky";
   };
+  hakujin = {
+    email = "colin@hakuj.in";
+    github = "hakujin";
+    githubId = 2192042;
+    name = "Colin King";
+  };
   hamburger1984 = {
     email = "hamburger1984@gmail.com";
     github = "hamburger1984";

nixos/tests/all-tests.nix

@@ -416,7 +416,10 @@ in {
   flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {};
   flaresolverr = handleTest ./flaresolverr.nix {};
   flood = handleTest ./flood.nix {};
-  floorp = handleTest ./firefox.nix { firefoxPackage = pkgs.floorp; };
+  floorp = runTest {
+    imports = [ ./firefox.nix ] ;
+    _module.args.firefoxPackage = pkgs.floorp;
+  };
   fluentd = handleTest ./fluentd.nix {};
   fluidd = handleTest ./fluidd.nix {};
   fontconfig-default-fonts = handleTest ./fontconfig-default-fonts.nix {};
@@ -607,7 +610,10 @@ in {
   libresprite = handleTest ./libresprite.nix {};
   libreswan = runTest ./libreswan.nix;
   libreswan-nat = runTest ./libreswan-nat.nix;
-  librewolf = handleTest ./firefox.nix { firefoxPackage = pkgs.librewolf; };
+  librewolf = runTest {
+    imports = [ ./firefox.nix ];
+    _module.args.firefoxPackage = pkgs.librewolf;
+  };
   libuiohook = handleTest ./libuiohook.nix {};
   libvirtd = handleTest ./libvirtd.nix {};
   lidarr = handleTest ./lidarr.nix {};

pkgs/build-support/fetchgithub/default.nix

@@ -44,7 +44,10 @@ let
     else fetchzip;
   privateAttrs = lib.optionalAttrs private {
     netrcPhase =
-      let machineName = if githubBase == "github.com" then "api.github.com" else githubBase;
+      # When using private repos:
+      # - Fetching with git works using https://github.com but not with the GitHub API endpoint
+      # - Fetching a tarball from a private repo requires to use the GitHub API endpoint
+      let machineName = if githubBase == "github.com" && !useFetchGit then "api.github.com" else githubBase;
       in ''
         if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then
           echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2

pkgs/by-name/al/all-the-package-names/package.nix

@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2070";
+  version = "2.0.2095";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-yODB3vnQ3V0p+2tatYStrc5X1hA3nfm+mULhGEgIIPc=";
+    hash = "sha256-xlwCNpLNokV2XMzHfx6nuz7ac/2JtgxVpebIBLfYvdc=";
   };
 
-  npmDepsHash = "sha256-Ylqp5Zq04VyL4jYDkv4VLg2up2qFldHqleJaKQXKE/s=";
+  npmDepsHash = "sha256-8hkJjWgsrsPLpdd1GInLtx6GOY8/FqWgmpmUfmNLPV0=";
 
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/di/dirdiff/package.nix

@@ -8,13 +8,13 @@
   tk,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dirdiff";
   version = "2.1";
 
   src = fetchurl {
-    url = "mirror://samba/paulus/${pname}-${version}.tar.gz";
-    sha256 = "0lljd8av68j70733yshzzhxjr1lm0vgmbqsm8f02g03qsma3cdyb";
+    url = "mirror://samba/paulus/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    hash = "sha256-yzc2VNV4gCeAQ1XjVd8GlYYsO/wfaj/GAUcisxVqklI=";
   };
 
   nativeBuildInputs = [ copyDesktopItems ];
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
           --subst-var-by tcl ${tcl} \
           --subst-var-by tk ${tk}
     done
+
+    sed -i "1i #include <unistd.h>" filecmp.c
   '';
 
   env = {
@@ -61,7 +63,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Graphical directory tree diff and merge tool";
     mainProgram = "dirdiff";
     longDescription = ''
@@ -69,7 +71,7 @@ stdenv.mkDerivation rec {
       directory trees and for merging changes from one tree into another.
     '';
     homepage = "https://www.samba.org/ftp/paulus/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
   };
-}
+})

pkgs/by-name/fi/filebeat8/package.nix

@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "filebeat";
-  version = "8.17.2";
+  version = "8.17.3";
 
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "beats";
     tag = "v${version}";
-    hash = "sha256-Gk+F4OOe/n3SdiycKwJe4nPwfEKAVesKj5Fmvbe9Q5U=";
+    hash = "sha256-b0JDOA3yb/Pfcp9WQFvzE+k9DXDKg/hF4+iWGJ00doo=";
   };
 
   vendorHash = "sha256-p2Bm2MM85BFI/ePw+ZY90UgqeFKbozGvFvsjY6M82ts=";

pkgs/by-name/gi/gitkraken/package.nix

@@ -57,24 +57,24 @@
 
 let
   pname = "gitkraken";
-  version = "10.7.0";
+  version = "10.8.0";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchzip {
       url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-      hash = "sha256-fNx3mZnoMkEd1RlvcEmnncX0cLJhRjbf2t4CfB5eRl4=";
+      hash = "sha256-BsNrCnRqgUPSEgYTCLj4Rz8tG/iehgmDhfllG7UEBW8=";
     };
 
     x86_64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
-      hash = "sha256-FLNzB1MvW943DDBs5EmxOWx31CMm2KWXrXp6EjfkPeQ=";
+      hash = "sha256-YuRj9uR3BnFJHtZ4Y/RcQbI+4e5YPpadhnlNnoHC5oA=";
     };
 
     aarch64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
-      hash = "sha256-+uEpm9A9zkTMWL2XccWFTkuhFdZMJUZHSD3FinNsRyA=";
+      hash = "sha256-Xn+RLGafIVDRLtT7gHUlREax5CxPHWIpZOLFPNnm5cg=";
     };
   };
 

pkgs/by-name/la/last/package.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "last";
-  version = "1609";
+  version = "1611";
 
   src = fetchFromGitLab {
     owner = "mcfrith";
     repo = "last";
     rev = "refs/tags/${version}";
-    hash = "sha256-QSl2RvHilsD5Z65QC9Q6Flqx3gIXeoKyFOO5LWoV6MQ=";
+    hash = "sha256-m7JmNAFKI1mVzNtDeXKnDBxdFlcNZKBvxsq+KBuQWs4=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/no/node-gyp/package.nix

@@ -7,16 +7,16 @@
 
 (buildNpmPackage.override { inherit nodejs; }) rec {
   pname = "node-gyp";
-  version = "11.0.0";
+  version = "11.1.0";
 
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "node-gyp";
     tag = "v${version}";
-    hash = "sha256-uC75nDZPSDLsRIXyFs1hwhRMcECQB8iycNe9wtZjJ/E=";
+    hash = "sha256-KbV0lhBICx9oRWA8Gq/ex2cfeHbZSQq8JCjwCCIcrYk=";
   };
 
-  npmDepsHash = "sha256-RR6thRyl+tz0xQPwzTb03Zbt+IQTYZhnii3lrQXaZpI=";
+  npmDepsHash = "sha256-TQKSR0h/RH4/P+HENT+mwb0AFWkBo7SUh51yfCq/jVk=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json

pkgs/by-name/op/open-webui/package.nix

@@ -163,6 +163,7 @@ python312.pkgs.buildPythonApplication rec {
       requests
       restrictedpython
       sentence-transformers
+      sentencepiece
       soundfile
       tiktoken
       transformers

pkgs/by-name/sh/shen-sbcl/package.nix

@@ -1,43 +1,44 @@
 {
   lib,
-  stdenv,
-  fetchurl,
-  shen-sources,
+  stdenvNoCC,
+  fetchzip,
   sbcl,
 }:
-
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "shen-sbcl";
-  version = "3.0.3";
+  version = "39.1";
 
-  src = fetchurl {
-    url = "https://github.com/Shen-Language/shen-cl/releases/download/v${version}/shen-cl-v${version}-sources.tar.gz";
-    sha256 = "0mc10jlrxqi337m6ngwbr547zi4qgk69g1flz5dsddjy5x41j0yz";
+  src = fetchzip {
+    url = "https://www.shenlanguage.org/Download/S${finalAttrs.version}.zip";
+    hash = "sha256-reN9avgYGYCMiA5BeHLhRK51liKF2ctqIgxf+4IWjVY=";
   };
 
   nativeBuildInputs = [ sbcl ];
+  dontStrip = true; # necessary to prevent runtime errors with sbcl
 
-  preBuild = ''
-    ln -s ${shen-sources} kernel
+  buildPhase = ''
+    runHook preBuild
+
+    sbcl --noinform --no-sysinit --no-userinit --load install.lsp
+
+    runHook postBuild
   '';
 
-  buildFlags = [ "build-sbcl" ];
-
-  checkTarget = "test-sbcl";
-
-  doCheck = true;
-
   installPhase = ''
-    install -m755 -D bin/sbcl/shen $out/bin/shen-sbcl
+    runHook preInstall
+
+    install -Dm755 sbcl-shen.exe $out/bin/shen-sbcl
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://shenlanguage.org";
     description = "Port of Shen running on Steel Bank Common Lisp";
-    changelog = "https://github.com/Shen-Language/shen-cl/raw/v${version}/CHANGELOG.md";
+    changelog = "https://shenlanguage.org/download.html#kernel";
     platforms = sbcl.meta.platforms;
-    maintainers = with maintainers; [ bsima ];
-    broken = true;
-    license = licenses.bsd3;
+    maintainers = with lib.maintainers; [ hakujin ];
+    license = lib.licenses.bsd3;
+    mainProgram = "shen-sbcl";
   };
-}
+})

pkgs/by-name/sh/shen-sources/package.nix

@@ -1,31 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "shen-sources";
-  version = "22.4";
-
-  src = fetchurl {
-    url = "https://github.com/Shen-Language/shen-sources/releases/download/shen-${version}/ShenOSKernel-${version}.tar.gz";
-    sha256 = "1wlyh4rbzr615iykq1s779jvq28812rb4dascx1kzpakhw8z0260";
-  };
-
-  dontBuild = true;
-
-  installPhase = ''
-    mkdir -p $out
-    cp . $out -R
-  '';
-
-  meta = with lib; {
-    homepage = "https://shenlanguage.org";
-    description = "Source code for the Shen Language";
-    changelog = "https://github.com/Shen-Language/shen-sources/raw/shen-${version}/CHANGELOG.md";
-    platforms = platforms.all;
-    maintainers = with maintainers; [ bsima ];
-    license = licenses.bsd3;
-  };
-}

pkgs/by-name/so/solana-cli/crossbeam-epoch.patch

@@ -0,0 +1,53 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 0194c34ed2..0d58655f70 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1419,14 +1419,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "crossbeam-epoch"
+-version = "0.9.5"
+-source = "git+https://github.com/anza-xyz/crossbeam?rev=fd279d707025f0e60951e429bf778b4813d1b6bf#fd279d707025f0e60951e429bf778b4813d1b6bf"
++version = "0.9.16"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2d2fe95351b870527a5d09bf563ed3c97c0cffb87cf1c78a591bf48bb218d9aa"
+ dependencies = [
++ "autocfg",
+  "cfg-if 1.0.0",
+  "crossbeam-utils",
+- "lazy_static",
+- "memoffset 0.6.4",
+- "scopeguard",
++ "memoffset 0.9.0",
+ ]
+ 
+ [[package]]
+@@ -3118,15 +3118,6 @@ dependencies = [
+  "libc",
+ ]
+ 
+-[[package]]
+-name = "memoffset"
+-version = "0.6.4"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9"
+-dependencies = [
+- "autocfg",
+-]
+-
+ [[package]]
+ name = "memoffset"
+ version = "0.7.1"
+diff --git a/Cargo.toml b/Cargo.toml
+index 2ff2094d67..a3ace4459a 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -435,7 +435,7 @@ zstd = "0.11.2"
+ 
+ [patch.crates-io]
+ # for details, see https://github.com/anza-xyz/crossbeam/commit/fd279d707025f0e60951e429bf778b4813d1b6bf
+-crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }
++# crossbeam-epoch = { git = "https://github.com/anza-xyz/crossbeam", rev = "fd279d707025f0e60951e429bf778b4813d1b6bf" }
+ 
+ # We include the following crates as our dependencies above from crates.io:
+ #

pkgs/by-name/so/solana-cli/package.nix

@@ -12,6 +12,7 @@
   pkg-config,
   openssl,
   nix-update-script,
+  versionCheckHook,
   # Taken from https://github.com/solana-labs/solana/blob/master/scripts/cargo-install-all.sh#L84
   solanaPkgs ?
     [
@@ -57,20 +58,24 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "solana-labs";
     repo = "solana";
-    rev = "v${version}";
+    tag = "v${version}";
     inherit hash;
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
+  # The `crossbeam-epoch@0.9.5` crate used by the solana crates is their own fork,
+  # which exists due to performance-related reasons.
+  # The `solana-cli` build fails because this forked `crossbeam-epoch` crate contains a
+  # symlink that points outside of the crate into the root of the repository.
+  # This characteristic already existed in upstream `crossbeam-epoch@0.9.5`.
+  #
+  # As `buildRustPackage` vendors the dependencies of the `solana-cli` during the `buildPhase`,
+  # which occurs after the `patchPhase`, this `crossbeam-epoch` is not patchable in this build.
+  # The remaining solution is to make use of `cargoPatches` to remove the fork and bump to `crossbeam-epoch@0.9.16`,
+  # which is the first version that removed the `build.rs`.
+  cargoPatches = [ ./crossbeam-epoch.patch ];
 
-    outputHashes = {
-      "crossbeam-epoch-0.9.5" = "sha256-Jf0RarsgJiXiZ+ddy0vp4jQ59J9m0k3sgXhWhCdhgws=";
-      "tokio-1.29.1" = "sha256-Z/kewMCqkPVTXdoBcSaFKG5GSQAdkdpj3mAzLLCjjGk=";
-      "aes-gcm-siv-0.10.3" = "sha256-N1ppxvew4B50JQWsC3xzP0X4jgyXZ5aOQ0oJMmArjW8=";
-      "curve25519-dalek-3.2.1" = "sha256-FuVNFuGCyHXqKqg+sn3hocZf1KMCI092Ohk7cvLPNjQ=";
-    };
-  };
+  cargoHash = "sha256-adzcLrOiUUYhz57gme/hEmD4E3kVcKCp0/jSoavZfjw=";
+  useFetchCargoVendor = true;
 
   strictDeps = true;
   cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs;
@@ -102,6 +107,12 @@ rustPlatform.buildRustPackage rec {
       Libsystem
     ];
 
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/solana";
+  versionCheckProgramArg = "--version";
+
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd solana \
       --bash <($out/bin/solana completion --shell bash) \

pkgs/by-name/ta/talosctl/package.nix

@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "talosctl";
-  version = "1.9.4";
+  version = "1.9.5";
 
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "talos";
     tag = "v${version}";
-    hash = "sha256-gD9fIBILqSFExTIziNx6Hy6TpsBC90yHSfSDB9fhKwA=";
+    hash = "sha256-2YKZfW62yOA8uV3bn6at/9YV3OHjiMuqA1SUupyAAx4=";
   };
 
-  vendorHash = "sha256-ECTR1U2RlatLK3c3UP/aHzYMkN6WxPsHuwoXUzIYsAA=";
+  vendorHash = "sha256-f2hOAF746nMAZe1KEopdpFHfRMEZQdy4VoVUi49CBJo=";
 
   ldflags = [
     "-s"

pkgs/by-name/wi/windmill/package.nix

@@ -8,7 +8,6 @@
   cmake,
   cairo,
   deno,
-  fetchurl,
   go,
   lld,
   makeWrapper,
@@ -16,16 +15,13 @@
   openssl,
   pango,
   pixman,
-  giflib,
   pkg-config,
   python3,
   rustfmt,
   stdenv,
-  swagger-cli,
   perl,
   _experimental-update-script-combinators,
   nix-update-script,
-  writeScript,
   librusty_v8 ? (
     callPackage ./librusty_v8.nix {
       inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8;
@@ -67,15 +63,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     RUSTY_V8_ARCHIVE = librusty_v8;
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "php-parser-rs-0.1.3" = "sha256-ZeI3KgUPmtjlRfq6eAYveqt8Ay35gwj6B9iOQRjQa9A=";
-      "postgres-native-tls-0.5.0" = "sha256-hhvZkdc2KnU6IkgeTHY4M2dp9//NL8DQjOIcAh3sSRM=";
-      "progenitor-0.3.0" = "sha256-F6XRZFVIN6/HfcM8yI/PyNke45FL7jbcznIiqj22eIQ=";
-      "tinyvector-0.1.0" = "sha256-NYGhofU4rh+2IAM+zwe04YQdXY8Aa4gTmn2V2HtzRfI=";
-    };
-  };
+  cargoHash = "sha256-6htM6p09mPUQmS+QVBDO7Y/tuwweHgA+W/E3XTNunB8=";
+  useFetchCargoVendor = true;
 
   buildFeatures =
     [

pkgs/by-name/wo/wofi-emoji/package.nix

@@ -11,22 +11,23 @@
 
 let
   emojiJSON = fetchurl {
-    url = "https://raw.githubusercontent.com/muan/emojilib/v3.0.11/dist/emoji-en-US.json";
-    hash = "sha256-WHqCSNgDzc6ZASdVrwPvsU4MtBcYLKDp2D2Hykrq1sI=";
+    url = "https://raw.githubusercontent.com/muan/emojilib/v4.0.0/dist/emoji-en-US.json";
+    hash = "sha256-IoU9ZPCqvSPX4DmfC+r5MiglhFc41XMRrbJRL9ZNrvs=";
   };
 in
 stdenv.mkDerivation rec {
   pname = "wofi-emoji";
-  version = "1.0.0";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "Zeioth";
     repo = "wofi-emoji";
-    rev = "v${version}";
-    hash = "sha256-wLZK7RcDxxlYuu27WNj+SoRoBiCqk9whp4Fyg0SOoPA=";
+    tag = "v${version}";
+    hash = "sha256-NHiAAPRbIz0sC5yh9DTDmIU3zDBFIlUsbpW4HAPr5C8=";
   };
 
   nativeBuildInputs = [ jq ];
+
   buildInputs = [
     wofi
     wtype
@@ -35,11 +36,11 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace build.sh \
-      --replace 'curl ${emojiJSON.url}' 'cat ${emojiJSON}'
+      --replace-fail 'curl ${emojiJSON.url}' 'cat ${emojiJSON}'
     substituteInPlace wofi-emoji \
-      --replace 'wofi' '${wofi}/bin/wofi' \
-      --replace 'wtype' '${wtype}/bin/wtype' \
-      --replace 'wl-copy' '${wl-clipboard}/bin/wl-copy'
+      --replace-fail 'wofi' '${wofi}/bin/wofi' \
+      --replace-fail 'wtype' '${wtype}/bin/wtype' \
+      --replace-fail 'wl-copy' '${wl-clipboard}/bin/wl-copy'
   '';
 
   buildPhase = ''

pkgs/by-name/ze/zed-editor/package.nix

@@ -98,7 +98,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.176.3";
+  version = "0.177.7";
 
   outputs =
     [ "out" ]
@@ -110,7 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5bn70R5phHZmAf/71IK8o2laHcCo92cCiaKQ7xo0Uag=";
+    hash = "sha256-STMDbUMsQAPJCDJMFFpb18fBtzOjxvhvsqx94MpCTac=";
   };
 
   patches = [
@@ -136,7 +136,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   '';
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-IaAY1u5xLomvUtb4FjE4uE0w01rMmyR/DH0QD9cOK5Y=";
+  cargoHash = "sha256-NbjoaHZpqjWz6AnuE9EXAMuyeXldlm4QB765fp6QVlI=";
 
   nativeBuildInputs =
     [

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

@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "acquire";
-  version = "3.17";
+  version = "3.18";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "acquire";
     tag = version;
-    hash = "sha256-Ii19VnLLq+UGH0bkyUbLzHqZpJOXffIGeP4VZ9QG7D0=";
+    hash = "sha256-kDoDPeMvpctNnB+e2LnCZ7fw9AP+AjPYDXwVqKedJ88=";
   };
 
   build-system = [
@@ -55,8 +55,9 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full;
 
   disabledTests = [
-    "test_collector_collect_path_with_dir"
+    "output_encrypt"
     "test_collector_collect_glob"
+    "test_collector_collect_path_with_dir"
     "test_misc_osx"
     "test_misc_unix"
   ];

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

@@ -36,7 +36,7 @@
 
 buildPythonPackage rec {
   pname = "dissect";
-  version = "3.17.1";
+  version = "3.18";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -45,7 +45,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect";
     tag = version;
-    hash = "sha256-sD3NeZxc6VKo/tn16YVWZYk3hlOVtSf/xtzEuhXW5vs=";
+    hash = "sha256-3yy7BA6FJgAdn2lMSJgyFeVDxJg0f0RWsekkqiqxd7M=";
   };
 
   pythonRelaxDeps = true;

pkgs/development/python-modules/localstack-ext/default.nix

@@ -21,13 +21,13 @@
 
 buildPythonPackage rec {
   pname = "localstack-ext";
-  version = "4.1.1";
+  version = "4.2.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "localstack_ext";
     inherit version;
-    hash = "sha256-Fgblk8eL5JnF4yLeH73yGuOeH9anSu1o9H1UxcjTyco=";
+    hash = "sha256-PEsIes+CdYIhSPEy2J1u+kfzNIzbgQnKfwxw2oAmFYA=";
   };
 
   build-system = [

pkgs/development/python-modules/sentence-transformers/default.nix

@@ -2,14 +2,17 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonOlder,
 
   # build-system
   setuptools,
 
   # dependencies
+  accelerate,
+  datasets,
   huggingface-hub,
-  nltk,
-  numpy,
+  optimum,
+  pillow,
   scikit-learn,
   scipy,
   sentencepiece,
@@ -19,8 +22,6 @@
   transformers,
 
   # tests
-  accelerate,
-  datasets,
   pytestCheckHook,
   pytest-cov-stub,
 }:
@@ -30,6 +31,8 @@ buildPythonPackage rec {
   version = "3.4.1";
   pyproject = true;
 
+  disabled = pythonOlder "3.9";
+
   src = fetchFromGitHub {
     owner = "UKPLab";
     repo = "sentence-transformers";
@@ -41,23 +44,28 @@ buildPythonPackage rec {
 
   dependencies = [
     huggingface-hub
-    nltk
-    numpy
+    pillow
     scikit-learn
     scipy
-    sentencepiece
-    tokenizers
     torch
     tqdm
     transformers
   ];
 
+  optional-dependencies = {
+    train = [
+      accelerate
+      datasets
+    ];
+    onnx = [ optimum ] ++ optimum.optional-dependencies.onnxruntime;
+    # onnx-gpu = [ optimum ] ++ optimum.optional-dependencies.onnxruntime-gpu;
+    # openvino = [ optimum-intel ] ++ optimum-intel.optional-dependencies.openvino;
+  };
+
   nativeCheckInputs = [
-    accelerate
-    datasets
-    pytestCheckHook
     pytest-cov-stub
-  ];
+    pytestCheckHook
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "sentence_transformers" ];
 

pkgs/development/tools/worker-build/default.nix

@@ -1,44 +1,37 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
   rustPlatform,
-  Security,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "worker-build";
-  version = "0.0.18";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "workers-rs";
-    rev = "v${version}";
-    hash = "sha256-z6m14IbMzgycwnQpA28e4taokDSVpfZOKIRmFIwLjbg=";
+    tag = "v${version}";
+    hash = "sha256-eMuuEqHBiwgz7DKimYuK9MUPT4vnOU8rLOIIq8zsTao=";
   };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "postgres-protocol-0.6.5" = "sha256-xLyaappu7ebtKOoHY49dvjDEcuRg8IOv1bNH9RxSUcM=";
-    };
-  };
+  useFetchCargoVendor = true;
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
+  cargoHash = "sha256-yzuyenWAdj5tEdUFGxSfBU4m3w1YCCrnbajPMYMGSkI=";
 
   buildAndTestSubdir = "worker-build";
 
   # missing some module upstream to run the tests
   doCheck = false;
 
-  meta = with lib; {
-    description = "This is a tool to be used as a custom build command for a Cloudflare Workers `workers-rs` project";
+  meta = {
+    description = "Tool to be used as a custom build command for a Cloudflare Workers `workers-rs` project";
     mainProgram = "worker-build";
     homepage = "https://github.com/cloudflare/workers-rs";
-    license = with licenses; [
+    license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ happysalada ];
+    maintainers = with lib.maintainers; [ happysalada ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -3149,9 +3149,7 @@ with pkgs;
 
   vorta = qt6Packages.callPackage ../applications/backup/vorta { };
 
-  worker-build = callPackage ../development/tools/worker-build {
-    inherit (darwin.apple_sdk.frameworks) Security;
-  };
+  worker-build = callPackage ../development/tools/worker-build { };
 
   wrangler_1 = callPackage ../development/tools/wrangler_1 {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Security;