diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2b5db0ef9971..4bd55f52ac09 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13045,6 +13045,13 @@ name = "João Moreira"; keys = [ { fingerprint = "F457 0A3A 5F89 22F8 F572 E075 EF8B F2C8 C5F4 097D"; } ]; }; + joaosreis = { + email = "joaosreis@outlook.pt"; + github = "joaosreis"; + githubId = 3420596; + name = "João Santos Reis"; + keys = [ { fingerprint = "9BEB F137 4CAC 96D6 A4ED EC49 BA2E 05BD B7F8 C0EE"; } ]; + }; joaquintrinanes = { email = "hi@joaquint.io"; github = "JoaquinTrinanes"; diff --git a/nixos/modules/config/xdg/autostart.nix b/nixos/modules/config/xdg/autostart.nix index 8310c377d43b..46c90ae1793a 100644 --- a/nixos/modules/config/xdg/autostart.nix +++ b/nixos/modules/config/xdg/autostart.nix @@ -4,21 +4,33 @@ teams = [ lib.teams.freedesktop ]; }; - options = { - xdg.autostart.enable = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Whether to install files to support the - [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest). - ''; - }; + options.xdg.autostart = { + enable = + lib.mkEnableOption "auto-starting of desktop applications according to the [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest)." + // lib.mkOption { + default = true; + }; + install = + lib.mkEnableOption '' + install desktop files following the [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest) into `/etc/xdg/autostart/`. + + These are handled by your desktop environment or [`systemd-xdg-autostart-generator`](https://www.freedesktop.org/software/systemd/man/latest/systemd-xdg-autostart-generator.html). + '' + // lib.mkOption { + default = true; + }; }; - config = lib.mkIf config.xdg.autostart.enable { - environment.pathsToLink = [ + config = { + # FIXME this does not actually work because "/etc/xdg" is linked + # unconditionally in `nixos/modules/config/system-path.nix` + environment.pathsToLink = lib.mkIf config.xdg.autostart.install [ "/etc/xdg/autostart" ]; - }; + # On by default + systemd.user.generators.systemd-xdg-autostart-generator = lib.mkIf (!config.xdg.autostart.enable) ( + lib.mkDefault "/dev/null" + ); + }; } diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index f38a67291e33..e1536e274d85 100644 --- a/pkgs/applications/emulators/libretro/cores/flycast.nix +++ b/pkgs/applications/emulators/libretro/cores/flycast.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "flycast"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "751295151eed3cae619b14bcee49bb07f4fdb59c"; - hash = "sha256-PwmJspKYWS7WUAK7XRr2FYiAMnc03xp8qH23EZUC6Hs="; + rev = "c0f2cf4319d6c77d577599906ca0a90627a3afc8"; + hash = "sha256-ie0mP7IcvWsFX/k0UhJ6eMkdyDq69W8aCcjwkAoL5II="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 206c308504c0..3745a3cb02a3 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -153,14 +153,13 @@ let stageModules = writeShellScript "discord-stage-modules" '' store_modules="$1" modules_dir="''${XDG_CONFIG_HOME:-$HOME/.config}/${lib.toLower binaryName}/${version}/modules" - if [ ! -f "$modules_dir/installed.json" ]; then - mkdir -p "$modules_dir" - for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do - ln -sfn "$store_modules/$m" "$modules_dir/$m" - done - echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \ - > "$modules_dir/installed.json" - fi + rm -rf "$modules_dir" + mkdir -p "$modules_dir" + for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do + ln -sn "$store_modules/$m" "$modules_dir/$m" + done + echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \ + > "$modules_dir/installed.json" ''; disableBreakingUpdates = @@ -261,6 +260,7 @@ stdenv.mkDerivation (finalAttrs: { ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName}:${addDriverRunpath.driverLink}/lib \ + --suffix VK_ADD_DRIVER_FILES : "${addDriverRunpath.driverLink}/share/vulkan/icd.d" \ ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \ --run "${stageModules} $out/opt/${binaryName}/modules" \ --add-flags ${lib.escapeShellArg commandLineArgs} diff --git a/pkgs/by-name/al/allmytoes/package.nix b/pkgs/by-name/al/allmytoes/package.nix new file mode 100644 index 000000000000..afe3ce8bfc12 --- /dev/null +++ b/pkgs/by-name/al/allmytoes/package.nix @@ -0,0 +1,31 @@ +{ + lib, + nix-update-script, + rustPlatform, + fetchFromGitLab, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "allmytoes"; + version = "0.5.1"; + + src = fetchFromGitLab { + owner = "allmytoes"; + repo = "allmytoes"; + tag = finalAttrs.version; + hash = "sha256-BYKcDJN/uKESj0pnb2xvrx1lO6rOGdi+PVT6ywZqjbQ="; + }; + + cargoHash = "sha256-Pzbruv1E4mMohw//lf1JBoK+4BHDJVr4/9xXE4FrWbA=="; + + passthru.updateScript = nix-update-script { }; + + __structuredAttrs = true; + + meta = { + description = "Provides thumbnails by using the freedesktop-specified thumbnail database (aka XDG standard)"; + homepage = "https://gitlab.com/allmytoes/allmytoes"; + mainProgram = "allmytoes"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luminarleaf ]; + }; +}) diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index fdd5cbab063c..5083ba23fcfe 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -10,14 +10,14 @@ buildGo126Module (finalAttrs: { pname = "athens"; - version = "0.17.1"; + version = "0.18.0"; src = applyPatches { src = fetchFromGitHub { owner = "gomods"; repo = "athens"; tag = "v${finalAttrs.version}"; - hash = "sha256-hNk0hW7R7HdE4Wt1KuKSIUarRGKbtbFqQbfls1HXTqI="; + hash = "sha256-sFNxAG0hIxsoKCuef/ROy2MOjA7iC5ehXRvnUr20U0Y="; }; # Trim the patch version, not needed anyway. postPatch = '' @@ -25,7 +25,7 @@ buildGo126Module (finalAttrs: { ''; }; - vendorHash = "sha256-he7GNkCfqLgOXuCTahvqOnwW5TpbYjlCMfMGfKGwYZ4="; + vendorHash = "sha256-nTkrma32+JR+5a5u/XM+EFh9o7YwKMvZJ9cz4evo7Ec="; env.CGO_ENABLED = "0"; ldflags = [ diff --git a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix index ad9e4a9c5483..3660cf09f7d2 100644 --- a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix +++ b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix @@ -44,6 +44,6 @@ stdenv.mkDerivation { platforms ; - broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.1"); + broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.2"); }; } diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index 3d96d8ca157b..705e7035c600 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,16 +11,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "1.0.8"; + version = "1.0.10"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-LB2G5g5Bj+kFmrY/kgQEGsXmrmrGQbH7pdshr8lfank="; - aarch64-linux = "sha256-XYjHiB9JDkfoKS1uzzvJ0o79+YipABedY56JnmCyInE="; - x86_64-darwin = "sha256-avzB7gUiVPKuRha+Ls7huNfrPtDKmyFPc6gFfuWOBPw="; - aarch64-darwin = "sha256-frldCUG6aGfXDoPzvG8QYMTL4SxTEd2hPLy0+7YWtIE="; + x86_64-linux = "sha256-XFhJNf6DFIgGgfuBCNSCtT4S1tO0UecFO0uuEbkPYFM="; + aarch64-linux = "sha256-OoG3Se2iTekIuC1Igq99zVLrVPDK71wcrF3qIsVHz58="; + x86_64-darwin = "sha256-kuXBcIFxItfd1Wyq79l4O++/n8MvqKFOl/FD3uc37QY="; + aarch64-darwin = "sha256-nLjSBuqaZJy5vTnpNBEi4fxe+3hmmBL3Bq51ceJ7wxQ="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/by-name/co/colmap/package.nix b/pkgs/by-name/co/colmap/package.nix index 35b258738c98..fdee6db0126a 100644 --- a/pkgs/by-name/co/colmap/package.nix +++ b/pkgs/by-name/co/colmap/package.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, - fetchpatch, fetchurl, + fetchpatch, nix-update-script, cmake, boost, @@ -62,14 +62,12 @@ let onnxruntime ] ++ lib.optionals cudaSupport [ - cudatoolkit - (lib.getOutput "static" cudaPackages.cuda_cudart) + cudaPackages.cuda_cudart # CUDA::cudart, used by COLMAP and faiss + cudaPackages.libcublas # CUDA::cublas, propagated by faiss' exported targets + cudaPackages.libcurand # CUDA::curand, used by COLMAP ] ++ lib.optional stdenv'.cc.isClang llvmPackages.openmp; - # TODO: migrate to redist packages - inherit (cudaPackages) cudatoolkit; - # COLMAP needs these model files to run the ONNX tests # Based on: https://github.com/colmap/colmap/blob/79efc74b2b614935a3c69b1f983f2bad23a836a1/src/colmap/feature/resources.h#L36 modelsForTesting = [ @@ -100,16 +98,41 @@ let } ]; in -stdenv'.mkDerivation rec { +stdenv'.mkDerivation (finalAttrs: { version = "4.0.4"; pname = "colmap"; src = fetchFromGitHub { owner = "colmap"; repo = "colmap"; - tag = version; + tag = finalAttrs.version; hash = "sha256-n9YwEqMSIh6vM2MVf7qxxVvDpsTLEsT37xoHiX66bL0="; }; + __structuredAttrs = true; + strictDeps = true; + + patches = + lib.optionals stdenv'.hostPlatform.isAarch64 [ + # Set SANITIZE_PR for PoissonRecon to fix data races on aarch64 + # https://github.com/colmap/colmap/pull/4429 + (fetchpatch { + url = "https://github.com/colmap/colmap/commit/e13294e43baae6cf7f4e3ec05a19060e0b230a72.patch"; + hash = "sha256-hoIjWdrOlXeT78X+g3YCDWaWnmQMzHVQNkdpx5vXpGk="; + }) + (fetchpatch { + url = "https://github.com/colmap/colmap/commit/6c5c59f96f9e819bcc57267ef48b193d77707fe0.patch"; + hash = "sha256-2dAhy3sgxF2SXPAYE/EV1hd61dm05vJ5JJXEjQxEKWM="; + }) + ] + ++ lib.optionals (stdenv'.hostPlatform.isLinux && stdenv'.hostPlatform.isAarch64) [ + # Fix determinism check in rotation_averaging_test + # https://github.com/colmap/colmap/pull/4426 + (fetchpatch { + url = "https://github.com/colmap/colmap/commit/d38b65b9312c66e841739989f4a38924d8cb5ec5.patch"; + hash = "sha256-dbs+TNfa4o5L79+krPpF4VmP8PhFHtzYZehYZbsnx5s="; + }) + ]; + cmakeFlags = [ (lib.cmakeBool "DOWNLOAD_ENABLED" true) # We want COLMAP to be able to fetch models like LightGlue. (lib.cmakeBool "UNINSTALL_ENABLED" false) @@ -117,8 +140,8 @@ stdenv'.mkDerivation rec { (lib.cmakeBool "FETCH_FAISS" false) (lib.cmakeBool "FETCH_ONNX" false) (lib.cmakeBool "TESTS_ENABLED" enableTests) - (lib.cmakeFeature "CHOLMOD_INCLUDE_DIR_HINTS" "${suitesparse.dev}/include") - (lib.cmakeFeature "CHOLMOD_LIBRARY_DIR_HINTS" "${suitesparse}/lib") + (lib.cmakeFeature "CHOLMOD_INCLUDE_DIR_HINTS" "${lib.getDev suitesparse}/include") + (lib.cmakeFeature "CHOLMOD_LIBRARY_DIR_HINTS" "${lib.getLib suitesparse}/lib") ] ++ lib.optionals cudaSupport [ (lib.cmakeBool "CUDA_ENABLED" cudaSupport) @@ -135,6 +158,7 @@ stdenv'.mkDerivation rec { glog libGLU glew + gtest qt5.qtbase flann lz4 @@ -153,21 +177,43 @@ stdenv'.mkDerivation rec { ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath + cudaPackages.cuda_nvcc ]; doCheck = enableTests; - preCheck = lib.optionalString enableTests '' - export GTEST_FILTER='-*Gpu*:*GPU*:*OpenGL*' # Disable any test involving OpenGL or GPU, these won't work in the sandbox. - export HOME=$PWD + preCheck = lib.optionalString enableTests ( + let + disabledTestPatterns = [ + # Disable any test involving OpenGL or GPU, these won't work in the sandbox. + "*Gpu*" + "*GPU*" + "*OpenGL*" + ] + ++ lib.optionals stdenv'.hostPlatform.isDarwin [ + # reconstruction_pruning_test.cc:65: Failure + # Expected: (redundant_point3D_ids.size()) > (prev_num_redundant_points3D), actual: 0 vs 0 + "FindRedundantPoints3D.VaryingCoverageGain" + ]; + in + '' + export GTEST_FILTER='-${lib.concatStringsSep ":" disabledTestPatterns}' + '' + + '' + export HOME=$PWD + '' # Pre-fetch the ONNX models into COLMAP's cache dir so we can run their tests. - mkdir -p .cache/colmap - ${lib.concatMapStringsSep "\n" (model: '' - ln -s ${fetchurl model} .cache/colmap/${model.sha256}-${model.name} - '') modelsForTesting} - ''; + + '' + mkdir -p .cache/colmap + ${lib.concatMapStringsSep "\n" (model: '' + ln -s ${fetchurl model} .cache/colmap/${model.sha256}-${model.name} + '') modelsForTesting} + '' + ); - passthru.depsAlsoForPycolmap = depsAlsoForPycolmap; - passthru.updateScript = nix-update-script { }; + passthru = { + depsAlsoForPycolmap = depsAlsoForPycolmap; + updateScript = nix-update-script { }; + }; meta = { description = "Structure-From-Motion and Multi-View Stereo pipeline"; @@ -177,6 +223,8 @@ stdenv'.mkDerivation rec { ''; mainProgram = "colmap"; homepage = "https://colmap.github.io/index.html"; + downloadPage = "https://github.com/colmap/colmap"; + changelog = "https://github.com/colmap/colmap/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.bsd3; platforms = if cudaSupport then lib.platforms.linux else lib.platforms.unix; maintainers = with lib.maintainers; [ @@ -185,4 +233,4 @@ stdenv'.mkDerivation rec { chpatrick ]; }; -} +}) diff --git a/pkgs/by-name/co/cosign/package.nix b/pkgs/by-name/co/cosign/package.nix index 92a57b76eb3f..3f8b82bf9771 100644 --- a/pkgs/by-name/co/cosign/package.nix +++ b/pkgs/by-name/co/cosign/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "cosign"; - version = "3.0.6"; + version = "3.1.1"; src = fetchFromGitHub { owner = "sigstore"; repo = "cosign"; rev = "v${finalAttrs.version}"; - hash = "sha256-Flvi+dVb9RcaS5f1X8A8kevfzNbiSyglEYfJfievVfM="; + hash = "sha256-DOsGLU6W0JrUGpthILTZfKv3fC45SlIXkvt+idUn5Tc="; }; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite); @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { installShellFiles ]; - vendorHash = "sha256-q9dB54s9LD0klbDW8bWlXmFzPIPrFBcWJrhYRkyKTp0="; + vendorHash = "sha256-AeVvp+6iKiTZ4dWy5kjAS2njI3IU+ANgTdUxOFcihSg="; subPackages = [ "cmd/cosign" diff --git a/pkgs/by-name/fa/faiss/package.nix b/pkgs/by-name/fa/faiss/package.nix index b4b74a815cfc..2f1d23c5089e 100644 --- a/pkgs/by-name/fa/faiss/package.nix +++ b/pkgs/by-name/fa/faiss/package.nix @@ -97,10 +97,22 @@ stdenv.mkDerivation (finalAttrs: { python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .) ''; - postInstall = lib.optionalString pythonSupport '' - mkdir "$dist" - cp faiss/python/dist/*.whl "$dist/" - ''; + postInstall = + lib.optionalString pythonSupport '' + mkdir "$dist" + cp faiss/python/dist/*.whl "$dist/" + '' + # The GPU targets in faiss-targets.cmake reference CUDA imported targets + # (CUDA::cudart, CUDA::cublas), but faiss-config.cmake never finds them. + # Declare the dependency so downstream find_package(faiss) resolves them. + + lib.optionalString cudaSupport '' + substituteInPlace "$out/share/faiss/faiss-config.cmake" \ + --replace-fail \ + 'include("''${CMAKE_CURRENT_LIST_DIR}/faiss-targets.cmake")' \ + 'include(CMakeFindDependencyMacro) + find_dependency(CUDAToolkit) + include("''${CMAKE_CURRENT_LIST_DIR}/faiss-targets.cmake")' + ''; passthru = { inherit cudaSupport cudaPackages pythonSupport; diff --git a/pkgs/by-name/fi/firefox-sync-client/package.nix b/pkgs/by-name/fi/firefox-sync-client/package.nix index 2a229175c249..5712e849d4b9 100644 --- a/pkgs/by-name/fi/firefox-sync-client/package.nix +++ b/pkgs/by-name/fi/firefox-sync-client/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "firefox-sync-client"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "Mikescher"; repo = "firefox-sync-client"; rev = "v${finalAttrs.version}"; - hash = "sha256-tzYuYSifV/a9SPb5KyabhQ29ByXuAgQgi3t0VMHVSH8="; + hash = "sha256-hZ6sd/IM/X8WWNc1ca7w1R4fsixo5VMGEujmPJvEMQc="; }; - vendorHash = "sha256-kDh/5SOwKPYl9sC9W17bnzG73fGI5iX6lSjcB3IjOss="; + vendorHash = "sha256-NQKF5LugGh2wNWf6M3uUhS2YOTuv2/K56gWUv5ACwEU="; meta = { description = "Commandline-utility to list/view/edit/delete entries in a firefox-sync account"; diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix index 1c744b328b22..79b99e8ae42d 100644 --- a/pkgs/by-name/ja/jackett/package.nix +++ b/pkgs/by-name/ja/jackett/package.nix @@ -12,13 +12,13 @@ buildDotnetModule (finalAttrs: { pname = "jackett"; - version = "0.24.2021"; + version = "0.24.2066"; src = fetchFromGitHub { owner = "jackett"; repo = "jackett"; tag = "v${finalAttrs.version}"; - hash = "sha256-/9NDFedtjMholM3Doqt/5hJ+Zw68DJheWNxZ0X+Kvuk="; + hash = "sha256-hK7QfztI3kFJcOG9OTQ5/lOusFKnv8AyNfCaU9IhdKE="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; diff --git a/pkgs/by-name/ke/keifu/package.nix b/pkgs/by-name/ke/keifu/package.nix index 7ce00967fc52..691f403a235e 100644 --- a/pkgs/by-name/ke/keifu/package.nix +++ b/pkgs/by-name/ke/keifu/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "keifu"; - version = "0.3.0"; + version = "0.4.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "trasta298"; repo = "keifu"; tag = "v${finalAttrs.version}"; - hash = "sha256-Srw71Rswafu70kKI36dY1PtB4BQhpTYYzqbrWJuvaUM="; + hash = "sha256-668ejr2pxjGfQ0/hhJSNBSZME2+hSGuNJmwmbLVqy0o="; }; - cargoHash = "sha256-Ga405TV1uDSZbADrV+3aAeLDRfdPFHzdxxTEDu+f+b4="; + cargoHash = "sha256-6YmpsKkf/Mox98fRdrwbwzFohgOicRfCxcAIGSwmT7g="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix index 60e31c55bd45..5d242d0a7d32 100644 --- a/pkgs/by-name/la/lagrange/package.nix +++ b/pkgs/by-name/la/lagrange/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.20.6"; + version = "1.20.7"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZKxRcZt5JAO9AOveqXaoqqseZbRguqetdoAKe8c8Il0="; + hash = "sha256-/dQfgAGfe66bg6MYTYGv1jhCdGzdp+GbT8FwZnKlrtY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index afbdd8906428..a08d157bee7c 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -81,7 +81,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "9503"; + version = "9608"; outputs = [ "out" @@ -92,7 +92,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-SnPK7hCfA7svxXhPji7Cuf7H8eHFjdTJSpNR1otPO4c="; + hash = "sha256-nNQzEfSqVwusixHdiZCyAOtrQTQ7aAdV+S9qZywWWx0="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -125,7 +125,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ [ openssl ]; npmRoot = "tools/ui"; - npmDepsHash = "sha256-1iM0LGeI9e+gZEHk46lkBe51DxIhiimfAm9o3Z3m9Ik="; + npmDepsHash = "sha256-pjdbI6NcZRlJVd62xhgbLhWrwFYwgsIwjORqvo1+VD8="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src patches; diff --git a/pkgs/by-name/mu/multica-cli/package.nix b/pkgs/by-name/mu/multica-cli/package.nix index 2a327d5e0342..0c5dc989be80 100644 --- a/pkgs/by-name/mu/multica-cli/package.nix +++ b/pkgs/by-name/mu/multica-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { __structuredAttrs = true; pname = "multica-cli"; - version = "0.3.16"; + version = "0.3.21"; src = fetchFromGitHub { owner = "multica-ai"; repo = "multica"; rev = "v${version}"; - hash = "sha256-hD69SEhZL8TqZEg1/Hu+UDJnCZJsdDs4pai5wzMFq3I="; + hash = "sha256-qsQ2ycr+MU1A+U8LIbxnfaYtSHoMnLNO3P9ACJ6ThD4="; }; sourceRoot = "${src.name}/server"; - vendorHash = "sha256-96hxRLb+NBirsAzk80gtFYbSySKKWix/WJFLvokYKmU="; + vendorHash = "sha256-NXdBykPMWDD4BGLo2ams+KC14mxGNJYoV/dqobH6dv8="; subPackages = [ "cmd/multica" ]; diff --git a/pkgs/by-name/nz/nzbhydra2/package.nix b/pkgs/by-name/nz/nzbhydra2/package.nix index 20602fd44707..602b34b2a01f 100644 --- a/pkgs/by-name/nz/nzbhydra2/package.nix +++ b/pkgs/by-name/nz/nzbhydra2/package.nix @@ -35,13 +35,13 @@ let in maven.buildMavenPackage rec { pname = "nzbhydra2"; - version = "8.8.1"; + version = "8.8.3"; src = fetchFromGitHub { owner = "theotherp"; repo = "nzbhydra2"; tag = "v${version}"; - hash = "sha256-r6vv636evAetj5Pa4Ql2vkKP36BQ16JdmbAQLatCr9c="; + hash = "sha256-Lrhc9pp4KrbqzMyKyWqaMY1iz8lAJYO+FTb43CWChPM="; }; mvnHash = "sha256-mZ/mOF9k5URheNNxmrKkCiklP26zeTGKhDGxqRiDBuk="; diff --git a/pkgs/by-name/pd/pdk-ciel/package.nix b/pkgs/by-name/pd/pdk-ciel/package.nix index e8e4f5cea931..0ce526bcd0ba 100644 --- a/pkgs/by-name/pd/pdk-ciel/package.nix +++ b/pkgs/by-name/pd/pdk-ciel/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ciel"; - version = "2.4.1"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "fossi-foundation"; repo = "ciel"; tag = finalAttrs.version; - hash = "sha256-p35R0wfoGR8CmI++ae7iKLJs00RHHMdaSckgC18EIyM="; + hash = "sha256-EDXsR2cBU8+Z4h/Pkac5An9/TVI9LkZqLB3xAjrQq78="; }; build-system = [ python3Packages.poetry-core ]; diff --git a/pkgs/by-name/pt/pt2-clone/package.nix b/pkgs/by-name/pt/pt2-clone/package.nix index 71da6b8f3563..dccc86e540bb 100644 --- a/pkgs/by-name/pt/pt2-clone/package.nix +++ b/pkgs/by-name/pt/pt2-clone/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "pt2-clone"; - version = "1.89"; + version = "1.90"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-2fyuhg8Utj2EbV++4C8rAHMYQItXvxh0WTsp/NM+Xes="; + sha256 = "sha256-NoFOgDRBgpwNeyiTlKqYokKy2+1ZAhzzSIgPCKsWq7M="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/py/py-spy/package.nix b/pkgs/by-name/py/py-spy/package.nix index 71cfe88ee9f4..ac7f74773793 100644 --- a/pkgs/by-name/py/py-spy/package.nix +++ b/pkgs/by-name/py/py-spy/package.nix @@ -5,36 +5,42 @@ libunwind, python3, rustPlatform, + xz, }: +let + # https://github.com/benfred/py-spy/blob/v0.4.2/build.rs#L6-L8 + supportsUnwind = + stdenv.hostPlatform.isWindows && stdenv.hostPlatform.isx86_64 + || stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isAarch || stdenv.hostPlatform.isx86_64); +in rustPlatform.buildRustPackage (finalAttrs: { pname = "py-spy"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "benfred"; repo = "py-spy"; rev = "v${finalAttrs.version}"; - hash = "sha256-T96F8xgB9HRwuvDLXi6+lfi8za/iNn1NAbG4AIpE0V0="; + hash = "sha256-5T6R2Neslw8rNYWJbXncLH78kH1o42fR6kidhip6/Bg="; }; - cargoHash = "sha256-velwX7lcNQvwg3VAUTbgsOPLlA5fAcPiPvczrBBsMvs="; + cargoHash = "sha256-ZhtQjX15pZe3CM898LBj/79kXa6ESgPOSFkNghq0Ywo="; - buildFeatures = lib.optional stdenv.hostPlatform.isLinux "unwind"; + buildFeatures = lib.optional supportsUnwind "unwind"; + + # https://github.com/benfred/remoteprocess/blob/v0.5.2/build.rs + buildInputs = lib.optionals (supportsUnwind && stdenv.hostPlatform.isLinux) [ + libunwind + (lib.getLib xz) + ]; nativeBuildInputs = [ rustPlatform.bindgenHook ]; nativeCheckInputs = [ - python3 - ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isLinux "-L${libunwind}/lib"; - - checkFlags = [ - # assertion `left == right` failed - "--skip=test_negative_linenumber_increment" + (python3.withPackages (ps: [ ps.numpy ])) ]; meta = { @@ -44,8 +50,5 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/benfred/py-spy/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - # https://github.com/benfred/py-spy/pull/330 - broken = stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux; }; }) diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index c2d70a0f7608..99a522a647b2 100644 --- a/pkgs/by-name/re/renode-dts2repl/package.nix +++ b/pkgs/by-name/re/renode-dts2repl/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication { pname = "renode-dts2repl"; - version = "0-unstable-2026-05-28"; + version = "0-unstable-2026-06-08"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "7d7217df0f1c9a814043ae60184e7769337f9779"; - hash = "sha256-9hStDQcewBFSj/OF9Yw0d3W+3zeO9ii0mjel5mQb5js="; + rev = "ecd06775c379e4b45b3f4d9176782695ee479014"; + hash = "sha256-hv+ulJEZdB38E9ljIeRa3LupouGGiBffjNWBidhNcoQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/rf/rfc/package.nix b/pkgs/by-name/rf/rfc/package.nix index b8abd94abe97..92bc84f0683e 100644 --- a/pkgs/by-name/rf/rfc/package.nix +++ b/pkgs/by-name/rf/rfc/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "rfc"; - version = "1.0.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "bfontaine"; repo = "rfc"; rev = "v${version}"; - hash = "sha256-bCqgLkbZGQFcxhLwekVw+rUGinXTc7QJHlVRGtNf6Jc="; + hash = "sha256-g6JUdN58Q5630Qb1kijWtReGCq1o5FBE4SWifL6lirI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/se/seconlay/package.nix b/pkgs/by-name/se/seconlay/package.nix index 7752899a46f4..772e9ece00e1 100644 --- a/pkgs/by-name/se/seconlay/package.nix +++ b/pkgs/by-name/se/seconlay/package.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "seconlay"; - version = "0-unstable-2026-05-29"; + version = "0-unstable-2026-06-09"; src = fetchFromGitLab { group = "alasca.cloud"; owner = "scl"; repo = "scl-management"; - rev = "58c9b1ef34d950a356edde4da746e4238fc77c2c"; - hash = "sha256-33YmlPS8Js0JebsBEzSj23qErUpyhdIINltcljVBKEI="; + rev = "1b410ebd9775faa116629a7bec01463ce9038a56"; + hash = "sha256-Qq7bX1C+QTcYXfn8DGJwZZT0N1YfbywUe9jwqdReNLU="; }; cargoHash = "sha256-pb9xqdgWrf8Lc10jSkkDb/1n0e15fMQ3AcKNPw6/vi8="; diff --git a/pkgs/by-name/se/secp256k1-jdk/package.nix b/pkgs/by-name/se/secp256k1-jdk/package.nix new file mode 100644 index 000000000000..247d13ffd03f --- /dev/null +++ b/pkgs/by-name/se/secp256k1-jdk/package.nix @@ -0,0 +1,65 @@ +{ + lib, + fetchFromGitHub, + maven, + jdk25, +}: + +maven.buildMavenPackage (finalAttrs: { + pname = "secp256k1-jdk"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "bitcoinj"; + repo = "secp256k1-jdk"; + rev = "v${finalAttrs.version}"; + hash = "sha256-kIWBgJ9OueNNDRKf1HHaxt6PFxK2iCuO0TFr8swbiL0="; + }; + + mvnJdk = jdk25; + mvnGoal = "deploy"; # The secp256k1-jdk POM targets a `local-staging` repository using a file URL + mvnOffline = false; # We need actions not allowed in Maven offline mode, but Nix sandboxing will still be enforced + mvnParameters = "-Drevision=${finalAttrs.version}"; # make snapshot builds reproducible + mvnHash = "sha256-87iDewdy/7lSyvROf1YyrsgvVUJtaivdHdSLig3Ea1Y="; + + strictDeps = true; + __structuredAttrs = true; + buildOffline = true; + doCheck = false; + + installPhase = '' + runHook preInstall + + # copy the full output in a maven repository directory structure + mkdir -p "$out/share/maven-repo" + cp -r target/repo/. "$out/share/maven-repo" + + # create symlinks for the binaries in $out/share/java + mkdir -p "$out/share/java" + ln -s "$out/share/maven-repo/org/bitcoinj/secp/secp-api/${finalAttrs.version}/secp-api-${finalAttrs.version}.jar" "$out/share/java" + ln -s "$out/share/maven-repo/org/bitcoinj/secp/secp-bouncy/${finalAttrs.version}/secp-bouncy-${finalAttrs.version}.jar" "$out/share/java" + ln -s "$out/share/maven-repo/org/bitcoinj/secp/secp-ffm/${finalAttrs.version}/secp-ffm-${finalAttrs.version}.jar" "$out/share/java" + ln -s "$out/share/maven-repo/org/bitcoinj/secp/secp-graalvm/${finalAttrs.version}/secp-graalvm-${finalAttrs.version}.jar" "$out/share/java" + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/bitcoinj/secp256k1-jdk/blob/master/CHANGELOG.adoc"; + description = "Java library providing Elliptic Curve Cryptography on curve secp256k1"; + longDescription = '' + secp256k1-jdk is a Java library providing Elliptic Curve Cryptography using the SECG curve secp256k1. + It provides ECDSA and Schnorr message signing, verification, and other functions. + ''; + homepage = "https://github.com/bitcoinj/secp256k1-jdk"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + msgilligan + ]; + platforms = jdk25.meta.platforms; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # dependencies pulled via FOD from Maven Central + ]; + }; +}) diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix index 6af6bdd11282..dcf2145b1718 100644 --- a/pkgs/by-name/si/sigsum/package.nix +++ b/pkgs/by-name/si/sigsum/package.nix @@ -8,7 +8,7 @@ buildGo125Module (finalAttrs: { pname = "sigsum"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitLab { domain = "git.glasklar.is"; @@ -16,7 +16,7 @@ buildGo125Module (finalAttrs: { owner = "core"; repo = "sigsum-go"; tag = "v${finalAttrs.version}"; - hash = "sha256-+opDvVUG2OVJ/V1lHPXl2rxk4CCaXxc+4xBguvGqO1o="; + hash = "sha256-ZiU5eEI2pKknpjc3HU9EqQu6u1ZD/N7sOD0DyTma0/g="; }; postPatch = '' @@ -24,7 +24,7 @@ buildGo125Module (finalAttrs: { --replace-fail "info.Main.Version" '"${finalAttrs.version}"' ''; - vendorHash = "sha256-s5IUDGA/8Qv6XhvqJG396EZt7HTaG/BMknPj8uYhVZc="; + vendorHash = "sha256-BaN9NslTvVyIp1Gi0N3UKdTXCd5opdL6Fb0AVoy9diM="; ldflags = [ "-s" diff --git a/pkgs/by-name/sl/slurm-spank-stunnel/hostlist.patch b/pkgs/by-name/sl/slurm-spank-stunnel/hostlist.patch deleted file mode 100644 index 0fc1d0626aab..000000000000 --- a/pkgs/by-name/sl/slurm-spank-stunnel/hostlist.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/slurm-spank-stunnel.c b/slurm-spank-stunnel.c -index 81fb4fd..dbe69f6 100644 ---- a/slurm-spank-stunnel.c -+++ b/slurm-spank-stunnel.c -@@ -278,7 +278,7 @@ int _stunnel_connect_nodes (char* nodes) - { - - char* host; -- hostlist_t hlist; -+ hostlist_t *hlist; - - // Connect to the first host in the list - hlist = slurm_hostlist_create(nodes); diff --git a/pkgs/by-name/sl/slurm-spank-stunnel/package.nix b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix index 4ee7ded8530e..ccc8e7bc99b1 100644 --- a/pkgs/by-name/sl/slurm-spank-stunnel/package.nix +++ b/pkgs/by-name/sl/slurm-spank-stunnel/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, slurm, }: @@ -17,18 +18,30 @@ stdenv.mkDerivation (finalAttrs: { }; patches = [ - ./hostlist.patch ./backward-compat.patch + (fetchpatch { + name = "hostlist_t-signature.patch"; + url = "https://github.com/stanford-rc/slurm-spank-stunnel/commit/84d04e4ccfe538a09c3f17a52dde616903b66db8.patch"; + sha256 = "sha256-RaUYqeNmFPvYci2yX8Bxps1nDjX/UAG+e3JbjbcwrO0="; + }) ]; buildPhase = '' + runHook preBuild + gcc -I${lib.getDev slurm}/include -shared -fPIC -o stunnel.so slurm-spank-stunnel.c + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/lib $out/etc/slurm/plugstack.conf.d install -m 755 stunnel.so $out/lib install -m 644 plugstack.conf $out/etc/slurm/plugstack.conf.d/stunnel.conf.example + + runHook postInstall ''; meta = { diff --git a/pkgs/by-name/sl/slurm-spank-x11/package.nix b/pkgs/by-name/sl/slurm-spank-x11/package.nix index 5a5d694c9b3e..a0a2cbe3102d 100644 --- a/pkgs/by-name/sl/slurm-spank-x11/package.nix +++ b/pkgs/by-name/sl/slurm-spank-x11/package.nix @@ -24,16 +24,24 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; buildPhase = '' + runHook preBuild + gcc -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" \ -g -o slurm-spank-x11 slurm-spank-x11.c gcc -I${lib.getDev slurm}/include -DX11_LIBEXEC_PROG="\"$out/bin/slurm-spank-x11\"" -shared -fPIC \ -g -o x11.so slurm-spank-x11-plug.c + + runHook postBuild ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/lib install -m 755 slurm-spank-x11 $out/bin install -m 755 x11.so $out/lib + + runHook postInstall ''; meta = { diff --git a/pkgs/by-name/sn/snapraid/package.nix b/pkgs/by-name/sn/snapraid/package.nix index 1de2854dd754..3297f7a33ef6 100644 --- a/pkgs/by-name/sn/snapraid/package.nix +++ b/pkgs/by-name/sn/snapraid/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "snapraid"; - version = "14.5"; + version = "14.7"; src = fetchFromGitHub { owner = "amadvance"; repo = "snapraid"; tag = "v${finalAttrs.version}"; - hash = "sha256-Krd39k3yfoKhvcMzOYkOhoNKE/eL7jc3/RaWN1ZuwG0="; + hash = "sha256-+h4kEvNtNEe7u0N1UWmZF3bH7em+Y2/XUyAdyDliV1g="; }; env.VERSION = finalAttrs.version; diff --git a/pkgs/by-name/su/sub-store-frontend/package.nix b/pkgs/by-name/su/sub-store-frontend/package.nix index 4467d64f5ac8..5c160963c918 100644 --- a/pkgs/by-name/su/sub-store-frontend/package.nix +++ b/pkgs/by-name/su/sub-store-frontend/package.nix @@ -14,13 +14,13 @@ let in buildNpmPackage (finalAttrs: { pname = "sub-store-frontend"; - version = "2.17.31"; + version = "2.17.36"; src = fetchFromGitHub { owner = "sub-store-org"; repo = "Sub-Store-Front-End"; tag = finalAttrs.version; - hash = "sha256-/L5qdjqXZ8MjEjOGT8e8vdS/F9uudkemboAVrYih0Zc="; + hash = "sha256-tMmoq9y3NvuOoKhEN2/d0nrq2Y8+7VMYo6+OP/q67I8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/to/todoist-cli/package.nix b/pkgs/by-name/to/todoist-cli/package.nix new file mode 100644 index 000000000000..be1ba7dda56e --- /dev/null +++ b/pkgs/by-name/to/todoist-cli/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + testers, + todoist-cli, +}: +buildNpmPackage rec { + pname = "todoist-cli"; + version = "1.61.2"; + + src = fetchFromGitHub { + owner = "Doist"; + repo = "todoist-cli"; + rev = "v${version}"; + sha256 = "sha256-A7SrwLD1296YCtiHRvrtN2AQ1PKDsvFCTWPwyimFWMI="; + }; + + npmDepsHash = "sha256-vPts0GjwpDRiiWG7cP2N4Jlci3JGtaqpA8MYdrGCBkI="; + + doCheck = true; + + __structuredAttrs = true; + + passthru.tests.version = testers.testVersion { + package = todoist-cli; + }; + + meta = { + description = "A command-line interface for Todoist"; + homepage = "https://github.com/Doist/todoist-cli"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ joaosreis ]; + mainProgram = "td"; + }; +} diff --git a/pkgs/by-name/to/toml-f/package.nix b/pkgs/by-name/to/toml-f/package.nix index 5a843bcd48d7..96dc25e7d4c2 100644 --- a/pkgs/by-name/to/toml-f/package.nix +++ b/pkgs/by-name/to/toml-f/package.nix @@ -20,13 +20,13 @@ assert ( stdenv.mkDerivation (finalAttrs: { pname = "toml-f"; - version = "0.4.3"; + version = "0.5.1"; src = fetchFromGitHub { owner = "toml-f"; repo = "toml-f"; rev = "v${finalAttrs.version}"; - hash = "sha256-QRghnzsLGuQ5MHoVVTDg6ACtwVIkIRexNx/zrrQ0Icc="; + hash = "sha256-lReez2rSAJVnLFngjUYgGkm+HUDH8VsCC2m9zYOOr4A="; }; patches = [ diff --git a/pkgs/by-name/tu/turingdb/package.nix b/pkgs/by-name/tu/turingdb/package.nix index a4f33feb50a9..49fd998bb6c5 100644 --- a/pkgs/by-name/tu/turingdb/package.nix +++ b/pkgs/by-name/tu/turingdb/package.nix @@ -21,15 +21,27 @@ zlib, llvmPackages_20, versionCheckHook, + + config, + cudaSupport ? config.cudaSupport, + cudaPackages, }: let - turingstdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_20.stdenv else stdenv; + turingstdenv = + if stdenv.hostPlatform.isDarwin then + llvmPackages_20.stdenv + else if cudaSupport then + cudaPackages.backendStdenv + else + stdenv; in turingstdenv.mkDerivation (finalAttrs: { pname = "turingdb"; version = "1.33"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "turing-db"; repo = "turingdb"; @@ -74,6 +86,10 @@ turingstdenv.mkDerivation (finalAttrs: { gitMinimal pkg-config python3 + ] + ++ lib.optionals cudaSupport [ + # Needed by transitive dependency faiss + cudaPackages.cuda_nvcc ]; buildInputs = [ @@ -90,7 +106,11 @@ turingstdenv.mkDerivation (finalAttrs: { zlib ] ++ lib.optionals turingstdenv.isDarwin [ llvmPackages_20.openmp ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ]; + ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.cc.lib ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_cudart + cudaPackages.libcublas + ]; cmakeFlags = [ (lib.cmakeBool "NIX_BUILD" true) diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix index 11befdbe5028..58ff768b233f 100644 --- a/pkgs/by-name/va/vacuum-go/package.nix +++ b/pkgs/by-name/va/vacuum-go/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "vacuum-go"; - version = "0.29.0"; + version = "0.29.2"; src = fetchFromGitHub { owner = "daveshanley"; repo = "vacuum"; tag = "v${finalAttrs.version}"; - hash = "sha256-4+J2f3rKC9DHxQrxFbL4y7yjyZuYUipKy0t7K9X8O+g="; + hash = "sha256-OmGwFmd3hNv4fmPY0ZK+iY9ZuSRpxZL47qhYZO7LiJA="; }; - vendorHash = "sha256-OP7nceABcJFozDZ8GHtxjIi6a9eaQuQUYW1cOAAXJTU="; + vendorHash = "sha256-HwWsTMGlQNl/yI/2/+CXJ4ClBcnih6+jH0OdlRNhtGU="; env.CGO_ENABLED = 0; ldflags = [ diff --git a/pkgs/by-name/vo/vouch-proxy/package.nix b/pkgs/by-name/vo/vouch-proxy/package.nix index 0eb1021d060c..636f5cdb9366 100644 --- a/pkgs/by-name/vo/vouch-proxy/package.nix +++ b/pkgs/by-name/vo/vouch-proxy/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "vouch-proxy"; - version = "0.47.2"; + version = "0.48.0"; src = fetchFromGitHub { owner = "vouch"; repo = "vouch-proxy"; tag = "v${finalAttrs.version}"; - hash = "sha256-BdqdJosX1Z1CsPDW65ybk6oGdSk/RXHPaEJuuIedNJ4="; + hash = "sha256-QJoZqz3kQCUqEBu9hjTBrGMrNTiNi4LXKyi0EFSZNy8="; }; vendorHash = "sha256-Ma5/S2PXQ9lByIpIfkkLeiw/9rvmasSMElE1VoGIEHc="; diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix index 00ab7b20626d..d2c7f00cb18d 100644 --- a/pkgs/by-name/we/weblate/package.nix +++ b/pkgs/by-name/we/weblate/package.nix @@ -50,7 +50,7 @@ let in python3Packages.buildPythonApplication (finalAttrs: { pname = "weblate"; - version = "5.17"; + version = "2026.6.1"; pyproject = true; outputs = [ @@ -62,11 +62,14 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "WeblateOrg"; repo = "weblate"; tag = "weblate-${finalAttrs.version}"; - hash = "sha256-+czdS1cICvm8esXxJG9BjzPTJExajxvDoRVH7f+t6lY="; + hash = "sha256-7dhEkU2sVIjMPPR/0U2sMFXG6bl8s5WDvw8MyZZhqNE="; }; postPatch = '' sed -i 's|/bin/true|true|g' weblate/addons/example_pre.py + + sed -i 's/"setuptools==.*"/"setuptools"/' pyproject.toml + sed -i 's/"translate-toolkit==.*"/"translate-toolkit"/' pyproject.toml ''; build-system = with python3Packages; [ setuptools ]; @@ -93,27 +96,40 @@ python3Packages.buildPythonApplication (finalAttrs: { ${manage} compress ''; - pythonRelaxDeps = [ - "requests" - "pygobject" - "certifi" - "hiredis" - ]; + # Upstream pins all dependencies, so their version constraints are mostly meanningless, + # except for a few packages maintained by themselfes. + # https://github.com/WeblateOrg/weblate/issues/20003#issuecomment-4691837274 + pythonRelaxDeps = + let + # Dependencies owned by Weblate that should always be in the exact version specified + coreDeps = [ + "weblate-fonts" + "weblate-schemas" + "weblate-language-data" + "translation-finder" + "translate-toolkit" + ]; + in + lib.concatMap ( + p: if lib.elem p.pname coreDeps then [ ] else [ p.pname ] + ) finalAttrs.passthru.dependencies; dependencies = with python3Packages; [ ahocorasick-rs altcha + argon2-cffi-bindings + argon2-cffi (toPythonModule (borgbackup.override { python3 = python; })) celery certifi + cffi charset-normalizer confusable-homoglyphs crispy-bootstrap5 cryptography cssselect - cython cyrtranslit dateparser diff-match-patch @@ -143,13 +159,23 @@ python3Packages.buildPythonApplication (finalAttrs: { mistletoe nh3 openpyxl + opentelemetry-exporter-otlp-proto-http + opentelemetry-instrumentation-celery + opentelemetry-instrumentation-django + opentelemetry-instrumentation-psycopg + opentelemetry-instrumentation-redis + opentelemetry-instrumentation-requests + opentelemetry-sdk packaging pillow pyaskalono + pyasn1 pycairo pygments pygobject pyicumessageformat + pyjwt + pyopenssl pyparsing python-dateutil qrcode @@ -165,6 +191,7 @@ python3Packages.buildPythonApplication (finalAttrs: { tesserocr translate-toolkit translation-finder + twisted unidecode urllib3 user-agents @@ -190,10 +217,6 @@ python3Packages.buildPythonApplication (finalAttrs: { # Commented entries are not packaged yet optional-dependencies = with python3Packages; { - alibaba = [ - aliyun-python-sdk-alimt - aliyun-python-sdk-core - ]; amazon = [ boto3 ]; # gelf = [ logging-gelf ]; # gerrit = [ git-review ]; @@ -201,11 +224,17 @@ python3Packages.buildPythonApplication (finalAttrs: { google-cloud-storage google-cloud-translate ]; + google-errors = [ + google-cloud-error-reporting + ]; ldap = [ django-auth-ldap ]; # mercurial = [ mercurial ]; - openai = [ openai ]; postgres = [ psycopg ]; - saml = [ python3-saml ]; + rollbar = [ rollbar ]; + saml = [ + python3-saml + xmlsec + ]; # saml2idp = [ djangosaml2idp2 ]; sphinx = [ sphinx ]; # wllegal = [ wllegal ]; @@ -231,7 +260,6 @@ python3Packages.buildPythonApplication (finalAttrs: { pytest-django pytest-xdist responses - respx selenium standardwebhooks @@ -307,6 +335,7 @@ python3Packages.buildPythonApplication (finalAttrs: { # Tries to resolve DNS "weblate/api/tests.py::ProjectAPITest::test_install_machinery" + "weblate/addons/tests.py::WebhooksAddonTest::test_form" # djangosaml2idp2 is not packaged yet "weblate/utils/tests/test_djangosaml2idp.py" diff --git a/pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix index 962138d8994e..1e7e8a108125 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-termfilechooser/package.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-termfilechooser"; - version = "1.4.0"; + version = "1.4.3"; src = fetchFromGitHub { owner = "hunkyburrito"; repo = "xdg-desktop-portal-termfilechooser"; tag = "v${finalAttrs.version}"; - hash = "sha256-GZi05OsyhLsiY/bTFLGd5KeJaD5CQNJInN0wCkXaOoU="; + hash = "sha256-zk/zUbq+fa977wuT/yuJ+bBawuTXKVJwLj2G8ITjMfU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/zk/zk/package.nix b/pkgs/by-name/zk/zk/package.nix index b41063abafa4..61c851950061 100644 --- a/pkgs/by-name/zk/zk/package.nix +++ b/pkgs/by-name/zk/zk/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "zk"; - version = "0.15.4"; + version = "0.15.5"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-HIt/SO5OXpIg7yDriFcg22U2RUG/don6sEJsslfKEME="; + sha256 = "sha256-QV6+ZMQxdFQMqgyELu6AEZqVhk+MGWu9V6YnCabRjbc="; }; - vendorHash = "sha256-YX+voBRKC/2LN7ByS8XWgJkm6dAip8L0kHpt754wHck="; + vendorHash = "sha256-Kq427Dfiys19GoUnalOxUxFhcQikwg7dd6diLH2kjEo="; doCheck = false; diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix index 0df390b8a9ee..be83ed4778a9 100644 --- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix +++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix @@ -4,6 +4,7 @@ mathcomp, mathcomp-finmap, mathcomp-bigenough, + mathcomp-real-closed, hierarchy-builder, stdlib, single ? false, @@ -104,6 +105,7 @@ let analysis-deps = [ mathcomp.field mathcomp-bigenough + mathcomp-real-closed ]; intra-deps = lib.optionals (package != "single") (map mathcomp_ packages.${package}); pkgpath = lib.switch package [ diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 6c16418a2c51..53b521f8ada2 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -439,6 +439,13 @@ stdenv.mkDerivation ( --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 substituteInPlace doc/filters.texi \ --replace /usr/local/lib/frei0r-1 ${frei0r}/lib/frei0r-1 + '' + # https://code.ffmpeg.org/FFmpeg/FFmpeg/issues/22564, also fails on big-endian POWER + + lib.optionalString (lib.versionAtLeast version "8.1" && stdenv.hostPlatform.isBigEndian) '' + substituteInPlace tests/fate/vcodec.mak \ + --replace-fail \ + 'FATE_VCODEC_SCALE-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff444 ffvhuff420p12 ffvhuff422p10left ffvhuff444p16' \ + 'FATE_VCODEC_SCALE-$(call ENCDEC, FFVHUFF, AVI) += ffvhuff444 ffvhuff422p10left ffvhuff444p16' ''; patches = diff --git a/pkgs/development/python-modules/opentelemetry-instrumentation-psycopg/default.nix b/pkgs/development/python-modules/opentelemetry-instrumentation-psycopg/default.nix new file mode 100644 index 000000000000..ebdb66e32a67 --- /dev/null +++ b/pkgs/development/python-modules/opentelemetry-instrumentation-psycopg/default.nix @@ -0,0 +1,39 @@ +{ + buildPythonPackage, + pytestCheckHook, + hatchling, + opentelemetry-api, + opentelemetry-instrumentation, + opentelemetry-instrumentation-dbapi, + opentelemetry-test-utils, + psycopg, +}: + +buildPythonPackage { + inherit (opentelemetry-instrumentation) version src; + pname = "opentelemetry-instrumentation-psycopg"; + pyproject = true; + + sourceRoot = "${opentelemetry-instrumentation.src.name}/instrumentation/opentelemetry-instrumentation-psycopg"; + + build-system = [ hatchling ]; + + dependencies = [ + psycopg + opentelemetry-api + opentelemetry-instrumentation + opentelemetry-instrumentation-dbapi + ]; + + nativeCheckInputs = [ + opentelemetry-test-utils + pytestCheckHook + ]; + + pythonImportsCheck = [ "opentelemetry.instrumentation.psycopg" ]; + + meta = opentelemetry-instrumentation.meta // { + homepage = "https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation/opentelemetry-instrumentation-psycopg"; + description = "OpenTelemetry Psycopg Instrumentation"; + }; +} diff --git a/pkgs/development/python-modules/social-auth-app-django/default.nix b/pkgs/development/python-modules/social-auth-app-django/default.nix index 9a0a1c5b85a5..b825aa5fcd14 100644 --- a/pkgs/development/python-modules/social-auth-app-django/default.nix +++ b/pkgs/development/python-modules/social-auth-app-django/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "social-auth-app-django"; - version = "5.8.0"; + version = "5.9.0"; pyproject = true; src = fetchFromGitHub { owner = "python-social-auth"; repo = "social-app-django"; tag = version; - hash = "sha256-NAUCA+FMMgY4xMYspiRO5Kt/S2jbSKDRnBxwmATYxKo="; + hash = "sha256-kyiN7HblqN66Slrub2IphCXBBy6UKxd7PbVHkjuHzkI="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/social-auth-core/default.nix b/pkgs/development/python-modules/social-auth-core/default.nix index edc2f91a3db4..a4b893b5e62c 100644 --- a/pkgs/development/python-modules/social-auth-core/default.nix +++ b/pkgs/development/python-modules/social-auth-core/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "social-auth-core"; - version = "4.8.5"; + version = "4.9.1"; pyproject = true; src = fetchFromGitHub { owner = "python-social-auth"; repo = "social-core"; tag = version; - hash = "sha256-hYqfahjeNRpfpnNdDRTF9VPaoUh5R+nMDM3frvRI5Nw="; + hash = "sha256-HIRqueDoT5MiK5wYto1/MhZOJVBGUdsHma/klOyVHtM="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/translate-toolkit/default.nix b/pkgs/development/python-modules/translate-toolkit/default.nix index 28e64d4cb293..de0e669b4cca 100644 --- a/pkgs/development/python-modules/translate-toolkit/default.nix +++ b/pkgs/development/python-modules/translate-toolkit/default.nix @@ -29,18 +29,19 @@ addBinToPathHook, pytest-xdist, gettext, + syrupy, }: buildPythonPackage (finalAttrs: { pname = "translate-toolkit"; - version = "3.19.5"; + version = "3.19.11"; pyproject = true; src = fetchFromGitHub { owner = "translate"; repo = "translate"; tag = finalAttrs.version; - hash = "sha256-NJuhkJyXfGO2iwvcHUrfMZi55t1+89RN6jEIxHk8mcs="; + hash = "sha256-+94oo6IYnRR4jnR60C3WNjesK6Tk6jND3xsYyx6sw0U="; }; build-system = [ setuptools-scm ]; @@ -50,6 +51,8 @@ buildPythonPackage (finalAttrs: { unicode-segmentation-rs ]; + pythonRelaxDeps = [ "lxml" ]; + optional-dependencies = { chardet = [ charset-normalizer ]; fluent = [ fluent-syntax ]; @@ -69,6 +72,7 @@ buildPythonPackage (finalAttrs: { pytestCheckHook addBinToPathHook pytest-xdist + syrupy gettext ] ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; @@ -78,12 +82,6 @@ buildPythonPackage (finalAttrs: { "test_timezones" ]; - disabledTestPaths = [ - # Require pytest-snapshot but there are no snapshots checked in - "tests/translate/tools/test_pocount.py" - "tests/translate/tools/test_junitmsgfmt.py" - ]; - pythonImportsCheck = [ "translate" ]; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/translation-finder/default.nix b/pkgs/development/python-modules/translation-finder/default.nix index afbbf84b5185..f7bf943da299 100644 --- a/pkgs/development/python-modules/translation-finder/default.nix +++ b/pkgs/development/python-modules/translation-finder/default.nix @@ -11,7 +11,7 @@ buildPythonPackage (finalAttrs: { pname = "translation-finder"; - version = "2.24"; + version = "3.1"; pyproject = true; @@ -19,7 +19,7 @@ buildPythonPackage (finalAttrs: { owner = "WeblateOrg"; repo = "translation-finder"; tag = finalAttrs.version; - hash = "sha256-OVAsw+snISVyz3ZvcfqCpv0BRfTNzYSpI+YLafW5OQg="; + hash = "sha256-sRqn7K39R4A83USCng5wu14eKq4VqUp9tPzg8Qb8MOU="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/weblate-schemas/default.nix b/pkgs/development/python-modules/weblate-schemas/default.nix index 875ad8802fbe..5de6969fd76b 100644 --- a/pkgs/development/python-modules/weblate-schemas/default.nix +++ b/pkgs/development/python-modules/weblate-schemas/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, setuptools, fqdn, jsonschema, @@ -11,30 +11,28 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "weblate-schemas"; - version = "2025.6"; + version = "2026.4"; pyproject = true; - src = fetchPypi { - pname = "weblate_schemas"; - inherit version; - hash = "sha256-Kxu+8CiJ343PmCdY5rSbTqsWmVMLnz9inAH726g5TQQ="; + src = fetchFromGitHub { + owner = "WeblateOrg"; + repo = "weblate_schemas"; + tag = finalAttrs.version; + hash = "sha256-OPuhRsUmVte54UPNna76N5Kbg1Tl7p8OdKbE6VHWcvg="; }; build-system = [ setuptools ]; dependencies = [ - fqdn jsonschema - rfc3987 - strict-rfc3339 ]; nativeCheckInputs = [ - fedora-messaging pytestCheckHook + fedora-messaging ] ++ jsonschema.optional-dependencies.format; @@ -43,9 +41,9 @@ buildPythonPackage rec { meta = { description = "Schemas used by Weblate"; homepage = "https://github.com/WeblateOrg/weblate_schemas"; - changelog = "https://github.com/WeblateOrg/weblate_schemas/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/WeblateOrg/weblate_schemas/blob/${finalAttrs.version}/CHANGES.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ erictapen ]; }; -} +}) diff --git a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix index f4fa5c87aa6a..7e9d931bc6e9 100644 --- a/pkgs/misc/tmux-plugins/tmux-fingers/default.nix +++ b/pkgs/misc/tmux-plugins/tmux-fingers/default.nix @@ -7,13 +7,13 @@ let fingers = crystal.buildCrystalPackage rec { format = "shards"; - version = "2.6.2"; + version = "2.7.1"; pname = "fingers"; src = fetchFromGitHub { owner = "Morantron"; repo = "tmux-fingers"; rev = "${version}"; - sha256 = "sha256-6zJq2Utr/TnbNS5WhQKQqU3WMAhToSdEvHqll8JzIBY="; + sha256 = "sha256-4aA60127Pv1jk7jzEhlU3NmPDmUbp9nE/8yYKkcMUb4="; }; shardsFile = ./shards.nix; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index dac97a477fa5..85054366042e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1957,7 +1957,7 @@ mapAliases { ryujinx = throw "'ryujinx' has been replaced by 'ryubing' as the new upstream"; # Added 2025-07-30 ryujinx-greemdev = throw "'ryujinx-greemdev' has been renamed to/replaced by 'ryubing'"; # Converted to throw 2025-10-27 scantailor = throw "'scantailor' has been renamed to/replaced by 'scantailor-advanced'"; # Converted to throw 2025-10-27 - scaphandra = throw "'scaphandra' was broken with no upstream progress since February 2025"; # Added 2026-06-14 + scaphandre = throw "'scaphandre' was broken with no upstream progress since February 2025"; # Added 2026-06-14 scitoken-cpp = throw "'scitoken-cpp' has been renamed to/replaced by 'scitokens-cpp'"; # Converted to throw 2025-10-27 scudcloud = throw "'scudcloud' has been removed as it was archived by upstream"; # Added 2025-07-24 SDL2_classic = throw "'SDL2_classic' has been removed. Consider upgrading to 'sdl2-compat', also available as 'SDL2'."; # Added 2025-05-20 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11071cbaf5cc..5ef99710deb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11955,6 +11955,10 @@ self: super: with self; { callPackage ../development/python-modules/opentelemetry-instrumentation-logging { }; + opentelemetry-instrumentation-psycopg = + callPackage ../development/python-modules/opentelemetry-instrumentation-psycopg + { }; + opentelemetry-instrumentation-psycopg2 = callPackage ../development/python-modules/opentelemetry-instrumentation-psycopg2 { };