diff --git a/lib/strings-with-deps.nix b/lib/strings-with-deps.nix index 6322cad11995..8fd879df1790 100644 --- a/lib/strings-with-deps.nix +++ b/lib/strings-with-deps.nix @@ -43,7 +43,7 @@ let inherit (lib) - concatStringsSep + concatMapStringsSep head isAttrs listToAttrs @@ -166,7 +166,7 @@ rec { textClosureMap = f: predefined: names: - concatStringsSep "\n" (map f (textClosureList predefined names)); + concatMapStringsSep "\n" f (textClosureList predefined names); noDepEntry = text: { inherit text; diff --git a/nixos/modules/hardware/facter/bluetooth.nix b/nixos/modules/hardware/facter/bluetooth.nix new file mode 100644 index 000000000000..5294589269f4 --- /dev/null +++ b/nixos/modules/hardware/facter/bluetooth.nix @@ -0,0 +1,13 @@ +{ lib, config, ... }: +{ + options.hardware.facter.detected.bluetooth.enable = + lib.mkEnableOption "Enable the Facter bluetooth module" + // { + default = builtins.length (config.hardware.facter.report.hardware.bluetooth or [ ]) > 0; + defaultText = "hardware dependent"; + }; + + config.hardware.bluetooth.enable = lib.mkIf config.hardware.facter.detected.bluetooth.enable ( + lib.mkDefault true + ); +} diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix index 30db0d10e48a..aa8a1ca4175e 100644 --- a/nixos/modules/hardware/facter/default.nix +++ b/nixos/modules/hardware/facter/default.nix @@ -5,7 +5,9 @@ }: { imports = [ + ./bluetooth.nix ./disk.nix + ./fingerprint ./firmware.nix ./graphics ./keyboard.nix diff --git a/nixos/modules/hardware/facter/fingerprint/default.nix b/nixos/modules/hardware/facter/fingerprint/default.nix new file mode 100644 index 000000000000..59929b33a7ee --- /dev/null +++ b/nixos/modules/hardware/facter/fingerprint/default.nix @@ -0,0 +1,37 @@ +# To update devices.json, run: +# $(nix-build nixos/modules/hardware/facter/fingerprint/update.nix)/bin/update-fprint-devices +{ lib, config, ... }: +let + facterLib = import ../lib.nix lib; + + devices = builtins.fromJSON (builtins.readFile ./devices.json); + default = { + value = 0; + }; + + isSupported = lib.any ( + { + vendor ? default, + device ? default, + bus_type ? { + name = ""; + }, + ... + }: + bus_type.name == "USB" + && devices ? "${facterLib.toZeroPaddedHex vendor.value}:${facterLib.toZeroPaddedHex device.value}" + ); +in +{ + options.hardware.facter.detected.fingerprint.enable = lib.mkEnableOption "Fingerprint devices" // { + default = + isSupported (config.hardware.facter.report.hardware.unknown or [ ]) + || isSupported (config.hardware.facter.report.hardware.fingerprint or [ ]) + || isSupported (config.hardware.facter.report.hardware.usb or [ ]); + defaultText = "hardware dependent"; + }; + + config.services.fprintd.enable = lib.mkIf config.hardware.facter.detected.fingerprint.enable ( + lib.mkDefault true + ); +} diff --git a/nixos/modules/hardware/facter/fingerprint/devices.json b/nixos/modules/hardware/facter/fingerprint/devices.json new file mode 100644 index 000000000000..7eea228142ed --- /dev/null +++ b/nixos/modules/hardware/facter/fingerprint/devices.json @@ -0,0 +1,233 @@ +{ + "045E:00BB": true, + "045E:00BC": true, + "045E:00BD": true, + "045E:00CA": true, + "0483:2015": true, + "0483:2016": true, + "0483:2017": true, + "04F3:0903": true, + "04F3:0907": true, + "04F3:0C01": true, + "04F3:0C02": true, + "04F3:0C03": true, + "04F3:0C04": true, + "04F3:0C05": true, + "04F3:0C06": true, + "04F3:0C07": true, + "04F3:0C08": true, + "04F3:0C09": true, + "04F3:0C0A": true, + "04F3:0C0B": true, + "04F3:0C0C": true, + "04F3:0C0D": true, + "04F3:0C0E": true, + "04F3:0C0F": true, + "04F3:0C10": true, + "04F3:0C11": true, + "04F3:0C12": true, + "04F3:0C13": true, + "04F3:0C14": true, + "04F3:0C15": true, + "04F3:0C16": true, + "04F3:0C17": true, + "04F3:0C18": true, + "04F3:0C19": true, + "04F3:0C1A": true, + "04F3:0C1B": true, + "04F3:0C1C": true, + "04F3:0C1D": true, + "04F3:0C1E": true, + "04F3:0C1F": true, + "04F3:0C20": true, + "04F3:0C21": true, + "04F3:0C22": true, + "04F3:0C23": true, + "04F3:0C24": true, + "04F3:0C25": true, + "04F3:0C26": true, + "04F3:0C27": true, + "04F3:0C28": true, + "04F3:0C29": true, + "04F3:0C2A": true, + "04F3:0C2B": true, + "04F3:0C2C": true, + "04F3:0C2D": true, + "04F3:0C2E": true, + "04F3:0C2F": true, + "04F3:0C30": true, + "04F3:0C31": true, + "04F3:0C32": true, + "04F3:0C33": true, + "04F3:0C3D": true, + "04F3:0C42": true, + "04F3:0C4B": true, + "04F3:0C4D": true, + "04F3:0C4F": true, + "04F3:0C58": true, + "04F3:0C63": true, + "04F3:0C6E": true, + "04F3:0C7D": true, + "04F3:0C7E": true, + "04F3:0C82": true, + "04F3:0C88": true, + "04F3:0C8C": true, + "04F3:0C8D": true, + "04F3:0C98": true, + "04F3:0C99": true, + "04F3:0C9D": true, + "04F3:0C9F": true, + "04F3:0CA3": true, + "04F3:241F": true, + "04F3:2766": true, + "04F3:3057": true, + "04F3:3087": true, + "04F3:309F": true, + "04F3:30B2": true, + "04F3:30C6": true, + "04F3:3128": true, + "04F3:3134": true, + "04F3:3148": true, + "05BA:0007": true, + "05BA:0008": true, + "05BA:000A": true, + "061A:0110": true, + "06CB:00BD": true, + "06CB:00C2": true, + "06CB:00C4": true, + "06CB:00C6": true, + "06CB:00DF": true, + "06CB:00F0": true, + "06CB:00F9": true, + "06CB:00FC": true, + "06CB:0100": true, + "06CB:0103": true, + "06CB:0104": true, + "06CB:0106": true, + "06CB:0107": true, + "06CB:0108": true, + "06CB:0123": true, + "06CB:0124": true, + "06CB:0126": true, + "06CB:0129": true, + "06CB:015F": true, + "06CB:0168": true, + "06CB:016C": true, + "06CB:0173": true, + "06CB:0174": true, + "06CB:019D": true, + "08FF:1600": true, + "08FF:1660": true, + "08FF:1680": true, + "08FF:1681": true, + "08FF:1682": true, + "08FF:1683": true, + "08FF:1684": true, + "08FF:1685": true, + "08FF:1686": true, + "08FF:1687": true, + "08FF:1688": true, + "08FF:1689": true, + "08FF:168A": true, + "08FF:168B": true, + "08FF:168C": true, + "08FF:168D": true, + "08FF:168E": true, + "08FF:168F": true, + "08FF:2500": true, + "08FF:2550": true, + "08FF:2580": true, + "08FF:2660": true, + "08FF:2680": true, + "08FF:2681": true, + "08FF:2682": true, + "08FF:2683": true, + "08FF:2684": true, + "08FF:2685": true, + "08FF:2686": true, + "08FF:2687": true, + "08FF:2688": true, + "08FF:2689": true, + "08FF:268A": true, + "08FF:268B": true, + "08FF:268C": true, + "08FF:268D": true, + "08FF:268E": true, + "08FF:268F": true, + "08FF:2691": true, + "08FF:2810": true, + "08FF:5501": true, + "08FF:5731": true, + "0BDA:5813": true, + "0BDA:5816": true, + "10A5:9524": true, + "10A5:9544": true, + "10A5:A305": true, + "10A5:C844": true, + "10A5:D205": true, + "10A5:D805": true, + "10A5:DA04": true, + "10A5:FFE0": true, + "138A:0001": true, + "138A:0005": true, + "138A:0008": true, + "138A:0010": true, + "138A:0011": true, + "138A:0015": true, + "138A:0017": true, + "138A:0018": true, + "138A:0050": true, + "138A:0091": true, + "147E:1000": true, + "147E:1001": true, + "147E:2016": true, + "147E:2020": true, + "147E:3001": true, + "1C7A:0570": true, + "1C7A:0571": true, + "1C7A:0582": true, + "1C7A:0583": true, + "1C7A:0586": true, + "1C7A:0587": true, + "1C7A:05A1": true, + "1C7A:0603": true, + "27C6:5840": true, + "27C6:6014": true, + "27C6:6092": true, + "27C6:6094": true, + "27C6:609A": true, + "27C6:609C": true, + "27C6:60A2": true, + "27C6:60A4": true, + "27C6:60BC": true, + "27C6:60C2": true, + "27C6:6304": true, + "27C6:631C": true, + "27C6:633C": true, + "27C6:634C": true, + "27C6:6384": true, + "27C6:639C": true, + "27C6:63AC": true, + "27C6:63BC": true, + "27C6:63CC": true, + "27C6:6496": true, + "27C6:650A": true, + "27C6:650C": true, + "27C6:6512": true, + "27C6:6582": true, + "27C6:6584": true, + "27C6:658C": true, + "27C6:6592": true, + "27C6:6594": true, + "27C6:659A": true, + "27C6:659C": true, + "27C6:689A": true, + "27C6:6A94": true, + "2808:9E48": true, + "2808:A57A": true, + "2808:A78A": true, + "2808:A959": true, + "2808:A99A": true, + "2808:D979": true, + "298D:1010": true +} diff --git a/nixos/modules/hardware/facter/fingerprint/update.nix b/nixos/modules/hardware/facter/fingerprint/update.nix new file mode 100644 index 000000000000..492f3aec2845 --- /dev/null +++ b/nixos/modules/hardware/facter/fingerprint/update.nix @@ -0,0 +1,37 @@ +# Run: $(nix-build nixos/modules/hardware/facter/fingerprint/update.nix)/bin/update-fprint-devices +{ + pkgs ? import ../../../../.. { }, +}: +let + fprint-supported-devices = pkgs.libfprint.overrideAttrs (old: { + nativeBuildInputs = old.nativeBuildInputs or [ ] ++ [ + pkgs.jq + pkgs.gawk + ]; + buildPhase = '' + ninja libfprint/fprint-list-supported-devices + ''; + outputs = [ "out" ]; + installPhase = '' + ./libfprint/fprint-list-supported-devices | \ + grep -o -E '(\b[0-9a-fA-F]{4}:[0-9a-fA-F]{4}\b)' | \ + awk '{print toupper($0)}' | \ + jq -S -R -s 'split("\n") | map(select(. != "")) | map({key: ., value: true}) | from_entries' > $out + ''; + # we cannot disable doInstallcheck because than we are missing nativeCheckInputs dependencies + installCheckPhase = ""; + }); +in +pkgs.writeShellApplication { + name = "update-fprint-devices"; + runtimeInputs = with pkgs; [ + coreutils + git + ]; + text = '' + root="$(git rev-parse --show-toplevel)" + target="$root/nixos/modules/hardware/facter/fingerprint/devices.json" + cp ${fprint-supported-devices} "$target" + echo "Updated $target" + ''; +} diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index b21822369a51..526f89a00c6a 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -141,9 +141,6 @@ in loginShellInit = cfge.loginShellInit; interactiveShellInit = '' - # Check the window size after every command. - shopt -s checkwinsize - # Disable hashing (i.e. caching) of command lookups. set +h diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix index 179c9fc374e9..250d7b2b7685 100644 --- a/nixos/modules/services/networking/netbird.nix +++ b/nixos/modules/services/networking/netbird.nix @@ -711,6 +711,7 @@ in "org.freedesktop.resolve1.set-default-route", "org.freedesktop.resolve1.set-dns-servers", "org.freedesktop.resolve1.set-domains", + "org.freedesktop.resolve1.set-dnssec", ]; var users = ${builtins.toJSON (toHardenedClientList (client: client.user.name))}; diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index bd83dd72b436..08ab396e1de2 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -13,17 +13,16 @@ let addAttributeName = mapAttrs ( a: v: v - // { + // (lib.optionalAttrs (v.text != "") { text = '' #### Activation script snippet ${a}: _localstatus=0 ${v.text} - if (( _localstatus > 0 )); then printf "Activation script snippet '%s' failed (%s)\n" "${a}" "$_localstatus" fi ''; - } + }) ); systemActivationScript = @@ -68,8 +67,11 @@ let # Ensure a consistent umask. umask 0022 - ${textClosureMap id withDrySnippets (attrNames withDrySnippets)} - + ${lib.concatStringsSep "\n" ( + lib.filter (v: v != "") ( + textClosureList withDrySnippets (attrNames (lib.filterAttrs (_: v: v.text != "") withDrySnippets)) + ) + )} '' + optionalString (!onlyDry) '' # Make this configuration the current configuration. diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 47483b84872d..e1283afe8ad9 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -288,7 +288,7 @@ in assertion = !( config.networking.firewall.enable - && !config.networking.nftables.enable + && !(config.networking.nftables.enable || config.networking.firewall.backend == "nftables") && config.virtualisation.incus.enable ); message = "Incus on NixOS is unsupported using iptables. Set `networking.nftables.enable = true;`"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index 038cc7024b6e..569540446ab6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -549,7 +549,10 @@ let # Telega has a server portion for it's network protocol # elisp error telega = (ignoreCompilationError super.telega).overrideAttrs (old: { - buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; + buildInputs = old.buildInputs ++ [ + pkgs.tdlib + pkgs.zlib + ]; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; postPatch = '' diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c06757a8bc8b..99c2917a87a0 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4534,6 +4534,8 @@ let }; }; + sysdig.sysdig-vscode-ext = callPackage ./sysdig.sysdig-vscode-ext { }; + tabnine.tabnine-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "tabnine-vscode"; diff --git a/pkgs/applications/editors/vscode/extensions/sysdig.sysdig-vscode-ext/default.nix b/pkgs/applications/editors/vscode/extensions/sysdig.sysdig-vscode-ext/default.nix new file mode 100644 index 000000000000..be85f260a9b5 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/sysdig.sysdig-vscode-ext/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "sysdig-vscode-ext"; + publisher = "sysdig"; + version = "0.2.12"; + hash = "sha256-3sn1YQHOZW/SigV6eyubPJoQbTwqNNwlsXIEmevs2zc="; + }; + + meta = { + description = "Scan your VS Code projects with Sysdig to investigate misconfigurations in IaC files or track vulnerabilities"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=sysdig.sysdig-vscode-ext"; + homepage = "https://github.com/sysdiglabs/vscode-extension"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ tembleking ]; + }; +} diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 68d7cafab2c4..ec774abd942d 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -4,8 +4,8 @@ lib, ncurses, openssl, - aspell, cjson, + enchant, gnutls, gettext, zlib, @@ -21,7 +21,7 @@ guileSupport ? true, guile, luaSupport ? true, - lua5, + lua5_3, perlSupport ? true, perl, pythonSupport ? true, @@ -76,7 +76,7 @@ let name = "lua"; enabled = luaSupport; cmakeFlag = "ENABLE_LUA"; - buildInputs = [ lua5 ]; + buildInputs = [ lua5_3 ]; } { name = "python"; @@ -105,11 +105,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { pname = "weechat"; - version = "4.7.2"; + version = "4.8.0"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-ZmJL2QWm21igiTv73du4+kF7l6q0qa+MFA4LKc66JWk="; + hash = "sha256-7SjcoqsRtBwEHfYVM62LRzw+vzVEoZka1D0Iz6Zv4WU="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 @@ -144,8 +144,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses openssl - aspell cjson + enchant gnutls gettext zlib diff --git a/pkgs/by-name/ad/adios2/package.nix b/pkgs/by-name/ad/adios2/package.nix index f5d73d9695b3..867476aea756 100644 --- a/pkgs/by-name/ad/adios2/package.nix +++ b/pkgs/by-name/ad/adios2/package.nix @@ -25,7 +25,9 @@ libffi, yaml-cpp, nlohmann_json, + openssl, llvmPackages, + gtest, ctestCheckHook, mpiCheckPhaseHook, testers, @@ -51,24 +53,24 @@ let }; in stdenv.mkDerivation (finalAttrs: { - version = "2.10.2"; + version = "2.11.0"; pname = "adios2"; src = fetchFromGitHub { owner = "ornladios"; repo = "adios2"; tag = "v${finalAttrs.version}"; - hash = "sha256-NVyw7xoPutXeUS87jjVv1YxJnwNGZAT4QfkBLzvQbwg="; + hash = "sha256-yHPI///17poiCEb7Luu5qfqxTWm9Nh+o9r57mZT26U0="; }; postPatch = '' chmod +x cmake/install/post/adios2-config.pre.sh.in patchShebangs cmake/install/post/{generate-adios2-config,adios2-config.pre}.sh.in - '' - # Dynamic cast to nullptr on darwin platform, switch to unsafe reinterpret cast. - + lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace bindings/Python/py11{Attribute,Engine,Variable}.cpp \ - --replace-fail "dynamic_cast" "reinterpret_cast" + + # use upstream GoogleTest.cmake + # see https://github.com/ornladios/ADIOS2/issues/4659 + substituteInPlace cmake/GoogleTest.cmake \ + --replace-fail 'CMAKE_VERSION VERSION_LESS 4' 'TRUE' ''; nativeBuildInputs = [ @@ -98,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { zlib yaml-cpp nlohmann_json + openssl # Todo: add these optional dependencies in nixpkgs. # sz @@ -105,11 +108,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform ucx) ucx ++ lib.optional (stdenv.hostPlatform.isLoongArch64) libffi - ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform zfp) zfp - # openmp required by zfp - ++ lib.optional ( - lib.meta.availableOn stdenv.hostPlatform zfp && stdenv.cc.isClang - ) llvmPackages.openmp; + ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform zfp) zfp; propagatedBuildInputs = lib.optional mpiSupport mpi @@ -145,11 +144,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ADIOS2_USE_UCX" (lib.meta.availableOn stdenv.hostPlatform ucx)) (lib.cmakeBool "ADIOS2_USE_Sodium" true) (lib.cmakeBool "ADIOS2_USE_Catalyst" true) + (lib.cmakeBool "ADIOS2_USE_OpenSSL" true) (lib.cmakeBool "ADIOS2_USE_Campaign" true) (lib.cmakeBool "ADIOS2_USE_AWSSDK" false) - # use vendored gtest as nixpkgs#gtest does not include in - (lib.cmakeBool "ADIOS2_USE_EXTERNAL_GTEST" false) (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) # higher MPIEXEC_MAX_NUMPROCS>8 might cause tests failure in # - Engine.BP.BPJoinedArray.MultiBlock.BP4.MPI @@ -175,51 +173,29 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; dontUseNinjaCheck = true; - preCheck = '' - export adios2_DIR=$PWD - ''; - enableParallelChecking = false; - enabledTestPaths = [ - "../testing/adios2/python/Test*.py" - ]; - __darwinAllowLocalNetworking = finalAttrs.finalPackage.doCheck && mpiSupport; nativeCheckInputs = [ python3Packages.python + gtest ctestCheckHook mpiCheckPhaseHook ]; - # required for finding the generated adios2-config.cmake file - preInstall = '' - export adios2_DIR=$out/lib/cmake/adios2 - ''; - pythonImportsCheck = [ "adios2" ]; passthru.tests = { - withCheck = finalAttrs.finalPackage.overrideAttrs { - doCheck = true; - - disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ - # TypeError: cannot pickle 'TextIOWrapper' instances - "Test.Engine.DataMan1xN.Serial" - "Test.Engine.DataManSingleValues" - # The test assumed to always contain n*64 byte-length records. Right now the length of index buffer is 71 bytes. - "Staging.1x1.Local2.BPS.BB.BP4_stream" - # Timeout - "Staging.3x5LockGeometry.FS.BB.FileStream" - "Engine.Staging.TestOnDemandMPI.ADIOS2OnDemandMPI.SST.MPI" - ]; - }; - cmake-config = testers.hasCmakeConfigModules { moduleNames = [ "adios2" ]; package = finalAttrs.finalPackage; }; + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + withCheck = finalAttrs.finalPackage.overrideAttrs { + doCheck = true; + }; }; meta = { diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix index a755e04092ef..1614c54183c7 100644 --- a/pkgs/by-name/al/alacritty/package.nix +++ b/pkgs/by-name/al/alacritty/package.nix @@ -44,8 +44,8 @@ let ]; in rustPlatform.buildRustPackage (finalAttrs: { - pname = "alacritty"; - version = if !withGraphics then "0.16.1" else "0.16.1-graphics"; + pname = "alacritty${lib.optionalString withGraphics "-graphics"}"; + version = "0.16.1"; src = # by default we want the official package @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: { fetchFromGitHub { owner = "ayosec"; repo = "alacritty"; - tag = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}-graphics"; hash = "sha256-e+o0GLy05qXEY4T57dCuqhukTKBSm1WIHzPUV8uswRI="; }; diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix index a6385cb47d7b..96b85e6e3334 100644 --- a/pkgs/by-name/al/algia/package.nix +++ b/pkgs/by-name/al/algia/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "algia"; - version = "0.0.87"; + version = "0.0.91"; src = fetchFromGitHub { owner = "mattn"; repo = "algia"; tag = "v${version}"; - hash = "sha256-8E48TLxA+kGObE08NJ3oFsLUY+y1LKQ6f8+kw7EhAzY="; + hash = "sha256-VsQBiD8OE2NHwMlYrCG43ukuBHE0bkKFt4BxsNUvLAo="; }; - vendorHash = "sha256-Yt95kSXAIBxHgX+VUefKrumg9thuvh3c+gnSu/2PSQY="; + vendorHash = "sha256-kp52vbvE6QY0SEY/2D1f1EbDzqweQkNOepN0We4I9ko="; meta = { description = "CLI application for nostr"; diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index 7f91805ccb6d..c4c83a74d3f1 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "0.30.26"; + version = "0.30.27"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-lJV5WyhbMC0L0kNzo/Yv1yWLAFZ69QojRUpamJnbf3U="; + hash = "sha256-lter7nuNM62J1+unCgnkG7pU6lvNK3LjXS6FaW8NDjY="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-BXWaXdlqaw2SACFGAebnmeQSWdq/htvWVqXVYcUlLP8="; + vendorHash = "sha256-1VKvW34w88Xc5/2h3WrutZK1ziGaLLgwf9bTSSIDF/A="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/bi/bitmap/package.nix b/pkgs/by-name/bi/bitmap/package.nix new file mode 100644 index 000000000000..a5dbc42e9daf --- /dev/null +++ b/pkgs/by-name/bi/bitmap/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + util-macros, + autoreconfHook, + wrapWithXFileSearchPathHook, + libx11, + libxaw, + xbitmaps, + libxmu, + xorgproto, + libxt, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "bitmap"; + version = "1.1.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "bitmap"; + tag = "bitmap-${finalAttrs.version}"; + hash = "sha256-UZxPc19jAqvJPwZSMf4seqxJNHeLOXA8bXh4y6D4gRE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + util-macros + autoreconfHook + wrapWithXFileSearchPathHook + ]; + + buildInputs = [ + libx11 + libxaw + xbitmaps + libxmu + xorgproto + libxt + ]; + + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=bitmap-(.*)" ]; }; + meta = { + description = "X bitmap (XBM) editor and converter utilities"; + homepage = "https://gitlab.freedesktop.org/xorg/app/bitmap"; + license = lib.licenses.mitOpenGroup; + mainProgram = "bitmap"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix index 3f3d27ddaff1..27bb9309e1df 100644 --- a/pkgs/by-name/bo/borgmatic/package.nix +++ b/pkgs/by-name/bo/borgmatic/package.nix @@ -15,12 +15,12 @@ }: python3Packages.buildPythonApplication rec { pname = "borgmatic"; - version = "2.0.11"; + version = "2.0.12"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-X8IrLAH0rwUOGWMx9tDHIL8DeII35YCOeZyD979x/gk="; + hash = "sha256-z2LOj7NW1S1C6hSsaeBKXYnrwS0XskOK9idwIfiA9Do="; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index 63e6d45e381c..18d7239562b3 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -17,7 +17,7 @@ }: stdenvNoCC.mkDerivation rec { - version = "1.3.2"; + version = "1.3.3"; pname = "bun"; src = @@ -87,19 +87,19 @@ stdenvNoCC.mkDerivation rec { sources = { "aarch64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip"; - hash = "sha256-2FhHmC21dFGBMKRVgrzxTY4r6WELZstQRsIDSFeLD+I="; + hash = "sha256-9Q9cx2fDiCxGZ1++B+C3sd9xpzzlRKrbU3rZJhrwC7E="; }; "aarch64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip"; - hash = "sha256-/jjBO2trRQr05PD7jgSyLspT+c1xBo0dHuv09KRPAvs="; + hash = "sha256-Qbn08lJW24l8LBNTIOT5bDc+IK5vBtgBUYfayDWR78g="; }; "x86_64-darwin" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-LW3aLD9Xp6m7qFJdUcQAbj2M7MS2rTP/ae4HZgbBN7w="; + hash = "sha256-oANEA7/9GLpms1yrL3nuU+2QmNfkbijgjn+2TYL58k4="; }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip"; - hash = "sha256-DLVqRIS9d2Sj7vm55nq0V4QJgSh7RnlJdNHmYSy/Zwk="; + hash = "sha256-9cVGc2+VUUFFneIxFntv33sBQY6L42CfLN6d/kapOj0="; }; }; updateScript = writeShellScript "update-bun" '' diff --git a/pkgs/by-name/ca/cargo-bundle/package.nix b/pkgs/by-name/ca/cargo-bundle/package.nix index 02a620561354..54eb345f941b 100644 --- a/pkgs/by-name/ca/cargo-bundle/package.nix +++ b/pkgs/by-name/ca/cargo-bundle/package.nix @@ -6,39 +6,56 @@ stdenv, libxkbcommon, wayland, + openssl, + squashfsTools, + makeWrapper, + versionCheckHook, + nix-update-script, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-bundle"; - # the latest stable release fails to build on darwin - version = "unstable-2023-08-18"; + version = "0.9.0"; src = fetchFromGitHub { owner = "burtonageo"; repo = "cargo-bundle"; - rev = "c9f7a182d233f0dc4ad84e10b1ffa0d44522ea43"; - hash = "sha256-n+c83pmCvFdNRAlcadmcZvYj+IRqUYeE8CJVWWYbWDQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-8Ulah5NtjQh5dIB/nhTrDstnaub4LS9iH33E1iv1JpY="; }; - cargoHash = "sha256-g898Oelrk/ok52raTEDhgtQ9psc0PFHd/uNnk1QeXCs="; + cargoHash = "sha256-qE0ZDq0UJHfsivvI1W44u/pVjKMDGrghSl7sfau/pIY="; nativeBuildInputs = [ pkg-config + makeWrapper ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxkbcommon wayland + openssl ]; - meta = with lib; { + postFixup = '' + wrapProgram $out/bin/cargo-bundle \ + --prefix PATH : ${lib.makeBinPath [ squashfsTools ]} + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + passthru.updateScript = nix-update-script { }; + + meta = { description = "Wrap rust executables in OS-specific app bundles"; mainProgram = "cargo-bundle"; homepage = "https://github.com/burtonageo/cargo-bundle"; - license = with licenses; [ + license = with lib.licenses; [ asl20 mit ]; - maintainers = [ ]; + maintainers = [ lib.maintainers.progrm_jarvis ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-valgrind/package.nix b/pkgs/by-name/ca/cargo-valgrind/package.nix index 84635d93252e..151709cecd67 100644 --- a/pkgs/by-name/ca/cargo-valgrind/package.nix +++ b/pkgs/by-name/ca/cargo-valgrind/package.nix @@ -35,6 +35,7 @@ rustPlatform.buildRustPackage rec { checkFlags = [ "--skip tests_are_runnable" "--skip default_cargo_project_reports_no_violations" + "--skip empty_tests_not_leak_in_release_mode" ]; meta = with lib; { diff --git a/pkgs/by-name/ce/cerberus/package.nix b/pkgs/by-name/ce/cerberus/package.nix index 44b819960dd2..6e588d63d961 100644 --- a/pkgs/by-name/ce/cerberus/package.nix +++ b/pkgs/by-name/ce/cerberus/package.nix @@ -12,13 +12,13 @@ }: ocamlPackages.buildDunePackage rec { pname = "cerberus"; - version = "0-unstable-2025-11-24"; + version = "0-unstable-2025-11-26"; src = fetchFromGitHub { owner = "rems-project"; repo = "cerberus"; - rev = "3946c7e757f338061c8e29079605424360d41cb3"; - hash = "sha256-aYWoGugqIBS2jpRkepO54wjitMQoCVeFf3cMpCUyZVU="; + rev = "6d60ef25944ebcdab892158c949a8e05501557dc"; + hash = "sha256-RucW01xuW5b6F9/O1OL99YJn3rSMCP7l7Cwjuv4PNIc="; }; patches = [ diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix index 10e9f2370019..d43c0e930ca5 100644 --- a/pkgs/by-name/cl/clickhouse/lts.nix +++ b/pkgs/by-name/cl/clickhouse/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "25.8.11.66-lts"; - rev = "fa393206741c830da77b8f1bcf18c753161932c8"; - hash = "sha256-LBAGiYLyo535j2FYTVbcfq20d9VisGXZMPbTpONBpQU="; + version = "25.8.12.129-lts"; + rev = "25db09bd0a09eb1576ae0ba56f6e52d9f2c4651e"; + hash = "sha256-86wHAzrEoRKH0x4WPXBGnR6iY3rK+pa7Sbent/Xg7Ss="; lts = true; } diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index 34d627680ed5..accc526c1a27 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -20,14 +20,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applets"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applets"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-4cQ3MFV2l75ZTMkc4lri48hPE21os6xygr3MDP7RSEA="; + hash = "sha256-4BH7qEoUf5UtpiQtk3WvgA3p/hAa58RnQ4jUjG8tpd0="; }; cargoHash = "sha256-XOA5yREoQHGxPI9PVYd2UsaHRCIfbb3Tkr1eovqIIow="; diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix index cca1ad004f8a..b393ff7dc5df 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-applibrary/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applibrary"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applibrary"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-G8zH66v5YLqF8p1WhCBnXeI2ac3igGCAFJTvgeTTCUE="; + hash = "sha256-u2DuATdE5qdOvSISizIQsZWnSKTgya9c42xehTwxl8Q="; }; cargoHash = "sha256-s+Q8hj8/dqwGpCq87BWTtk/PmAg55cMI/KLL96SaqUo="; diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index 801e3ec0ba06..98e5eebbe1c0 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-bg"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-bg"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-RPVPiMEwMh4DRixaC8A4oK9KzGIbi2CFlVAthICalt0="; + hash = "sha256-xChEpJFxilcJW07VgGiy8LNjDdjxbpBtYLEemrxp/2g="; }; postPatch = '' diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index 6283fd14850a..28508219b387 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -20,17 +20,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-comp"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-qE+m/LEe1ky+7A4PAzQrhZyguRsCID7IFwCx/yriYQE="; + hash = "sha256-MyE2C7oUMSIkNn03am/ytc1/oJITsAO7Ok3XV231EmA="; }; - cargoHash = "sha256-xaA0qwOxT/RNyUXOazJeO8oVR5pzxW15KFZ+IrWsL5o="; + cargoHash = "sha256-qlfCCHqjKX72hVj5Bgh1wKT7pMsy5vG1VEIqJk4prR8="; separateDebugInfo = true; diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index 5a34bef09c5b..3a2b7178a02b 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-edit"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-V3O4ktSJ1cLAgtFvHqzX0AanJdir/HfqdvgCiHINyxg="; + hash = "sha256-Zk4qo/2ZdlAv2g1gIoMfzRXwndmqtyIqtX/2Z1nmhLM="; }; - cargoHash = "sha256-ELQrRDTNAX5eWWjsmWfg8BCKnaM+tqncS2O4jA3N9W8="; + cargoHash = "sha256-6b6m6mZTa3Li74JCm6czR0VBc7H5IRTPr7yic3V1FL4="; postPatch = '' substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" diff --git a/pkgs/by-name/co/cosmic-ext-applet-external-monitor-brightness/package.nix b/pkgs/by-name/co/cosmic-ext-applet-external-monitor-brightness/package.nix index 0e6d051ed6b2..15a2e929283b 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-external-monitor-brightness/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-external-monitor-brightness/package.nix @@ -11,13 +11,13 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-external-monitor-brightness"; - version = "0.0.1-unstable-2025-09-17"; + version = "0.0.1-unstable-2025-11-27"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ext-applet-external-monitor-brightness"; - rev = "1f648171fcc1b187ca6603b78c650ea0f33daa79"; - hash = "sha256-QXQqHtXYoq2cg2DKL8DHZz2T+MsnCtI5mRJP036UC2U="; + rev = "3cfba2bbe5e622f887b8236304823fda67c33b46"; + hash = "sha256-UNfIH0Itm1fbRGfh8NdSGeOrm+H8t42yawcZmTjQLQ0="; }; cargoHash = "sha256-ou7iukl1pHMfcJNemwLdZYYxugbJJQ53XpCYowUTj90="; diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index d3660d35a6ce..ffe09417c879 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-files"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-files"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-6r2HBxp7sZ79MKZoONXmopKea2unqZ91xaq4l6QiE9w="; + hash = "sha256-jH88PzgHMbbtGc68v/7Azia+LrB1kfA7QdBJOVAsEs0="; }; - cargoHash = "sha256-L3a3gtqW5Zjufom8NDeklKe6rOnzd8sEaCPIVGsOqWM="; + cargoHash = "sha256-WPBK7/7l+Z69AFrqnDL6XszUcBHuZdKsNZ31HS+Ol4o="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index 0720afaf9958..ba5c3f8ac8aa 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -19,20 +19,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-greeter"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-greeter"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-r/xhJR3xtLxPusMUKzS2PGsS51m1jfoxZByJWcXLaoY="; + hash = "sha256-ldB9t+WMN/K5Xk6wO4lZ6+VJIDNI2iAl9240iRsvNCg="; }; cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc="; env = { - VERGEN_GIT_COMMIT_DATE = "2025-11-20"; + VERGEN_GIT_COMMIT_DATE = "2025-11-24"; VERGEN_GIT_SHA = finalAttrs.src.tag; }; diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 3a2f4630dfe3..61f3fa10ac3a 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -9,7 +9,7 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-icons"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index b68b2c03827c..5cf27060c9ad 100644 --- a/pkgs/by-name/co/cosmic-idle/package.nix +++ b/pkgs/by-name/co/cosmic-idle/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-idle"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix index daaab3772438..ab7e31549ad1 100644 --- a/pkgs/by-name/co/cosmic-initial-setup/package.nix +++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix @@ -14,14 +14,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-initial-setup"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-initial-setup"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-8dnReeMxkbu965x8VgTg3C6IPSK3wcqT1r0rklPksAw="; + hash = "sha256-iSxBd/0DsaId7PETZMZbN4uZHiUJmxzm/1KXRXDwpEo="; }; cargoHash = "sha256-jOPJiKPE3UUD/QHmb+6s6l2RVhtUFls3QRGQ6DmEFSE="; diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index a1ab169f9548..c46444d5932b 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-launcher"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-launcher"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-lVNvmpiShkdT+VZMxV1bvYyC17edaepwlkmOvNMng8k="; + hash = "sha256-+qSh2QaLbUcBbJi5nqyXmzAIZfqQhwQF/QBN8a7nY5U="; }; cargoHash = "sha256-pHW7kBbEQ8P9Ugkgzn1olSlMCeetuNQ2jMJyEteoeIo="; diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index 221320dd0ffe..04c5f8e62e4a 100644 --- a/pkgs/by-name/co/cosmic-notifications/package.nix +++ b/pkgs/by-name/co/cosmic-notifications/package.nix @@ -12,14 +12,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-notifications"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-notifications"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-OK+6qSQuu44t1uMt9ESg2L9h47wQmiCh1iZfXkO1vE0="; + hash = "sha256-2j6F2aYm/tqRlIk0i7HINGI1DuXhI3FX71ggXoPoPpY="; }; cargoHash = "sha256-kLvfZBHJbVSceqKuB9XFshTH4Sl54hKfm8H90RUszKk="; diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 5b19c4de318b..7df34845f39f 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -1,8 +1,10 @@ { lib, + stdenv, fetchFromGitHub, rustPlatform, libcosmicAppHook, + just, pulseaudio, pipewire, libinput, @@ -13,19 +15,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-osd"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-gAmsLScFKgs2bUf0c4NuP2Zuuz+vz8Y7w4uQtKzXSRo="; + hash = "sha256-mbsTDxd8vvkY0EQCOI8sXxY80odJgSAuuP2gNzy6HXo="; }; cargoHash = "sha256-cpNp/by8TU2lbb2d3smxUr48mTSLnoPXseiRZScwSXI="; nativeBuildInputs = [ + just libcosmicAppHook rustPlatform.bindgenHook ]; @@ -37,6 +40,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pipewire ]; + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" + ]; + env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1"; passthru = { @@ -48,6 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: { cosmic-autologin-noxwayland ; }; + updateScript = nix-update-script { extraArgs = [ "--version" diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index f1539687b7b1..9fc2c803691c 100644 --- a/pkgs/by-name/co/cosmic-panel/package.nix +++ b/pkgs/by-name/co/cosmic-panel/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-panel"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index 5b9032fa2ada..70bf397b220a 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -18,17 +18,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-player"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-player"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-RNDc+NCih1bsdqa4DCOrtiKPsdVaQ6fvj9VGQAoNri8="; + hash = "sha256-ocnPHk/7/McHPOPsHR3k6fEFAPVlXA729yN+9uQVedo="; }; - cargoHash = "sha256-ST/04USAIHvySOoKvh5EPCDlUOjHxbiRFouLunaleKw="; + cargoHash = "sha256-Z0+6jtvJ3z/ptcqrbvSuXgjH2liASNJwBIKiHbrVBT8="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index a921ee941fe8..1101e31c9c92 100644 --- a/pkgs/by-name/co/cosmic-randr/package.nix +++ b/pkgs/by-name/co/cosmic-randr/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-randr"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-randr"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-daP2YZ7B1LXzqh2n0KoSTJbitdK+hlZO+Ydt9behzmQ="; + hash = "sha256-g5s4TIk8nS3qPIAlWQC4D5A936+DYMbEEnU6v8iO9TI="; }; - cargoHash = "sha256-tkmBthh+nM3Mb9WoSjxMbx3t0NTf6lv91TwEwEANS6U="; + cargoHash = "sha256-ZStjzRqgCnRy1v2K1upUbioedmDaa1ml1gRNZc32Q00="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index aa0f12a16fcf..dde40f17d679 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-screenshot"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-screenshot"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-LaKopOd7HuDvXfE9zudoudCxGYfMkpru/PISzIrEARo="; + hash = "sha256-80PNYY6jiyKDFusF8c1feS6z4Is/6Azj9uEPlm0Ae3I="; }; cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o="; diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index 3efee330f80e..d7ac180b2d1e 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-session"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 5680859fe516..057c1819607c 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings-daemon"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 959d47d7f9b5..5f2282939c81 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -27,14 +27,14 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-CIY7SAS6WCn41mM+MpKaCm08cfnVIqFl+/t5u5717Lw="; + hash = "sha256-Z+MJMHcyqUnSKSUeYH5PyFFkzUQ33bkFoAd3m/TckrQ="; }; cargoHash = "sha256-Su+yAQLr3Us8YNU8z83XO1UDjjOY3SCGnkmwGaIGFho="; diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index 3c060790157b..8d2df5c76e0e 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -15,14 +15,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-store"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-store"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-6Qn9+kwuiArxTHpN410gy+7bKXBwv87OPPDMatAYr38="; + hash = "sha256-rrM0ibnapXv+IYDPqw/dXQJ44cDWPNlz7rREVQw5J1o="; }; cargoHash = "sha256-nJLowAuWvj5JfmPyExQyfCJ9pqNJ0OdzPPku9z7RDWc="; diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 789751c7e352..75eed0912f66 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-term"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-kyswCFnor2tg64BodSwiRYqzjxRN6r7zqm2z/egmX1I="; + hash = "sha256-RSW5oy5lYY15PbZaoxEwLy6g1+I0pOFBNR3pN5HuEqE="; }; - cargoHash = "sha256-7+1tvJ/B+YITI5XXr1A+jlRRNRoNZ1ZsGeeAfGPT/00="; + cargoHash = "sha256-gLPNX9CEortxDPM9+QYiHlCTPINnoYL1P90HWVPcezY="; nativeBuildInputs = [ just diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index 2312df47ac71..e217cfd1ef95 100644 --- a/pkgs/by-name/co/cosmic-wallpapers/package.nix +++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-wallpapers"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index 0beaa33ca243..7b7f2e5b331b 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-workspaces-epoch"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-workspaces-epoch"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-7iOiVrMHpE5oG/qIH0DIgBeHEEm0x7HIDLv64FFs300="; + hash = "sha256-XsBOT4AUdw9cA1wjHzS0StbSIt4z3tEMnnJdegdsROI="; }; cargoHash = "sha256-7BdyHz66A+QhJY0haohaQiNkhpmX9rqIW9gD8E4Q7Qg="; diff --git a/pkgs/by-name/ct/ctranslate2/package.nix b/pkgs/by-name/ct/ctranslate2/package.nix index f97a6e1e4658..e98c1b789195 100644 --- a/pkgs/by-name/ct/ctranslate2/package.nix +++ b/pkgs/by-name/ct/ctranslate2/package.nix @@ -72,6 +72,9 @@ stdenv'.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (lib.cmakeBool "WITH_ACCELERATE" true) + ] + ++ lib.optionals (stdenv.hostPlatform.gcc.arch or null != null) [ + (lib.cmakeBool "ENABLE_CPU_DISPATCH" false) ]; buildInputs = diff --git a/pkgs/by-name/do/docfd/package.nix b/pkgs/by-name/do/docfd/package.nix index c8ea6c3c58f7..53e47abc764f 100644 --- a/pkgs/by-name/do/docfd/package.nix +++ b/pkgs/by-name/do/docfd/package.nix @@ -14,7 +14,7 @@ ocamlPackages.buildDunePackage rec { pname = "docfd"; - version = "12.1.0"; + version = "12.2.0"; minimalOCamlVersion = "5.1"; @@ -22,7 +22,7 @@ ocamlPackages.buildDunePackage rec { owner = "darrenldl"; repo = "docfd"; rev = version; - hash = "sha256-fDvjnqAH0ALP1im34vxmXtO7kst0G/iPu3VLLBas5YI="; + hash = "sha256-0URs7X94/2D0WLpVBXjYZ3zDR3uGXSVG+WLdsAqVKBg="; }; # Compatibility with nottui ≥ 0.4 diff --git a/pkgs/by-name/do/dolfinx/package.nix b/pkgs/by-name/do/dolfinx/package.nix index 93def43bc33b..a44c7e147ce6 100644 --- a/pkgs/by-name/do/dolfinx/package.nix +++ b/pkgs/by-name/do/dolfinx/package.nix @@ -12,7 +12,6 @@ kahip, adios2, python3Packages, - darwinMinVersionHook, catch2_3, withParmetis ? false, }: @@ -26,20 +25,16 @@ let ); in stdenv.mkDerivation (finalAttrs: { - version = "0.10.0.post3"; + version = "0.10.0.post4"; pname = "dolfinx"; src = fetchFromGitHub { owner = "fenics"; repo = "dolfinx"; tag = "v${finalAttrs.version}"; - hash = "sha256-YsFya92lz9Twc1PsSLGj6tJNvKb+MQfpmN/qOFxbe34="; + hash = "sha256-vzP5vBZpUR4HW6yJw1wFtbo/TiZ/k02TXV2Zk42b5aQ="; }; - preConfigure = '' - cd cpp - ''; - nativeBuildInputs = [ cmake pkg-config @@ -49,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { dolfinxPackages.kahip dolfinxPackages.scotch ] - ++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3") ++ lib.optional withParmetis dolfinxPackages.parmetis; propagatedBuildInputs = [ @@ -64,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: { python3Packages.fenics-ffcx ]; + cmakeDir = "../cpp"; + cmakeFlags = [ (lib.cmakeBool "DOLFINX_ENABLE_ADIOS2" true) (lib.cmakeBool "DOLFINX_ENABLE_PETSC" true) @@ -81,9 +77,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "${finalAttrs.pname}-unittests"; inherit (finalAttrs) version src; - preConfigure = '' - cd cpp/test - ''; + cmakeDir = "../cpp/test"; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ed/editres/package.nix b/pkgs/by-name/ed/editres/package.nix index 63ec3f9d74d7..e75421201235 100644 --- a/pkgs/by-name/ed/editres/package.nix +++ b/pkgs/by-name/ed/editres/package.nix @@ -1,40 +1,70 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, pkg-config, - libXt, - libXaw, - libXres, - utilmacros, + util-macros, + autoreconfHook, + wrapWithXFileSearchPathHook, + libx11, + libxaw, + libxkbfile, + libxmu, + libxres, + libxt, + xorgproto, + nix-update-script, }: - -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "editres"; - version = "1.0.8"; + version = "1.0.9"; - src = fetchurl { - url = "mirror://xorg/individual/app/editres-${version}.tar.gz"; - sha256 = "sha256-LVbWB3vHZ6+n4DD+ssNy/mvok/7EApoj9FodVZ/YRq4="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "editres"; + tag = "editres-${finalAttrs.version}"; + hash = "sha256-fdp6j8zS8mtzHpG9js9c8iIt1vsKsqGG9MdkpLh8UB0="; }; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libXt - libXaw - libXres - utilmacros - ]; - - configureFlags = [ "--with-appdefaultdir=$(out)/share/X11/app-defaults/editres" ]; + strictDeps = true; hardeningDisable = [ "format" ]; - meta = with lib; { - homepage = "https://cgit.freedesktop.org/xorg/app/editres/"; + nativeBuildInputs = [ + pkg-config + util-macros + autoreconfHook + wrapWithXFileSearchPathHook + ]; + + buildInputs = [ + libx11 + libxaw + libxkbfile + libxmu + libxres + libxt + xorgproto + ]; + + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=editres-(.*)" ]; }; + + meta = { description = "Dynamic resource editor for X Toolkit applications"; - license = licenses.mit; - platforms = platforms.linux; + longDescription = '' + Editres is a tool that allows users and application developers to view the full widget + hierarchy of any Xt Toolkit application that speaks the Editres protocol. In addition, editres + will help the user construct resource specifications, allow the user to apply the resource + to the application and view the results dynamically. Once the user is happy with a resource + specification editres will append the resource string to the user's X Resources file. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/editres"; + license = lib.licenses.mitOpenGroup; mainProgram = "editres"; + platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index 9adad1a48c13..2188cc20ee1e 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -33,14 +33,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "edk2"; - version = "202508.01"; + version = "202511"; srcWithVendoring = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; tag = "edk2-stable${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-BgNNKA+YFeaZDm1mLzBN3VA7RAwNT9MXV3JX5ZLrFOo="; + hash = "sha256-R/rgz8dWcDYVoiM67K2UGuq0xXbjjJYBPtJ1FmfGIaU="; }; src = applyPatches { diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix index 29f5571c974f..0b262a893a46 100644 --- a/pkgs/by-name/ei/eigenwallet/package.nix +++ b/pkgs/by-name/ei/eigenwallet/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenwallet"; - version = "3.3.7"; + version = "3.3.8"; src = fetchurl { url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb"; - hash = "sha256-F0EzdEG9/+LzINOL59wgYSvvzeTC0im8hB8UZxEphZM="; + hash = "sha256-Q6KCmLwgk6Z/MhsKWevl9IZmG//Z9zEvawwhj241SrY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 742ea62f648a..1b88c0abfe5f 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,13 +17,13 @@ }: let - version = "0.210.2"; + version = "0.211.0"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-163giiFxlvu0Jq+59fOM4W2NTKb2ZVZ4rBdT7cY1HyE="; + hash = "sha256-nbRXQ+3nAH32J4QegfeeFT+4TqdsTcIhxhAC6e9DyR8="; }; vendorHash = "sha256-arrEWH3rspwynRXf43sElliEJ2kBxhikz1ZGS1+gDes="; diff --git a/pkgs/by-name/fi/fim-rs/Cargo.lock b/pkgs/by-name/fi/fim-rs/Cargo.lock index a9303453c613..3d367b65ef6f 100644 --- a/pkgs/by-name/fi/fim-rs/Cargo.lock +++ b/pkgs/by-name/fi/fim-rs/Cargo.lock @@ -1,21 +1,21 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aes" @@ -29,28 +29,40 @@ dependencies = [ ] [[package]] -name = "aho-corasick" -version = "1.1.3" +name = "ahash" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "aho-corasick" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" dependencies = [ "memchr", ] [[package]] name = "arbitrary" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" dependencies = [ "derive_arbitrary", ] [[package]] name = "async-stream" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" dependencies = [ "async-stream-impl", "futures-core", @@ -59,9 +71,9 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" dependencies = [ "proc-macro2", "quote", @@ -69,24 +81,24 @@ dependencies = [ ] [[package]] -name = "autocfg" -version = "1.3.0" +name = "atomic-waker" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-link", ] [[package]] @@ -103,9 +115,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "block-buffer" @@ -117,65 +129,58 @@ dependencies = [ ] [[package]] -name = "bumpalo" -version = "3.16.0" +name = "block2" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytes" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" +checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" dependencies = [ - "bzip2-sys", - "libc", + "objc2", ] [[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" +name = "bumpalo" +version = "3.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" + +[[package]] +name = "bytes" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" + +[[package]] +name = "bzip2" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3a53fac24f34a81bc9954b5d6cfce0c21e18ec6959f44f56e8e90e4bb7c346c" dependencies = [ - "cc", - "libc", - "pkg-config", + "libbz2-rs-sys", ] [[package]] name = "cc" -version = "1.1.7" +version = "1.2.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +checksum = "c481bdbf0ed3b892f6f806287d72acd515b352a4ec27a208489b8c1bc839633a" dependencies = [ + "find-msvc-tools", "jobserver", "libc", + "shlex", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" -version = "0.1.1" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "cipher" @@ -187,74 +192,50 @@ dependencies = [ "inout", ] -[[package]] -name = "cmake" -version = "0.1.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" -dependencies = [ - "cc", -] - [[package]] name = "constant_time_eq" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" dependencies = [ "libc", ] -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - [[package]] name = "crc32fast" -version = "1.4.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] [[package]] name = "crossbeam-channel" -version = "0.5.13" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.20" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crypto-common" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +checksum = "78c8292055d1c1df0cce5d180393dc8cce0abec0a7102adb6c7b1eef6016d60a" dependencies = [ "generic-array", "typenum", @@ -262,34 +243,35 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.4" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +checksum = "73736a89c4aff73035ba2ed2e565061954da00d4970fc9ac25dcc85a2a20d790" dependencies = [ + "dispatch2", "nix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "deflate64" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b" +checksum = "26bf8fc351c5ed29b5c2f0cbbac1b209b74f60ecd62e675a998df72c49af5204" [[package]] name = "deranged" -version = "0.3.11" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587" dependencies = [ "powerfmt", ] [[package]] name = "derive_arbitrary" -version = "1.3.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" +checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" dependencies = [ "proc-macro2", "quote", @@ -307,6 +289,18 @@ dependencies = [ "subtle", ] +[[package]] +name = "dispatch2" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec" +dependencies = [ + "bitflags 2.10.0", + "block2", + "libc", + "objc2", +] + [[package]] name = "displaydoc" version = "0.2.5" @@ -320,41 +314,53 @@ dependencies = [ [[package]] name = "either" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" [[package]] name = "equivalent" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] -name = "filetime" -version = "0.2.23" +name = "fallible-iterator" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" + +[[package]] +name = "fallible-streaming-iterator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" + +[[package]] +name = "filetime" +version = "0.2.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.60.2", ] [[package]] name = "fim" -version = "0.5.0" +version = "0.6.1" dependencies = [ "ctrlc", "flate2", @@ -367,7 +373,10 @@ dependencies = [ "notify", "regex", "reqwest", + "rusqlite", "serde_json", + "serial_test", + "sha2", "sha3", "simplelog", "tar", @@ -376,33 +385,34 @@ dependencies = [ "tokio-test", "tokio-util", "uuid", + "walkdir", "windows-service", "yaml-rust", "zip", ] [[package]] -name = "flate2" -version = "1.0.31" +name = "find-msvc-tools" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +checksum = "3a3076410a55c90011c298b04d0cfa770b00fa04e1e3c97d3f6c9de105a03844" + +[[package]] +name = "flate2" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", - "libz-ng-sys", + "libz-rs-sys", "miniz_oxide", ] -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - [[package]] name = "form_urlencoded" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf" dependencies = [ "percent-encoding", ] @@ -418,9 +428,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876" dependencies = [ "futures-channel", "futures-core", @@ -433,9 +443,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -443,15 +453,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" dependencies = [ "futures-core", "futures-task", @@ -460,15 +470,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -477,21 +487,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -517,42 +527,70 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.4.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" +checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" dependencies = [ - "libc", - "windows-targets 0.48.5", + "rustix", + "windows-link", ] [[package]] name = "getrandom" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "r-efi", + "wasip2", + "wasm-bindgen", ] [[package]] name = "gimli" -version = "0.29.0" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" [[package]] name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +dependencies = [ + "ahash", +] [[package]] -name = "hermit-abi" -version = "0.3.9" +name = "hashbrown" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" + +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] [[package]] name = "hex" @@ -571,12 +609,11 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" dependencies = [ "bytes", - "fnv", "itoa", ] @@ -592,12 +629,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ "bytes", - "futures-util", + "futures-core", "http", "http-body", "pin-project-lite", @@ -605,24 +642,26 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" [[package]] name = "hyper" -version = "1.4.1" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" dependencies = [ + "atomic-waker", "bytes", "futures-channel", - "futures-util", + "futures-core", "http", "http-body", "httparse", "itoa", "pin-project-lite", + "pin-utils", "smallvec", "tokio", "want", @@ -630,11 +669,10 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" dependencies = [ - "futures-util", "http", "hyper", "hyper-util", @@ -648,42 +686,138 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "52e9a2a24dc5c6821e71a7030e1e14b7b632acac55c40e9d2e082c621261bb56" dependencies = [ + "base64", "bytes", "futures-channel", + "futures-core", "futures-util", "http", "http-body", "hyper", + "ipnet", + "libc", + "percent-encoding", "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] [[package]] -name = "idna" -version = "0.5.0" +name = "icu_collections" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "displaydoc", + "potential_utf", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locale_core" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_normalizer" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599" +dependencies = [ + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a" + +[[package]] +name = "icu_properties" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99" +dependencies = [ + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899" + +[[package]] +name = "icu_provider" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614" +dependencies = [ + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", +] + +[[package]] +name = "idna" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de" +dependencies = [ + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] name = "indexmap" -version = "2.3.0" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.16.1", ] [[package]] @@ -708,49 +842,61 @@ dependencies = [ [[package]] name = "inout" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01" dependencies = [ "generic-array", ] [[package]] name = "ipnet" -version = "2.9.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "iri-string" +version = "0.7.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397" +dependencies = [ + "memchr", + "serde", +] [[package]] name = "itertools" -version = "0.12.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jobserver" -version = "0.1.32" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" +checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33" dependencies = [ + "getrandom 0.3.4", "libc", ] [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "464a3709c7f55f1f721e5389aa6ea4e3bc6aba669353300af094b29ffbdde1d8" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -765,9 +911,9 @@ dependencies = [ [[package]] name = "kqueue" -version = "1.0.8" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" dependencies = [ "kqueue-sys", "libc", @@ -784,19 +930,66 @@ dependencies = [ ] [[package]] -name = "libc" -version = "0.2.155" +name = "libbz2-rs-sys" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "2c4a545a15244c7d945065b5d392b2d2d7f21526fba56ce51467b06ed445e8f7" [[package]] -name = "libz-ng-sys" -version = "1.1.15" +name = "libc" +version = "0.2.177" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6409efc61b12687963e602df8ecf70e8ddacf95bc6576bcf16e3ac6328083c5" +checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976" + +[[package]] +name = "liblzma" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73c36d08cad03a3fbe2c4e7bb3a9e84c57e4ee4135ed0b065cade3d98480c648" dependencies = [ - "cmake", + "liblzma-sys", +] + +[[package]] +name = "liblzma-sys" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01b9596486f6d60c3bbe644c0e1be1aa6ccc472ad630fe8927b456973d7cb736" +dependencies = [ + "cc", "libc", + "pkg-config", +] + +[[package]] +name = "libredox" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb" +dependencies = [ + "bitflags 2.10.0", + "libc", + "redox_syscall", +] + +[[package]] +name = "libsqlite3-sys" +version = "0.30.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +dependencies = [ + "cc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "libz-rs-sys" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd" +dependencies = [ + "zlib-rs", ] [[package]] @@ -807,21 +1000,30 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] name = "linux-raw-sys" -version = "0.4.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" [[package]] -name = "lockfree-object-pool" -version = "0.1.6" +name = "litemap" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e" +checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77" + +[[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] [[package]] name = "log" -version = "0.4.22" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "log-panics" @@ -834,34 +1036,25 @@ dependencies = [ ] [[package]] -name = "lzma-rs" -version = "0.3.0" +name = "lru-slab" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" -dependencies = [ - "byteorder", - "crc", -] +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" - -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ - "adler", + "adler2", + "simd-adler32", ] [[package]] @@ -878,23 +1071,22 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873" dependencies = [ - "hermit-abi", "libc", "wasi", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "nix" -version = "0.28.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.10.0", "cfg-if", "cfg_aliases", "libc", @@ -906,7 +1098,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.10.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -925,27 +1117,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" -[[package]] -name = "num_enum" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "num_threads" version = "0.1.7" @@ -956,19 +1127,57 @@ dependencies = [ ] [[package]] -name = "object" -version = "0.36.3" +name = "objc2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9" +checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05" +dependencies = [ + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" + +[[package]] +name = "object" +version = "0.37.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.19.0" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + +[[package]] +name = "parking_lot" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-link", +] [[package]] name = "pbkdf2" @@ -982,35 +1191,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -1020,9 +1209,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + +[[package]] +name = "potential_utf" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77" +dependencies = [ + "zerovec", +] [[package]] name = "powerfmt" @@ -1031,39 +1229,37 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] -name = "ppv-lite86" -version = "0.2.20" +name = "ppmd-rust" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "d558c559f0450f16f2a27a1f017ef38468c1090c9ce63c8e51366232d53717b4" + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ "zerocopy", ] -[[package]] -name = "proc-macro-crate" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" -dependencies = [ - "toml_edit", -] - [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" dependencies = [ "bytes", + "cfg_aliases", "pin-project-lite", "quinn-proto", "quinn-udp", @@ -1073,63 +1269,74 @@ dependencies = [ "thiserror", "tokio", "tracing", + "web-time", ] [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" dependencies = [ "bytes", + "getrandom 0.3.4", + "lru-slab", "rand", "ring", "rustc-hash", "rustls", + "rustls-pki-types", "slab", "thiserror", "tinyvec", "tracing", + "web-time", ] [[package]] name = "quinn-udp" -version = "0.5.4" +version = "0.5.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" dependencies = [ + "cfg_aliases", "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f" dependencies = [ "proc-macro2", ] [[package]] -name = "rand" -version = "0.8.5" +name = "r-efi" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ - "libc", "rand_chacha", "rand_core", ] [[package]] name = "rand_chacha" -version = "0.3.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", "rand_core", @@ -1137,27 +1344,27 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.4" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ - "getrandom", + "getrandom 0.3.4", ] [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.10.0", ] [[package]] name = "regex" -version = "1.10.6" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", @@ -1167,9 +1374,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -1178,15 +1385,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f" dependencies = [ "base64", "bytes", @@ -1198,16 +1405,12 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-util", - "ipnet", "js-sys", "log", - "mime", - "once_cell", "percent-encoding", "pin-project-lite", "quinn", "rustls", - "rustls-pemfile", "rustls-pki-types", "serde", "serde_json", @@ -1216,6 +1419,8 @@ dependencies = [ "tokio", "tokio-rustls", "tokio-util", + "tower", + "tower-http", "tower-service", "url", "wasm-bindgen", @@ -1223,54 +1428,66 @@ dependencies = [ "wasm-streams", "web-sys", "webpki-roots", - "winreg", ] [[package]] name = "ring" -version = "0.17.8" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.16", "libc", - "spin", "untrusted", "windows-sys 0.52.0", ] [[package]] -name = "rustc-demangle" -version = "0.1.24" +name = "rusqlite" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "7753b721174eb8ff87a9a0e799e2d7bc3749323e773db92e0984debb00019d6e" +dependencies = [ + "bitflags 2.10.0", + "fallible-iterator", + "fallible-streaming-iterator", + "hashlink", + "libsqlite3-sys", + "smallvec", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace" [[package]] name = "rustc-hash" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" +checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d" [[package]] name = "rustix" -version = "0.38.34" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.10.0", "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f" dependencies = [ "once_cell", "ring", @@ -1281,26 +1498,20 @@ dependencies = [ ] [[package]] -name = "rustls-pemfile" -version = "2.1.3" +name = "rustls-pki-types" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "708c0f9d5f54ba0272468c1d306a52c495b31fa155e91bc25371e6df7996908c" dependencies = [ - "base64", - "rustls-pki-types", + "web-time", + "zeroize", ] -[[package]] -name = "rustls-pki-types" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" - [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.103.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52" dependencies = [ "ring", "rustls-pki-types", @@ -1308,10 +1519,16 @@ dependencies = [ ] [[package]] -name = "ryu" -version = "1.0.18" +name = "rustversion" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" + +[[package]] +name = "ryu" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "same-file" @@ -1323,19 +1540,50 @@ dependencies = [ ] [[package]] -name = "serde" -version = "1.0.204" +name = "scc" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc" +dependencies = [ + "sdd", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sdd" +version = "3.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca" + +[[package]] +name = "serde" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.228" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.228" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", @@ -1344,14 +1592,15 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.145" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c" dependencies = [ "itoa", "memchr", "ryu", "serde", + "serde_core", ] [[package]] @@ -1366,6 +1615,31 @@ dependencies = [ "serde", ] +[[package]] +name = "serial_test" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b258109f244e1d6891bf1053a55d63a5cd4f8f4c30cf9a1280989f80e7a1fa9" +dependencies = [ + "futures", + "log", + "once_cell", + "parking_lot", + "scc", + "serial_test_derive", +] + +[[package]] +name = "serial_test_derive" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sha1" version = "0.10.6" @@ -1377,6 +1651,27 @@ dependencies = [ "digest", ] +[[package]] +name = "sha2" +version = "0.10.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", + "sha2-asm", +] + +[[package]] +name = "sha2-asm" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b845214d6175804686b2bd482bcffe96651bb2d1200742b712003504a2dac1ab" +dependencies = [ + "cc", +] + [[package]] name = "sha3" version = "0.10.8" @@ -1387,6 +1682,12 @@ dependencies = [ "keccak", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "simd-adler32" version = "0.3.7" @@ -1406,34 +1707,31 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" [[package]] name = "smallvec" -version = "1.13.2" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "socket2" -version = "0.5.7" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.60.2", ] [[package]] -name = "spin" -version = "0.9.8" +name = "stable_deref_trait" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "subtle" @@ -1443,9 +1741,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.72" +version = "2.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "390cc9a294ab71bdb1aa2e99d13be9c753cd2d7bd6560c77118597410c4d2e87" dependencies = [ "proc-macro2", "quote", @@ -1454,15 +1752,29 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + +[[package]] +name = "synstructure" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "tar" -version = "0.4.41" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a" dependencies = [ "filetime", "libc", @@ -1480,18 +1792,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "2.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", @@ -1500,9 +1812,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d" dependencies = [ "deranged", "itoa", @@ -1517,25 +1829,35 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.2" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3" dependencies = [ "num-conv", "time-core", ] [[package]] -name = "tinyvec" -version = "1.8.0" +name = "tinystr" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869" +dependencies = [ + "displaydoc", + "zerovec", +] + +[[package]] +name = "tinyvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" dependencies = [ "tinyvec_macros", ] @@ -1548,25 +1870,24 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.2" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", "libc", - "mio 1.0.1", + "mio 1.1.0", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", @@ -1575,20 +1896,19 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" dependencies = [ "rustls", - "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -1610,9 +1930,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594" dependencies = [ "bytes", "futures-core", @@ -1621,55 +1941,56 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml_datetime" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" - -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow", -] - [[package]] name = "tower" -version = "0.4.13" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", - "pin-project", "pin-project-lite", + "sync_wrapper", "tokio", "tower-layer", "tower-service", ] [[package]] -name = "tower-layer" -version = "0.3.2" +name = "tower-http" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "9cf146f99d442e8e68e585f5d798ccd3cad9a7835b917e09728880a862706456" +dependencies = [ + "bitflags 2.10.0", + "bytes", + "futures-util", + "http", + "http-body", + "iri-string", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "2d15d90a0b5c19378952d479dc858407149d7bb45a14de0142f6c534b16fc647" dependencies = [ "pin-project-lite", "tracing-core", @@ -1677,9 +1998,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "7a04e24fab5c89c6a36eb8558c9656f30d81de51dfa4d3b45f26b21d61fa0a6c" dependencies = [ "once_cell", ] @@ -1692,30 +2013,15 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.17.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "untrusted" @@ -1725,24 +2031,37 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.2" +version = "2.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b" dependencies = [ "form_urlencoded", "idna", "percent-encoding", + "serde", ] [[package]] -name = "uuid" -version = "1.10.0" +name = "utf8_iter" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + +[[package]] +name = "uuid" +version = "1.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2" dependencies = [ - "getrandom", + "getrandom 0.3.4", ] +[[package]] +name = "vcpkg" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + [[package]] name = "version_check" version = "0.9.5" @@ -1770,52 +2089,50 @@ dependencies = [ [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] -name = "wasm-bindgen" -version = "0.2.92" +name = "wasip2" +version = "1.0.1+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7" dependencies = [ - "cfg-if", - "wasm-bindgen-macro", + "wit-bindgen", ] [[package]] -name = "wasm-bindgen-backend" -version = "0.2.92" +name = "wasm-bindgen" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "0d759f433fa64a2d763d1340820e46e111a7a5ab75f993d1852d70b03dbb80fd" dependencies = [ - "bumpalo", - "log", + "cfg-if", "once_cell", - "proc-macro2", - "quote", - "syn", + "rustversion", + "wasm-bindgen-macro", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "836d9622d604feee9e5de25ac10e3ea5f2d65b41eac0d9ce72eb5deae707ce7c" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "48cb0d2638f8baedbc542ed444afc0644a29166f1595371af4fecf8ce1e7eeb3" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1823,28 +2140,31 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "cefb59d5cd5f92d9dcf80e4683949f15ca4b511f4ac0a6e14d4e1ac60c6ecd40" dependencies = [ + "bumpalo", "proc-macro2", "quote", "syn", - "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "cbc538057e648b67f72a982e708d485b2efa771e1ac05fec311f9f63e5800db4" +dependencies = [ + "unicode-ident", +] [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" dependencies = [ "futures-util", "js-sys", @@ -1855,9 +2175,19 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "9b32828d774c412041098d182a8b38b16ea816958e07cf40eec2bc080ae137ac" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ "js-sys", "wasm-bindgen", @@ -1865,35 +2195,41 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e" dependencies = [ "rustls-pki-types", ] [[package]] name = "widestring" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311" +checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471" [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + [[package]] name = "windows-service" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24d6bcc7f734a4091ecf8d7a64c5f7d7066f45585c1861eba06449909609c8a" dependencies = [ - "bitflags 2.6.0", + "bitflags 2.10.0", "widestring", "windows-sys 0.52.0", ] @@ -1918,11 +2254,20 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.59.0" +version = "0.60.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" dependencies = [ - "windows-targets 0.52.6", + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", ] [[package]] @@ -1949,13 +2294,30 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -1968,6 +2330,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -1980,6 +2348,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -1992,12 +2366,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + [[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_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -2010,6 +2396,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -2022,6 +2414,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -2034,6 +2432,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -2047,32 +2451,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] -name = "winnow" -version = "0.5.40" +name = "windows_x86_64_msvc" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] -name = "winreg" -version = "0.52.0" +name = "wit-bindgen" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] +checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" + +[[package]] +name = "writeable" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "xattr" -version = "1.3.1" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", - "linux-raw-sys", "rustix", ] @@ -2086,20 +2488,42 @@ dependencies = [ ] [[package]] -name = "zerocopy" -version = "0.7.35" +name = "yoke" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerocopy" +version = "0.8.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" dependencies = [ - "byteorder", "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" dependencies = [ "proc-macro2", "quote", @@ -2107,75 +2531,147 @@ dependencies = [ ] [[package]] -name = "zeroize" -version = "1.8.1" +name = "zerofrom" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" +checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zeroize" +version = "1.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +dependencies = [ + "zeroize_derive", +] + +[[package]] +name = "zeroize_derive" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "zerotrie" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "zip" -version = "1.1.4" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" +checksum = "caa8cd6af31c3b31c6631b8f483848b91589021b28fffe50adada48d4f4d2ed1" dependencies = [ "aes", "arbitrary", "bzip2", "constant_time_eq", "crc32fast", - "crossbeam-utils", "deflate64", - "displaydoc", "flate2", + "getrandom 0.3.4", "hmac", "indexmap", - "lzma-rs", - "num_enum", + "liblzma", + "memchr", "pbkdf2", + "ppmd-rust", "sha1", - "thiserror", "time", + "zeroize", "zopfli", "zstd", ] [[package]] -name = "zopfli" -version = "0.8.1" +name = "zlib-rs" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946" +checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2" + +[[package]] +name = "zopfli" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249" dependencies = [ "bumpalo", "crc32fast", - "lockfree-object-pool", "log", - "once_cell", "simd-adler32", ] [[package]] name = "zstd" -version = "0.13.2" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" +checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.2.1" +version = "7.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a3ab4db68cea366acc5c897c7b4d4d1b8994a9cd6e6f841f8964566a419059" +checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.13+zstd.1.5.6" +version = "2.0.16+zstd.1.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa" +checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" dependencies = [ "cc", "pkg-config", diff --git a/pkgs/by-name/fi/fim-rs/package.nix b/pkgs/by-name/fi/fim-rs/package.nix index dd3e2abc9ee6..c25b1a1d6f68 100644 --- a/pkgs/by-name/fi/fim-rs/package.nix +++ b/pkgs/by-name/fi/fim-rs/package.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "fim-rs"; - version = "0.5.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Achiefs"; repo = "fim"; tag = "v${version}"; - hash = "sha256-V9BzgVcDTnYSy7N5fCo38vQmXRDXLjY6wvnSkIpuDGg="; + hash = "sha256-xJzglrNB5rqaRQTgRFIl8/AXjeDwFPykIE5LJwJ3cX4="; }; cargoLock = { @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { ZSTD_SYS_USE_PKG_CONFIG = true; }; - # There is a failure while the binary is checked + # Relies on /var/lib/fim existing, but /var is not available under nix-build. doCheck = false; meta = { diff --git a/pkgs/by-name/fo/fonttosfnt/package.nix b/pkgs/by-name/fo/fonttosfnt/package.nix new file mode 100644 index 000000000000..f7228391f4f9 --- /dev/null +++ b/pkgs/by-name/fo/fonttosfnt/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + util-macros, + autoreconfHook, + libfontenc, + freetype, + xorgproto, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "fonttosfnt"; + version = "1.2.4"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "fonttosfnt"; + tag = "fonttosfnt-${finalAttrs.version}"; + hash = "sha256-DPPouSLsPurJ7fscxraF9HEYENbuCvZcxZ44bBY7ytU="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + util-macros + autoreconfHook + ]; + + buildInputs = [ + libfontenc + freetype + xorgproto + ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=fonttosfnt-(.*)" ]; }; + + meta = { + description = "Wraps a set of bdf or pcf bitmap fonts in a sfnt (TrueType or OpenType) wrapper"; + homepage = "https://gitlab.freedesktop.org/xorg/app/fonttosfnt"; + license = lib.licenses.mit; + mainProgram = "fonttosfnt"; + maintainers = [ ]; + platforms = lib.platforms.unix; + # something about missing `gzgetc` `gzopen` and `gzclose` + # works on pkgsMusl so definitely a static problem + broken = stdenv.hostPlatform.isStatic; + }; +}) diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix index c8f57b7ddcbb..d5914f7e9c77 100644 --- a/pkgs/by-name/fo/forge-mtg/package.nix +++ b/pkgs/by-name/fo/forge-mtg/package.nix @@ -16,13 +16,13 @@ }: let - version = "2.0.06"; + version = "2.0.07"; src = fetchFromGitHub { owner = "Card-Forge"; repo = "forge"; rev = "forge-${version}"; - hash = "sha256-/V8Ce1r68Svf4TQ/zgIqSWjqIFr1uJOmv+aRNLm1qE4="; + hash = "sha256-hPE++/wcK0jkhM4LYt09HZPL6tUVajHaKxXxBYhBw2g="; }; # launch4j downloads and runs a native binary during the package phase. @@ -33,7 +33,7 @@ maven.buildMavenPackage { pname = "forge-mtg"; inherit version src patches; - mvnHash = "sha256-DeYmCmsDdNOVMlD+SwvSB2VdqvCDwKghXlyaDuamHiY="; + mvnHash = "sha256-nAhULH7DGO0gkIyHwVmhvyO2lqmBpFWkfiCgtuK9T3A="; doCheck = false; # Needs a running Xorg diff --git a/pkgs/by-name/gi/github-runner/deps.json b/pkgs/by-name/gi/github-runner/deps.json index be678bbdeb91..af463d3cea13 100644 --- a/pkgs/by-name/gi/github-runner/deps.json +++ b/pkgs/by-name/gi/github-runner/deps.json @@ -1,18 +1,18 @@ [ { "pname": "Azure.Core", - "version": "1.44.1", - "hash": "sha256-0su/ylZ68+FDZ6mgfp3qsm7qpfPtD5SW75HXbVhs5qk=" + "version": "1.47.3", + "hash": "sha256-fWyfqF1lpnap4cF3l9J0fYtZbxIqm6UFsuJgN+/hwW4=" }, { "pname": "Azure.Storage.Blobs", - "version": "12.25.1", - "hash": "sha256-OJgmzE7+BJsrqGMErUwG4wmaguYL1zPbhtdQvvqFuHY=" + "version": "12.26.0", + "hash": "sha256-J6774WE6xlrsmhkmE1dapkrhK6dFByYxSHLs1OQPk48=" }, { "pname": "Azure.Storage.Common", - "version": "12.24.0", - "hash": "sha256-ZjeMv8xaZXkmb1OgZlN9uJelhAcU7KhO/FK02qiz/zA=" + "version": "12.25.0", + "hash": "sha256-4eMv4oOumO6FFx0VMsuIr6sWtouu4f6AajebTQjhj9Q=" }, { "pname": "Castle.Core", @@ -26,14 +26,24 @@ }, { "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "6.0.0", - "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + "version": "8.0.0", + "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw=" }, { "pname": "Microsoft.CodeCoverage", "version": "17.14.1", "hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs=" }, + { + "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", + "version": "8.0.2", + "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY=" + }, + { + "pname": "Microsoft.Extensions.Logging.Abstractions", + "version": "8.0.3", + "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q=" + }, { "pname": "Microsoft.NET.Test.Sdk", "version": "17.14.1", @@ -421,8 +431,8 @@ }, { "pname": "System.ClientModel", - "version": "1.1.0", - "hash": "sha256-FiueWJawZGar++OztDFWxU2nQE5Vih9iYsc3uEx0thM=" + "version": "1.6.1", + "hash": "sha256-OMnamkT9Nt5ZSR6xPKFmOQRUjdn0a4nP9jkD2eZxxc0=" }, { "pname": "System.Collections", @@ -469,11 +479,6 @@ "version": "4.3.0", "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "6.0.1", - "hash": "sha256-Xi8wrUjVlioz//TPQjFHqcV/QGhTqnTfUcltsNlcCJ4=" - }, { "pname": "System.Diagnostics.EventLog", "version": "6.0.0", @@ -596,8 +601,8 @@ }, { "pname": "System.Memory.Data", - "version": "6.0.0", - "hash": "sha256-83/bxn3vyv17dQDDqH1L3yDpluhOxIS5XR27f4OnCEo=" + "version": "8.0.1", + "hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg=" }, { "pname": "System.Net.Http", @@ -624,11 +629,6 @@ "version": "4.1.0-rc2-24027", "hash": "sha256-GgOSOyyZzXQw6ubXl5iZeQ8Rx3ZTWdlZ5dCeUPdaUxg=" }, - { - "pname": "System.Numerics.Vectors", - "version": "4.5.0", - "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" - }, { "pname": "System.ObjectModel", "version": "4.0.12-rc2-24027", @@ -704,11 +704,6 @@ "version": "4.3.1", "hash": "sha256-R9T68AzS1PJJ7v6ARz9vo88pKL1dWqLOANg4pkQjkA0=" }, - { - "pname": "System.Runtime.CompilerServices.Unsafe", - "version": "6.0.0", - "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" - }, { "pname": "System.Runtime.Extensions", "version": "4.1.0-rc2-24027", @@ -864,16 +859,6 @@ "version": "4.3.0", "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" }, - { - "pname": "System.Text.Encodings.Web", - "version": "6.0.0", - "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" - }, - { - "pname": "System.Text.Json", - "version": "6.0.10", - "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=" - }, { "pname": "System.Text.RegularExpressions", "version": "4.3.1", diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index ca76c0781863..9e16ca80dee6 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -35,13 +35,13 @@ assert builtins.all ( buildDotnetModule (finalAttrs: { pname = "github-runner"; - version = "2.329.0"; + version = "2.330.0"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-Lf8l959y5tfvCsLwI8+tziFGm+LUJnhE2PQIz/zZneA="; + hash = "sha256-Ft6NCgljzMy5SrRwAdixWpPIrbq7WdW8VzXDUVsiuqo="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision diff --git a/pkgs/by-name/he/hexagonrpc/package.nix b/pkgs/by-name/he/hexagonrpc/package.nix index ec90538b4205..fd21a813f146 100644 --- a/pkgs/by-name/he/hexagonrpc/package.nix +++ b/pkgs/by-name/he/hexagonrpc/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/linux-msm/hexagonrpc"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ matthewcroughan ]; - mainProgram = "hexagonrpc"; + mainProgram = "hexagonrpcd"; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix index dd3728f6a74a..eeafb30d0e02 100644 --- a/pkgs/by-name/ho/home-manager/package.nix +++ b/pkgs/by-name/ho/home-manager/package.nix @@ -19,14 +19,14 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-manager"; - version = "0-unstable-2025-11-27"; + version = "0-unstable-2025-11-30"; src = fetchFromGitHub { name = "home-manager-source"; owner = "nix-community"; repo = "home-manager"; - rev = "86ff0ef506c209bb397849706e85cc3a913cb577"; - hash = "sha256-bO7FN/bF6gG7TlZpKAZjO3VvfsLaPFkefeUfJJ7F/7w="; + rev = "83053e1d337f33e0b48250588006e4b9df2f0d9d"; + hash = "sha256-hDFkciyjhjMLRC/qXCREWX1dgq8kopiuJdwXdfVlJuQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ic/iceauth/package.nix b/pkgs/by-name/ic/iceauth/package.nix new file mode 100644 index 000000000000..525de7f1e889 --- /dev/null +++ b/pkgs/by-name/ic/iceauth/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + util-macros, + autoreconfHook, + xorgproto, + libice, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "iceauth"; + version = "1.0.10"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "iceauth"; + tag = "iceauth-${finalAttrs.version}"; + hash = "sha256-XAk+hffmX02/0wJlXZVSY325I1AyiJ6AozJizsv39Mg="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + util-macros + autoreconfHook + ]; + + buildInputs = [ + xorgproto + libice + ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=iceauth-(.*)" ]; }; + + meta = { + description = "libICE authority file utility"; + longDescription = '' + The iceauth program is used to edit and display the authorization information used in + connecting with ICE (the X11 Inter-Client Exchange protocol). It operates very much like the + xauth program for X11 connection authentication records. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/iceauth"; + license = lib.licenses.mitOpenGroup; + mainProgram = "iceauth"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix index c0dcafedf66b..e816bcd3aaba 100644 --- a/pkgs/by-name/je/jellyfin-web/package.nix +++ b/pkgs/by-name/je/jellyfin-web/package.nix @@ -13,7 +13,7 @@ }: buildNpmPackage rec { pname = "jellyfin-web"; - version = "10.11.3"; + version = "10.11.4"; src = assert version == jellyfin.version; @@ -21,7 +21,7 @@ buildNpmPackage rec { owner = "jellyfin"; repo = "jellyfin-web"; rev = "v${version}"; - hash = "sha256-rsAxV3ABO1HYnVsvsIMMoWizPuFL0GyfKNUGYkqFxBc="; + hash = "sha256-5MgU9Fw+uiDJLRE1pFHwwfVSnZ47WPeT0Sz4G01jaXs="; }; nodejs = nodejs_20; # does not build with 22 @@ -31,7 +31,7 @@ buildNpmPackage rec { --replace-fail "git describe --always --dirty" "echo ${src.rev}" \ ''; - npmDepsHash = "sha256-OLFjeCgq2c4d22L6yt7ihPuZiwsR1txZpjniuf/0L0I="; + npmDepsHash = "sha256-52LteGNeSJ7tLxM5skMVeE7pZW4dwOe5p/ZEMSlcO2o="; preBuild = '' # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index b72fbe56e5c9..f8c58e68bee6 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -13,13 +13,13 @@ buildDotnetModule rec { pname = "jellyfin"; - version = "10.11.3"; # ensure that jellyfin-web has matching version + version = "10.11.4"; # ensure that jellyfin-web has matching version src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin"; rev = "v${version}"; - hash = "sha256-xNQe0hjY1BjC1D+hYTj1Gv2jCpwhWJv9dlvY6K9jkSk="; + hash = "sha256-Hs7G8igW7TJBTYuv83AhN/YhpLcO5pwuU5vYwDUEsUQ="; }; propagatedBuildInputs = [ sqlite ]; diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix index 27d8546e615e..411bbf927419 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.19.3"; + version = "1.19.4"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; tag = "v${finalAttrs.version}"; - hash = "sha256-GyX4LKe2SHRlHqRfh7yAkOyISo/N3rhpkARevUmuLbc="; + hash = "sha256-o8BDreuQbPrGuSV7k4OVy4XmMSSEXrdNzEzUXM6hMyA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix index 3bb5229cdfab..db8204322470 100644 --- a/pkgs/by-name/le/lemminx/package.nix +++ b/pkgs/by-name/le/lemminx/package.nix @@ -19,6 +19,7 @@ let "java.base" "java.logging" "java.xml" + "jdk.crypto.ec" ]; jdk = jdk_headless; }; diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 9dd5841c6298..eb2e9b728e0e 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "10.3.2"; + version = "10.4.0"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-LeSBso/Y6I8lIy3TLvGeZLPjxsL1eHr/YSKXglHK08s="; + hash = "sha256-yCNYjGG5B+G+8liJVZc+VW2ZqSbucC55YfExQkeMv6Q="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/lo/lowdown/package.nix b/pkgs/by-name/lo/lowdown/package.nix index 0ed05f596982..7ea55e19f137 100644 --- a/pkgs/by-name/lo/lowdown/package.nix +++ b/pkgs/by-name/lo/lowdown/package.nix @@ -11,13 +11,14 @@ enableDarwinSandbox ? true, # for passthru.tests nix, + lowdown-unsandboxed, }: stdenv.mkDerivation rec { pname = "lowdown${ lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) "-unsandboxed" }"; - version = "2.0.2"; + version = "2.0.4"; outputs = [ "out" @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - hash = "sha512-cfzhuF4EnGmLJf5EGSIbWqJItY3npbRSALm+GarZ7SMU7Hr1xw0gtBFMpOdi5PBar4TgtvbnG4oRPh+COINGlA=="; + sha512 = "649a508b7727df6e7e1203abb3853e05f167b64832fd5e1271f142ccf782e600b1de73c72dc02673d7b175effdc54f2c0f60318208a968af9f9763d09cf4f9ef"; }; nativeBuildInputs = [ @@ -38,6 +39,12 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ fixDarwinDylibNames ]; + postPatch = '' + # fails test, some column width mismatch + rm regress/table-footnotes.md + rm regress/table-styles.md + ''; + # The Darwin sandbox calls fail inside Nix builds, presumably due to # being nested inside another sandbox. preConfigure = lib.optionalString (stdenv.hostPlatform.isDarwin && !enableDarwinSandbox) '' @@ -74,32 +81,8 @@ stdenv.mkDerivation rec { "install_static" ]; - postInstall = - let - soVersion = "2"; - in - - # Check that soVersion is up to date even if we are not on darwin - lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin) '' - test -f $lib/lib/liblowdown.so.${soVersion} || \ - die "postInstall: expected $lib/lib/liblowdown.so.${soVersion} is missing" - '' - # Fix lib extension so that fixDarwinDylibNames detects it, see - # . - + lib.optionalString (enableShared && stdenv.hostPlatform.isDarwin) '' - darwinDylib="$lib/lib/liblowdown.${soVersion}.dylib" - mv "$lib/lib/liblowdown.so.${soVersion}" "$darwinDylib" - - # Make sure we are re-creating a symbolic link here - test -L "$lib/lib/liblowdown.so" || \ - die "postInstall: expected $lib/lib/liblowdown.so to be a symlink" - ln -s "$darwinDylib" "$lib/lib/liblowdown.dylib" - rm "$lib/lib/liblowdown.so" - ''; - - doInstallCheck = true; - - installCheckPhase = lib.optionalString (!stdenv.hostPlatform.isDarwin || !enableDarwinSandbox) '' + doInstallCheck = !stdenv.hostPlatform.isDarwin || !enableDarwinSandbox; + installCheckPhase = '' runHook preInstallCheck echo '# TEST' > test.md @@ -108,12 +91,12 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - doCheck = true; + doCheck = !stdenv.hostPlatform.isDarwin || !enableDarwinSandbox; checkTarget = "regress"; passthru.tests = { - # most important consumer in nixpkgs - inherit nix; + # most important consumers in nixpkgs + inherit nix lowdown-unsandboxed; }; meta = with lib; { diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index 23aecd1079ca..725a11bc0f55 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -18,21 +18,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-authentication-service"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-JSuhI38fLi9z7dMRL04eQ1UdMMe8S/F3qXrJT1DwnS0="; + hash = "sha256-7bwpXy6y3tFeAExxu4oRT6jjOq375MFpEqpAP2hsBmg="; }; - cargoHash = "sha256-PNPZFxCsBXwiQ2leDyHWOFtEQJW0DxU6pTEs04sdM+M="; + cargoHash = "sha256-hpf4ocUSPi6jVvEKdhEYewjPVhwEmtE2+2FNS/JPuQU="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; src = "${finalAttrs.src}/${finalAttrs.npmRoot}"; - hash = "sha256-0YWguliIJjYh1IUUIX4/CHDYwvUk/M2Hz15tL558tws="; + hash = "sha256-HVT1x378CRvyW1m9peM3Q0xHLRKocmtDUPkvnV5XQeQ="; }; npmRoot = "frontend"; diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix index 84cde48ec1df..3532b5d87423 100644 --- a/pkgs/by-name/mo/mommy/package.nix +++ b/pkgs/by-name/mo/mommy/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "mommy"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "FWDekker"; repo = "mommy"; rev = "v${version}"; - hash = "sha256-ZxGHoBRWeGdUelykDdR51HigB85IrvNyswWjCTaOLvg="; + hash = "sha256-G/8gUoJ6zKtSVlxrMYAkPX28SNG9XnLE72FZkqGhe+o="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mu/musl/package.nix b/pkgs/by-name/mu/musl/package.nix index 402b8fbf8123..bef015a0756b 100644 --- a/pkgs/by-name/mu/musl/package.nix +++ b/pkgs/by-name/mu/musl/package.nix @@ -94,6 +94,10 @@ stdenv.mkDerivation rec { url = "https://www.openwall.com/lists/musl/2025/02/13/1/2"; hash = "sha256-BiD87k6KTlLr4ep14rUdIZfr2iQkicBYaSTq+p6WBqE="; }) + # required for systemd user namespacing and oomd to work correctly on musl + # drop next release + # https://git.musl-libc.org/cgit/musl/commit/?id=fde29c04adbab9d5b081bf6717b5458188647f1c + ./stdio-skip-empty-iovec-when-buffering-is-disabled.patch ]; CFLAGS = [ "-fstack-protector-strong" diff --git a/pkgs/by-name/mu/musl/stdio-skip-empty-iovec-when-buffering-is-disabled.patch b/pkgs/by-name/mu/musl/stdio-skip-empty-iovec-when-buffering-is-disabled.patch new file mode 100644 index 000000000000..68fbb526b2c5 --- /dev/null +++ b/pkgs/by-name/mu/musl/stdio-skip-empty-iovec-when-buffering-is-disabled.patch @@ -0,0 +1,31 @@ +From fde29c04adbab9d5b081bf6717b5458188647f1c Mon Sep 17 00:00:00 2001 +From: Casey Connolly +Date: Wed, 23 Apr 2025 15:06:48 +0200 +Subject: stdio: skip empty iovec when buffering is disabled + +When buffering on a FILE is disabled we still send both iovecs, even +though the first one is always empty. Clean things up by skipping the +empty iovec instead. +--- + src/stdio/__stdio_write.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/stdio/__stdio_write.c b/src/stdio/__stdio_write.c +index d2d89475..5356553d 100644 +--- a/src/stdio/__stdio_write.c ++++ b/src/stdio/__stdio_write.c +@@ -11,6 +11,11 @@ size_t __stdio_write(FILE *f, const unsigned char *buf, size_t len) + size_t rem = iov[0].iov_len + iov[1].iov_len; + int iovcnt = 2; + ssize_t cnt; ++ ++ if (!iov->iov_len) { ++ iov++; ++ iovcnt--; ++ } + for (;;) { + cnt = syscall(SYS_writev, f->fd, iov, iovcnt); + if (cnt == rem) { +-- +cgit v1.2.1 + diff --git a/pkgs/by-name/oc/oclock/package.nix b/pkgs/by-name/oc/oclock/package.nix new file mode 100644 index 000000000000..2e1a58a70e6a --- /dev/null +++ b/pkgs/by-name/oc/oclock/package.nix @@ -0,0 +1,59 @@ +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + util-macros, + autoreconfHook, + libxkbfile, + libx11, + libxext, + libxmu, + libxt, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "oclock"; + version = "1.0.6"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "oclock"; + tag = "oclock-${finalAttrs.version}"; + hash = "sha256-rk+PV2iEoqRwXN8bq0kCPk0qW0VPwid1T1XrH+Y9yLw="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + util-macros + autoreconfHook + ]; + + buildInputs = [ + libxkbfile + libx11 + libxext + libxmu + libxt + ]; + + installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=oclock-(.*)" ]; }; + + meta = { + description = "simple analog clock using the X11 SHAPE extension to make a round window"; + homepage = "https://gitlab.freedesktop.org/xorg/app/oclock"; + license = with lib.licenses; [ + mitOpenGroup + x11 + ]; + mainProgram = "oclock"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix index 41f9058414fc..6cbd718eb848 100644 --- a/pkgs/by-name/oh/oha/package.nix +++ b/pkgs/by-name/oh/oha/package.nix @@ -6,21 +6,25 @@ pkg-config, openssl, rust-jemalloc-sys, + versionCheckHook, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "oha"; version = "1.11.0"; src = fetchFromGitHub { owner = "hatoo"; repo = "oha"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-N52j8WYEVlmHQdr0HZJZZo92OhIz4V0R1SdaWlOD684="; }; cargoHash = "sha256-M6wJy5X9JRM9tOOGT8b6YIUT0OakXQxjw17iuqaRT5s="; + CARGO_PROFILE_RELEASE_LTO = "fat"; + CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; @@ -33,12 +37,17 @@ rustPlatform.buildRustPackage rec { # tests don't work inside the sandbox doCheck = false; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = { description = "HTTP load generator inspired by rakyll/hey with tui animation"; homepage = "https://github.com/hatoo/oha"; - changelog = "https://github.com/hatoo/oha/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/hatoo/oha/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = [ lib.maintainers.jpds ]; mainProgram = "oha"; }; -} +}) diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix index 23902a210560..a32c5d9f5ddf 100644 --- a/pkgs/by-name/oi/oils-for-unix/package.nix +++ b/pkgs/by-name/oi/oils-for-unix/package.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "oils-for-unix"; - version = "0.36.0"; + version = "0.37.0"; src = fetchurl { url = "https://oils.pub/download/oils-for-unix-${version}.tar.gz"; - hash = "sha256-m2X8czNwjcHcd36KYUWuho6sb74MREqLErttbSllKQI="; + hash = "sha256-9NQdIKBSPbz71LojH4Lt8lsI1JZdZbxx/LVmZtZ0MAA="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencascade-occt/package.nix b/pkgs/by-name/op/opencascade-occt/package.nix index 65a359429b7d..23cc7b525235 100644 --- a/pkgs/by-name/op/opencascade-occt/package.nix +++ b/pkgs/by-name/op/opencascade-occt/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ] ++ lib.optional withVtk vtk; - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + env.NIX_CFLAGS_COMPILE = "-fpermissive"; cmakeFlags = [ (lib.cmakeBool "USE_RAPIDJSON" true) # Enable exception handling for release builds. diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix index ef95e71ceee0..9de66537169f 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-2025-11-21"; + version = "0-unstable-2025-11-26"; pyproject = true; src = fetchFromGitHub { owner = "antmicro"; repo = "dts2repl"; - rev = "a4e216d0bef24c92674913f261197d17292def5c"; - hash = "sha256-hgdT7mQ7ociy518WK0Z6s6LfUluwWH8SDJhhfjdz29g="; + rev = "f0c3d27b0f190defce22eaba0cb3f0b410d5d3db"; + hash = "sha256-Q90gF4UQqlRJ8Y116jp9gb/8hinpiTMg7QnXC7m2T+U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 5f675e9cd91c..381ad6acfb35 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -16,18 +16,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruff"; - version = "0.14.6"; + version = "0.14.7"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; tag = finalAttrs.version; - hash = "sha256-xGQGodhDHrXIfCJ/Igv8TunsLo38FRRgnR1el+VKWGM="; + hash = "sha256-7ZgA5e2Cd2xb/jlo0CrEJYKWAAsvyml2KBnhHRimduo="; }; cargoBuildFlags = [ "--package=ruff" ]; - cargoHash = "sha256-xbYWTuSvC1iqCNF+kIHKuQEjtdv+Z7DlL/4KUAXNcW0="; + cargoHash = "sha256-2RXFT3ERzw1VpwGnLrS8bsrx4B5xLU6yQkwXAQuR/iM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sa/satysfi/package.nix b/pkgs/by-name/sa/satysfi/package.nix index 3d4d042c5e88..2e7de38ddd75 100644 --- a/pkgs/by-name/sa/satysfi/package.nix +++ b/pkgs/by-name/sa/satysfi/package.nix @@ -4,6 +4,7 @@ ocaml-ng, ipaexfont, junicode, + libpng, lmodern, lmmath, which, @@ -47,7 +48,7 @@ ocamlPackages.buildDunePackage { }; preConfigure = '' - substituteInPlace src/frontend/main.ml --replace \ + substituteInPlace src/frontend/main.ml --replace-fail \ '/usr/local/share/satysfi"; "/usr/share/satysfi' \ $out/share/satysfi ''; @@ -59,6 +60,7 @@ ocamlPackages.buildDunePackage { buildInputs = [ camlpdf + libpng yojson-with-position ] ++ (with ocamlPackages; [ diff --git a/pkgs/by-name/se/setxkbmap/package.nix b/pkgs/by-name/se/setxkbmap/package.nix new file mode 100644 index 000000000000..0b487e787508 --- /dev/null +++ b/pkgs/by-name/se/setxkbmap/package.nix @@ -0,0 +1,58 @@ +# TODO: replace build system with meson next update +{ + lib, + stdenv, + fetchFromGitLab, + pkg-config, + util-macros, + autoreconfHook, + libx11, + libxkbfile, + libxrandr, + xkeyboard-config, + nix-update-script, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "setxkbmap"; + version = "1.3.4"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + group = "xorg"; + owner = "app"; + repo = "setxkbmap"; + tag = "setxkbmap-${finalAttrs.version}"; + hash = "sha256-eEh1rifV+XY5RuKbA3Rgn9vmQPnyWvSae/m5lZA3FGE="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + pkg-config + util-macros + autoreconfHook + ]; + + buildInputs = [ + libx11 + libxkbfile + libxrandr + ]; + + configureFlags = [ "--with-xkb-config-root=${xkeyboard-config}/etc/X11/xkb" ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=setxkbmap-(.*)" ]; }; + + meta = { + description = "Set keymaps, layouts, and options via the X Keyboard Extension (XKB)"; + longDescription = '' + setxkbmap is an X11 client to change the keymaps in the X server for a specified keyboard to + use the layout determined by the options listed on the command line. + ''; + homepage = "https://gitlab.freedesktop.org/xorg/app/setxkbmap"; + license = lib.licenses.hpnd; + mainProgram = "setxkbmap"; + maintainers = [ ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index 7cdeed81fb4a..41cc673a7787 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/pkgs/by-name/so/sonarlint-ls/package.nix @@ -26,7 +26,7 @@ maven.buildMavenPackage rec { }; mvnJdk = jdk17; - mvnHash = "sha256-cRDrd2QysN3KCndfdnTn8/hXuJ1xd28GcE8vrd6ILuM="; + mvnHash = "sha256-Fk6JPMmzz7YnPWOdWKOXQ8z6bdYuXSgQdWBOaIlpd4A="; # Disables failing tests which either need network access or are flaky. mvnParameters = lib.escapeShellArgs [ @@ -49,7 +49,7 @@ maven.buildMavenPackage rec { makeWrapper ${jre_headless}/bin/java $out/bin/sonarlint-ls \ --add-flags "-jar $out/share/sonarlint-ls.jar" \ - --add-flags "-analyzers $(ls -1 $out/share/plugins | tr '\n' ' ')" + --add-flags "-analyzers $(find $out/share/plugins/ -type f -name '*.jar' | sort | tr '\n' ' ')" runHook postInstall ''; diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 04fc003611a1..4eaf19e6df43 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.36"; + version = "3.16.38"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-7sOoxpT65O3Mks9+xfISuRgx55E6eRdbsDpdMafTq98="; + hash = "sha256-QhuxJmSI09rPJf5W+MH/5ApBVTSYYY/kWENLr7vX/3A="; }; outputs = [ diff --git a/pkgs/by-name/wc/wcc/package.nix b/pkgs/by-name/wc/wcc/package.nix index c3e8d8911a35..a4a49c179ba8 100644 --- a/pkgs/by-name/wc/wcc/package.nix +++ b/pkgs/by-name/wc/wcc/package.nix @@ -3,12 +3,14 @@ stdenv, rustPlatform, fetchFromGitHub, + fetchpatch2, cargo, capstone, libbfd, libelf, libiberty, readline, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { @@ -19,8 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "endrazine"; repo = "wcc"; tag = "v${finalAttrs.version}"; - hash = "sha256-hyelDAsE3IFvUxBqttYW7QmM6NPEa6pOREmawFjW2Q8="; - deepClone = true; + hash = "sha256-cg8rf8R3xYNJTJhrDfIdVAUR/OOd6JjB0NYHRosUzvU="; fetchSubmodules = true; }; @@ -39,6 +40,14 @@ stdenv.mkDerivation (finalAttrs: { readline ]; + patches = [ + # The upstream forgot to bump WVERSION in header before tagging `v0.0.11`. + (fetchpatch2 { + url = "https://github.com/endrazine/wcc/commit/4bea2dac8b49d82e4f72e42027d74fc654380f7b.patch?full_index=1"; + hash = "sha256-RK0ue8hdK/G+njwGmWpaewclRHprO8aBdZ9vBGQIQOc="; + }) + ]; + postPatch = '' cp ${./Cargo.lock} Cargo.lock sed -i src/wsh/include/libwitch/wsh.h src/wsh/scripts/INDEX \ @@ -71,6 +80,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + meta = { homepage = "https://github.com/endrazine/wcc"; description = "Witchcraft compiler collection: tools to convert and script ELF files"; @@ -82,5 +97,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ DieracDelta ]; + mainProgram = "wcc"; }; }) diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix index 6b2bb8da9889..c0447ca2492b 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix @@ -16,17 +16,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "xdg-desktop-portal-cosmic"; - version = "1.0.0-beta.7"; + version = "1.0.0-beta.8"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "xdg-desktop-portal-cosmic"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-oqggnwDzmi6ES3o3Pt51QwZUuqtqlbrMxFGaftyqgRo="; + hash = "sha256-4rNHZcAq/LafUPywZ9XdpXr9wVFOBWkUvnCFwT+3lFA="; }; - cargoHash = "sha256-CqzM1hVdY3+NhH58NDlOaFVU1na/bkh6fI9rAp2Vwog="; + cargoHash = "sha256-0PsiB/xvePSi5o1eRUgCq02UAGzuBQEe8+LlFJi5814="; separateDebugInfo = true; diff --git a/pkgs/by-name/zf/zfp/package.nix b/pkgs/by-name/zf/zfp/package.nix index a4aee973dd84..fffc9ccd8db1 100644 --- a/pkgs/by-name/zf/zfp/package.nix +++ b/pkgs/by-name/zf/zfp/package.nix @@ -8,6 +8,7 @@ python3Packages, stdenv, config, + testers, enableCfp ? true, enableCuda ? config.cudaSupport, enableFortran ? builtins.elem stdenv.hostPlatform.system gfortran.meta.platforms, @@ -38,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optional enableCuda cudatoolkit ++ lib.optional enableFortran gfortran - ++ lib.optional enableOpenMP llvmPackages.openmp ++ lib.optionals enablePython ( with python3Packages; [ @@ -48,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: { ] ); + propagatedBuildInputs = lib.optional (enableOpenMP && stdenv.cc.isClang) llvmPackages.openmp; + # compile CUDA code for all extant GPUs so the binary will work with any GPU # and driver combination. to be ultimately solved upstream: # https://github.com/LLNL/zfp/issues/178 @@ -69,6 +71,13 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + passthru.tests = { + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "zfp" ]; + package = finalAttrs.finalPackage; + }; + }; + meta = { homepage = "https://computing.llnl.gov/projects/zfp"; description = "Library for random-access compression of floating-point arrays"; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 44802e0833e5..8851bb4654af 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -18,8 +18,8 @@ let param = if lib.versionAtLeast ppxlib.version "0.36" then { - version = "3.17.0"; - hash = "sha256-gsiBnOn9IVt+fixlAeY456kE6+E6taHY6sJnnYz4pes="; + version = "3.17.2"; + hash = "sha256-f0CHAW6MOToT1Xt3N2d7wdvxaXj9Q8GTVNTXmnlMjEc="; } else { diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/pkgs/development/python-modules/flask-bcrypt/default.nix index a1f4cacc0cf6..83771359fcb6 100644 --- a/pkgs/development/python-modules/flask-bcrypt/default.nix +++ b/pkgs/development/python-modules/flask-bcrypt/default.nix @@ -19,6 +19,13 @@ buildPythonPackage rec { hash = "sha256-WlIholi/nzq6Ikc0LS6FhG0Q5Kz0kvvAlA2YJ7EksZ4="; }; + postPatch = '' + # Backport fix for test_long_password from upstream PR: https://github.com/maxcountryman/flask-bcrypt/pull/96 + substituteInPlace test_bcrypt.py \ + --replace-fail "self.assertTrue(self.bcrypt.check_password_hash(pw_hash, 'A' * 80))" \ + "self.assertTrue(self.bcrypt.check_password_hash(pw_hash, 'A' * 72))" + ''; + propagatedBuildInputs = [ flask bcrypt diff --git a/pkgs/development/python-modules/manim/default.nix b/pkgs/development/python-modules/manim/default.nix index 04d864118ac3..e3fe76eddce3 100644 --- a/pkgs/development/python-modules/manim/default.nix +++ b/pkgs/development/python-modules/manim/default.nix @@ -5,8 +5,7 @@ texliveInfraOnly, # build-system - poetry-core, - setuptools, + hatchling, # buildInputs cairo, @@ -37,6 +36,8 @@ tqdm, typing-extensions, watchdog, + pythonAtLeast, + audioop-lts, # optional-dependencies jupyterlab, @@ -187,18 +188,17 @@ in buildPythonPackage rec { pname = "manim"; pyproject = true; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "ManimCommunity"; repo = "manim"; tag = "v${version}"; - hash = "sha256-eQgp/GwKsfQA1ZgqfB3HF2ThEgH3Fbn9uAtcko9pkjs="; + hash = "sha256-VkMmIQNLUg6Epttze23vaAA8QOdlnAPQZ7UKpkFRzIk="; }; build-system = [ - poetry-core - setuptools + hatchling ]; patches = [ ./pytest-report-header.patch ]; @@ -231,6 +231,9 @@ buildPythonPackage rec { tqdm typing-extensions watchdog + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + audioop-lts ]; optional-dependencies = { @@ -278,7 +281,7 @@ buildPythonPackage rec { manim. ''; mainProgram = "manim"; - changelog = "https://docs.manim.community/en/latest/changelog/${version}-changelog.html"; + changelog = "https://github.com/ManimCommunity/manim/releases/tag/${src.tag}"; homepage = "https://github.com/ManimCommunity/manim"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ osbm ]; diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index b180498bd6c8..3c9741a699b3 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.30.1"; + version = "1.0.0"; pyproject = true; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "mkdocstrings"; tag = version; - hash = "sha256-BfqxL35prq+pvD21w0BOJx/ls8og+LjtGdOAZlHYGVE="; + hash = "sha256-PQ8TL/eMYNX0gXvWhq/Rop2bv1oCoO7o3dxlCK9tbGE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/pymodbus/default.nix b/pkgs/development/python-modules/pymodbus/default.nix index 292aac9fffea..ad61d3014ae5 100644 --- a/pkgs/development/python-modules/pymodbus/default.nix +++ b/pkgs/development/python-modules/pymodbus/default.nix @@ -21,14 +21,14 @@ buildPythonPackage rec { pname = "pymodbus"; - version = "3.11.3"; + version = "3.11.4"; pyproject = true; src = fetchFromGitHub { owner = "pymodbus-dev"; repo = "pymodbus"; tag = "v${version}"; - hash = "sha256-2wOeghoi8FSk1II/0rid+ddRq7ceerH7ZeLcb+SSXKY="; + hash = "sha256-Le/TJfDSvro9eMLOfY/il/0LSJ8orHSSjI7jaYdXaLs="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix index 7f1af2a0db47..e40f5636c657 100644 --- a/pkgs/development/python-modules/types-lxml/default.nix +++ b/pkgs/development/python-modules/types-lxml/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "types-lxml"; - version = "2025.08.25"; + version = "2025.11.25"; pyproject = true; src = fetchFromGitHub { owner = "abelcheung"; repo = "types-lxml"; tag = version; - hash = "sha256-XuQ3sZi/cuJF76JeyuFEZVsY3F9zmPHRUWbkNQaT0Lo="; + hash = "sha256-WCG+jCkNPb6Mv7Mn1ivA5iwteR+vsfdGeo77HiQiQYc="; }; pythonRelaxDeps = [ "beautifulsoup4" ]; diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix index ab11fb8ad1f3..f6416908579e 100644 --- a/pkgs/development/python-modules/urllib3-future/default.nix +++ b/pkgs/development/python-modules/urllib3-future/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "urllib3-future"; - version = "2.14.907"; + version = "2.14.908"; pyproject = true; src = fetchFromGitHub { owner = "jawah"; repo = "urllib3.future"; tag = version; - hash = "sha256-LdJplIA/hUIHmDNJKUwcr5ganKaxEQMGhjQsc5FcEjI="; + hash = "sha256-EPM3LbzNA7gKkwJy4xd/d/Mhs0qhuPRGI4uVkDHiUnI="; }; postPatch = '' diff --git a/pkgs/development/python-modules/warp-lang/clang-libs.patch b/pkgs/development/python-modules/warp-lang/clang-libs.patch deleted file mode 100644 index 3c8a5b87a0b8..000000000000 --- a/pkgs/development/python-modules/warp-lang/clang-libs.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/warp/build_dll.py b/warp/build_dll.py -index 2218ff13..3fcf5796 100644 ---- a/warp/build_dll.py -+++ b/warp/build_dll.py -@@ -404,8 +404,8 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[ - cuda_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "nvcc" - cpp_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "g++" - -- cpp_includes = f' -I"{warp_home_path.parent}/external/llvm-project/out/install/{mode}-{arch}/include"' -- cpp_includes += f' -I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"' -+ cpp_includes = ' -I"@LLVM_DEV@/include"' -+ cpp_includes += ' -I"@LIBCLANG_DEV@/include"' - cuda_includes = f' -I"{cuda_home}/include"' if cu_path else "" - includes = cpp_includes + cuda_includes - diff --git a/pkgs/development/python-modules/warp-lang/clang-path.patch b/pkgs/development/python-modules/warp-lang/clang-path.patch deleted file mode 100644 index ad87f9b3ab15..000000000000 --- a/pkgs/development/python-modules/warp-lang/clang-path.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/warp/build_dll.py b/warp/build_dll.py -index 11d2a898..33fb2a76 100644 ---- a/warp/build_dll.py -+++ b/warp/build_dll.py -@@ -636,8 +636,8 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: list[str] - - else: - # Unix compilation -- cuda_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "nvcc" -- cpp_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "g++" -+ cuda_compiler = "@CLANG@" if getattr(args, "clang_build_toolchain", False) else "nvcc" -+ cpp_compiler = "@CLANG@" if getattr(args, "clang_build_toolchain", False) else "g++" - - cpp_includes = f' -I"{warp_home_path.parent}/external/llvm-project/out/install/{mode}-{arch}/include"' - cpp_includes += f' -I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"' -@@ -687,9 +687,9 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: list[str] - else: - # Use Clang compiler - if mode == "debug": -- cuda_cmd = f'clang++ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -g -O0 -fPIC -fvisibility=hidden -D_DEBUG -D_ITERATOR_DEBUG_LEVEL=0 -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"' -+ cuda_cmd = f'@CLANG@ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -g -O0 -fPIC -fvisibility=hidden -D_DEBUG -D_ITERATOR_DEBUG_LEVEL=0 -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"' - elif mode == "release": -- cuda_cmd = f'clang++ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -O3 -fPIC -fvisibility=hidden -DNDEBUG -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"' -+ cuda_cmd = f'@CLANG@ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -O3 -fPIC -fvisibility=hidden -DNDEBUG -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"' - - with ScopedTimer("build_cuda", active=args.verbose): - run_cmd(cuda_cmd) - diff --git a/pkgs/development/python-modules/warp-lang/cxx11-abi.patch b/pkgs/development/python-modules/warp-lang/cxx11-abi.patch deleted file mode 100644 index dab0fca570a3..000000000000 --- a/pkgs/development/python-modules/warp-lang/cxx11-abi.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/build_llvm.py b/build_llvm.py -index aee0a9f1..5e1c3557 100644 ---- a/build_llvm.py -+++ b/build_llvm.py -@@ -171,7 +171,6 @@ def build_llvm_clang_from_source_for_arch(args, arch: str, llvm_source: str) -> - "-D", "LLVM_INCLUDE_TESTS=FALSE", - "-D", "LLVM_INCLUDE_TOOLS=TRUE", # Needed by Clang - "-D", "LLVM_INCLUDE_UTILS=FALSE", -- "-D", f"CMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 {abi_version}", # The pre-C++11 ABI is still the default on the CentOS 7 toolchain - "-D", f"CMAKE_INSTALL_PREFIX={install_path}", - "-D", f"LLVM_HOST_TRIPLE={host_triple}", - "-D", f"CMAKE_OSX_ARCHITECTURES={osx_architectures}", -diff --git a/warp/build_dll.py b/warp/build_dll.py -index 2218ff13..2354f69f 100644 ---- a/warp/build_dll.py -+++ b/warp/build_dll.py -@@ -417,7 +417,7 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[ - else: - version = "" - -- cpp_flags = f'-Werror -Wuninitialized {version} --std=c++17 -fno-rtti -D{cuda_enabled} -D{mathdx_enabled} -D{cuda_compat_enabled} -fPIC -fvisibility=hidden -D_GLIBCXX_USE_CXX11_ABI=0 -I"{native_dir}" {includes} ' -+ cpp_flags = f'-Werror -Wuninitialized {version} --std=c++17 -fno-rtti -D{cuda_enabled} -D{mathdx_enabled} -D{cuda_compat_enabled} -fPIC -fvisibility=hidden -I"{native_dir}" {includes} ' - - if mode == "debug": - cpp_flags += "-O0 -g -D_DEBUG -DWP_ENABLE_DEBUG=1 -fkeep-inline-functions" diff --git a/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch b/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch deleted file mode 100644 index 8b1cb03afea0..000000000000 --- a/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/warp/build_dll.py b/warp/build_dll.py -index 2218ff13..53786017 100644 ---- a/warp/build_dll.py -+++ b/warp/build_dll.py -@@ -441,6 +442,7 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[ - build_cmd = f'{cpp_compiler} {cpp_flags} -c "{cpp_path}" -o "{cpp_out}"' - run_cmd(build_cmd) - -+ ld_inputs.append('-L"@LIBCXX_LIB@/lib" -lc++') - if cu_path: - cu_out = cu_path + ".o" - diff --git a/pkgs/development/python-modules/warp-lang/darwin-single-target.patch b/pkgs/development/python-modules/warp-lang/darwin-single-target.patch deleted file mode 100644 index ec13135798ab..000000000000 --- a/pkgs/development/python-modules/warp-lang/darwin-single-target.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/build_llvm.py b/build_llvm.py -index aee0a9f1..bf281f6d 100644 ---- a/build_llvm.py -+++ b/build_llvm.py -@@ -402,16 +402,4 @@ def build_warp_clang_for_arch(args, lib_name: str, arch: str) -> None: - - def build_warp_clang(args, lib_name: str) -> None: - """Build the CPU-only Warp library using Clang/LLVM.""" -- -- if sys.platform == "darwin": -- # create a universal binary by combining x86-64 and AArch64 builds -- build_warp_clang_for_arch(args, lib_name + "-x86_64", "x86_64") -- build_warp_clang_for_arch(args, lib_name + "-aarch64", "aarch64") -- -- dylib_path = os.path.join(build_path, f"bin/{lib_name}") -- run_cmd(f"lipo -create -output {dylib_path} {dylib_path}-x86_64 {dylib_path}-aarch64") -- os.remove(f"{dylib_path}-x86_64") -- os.remove(f"{dylib_path}-aarch64") -- -- else: -- build_warp_clang_for_arch(args, lib_name, machine_architecture()) -+ build_warp_clang_for_arch(args, lib_name, machine_architecture()) -diff --git a/warp/build_dll.py b/warp/build_dll.py -index 2218ff13..c0d978ce 100644 ---- a/warp/build_dll.py -+++ b/warp/build_dll.py -@@ -410,7 +410,7 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[ - includes = cpp_includes + cuda_includes - - if sys.platform == "darwin": -- version = f"--target={arch}-apple-macos11" -+ version = "" - else: - if cpp_compiler == "g++": - version = "-fabi-version=13" # GCC 8.2+ -@@ -491,14 +491,4 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[ - - - def build_dll(args, dll_path, cpp_paths, cu_path, libs=None): -- if sys.platform == "darwin": -- # create a universal binary by combining x86-64 and AArch64 builds -- build_dll_for_arch(args, dll_path + "-x86_64", cpp_paths, cu_path, "x86_64", libs) -- build_dll_for_arch(args, dll_path + "-aarch64", cpp_paths, cu_path, "aarch64", libs) -- -- run_cmd(f"lipo -create -output {dll_path} {dll_path}-x86_64 {dll_path}-aarch64") -- os.remove(f"{dll_path}-x86_64") -- os.remove(f"{dll_path}-aarch64") -- -- else: -- build_dll_for_arch(args, dll_path, cpp_paths, cu_path, machine_architecture(), libs) -+ build_dll_for_arch(args, dll_path, cpp_paths, cu_path, machine_architecture(), libs) diff --git a/pkgs/development/python-modules/warp-lang/default.nix b/pkgs/development/python-modules/warp-lang/default.nix index 414d62197ace..ca97757e3ff3 100644 --- a/pkgs/development/python-modules/warp-lang/default.nix +++ b/pkgs/development/python-modules/warp-lang/default.nix @@ -39,7 +39,7 @@ let effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv; stdenv = throw "Use effectiveStdenv instead of stdenv directly, as it may be replaced by cudaPackages.backendStdenv"; - version = "1.9.1"; + version = "1.10.0"; libmathdx = callPackage ./libmathdx.nix { }; in @@ -59,94 +59,94 @@ buildPythonPackage { owner = "NVIDIA"; repo = "warp"; tag = "v${version}"; - hash = "sha256-Atp3WyxQ7GYwWLmQIUgoPULyVlNjduh4/9CBixNWFwc="; + hash = "sha256-9OEyYdVq+/SzxHfNT+sa/YeBKklaUfpKUiJZuiuzxhQ="; }; - patches = [ - ./cxx11-abi.patch - ] - ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [ - (replaceVars ./darwin-libcxx.patch { - LIBCXX_LIB = llvmPackages.libcxx; - }) - - ./darwin-single-target.patch - ] - ++ lib.optionals (effectiveStdenv.cc.isClang || standaloneSupport) [ - (replaceVars ./clang-path.patch { - CLANG = "${effectiveStdenv.cc}/bin/cc"; - }) - - (replaceVars ./clang-libs.patch { - LLVM_DEV = llvmPackages.llvm.dev; - LIBCLANG_DEV = llvmPackages.libclang.dev; - }) - ] - ++ lib.optionals standaloneSupport [ - (replaceVars ./llvm-libs.patch { + patches = lib.optionals standaloneSupport [ + (replaceVars ./dynamic-link.patch { LLVM_LIB = llvmPackages.llvm.lib; LIBCLANG_LIB = llvmPackages.libclang.lib; }) ]; - postPatch = - # Patch build_dll.py to use our gencode flags rather than NVIDIA's very broad defaults. - lib.optionalString cudaSupport '' - nixLog "patching $PWD/warp/build_dll.py to use our gencode flags" - substituteInPlace "$PWD/warp/build_dll.py" \ - --replace-fail \ - '*gencode_opts,' \ - '${ - lib.concatMapStringsSep ", " (gencodeString: ''"${gencodeString}"'') cudaPackages.flags.gencode - },' \ - --replace-fail \ - '*clang_arch_flags,' \ - '${ - lib.concatMapStringsSep ", " ( - realArch: ''"--cuda-gpu-arch=${realArch}"'' - ) cudaPackages.flags.realArches - },' + postPatch = '' + nixLog "patching $PWD/build_llvm.py to remove pre-C++11 ABI flag" + substituteInPlace "$PWD/build_llvm.py" \ + --replace-fail \ + '"-D", f"CMAKE_CXX_FLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 {abi_version}", # The pre-C++11 ABI is still the default on the CentOS 7 toolchain' \ + "" + + substituteInPlace "$PWD/warp/_src/build_dll.py" \ + --replace-fail " -D_GLIBCXX_USE_CXX11_ABI=0" "" + '' + + lib.optionalString effectiveStdenv.hostPlatform.isDarwin ( + '' + nixLog "patching $PWD/warp/_src/build_dll.py to remove macOS target flag and link against libc++" + substituteInPlace "$PWD/warp/_src/build_dll.py" \ + --replace-fail "--target={arch}-apple-macos11" "" \ + --replace-fail 'ld_inputs = []' "ld_inputs = ['-L\"${llvmPackages.libcxx}/lib\" -lc++']" + '' + # AssertionError: 0.4082476496696472 != 0.40824246406555176 within 5 places + + '' + nixLog "patching $PWD/warp/tests/test_fem.py to disable broken tests on darwin" + substituteInPlace "$PWD/warp/tests/test_codegen.py" \ + --replace-fail 'places=5' 'places=4' + '' + ) + + lib.optionalString effectiveStdenv.cc.isClang '' + substituteInPlace "$PWD/warp/_src/build_dll.py" \ + --replace-fail "clang++" "${effectiveStdenv.cc}/bin/cc" + '' + + lib.optionalString standaloneSupport '' + substituteInPlace "$PWD/warp/_src/build_dll.py" \ + --replace-fail \ + '-I"{warp_home_path.parent}/external/llvm-project/out/install/{mode}-{arch}/include"' \ + '-I"${llvmPackages.llvm.dev}/include"' \ + --replace-fail \ + '-I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"' \ + '-I"${llvmPackages.libclang.dev}/include"' \ + + '' + # Patch build_dll.py to use our gencode flags rather than NVIDIA's very broad defaults. + + lib.optionalString cudaSupport ( + let + gencodeOpts = lib.concatMapStringsSep ", " ( + gencodeString: ''"${gencodeString}"'' + ) cudaPackages.flags.gencode; + + clangArchFlags = lib.concatMapStringsSep ", " ( + realArch: ''"--cuda-gpu-arch=${realArch}"'' + ) cudaPackages.flags.realArches; + in + '' + nixLog "patching $PWD/warp/_src/build_dll.py to use our gencode flags" + substituteInPlace "$PWD/warp/_src/build_dll.py" \ + --replace-fail '*gencode_opts,' '${gencodeOpts},' \ + --replace-fail '*clang_arch_flags,' '${clangArchFlags},' '' # Patch build_dll.py to use dynamic libraries rather than static ones. # NOTE: We do not patch the `nvptxcompiler_static` path because it is not available as a dynamic library. - + lib.optionalString cudaSupport '' - nixLog "patching $PWD/warp/build_dll.py to use dynamic libraries" - substituteInPlace "$PWD/warp/build_dll.py" \ - --replace-fail \ - '-lcudart_static' \ - '-lcudart' \ - --replace-fail \ - '-lnvrtc_static' \ - '-lnvrtc' \ - --replace-fail \ - '-lnvrtc-builtins_static' \ - '-lnvrtc-builtins' \ - --replace-fail \ - '-lnvJitLink_static' \ - '-lnvJitLink' \ - --replace-fail \ - '-lmathdx_static' \ - '-lmathdx' - '' - # AssertionError: 0.4082476496696472 != 0.40824246406555176 within 5 places - + lib.optionalString effectiveStdenv.hostPlatform.isDarwin '' - nixLog "patching $PWD/warp/tests/test_fem.py to disable broken tests on darwin" - substituteInPlace "$PWD/warp/tests/test_codegen.py" \ - --replace-fail \ - 'places=5' \ - 'places=4' - '' - # These tests fail on CPU and CUDA. + '' - nixLog "patching $PWD/warp/tests/test_reload.py to disable broken tests" - substituteInPlace "$PWD/warp/tests/test_reload.py" \ - --replace-fail \ - 'add_function_test(TestReload, "test_reload", test_reload, devices=devices)' \ - "" \ - --replace-fail \ - 'add_function_test(TestReload, "test_reload_references", test_reload_references, devices=get_test_devices("basic"))' \ - "" - ''; + nixLog "patching $PWD/warp/_srsc/build_dll.py to use dynamic libraries" + substituteInPlace "$PWD/warp/_src/build_dll.py" \ + --replace-fail '-lcudart_static' '-lcudart' \ + --replace-fail '-lnvrtc_static' '-lnvrtc' \ + --replace-fail '-lnvrtc-builtins_static' '-lnvrtc-builtins' \ + --replace-fail '-lnvJitLink_static' '-lnvJitLink' \ + --replace-fail '-lmathdx_static' '-lmathdx' + '' + ) + # These tests fail on CPU and CUDA. + + '' + nixLog "patching $PWD/warp/tests/test_reload.py to disable broken tests" + substituteInPlace "$PWD/warp/tests/test_reload.py" \ + --replace-fail \ + 'add_function_test(TestReload, "test_reload", test_reload, devices=devices)' \ + "" \ + --replace-fail \ + 'add_function_test(TestReload, "test_reload_references", test_reload_references, devices=get_test_devices("basic"))' \ + "" + ''; build-system = [ setuptools @@ -318,7 +318,7 @@ buildPythonPackage { homepage = "https://github.com/NVIDIA/warp"; changelog = "https://github.com/NVIDIA/warp/blob/v${version}/CHANGELOG.md"; license = lib.licenses.asl20; - platforms = with lib.platforms; linux ++ darwin; + platforms = lib.platforms.linux ++ [ "aarch64-darwin" ]; maintainers = with lib.maintainers; [ yzx9 ]; }; } diff --git a/pkgs/development/python-modules/warp-lang/llvm-libs.patch b/pkgs/development/python-modules/warp-lang/dynamic-link.patch similarity index 93% rename from pkgs/development/python-modules/warp-lang/llvm-libs.patch rename to pkgs/development/python-modules/warp-lang/dynamic-link.patch index 60c967004001..70a65c3d5fba 100644 --- a/pkgs/development/python-modules/warp-lang/llvm-libs.patch +++ b/pkgs/development/python-modules/warp-lang/dynamic-link.patch @@ -1,8 +1,8 @@ diff --git a/build_llvm.py b/build_llvm.py -index aee0a9f1..20cfe8f3 100644 +index 1aa8631a..2304ce1f 100644 --- a/build_llvm.py +++ b/build_llvm.py -@@ -350,33 +350,23 @@ def build_warp_clang_for_arch(args, lib_name: str, arch: str) -> None: +@@ -346,34 +346,24 @@ def build_warp_clang_for_arch(args, lib_name: str, arch: str) -> None: clang_dll_path = os.path.join(build_path, f"bin/{lib_name}") @@ -27,6 +27,7 @@ index aee0a9f1..20cfe8f3 100644 if os.name == "nt": libs.append("Version.lib") libs.append("Ws2_32.lib") + libs.append("ntdll.lib") - libs.append(f'/LIBPATH:"{libpath}"') + libs.extend(f'/LIBPATH:"{libpath}"' for libpath in libpaths) else: diff --git a/pkgs/development/python-modules/wxpython/4.2-ctypes.patch b/pkgs/development/python-modules/wxpython/4.2-ctypes.patch index 17fd8a9a8490..1f07fb004d1a 100644 --- a/pkgs/development/python-modules/wxpython/4.2-ctypes.patch +++ b/pkgs/development/python-modules/wxpython/4.2-ctypes.patch @@ -1,8 +1,17 @@ diff --git a/wx/lib/wxcairo/wx_pycairo.py b/wx/lib/wxcairo/wx_pycairo.py -index 7cfe3071..24d1120f 100644 +index 19a28dd131f659cd596de280bc52f3f7fb1acb5f..dc6bea6afb36e4197fac990877b7112ade84d6f4 100644 --- a/wx/lib/wxcairo/wx_pycairo.py +++ b/wx/lib/wxcairo/wx_pycairo.py -@@ -197,7 +197,12 @@ def _findCairoLib(): +@@ -25,7 +25,7 @@ import ctypes.util + #---------------------------------------------------------------------------- + + # A reference to the cairo shared lib via ctypes.CDLL +-cairoLib = None ++cairoLib = ctypes.CDLL("@libcairo@") + + # A reference to the pycairo C API structure + pycairoAPI = None +@@ -196,7 +196,11 @@ def _findCairoLib(): # For other DLLs we'll just use a dictionary to track them, as there # probably isn't any need to use them outside of this module. @@ -10,7 +19,6 @@ index 7cfe3071..24d1120f 100644 +_dlls = { + "gdk": ctypes.CDLL("@libgdk@"), + "pangocairo": ctypes.CDLL("@libpangocairo@"), -+ "cairoLib": ctypes.CDLL("@libcairo@"), + "appsvc": ctypes.CDLL(None), +} diff --git a/pkgs/development/python-modules/wxpython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index a4bd7a8af2f1..8dfeb074c16b 100644 --- a/pkgs/development/python-modules/wxpython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -4,11 +4,13 @@ buildPythonPackage, setuptools, fetchPypi, + fetchpatch, replaceVars, # build autoPatchelfHook, attrdict, + cython, doxygen, pkg-config, python, @@ -38,37 +40,51 @@ numpy, pillow, six, + + # checks + py, + pytest, + pytest-forked, + xvfb-run, }: buildPythonPackage rec { pname = "wxpython"; - version = "4.2.3"; + version = "4.2.4"; format = "other"; src = fetchPypi { - pname = "wxPython"; - inherit version; - hash = "sha256-INbgySfifO2FZDcZvWPp9/1QHfbpqKqxSJsDmJf9fAE="; + inherit pname version; + hash = "sha256-LrEjl5yHvLMp6KJFImnWD/j59lHpvyXGdXnlPE67rjw="; }; patches = [ (replaceVars ./4.2-ctypes.patch { - libgdk = "${gtk3.out}/lib/libgdk-3.so"; - libpangocairo = "${pango}/lib/libpangocairo-1.0.so"; - libcairo = "${cairo}/lib/libcairo.so"; + libgdk = "${lib.getLib gtk3}/lib/libgdk-3${stdenv.hostPlatform.extensions.sharedLibrary}"; + libpangocairo = "${lib.getLib pango}/lib/libpangocairo-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + libcairo = "${lib.getLib cairo}/lib/libcairo${stdenv.hostPlatform.extensions.sharedLibrary}"; }) ./0001-add-missing-bool-c.patch # Add missing bool.c from old source + # TODO: drop when updating beyond version 4.2.4 + # https://github.com/wxWidgets/Phoenix/pull/2822 + (fetchpatch { + name = "Fix-wx.svg-to-work-with-cython-3.1-generated-code.patch"; + url = "https://github.com/wxWidgets/Phoenix/commit/31303649ab0a0fed0789e0951a7487d172b65bfa.patch"; + hash = "sha256-OAnAsyqHGPNEAiOxLLpdEGcd92K7TCxqEBYceuIb8so="; + }) ]; # https://github.com/wxWidgets/Phoenix/issues/2575 postPatch = '' ln -s ${lib.getExe buildPackages.waf} bin/waf substituteInPlace build.py \ - --replace-fail "distutils.dep_util" "setuptools.modified" + --replace-fail "distutils.dep_util" "setuptools.modified" \ + --replace-fail "runcmd(cmd, fatal=False)" "runcmd(cmd, fatal=True)" # fail when pytest reports errors ''; nativeBuildInputs = [ attrdict + cython pkg-config requests setuptools @@ -102,6 +118,13 @@ buildPythonPackage rec { six ]; + nativeCheckInputs = [ + py # py must be ordered before pytest (see https://github.com/pytest-dev/pytest-forked/issues/88) + pytest + pytest-forked + xvfb-run + ]; + wafPath = "bin/waf"; buildPhase = '' @@ -124,13 +147,35 @@ buildPythonPackage rec { runHook postInstall ''; - checkPhase = '' - runHook preCheck + # The majority of the tests require a graphical environment, but xvfb-run is available only on Linux. + # Tests on aarch64-linux fail randomly on OfBorg. + doCheck = stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux; - ${python.interpreter} build.py -v test + checkPhase = + let + # Some tests appear to be incompatible with xvfb-run. + skippedTests = [ + "dirdlg" + "display" + "filectrl" + "filedlg" + "filedlgcustomize" + "frame" + "glcanvas" + "pickers" + "windowid" + ]; + testArguments = lib.concatMapStringsSep " " ( + test: "--ignore unittests/test_${test}.py" + ) skippedTests; + in + '' + runHook preCheck - runHook postCheck - ''; + HOME=$(mktemp -d) xvfb-run ${python.interpreter} build.py -v --extra_pytest='${testArguments}' test + + runHook postCheck + ''; meta = with lib; { changelog = "https://github.com/wxWidgets/Phoenix/blob/wxPython-${version}/CHANGES.rst"; diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix index 442012bf5319..2a94c25d452b 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix @@ -1,16 +1,17 @@ -{ lib, fetchzip }: +{ lib, fetchFromGitHub }: let version = "3.12.0"; - srcHash = "sha256-36802UcUufQS8zhpWDfbO1wTRZElDD3HpxSwNTrXGp0="; - vendorHash = null; # The tarball contains vendored dependencies + vendorHash = "sha256-TXQ53G+YGIcURZvJtkvGU66dlQx0NxMTeRkrmReCDU8="; + nodeModulesHash = "sha256-34N20FvgBbJAa28u56ZrYrT16J/+8OPuIm1O7EYGVc0="; in { - inherit version vendorHash; + inherit version vendorHash nodeModulesHash; - src = fetchzip { - url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v${version}/woodpecker-src.tar.gz"; - hash = srcHash; - stripRoot = false; + src = fetchFromGitHub { + owner = "woodpecker-ci"; + repo = "woodpecker"; + tag = "v${version}"; + hash = "sha256-TaFAQa8QlogqzhznKeveaCiDbpk1Bl+aPSMGxiaE2ko="; }; postInstall = '' diff --git a/pkgs/development/tools/continuous-integration/woodpecker/server.nix b/pkgs/development/tools/continuous-integration/woodpecker/server.nix index fce029e63388..f1847654cf76 100644 --- a/pkgs/development/tools/continuous-integration/woodpecker/server.nix +++ b/pkgs/development/tools/continuous-integration/woodpecker/server.nix @@ -1,8 +1,11 @@ -{ buildGoModule, callPackage }: +{ + buildGoModule, + callPackage, +}: let common = callPackage ./common.nix { }; in -buildGoModule { +buildGoModule (finalAttrs: { pname = "woodpecker-server"; inherit (common) version @@ -16,7 +19,12 @@ buildGoModule { env.CGO_ENABLED = 1; + postPatch = '' + cp -r ${finalAttrs.passthru.webui} web/dist + ''; + passthru = { + webui = callPackage ./webui.nix { }; updateScript = ./update.sh; }; @@ -24,4 +32,4 @@ buildGoModule { description = "Woodpecker Continuous Integration server"; mainProgram = "woodpecker-server"; }; -} +}) diff --git a/pkgs/development/tools/continuous-integration/woodpecker/update.sh b/pkgs/development/tools/continuous-integration/woodpecker/update.sh index 10b16d9f5062..ac18dfcce100 100755 --- a/pkgs/development/tools/continuous-integration/woodpecker/update.sh +++ b/pkgs/development/tools/continuous-integration/woodpecker/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p nix wget jq nix-prefetch +#!nix-shell -i bash -p nix wget jq nix-prefetch-github nurl # shellcheck shell=bash @@ -13,20 +13,37 @@ if [[ $# -gt 1 || $1 == -* ]]; then exit 1 fi -cd "$(dirname "$0")" version="$1" set -euo pipefail +NIXPKGS_ROOT="$(git rev-parse --show-toplevel)" + if [ -z "$version" ]; then version="$(wget -q -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/woodpecker-ci/woodpecker/releases?per_page=10" | jq -r '[.[] | select(.prerelease == false)][0].tag_name')" fi # strip leading "v" version="${version#v}" +rev="v$version" + +cd "$(dirname "$0")" + +# Woodpecker repository source hash +src_hash=$(nix-prefetch-github woodpecker-ci woodpecker --rev "$rev" | jq -r .hash) +sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" common.nix sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix -# Woodpecker repository -src_hash=$(nix-prefetch-url --type sha256 --unpack "https://github.com/woodpecker-ci/woodpecker/releases/download/v$version/woodpecker-src.tar.gz") -src_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$src_hash") -sed -i -E -e "s#srcHash = \".*\"#srcHash = \"$src_hash\"#" common.nix +# Go modules vendor hash +vendor_hash=$(nurl -e "(import $NIXPKGS_ROOT/. { }).woodpecker-server.goModules") +sed -i -E -e "s#vendorHash = \".*\"#vendorHash = \"$vendor_hash\"#" common.nix + +# pnpm dependencies hash for web UI +pnpm_hash=$(nurl -e "(import $NIXPKGS_ROOT/. { }).woodpecker-server.pnpmDeps") +sed -i -E -e "s#nodeModulesHash = \".*\"#nodeModulesHash = \"$pnpm_hash\"#" common.nix + +echo "Update complete!" +echo "Version: $version" +echo "Source hash: $src_hash" +echo "go vendor hash: $vendor_hash" +echo "pnpm dependencies hash: $pnpm_hash" diff --git a/pkgs/development/tools/continuous-integration/woodpecker/webui.nix b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix new file mode 100644 index 000000000000..b39f29bfb867 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/woodpecker/webui.nix @@ -0,0 +1,48 @@ +{ + lib, + stdenv, + callPackage, + nodejs, + pnpm, +}: +let + common = callPackage ./common.nix { }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "woodpecker-webui"; + inherit (common) version src; + + sourceRoot = "${common.src.name}/web"; + + pnpmDeps = pnpm.fetchDeps { + inherit (finalAttrs) pname version src; + sourceRoot = "${common.src.name}/web"; + fetcherVersion = 2; + hash = common.nodeModulesHash; + }; + + nativeBuildInputs = [ + nodejs + pnpm.configHook + ]; + + buildPhase = '' + runHook preBuild + + pnpm build + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + cp -r dist $out + + runHook postInstall + ''; + + meta = common.meta // { + description = "Woodpecker Continuous Integration server webui"; + }; +}) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 6ec97b58bf0d..8546fa4b3354 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,18 +20,23 @@ "lts": true }, "6.6": { - "version": "6.6.117", - "hash": "sha256:1la3if0n4pv8lii4ggh4c69a61aga66bdl7x1jkvvz92j83k2fv4", + "version": "6.6.118", + "hash": "sha256:0zdifhri9flxa99hzrk9bz8yqi8h1v6zpsvldz9cibvlakixrpab", "lts": true }, "6.12": { - "version": "6.12.59", - "hash": "sha256:1gjqr91qysbzx55ic8101l8vsfb4q09bph8m4q1fq3pi4xrwvlm1", + "version": "6.12.60", + "hash": "sha256:1y6wkk4500pisk9l2dibmidqix1gpci7dy6brs1xc4bl2jr9cc56", "lts": true }, "6.17": { - "version": "6.17.9", - "hash": "sha256:01lfiw67jm853jr3wddvv0hl6lljscg2ils4ips9sl1wjlxq023d", + "version": "6.17.10", + "hash": "sha256:1kf8slgkvv9x6i1111l78p93y65rscdxarh05spx1njh797k8zzs", + "lts": false + }, + "6.18": { + "version": "6.18", + "hash": "sha256:0jzdvk3xdai1xsq0739hmf8rapw15dw5inarfvqizqx9bmha81li", "lts": false } } diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix index 092692bd7aa2..070b6c44e602 100644 --- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix +++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix @@ -7,13 +7,13 @@ buildHomeAssistantComponent rec { owner = "jwillemsen"; domain = "daikin_onecta"; - version = "4.2.9"; + version = "4.2.13"; src = fetchFromGitHub { owner = "jwillemsen"; repo = "daikin_onecta"; tag = "v${version}"; - hash = "sha256-bV+4nTRhtqSVBdaG3rCtIdTYhM4pqcQCtUQwsUhgcq0="; + hash = "sha256-iMoXwcI9OlkamqxBs7AiecyB38kUS8PNq0n4SK85hu8="; }; meta = { diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 46a49e3f7d54..a12975f71115 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -3,6 +3,8 @@ lib, appres, bdftopcf, + bitmap, + editres, font-adobe-100dpi, font-adobe-75dpi, font-adobe-utopia-100dpi, @@ -37,10 +39,12 @@ font-screen-cyrillic, font-sony-misc, font-sun-misc, + fonttosfnt, font-util, font-winitzki-cyrillic, font-xfree86-type1, gccmakedep, + iceauth, ico, imake, libapplewm, @@ -97,8 +101,10 @@ luit, makedepend, mkfontscale, + oclock, pixman, sessreg, + setxkbmap, smproxy, tab-window-manager, transset, @@ -155,7 +161,11 @@ self: with self; { inherit appres bdftopcf + bitmap + editres + fonttosfnt gccmakedep + iceauth ico imake libdmx @@ -170,8 +180,10 @@ self: with self; { luit makedepend mkfontscale + oclock pixman sessreg + setxkbmap smproxy transset viewres @@ -302,176 +314,6 @@ self: with self; { xorgdocs = xorg-docs; xorgsgmldoctools = xorg-sgml-doctools; - # THIS IS A GENERATED FILE. DO NOT EDIT! - bitmap = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libXaw, - xbitmaps, - libXmu, - xorgproto, - libXt, - wrapWithXFileSearchPathHook, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "bitmap"; - version = "1.1.1"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/bitmap-1.1.1.tar.xz"; - sha256 = "1ri66kxa9m6s3xw25mz85k34qhjyksa4kbs4jfrri0g47yv2xm33"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; - buildInputs = [ - libX11 - libXaw - xbitmaps - libXmu - xorgproto - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - editres = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libxkbfile, - libX11, - libXaw, - libXmu, - xorgproto, - libXt, - wrapWithXFileSearchPathHook, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "editres"; - version = "1.0.9"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/editres-1.0.9.tar.xz"; - sha256 = "1imk7mgdc3q9lf058xisajij374x8r31ynvqmwbs9khfdxx3zz6d"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; - buildInputs = [ - libxkbfile - libX11 - libXaw - libXmu - xorgproto - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - fonttosfnt = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libfontenc, - freetype, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "fonttosfnt"; - version = "1.2.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz"; - sha256 = "0wk3fs038sh2sl1sqayzfjvygmcdp903qa1pd3aankxrgzv3b5i4"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libfontenc - freetype - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - iceauth = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libICE, - xorgproto, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "iceauth"; - version = "1.0.10"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/iceauth-1.0.10.tar.xz"; - sha256 = "0ad0kbr5bfdk9na3jmjpg26gd6hwv4lxja2nkdwxrybal9yzpvix"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libICE - xorgproto - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! libXTrap = callPackage ( { @@ -512,90 +354,6 @@ self: with self; { }) ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! - oclock = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libxkbfile, - libX11, - libXext, - libXmu, - libXt, - wrapWithXFileSearchPathHook, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "oclock"; - version = "1.0.6"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/oclock-1.0.6.tar.xz"; - sha256 = "1gi41nmf5glvzasri0glka19h6gkpbiy0bwbvdxwl7i15mg5xs1y"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ - pkg-config - wrapWithXFileSearchPathHook - ]; - buildInputs = [ - libxkbfile - libX11 - libXext - libXmu - libXt - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - - # THIS IS A GENERATED FILE. DO NOT EDIT! - setxkbmap = callPackage ( - { - stdenv, - pkg-config, - fetchurl, - libX11, - libxkbfile, - libXrandr, - testers, - }: - stdenv.mkDerivation (finalAttrs: { - pname = "setxkbmap"; - version = "1.3.4"; - builder = ./builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz"; - sha256 = "1pps0x66512y3f7v6xgnb6gjbllsgi4q5zxmjcdiv60fsia8b3dy"; - }; - hardeningDisable = [ - "bindnow" - "relro" - ]; - strictDeps = true; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - libX11 - libxkbfile - libXrandr - ]; - passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; - meta = { - pkgConfigModules = [ ]; - platforms = lib.platforms.unix; - }; - }) - ) { }; - # THIS IS A GENERATED FILE. DO NOT EDIT! xclock = callPackage ( { diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 5e7eb1243b5b..070ce5d76e3f 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -334,6 +334,8 @@ print OUT <