diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix index f6241e9bf96b..70ee02421cc3 100644 --- a/nixos/modules/config/resolvconf.nix +++ b/nixos/modules/config/resolvconf.nix @@ -161,9 +161,12 @@ in script = '' ${lib.getExe cfg.package} -u - files=(/run/resolvconf ${lib.escapeShellArgs cfg.subscriberFiles}) - chgrp -R resolvconf "''${files[@]}" - chmod -R g=u "''${files[@]}" + chgrp resolvconf ${lib.escapeShellArgs cfg.subscriberFiles} + chmod g=u ${lib.escapeShellArgs cfg.subscriberFiles} + ${lib.getExe' pkgs.acl "setfacl"} -R \ + -m group:resolvconf:rwx \ + -m default:group:resolvconf:rwx \ + /run/resolvconf ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 4de80acfa9a8..d2b23bf17570 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -201,6 +201,26 @@ let }; }; + promTypes.sigv4 = types.submodule { + options = { + region = mkOpt types.str '' + The AWS region. + ''; + access_key = mkOpt types.str '' + The Access Key ID. + ''; + secret_key = mkOpt types.str '' + The Secret Access Key. + ''; + profile = mkOpt types.str '' + The named AWS profile used to authenticate. + ''; + role_arn = mkOpt types.str '' + The AWS role ARN. + ''; + }; + }; + promTypes.tls_config = types.submodule { options = { ca_file = mkOpt types.str '' @@ -1464,6 +1484,9 @@ let Sets the `Authorization` header on every remote write request with the bearer token read from the configured file. It is mutually exclusive with `bearer_token`. ''; + sigv4 = mkOpt promTypes.sigv4 '' + Configures AWS Signature Version 4 settings. + ''; tls_config = mkOpt promTypes.tls_config '' Configures the remote write request's TLS settings. ''; diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index a7c896cb28a2..059dc59e8a0a 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -249,7 +249,7 @@ in ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind"; Restart = "always"; AmbientCapabilities = [ "CAP_NET_ADMIN" "CAP_NET_RAW" "CAP_NET_BIND_SERVICE" ]; - ReadWritePaths = [ "/proc/sys/net/ipv6" ] + ReadWritePaths = [ "/proc/sys/net/ipv4" "/proc/sys/net/ipv6" ] ++ lib.optionals useResolvConf ([ "/run/resolvconf" ] ++ config.networking.resolvconf.subscriberFiles); DeviceAllow = ""; LockPersonality = true; diff --git a/nixos/modules/services/networking/pptpd.nix b/nixos/modules/services/networking/pptpd.nix index b28015800f3c..441ab52372f9 100644 --- a/nixos/modules/services/networking/pptpd.nix +++ b/nixos/modules/services/networking/pptpd.nix @@ -101,15 +101,12 @@ with lib; secrets="/etc/ppp-pptpd/chap-secrets" - [ -f "$secrets" ] || cat > "$secrets" << EOF + [ -f "$secrets" ] || install -m 600 -o root -g root /dev/stdin "$secrets" << EOF # From: pptpd-1.4.0/samples/chap-secrets # Secrets for authentication using CHAP # client server secret IP addresses #username pptpd password * EOF - - chown root:root "$secrets" - chmod 600 "$secrets" ''; serviceConfig = { diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index dd6519ff9361..77632ca4b33b 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -440,6 +440,7 @@ in { pyload = handleTest ./pyload.nix {}; oci-containers = handleTestOn ["aarch64-linux" "x86_64-linux"] ./oci-containers.nix {}; odoo = handleTest ./odoo.nix {}; + odoo17 = handleTest ./odoo.nix { package = pkgs.odoo17; }; odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; }; odoo15 = handleTest ./odoo.nix { package = pkgs.odoo15; }; # 9pnet_virtio used to mount /nix partition doesn't support diff --git a/pkgs/applications/misc/yubioath-flutter/default.nix b/pkgs/applications/misc/yubioath-flutter/default.nix index 2392feb8a476..23fa019d75dc 100644 --- a/pkgs/applications/misc/yubioath-flutter/default.nix +++ b/pkgs/applications/misc/yubioath-flutter/default.nix @@ -43,21 +43,21 @@ flutter324.buildFlutterApplication rec { postInstall = '' # Swap the authenticator-helper symlink with the correct symlink. - ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/helper/authenticator-helper" + ln -fs "${passthru.helper}/bin/authenticator-helper" "$out/app/$pname/helper/authenticator-helper" # Move the icon. mkdir $out/share/icons - mv $out/app/linux_support/com.yubico.yubioath.png $out/share/icons + mv $out/app/$pname/linux_support/com.yubico.yubioath.png $out/share/icons # Cleanup. rm -rf \ - "$out/app/README.adoc" \ - "$out/app/desktop_integration.sh" \ - "$out/app/linux_support" \ + "$out/app/$pname/README.adoc" \ + "$out/app/$pname/desktop_integration.sh" \ + "$out/app/$pname/linux_support" \ $out/bin/* # We will repopulate this directory later. # Symlink binary. - ln -sf "$out/app/authenticator" "$out/bin/yubioath-flutter" + ln -sf "$out/app/$pname/authenticator" "$out/bin/yubioath-flutter" # Set the correct path to the binary in desktop file. substituteInPlace "$out/share/applications/com.yubico.authenticator.desktop" \ diff --git a/pkgs/applications/networking/browsers/ladybird/default.nix b/pkgs/applications/networking/browsers/ladybird/default.nix index d2e9308a5021..94a2944f002e 100644 --- a/pkgs/applications/networking/browsers/ladybird/default.nix +++ b/pkgs/applications/networking/browsers/ladybird/default.nix @@ -48,13 +48,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2024-10-05"; + version = "0-unstable-2024-10-22"; src = fetchFromGitHub { owner = "LadybirdWebBrowser"; repo = "ladybird"; - rev = "077bc68a4cbf2d8c97abc818515a22471da42c99"; - hash = "sha256-zlQEOk9rex9Evpc2+4q2e2QPwGd9kLOQ393DJPuwh7c="; + rev = "648fac7215e1841e3714d4c72c7aee75152da522"; + hash = "sha256-OB9dV+dNr5eA4h1+telYitrI62m+XSK/SYc9UPs7D4M="; }; postPatch = '' diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index f5a5296de9c4..6499b48d95a6 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "bitwuzla"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "bitwuzla"; repo = "bitwuzla"; rev = finalAttrs.version; - hash = "sha256-/izxmN+zlrXsY6g6TRC1QqsLqltvrmZquXRd6h8RLRc="; + hash = "sha256-xO9+hixboGaCAIi01sWuIYtPamIwUpiTujmOD60NEm0="; }; strictDeps = true; diff --git a/pkgs/by-name/ax/axis2/package.nix b/pkgs/by-name/ax/axis2/package.nix index adb305f3100e..378656e036e3 100644 --- a/pkgs/by-name/ax/axis2/package.nix +++ b/pkgs/by-name/ax/axis2/package.nix @@ -34,6 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall + install -Dm644 lib/* -t $out/lib install -Dm644 dist/axis2.war -t $out/webapps unzip $out/webapps/axis2.war -d $out/webapps/axis2 diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix index 3fc5138912a2..c0f181dd41db 100644 --- a/pkgs/by-name/ba/bant/package.nix +++ b/pkgs/by-name/ba/bant/package.nix @@ -15,7 +15,8 @@ let rev = "40bc9ad53e5a59d596935839e7c072679e706266"; hash = "sha256-CL0YMQd1ck6/dlvJCLxt9jYyqDuk+iAWfdBOMj864u8="; }; -in buildBazelPackage rec { +in +buildBazelPackage rec { pname = "bant"; version = "0.1.7"; @@ -26,17 +27,22 @@ in buildBazelPackage rec { hash = "sha256-QbxPosjlrpxbz6gQKUKccF2Gu/i5xvqh2gwfABYE8kE="; }; - bazelFlags = ["--registry" "file://${registry}"]; + bazelFlags = [ + "--registry" + "file://${registry}" + ]; postPatch = '' patchShebangs scripts/create-workspace-status.sh ''; fetchAttrs = { - sha256 = { - aarch64-linux = "sha256-09RL0tj6xsGEmuv11V81eAtqLc9nAaE8Il3d6ueS0UQ="; - x86_64-linux = "sha256-6mlaJ/kT14vKvlJjxqBK/lESjjxbcYxApi7+eiiI37M="; - }.${system} or (throw "No hash for system: ${system}"); + hash = + { + aarch64-linux = "sha256-LNca4h4yceSgve9GYUoXqlODKPjLAa71kh1BWXqRYtk="; + x86_64-linux = "sha256-bRFIfaVbsU2WroXR/i0E7J4rWeaNEoum93r8qOMXXvc="; + } + .${system} or (throw "No hash for system: ${system}"); }; nativeBuildInputs = [ @@ -58,7 +64,10 @@ in buildBazelPackage rec { description = "Bazel/Build Analysis and Navigation Tool"; homepage = "http://bant.build/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ hzeller lromor ]; + maintainers = with maintainers; [ + hzeller + lromor + ]; platforms = platforms.linux; }; } diff --git a/pkgs/by-name/co/commitlint-rs/package.nix b/pkgs/by-name/co/commitlint-rs/package.nix index 9b31e6cfd309..c69ace68ee52 100644 --- a/pkgs/by-name/co/commitlint-rs/package.nix +++ b/pkgs/by-name/co/commitlint-rs/package.nix @@ -8,15 +8,15 @@ }: rustPlatform.buildRustPackage rec { pname = "commitlint-rs"; - version = "0.1.11"; + version = "0.1.12"; src = fetchFromGitHub { owner = "KeisukeYamashita"; repo = "commitlint-rs"; rev = "v${version}"; - hash = "sha256-FrYXEh75H0u1rE1YNDL/B1gMYMG43jPDJGUMv9y5/3g="; + hash = "sha256-xDEd3jNmqur+ULjXOReolIDiqvpT2tAHj/IbH2op5Po="; }; - cargoHash = "sha256-W6HkLCUoylgQQc2fFprmJeLH8KtpVUD4+BXWbNECVZ4="; + cargoHash = "sha256-SNOy0B1QARfoueMsCjLZhJsGQy2jTSeFC/D1+R/FH4Y="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index ef29c8a67548..8e62a026ba00 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "24.2.1"; + version = "24.2.3"; src = let @@ -29,10 +29,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-U1KJxE1PzRRMvYw3jSYV2n6JuhzyL30le1HeY0kft1k="; - aarch64-linux = "sha256-AT/Xx+Hwu64sUfR1fS9nI+RTsIfdi9udF9TR9hbjnxg="; - x86_64-darwin = "sha256-hCIfBv6FaNoZiTvpx1UCdwBg15vq+ZsTG5upmbWXN0M="; - aarch64-darwin = "sha256-g0G6fqR75AoOEzlYr6MbTBL8aQ/hWQuFyw1G2w9/JlU="; + x86_64-linux = "sha256-TvDpoEcnZBS8ORggFwLM80FXsJ8EXKvRSPUn+VtNTk8="; + aarch64-linux = "sha256-59khU3VQzpNeZv69pbeeE4ZAFajyI5gUUw9baOWPIFM="; + x86_64-darwin = "sha256-/YyN5daeoxq0oii6qYRpZ8cb43u6n8HuVc2JqVOhrxs="; + aarch64-darwin = "sha256-Stb76QpLnpmpBYDm+6fgkcx+TlY8hVkNtvGgdMWbaHg="; }; in fetchurl { diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix index 8795f6c066e0..b4b3668633e5 100644 --- a/pkgs/by-name/fi/finamp/package.nix +++ b/pkgs/by-name/fi/finamp/package.nix @@ -33,7 +33,7 @@ flutter324.buildFlutterApplication { }; postFixup = '' - patchelf $out/app/finamp --add-needed libisar.so --add-needed libmpv.so --add-rpath ${lib.makeLibraryPath [ mpv-unwrapped ]} + patchelf $out/app/$pname/finamp --add-needed libisar.so --add-needed libmpv.so --add-rpath ${lib.makeLibraryPath [ mpv-unwrapped ]} ''; postInstall = '' diff --git a/pkgs/development/web/flyctl/disable-auto-update.patch b/pkgs/by-name/fl/flyctl/disable-auto-update.patch similarity index 100% rename from pkgs/development/web/flyctl/disable-auto-update.patch rename to pkgs/by-name/fl/flyctl/disable-auto-update.patch diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/by-name/fl/flyctl/package.nix similarity index 78% rename from pkgs/development/web/flyctl/default.nix rename to pkgs/by-name/fl/flyctl/package.nix index 8faa35852e34..a820d6ac8f3d 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -1,26 +1,34 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, flyctl, installShellFiles }: +{ + lib, + buildGoModule, + fetchFromGitHub, + testers, + flyctl, + installShellFiles, +}: buildGoModule rec { pname = "flyctl"; - version = "0.3.15"; + version = "0.3.29"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-RM9R3o1NJYrw21SYx5whdR9kbopdOXUj3Uw5dVmo6Kk="; + hash = "sha256-gaDmgMJ87d8SosmXuO2arLS7w+3NBS8teKhdIRIXRnM="; }; - vendorHash = "sha256-0KVjg4gt0WOJgVaeugSGzJJE/MvKSPZP6MXCYIw0cxQ="; + vendorHash = "sha256-0GfbHCKzBE8dlf2ZtUZN5L6ZJK2/Jhd9HNnkCNTAgtk="; subPackages = [ "." ]; ldflags = [ - "-s" "-w" + "-s" + "-w" "-X github.com/superfly/flyctl/internal/buildinfo.buildDate=1970-01-01T00:00:00Z" "-X github.com/superfly/flyctl/internal/buildinfo.buildVersion=${version}" ]; - tags = ["production"]; + tags = [ "production" ]; nativeBuildInputs = [ installShellFiles ]; @@ -64,7 +72,13 @@ buildGoModule rec { downloadPage = "https://github.com/superfly/flyctl"; homepage = "https://fly.io/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ adtya jsierles techknowlogick RaghavSood teutat3s ]; + maintainers = with lib.maintainers; [ + adtya + jsierles + techknowlogick + RaghavSood + teutat3s + ]; mainProgram = "flyctl"; }; } diff --git a/pkgs/by-name/gu/guile-ssh/package.nix b/pkgs/by-name/gu/guile-ssh/package.nix index ad3a8c547442..5fca74a79462 100644 --- a/pkgs/by-name/gu/guile-ssh/package.nix +++ b/pkgs/by-name/gu/guile-ssh/package.nix @@ -12,13 +12,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "guile-ssh"; - version = "0.16.3"; + # XXX: using unstable to ensure proper build with libssh 0.11.1 (https://github.com/artyom-poptsov/guile-ssh/issues/42) + version = "0.17.0-unstable-2024-10-15"; src = fetchFromGitHub { owner = "artyom-poptsov"; repo = "guile-ssh"; - rev = "v${finalAttrs.version}"; - hash = "sha256-P29U88QrCjoyl/wdTPZbiMoykd/v6ul6CW/IJn9UAyw="; + rev = "9336580f92f83bb73041c5374b400144a56b4c35"; + hash = "sha256-Hwg0xaNSm/SEZfzczjb7o8TJXfzT1mmOk1rJROxahLQ="; }; patches = [ diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 7353a8ed6aca..d4216c553b11 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -50,11 +50,13 @@ flutterPackages.v3_19.buildFlutterApplication rec { # without this, only the splash screen will be shown and the logs will contain the # line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'` - extraWrapProgramArgs = "--chdir $out/app"; + # Environmental variables don't quite eval outside of hooks so use pname and + # version directly. + extraWrapProgramArgs = "--chdir $out/app/${pname}"; postInstall = '' mkdir -p $out/share/pixmaps - cp $out/app/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png + cp $out/app/$pname/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/pixmaps/intiface-central.png ''; desktopItems = [ diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/by-name/le/lenmus/package.nix similarity index 59% rename from pkgs/applications/misc/lenmus/default.nix rename to pkgs/by-name/le/lenmus/package.nix index c7a1ce9f5d2f..4a7fbb5409db 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/by-name/le/lenmus/package.nix @@ -1,37 +1,42 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, pkg-config -, makeWrapper -, boost -, portmidi -, sqlite -, freetype -, libpng -, pngpp -, zlib -, wxGTK32 -, wxsqlite3 -, fluidsynth -, fontconfig -, darwin -, soundfont-fluid -, openlilylib-fonts +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + makeWrapper, + boost, + portmidi, + sqlite, + freetype, + libpng, + pngpp, + zlib, + wxGTK32, + wxsqlite3, + fluidsynth, + fontconfig, + darwin, + soundfont-fluid, + openlilylib-fonts, }: let inherit (darwin.apple_sdk.frameworks) Cocoa; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "lenmus"; version = "6.0.1"; src = fetchFromGitHub { owner = "lenmus"; repo = "lenmus"; - rev = "Release_${version}"; - sha256 = "sha256-qegOAc6vs2+6VViDHVjv0q+qjLZyTT7yPF3hFpTt5zE="; + rev = "Release_${finalAttrs.version}"; + hash = "sha256-qegOAc6vs2+6VViDHVjv0q+qjLZyTT7yPF3hFpTt5zE="; + }; + + env = { + NIX_CFLAGS_COMPILE = "-fpermissive"; }; postPatch = '' @@ -40,28 +45,32 @@ stdenv.mkDerivation rec { sed -i 's/fixup_bundle.*")/")/g' CMakeLists.txt ''; - nativeBuildInputs = [ - cmake - pkg-config - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - makeWrapper - ]; + nativeBuildInputs = + [ + cmake + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeWrapper + ]; - buildInputs = [ - boost - portmidi - sqlite - freetype - libpng - pngpp - zlib - wxGTK32 - wxsqlite3 - fluidsynth - fontconfig - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Cocoa - ]; + buildInputs = + [ + boost + portmidi + sqlite + freetype + libpng + pngpp + zlib + wxGTK32 + wxsqlite3 + fluidsynth + fontconfig + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + Cocoa + ]; preConfigure = '' mkdir res/fonts @@ -82,7 +91,7 @@ stdenv.mkDerivation rec { makeWrapper $out/{Applications/lenmus.app/Contents/MacOS,bin}/lenmus ''; - meta = with lib; { + meta = { description = "LenMus Phonascus is a program for learning music"; longDescription = '' LenMus Phonascus is a free open source program (GPL v3) for learning music. @@ -90,9 +99,9 @@ stdenv.mkDerivation rec { The different activities can be customized to meet your needs ''; homepage = "http://www.lenmus.org/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ ramkromberg ]; - platforms = with platforms; unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ ramkromberg ]; + platforms = lib.platforms.unix; mainProgram = "lenmus"; }; -} +}) diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 0b5a93a1f52b..9e41b311d5e1 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -6,11 +6,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.2.19"; + version = "3.2.24"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage"; - hash = "sha512-OLXp355IxMmhLtsxNVj0/ykl2lGJtwu1Ti3TOJZ1dwTsx/Y+tdeFT+WeDAju9fMC2AssciUnAeqqdp76sHxUgw=="; + hash = "sha512-0rTADFgOOBDuv4nk2lgP4YUFxfsasZDQkp/r26iVwSa5f1swQXALGFwLl1VdJTRQ5AlZvRm6WBbt/ML2jODTZw=="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/od/odoo/package.nix b/pkgs/by-name/od/odoo/package.nix index fd3768bcd742..8c7477c074ea 100644 --- a/pkgs/by-name/od/odoo/package.nix +++ b/pkgs/by-name/od/odoo/package.nix @@ -1,29 +1,17 @@ { lib , fetchgit , fetchzip -, python310 +, python312 , rtlcss , wkhtmltopdf , nixosTests -, odoo_version ? "17.0" -, odoo_release ? "20240610" }: let - python = python310.override { + odoo_version = "18.0"; + odoo_release = "20241010"; + python = python312.override { self = python; - packageOverrides = final: prev: { - # requirements.txt fixes docutils at 0.17; the default 0.21.1 tested throws exceptions - docutils-0_17 = prev.docutils.overridePythonAttrs (old: rec { - version = "0.17"; - src = fetchgit { - url = "git://repo.or.cz/docutils.git"; - rev = "docutils-${version}"; - hash = "sha256-O/9q/Dg1DBIxKdNBOhDV16yy5ez0QANJYMjeovDoWX8="; - }; - buildInputs = with prev; [setuptools]; - }); - }; }; in python.pkgs.buildPythonApplication rec { pname = "odoo"; @@ -34,13 +22,10 @@ in python.pkgs.buildPythonApplication rec { src = fetchzip { # find latest version on https://nightly.odoo.com/${odoo_version}/nightly/src url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; - name = "${pname}-${version}"; - hash = "sha256-blibGJyaz+MxMazOXhPbGBAJWZoGubirwSnjVYyLBJs="; # odoo + name = "odoo-${version}"; + hash = "sha256-TUfLyB0m8XyEiS493Q/ECgSJutAd1rtWX93f3mwfOK0="; # odoo }; - # needs some investigation - doCheck = false; - makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}" ]; @@ -50,7 +35,8 @@ in python.pkgs.buildPythonApplication rec { chardet cryptography decorator - docutils-0_17 # sphinx has a docutils requirement >= 18 + docutils + distutils ebaysdk freezegun geoip2 diff --git a/pkgs/by-name/od/odoo/update.sh b/pkgs/by-name/od/odoo/update.sh index e9c50ccb5081..2265f9048c0e 100755 --- a/pkgs/by-name/od/odoo/update.sh +++ b/pkgs/by-name/od/odoo/update.sh @@ -1,9 +1,15 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch +# shellcheck shell=bash set -euo pipefail -VERSION="17.0" # must be incremented manually +SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" +PKG=$(basename "$SCRIPT_DIR") + +LATEST="18" # increment manually +VERSION="${PKG/#odoo}" +VERSION="${VERSION:-$LATEST}.0" RELEASE="$( curl "https://nightly.odoo.com/$VERSION/nightly/src/" | @@ -12,15 +18,15 @@ RELEASE="$( )" latestVersion="$VERSION.$RELEASE" -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; odoo.version or (lib.getVersion odoo)" | tr -d '"') +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; $PKG.version or (lib.getVersion $PKG)" | tr -d '"') if [[ "$currentVersion" == "$latestVersion" ]]; then - echo "odoo is up-to-date: $currentVersion" + echo "$PKG is up-to-date: $currentVersion" exit 0 fi -cd "$(dirname "${BASH_SOURCE[0]}")" +cd "$SCRIPT_DIR" -sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix -sed -ri "s|, odoo_version \? .+|, odoo_version ? \"$VERSION\"|" package.nix -sed -ri "s|, odoo_release \? .+|, odoo_release ? \"$RELEASE\"|" package.nix +sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix +sed -ri "s|odoo_version = .+|odoo_version = \"$VERSION\";|" package.nix +sed -ri "s|odoo_release = .+|odoo_release = \"$RELEASE\";|" package.nix diff --git a/pkgs/by-name/od/odoo15/package.nix b/pkgs/by-name/od/odoo15/package.nix index ca2a1444a02c..be0f9a690660 100644 --- a/pkgs/by-name/od/odoo15/package.nix +++ b/pkgs/by-name/od/odoo15/package.nix @@ -1,13 +1,20 @@ -{ lib, fetchFromGitHub, fetchzip, python310, rtlcss, wkhtmltopdf -, nixosTests }: +{ lib +, fetchFromGitHub +, fetchzip +, python310 +, rtlcss +, wkhtmltopdf +, nixosTests +}: let + odoo_version = "15.0"; + odoo_release = "20241010"; python = python310.override { self = python; packageOverrides = self: super: { pypdf2 = super.pypdf2.overridePythonAttrs (old: rec { version = "1.28.6"; - format = "setuptools"; src = fetchFromGitHub { owner = "py-pdf"; @@ -17,43 +24,25 @@ let hash = "sha256-WnRbsy/PJcotZqY9mJPLadrYqkXykOVifLIbDyNf4s4="; }; + dependencies = [ self.setuptools ]; + nativeCheckInputs = with self; [ pytestCheckHook pillow ]; }); - flask = super.flask.overridePythonAttrs (old: rec { - version = "2.1.3"; - src = old.src.override { - inherit version; - hash = "sha256-FZcuUBffBXXD1sCQuhaLbbkCWeYgrI1+qBOjlrrVtss="; - }; - }); - werkzeug = super.werkzeug.overridePythonAttrs (old: rec { - version = "2.1.2"; - src = old.src.override { - inherit version; - hash = "sha256-HOCOgJPtZ9Y41jh5/Rujc1gX96gN42dNKT9ZhPJftuY="; - }; - }); }; }; - - odoo_version = "15.0"; - odoo_release = "20230816"; in python.pkgs.buildPythonApplication rec { - pname = "odoo15"; + pname = "odoo"; version = "${odoo_version}.${odoo_release}"; format = "setuptools"; - # latest release is at https://github.com/odoo/docker/blob/master/15.0/Dockerfile + # latest release is at https://github.com/odoo/docker/blob/5fb6a842747c296099d9384587cd89640eb7a615/15.0/Dockerfile#L58 src = fetchzip { url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; - name = "${pname}-${version}"; - hash = "sha256-h81JA0o44DVtl/bZ52rGQfg54TigwQcNpcMjQbi0zIQ="; # odoo + name = "odoo-${version}"; + hash = "sha256-Hkre6mghEiLrDwfB1BxGbqEm/zruHLwaS+eIFQKjl1o="; # odoo }; - # needs some investigation - doCheck = false; - makeWrapperArgs = [ "--prefix" "PATH" @@ -74,6 +63,7 @@ in python.pkgs.buildPythonApplication rec { jinja2 libsass lxml + lxml-html-clean markupsafe mock num2words @@ -108,6 +98,7 @@ in python.pkgs.buildPythonApplication rec { dontStrip = true; passthru = { + updateScript = ./update.sh; tests = { inherit (nixosTests) odoo15; }; }; diff --git a/pkgs/by-name/od/odoo15/update.sh b/pkgs/by-name/od/odoo15/update.sh new file mode 100755 index 000000000000..2265f9048c0e --- /dev/null +++ b/pkgs/by-name/od/odoo15/update.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch +# shellcheck shell=bash + +set -euo pipefail + +SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" +PKG=$(basename "$SCRIPT_DIR") + +LATEST="18" # increment manually +VERSION="${PKG/#odoo}" +VERSION="${VERSION:-$LATEST}.0" + +RELEASE="$( + curl "https://nightly.odoo.com/$VERSION/nightly/src/" | + sed -nE 's/.*odoo_'"$VERSION"'.(20[0-9]{6}).tar.gz.*/\1/p' | + tail -n 1 +)" + +latestVersion="$VERSION.$RELEASE" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; $PKG.version or (lib.getVersion $PKG)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "$PKG is up-to-date: $currentVersion" + exit 0 +fi + +cd "$SCRIPT_DIR" + +sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix +sed -ri "s|odoo_version = .+|odoo_version = \"$VERSION\";|" package.nix +sed -ri "s|odoo_release = .+|odoo_release = \"$RELEASE\";|" package.nix diff --git a/pkgs/by-name/od/odoo16/package.nix b/pkgs/by-name/od/odoo16/package.nix index 91e634a13b22..b2acd426cf60 100644 --- a/pkgs/by-name/od/odoo16/package.nix +++ b/pkgs/by-name/od/odoo16/package.nix @@ -7,31 +7,11 @@ }: let + odoo_version = "16.0"; + odoo_release = "20241010"; python = python310.override { self = python; - packageOverrides = self: super: { - flask = super.flask.overridePythonAttrs (old: rec { - version = "2.3.3"; - src = old.src.override { - inherit version; - hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw="; - }; - }); - werkzeug = super.werkzeug.overridePythonAttrs (old: rec { - version = "2.3.7"; - src = old.src.override { - inherit version; - hash = "sha256-K4wORHtLnbzIXdl7butNy69si2w74L1lTiVVPgohV9g="; - }; - disabledTests = old.disabledTests ++ [ - "test_response_body" - ]; - }); - }; }; - - odoo_version = "16.0"; - odoo_release = "20231024"; in python.pkgs.buildPythonApplication rec { pname = "odoo"; version = "${odoo_version}.${odoo_release}"; @@ -41,13 +21,10 @@ in python.pkgs.buildPythonApplication rec { # latest release is at https://github.com/odoo/docker/blob/master/16.0/Dockerfile src = fetchzip { url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; - name = "${pname}-${version}"; - hash = "sha256-Ux8RfA7kWLKissBBY5wrfL+aKKw++5BxjP3Vw0JAOsk="; # odoo + name = "odoo-${version}"; + hash = "sha256-ICe5UOy+Ga81fE66SnIhRz3+JEEbGfoz7ag53mkG4UM="; # odoo }; - # needs some investigation - doCheck = false; - makeWrapperArgs = [ "--prefix" "PATH" ":" "${lib.makeBinPath [ wkhtmltopdf rtlcss ]}" ]; @@ -66,6 +43,7 @@ in python.pkgs.buildPythonApplication rec { jinja2 libsass lxml + lxml-html-clean markupsafe num2words ofxparse @@ -102,6 +80,7 @@ in python.pkgs.buildPythonApplication rec { dontStrip = true; passthru = { + updateScript = ./update.sh; tests = { inherit (nixosTests) odoo; }; diff --git a/pkgs/by-name/od/odoo16/update.sh b/pkgs/by-name/od/odoo16/update.sh new file mode 100755 index 000000000000..2265f9048c0e --- /dev/null +++ b/pkgs/by-name/od/odoo16/update.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch +# shellcheck shell=bash + +set -euo pipefail + +SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" +PKG=$(basename "$SCRIPT_DIR") + +LATEST="18" # increment manually +VERSION="${PKG/#odoo}" +VERSION="${VERSION:-$LATEST}.0" + +RELEASE="$( + curl "https://nightly.odoo.com/$VERSION/nightly/src/" | + sed -nE 's/.*odoo_'"$VERSION"'.(20[0-9]{6}).tar.gz.*/\1/p' | + tail -n 1 +)" + +latestVersion="$VERSION.$RELEASE" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; $PKG.version or (lib.getVersion $PKG)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "$PKG is up-to-date: $currentVersion" + exit 0 +fi + +cd "$SCRIPT_DIR" + +sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix +sed -ri "s|odoo_version = .+|odoo_version = \"$VERSION\";|" package.nix +sed -ri "s|odoo_release = .+|odoo_release = \"$RELEASE\";|" package.nix diff --git a/pkgs/by-name/od/odoo17/package.nix b/pkgs/by-name/od/odoo17/package.nix new file mode 100644 index 000000000000..698afb37d103 --- /dev/null +++ b/pkgs/by-name/od/odoo17/package.nix @@ -0,0 +1,121 @@ +{ + lib, + fetchgit, + fetchzip, + python310, + rtlcss, + wkhtmltopdf, + nixosTests, +}: + +let + odoo_version = "17.0"; + odoo_release = "20241010"; + python = python310.override { + self = python; + packageOverrides = final: prev: { + # requirements.txt fixes docutils at 0.17; the default 0.21.1 tested throws exceptions + docutils-0_17 = prev.docutils.overridePythonAttrs (old: rec { + version = "0.17"; + src = fetchgit { + url = "git://repo.or.cz/docutils.git"; + rev = "docutils-${version}"; + hash = "sha256-O/9q/Dg1DBIxKdNBOhDV16yy5ez0QANJYMjeovDoWX8="; + }; + buildInputs = with prev; [ setuptools ]; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { + pname = "odoo"; + version = "${odoo_version}.${odoo_release}"; + + format = "setuptools"; + + # latest release is at https://github.com/odoo/docker/blob/master/17.0/Dockerfile + src = fetchzip { + url = "https://nightly.odoo.com/${odoo_version}/nightly/src/odoo_${version}.zip"; + name = "odoo-${version}"; + hash = "sha256-s4Fvzjwl2oM0V9G1WQdSoqo7kE7b8tJdluk9f7A06e8="; # odoo + }; + + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + "${lib.makeBinPath [ + wkhtmltopdf + rtlcss + ]}" + ]; + + propagatedBuildInputs = with python.pkgs; [ + babel + chardet + cryptography + decorator + docutils-0_17 # sphinx has a docutils requirement >= 18 + ebaysdk + freezegun + geoip2 + gevent + greenlet + idna + jinja2 + libsass + lxml + lxml-html-clean + markupsafe + num2words + ofxparse + passlib + pillow + polib + psutil + psycopg2 + pydot + pyopenssl + pypdf2 + pyserial + python-dateutil + python-ldap + python-stdnum + pytz + pyusb + qrcode + reportlab + requests + rjsmin + urllib3 + vobject + werkzeug + xlrd + xlsxwriter + xlwt + zeep + + setuptools + mock + ]; + + # takes 5+ minutes and there are not files to strip + dontStrip = true; + + passthru = { + updateScript = ./update.sh; + tests = { + inherit (nixosTests) odoo; + }; + }; + + meta = with lib; { + description = "Open Source ERP and CRM"; + homepage = "https://www.odoo.com/"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ + mkg20001 + siriobalmelli + ]; + }; +} diff --git a/pkgs/by-name/od/odoo17/update.sh b/pkgs/by-name/od/odoo17/update.sh new file mode 100755 index 000000000000..2265f9048c0e --- /dev/null +++ b/pkgs/by-name/od/odoo17/update.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused nix coreutils nix-prefetch +# shellcheck shell=bash + +set -euo pipefail + +SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")" +PKG=$(basename "$SCRIPT_DIR") + +LATEST="18" # increment manually +VERSION="${PKG/#odoo}" +VERSION="${VERSION:-$LATEST}.0" + +RELEASE="$( + curl "https://nightly.odoo.com/$VERSION/nightly/src/" | + sed -nE 's/.*odoo_'"$VERSION"'.(20[0-9]{6}).tar.gz.*/\1/p' | + tail -n 1 +)" + +latestVersion="$VERSION.$RELEASE" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; $PKG.version or (lib.getVersion $PKG)" | tr -d '"') + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "$PKG is up-to-date: $currentVersion" + exit 0 +fi + +cd "$SCRIPT_DIR" + +sed -ri "s| hash.+ # odoo| hash = \"$(nix-prefetch -q fetchzip --option extra-experimental-features flakes --url "https://nightly.odoo.com/${VERSION}/nightly/src/odoo_${latestVersion}.zip")\"; # odoo|g" package.nix +sed -ri "s|odoo_version = .+|odoo_version = \"$VERSION\";|" package.nix +sed -ri "s|odoo_release = .+|odoo_release = \"$RELEASE\";|" package.nix diff --git a/pkgs/by-name/pd/pdfarranger/package.nix b/pkgs/by-name/pd/pdfarranger/package.nix index 8050e5af6755..ed832c2be816 100644 --- a/pkgs/by-name/pd/pdfarranger/package.nix +++ b/pkgs/by-name/pd/pdfarranger/package.nix @@ -6,6 +6,8 @@ gtk3, poppler_gi, libhandy, + gettext, + stdenv, }: python3Packages.buildPythonApplication rec { @@ -20,7 +22,15 @@ python3Packages.buildPythonApplication rec { hash = "sha256-94qziqJaKW8/L/6+U1yojxdG8BmeAStn+qbfGemTrVA="; }; - nativeBuildInputs = [ wrapGAppsHook3 ]; + nativeBuildInputs = [ wrapGAppsHook3 ] ++ lib.optionals stdenv.isDarwin [ gettext ]; + + postPatch = lib.optionalString stdenv.isDarwin '' + LINTL="${lib.getLib gettext}/lib/libintl.8.dylib" + substituteInPlace pdfarranger/pdfarranger.py --replace-fail \ + "return 'libintl.8.dylib'" \ + "return '$LINTL'" + unset LINTL + ''; build-system = with python3Packages; [ setuptools ]; @@ -49,8 +59,10 @@ python3Packages.buildPythonApplication rec { inherit (src.meta) homepage; description = "Merge or split pdf documents and rotate, crop and rearrange their pages using a graphical interface"; mainProgram = "pdfarranger"; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ symphorien ]; + maintainers = with lib.maintainers; [ + symphorien + endle + ]; license = lib.licenses.gpl3Plus; changelog = "https://github.com/pdfarranger/pdfarranger/releases/tag/${version}"; }; diff --git a/pkgs/by-name/pi/pixi/Cargo.lock b/pkgs/by-name/pi/pixi/Cargo.lock index 13031bdfe9d4..a67d68e188cf 100644 --- a/pkgs/by-name/pi/pixi/Cargo.lock +++ b/pkgs/by-name/pi/pixi/Cargo.lock @@ -4,18 +4,18 @@ version = 3 [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aes" @@ -139,9 +139,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" @@ -198,9 +198,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.12" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa" +checksum = "e26a9844c659a2a293d239c7910b752f8487fe122c6c8bd1659bf85a6507c302" dependencies = [ "bzip2", "flate2", @@ -216,13 +216,13 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" +checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" dependencies = [ "async-task", "concurrent-queue", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-lite", "slab", ] @@ -255,9 +255,9 @@ dependencies = [ [[package]] name = "async-io" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" +checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8" dependencies = [ "async-lock", "cfg-if", @@ -269,7 +269,7 @@ dependencies = [ "rustix", "slab", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -317,7 +317,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -346,13 +346,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -365,8 +365,8 @@ dependencies = [ "futures", "http-content-range", "itertools 0.12.1", - "memmap2 0.9.4", - "reqwest 0.12.5", + "memmap2 0.9.5", + "reqwest 0.12.8", "reqwest-middleware", "thiserror", "tokio", @@ -397,9 +397,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backoff" @@ -417,17 +417,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -590,9 +590,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "bzip2" @@ -701,12 +701,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.7" +version = "1.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -758,9 +759,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.13" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -778,15 +779,15 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.13" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", "clap_lex", "strsim", - "terminal_size", + "terminal_size 0.4.0", ] [[package]] @@ -810,14 +811,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.13" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -878,9 +879,9 @@ checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -980,7 +981,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -991,14 +992,14 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] name = "dashmap" -version = "6.0.1" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" dependencies = [ "cfg-if", "crossbeam-utils", @@ -1027,9 +1028,9 @@ dependencies = [ [[package]] name = "dbus-secret-service" -version = "4.0.2" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1caa0c241c01ad8d99a78d553567d38f873dd3ac16eca33a5370d650ab25584e" +checksum = "b42a16374481d92aed73ae45b1f120207d8e71d24fb89f357fadbd8f946fd84b" dependencies = [ "aes", "block-padding", @@ -1089,9 +1090,15 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] +[[package]] +name = "deunicode" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" + [[package]] name = "dialoguer" version = "0.11.0" @@ -1154,7 +1161,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1264,7 +1271,7 @@ dependencies = [ "heck 0.4.1", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1276,7 +1283,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1297,7 +1304,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -1358,6 +1365,16 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "fake" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c25829bde82205da46e1823b2259db6273379f626fc211f126f65654a2669be" +dependencies = [ + "deunicode", + "rand", +] + [[package]] name = "fancy_display" version = "0.1.0" @@ -1376,9 +1393,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fd-lock" @@ -1393,9 +1410,9 @@ dependencies = [ [[package]] name = "file_url" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31b8d0fe7b11e53d71e1484766a00187bc239910dcacb5bf8909f1f3ffd9b4aa" +checksum = "e581e35fcfcf40b1767a88e44e3e1ef27faa11fc7383287d47bd3efef1cfe199" dependencies = [ "itertools 0.13.0", "percent-encoding", @@ -1406,14 +1423,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.4.1", - "windows-sys 0.52.0", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -1424,9 +1441,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.31" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -1535,9 +1552,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[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", @@ -1550,9 +1567,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", @@ -1560,15 +1577,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", @@ -1577,9 +1594,9 @@ 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-lite" @@ -1587,7 +1604,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" dependencies = [ - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-core", "futures-io", "parking", @@ -1596,26 +1613,26 @@ dependencies = [ [[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", - "syn 2.0.72", + "syn 2.0.79", ] [[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-timer" @@ -1625,9 +1642,9 @@ checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" [[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", @@ -1676,9 +1693,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -1695,8 +1712,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -1764,7 +1781,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.3.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -1773,9 +1790,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -1783,7 +1800,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.3.0", + "indexmap 2.6.0", "slab", "tokio", "tokio-util", @@ -1819,6 +1836,12 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "hashbrown" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb" + [[package]] name = "heck" version = "0.4.1" @@ -1971,7 +1994,7 @@ dependencies = [ "http 1.1.0", "http-cache", "http-cache-semantics", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "serde", "url", @@ -1985,7 +2008,7 @@ checksum = "92baf25cf0b8c9246baecf3a444546360a97b569168fdf92563ee6a47829920c" dependencies = [ "http 1.1.0", "http-serde", - "reqwest 0.12.5", + "reqwest 0.12.8", "serde", "time", ] @@ -2008,9 +2031,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.4" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" +checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946" [[package]] name = "httpdate" @@ -2041,9 +2064,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.30" +version = "0.14.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" +checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85" dependencies = [ "bytes", "futures-channel", @@ -2065,14 +2088,14 @@ dependencies = [ [[package]] name = "hyper" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +checksum = "bbbff0a806a4728c99295b254c8838933b5b082d75e3cb70c8dab21fdfbcfa9a" dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -2091,7 +2114,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http 0.2.12", - "hyper 0.14.30", + "hyper 0.14.31", "rustls 0.21.12", "tokio", "tokio-rustls 0.24.1", @@ -2099,21 +2122,21 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-util", - "rustls 0.23.12", + "rustls 0.23.14", "rustls-native-certs", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", "tower-service", - "webpki-roots 0.26.3", + "webpki-roots 0.26.5", ] [[package]] @@ -2123,7 +2146,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes", - "hyper 0.14.30", + "hyper 0.14.31", "native-tls", "tokio", "tokio-native-tls", @@ -2137,7 +2160,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ "bytes", "http-body-util", - "hyper 1.4.1", + "hyper 1.5.0", "hyper-util", "native-tls", "tokio", @@ -2147,29 +2170,28 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", "futures-util", "http 1.1.0", "http-body 1.0.1", - "hyper 1.4.1", + "hyper 1.5.0", "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -2214,7 +2236,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata 0.4.7", + "regex-automata 0.4.8", "same-file", "walkdir", "winapi-util", @@ -2233,12 +2255,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.3.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.0", "serde", ] @@ -2333,9 +2355,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" [[package]] name = "is_ci" @@ -2476,9 +2498,9 @@ dependencies = [ [[package]] name = "keyring" -version = "3.2.0" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73b9af47ded4df3067484d7d45758ca2b36bd083bf6d024c2952bbd8af1cdaa4" +checksum = "030a9b84bb2a2f3673d4c8b8236091ed5d8f6b66a56d8085471d8abd5f3c6a80" dependencies = [ "byteorder", "dbus-secret-service", @@ -2490,9 +2512,9 @@ dependencies = [ [[package]] name = "lazy-regex" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576c8060ecfdf2e56995cf3274b4f2d71fa5e4fa3607c1c0b63c10180ee58741" +checksum = "8d8e41c97e6bc7ecb552016274b99fbb5d035e8de288c582d9b933af6677bfda" dependencies = [ "lazy-regex-proc_macros", "once_cell", @@ -2501,14 +2523,14 @@ dependencies = [ [[package]] name = "lazy-regex-proc_macros" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9efb9e65d4503df81c615dc33ff07042a9408ac7f26b45abee25566f7fbfd12c" +checksum = "76e1d8b05d672c53cb9c7b920bbba8783845ae4f0b076e02a3db1d02c81b4163" dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -2519,9 +2541,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libdbus-sys" @@ -2556,6 +2578,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ "bitflags 2.6.0", "libc", + "redox_syscall 0.5.3", ] [[package]] @@ -2650,9 +2673,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -2692,7 +2715,7 @@ dependencies = [ "supports-color", "supports-hyperlinks", "supports-unicode", - "terminal_size", + "terminal_size 0.3.0", "textwrap", "thiserror", "unicode-width", @@ -2706,7 +2729,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -2717,7 +2740,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -2743,18 +2766,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi 0.3.9", "libc", @@ -2948,9 +2971,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] name = "object" -version = "0.36.2" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -2967,15 +2990,15 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "7b8cefcf97f41316955f9294cd61f639bdcfa9f2f230faac6cb896aa8ab64704" dependencies = [ "bitflags 2.6.0", "cfg-if", @@ -2994,7 +3017,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -3005,9 +3028,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741" dependencies = [ "cc", "libc", @@ -3063,7 +3086,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -3074,15 +3097,15 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" +checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56" [[package]] name = "parking" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -3186,7 +3209,7 @@ version = "0.6.0" source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "boxcar", - "indexmap 2.3.0", + "indexmap 2.6.0", "itertools 0.13.0", "pep440_rs", "pubgrub", @@ -3216,7 +3239,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.3.0", + "indexmap 2.6.0", ] [[package]] @@ -3249,7 +3272,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", "unicase", ] @@ -3265,22 +3288,22 @@ dependencies = [ [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -3297,18 +3320,18 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "piper" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" +checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" dependencies = [ "atomic-waker", - "fastrand 2.1.0", + "fastrand 2.1.1", "futures-io", ] [[package]] name = "pixi" -version = "0.31.0" +version = "0.34.0" dependencies = [ "ahash 0.8.11", "assert_matches", @@ -3325,19 +3348,20 @@ dependencies = [ "csv", "deno_task_shell", "dialoguer", - "dirs", "distribution-filename", "distribution-types", "dunce", + "fake", "fancy_display", "flate2", + "fs-err", "fs_extra", "futures", "http 1.1.0", "human_bytes", "humantime", "ignore", - "indexmap 2.3.0", + "indexmap 2.6.0", "indicatif", "insta", "install-wheel-rs", @@ -3374,11 +3398,10 @@ dependencies = [ "rattler_solve", "rattler_virtual_packages", "regex", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "rlimit", "rstest", - "same-file", "self-replace", "serde", "serde_json", @@ -3392,7 +3415,7 @@ dependencies = [ "thiserror", "tokio", "tokio-util", - "toml_edit 0.22.20", + "toml_edit", "tracing", "tracing-subscriber", "url", @@ -3431,7 +3454,7 @@ dependencies = [ "serde", "serde_ignored", "serde_json", - "toml_edit 0.22.20", + "toml_edit", "tracing", "url", ] @@ -3462,7 +3485,7 @@ dependencies = [ "dunce", "fancy_display", "glob", - "indexmap 2.3.0", + "indexmap 2.6.0", "insta", "itertools 0.13.0", "miette 7.2.0", @@ -3485,7 +3508,7 @@ dependencies = [ "strsim", "tempfile", "thiserror", - "toml_edit 0.22.20", + "toml_edit", "tracing", "url", ] @@ -3523,7 +3546,7 @@ dependencies = [ "serde_with", "serde_yaml", "thiserror", - "toml_edit 0.22.20", + "toml_edit", "typed-path", "url", ] @@ -3542,8 +3565,9 @@ dependencies = [ "pixi_consts", "rattler_conda_types", "rattler_networking", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", + "rstest", "serde", "serde_json", "serde_yaml", @@ -3576,9 +3600,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plain" @@ -3613,7 +3637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016" dependencies = [ "base64 0.22.1", - "indexmap 2.3.0", + "indexmap 2.6.0", "quick-xml", "serde", "time", @@ -3621,9 +3645,9 @@ dependencies = [ [[package]] name = "polling" -version = "3.7.2" +version = "3.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" +checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511" dependencies = [ "cfg-if", "concurrent-queue", @@ -3631,14 +3655,14 @@ dependencies = [ "pin-project-lite", "rustix", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" [[package]] name = "powerfmt" @@ -3663,23 +3687,23 @@ checksum = "70c501afe3a2e25c9bd219aa56ec1e04cdb3fcdd763055be268778c13fa82c1f" dependencies = [ "autocfg", "equivalent", - "indexmap 2.3.0", + "indexmap 2.6.0", ] [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -3692,7 +3716,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", "version_check", "yansi", ] @@ -3722,7 +3746,7 @@ name = "pubgrub" version = "0.2.1" source = "git+https://github.com/astral-sh/pubgrub?rev=388685a8711092971930986644cfed152d1a1f6c#388685a8711092971930986644cfed152d1a1f6c" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.6.0", "log", "priority-queue", "rustc-hash", @@ -3750,7 +3774,7 @@ version = "0.0.1" source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb70f1d35c0bb62b68e" dependencies = [ "distribution-filename", - "indexmap 2.3.0", + "indexmap 2.6.0", "itertools 0.13.0", "jiff", "mailparse", @@ -3783,7 +3807,7 @@ dependencies = [ "pixi_consts", "rattler_conda_types", "rattler_digest", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "reqwest-retry 0.5.0", "serde", @@ -3810,7 +3834,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef7061023bcb58a0fc4a4bbe9819c13b0dca7c2abc14da14f5ecc1532ab3a36a" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.6.0", "pep440_rs", "pep508_rs", "serde", @@ -3828,16 +3852,16 @@ dependencies = [ [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.12", + "rustls 0.23.14", "socket2", "thiserror", "tokio", @@ -3846,15 +3870,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand", "ring", "rustc-hash", - "rustls 0.23.12", + "rustls 0.23.14", "slab", "thiserror", "tinyvec", @@ -3863,22 +3887,22 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -3927,9 +3951,9 @@ dependencies = [ [[package]] name = "rattler" -version = "0.27.14" +version = "0.27.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a8488d78fb6fa616eeaed34dd3e3ae28de3d41f5fd0f2a692b714546769f6d" +checksum = "19b1afb401b5ae69ef0c20beabdf822c650cc6c387bd01369876a3cc05807b65" dependencies = [ "anyhow", "clap", @@ -3939,11 +3963,11 @@ dependencies = [ "fs-err", "futures", "humantime", - "indexmap 2.3.0", + "indexmap 2.6.0", "indicatif", "itertools 0.13.0", "memchr", - "memmap2 0.9.4", + "memmap2 0.9.5", "once_cell", "parking_lot 0.12.3", "rattler_cache", @@ -3954,7 +3978,7 @@ dependencies = [ "rattler_shell", "reflink-copy", "regex", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "simple_spawn_blocking", "smallvec", @@ -3968,9 +3992,9 @@ dependencies = [ [[package]] name = "rattler_cache" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50307f280939786d161dc4a117032bb3aabd8fd1301f3fcaf63caa095638d990" +checksum = "abdd55d83e6b1a573920b0b40b79fe11b4957abef45e2fac3144c323f48a2f60" dependencies = [ "anyhow", "dashmap", @@ -3985,7 +4009,7 @@ dependencies = [ "rattler_digest", "rattler_networking", "rattler_package_streaming", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "simple_spawn_blocking", "thiserror", @@ -3996,9 +4020,9 @@ dependencies = [ [[package]] name = "rattler_conda_types" -version = "0.28.1" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd1f00e6500bd4252ebb414d1c83aad05e0ab4c177e577344011d38d49ef223" +checksum = "ada4de35daa5b8ef2eecf18f51eaec355c52c5a6f9ca21b6413807b72cb90d0f" dependencies = [ "chrono", "dirs", @@ -4006,7 +4030,7 @@ dependencies = [ "fxhash", "glob", "hex", - "indexmap 2.3.0", + "indexmap 2.6.0", "itertools 0.13.0", "lazy-regex", "nom", @@ -4049,14 +4073,14 @@ dependencies = [ [[package]] name = "rattler_lock" -version = "0.22.26" +version = "0.22.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ff07b4be849f3eeb334d36d0e3496f8e0fdf096d7ca2b2142b2cbe66e60515" +checksum = "889a7a66861b54beec196fbcf72fc699e3696692cec02b8e429b6394257dd2c9" dependencies = [ "chrono", "file_url", "fxhash", - "indexmap 2.3.0", + "indexmap 2.6.0", "itertools 0.13.0", "pep440_rs", "pep508_rs", @@ -4077,7 +4101,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0306a96eb7216c786fa6234fd26207bf3769cbb48b2373d682eabb36ff11c175" dependencies = [ "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -4098,7 +4122,7 @@ dependencies = [ "itertools 0.13.0", "keyring", "netrc-rs", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "retry-policies 0.4.0", "serde", @@ -4110,9 +4134,9 @@ dependencies = [ [[package]] name = "rattler_package_streaming" -version = "0.22.9" +version = "0.22.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a3584bca0b2b7c67c61ae15c280f2202b6590e6afb201a83186432114dc53" +checksum = "ac020482d1e8eac6aa1114bc87f2af426a8c719e56b7798afe331354a41d1e5e" dependencies = [ "bzip2", "chrono", @@ -4122,7 +4146,7 @@ dependencies = [ "rattler_digest", "rattler_networking", "rattler_redaction", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "serde_json", "tar", @@ -4142,16 +4166,16 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b3a430398cc4ecd0350204087377bc31d977dfd897d3b6930f195f39c515b" dependencies = [ - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "url", ] [[package]] name = "rattler_repodata_gateway" -version = "0.21.16" +version = "0.21.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89a4c1042b0ae79c38f13292fd27a6b8319dcb056928ac688eab67214a6fc125" +checksum = "05726dde3ce7a7f46d67b9b41c6515af96219453043f0ba61359df40fbcff4db" dependencies = [ "anyhow", "async-compression", @@ -4175,7 +4199,7 @@ dependencies = [ "json-patch", "libc", "md-5", - "memmap2 0.9.4", + "memmap2 0.9.5", "ouroboros", "parking_lot 0.12.3", "pin-project-lite", @@ -4184,7 +4208,7 @@ dependencies = [ "rattler_digest", "rattler_networking", "rattler_redaction", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "rmp-serde", "serde", @@ -4204,12 +4228,12 @@ dependencies = [ [[package]] name = "rattler_shell" -version = "0.22.3" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a7d11ca9da7e3954764cb37b96dea0e07c59fbe2f35363083926618a192a2a" +checksum = "1b9ab12a632b2a9641c4935d160ac181564a66ca56767780bf6ffa9814161dd5" dependencies = [ "enum_dispatch", - "indexmap 2.3.0", + "indexmap 2.6.0", "itertools 0.13.0", "rattler_conda_types", "serde_json", @@ -4222,9 +4246,9 @@ dependencies = [ [[package]] name = "rattler_solve" -version = "1.0.10" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee39b9a5a7e3f1506392034bb39fb7bcac5a296c3ce411a57f285250d953258" +checksum = "726c21f9119981b47fab512da5d94ddd139617a45ed2863aa709958badc26510" dependencies = [ "chrono", "futures", @@ -4241,9 +4265,9 @@ dependencies = [ [[package]] name = "rattler_virtual_packages" -version = "1.1.6" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5386d3d7d4e7894f4eeee35b0a3ef204f55993c6eeb7e3fc772ec4566df679f1" +checksum = "7f6d62812b0b3050fb63ebb3368dd1b64eac3a4d6eb2509bae04d49200b036c5" dependencies = [ "archspec", "libloading", @@ -4295,15 +4319,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.3" @@ -4341,7 +4356,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -4357,14 +4372,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", + "regex-automata 0.4.8", + "regex-syntax 0.8.5", ] [[package]] @@ -4378,13 +4393,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax 0.8.5", ] [[package]] @@ -4395,9 +4410,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "relative-path" @@ -4449,7 +4464,7 @@ dependencies = [ "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", - "hyper 0.14.30", + "hyper 0.14.31", "hyper-rustls 0.24.2", "hyper-tls 0.5.0", "ipnet", @@ -4466,7 +4481,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 0.1.2", - "system-configuration", + "system-configuration 0.5.1", "tokio", "tokio-native-tls", "tokio-rustls 0.24.1", @@ -4476,14 +4491,14 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots 0.25.4", - "winreg 0.50.0", + "winreg", ] [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b" dependencies = [ "async-compression", "base64 0.22.1", @@ -4491,12 +4506,12 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "http-body-util", - "hyper 1.4.1", - "hyper-rustls 0.27.2", + "hyper 1.5.0", + "hyper-rustls 0.27.3", "hyper-tls 0.6.0", "hyper-util", "ipnet", @@ -4508,15 +4523,15 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.12", + "rustls 0.23.14", "rustls-native-certs", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper 1.0.1", - "system-configuration", + "system-configuration 0.6.1", "tokio", "tokio-native-tls", "tokio-rustls 0.26.0", @@ -4527,8 +4542,8 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.26.3", - "winreg 0.52.0", + "webpki-roots 0.26.5", + "windows-registry", ] [[package]] @@ -4539,7 +4554,7 @@ dependencies = [ "anyhow", "async-trait", "http 1.1.0", - "reqwest 0.12.5", + "reqwest 0.12.8", "serde", "thiserror", "tower-service", @@ -4557,9 +4572,9 @@ dependencies = [ "futures", "getrandom", "http 1.1.0", - "hyper 1.4.1", + "hyper 1.5.0", "parking_lot 0.11.2", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "retry-policies 0.3.0", "tokio", @@ -4577,9 +4592,9 @@ dependencies = [ "futures", "getrandom", "http 1.1.0", - "hyper 1.4.1", + "hyper 1.5.0", "parking_lot 0.11.2", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "retry-policies 0.4.0", "thiserror", @@ -4590,16 +4605,16 @@ dependencies = [ [[package]] name = "resolvo" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68c0ae687bbcd99ab33236c7cbccd2ba1c526a7f7a59743cb991074414c5293" +checksum = "1621ce52e3ff36c8f55f0017f1e4909f59514af8f852ee943997760bf12c7c15" dependencies = [ "ahash 0.8.11", "bitvec", "elsa", "event-listener", "futures", - "indexmap 2.3.0", + "indexmap 2.6.0", "itertools 0.13.0", "petgraph", "tracing", @@ -4725,7 +4740,7 @@ dependencies = [ "regex", "relative-path", "rustc_version", - "syn 2.0.72", + "syn 2.0.79", "unicode-ident", ] @@ -4761,9 +4776,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -4786,26 +4801,26 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" dependencies = [ "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] [[package]] name = "rustls-native-certs" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.3", + "rustls-pemfile 2.2.0", "rustls-pki-types", "schannel", "security-framework", @@ -4822,19 +4837,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.3" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" dependencies = [ - "base64 0.22.1", "rustls-pki-types", ] [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" @@ -4848,9 +4862,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -4859,9 +4873,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" [[package]] name = "ryu" @@ -4909,7 +4923,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -4935,7 +4949,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -5015,9 +5029,9 @@ checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -5035,13 +5049,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -5052,7 +5066,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -5066,11 +5080,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.6.0", "itoa", "memchr", "ryu", @@ -5085,14 +5099,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -5111,15 +5125,15 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.3.0", + "indexmap 2.6.0", "serde", "serde_derive", "serde_json", @@ -5129,14 +5143,14 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.9.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -5145,7 +5159,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.3.0", + "indexmap 2.6.0", "itoa", "ryu", "serde", @@ -5239,9 +5253,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "simd-json" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f0b376aada35f30a0012f5790e50aed62f91804a0682669aefdbe81c7fcb91" +checksum = "bfa5500f67df6466a45c6f83d1aada89fe0f7e9b17afec424ea06feee0906549" dependencies = [ "getrandom", "halfbrown", @@ -5254,9 +5268,9 @@ dependencies = [ [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "similar" @@ -5405,7 +5419,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -5454,9 +5468,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -5474,6 +5488,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "sys-info" @@ -5522,7 +5539,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "system-configuration-sys 0.6.0", ] [[package]] @@ -5535,6 +5563,16 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tabwriter" version = "1.4.0" @@ -5552,9 +5590,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -5569,15 +5607,15 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tempfile" -version = "3.11.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", - "fastrand 2.1.0", + "fastrand 2.1.1", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -5590,6 +5628,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "terminal_size" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +dependencies = [ + "rustix", + "windows-sys 0.59.0", +] + [[package]] name = "textwrap" version = "0.16.1" @@ -5603,22 +5651,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -5684,9 +5732,9 @@ source = "git+https://github.com/charliermarsh/tl.git?rev=6e25b2ee2513d75385101a [[package]] name = "tokio" -version = "1.39.2" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -5708,7 +5756,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -5737,16 +5785,16 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.14", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -5771,9 +5819,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -5792,7 +5840,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit", ] [[package]] @@ -5806,54 +5854,22 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.21.1" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.3.0", - "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" -dependencies = [ - "indexmap 2.3.0", + "indexmap 2.6.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" - [[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" @@ -5874,7 +5890,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -5924,15 +5940,15 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typed-path" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04645b6c01cfb2ddabffc7c67ae6bfe7c3e28a5c37d729f6bb498e784f1fd70c" +checksum = "82205ffd44a9697e34fc145491aa47310f9871540bb7909eaa9365e0a9a46607" [[package]] name = "typeid" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" [[package]] name = "typenum" @@ -5962,15 +5978,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-linebreak" @@ -5980,18 +5996,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unsafe-libyaml" @@ -6043,9 +6059,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", "rand", @@ -6062,7 +6078,7 @@ dependencies = [ "futures", "http 1.1.0", "once-map", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "rust-netrc", "rustc-hash", @@ -6147,7 +6163,7 @@ dependencies = [ "pep508_rs", "platform-tags", "pypi-types", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "reqwest-retry 0.7.1", "rkyv", @@ -6233,7 +6249,7 @@ dependencies = [ "pep508_rs", "platform-tags", "pypi-types", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "rmp-serde", "rustc-hash", @@ -6270,7 +6286,7 @@ dependencies = [ "md-5", "pypi-types", "rayon", - "reqwest 0.12.5", + "reqwest 0.12.8", "rustc-hash", "sha2", "thiserror", @@ -6313,7 +6329,7 @@ dependencies = [ "cargo-util", "dashmap", "fs-err", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "serde", "thiserror", @@ -6369,7 +6385,7 @@ source = "git+https://github.com/astral-sh/uv?tag=0.4.0#d9bd3bc7a536037ea8645fb7 dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", "textwrap", ] @@ -6421,7 +6437,7 @@ dependencies = [ "platform-tags", "pypi-types", "regex", - "reqwest 0.12.5", + "reqwest 0.12.8", "reqwest-middleware", "rmp-serde", "rustix", @@ -6459,7 +6475,7 @@ dependencies = [ "distribution-types", "either", "futures", - "indexmap 2.3.0", + "indexmap 2.6.0", "install-wheel-rs", "itertools 0.13.0", "jiff", @@ -6481,7 +6497,7 @@ dependencies = [ "tokio", "tokio-stream", "toml", - "toml_edit 0.22.20", + "toml_edit", "tracing", "url", "uv-client", @@ -6577,7 +6593,7 @@ dependencies = [ "thiserror", "tokio", "toml", - "toml_edit 0.22.20", + "toml_edit", "tracing", "url", "uv-fs", @@ -6664,7 +6680,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -6698,7 +6714,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6755,9 +6771,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" dependencies = [ "rustls-pki-types", ] @@ -6856,7 +6872,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -6867,7 +6883,18 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", +] + +[[package]] +name = "windows-registry" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" +dependencies = [ + "windows-result", + "windows-strings", + "windows-targets 0.52.6", ] [[package]] @@ -7039,18 +7066,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.5.40" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - -[[package]] -name = "winnow" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -7065,16 +7083,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "winsafe" version = "0.0.19" @@ -7109,12 +7117,12 @@ dependencies = [ [[package]] name = "xdg-home" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca91dcf8f93db085f3a0a29358cd0b9d670915468f4290e8b85d118a34211ab8" +checksum = "ec1cdab258fb55c0da61328dc52c8764709b249011b2cad0454c72f0bf10a1f6" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7185,7 +7193,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", "zvariant_utils", ] @@ -7218,7 +7226,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] [[package]] @@ -7250,7 +7258,7 @@ dependencies = [ "crossbeam-utils", "displaydoc", "flate2", - "indexmap 2.3.0", + "indexmap 2.6.0", "memchr", "thiserror", "time", @@ -7321,7 +7329,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", "zvariant_utils", ] @@ -7333,5 +7341,5 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.79", ] diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix index 70651e508546..b82ae5bb76ab 100644 --- a/pkgs/by-name/pi/pixi/package.nix +++ b/pkgs/by-name/pi/pixi/package.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "pixi"; - version = "0.31.0"; + version = "0.34.0"; src = fetchFromGitHub { owner = "prefix-dev"; repo = "pixi"; rev = "v${version}"; - hash = "sha256-1Woi+HwlN1nP05/cMNj+FVqEVREy/+UivdWGD6lZSNY="; + hash = "sha256-pXJna0WuosQ21u+ImIc70OaG63xVODLaWFkuYqxUc/Y="; }; cargoLock = { diff --git a/pkgs/tools/security/pwncat/default.nix b/pkgs/by-name/pw/pwncat/package.nix similarity index 50% rename from pkgs/tools/security/pwncat/default.nix rename to pkgs/by-name/pw/pwncat/package.nix index 98b782bf194c..12b54f3a4738 100644 --- a/pkgs/tools/security/pwncat/default.nix +++ b/pkgs/by-name/pw/pwncat/package.nix @@ -1,25 +1,30 @@ -{ lib -, buildPythonApplication -, fetchPypi +{ + lib, + python3Packages, + fetchPypi, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "pwncat"; version = "0.1.2"; + pyproject = true; src = fetchPypi { inherit pname version; - sha256 = "1230fdn5mx3wwr3a3nn6z2vwh973n248m11hnx9y3fjq7bgpky67"; + hash = "sha256-x/h53zpYuuFTtzCEioiw4yTIt/jG2qFG5nz0WmxzYIg="; }; + build-system = with python3Packages; [ setuptools ]; + # Tests requires to start containers doCheck = false; meta = with lib; { description = "TCP/UDP communication suite"; - mainProgram = "pwncat"; homepage = "https://pwncat.org/"; - license = with licenses; [ mit ]; + changelog = "https://github.com/cytopia/pwncat/releases/tag/v${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "pwncat"; }; } diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix index 18a0246cfa76..a31b2ae9ec92 100644 --- a/pkgs/by-name/ra/railway/package.nix +++ b/pkgs/by-name/ra/railway/package.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.15.1"; + version = "3.17.10"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-2/Yaz+eqZEOh/bCme9DuQep4XDkatr9kw32zN1yn9DQ="; + hash = "sha256-WrNWtVlvEscyo/MOQEf+MikxHCKIqfKWfhPtV0DVhXM="; }; - cargoHash = "sha256-9fO8YmmqyqVp0FYndUnTD6+nSvlV9jzjT+G/iNlZYLo="; + cargoHash = "sha256-C1lqK60asOW9Kl3cNgJvdDtZEtPUOE/SbBww0qL3fsU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ru/ruff/Cargo.lock b/pkgs/by-name/ru/ruff/Cargo.lock index 9fd3cb9b621d..0e488abec554 100644 --- a/pkgs/by-name/ru/ruff/Cargo.lock +++ b/pkgs/by-name/ru/ruff/Cargo.lock @@ -69,7 +69,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e" dependencies = [ - "unicode-width", + "unicode-width 0.1.13", "yansi-term", ] @@ -123,9 +123,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.89" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95" [[package]] name = "append-only-vec" @@ -407,7 +407,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -491,7 +491,7 @@ dependencies = [ "encode_unicode", "lazy_static", "libc", - "unicode-width", + "unicode-width 0.1.13", "windows-sys 0.52.0", ] @@ -687,7 +687,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn", + "syn 2.0.82", ] [[package]] @@ -698,7 +698,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -750,6 +750,27 @@ dependencies = [ "crypto-common", ] +[[package]] +name = "dir-test" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c44bdf9319ad5223afb7eb15a7110452b0adf0373ea6756561b2c708eef0dd1" +dependencies = [ + "dir-test-macros", +] + +[[package]] +name = "dir-test-macros" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "644f96047137dfaa7a09e34d4623f9e52a1926ecc25ba32ad2ba3fc422536b25" +dependencies = [ + "glob", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "dirs" version = "4.0.0" @@ -879,9 +900,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fern" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f0c14694cbd524c8720dd69b0e3179344f04ebb5f90f2e4a440c6ea3b2f1ee" +checksum = "69ff9c9d5fb3e6da8ac2f77ab76fe7e8087d512ce095200f8f29ac5b656cf6dc" dependencies = [ "log", ] @@ -957,7 +978,7 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" dependencies = [ - "unicode-width", + "unicode-width 0.1.13", ] [[package]] @@ -1160,7 +1181,7 @@ dependencies = [ "instant", "number_prefix", "portable-atomic", - "unicode-width", + "unicode-width 0.1.13", "vt100", ] @@ -1246,7 +1267,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -1346,9 +1367,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libcst" @@ -1372,7 +1393,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2ae40017ac09cd2c6a53504cb3c871c7f2b41466eac5bc66ba63f39073b467b" dependencies = [ "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -1760,18 +1781,17 @@ dependencies = [ "once_cell", "regex", "serde", - "unicode-width", + "unicode-width 0.1.13", ] [[package]] name = "pep440_rs" -version = "0.6.6" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "466eada3179c2e069ca897b99006cbb33f816290eaeec62464eea907e22ae385" +checksum = "7c8ee724d21f351f9d47276614ac9710975db827ba9fe2ca5a517ba648193307" dependencies = [ - "once_cell", "serde", - "unicode-width", + "unicode-width 0.2.0", "unscanny", ] @@ -1787,7 +1807,7 @@ dependencies = [ "serde", "thiserror", "tracing", - "unicode-width", + "unicode-width 0.1.13", "url", ] @@ -1828,7 +1848,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -1943,9 +1963,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] @@ -2080,6 +2100,7 @@ dependencies = [ "camino", "compact_str", "countme", + "dir-test", "hashbrown 0.15.0", "insta", "itertools 0.13.0", @@ -2087,7 +2108,6 @@ dependencies = [ "ordermap", "red_knot_test", "red_knot_vendored", - "rstest", "ruff_db", "ruff_index", "ruff_python_ast", @@ -2136,7 +2156,7 @@ version = "0.0.0" dependencies = [ "anyhow", "colored", - "once_cell", + "memchr", "red_knot_python_semantic", "red_knot_vendored", "regex", @@ -2154,7 +2174,6 @@ dependencies = [ name = "red_knot_vendored" version = "0.0.0" dependencies = [ - "once_cell", "path-slash", "ruff_db", "walkdir", @@ -2270,12 +2289,6 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" -[[package]] -name = "relative-path" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2" - [[package]] name = "ring" version = "0.17.8" @@ -2291,36 +2304,9 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rstest" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936" -dependencies = [ - "rstest_macros", - "rustc_version", -] - -[[package]] -name = "rstest_macros" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42" -dependencies = [ - "cfg-if", - "glob", - "proc-macro2", - "quote", - "regex", - "relative-path", - "rustc_version", - "syn", - "unicode-ident", -] - [[package]] name = "ruff" -version = "0.7.0" +version = "0.7.1" dependencies = [ "anyhow", "argfile", @@ -2382,7 +2368,6 @@ dependencies = [ "codspeed-criterion-compat", "criterion", "mimalloc", - "once_cell", "rayon", "red_knot_python_semantic", "red_knot_workspace", @@ -2506,7 +2491,7 @@ dependencies = [ "serde", "static_assertions", "tracing", - "unicode-width", + "unicode-width 0.1.13", ] [[package]] @@ -2515,7 +2500,6 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", - "once_cell", "red_knot_python_semantic", "ruff_cache", "ruff_db", @@ -2539,7 +2523,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.7.0" +version = "0.7.1" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2560,10 +2544,9 @@ dependencies = [ "log", "memchr", "natord", - "once_cell", "path-absolutize", "pathdiff", - "pep440_rs 0.6.6", + "pep440_rs 0.7.1", "pyproject-toml", "quick-junit", "regex", @@ -2594,7 +2577,7 @@ dependencies = [ "toml", "typed-arena", "unicode-normalization", - "unicode-width", + "unicode-width 0.1.13", "unicode_names2", "url", ] @@ -2607,7 +2590,7 @@ dependencies = [ "proc-macro2", "quote", "ruff_python_trivia", - "syn", + "syn 2.0.82", ] [[package]] @@ -2616,7 +2599,6 @@ version = "0.0.0" dependencies = [ "anyhow", "itertools 0.13.0", - "once_cell", "rand", "ruff_diagnostics", "ruff_source_file", @@ -2638,7 +2620,6 @@ dependencies = [ "compact_str", "is-macro", "itertools 0.13.0", - "once_cell", "ruff_cache", "ruff_macros", "ruff_python_trivia", @@ -2664,7 +2645,6 @@ dependencies = [ name = "ruff_python_codegen" version = "0.0.0" dependencies = [ - "once_cell", "ruff_python_ast", "ruff_python_literal", "ruff_python_parser", @@ -2682,7 +2662,6 @@ dependencies = [ "insta", "itertools 0.13.0", "memchr", - "once_cell", "regex", "ruff_cache", "ruff_formatter", @@ -2833,6 +2812,7 @@ dependencies = [ "serde", "serde_json", "shellexpand", + "thiserror", "tracing", "tracing-subscriber", ] @@ -2842,7 +2822,6 @@ name = "ruff_source_file" version = "0.0.0" dependencies = [ "memchr", - "once_cell", "ruff_text_size", "serde", ] @@ -2859,7 +2838,7 @@ dependencies = [ [[package]] name = "ruff_wasm" -version = "0.7.0" +version = "0.7.1" dependencies = [ "console_error_panic_hook", "console_log", @@ -2898,7 +2877,7 @@ dependencies = [ "matchit", "path-absolutize", "path-slash", - "pep440_rs 0.6.6", + "pep440_rs 0.7.1", "regex", "ruff_cache", "ruff_formatter", @@ -2940,15 +2919,6 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" -[[package]] -name = "rustc_version" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" -dependencies = [ - "semver", -] - [[package]] name = "rustix" version = "0.38.37" @@ -3009,7 +2979,7 @@ checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "salsa" version = "0.18.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=b14be5c0392f4c55eca60b92e457a35549372382#b14be5c0392f4c55eca60b92e457a35549372382" +source = "git+https://github.com/salsa-rs/salsa.git?rev=254c749b02cde2fd29852a7463a33e800b771758#254c749b02cde2fd29852a7463a33e800b771758" dependencies = [ "append-only-vec", "arc-swap", @@ -3029,17 +2999,17 @@ dependencies = [ [[package]] name = "salsa-macro-rules" version = "0.1.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=b14be5c0392f4c55eca60b92e457a35549372382#b14be5c0392f4c55eca60b92e457a35549372382" +source = "git+https://github.com/salsa-rs/salsa.git?rev=254c749b02cde2fd29852a7463a33e800b771758#254c749b02cde2fd29852a7463a33e800b771758" [[package]] name = "salsa-macros" version = "0.18.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=b14be5c0392f4c55eca60b92e457a35549372382#b14be5c0392f4c55eca60b92e457a35549372382" +source = "git+https://github.com/salsa-rs/salsa.git?rev=254c749b02cde2fd29852a7463a33e800b771758#254c749b02cde2fd29852a7463a33e800b771758" dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.82", "synstructure", ] @@ -3073,7 +3043,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn", + "syn 2.0.82", ] [[package]] @@ -3094,12 +3064,6 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" -[[package]] -name = "semver" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" - [[package]] name = "serde" version = "1.0.210" @@ -3128,7 +3092,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -3139,14 +3103,14 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.132" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" dependencies = [ "itoa", "memchr", @@ -3162,7 +3126,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -3203,7 +3167,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -3305,7 +3269,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn", + "syn 2.0.82", ] [[package]] @@ -3316,9 +3280,20 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.79" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" dependencies = [ "proc-macro2", "quote", @@ -3333,7 +3308,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -3396,7 +3371,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -3407,7 +3382,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.82", "test-case-core", ] @@ -3428,7 +3403,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -3540,7 +3515,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -3704,6 +3679,12 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +[[package]] +name = "unicode-width" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" + [[package]] name = "unicode_names2" version = "1.3.0" @@ -3774,9 +3755,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" dependencies = [ "getrandom", "rand", @@ -3786,13 +3767,13 @@ dependencies = [ [[package]] name = "uuid-macro-internal" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a" +checksum = "6b91f57fe13a38d0ce9e28a03463d8d3c2468ed03d75375110ec71d93b449a08" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -3815,7 +3796,7 @@ checksum = "84cd863bf0db7e392ba3bd04994be3473491b31e66340672af5d11943c6274de" dependencies = [ "itoa", "log", - "unicode-width", + "unicode-width 0.1.13", "vte", ] @@ -3878,7 +3859,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.82", "wasm-bindgen-shared", ] @@ -3912,7 +3893,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.82", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3946,7 +3927,7 @@ checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] @@ -4234,7 +4215,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.82", ] [[package]] diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 92b62a0fc5a9..25678f65f83a 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { pname = "ruff"; - version = "0.7.0"; + version = "0.7.1"; pyproject = true; outputs = [ @@ -27,7 +27,7 @@ python3Packages.buildPythonPackage rec { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-//ayB5ayYM5FqiSXDDns2tIL+PJ0Osvkp8+MEEL0L+8="; + hash = "sha256-TPr6YdSb5JKltXHDi1PdGzPYjmmsbCFQKxIiJURrBMI="; }; # Do not rely on path lookup at runtime to find the ruff binary @@ -42,7 +42,7 @@ python3Packages.buildPythonPackage rec { lockFile = ./Cargo.lock; outputHashes = { "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ="; - "salsa-0.18.0" = "sha256-vuLgeaqIL8U+5PUHJaGdovHFapAMGGQ9nPAMJJnxz/o="; + "salsa-0.18.0" = "sha256-zUF2ZBorJzgo8O8ZEnFaitAvWXqNwtHSqx4JE8nByIg="; }; }; diff --git a/pkgs/by-name/ws/wstunnel/Cargo.lock b/pkgs/by-name/ws/wstunnel/Cargo.lock index 23168aeacee7..7339e0e99303 100644 --- a/pkgs/by-name/ws/wstunnel/Cargo.lock +++ b/pkgs/by-name/ws/wstunnel/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" +checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" dependencies = [ "gimli", ] @@ -109,6 +109,12 @@ version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + [[package]] name = "asn1-rs" version = "0.6.2" @@ -185,9 +191,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-lc-rs" -version = "1.9.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070" +checksum = "cdd82dba44d209fddb11c190e0a94b78651f95299598e472215667417a03ff1d" dependencies = [ "aws-lc-sys", "mirai-annotations", @@ -198,9 +204,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.21.2" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3ddc4a5b231dd6958b140ff3151b6412b3f4321fab354f399eec8f14b06df62" +checksum = "df7a4168111d7eb622a31b214057b8509c0a7e1794f44c546d742330dc793972" dependencies = [ "bindgen", "cc", @@ -252,9 +258,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.69.4" +version = "0.69.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" +checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088" dependencies = [ "bitflags 2.6.0", "cexpr", @@ -316,7 +322,7 @@ dependencies = [ "hyperlocal", "log", "pin-project-lite", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-native-certs 0.7.3", "rustls-pemfile 2.2.0", "rustls-pki-types", @@ -364,9 +370,9 @@ checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "cc" -version = "1.1.24" +version = "1.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938" +checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945" dependencies = [ "jobserver", "libc", @@ -420,9 +426,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" dependencies = [ "clap_builder", "clap_derive", @@ -430,9 +436,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.19" +version = "4.5.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" dependencies = [ "anstream", "anstyle", @@ -803,9 +809,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", @@ -818,9 +824,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", @@ -828,15 +834,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", @@ -845,15 +851,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", @@ -862,21 +868,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", @@ -915,9 +921,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.31.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" +checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "glob" @@ -1171,7 +1177,7 @@ dependencies = [ "http 1.1.0", "hyper", "hyper-util", - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -1317,9 +1323,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708" dependencies = [ "serde", ] @@ -1356,9 +1362,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.70" +version = "0.3.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" +checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" dependencies = [ "wasm-bindgen", ] @@ -1645,9 +1651,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.4" +version = "0.36.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a" +checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" dependencies = [ "memchr", ] @@ -1663,12 +1669,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.1" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" -dependencies = [ - "portable-atomic", -] +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "openssl-probe" @@ -1750,18 +1753,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pin-project" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" +checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" +checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8" dependencies = [ "proc-macro2", "quote", @@ -1780,12 +1783,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "portable-atomic" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" - [[package]] name = "powerfmt" version = "0.2.0" @@ -1822,9 +1819,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -2022,9 +2019,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.13" +version = "0.23.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" +checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8" dependencies = [ "aws-lc-rs", "log", @@ -2137,9 +2134,9 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.24" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" +checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1" dependencies = [ "windows-sys 0.59.0", ] @@ -2250,9 +2247,9 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.10.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9720086b3357bcb44fce40117d769a4d068c70ecfa190850a980a71755f66fcc" +checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817" dependencies = [ "base64 0.22.1", "chrono", @@ -2268,9 +2265,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "3.10.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1abbfe725f27678f4663bcacb75a83e829fd464c25d78dd038a3a29e307cec" +checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d" dependencies = [ "darling", "proc-macro2", @@ -2603,7 +2600,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.13", + "rustls 0.23.14", "rustls-pki-types", "tokio", ] @@ -2846,9 +2843,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", "once_cell", @@ -2857,9 +2854,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -2872,9 +2869,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2882,9 +2879,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -2895,9 +2892,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.93" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" [[package]] name = "which" @@ -3117,10 +3114,11 @@ dependencies = [ [[package]] name = "wstunnel" -version = "10.1.3" +version = "10.1.5" dependencies = [ "ahash", "anyhow", + "arc-swap", "async-channel", "async-trait", "base64 0.22.1", diff --git a/pkgs/by-name/ws/wstunnel/package.nix b/pkgs/by-name/ws/wstunnel/package.nix index 1ea48259ebce..b2b5e42062dc 100644 --- a/pkgs/by-name/ws/wstunnel/package.nix +++ b/pkgs/by-name/ws/wstunnel/package.nix @@ -10,7 +10,7 @@ }: let - version = "10.1.3"; + version = "10.1.5"; in rustPlatform.buildRustPackage { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "erebe"; repo = "wstunnel"; rev = "v${version}"; - hash = "sha256-mrCDx9f+EeA6McRc1s9YwYL4RHKSla10fxXZc1WYPio="; + hash = "sha256-MomT9iwIsdou7lIfI7zBU9nEjjYGcsHKTlrYbK4p3BQ="; }; cargoLock = { @@ -57,6 +57,7 @@ rustPlatform.buildRustPackage { changelog = "https://github.com/erebe/wstunnel/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ + raylas rvdp neverbehave ]; diff --git a/pkgs/by-name/xo/xortool/package.nix b/pkgs/by-name/xo/xortool/package.nix new file mode 100644 index 000000000000..a59eb77d8cf2 --- /dev/null +++ b/pkgs/by-name/xo/xortool/package.nix @@ -0,0 +1,38 @@ +{ + lib, + fetchFromGitHub, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "xortool"; + version = "1.0.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "hellman"; + repo = "xortool"; + rev = "refs/tags/v${version}"; + hash = "sha256-xxaWhGUh/r34eS2TJt8c3Q795OsZOoQLXQllJGJTjqY="; + }; + + build-system = with python3Packages; [ poetry-core ]; + + dependencies = with python3Packages; [ + docopt + importlib-metadata + ]; + + # Project has no tests + doCheck = false; + + pythonImportsCheck = [ "xortool" ]; + + meta = with lib; { + description = "Tool to analyze multi-byte XOR cipher"; + homepage = "https://github.com/hellman/xortool"; + changelog = "https://github.com/hellman/xortool/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/desktops/expidus/calculator/default.nix b/pkgs/desktops/expidus/calculator/default.nix index fb2ab188922a..98328b8874c6 100644 --- a/pkgs/desktops/expidus/calculator/default.nix +++ b/pkgs/desktops/expidus/calculator/default.nix @@ -23,16 +23,16 @@ flutter.buildFlutterApplication rec { postInstall = '' rm $out/bin/calculator - ln -s $out/app/calculator $out/bin/expidus-calculator + ln -s $out/app/$pname/calculator $out/bin/expidus-calculator mkdir -p $out/share/applications - mv $out/app/data/com.expidusos.calculator.desktop $out/share/applications + mv $out/app/$pname/data/com.expidusos.calculator.desktop $out/share/applications mkdir -p $out/share/icons - mv $out/app/data/com.expidusos.calculator.png $out/share/icons + mv $out/app/$pname/data/com.expidusos.calculator.png $out/share/icons mkdir -p $out/share/metainfo - mv $out/app/data/com.expidusos.calculator.metainfo.xml $out/share/metainfo + mv $out/app/$pname/data/com.expidusos.calculator.metainfo.xml $out/share/metainfo substituteInPlace "$out/share/applications/com.expidusos.calculator.desktop" \ --replace "Exec=calculator" "Exec=$out/bin/expidus-calculator" \ diff --git a/pkgs/desktops/expidus/file-manager/default.nix b/pkgs/desktops/expidus/file-manager/default.nix index fa8e50475fde..8de6262d86ba 100644 --- a/pkgs/desktops/expidus/file-manager/default.nix +++ b/pkgs/desktops/expidus/file-manager/default.nix @@ -23,16 +23,16 @@ flutter.buildFlutterApplication rec { postInstall = '' rm $out/bin/file_manager - ln -s $out/app/file_manager $out/bin/expidus-file-manager + ln -s $out/app/$pname/file_manager $out/bin/expidus-file-manager mkdir -p $out/share/applications - mv $out/app/data/com.expidusos.file_manager.desktop $out/share/applications + mv $out/app/$pname/data/com.expidusos.file_manager.desktop $out/share/applications mkdir -p $out/share/icons - mv $out/app/data/com.expidusos.file_manager.png $out/share/icons + mv $out/app/$pname/data/com.expidusos.file_manager.png $out/share/icons mkdir -p $out/share/metainfo - mv $out/app/data/com.expidusos.file_manager.metainfo.xml $out/share/metainfo + mv $out/app/$pname/data/com.expidusos.file_manager.metainfo.xml $out/share/metainfo substituteInPlace "$out/share/applications/com.expidusos.file_manager.desktop" \ --replace "Exec=file_manager" "Exec=$out/bin/expidus-file-manager" \ diff --git a/pkgs/development/ada-modules/gnatprove/0001-fix-install.patch b/pkgs/development/ada-modules/gnatprove/0001-fix-install.patch new file mode 100644 index 000000000000..d6911fb9a56a --- /dev/null +++ b/pkgs/development/ada-modules/gnatprove/0001-fix-install.patch @@ -0,0 +1,33 @@ +From 7458110cc50d91cb7833b2abd232faca52865566 Mon Sep 17 00:00:00 2001 +From: Thomas Heijligen +Date: Tue, 21 May 2024 22:02:09 +0000 +Subject: [PATCH] fix install + +--- + Makefile | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 4950b2d5cc..9d9358ad08 100644 +--- a/Makefile ++++ b/Makefile +@@ -106,11 +106,11 @@ install: + $(CP) share/spark/theories/*why $(THEORIESDIR) + $(CP) share/spark/theories/*mlw $(THEORIESDIR) + $(CP) share/spark/runtimes/README $(RUNTIMESDIR) +- @echo "Generate Coq files by preprocessing context files:" +- $(MAKE) -C include generate +- $(CP) include/src/*.ad? $(INCLUDEDIR) +- $(CP) include/*.gpr $(LIBDIR) +- $(CP) include/proof $(LIBDIR) ++ #@echo "Generate Coq files by preprocessing context files:" ++ #$(MAKE) -C include generate ++ #$(CP) include/src/*.ad? $(INCLUDEDIR) ++ #$(CP) include/*.gpr $(LIBDIR) ++ #$(CP) include/proof $(LIBDIR) + + doc: $(DOC) + +-- +2.44.0 + diff --git a/pkgs/development/ada-modules/gnatprove/default.nix b/pkgs/development/ada-modules/gnatprove/default.nix index d50baba1391f..6e0eda57e8db 100644 --- a/pkgs/development/ada-modules/gnatprove/default.nix +++ b/pkgs/development/ada-modules/gnatprove/default.nix @@ -7,10 +7,22 @@ , python3 , ocamlPackages , makeWrapper +, gpr2 }: let gnat_version = lib.versions.major gnat.version; + # gnatprove fsf-14 requires gpr2 from a special branch + gpr2_24_2_next = gpr2.overrideAttrs(old: rec { + version = "24.2.0-next"; + src = fetchFromGitHub { + owner = "AdaCore"; + repo = "gpr"; + rev = "v${version}"; + hash = "sha256-Tp+N9VLKjVWs1VRPYE0mQY3rl4E5iGb8xDoNatEYBg4="; + }; + }); + fetchSpark2014 = { rev, hash } : fetchFromGitHub { owner = "AdaCore"; repo = "spark2014"; @@ -33,10 +45,21 @@ let }; commit_date = "2023-01-05"; }; + "14" = { + src = fetchSpark2014 { + rev = "ce5fad038790d5dc18f9b5345dc604f1ccf45b06"; # branch fsf-14 + hash = "sha256-WprJJIe/GpcdabzR2xC2dAV7kIYdNTaTpNYoR3UYTVo="; + }; + patches = [ + # Disable Coq related targets which are missing in the fsf-14 branch + ./0001-fix-install.patch + ]; + commit_date = "2024-01-11"; + }; }; thisSpark = spark2014.${gnat_version} or - (builtins.throw "GNATprove depend on a specific GNAT version and can't be built using GNAT ${gnat_version}."); + (builtins.throw "GNATprove depends on a specific GNAT version and can't be built using GNAT ${gnat_version}."); in stdenv.mkDerivation rec { @@ -45,24 +68,35 @@ stdenv.mkDerivation rec { src = thisSpark.src; + patches = thisSpark.patches or []; + nativeBuildInputs = [ gnat gprbuild python3 - ocamlPackages.ocaml makeWrapper - ]; + ] ++ (with ocamlPackages; [ + ocaml + findlib + menhir + ]); buildInputs = [ gnatcoll-core - ocamlPackages.camlzip - ocamlPackages.findlib - ocamlPackages.menhir - ocamlPackages.menhirLib - ocamlPackages.num - ocamlPackages.yojson - ocamlPackages.zarith - ]; + ] ++ (with ocamlPackages; [ + ocamlgraph + zarith + ppx_deriving + ppx_sexp_conv + camlzip + menhirLib + num + re + sexplib + yojson + ]) ++ (lib.optionals (gnat_version == "14")[ + gpr2_24_2_next + ]); propagatedBuildInputs = [ gprbuild @@ -75,14 +109,18 @@ stdenv.mkDerivation rec { ''; configurePhase = '' + runHook preConfigure make setup + runHook postConfigure ''; installPhase = '' + runHook preInstall make install-all cp -a ./install/. $out mkdir $out/share/gpr ln -s $out/lib/gnat/* $out/share/gpr/ + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/development/ada-modules/gpr2/default.nix b/pkgs/development/ada-modules/gpr2/default.nix new file mode 100644 index 000000000000..1ad58b125db4 --- /dev/null +++ b/pkgs/development/ada-modules/gpr2/default.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + fetchurl, + gprbuild, + which, + gnat, + gnatcoll-core, + gnatcoll-iconv, + gnatcoll-gmp, + enableShared ? !stdenv.hostPlatform.isStatic, +}: + +stdenv.mkDerivation rec { + pname = "gpr2"; + version = "24.0.0"; + + src = fetchurl { + url = "https://github.com/AdaCore/gpr/releases/download/v${version}/gpr2-with-lkparser-${lib.versions.majorMinor version}.tgz"; + sha256 = "1g90689k94q3ma7q76gnjipfblgfvcq6ldwbzcf0l5hx6n8vbly8"; + }; + + nativeBuildInputs = [ + which + gnat + gprbuild + ]; + + makeFlags = [ + "prefix=$(out)" + "GPR2KBDIR=${gprbuild}/share/gprconfig" + "PROCESSORS=$(NIX_BUILD_CORES)" + "ENABLE_SHARED=${if enableShared then "yes" else "no"}" + ]; + + propagatedBuildInputs = [ + gprbuild + gnatcoll-gmp + gnatcoll-core + gnatcoll-iconv + ]; + + meta = with lib; { + description = "The framework for analyzing the GNAT Project (GPR) files"; + homepage = "https://github.com/AdaCore/gpr"; + license = with licenses; [ + asl20 + gpl3Only + ]; + maintainers = with maintainers; [ heijligen ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/compilers/fasmg/default.nix b/pkgs/development/compilers/fasmg/default.nix index e98715795458..67f47202615c 100644 --- a/pkgs/development/compilers/fasmg/default.nix +++ b/pkgs/development/compilers/fasmg/default.nix @@ -1,14 +1,22 @@ { lib, stdenv , fetchzip + +# update script +, writeScript +, coreutils +, curl +, gnugrep +, htmlq +, nix-update }: stdenv.mkDerivation rec { pname = "fasmg"; - version = "kd3c"; + version = "kl0e"; src = fetchzip { url = "https://flatassembler.net/fasmg.${version}.zip"; - sha256 = "sha256-duxune/UjXppKf/yWp7y85rpBn4EIC6JcZPNDhScsEA="; + sha256 = "sha256-qUhsUMwxgUduGz+D8+Dm4EXyh7aiE9lJ1mhvTjHP6Tw="; stripRoot = false; }; @@ -48,6 +56,18 @@ stdenv.mkDerivation rec { cp docs/*.txt $doc/share/doc/fasmg ''; + passthru.updateScript = writeScript "update-fasmg.sh" '' + export PATH="${lib.makeBinPath [ coreutils curl gnugrep htmlq nix-update ]}:$PATH" + version=$( + curl 'https://flatassembler.net/download.php' \ + | htmlq .links a.boldlink -a href \ + | grep -E '^fasmg\..*\.zip$' \ + | head -n1 \ + | cut -d. -f2 + ) + nix-update fasmg --version "$version" + ''; + meta = with lib; { description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF"; mainProgram = "fasmg"; diff --git a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix index ff6c6b31006f..ae89d3720b33 100644 --- a/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix +++ b/pkgs/development/compilers/flutter/build-support/build-flutter-application.nix @@ -146,21 +146,22 @@ let built=build/linux/*/$flutterMode/bundle mkdir -p $out/bin - mv $built $out/app + mkdir -p $out/app + mv $built $out/app/$pname - for f in $(find $out/app -iname "*.desktop" -type f); do + for f in $(find $out/app/$pname -iname "*.desktop" -type f); do install -D $f $out/share/applications/$(basename $f) done - for f in $(find $out/app -maxdepth 1 -type f); do + for f in $(find $out/app/$pname -maxdepth 1 -type f); do ln -s $f $out/bin/$(basename $f) done # make *.so executable - find $out/app -iname "*.so" -type f -exec chmod +x {} + + find $out/app/$pname -iname "*.so" -type f -exec chmod +x {} + # remove stuff like /build/source/packages/ubuntu_desktop_installer/linux/flutter/ephemeral - for f in $(find $out/app -executable -type f); do + for f in $(find $out/app/$pname -executable -type f); do if patchelf --print-rpath "$f" | grep /build; then # this ignores static libs (e,g. libapp.so) also echo "strip RPath of $f" newrp=$(patchelf --print-rpath $f | sed -r "s|/build.*ephemeral:||g" | sed -r "s|/build.*profile:||g") diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index 85dbf3a72b9d..81a129587dd7 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -1,31 +1,51 @@ -{ lib, stdenv, fetchurl, cmake, minizip, pcsclite, opensc, openssl -, xercesc, xml-security-c, pkg-config, xsd, zlib, xalanc, xxd }: +{ lib +, stdenv +, fetchurl +, cmake +, libtool +, libxml2 +, minizip +, pcsclite +, opensc +, openssl +, xercesc +, pkg-config +, xsd +, zlib +, xmlsec +, xxd +}: stdenv.mkDerivation rec { - version = "3.17.1"; + version = "4.0.0"; pname = "libdigidocpp"; src = fetchurl { - url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; - hash = "sha256-3qDsIAOiWMZDj2zLE+Os7BoeCPeC4JQ6p8jSBd7PdV0="; + url = "https://github.com/open-eid/libdigidocpp/releases/download/v${version}/libdigidocpp-${version}.tar.gz"; + hash = "sha256-0G7cjJEgLJ24SwHRznKJ18cRY0m50lr6HXstfbYq9f8="; }; nativeBuildInputs = [ cmake pkg-config xxd ]; buildInputs = [ - minizip pcsclite opensc openssl xercesc - xml-security-c xsd zlib xalanc + libxml2 + minizip + pcsclite + opensc + openssl + xercesc + xsd + zlib + xmlsec ]; outputs = [ "out" "lib" "dev" "bin" ]; - # Cherry-pick of - # https://github.com/open-eid/libdigidocpp/commit/2b5db855ba3ceb9bae1f11589ea1aea22bb7595a - # Fixes https://github.com/NixOS/nixpkgs/issues/334397 - postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail 'TSA_URL "http://dd-at.ria.ee/tsa"' 'TSA_URL "https://eid-dd.ria.ee/ts"' - ''; + # This wants to link to ${CMAKE_DL_LIBS} (ltdl), and there doesn't seem to be + # a way to tell CMake where this should be pulled from. + # A cleaner fix would probably be to patch cmake to use + # `-L${libtool.lib}/lib -ltdl` for `CMAKE_DL_LIBS`, but that's a world rebuild. + env.NIX_LDFLAGS = "-L${libtool.lib}/lib"; # libdigidocpp.so's `PKCS11Signer::PKCS11Signer()` dlopen()s "opensc-pkcs11.so" # itself, so add OpenSC to its DT_RUNPATH after the fixupPhase shrinked it. diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 5dc620fd5c01..ef311bdd0246 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -23,7 +23,7 @@ assert enablePython -> pythonPackages != null; stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.56.1"; + version = "2.56.2"; outputs = [ "out" "dev" ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1ICSJqr5WRePLIHsD3T2L0Nxdn1LWaHqHDJrfTIRl88="; + sha256 = "sha256-7DO+AC9R6mnSs52ex/uIzEv7q+fS7FQ5FGYe5niap4Q="; }; buildInputs = [ diff --git a/pkgs/development/libraries/libvgm/default.nix b/pkgs/development/libraries/libvgm/default.nix index 895a382c96a3..09d7ac023648 100644 --- a/pkgs/development/libraries/libvgm/default.nix +++ b/pkgs/development/libraries/libvgm/default.nix @@ -1,122 +1,130 @@ -{ stdenv -, lib -, fetchFromGitHub -, unstableGitUpdater -, cmake -, libiconv -, zlib -, enableShared ? true +{ + stdenv, + lib, + fetchFromGitHub, + unstableGitUpdater, + testers, + cmake, + libiconv, + zlib, + enableShared ? (!stdenv.hostPlatform.isStatic), -, enableAudio ? true -, withWaveWrite ? true -, withWinMM ? stdenv.hostPlatform.isWindows -, withDirectSound ? stdenv.hostPlatform.isWindows -, withXAudio2 ? stdenv.hostPlatform.isWindows -, withWASAPI ? stdenv.hostPlatform.isWindows -, withOSS ? stdenv.hostPlatform.isFreeBSD -, withSADA ? stdenv.hostPlatform.isSunOS -, withALSA ? stdenv.hostPlatform.isLinux -, alsa-lib -, withPulseAudio ? stdenv.hostPlatform.isLinux -, libpulseaudio -, withCoreAudio ? stdenv.hostPlatform.isDarwin -, CoreAudio -, AudioToolbox -, withLibao ? true -, libao + enableAudio ? true, + withWaveWrite ? true, + withWinMM ? stdenv.hostPlatform.isWindows, + withDirectSound ? stdenv.hostPlatform.isWindows, + withXAudio2 ? stdenv.hostPlatform.isWindows, + withWASAPI ? stdenv.hostPlatform.isWindows, + withOSS ? stdenv.hostPlatform.isFreeBSD, + withSADA ? stdenv.hostPlatform.isSunOS, + withALSA ? stdenv.hostPlatform.isLinux, + alsa-lib, + withPulseAudio ? stdenv.hostPlatform.isLinux, + libpulseaudio, + withCoreAudio ? stdenv.hostPlatform.isDarwin, + CoreAudio, + AudioToolbox, + withLibao ? true, + libao, -, enableEmulation ? true -, withAllEmulators ? true -, emulators ? [ ] + enableEmulation ? true, + withAllEmulators ? true, + emulators ? [ ], -, enableLibplayer ? true + enableLibplayer ? true, -, enableTools ? false + enableTools ? false, }: assert enableTools -> enableAudio && enableEmulation && enableLibplayer; -let - inherit (lib) optional optionals; - onOff = val: if val then "ON" else "OFF"; -in -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "libvgm"; - version = "0-unstable-2024-06-08"; + version = "0-unstable-2024-10-17"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "34c368cde98f33c42455fbbfbec07073ba79bf5c"; - hash = "sha256-eX2k2cUtapHhx8dLaFk63Si0Di1q0uDWvdOI0+FgqEY="; + rev = "7b694e53e42a75ce48b846c53d08e4a33f627842"; + hash = "sha256-u+mBzmEixJT3rwuipITktFI4iVswnXftfF7syBw4t/w="; }; outputs = [ "out" "dev" - ] ++ optional enableTools "bin"; + ] ++ lib.optionals enableTools [ "bin" ]; - nativeBuildInputs = [ - cmake - ]; + nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ - libiconv - zlib - ] ++ optionals withALSA [ - alsa-lib - ] ++ optionals withPulseAudio [ - libpulseaudio - ] ++ optionals withCoreAudio [ - CoreAudio - AudioToolbox - ] ++ optionals withLibao [ - libao - ]; + propagatedBuildInputs = + [ + libiconv + zlib + ] + ++ lib.optionals withALSA [ alsa-lib ] + ++ lib.optionals withPulseAudio [ libpulseaudio ] + ++ lib.optionals withCoreAudio [ + CoreAudio + AudioToolbox + ] + ++ lib.optionals withLibao [ libao ]; - cmakeFlags = [ - "-DBUILD_LIBAUDIO=${onOff enableAudio}" - "-DBUILD_LIBEMU=${onOff enableEmulation}" - "-DBUILD_LIBPLAYER=${onOff enableLibplayer}" - "-DBUILD_TESTS=${onOff enableTools}" - "-DBUILD_PLAYER=${onOff enableTools}" - "-DBUILD_VGM2WAV=${onOff enableTools}" - "-DLIBRARY_TYPE=${if enableShared then "SHARED" else "STATIC"}" - "-DUSE_SANITIZERS=ON" - ] ++ optionals enableAudio [ - "-DAUDIODRV_WAVEWRITE=${onOff withWaveWrite}" - "-DAUDIODRV_WINMM=${onOff withWinMM}" - "-DAUDIODRV_DSOUND=${onOff withDirectSound}" - "-DAUDIODRV_XAUDIO2=${onOff withXAudio2}" - "-DAUDIODRV_WASAPI=${onOff withWASAPI}" - "-DAUDIODRV_OSS=${onOff withOSS}" - "-DAUDIODRV_SADA=${onOff withSADA}" - "-DAUDIODRV_ALSA=${onOff withALSA}" - "-DAUDIODRV_PULSE=${onOff withPulseAudio}" - "-DAUDIODRV_APPLE=${onOff withCoreAudio}" - "-DAUDIODRV_LIBAO=${onOff withLibao}" - ] ++ optionals enableEmulation ([ - "-DSNDEMU__ALL=${onOff withAllEmulators}" - ] ++ optionals (!withAllEmulators) - (lib.lists.forEach emulators (x: "-DSNDEMU_${x}=ON")) - ) ++ optionals enableTools [ - "-DUTIL_CHARCNV_ICONV=ON" - "-DUTIL_CHARCNV_WINAPI=${onOff stdenv.hostPlatform.isWindows}" - ]; + cmakeFlags = + [ + (lib.cmakeBool "BUILD_LIBAUDIO" enableAudio) + (lib.cmakeBool "BUILD_LIBEMU" enableEmulation) + (lib.cmakeBool "BUILD_LIBPLAYER" enableLibplayer) + (lib.cmakeBool "BUILD_TESTS" enableTools) + (lib.cmakeBool "BUILD_PLAYER" enableTools) + (lib.cmakeBool "BUILD_VGM2WAV" enableTools) + (lib.cmakeFeature "LIBRARY_TYPE" (if enableShared then "SHARED" else "STATIC")) + (lib.cmakeBool "USE_SANITIZERS" true) + ] + ++ lib.optionals enableAudio [ + (lib.cmakeBool "AUDIODRV_WAVEWRITE" withWaveWrite) + (lib.cmakeBool "AUDIODRV_WINMM" withWinMM) + (lib.cmakeBool "AUDIODRV_DSOUND" withDirectSound) + (lib.cmakeBool "AUDIODRV_XAUDIO2" withXAudio2) + (lib.cmakeBool "AUDIODRV_WASAPI" withWASAPI) + (lib.cmakeBool "AUDIODRV_OSS" withOSS) + (lib.cmakeBool "AUDIODRV_SADA" withSADA) + (lib.cmakeBool "AUDIODRV_ALSA" withALSA) + (lib.cmakeBool "AUDIODRV_PULSE" withPulseAudio) + (lib.cmakeBool "AUDIODRV_APPLE" withCoreAudio) + (lib.cmakeBool "AUDIODRV_LIBAO" withLibao) + ] + ++ lib.optionals enableEmulation ( + [ (lib.cmakeBool "SNDEMU__ALL" withAllEmulators) ] + ++ lib.optionals (!withAllEmulators) ( + lib.lists.forEach emulators (x: (lib.cmakeBool "SNDEMU_${x}" true)) + ) + ) + ++ lib.optionals enableTools [ + (lib.cmakeBool "UTIL_CHARCNV_ICONV" true) + (lib.cmakeBool "UTIL_CHARCNV_WINAPI" stdenv.hostPlatform.isWindows) + ]; - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/ValleyBell/libvgm.git"; + passthru = { + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + updateScript = unstableGitUpdater { }; }; - meta = with lib; { - homepage = "https://github.com/ValleyBell/libvgm"; + meta = { description = "More modular rewrite of most components from VGMPlay"; + homepage = "https://github.com/ValleyBell/libvgm"; license = - if (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators))) then - licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43 + if + (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators))) + then + lib.licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43 else - licenses.gpl2Only; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; + lib.licenses.gpl2Only; + maintainers = with lib.maintainers; [ OPNA2608 ]; + platforms = lib.platforms.all; + pkgConfigModules = + [ "vgm-utils" ] + ++ lib.optionals enableAudio [ "vgm-audio" ] + ++ lib.optionals enableEmulation [ "vgm-emu" ] + ++ lib.optionals enableLibplayer [ "vgm-player" ]; }; -} +}) diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index e021832f15d1..7988785382a4 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -6,6 +6,7 @@ fetchFromGitHub, substituteAll, python, + isPy310, # build-system cython, @@ -113,6 +114,11 @@ buildPythonPackage rec { # don't run benchmarks "test_import_time" ] + # these tests fail with python310 but succeeds with 11+ + ++ lib.optionals isPy310 [ + "test_https_proxy_unsupported_tls_in_tls" + "test_tcp_connector_raise_connector_ssl_error" + ] ++ lib.optionals stdenv.hostPlatform.is32bit [ "test_cookiejar" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_addresses" # https://github.com/aio-libs/aiohttp/issues/3572, remove >= v4.0.0 diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix index d42085999e85..1b8e6e733c40 100644 --- a/pkgs/development/python-modules/ducc0/default.nix +++ b/pkgs/development/python-modules/ducc0/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ducc0"; - version = "0.34.0"; + version = "0.35.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtr"; repo = "ducc"; rev = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-lxNqB3Lt+n4vIH7cVW4DAwhjuPn49y+/3RLKVO8IuJM="; + hash = "sha256-LfN+rwJp5euVpR/5sUBG3XqBhF7/KbgW/485eufJtMQ="; }; buildInputs = [ pybind11 ]; @@ -34,6 +34,8 @@ buildPythonPackage rec { pytestFlagsArray = [ "python/test" ]; pythonImportsCheck = [ "ducc0" ]; + DUCC0_OPTIMIZATION = "portable-strip"; + meta = with lib; { homepage = "https://gitlab.mpcdf.mpg.de/mtr/ducc"; description = "Efficient algorithms for Fast Fourier transforms and more"; diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix index d7642559e537..b730ef5c5a9d 100644 --- a/pkgs/development/python-modules/gymnasium/default.nix +++ b/pkgs/development/python-modules/gymnasium/default.nix @@ -1,48 +1,53 @@ { lib, + stdenv, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, - numpy, + + # dependencies cloudpickle, - gym-notices, - jax-jumpy, - typing-extensions, farama-notifications, - importlib-metadata, + numpy, + typing-extensions, pythonOlder, - ffmpeg, + importlib-metadata, + + # tests + dill, + flax, jax, jaxlib, matplotlib, + mujoco, moviepy, opencv4, pybox2d, pygame, pytestCheckHook, scipy, - stdenv, }: buildPythonPackage rec { pname = "gymnasium"; - version = "0.29.1"; - format = "pyproject"; + version = "1.0.0"; + + pyproject = true; src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "gymnasium"; rev = "refs/tags/v${version}"; - hash = "sha256-L7fn9FaJzXwQhjDKwI9hlFpbPuQdwynU+Xjd8bbjxiw="; + hash = "sha256-Qchuz08yJ0giVrtKLC9vBgr28JrHQyAOCuoS239ivVw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ cloudpickle farama-notifications - gym-notices - jax-jumpy numpy typing-extensions ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; @@ -50,11 +55,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "gymnasium" ]; nativeCheckInputs = [ - ffmpeg + dill + flax jax jaxlib matplotlib moviepy + mujoco opencv4 pybox2d pygame @@ -69,20 +76,30 @@ buildPythonPackage rec { doCheck = !stdenv.hostPlatform.isDarwin; disabledTestPaths = [ - # mujoco is required for those tests but the mujoco python bindings are not packaged in nixpkgs. + # Unpackaged `mujoco-py` (Openai's mujoco) is required for these tests. "tests/envs/mujoco/test_mujoco_custom_env.py" + "tests/envs/mujoco/test_mujoco_rendering.py" + "tests/envs/mujoco/test_mujoco_v5.py" - # Those tests need to write on the filesystem which cause them to fail. - "tests/experimental/wrappers/test_record_video.py" + # Rendering tests failing in the sandbox + "tests/wrappers/vector/test_human_rendering.py" + + # These tests need to write on the filesystem which cause them to fail. "tests/utils/test_save_video.py" "tests/wrappers/test_record_video.py" - "tests/wrappers/test_video_recorder.py" ]; - meta = with lib; { + disabledTests = [ + # Succeeds for most environments but `test_render_modes[Reacher-v4]` fails because it requires + # OpenGL access which is not possible inside the sandbox. + "test_render_mode" + ]; + + meta = { description = "Standard API for reinforcement learning and a diverse set of reference environments (formerly Gym)"; homepage = "https://github.com/Farama-Foundation/Gymnasium"; - license = licenses.mit; - maintainers = with maintainers; [ GaetanLepage ]; + changelog = "https://github.com/Farama-Foundation/Gymnasium/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; }; } diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index c971467d17a1..95d9a582587a 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "oauthenticator"; - version = "17.0.0"; + version = "17.1.0"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0eRfcuI+GuhgF0myZPy8ZcL4kBCLv6PcGEk+92J+GZ0="; + hash = "sha256-2RWsrS+W09AY9wWvvM/pYzsM0xzqcwWZYSv4BCsegiw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytest-ruff/default.nix b/pkgs/development/python-modules/pytest-ruff/default.nix new file mode 100644 index 000000000000..0d9239e7114f --- /dev/null +++ b/pkgs/development/python-modules/pytest-ruff/default.nix @@ -0,0 +1,55 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + poetry-core, + poetry-dynamic-versioning, + + # dependencies + pytest, + ruff, + + # tests + pytestCheckHook, + pytest-mock, +}: + +buildPythonPackage rec { + pname = "pytest-ruff"; + version = "0.4.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "businho"; + repo = "pytest-ruff"; + rev = "refs/tags/v${version}"; + hash = "sha256-Ol+W5mDGMCwptuBa0b+Plkm64UUBf9bmr9YBo8g93Ok="; + }; + + build-system = [ + poetry-core + poetry-dynamic-versioning + ]; + + dependencies = [ + pytest + ruff + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-mock + ]; + + pythonImportsCheck = [ "pytest_ruff" ]; + + meta = { + description = "A pytest plugin to run ruff"; + homepage = "https://github.com/businho/pytest-ruff"; + changelog = "https://github.com/businho/pytest-ruff/releases/tag/v${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ baloo ]; + }; +} diff --git a/pkgs/development/python-modules/shimmy/default.nix b/pkgs/development/python-modules/shimmy/default.nix index b50135e517bf..eb19b4e16398 100644 --- a/pkgs/development/python-modules/shimmy/default.nix +++ b/pkgs/development/python-modules/shimmy/default.nix @@ -1,12 +1,17 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, + fetchpatch, + + # build-system setuptools, - wheel, + + # dependencies gymnasium, numpy, + + # tests ale-py, bsuite, dm-control, @@ -18,21 +23,32 @@ buildPythonPackage rec { pname = "shimmy"; - version = "1.3.0"; + version = "2.0.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "Farama-Foundation"; repo = "Shimmy"; rev = "refs/tags/v${version}"; - hash = "sha256-rYBbGyMSFF/iIGruKn2JXKAVIZIfJDEHUEZUESiUg/k="; + hash = "sha256-/wIXjOGb3UeMQdeifYagd7OcxbBcdGPS09mjvkFsWmk="; }; + patches = [ + # Shimmy tries to register some environments from `dm-control` that require unpackaged `labmaze`. + # This prevents from importing `shimmy` itself by crashing with a `ModuleNotFoundError`. + # This patch imports those environments lazily. + # + # TODO: get rid of this patch at the next release as the issue has been fixed upstream: + # https://github.com/Farama-Foundation/Shimmy/pull/125 + (fetchpatch { + name = "prevent-labmaze-import-crash"; + url = "https://github.com/Farama-Foundation/Shimmy/commit/095d576f6aae15a09a1e426138629ce9f43a3c04.patch"; + hash = "sha256-rr9l3tHunYFk0j7hfo9IaSRlogAtwXoXcQ0zuU/TL8c="; + }) + ]; + build-system = [ setuptools - wheel ]; dependencies = [ @@ -58,10 +74,6 @@ buildPythonPackage rec { # Requires unpackaged pyspiel "tests/test_openspiel.py" - - # Broken since ale-py v0.9.0 due to API change - # https://github.com/Farama-Foundation/Shimmy/issues/120 - "tests/test_atari.py" ]; preCheck = '' diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 57544c7401b7..9a6bafea9c9d 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.33.1"; + version = "3.33.2"; pyproject = true; disabled = pythonOlder "3.6"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-OcGzpYwa8Ouf1ojQS9KnqlL37EYCZo5yjNeXXrkd0B4="; + hash = "sha256-6Uvp7hVFgHVavJO6Un5L793pOOOBtaT4+eywS3rRWUU="; }; postPatch = '' diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix index 3023380920c7..990e4df76be4 100644 --- a/pkgs/development/python-modules/torchrl/default.nix +++ b/pkgs/development/python-modules/torchrl/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, # build-system @@ -44,8 +43,6 @@ pytestCheckHook, pyyaml, scipy, - - stdenv, }: buildPythonPackage rec { @@ -53,8 +50,6 @@ buildPythonPackage rec { version = "0.5.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "pytorch"; repo = "rl"; @@ -138,6 +133,11 @@ buildPythonPackage rec { ++ optional-dependencies.rendering; disabledTests = [ + # torchrl is incompatible with gymnasium>=1.0 + # https://github.com/pytorch/rl/discussions/2483 + "test_resetting_strategies" + "test_torchrl_to_gym" + # mujoco.FatalError: an OpenGL platform library has not been loaded into this process, this most likely means that a valid OpenGL context has not been created before mjr_makeContext was called "test_vecenvs_env" @@ -175,6 +175,5 @@ buildPythonPackage rec { changelog = "https://github.com/pytorch/rl/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; - # ~3k tests fail with: RuntimeError: internal error }; } diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 6058d62c0640..8ef7730047d5 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -61,6 +61,9 @@ buildPythonPackage rec { "--deselect=tests/test_process.py::Test_UV_Process::test_process_streams_redirect" "--deselect=tests/test_process.py::Test_AIO_Process::test_process_streams_redirect" ] + ++ lib.optionals (pythonOlder "3.11") [ + "--deselect=tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat" + ] ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ # Segmentation fault "--deselect=tests/test_fs_event.py::Test_UV_FS_EVENT_RENAME::test_fs_event_rename" diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 59b1e02d771f..658d69ea942d 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -24,26 +24,31 @@ buildPythonPackage rec { build-system = [ setuptools ]; - patchPhase = '' - # Disable all tests that need to terminate within a predetermined amount of - # time. This is nondeterministic. - sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ - tests/legacy/test_protocol.py + patchPhase = + '' + # Disable all tests that need to terminate within a predetermined amount of + # time. This is nondeterministic. + sed -i 's/with self.assertCompletesWithin.*:/if True:/' \ + tests/legacy/test_protocol.py - # Disables tests relying on tight timeouts to avoid failures like: - # File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout - # ping_1_again, ping_2 = tuple(self.protocol.pings) - # ValueError: too many values to unpack (expected 2) - for t in \ - test_keepalive_ping_stops_when_connection_closing \ - test_keepalive_ping_does_not_crash_when_connection_lost \ - test_keepalive_ping \ - test_keepalive_ping_not_acknowledged_closes_connection \ - test_keepalive_ping_with_no_ping_timeout \ - ; do - sed -i "s/def $t(/def skip_$t(/" tests/legacy/test_protocol.py - done - ''; + # Disables tests relying on tight timeouts to avoid failures like: + # File "/build/source/tests/legacy/test_protocol.py", line 1270, in test_keepalive_ping_with_no_ping_timeout + # ping_1_again, ping_2 = tuple(self.protocol.pings) + # ValueError: too many values to unpack (expected 2) + for t in \ + test_keepalive_ping_stops_when_connection_closing \ + test_keepalive_ping_does_not_crash_when_connection_lost \ + test_keepalive_ping \ + test_keepalive_ping_not_acknowledged_closes_connection \ + test_keepalive_ping_with_no_ping_timeout \ + ; do + sed -i "s/def $t(/def skip_$t(/" tests/legacy/test_protocol.py + done + '' + + lib.optionalString (pythonOlder "3.11") '' + # Our Python 3.10 and older raise SSLError instead of SSLCertVerificationError + sed -i "s/def test_reject_invalid_server_certificate(/def skip_test_reject_invalid_server_certificate(/" tests/sync/test_client.py + ''; nativeCheckInputs = [ unittestCheckHook ]; diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index c68e1e00fc6f..23208b141408 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "3.2.4"; + version = "3.2.5"; pyproject = true; src = fetchFromGitHub { owner = "sqlfluff"; repo = "sqlfluff"; rev = "refs/tags/${version}"; - hash = "sha256-7EP2XIbvdB3oCFTY6IS9r00/QEB/eHJth05hVBzZCUI="; + hash = "sha256-jYAzFqHuTpcgmnodt7vuNWTHRP3rd0B/3tp2Q04/N9o="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 1125c62c87d8..32e7524645c3 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nasm +{ lib, stdenv, fetchFromGitHub, fetchpatch, nasm , alsa-lib, curl, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libtheora, libvorbis, libGLU, libGL, SDL2, zlib , Cocoa, AudioToolbox, Carbon, CoreMIDI, AudioUnit, cctools }: @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { hash = "sha256-8/q16MwHhbbmUxiwJOHkjNxrnBB4grMa7qw/n3KLvRc="; }; + patches = [ + # Fix building with Freetype 2.13.3. Remove after next release. + (fetchpatch { + url = "https://github.com/scummvm/scummvm/commit/65977961b20ba97b1213b5267da0cb1efb49063b.patch?full_index=1"; + hash = "sha256-e5dJd3gP8OAD3hEJlvOhMemsNErCKTn7avlprApFig0="; + }) + ]; + nativeBuildInputs = [ nasm ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index e2282008ce8e..19b25edf65d2 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -20,28 +20,6 @@ cmake, perl, git, - # nix has a problem with the `?` in the feature list - # enabling kafka will produce a vector with no features at all - enableKafka ? false, - # TODO investigate adding various "vendor-*" - # "disk-buffer" is using leveldb TODO: investigate how useful - # it would be, perhaps only for massive scale? - features ? ( - [ - "api" - "api-client" - "enrichment-tables" - "sinks" - "sources" - "sources-dnstap" - "transforms" - "component-validation-runner" - ] - # the second feature flag is passed to the rdkafka dependency - # building on linux fails without this feature flag (both x86_64 and AArch64) - ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ] - ++ lib.optional stdenv.hostPlatform.isUnix "unix" - ), nixosTests, nix-update-script, }: @@ -119,9 +97,6 @@ rustPlatform.buildRustPackage { CARGO_PROFILE_RELEASE_LTO = "fat"; CARGO_PROFILE_RELEASE_CODEGEN_UNITS = "1"; - buildNoDefaultFeatures = true; - buildFeatures = features; - # TODO investigate compilation failure for tests # there are about 100 tests failing (out of 1100) for version 0.22.0 doCheck = false; @@ -158,7 +133,6 @@ rustPlatform.buildRustPackage { ''; passthru = { - inherit features; tests = { inherit (nixosTests) vector; }; diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index f1af411fa5a0..a7b7f26f17a9 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication rec { pname = "pdm"; - version = "2.19.2"; + version = "2.19.3"; pyproject = true; disabled = python3.pkgs.pythonOlder "3.8"; @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { owner = "pdm-project"; repo = "pdm"; rev = "refs/tags/${version}"; - hash = "sha256-m+ZVaAZZ4+/qqJs3B8/CEj+in/mrBKgfrx1OD3GpXLU="; + hash = "sha256-xgwIPHlTtmgCNN4R6/BJsqmI9hbA0wFAiq4YCa+r/UM="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 3c7b66fcbf5e..458fe5789fed 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -6,22 +6,24 @@ python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "1.2.0"; + version = "1.3.0"; pyproject = true; src = fetchFromGitHub { owner = "darkoperator"; repo = "dnsrecon"; rev = "refs/tags/${version}"; - hash = "sha256-XboRxq3ZDIDtuECVSnncQ2Pa8YAvva4KUNm0O5ED6rc="; + hash = "sha256-h87sNorCKxUmXZAbF7FaOqruUCv84FepFwKMYrIl70M="; }; build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ dnspython - netaddr + loguru lxml + netaddr + requests setuptools ]; diff --git a/pkgs/tools/security/gowitness/default.nix b/pkgs/tools/security/gowitness/default.nix index 57a82168bdb9..1719a6f272d5 100644 --- a/pkgs/tools/security/gowitness/default.nix +++ b/pkgs/tools/security/gowitness/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "gowitness"; - version = "3.0.4"; + version = "3.0.5"; src = fetchFromGitHub { owner = "sensepost"; repo = "gowitness"; rev = "refs/tags/${version}"; - hash = "sha256-ygnYqX8il0nDvF5+jd52CypmHH8iiLMlOZWdoTsR0ig="; + hash = "sha256-oEEq4f5G0kOpaj4KORbVhZqW4RPkBXC33PXYUHhoMxo="; }; vendorHash = "sha256-2hG+93LzJ+kUVCOXFGk83Asvn7zLWq2BSqrq+eOJhQ0="; diff --git a/pkgs/tools/security/qdigidoc/default.nix b/pkgs/tools/security/qdigidoc/default.nix index 844e3d0771f2..b23f3abdc4b0 100644 --- a/pkgs/tools/security/qdigidoc/default.nix +++ b/pkgs/tools/security/qdigidoc/default.nix @@ -18,27 +18,27 @@ mkDerivation rec { pname = "qdigidoc"; - version = "4.5.1"; + version = "4.6.0"; src = fetchurl { url = "https://github.com/open-eid/DigiDoc4-Client/releases/download/v${version}/qdigidoc4-${version}.tar.gz"; - hash = "sha256-grhSuexp5yd/s8h5AdmdSLBmQY85l9HKZ15oTTvC6PI="; - }; - - tsl = fetchurl { - url = "https://ec.europa.eu/tools/lotl/eu-lotl-pivot-300.xml"; - sha256 = "1cikz36w9phgczcqnwk4k3mx3kk919wy2327jksmfa4cjfjq4a8d"; + hash = "sha256-szFLY9PpZMMYhfV5joueShfu92YDVmcCC3MOWIOAKVg="; }; patches = [ - # https://github.com/open-eid/DigiDoc4-Client/pull/1251 (fetchpatch { - url = "https://github.com/open-eid/DigiDoc4-Client/commit/30281d14c5fb5582832eafbc254b56f8d685227d.patch"; - hash = "sha256-nv23NbPUogOhS8No3SMIrAcPChl+d1HkxnePpCKIoUw="; + url = "https://github.com/open-eid/DigiDoc4-Client/commit/bb324d18f0452c2ab1b360ff6c42bb7f11ea60d7.patch"; + hash = "sha256-JpaU9inupSDsZKhHk+sp5g+oUynVFxR7lshjTXoFIbU="; }) ]; + # Check https://dss.nowina.lu/tl-info, "Pivots loaded" section + tsl = fetchurl { + url = "https://ec.europa.eu/tools/lotl/eu-lotl-pivot-341.xml"; + hash = "sha256-/TI8qYxXzourjGFPBpsQzi9Depi7lLQ2JaV+FyP0FtE="; + }; + nativeBuildInputs = [ cmake gettext pkg-config qttools ]; postPatch = '' diff --git a/pkgs/tools/security/xortool/default.nix b/pkgs/tools/security/xortool/default.nix deleted file mode 100644 index 1e8b6aee5d37..000000000000 --- a/pkgs/tools/security/xortool/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, buildPythonApplication -, docopt -, fetchFromGitHub -, importlib-metadata -, poetry-core -}: - -buildPythonApplication rec { - pname = "xortool"; - version = "1.0.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "hellman"; - repo = pname; - rev = "v${version}"; - sha256 = "19lfadi28r89bl5q8fhrxgjgs3nx3kgjd4rdg7wbvzi1cn29c5n7"; - }; - - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ docopt importlib-metadata ]; - - # Project has no tests - doCheck = false; - pythonImportsCheck = [ "xortool" ]; - - meta = with lib; { - description = "Tool to analyze multi-byte XOR cipher"; - homepage = "https://github.com/hellman/xortool"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index acb4a20314ed..39859d6f5529 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -139,7 +139,7 @@ let mainDrv = set.out or set.tex or set.tlpkg or set.texdoc or set.texsource; in builtins.removeAttrs mainDrv [ "outputSpecified" ]; toTLPkgSets = { pkgs, ... }: lib.mapAttrsToList toTLPkgSet - (builtins.groupBy (p: p.pname) pkgs); + (lib.groupBy (p: p.pname) pkgs); # export TeX packages as { pkgs = [ ... ]; } in the top attribute set allPkgLists = lib.mapAttrs (n: drv: { pkgs = toTLPkgList drv; }) tl; diff --git a/pkgs/top-level/ada-packages.nix b/pkgs/top-level/ada-packages.nix index 2d3d0c4dc3fa..ad29103deb22 100644 --- a/pkgs/top-level/ada-packages.nix +++ b/pkgs/top-level/ada-packages.nix @@ -12,6 +12,8 @@ makeScopeWithSplicing' { f = (self: { inherit gnat; + gpr2 = self.callPackage ../development/ada-modules/gpr2 { }; + gprbuild-boot = self.callPackage ../development/ada-modules/gprbuild/boot.nix { }; gprbuild = self.callPackage ../development/ada-modules/gprbuild { }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b42392869566..3e9181528f77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -466,6 +466,11 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) AppKit; }; + cope = callPackage ../by-name/co/cope/package.nix { + perl = perl538; + perlPackages = perl538Packages; + }; + cmark = callPackage ../development/libraries/cmark { }; cmark-gfm = callPackage ../development/libraries/cmark-gfm { }; @@ -14495,8 +14500,6 @@ with pkgs; flasm = callPackage ../development/compilers/flasm { }; - flyctl = callPackage ../development/web/flyctl { }; - fluidd = callPackage ../applications/misc/fluidd { }; flutterPackages-bin = recurseIntoAttrs (callPackage ../development/compilers/flutter { }); @@ -14765,6 +14768,7 @@ with pkgs; gnat12Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat12; }); gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; }); + gnat14Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat14; }); gnatPackages = gnat12Packages; inherit (gnatPackages) @@ -17884,8 +17888,6 @@ with pkgs; lemon = callPackage ../development/tools/parsing/lemon { }; - lenmus = callPackage ../applications/misc/lenmus { }; - libtool = libtool_2; libtool_1_5 = callPackage ../development/tools/misc/libtool { }; @@ -37627,8 +37629,6 @@ with pkgs; pyupgrade = with python3Packages; toPythonApplication pyupgrade; - pwncat = python3Packages.callPackage ../tools/security/pwncat { }; - pwntools = with python3Packages; toPythonApplication pwntools; putty = callPackage ../applications/networking/remote/putty { @@ -38140,8 +38140,6 @@ with pkgs; xboxdrv = callPackage ../misc/drivers/xboxdrv { }; - xortool = python3Packages.callPackage ../tools/security/xortool { }; - xorex = callPackage ../tools/security/xorex { }; xbps = callPackage ../tools/package-management/xbps { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ced4a03bf95..96d7f210d0b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10374,6 +10374,8 @@ self: super: with self; { pytest-pudb = callPackage ../development/python-modules/pytest-pudb { }; + pytest-ruff = callPackage ../development/python-modules/pytest-ruff { }; + pytlv = callPackage ../development/python-modules/pytlv { }; pywebcopy = callPackage ../development/python-modules/pywebcopy { };