diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:31:50 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-01-20 12:32:25 +0100 |
commit | b7baf40e099b4215181fe7b0c63083b12ef2c7fb (patch) | |
tree | a6efabd31d05b6d0a36624729e80377bbbfb0149 /nixpkgs/pkgs/tools | |
parent | 710028664e26e85cb831a869b3da9f6993902255 (diff) | |
parent | 0799f514b1cd74878174939df79ac60ca5036673 (diff) | |
download | nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.gz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.bz2 nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.lz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.xz nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.tar.zst nixlib-b7baf40e099b4215181fe7b0c63083b12ef2c7fb.zip |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
Diffstat (limited to 'nixpkgs/pkgs/tools')
357 files changed, 5109 insertions, 6816 deletions
diff --git a/nixpkgs/pkgs/tools/X11/screen-message/default.nix b/nixpkgs/pkgs/tools/X11/screen-message/default.nix index 3701684af8d8..c049c3841ea6 100644 --- a/nixpkgs/pkgs/tools/X11/screen-message/default.nix +++ b/nixpkgs/pkgs/tools/X11/screen-message/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, gtk3 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk3 }: stdenv.mkDerivation rec { pname = "screen-message"; - version = "0.26"; + version = "0.28"; - src = fetchurl { - url = "mirror://debian/pool/main/s/screen-message/screen-message_${version}.orig.tar.gz"; - sha256 = "sha256-vBKnuXOEQZDACmlNP9wjJ3NbIdixIx7I72a6Nj6pjzc="; + src = fetchFromGitHub { + owner = "nomeata"; + repo = "screen-message"; + rev = version; + hash = "sha256-KHJL1N72Hc1B1m0olxoZxBHIpq/d/T3m2VdS5XC9+tk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/X11/sx/default.nix b/nixpkgs/pkgs/tools/X11/sx/default.nix deleted file mode 100644 index d408af8245bc..000000000000 --- a/nixpkgs/pkgs/tools/X11/sx/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ lib -, stdenvNoCC -, fetchFromGitHub -, patsh -, xorg -}: - -stdenvNoCC.mkDerivation rec { - pname = "sx"; - version = "2.1.7"; - - src = fetchFromGitHub { - owner = "earnestly"; - repo = pname; - rev = version; - sha256 = "0xv15m30nhcknasqiybj5wwf7l91q4a4jf6xind8x5x00c6br6nl"; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - nativeBuildInputs = [ patsh ]; - - buildInputs = [ - xorg.xauth - xorg.xorgserver - ]; - - postInstall = '' - patsh -f $out/bin/sx -s ${builtins.storeDir} - ''; - - meta = with lib; { - description = "Simple alternative to both xinit and startx for starting a Xorg server"; - homepage = "https://github.com/earnestly/sx"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ figsoda thiagokokada ]; - mainProgram = "sx"; - }; -} diff --git a/nixpkgs/pkgs/tools/admin/afterburn/default.nix b/nixpkgs/pkgs/tools/admin/afterburn/default.nix index c3d3cf09107b..7cd637c28d9e 100644 --- a/nixpkgs/pkgs/tools/admin/afterburn/default.nix +++ b/nixpkgs/pkgs/tools/admin/afterburn/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/coreos/ignition"; - description = "This is a small utility, typically used in conjunction with Ignition, which reads metadata from a given cloud-provider and applies it to the system."; + description = "A one-shot cloud provider agent"; license = licenses.asl20; maintainers = [ maintainers.arianvp ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/admin/ansible/lint.nix b/nixpkgs/pkgs/tools/admin/ansible/lint.nix index fbac95d019ba..e1c168f8bf53 100644 --- a/nixpkgs/pkgs/tools/admin/ansible/lint.nix +++ b/nixpkgs/pkgs/tools/admin/ansible/lint.nix @@ -23,6 +23,11 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools setuptools-scm + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "ruamel.yaml" ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/admin/aws-assume-role/default.nix b/nixpkgs/pkgs/tools/admin/aws-assume-role/default.nix index 7a09c8d2571c..29dcac28c1e2 100644 --- a/nixpkgs/pkgs/tools/admin/aws-assume-role/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-assume-role/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { ''; meta = with lib; { - description = "Easily assume AWS roles in your terminal."; + description = "Easily assume AWS roles in your terminal"; homepage = "https://github.com/remind101/assume-role"; license = licenses.bsd2; mainProgram = "assume-role"; diff --git a/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix b/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix index 351355bed997..01d5b9479aa7 100644 --- a/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-lambda-runtime-interface-emulator/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { doCheck = false; meta = with lib; { - description = "To locally test their Lambda function packaged as a container image."; + description = "Locally test Lambda functions packaged as container images"; homepage = "https://github.com/aws/aws-lambda-runtime-interface-emulator"; license = licenses.asl20; maintainers = with maintainers; [ teto ]; diff --git a/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix b/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix index 5ff20fd17b1d..998da596c068 100644 --- a/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,15 +6,15 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.14.2"; + version = "1.14.3"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - hash = "sha256-KtSmDBr2JRxyBUJ5UWMmnfN87oO1/TiCrtuxA2b9Ph0="; + hash = "sha256-6UP+5niKAdO4DgdEnTdpbUnr2BLKwAgHcEZqkgzCcqs="; }; - vendorHash = "sha256-B7t1syBJjwaTM4Tgj/OhhmHJRAhJ/Ewg+g55AKpdj4c="; + vendorHash = "sha256-TU5kJ0LIqHcfEQEkk69xWJZk30VD9XwlJ5b83w1mHKk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/admin/awscli/default.nix b/nixpkgs/pkgs/tools/admin/awscli/default.nix index 7bbc1e14efbe..73c86278df70 100644 --- a/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -10,14 +10,13 @@ python3.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.30.2"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.31.6"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - hash = "sha256-XbYsPbYUIJPCS+nhcE3A5K7yxHcGUkulT5vHPT5T9kM="; + hash = "sha256-PINiNkP2vopPgc9bH0x7mifeUt7gdXi3/i2Ye96RANg="; }; - propagatedBuildInputs = with python3.pkgs; [ botocore bcdoc diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index 9893e9e1e29c..0f1c2f3d327b 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -99,7 +99,6 @@ let azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "9.0.0" "zip" "sha256-/ECLNzFf6EeBtRkST4yxuKwQsvQkHkOdDT4l/WyhjXs="; azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "4.0.0" "zip" "sha256-AiTjLJ28g80xnrRFLfPUevJgeaxLpuGmvkd3+FskNiw="; azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "4.0.0" "zip" "sha256-abhavAmuZPxyl1vUNDEXDYx+tdFmdUuYqsXzhF3lfcQ="; - azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "17.0.0" "zip" "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo="; azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "6.0.0" "zip" "sha256-1PXFpBiKRW/h6zK2xF9VyiBpx0vkHrdpIYQLOfL1wH8="; azure-mgmt-botservice = overrideAzureMgmtPackage super.azure-mgmt-botservice "2.0.0b3" "zip" "sha256-XZGQOeMw8usyQ1tl8j57fZ3uqLshomHY9jO/rbpQOvM="; azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "13.5.0" "zip" "sha256-RK8LGbH4J+nN6gnGBUweZgkqUcMrwe9aVtvZtAvFeBU="; @@ -139,6 +138,11 @@ let azure-mgmt-appcontainers = overrideAzureMgmtPackage super.azure-mgmt-appcontainers "2.0.0" "zip" "sha256-ccdIdvdgTYPWEZCWqkLc8lEuMuAEERvl5B1huJyBkvU="; + azure-mgmt-batch = (overrideAzureMgmtPackage super.azure-mgmt-batch "17.0.0" "zip" + "sha256-hkM4WVLuwxj4qgXsY8Ya7zu7/v37gKdP0Xbf2EqrsWo=").overridePythonAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; + }); + azure-mgmt-batchai = overrideAzureMgmtPackage super.azure-mgmt-batchai "7.0.0b1" "zip" "sha256-mT6vvjWbq0RWQidugR229E8JeVEiobPD3XA/nDM3I6Y="; @@ -181,7 +185,7 @@ let "sha256-WvyNgfiliEt6qawqy8Le8eifhxusMkoZbf6YcyY1SBA="; azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "10.1.0" "zip" - "sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM="; + "sha256-eJiWTOCk2C79Jotku9bKlu3vU6H8004hWrX+h76MjQM="; azure-mgmt-signalr = overrideAzureMgmtPackage super.azure-mgmt-signalr "2.0.0b2" "tar.gz" "sha256-05PUV8ouAKq/xhGxVEWIzDop0a7WDTV5mGVSC4sv9P4="; @@ -204,8 +208,10 @@ let azure-mgmt-applicationinsights = overrideAzureMgmtPackage super.azure-mgmt-applicationinsights "1.0.0" "zip" "sha256-woeix9703hn5LAwxugKGf6xvW433G129qxkoi7RV/Fs="; - azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" - "sha256-3jXhF5EoMsGp6TEJqNJMq5T1VwOpCHsuscWwZVs7GRM="; + azure-mgmt-servicefabric = (overrideAzureMgmtPackage super.azure-mgmt-servicefabric "1.0.0" "zip" + "sha256-3jXhF5EoMsGp6TEJqNJMq5T1VwOpCHsuscWwZVs7GRM=").overridePythonAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest ]; + }); azure-mgmt-servicelinker = overrideAzureMgmtPackage super.azure-mgmt-servicelinker "1.2.0b1" "zip" "sha256-RK1Q51Q0wAG55oKrFmv65/2AUKl+gRdp27t/EcuMONk="; diff --git a/nixpkgs/pkgs/tools/admin/chkservice/default.nix b/nixpkgs/pkgs/tools/admin/chkservice/default.nix deleted file mode 100644 index 9e2965a0db2a..000000000000 --- a/nixpkgs/pkgs/tools/admin/chkservice/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, cmake -, ninja -, pkg-config -, systemd -, ncurses -}: - -stdenv.mkDerivation rec { - pname = "chkservice"; - version = "0.3"; - - src = fetchFromGitHub { - owner = "linuxenko"; - repo = "chkservice"; - rev = version; - hash = "sha256-ZllO6Ag+OgAkQp6jSv000NUEskXFuhMcCo83A4Wp2zU="; - }; - - patches = [ - # Pull fix pending upstream inclusion for gcc-11 support: - # https://github.com/linuxenko/chkservice/pull/38 - (fetchpatch { - name = "gcc-11.patch"; - url = "https://github.com/linuxenko/chkservice/commit/26b12a7918c8a3bc449c92b458e6cd5c2d7b2e05.patch"; - hash = "sha256-LaJLlqRyn1eoahbW2X+hDSt8iV4lhNRn0j0kLHB+RhM="; - }) - ]; - - # Tools needed during build time - nativeBuildInputs = [ - cmake - # Makes the build faster, adds less than half a megabyte to the build - # dependencies - ninja - pkg-config - ]; - - buildInputs = [ - systemd - ncurses - ]; - - hardeningDisable = [ "format" ]; - - meta = { - description = "chkservice is a tool for managing systemd units in terminal."; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ infinisil ]; - license = lib.licenses.gpl3Plus; - homepage = "https://github.com/linuxenko/chkservice"; - }; -} diff --git a/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix b/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix index 2c78ce3ed9ad..a391aa4777d3 100644 --- a/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.32.1"; + version = "1.33.0"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-OdzycH+52F6lfCErKlsVFiPE2gxU22ySV5uPA6zBXUg="; + hash = "sha256-4LDeilWi3FzvrvHjEyQKQi1GxouSlzDY96yBuMfpsXM="; }; - vendorHash = "sha256-5Nlo5Ol4YdO3XI5RhpFfBgprVUV5DUkySvCXeFZqulk="; + vendorHash = "sha256-EqgOyjb2raE5hW3h+czbsi/F9SVNDwPWM1L6GC7v6IY="; nativeBuildInputs = [ installShellFiles ]; @@ -19,7 +19,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/aws/copilot-cli/internal/pkg/version.Version=${version}" + "-X github.com/aws/copilot-cli/internal/pkg/version.Version=v${version}" "-X github.com/aws/copilot-cli/internal/pkg/cli.binaryS3BucketPath=https://ecs-cli-v2-release.s3.amazonaws.com" ]; @@ -35,10 +35,11 @@ buildGoModule rec { passthru.tests.version = testers.testVersion { package = copilot-cli; command = "copilot version"; + version = "v${version}"; }; meta = with lib; { - description = "Build, Release and Operate Containerized Applications on AWS."; + description = "Build, Release and Operate Containerized Applications on AWS"; homepage = "https://github.com/aws/copilot-cli"; changelog = "https://github.com/aws/copilot-cli/releases/tag/v${version}"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix b/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix index 151da67fe91f..ba5aa38860ef 100644 --- a/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-credential-helpers"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "docker"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3zWlYW+2LA/JK/lv/OTzMlF2HlQPID0WYks0dQrP3GY="; + sha256 = "sha256-Q1SdDfTT0W+eG/F5HX+pk4B06IG5ZoeZxe36l71gMc8="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/admin/drawterm/default.nix b/nixpkgs/pkgs/tools/admin/drawterm/default.nix index 0fafd28ae3c2..e0c33457e168 100644 --- a/nixpkgs/pkgs/tools/admin/drawterm/default.nix +++ b/nixpkgs/pkgs/tools/admin/drawterm/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { }; meta = with lib; { - description = "Connect to Plan 9 CPU servers from other operating systems."; + description = "Connect to Plan 9 CPU servers from other operating systems"; homepage = "https://drawterm.9front.org/"; license = licenses.mit; maintainers = with maintainers; [ luc65r moody ]; diff --git a/nixpkgs/pkgs/tools/admin/ejson2env/default.nix b/nixpkgs/pkgs/tools/admin/ejson2env/default.nix index a7d516644c3d..26a1b737d8b6 100644 --- a/nixpkgs/pkgs/tools/admin/ejson2env/default.nix +++ b/nixpkgs/pkgs/tools/admin/ejson2env/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { passthru.updateScript = nix-update-script { }; meta = with lib; { - description = "A tool to simplify storing secrets that should be accessible in the shell environment in your git repo."; + description = "Decrypt EJSON secrets and export them as environment variables"; homepage = "https://github.com/Shopify/ejson2env"; maintainers = with maintainers; [ viraptor ]; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock b/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock index 78fd0510629f..9f2cbafb8949 100644 --- a/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/nixpkgs/pkgs/tools/admin/fastlane/Gemfile.lock @@ -3,25 +3,25 @@ GEM specs: CFPropertyList (3.0.6) rexml - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) atomos (0.1.3) - aws-eventstream (1.2.0) - aws-partitions (1.851.0) - aws-sdk-core (3.186.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.877.0) + aws-sdk-core (3.190.1) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.72.0) - aws-sdk-core (~> 3, >= 3.184.0) + aws-sdk-kms (1.76.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.136.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.142.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.6.1) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) claide (1.1.0) @@ -35,7 +35,7 @@ GEM domain_name (0.6.20231109) dotenv (2.8.1) emoji_regex (3.2.3) - excon (0.104.0) + excon (0.109.0) faraday (1.10.3) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -64,8 +64,8 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - fastimage (2.2.7) - fastlane (2.217.0) + fastimage (2.3.0) + fastlane (2.219.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -84,6 +84,7 @@ GEM gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) google-cloud-storage (~> 1.31) highline (~> 2.0) http-cookie (~> 1.0.5) @@ -92,7 +93,7 @@ GEM mini_magick (>= 4.9.4, < 5.0.0) multipart-post (>= 2.0.0, < 3.0.0) naturally (~> 2.2) - optparse (~> 0.1.1) + optparse (>= 0.1.1) plist (>= 3.1.0, < 4.0.0) rubyzip (>= 2.0.0, < 3.0.0) security (= 0.1.3) @@ -106,7 +107,7 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.52.0) + google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-core (0.11.2) addressable (~> 2.5, >= 2.5.1) @@ -123,8 +124,8 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.29.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) + google-cloud-core (1.6.1) + google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) @@ -148,7 +149,7 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.6.2) - json (2.6.3) + json (2.7.1) jwt (2.7.1) mini_magick (4.12.0) mini_mime (1.1.5) @@ -156,10 +157,10 @@ GEM multipart-post (2.3.0) nanaimo (0.3.0) naturally (2.2.1) - optparse (0.1.1) + optparse (0.4.0) os (1.1.4) - plist (3.7.0) - public_suffix (5.0.3) + plist (3.7.1) + public_suffix (5.0.4) rake (13.1.0) representable (3.2.0) declarative (< 0.1.0) @@ -184,7 +185,7 @@ GEM unicode-display_width (>= 1.1.1, < 3) trailblazer-option (0.1.2) tty-cursor (0.7.1) - tty-screen (0.8.1) + tty-screen (0.8.2) tty-spinner (0.9.3) tty-cursor (~> 0.7) uber (0.1.0) @@ -210,4 +211,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 2.4.20 + 2.4.22 diff --git a/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix b/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix index 033ce2a4292e..1afc21c27a16 100644 --- a/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix +++ b/nixpkgs/pkgs/tools/admin/fastlane/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.6"; }; artifactory = { groups = ["default"]; @@ -35,20 +35,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1aj4c8m40kpyy48j5gmr3gnz27sy97zjrdd3xpn6i0ix2m9sq2c5"; + sha256 = "1zcwrlg4in3gzvsiynpzp9fzlr5grrhc2881xcgfs01ppmxysllm"; type = "gem"; }; - version = "1.851.0"; + version = "1.877.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19zl449qzc2ir0yzwhdy82nkm0ycd1822pym6b2i0h1k7zw69may"; + sha256 = "1ansagfl5irx1y6b9xf4xpi9j6q6k5pbd2aw80hn0p4m3ycafamh"; type = "gem"; }; - version = "3.186.0"; + version = "3.190.1"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -67,10 +67,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01z32ryrl18al0hazyimww808ij144pgs5m8wmp0k49i7k33hnlw"; + sha256 = "0jfgw9a9c8xyjhkmgpd9rpi95h9i0rhbqszn8iqkbfm9rc9m1xz7"; type = "gem"; }; - version = "1.72.0"; + version = "1.76.0"; }; aws-sdk-s3 = { dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; @@ -78,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qwdkbwp3f5illkkmivzdr9gcrcg69yv73xlfp6fc7fmhlm30irm"; + sha256 = "1sfpipfdmixpc0madfx1yvpwpv52fdhxfx4bmvrjxzb6ra78ikbr"; type = "gem"; }; - version = "1.136.0"; + version = "1.142.0"; }; aws-sigv4 = { dependencies = ["aws-eventstream"]; @@ -89,10 +89,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wzi7mkyfcr23y8r3dx64zqil115rjy8d9nmkd2q5a6ssxs8y58w"; + sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; type = "gem"; }; - version = "1.6.1"; + version = "1.8.0"; }; babosa = { groups = ["default"]; @@ -212,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "104vrqqy6bszbhpvabgz9ra7dm6lnb5jwzwqm2fks0ka44spknyl"; + sha256 = "1kmmwgjzlrnc3nnrdnw1z67c95nbw0hv54a73yj8jw6pcvl9585x"; type = "gem"; }; - version = "0.104.0"; + version = "0.109.0"; }; faraday = { dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; @@ -356,21 +356,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pd7pamzhdz2w0fbcvsfn2nyslznvphnwj16zw35g2b28zd2xyzx"; + sha256 = "104kn1lj55hifcpiw1x7x9slskvqmfanylcz3nj8acjgmri0av72"; type = "gem"; }; - version = "2.2.7"; + version = "2.3.0"; }; fastlane = { - dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "http-cookie" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; + dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-env" "google-cloud-storage" "highline" "http-cookie" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p2b92csayzlj60v15fz3mq4h23kvvr7swhaavi6fpaqzf70iafi"; + sha256 = "0g3rg730nf7fr4pjy7fpw19iwxng871mb1d85639fn1bmhma6j7v"; type = "gem"; }; - version = "2.217.0"; + version = "2.219.0"; }; gh_inspector = { groups = ["default"]; @@ -388,10 +388,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rxxj033ziwx94xcym2cs76lcqjiyxv5vv52i32s97nkpk6wid6g"; + sha256 = "046j100lrh5dhb8p3gr38fyqrw8vcif97pqb55ysipy874lafw49"; type = "gem"; }; - version = "0.52.0"; + version = "0.54.0"; }; google-apis-core = { dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; @@ -443,10 +443,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0amp8vd16pzbdrfbp7k0k38rqxpwd88bkyp35l3x719hbb6l85za"; + sha256 = "00wfvdvdv9m4l5ydn6xp65n68mgmpqr3n09hzvxs7gp8fly3j17v"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; google-cloud-env = { dependencies = ["faraday"]; @@ -537,10 +537,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; + sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; type = "gem"; }; - version = "2.6.3"; + version = "2.7.1"; }; jwt = { groups = ["default"]; @@ -617,10 +617,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0j9l5a1zszvrlggp1ldx82i4kkqx34g4g3amwp488s499w5l1cvj"; + sha256 = "1pmsn1g1q5fpkjrc4h1wlw6lxlqp165sdcd951xyl47n6k0az17m"; type = "gem"; }; - version = "0.1.1"; + version = "0.4.0"; }; os = { groups = ["default"]; @@ -637,20 +637,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wzhnbzraz60paxhm48c50fp9xi7cqka4gfhxmiq43mhgh5ajg3h"; + sha256 = "0b643i5b7b7galvlb2fc414ifmb78b5lsq47gnvhzl8m27dl559z"; type = "gem"; }; - version = "3.7.0"; + version = "3.7.1"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "5.0.3"; + version = "5.0.4"; }; rake = { groups = ["default"]; @@ -801,10 +801,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + sha256 = "0l4vh6g333jxm9lakilkva2gn17j6gb052626r1pdbmy2lhnb460"; type = "gem"; }; - version = "0.8.1"; + version = "0.8.2"; }; tty-spinner = { dependencies = ["tty-cursor"]; diff --git a/nixpkgs/pkgs/tools/admin/granted/default.nix b/nixpkgs/pkgs/tools/admin/granted/default.nix index 36f1ebca16b8..116c8a118b94 100644 --- a/nixpkgs/pkgs/tools/admin/granted/default.nix +++ b/nixpkgs/pkgs/tools/admin/granted/default.nix @@ -57,7 +57,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "The easiest way to access your cloud."; + description = "The easiest way to access your cloud"; homepage = "https://github.com/common-fate/granted"; changelog = "https://github.com/common-fate/granted/releases/tag/${version}"; license = licenses.mit; diff --git a/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index 4a70d2276573..65dd2c70daa2 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -76,6 +76,7 @@ buildGoModule rec { ''; passthru.tests.lxd = nixosTests.lxd; + passthru.tests.lxd-to-incus = nixosTests.incus.lxd-to-incus; passthru.ui = callPackage ./ui.nix { }; passthru.updateScript = gitUpdater { url = "https://github.com/canonical/lxd.git"; diff --git a/nixpkgs/pkgs/tools/admin/lxd/ui.nix b/nixpkgs/pkgs/tools/admin/lxd/ui.nix index 16fdb4c33175..d2110d4c4d7c 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/ui.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/ui.nix @@ -5,6 +5,7 @@ , nodejs , prefetch-yarn-deps , yarn +, nixosTests }: stdenv.mkDerivation rec { @@ -57,8 +58,10 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.tests.default = nixosTests.lxd.ui; + meta = { - description = "Web user interface for LXD."; + description = "Web user interface for LXD"; homepage = "https://github.com/canonical/lxd-ui"; license = lib.licenses.gpl3; maintainers = lib.teams.lxc.members; diff --git a/nixpkgs/pkgs/tools/admin/oxidized/default.nix b/nixpkgs/pkgs/tools/admin/oxidized/default.nix index 6e09092874cc..0436038a98b1 100644 --- a/nixpkgs/pkgs/tools/admin/oxidized/default.nix +++ b/nixpkgs/pkgs/tools/admin/oxidized/default.nix @@ -11,7 +11,7 @@ bundlerApp { passthru.updateScript = bundlerUpdateScript "oxidized"; meta = with lib; { - description = "A network device configuration backup tool. It's a RANCID replacement!"; + description = "A network device configuration backup tool. It's a RANCID replacement"; homepage = "https://github.com/ytti/oxidized"; license = licenses.asl20; maintainers = with maintainers; [ nicknovitski ] ++ teams.wdz.members; diff --git a/nixpkgs/pkgs/tools/admin/pbm/default.nix b/nixpkgs/pkgs/tools/admin/pbm/default.nix index 39445a52354a..4fe6c95a4893 100644 --- a/nixpkgs/pkgs/tools/admin/pbm/default.nix +++ b/nixpkgs/pkgs/tools/admin/pbm/default.nix @@ -7,7 +7,7 @@ buildDotnetGlobalTool { nugetSha256 = "sha256-xu3g8NFLZYnHzBuoIhIiAzaPJqY0xhLWLYi+ORRADH8="; meta = with lib; { - description = "CLI for managing Akka.NET applications and Akka.NET Clusters."; + description = "CLI for managing Akka.NET applications and Akka.NET Clusters"; homepage = "https://cmd.petabridge.com/index.html"; changelog = "https://cmd.petabridge.com/articles/RELEASE_NOTES.html"; license = licenses.unfree; diff --git a/nixpkgs/pkgs/tools/admin/pgadmin/default.nix b/nixpkgs/pkgs/tools/admin/pgadmin/default.nix index 0a7f90dd662a..d6f3b7551f9a 100644 --- a/nixpkgs/pkgs/tools/admin/pgadmin/default.nix +++ b/nixpkgs/pkgs/tools/admin/pgadmin/default.nix @@ -14,14 +14,14 @@ let pname = "pgadmin"; - version = "8.1"; - yarnHash = "sha256-KAiY5TX2O8mxP7PjIJstYEzCBbqDgT+CpEhreuAGW/U="; + version = "8.2"; + yarnHash = "sha256-uMSgpkYoLD32VYDAkjywC9bZjm7UKA0hhwVNc/toEbA="; src = fetchFromGitHub { owner = "pgadmin-org"; repo = "pgadmin4"; rev = "REL-${lib.versions.major version}_${lib.versions.minor version}"; - hash = "sha256-zzS/fydNOXpIWdyLtWQhY+hVpneca+3wD88DmZEkS8s="; + hash = "sha256-RfpZXy265kwpMsWUBDVfbL/0eX0By79I4VNkG8zwVOs="; }; # keep the scope, as it is used throughout the derivation and tests @@ -181,6 +181,8 @@ pythonPackages.buildPythonApplication rec { google-auth-oauthlib google-api-python-client keyring + typer + rich ]; passthru.tests = { diff --git a/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch b/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch index ac68eabd411d..67e588c5be83 100644 --- a/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch +++ b/nixpkgs/pkgs/tools/admin/pgadmin/expose-setup.py.patch @@ -1,64 +1,16 @@ - pkg/pip/setup_pip.py | 5 ++++- - web/setup.py | 14 ++++++++------ - 2 files changed, 12 insertions(+), 7 deletions(-) - diff --git a/pkg/pip/setup_pip.py b/pkg/pip/setup_pip.py -index 5592d1b04..131eaa1ed 100644 +index c65795b10..e56b6a6f3 100644 --- a/pkg/pip/setup_pip.py +++ b/pkg/pip/setup_pip.py -@@ -95,7 +95,10 @@ setup( - }, - +@@ -101,7 +101,7 @@ setup( + entry_points={ -- 'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4:main'], -+ 'console_scripts': [ -+ 'pgadmin4=pgadmin4.pgAdmin4:main', -+ 'pgadmin4-setup=pgadmin4.setup:main' -+ ], + 'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4:main', +- 'pgadmin4-cli=pgadmin4.setup:main'], ++ 'pgadmin4-cli=pgadmin4.setup:app'], }, - - ) -diff --git a/web/setup.py b/web/setup.py -index 2204ffb..d5fda9f 100644 ---- a/web/setup.py -+++ b/web/setup.py -@@ -14,7 +14,6 @@ import argparse - import os - import sys - import builtins --import config - - # Grab the SERVER_MODE if it's been set by the runtime - if 'SERVER_MODE' in globals(): -@@ -91,6 +90,9 @@ def load_servers(args): - def setup_db(app): - """Setup the configuration database.""" - -+ # here we need an additional import, since the call to setup_db changed -+ # https://redmine.postgresql.org/projects/pgadmin4/repository/2/revisions/3a69d50458f57d19948b867aec55c55d635a36e5/diff/web/setup.py -+ import config - create_app_data_directory(config) - - print("pgAdmin 4 - Application Initialisation") -@@ -139,8 +141,9 @@ def clear_servers(): - clear_database_servers(load_user, True) - - --if __name__ == '__main__': -+def main(): - # Configuration settings -+ import config - parser = argparse.ArgumentParser(description='Setup the pgAdmin config DB') - - exp_group = parser.add_argument_group('Dump server config') -@@ -191,3 +194,6 @@ if __name__ == '__main__': - else: - app = create_app() - setup_db(app) -+ -+if __name__ == '__main__': -+ main() + ) diff --git a/web/pgadmin/model/__init__.py b/web/pgadmin/model/__init__.py index 4c36dd1..a492365 100644 --- a/web/pgadmin/model/__init__.py diff --git a/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock b/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock index abf896fa9891..cf3e188e8674 100644 --- a/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock +++ b/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock @@ -12716,3 +12716,8 @@ zustand@^4.4.1: resolved "https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8" dependencies: "clsx" "^1.1.1" +"react-data-grid@https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8": + version "7.0.0-beta.14" + resolved "https://github.com/pgadmin-org/react-data-grid.git#200d2f5e02de694e3e9ffbe177c279bc40240fb8" + dependencies: + "clsx" "^1.1.1" diff --git a/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix b/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix index 7a89891e9cc2..a84c916a1408 100644 --- a/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/qovery-cli/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.79.2"; + version = "0.81.0"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-vbN0og4IflqfIRQ/de/OQMjew0JIXmwj+nz9Dpg397s="; + hash = "sha256-Me2UIyBJ/TFP6M7zqQvJ/NDYoiOWop8Lkh8e1KbD9eU="; }; - vendorHash = "sha256-afRcW1MkRcVON2xmBvoeUzDR/JByViF4EEgGC0ftZeo="; + vendorHash = "sha256-IDKJaWnQsOtghpCh7UyO6RzWgSZS0S0jdF5hVV7xVbs="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix b/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix index 9974a9d4bd34..00065aa2e357 100644 --- a/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/scalr-cli/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { doCheck = false; # Skip tests as they require creating actual Scalr resources. meta = with lib; { - description = "A command-line tool that communicates directly with the Scalr API."; + description = "A command-line tool that communicates directly with the Scalr API"; homepage = "https://github.com/Scalr/scalr-cli"; changelog = "https://github.com/Scalr/scalr-cli/releases/tag/v${version}"; license = licenses.asl20; diff --git a/nixpkgs/pkgs/tools/admin/triton/default.nix b/nixpkgs/pkgs/tools/admin/triton/default.nix index fa08d4e4bfd6..3605bd9089f5 100644 --- a/nixpkgs/pkgs/tools/admin/triton/default.nix +++ b/nixpkgs/pkgs/tools/admin/triton/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "triton"; - version = "7.16.0"; + version = "7.17.0"; src = fetchFromGitHub { owner = "TritonDataCenter"; repo = "node-triton"; rev = version; - hash = "sha256-JjQAf1pbNraatWvrfys3ydqk3FPOoJ5XWJH/4qgfINk="; + hash = "sha256-udS5CnaaeaY+owOrbC3R2jrNBpuTBKOkHrIS2AlHWAE="; }; - npmDepsHash = "sha256-E5yJwLSNLkK3OfwJrm59C4qfrd2y3nw/45B68MVBqV8="; + npmDepsHash = "sha256-w33awTkj+YxBoPlmP0JBlZlrMmaWhMC03/5a+LB0RZ8="; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/admin/trivy/default.nix b/nixpkgs/pkgs/tools/admin/trivy/default.nix index 8a9a521ca4b3..c3a8a71947af 100644 --- a/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -10,19 +10,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.48.2"; + version = "0.48.3"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-b7lwy1erESjSg+pPZelYNBfIcbdcfDdM3klefQ6+L00="; + hash = "sha256-zWv/4dDzWfR9qbbBaMaHFMId1OVhcOja7lTy3gcm77w="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-1jznsC6VFUph7AKk86iGAV7GKFoAcA87Ltt4n0EaX4c="; + vendorHash = "sha256-EOu4VHfrQbIP1vSWF3UkZDMyEIcbjQKjzdch9c6cVg4="; subPackages = [ "cmd/trivy" ]; diff --git a/nixpkgs/pkgs/tools/archivers/cpio/default.nix b/nixpkgs/pkgs/tools/archivers/cpio/default.nix index 1b766fed1492..4116a0b3e4ca 100644 --- a/nixpkgs/pkgs/tools/archivers/cpio/default.nix +++ b/nixpkgs/pkgs/tools/archivers/cpio/default.nix @@ -1,6 +1,8 @@ { lib , stdenv , fetchurl +, fetchpatch +, autoreconfHook # for passthru.tests , git @@ -18,6 +20,17 @@ stdenv.mkDerivation rec { sha256 = "/NwV1g9yZ6b8fvzWudt7bIlmxPL7u5ZMJNQTNv0/LBI="; }; + patches = [ + # Pull upstream fix for clang-16 and gcc-14. + (fetchpatch { + name = "major-decl.patch"; + url = "https://git.savannah.gnu.org/cgit/cpio.git/patch/?id=8179be21e664cedb2e9d238cc2f6d04965e97275"; + hash = "sha256-k5Xiv3xuPU8kPT6D9B6p+V8SK55ybFgrIIPDgHuorpM="; + }) + ]; + + nativeBuildInputs = [ autoreconfHook ]; + separateDebugInfo = true; preConfigure = lib.optionalString stdenv.isCygwin '' diff --git a/nixpkgs/pkgs/tools/archivers/dumpnar/default.nix b/nixpkgs/pkgs/tools/archivers/dumpnar/default.nix index e63c79938864..77ce4649b399 100644 --- a/nixpkgs/pkgs/tools/archivers/dumpnar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/dumpnar/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/stephank/dumpnar"; - description = "Minimal tool to produce a Nix NAR archive."; + description = "Minimal tool to produce a Nix NAR archive"; license = licenses.lgpl2Plus; platforms = platforms.all; maintainers = [ maintainers.stephank ]; diff --git a/nixpkgs/pkgs/tools/archivers/rar/default.nix b/nixpkgs/pkgs/tools/archivers/rar/default.nix index a1c22835752b..168316813f76 100644 --- a/nixpkgs/pkgs/tools/archivers/rar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/rar/default.nix @@ -1,39 +1,43 @@ -{ lib, stdenv, fetchurl, autoPatchelfHook, installShellFiles }: +{ lib +, stdenv +, fetchurl +, autoPatchelfHook +, installShellFiles +}: let - version = "6.21"; + version = "6.24"; downloadVersion = lib.replaceStrings [ "." ] [ "" ] version; - # Use `nix store prefetch-file <url>` to generate the hashes for the other systems - # TODO: create update script - srcUrl = { + # Use `./update.sh` to generate the entries below + srcs = { i686-linux = { url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz"; - hash = "sha256-mDeRmLTjF0ZLv4JoLrgI8YBFFulBSKfOPb6hrxDZIkU="; + hash = "sha256-aacgJH0iJLRNEaZuVyzl/FxZgSnW3dIZFUfaqt0l88M="; }; x86_64-linux = { url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz"; - hash = "sha256-3fr5aVkh/r6OfBEcZULJSZp5ydakJOLRPlgzMdlwGTM="; + hash = "sha256-iOIqjoQSXJR2N7vyjHRuM4oKYyedgPn51zc2A4ddses="; }; aarch64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz"; - hash = "sha256-OR9HBlRteTzuyQ06tyXTSrFTBHFwmZ41kUfvgflogT4="; + hash = "sha256-2r4zWDT7Xw/CNvA7oNEsGfrXJDzFa5gNthIB/5TYR5U="; }; x86_64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz"; - hash = "sha256-UN3gmEuIpCXwmw3/l+KdarAYLy1DxGoPAOB2bfJTGbw="; + hash = "sha256-4vENPNfMpQstsm9+8+glHPK9fAlDmnHWbCHW+HUwSX4="; }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + }; manSrc = fetchurl { url = "https://aur.archlinux.org/cgit/aur.git/plain/rar.1?h=rar&id=8e39a12e88d8a3b168c496c44c18d443c876dd10"; name = "rar.1"; hash = "sha256-93cSr9oAsi+xHUtMsUvICyHJe66vAImS2tLie7nt8Uw="; }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "rar"; inherit version; - src = fetchurl srcUrl; + src = fetchurl (srcs.${stdenv.hostPlatform.system}); dontBuild = true; @@ -57,12 +61,15 @@ stdenv.mkDerivation rec { installManPage ${manSrc} ''; + passthru.updateScript = ./update.sh; + meta = with lib; { description = "Utility for RAR archives"; homepage = "https://www.rarlab.com/"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; + mainProgram = "rar"; maintainers = with maintainers; [ thiagokokada ]; - platforms = with platforms; linux ++ darwin; + platforms = lib.attrNames srcs; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/nixpkgs/pkgs/tools/archivers/rar/update.sh b/nixpkgs/pkgs/tools/archivers/rar/update.sh new file mode 100755 index 000000000000..f81562727f29 --- /dev/null +++ b/nixpkgs/pkgs/tools/archivers/rar/update.sh @@ -0,0 +1,78 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gawk gnused pup jq + +set -euo pipefail + +DIRNAME=$(dirname "$0") +readonly DIRNAME +readonly NIXPKGS_ROOT="../../../.." +readonly NIX_FLAGS=(--extra-experimental-features 'nix-command flakes') + +# awk is used for parsing the RARLAB website to get the newest version +readonly AWK_FIELD_SEPARATOR='[-.]' +# shellcheck disable=SC2016 +readonly AWK_COMMAND=' +# We will get the following output from pup: +# /rar/rarlinux-x64-700b3.tar.gz +# /rar/rarmacos-x64-700b3.tar.gz +# /rar/rarlinux-x64-624.tar.gz +# /rar/rarbsd-x64-624.tar.gz +# /rar/rarmacos-x64-624.tar.gz + +# Ignore anything that is flagged as beta (e.g.: `/rar/rarlinux-x64-700b3.tar.gz`) +!/[0-9]+b[0-9]*.tar.gz$/ { + # /rar/rarlinux-x64-624.tar.gz -> 624 + val = $3 + # Only get the value if it is bigger than the current one + if (val > max) max = val +} +END { + # 624 -> 6.24 + printf "%.2f\n", max/100 +} +' + +updateHash() { + local -r version="${1//./}" + local -r arch="$2" + local -r os="$3" + local -r nix_arch="$4" + + url="https://www.rarlab.com/rar/rar$os-$arch-$version.tar.gz" + hash=$(nix store prefetch-file --json "$url" | jq -r .hash) + currentHash=$(cd "$DIRNAME" && nix "${NIX_FLAGS[@]}" eval --raw "$NIXPKGS_ROOT#legacyPackages.$nix_arch.rar.src.outputHash") + + sed -i "s|$currentHash|$hash|g" "$DIRNAME/default.nix" +} + +updateVersion() { + local -r version="$1" + sed -i "s|version = \"[0-9.]*\";|version = \"$version\";|g" "$DIRNAME/default.nix" +} + +latestVersion="${1:-}" +if [[ -z "$latestVersion" ]]; then + latestVersion=$( + curl --silent --location --fail https://www.rarlab.com/download.htm | \ + pup 'a[href*=".tar.gz"] attr{href}' | \ + awk -F"$AWK_FIELD_SEPARATOR" "$AWK_COMMAND" + ) +fi +readonly latestVersion +echo "Latest version: $latestVersion" + +currentVersion=$(cd "$DIRNAME" && nix "${NIX_FLAGS[@]}" eval --raw "$NIXPKGS_ROOT#legacyPackages.x86_64-linux.rar.version") +readonly currentVersion +echo "Current version: $currentVersion" + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "rar is up-to-date" + exit 0 +fi + +updateHash "$latestVersion" x32 linux i686-linux +updateHash "$latestVersion" x64 linux x86_64-linux +updateHash "$latestVersion" arm macos aarch64-darwin +updateHash "$latestVersion" x64 macos x86_64-darwin + +updateVersion "$latestVersion" diff --git a/nixpkgs/pkgs/tools/archivers/sharutils/default.nix b/nixpkgs/pkgs/tools/archivers/sharutils/default.nix index c504ed8f16e1..5c84e596531c 100644 --- a/nixpkgs/pkgs/tools/archivers/sharutils/default.nix +++ b/nixpkgs/pkgs/tools/archivers/sharutils/default.nix @@ -58,6 +58,9 @@ stdenv.mkDerivation rec { substituteInPlace intl/Makefile.in --replace "AR = ar" "" ''; + # Workaround to fix the static build on macOS. + env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration"; + doCheck = true; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/archivers/tarlz/default.nix b/nixpkgs/pkgs/tools/archivers/tarlz/default.nix deleted file mode 100644 index 0f031338cf6c..000000000000 --- a/nixpkgs/pkgs/tools/archivers/tarlz/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ lib, stdenv, fetchurl, lzip, lzlib, texinfo }: - -stdenv.mkDerivation rec { - pname = "tarlz"; - version = "0.24"; - outputs = [ "out" "man" "info" ]; - - nativeBuildInputs = [ lzip texinfo ]; - buildInputs = [ lzlib ]; - - src = fetchurl { - url = "mirror://savannah/lzip/${pname}/${pname}-${version}.tar.lz"; - sha256 = "49838effe95acb29d548b7ef2ddbb4b63face40536df0d9a80a62900c7170576"; - }; - - enableParallelBuilding = true; - makeFlags = [ "CXX:=$(CXX)" ]; - - doCheck = false; # system clock issues - - meta = with lib; { - homepage = "https://www.nongnu.org/lzip/${pname}.html"; - description = - "Massively parallel combined implementation of the tar archiver and the lzip compressor"; - license = licenses.gpl2Plus; - platforms = platforms.all; - maintainers = with maintainers; [ ehmry ]; - mainProgram = "tarlz"; - }; -} diff --git a/nixpkgs/pkgs/tools/archivers/unar/default.nix b/nixpkgs/pkgs/tools/archivers/unar/default.nix index 07aa89fa5caf..4b2c66c0fc40 100644 --- a/nixpkgs/pkgs/tools/archivers/unar/default.nix +++ b/nixpkgs/pkgs/tools/archivers/unar/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. ''; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ peterhoeg thiagokokada ]; + maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix b/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix index c91457231716..96893b8fe072 100644 --- a/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix +++ b/nixpkgs/pkgs/tools/audio/abcm2ps/default.nix @@ -5,17 +5,18 @@ , pkg-config , freetype , pango +, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "abcm2ps"; - version = "8.14.14"; + version = "8.14.15"; src = fetchFromGitHub { owner = "leesavide"; repo = "abcm2ps"; - rev = "v${version}"; - hash = "sha256-2BSbnziwlilYio9CF4MTlj0GVlkSpL8jeaqvLIBCeLQ="; + rev = "v${finalAttrs.version}"; + hash = "sha256-0ZSMKARX16/33sIWR8LOVOFblI/Q+iZgnfVq/xqRMnI="; }; configureFlags = [ @@ -26,6 +27,13 @@ stdenv.mkDerivation rec { buildInputs = [ freetype pango ]; + passthru.tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "abcm2ps -V"; + }; + }; + meta = with lib; { homepage = "http://moinejf.free.fr/"; license = licenses.lgpl3Plus; @@ -34,4 +42,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.dotlambda ]; mainProgram = "abcm2ps"; }; -} +}) diff --git a/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix b/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix index eac34e30b08c..e2fd352422a8 100644 --- a/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix +++ b/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/default.nix @@ -8,17 +8,28 @@ , CoreGraphics , CoreML , CoreVideo +, MetalKit + +, config +, cudaSupport ? config.cudaSupport +, cudaPackages ? {} }: -stdenv.mkDerivation rec { +let + # It's necessary to consistently use backendStdenv when building with CUDA support, + # otherwise we get libstdc++ errors downstream. + # cuda imposes an upper bound on the gcc version, e.g. the latest gcc compatible with cudaPackages_11 is gcc11 + effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else stdenv; +in +effectiveStdenv.mkDerivation (finalAttrs: { pname = "whisper-cpp"; - version = "1.5.2"; + version = "1.5.4"; src = fetchFromGitHub { owner = "ggerganov"; repo = "whisper.cpp"; - rev = "refs/tags/v${version}" ; - hash = "sha256-7pJbROifDajBJUE07Nz8tARB901fWCB+TS4okcnEsvc="; + rev = "refs/tags/v${finalAttrs.version}" ; + hash = "sha256-9H2Mlua5zx2WNXbz2C5foxIteuBgeCNALdq5bWyhQCk="; }; # The upstream download script tries to download the models to the @@ -27,13 +38,49 @@ stdenv.mkDerivation rec { # the models to the current directory of where it is being run from. patches = [ ./download-models.patch ]; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optionals cudaSupport ( with cudaPackages ;[ + cuda_nvcc + + # TODO: Replace with autoAddDriverRunpath + # once https://github.com/NixOS/nixpkgs/pull/275241 has been merged + autoAddOpenGLRunpathHook + ]); - buildInputs = [ SDL2 ] ++ lib.optionals stdenv.isDarwin [ Accelerate CoreGraphics CoreML CoreVideo ]; + buildInputs = [ + SDL2 + ] ++ lib.optionals stdenv.isDarwin [ + Accelerate + CoreGraphics + CoreML + CoreVideo + MetalKit + ] ++ lib.optionals cudaSupport ( with cudaPackages; [ + + # A temporary hack for reducing the closure size, remove once cudaPackages + # have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792 + cuda_cudart.dev + cuda_cudart.lib + cuda_cudart.static + libcublas.dev + libcublas.lib + libcublas.static + ]); + + postPatch = let + cudaOldStr = "-lcuda "; + cudaNewStr = "-lcuda -L${cudaPackages.cuda_cudart.lib}/lib/stubs "; + in lib.optionalString cudaSupport '' + substituteInPlace Makefile \ + --replace '${cudaOldStr}' '${cudaNewStr}' + ''; env = lib.optionalAttrs stdenv.isDarwin { WHISPER_COREML = "1"; WHISPER_COREML_ALLOW_FALLBACK = "1"; + } // lib.optionalAttrs cudaSupport { + WHISPER_CUBLAS = "1"; }; makeFlags = [ "main" "stream" "command" ]; @@ -51,6 +98,15 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/whisper-cpp-download-ggml-model \ --prefix PATH : ${lib.makeBinPath [wget]} + ${lib.optionalString stdenv.isDarwin '' + install -Dt $out/share/whisper-cpp ggml-metal.metal + + for bin in whisper-cpp whisper-cpp-stream whisper-cpp-command; do + wrapProgram $out/bin/$bin \ + --set-default GGML_METAL_PATH_RESOURCES $out/share/whisper-cpp + done + ''} + runHook postInstall ''; @@ -65,4 +121,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ dit7ya hughobrien ]; }; -} +}) diff --git a/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/download-models.patch b/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/download-models.patch index c470231b59e8..7183c38b5166 100644 --- a/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/download-models.patch +++ b/nixpkgs/pkgs/tools/audio/openai-whisper-cpp/download-models.patch @@ -1,5 +1,3 @@ -diff --git a/models/download-ggml-model.sh b/models/download-ggml-model.sh -index 749b409..831f4c0 100755 --- a/models/download-ggml-model.sh +++ b/models/download-ggml-model.sh @@ -9,18 +9,6 @@ @@ -16,11 +14,22 @@ index 749b409..831f4c0 100755 - fi -} - --models_path="$(get_script_path)" +-models_path="${2:-$(get_script_path)}" - # Whisper models models=( "tiny.en" +@@ -56,8 +44,8 @@ function list_models { + printf "\n\n" + } + +-if [ "$#" -lt 1 ] || [ "$#" -gt 2 ]; then +- printf "Usage: $0 <model> [models_path]\n" ++if [ "$#" -ne 1 ]; then ++ printf "Usage: $0 <model>\n" + list_models + + exit 1 @@ -82,8 +70,6 @@ fi printf "Downloading ggml model $model from '$src' ...\n" @@ -34,9 +43,9 @@ index 749b409..831f4c0 100755 exit 1 fi --printf "Done! Model '$model' saved in 'models/ggml-$model.bin'\n" +-printf "Done! Model '$model' saved in '$models_path/ggml-$model.bin'\n" +printf "Done! Model '$model' saved in 'ggml-$model.bin'\n" printf "You can now use it like this:\n\n" --printf " $ ./main -m models/ggml-$model.bin -f samples/jfk.wav\n" +-printf " $ ./main -m $models_path/ggml-$model.bin -f samples/jfk.wav\n" +printf " $ whisper-cpp -m ggml-$model.bin -f samples/jfk.wav\n" printf "\n" diff --git a/nixpkgs/pkgs/tools/audio/wyoming/piper.nix b/nixpkgs/pkgs/tools/audio/wyoming/piper.nix index f53f684f6fac..32d21bfa4eaf 100644 --- a/nixpkgs/pkgs/tools/audio/wyoming/piper.nix +++ b/nixpkgs/pkgs/tools/audio/wyoming/piper.nix @@ -27,6 +27,11 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ setuptools + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "wyoming" ]; propagatedBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/tools/audio/yabridge/default.nix b/nixpkgs/pkgs/tools/audio/yabridge/default.nix index 5c4762183970..57534b93a6ff 100644 --- a/nixpkgs/pkgs/tools/audio/yabridge/default.nix +++ b/nixpkgs/pkgs/tools/audio/yabridge/default.nix @@ -17,48 +17,48 @@ let asio = fetchFromGitHub { owner = "chriskohlhoff"; repo = "asio"; - rev = "refs/tags/asio-1-22-1"; - hash = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg="; + rev = "refs/tags/asio-1-28-2"; + hash = "sha256-8Sw0LuAqZFw+dxlsTstlwz5oaz3+ZnKBuvSdLW6/DKQ="; }; # Derived from subprojects/bitsery.wrap bitsery = fetchFromGitHub { owner = "fraillt"; repo = "bitsery"; - rev = "refs/tags/v5.2.2"; - hash = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY="; + rev = "refs/tags/v5.2.3"; + hash = "sha256-rmfcIYCrANycFuLtibQ5wOPwpMVhpTMpdGsUfpR3YsM="; }; # Derived from subprojects/clap.wrap clap = fetchFromGitHub { owner = "free-audio"; repo = "clap"; - rev = "refs/tags/1.1.7"; - hash = "sha256-WcMTxE+QCzlp4lhFdghZI8UI/5mdVeRvrl24Xynd0qk="; + rev = "refs/tags/1.1.9"; + hash = "sha256-z2P0U2NkDK1/5oDV35jn/pTXCcspuM1y2RgZyYVVO3w="; }; # Derived from subprojects/function2.wrap function2 = fetchFromGitHub { owner = "Naios"; repo = "function2"; - rev = "refs/tags/4.2.0"; - hash = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs="; + rev = "refs/tags/4.2.3"; + hash = "sha256-+fzntJn1fRifOgJhh5yiv+sWR9pyaeeEi2c1+lqX3X8="; }; # Derived from subprojects/ghc_filesystem.wrap ghc_filesystem = fetchFromGitHub { owner = "gulrak"; repo = "filesystem"; - rev = "refs/tags/v1.5.12"; - hash = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE="; + rev = "refs/tags/v1.5.14"; + hash = "sha256-XZ0IxyNIAs2tegktOGQevkLPbWHam/AOFT+M6wAWPFg="; }; # Derived from subprojects/tomlplusplus.wrap tomlplusplus = fetchFromGitHub { owner = "marzer"; repo = "tomlplusplus"; - rev = "refs/tags/v3.3.0"; - hash = "sha256-INX8TOEumz4B5coSxhiV7opc3rYJuQXT2k1BJ3Aje1M="; + rev = "refs/tags/v3.4.0"; + hash = "sha256-h5tbO0Rv2tZezY58yUbyRVpsfRjY3i+5TPkkxr6La8M="; }; # Derived from vst3.wrap @@ -72,14 +72,14 @@ let in multiStdenv.mkDerivation (finalAttrs: { pname = "yabridge"; - version = "5.0.5"; + version = "5.1.0"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = "yabridge"; rev = "refs/tags/${finalAttrs.version}"; - hash = "sha256-SB2/zKxj9GDOOb3Zn4kWj7dXhDg/wbx6nPKYbQ041Cs="; + hash = "sha256-vnSdGedpiit8nym26i1QFiNnATk0Bymm7e5Ha2H41/M="; }; # Unpack subproject sources @@ -159,6 +159,7 @@ multiStdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A modern and transparent way to use Windows VST2 and VST3 plugins on Linux"; homepage = "https://github.com/robbert-vdh/yabridge"; + changelog = "https://github.com/robbert-vdh/yabridge/blob/${finalAttrs.version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch b/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch index c657cd7d56b2..bd9e08bc6cf3 100644 --- a/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch +++ b/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch @@ -1,8 +1,8 @@ diff --git a/meson.build b/meson.build -index d8d9135b..717280d9 100644 +index c602c5ad..a52e20a1 100644 --- a/meson.build +++ b/meson.build -@@ -221,7 +221,7 @@ if is_64bit_system +@@ -226,7 +226,7 @@ if is_64bit_system xcb_64bit_dep = dependency('xcb') endif if with_32bit_libraries or with_bitbridge @@ -12,10 +12,10 @@ index d8d9135b..717280d9 100644 # These are all headers-only libraries, and thus won't require separate 32-bit diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp -index 4a52b6c1..abbb1ec8 100644 +index 82db99a5..491f005d 100644 --- a/src/plugin/utils.cpp +++ b/src/plugin/utils.cpp -@@ -101,7 +101,7 @@ std::string PluginInfo::wine_version() const { +@@ -103,7 +103,7 @@ std::string PluginInfo::wine_version() const { // The '*.exe' scripts generated by winegcc allow you to override the binary // used to run Wine, so will will handle this in the same way for our Wine // version detection. We'll be using `execvpe` diff --git a/nixpkgs/pkgs/tools/audio/yabridgectl/Cargo.lock b/nixpkgs/pkgs/tools/audio/yabridgectl/Cargo.lock index e5eeca5a3db0..451b0ae0141c 100644 --- a/nixpkgs/pkgs/tools/audio/yabridgectl/Cargo.lock +++ b/nixpkgs/pkgs/tools/audio/yabridgectl/Cargo.lock @@ -3,23 +3,61 @@ version = 3 [[package]] -name = "anyhow" -version = "1.0.57" +name = "anstream" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" +checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" [[package]] -name = "atty" -version = "0.2.14" +name = "anstyle-parse" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" dependencies = [ - "hermit-abi", - "libc", - "winapi", + "utf8parse", ] [[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c" +dependencies = [ + "anstyle", + "windows-sys", +] + +[[package]] +name = "anyhow" +version = "1.0.72" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" + +[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -32,10 +70,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "cc" -version = "1.0.73" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" +dependencies = [ + "libc", +] [[package]] name = "cfg-if" @@ -45,35 +92,52 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.1.18" +version = "4.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" +checksum = "c27cdf28c0f604ba3f512b0c9a409f8de8513e4816705deb0498b627e7c3a3fd" dependencies = [ - "atty", - "bitflags", + "clap_builder", + "clap_derive", + "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.3.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08a9f1ab5e9f01a9b81f202e8562eb9a10de70abf9eaeac1be465c28b75aa4aa" +dependencies = [ + "anstream", + "anstyle", "clap_lex", - "indexmap", - "lazy_static", + "once_cell", "strsim", - "termcolor", "terminal_size", - "textwrap 0.15.0", ] [[package]] -name = "clap_lex" -version = "0.2.0" +name = "clap_derive" +version = "4.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" dependencies = [ - "os_str_bytes", + "heck", + "proc-macro2", + "quote", + "syn", ] [[package]] +name = "clap_lex" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" + +[[package]] name = "clipboard-win" -version = "4.4.1" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3e1238132dc01f081e1cbb9dace14e5ef4c3a51ee244bd982275fb514605db" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" dependencies = [ "error-code", "str-buf", @@ -81,21 +145,27 @@ dependencies = [ ] [[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] name = "colored" -version = "2.0.0" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" +checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" dependencies = [ - "atty", + "is-terminal", "lazy_static", - "winapi", + "windows-sys", ] [[package]] name = "crossbeam-channel" -version = "0.5.4" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -103,9 +173,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -114,35 +184,24 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.8" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if", "crossbeam-utils", - "lazy_static", - "memoffset", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if", - "lazy_static", -] - -[[package]] -name = "dirs" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" -dependencies = [ - "dirs-sys", ] [[package]] @@ -156,17 +215,6 @@ dependencies = [ ] [[package]] -name = "dirs-sys" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] name = "dirs-sys-next" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -179,9 +227,9 @@ dependencies = [ [[package]] name = "either" -version = "1.6.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "endian-type" @@ -191,13 +239,13 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d" [[package]] name = "errno" -version = "0.2.8" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys", ] [[package]] @@ -222,20 +270,20 @@ dependencies = [ [[package]] name = "fd-lock" -version = "3.0.5" +version = "3.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46e245f4c8ec30c6415c56cb132c07e69e74f1942f6b4a4061da748b49f486ca" +checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" dependencies = [ "cfg-if", - "rustix", + "rustix 0.38.8", "windows-sys", ] [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if", "libc", @@ -244,9 +292,9 @@ dependencies = [ [[package]] name = "goblin" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572564d6cba7d09775202c8e7eebc4d534d5ae36578ab402fb21e182a0ac9505" +checksum = "0d6b4de4a8eb6c46a8c77e1d3be942cb9a8bf073c22374578e5ba4b08ed0ff68" dependencies = [ "log", "plain", @@ -254,35 +302,38 @@ dependencies = [ ] [[package]] -name = "hashbrown" -version = "0.11.2" +name = "heck" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" [[package]] -name = "indexmap" -version = "1.8.2" +name = "io-lifetimes" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "autocfg", - "hashbrown", + "hermit-abi", + "libc", + "windows-sys", ] [[package]] -name = "io-lifetimes" -version = "0.6.1" +name = "is-terminal" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9448015e586b611e5d322f6703812bbca2f1e709d5773ecd38ddb4e3bb649504" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.8", + "windows-sys", +] [[package]] name = "is_executable" @@ -307,15 +358,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.126" +version = "0.2.147" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" +checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if", "winapi", @@ -323,18 +374,21 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.0.46" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d" +checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "memchr" @@ -352,6 +406,15 @@ dependencies = [ ] [[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] name = "nibble_vec" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -362,32 +425,32 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if", "libc", - "memoffset", + "memoffset 0.6.5", ] [[package]] name = "num_cpus" -version = "1.13.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ "hermit-abi", "libc", ] [[package]] -name = "os_str_bytes" -version = "6.1.0" +name = "once_cell" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "plain" @@ -397,9 +460,9 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" dependencies = [ "unicode-ident", ] @@ -415,9 +478,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.18" +version = "1.0.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" dependencies = [ "proc-macro2", ] @@ -434,21 +497,19 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.3" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -458,11 +519,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.13" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -487,16 +548,29 @@ dependencies = [ [[package]] name = "rustix" -version = "0.34.8" +version = "0.37.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2079c267b8394eb529872c3cf92e181c378b41fea36e68130357b52493701d2e" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", - "linux-raw-sys", - "winapi", + "linux-raw-sys 0.3.8", + "windows-sys", +] + +[[package]] +name = "rustix" +version = "0.38.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.5", + "windows-sys", ] [[package]] @@ -505,7 +579,7 @@ version = "9.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db7826789c0e25614b03e5a54a0717a86f9ff6e6e5247f92b369472869320039" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if", "clipboard-win", "dirs-next", @@ -540,9 +614,9 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scroll" @@ -555,9 +629,9 @@ dependencies = [ [[package]] name = "scroll_derive" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdbda6ac5cd1321e724fa9cee216f3a61885889b896f073b8f82322789c5250e" +checksum = "1db149f81d46d2deba7cd3c50772474707729550221e69588478ebf9ada425ae" dependencies = [ "proc-macro2", "quote", @@ -566,15 +640,15 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.137" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ea8d54c77f8315140a05f4c7237403bf38b72704d031543aa1d16abbf517d1" +checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c" [[package]] name = "serde_derive" -version = "1.0.137" +version = "1.0.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f26faba0c3959972377d3b2d306ee9f71faee9714294e41bb777f83f88578be" +checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816" dependencies = [ "proc-macro2", "quote", @@ -594,9 +668,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.8.0" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" + +[[package]] +name = "smawk" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" [[package]] name = "str-buf" @@ -612,9 +692,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.96" +version = "2.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf" +checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567" dependencies = [ "proc-macro2", "quote", @@ -622,67 +702,41 @@ dependencies = [ ] [[package]] -name = "term_size" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "textwrap" -version = "0.11.0" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "term_size", - "unicode-width", + "rustix 0.37.23", + "windows-sys", ] [[package]] name = "textwrap" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ + "smawk", "terminal_size", + "unicode-linebreak", + "unicode-width", ] [[package]] name = "thiserror" -version = "1.0.31" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd829fe32373d27f76265620b5309d0340cb8550f523c1dda251d6298069069a" +checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.31" +version = "1.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0396bc89e626244658bef819e22d0cc459e795a5ebe878e6ec336d1674a8d79a" +checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" dependencies = [ "proc-macro2", "quote", @@ -691,63 +745,68 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.9" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" + +[[package]] +name = "unicode-linebreak" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" [[package]] name = "unicode-segmentation" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" [[package]] name = "utf8parse" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "which" -version = "4.2.5" +version = "4.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fb54e6113b6a8772ee41c3404fb0301ac79604489467e0a9ce1f3e97c24ae" +checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" dependencies = [ "either", - "lazy_static", "libc", + "once_cell", ] [[package]] @@ -783,59 +842,79 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.30.0" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030b7ff91626e57a05ca64a07c481973cbb2db774e4852c9c7ca342408c6a99a" +checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" dependencies = [ + "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", "windows_i686_msvc", "windows_x86_64_gnu", + "windows_x86_64_gnullvm", "windows_x86_64_msvc", ] [[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" + +[[package]] name = "windows_aarch64_msvc" -version = "0.30.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.30.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.30.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.30.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.30.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "xdg" -version = "2.4.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4583db5cbd4c4c0303df2d15af80f0539db703fa1c68802d4cbbd2dd0f88f6" -dependencies = [ - "dirs", -] +checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "yabridgectl" -version = "5.0.5" +version = "5.1.0" dependencies = [ "anyhow", "clap", @@ -849,7 +928,7 @@ dependencies = [ "serde", "serde_derive", "serde_jsonrc", - "textwrap 0.11.0", + "textwrap", "toml", "walkdir", "which", diff --git a/nixpkgs/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch b/nixpkgs/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch index 066b854cac9e..35193c919f63 100644 --- a/nixpkgs/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch +++ b/nixpkgs/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch @@ -1,5 +1,5 @@ diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs -index 53200bd5..ef8a781d 100644 +index da5f4ff5..c220d62d 100644 --- a/tools/yabridgectl/src/config.rs +++ b/tools/yabridgectl/src/config.rs @@ -22,6 +22,7 @@ use serde_derive::{Deserialize, Serialize}; @@ -58,10 +58,10 @@ index 53200bd5..ef8a781d 100644 )); } diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs -index 8dcd7dc8..bddca534 100644 +index 0a29d431..479eaef0 100644 --- a/tools/yabridgectl/src/main.rs +++ b/tools/yabridgectl/src/main.rs -@@ -135,7 +135,7 @@ fn main() -> Result<()> { +@@ -134,7 +134,7 @@ fn main() -> Result<()> { .long_help( "Path to the directory containing \ 'libyabridge-chainloader-{clap,vst2,vst3}.so'. If this is not set, \ @@ -69,4 +69,4 @@ index 8dcd7dc8..bddca534 100644 + then yabridgectl will look through 'NIX_PROFILES' and \ '~/.local/share/yabridge' by default.", ) - .validator(validate_path) + .value_parser(parse_directory_path) diff --git a/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix b/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix index 41d32cd282a5..bc52e3d6c72f 100644 --- a/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix +++ b/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix @@ -40,6 +40,7 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "A small, optional utility to help set up and update yabridge for several directories at once"; homepage = "${yabridge.src.meta.homepage}/tree/${yabridge.version}/tools/yabridgectl"; + changelog = yabridge.meta.changelog; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = yabridge.meta.platforms; diff --git a/nixpkgs/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch b/nixpkgs/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch index b39aaeaa8117..a1494a490384 100644 --- a/nixpkgs/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch +++ b/nixpkgs/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch @@ -1,10 +1,10 @@ diff --git a/tools/yabridgectl/src/actions.rs b/tools/yabridgectl/src/actions.rs -index 25857753..59590e38 100644 +index a0d9b98e..2819f017 100644 --- a/tools/yabridgectl/src/actions.rs +++ b/tools/yabridgectl/src/actions.rs -@@ -835,14 +835,6 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> { +@@ -847,14 +847,6 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> { // be the case if we get to this point though. - verify_path_setup(config)?; + verify_path_setup()?; - // This check is only performed once per combination of Wine and yabridge versions - verify_wine_setup(config)?; diff --git a/nixpkgs/pkgs/tools/backup/autorestic/default.nix b/nixpkgs/pkgs/tools/backup/autorestic/default.nix index 114789505271..7cd8338a3d42 100644 --- a/nixpkgs/pkgs/tools/backup/autorestic/default.nix +++ b/nixpkgs/pkgs/tools/backup/autorestic/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "autorestic"; - version = "1.7.9"; + version = "1.7.10"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-7KYbA9qKa1o0ZLb+6S/UgAPT7wpsIugEFzWYB3voqBU="; + sha256 = "sha256-LhcHTXzTd2C9Nb60pZGc3Z1wlbs9RNUj8uW4r7vzIX0="; }; vendorHash = "sha256-K3+5DRXcx56sJ4XHikVtmoxmpJbBeAgPkN9KtHVgvYA="; diff --git a/nixpkgs/pkgs/tools/backup/borgbackup/default.nix b/nixpkgs/pkgs/tools/backup/borgbackup/default.nix index 33c5aa527218..d7853d0506f6 100644 --- a/nixpkgs/pkgs/tools/backup/borgbackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/borgbackup/default.nix @@ -14,7 +14,22 @@ , fetchPypi }: -python3Packages.buildPythonApplication rec { +let + python = python3Packages.python.override { + packageOverrides = self: super: { + msgpack = super.msgpack.overrideAttrs (oldAttrs: rec { + version ="1.0.4"; + + src = fetchPypi { + pname = "msgpack"; + inherit version; + hash = "sha256-9dhpwY8DAgLrQS8Iso0q/upVPWYTruieIA16yn7wH18="; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "borgbackup"; version = "1.2.7"; format = "pyproject"; @@ -30,7 +45,7 @@ python3Packages.buildPythonApplication rec { --replace "0o4755" "0o0755" ''; - nativeBuildInputs = with python3Packages; [ + nativeBuildInputs = with python.pkgs; [ cython setuptools-scm pkgconfig @@ -55,7 +70,7 @@ python3Packages.buildPythonApplication rec { acl ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ msgpack packaging (if stdenv.isLinux then pyfuse3 else llfuse) @@ -72,7 +87,7 @@ python3Packages.buildPythonApplication rec { --zsh scripts/shell_completions/zsh/_borg ''; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python.pkgs; [ e2fsprogs py python-dateutil diff --git a/nixpkgs/pkgs/tools/backup/duplicity/default.nix b/nixpkgs/pkgs/tools/backup/duplicity/default.nix index 15b8a33de675..452fab128e14 100644 --- a/nixpkgs/pkgs/tools/backup/duplicity/default.nix +++ b/nixpkgs/pkgs/tools/backup/duplicity/default.nix @@ -36,8 +36,6 @@ python3.pkgs.buildPythonApplication rec { ./linux-disable-timezone-test.patch ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - preConfigure = '' # fix version displayed by duplicity --version # see SourceCopy in setup.py diff --git a/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix b/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix index 53db44bb2e11..74c442c09583 100644 --- a/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix +++ b/nixpkgs/pkgs/tools/backup/gphotos-sync/default.nix @@ -8,8 +8,6 @@ python3.pkgs.buildPythonApplication rec { version = "3.1.2"; format = "pyproject"; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - src = fetchFromGitHub { owner = "gilesknap"; repo = "gphotos-sync"; diff --git a/nixpkgs/pkgs/tools/backup/restic/default.nix b/nixpkgs/pkgs/tools/backup/restic/default.nix index 72220f17d26e..0fbfaa693aac 100644 --- a/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.16.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-Qrbg8/f1ne+7c+mnUc/8CoZBjiGLohJXnu0cnc0pT4g="; + hash = "sha256-nPOCncqdnwhmWrT11evBD4r5hpRb3DTdRej4zh4Q8lg="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorHash = "sha256-Ctg6bln5kzGs7gDLo9zUpsbSybKOtHFuHvHG3cxCfac="; + vendorHash = "sha256-stz76S2dwVlBuGW9R7+Uqs51Xsq7L/4pgTqUZnu7YCQ="; subPackages = [ "cmd/restic" ]; diff --git a/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix b/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix deleted file mode 100644 index 30ef73228b31..000000000000 --- a/nixpkgs/pkgs/tools/bluetooth/bluez-alsa/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook -, alsa-lib, bluez, glib, sbc, dbus - -# optional, but useful utils -, readline, libbsd, ncurses - -# optional codecs -, aacSupport ? true, fdk_aac -# TODO: aptxSupport -}: - -stdenv.mkDerivation rec { - pname = "bluez-alsa"; - version = "4.1.1"; - - src = fetchFromGitHub { - owner = "Arkq"; - repo = "bluez-alsa"; - rev = "v${version}"; - sha256 = "sha256-oGaYiSkOhqfjUl+mHTs3gqFcxli3cgkRtT6tbjy3ht0="; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - - buildInputs = [ - alsa-lib bluez glib sbc dbus - readline libbsd ncurses - ] - ++ lib.optional aacSupport fdk_aac; - - configureFlags = [ - "--with-alsaplugindir=${placeholder "out"}/lib/alsa-lib" - "--with-dbusconfdir=${placeholder "out"}/share/dbus-1/system.d" - "--enable-rfcomm" - "--enable-hcitop" - ] - ++ lib.optional aacSupport "--enable-aac"; - - meta = with lib; { - description = "Bluez 5 Bluetooth Audio ALSA Backend"; - longDescription = '' - Bluez-ALSA (BlueALSA) is an ALSA backend for Bluez 5 audio interface. - Bluez-ALSA registers all Bluetooth devices with audio profiles in Bluez - under a virtual ALSA PCM device called `bluealsa` that supports both - playback and capture. - - Some backstory: Bluez 5 removed built-in support for ALSA in favor of a - generic interface for 3rd party appliations. Thereafter, PulseAudio - implemented a backend for that interface and became the only way to get - Bluetooth audio with Bluez 5. Users prefering ALSA stayed on Bluez 4. - However, Bluez 4 eventually became deprecated. - - This package is a rebirth of a direct interface between ALSA and Bluez 5, - that, unlike PulseAudio, provides KISS near-metal-like experience. It is - not possible to run BluezALSA and PulseAudio Bluetooth at the same time - due to limitations in Bluez, but it is possible to run PulseAudio over - BluezALSA if you disable `bluetooth-discover` and `bluez5-discover` - modules in PA and configure it to play/capture sound over `bluealsa` PCM. - ''; - homepage = src.meta.homepage; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.oxij ]; - }; - -} diff --git a/nixpkgs/pkgs/tools/bluetooth/bluez-tools/default.nix b/nixpkgs/pkgs/tools/bluetooth/bluez-tools/default.nix deleted file mode 100644 index 271daed01653..000000000000 --- a/nixpkgs/pkgs/tools/bluetooth/bluez-tools/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, stdenv, autoreconfHook, readline -, fetchFromGitHub, glib, pkg-config }: - -stdenv.mkDerivation rec { - version = "unstable-2020-10-24"; - pname = "bluez-tools"; - - src = fetchFromGitHub { - owner = "khvzak"; - repo = "bluez-tools"; - rev = "f65321736475429316f07ee94ec0deac8e46ec4a"; - sha256 = "0xk39lz3hm8lcnb5fdbfz4ldbbq8gswg95vilzdwxzrglcr6xnqq"; - }; - - nativeBuildInputs = [ pkg-config autoreconfHook ]; - - buildInputs = [ readline glib ]; - - meta = with lib; { - description = "Command line bluetooth manager for Bluez5"; - license = licenses.gpl2; - maintainers = [ ]; - platforms = platforms.unix; - }; - -} diff --git a/nixpkgs/pkgs/tools/cd-dvd/iat/default.nix b/nixpkgs/pkgs/tools/cd-dvd/iat/default.nix index 0f7a1ad442a7..3a727eaf74e8 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/iat/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/iat/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttr: { }; meta = with lib; { - description = "The Iso9660 Analyzer Tool is a tool for detecting the structure of many types of CD/DVD images. It can convert from IMG to ISO format."; + description = "A tool for detecting the structure of many types of CD/DVD images"; homepage = "https://www.berlios.de/software/iso9660-analyzer-tool/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ hughobrien ]; diff --git a/nixpkgs/pkgs/tools/compression/efficient-compression-tool/default.nix b/nixpkgs/pkgs/tools/compression/efficient-compression-tool/default.nix index 17c1bfcbcf2b..a4f4b9fd40da 100644 --- a/nixpkgs/pkgs/tools/compression/efficient-compression-tool/default.nix +++ b/nixpkgs/pkgs/tools/compression/efficient-compression-tool/default.nix @@ -29,6 +29,11 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DECT_FOLDER_SUPPORT=ON" ]; + CXXFLAGS = [ + # GCC 13: error: 'uint32_t' does not name a type + "-include cstdint" + ]; + meta = with lib; { description = "Fast and effective C++ file optimizer"; homepage = "https://github.com/fhanau/Efficient-Compression-Tool"; diff --git a/nixpkgs/pkgs/tools/compression/zstd/default.nix b/nixpkgs/pkgs/tools/compression/zstd/default.nix index 75b306b368aa..4ba37c1502f6 100644 --- a/nixpkgs/pkgs/tools/compression/zstd/default.nix +++ b/nixpkgs/pkgs/tools/compression/zstd/default.nix @@ -50,8 +50,6 @@ stdenv.mkDerivation rec { tests/playTests.sh ''; - LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; - cmakeFlags = lib.attrsets.mapAttrsToList (name: value: "-DZSTD_${name}:BOOL=${if value then "ON" else "OFF"}") { BUILD_SHARED = !static; diff --git a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock index a99cd4744392..091f76071a2b 100644 --- a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock +++ b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/Cargo.lock @@ -99,7 +99,6 @@ dependencies = [ "errno 0.2.8", "gag", "getset", - "itertools", "libc", "log", "parse-display", @@ -408,15 +407,6 @@ dependencies = [ ] [[package]] -name = "itertools" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" -dependencies = [ - "either", -] - -[[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix index 8eed999ccfe8..17b438ac46b8 100644 --- a/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -24,14 +24,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.3.5"; + version = "1.4.1"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-Yq631LPpWal0hsEJS0dOtiox1295tYgUWJVIw+bsbnw="; + hash = "sha256-+KqTiIp9dIJWG2KvgvPwXC7p754XfgvKHjvwjCdbvCs="; }; nativeBuildInputs = [ @@ -69,7 +69,8 @@ stdenv.mkDerivation (finalAttrs: { checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; makeFlags = [ - "PREFIX=${placeholder "out"}" + "DESTDIR=${placeholder "out"}" + "PREFIX=" "VERSION=${finalAttrs.version}" "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ]; diff --git a/nixpkgs/pkgs/tools/filesystems/bees/default.nix b/nixpkgs/pkgs/tools/filesystems/bees/default.nix index fd1166e1a301..1dbb62ccb1b2 100644 --- a/nixpkgs/pkgs/tools/filesystems/bees/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bees/default.nix @@ -14,13 +14,13 @@ let bees = stdenv.mkDerivation rec { pname = "bees"; - version = "0.9.3"; + version = "0.10"; src = fetchFromGitHub { owner = "Zygo"; repo = "bees"; rev = "v${version}"; - sha256 = "sha256-krG8TzfOz3m7h3GfkBU+NJz7EdlXiWOOXY8bQRq9z4Q="; + hash = "sha256-f3P3BEd8uO6QOZ1/2hBzdcuOSggYvHxW3g9pGftKO8g="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/filesystems/btrfs-snap/default.nix b/nixpkgs/pkgs/tools/filesystems/btrfs-snap/default.nix index e43380e6792e..efc2ddafa419 100644 --- a/nixpkgs/pkgs/tools/filesystems/btrfs-snap/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/btrfs-snap/default.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec { ]} ''; meta = with lib; { - description = "btrfs-snap creates and maintains the history of snapshots of btrfs filesystems."; + description = "Create and maintain the history of snapshots of btrfs filesystems"; homepage = "https://github.com/jf647/btrfs-snap"; license = licenses.gpl3Only; maintainers = with maintainers; [ lionello ]; diff --git a/nixpkgs/pkgs/tools/filesystems/dduper/default.nix b/nixpkgs/pkgs/tools/filesystems/dduper/default.nix index ba14fcad6c58..7f876df37ee1 100644 --- a/nixpkgs/pkgs/tools/filesystems/dduper/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/dduper/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Fast block-level out-of-band BTRFS deduplication tool."; + description = "Fast block-level out-of-band BTRFS deduplication tool"; homepage = "https://github.com/Lakshmipathi/dduper"; license = licenses.gpl2Plus; maintainers = with maintainers; [ thesola10 ]; diff --git a/nixpkgs/pkgs/tools/filesystems/dupe-krill/default.nix b/nixpkgs/pkgs/tools/filesystems/dupe-krill/default.nix index ee81db5c8707..8f962b65a329 100644 --- a/nixpkgs/pkgs/tools/filesystems/dupe-krill/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/dupe-krill/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-JUcIDUVzSLzblb2EbmSfuCAB+S0fyW6wpGF0b/xR+b0="; meta = with lib; { - description = " A fast file deduplicator."; + description = "A fast file deduplicator"; homepage = "https://github.com/kornelski/dupe-krill"; license = with licenses; [ mit ]; maintainers = with maintainers; [ urbas ]; diff --git a/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix b/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix index b57dcc4b3629..5346403fa0e0 100644 --- a/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/erofs-utils/default.nix @@ -1,6 +1,7 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, zlib, libselinux +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, fuse, util-linux, lz4, xz, zlib, libselinux , fuseSupport ? stdenv.isLinux , selinuxSupport ? false +, lzmaSupport ? false }: stdenv.mkDerivation rec { @@ -17,12 +18,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ util-linux lz4 zlib ] ++ lib.optionals fuseSupport [ fuse ] - ++ lib.optionals selinuxSupport [ libselinux ]; + ++ lib.optionals selinuxSupport [ libselinux ] + ++ lib.optionals lzmaSupport [ xz ]; configureFlags = [ "MAX_BLOCK_SIZE=4096" ] ++ lib.optional fuseSupport "--enable-fuse" - ++ lib.optional selinuxSupport "--with-selinux"; + ++ lib.optional selinuxSupport "--with-selinux" + ++ lib.optional lzmaSupport "--enable-lzma"; meta = with lib; { homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs-utils.git/about/"; diff --git a/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix index c2af09857728..811adfadb55b 100644 --- a/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -1,12 +1,11 @@ -{ lib, stdenv, fetchgit, autoreconfHook, libselinux, libuuid, pkg-config }: +{ lib, stdenv, fetchzip, autoreconfHook, libselinux, libuuid, pkg-config }: stdenv.mkDerivation rec { pname = "f2fs-tools"; version = "1.16.0"; - src = fetchgit { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git"; - rev = "refs/tags/v${version}"; + src = fetchzip { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v${version}.tar.gz"; sha256 = "sha256-zNG1F//+BTBzlEc6qNVixyuCB6PMZD5Kf8pVK0ePYiA="; }; diff --git a/nixpkgs/pkgs/tools/filesystems/goofys/default.nix b/nixpkgs/pkgs/tools/filesystems/goofys/default.nix index 30c78ad31993..1865b6f57644 100644 --- a/nixpkgs/pkgs/tools/filesystems/goofys/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/goofys/default.nix @@ -27,7 +27,7 @@ buildGoModule { meta = { homepage = "https://github.com/kahing/goofys"; - description = "A high-performance, POSIX-ish Amazon S3 file system written in Go."; + description = "A high-performance, POSIX-ish Amazon S3 file system written in Go"; license = [ lib.licenses.mit ]; maintainers = [ lib.maintainers.adisbladis ]; broken = stdenv.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 diff --git a/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix index 59724c0c7c52..0e7c8fd42d63 100644 --- a/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/rdfind/default.nix @@ -1,22 +1,14 @@ -{ lib, stdenv, fetchpatch, fetchurl, nettle }: +{ lib, stdenv, fetchurl, nettle }: stdenv.mkDerivation rec { pname = "rdfind"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://rdfind.pauldreik.se/${pname}-${version}.tar.gz"; - sha256 = "103hfqzgr6izmj57fcy4jsa2nmb1ax43q4b5ij92pcgpaq9fsl21"; + sha256 = "sha256-ekBujvGIalhpZVYEYY3Zj2cvEsamvkkm0FO+ZQcPMnk="; }; - patches = [ - (fetchpatch { - name = "include-limits.patch"; - url = "https://github.com/pauldreik/rdfind/commit/61877de88d782b63b17458a61fcc078391499b29.patch"; - sha256 = "0igzm4833cn905pj84lgr88nd5gx35dnjl8kl8vrwk7bpyii6a8l"; - }) - ]; - buildInputs = [ nettle ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix b/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix index b955aa870c0f..6249c7f5bbd5 100644 --- a/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "stuffbin"; - version = "1.2.0"; + version = "1.3.0"; vendorHash = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "knadh"; repo = "stuffbin"; rev = "v${version}"; - sha256 = "sha256-roXjE0t4iwrL2y/G2oePYL2AbTwd9uzQPtgdY14WeZk="; + sha256 = "sha256-dOlc/G2IiuMAN0LqiZtbpXLSYaOpe5cl1+cs3YhaAbg="; }; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/games/er-patcher/default.nix b/nixpkgs/pkgs/tools/games/er-patcher/default.nix index 4440277b664d..66c0b5a07845 100644 --- a/nixpkgs/pkgs/tools/games/er-patcher/default.nix +++ b/nixpkgs/pkgs/tools/games/er-patcher/default.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "er-patcher"; - version = "1.06-3"; + version = "1.10-1"; src = fetchFromGitHub { owner = "gurrgur"; repo = "er-patcher"; rev = "v${version}"; - sha256 = "sha256-w/5cXxY4ua5Xo1BSz3MYRV+SdvVGFAx53KMIORS1uWE="; + sha256 = "sha256-Hpe+z7xtiDN7u2qrLYib6pQfZIMvWkf/G7hdHy2htIE="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/games/jpsxdec/0001-jpsxdec-hackfix-build-with-newer-JDKs.patch b/nixpkgs/pkgs/tools/games/jpsxdec/0001-jpsxdec-hackfix-build-with-newer-JDKs.patch deleted file mode 100644 index 17899ef328f1..000000000000 --- a/nixpkgs/pkgs/tools/games/jpsxdec/0001-jpsxdec-hackfix-build-with-newer-JDKs.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 52662c71f7b043f374d4062d07a28b59ef010cbe Mon Sep 17 00:00:00 2001 -From: Zane van Iperen <zane@zanevaniperen.com> -Date: Wed, 22 Sep 2021 18:41:36 +1000 -Subject: [PATCH] jpsxdec: hackfix build with newer JDKs - ---- - jpsxdec/build.xml | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/jpsxdec/build.xml b/jpsxdec/build.xml -index 713941c..f5aa902 100644 ---- a/jpsxdec/build.xml -+++ b/jpsxdec/build.xml -@@ -43,8 +43,8 @@ - <property name="build-lgpl.dir" location="${working.dir}/build-lgpl"/> - <property name="testbuild.dir" location="${working.dir}/build-test"/> - -- <property name="javac.target.ver" value="1.6"/> -- <property name="javac.source.ver" value="1.6" /> -+ <property name="javac.target.ver" value="1.8"/> -+ <property name="javac.source.ver" value="1.8" /> - - <!-- output --> - <property name="release.dir" location="${working.dir}/release"/> -@@ -76,7 +76,6 @@ - <compilerarg value="-Xlint:static"/> - <compilerarg value="-Xlint:unchecked"/> - <compilerarg value="-Xlint:varargs"/> -- <compilerarg value="-Werror"/> - </javac> - - <!-- Copy over resources --> -@@ -109,7 +108,6 @@ - <compilerarg value="-Xlint:static"/> - <compilerarg value="-Xlint:unchecked"/> - <compilerarg value="-Xlint:varargs"/> -- <compilerarg value="-Werror"/> - </javac> - - <!-- Copy over resources --> --- -2.31.1 - diff --git a/nixpkgs/pkgs/tools/games/jpsxdec/default.nix b/nixpkgs/pkgs/tools/games/jpsxdec/default.nix index d749353abc51..85fd9d65ada1 100644 --- a/nixpkgs/pkgs/tools/games/jpsxdec/default.nix +++ b/nixpkgs/pkgs/tools/games/jpsxdec/default.nix @@ -1,84 +1,76 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub -, jdk -/* - * jPSXdec needs to be built with no later than JDK8, but - * should be run with the latest to get HiDPI fixes, etc. - */ -, jre ? jdk , ant -, unoconv +, jdk8 # the build script wants JAVA 8 for compilation +, jre # version can be >= 8 (latest version by default) , makeWrapper , makeDesktopItem +, copyDesktopItems +, canonicalize-jars-hook }: -let - pname = "jpsxdec"; - version = "1.06"; - - description = "Cross-platform PlayStation 1 audio and video converter"; - desktopItem = makeDesktopItem { - name = pname; - exec = pname; - icon = pname; - comment = description; - desktopName = "jPSXdec"; - categories = [ "AudioVideo" "Utility" ]; - }; -in -stdenv.mkDerivation rec { - inherit pname version; +stdenv.mkDerivation (finalAttrs: { + pname = "jpsxdec"; + version = "2.0"; src = fetchFromGitHub { owner = "m35"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-6PLEvK4NP0/ipdygyDFFcWTIfch5y0Hren40+8iqYJs="; + repo = "jpsxdec"; + rev = "v${finalAttrs.version}"; + hash = "sha256-PZOc5mpnUiUyydWyfZjWuPG4w+tRd6WLJ6YQMqu/95I="; }; - nativeBuildInputs = [ ant jdk unoconv makeWrapper ]; - buildInputs = [ jre ]; + sourceRoot = "${finalAttrs.src.name}/jpsxdec"; - patches = [ - ./0001-jpsxdec-hackfix-build-with-newer-JDKs.patch + nativeBuildInputs = [ + ant + jdk8 + makeWrapper + copyDesktopItems + canonicalize-jars-hook ]; buildPhase = '' runHook preBuild - - cd jpsxdec - mkdir -p _ant/release/doc/ - unoconv -d document -f pdf -o _ant/release/doc/jPSXdec-manual.pdf doc/jPSXdec-manual.odt - ant release - runHook postBuild ''; installPhase = '' runHook preInstall - mkdir -p $out/{bin,share/pixmaps} - mv _ant/release $out/jpsxdec + mkdir -p $out/share/jpsxdec + mv _ant/release/{doc,*.jar} $out/share/jpsxdec + install -Dm644 src/jpsxdec/gui/icon48.png $out/share/pixmaps/jpsxdec.png makeWrapper ${jre}/bin/java $out/bin/jpsxdec \ - --add-flags "-jar $out/jpsxdec/jpsxdec.jar" - - cp ${src}/jpsxdec/src/jpsxdec/gui/icon48.png $out/share/pixmaps/${pname}.png - ln -s ${desktopItem}/share/applications $out/share + --add-flags "-jar $out/share/jpsxdec/jpsxdec.jar" runHook postInstall ''; + desktopItems = [ + (makeDesktopItem { + name = "jpsxdec"; + exec = "jpsxdec"; + icon = "jpsxdec"; + desktopName = "jPSXdec"; + comment = finalAttrs.meta.description; + categories = [ "AudioVideo" "Utility" ]; + }) + ]; + meta = with lib; { - inherit description; + changelog = "https://github.com/m35/jpsxdec/blob/${finalAttrs.src.rev}/jpsxdec/doc/CHANGES.txt"; + description = "Cross-platform PlayStation 1 audio and video converter"; homepage = "https://jpsxdec.blogspot.com/"; - platforms = platforms.all; license = { - url = "https://raw.githubusercontent.com/m35/jpsxdec/readme/.github/LICENSE.md"; + url = "https://raw.githubusercontent.com/m35/jpsxdec/${finalAttrs.src.rev}/.github/LICENSE.md"; free = true; }; + mainProgram = "jpsxdec"; maintainers = with maintainers; [ zane ]; + platforms = platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/tools/games/pocket-updater-utility/default.nix b/nixpkgs/pkgs/tools/games/pocket-updater-utility/default.nix index bfb863b909b1..9777b433505a 100644 --- a/nixpkgs/pkgs/tools/games/pocket-updater-utility/default.nix +++ b/nixpkgs/pkgs/tools/games/pocket-updater-utility/default.nix @@ -12,13 +12,13 @@ buildDotnetModule rec { pname = "pocket-updater-utility"; - version = "2.42.0"; + version = "2.43.0"; src = fetchFromGitHub { owner = "mattpannella"; repo = "${pname}"; rev = "${version}"; - hash = "sha256-Xw85xQstGDCJJ0J/WWd36Z1cXUAoIsL8lGcu7vZEWCA="; + hash = "sha256-mizKR3hS8s1we+jJ1bQQpFzRMjHFv4UAiINUpfnWnwI="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix b/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix index eb0222ba8448..0a227a1781ae 100644 --- a/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix +++ b/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix @@ -29,13 +29,13 @@ with rec { stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "4.6.1"; + version = "4.7.0"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-7/GBzqgXh8sU3Pl30eH9Mi24PPIqayQqNuhkMnn5Lq0="; + sha256 = "sha256-UzMVJnXYLy7E9RuM4VPdqnIyfQjDOdAlKiqRkXuxnQ0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/graphics/cgif/default.nix b/nixpkgs/pkgs/tools/graphics/cgif/default.nix index 2fc3cc9f3489..f581a97759b8 100644 --- a/nixpkgs/pkgs/tools/graphics/cgif/default.nix +++ b/nixpkgs/pkgs/tools/graphics/cgif/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/dloebl/cgif"; - description = "CGIF, a GIF encoder written in C."; + description = "CGIF, a GIF encoder written in C"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix b/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix index 684d6abadfed..a67479e4ffd5 100644 --- a/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix +++ b/nixpkgs/pkgs/tools/graphics/gmic-qt/default.nix @@ -54,11 +54,11 @@ assert lib.assertMsg stdenv.mkDerivation (finalAttrs: { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.3.2"; + version = "3.3.3"; src = fetchzip { url = "https://gmic.eu/files/source/gmic_${finalAttrs.version}.tar.gz"; - hash = "sha256-VaGYjCp1KVRTxEKzUdMCavZBIGEnEvP5fdFqQeKGa44="; + hash = "sha256-LkWQ3fSHJSaXztX+soGZ+pl3MnXNgw6tV09356bAfYY="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/graphics/graph-cli/default.nix b/nixpkgs/pkgs/tools/graphics/graph-cli/default.nix index be6769d85e9a..ebddd548bed0 100644 --- a/nixpkgs/pkgs/tools/graphics/graph-cli/default.nix +++ b/nixpkgs/pkgs/tools/graphics/graph-cli/default.nix @@ -1,22 +1,31 @@ { lib , python3Packages , fetchPypi +, qt5 }: python3Packages.buildPythonApplication rec { pname = "graph-cli"; - version = "0.1.18"; + version = "0.1.19"; src = fetchPypi { inherit version; pname = "graph_cli"; - sha256 = "sha256-0mxOc8RJ3GNgSbppLylIViqfYf6zwJ49pltnsyQUpSA="; + hash = "sha256-AOfUgeVgcTtuf5IuLYy1zFTBCjWZxu0OiZzUVXDIaSc="; }; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + + dontWrapQtApps = true; + + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + propagatedBuildInputs = with python3Packages; [ numpy pandas - matplotlib + (matplotlib.override { enableQt = true; }) ]; # does not contain tests despite reference in Makefile diff --git a/nixpkgs/pkgs/tools/graphics/pngquant/add-Cargo.lock.patch b/nixpkgs/pkgs/tools/graphics/pngquant/add-Cargo.lock.patch new file mode 100644 index 000000000000..9098198724bb --- /dev/null +++ b/nixpkgs/pkgs/tools/graphics/pngquant/add-Cargo.lock.patch @@ -0,0 +1,428 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..319b40b +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,422 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++version = 3 ++ ++[[package]] ++name = "arrayvec" ++version = "0.7.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" ++ ++[[package]] ++name = "autocfg" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" ++ ++[[package]] ++name = "bitflags" ++version = "1.3.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" ++ ++[[package]] ++name = "bitflags" ++version = "2.4.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" ++ ++[[package]] ++name = "bytemuck" ++version = "1.14.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" ++ ++[[package]] ++name = "cc" ++version = "1.0.83" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" ++dependencies = [ ++ "jobserver", ++ "libc", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "cocoa_image" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ea3dcd9c6980e6b9152a61476163a7039bdd73b4508f699b4b3b102d53490839" ++dependencies = [ ++ "core-foundation", ++ "core-graphics", ++ "imgref", ++ "objc", ++ "rgb", ++] ++ ++[[package]] ++name = "core-foundation" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" ++dependencies = [ ++ "core-foundation-sys", ++ "libc", ++] ++ ++[[package]] ++name = "core-foundation-sys" ++version = "0.8.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" ++ ++[[package]] ++name = "core-graphics" ++version = "0.23.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "970a29baf4110c26fedbc7f82107d42c23f7e88e404c4577ed73fe99ff85a212" ++dependencies = [ ++ "bitflags 1.3.2", ++ "core-foundation", ++ "core-graphics-types", ++ "foreign-types", ++ "libc", ++] ++ ++[[package]] ++name = "core-graphics-types" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" ++dependencies = [ ++ "bitflags 1.3.2", ++ "core-foundation", ++ "libc", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" ++dependencies = [ ++ "cfg-if", ++ "crossbeam-epoch", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.9.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" ++dependencies = [ ++ "autocfg", ++ "cfg-if", ++ "crossbeam-utils", ++ "memoffset", ++ "scopeguard", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "dunce" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" ++ ++[[package]] ++name = "either" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" ++ ++[[package]] ++name = "foreign-types" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" ++dependencies = [ ++ "foreign-types-macros", ++ "foreign-types-shared", ++] ++ ++[[package]] ++name = "foreign-types-macros" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "foreign-types-shared" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" ++ ++[[package]] ++name = "getopts" ++version = "0.2.21" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "glob" ++version = "0.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" ++ ++[[package]] ++name = "imagequant" ++version = "4.2.2" ++dependencies = [ ++ "arrayvec", ++ "once_cell", ++ "rayon", ++ "rgb", ++ "thread_local", ++] ++ ++[[package]] ++name = "imagequant-sys" ++version = "4.0.3" ++dependencies = [ ++ "bitflags 2.4.1", ++ "imagequant", ++ "libc", ++] ++ ++[[package]] ++name = "imgref" ++version = "1.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90d944e334f00f4449c9640b440a171f816be0152305c12ef90424fc35fd035c" ++ ++[[package]] ++name = "jobserver" ++version = "0.1.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "lcms2-sys" ++version = "4.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "137dae56197ab9e66729ff73e2942e26f16f9ddcd14a53295c35f53dcd067b58" ++dependencies = [ ++ "cc", ++ "dunce", ++ "libc", ++ "pkg-config", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.150" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" ++ ++[[package]] ++name = "libpng-sys" ++version = "1.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b531eb8c558e697d1fc6a642b260426aa85ba4d054a8f0db66f5866918332674" ++dependencies = [ ++ "cc", ++ "dunce", ++ "libc", ++ "libz-sys", ++ "pkg-config", ++] ++ ++[[package]] ++name = "libz-sys" ++version = "1.1.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" ++dependencies = [ ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", ++] ++ ++[[package]] ++name = "malloc_buf" ++version = "0.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "memoffset" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "objc" ++version = "0.2.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" ++dependencies = [ ++ "malloc_buf", ++] ++ ++[[package]] ++name = "once_cell" ++version = "1.18.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" ++ ++[[package]] ++name = "pkg-config" ++version = "0.3.27" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" ++ ++[[package]] ++name = "pngquant" ++version = "3.0.3" ++dependencies = [ ++ "cc", ++ "cocoa_image", ++ "dunce", ++ "getopts", ++ "imagequant-sys", ++ "lcms2-sys", ++ "libc", ++ "libpng-sys", ++ "wild", ++] ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.69" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" ++dependencies = [ ++ "unicode-ident", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rayon" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" ++dependencies = [ ++ "either", ++ "rayon-core", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.12.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" ++dependencies = [ ++ "crossbeam-deque", ++ "crossbeam-utils", ++] ++ ++[[package]] ++name = "rgb" ++version = "0.8.37" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" ++dependencies = [ ++ "bytemuck", ++] ++ ++[[package]] ++name = "scopeguard" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" ++ ++[[package]] ++name = "syn" ++version = "2.0.39" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-ident", ++] ++ ++[[package]] ++name = "thread_local" ++version = "1.1.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" ++dependencies = [ ++ "cfg-if", ++ "once_cell", ++] ++ ++[[package]] ++name = "unicode-ident" ++version = "1.0.12" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" ++ ++[[package]] ++name = "vcpkg" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" ++ ++[[package]] ++name = "wild" ++version = "2.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "10d01931a94d5a115a53f95292f51d316856b68a035618eb831bbba593a30b67" ++dependencies = [ ++ "glob", ++] diff --git a/nixpkgs/pkgs/tools/graphics/pngquant/default.nix b/nixpkgs/pkgs/tools/graphics/pngquant/default.nix index 73fa81ad6025..cdfcb4093548 100644 --- a/nixpkgs/pkgs/tools/graphics/pngquant/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngquant/default.nix @@ -1,25 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, libpng, zlib, lcms2 }: +{ lib, rustPlatform, fetchFromGitHub, pkg-config, libpng, zlib, lcms2 }: -stdenv.mkDerivation rec { +rustPlatform.buildRustPackage rec { pname = "pngquant"; - version = "2.17.0"; + version = "3.0.3"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "kornelski"; repo = "pngquant"; rev = version; - sha256 = "sha256-D2KNn6AJ4eIHeb/2Oo1Wf0djMCXTtVGrua0D6z7+9V4="; + hash = "sha256-u2zEp9Llo+c/+1QGW4V4r40KQn/ATHCTEsrpy7bRf/I="; fetchSubmodules = true; }; - preConfigure = "patchShebangs ."; - - configureFlags = lib.optionals (!stdenv.hostPlatform.isx86) [ "--disable-sse" ]; + cargoHash = "sha256-mZpg6BRpsvEiMsS6ZJzVYg6wXHLb3Cf72sK1yzTF8y4="; + cargoPatches = [ + # https://github.com/kornelski/pngquant/issues/347 + ./add-Cargo.lock.patch + ]; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpng zlib lcms2 ]; - doCheck = true; + doCheck = false; # Has no Rust-based tests + + postInstall = '' + install -Dpm0444 pngquant.1 $man/share/man/man1/pngquant.1 + ''; meta = with lib; { homepage = "https://pngquant.org/"; diff --git a/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix index 4bc67f1e6a47..6a3b66a3548c 100644 --- a/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix +++ b/nixpkgs/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "NCNN implementation of Real-ESRGAN. Real-ESRGAN aims at developing Practical Algorithms for General Image Restoration."; + description = "NCNN implementation of Real-ESRGAN. Real-ESRGAN aims at developing Practical Algorithms for General Image Restoration"; homepage = "https://github.com/xinntao/Real-ESRGAN-ncnn-vulkan"; license = licenses.mit; maintainers = with maintainers; [ tilcreator ]; diff --git a/nixpkgs/pkgs/tools/graphics/shot-scraper/default.nix b/nixpkgs/pkgs/tools/graphics/shot-scraper/default.nix index 60aee277b60f..a5406d7334c7 100644 --- a/nixpkgs/pkgs/tools/graphics/shot-scraper/default.nix +++ b/nixpkgs/pkgs/tools/graphics/shot-scraper/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "shot-scraper"; - version = "1.1.1"; + version = "1.3"; format = "setuptools"; disabled = python3.pkgs.pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-YfWiy44rCRXK5xVkmA9X7pAlDhZrk6nS9vbC2eYvjbg="; + hash = "sha256-IC6S6LnavwxTcGEDX7lSHF1GZKBH1QcHQy17LGx4Ago="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/graphics/vips/default.nix b/nixpkgs/pkgs/tools/graphics/vips/default.nix index c16ba635f504..5c59971f955c 100644 --- a/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.15.0"; + version = "8.15.1"; outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libvips"; repo = "libvips"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-WfKq+maLcAXyjk1sq66wSU92ALv4MfRDPKe4Mki0KRQ="; + hash = "sha256-0zfYpOawH7XnTH9k8BdNDtZEKpYUlCXp7GY+fdXalsE="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' diff --git a/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix b/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix index 1151d8f04f37..236cf3f7a7fa 100644 --- a/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix +++ b/nixpkgs/pkgs/tools/graphics/wgpu-utils/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "Safe and portable GPU abstraction in Rust, implementing WebGPU API."; + description = "Safe and portable GPU abstraction in Rust, implementing WebGPU API"; homepage = "https://wgpu.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ erictapen ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/gebaar-libinput/default.nix b/nixpkgs/pkgs/tools/inputmethods/gebaar-libinput/default.nix index 7506493ee7ce..9a808535fe04 100644 --- a/nixpkgs/pkgs/tools/inputmethods/gebaar-libinput/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/gebaar-libinput/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, libinput, zlib }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, libinput, zlib }: stdenv.mkDerivation rec { pname = "gebaar-libinput"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # fix build with gcc 11+ + (fetchpatch { + url = "https://github.com/9ary/gebaar-libinput-fork/commit/25cac08a5f1aed1951b03de12fa0010a0964967d.patch"; + hash = "sha256-CtgfMTBCXotiPAXc7cA3h+7Kb0NHFi/q7w72IY32CyA="; + }) + ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ libinput zlib ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index e0f67109071e..8a6a7217dea6 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.24.10"; + version = "2.24.11"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-C7kZCreJki3acnbInW8MbrbwoWgovB/g072Sf6FKLU0="; + hash = "sha256-qksAtEUdvRddkl1tLfDqGhJDGwT605/IJOuIFVxgI0s="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix b/nixpkgs/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix index 34dde4dc7429..bd06d07b4170 100644 --- a/nixpkgs/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix +++ b/nixpkgs/pkgs/tools/inputmethods/interception-tools/dual-function-keys.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.com/interception/linux/plugins/dual-function-keys"; - description = "Tap for one key, hold for another."; + description = "Tap for one key, hold for another"; license = licenses.mit; maintainers = with maintainers; [ svend ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix b/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix index a059be9a0f9d..a3df8d44cec8 100644 --- a/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/keyd/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { passthru.tests.keyd = nixosTests.keyd; meta = with lib; { - description = "A key remapping daemon for linux."; + description = "A key remapping daemon for Linux"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix b/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix index 7ef25a43ec84..b4e781575e3c 100644 --- a/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/remote-touchpad/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { vendorHash = "sha256-UX366UWROeorwYV4l1A3R03J10Gm7EajM+wEczIJEJM="; meta = with lib; { - description = "Control mouse and keyboard from the webbrowser of a smartphone."; + description = "Control mouse and keyboard from the web browser of a smartphone"; homepage = "https://github.com/unrud/remote-touchpad"; license = licenses.gpl3Plus; maintainers = with maintainers; [ schnusch ]; diff --git a/nixpkgs/pkgs/tools/llm/heygpt/default.nix b/nixpkgs/pkgs/tools/llm/heygpt/default.nix index e371673739fa..eb2c7e4b11b4 100644 --- a/nixpkgs/pkgs/tools/llm/heygpt/default.nix +++ b/nixpkgs/pkgs/tools/llm/heygpt/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { OPENSSL_DIR = "${lib.getDev openssl}"; meta = with lib; { - description = "A simple command-line interface for ChatGPT API."; + description = "A simple command-line interface for ChatGPT API"; homepage = "https://github.com/fuyufjh/heygpt"; license = licenses.mit; mainProgram = "heygpt"; diff --git a/nixpkgs/pkgs/tools/llm/open-interpreter/default.nix b/nixpkgs/pkgs/tools/llm/open-interpreter/default.nix deleted file mode 100644 index b8624fdc4831..000000000000 --- a/nixpkgs/pkgs/tools/llm/open-interpreter/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -, semgrep -}: -let - version = "0.1.11"; -in -python3.pkgs.buildPythonApplication { - pname = "open-interpreter"; - format = "pyproject"; - inherit version; - - src = fetchFromGitHub { - owner = "KillianLucas"; - repo = "open-interpreter"; - rev = "v${version}"; - hash = "sha256-viUMGUBy5UNWag6P8tXE4TcJIx53Q/tASNV3bmCCK0g="; - }; - - nativeBuildInputs = [ - python3.pkgs.poetry-core - ]; - - propagatedBuildInputs = with python3.pkgs; [ - appdirs - astor - gitpython - huggingface-hub - inquirer - jinja2 - litellm - openai - # pyreadline3 # this is a windows deps - python-dotenv - pyyaml - rich - six - tiktoken - tokenizers - tokentrim - wget - yaspin - ] ++ [ - semgrep - ]; - - # the import check phase fails trying to do a network request to openai - # because of litellm - # pythonImportsCheck = [ "interpreter" ]; - - meta = with lib; { - description = "OpenAI's Code Interpreter in your terminal, running locally"; - homepage = "https://github.com/KillianLucas/open-interpreter"; - license = licenses.mit; - changelog = "https://github.com/KillianLucas/open-interpreter/releases/tag/v${version}"; - maintainers = with maintainers; [ happysalada ]; - mainProgram = "interpreter"; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix b/nixpkgs/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix index dde0bc349248..f2ff558168d5 100644 --- a/nixpkgs/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix +++ b/nixpkgs/pkgs/tools/misc/SP800-90B_EntropyAssessment/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/usnistgov/SP800-90B_EntropyAssessment"; - description = "Implementation of min-entropy assessment methods included in Special Publication 800-90B."; + description = "Implementation of min-entropy assessment methods included in Special Publication 800-90B"; platforms = lib.platforms.linux; license = lib.licenses.free; #this software uses the NIST software license maintainers = with lib.maintainers; [ orichter thillux ]; diff --git a/nixpkgs/pkgs/tools/misc/addlicense/default.nix b/nixpkgs/pkgs/tools/misc/addlicense/default.nix index 9b0dc691054a..532bf3464fb6 100644 --- a/nixpkgs/pkgs/tools/misc/addlicense/default.nix +++ b/nixpkgs/pkgs/tools/misc/addlicense/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, fetchpatch }: buildGoModule rec { @@ -14,6 +15,15 @@ buildGoModule rec { sha256 = "sha256-YMMHj6wctKtJi/rrcMIrLmNw/uvO6wCwokgYRQxcsFw="; }; + patches = [ + # Add support for Nix files. Upstream is slow with responding to PRs, + # patch backported from PR https://github.com/google/addlicense/pull/153. + (fetchpatch { + url = "https://github.com/google/addlicense/commit/e0fb3f44cc7670dcc5cbcec2211c9ad238c5f9f1.patch"; + hash = "sha256-XCAvL+HEa1hGc0GAnl+oYHKzBJ3I5ArS86vgABrP/Js="; + }) + ]; + vendorHash = "sha256-2mncc21ecpv17Xp8PA9GIodoaCxNBacbbya/shU8T9Y="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/tools/misc/aichat/default.nix b/nixpkgs/pkgs/tools/misc/aichat/default.nix index 8e9cc20a14cf..3a35cb888497 100644 --- a/nixpkgs/pkgs/tools/misc/aichat/default.nix +++ b/nixpkgs/pkgs/tools/misc/aichat/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "Chat with gpt-3.5/chatgpt in terminal."; + description = "Use GPT-4(V), Gemini, LocalAI, Ollama and other LLMs in the terminal"; homepage = "https://github.com/sigoden/aichat"; license = licenses.mit; maintainers = with maintainers; [ mwdomino ]; diff --git a/nixpkgs/pkgs/tools/misc/altserver-linux/default.nix b/nixpkgs/pkgs/tools/misc/altserver-linux/default.nix index 20251f7d17fe..701fe0d5afb9 100644 --- a/nixpkgs/pkgs/tools/misc/altserver-linux/default.nix +++ b/nixpkgs/pkgs/tools/misc/altserver-linux/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { homepage = "https://github.com/NyaMisty/AltServer-Linux"; - description = "AltServer for AltStore, but on-device. Requires root privileges as well as running a custom anisette server currently."; + description = "AltServer for AltStore, but on-device. Requires root privileges as well as running a custom anisette server currently"; license = licenses.agpl3; mainProgram = "alt-server"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; diff --git a/nixpkgs/pkgs/tools/misc/bcunit/default.nix b/nixpkgs/pkgs/tools/misc/bcunit/default.nix index b9e7c9712daa..14cf183f5878 100644 --- a/nixpkgs/pkgs/tools/misc/bcunit/default.nix +++ b/nixpkgs/pkgs/tools/misc/bcunit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "Belledonne Communications' fork of CUnit test framework. Part of the Linphone project."; + description = "Belledonne Communications' fork of CUnit test framework. Part of the Linphone project"; homepage = "https://gitlab.linphone.org/BC/public/bcunit"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin jluttine ]; diff --git a/nixpkgs/pkgs/tools/misc/bkyml/default.nix b/nixpkgs/pkgs/tools/misc/bkyml/default.nix index bab6f7865e7d..8b930e960e24 100644 --- a/nixpkgs/pkgs/tools/misc/bkyml/default.nix +++ b/nixpkgs/pkgs/tools/misc/bkyml/default.nix @@ -39,7 +39,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://github.com/joscha/bkyml"; - description = "A CLI tool to generate a pipeline.yaml file for Buildkite on the fly."; + description = "A CLI tool to generate a pipeline.yaml file for Buildkite on the fly"; license = licenses.mit; maintainers = with maintainers; [ olebedev ]; }; diff --git a/nixpkgs/pkgs/tools/misc/bonsai/default.nix b/nixpkgs/pkgs/tools/misc/bonsai/default.nix new file mode 100644 index 000000000000..1148eb6e98d3 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/bonsai/default.nix @@ -0,0 +1,66 @@ +{ stdenv +, lib +, fetchFromSourcehut +, gitUpdater +, hare +, hareThirdParty +}: + +stdenv.mkDerivation rec { + pname = "bonsai"; + version = "1.0.2"; + + src = fetchFromSourcehut { + owner = "~stacyharper"; + repo = "bonsai"; + rev = "v${version}"; + hash = "sha256-Yosf07KUOQv4O5111tLGgI270g0KVGwzdTPtPOsTcP8="; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace 'hare build' 'hare build $(HARE_TARGET_FLAGS)' + ''; + + nativeBuildInputs = [ + hare + ]; + + buildInputs = with hareThirdParty; [ + hare-ev + hare-json + ]; + + env.HARE_TARGET_FLAGS = + if stdenv.hostPlatform.isAarch64 then + "-a aarch64" + else if stdenv.hostPlatform.isRiscV64 then + "-a riscv64" + else if stdenv.hostPlatform.isx86_64 then + "-a x86_64" + else + ""; + # TODO: hare setup-hook is supposed to do this for us. + # It does it correctly for native compilation, but not cross compilation: wrong offset? + env.HAREPATH = with hareThirdParty; "${hare-json}/src/hare/third-party:${hare-ev}/src/hare/third-party"; + + preConfigure = '' + export HARECACHE=$(mktemp -d) + ''; + + installFlags = [ "PREFIX=$(out)" ]; + + doCheck = true; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = with lib; { + description = "Finite State Machine structured as a tree"; + homepage = "https://git.sr.ht/~stacyharper/bonsai"; + license = licenses.agpl3; + maintainers = with maintainers; [ colinsane ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix b/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix index 602327ab79b1..a4b3c992544a 100644 --- a/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix +++ b/nixpkgs/pkgs/tools/misc/cc2538-bsl/default.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonPackage rec { pname = "cc2538-bsl"; - version = "unstable-2023-08-14"; + version = "2.1-unstable-2023-10-03"; format = "pyproject"; src = fetchFromGitHub { owner = "JelmerT"; repo = "cc2538-bsl"; - rev = "641305fb5cae98415a28cbfab6e63436c1753abf"; - hash = "sha256-fPY12kValxbJORi9xNyxzwkGpD9F9u3M1+aa9IlSiaE="; + rev = "4d64ac633dbaf29d098842c5937ed6eea2fd7c45"; + hash = "sha256-NX2jPYAz15bSucj/YR5E/0eJy/cbszSrNxyJHRsbXxo="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix b/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix index d3c1490d528e..d27230906157 100644 --- a/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix +++ b/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-XFL9BfTpZaIsNeJLT3wEPFBvyO/VxvFjpApjjxvaGKw="; + sha256 = "sha256-U6xYJWVf1O/DLtC6J3b+DL97QYUW6ObRh/9EKXhi/j4="; }; - vendorHash = "sha256-j4J6VAXT+CdU4WkISBunJn6B25CDdaarhFnnLaC4cBE="; + vendorHash = "sha256-r5qlnY3gIigjbFUj9ZVY9WTQM4aYNlTv3HHpc2r/+Rw="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from diff --git a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index 36ea75d2de76..59eb121fefb6 100644 --- a/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.42.3"; + version = "2.45.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-Hw/yoQzwzyicFXsbNlBjL2S+pC23N+sC0R3dijMP2Gs="; + hash = "sha256-h17qbuicwYo2/ygJbhJbLqdcFWgZO/Sz8WQC/Addasc="; }; - vendorHash = "sha256-xBsjK2QCW5I9PGPNZWs3uuiBptV+EHSmAuUEWwvV/C0="; + vendorHash = "sha256-NqCNP+oG8+x6vYaV9bDfn8+Q1nbxV3L3vs8L4iYgypU="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/clematis/default.nix b/nixpkgs/pkgs/tools/misc/clematis/default.nix index 76851bbd0fd0..cba0b6cd5f95 100644 --- a/nixpkgs/pkgs/tools/misc/clematis/default.nix +++ b/nixpkgs/pkgs/tools/misc/clematis/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorHash = "sha256-YKu+7LFUoQwCH//URIswiaqa0rmnWZJvuSn/68G3TUA="; meta = with lib; { - description = "Discord rich presence for MPRIS music players."; + description = "Discord rich presence for MPRIS music players"; homepage = "https://github.com/TorchedSammy/Clematis"; license = licenses.mit; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/misc/convimg/default.nix b/nixpkgs/pkgs/tools/misc/convimg/default.nix index 93b01723bf62..1e37c2636bbe 100644 --- a/nixpkgs/pkgs/tools/misc/convimg/default.nix +++ b/nixpkgs/pkgs/tools/misc/convimg/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "convimg"; - version = "9.2"; + version = "9.3"; src = fetchFromGitHub { owner = "mateoconlechuga"; repo = pname; rev = "v${version}"; - sha256 = "sha256-37nJyaUyC5aQ4h3sH+s8XOzyLh6zfzgIEDp+M6SERSg="; + sha256 = "sha256-xnfMHlbQ7XG/mvnWoGkRHhxIK2u7kWJTVnLxd9c5oNU="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/tools/misc/crudini/default.nix b/nixpkgs/pkgs/tools/misc/crudini/default.nix index fa4e7cc34a48..ea77f4db163e 100644 --- a/nixpkgs/pkgs/tools/misc/crudini/default.nix +++ b/nixpkgs/pkgs/tools/misc/crudini/default.nix @@ -22,8 +22,6 @@ python3Packages.buildPythonApplication rec { patchShebangs crudini.py crudini-help tests/test.sh ''; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ help2man installShellFiles diff --git a/nixpkgs/pkgs/tools/misc/cyberchef/default.nix b/nixpkgs/pkgs/tools/misc/cyberchef/default.nix index d93f8adca158..7d667a90cbd1 100644 --- a/nixpkgs/pkgs/tools/misc/cyberchef/default.nix +++ b/nixpkgs/pkgs/tools/misc/cyberchef/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis."; + description = "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis"; homepage = "https://gchq.github.io/CyberChef"; changelog = "https://github.com/gchq/CyberChef/blob/v${version}/CHANGELOG.md"; maintainers = with maintainers; [ sebastianblunt ]; diff --git a/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix b/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix index 8284035c99e1..fa5be39000af 100644 --- a/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix +++ b/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix @@ -1,37 +1,54 @@ { lib -, python3 , fetchFromGitHub +, python3 }: + +let + py = python3.override { + packageOverrides = self: super: { + + # Requires 'cyclonedx-python-lib = ">= 2.0.0, < 4.0.0"' + cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec { + version = "3.1.5"; + src = fetchFromGitHub { + owner = "CycloneDX"; + repo = "cyclonedx-python-lib"; + rev = "refs/tags/v${version}"; + hash = "sha256-4lA8OdmvQD94jTeDf+Iz7ZyEQ9fZzCxnXQG9Ir8FKhk="; + }; + }); + }; + }; +in +with py.pkgs; + python3.pkgs.buildPythonApplication rec { pname = "cyclonedx-python"; - version = "0.4.3"; + version = "3.11.7"; + pyproject = true; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-python"; - rev = "v${version}"; - sha256 = "BvG4aWBMsllW2L4lLsiRFUCPjgoDpHxN49fsUFdg7tQ="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-jU/0FkQCyph59TnEE+lckJXsU9whfvWp7dkdfzprYw8="; }; - # They pin versions for exact version numbers because "A bill-of-material such - # as CycloneDX expects exact version numbers" -- but that's unnecessary with - # Nix. - preBuild = '' - sed "s@==.*'@'@" -i setup.py - ''; + nativeBuildInputs = with py.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with py.pkgs; [ + chardet + cyclonedx-python-lib packageurl-python - requests - xmlschema + pip-requirements-parser setuptools - requirements-parser - packaging - chardet - jsonschema + toml ]; - # the tests want access to the cyclonedx binary + # The tests want access to the cyclonedx binary doCheck = false; pythonImportsCheck = [ @@ -41,8 +58,9 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Creates CycloneDX Software Bill of Materials (SBOM) from Python projects"; homepage = "https://github.com/CycloneDX/cyclonedx-python"; + changelog = "https://github.com/CycloneDX/cyclonedx-python/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ ]; mainProgram = "cyclonedx-py"; }; } diff --git a/nixpkgs/pkgs/tools/misc/czkawka/default.nix b/nixpkgs/pkgs/tools/misc/czkawka/default.nix deleted file mode 100644 index 14908c0a402e..000000000000 --- a/nixpkgs/pkgs/tools/misc/czkawka/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib -, stdenv -, rustPlatform -, fetchFromGitHub -, pkg-config -, glib -, cairo -, pango -, gdk-pixbuf -, atk -, gtk4 -, Foundation -, wrapGAppsHook4 -, gobject-introspection -, xvfb-run -, testers -, czkawka -}: - -rustPlatform.buildRustPackage rec { - pname = "czkawka"; - version = "6.1.0"; - - src = fetchFromGitHub { - owner = "qarmin"; - repo = "czkawka"; - rev = version; - hash = "sha256-uKmiBNwuu3Eduf0v3p2VYYNf6mgxJTBUsYs+tKZQZys="; - }; - - cargoHash = "sha256-iBO99kpITVl7ySlXPkEg2YecS1lonVx9CbKt9WI180s="; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook4 - gobject-introspection - ]; - - buildInputs = [ - glib - cairo - pango - gdk-pixbuf - atk - gtk4 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - Foundation - ]; - - nativeCheckInputs = [ - xvfb-run - ]; - - checkPhase = '' - runHook preCheck - xvfb-run cargo test - runHook postCheck - ''; - - doCheck = stdenv.hostPlatform.isLinux - && (stdenv.hostPlatform == stdenv.buildPlatform); - - passthru.tests.version = testers.testVersion { - package = czkawka; - command = "czkawka_cli --version"; - }; - - postInstall = '' - # Install Icons - install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg - install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka-symbolic.svg - - # Install MetaInfo - install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml - - # Install Desktop Entry - install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop - ''; - - meta = with lib; { - changelog = "https://github.com/qarmin/czkawka/raw/${version}/Changelog.md"; - description = "A simple, fast and easy to use app to remove unnecessary files from your computer"; - homepage = "https://github.com/qarmin/czkawka"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ yanganto _0x4A6F ]; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/dooit/default.nix b/nixpkgs/pkgs/tools/misc/dooit/default.nix index 79e968a5458b..7e251e2f339e 100644 --- a/nixpkgs/pkgs/tools/misc/dooit/default.nix +++ b/nixpkgs/pkgs/tools/misc/dooit/default.nix @@ -7,18 +7,23 @@ python3.pkgs.buildPythonApplication rec { pname = "dooit"; - version = "2.1.0"; - format = "pyproject"; + version = "2.1.1"; + pyproject = true; src = fetchFromGitHub { owner = "kraanzu"; repo = "dooit"; rev = "v${version}"; - hash = "sha256-ZCEBpaQHaFb09MUlN6acYB3LrfX456uRbhVh9YPz7NU="; + hash = "sha256-YfWfh8oDZSG1DdAV+hzchqyNSSqyeNR5SSEa9B5yGY8="; }; nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "tzlocal" ]; propagatedBuildInputs = with python3.pkgs; [ @@ -30,12 +35,6 @@ python3.pkgs.buildPythonApplication rec { tzlocal ]; - # NOTE pyproject version was bumped after release tag 2.0.1 - remove after next release. - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "version = \"2.0.0\"" "version = \"2.0.1\"" - ''; - # No tests available doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix index 0ee5d2e47dcc..8061d535bc23 100644 --- a/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.24.2"; + version = "2.26.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - hash = "sha256-1rGzgKusUKlkH/Ew8qDzq143mu+gvSlXTcqL+I+ypSY="; + hash = "sha256-+7pf87mmT5KB4KtKzZXYnV6GwMzb6ieXjBVZpvmQ3eU="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-+GHVZNuEpOxu29EuHOshrYyhg1HFcYJjC4MnFJgjw38="; + cargoHash = "sha256-5n6zjuoL5v3ieP8eOzvyJf/YDmQ+MuGMk3T/8rHKQVE="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation diff --git a/nixpkgs/pkgs/tools/misc/dust/default.nix b/nixpkgs/pkgs/tools/misc/dust/default.nix index 3851a026a921..c3994f05b6a4 100644 --- a/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "du-dust"; - version = "0.8.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-PEW13paHNQ1JAz9g3pIdCB1f1KqIz8XC4gGE0z/glOk="; + sha256 = "sha256-5X7gRMTUrG6ecZnwExBTadOJo/HByohTMDsgxFmp1HM="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-VJBmVidLkx4nIQULtDoywV4QGmgf53YAAXLJH/LZ/j0="; + cargoHash = "sha256-uc7jbA8HqsH1bSJgbnUVT/f7F7kZJ4Jf3yyFvseH7no="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/elfcat/default.nix b/nixpkgs/pkgs/tools/misc/elfcat/default.nix index 53d2516e4091..2344eb717547 100644 --- a/nixpkgs/pkgs/tools/misc/elfcat/default.nix +++ b/nixpkgs/pkgs/tools/misc/elfcat/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Dc+SuLwbLFcNSr9RiNSc7dgisBOvOUEIDR8dFAkC/O0="; meta = with lib; { - description = "ELF visualizer, generates HTML files from ELF binaries."; + description = "ELF visualizer, generates HTML files from ELF binaries"; homepage = "https://github.com/ruslashev/elfcat"; license = licenses.zlib; maintainers = with maintainers; [ moni ]; diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index a8ab91f8f329..4baf50a063e7 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -2,6 +2,7 @@ , callPackage , python3Packages , fetchFromGitHub +, installShellFiles , platformio , esptool , git @@ -10,7 +11,7 @@ let python = python3Packages.python.override { packageOverrides = self: super: { - esphome-dashboard = self.callPackage ./dashboard.nix {}; + esphome-dashboard = self.callPackage ./dashboard.nix { }; }; }; in @@ -28,6 +29,8 @@ python.pkgs.buildPythonApplication rec { nativeBuildInputs = with python.pkgs; [ setuptools + argcomplete + installShellFiles ]; postPatch = '' @@ -98,9 +101,20 @@ python.pkgs.buildPythonApplication rec { $out/bin/esphome --help > /dev/null ''; + postInstall = + let + argcomplete = lib.getExe' python3Packages.argcomplete "register-python-argcomplete"; + in + '' + installShellCompletion --cmd esphome \ + --bash <(${argcomplete} --shell bash esphome) \ + --zsh <(${argcomplete} --shell zsh esphome) \ + --fish <(${argcomplete} --shell fish esphome) + ''; + passthru = { dashboard = python.pkgs.esphome-dashboard; - updateScript = callPackage ./update.nix {}; + updateScript = callPackage ./update.nix { }; }; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/fastfetch/default.nix b/nixpkgs/pkgs/tools/misc/fastfetch/default.nix index 3b0bdf4476db..a180784b498a 100644 --- a/nixpkgs/pkgs/tools/misc/fastfetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/fastfetch/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-W/6Ye7IJi46SKPY9gnvHNRYwTwxGCJ6oY3KVPzcFvNM="; + hash = "sha256-cjNVN/2N/CiItsysZFJNL0mqXL6B86BihjDJ7IwD1a4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/flashrom-stable/default.nix b/nixpkgs/pkgs/tools/misc/flashrom-stable/default.nix index 053605b5aaf1..81beb2346e34 100644 --- a/nixpkgs/pkgs/tools/misc/flashrom-stable/default.nix +++ b/nixpkgs/pkgs/tools/misc/flashrom-stable/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.flashrom.org"; - description = "Utility for reading, writing, erasing and verifying flash ROM chips."; + description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = with licenses; [ gpl2 gpl2Plus ]; maintainers = with maintainers; [ felixsinger ]; platforms = platforms.all; diff --git a/nixpkgs/pkgs/tools/misc/graylog/plugins.nix b/nixpkgs/pkgs/tools/misc/graylog/plugins.nix index 8601d2c6e805..e25aeb39f7aa 100644 --- a/nixpkgs/pkgs/tools/misc/graylog/plugins.nix +++ b/nixpkgs/pkgs/tools/misc/graylog/plugins.nix @@ -226,7 +226,7 @@ in { }; meta = { homepage = "https://bitbucket.org/proximus/smseagle-graylog/"; - description = "Alert/notification callback plugin for integrating the SMSEagle into Graylog."; + description = "Alert/notification callback plugin for integrating the SMSEagle into Graylog"; license = lib.licenses.gpl3Only; }; }; @@ -253,7 +253,7 @@ in { }; meta = { homepage = "https://github.com/graylog-labs/graylog-plugin-spaceweather"; - description = "Correlate proton density to the response time of your app and the ion temperature to your exception rate."; + description = "Correlate proton density to the response time of your app and the ion temperature to your exception rate"; }; }; splunk = glPlugin rec { @@ -266,7 +266,7 @@ in { }; meta = { homepage = "https://github.com/graylog-labs/graylog-plugin-splunk"; - description = "Graylog output plugin that forwards one or more streams of data to Splunk via TCP."; + description = "Graylog output plugin that forwards one or more streams of data to Splunk via TCP"; license = lib.licenses.gpl3Only; }; }; diff --git a/nixpkgs/pkgs/tools/misc/gtklp/default.nix b/nixpkgs/pkgs/tools/misc/gtklp/default.nix deleted file mode 100644 index af98ed1ae1b7..000000000000 --- a/nixpkgs/pkgs/tools/misc/gtklp/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv, lib, fetchurl -, autoreconfHook, libtool, pkg-config -, gtk2, glib, cups, gettext, openssl -}: - -stdenv.mkDerivation rec { - pname = "gtklp"; - version = "1.3.4"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.src.tar.gz"; - sha256 = "1arvnnvar22ipgnzqqq8xh0kkwyf71q2sfsf0crajpsr8a8601xy"; - }; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; - - buildInputs = [ - cups - gettext - glib - gtk2 - libtool - openssl - ]; - - patches = [ - ./patches/mdv-fix-str-fmt.patch - ./patches/autoconf.patch - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: libgtklp.a(libgtklp.o):libgtklp/libgtklp.h:83: multiple definition of `progressBar'; - # file.o:libgtklp/libgtklp.h:83: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preConfigure = '' - substituteInPlace include/defaults.h --replace "netscape" "firefox" - substituteInPlace include/defaults.h --replace "http://localhost:631/sum.html#STANDARD_OPTIONS" \ - "http://localhost:631/help/" - ''; - - preInstall = '' - install -D -m0644 -t $out/share/doc AUTHORS BUGS ChangeLog README USAGE - ''; - - meta = with lib; { - description = "A graphical frontend for CUPS"; - homepage = "https://gtklp.sirtobi.com"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ caadar ]; - platforms = platforms.unix; - }; - -} diff --git a/nixpkgs/pkgs/tools/misc/gtklp/patches/autoconf.patch b/nixpkgs/pkgs/tools/misc/gtklp/patches/autoconf.patch deleted file mode 100644 index c1698bee1fdc..000000000000 --- a/nixpkgs/pkgs/tools/misc/gtklp/patches/autoconf.patch +++ /dev/null @@ -1,23 +0,0 @@ -Patch origin: http://sophie.zarb.org/rpms/68e90a72e0052022f558148d97c9ea2a/files/3 - -diff --git a/configure.ac b/configure.ac -index b7a30e9..3768ae9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8,6 +8,7 @@ AC_CONFIG_HEADERS([config.h]) - - AC_CONFIG_MACRO_DIR([m4]) - AM_GNU_GETTEXT([external]) -+AM_GNU_GETTEXT_REQUIRE_VERSION([0.21]) - - dnl Extra params - CUPSCONFIGPATH="" -@@ -30,8 +31,6 @@ AC_SUBST(XLIBS) - - dnl Checks for header files - --dnl internationalization macros --AM_GNU_GETTEXT - - - # Forte Compiler ############################################################ diff --git a/nixpkgs/pkgs/tools/misc/gtklp/patches/mdv-fix-str-fmt.patch b/nixpkgs/pkgs/tools/misc/gtklp/patches/mdv-fix-str-fmt.patch deleted file mode 100644 index 6cfc90beb02a..000000000000 --- a/nixpkgs/pkgs/tools/misc/gtklp/patches/mdv-fix-str-fmt.patch +++ /dev/null @@ -1,22 +0,0 @@ -Patch source: http://sophie.zarb.org/rpms/68e90a72e0052022f558148d97c9ea2a/files/1 - ---- a/libgtklp/libgtklp.c 2020-08-25 17:31:52.427298559 +0100 -+++ b/libgtklp/libgtklp.c 2020-08-25 17:36:37.728154682 +0100 -@@ -939,7 +939,7 @@ - gtk_widget_show(pixmapwid); - - if (strlen(gerror2) == 0) -- snprintf(tmplabel, (size_t) MAXLINE, gerror1); -+ snprintf(tmplabel, (size_t) MAXLINE, "%s", gerror1); - else - snprintf(tmplabel, (size_t) MAXLINE, gerror1, gerror2); - label = gtk_label_new(tmplabel); -@@ -973,7 +973,7 @@ - #endif - } else { - if (strlen(gerror2) == 0) -- g_warning(gerror1); -+ g_warning("%s", gerror1); - else - g_warning(gerror1, gerror2); - } diff --git a/nixpkgs/pkgs/tools/misc/gwe/default.nix b/nixpkgs/pkgs/tools/misc/gwe/default.nix index e1576c3f9dc5..1b03756be25b 100644 --- a/nixpkgs/pkgs/tools/misc/gwe/default.nix +++ b/nixpkgs/pkgs/tools/misc/gwe/default.nix @@ -28,6 +28,7 @@ let requests rx gtk3 + reactivex ]); in stdenv.mkDerivation rec { pname = "gwe"; diff --git a/nixpkgs/pkgs/tools/misc/immich-cli/default.nix b/nixpkgs/pkgs/tools/misc/immich-cli/default.nix index ec1483ccc0c9..82d8e96ec798 100644 --- a/nixpkgs/pkgs/tools/misc/immich-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/immich-cli/default.nix @@ -3,25 +3,29 @@ , fetchFromGitHub }: -buildNpmPackage rec { +buildNpmPackage { pname = "immich-cli"; - version = "0.41.0"; + version = "2.0.6"; src = fetchFromGitHub { owner = "immich-app"; - repo = "CLI"; - rev = "v${version}"; - hash = "sha256-BpJNssNTJZASH5VTgTNJ0ILj0XucWvyn3Y7hQdfCEGQ="; + repo = "immich"; + # Using a fixed commit until upstream has release tags for cli. + rev = "014adf175ad50a61f92804666940e267ab329064"; + hash = "sha256-MK3Watq5/Zp+rymCIfWxAXSgBPDE13g23uDnW7A5x9g="; }; - npmDepsHash = "sha256-GOYWPRAzV59iaX32I42dOOEv1niLiDIPagzQ/QBBbKc="; + npmDepsHash = "sha256-ssxOXKE1t/bSb972w/cBeK61IrqPLmx9ODMn6D+2Ezw="; + + postPatch = '' + cd cli + ''; meta = { - changelog = "https://github.com/immich-app/CLI/releases/tag/${src.rev}"; description = "CLI utilities for Immich to help upload images and videos"; - homepage = "https://github.com/immich-app/CLI"; + homepage = "https://github.com/immich-app/immich"; license = lib.licenses.mit; mainProgram = "immich"; - maintainers = with lib.maintainers; [ felschr ]; + maintainers = with lib.maintainers; [ felschr pineapplehunter ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/infracost/default.nix b/nixpkgs/pkgs/tools/misc/infracost/default.nix index ce555facf410..2ed332b58fbd 100644 --- a/nixpkgs/pkgs/tools/misc/infracost/default.nix +++ b/nixpkgs/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.31"; + version = "0.10.32"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-slZFZu+NEOLy4oxdcZwW2OhabGxE/RPsfEhO0W6+gT0="; + sha256 = "sha256-/GXT8ptoE6AjW0yTyQ8oLFqok59hIu+bOoE8FpdrOrY="; }; - vendorHash = "sha256-o8CMISBU5C/SDexeEiwnxTC9hvbCWUrm6a/2TOE9Bmw="; + vendorHash = "sha256-ji9TpUcq0aUAn5vV5dnaC15i0Uli2Qsz/BrOKB3/Rl4="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/instaloader/default.nix b/nixpkgs/pkgs/tools/misc/instaloader/default.nix index 634693f6144b..57601ae97550 100644 --- a/nixpkgs/pkgs/tools/misc/instaloader/default.nix +++ b/nixpkgs/pkgs/tools/misc/instaloader/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , sphinx , requests }: @@ -20,6 +21,10 @@ buildPythonPackage rec { sha256 = "sha256-ZxvJPDj+r7KSyXpYNQIgnda5OS77GOFM901ZHgR6c4k="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ requests sphinx diff --git a/nixpkgs/pkgs/tools/misc/isoimagewriter/default.nix b/nixpkgs/pkgs/tools/misc/isoimagewriter/default.nix index 28c0ddd5f889..1ffb0f51db51 100644 --- a/nixpkgs/pkgs/tools/misc/isoimagewriter/default.nix +++ b/nixpkgs/pkgs/tools/misc/isoimagewriter/default.nix @@ -21,7 +21,7 @@ mkDerivation rec { ]; meta = { - description = "ISO Image Writer is a tool to write a .iso file to a USB disk."; + description = "A program to write hybrid ISO files onto USB disks"; homepage = "https://invent.kde.org/utilities/isoimagewriter"; platforms = lib.platforms.linux; license = lib.licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/nixpkgs/pkgs/tools/misc/jdupes/default.nix index cb81ef9a9983..8e29307ad24a 100644 --- a/nixpkgs/pkgs/tools/misc/jdupes/default.nix +++ b/nixpkgs/pkgs/tools/misc/jdupes/default.nix @@ -1,37 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitea, libjodycode }: stdenv.mkDerivation rec { pname = "jdupes"; - version = "1.21.0"; + version = "1.27.3"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "codeberg.org"; owner = "jbruchon"; repo = "jdupes"; rev = "v${version}"; - sha256 = "sha256-nDyRaV49bLVHlyqKJ7hf6OBWOLCfmHrTeHryK091c3w="; + hash = "sha256-hR5nl8G7TYVm4ol/jgo7iOb4dLr2MovgjKSXCD2UwMg="; # Unicode file names lead to different checksums on HFS+ vs. other # filesystems because of unicode normalisation. The testdir # directories have such files and will be removed. postFetch = "rm -r $out/testdir"; }; - patches = [ - (fetchpatch { - name = "darwin-stack-size.patch"; - url = "https://github.com/jbruchon/jdupes/commit/8f5b06109b44a9e4316f9445da3044590a6c63e2.patch"; - sha256 = "0saq92v0mm5g979chr062psvwp3i3z23mgqrcliq4m07lvwc7i3s"; - }) - (fetchpatch { - name = "linux-header-ioctl.patch"; - url = "https://github.com/jbruchon/jdupes/commit/0d4d98f51c99999d2c6dbbb89d554af551b5b69b.patch"; - sha256 = "sha256-lyuZeRp0Laa8I9nDl1HGdlKa59OvGRQJnRg2fTWv7mQ="; - }) - (fetchpatch { - name = "darwin-apfs-comp.patch"; - url = "https://github.com/jbruchon/jdupes/commit/517b7035945eacd82323392b13bc17b044bcc89d.patch"; - sha256 = "sha256-lvOab6tyEyKUtik3JBdIs5SHpVjcQEDfN7n2bfUszBw="; - }) - ]; + buildInputs = [ libjodycode ]; dontConfigure = true; @@ -49,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = false; # broken Makefile, the above also removes tests postInstall = '' - install -Dm444 -t $out/share/doc/jdupes CHANGES LICENSE README.md + install -Dm444 -t $out/share/doc/jdupes CHANGES.txt LICENSE.txt README.md ''; meta = with lib; { @@ -61,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/jbruchon/jdupes"; license = licenses.mit; - maintainers = with maintainers; [ romildo ]; + maintainers = with maintainers; [ ]; mainProgram = "jdupes"; }; } diff --git a/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix b/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix index 9d552072f7df..64b91a68d948 100644 --- a/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix +++ b/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix @@ -1,37 +1,73 @@ -{ lib, stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }: -stdenv.mkDerivation rec { - version = "1.6.3"; +{ lib +, stdenv +, maven +, fetchFromGitHub +, makeWrapper +, wrapGAppsHook +, jre +}: + +let + platformName = { + "x86_64-linux" = "linux-x86-64"; + "aarch64-linux" = "linux-aarch64"; + "x86_64-darwin" = "darwin-x86-64"; + "aarch64-darwin" = "darwin-aarch64"; + }.${stdenv.system} or null; +in +maven.buildMavenPackage rec { pname = "jugglinglab"; + version = "1.6.5"; + src = fetchFromGitHub { owner = "jkboyce"; repo = "jugglinglab"; rev = "v${version}"; - sha256 = "sha256-Gq8V7gLl9IakQi7xaK8TCI/B2+6LlLjoLdcv9zlalIE="; + hash = "sha256-Y87uHFpVs4A/wErNO2ZF6Su0v4LEvaE9nIysrqFoY8w="; }; - buildInputs = [ jre ]; - nativeBuildInputs = [ ant jdk makeWrapper ]; - buildPhase = "ant"; + + patches = [ + # make sure mvnHash doesn't change when maven is updated + ./fix-default-maven-plugin-versions.patch + ]; + + mvnHash = "sha256-1Uzo9nRw+YR/sd7CC9MTPe/lttkRX6BtmcsHaagP1Do="; + + # fix jar timestamps for reproducibility + mvnParameters = "-Dproject.build.outputTimestamp=1980-01-01T00:00:02Z"; + + nativeBuildInputs = [ + makeWrapper + wrapGAppsHook + ]; + + dontWrapGApps = true; installPhase = '' - mkdir -p "$out/bin" - mkdir -p "$out/lib" - cp bin/*.jar $out/lib/ + runHook preInstall - # copied from the upstream shell wrapper - classpath=$out/lib/JugglingLab.jar:$out/lib/commons-math3-3.6.1.jar:$out/lib/protobuf.jar:$out/lib/com.google.ortools.jar + install -Dm644 bin/JugglingLab.jar -t $out/share/jugglinglab + ${lib.optionalString (platformName != null) '' + install -Dm755 bin/ortools-lib/ortools-${platformName}/* -t $out/lib/ortools-lib + ''} + + runHook postInstall + ''; + # gappsWrapperArgs are set in preFixup + postFixup = '' makeWrapper ${jre}/bin/java $out/bin/jugglinglab \ - --add-flags "-cp $classpath" \ - --add-flags "-Xss2048k -Djava.library.path=ortools-lib" \ - --add-flags jugglinglab.JugglingLab + "''${gappsWrapperArgs[@]}" \ + --add-flags "-Xss2048k -Djava.library.path=$out/lib/ortools-lib" \ + --add-flags "-jar $out/share/jugglinglab/JugglingLab.jar" ''; meta = with lib; { - description = "A program to visualize different juggling pattens"; - homepage = "https://jugglinglab.org/"; - license = licenses.gpl2; - maintainers = with maintainers; [ wnklmnn ]; - platforms = platforms.all; - mainProgram = "jugglinglab"; + description = "A program to visualize different juggling pattens"; + homepage = "https://jugglinglab.org/"; + license = licenses.gpl2Only; + mainProgram = "jugglinglab"; + maintainers = with maintainers; [ wnklmnn tomasajt ]; + platforms = platforms.all; }; } diff --git a/nixpkgs/pkgs/tools/misc/jugglinglab/fix-default-maven-plugin-versions.patch b/nixpkgs/pkgs/tools/misc/jugglinglab/fix-default-maven-plugin-versions.patch new file mode 100644 index 000000000000..a2f74b19b61f --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/jugglinglab/fix-default-maven-plugin-versions.patch @@ -0,0 +1,70 @@ +diff --git a/pom.xml b/pom.xml +index 93fd6be..5f929c3 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -42,6 +43,65 @@ + + <build> + <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-enforcer-plugin</artifactId> ++ <version>3.4.1</version> ++ <executions> ++ <execution> ++ <id>require-all-plugin-versions-to-be-set</id> ++ <phase>validate</phase> ++ <goals> ++ <goal>enforce</goal> ++ </goals> ++ <configuration> ++ <rules> ++ <requirePluginVersions /> ++ </rules> ++ </configuration> ++ </execution> ++ </executions> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-compiler-plugin</artifactId> ++ <version>3.12.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-surefire-plugin</artifactId> ++ <version>3.2.3</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ <version>3.3.0</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-clean-plugin</artifactId> ++ <version>3.3.2</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-install-plugin</artifactId> ++ <version>3.1.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-site-plugin</artifactId> ++ <version>4.0.0-M13</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-resources-plugin</artifactId> ++ <version>3.3.1</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-deploy-plugin</artifactId> ++ <version>3.1.1</version> ++ </plugin> + + <!-- remove existing `bin/JugglingLab.jar` --> + <!-- otherwise on overwrite Maven creates `bin/original-JugglingLab.jar` --> diff --git a/nixpkgs/pkgs/tools/misc/lektor/default.nix b/nixpkgs/pkgs/tools/misc/lektor/default.nix index 638ce2ee3ce7..1b20b4355d8e 100644 --- a/nixpkgs/pkgs/tools/misc/lektor/default.nix +++ b/nixpkgs/pkgs/tools/misc/lektor/default.nix @@ -46,8 +46,6 @@ in python.pkgs.buildPythonApplication rec { npmHooks.npmConfigHook ]; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = with python.pkgs; [ babel click diff --git a/nixpkgs/pkgs/tools/misc/maker-panel/default.nix b/nixpkgs/pkgs/tools/misc/maker-panel/default.nix index 96c4d6ad61c6..cbe618d406fe 100644 --- a/nixpkgs/pkgs/tools/misc/maker-panel/default.nix +++ b/nixpkgs/pkgs/tools/misc/maker-panel/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "Make mechanical PCBs by combining shapes together."; + description = "Make mechanical PCBs by combining shapes together"; homepage = "https://github.com/twitchyliquid64/maker-panel"; license = with licenses; [ mit ]; maintainers = with maintainers; [ twitchyliquid64 ]; diff --git a/nixpkgs/pkgs/tools/misc/mathpix-snipping-tool/default.nix b/nixpkgs/pkgs/tools/misc/mathpix-snipping-tool/default.nix index c5b5745ceb33..2a3e45dd6367 100644 --- a/nixpkgs/pkgs/tools/misc/mathpix-snipping-tool/default.nix +++ b/nixpkgs/pkgs/tools/misc/mathpix-snipping-tool/default.nix @@ -22,7 +22,7 @@ in appimageTools.wrapType2 { ''; meta = with lib; { - description = "OCR tool to convert pictures to LaTeX."; + description = "OCR tool to convert pictures to LaTeX"; homepage = "https://mathpix.com/"; license = licenses.unfree; maintainers = [ maintainers.hiro98 ]; diff --git a/nixpkgs/pkgs/tools/misc/memtest86+/default.nix b/nixpkgs/pkgs/tools/misc/memtest86+/default.nix index 53f9efac5fc4..297ef5dff041 100644 --- a/nixpkgs/pkgs/tools/misc/memtest86+/default.nix +++ b/nixpkgs/pkgs/tools/misc/memtest86+/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "memtest86+"; - version = "6.20"; + version = "7.00"; src = fetchFromGitHub { owner = "memtest86plus"; repo = "memtest86plus"; rev = "v${finalAttrs.version}"; - hash = "sha256-JzQJrAnPsa3GKNdy1PidOAZk7IQvRBi/YtmK2O9rWfM="; + hash = "sha256-DVYiE9yi20IR2AZs8bya1h9vK4si7nKdg9Nqef4WTrw="; }; # Binaries are booted directly by BIOS/UEFI or bootloader diff --git a/nixpkgs/pkgs/tools/misc/rtx/default.nix b/nixpkgs/pkgs/tools/misc/mise/default.nix index 78d5f654d181..c82603b93039 100644 --- a/nixpkgs/pkgs/tools/misc/rtx/default.nix +++ b/nixpkgs/pkgs/tools/misc/mise/default.nix @@ -11,28 +11,32 @@ , direnv , Security , SystemConfiguration -, rtx +, mise , testers }: rustPlatform.buildRustPackage rec { - pname = "rtx"; - version = "2023.12.35"; + pname = "mise"; + version = "2024.1.20"; src = fetchFromGitHub { owner = "jdx"; - repo = "rtx"; + repo = "mise"; rev = "v${version}"; - hash = "sha256-vzMjC6qIPhZm80hzYQRpF3j+s85B0nwTcgSGRATQEIg="; + hash = "sha256-4KyvqxM7QpszTGIzSrd0nrnO1yk/hkjmbRqVzzlMuYI="; }; - cargoHash = "sha256-LvW5xGVggzuXlFPhbrc93Dht3S9zaQyx9Nm+Mx/Mjh0="; + cargoHash = "sha256-Mq9uN0pztH5DwVCPNtl58zDPZtyWBsoTTMriUK6w8iI="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; postPatch = '' - patchShebangs --build ./test/data/plugins/**/bin/* ./src/fake_asdf.rs ./src/cli/reshim.rs + patchShebangs --build \ + ./test/data/plugins/**/bin/* \ + ./src/fake_asdf.rs \ + ./src/cli/reshim.rs \ + ./test/cwd/.mise/tasks/filetask substituteInPlace ./src/env_diff.rs \ --replace '"bash"' '"${bash}/bin/bash"' @@ -51,25 +55,25 @@ rustPlatform.buildRustPackage rec { dontUseCargoParallelTests = true; postInstall = '' - installManPage ./man/man1/rtx.1 + installManPage ./man/man1/mise.1 installShellCompletion \ - --bash ./completions/rtx.bash \ - --fish ./completions/rtx.fish \ - --zsh ./completions/_rtx + --bash ./completions/mise.bash \ + --fish ./completions/mise.fish \ + --zsh ./completions/_mise ''; passthru = { updateScript = nix-update-script { }; - tests.version = testers.testVersion { package = rtx; }; + tests.version = testers.testVersion { package = mise; }; }; meta = { - homepage = "https://github.com/jdx/rtx"; - description = "Polyglot runtime manager (asdf rust clone)"; - changelog = "https://github.com/jdx/rtx/releases/tag/v${version}"; + homepage = "https://mise.jdx.dev"; + description = "The front-end to your dev env"; + changelog = "https://github.com/jdx/mise/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ konradmalik ]; - mainProgram = "rtx"; + mainProgram = "mise"; }; } diff --git a/nixpkgs/pkgs/tools/misc/moar/default.nix b/nixpkgs/pkgs/tools/misc/moar/default.nix index 232972d35ac0..77b85245beba 100644 --- a/nixpkgs/pkgs/tools/misc/moar/default.nix +++ b/nixpkgs/pkgs/tools/misc/moar/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "moar"; - version = "1.18.6"; + version = "1.22.2"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-QQapWDTJkP0YuyNR8J1N2IEETG1BfkdWv40SPD/JKYg="; + hash = "sha256-fS+HmLnqs3haQ/cv768zSY62CcqONCkTF/GpUsPNX0c="; }; - vendorHash = "sha256-x6BeU6JDayCOi8T8+NvXZe59QmTaO9RAYwSiFlDPL/c="; + vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix index e714861c1aa6..0ed70de2e8e1 100644 --- a/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mongo-tools"; - version = "100.9.3"; + version = "100.9.4"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-tools"; rev = version; - sha256 = "sha256-l3A7ykkQCkT34EdgpcSJpFsZq1gE9GII9gzaXJaUwEk="; + sha256 = "sha256-FGgO8JNUU0+WqIh13I0i9cprN8qE/020wDXjFsZdFy0="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/misc/mpremote/default.nix b/nixpkgs/pkgs/tools/misc/mpremote/default.nix index 04b7abb353a2..c260b1e52893 100644 --- a/nixpkgs/pkgs/tools/misc/mpremote/default.nix +++ b/nixpkgs/pkgs/tools/misc/mpremote/default.nix @@ -19,7 +19,6 @@ buildPythonApplication rec { }; sourceRoot = "source/tools/mpremote"; format = "pyproject"; - env.SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ hatchling diff --git a/nixpkgs/pkgs/tools/misc/nanoemoji/default.nix b/nixpkgs/pkgs/tools/misc/nanoemoji/default.nix index 401783bcc4a1..a4fb6768d0bb 100644 --- a/nixpkgs/pkgs/tools/misc/nanoemoji/default.nix +++ b/nixpkgs/pkgs/tools/misc/nanoemoji/default.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { toml tomlkit ufo2ft - ufoLib2 + ufolib2 zopfli ]; diff --git a/nixpkgs/pkgs/tools/misc/nbqa/default.nix b/nixpkgs/pkgs/tools/misc/nbqa/default.nix index dec7eb1aa113..0c55c78f7b49 100644 --- a/nixpkgs/pkgs/tools/misc/nbqa/default.nix +++ b/nixpkgs/pkgs/tools/misc/nbqa/default.nix @@ -7,15 +7,20 @@ }: python3.pkgs.buildPythonApplication rec { pname = "nbqa"; - version = "1.7.0"; + version = "1.7.1"; + pyproject = true; src = fetchFromGitHub { owner = "nbQA-dev"; repo = "nbQA"; - rev = version; - hash = "sha256-CTF5HisBS44Ta18cVT04UrMIF30WmEBwZBGW7fkKXwk="; + rev = "refs/tags/${version}"; + hash = "sha256-a/FuhJyf8BmZekUibzEiGgkHL51A+75R4a6S+h5i28s="; }; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + passthru.optional-dependencies = { black = [ black ]; blacken-docs = [ blacken-docs ]; @@ -76,9 +81,6 @@ python3.pkgs.buildPythonApplication rec { "test_running_in_different_dir_works" "test_unable_to_reconstruct_message_pythonpath" "test_with_subcommand" - # Broken since ruff was updated to 0.1.2 - # A PR was opened upstream: https://github.com/nbQA-dev/nbQA/issues/834 - "test_ruff_works" ]; disabledTestPaths = [ diff --git a/nixpkgs/pkgs/tools/misc/ntfy-sh/default.nix b/nixpkgs/pkgs/tools/misc/ntfy-sh/default.nix index 2ee18cb3da1c..1bfde93c39e5 100644 --- a/nixpkgs/pkgs/tools/misc/ntfy-sh/default.nix +++ b/nixpkgs/pkgs/tools/misc/ntfy-sh/default.nix @@ -42,7 +42,7 @@ buildGoModule rec { mkdocs python3 python3Packages.mkdocs-material - python3Packages.mkdocs-minify + python3Packages.mkdocs-minify-plugin python3Packages.mkdocs-simple-hooks ]; diff --git a/nixpkgs/pkgs/tools/misc/oscclip/default.nix b/nixpkgs/pkgs/tools/misc/oscclip/default.nix index 6c68c4a6f24a..3020998d9392 100644 --- a/nixpkgs/pkgs/tools/misc/oscclip/default.nix +++ b/nixpkgs/pkgs/tools/misc/oscclip/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = with python3Packages; [ poetry-core ]; meta = with lib; { - description = "A program that allows to copy/paste from a terminal using osc-52 control sequences."; + description = "A program that allows to copy/paste from a terminal using osc-52 control sequences"; longDescription = '' oscclip provides two commands: osc-copy and osc-paste. These commands allow to interact with the clipboard through the terminal directly. This means that they work through ssh sessions for example (given that the terminal supports osc-52 sequences). diff --git a/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix b/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix index be78d6c02600..774ccd946aa7 100644 --- a/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , meson , ninja @@ -26,6 +27,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-i6bTG7XvBwVuOIeeBwZxr7z+wOtBqH+ZUEULu4MbCh0="; }; + patches = [ + # Fix build with libxml 2.12 + (fetchpatch { + url = "https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/019487cbc79925e49988789bf533c78dab7e1842.patch"; + hash = "sha256-skuspjHDRilwym+hFInrSvIZ+rrzBOoI7WeFj2SrGkc="; + }) + (fetchpatch { + url = "https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/34378a4ac257f2f5fcf364786d1634a8c36b304f.patch"; + hash = "sha256-I9vRRbnotqRi8+7q1eZLJwQLaT9J4G3h+3rKxlaCME4="; + }) + ]; + nativeBuildInputs = [ meson ninja diff --git a/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix b/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix index 6ed29433a35d..59d477b62fe2 100644 --- a/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix +++ b/nixpkgs/pkgs/tools/misc/paperlike-go/default.nix @@ -19,7 +19,7 @@ buildGoModule { subPackages = [ "cmd/paperlike-cli" ]; meta = { - description = "paperlike-go is a Linux Go library and CLI utility to control a Dasung Paperlike display via I2C DDC."; + description = "A Linux Go library and CLI utility to control a Dasung Paperlike display via I2C DDC"; homepage = "https://github.com/leoluk/paperlike-go"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.adisbladis ]; diff --git a/nixpkgs/pkgs/tools/misc/partition-manager/default.nix b/nixpkgs/pkgs/tools/misc/partition-manager/default.nix deleted file mode 100644 index 8dde1e68bd29..000000000000 --- a/nixpkgs/pkgs/tools/misc/partition-manager/default.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ mkDerivation -, fetchurl -, lib -, extra-cmake-modules -, kdoctools -, wrapGAppsHook -, kconfig -, kcrash -, kinit -, kpmcore -, polkit-qt -, cryptsetup -, lvm2 -, mdadm -, smartmontools -, systemdMinimal -, util-linux -, btrfs-progs -, dosfstools -, e2fsprogs -, exfat -, f2fs-tools -, fatresize -, hfsprogs -, jfsutils -, nilfs-utils -, ntfs3g -, reiser4progs -, reiserfsprogs -, udftools -, xfsprogs -, zfs -}: - -let - # External programs are resolved by `partition-manager` and then - # invoked by `kpmcore_externalcommand` from `kpmcore` as root. - # So these packages should be in PATH of `partition-manager`. - # https://github.com/KDE/kpmcore/blob/06f15334ecfbe871730a90dbe2b694ba060ee998/src/util/externalcommand_whitelist.h - runtimeDeps = lib.makeBinPath [ - cryptsetup - lvm2 - mdadm - smartmontools - systemdMinimal - util-linux - - btrfs-progs - dosfstools - e2fsprogs - exfat - f2fs-tools - fatresize - hfsprogs - jfsutils - nilfs-utils - ntfs3g - reiser4progs - reiserfsprogs - udftools - xfsprogs - zfs - - # FIXME: Missing command: tune.exfat hfsck hformat fsck.nilfs2 {fsck,mkfs,debugfs,tunefs}.ocfs2 - ]; - -in -mkDerivation rec { - pname = "partitionmanager"; - # NOTE: When changing this version, also change the version of `kpmcore`. - version = "23.04.1"; - - src = fetchurl { - url = "mirror://kde/stable/release-service/${version}/src/${pname}-${version}.tar.xz"; - hash = "sha256-iMf6/QOJIDTKHAsCg3ey4GX0QHwrYl2LcCWxZsolMl8="; - }; - - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - - propagatedBuildInputs = [ kconfig kcrash kinit kpmcore polkit-qt ]; - - dontWrapGApps = true; - preFixup = '' - qtWrapperArgs+=( - "''${gappsWrapperArgs[@]}" - --prefix PATH : "${runtimeDeps}" - ) - ''; - - meta = with lib; { - description = "KDE Partition Manager"; - longDescription = '' - KDE Partition Manager is a utility to help you manage the disks, partitions, and file systems on your computer. - It allows you to easily create, copy, move, delete, back up, restore, and resize them without losing data. - It supports a large number of file systems, including ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS and more. - - To install on NixOS, use the option `programs.partition-manager.enable = true`. - ''; - license = with licenses; [ cc-by-40 cc0 gpl3Plus lgpl3Plus mit ]; - homepage = "https://www.kde.org/applications/system/kdepartitionmanager/"; - maintainers = with maintainers; [ peterhoeg oxalica ]; - mainProgram = "partitionmanager"; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix b/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix index 70404d0a0ae3..a856ef8cf3d9 100644 --- a/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.19.1"; + version = "2.19.3"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-lBAht2r48+nlCrJTUPzcJK2Nd5pPqStTv27jghtF8e4="; + sha256 = "sha256-Picdgy4CnMnKjENPfRvu0zLhykbH/uM0JfHh7cwDdoQ="; }; - vendorHash = "sha256-0oepdfm+MWA/F+B/Ayl2PiBvOL4bA9iUNV+zculIaN8="; + vendorHash = "sha256-an43wSx5zhMirKAUnYv+5kDcUlv1fe1+mLGbBS7p4Qs="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix b/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix index 689a502efde1..6252425580d6 100644 --- a/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix +++ b/nixpkgs/pkgs/tools/misc/plantuml-server/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - description = "A web application to generate UML diagrams on-the-fly."; + description = "A web application to generate UML diagrams on-the-fly"; homepage = "https://plantuml.com/"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/misc/plocate/default.nix b/nixpkgs/pkgs/tools/misc/plocate/default.nix index 8cc8b9b6b801..5081ec12b0ba 100644 --- a/nixpkgs/pkgs/tools/misc/plocate/default.nix +++ b/nixpkgs/pkgs/tools/misc/plocate/default.nix @@ -10,12 +10,12 @@ }: stdenv.mkDerivation rec { pname = "plocate"; - version = "1.1.20"; + version = "1.1.21"; src = fetchgit { url = "https://git.sesse.net/plocate"; rev = version; - sha256 = "sha256-Nc39wPVW+GpmT8X8q/VbrPhPxO/PgFBPTOCWAkkUfDY="; + sha256 = "sha256-ucCRm1w3ON3Qh7qt1Pf5/3kvXVGP+dJwjSuwYGcDMcs="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/pokeget-rs/default.nix b/nixpkgs/pkgs/tools/misc/pokeget-rs/default.nix index d6e790595c5d..55995e8b0bce 100644 --- a/nixpkgs/pkgs/tools/misc/pokeget-rs/default.nix +++ b/nixpkgs/pkgs/tools/misc/pokeget-rs/default.nix @@ -5,17 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "pokeget-rs"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "talwat"; repo = "pokeget-rs"; rev = version; - hash = "sha256-C7pEe9nScJ/ORJJrUDo6pADKceKoagHGP/X/asR1PcM="; + hash = "sha256-++MD7XYWJ4Oim/VSYSisu/DwazOEfQ4CJNLfR5sjP3M="; fetchSubmodules = true; }; - cargoHash = "sha256-gPPtVFSaaSL0QBXxHpslVdon3XVCVx1E5cfEP1Ffa9g="; + cargoHash = "sha256-lWImtmtoo3ujbHvaeijuVjt0NQhdp+mxuu8oxNutr2E="; meta = with lib; { description = "A better rust version of pokeget"; diff --git a/nixpkgs/pkgs/tools/misc/pouf/default.nix b/nixpkgs/pkgs/tools/misc/pouf/default.nix index 8029d77fcbc8..e114af2c2c1e 100644 --- a/nixpkgs/pkgs/tools/misc/pouf/default.nix +++ b/nixpkgs/pkgs/tools/misc/pouf/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { postInstall = "make PREFIX=$out copy-data"; meta = with lib; { - description = "A cli program for produce fake datas."; + description = "A CLI program for produce fake datas"; homepage = "https://github.com/mothsart/pouf"; changelog = "https://github.com/mothsart/pouf/releases/tag/${version}"; maintainers = with maintainers; [ mothsart ]; diff --git a/nixpkgs/pkgs/tools/misc/remote-exec/default.nix b/nixpkgs/pkgs/tools/misc/remote-exec/default.nix index afedab81cbd6..557bde26c465 100644 --- a/nixpkgs/pkgs/tools/misc/remote-exec/default.nix +++ b/nixpkgs/pkgs/tools/misc/remote-exec/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , buildPythonApplication , click -, pydantic +, pydantic_1 , toml , watchdog , pytestCheckHook @@ -29,7 +29,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ click - pydantic + pydantic_1 toml watchdog ]; diff --git a/nixpkgs/pkgs/tools/misc/seaborn-data/default.nix b/nixpkgs/pkgs/tools/misc/seaborn-data/default.nix index 2ff8c4d40a5c..5ac78f1eef25 100644 --- a/nixpkgs/pkgs/tools/misc/seaborn-data/default.nix +++ b/nixpkgs/pkgs/tools/misc/seaborn-data/default.nix @@ -4,7 +4,7 @@ let version = "unstable-2023-01-26"; dontBuild = true; meta = with lib; { - description = "Data repository for seaborn examples."; + description = "Data repository for seaborn examples"; homepage = "https://github.com/mwaskom/seaborn-data"; platforms = platforms.all; maintainers = with maintainers; [ mbalatsko ]; diff --git a/nixpkgs/pkgs/tools/misc/see/default.nix b/nixpkgs/pkgs/tools/misc/see/default.nix index 025d22facd2a..592bc59262ca 100644 --- a/nixpkgs/pkgs/tools/misc/see/default.nix +++ b/nixpkgs/pkgs/tools/misc/see/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication { ]; meta = { - description = "Textualize See is a command line tool to open files in the terminal."; + description = "A CLI tool to open files in the terminal"; homepage = "https://github.com/Textualize/textualize-see"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ anselmschueler ]; diff --git a/nixpkgs/pkgs/tools/misc/semiphemeral/default.nix b/nixpkgs/pkgs/tools/misc/semiphemeral/default.nix index 7ccdd663082f..7208dca81176 100644 --- a/nixpkgs/pkgs/tools/misc/semiphemeral/default.nix +++ b/nixpkgs/pkgs/tools/misc/semiphemeral/default.nix @@ -5,11 +5,11 @@ python3.pkgs.buildPythonApplication rec { pname = "semiphemeral"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "c90d73b14c826f262b1339d1f5926c5abc6431181090ea87177af821c0866fb7"; + sha256 = "sha256-KRi3zfRWGRZJjQ6KPqBI9wQ6yU8Ohx0TDtA5qoak35U="; }; doCheck = false; # upstream has no tests diff --git a/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix b/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix index d585632810f4..238b9f400b89 100644 --- a/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "The package provides utilities used by programs to sensibly select and spawn an appropriate browser, editor, or pager."; + description = "A collection of utilities used by programs to sensibly select and spawn an appropriate browser, editor, or pager"; longDescription = '' The specific utilities included are: - sensible-browser diff --git a/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix index 08da05b8205b..a4947eb6c8bd 100644 --- a/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "sqlite3-to-mysql"; - version = "2.1.6"; + version = "2.1.7"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.8"; @@ -18,11 +18,12 @@ python3Packages.buildPythonApplication rec { owner = "techouse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RIe4If7R8snbNN2yIPxAh39EQplVyhMF2c0G06Zipds="; + hash = "sha256-TglHny0HgVth3o73GQYddh9sdyQ0L+4J4dJBAeJToiM="; }; nativeBuildInputs = with python3Packages; [ hatchling + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3Packages; [ @@ -41,6 +42,10 @@ python3Packages.buildPythonApplication rec { mysql80 ]; + pythonRelaxDeps = [ + "mysql-connector-python" + ]; + # tests require a mysql server instance doCheck = false; diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index 788a913c7907..605867e285c2 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -28,6 +28,11 @@ rustPlatform.buildRustPackage rec { NIX_LDFLAGS = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "-framework" "AppKit" ]; + # tries to access HOME only in aarch64-darwin environment when building mac-notification-sys + preBuild = lib.optionalString (stdenv.isDarwin && stdenv.isAarch64) '' + export HOME=$TMPDIR + ''; + postInstall = '' installShellCompletion --cmd starship \ --bash <($out/bin/starship completions bash) \ diff --git a/nixpkgs/pkgs/tools/misc/tagref/default.nix b/nixpkgs/pkgs/tools/misc/tagref/default.nix index df393571d380..928945f4daa6 100644 --- a/nixpkgs/pkgs/tools/misc/tagref/default.nix +++ b/nixpkgs/pkgs/tools/misc/tagref/default.nix @@ -1,4 +1,5 @@ { lib, fetchFromGitHub, rustPlatform }: + rustPlatform.buildRustPackage rec { pname = "tagref"; version = "1.8.4"; @@ -13,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-Wis6C4Wlz7NScFeKXWODA8BKmRtL7adaYxPVR13wNsg="; meta = with lib; { - description = "Tagref helps you refer to other locations in your codebase."; + description = "Manage cross-references in your code"; homepage = "https://github.com/stepchowfun/tagref"; license = licenses.mit; maintainers = [ maintainers.yusdacra ]; diff --git a/nixpkgs/pkgs/tools/misc/tailspin/default.nix b/nixpkgs/pkgs/tools/misc/tailspin/default.nix index b46b25979a51..15af583ce0c4 100644 --- a/nixpkgs/pkgs/tools/misc/tailspin/default.nix +++ b/nixpkgs/pkgs/tools/misc/tailspin/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "tailspin"; - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "bensadeh"; repo = "tailspin"; rev = version; - hash = "sha256-ggh0y50yzqWQbjdP/weboEmo4CpfAGZmtt1WWLokpZ8="; + hash = "sha256-xr9dxq6hUlF3kcXCfmnX2C71NYuGducD0BwbQDnyYJU="; }; - cargoHash = "sha256-R67bHDGFxCStKKHTR820r0CjbrqjQ6evtnBMaqCDRYM="; + cargoHash = "sha256-1jPVCYq8W+LjJCdEimImUcSmd2OvIKMs5n9yl3g7sBM="; meta = with lib; { description = "A log file highlighter"; diff --git a/nixpkgs/pkgs/tools/misc/tbls/default.nix b/nixpkgs/pkgs/tools/misc/tbls/default.nix index 9a3c99359548..060232d8c2f7 100644 --- a/nixpkgs/pkgs/tools/misc/tbls/default.nix +++ b/nixpkgs/pkgs/tools/misc/tbls/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.72.0"; + version = "1.72.1"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-FxG8vTbBMgFa+z1/8+ci7UxOfU88JynenZfVBh+0UPM="; + hash = "sha256-ZkJ1+o4xWQX63/2hdhnE5hyVrZIn1O2kmaiZ1853X/8="; }; - vendorHash = "sha256-1w1pQyHTuEJ1w01lJIZhXuEArFigjoFKGvi0cpFd8m0="; + vendorHash = "sha256-IczwqqCQeTpXiDSJxX8ErmO4Ap+coIRAQTmRoDNtdXs="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/tdfgo/default.nix b/nixpkgs/pkgs/tools/misc/tdfgo/default.nix index bd9603b5fa98..0d9e5950b51a 100644 --- a/nixpkgs/pkgs/tools/misc/tdfgo/default.nix +++ b/nixpkgs/pkgs/tools/misc/tdfgo/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorHash = "sha256-T6PSs5NfXSXvzlq67rIDbzURyA+25df3nMMfufo0fow="; meta = with lib; { - description = "TheDraw font parser and console text renderer."; + description = "TheDraw font parser and console text renderer"; longDescription = "Supports more fonts than `tdfiglet`, and packs more features."; homepage = "https://github.com/digitallyserviced/tdfgo"; license = licenses.cc0; diff --git a/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix b/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix index a9aa41a9d992..53aeb3982fea 100644 --- a/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmux-sessionizer/default.nix @@ -10,7 +10,7 @@ }: let name = "tmux-sessionizer"; - version = "0.3.0"; + version = "0.3.2"; in rustPlatform.buildRustPackage { pname = name; @@ -20,10 +20,10 @@ in rustPlatform.buildRustPackage { owner = "jrmoulton"; repo = name; rev = "v${version}"; - hash = "sha256-ZascTDIV9MqPPtK0CHSXUW5gIk/zjRhUB0xATcu7ICM="; + hash = "sha256-8RQ67v2Cw681zikxYnq0Pb2ybh26w8mUbHKAC4TjYWA="; }; - cargoHash = "sha256-lZi72OJ+AnnLxf/zxwAERfy1oW8dE8bGF8hFwwrUXqE="; + cargoHash = "sha256-ZOWoUBna8U0A/sYwXMf4Z7Vi+KqM7VinWhmtO8Q0HtU="; passthru.tests.version = testers.testVersion { package = tmux-sessionizer; diff --git a/nixpkgs/pkgs/tools/misc/tmuxp/default.nix b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix index 8babec312268..1d1eaa53e7bb 100644 --- a/nixpkgs/pkgs/tools/misc/tmuxp/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmuxp/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "tmuxp"; - version = "1.29.0"; + version = "1.34.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-MiXG4MVzomyc4LjovPsvhmPngtJv85s6Ypo/Cm2Whho="; + hash = "sha256-G93YtgXo4li+tLWKgJFaxx4Ax4sK4F+vK6M3WTXIeiU="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://tmuxp.git-pull.com/"; changelog = "https://github.com/tmux-python/tmuxp/raw/v${version}/CHANGES"; license = licenses.mit; - maintainers = with maintainers; [ peterhoeg ]; + maintainers = with maintainers; [ peterhoeg otavio ]; mainProgram = "tmuxp"; }; } diff --git a/nixpkgs/pkgs/tools/misc/trillian/default.nix b/nixpkgs/pkgs/tools/misc/trillian/default.nix index 92b931fd1d9e..1c2422bb3391 100644 --- a/nixpkgs/pkgs/tools/misc/trillian/default.nix +++ b/nixpkgs/pkgs/tools/misc/trillian/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/google/trillian"; - description = "A transparent, highly scalable and cryptographically verifiable data store."; + description = "A transparent, highly scalable and cryptographically verifiable data store"; license = [ licenses.asl20 ]; maintainers = [ maintainers.adisbladis ]; }; diff --git a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix index 4e8d7ca8f9fe..1f5e5911d7a1 100644 --- a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix @@ -1,31 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, ncurses }: +{ lib, stdenv, fetchFromGitHub, ncurses, pkg-config }: stdenv.mkDerivation rec { pname = "ttyplot"; - version = "1.5.2"; + version = "1.6.1"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - sha256 = "sha256-BYMdGNDl8HUin1Hu4Fqgx305a/tTt1fztqlT2vDeTh8="; + hash = "sha256-SQ5keCcwzQsSxfSevQwRa1eNf+8JXsrh1vljehI4tPc="; }; - buildInputs = [ ncurses ]; + buildInputs = [ + pkg-config + ncurses + ]; - buildPhase = '' - ${stdenv.cc}/bin/cc ./ttyplot.c -lncurses -o ttyplot - ''; - - installPhase = '' - mkdir -p $out/bin - cp ttyplot $out/bin/ - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { description = "A simple general purpose plotting utility for tty with data input from stdin"; homepage = "https://github.com/tenox7/ttyplot"; - license = licenses.unlicense; + license = licenses.asl20; maintainers = with maintainers; [ lassulus ]; mainProgram = "ttyplot"; }; diff --git a/nixpkgs/pkgs/tools/misc/tvnamer/default.nix b/nixpkgs/pkgs/tools/misc/tvnamer/default.nix index ba3a91bcde16..d1ddb319dc19 100644 --- a/nixpkgs/pkgs/tools/misc/tvnamer/default.nix +++ b/nixpkgs/pkgs/tools/misc/tvnamer/default.nix @@ -44,7 +44,7 @@ pypkgs.buildPythonApplication rec { doCheck = false; meta = with lib; { - description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api."; + description = "Automatic TV episode file renamer, uses data from thetvdb.com via tvdb_api"; homepage = "https://github.com/dbr/tvnamer"; license = licenses.unlicense; maintainers = with maintainers; [ peterhoeg ]; diff --git a/nixpkgs/pkgs/tools/misc/ugs/default.nix b/nixpkgs/pkgs/tools/misc/ugs/default.nix index 58c221ee9e84..9364b1f871ea 100644 --- a/nixpkgs/pkgs/tools/misc/ugs/default.nix +++ b/nixpkgs/pkgs/tools/misc/ugs/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { desktopItems = [ desktopItem ]; meta = with lib; { - description = "A cross-platform G-Code sender for GRBL, Smoothieware, TinyG and G2core."; + description = "A cross-platform G-Code sender for GRBL, Smoothieware, TinyG and G2core"; homepage = "https://github.com/winder/Universal-G-Code-Sender"; maintainers = with maintainers; [ matthewcroughan ]; sourceProvenance = with sourceTypes; [ binaryBytecode ]; diff --git a/nixpkgs/pkgs/tools/misc/vector/Cargo.lock b/nixpkgs/pkgs/tools/misc/vector/Cargo.lock index adbac39dd892..193099d1733d 100644 --- a/nixpkgs/pkgs/tools/misc/vector/Cargo.lock +++ b/nixpkgs/pkgs/tools/misc/vector/Cargo.lock @@ -66,7 +66,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "once_cell", "version_check", ] @@ -78,7 +78,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "getrandom 0.2.11", "once_cell", "version_check", "zerocopy", @@ -227,15 +227,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "anymap" -version = "1.0.0-beta.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f1f8f5a6f3d50d89e3797d7593a50f96bb2aaa20ca0cc7be1fb673232c91d72" +checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355" [[package]] name = "apache-avro" @@ -302,7 +296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c6368f9ae5c6ec403ca910327ae0c9437b0a85255b6950c90d497e6177f6e5e" dependencies = [ "proc-macro-hack", - "quote 1.0.33", + "quote 1.0.35", "syn 1.0.109", ] @@ -355,7 +349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" dependencies = [ "anstyle", - "bstr 1.7.0", + "bstr 1.9.0", "doc-comment", "predicates", "predicates-core", @@ -389,9 +383,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "flate2", "futures-core", @@ -456,9 +450,9 @@ dependencies = [ [[package]] name = "async-graphql" -version = "6.0.9" +version = "6.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "117113a7ff4a98f2a864fa7a5274033b0907fce65dc8464993c75033f8074f90" +checksum = "298a5d587d6e6fdb271bf56af2dc325a80eb291fd0fc979146584b9a05494a8c" dependencies = [ "async-graphql-derive", "async-graphql-parser", @@ -470,7 +464,7 @@ dependencies = [ "chrono", "fnv", "futures-util", - "http", + "http 0.2.9", "indexmap 2.1.0", "mime", "multer", @@ -487,26 +481,26 @@ dependencies = [ [[package]] name = "async-graphql-derive" -version = "6.0.9" +version = "6.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4bb7b7b2344d24af860776b7fe4e4ee4a67cd965f076048d023f555703b854" +checksum = "c7f329c7eb9b646a72f70c9c4b516c70867d356ec46cb00dcac8ad343fd006b0" dependencies = [ "Inflector", "async-graphql-parser", "darling 0.20.3", "proc-macro-crate 1.3.1", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "strum", - "syn 2.0.39", + "syn 2.0.46", "thiserror", ] [[package]] name = "async-graphql-parser" -version = "6.0.9" +version = "6.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c47e1c1ff6cb7cae62c9cd768d76475cc68f156d8234b024fd2499ad0e91da21" +checksum = "6139181845757fd6a73fbb8839f3d036d7150b798db0e9bb3c6e83cdd65bd53b" dependencies = [ "async-graphql-value", "pest", @@ -516,9 +510,9 @@ dependencies = [ [[package]] name = "async-graphql-value" -version = "6.0.9" +version = "6.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2270df3a642efce860ed06fbcf61fc6db10f83c2ecb5613127fb453c82e012a4" +checksum = "323a5143f5bdd2030f45e3f2e0c821c9b1d36e79cf382129c64299c50a7f3750" dependencies = [ "bytes 1.5.0", "indexmap 2.1.0", @@ -528,9 +522,9 @@ dependencies = [ [[package]] name = "async-graphql-warp" -version = "6.0.9" +version = "6.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d54ac2c41da8f2bc2b5976227d585e787b55f696660d26fd6e1bee50e740f98" +checksum = "fa68237ec9f2190cae295122ba45612b992658fbc372d142c6c6981cc70a9eac" dependencies = [ "async-graphql", "futures-util", @@ -571,7 +565,7 @@ dependencies = [ "futures-lite", "parking", "polling 3.3.0", - "rustix 0.38.21", + "rustix 0.38.28", "slab", "tracing 0.1.40", "waker-fn", @@ -600,21 +594,21 @@ dependencies = [ [[package]] name = "async-nats" -version = "0.32.1" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e45b67ea596bb94741ef15ba1d90b72c92bdc07553d8033734cb620a2b39f1c" +checksum = "dbc1f1a75fd07f0f517322d103211f12d757658e91676def9a2e688774656c60" dependencies = [ "base64 0.21.5", "bytes 1.5.0", - "futures 0.3.29", - "http", + "futures 0.3.30", + "http 0.2.9", "memchr", - "nkeys", + "nkeys 0.3.2", "nuid", "once_cell", "rand 0.8.5", "regex", - "ring 0.16.20", + "ring 0.17.5", "rustls 0.21.8", "rustls-native-certs", "rustls-pemfile", @@ -656,7 +650,7 @@ dependencies = [ "cfg-if", "event-listener 3.0.1", "futures-lite", - "rustix 0.38.21", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -678,9 +672,9 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -695,7 +689,7 @@ dependencies = [ "cfg-if", "futures-core", "futures-io", - "rustix 0.38.21", + "rustix 0.38.28", "signal-hook-registry", "slab", "windows-sys 0.48.0", @@ -718,9 +712,9 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -731,13 +725,13 @@ checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -781,7 +775,7 @@ dependencies = [ "aws-types", "bytes 1.5.0", "hex", - "http", + "http 0.2.9", "hyper", "ring 0.16.20", "time", @@ -811,7 +805,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "aws-types", - "http", + "http 0.2.9", "regex", "tracing 0.1.40", ] @@ -826,7 +820,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "http-body", "lazy_static", "percent-encoding", @@ -853,7 +847,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -876,7 +870,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -899,7 +893,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -922,7 +916,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tower", ] @@ -944,7 +938,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -973,7 +967,7 @@ dependencies = [ "bytes 1.5.0", "bytes-utils", "fastrand 1.9.0", - "http", + "http 0.2.9", "http-body", "once_cell", "percent-encoding", @@ -1003,7 +997,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -1028,7 +1022,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -1051,7 +1045,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tower", @@ -1076,7 +1070,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes 1.5.0", - "http", + "http 0.2.9", "regex", "tower", "tracing 0.1.40", @@ -1092,7 +1086,7 @@ dependencies = [ "aws-smithy-eventstream", "aws-smithy-http", "aws-types", - "http", + "http 0.2.9", "tracing 0.1.40", ] @@ -1107,7 +1101,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac", - "http", + "http 0.2.9", "once_cell", "percent-encoding", "regex", @@ -1138,7 +1132,7 @@ dependencies = [ "crc32c", "crc32fast", "hex", - "http", + "http 0.2.9", "http-body", "md-5", "pin-project-lite", @@ -1159,7 +1153,7 @@ dependencies = [ "aws-smithy-types", "bytes 1.5.0", "fastrand 1.9.0", - "http", + "http 0.2.9", "http-body", "hyper", "hyper-rustls 0.23.2", @@ -1192,7 +1186,7 @@ dependencies = [ "bytes 1.5.0", "bytes-utils", "futures-core", - "http", + "http 0.2.9", "http-body", "hyper", "once_cell", @@ -1210,7 +1204,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes 1.5.0", - "http", + "http 0.2.9", "http-body", "pin-project-lite", "tower", @@ -1231,7 +1225,7 @@ version = "0.54.1" source = "git+https://github.com/vectordotdev/aws-sdk-rust?rev=3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670#3d6aefb7fcfced5fc2a7e761a87e4ddbda1ee670" dependencies = [ "assert-json-diff 1.1.0", - "http", + "http 0.2.9", "pretty_assertions", "regex", "roxmltree 0.14.1", @@ -1278,7 +1272,7 @@ dependencies = [ "aws-smithy-client", "aws-smithy-http", "aws-smithy-types", - "http", + "http 0.2.9", "rustc_version 0.4.0", "tracing 0.1.40", ] @@ -1294,7 +1288,7 @@ dependencies = [ "bitflags 1.3.2", "bytes 1.5.0", "futures-util", - "http", + "http 0.2.9", "http-body", "hyper", "itoa", @@ -1321,7 +1315,7 @@ dependencies = [ "async-trait", "bytes 1.5.0", "futures-util", - "http", + "http 0.2.9", "http-body", "mime", "rustversion", @@ -1339,8 +1333,8 @@ dependencies = [ "base64 0.21.5", "bytes 1.5.0", "dyn-clone", - "futures 0.3.29", - "getrandom 0.2.10", + "futures 0.3.30", + "getrandom 0.2.11", "http-types", "log", "paste", @@ -1365,7 +1359,7 @@ dependencies = [ "async-lock 3.0.0", "async-trait", "azure_core", - "futures 0.3.29", + "futures 0.3.30", "log", "oauth2", "pin-project", @@ -1387,7 +1381,7 @@ dependencies = [ "async-trait", "azure_core", "bytes 1.5.0", - "futures 0.3.29", + "futures 0.3.30", "hmac", "log", "serde", @@ -1409,7 +1403,7 @@ dependencies = [ "azure_core", "azure_storage", "bytes 1.5.0", - "futures 0.3.29", + "futures 0.3.30", "log", "serde", "serde_derive", @@ -1425,7 +1419,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "instant", "rand 0.8.5", ] @@ -1535,8 +1529,8 @@ version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9990737a6d5740ff51cdbbc0f0503015cb30c390f6623968281eb214a520cfc0" dependencies = [ - "quote 1.0.33", - "syn 2.0.39", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -1608,7 +1602,7 @@ dependencies = [ "futures-util", "hex", "home", - "http", + "http 0.2.9", "hyper", "hyper-rustls 0.24.2", "hyperlocal", @@ -1645,54 +1639,33 @@ dependencies = [ [[package]] name = "borsh" -version = "0.10.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" dependencies = [ "borsh-derive", - "hashbrown 0.13.1", + "cfg_aliases", ] [[package]] name = "borsh-derive" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", - "proc-macro-crate 0.1.5", - "proc-macro2 1.0.69", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" -dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" +checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 1.0.109", + "once_cell", + "proc-macro-crate 2.0.0", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", + "syn_derive", ] [[package]] name = "bson" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58da0ae1e701ea752cc46c1bb9f39d5ecefc7395c3ecd526261a566d4f16e0c2" +checksum = "61570f4de0cc9c03b481c96057b3ae7c6ff7b5b35da8b0832c44f0131987a718" dependencies = [ "ahash 0.8.6", "base64 0.13.1", @@ -1722,9 +1695,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", "regex-automata 0.4.3", @@ -1754,8 +1727,8 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] @@ -1815,7 +1788,7 @@ dependencies = [ "ahash 0.8.6", "cached_proc_macro", "cached_proc_macro_types", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "instant", "once_cell", "thiserror", @@ -1828,8 +1801,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c878c71c2821aa2058722038a59a67583a4240524687c6028571c9b395ded61f" dependencies = [ "darling 0.14.4", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] @@ -1841,12 +1814,12 @@ checksum = "3a4f925191b4367301851c6d99b09890311d74b0d43f274c0b34c86d308a3663" [[package]] name = "cargo_toml" -version = "0.17.0" +version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ca592ad99e6a0fd4b95153406138b997cc26ccd3cd0aecdfd4fbdbf1519bd77" +checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719" dependencies = [ "serde", - "toml 0.8.6", + "toml 0.8.8", ] [[package]] @@ -1902,6 +1875,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + +[[package]] name = "chacha20" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1952,9 +1931,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76" +checksum = "91d7b79e99bfaa0d47da0687c43aa3b7381938a62ad3a6498599039321f660b7" dependencies = [ "chrono", "chrono-tz-build", @@ -2001,6 +1980,12 @@ dependencies = [ ] [[package]] +name = "cidr" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d18b093eba54c9aaa1e3784d4361eb2ba944cf7d0a932a830132238f483e8d8" + +[[package]] name = "cidr-utils" version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2014,6 +1999,17 @@ dependencies = [ ] [[package]] +name = "cidr-utils" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25c0a9fb70c2c2cc2a520aa259b1d1345650046a07df1b6da1d3cefcd327f43e" +dependencies = [ + "cidr", + "num-bigint", + "num-traits", +] + +[[package]] name = "cipher" version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2041,9 +2037,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.7" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" +checksum = "dcfab8ba68f3668e89f6ff60f5b205cea56aa7b769451a59f34b8682f51c056d" dependencies = [ "clap_builder", "clap_derive", @@ -2051,19 +2047,19 @@ dependencies = [ [[package]] name = "clap-verbosity-flag" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5fdbb015d790cfb378aca82caf9cc52a38be96a7eecdb92f31b4366a8afc019" +checksum = "3c90e95e5bd4e8ac34fa6f37c774b0c6f8ed06ea90c79931fd448fcf941a9767" dependencies = [ - "clap 4.4.7", + "clap 4.4.12", "log", ] [[package]] name = "clap_builder" -version = "4.4.7" +version = "4.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" +checksum = "fb7fb5e4e979aec3be7791562fcba452f94ad85e954da024396433e0e25a79e9" dependencies = [ "anstream", "anstyle", @@ -2074,11 +2070,11 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.4.4" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" +checksum = "97aeaa95557bd02f23fbb662f981670c3d20c5a26e69f7354b28f57092437fcd" dependencies = [ - "clap 4.4.7", + "clap 4.4.12", ] [[package]] @@ -2088,9 +2084,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -2101,13 +2097,11 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc" dependencies = [ "error-code", - "str-buf", - "winapi", ] [[package]] @@ -2129,14 +2123,15 @@ dependencies = [ "csv-core", "derivative", "dyn-clone", - "futures 0.3.29", + "futures 0.3.30", "indoc", "memchr", "once_cell", - "ordered-float 4.1.1", - "prost 0.12.1", + "ordered-float 4.2.0", + "prost 0.12.3", "prost-reflect", "regex", + "rstest", "serde", "serde_json", "similar-asserts", @@ -2146,6 +2141,7 @@ dependencies = [ "tokio", "tokio-util", "tracing 0.1.40", + "uuid", "vector-common", "vector-config", "vector-config-common", @@ -2173,11 +2169,10 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "colored" -version = "2.0.4" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" +checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" dependencies = [ - "is-terminal", "lazy_static", "windows-sys 0.48.0", ] @@ -2264,8 +2259,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" dependencies = [ "futures-core", - "prost 0.12.1", - "prost-types 0.12.1", + "prost 0.12.3", + "prost-types 0.12.3", "tonic 0.10.2", "tracing-core 0.1.32", ] @@ -2282,7 +2277,7 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", - "prost-types 0.12.1", + "prost-types 0.12.3", "serde", "serde_json", "thread_local", @@ -2403,9 +2398,9 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.4.7", + "clap 4.4.12", "criterion-plot", - "futures 0.3.29", + "futures 0.3.30", "is-terminal", "itertools 0.10.5", "num-traits", @@ -2478,9 +2473,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] @@ -2519,9 +2514,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", "rand_core 0.6.4", @@ -2608,9 +2603,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -2651,8 +2646,8 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "strsim 0.10.0", "syn 1.0.109", ] @@ -2665,8 +2660,8 @@ checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "strsim 0.10.0", "syn 1.0.109", ] @@ -2679,10 +2674,10 @@ checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "strsim 0.10.0", - "syn 2.0.39", + "syn 2.0.46", ] [[package]] @@ -2692,7 +2687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", - "quote 1.0.33", + "quote 1.0.35", "syn 1.0.109", ] @@ -2703,7 +2698,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ "darling_core 0.14.4", - "quote 1.0.33", + "quote 1.0.35", "syn 1.0.109", ] @@ -2714,8 +2709,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", - "quote 1.0.33", - "syn 2.0.39", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -2731,7 +2726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "lock_api", "once_cell", "parking_lot_core", @@ -2739,15 +2734,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "data-url" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" +checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] name = "db-key" @@ -2807,8 +2802,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] @@ -2818,9 +2813,9 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -2830,8 +2825,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "rustc_version 0.4.0", "syn 1.0.109", ] @@ -2940,8 +2935,8 @@ version = "0.1.0" dependencies = [ "criterion", "data-encoding", + "hickory-proto", "thiserror", - "trust-dns-proto 0.23.2", ] [[package]] @@ -2990,9 +2985,9 @@ checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "ecdsa" -version = "0.16.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der", "digest", @@ -3034,9 +3029,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" -version = "0.13.6" +version = "0.13.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97ca172ae9dc9f9b779a6e3a65d308f2af74e5b8c921299075bdb4a0370e914" +checksum = "e9775b22bc152ad86a0cf23f0f348b884b26add12bf741e7ffc4d4ab2ab4d205" dependencies = [ "base16ct", "crypto-bigint", @@ -3107,8 +3102,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] @@ -3119,9 +3114,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -3131,9 +3126,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ "once_cell", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -3151,9 +3146,9 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -3174,9 +3169,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -3193,21 +3188,21 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "erased-serde" -version = "0.3.31" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" +checksum = "a3286168faae03a0e583f6fde17c02c8b8bba2dcc2061d0f7817066e5b0af706" dependencies = [ "serde", ] [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3221,13 +3216,9 @@ dependencies = [ [[package]] name = "error-code" -version = "2.3.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc" [[package]] name = "event-listener" @@ -3278,8 +3269,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f47da3a72ec598d9c8937a7ebca8962a5c7a1f28444e38c2b33c771ba3f55f05" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] @@ -3345,14 +3336,14 @@ checksum = "a481586acf778f1b1455424c343f71124b048ffa5f4fc3f8f6ae9dc432dcb3c7" name = "file-source" version = "0.1.0" dependencies = [ - "bstr 1.7.0", + "bstr 1.9.0", "bytes 1.5.0", "chrono", "crc", "criterion", "dashmap", "flate2", - "futures 0.3.29", + "futures 0.3.30", "glob", "indexmap 2.1.0", "libc", @@ -3451,9 +3442,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -3491,9 +3482,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -3506,9 +3497,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -3516,15 +3507,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -3533,9 +3524,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -3554,26 +3545,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] name = "futures-sink" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" @@ -3583,9 +3574,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.29" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures 0.1.31", "futures-channel", @@ -3625,9 +3616,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -3668,7 +3659,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d351469a584f3b3565e2e740d4da60839bddc4320dadd7d61da8bdd77ffb373b" dependencies = [ "arc-swap", - "futures 0.3.29", + "futures 0.3.30", "log", "reqwest", "serde", @@ -3688,7 +3679,7 @@ checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4" dependencies = [ "cfg-if", "dashmap", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "no-std-compat", "nonzero_ext", @@ -3737,8 +3728,8 @@ dependencies = [ "graphql-parser", "heck 0.4.1", "lazy_static", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "serde", "serde_json", "syn 1.0.109", @@ -3751,7 +3742,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00bda454f3d313f909298f626115092d348bc231025699f557b27e248475f48c" dependencies = [ "graphql_client_codegen", - "proc-macro2 1.0.69", + "proc-macro2 1.0.74", "syn 1.0.109", ] @@ -3774,7 +3765,7 @@ source = "git+https://github.com/GreptimeTeam/greptimedb-client-rust.git?rev=bc3 dependencies = [ "dashmap", "enum_dispatch", - "futures 0.3.29", + "futures 0.3.30", "futures-util", "greptime-proto", "parking_lot", @@ -3811,17 +3802,36 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes 1.5.0", "fnv", "futures-core", "futures-sink", "futures-util", - "http", - "indexmap 1.9.3", + "http 0.2.9", + "indexmap 2.1.0", + "slab", + "tokio", + "tokio-util", + "tracing 0.1.40", +] + +[[package]] +name = "h2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d308f63daf4181410c242d34c11f928dcb3aa105852019e043c9d1f4e4368a" +dependencies = [ + "bytes 1.5.0", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 1.0.0", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -3860,9 +3870,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash 0.8.6", "allocator-api2", @@ -3870,11 +3880,11 @@ dependencies = [ [[package]] name = "hdrhistogram" -version = "7.5.2" +version = "7.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8" +checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" dependencies = [ - "base64 0.13.1", + "base64 0.21.5", "byteorder", "crossbeam-channel", "flate2", @@ -3891,7 +3901,7 @@ dependencies = [ "base64 0.21.5", "bytes 1.5.0", "headers-core", - "http", + "http 0.2.9", "httpdate", "mime", "sha1", @@ -3903,7 +3913,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.9", ] [[package]] @@ -3959,7 +3969,7 @@ version = "0.1.0-rc.1" source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" dependencies = [ "cfg-if", - "futures 0.3.29", + "futures 0.3.30", "glob", "heim-common", "heim-runtime", @@ -4039,7 +4049,7 @@ name = "heim-runtime" version = "0.1.0-rc.1" source = "git+https://github.com/vectordotdev/heim.git?branch=update-nix#76fa765c7ed7fbe43d1465bf52da6b8d19f2d2a9" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "once_cell", "smol", @@ -4067,6 +4077,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] +name = "hickory-proto" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner 0.6.0", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "thiserror", + "tinyvec", + "tokio", + "tracing 0.1.40", + "url", +] + +[[package]] name = "hkdf" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4116,13 +4150,24 @@ dependencies = [ ] [[package]] +name = "http" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" +dependencies = [ + "bytes 1.5.0", + "fnv", + "itoa", +] + +[[package]] name = "http-body" version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes 1.5.0", - "http", + "http 0.2.9", "pin-project-lite", ] @@ -4138,7 +4183,7 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee" dependencies = [ - "http", + "http 0.2.9", "serde", ] @@ -4152,7 +4197,7 @@ dependencies = [ "async-channel", "base64 0.13.1", "futures-lite", - "http", + "http 0.2.9", "infer 0.2.3", "pin-project-lite", "rand 0.7.3", @@ -4183,22 +4228,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes 1.5.0", "futures-channel", "futures-core", "futures-util", - "h2", - "http", + "h2 0.3.22", + "http 0.2.9", "http-body", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.5", "tokio", "tower-service", "tracing 0.1.40", @@ -4211,7 +4256,7 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6ee5d7a8f718585d1c3c61dfde28ef5b0bb14734b4db13f5ada856cdc6c612b" dependencies = [ - "http", + "http 0.2.9", "hyper", "linked_hash_set", "once_cell", @@ -4230,9 +4275,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" dependencies = [ "bytes 1.5.0", - "futures 0.3.29", + "futures 0.3.30", "headers", - "http", + "http 0.2.9", "hyper", "openssl", "tokio", @@ -4246,7 +4291,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ - "http", + "http 0.2.9", "hyper", "log", "rustls 0.20.9", @@ -4262,7 +4307,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", - "http", + "http 0.2.9", "hyper", "log", "rustls 0.21.8", @@ -4360,6 +4405,16 @@ dependencies = [ ] [[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] name = "indexmap" version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4377,7 +4432,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "serde", ] @@ -4454,9 +4509,9 @@ dependencies = [ [[package]] name = "inventory" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0508c56cfe9bfd5dfeb0c22ab9a6abfda2f27bdca422132e494266351ed8d83c" +checksum = "c8573b2b1fb643a372c73b23f4da5f888677feef3305146d68a539250a9bccc7" [[package]] name = "io-lifetimes" @@ -4512,7 +4567,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.3", - "rustix 0.38.21", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -4541,6 +4596,15 @@ dependencies = [ ] [[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + +[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4613,8 +4677,8 @@ dependencies = [ name = "k8s-e2e-tests" version = "0.1.0" dependencies = [ - "env_logger 0.10.0", - "futures 0.3.29", + "env_logger 0.10.1", + "futures 0.3.30", "indoc", "k8s-openapi 0.16.0", "k8s-test-framework", @@ -4649,7 +4713,7 @@ dependencies = [ "base64 0.21.5", "bytes 1.5.0", "chrono", - "http", + "http 0.2.9", "percent-encoding", "serde", "serde-value", @@ -4729,8 +4793,8 @@ dependencies = [ "chrono", "dirs-next", "either", - "futures 0.3.29", - "http", + "futures 0.3.30", + "http 0.2.9", "http-body", "hyper", "hyper-openssl", @@ -4744,7 +4808,7 @@ dependencies = [ "secrecy", "serde", "serde_json", - "serde_yaml 0.9.27", + "serde_yaml 0.9.29", "thiserror", "tokio", "tokio-util", @@ -4761,7 +4825,7 @@ checksum = "25983d07f414dfffba08c5951fe110f649113416b1d8e22f7c89c750eb2555a7" dependencies = [ "chrono", "form_urlencoded", - "http", + "http 0.2.9", "json-patch", "k8s-openapi 0.18.0", "once_cell", @@ -4780,7 +4844,7 @@ dependencies = [ "async-trait", "backoff", "derivative", - "futures 0.3.29", + "futures 0.3.30", "json-patch", "k8s-openapi 0.18.0", "kube-client", @@ -4856,9 +4920,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libflate" @@ -4925,9 +4989,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "listenfd" @@ -4974,19 +5038,19 @@ version = "0.1.0" dependencies = [ "bytes 1.5.0", "chrono", - "prost 0.12.1", - "prost-build 0.12.1", - "prost-types 0.12.1", + "prost 0.12.3", + "prost-build 0.12.3", + "prost-types 0.12.3", "snap", ] [[package]] name = "lru" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" +checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" dependencies = [ - "hashbrown 0.14.2", + "hashbrown 0.14.3", ] [[package]] @@ -5009,12 +5073,12 @@ dependencies = [ [[package]] name = "luajit-src" -version = "210.4.8+resty107baaf" +version = "210.5.2+113a168" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05167e8b2a2185758d83ed23541e5bd8bce37072e4204e0ef2c9b322bc87c4e" +checksum = "823ec7bedb1819b11633bd583ae981b0082db08492b0c3396412b85dd329ffee" dependencies = [ "cc", - "which", + "which 5.0.0", ] [[package]] @@ -5131,15 +5195,15 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" dependencies = [ "libc", ] @@ -5188,9 +5252,9 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -5273,11 +5337,11 @@ dependencies = [ [[package]] name = "mlua" -version = "0.9.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c3a7a7ff4481ec91b951a733390211a8ace1caba57266ccb5f4d4966704e560" +checksum = "7c81f8ac20188feb5461a73eabb22a34dd09d6d58513535eb587e46bff6ba250" dependencies = [ - "bstr 1.7.0", + "bstr 1.9.0", "mlua-sys", "mlua_derive", "num-traits", @@ -5287,9 +5351,9 @@ dependencies = [ [[package]] name = "mlua-sys" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec8b54eddb76093069cce9eeffb4c7b3a1a0fe66962d7bd44c4867928149ca3" +checksum = "fc29228347d6bdc9e613dc95c69df2817f755434ee0f7f3b27b57755fe238b7f" dependencies = [ "cc", "cfg-if", @@ -5307,10 +5371,10 @@ dependencies = [ "itertools 0.11.0", "once_cell", "proc-macro-error", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "regex", - "syn 2.0.39", + "syn 2.0.46", ] [[package]] @@ -5321,9 +5385,9 @@ checksum = "6c1a54de846c4006b88b1516731cc1f6026eb5dc4bcb186aa071ef66d40524ec" [[package]] name = "mongodb" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c926772050c3a3f87c837626bf6135c8ca688d91d31dd39a3da547fc2bc9fe" +checksum = "46c30763a5c6c52079602be44fa360ca3bfacee55fca73f4734aecd23706a7f2" dependencies = [ "async-trait", "base64 0.13.1", @@ -5359,7 +5423,7 @@ dependencies = [ "tokio", "tokio-rustls 0.24.1", "tokio-util", - "trust-dns-proto 0.21.2", + "trust-dns-proto", "trust-dns-resolver", "typed-builder 0.10.0", "uuid", @@ -5375,7 +5439,7 @@ dependencies = [ "bytes 1.5.0", "encoding_rs", "futures-util", - "http", + "http 0.2.9", "httparse", "log", "memchr", @@ -5483,6 +5547,17 @@ dependencies = [ ] [[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "libc", +] + +[[package]] name = "nkeys" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5492,7 +5567,23 @@ dependencies = [ "data-encoding", "ed25519", "ed25519-dalek", - "getrandom 0.2.10", + "getrandom 0.2.11", + "log", + "rand 0.8.5", + "signatory", +] + +[[package]] +name = "nkeys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafe79aeb8066a6f1f84dc44c03ae97403013e946bf0b13626468e0d5e26c6f" +dependencies = [ + "byteorder", + "data-encoding", + "ed25519", + "ed25519-dalek", + "getrandom 0.2.11", "log", "rand 0.8.5", "signatory", @@ -5504,7 +5595,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b41e7479dc3678ea792431e04bafd62a31879035f4a5fa707602df062f58c77" dependencies = [ - "cidr-utils", + "cidr-utils 0.5.11", "serde", ] @@ -5718,8 +5809,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] @@ -5730,9 +5821,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -5742,9 +5833,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e" dependencies = [ "proc-macro-crate 2.0.0", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -5770,8 +5861,8 @@ checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" dependencies = [ "base64 0.13.1", "chrono", - "getrandom 0.2.10", - "http", + "getrandom 0.2.11", + "http 0.2.9", "rand 0.8.5", "reqwest", "serde", @@ -5811,9 +5902,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "onig" @@ -5851,9 +5942,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "opendal" -version = "0.41.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31b48f0af6de5b3b344c1acc1e06c4581dca3e13cd5ba05269927fc2abf953a" +checksum = "c32736a48ef08a5d2212864e2295c8e54f4d6b352b7f49aa0c29a12fc410ff66" dependencies = [ "anyhow", "async-compat", @@ -5863,9 +5954,9 @@ dependencies = [ "bytes 1.5.0", "chrono", "flagset", - "futures 0.3.29", - "http", - "hyper", + "futures 0.3.30", + "getrandom 0.2.11", + "http 0.2.9", "log", "md-5", "once_cell", @@ -5891,7 +5982,7 @@ dependencies = [ "dyn-clone", "ed25519-dalek", "hmac", - "http", + "http 0.2.9", "itertools 0.10.5", "log", "oauth2", @@ -5914,9 +6005,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.59" +version = "0.10.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" +checksum = "8cde4d2d9200ad5909f8dac647e29482e07c3a35de8a13fce7c9c7747ad9f671" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -5933,9 +6024,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -5946,18 +6037,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.1.6+3.1.4" +version = "300.2.1+3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439fac53e092cd7442a3660c85dde4643ab3b5bd39040912388dcdabf6b88085" +checksum = "3fe476c29791a5ca0d1273c697e96085bbabbbea2ef7afd5617e78a4b40332d3" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.95" +version = "0.9.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" +checksum = "c1665caf8ab2dc9aef43d1c0023bd904633a6a05cb30b0ad59bec2ae986e57a7" dependencies = [ "cc", "libc", @@ -5973,9 +6064,9 @@ dependencies = [ "bytes 1.5.0", "chrono", "hex", - "ordered-float 4.1.1", - "prost 0.12.1", - "prost-build 0.12.1", + "ordered-float 4.2.0", + "prost 0.12.3", + "prost-build 0.12.3", "tonic 0.10.2", "tonic-build 0.10.2", "vector-core", @@ -6009,9 +6100,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "4.1.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536900a8093134cf9ccf00a27deb3532421099e958d9dd431135d0c7543ca1e8" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" dependencies = [ "num-traits", ] @@ -6050,9 +6141,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "3.5.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" +checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" dependencies = [ "supports-color", ] @@ -6185,9 +6276,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" @@ -6218,9 +6309,9 @@ checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -6306,9 +6397,9 @@ version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -6438,7 +6529,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite", - "rustix 0.38.21", + "rustix 0.38.28", "tracing 0.1.40", "windows-sys 0.48.0", ] @@ -6473,7 +6564,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1de0ea6504e07ca78355a6fb88ad0f36cafe9e696cbc6717f16a207f3a60be72" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "openssl", "tokio", "tokio-openssl", @@ -6584,7 +6675,7 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "proc-macro2 1.0.69", + "proc-macro2 1.0.74", "syn 1.0.109", ] @@ -6594,8 +6685,8 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ - "proc-macro2 1.0.69", - "syn 2.0.39", + "proc-macro2 1.0.74", + "syn 2.0.46", ] [[package]] @@ -6614,24 +6705,15 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.13.2" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3" +checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6" dependencies = [ "elliptic-curve", ] [[package]] name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml 0.5.11", -] - -[[package]] -name = "proc-macro-crate" version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" @@ -6656,8 +6738,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", "version_check", ] @@ -6668,8 +6750,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "version_check", ] @@ -6696,9 +6778,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "2de98502f212cfcea8d0bb305bd0f49d7ebdd75b64ba0a68f937d888f4e0d6db" dependencies = [ "unicode-ident", ] @@ -6710,18 +6792,18 @@ dependencies = [ "indexmap 2.1.0", "nom", "num_enum 0.7.1", - "prost 0.12.1", - "prost-build 0.12.1", - "prost-types 0.12.1", + "prost 0.12.3", + "prost-build 0.12.3", + "prost-types 0.12.3", "snafu", "vector-common", ] [[package]] name = "proptest" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c003ac8c77cb07bb74f5f198bce836a689bcd5a42574612bf14d17bfd08c20e" +checksum = "31b476131c3c86cb68032fdc5cb6d5a1045e3e42d96b69fa599fd77701e1f5bf" dependencies = [ "bit-set", "bit-vec", @@ -6731,7 +6813,7 @@ dependencies = [ "rand 0.8.5", "rand_chacha 0.3.1", "rand_xorshift", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", "rusty-fork", "tempfile", "unarray", @@ -6749,12 +6831,12 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4fdd22f3b9c31b53c060df4a0613a1c7f062d4115a2b984dd15b1858f7e340d" +checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" dependencies = [ "bytes 1.5.0", - "prost-derive 0.12.1", + "prost-derive 0.12.3", ] [[package]] @@ -6776,14 +6858,14 @@ dependencies = [ "regex", "syn 1.0.109", "tempfile", - "which", + "which 4.4.2", ] [[package]] name = "prost-build" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bdf592881d821b83d471f8af290226c8d51402259e9bb5be7f9f8bdebbb11ac" +checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" dependencies = [ "bytes 1.5.0", "heck 0.4.1", @@ -6793,12 +6875,12 @@ dependencies = [ "once_cell", "petgraph", "prettyplease 0.2.15", - "prost 0.12.1", - "prost-types 0.12.1", + "prost 0.12.3", + "prost-types 0.12.3", "regex", - "syn 2.0.39", + "syn 2.0.46", "tempfile", - "which", + "which 4.4.2", ] [[package]] @@ -6809,22 +6891,22 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "prost-derive" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265baba7fabd416cf5078179f7d2cbeca4ce7a9041111900675ea7c4cb8a4c32" +checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" dependencies = [ "anyhow", "itertools 0.11.0", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -6835,8 +6917,8 @@ checksum = "057237efdb71cf4b3f9396302a3d6599a92fa94063ba537b66130980ea9909f3" dependencies = [ "base64 0.21.5", "once_cell", - "prost 0.12.1", - "prost-types 0.12.1", + "prost 0.12.3", + "prost-types 0.12.3", "serde", "serde-value", ] @@ -6852,11 +6934,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf" +checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" dependencies = [ - "prost 0.12.1", + "prost 0.12.3", ] [[package]] @@ -6874,8 +6956,8 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] @@ -6892,7 +6974,7 @@ dependencies = [ "crc", "data-url", "flate2", - "futures 0.3.29", + "futures 0.3.30", "futures-io", "futures-timer", "log", @@ -6942,13 +7024,12 @@ dependencies = [ [[package]] name = "quanta" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "577c55a090a94ed7da0e6580cc38a553558e2d736398b5d8ebf81bc9880f8acd" +checksum = "9ca0b7bac0b97248c40bb77288fc52029cf1459c0461ea1b05ee32ccf011de2c" dependencies = [ "crossbeam-utils", "libc", - "mach2", "once_cell", "raw-cpuid 11.0.1", "wasi 0.11.0+wasi-snapshot-preview1", @@ -6999,8 +7080,8 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] @@ -7015,11 +7096,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ - "proc-macro2 1.0.69", + "proc-macro2 1.0.74", ] [[package]] @@ -7103,7 +7184,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -7136,17 +7217,18 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.24.0" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ebc917cfb527a566c37ecb94c7e3fd098353516fb4eb6bea17015ade0182425" +checksum = "a5659e52e4ba6e07b2dad9f1158f578ef84a73762625ddb51536019f34d180eb" dependencies = [ "bitflags 2.4.1", "cassowary", "crossterm", "indoc", - "itertools 0.11.0", + "itertools 0.12.0", "lru", "paste", + "stability", "strum", "unicode-segmentation", "unicode-width", @@ -7204,9 +7286,9 @@ dependencies = [ [[package]] name = "rdkafka" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053adfa02fab06e86c01d586cc68aa47ee0ff4489a59469081dc12cbcde578bf" +checksum = "f16c17f411935214a5870e40aff9291f8b40a73e97bf8de29e5959c473d5ef33" dependencies = [ "futures-channel", "futures-util", @@ -7222,9 +7304,9 @@ dependencies = [ [[package]] name = "rdkafka-sys" -version = "4.6.0+2.2.0" +version = "4.7.0+2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad63c279fca41a27c231c450a2d2ad18288032e9cbb159ad16c9d96eba35aaaf" +checksum = "55e0d2f9ba6253f6ec72385e453294f8618e9e15c2c6aba2a5c01ccf9622d615" dependencies = [ "cmake", "libc", @@ -7249,15 +7331,15 @@ dependencies = [ [[package]] name = "redis" -version = "0.23.3" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba" +checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd" dependencies = [ "arc-swap", "async-trait", "bytes 1.5.0", "combine 4.6.6", - "futures 0.3.29", + "futures 0.3.30", "futures-util", "itoa", "native-tls", @@ -7304,7 +7386,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "redox_syscall 0.2.16", "thiserror", ] @@ -7382,17 +7464,17 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.22" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ "base64 0.21.5", "bytes 1.5.0", "encoding_rs", "futures-core", "futures-util", - "h2", - "http", + "h2 0.3.22", + "http 0.2.9", "http-body", "hyper", "hyper-rustls 0.24.2", @@ -7473,7 +7555,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.10", + "getrandom 0.2.11", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -7482,12 +7564,13 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.42" +version = "0.7.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +checksum = "527a97cdfef66f65998b5f3b637c26f5a5ec09cc52a3f9932313ac645f4190f5" dependencies = [ "bitvec", "bytecheck", + "bytes 1.5.0", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -7499,12 +7582,12 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.42" +version = "0.7.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +checksum = "b5c462a1328c8e67e4d6dbad1eb0355dd43e8ab432c6e227a43657f16ade5033" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] @@ -7570,12 +7653,9 @@ dependencies = [ [[package]] name = "roxmltree" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" -dependencies = [ - "xmlparser", -] +checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f" [[package]] name = "rsa" @@ -7603,7 +7683,7 @@ version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "rstest_macros", "rustc_version 0.4.0", @@ -7617,20 +7697,20 @@ checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" dependencies = [ "cfg-if", "glob", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "regex", "relative-path", "rustc_version 0.4.0", - "syn 2.0.39", + "syn 2.0.46", "unicode-ident", ] [[package]] name = "rust_decimal" -version = "1.32.0" +version = "1.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" +checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" dependencies = [ "arrayvec", "borsh", @@ -7698,15 +7778,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.10", - "windows-sys 0.48.0", + "linux-raw-sys 0.4.12", + "windows-sys 0.52.0", ] [[package]] @@ -7784,9 +7864,9 @@ dependencies = [ [[package]] name = "rustyline" -version = "12.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" +checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -7794,8 +7874,7 @@ dependencies = [ "libc", "log", "memchr", - "nix 0.26.2", - "scopeguard", + "nix 0.27.1", "unicode-segmentation", "unicode-width", "utf8parse", @@ -7804,9 +7883,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "salsa20" @@ -7850,11 +7929,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -7958,9 +8037,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.190" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" +checksum = "0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773" dependencies = [ "serde_derive", ] @@ -7971,7 +8050,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af5ae5f42c16d60b098ae5d4afd75c1d3b6512e6ca5d0b9b916e2ced30df264c" dependencies = [ - "toml 0.8.6", + "toml 0.8.8", ] [[package]] @@ -7986,9 +8065,9 @@ dependencies = [ [[package]] name = "serde-wasm-bindgen" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ba92964781421b6cef36bf0d7da26d201e96d84e1b10e7ae6ed416e516906d" +checksum = "b9b713f70513ae1f8d92665bbbbda5c295c2cf1da5542881ae5eefe20c9af132" dependencies = [ "js-sys", "serde", @@ -8006,13 +8085,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.190" +version = "1.0.194" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" +checksum = "a3385e45322e8f9931410f01b3031ec534c3947d0e94c18049af4d9f9907d4e0" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -8021,16 +8100,16 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" dependencies = [ "indexmap 2.1.0", "itoa", @@ -8083,9 +8162,9 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -8143,8 +8222,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] @@ -8155,9 +8234,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93634eb5f75a2323b16de4748022ac4297f9e76b6dced2be287a099f41b5e788" dependencies = [ "darling 0.20.3", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -8174,9 +8253,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.27" +version = "0.9.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" +checksum = "a15e0ef66bf939a7c890a0bf6d5a733c70202225f9888a89ed5c62298b019129" dependencies = [ "indexmap 2.1.0", "itoa", @@ -8363,9 +8442,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" dependencies = [ "serde", ] @@ -8422,16 +8501,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] [[package]] name = "snap" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" @@ -8479,22 +8558,26 @@ dependencies = [ ] [[package]] -name = "static_assertions" -version = "1.1.0" +name = "stability" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" +dependencies = [ + "quote 1.0.35", + "syn 1.0.109", +] [[package]] -name = "str-buf" -version = "1.0.6" +name = "static_assertions" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "stream-cancel" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0a9eb2715209fb8cc0d942fcdff45674bfc9f0090a0d897e85a22955ad159b" +checksum = "5f9fbf9bd71e4cf18d68a8a0951c0e5b7255920c0cd992c4ff51cddd6ef514a3" dependencies = [ "futures-core", "pin-project", @@ -8565,8 +8648,8 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck 0.3.3", "proc-macro-error", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] @@ -8586,10 +8669,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "rustversion", - "syn 2.0.39", + "syn 2.0.46", ] [[package]] @@ -8600,11 +8683,11 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "supports-color" -version = "1.3.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba6faf2ca7ee42fdd458f4347ae0a9bd6bcc445ad7cb57ad82b383f18870d6f" +checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" dependencies = [ - "atty", + "is-terminal", "is_ci", ] @@ -8625,23 +8708,35 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.39" +version = "2.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "89456b690ff72fddcecf231caedbe615c59480c93358a93dfae7fc29e3ebbf0e" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "unicode-ident", ] [[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", +] + +[[package]] name = "sync_wrapper" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8662,9 +8757,9 @@ dependencies = [ [[package]] name = "syslog_loose" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf5252d1adec0a489a0225f867c1a7fd445e41674530a396d0629cff0c4b211" +checksum = "161028c00842709450114c39db3b29f44c898055ed8833bb9b535aba7facf30e" dependencies = [ "chrono", "nom", @@ -8716,21 +8811,21 @@ dependencies = [ [[package]] name = "temp-dir" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" +checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.4.1", - "rustix 0.38.21", - "windows-sys 0.48.0", + "rustix 0.38.28", + "windows-sys 0.52.0", ] [[package]] @@ -8759,7 +8854,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.21", + "rustix 0.38.28", "windows-sys 0.48.0", ] @@ -8792,22 +8887,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -8908,9 +9003,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes 1.5.0", @@ -8949,13 +9044,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -8970,9 +9065,9 @@ dependencies = [ [[package]] name = "tokio-openssl" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" +checksum = "6ffab79df67727f6acf57f1ff743091873c24c579b1e2ce4d8f53e47ded4d63d" dependencies = [ "futures-util", "openssl", @@ -9102,14 +9197,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.6" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.7", + "toml_edit 0.21.0", ] [[package]] @@ -9139,6 +9234,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -9158,8 +9264,8 @@ dependencies = [ "bytes 1.5.0", "futures-core", "futures-util", - "h2", - "http", + "h2 0.3.22", + "http 0.2.9", "http-body", "hyper", "hyper-timeout", @@ -9188,14 +9294,14 @@ dependencies = [ "base64 0.21.5", "bytes 1.5.0", "flate2", - "h2", - "http", + "h2 0.3.22", + "http 0.2.9", "http-body", "hyper", "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.1", + "prost 0.12.3", "rustls 0.21.8", "rustls-native-certs", "rustls-pemfile", @@ -9215,9 +9321,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ "prettyplease 0.1.25", - "proc-macro2 1.0.69", + "proc-macro2 1.0.74", "prost-build 0.11.9", - "quote 1.0.33", + "quote 1.0.35", "syn 1.0.109", ] @@ -9228,10 +9334,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease 0.2.15", - "proc-macro2 1.0.69", - "prost-build 0.12.1", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "prost-build 0.12.3", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -9266,7 +9372,7 @@ dependencies = [ "bytes 1.5.0", "futures-core", "futures-util", - "http", + "http 0.2.9", "http-body", "http-range-header", "mime", @@ -9332,9 +9438,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -9372,7 +9478,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "futures-task", "pin-project", "tracing 0.1.40", @@ -9401,9 +9507,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.4" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", @@ -9422,9 +9528,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -9445,7 +9551,7 @@ name = "tracing-tower" version = "0.1.0" source = "git+https://github.com/tokio-rs/tracing?rev=e0642d949891546a3bb7e47080365ee7274f05cd#e0642d949891546a3bb7e47080365ee7274f05cd" dependencies = [ - "futures 0.3.29", + "futures 0.3.30", "tower-service", "tracing 0.2.0", "tracing-futures 0.3.0", @@ -9486,31 +9592,6 @@ dependencies = [ ] [[package]] -name = "trust-dns-proto" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" -dependencies = [ - "async-trait", - "cfg-if", - "data-encoding", - "enum-as-inner 0.6.0", - "futures-channel", - "futures-io", - "futures-util", - "idna 0.4.0", - "ipnet", - "once_cell", - "rand 0.8.5", - "smallvec", - "thiserror", - "tinyvec", - "tokio", - "tracing 0.1.40", - "url", -] - -[[package]] name = "trust-dns-resolver" version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9527,7 +9608,7 @@ dependencies = [ "smallvec", "thiserror", "tokio", - "trust-dns-proto 0.21.2", + "trust-dns-proto", ] [[package]] @@ -9545,7 +9626,7 @@ dependencies = [ "byteorder", "bytes 1.5.0", "data-encoding", - "http", + "http 0.2.9", "httparse", "log", "rand 0.8.5", @@ -9571,8 +9652,8 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "syn 1.0.109", ] @@ -9591,9 +9672,9 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -9604,9 +9685,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typetag" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80960fd143d4c96275c0e60b08f14b81fbb468e79bc0ef8fbda69fb0afafae43" +checksum = "c43148481c7b66502c48f35b8eef38b6ccdc7a9f04bd4cc294226d901ccc9bc7" dependencies = [ "erased-serde", "inventory", @@ -9617,13 +9698,13 @@ dependencies = [ [[package]] name = "typetag-impl" -version = "0.2.13" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfc13d450dc4a695200da3074dacf43d449b968baee95e341920e47f61a3b40f" +checksum = "291db8a81af4840c10d636e047cac67664e343be44e24dfdbd1492df9a5d3390" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] @@ -9736,9 +9817,9 @@ dependencies = [ [[package]] name = "unsafe-libyaml" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b" [[package]] name = "untrusted" @@ -9765,12 +9846,12 @@ dependencies = [ [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", "serde", ] @@ -9789,9 +9870,9 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8-width" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" +checksum = "86bd8d4e895da8537e5315b8254664e6b769c4ff3db18321b297a1e7004392e3" [[package]] name = "utf8parse" @@ -9801,11 +9882,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "rand 0.8.5", "serde", "wasm-bindgen", @@ -9830,7 +9911,7 @@ dependencies = [ "anyhow", "cached", "chrono", - "clap 4.4.7", + "clap 4.4.12", "clap-verbosity-flag", "clap_complete", "confy", @@ -9840,7 +9921,7 @@ dependencies = [ "hex", "indexmap 2.1.0", "indicatif", - "itertools 0.11.0", + "itertools 0.12.0", "log", "once_cell", "os_info", @@ -9850,10 +9931,10 @@ dependencies = [ "reqwest", "serde", "serde_json", - "serde_yaml 0.9.27", + "serde_yaml 0.9.29", "sha2", "tempfile", - "toml 0.8.6", + "toml 0.8.8", ] [[package]] @@ -9864,7 +9945,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vector" -version = "0.34.2" +version = "0.35.0" dependencies = [ "apache-avro", "approx", @@ -9905,8 +9986,9 @@ dependencies = [ "bytes 1.5.0", "bytesize", "chrono", - "cidr-utils", - "clap 4.4.7", + "chrono-tz", + "cidr-utils 0.6.1", + "clap 4.4.12", "colored", "console-subscriber", "criterion", @@ -9921,21 +10003,22 @@ dependencies = [ "exitcode", "fakedata", "flate2", - "futures 0.3.29", + "futures 0.3.30", "futures-util", "glob", "goauth", "governor", "greptimedb-client", "grok", - "h2", + "h2 0.4.0", "hash_hasher", - "hashbrown 0.14.2", + "hashbrown 0.14.3", "headers", "heim", "hex", + "hickory-proto", "hostname", - "http", + "http 0.2.9", "http-body", "http-serde", "hyper", @@ -9945,7 +10028,7 @@ dependencies = [ "indoc", "infer 0.15.0", "inventory", - "itertools 0.11.0", + "itertools 0.12.0", "k8s-openapi 0.18.0", "kube", "lapin", @@ -9961,7 +10044,7 @@ dependencies = [ "mlua", "mongodb", "nix 0.26.2", - "nkeys", + "nkeys 0.4.0", "nom", "notify", "num-format", @@ -9971,17 +10054,17 @@ dependencies = [ "openssl", "openssl-probe", "openssl-src", - "ordered-float 4.1.1", + "ordered-float 4.2.0", "paste", "percent-encoding", "pin-project", "portpicker", "postgres-openssl", "proptest", - "prost 0.12.1", - "prost-build 0.12.1", + "prost 0.12.3", + "prost-build 0.12.3", "prost-reflect", - "prost-types 0.12.1", + "prost-types 0.12.3", "pulsar", "quickcheck", "rand 0.8.5", @@ -10002,7 +10085,7 @@ dependencies = [ "serde_bytes", "serde_json", "serde_with 3.4.0", - "serde_yaml 0.9.27", + "serde_yaml 0.9.29", "sha2", "similar-asserts", "smallvec", @@ -10023,7 +10106,7 @@ dependencies = [ "tokio-test", "tokio-tungstenite", "tokio-util", - "toml 0.8.6", + "toml 0.8.8", "tonic 0.10.2", "tonic-build 0.10.2", "tower", @@ -10035,7 +10118,6 @@ dependencies = [ "tracing-limit", "tracing-subscriber", "tracing-tower", - "trust-dns-proto 0.23.2", "typetag", "url", "uuid", @@ -10055,8 +10137,8 @@ dependencies = [ "anyhow", "async-trait", "chrono", - "clap 4.4.7", - "futures 0.3.29", + "clap 4.4.12", + "futures 0.3.30", "graphql_client", "indoc", "reqwest", @@ -10078,13 +10160,14 @@ dependencies = [ "async-trait", "bytecheck", "bytes 1.5.0", - "clap 4.4.7", + "clap 4.4.12", "crc32fast", "criterion", "crossbeam-queue", "crossbeam-utils", + "derivative", "fslock", - "futures 0.3.29", + "futures 0.3.30", "hdrhistogram", "memmap2", "metrics", @@ -10092,13 +10175,14 @@ dependencies = [ "metrics-util", "num-traits", "once_cell", + "paste", "pin-project", "proptest", "quickcheck", "rand 0.8.5", "rkyv", "serde", - "serde_yaml 0.9.27", + "serde_yaml 0.9.29", "snafu", "temp-dir", "tokio", @@ -10123,11 +10207,11 @@ dependencies = [ "chrono-tz", "crossbeam-utils", "derivative", - "futures 0.3.29", + "futures 0.3.30", "indexmap 2.1.0", "metrics", "nom", - "ordered-float 4.1.1", + "ordered-float 4.2.0", "paste", "pin-project", "quickcheck", @@ -10154,7 +10238,7 @@ dependencies = [ "chrono", "chrono-tz", "encoding_rs", - "http", + "http 0.2.9", "indexmap 2.1.0", "inventory", "no-proxy", @@ -10163,7 +10247,7 @@ dependencies = [ "serde_json", "serde_with 3.4.0", "snafu", - "toml 0.8.6", + "toml 0.8.8", "tracing 0.1.40", "url", "vector-config-common", @@ -10179,11 +10263,11 @@ dependencies = [ "convert_case 0.6.0", "darling 0.20.3", "once_cell", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "serde", "serde_json", - "syn 2.0.39", + "syn 2.0.46", "tracing 0.1.40", ] @@ -10192,11 +10276,11 @@ name = "vector-config-macros" version = "0.1.0" dependencies = [ "darling 0.20.3", - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", "serde", "serde_derive_internals", - "syn 2.0.39", + "syn 2.0.46", "vector-config", "vector-config-common", ] @@ -10220,10 +10304,10 @@ dependencies = [ "enumflags2", "env-test-util", "float_eq", - "futures 0.3.29", + "futures 0.3.30", "futures-util", "headers", - "http", + "http 0.2.9", "hyper-proxy", "indexmap 2.1.0", "metrics", @@ -10236,14 +10320,14 @@ dependencies = [ "noisy_float", "once_cell", "openssl", - "ordered-float 4.1.1", + "ordered-float 4.2.0", "parking_lot", "pin-project", "proptest", - "prost 0.12.1", - "prost-build 0.12.1", - "prost-types 0.12.1", - "quanta 0.12.1", + "prost 0.12.3", + "prost-build 0.12.3", + "prost-types 0.12.3", + "quanta 0.12.2", "quickcheck", "quickcheck_macros", "rand 0.8.5", @@ -10264,7 +10348,7 @@ dependencies = [ "tokio-stream", "tokio-test", "tokio-util", - "toml 0.8.6", + "toml 0.8.8", "tonic 0.10.2", "tracing 0.1.40", "tracing-core 0.1.32", @@ -10313,7 +10397,7 @@ name = "vector-stream" version = "0.1.0" dependencies = [ "async-stream", - "futures 0.3.29", + "futures 0.3.30", "futures-util", "pin-project", "proptest", @@ -10332,7 +10416,7 @@ dependencies = [ name = "vector-vrl-cli" version = "0.1.0" dependencies = [ - "clap 4.4.7", + "clap 4.4.12", "vector-vrl-functions", "vrl", ] @@ -10351,7 +10435,7 @@ dependencies = [ "ansi_term", "chrono", "chrono-tz", - "clap 4.4.7", + "clap 4.4.12", "enrichment", "glob", "prettydiff", @@ -10370,7 +10454,7 @@ version = "0.1.0" dependencies = [ "cargo_toml", "enrichment", - "getrandom 0.2.10", + "getrandom 0.2.11", "gloo-utils", "serde", "serde-wasm-bindgen", @@ -10393,13 +10477,12 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a93ee342590c4df0ff63961d7d76a347e0c7b6e6c0be4c001317ca1ff11b53" +checksum = "0c13adaad36ee7b6f8cb7e7baa17ac05d84439d787b0b058df7be1cd9b04f485" dependencies = [ "aes", "ansi_term", - "anymap", "arbitrary", "base16", "base64 0.21.5", @@ -10411,8 +10494,8 @@ dependencies = [ "charset", "chrono", "chrono-tz", - "cidr-utils", - "clap 4.4.7", + "cidr-utils 0.6.1", + "clap 4.4.12", "codespan-reporting", "community-id", "crypto_secretbox", @@ -10429,7 +10512,7 @@ dependencies = [ "hostname", "indexmap 2.1.0", "indoc", - "itertools 0.11.0", + "itertools 0.12.0", "lalrpop", "lalrpop-util", "md-5", @@ -10438,7 +10521,7 @@ dependencies = [ "ofb", "once_cell", "onig", - "ordered-float 4.1.1", + "ordered-float 4.2.0", "paste", "peeking_take_while", "percent-encoding", @@ -10450,7 +10533,7 @@ dependencies = [ "quoted_printable", "rand 0.8.5", "regex", - "roxmltree 0.18.1", + "roxmltree 0.19.0", "rust_decimal", "rustyline", "seahash", @@ -10460,6 +10543,7 @@ dependencies = [ "sha2", "sha3", "snafu", + "snap", "strip-ansi-escapes", "syslog_loose", "termcolor", @@ -10490,8 +10574,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", + "proc-macro2 1.0.74", + "quote 1.0.35", ] [[package]] @@ -10538,7 +10622,7 @@ dependencies = [ "futures-channel", "futures-util", "headers", - "http", + "http 0.2.9", "hyper", "log", "mime", @@ -10572,9 +10656,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -10582,16 +10666,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", "wasm-bindgen-shared", ] @@ -10609,32 +10693,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ - "quote 1.0.33", + "quote 1.0.35", "wasm-bindgen-macro-support", ] [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wasm-streams" @@ -10701,7 +10785,20 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.21", + "rustix 0.38.28", +] + +[[package]] +name = "which" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bf3ea8596f3a0dd5980b46430f2058dfe2c36a27ccfbb1845d6fbfcd9ba6e14" +dependencies = [ + "either", + "home", + "once_cell", + "rustix 0.38.28", + "windows-sys 0.48.0", ] [[package]] @@ -10796,6 +10893,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10826,6 +10932,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10838,6 +10959,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10850,6 +10977,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10862,6 +10995,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10874,6 +11013,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10886,6 +11031,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10898,6 +11049,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10910,6 +11067,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winnow" version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -10930,15 +11093,15 @@ dependencies = [ [[package]] name = "wiremock" -version = "0.5.21" +version = "0.5.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "079aee011e8a8e625d16df9e785de30a6b77f80a6126092d76a57375f96448da" +checksum = "13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9" dependencies = [ "assert-json-diff 2.0.2", "async-trait", "base64 0.21.5", "deadpool", - "futures 0.3.29", + "futures 0.3.30", "futures-timer", "http-types", "hyper", @@ -11005,9 +11168,9 @@ version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 2.0.39", + "proc-macro2 1.0.74", + "quote 1.0.35", + "syn 2.0.46", ] [[package]] diff --git a/nixpkgs/pkgs/tools/misc/vector/default.nix b/nixpkgs/pkgs/tools/misc/vector/default.nix index aef8bace56f7..de9341c1c6bc 100644 --- a/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -9,6 +9,7 @@ , oniguruma , zstd , rust-jemalloc-sys +, rust-jemalloc-sys-unprefixed , Security , libiconv , coreutils @@ -35,7 +36,7 @@ let pname = "vector"; - version = "0.34.2"; + version = "0.35.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -44,11 +45,9 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-XaX6C1kl908MG8SndT2sUDR09qbFCar4G7U7TYlLBR4="; + hash = "sha256-hScmHDkKkR6g1rrVRzBjtkrq59w1efIjeRJdDxmb+nY="; }; - patches = [ ./vector-pr19075.patch ]; - cargoLock = { lockFile = ./Cargo.lock; outputHashes = { @@ -64,8 +63,9 @@ rustPlatform.buildRustPackage { }; nativeBuildInputs = [ pkg-config cmake perl git rustPlatform.bindgenHook ]; buildInputs = - [ oniguruma openssl protobuf rdkafka zstd rust-jemalloc-sys ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices SystemConfiguration ]; + [ oniguruma openssl protobuf rdkafka zstd ] + ++ lib.optionals stdenv.isLinux [ rust-jemalloc-sys-unprefixed ] + ++ lib.optionals stdenv.isDarwin [ rust-jemalloc-sys Security libiconv coreutils CoreServices SystemConfiguration ]; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; @@ -99,6 +99,8 @@ rustPlatform.buildRustPackage { "--skip=sources::aws_kinesis_firehose::tests::handles_acknowledgement_failure" ]; + patches = [ ./vector-pr19518.patch ]; + # recent overhauls of DNS support in 0.9 mean that we try to resolve # vector.dev during the checkPhase, which obviously isn't going to work. # these tests in the DNS module are trivial though, so stubbing them out is diff --git a/nixpkgs/pkgs/tools/misc/vector/vector-pr19075.patch b/nixpkgs/pkgs/tools/misc/vector/vector-pr19075.patch deleted file mode 100644 index 96ab75edef37..000000000000 --- a/nixpkgs/pkgs/tools/misc/vector/vector-pr19075.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 14cd9c12416b5c9ada55ced51e8f92fdce56a4b1 Mon Sep 17 00:00:00 2001 -From: Aaron Andersen <aaron@fosslib.net> -Date: Tue, 7 Nov 2023 09:05:26 -0500 -Subject: [PATCH] fix(config): rustc warnings - ---- - src/convert_config.rs | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/convert_config.rs b/src/convert_config.rs -index f0a900cf421a0..d81b998c5ee1f 100644 ---- a/src/convert_config.rs -+++ b/src/convert_config.rs -@@ -157,8 +157,7 @@ fn walk_dir_and_convert( - let new_output_dir = if entry_path.is_dir() { - let last_component = entry_path - .file_name() -- .unwrap_or_else(|| panic!("Failed to get file_name for {entry_path:?}")) -- .clone(); -+ .unwrap_or_else(|| panic!("Failed to get file_name for {entry_path:?}")); - let new_dir = output_dir.join(last_component); - - if !new_dir.exists() { diff --git a/nixpkgs/pkgs/tools/misc/vector/vector-pr19518.patch b/nixpkgs/pkgs/tools/misc/vector/vector-pr19518.patch new file mode 100644 index 000000000000..a8ee5334eda9 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/vector/vector-pr19518.patch @@ -0,0 +1,25 @@ +diff --git a/src/config/loading/mod.rs b/src/config/loading/mod.rs +index 58c464a58..40656fd29 100644 +--- a/src/config/loading/mod.rs ++++ b/src/config/loading/mod.rs +@@ -13,7 +13,6 @@ use std::{ + }; + + use config_builder::ConfigBuilderLoader; +-pub use config_builder::*; + use glob::glob; + use loader::process::Process; + pub use loader::*; +diff --git a/src/sinks/prometheus/remote_write/mod.rs b/src/sinks/prometheus/remote_write/mod.rs +index 3ebda7df8..cf5b37a70 100644 +--- a/src/sinks/prometheus/remote_write/mod.rs ++++ b/src/sinks/prometheus/remote_write/mod.rs +@@ -24,8 +24,6 @@ mod tests; + #[cfg(all(test, feature = "prometheus-integration-tests"))] + mod integration_tests; + +-pub use config::RemoteWriteConfig; +- + #[derive(Debug, Snafu)] + enum Errors { + #[cfg(feature = "aws-core")] diff --git a/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix b/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix index 443cfa85f808..e192b4a229de 100644 --- a/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.54"; + version = "1.0.55"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-ZiOuD7aiBI1virfcXzxHnX5/uPZRc+Nntg24K2b9Mbo="; + hash = "sha256-9HcHM5ao0lSGctvjYQZNb5wlNsYPTD3NtPDZA/kHJdY="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-OPNxs5WSQEatIJQ48GYjCzwM4twvQd38W/xsFgU9dB0="; + cargoHash = "sha256-fU9tpN+tVlwbTNWinylcRACSLhDD/uPPGW6GNWm/tvo="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/nixpkgs/pkgs/tools/misc/wlc/default.nix b/nixpkgs/pkgs/tools/misc/wlc/default.nix index acd6eb5f3724..3b52d7eb284d 100644 --- a/nixpkgs/pkgs/tools/misc/wlc/default.nix +++ b/nixpkgs/pkgs/tools/misc/wlc/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "wlc is a Weblate commandline client using Weblate's REST API."; + description = "A Weblate commandline client using Weblate's REST API"; homepage = "https://github.com/WeblateOrg/wlc"; license = licenses.gpl3Plus; maintainers = with maintainers; [ paperdigits ]; diff --git a/nixpkgs/pkgs/tools/misc/xfstests/default.nix b/nixpkgs/pkgs/tools/misc/xfstests/default.nix index c894f3b9f32e..5080c8592492 100644 --- a/nixpkgs/pkgs/tools/misc/xfstests/default.nix +++ b/nixpkgs/pkgs/tools/misc/xfstests/default.nix @@ -1,5 +1,5 @@ { stdenv, acl, attr, autoconf, automake, bash, bc, coreutils, e2fsprogs -, fetchgit, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool +, fetchzip, fio, gawk, keyutils, killall, lib, libaio, libcap, libtool , libuuid, libxfs, lvm2, openssl, perl, procps, quota , time, util-linux, which, writeScript, xfsprogs, runtimeShell }: @@ -7,10 +7,9 @@ stdenv.mkDerivation rec { pname = "xfstests"; version = "2023.05.14"; - src = fetchgit { - url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git"; - rev = "v${version}"; - sha256 = "sha256-yyjY9Q3eUH+q+o15zFUjOcNz1HpXPCwdcxWXoycOx98="; + src = fetchzip { + url = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/snapshot/xfstests-dev-v${version}.tar.gz"; + hash = "sha256-yyjY9Q3eUH+q+o15zFUjOcNz1HpXPCwdcxWXoycOx98="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/xq/default.nix b/nixpkgs/pkgs/tools/misc/xq/default.nix index 129a572a40aa..7c4d185a7b68 100644 --- a/nixpkgs/pkgs/tools/misc/xq/default.nix +++ b/nixpkgs/pkgs/tools/misc/xq/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "xq"; - version = "0.2.44"; + version = "0.2.45"; src = fetchCrate { inherit pname version; - sha256 = "sha256-szrt5msjAfiWFMBHVXxqXmLCpvKre8WM/zqCOHwBEP0="; + sha256 = "sha256-wSvVmKqucvg7Gs4H1o9i/d8f2I1g52Vq2Z8F7FwaOR0="; }; - cargoHash = "sha256-T8H9Xnvfewf6B60AzBDn3gEps/0/dXiVl2g+eTw+OaQ="; + cargoHash = "sha256-Gje7Sqe51IMzblydU0s1qXqfIIIQvt0EYMChVbK295s="; meta = with lib; { description = "Pure rust implementation of jq"; diff --git a/nixpkgs/pkgs/tools/misc/xstow/default.nix b/nixpkgs/pkgs/tools/misc/xstow/default.nix index 694634cf0bfe..e40cffb51659 100644 --- a/nixpkgs/pkgs/tools/misc/xstow/default.nix +++ b/nixpkgs/pkgs/tools/misc/xstow/default.nix @@ -1,11 +1,20 @@ -{ stdenv, lib, fetchurl, ncurses, autoreconfHook }: +{ stdenv +, lib +, fetchFromGitHub +, ncurses +, autoreconfHook +}: + stdenv.mkDerivation rec { pname = "xstow"; - version = "1.1.0"; + version = "1.1.1"; - src = fetchurl { - url = "http://downloads.sourceforge.net/sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-wXQ5XSmogAt1torfarrqIU4nBYj69MGM/HBYqeIE+dw="; + src = fetchFromGitHub { + owner = "majorkingleo"; + repo = "xstow"; + rev = version; + fetchSubmodules = true; + hash = "sha256-c89+thw5N3Cgl1Ww+W7c3YsyhNJMLlreedvdWJFY3WY="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -23,9 +32,8 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - broken = stdenv.isDarwin; description = "A replacement of GNU Stow written in C++"; - homepage = "https://xstow.sourceforge.net"; + homepage = "https://github.com/majorkingleo/xstow"; license = licenses.gpl2Only; maintainers = with maintainers; [ nzbr ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix index 3d21dc82af9e..ce0d06bb089a 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -9,7 +9,7 @@ , qtbase , qtgraphicaleffects , qtquickcontrols2 -, yubikey-manager4 +, yubikey-manager , yubikey-personalization }: @@ -18,8 +18,8 @@ mkDerivation rec { version = "1.2.5"; src = fetchurl { - url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "sha256-6bKeR3UX2DhXGcKJ1bxvT1aLTgCfc+aNo6ckE89NV+I="; + url = "https://developers.yubico.com/yubikey-manager-qt/Releases/yubikey-manager-qt-${version}.tar.gz"; + hash = "sha256-6bKeR3UX2DhXGcKJ1bxvT1aLTgCfc+aNo6ckE89NV+I="; }; nativeBuildInputs = [ @@ -41,7 +41,7 @@ mkDerivation rec { ]; pythonPath = [ - (yubikey-manager4.override { python3Packages = python3.pkgs; }) + (yubikey-manager.override { python3Packages = python3.pkgs; }) ]; postInstall = '' diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager/4.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager/4.nix deleted file mode 100644 index b03e5fa93bb1..000000000000 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager/4.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ python3Packages, fetchFromGitHub, lib, installShellFiles, yubikey-personalization, libu2f-host, libusb1, procps -, stdenv, pyOpenSSLSupport ? !(stdenv.isDarwin && stdenv.isAarch64) }: - -python3Packages.buildPythonPackage rec { - pname = "yubikey-manager"; - version = "4.0.9"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "Yubico"; - repo = "yubikey-manager"; - rev = "refs/tags/${version}"; - sha256 = "sha256-MwM/b1QP6pkyBjz/r6oC4sW1mKC0CKMay45a0wCktk0="; - }; - - patches = lib.optionals (!pyOpenSSLSupport) [ - ./remove-pyopenssl-tests.patch - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'cryptography = ">=2.1, <39"' 'cryptography = ">=2.1"' - substituteInPlace "ykman/pcsc/__init__.py" \ - --replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill' - ''; - - nativeBuildInputs = [ installShellFiles ] - ++ (with python3Packages; [ poetry-core ]); - - propagatedBuildInputs = with python3Packages; ([ - click - cryptography - pyscard - pyusb - six - fido2 - ] ++ lib.optionals pyOpenSSLSupport [ - pyopenssl - ]) ++ [ - libu2f-host - libusb1 - yubikey-personalization - ]; - - makeWrapperArgs = [ - "--prefix" "LD_LIBRARY_PATH" ":" - (lib.makeLibraryPath [ libu2f-host libusb1 yubikey-personalization ]) - ]; - - postInstall = '' - installManPage man/ykman.1 - - mkdir -p $out/share/bash-completion/completions - _YKMAN_COMPLETE=source $out/bin/ykman > $out/share/bash-completion/completions/ykman || : - mkdir -p $out/share/zsh/site-functions/ - _YKMAN_COMPLETE=source_zsh "$out/bin/ykman" > "$out/share/zsh/site-functions/_ykman" || : - substituteInPlace "$out/share/zsh/site-functions/_ykman" \ - --replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"' - ''; - - nativeCheckInputs = with python3Packages; [ pytestCheckHook makefun ]; - - meta = with lib; { - homepage = "https://developers.yubico.com/yubikey-manager"; - description = "Previous release of command line tool for configuring any YubiKey over all USB transports"; - license = licenses.bsd2; - platforms = platforms.unix; - maintainers = with maintainers; [ benley lassulus pinpox ]; - mainProgram = "ykman"; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix index b5240e8becd7..fd95f6541981 100644 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubikey-manager/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonPackage rec { postPatch = '' substituteInPlace "ykman/pcsc/__init__.py" \ - --replace 'pkill' '${if stdenv.isLinux then "${procps}" else "/usr"}/bin/pkill' + --replace 'pkill' '${if stdenv.isLinux then procps else "/usr"}/bin/pkill' ''; nativeBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch b/nixpkgs/pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch deleted file mode 100644 index 5be08f4ddbb9..000000000000 --- a/nixpkgs/pkgs/tools/misc/yubikey-manager/remove-pyopenssl-tests.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 65a5943..e6932e0 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -30,7 +30,6 @@ packages = [ - python = "^3.6" - dataclasses = {version = "^0.8", python = "<3.7"} - cryptography = ">=2.1, <39" --pyOpenSSL = {version = ">=0.15.1", optional = true} - pyscard = "^1.9 || ^2.0" - fido2 = ">=0.9, <2.0" - click = "^7.0 || ^8.0" -diff --git a/tests/test_util.py b/tests/test_util.py -index 6ccda6c..b4460e4 100644 ---- a/tests/test_util.py -+++ b/tests/test_util.py -@@ -8,7 +8,6 @@ from ykman.util import _parse_pkcs12_pyopenssl, _parse_pkcs12_cryptography - from ykman.otp import format_oath_code, generate_static_pw, time_challenge - from .util import open_file - from cryptography.hazmat.primitives.serialization import pkcs12 --from OpenSSL import crypto - - import unittest - -@@ -114,16 +113,6 @@ class TestUtilityFunctions(unittest.TestCase): - ) as rsa_2048_key_cert_encrypted_pfx: - self.assertTrue(is_pkcs12(rsa_2048_key_cert_encrypted_pfx.read())) - -- def test_parse_pkcs12(self): -- with open_file("rsa_2048_key_cert.pfx") as rsa_2048_key_cert_pfx: -- data = rsa_2048_key_cert_pfx.read() -- -- key1, certs1 = _parse_pkcs12_cryptography(pkcs12, data, None) -- key2, certs2 = _parse_pkcs12_pyopenssl(crypto, data, None) -- self.assertEqual(key1.private_numbers(), key2.private_numbers()) -- self.assertEqual(1, len(certs1)) -- self.assertEqual(certs1, certs2) -- - def test_is_pem(self): - self.assertFalse(is_pem(b"just a byte string")) - self.assertFalse(is_pem(None)) diff --git a/nixpkgs/pkgs/tools/misc/yutto/default.nix b/nixpkgs/pkgs/tools/misc/yutto/default.nix index 1b98c2a38fbd..7aae06e25485 100644 --- a/nixpkgs/pkgs/tools/misc/yutto/default.nix +++ b/nixpkgs/pkgs/tools/misc/yutto/default.nix @@ -9,14 +9,14 @@ with python3.pkgs; buildPythonApplication rec { pname = "yutto"; - version = "2.0.0b31"; + version = "2.0.0b32"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-PWUZ4adH6uaNRIXVMGN3Yun7muYljQC8xDeEes0MB2U="; + hash = "sha256-tncuRrEq59OPO2ZuWUowDHLsqJ1Dof9vroVOxQQ9hpE="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/zthrottle/default.nix b/nixpkgs/pkgs/tools/misc/zthrottle/default.nix index 012ffbccd4ae..1598215e0eb9 100644 --- a/nixpkgs/pkgs/tools/misc/zthrottle/default.nix +++ b/nixpkgs/pkgs/tools/misc/zthrottle/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "A program that throttles a pipeline, only letting a line through at most every $1 seconds."; + description = "A program that throttles a pipeline, only letting a line through at most every $1 seconds"; homepage = "https://github.com/anko/zthrottle"; license = licenses.unlicense; maintainers = [ maintainers.ckie ]; diff --git a/nixpkgs/pkgs/tools/networking/brook/default.nix b/nixpkgs/pkgs/tools/networking/brook/default.nix index ed01beeb7838..bdc16874779b 100644 --- a/nixpkgs/pkgs/tools/networking/brook/default.nix +++ b/nixpkgs/pkgs/tools/networking/brook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "brook"; - version = "20230606"; + version = "20240214"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F4muuU696YbKcPkpD1LAeyD8ghQAe65UdqV5wS1fATI="; + sha256 = "sha256-5+AqlmDa11PrB24XkelOFHK4sBi4j78WMLQrzDuP1/M="; }; - vendorHash = "sha256-uKlO1x5sGM8B1htmvRt9kND7tuH36iLN/Mev77vwZ6M="; + vendorHash = "sha256-cTw9k4AqS4NOJ0vX0InR0xxOfCXIgA3FxgL6oXryOnA="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; diff --git a/nixpkgs/pkgs/tools/networking/curl/configure-ipv6-autodetect.diff b/nixpkgs/pkgs/tools/networking/curl/configure-ipv6-autodetect.diff new file mode 100644 index 000000000000..9797d2c16d11 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/curl/configure-ipv6-autodetect.diff @@ -0,0 +1,46 @@ +diff --git a/configure b/configure +index 04d1de1..5de1b41 100755 +--- a/configure ++++ b/configure +@@ -24949,15 +24949,12 @@ else $as_nop + # include <netinet/in6.h> + #endif + #endif +-#include <stdlib.h> /* for exit() */ +-main() ++ ++int main(void) + { + struct sockaddr_in6 s; + (void)s; +- if (socket(AF_INET6, SOCK_STREAM, 0) < 0) +- exit(1); +- else +- exit(0); ++ return socket(AF_INET6, SOCK_STREAM, 0) < 0; + } + + +diff --git a/configure.ac b/configure.ac +index 2d71c83..bd38dd9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1679,15 +1679,12 @@ AS_HELP_STRING([--disable-ipv6],[Disable IPv6 support]), + # include <netinet/in6.h> + #endif + #endif +-#include <stdlib.h> /* for exit() */ +-main() ++ ++int main(void) + { + struct sockaddr_in6 s; + (void)s; +- if (socket(AF_INET6, SOCK_STREAM, 0) < 0) +- exit(1); +- else +- exit(0); ++ return socket(AF_INET6, SOCK_STREAM, 0) < 0; + } + ]]) + ], diff --git a/nixpkgs/pkgs/tools/networking/curl/default.nix b/nixpkgs/pkgs/tools/networking/curl/default.nix index 48bf59e25266..01208f0a121c 100644 --- a/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -57,6 +57,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FsYqnErw9wPSi9pte783ukcFWtNBTXDexj4uYzbyqC0="; }; + patches = [ + # fix ipv6 autodetect compile error in configure script + # remove once https://github.com/curl/curl/pull/12607 released (8.6.0) + ./configure-ipv6-autodetect.diff + ]; + outputs = [ "bin" "dev" "out" "man" "devdoc" ]; separateDebugInfo = stdenv.isLinux; diff --git a/nixpkgs/pkgs/tools/networking/dae/default.nix b/nixpkgs/pkgs/tools/networking/dae/default.nix index 9c262144bbc3..18856ca5f0e3 100644 --- a/nixpkgs/pkgs/tools/networking/dae/default.nix +++ b/nixpkgs/pkgs/tools/networking/dae/default.nix @@ -2,27 +2,24 @@ , clang , fetchFromGitHub , buildGoModule -, installShellFiles }: buildGoModule rec { pname = "dae"; - version = "0.5.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; rev = "v${version}"; - hash = "sha256-DxGKfxu13F7+5zV/31GP9gkbGHrz5RdRe84J3DQ0iUs="; + hash = "sha256-hvAuWCacaWxXwxx5ktj57hnWt8fcnwD6rUuRj1+ZtFA="; fetchSubmodules = true; }; - vendorHash = "sha256-UQRM3/JSsPDAGqYZ43bVYVvSLvqqZ/BJE6hwx5wzfcQ="; + vendorHash = "sha256-qK+x6ciAebwIWHRjRpNXCAqsfnmEx37evS4+7kwcFIs="; proxyVendor = true; - nativeBuildInputs = [ clang installShellFiles ]; - - CGO_ENABLED = 0; + nativeBuildInputs = [ clang ]; ldflags = [ "-s" @@ -44,7 +41,6 @@ buildGoModule rec { install -Dm444 install/dae.service $out/lib/systemd/system/dae.service substituteInPlace $out/lib/systemd/system/dae.service \ --replace /usr/bin/dae $out/bin/dae - installShellCompletion install/shell-completion/dae.{bash,zsh,fish} ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/ddns-go/default.nix b/nixpkgs/pkgs/tools/networking/ddns-go/default.nix index c9db9f7d8564..3727f7d93ec6 100644 --- a/nixpkgs/pkgs/tools/networking/ddns-go/default.nix +++ b/nixpkgs/pkgs/tools/networking/ddns-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "5.7.0"; + version = "5.7.1"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-/GZxPM0f1W72OtpEknw0TLQ1eFDF5C98umX0Q8MX46s="; + hash = "sha256-PKshYKywqL706pVgruWQ9M0QbK2btKu28+wmnlFdDgE="; }; vendorHash = "sha256-/kKFMo4PRWwXUuurNHMG36TV3EpcEikgf03/y/aKpXo="; diff --git a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index 2d7a646299ad..0350a4989262 100644 --- a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , udev , runtimeShellPackage @@ -12,24 +11,15 @@ stdenv.mkDerivation rec { pname = "dhcpcd"; - version = "9.4.1"; + version = "10.0.3"; src = fetchFromGitHub { owner = "NetworkConfiguration"; repo = "dhcpcd"; rev = "v${version}"; - sha256 = "sha256-qyxON+TsAKMwAI19b5P+dT/sgxpW6m1giGcf/boFpHc="; + sha256 = "sha256-NXLOfSPGHiRDSagaT+37TAn9XtdcG4+wP9AvyGJi4Dc="; }; - patches = [ - # dhcpcd with privsep SIGSYS's on dhcpcd -U - # https://github.com/NetworkConfiguration/dhcpcd/issues/147 - (fetchpatch { - url = "https://github.com/NetworkConfiguration/dhcpcd/commit/38befd4e867583002b96ec39df733585d74c4ff5.patch"; - hash = "sha256-nS2zmLuQBYhLfoPp0DOwxF803Hh32EE4OUKGBTTukE0="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev diff --git a/nixpkgs/pkgs/tools/networking/dnstwist/default.nix b/nixpkgs/pkgs/tools/networking/dnstwist/default.nix index 9c82eab503d6..1d075a75de24 100644 --- a/nixpkgs/pkgs/tools/networking/dnstwist/default.nix +++ b/nixpkgs/pkgs/tools/networking/dnstwist/default.nix @@ -5,16 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "dnstwist"; - version = "20230918"; - format = "setuptools"; + version = "20240116"; + pyproject = true; src = fetchFromGitHub { owner = "elceef"; - repo = pname; + repo = "dnstwist"; rev = "refs/tags/${version}"; - hash = "sha256-LGeDb0++9Zsal9HOXjfjF18RFQS+6i578EfD3YTtlS4="; + hash = "sha256-areFRDi728SedArhUy/rbPzhoFabNoT/WdyyN+6OQK0="; }; + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + propagatedBuildInputs = with python3.pkgs; [ dnspython geoip diff --git a/nixpkgs/pkgs/tools/networking/edgedb/Cargo.lock b/nixpkgs/pkgs/tools/networking/edgedb/Cargo.lock index 556735390f54..5372163a7ee7 100644 --- a/nixpkgs/pkgs/tools/networking/edgedb/Cargo.lock +++ b/nixpkgs/pkgs/tools/networking/edgedb/Cargo.lock @@ -61,18 +61,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] +name = "ansi-escapes" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e3c0daaaae24df5995734b689627f8fa02101bc5bbc768be3055b66a010d7af" + +[[package]] +name = "anstream" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] name = "anstyle" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] +name = "anstyle-parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" +dependencies = [ + "anstyle", + "windows-sys 0.48.0", +] + +[[package]] name = "anyhow" version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] +name = "append-only-vec" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5608767d94038891df4c7bb82f6b1beb55fe3d204735985e20de329bc35d5fee" + +[[package]] name = "arc-swap" version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -309,9 +363,10 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa" dependencies = [ - "num-bigint", + "num-bigint 0.4.3", "num-integer", "num-traits", + "serde", ] [[package]] @@ -322,9 +377,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" [[package]] name = "bitvec" @@ -400,9 +455,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" [[package]] name = "byteorder" @@ -478,37 +533,63 @@ version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ - "atty", "bitflags 1.3.2", - "clap_derive", - "clap_lex", + "clap_lex 0.2.4", "indexmap 1.9.3", - "once_cell", - "strsim", - "termcolor", "textwrap", ] [[package]] +name = "clap" +version = "4.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 0.5.1", + "strsim", + "terminal_size 0.3.0", +] + +[[package]] name = "clap_complete" version = "3.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" dependencies = [ - "clap", + "clap 3.2.25", +] + +[[package]] +name = "clap_complete" +version = "4.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ae8ba90b9d8b007efe66e55e48fb936272f5ca00349b5b0e89877520d35ea7" +dependencies = [ + "clap 4.4.6", ] [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] @@ -517,8 +598,8 @@ version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e1b28c4a802ac3628604fd267cac62aaea74dc61af3410db6b1c44c03b42599" dependencies = [ - "clap", - "clap_complete", + "clap 3.2.25", + "clap_complete 3.2.5", ] [[package]] @@ -531,6 +612,12 @@ dependencies = [ ] [[package]] +name = "clap_lex" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" + +[[package]] name = "clicolors-control" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -553,6 +640,33 @@ dependencies = [ ] [[package]] +name = "color-print" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a858372ff14bab9b1b30ea504f2a4bc534582aee3e42ba2d41d2a7baba63d5d" +dependencies = [ + "color-print-proc-macro", +] + +[[package]] +name = "color-print-proc-macro" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57e37866456a721d0a404439a1adae37a31be4e0055590d053dfe6981e05003f" +dependencies = [ + "nom", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] name = "colorful" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -884,8 +998,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "edgedb-cli" -version = "3.4.0" +version = "4.0.2" dependencies = [ + "ansi-escapes", "anyhow", "arc-swap", "assert_cmd", @@ -899,10 +1014,11 @@ dependencies = [ "blake3", "bytes", "chrono", - "clap", - "clap_complete", + "clap 4.4.6", + "clap_complete 4.4.3", "clicolors-control", "codespan-reporting", + "color-print", "colorful", "combine", "crossbeam-utils", @@ -937,7 +1053,7 @@ dependencies = [ "native-tls", "nix", "notify", - "num-bigint", + "num-bigint 0.4.3", "once_cell", "open", "openssl", @@ -973,7 +1089,7 @@ dependencies = [ "term", "termcolor", "termimad", - "terminal_size", + "terminal_size 0.2.6", "test-case", "textwrap", "thiserror", @@ -999,9 +1115,9 @@ dependencies = [ [[package]] name = "edgedb-cli-derive" -version = "0.3.0" +version = "0.4.0" dependencies = [ - "clap", + "clap 4.4.6", "clap_generate", "heck", "indexmap 1.9.3", @@ -1015,8 +1131,8 @@ dependencies = [ [[package]] name = "edgedb-derive" -version = "0.5.0" -source = "git+https://github.com/edgedb/edgedb-rust/#4f12f749bc88af8167f1929d883920869c5572fc" +version = "0.5.1" +source = "git+https://github.com/edgedb/edgedb-rust/#a1094916fe28d090156c006722ca660cc29e06ad" dependencies = [ "proc-macro2", "quote", @@ -1026,23 +1142,23 @@ dependencies = [ [[package]] name = "edgedb-errors" -version = "0.4.0" -source = "git+https://github.com/edgedb/edgedb-rust/#4f12f749bc88af8167f1929d883920869c5572fc" +version = "0.4.1" +source = "git+https://github.com/edgedb/edgedb-rust/#a1094916fe28d090156c006722ca660cc29e06ad" dependencies = [ "bytes", ] [[package]] name = "edgedb-protocol" -version = "0.5.0" -source = "git+https://github.com/edgedb/edgedb-rust/#4f12f749bc88af8167f1929d883920869c5572fc" +version = "0.6.0" +source = "git+https://github.com/edgedb/edgedb-rust/#a1094916fe28d090156c006722ca660cc29e06ad" dependencies = [ "bigdecimal", - "bitflags 2.3.1", + "bitflags 2.4.0", "bytes", "chrono", "edgedb-errors", - "num-bigint", + "num-bigint 0.4.3", "num-traits", "snafu", "uuid", @@ -1050,8 +1166,8 @@ dependencies = [ [[package]] name = "edgedb-tokio" -version = "0.4.0" -source = "git+https://github.com/edgedb/edgedb-rust/#4f12f749bc88af8167f1929d883920869c5572fc" +version = "0.5.0" +source = "git+https://github.com/edgedb/edgedb-rust/#a1094916fe28d090156c006722ca660cc29e06ad" dependencies = [ "anyhow", "arc-swap", @@ -1087,11 +1203,17 @@ dependencies = [ [[package]] name = "edgeql-parser" version = "0.1.0" -source = "git+https://github.com/edgedb/edgedb#68033e0256a9c4f214ec1b2042817d8e235f56ec" +source = "git+https://github.com/edgedb/edgedb#6f6b4cd1174daff8a1c1a7065659bb7837599b3e" dependencies = [ + "append-only-vec", "base32", - "combine", + "bigdecimal", + "bumpalo", + "indexmap 1.9.3", "memchr", + "num-bigint 0.3.3", + "phf", + "serde_json", "sha2", "snafu", "thiserror", @@ -1210,7 +1332,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ae6b3d9530211fb3b12a95374b8b0823be812f53d09e18c5675c0146b09642" dependencies = [ "cfg-if", - "rustix", + "rustix 0.37.7", "windows-sys 0.48.0", ] @@ -1755,7 +1877,7 @@ checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", - "rustix", + "rustix 0.37.7", "windows-sys 0.48.0", ] @@ -1860,6 +1982,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" + +[[package]] name = "lock_api" version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1934,6 +2062,12 @@ dependencies = [ ] [[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" + +[[package]] name = "miniz_oxide" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1996,6 +2130,16 @@ dependencies = [ ] [[package]] +name = "nom" +version = "7.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" +dependencies = [ + "memchr", + "minimal-lexical", +] + +[[package]] name = "normalize-line-endings" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2021,6 +2165,18 @@ dependencies = [ [[package]] name = "num-bigint" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", + "serde", +] + +[[package]] +name = "num-bigint" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" @@ -2280,6 +2436,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" [[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros", + "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared", + "rand", +] + +[[package]] +name = "phf_macros" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +dependencies = [ + "phf_generator", + "phf_shared", + "proc-macro2", + "quote", + "syn 2.0.18", +] + +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + +[[package]] name = "pin-project" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2662,11 +2860,24 @@ dependencies = [ "errno", "io-lifetimes", "libc", - "linux-raw-sys", + "linux-raw-sys 0.3.8", "windows-sys 0.45.0", ] [[package]] +name = "rustix" +version = "0.38.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac5ffa1efe7548069688cd7028f32591853cd7b5b756d41bcffd2353e4fc75b4" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys 0.48.0", +] + +[[package]] name = "rustls" version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2951,6 +3162,12 @@ dependencies = [ ] [[package]] +name = "siphasher" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" + +[[package]] name = "slab" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3076,7 +3293,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", + "rustix 0.37.7", "windows-sys 0.45.0", ] @@ -3120,7 +3337,17 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "rustix", + "rustix 0.37.7", + "windows-sys 0.48.0", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix 0.38.3", "windows-sys 0.48.0", ] @@ -3170,7 +3397,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" dependencies = [ "smawk", - "terminal_size", + "terminal_size 0.2.6", "unicode-linebreak", "unicode-width", ] diff --git a/nixpkgs/pkgs/tools/networking/edgedb/default.nix b/nixpkgs/pkgs/tools/networking/edgedb/default.nix index 5da99ea97f7c..1ace10486dea 100644 --- a/nixpkgs/pkgs/tools/networking/edgedb/default.nix +++ b/nixpkgs/pkgs/tools/networking/edgedb/default.nix @@ -19,21 +19,21 @@ rustPlatform.buildRustPackage rec { pname = "edgedb"; - version = "3.4.0"; + version = "4.0.2"; src = fetchFromGitHub { owner = "edgedb"; repo = "edgedb-cli"; - rev = "v${version}"; - sha256 = "sha256-w6YpjSmh517yat45l4gGdV6qWD4O3aCx/6LL5wea+RA="; + rev = "v${version}"; + hash = "sha256-uilotat61U6jW1NLh7fVHOujkzUSFRdpeOx+ECGsByY="; fetchSubmodules = true; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "edgedb-derive-0.5.0" = "sha256-y/mN0XuJtQBtkLmbk2s7hK5joGEH5Ge6sLCD88WyL9o="; - "edgeql-parser-0.1.0" = "sha256-Y3gXxPuR7qnTL4fu2nZIa3e20YV1fLvm2jHAng+Ke2Q="; + "edgedb-derive-0.5.1" = "sha256-1tbWg3bLab3xlVQxb4G+kpXriO+zQpnrwAESy5Tqsu4="; + "edgeql-parser-0.1.0" = "sha256-c5xBuW47xXgy8VLR/P7DvVhLBd0rvI6P9w82IPPsTwo="; "indexmap-2.0.0-pre" = "sha256-QMOmoUHE1F/sp+NeDpgRGqqacWLHWG02YgZc5vAdXZY="; "rexpect-0.5.0" = "sha256-vstAL/fJWWx7WbmRxNItKpzvgGF3SvJDs5isq9ym/OA="; "rustyline-8.0.0" = "sha256-CrICwQbHPzS4QdVIEHxt2euX+g+0pFYe84NfMp1daEc="; @@ -68,6 +68,6 @@ rustPlatform.buildRustPackage rec { description = "EdgeDB cli"; homepage = "https://www.edgedb.com/docs/cli/index"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = [ maintainers.ranfdev ]; + maintainers = with maintainers; [ ahirner kirillrdy ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/goflow2/default.nix b/nixpkgs/pkgs/tools/networking/goflow2/default.nix index de90345911c0..b80172fdee99 100644 --- a/nixpkgs/pkgs/tools/networking/goflow2/default.nix +++ b/nixpkgs/pkgs/tools/networking/goflow2/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goflow2"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "netsampler"; repo = pname; rev = "v${version}"; - hash = "sha256-c+1Y3OTM2FR9o7zWYGW3uH1LQ2U1occf1++Rnf/atVQ="; + hash = "sha256-RgHCUuP2EE38X6iMaYD2a8f/C2fBcBEHM5ErlKBkMqI="; }; ldflags = [ diff --git a/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix b/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix index d52fecf1f3f9..9ef1d801357f 100644 --- a/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { runHook postInstall ''; meta = with lib; { - description = "The command line tool for interacting with grpc services."; + description = "The command line tool for interacting with grpc services"; homepage = "https://github.com/grpc/grpc"; license = licenses.asl20; maintainers = with maintainers; [ doriath ]; diff --git a/nixpkgs/pkgs/tools/networking/haproxy/default.nix b/nixpkgs/pkgs/tools/networking/haproxy/default.nix index def4d97ca347..e76317b7c43e 100644 --- a/nixpkgs/pkgs/tools/networking/haproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/haproxy/default.nix @@ -24,11 +24,11 @@ assert !useQuicTls -> openssl != null; let sslPkg = if useQuicTls then quictls else openssl; in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "2.9.1"; + version = "2.9.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-1YAcdyqrnEP0CWS3sztDiNFLW0V1C+TSZxeFhjzbnxw="; + hash = "sha256-hRrugw7CjBeRJGqf1EePZD0RWlY92Qf2YSzDgalSqzw="; }; buildInputs = [ sslPkg zlib libxcrypt ] diff --git a/nixpkgs/pkgs/tools/networking/hurl/default.nix b/nixpkgs/pkgs/tools/networking/hurl/default.nix index 69c09515d2b5..37f36e5dd43f 100644 --- a/nixpkgs/pkgs/tools/networking/hurl/default.nix +++ b/nixpkgs/pkgs/tools/networking/hurl/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "Command line tool that performs HTTP requests defined in a simple plain text format."; + description = "Command line tool that performs HTTP requests defined in a simple plain text format"; homepage = "https://hurl.dev/"; changelog = "https://github.com/Orange-OpenSource/hurl/blob/${version}/CHANGELOG.md"; maintainers = with maintainers; [ eonpatapon figsoda ]; diff --git a/nixpkgs/pkgs/tools/networking/i2p/default.nix b/nixpkgs/pkgs/tools/networking/i2p/default.nix index c0a6def95cb6..c160dfd2e7a9 100644 --- a/nixpkgs/pkgs/tools/networking/i2p/default.nix +++ b/nixpkgs/pkgs/tools/networking/i2p/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { mit publicDomain ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; maintainers = with maintainers; [ joelmo ]; }; }) diff --git a/nixpkgs/pkgs/tools/networking/ipinfo/default.nix b/nixpkgs/pkgs/tools/networking/ipinfo/default.nix index 16b68e4801c6..e9db76d73f56 100644 --- a/nixpkgs/pkgs/tools/networking/ipinfo/default.nix +++ b/nixpkgs/pkgs/tools/networking/ipinfo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ipinfo"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = pname; repo = "cli"; rev = "refs/tags/${pname}-${version}"; - hash = "sha256-bqA8Y3mVHSwhUcvr3biWbH6K73MYmo3f7wSMS4J+Bk8="; + hash = "sha256-B0Qb6RFBAUBpE1o8GqKQtxpndeHermMlwlWlfIa7rmM="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/networking/linkchecker/default.nix b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix index c78c12c8fa77..018da51f7701 100644 --- a/nixpkgs/pkgs/tools/networking/linkchecker/default.nix +++ b/nixpkgs/pkgs/tools/networking/linkchecker/default.nix @@ -17,8 +17,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-z7Qp74cai8GfsxB4n9dSCWQepp0/4PimFiRJQBaVSoo="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ gettext ]; diff --git a/nixpkgs/pkgs/tools/networking/linux-router/default.nix b/nixpkgs/pkgs/tools/networking/linux-router/default.nix index acf02a2cc211..65a0531616e0 100644 --- a/nixpkgs/pkgs/tools/networking/linux-router/default.nix +++ b/nixpkgs/pkgs/tools/networking/linux-router/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "linux-router"; - version = "0.6.7"; + version = "0.7.1"; src = fetchFromGitHub { owner = "garywill"; repo = "linux-router"; rev = "refs/tags/${version}"; - hash = "sha256-Ote/arHCU6qiTXdK2RXv9848aeW6rcBsrb6nfxIzQLs="; + hash = "sha256-S7oxtd5DMFaChUhemcCOfoD1E0DbZ68r+1eVMq4vqZc="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/lychee/default.nix b/nixpkgs/pkgs/tools/networking/lychee/default.nix index 5791960029ca..e927982c209a 100644 --- a/nixpkgs/pkgs/tools/networking/lychee/default.nix +++ b/nixpkgs/pkgs/tools/networking/lychee/default.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { ]; meta = with lib; { - description = "A fast, async, stream-based link checker written in Rust."; + description = "A fast, async, stream-based link checker written in Rust"; homepage = "https://github.com/lycheeverse/lychee"; downloadPage = "https://github.com/lycheeverse/lychee/releases/tag/v${version}"; license = with licenses; [ asl20 mit ]; diff --git a/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/nixpkgs/pkgs/tools/networking/minio-client/default.nix index b40ba824be1b..b3cfc792bc39 100644 --- a/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2023-10-30T18-43-32Z"; + version = "2024-01-05T05-04-32Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-4WYJaFVB/+ERMNKvfDZvJGEiImwISM8fXLbi+Y986AM="; + sha256 = "sha256-1A5Nzlf9xBcOcPdKXZut+4ViUvsDa2uFtfN/nIRoUf8="; }; - vendorHash = "sha256-YDXkJVFK09I/Ic3ZBlO2AtybH6+RfwLmBCldX4i41Po="; + vendorHash = "sha256-rqlPUU9phbsw9cjGvU86DjA3cWhcoxX3kxQ1buLM+hg="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix b/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix index 994649404530..f1a639b72060 100644 --- a/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix +++ b/nixpkgs/pkgs/tools/networking/miniupnpc/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "miniupnpc"; - version = "2.2.5"; + version = "2.2.6"; src = fetchurl { url = "https://miniupnp.tuxfamily.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-OKzV9GAvfPi83B7DCy1Y2y6ZEuXZ9TUN2ZsGv9/7UXw="; + sha256 = "sha256-N/zZGVNQjD5i1pZLuP+8XUfz4TSB+lTmIU/MaHBMZvE="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix b/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix index 8264b54d28c0..74c5bdc2ec6e 100644 --- a/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix +++ b/nixpkgs/pkgs/tools/networking/miniupnpd/default.nix @@ -1,10 +1,30 @@ { stdenv, lib, fetchurl, iptables-legacy, libuuid, openssl, pkg-config -, which, iproute2, gnused, coreutils, gawk, makeWrapper +, which, iproute2, gnused, coreutils, gnugrep, gawk, makeWrapper , nixosTests +, firewall ? "iptables", nftables, libmnl, libnftnl }: let - scriptBinEnv = lib.makeBinPath [ which iproute2 iptables-legacy gnused coreutils gawk ]; + scriptBinEnv = lib.makeBinPath { + iptables = [ + # needed for dirname in ip{,6}tables_*.sh + coreutils + # used in miniupnpd_functions.sh: + which + iproute2 + iptables-legacy + gnused + gnugrep + gawk + ]; + nftables = [ + # needed for dirname in nft_*.sh & cat in nft_init.sh + coreutils + # used in miniupnpd_functions.sh: + which + nftables + ]; + }.${firewall}; in stdenv.mkDerivation rec { pname = "miniupnpd"; @@ -15,22 +35,42 @@ stdenv.mkDerivation rec { sha256 = "sha256-b9cBn5Nv+IxB58gi9G8QtRvXLWZZePZYZIPedbMMNr8="; }; - buildInputs = [ iptables-legacy libuuid openssl ]; + buildInputs = [ iptables-legacy libuuid openssl ] + ++ lib.optionals (firewall == "nftables") [ libmnl libnftnl ]; nativeBuildInputs= [ pkg-config makeWrapper ]; - # ./configure is not a standard configure file, errors with: # Option not recognized : --prefix= dontAddPrefix = true; + configureFlags = [ + "--firewall=${firewall}" + # allow using various config options + "--ipv6" + "--leasefile" + "--regex" + "--vendorcfg" + # hardening + "--portinuse" + ]; installFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; - postFixup = '' - for script in $out/etc/miniupnpd/ip{,6}tables_{init,removeall}.sh - do - wrapProgram $script --set PATH '${scriptBinEnv}:$PATH' - done - ''; + postFixup = { + # Ideally we'd prefer using system's config.firewall.package here for iptables, + # however for some reason switching --prefix to --suffix breaks the script + iptables = '' + for script in $out/etc/miniupnpd/ip{,6}tables_{init,removeall}.sh + do + wrapProgram $script --prefix PATH : '${scriptBinEnv}:$PATH' + done + ''; + nftables = '' + for script in $out/etc/miniupnpd/nft_{delete_chain,flush,init,removeall}.sh + do + wrapProgram $script --suffix PATH : '${scriptBinEnv}:$PATH' + done + ''; + }.${firewall}; passthru.tests = { bittorrent-integration = nixosTests.bittorrent; @@ -42,5 +82,6 @@ stdenv.mkDerivation rec { description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = platforms.linux; license = licenses.bsd3; + mainProgram = "miniupnpd"; }; } diff --git a/nixpkgs/pkgs/tools/networking/mmsd/default.nix b/nixpkgs/pkgs/tools/networking/mmsd/default.nix index 43891d612bb1..f7ea7be22c08 100644 --- a/nixpkgs/pkgs/tools/networking/mmsd/default.nix +++ b/nixpkgs/pkgs/tools/networking/mmsd/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchgit +, fetchzip , autoreconfHook , pkg-config , glib @@ -10,9 +10,8 @@ stdenv.mkDerivation rec { pname = "mmsd"; version = "unstable-2019-07-15"; - src = fetchgit { - url = "https://git.kernel.org/pub/scm/network/ofono/mmsd.git"; - rev = "f4b8b32477a411180be1823fdc460b4f7e1e3c9c"; + src = fetchzip { + url = "https://git.kernel.org/pub/scm/network/ofono/mmsd.git/snapshot/mmsd-f4b8b32477a411180be1823fdc460b4f7e1e3c9c.tar.gz"; sha256 = "0hcnpyhsi7b5m825dhnwbp65yi0961wi8mipzdvaw5nc693xv15b"; }; diff --git a/nixpkgs/pkgs/tools/networking/nebula/default.nix b/nixpkgs/pkgs/tools/networking/nebula/default.nix index 2be42d891466..5420c5fa35c3 100644 --- a/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nebula"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-lLDoAR3n3V0hJWvvSqz0nWXSsiXK+kjJJo7okv4KX8c="; + hash = "sha256-tbzdbI4QTLQcJ6kyD3c+jQvXn9ERV/9hrzNPXV9XwVM="; }; - vendorHash = "sha256-amOveyxXGyQVV6yQspExXfj0JTN9yLs6+bcKYRst1tU="; + vendorHash = "sha256-BL9Tx87pBZIAuoneu6Sm2gjyTTC6yOZv5GVYNNeuhtw="; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; diff --git a/nixpkgs/pkgs/tools/networking/netifd/default.nix b/nixpkgs/pkgs/tools/networking/netifd/default.nix index 25aada6e3c44..59b2e4732980 100644 --- a/nixpkgs/pkgs/tools/networking/netifd/default.nix +++ b/nixpkgs/pkgs/tools/networking/netifd/default.nix @@ -1,17 +1,52 @@ -{ lib, stdenv, cmake, fetchgit, libnl, libubox, uci, ubus, json_c, pkg-config }: +{ lib +, stdenv +, cmake +, fetchgit +, libnl +, libubox +, uci +, ubus +, json_c +, pkg-config +, udebug +}: stdenv.mkDerivation { pname = "netifd"; - version = "unstable-2021-04-03"; + version = "unstable-2023-11-27"; src = fetchgit { url = "https://git.openwrt.org/project/netifd.git"; - rev = "327da9895327bc56b23413ee91a6e6b6e0e4329d"; - sha256 = "0jvk2hx8kbkc6d72gh9rwap8ds6qgnmny6306vvzxy68v03xikwv"; + rev = "02bc2e14d1d37500e888c0c53ac41398a56b5579"; + hash = "sha256-aMs/Y50+1Yk/j5jGubjBCRcPGw03oIitvEygaxRlr90="; }; - buildInputs = [ libnl libubox uci ubus json_c ]; - nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ + libnl.dev + libubox + uci + ubus + json_c + udebug + ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + postPatch = '' + # by default this assumes the build directory is the source directory + # since we let cmake build in it's own build directory, we need to use + # $PWD (which at the time of this script being run is the directory with the source code) + # to adjust the paths + sed "s|./make_ethtool_modes_h.sh|$PWD/make_ethtool_modes_h.sh|g" -i CMakeLists.txt + sed "s|./ethtool-modes.h|$PWD/ethtool-modes.h|g" -i CMakeLists.txt + ''; + + env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ + "-Wno-error=maybe-uninitialized" + ]); meta = with lib; { description = "OpenWrt Network interface configuration daemon"; diff --git a/nixpkgs/pkgs/tools/networking/ntpd-rs/default.nix b/nixpkgs/pkgs/tools/networking/ntpd-rs/default.nix index 0fa44cb418c7..828110037896 100644 --- a/nixpkgs/pkgs/tools/networking/ntpd-rs/default.nix +++ b/nixpkgs/pkgs/tools/networking/ntpd-rs/default.nix @@ -1,39 +1,51 @@ { lib , rustPlatform , fetchFromGitHub +, installShellFiles +, pandoc }: rustPlatform.buildRustPackage rec { pname = "ntpd-rs"; - version = "0.3.7"; + version = "1.1.0"; src = fetchFromGitHub { owner = "pendulum-project"; repo = "ntpd-rs"; rev = "v${version}"; - hash = "sha256-AUCzsveG9U+KxYO/4LGmyCPkR+w9pGDA/vTzMAGiVuI="; + hash = "sha256-IoTuI0M+stZNUVpaVsf7JR7uHcamSSVDMJxJ+7n5ayA="; }; - cargoHash = "sha256-6FUVkr3uock43ZBHuMEVIZ5F8Oh8wMifh2EokMWv4hU="; + cargoHash = "sha256-iZuDNFy8c2UZUh3J11lEtfHlDFN+qPl4iZg+ps7AenE="; + + nativeBuildInputs = [ pandoc installShellFiles ]; + + postPatch = '' + substituteInPlace utils/generate-man.sh \ + --replace 'utils/pandoc.sh' 'pandoc' + ''; + + postBuild = '' + source utils/generate-man.sh + ''; + + doCheck = true; checkFlags = [ # doesn't find the testca "--skip=keyexchange::tests::key_exchange_roundtrip" - # seems flaky + # seems flaky? "--skip=algorithm::kalman::peer::tests::test_offset_steering_and_measurements" # needs networking "--skip=hwtimestamp::tests::get_hwtimestamp" ]; postInstall = '' - install -vDt $out/lib/systemd/system pkg/common/ntpd-rs.service - - for testprog in demobilize-server rate-limit-server nts-ke nts-ke-server peer-state simple-daemon; do - moveToOutput bin/$testprog "$tests" - done + install -Dm444 -t $out/lib/systemd/system docs/examples/conf/{ntpd-rs,ntpd-rs-metrics}.service + installManPage docs/precompiled/man/{ntp.toml.5,ntp-ctl.8,ntp-daemon.8,ntp-metrics-exporter.8} ''; - outputs = [ "out" "tests" ]; + outputs = [ "out" "man" ]; meta = with lib; { description = "A full-featured implementation of the Network Time Protocol"; diff --git a/nixpkgs/pkgs/tools/networking/ockam/default.nix b/nixpkgs/pkgs/tools/networking/ockam/default.nix index 472dec1b83dd..b50a4ff45245 100644 --- a/nixpkgs/pkgs/tools/networking/ockam/default.nix +++ b/nixpkgs/pkgs/tools/networking/ockam/default.nix @@ -12,7 +12,7 @@ let pname = "ockam"; - version = "0.115.0"; + version = "0.116.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - sha256 = "sha256-DPRMPGxOuF4FwDXyVNxv9j2qy3K1p/9AVmrp0pPUQXM="; + sha256 = "sha256-dcSH/mO3cUamjOCuvEB/C24n7K5T1KnUMvTn8fVu+YM="; }; - cargoHash = "sha256-SeBv2yO0E60C4xMGf/7LOOyTOXf8vZCxIBC1dU2CAX0="; + cargoHash = "sha256-9UwPPOKg+Im+vfQFiYKS68tONYkKz1TqX7ukbtmLcRk="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] ++ lib.optionals stdenv.isDarwin [ Security ]; @@ -53,9 +53,8 @@ rustPlatform.buildRustPackage { # "--skip=util::tests::test_process_multi_addr" # ]; - meta = with lib; { - description = "Orchestrate end-to-end encryption, cryptographic identities, mutual authentication, and authorization policies between distributed applications – at massive scale. Use Ockam to build secure-by-design applications that can Trust Data-in-Motion."; + description = "Orchestrate end-to-end encryption, cryptographic identities, mutual authentication, and authorization policies between distributed applications – at massive scale"; homepage = "https://github.com/build-trust/ockam"; license = licenses.mpl20; maintainers = with maintainers; [ happysalada ]; diff --git a/nixpkgs/pkgs/tools/networking/octodns/default.nix b/nixpkgs/pkgs/tools/networking/octodns/default.nix index 21b554aaf063..4eedbaa0dedd 100644 --- a/nixpkgs/pkgs/tools/networking/octodns/default.nix +++ b/nixpkgs/pkgs/tools/networking/octodns/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pythonOlder , setuptools -, wheel , pytestCheckHook , dnspython , fqdn @@ -31,7 +30,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/octodns/providers/bind/default.nix b/nixpkgs/pkgs/tools/networking/octodns/providers/bind/default.nix index 46631ebd8e15..f615c9a1eed3 100644 --- a/nixpkgs/pkgs/tools/networking/octodns/providers/bind/default.nix +++ b/nixpkgs/pkgs/tools/networking/octodns/providers/bind/default.nix @@ -6,7 +6,6 @@ , pythonOlder , dnspython , setuptools -, wheel }: buildPythonPackage rec { @@ -25,7 +24,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/octodns/providers/gandi/default.nix b/nixpkgs/pkgs/tools/networking/octodns/providers/gandi/default.nix new file mode 100644 index 000000000000..ced7599c6874 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/octodns/providers/gandi/default.nix @@ -0,0 +1,49 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, octodns +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, setuptools +}: + +buildPythonPackage rec { + pname = "octodns-gandi"; + version = "0.0.2"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-gandi"; + rev = "refs/tags/v${version}"; + hash = "sha256-aZUVdCeIbyXBgy8HNf6bZSmjdRzIvQkCEzndKGyuTkw="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + octodns + requests + ]; + + pythonImportsCheck = [ "octodns_gandi" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + meta = with lib; { + description = "Gandi v5 API provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-gandi"; + changelog = "https://github.com/octodns/octodns-gandi/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/octodns/providers/hetzner/default.nix b/nixpkgs/pkgs/tools/networking/octodns/providers/hetzner/default.nix index eb0903964b71..7ce8ceb81476 100644 --- a/nixpkgs/pkgs/tools/networking/octodns/providers/hetzner/default.nix +++ b/nixpkgs/pkgs/tools/networking/octodns/providers/hetzner/default.nix @@ -7,7 +7,6 @@ , requests , requests-mock , setuptools -, wheel }: buildPythonPackage rec { @@ -27,7 +26,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/nixpkgs/pkgs/tools/networking/octodns/providers/powerdns/default.nix index 68ddc56112b2..deee1d142a31 100644 --- a/nixpkgs/pkgs/tools/networking/octodns/providers/powerdns/default.nix +++ b/nixpkgs/pkgs/tools/networking/octodns/providers/powerdns/default.nix @@ -7,7 +7,6 @@ , requests , requests-mock , setuptools -, wheel }: buildPythonPackage rec { @@ -26,7 +25,6 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - wheel ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/ofono/default.nix b/nixpkgs/pkgs/tools/networking/ofono/default.nix index b52912d5e9a0..f4631f06dc79 100644 --- a/nixpkgs/pkgs/tools/networking/ofono/default.nix +++ b/nixpkgs/pkgs/tools/networking/ofono/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, fetchgit +, fetchzip , autoreconfHook , pkg-config , glib @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - src = fetchgit { - url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git"; - rev = version; + src = fetchzip { + url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git/snapshot/ofono-${version}.tar.gz"; sha256 = "sha256-mnh0qzmgPDfimN/M33HntYj90Xcgc/uF8tKbzeQV1Yg="; }; diff --git a/nixpkgs/pkgs/tools/networking/oha/default.nix b/nixpkgs/pkgs/tools/networking/oha/default.nix index 03028ca580a1..b002e5368495 100644 --- a/nixpkgs/pkgs/tools/networking/oha/default.nix +++ b/nixpkgs/pkgs/tools/networking/oha/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "oha"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "hatoo"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-QZEDp+XCc3ZWQ1UTlMUpdvJCbuO6VCYnJj1Jj9o+Ovs="; + hash = "sha256-s98FPzX6RfLCyttNpE/zC4gb30tLPW+MYCuuxn1ep3c="; }; - cargoSha256 = "sha256-JEbsAJ9NbWw03qYUQqLx7sA04Xq990zdBuludVbxoIg="; + cargoHash = "sha256-zyfCa5hMS8aWABg3gb2Pa/TvNsVXBJKIOiAQ96CLiBo="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config diff --git a/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/nixpkgs/pkgs/tools/networking/openvpn/default.nix index 6aedcbbcbb3e..1a83209aefd4 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/default.nix @@ -66,6 +66,7 @@ let meta = with lib; { description = "A robust and highly flexible tunneling application"; + mainProgram = "openvpn"; downloadPage = "https://openvpn.net/community-downloads/"; homepage = "https://openvpn.net/"; license = licenses.gpl2Only; diff --git a/nixpkgs/pkgs/tools/networking/redli/default.nix b/nixpkgs/pkgs/tools/networking/redli/default.nix index 7c757c9ef770..8045be91a75d 100644 --- a/nixpkgs/pkgs/tools/networking/redli/default.nix +++ b/nixpkgs/pkgs/tools/networking/redli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "redli"; - version = "0.9.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "IBM-Cloud"; repo = pname; rev = "v${version}"; - hash = "sha256-AeIGlRsUWK6q0GJJFmvJwpuGy312VPsMhkxMqDDzay4="; + hash = "sha256-Tux4GsYG3DlJoV10Ahb+X+8mpkchLchbh+PCgRD0kUA="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/networking/requestly/default.nix b/nixpkgs/pkgs/tools/networking/requestly/default.nix index e833b0a7e7f1..4655da5a34c0 100644 --- a/nixpkgs/pkgs/tools/networking/requestly/default.nix +++ b/nixpkgs/pkgs/tools/networking/requestly/default.nix @@ -5,11 +5,11 @@ let pname = "requestly"; - version = "1.5.15"; + version = "1.5.16"; src = fetchurl { url = "https://github.com/requestly/requestly-desktop-app/releases/download/v${version}/Requestly-${version}.AppImage"; - hash = "sha256-GTc4VikXsyiEfgN6oY/YQPBqNLia4cFz1aYS65+SboI="; + hash = "sha256-c+Ti7j+3r0hSw2uvaDkavykUQQdvg0OgD1XdDTQbJuA="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/nixpkgs/pkgs/tools/networking/rosenpass/default.nix b/nixpkgs/pkgs/tools/networking/rosenpass/default.nix index 60240094b436..afbd1ac7f310 100644 --- a/nixpkgs/pkgs/tools/networking/rosenpass/default.nix +++ b/nixpkgs/pkgs/tools/networking/rosenpass/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { passthru.tests.rosenpass = nixosTests.rosenpass; meta = with lib; { - description = "Build post-quantum-secure VPNs with WireGuard!"; + description = "Build post-quantum-secure VPNs with WireGuard"; homepage = "https://rosenpass.eu/"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ wucke13 ]; diff --git a/nixpkgs/pkgs/tools/networking/rosenpass/tools.nix b/nixpkgs/pkgs/tools/networking/rosenpass/tools.nix index fb59436b3810..86f7359809a5 100644 --- a/nixpkgs/pkgs/tools/networking/rosenpass/tools.nix +++ b/nixpkgs/pkgs/tools/networking/rosenpass/tools.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = rosenpass.meta // { - description = "This package contains the Rosenpass tool `rp`, which is a script that wraps the `rosenpass` binary."; + description = "The Rosenpass tool `rp`, which is a script that wraps the `rosenpass` binary"; mainProgram = "rp"; }; } diff --git a/nixpkgs/pkgs/tools/networking/sing-box/default.nix b/nixpkgs/pkgs/tools/networking/sing-box/default.nix index bc5f09ae2934..274920b3d612 100644 --- a/nixpkgs/pkgs/tools/networking/sing-box/default.nix +++ b/nixpkgs/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.8.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-MKvqnPHcao7Hpc6C2kEmBAAC3lHHI1nQ+Zpco9WwqoU="; + hash = "sha256-+N+3RfWOIM6bZAxmmfG3jMWICWKvOC1CV4hBv8oZjIM="; }; - vendorHash = "sha256-8qNH4tQQMwVMpyUTrpL6StkYawO1kWOYXorRTh4GeIQ="; + vendorHash = "sha256-NgtZ0z/9X+GWaZqQJMecF/Bxq9u8JKCewgQGSru+EJc="; tags = [ "with_quic" diff --git a/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix b/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix index 6a332ea8070c..de4831ddeadd 100644 --- a/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix +++ b/nixpkgs/pkgs/tools/networking/sleep-on-lan/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/SR-G/sleep-on-lan"; - description = "Multi-platform process allowing to sleep on LAN a linux or windows computer, through wake-on-lan (reversed) magic packets or through HTTP REST requests."; + description = "Multi-platform process allowing to sleep on LAN a Linux or Windows computer, through wake-on-lan (reversed) magic packets or through HTTP REST requests"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ devusb ]; diff --git a/nixpkgs/pkgs/tools/networking/sniffglue/default.nix b/nixpkgs/pkgs/tools/networking/sniffglue/default.nix index fdedff083b1b..be6a95f4e928 100644 --- a/nixpkgs/pkgs/tools/networking/sniffglue/default.nix +++ b/nixpkgs/pkgs/tools/networking/sniffglue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "sniffglue"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "kpcyrd"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8SkwdPaKHf0ZE/MeM4yOe2CpQvZzIHf5d06iM7KPAT8="; + sha256 = "sha256-MOw0WBdpo6dYXsjbUrqoIJl/sjQ4wSAcm4dPxDgTYgY="; }; - cargoSha256 = "sha256-UGvFLW48sakNuV3eXBpCxaHOrveQPXkynOayMK6qs4g="; + cargoHash = "sha256-vnfviiXJ4L/j5M3N+LegOIvLuD6vYJB1QeBgZJVfDnI="; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix b/nixpkgs/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix deleted file mode 100644 index 3faff612aadc..000000000000 --- a/nixpkgs/pkgs/tools/networking/ssh-askpass-fullscreen/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, gtk2, openssh }: - -stdenv.mkDerivation rec { - pname = "ssh-askpass-fullscreen"; - version = "1.3"; - - src = fetchFromGitHub { - owner = "atj"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-1GER+SxTpbMiYLwFCwLX/hLvzCIqutyvQc9DNJ7d1C0="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - - buildInputs = [ - gtk2 - openssh - ]; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "A small SSH askpass GUI using GTK+2"; - homepage = "https://github.com/atj/ssh-askpass-fullscreen"; - license = licenses.gpl2; - maintainers = with maintainers; [ caadar ]; - platforms = platforms.unix; - }; -} diff --git a/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix b/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix index 6c690fe4064e..b95d0537a8dc 100644 --- a/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix +++ b/nixpkgs/pkgs/tools/networking/stevenblack-blocklist/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "3.13.10"; + version = "3.14.44"; in fetchFromGitHub { name = "stevenblack-blocklist-${version}"; @@ -9,7 +9,7 @@ fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; rev = version; - sha256 = "sha256-LTo0NV1DpHI05AvfmTKNz+/NdXaNoLxgpMhV/HqeT6g="; + sha256 = "sha256-LlTyhtx3DbtsQdkl6J7ktj/zLJULFqQWq5sCqKPX71g="; meta = with lib; { description = "Unified hosts file with base extensions"; diff --git a/nixpkgs/pkgs/tools/networking/subfinder/default.nix b/nixpkgs/pkgs/tools/networking/subfinder/default.nix index 6cd2ee26959f..eca5ee264631 100644 --- a/nixpkgs/pkgs/tools/networking/subfinder/default.nix +++ b/nixpkgs/pkgs/tools/networking/subfinder/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "subfinder"; - version = "2.6.3"; + version = "2.6.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-X1Ow11ECwu2a/VzimrKGRJKCnZWL8KJ5Gii+pjP5b9E="; + hash = "sha256-pCfTaxGScGg2pcQERfWYOwBI3dnfOuXcFZ9msncpPwE="; }; - vendorHash = "sha256-T1xrJ44xB95+ZhQPCYlcbH1gIQm7ETtTnQLl/+TRxVA="; + vendorHash = "sha256-3JlCXW5TfZT6zJ93V45XMDtfpuc31tHCLiJOscizG9M="; modRoot = "./v2"; diff --git a/nixpkgs/pkgs/tools/networking/tunwg/default.nix b/nixpkgs/pkgs/tools/networking/tunwg/default.nix index bab71aa523bc..dfcbbff907b7 100644 --- a/nixpkgs/pkgs/tools/networking/tunwg/default.nix +++ b/nixpkgs/pkgs/tools/networking/tunwg/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tunwg"; - version = "23.07.15+3213668"; + version = "24.01.15+9f04d73"; src = fetchFromGitHub { owner = "ntnj"; repo = "tunwg"; rev = "v${version}"; - hash = "sha256-FghsfL3GW8jWBICJWXsqiFZPbDhIKl2nY8RsMH6ILTw="; + hash = "sha256-M7iMl80uxw0hKg4sK8Tv6U5+nMOK8eTfb9SGn+U2+8E="; }; - vendorHash = "sha256-pzUWhKcht9vodBiZGe9RU+tm0c1/slBGeIrKfZlIDdk="; + vendorHash = "sha256-VlH41hOWC5QBCYZxiKCUZRmw2vHRbbPyzToRMU6kDO8="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/tools/networking/unbound/default.nix b/nixpkgs/pkgs/tools/networking/unbound/default.nix index d71353658e56..d2e657e4e13f 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -41,6 +41,8 @@ # enable support for python plugins in unbound: note this is distinct from pyunbound # see https://unbound.docs.nlnetlabs.nl/en/latest/developer/python-modules.html , withPythonModule ? false +, withLto ? !stdenv.hostPlatform.isStatic && !stdenv.hostPlatform.isMinGW +, withMakeWrapper ? !stdenv.hostPlatform.isMinGW , libnghttp2 # for passthru.tests @@ -58,7 +60,9 @@ stdenv.mkDerivation (finalAttrs: { outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB - nativeBuildInputs = [ makeWrapper pkg-config ] + nativeBuildInputs = + lib.optionals withMakeWrapper [ makeWrapper ] + ++ [ pkg-config ] ++ lib.optionals withPythonModule [ swig ]; buildInputs = [ openssl nettle expat libevent ] @@ -78,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-rootkey-file=${dns-root-data}/root.key" "--enable-pie" "--enable-relro-now" - ] ++ lib.optionals stdenv.hostPlatform.isStatic [ + ] ++ lib.optionals (!withLto) [ "--disable-flto" ] ++ lib.optionals withSystemd [ "--enable-systemd" @@ -124,9 +128,10 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' make unbound-event-install + '' + lib.optionalString withMakeWrapper '' wrapProgram $out/bin/unbound-control-setup \ --prefix PATH : ${lib.makeBinPath [ openssl ]} - '' + lib.optionalString withPythonModule '' + '' + lib.optionalString (withMakeWrapper && withPythonModule) '' wrapProgram $out/bin/unbound \ --prefix PYTHONPATH : "$out/${python.sitePackages}" \ --argv0 $out/bin/unbound @@ -161,6 +166,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; homepage = "https://www.unbound.net"; maintainers = lib.teams.helsinki-systems.members; - platforms = platforms.unix; + platforms = platforms.unix ++ platforms.windows; }; }) diff --git a/nixpkgs/pkgs/tools/networking/uqmi/default.nix b/nixpkgs/pkgs/tools/networking/uqmi/default.nix index 8050909487da..bdbb85f30e89 100644 --- a/nixpkgs/pkgs/tools/networking/uqmi/default.nix +++ b/nixpkgs/pkgs/tools/networking/uqmi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "uqmi"; - version = "unstable-2019-06-27"; + version = "unstable-2023-10-30"; src = fetchgit { url = "https://git.openwrt.org/project/uqmi.git"; - rev = "1965c713937495a5cb029165c16acdb6572c3f87"; - sha256 = "1gn8sdcl4lwfs3lwabmnjbvdhhk1l42bwbajwds7j4936fpbklx0"; + rev = "eea292401c388a4eb59c0caf5d00aa046c6059f4"; + hash = "sha256-Uz5GjGcSKatbii09CsvzsYMz8Vm+Am4RUeCZuFIK1Ag="; }; postPatch = '' @@ -21,6 +21,7 @@ stdenv.mkDerivation { env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ # Needed with GCC 12 but breaks on darwin (with clang) or older gcc "-Wno-error=dangling-pointer" + "-Wno-error=maybe-uninitialized" ]); meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/urlwatch/default.nix b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix index 885304d9fdb1..a17b4b88da3d 100644 --- a/nixpkgs/pkgs/tools/networking/urlwatch/default.nix +++ b/nixpkgs/pkgs/tools/networking/urlwatch/default.nix @@ -23,9 +23,9 @@ python3Packages.buildPythonApplication rec { markdown2 matrix-client minidb + playwright pushbullet-py pycodestyle - pyppeteer pyyaml requests ]; diff --git a/nixpkgs/pkgs/tools/networking/wget2/default.nix b/nixpkgs/pkgs/tools/networking/wget2/default.nix index 9b77133de565..27d1a659029b 100644 --- a/nixpkgs/pkgs/tools/networking/wget2/default.nix +++ b/nixpkgs/pkgs/tools/networking/wget2/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - description = "successor of GNU Wget, a file and recursive website downloader."; + description = "Successor of GNU Wget, a file and recursive website downloader"; longDescription = '' Designed and written from scratch it wraps around libwget, that provides the basic functions needed by a web client. diff --git a/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix b/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix index d2b8f1a0614b..b08abfe069f7 100644 --- a/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix +++ b/nixpkgs/pkgs/tools/nix/nixos-render-docs/default.nix @@ -1,18 +1,11 @@ { lib , stdenv , python3 -, python3Minimal , runCommand }: let - # python3Minimal can't be overridden with packages on Darwin, due to a missing framework. - # Instead of modifying stdenv, we take the easy way out, since most people on Darwin will - # just be hacking on the Nixpkgs manual (which also uses make-options-doc). - python = ((if stdenv.isDarwin then python3 else python3Minimal).override { - self = python; - includeSiteCustomize = true; - }).override { + python = python3.override { packageOverrides = final: prev: { markdown-it-py = prev.markdown-it-py.overridePythonAttrs (_: { doCheck = false; diff --git a/nixpkgs/pkgs/tools/package-management/apx/default.nix b/nixpkgs/pkgs/tools/package-management/apx/default.nix index eb7b0f3a8c71..d24a5bc07106 100644 --- a/nixpkgs/pkgs/tools/package-management/apx/default.nix +++ b/nixpkgs/pkgs/tools/package-management/apx/default.nix @@ -2,21 +2,24 @@ , buildGoModule , fetchFromGitHub , distrobox +, installShellFiles }: buildGoModule rec { pname = "apx"; - version = "2.1.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Vanilla-OS"; repo = "apx"; rev = "v${version}"; - hash = "sha256-0xQfbnLvNB1X1B8440CYHZWFGSQV319IU5tgXS3lyUI="; + hash = "sha256-/RGL2mCfJiJInnt5zgc1xXPqZxXCAcoWIbky99okvL0="; }; vendorHash = null; + nativeBuildInputs = [ installShellFiles ]; + ldflags = [ "-s" "-w" ]; postPatch = '' @@ -28,8 +31,8 @@ buildGoModule rec { ''; postInstall = '' - install -D config/apx.json -t $out/share/apx/ - install -D man/man1/apx.1 -t $out/man/man1/ + install -m 444 -D config/apx.json -t $out/share/apx/ + installManPage man/man1/* ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/package-management/ciel/default.nix b/nixpkgs/pkgs/tools/package-management/ciel/default.nix index 87ea364aa4c4..c5809fdca944 100644 --- a/nixpkgs/pkgs/tools/package-management/ciel/default.nix +++ b/nixpkgs/pkgs/tools/package-management/ciel/default.nix @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec { ''; meta = with lib; { - description = "A tool for controlling AOSC OS packaging environments using multi-layer filesystems and containers."; + description = "A tool for controlling AOSC OS packaging environments using multi-layer filesystems and containers"; homepage = "https://github.com/AOSC-Dev/ciel-rs"; license = licenses.mit; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/package-management/licensee/Gemfile.lock b/nixpkgs/pkgs/tools/package-management/licensee/Gemfile.lock index 487224bf5da2..6bfe70664bd1 100644 --- a/nixpkgs/pkgs/tools/package-management/licensee/Gemfile.lock +++ b/nixpkgs/pkgs/tools/package-management/licensee/Gemfile.lock @@ -1,36 +1,38 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.1) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) + base64 (0.2.0) dotenv (2.8.1) - faraday (2.7.2) + faraday (2.8.1) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) - licensee (9.16.0) + licensee (9.16.1) dotenv (~> 2.0) - octokit (>= 4.20, < 7.0) + octokit (>= 4.20, < 9.0) reverse_markdown (>= 1, < 3) rugged (>= 0.24, < 2.0) thor (>= 0.19, < 2.0) - mini_portile2 (2.8.1) - nokogiri (1.13.10) - mini_portile2 (~> 2.8.0) + mini_portile2 (2.8.5) + nokogiri (1.16.0) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - octokit (6.0.1) + octokit (8.0.0) faraday (>= 1, < 3) sawyer (~> 0.9) - public_suffix (5.0.1) - racc (1.6.2) + public_suffix (5.0.4) + racc (1.7.3) reverse_markdown (2.1.1) nokogiri ruby2_keywords (0.0.5) - rugged (1.5.0.1) + rugged (1.7.1) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - thor (1.2.1) + thor (1.3.0) PLATFORMS ruby @@ -39,4 +41,4 @@ DEPENDENCIES licensee BUNDLED WITH - 2.3.26 + 2.4.22 diff --git a/nixpkgs/pkgs/tools/package-management/licensee/gemset.nix b/nixpkgs/pkgs/tools/package-management/licensee/gemset.nix index 25726d2ac5c2..0a850ba8758b 100644 --- a/nixpkgs/pkgs/tools/package-management/licensee/gemset.nix +++ b/nixpkgs/pkgs/tools/package-management/licensee/gemset.nix @@ -5,10 +5,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ypdmpdn20hxp5vwxz3zc04r5xcwqc25qszdlg41h8ghdqbllwmw"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.6"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; }; dotenv = { groups = ["default"]; @@ -21,15 +31,15 @@ version = "2.8.1"; }; faraday = { - dependencies = ["faraday-net_http" "ruby2_keywords"]; + dependencies = ["base64" "faraday-net_http" "ruby2_keywords"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17lacy6n0hsayafvgxgzmngfq2x62b2arbn32bj2yyzmgxwyxhqn"; + sha256 = "19p45ryrvxff6ggdj4fq76dk7wlkfgrh474c3kwzdsjx3xpdq8x8"; type = "gem"; }; - version = "2.7.2"; + version = "2.8.1"; }; faraday-net_http = { groups = ["default"]; @@ -47,20 +57,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0i4hs0vbgp0w3pdddr37zhydm16af122rmr0w39v3nqrj1ir65kv"; + sha256 = "05g5w9c4jlfhwn0hfz117s1c7hfdm5yn7cywr4mah7xr41yvbh04"; type = "gem"; }; - version = "9.16.0"; + version = "9.16.1"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1af4yarhbbx62f7qsmgg5fynrik0s36wjy3difkawy536xg343mp"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.1"; + version = "2.8.5"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -68,10 +78,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; + sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; type = "gem"; }; - version = "1.13.10"; + version = "1.16.0"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -79,30 +89,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a5iy1v1n8f5ggp6q601mn8dz1n08ffs4gv0zsh5ca68j8dfmpx5"; + sha256 = "11fhv1a43c51jkgmqf62aypf9yw74lc6ph4qmzsh2bydwwzbwqn3"; type = "gem"; }; - version = "6.0.1"; + version = "8.0.0"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.4"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09jgz6r0f7v84a7jz9an85q8vvmp743dqcsdm3z9c8rqcqv6pljq"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.3"; }; reverse_markdown = { dependencies = ["nokogiri"]; @@ -130,10 +140,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02h1cv73znwfgy61mqmfylcfvwyyp3lddiz3njgivfx234mpz50x"; + sha256 = "02m9zksfy3dwzhbv56xq2wwmlghca5209hdg895pi2x2d2sbkahi"; type = "gem"; }; - version = "1.5.0.1"; + version = "1.7.1"; }; sawyer = { dependencies = ["addressable" "faraday"]; @@ -151,9 +161,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; type = "gem"; }; - version = "1.2.1"; + version = "1.3.0"; }; } diff --git a/nixpkgs/pkgs/tools/package-management/nix/common.nix b/nixpkgs/pkgs/tools/package-management/nix/common.nix index 0ea47dd7e17c..946407826f25 100644 --- a/nixpkgs/pkgs/tools/package-management/nix/common.nix +++ b/nixpkgs/pkgs/tools/package-management/nix/common.nix @@ -6,7 +6,7 @@ , src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit hash; } , patches ? [ ] , maintainers ? with lib.maintainers; [ eelco lovesegfault artturin ] -}: +}@args: assert (hash == null) -> (src != null); let atLeast24 = lib.versionAtLeast version "2.4pre"; @@ -213,6 +213,11 @@ self = stdenv.mkDerivation { preInstallCheck = lib.optionalString stdenv.isDarwin '' export TMPDIR=$NIX_BUILD_TOP '' + # Prevent crashes in libcurl due to invoking Objective-C `+initialize` methods after `fork`. + # See http://sealiesoftware.com/blog/archive/2017/6/5/Objective-C_and_fork_in_macOS_1013.html. + + lib.optionalString stdenv.isDarwin '' + export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=yes + '' # See https://github.com/NixOS/nix/issues/5687 + lib.optionalString (atLeast25 && stdenv.isDarwin) '' echo "exit 99" > tests/gc-non-blocking.sh @@ -232,6 +237,9 @@ self = stdenv.mkDerivation { }; }; + # point 'nix edit' and ofborg at the file that defines the attribute, + # not this common file. + pos = builtins.unsafeGetAttrPos "version" args; meta = with lib; { description = "Powerful package manager that makes package management reliable and reproducible"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix b/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix index 72045735cba3..897f8d9e7b4a 100644 --- a/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix +++ b/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchFromGitHub, cmake, pkg-config +{ stdenv, lib, fetchFromGitHub, cmake, pkg-config , qttools, packagekit }: -stdenv.mkDerivation rec { +let + isQt6 = lib.versions.major qttools.version == "6"; +in stdenv.mkDerivation rec { pname = "packagekit-qt"; version = "1.1.1"; @@ -16,6 +18,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config qttools ]; + cmakeFlags = [ (lib.cmakeBool "BUILD_WITH_QT6" isQt6) ]; + dontWrapQtApps = true; meta = packagekit.meta // { diff --git a/nixpkgs/pkgs/tools/package-management/pacman/default.nix b/nixpkgs/pkgs/tools/package-management/pacman/default.nix index f9a7fcdcde59..800e392f0f24 100644 --- a/nixpkgs/pkgs/tools/package-management/pacman/default.nix +++ b/nixpkgs/pkgs/tools/package-management/pacman/default.nix @@ -48,9 +48,12 @@ stdenv.mkDerivation rec { hash = "sha256-fY4+jFEhrsCWXfcfWb7fRgUsbPFPljZcRBHsPeCkwaU="; }; + strictDeps = true; + nativeBuildInputs = [ asciidoc installShellFiles + libarchive makeWrapper meson ninja diff --git a/nixpkgs/pkgs/tools/package-management/pdm/default.nix b/nixpkgs/pkgs/tools/package-management/pdm/default.nix index 0bf1cb88be68..b8f1b00b844d 100644 --- a/nixpkgs/pkgs/tools/package-management/pdm/default.nix +++ b/nixpkgs/pkgs/tools/package-management/pdm/default.nix @@ -32,13 +32,14 @@ in with python.pkgs; buildPythonApplication rec { pname = "pdm"; - version = "2.10.4"; - format = "pyproject"; - disabled = pythonOlder "3.7"; + version = "2.12.1"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bf2dTLWQQ+3sstC0fSCOVdidMzunGX3rBcyi37x6S/s="; + hash = "sha256-OaKroZmGyUWnm/WEw3dSheJOnH+O2KYDgVthxfrF20w="; }; nativeBuildInputs = [ @@ -49,6 +50,7 @@ buildPythonApplication rec { blinker certifi cachecontrol + dep-logic findpython installer packaging @@ -69,6 +71,9 @@ buildPythonApplication rec { ] ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata + ] + ++ lib.optionals (pythonAtLeast "3.10") [ + truststore ]; nativeCheckInputs = [ diff --git a/nixpkgs/pkgs/tools/package-management/poetry/default.nix b/nixpkgs/pkgs/tools/package-management/poetry/default.nix index 6de9219529bd..75cede5df7d3 100644 --- a/nixpkgs/pkgs/tools/package-management/poetry/default.nix +++ b/nixpkgs/pkgs/tools/package-management/poetry/default.nix @@ -1,8 +1,8 @@ -{ python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub }: let - python = python3.override { - packageOverrides = self: super: rec { + newPackageOverrides = + self: super: { poetry = self.callPackage ./unwrapped.nix { }; # The versions of Poetry and poetry-core need to match exactly, @@ -21,7 +21,10 @@ let }; }); } // (plugins self); - }; + python = python3.override (old: { + packageOverrides = lib.composeManyExtensions + ((if old ? packageOverrides then [ old.packageOverrides ] else [ ]) ++ [ newPackageOverrides ]); + }); plugins = ps: with ps; { poetry-audit-plugin = callPackage ./plugins/poetry-audit-plugin.nix { }; diff --git a/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix b/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix index 33fcb8e6f46d..f13a7715464b 100644 --- a/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix +++ b/nixpkgs/pkgs/tools/package-management/poetry/unwrapped.nix @@ -10,8 +10,8 @@ , cleo , crashtest , dulwich +, fastjsonschema , installer -, jsonschema , keyring , packaging , pexpect @@ -37,6 +37,7 @@ , pytest-mock , pytest-xdist , pythonAtLeast +, darwin }: buildPythonPackage rec { @@ -59,8 +60,10 @@ buildPythonPackage rec { ]; pythonRelaxDeps = [ - # only pinned to avoid dependency on Rust - "jsonschema" + # platformdirs 4.x is backwards compatible; https://github.com/python-poetry/poetry/commit/eb80d10846f7336b0b2a66ce2964e72dffee9a1c + "platformdirs" + # xattr 1.0 is backwards compatible modulo dropping Python 2 support: https://github.com/xattr/xattr/compare/v0.10.0...v1.0.0 + "xattr" ]; propagatedBuildInputs = [ @@ -69,8 +72,8 @@ buildPythonPackage rec { cleo crashtest dulwich + fastjsonschema installer - jsonschema keyring packaging pexpect @@ -108,6 +111,8 @@ buildPythonPackage rec { httpretty pytest-mock pytest-xdist + ] ++ lib.optionals stdenv.isDarwin [ + darwin.ps ]; preCheck = ('' diff --git a/nixpkgs/pkgs/tools/package-management/protontricks/default.nix b/nixpkgs/pkgs/tools/package-management/protontricks/default.nix index b8689fdf9966..462a2546ff5d 100644 --- a/nixpkgs/pkgs/tools/package-management/protontricks/default.nix +++ b/nixpkgs/pkgs/tools/package-management/protontricks/default.nix @@ -4,7 +4,9 @@ , setuptools-scm , setuptools , vdf -, bash +, pillow +, substituteAll +, writeShellScript , steam-run , winetricks , yad @@ -14,36 +16,41 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "sha256-gKrdUwX5TzeHHXuwhUyI4REPE6TNiZ6lhonyMCHcBCA="; + sha256 = "sha256-5FpcIaQodvNjdqUfD9hvXlrdhszr98j0zm3MCCpZFoc="; }; patches = [ # Use steam-run to run Proton binaries - ./steam-run.patch + (substituteAll { + src = ./steam-run.patch; + steamRun = lib.getExe steam-run; + bash = writeShellScript "steam-run-bash" '' + exec ${lib.getExe steam-run} bash "$@" + ''; + }) ]; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ setuptools # implicit dependency, used to find data/icon_placeholder.png vdf + pillow ]; makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ - bash - steam-run winetricks yad ]}" + # Steam Runtime does not work outside of steam-run, so don't use it + "--set STEAM_RUNTIME 0" ]; nativeCheckInputs = [ pytestCheckHook ]; diff --git a/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch b/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch index bcc1fc989836..3c865746377a 100644 --- a/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch +++ b/nixpkgs/pkgs/tools/package-management/protontricks/steam-run.patch @@ -1,470 +1,65 @@ -diff --git a/src/protontricks/cli/main.py b/src/protontricks/cli/main.py -index c77d287..236c2a9 100755 ---- a/src/protontricks/cli/main.py -+++ b/src/protontricks/cli/main.py -@@ -17,8 +17,7 @@ from ..flatpak import (FLATPAK_BWRAP_COMPATIBLE_VERSION, - get_running_flatpak_version) - from ..gui import (prompt_filesystem_access, select_steam_app_with_gui, - select_steam_installation) --from ..steam import (find_legacy_steam_runtime_path, find_proton_app, -- find_steam_installations, get_steam_apps, -+from ..steam import (find_proton_app, find_steam_installations, get_steam_apps, - get_steam_lib_paths) - from ..util import run_command - from ..winetricks import get_winetricks_path -@@ -67,8 +66,7 @@ def main(args=None, steam_path=None, steam_root=None): - "WINE: path to a custom 'wine' executable\n" - "WINESERVER: path to a custom 'wineserver' executable\n" - "STEAM_RUNTIME: 1 = enable Steam Runtime, 0 = disable Steam " -- "Runtime, valid path = custom Steam Runtime path, " -- "empty = enable automatically (default)\n" -+ "Runtime, empty = enable automatically (default)\n" - "PROTONTRICKS_GUI: GUI provider to use, accepts either 'yad' " - "or 'zenity'" - ), -@@ -204,17 +202,9 @@ def main(args=None, steam_path=None, steam_root=None): - if not steam_path: - exit_("No Steam installation was selected.") - -- # 2. Find the pre-installed legacy Steam Runtime if enabled -- legacy_steam_runtime_path = None -- use_steam_runtime = True -- -+ # 2. Use Steam Runtime if enabled - if os.environ.get("STEAM_RUNTIME", "") != "0" and not args.no_runtime: -- legacy_steam_runtime_path = find_legacy_steam_runtime_path( -- steam_root=steam_root -- ) -- -- if not legacy_steam_runtime_path: -- exit_("Steam Runtime was enabled but couldn't be found!") -+ use_steam_runtime = True - else: - use_steam_runtime = False - logger.info("Steam Runtime disabled.") -@@ -281,7 +271,6 @@ def main(args=None, steam_path=None, steam_root=None): - proton_app=proton_app, - steam_app=steam_app, - use_steam_runtime=use_steam_runtime, -- legacy_steam_runtime_path=legacy_steam_runtime_path, - command=[str(winetricks_path), "--gui"], - use_bwrap=use_bwrap, - start_wineserver=start_background_wineserver -@@ -361,7 +350,6 @@ def main(args=None, steam_path=None, steam_root=None): - proton_app=proton_app, - steam_app=steam_app, - use_steam_runtime=use_steam_runtime, -- legacy_steam_runtime_path=legacy_steam_runtime_path, - use_bwrap=use_bwrap, - start_wineserver=start_background_wineserver, - command=[str(winetricks_path)] + args.winetricks_command -@@ -373,7 +361,6 @@ def main(args=None, steam_path=None, steam_root=None): - steam_app=steam_app, - command=args.command, - use_steam_runtime=use_steam_runtime, -- legacy_steam_runtime_path=legacy_steam_runtime_path, - use_bwrap=use_bwrap, - start_wineserver=start_background_wineserver, - # Pass the command directly into the shell *without* diff --git a/src/protontricks/data/scripts/bwrap_launcher.sh b/src/protontricks/data/scripts/bwrap_launcher.sh -index b5552e1..b11bc99 100644 +index 922c59d..54742a4 100644 --- a/src/protontricks/data/scripts/bwrap_launcher.sh +++ b/src/protontricks/data/scripts/bwrap_launcher.sh @@ -1,4 +1,4 @@ -#!/bin/bash -+#!/usr/bin/env bash ++#!@bash@ # Helper script set -o errexit -@@ -80,6 +80,8 @@ done - log_info "Following directories will be mounted inside container: ${mount_dirs[*]}" - log_info "Using temporary directory: $PROTONTRICKS_TEMP_PATH" - --exec "$STEAM_RUNTIME_PATH"/run --share-pid --launcher \ -+exec steam-run "$STEAM_RUNTIME_PATH"/pressure-vessel/bin/pressure-vessel-wrap \ -+--variable-dir="${PRESSURE_VESSEL_VARIABLE_DIR:-$STEAM_RUNTIME_PATH/var}" \ -+--share-pid --launcher \ - "${mount_params[@]}" -- \ - --bus-name="com.github.Matoking.protontricks.App${STEAM_APPID}_${PROTONTRICKS_SESSION_ID}" diff --git a/src/protontricks/data/scripts/wine_launch.sh b/src/protontricks/data/scripts/wine_launch.sh -index 1f8a432..2d82f2b 100644 +index 1b0a0ce..127f13e 100644 --- a/src/protontricks/data/scripts/wine_launch.sh +++ b/src/protontricks/data/scripts/wine_launch.sh @@ -1,4 +1,4 @@ -#!/bin/bash -+#!/usr/bin/env -S steam-run bash ++#!@bash@ # Helper script created by Protontricks to run Wine binaries using Steam Runtime set -o errexit -@@ -158,8 +158,8 @@ if [[ -n "$PROTONTRICKS_INSIDE_STEAM_RUNTIME" - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"$PROTON_LD_LIBRARY_PATH" - log_info "Appending to LD_LIBRARY_PATH: $PROTON_LD_LIBRARY_PATH" - elif [[ "$PROTONTRICKS_STEAM_RUNTIME" = "legacy" ]]; then -- export LD_LIBRARY_PATH="$PROTON_LD_LIBRARY_PATH" -- log_info "LD_LIBRARY_PATH set to $LD_LIBRARY_PATH" -+ export LD_LIBRARY_PATH="$PROTON_LD_LIBRARY_PATH":"$LD_LIBRARY_PATH" -+ log_info "Inserting to head of LD_LIBRARY_PATH: $PROTON_LD_LIBRARY_PATH" - fi - exec "$PROTON_DIST_PATH"/bin/@@name@@ "$@" || : - elif [[ "$PROTONTRICKS_STEAM_RUNTIME" = "bwrap" ]]; then diff --git a/src/protontricks/data/scripts/wineserver_keepalive.sh b/src/protontricks/data/scripts/wineserver_keepalive.sh -index 8168dae..559de33 100644 +index 8168dae..cb3e7d9 100644 --- a/src/protontricks/data/scripts/wineserver_keepalive.sh +++ b/src/protontricks/data/scripts/wineserver_keepalive.sh @@ -1,4 +1,4 @@ -#!/bin/bash -+#!/usr/bin/env bash ++#!@bash@ # A simple keepalive script that will ensure a wineserver process is kept alive # for the duration of the Protontricks session. # This is accomplished by launching a simple Windows batch script that will -diff --git a/src/protontricks/steam.py b/src/protontricks/steam.py -index c39b51d..79de098 100644 ---- a/src/protontricks/steam.py -+++ b/src/protontricks/steam.py -@@ -14,9 +14,8 @@ from .util import lower_dict - - __all__ = ( - "COMMON_STEAM_DIRS", "SteamApp", "find_steam_installations", -- "find_steam_path", "find_legacy_steam_runtime_path", -- "iter_appinfo_sections", "get_appinfo_sections", "get_tool_appid", -- "find_steam_compat_tool_app", "find_appid_proton_prefix", -+ "find_steam_path", "iter_appinfo_sections", "get_appinfo_sections", -+ "get_tool_appid", "find_steam_compat_tool_app", "find_appid_proton_prefix", - "find_proton_app", "get_steam_lib_paths", "get_compat_tool_dirs", - "get_custom_compat_tool_installations_in_dir", - "get_custom_compat_tool_installations", "find_current_steamid3", -@@ -393,37 +392,6 @@ def find_steam_path(): - return None, None - - --def find_legacy_steam_runtime_path(steam_root): -- """ -- Find the legacy Steam Runtime either using the STEAM_RUNTIME env or -- steam_root -- """ -- env_steam_runtime = os.environ.get("STEAM_RUNTIME", "") -- -- if env_steam_runtime == "0": -- # User has disabled Steam Runtime -- logger.info("STEAM_RUNTIME is 0. Disabling Steam Runtime.") -- return None -- elif env_steam_runtime and Path(env_steam_runtime).is_dir(): -- # User has a custom Steam Runtime -- logger.info( -- "Using custom Steam Runtime at %s", env_steam_runtime) -- return Path(env_steam_runtime) -- elif env_steam_runtime in ["1", ""]: -- # User has enabled Steam Runtime or doesn't have STEAM_RUNTIME set; -- # default to enabled Steam Runtime in either case -- steam_runtime_path = steam_root / "ubuntu12_32" / "steam-runtime" -- -- logger.info( -- "Using default Steam Runtime at %s", str(steam_runtime_path)) -- return steam_runtime_path -- -- logger.error( -- "Path in STEAM_RUNTIME doesn't point to a valid Steam Runtime!") -- -- return None -- -- - APPINFO_STRUCT_HEADER = "<4sL" - APPINFO_V27_STRUCT_SECTION = "<LLLLQ20sL" - APPINFO_V28_STRUCT_SECTION = "<LLLLQ20sL20s" diff --git a/src/protontricks/util.py b/src/protontricks/util.py -index 7e95af5..7dc9a29 100644 +index 9262cd0..00b2b2f 100644 --- a/src/protontricks/util.py +++ b/src/protontricks/util.py -@@ -8,14 +8,14 @@ import shutil - import tempfile - import re - from pathlib import Path --from subprocess import PIPE, check_output, run, Popen, DEVNULL -+from subprocess import PIPE, run, Popen, DEVNULL - - import pkg_resources - - __all__ = ( - "SUPPORTED_STEAM_RUNTIMES", "lower_dict", -- "get_legacy_runtime_library_paths", "get_host_library_paths", -- "RUNTIME_ROOT_GLOB_PATTERNS", "get_runtime_library_paths", -+ "get_host_library_paths", "RUNTIME_ROOT_GLOB_PATTERNS", -+ "get_runtime_library_paths", - "WINE_SCRIPT_TEMPLATE", "create_wine_bin_dir", "run_command" - ) - -@@ -43,24 +43,6 @@ def lower_dict(d): - return {k.lower(): _lower_value(v) for k, v in d.items()} - - --def get_legacy_runtime_library_paths(legacy_steam_runtime_path, proton_app): -- """ -- Get LD_LIBRARY_PATH value to use when running a command using Steam Runtime -- """ -- steam_runtime_paths = check_output([ -- str(legacy_steam_runtime_path / "run.sh"), -- "--print-steam-runtime-library-paths" -- ]) -- steam_runtime_paths = str(steam_runtime_paths, "utf-8") -- # Add Proton installation directory first into LD_LIBRARY_PATH -- # so that libwine.so.1 is picked up correctly (see issue #3) -- return "".join([ -- str(proton_app.proton_dist_path / "lib"), os.pathsep, -- str(proton_app.proton_dist_path / "lib64"), os.pathsep, -- steam_runtime_paths -- ]) -- -- - def get_host_library_paths(): - """ - Get host library paths to use when creating the LD_LIBRARY_PATH environment -@@ -72,7 +54,7 @@ def get_host_library_paths(): +@@ -99,7 +99,7 @@ def get_host_library_paths(): # Since that command is unavailable with newer Steam Runtime releases, # do it ourselves here. result = run( - ["/sbin/ldconfig", "-XNv"], -+ ["steam-run", "ldconfig", "-XNv"], ++ ["@steamRun@", "/sbin/ldconfig", "-XNv"], check=True, stdout=PIPE, stderr=PIPE ) lines = result.stdout.decode("utf-8").split("\n") -@@ -90,7 +72,7 @@ RUNTIME_ROOT_GLOB_PATTERNS = ( - ) - - --def get_runtime_library_paths(proton_app, use_bwrap=True): -+def get_runtime_library_paths(proton_app, proton_app_only=True): - """ - Get LD_LIBRARY_PATH value to use when running a command using Steam Runtime - """ -@@ -111,7 +93,7 @@ def get_runtime_library_paths(proton_app, use_bwrap=True): - f"Could not find Steam Runtime runtime root for {runtime_app.name}" - ) - -- if use_bwrap: -+ if proton_app_only: - return "".join([ - str(proton_app.proton_dist_path / "lib"), os.pathsep, - str(proton_app.proton_dist_path / "lib64"), os.pathsep -@@ -313,7 +295,7 @@ def run_command( - wine_environ["STEAM_RUNTIME_PATH"] = \ - str(proton_app.required_tool_app.install_path) - wine_environ["PROTON_LD_LIBRARY_PATH"] = \ -- get_runtime_library_paths(proton_app, use_bwrap=use_bwrap) -+ get_runtime_library_paths(proton_app, proton_app_only=use_bwrap) - - runtime_name = proton_app.required_tool_app.name - logger.info( -@@ -337,13 +319,9 @@ def run_command( - "Current Steam Runtime not recognized by Protontricks." - ) - else: -- # Legacy Steam Runtime requires a different LD_LIBRARY_PATH -- # that is produced by a script. - wine_environ["PROTONTRICKS_STEAM_RUNTIME"] = "legacy" - wine_environ["PROTON_LD_LIBRARY_PATH"] = \ -- get_legacy_runtime_library_paths( -- legacy_steam_runtime_path, proton_app -- ) -+ get_runtime_library_paths(proton_app, proton_app_only=True) - - # bwrap is not available, so ensure it is not launched even if the - # user configured it so -@@ -353,7 +331,6 @@ def run_command( - # configuring the environment and Wine before launching the underlying - # Wine binaries. - wine_bin_dir = create_wine_bin_dir(proton_app) -- wine_environ["LEGACY_STEAM_RUNTIME_PATH"] = str(legacy_steam_runtime_path) - wine_environ["PATH"] = os.pathsep.join( - [str(wine_bin_dir), wine_environ["PATH"]] - ) -diff --git a/tests/cli/test_main.py b/tests/cli/test_main.py -index 0a35f8d..9b96629 100644 ---- a/tests/cli/test_main.py -+++ b/tests/cli/test_main.py -@@ -121,15 +121,10 @@ class TestCLIRun: - assert str(command.args[0]).endswith(".local/bin/winetricks") - assert command.args[1] == "winecfg" - assert command.env["PATH"].startswith(str(wine_bin_dir)) -- assert ( -- "fake_steam_runtime/lib64" in command.env["PROTON_LD_LIBRARY_PATH"] -- ) - assert command.env["WINE"] == str(wine_bin_dir / "wine") - assert command.env["WINELOADER"] == str(wine_bin_dir / "wine") - assert command.env["WINESERVER"] == str(wine_bin_dir / "wineserver") - -- assert command.env["LEGACY_STEAM_RUNTIME_PATH"] == \ -- str(steam_runtime_dir / "steam-runtime") - assert command.env["PROTONTRICKS_STEAM_RUNTIME"] == "legacy" - assert "STEAM_RUNTIME_PATH" not in command.env - -@@ -180,16 +175,14 @@ class TestCLIRun: - assert command.env["PATH"].startswith(str(wine_bin_dir)) - - # Compared to the traditional Steam Runtime, PROTON_LD_LIBRARY_PATH -- # will be different -+ # will be the same (it would be different without steam-run.patch) - proton_install_path = Path(proton_app.install_path) - assert command.env["PROTON_LD_LIBRARY_PATH"] == "".join([ - str(proton_install_path / "dist" / "lib"), os.pathsep, - str(proton_install_path / "dist" / "lib64"), os.pathsep - ]) - -- # Environment variables for both legacy and new Steam Runtime exist -- assert command.env["LEGACY_STEAM_RUNTIME_PATH"] == \ -- str(steam_runtime_dir / "steam-runtime") -+ # Environment variable for new Steam Runtime exists - assert command.env["STEAM_RUNTIME_PATH"] == \ - str(steam_runtime_soldier.install_path) - assert command.env["PROTONTRICKS_STEAM_RUNTIME"] == "bwrap" -@@ -254,9 +247,7 @@ class TestCLIRun: - str(runtime_root / "lib" / "x86_64-linux-gnu") - ])) - -- # Environment variables for both legacy and new Steam Runtime exist -- assert command.env["LEGACY_STEAM_RUNTIME_PATH"] == \ -- str(steam_runtime_dir / "steam-runtime") -+ # Environment variable for new Steam Runtime exists - assert command.env["STEAM_RUNTIME_PATH"] == \ - str(steam_runtime_soldier.install_path) - assert command.env["PROTONTRICKS_STEAM_RUNTIME"] == "legacy" -@@ -407,7 +398,6 @@ class TestCLIRun: - - # Also ensure log messages are included in the error message - assert b"Found Steam directory at" in message -- assert b"Using default Steam Runtime" in message - - def test_run_gui_provider_not_found(self, cli, home_dir, steam_app_factory): - """ -@@ -421,20 +411,6 @@ class TestCLIRun: - - assert "YAD or Zenity is not installed" in result - -- def test_run_steam_runtime_not_found( -- self, cli, steam_dir, steam_app_factory): -- """ -- Try performing a command with Steam Runtime enabled but no -- available Steam Runtime installation -- """ -- steam_app_factory(name="Fake game 1", appid=10) -- result = cli( -- ["10", "winecfg"], env={"STEAM_RUNTIME": "invalid/path"}, -- expect_returncode=1 -- ) -- -- assert "Steam Runtime was enabled but couldn't be found" in result -- - def test_run_proton_not_found(self, cli, steam_dir, steam_app_factory): - steam_app_factory(name="Fake game 1", appid=10) - result = cli(["10", "winecfg"], expect_returncode=1) diff --git a/tests/conftest.py b/tests/conftest.py -index 106e0d9..8236f3a 100644 +index a516437..88bf804 100644 --- a/tests/conftest.py +++ b/tests/conftest.py -@@ -169,7 +169,7 @@ def steam_runtime_dir(steam_dir): +@@ -170,7 +170,7 @@ def steam_runtime_dir(steam_dir): """ (steam_dir.parent / "root" / "ubuntu12_32" / "steam-runtime").mkdir(parents=True) (steam_dir.parent / "root" / "ubuntu12_32" / "steam-runtime" / "run.sh").write_text( - "#!/bin/bash\n" -+ "#!/usr/bin/env -S steam-run bash\n" ++ "#!/bin/sh\n" """if [ "$1" = "--print-steam-runtime-library-paths" ]; then\n""" " echo 'fake_steam_runtime/lib:fake_steam_runtime/lib64'\n" "fi" -@@ -735,7 +735,7 @@ def xdg_user_dir_bin(home_dir): +@@ -764,7 +764,7 @@ def xdg_user_dir_bin(home_dir): # Only mock PICTURES and DOWNLOAD; mocking everything isn't necessary # for the tests. (home_dir / ".local" / "bin" / "xdg-user-dir").write_text( - '#!/bin/bash\n' -+ '#!/usr/bin/env -S steam-run bash\n' ++ '#!/bin/sh\n' 'if [[ "$1" == "PICTURES" ]]; then\n' ' echo "$HOME/Pictures"\n' 'elif [[ "$1" == "DOWNLOAD" ]]; then\n' -diff --git a/tests/test_flatpak.py b/tests/test_flatpak.py -index cb2b9bb..440b704 100644 ---- a/tests/test_flatpak.py -+++ b/tests/test_flatpak.py -@@ -159,36 +159,6 @@ class TestGetInaccessiblePaths: - - assert len(inaccessible_paths) == 0 - -- @pytest.mark.usefixtures("xdg_user_dir_bin") -- def test_flatpak_xdg_user_dir(self, monkeypatch, tmp_path, home_dir): -- """ -- Test that XDG filesystem permissions such as 'xdg-pictures' and -- 'xdg-download' are detected correctly -- """ -- flatpak_info_path = tmp_path / "flatpak-info" -- -- flatpak_info_path.write_text( -- "[Application]\n" -- "name=fake.flatpak.Protontricks\n" -- "\n" -- "[Instance]\n" -- "flatpak-version=1.12.1\n" -- "\n" -- "[Context]\n" -- "filesystems=xdg-pictures;" -- ) -- monkeypatch.setattr( -- "protontricks.flatpak.FLATPAK_INFO_PATH", str(flatpak_info_path) -- ) -- -- inaccessible_paths = get_inaccessible_paths([ -- str(home_dir / "Pictures"), -- str(home_dir / "Download") -- ]) -- -- assert len(inaccessible_paths) == 1 -- assert str(inaccessible_paths[0]) == str(home_dir / "Download") -- - def test_flatpak_unknown_permission(self, monkeypatch, tmp_path, caplog): - """ - Test that unknown filesystem permissions are ignored -diff --git a/tests/test_util.py b/tests/test_util.py -index ec5f4f3..0b0a66c 100644 ---- a/tests/test_util.py -+++ b/tests/test_util.py -@@ -98,44 +98,6 @@ class TestRunCommand: - assert command.env["WINELOADER"] == "/fake/wine" - assert command.env["WINESERVER"] == "/fake/wineserver" - -- def test_unknown_steam_runtime_detected( -- self, home_dir, proton_factory, runtime_app_factory, -- steam_app_factory, caplog): -- """ -- Test that Protontricks will log a warning if it encounters a Steam -- Runtime it does not recognize -- """ -- steam_runtime_medic = runtime_app_factory( -- name="Steam Linux Runtime - Medic", -- appid=14242420, -- runtime_dir_name="medic" -- ) -- proton_app = proton_factory( -- name="Proton 5.20", appid=100, compat_tool_name="proton_520", -- is_default_proton=True, required_tool_app=steam_runtime_medic -- ) -- steam_app = steam_app_factory(name="Fake game", appid=10) -- -- run_command( -- winetricks_path=Path("/usr/bin/winetricks"), -- proton_app=proton_app, -- steam_app=steam_app, -- command=["echo", "nothing"], -- shell=True, -- use_steam_runtime=True -- ) -- -- # Warning will be logged since Protontricks does not recognize -- # Steam Runtime Medic and can't ensure it's being configured correctly -- warning = next( -- record for record in caplog.records -- if record.levelname == "WARNING" -- and "not recognized" in record.getMessage() -- ) -- assert warning.getMessage() == \ -- "Current Steam Runtime not recognized by Protontricks." -- -- - class TestLowerDict: - def test_lower_nested_dict(self): - """ diff --git a/nixpkgs/pkgs/tools/security/arti/default.nix b/nixpkgs/pkgs/tools/security/arti/default.nix index 47e5ded8581f..35e4dea0f9f6 100644 --- a/nixpkgs/pkgs/tools/security/arti/default.nix +++ b/nixpkgs/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.1.11"; + version = "1.1.12"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-4/qlO+/GY5/U+jEMCuinqAZPyqtBiyaJ4TGkz8JV5AI="; + hash = "sha256-cGqeuck/N1IoI400AkuUIkJpAJneJ7T47rfwC/GP62M="; }; - cargoHash = "sha256-NNf2iQyqZvBo6yVJo1Co67ivnILqfynjy5HCQxRJNKM="; + cargoHash = "sha256-aC5Us0wk2IORZDT+op2iAXYDqd9Qc2UI+GncbSZRMxI="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/security/bitwarden/cli.nix b/nixpkgs/pkgs/tools/security/bitwarden/cli.nix index b51dd1e9e8c2..b5adb6f5d9ae 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden/cli.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden/cli.nix @@ -10,18 +10,18 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2023.12.1"; + version = "2024.1.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-WHI1AfliJa1wAbN1Heto28WlM7uX51SSV4YndAZii1Y="; + hash = "sha256-lDDy1b1yfw3nZrwEEkpvh6xYucgn20XHsGACc45eb2w="; }; nodejs = nodejs_18; - npmDepsHash = "sha256-18OaRCys+HaCZ5/ZLeugqW0jWKSQkfvnBGx8aVAdezQ="; + npmDepsHash = "sha256-RR8Ua41D9SXymiPuabOnIab3byu8DR63rOfdeTaQpy4="; nativeBuildInputs = [ python3 @@ -37,6 +37,8 @@ buildNpmPackage rec { npmWorkspace = "apps/cli"; + npmFlags = [ "--legacy-peer-deps" ]; + passthru.tests = { vaultwarden = nixosTests.vaultwarden.sqlite; }; diff --git a/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/nixpkgs/pkgs/tools/security/bitwarden/default.nix index f5091a4b084c..56d0cf676330 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -30,30 +30,29 @@ let electron = electron_27; in buildNpmPackage rec { pname = "bitwarden"; - version = "2023.12.1"; + version = "2024.1.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-kmMEi9jYMPFHIdXyZAkeu8rh+34fEAkFw9uhwUt5k9o="; + hash = "sha256-lDDy1b1yfw3nZrwEEkpvh6xYucgn20XHsGACc45eb2w="; }; patches = [ (fetchpatch2 { - # https://github.com/bitwarden/clients/issues/6812#issuecomment-1806830091 - url = "https://github.com/solopasha/bitwarden_flatpak/raw/daec07b067b9cec5e260b44a53216fc65866ba1d/wayland-clipboard.patch"; - hash = "sha256-hcaRa9Nl7MYaTNwmB5Qdm65Mtufv3z+IPwLDPiO3pcw="; + # https://github.com/bitwarden/clients/pull/7508 + url = "https://github.com/amarshall/bitwarden-clients/commit/e85fa4ef610d9dd05bd22a9b93d54b0c7901776d.patch"; + hash = "sha256-P9MTsiNbAb2kKo/PasIm9kGm0lQjuVUxAJ3Fh1DfpzY="; }) - # Workaround Electron 25 EOL and 26 has https://github.com/bitwarden/clients/issues/6560 - ./electron-27.patch ]; nodejs = nodejs_18; makeCacheWritable = true; + npmFlags = [ "--legacy-peer-deps" ]; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-IDqyHiXdMezdPNlZDyRdNzwC3SO5G3gI3h5zoxzzz/g="; + npmDepsHash = "sha256-RR8Ua41D9SXymiPuabOnIab3byu8DR63rOfdeTaQpy4="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; @@ -69,7 +68,7 @@ in buildNpmPackage rec { patches; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-8A33f2q9GoSM8Wh55iqnSfqWIpeRBz+EQT+rmsZsuXs="; + hash = "sha256-EiJjIWiyu8MvX3Tj0Fkeh0T0El5kdCko2maiY6kkPPA="; }; cargoRoot = "apps/desktop/desktop_native"; diff --git a/nixpkgs/pkgs/tools/security/bloodhound-py/default.nix b/nixpkgs/pkgs/tools/security/bloodhound-py/default.nix deleted file mode 100644 index 197be429bee9..000000000000 --- a/nixpkgs/pkgs/tools/security/bloodhound-py/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib -, fetchPypi -, python3 -}: - -python3.pkgs.buildPythonApplication rec { - pname = "bloodhound-py"; - version = "1.6.1"; - - src = fetchPypi { - inherit version; - pname = "bloodhound"; - hash = "sha256-SRP74I5euKJErnSkm6OSdAwznv/ZQeEtNG4XofnIEec="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - impacket - ldap3 - dnspython - ]; - - # the package has no tests - doCheck = false; - - meta = with lib; { - description = "Ingestor for BloodHound"; - homepage = "https://github.com/fox-it/BloodHound.py"; - license = licenses.mit; - maintainers = with maintainers; [ exploitoverload ]; - }; -} diff --git a/nixpkgs/pkgs/tools/security/ccid/default.nix b/nixpkgs/pkgs/tools/security/ccid/default.nix index c13ec56c4b6a..12f65546e92e 100644 --- a/nixpkgs/pkgs/tools/security/ccid/default.nix +++ b/nixpkgs/pkgs/tools/security/ccid/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "ccid"; - version = "1.5.4"; + version = "1.5.5"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - hash = "sha256-boMq3Bcuzc/e4rVvMxRGhIgsvpctr/GTjnqcc6ZPiL8="; + hash = "sha256-GUcI91/jadRd18Feiz6Kfbi0nPxVV1dMoqLnbvEsoMo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/security/cdxgen/default.nix b/nixpkgs/pkgs/tools/security/cdxgen/default.nix index 4c4a7292ac56..162ef7abb642 100644 --- a/nixpkgs/pkgs/tools/security/cdxgen/default.nix +++ b/nixpkgs/pkgs/tools/security/cdxgen/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "cdxgen"; - version = "9.10.1"; + version = "9.10.2"; src = fetchFromGitHub { owner = "AppThreat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FkOWkjf/TXjmSOMSTHvf/MhRtuIPFwGwMt1IUJdvKM0="; + sha256 = "sha256-d4abSPP0dLi5xzq1CYxi1MSKogrQ+YcZjmlUEr5+oBQ="; }; - npmDepsHash = "sha256-2DDLogGXT9G8tKJYxVtS7oa5szlaaQTs1kJcgq9GA7k="; + npmDepsHash = "sha256-KLI6wJrP2s2UWkSC5zmFuC2sa2owRgAhnR4UVrI0ThY="; dontNpmBuild = true; diff --git a/nixpkgs/pkgs/tools/security/chainsaw/Cargo.lock b/nixpkgs/pkgs/tools/security/chainsaw/Cargo.lock deleted file mode 100644 index 28e3406db066..000000000000 --- a/nixpkgs/pkgs/tools/security/chainsaw/Cargo.lock +++ /dev/null @@ -1,2224 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - -[[package]] -name = "anyhow" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "assert_cmd" -version = "2.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88903cb14723e4d4003335bb7f8a14f27691649105346a0f0957466c096adfe6" -dependencies = [ - "anstyle", - "bstr", - "doc-comment", - "predicates", - "predicates-core", - "predicates-tree", - "wait-timeout", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" - -[[package]] -name = "blake3" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" -dependencies = [ - "arrayref", - "arrayvec", - "cc", - "cfg-if", - "constant_time_eq", -] - -[[package]] -name = "bstr" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "bytecount" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bytesize" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" - -[[package]] -name = "camino" -version = "1.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chainsaw" -version = "2.8.1" -dependencies = [ - "aho-corasick", - "anyhow", - "assert_cmd", - "base64", - "bincode", - "bytesize", - "chrono", - "chrono-tz", - "clap 4.4.8", - "crossterm", - "evtx", - "hex", - "indicatif", - "lazy_static", - "libesedb", - "mft", - "notatin", - "once_cell", - "paste", - "predicates", - "prettytable-rs", - "quick-xml 0.31.0", - "rayon", - "regex", - "rustc-hash", - "serde", - "serde_json", - "serde_yaml", - "smallvec", - "tau-engine", - "tempfile", - "terminal_size", - "uuid", -] - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "js-sys", - "num-traits", - "serde", - "wasm-bindgen", - "windows-targets 0.48.5", -] - -[[package]] -name = "chrono-tz" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76" -dependencies = [ - "chrono", - "chrono-tz-build", - "phf", - "serde", -] - -[[package]] -name = "chrono-tz-build" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" -dependencies = [ - "parse-zoneinfo", - "phf", - "phf_codegen", -] - -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" -dependencies = [ - "anstream", - "anstyle", - "clap_lex 0.6.0", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "console" -version = "0.15.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" -dependencies = [ - "encode_unicode 0.3.6", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.45.0", -] - -[[package]] -name = "constant_time_eq" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossterm" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" -dependencies = [ - "bitflags 2.4.1", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "dialoguer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" -dependencies = [ - "console", - "shell-words", - "tempfile", - "zeroize", -] - -[[package]] -name = "difflib" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" - -[[package]] -name = "dirs-next" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1" -dependencies = [ - "cfg-if", - "dirs-sys-next", -] - -[[package]] -name = "dirs-sys-next" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" -dependencies = [ - "libc", - "redox_users", - "winapi", -] - -[[package]] -name = "doc-comment" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "encode_unicode" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" - -[[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] -name = "enum-primitive-derive" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c375b9c5eadb68d0a6efee2999fef292f45854c3444c86f09d8ab086ba942b0e" -dependencies = [ - "num-traits", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "error-chain" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" -dependencies = [ - "version_check", -] - -[[package]] -name = "evtx" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3c0a23f64c81e962c993ccb5d9e88bbd62a3fcabdec20b037a8383f7c3e163f" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "byteorder", - "chrono", - "clap 3.2.25", - "crc32fast", - "dialoguer", - "encoding", - "indoc 1.0.9", - "log", - "quick-xml 0.24.1", - "rayon", - "serde", - "serde_json", - "simplelog", - "skeptic", - "thiserror", - "winstructs", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" -dependencies = [ - "num-traits", -] - -[[package]] -name = "getrandom" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" -dependencies = [ - "ahash", -] - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "iana-time-zone" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" -dependencies = [ - "equivalent", - "hashbrown 0.14.2", -] - -[[package]] -name = "indicatif" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - -[[package]] -name = "indoc" -version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.3", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.150" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" - -[[package]] -name = "libesedb" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40530440586ce2f7a30fc0867a5faf07767c70cb56c7776cc125409bc45432af" -dependencies = [ - "libesedb-sys", - "time", -] - -[[package]] -name = "libesedb-sys" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7a5067ea7b882d70851a209bef21f388242d2c2a9dbb45824b502c94033a8f5" -dependencies = [ - "cc", - "walkdir", -] - -[[package]] -name = "libredox" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" -dependencies = [ - "bitflags 2.4.1", - "libc", - "redox_syscall", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "lru" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e7d46de488603ffdd5f30afbc64fbba2378214a2c3a2fb83abf3d33126df17" -dependencies = [ - "hashbrown 0.13.2", -] - -[[package]] -name = "md5" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mft" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52cf53faa705fc7f6574f99a34fae16ffa12b6391eabd9f7269377738e583e99" -dependencies = [ - "anyhow", - "bitflags 1.3.2", - "byteorder", - "chrono", - "clap 4.4.8", - "csv", - "dialoguer", - "encoding", - "indoc 2.0.4", - "itertools 0.10.5", - "log", - "lru", - "num-derive", - "num-traits", - "rand", - "serde", - "serde_json", - "simplelog", - "skeptic", - "thiserror", - "winstructs", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "mio" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "notatin" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394a6bb8a521ac6140cf95b0a3b1c9a35c3ebccde7a0b13b7a3deb7039220024" -dependencies = [ - "bitflags 2.4.1", - "blake3", - "chrono", - "crossterm", - "enum-primitive-derive", - "md5", - "nom", - "num", - "num-traits", - "paste", - "regex", - "serde", - "serde_json", - "strum_macros", - "thiserror", - "winstructs", -] - -[[package]] -name = "num" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_threads" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" -dependencies = [ - "libc", -] - -[[package]] -name = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "os_str_bytes" -version = "6.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" - -[[package]] -name = "parking_lot" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.48.5", -] - -[[package]] -name = "parse-zoneinfo" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c705f256449c60da65e11ff6626e0c16a0a0b96aaa348de61376b249bc340f41" -dependencies = [ - "regex", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" -dependencies = [ - "phf_shared", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" -dependencies = [ - "phf_shared", - "rand", -] - -[[package]] -name = "phf_shared" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" -dependencies = [ - "siphasher", -] - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "portable-atomic" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "predicates" -version = "3.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dfc28575c2e3f19cb3c73b93af36460ae898d426eba6fc15b9bd2a5220758a0" -dependencies = [ - "anstyle", - "difflib", - "float-cmp", - "itertools 0.11.0", - "normalize-line-endings", - "predicates-core", - "regex", -] - -[[package]] -name = "predicates-core" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" - -[[package]] -name = "predicates-tree" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -dependencies = [ - "predicates-core", - "termtree", -] - -[[package]] -name = "prettytable-rs" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eea25e07510aa6ab6547308ebe3c036016d162b8da920dbb079e3ba8acf3d95a" -dependencies = [ - "csv", - "encode_unicode 1.0.0", - "is-terminal", - "lazy_static", - "term", - "unicode-width", -] - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" -dependencies = [ - "bitflags 1.3.2", - "memchr", - "unicase", -] - -[[package]] -name = "quick-xml" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37dddbbe9df96afafcb8027fcf263971b726530e12f0787f620a7ba5b4846081" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "libc", - "rand_chacha", - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[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_users" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" -dependencies = [ - "getrandom", - "libredox", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" -dependencies = [ - "serde", -] - -[[package]] -name = "serde" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.193" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.9.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" -dependencies = [ - "indexmap 2.1.0", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "shell-words" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" -dependencies = [ - "libc", -] - -[[package]] -name = "simplelog" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369" -dependencies = [ - "log", - "termcolor", - "time", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "skeptic" -version = "0.13.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8" -dependencies = [ - "bytecount", - "cargo_metadata", - "error-chain", - "glob", - "pulldown-cmark", - "tempfile", - "walkdir", -] - -[[package]] -name = "smallvec" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.39", -] - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tau-engine" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4566a9d67931bc2b779cbabb58ddef3e9b452e6059333fb34992ca46525a8413" -dependencies = [ - "aho-corasick", - "lazy_static", - "regex", - "serde", - "serde_json", - "serde_yaml", - "tracing", -] - -[[package]] -name = "tempfile" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" -dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix", - "windows-sys 0.48.0", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "time" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" -dependencies = [ - "deranged", - "itoa", - "libc", - "num_threads", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" -dependencies = [ - "time-core", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" -dependencies = [ - "getrandom", - "serde", -] - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.88" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winstructs" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dc7406cd936173d9cc3a4fd5dc5b295bc59612439d72038e3d7ac4e5dd42de9" -dependencies = [ - "bitflags 1.3.2", - "byteorder", - "chrono", - "log", - "num-derive", - "num-traits", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "zerocopy" -version = "0.7.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - -[[package]] -name = "zeroize" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" diff --git a/nixpkgs/pkgs/tools/security/chainsaw/default.nix b/nixpkgs/pkgs/tools/security/chainsaw/default.nix index 8375cccd0bdd..b939e15263da 100644 --- a/nixpkgs/pkgs/tools/security/chainsaw/default.nix +++ b/nixpkgs/pkgs/tools/security/chainsaw/default.nix @@ -16,9 +16,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-YEw/rN7X+npc9M8XdPGAZyYXSQOGiR0w9Wb3W63g8VU="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-cXvXvSipZFfanmn9QFtYZYEudZ6lyvsu2EMGD0lZEtw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation diff --git a/nixpkgs/pkgs/tools/security/cloudlist/default.nix b/nixpkgs/pkgs/tools/security/cloudlist/default.nix index b3e13d1691e8..64f6a23bde7e 100644 --- a/nixpkgs/pkgs/tools/security/cloudlist/default.nix +++ b/nixpkgs/pkgs/tools/security/cloudlist/default.nix @@ -5,16 +5,21 @@ buildGoModule rec { pname = "cloudlist"; - version = "1.0.4"; + version = "1.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; - repo = pname; + repo = "cloudlist"; rev = "refs/tags/v${version}"; - sha256 = "sha256-m0b7gtbI9i1tD8HduEAF+Mo2UpI4gqldEO8q4u+Wo3E="; + hash = "sha256-oq+JmcENFcB4AoVEhxoYIKZArgzVm6QFsPF8ybtNMak="; }; - vendorHash = "sha256-GHQnI4T6y/p+BlQyrNJmIaSek0sC1J3UwcuvDQH5gCI="; + vendorHash = "sha256-4eGmfPXqohdRHT0xExF1Z5jE8GscQGlVEmS3cHMX4x8="; + + ldflags = [ + "-w" + "-s" + ]; meta = with lib; { description = "Tool for listing assets from multiple cloud providers"; diff --git a/nixpkgs/pkgs/tools/security/cnquery/default.nix b/nixpkgs/pkgs/tools/security/cnquery/default.nix index 58ea4633ef8d..158629f1cd10 100644 --- a/nixpkgs/pkgs/tools/security/cnquery/default.nix +++ b/nixpkgs/pkgs/tools/security/cnquery/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "cnquery"; - version = "9.12.3"; + version = "9.13.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnquery"; rev = "v${version}"; - hash = "sha256-DMJuQkxU6VNaPgcdvKY5p/124t02QvAo8lDT9B50Ze0="; + hash = "sha256-jJayS4zGnbQBY/Z7rk4Xx0nHjCdAYCDs/FDYPVBxcqE="; }; subPackages = [ "apps/cnquery" ]; diff --git a/nixpkgs/pkgs/tools/security/cnspec/default.nix b/nixpkgs/pkgs/tools/security/cnspec/default.nix index d4d0c91f8770..2eee5568fea4 100644 --- a/nixpkgs/pkgs/tools/security/cnspec/default.nix +++ b/nixpkgs/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "9.13.0"; + version = "9.14.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-hGiMdL+SXJ5psrmfM5pvKD01yaD1q3tOOhfGzbcjvuE="; + hash = "sha256-9MIIxWfETi2DX1DYPALL+JoC4r3yKJpeSFIx+hrGKiM="; }; proxyVendor = true; - vendorHash = "sha256-pRFRPUL/Ck4m7JH5ykei3PSXbCFKRii8YyjBLQ5kb9M="; + vendorHash = "sha256-Yii2sDfYqIzQAUaMotT87Wa5g3skxWllq6yGlkPDbLg="; subPackages = [ "apps/cnspec" diff --git a/nixpkgs/pkgs/tools/security/coercer/default.nix b/nixpkgs/pkgs/tools/security/coercer/default.nix index 3d1e6cb46963..f380d130bb07 100644 --- a/nixpkgs/pkgs/tools/security/coercer/default.nix +++ b/nixpkgs/pkgs/tools/security/coercer/default.nix @@ -5,22 +5,28 @@ python3.pkgs.buildPythonApplication rec { pname = "coercer"; - version = "1.6"; + version = "2.4.3"; format = "pyproject"; src = fetchFromGitHub { owner = "p0dalirius"; repo = "Coercer"; rev = "refs/tags/${version}"; - hash = "sha256-xftYnwu6uUTvJTZU9E7wvdgBxqa8xy83K5GOlgNSCvc="; + hash = "sha256-WeaKToKYIB+jjTNIQvAUQQNb25TsNWALYZwIZuBjkPE="; }; nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "impacket" ]; propagatedBuildInputs = with python3.pkgs; [ impacket + xlsxwriter ]; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/tools/security/coze/default.nix b/nixpkgs/pkgs/tools/security/coze/default.nix index 03da09c19e91..5fbd906fd87e 100644 --- a/nixpkgs/pkgs/tools/security/coze/default.nix +++ b/nixpkgs/pkgs/tools/security/coze/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "CLI client for Coze, a cryptographic JSON messaging specification."; + description = "CLI client for Coze, a cryptographic JSON messaging specification"; homepage = "https://github.com/Cyphrme/coze_cli"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ qbit ]; diff --git a/nixpkgs/pkgs/tools/security/crackql/default.nix b/nixpkgs/pkgs/tools/security/crackql/default.nix index ab78f177fd7c..6a8e95ec57f2 100644 --- a/nixpkgs/pkgs/tools/security/crackql/default.nix +++ b/nixpkgs/pkgs/tools/security/crackql/default.nix @@ -5,20 +5,25 @@ python3.pkgs.buildPythonApplication rec { pname = "crackql"; - version = "unstable-20220821"; - format = "pyproject"; + version = "unstable-20230818"; + pyproject = true; src = fetchFromGitHub { owner = "nicholasaleks"; repo = "CrackQL"; # rev = "refs/tags/${version}"; # Switch to tag with the next update - rev = "5bcf92f4520a4dd036baf9f47c5ebbf18e6a032a"; + rev = "ac26a44c2dd201f65da0d1c3f95eaf776ed1b2dd"; hash = "sha256-XlHbGkwdOV1nobjtQP/M3IIEuzXHBuwf52EsXf3MWoM="; }; + pythonRelaxDeps = [ + "graphql-core" + ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/security/cryptomator/default.nix b/nixpkgs/pkgs/tools/security/cryptomator/default.nix index c80be56319f1..bf6f5c3c0587 100644 --- a/nixpkgs/pkgs/tools/security/cryptomator/default.nix +++ b/nixpkgs/pkgs/tools/security/cryptomator/default.nix @@ -14,17 +14,17 @@ in assert stdenv.isLinux; # better than `called with unexpected argument 'enableJavaFX'` mavenJdk.buildMavenPackage rec { pname = "cryptomator"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "cryptomator"; repo = "cryptomator"; rev = version; - hash = "sha256-NMNlDEUpwKUywzhXhxlNX7NiE+6wOov2Yt8nTfbKTNI="; + hash = "sha256-Y+oG2NF4Vsklp1W22Xv+XrkY6vwn23FkzAXG/5828Og="; }; mvnParameters = "-Dmaven.test.skip=true -Plinux"; - mvnHash = "sha256-cmwU9k7TRRJ07bT1EmY3pIBkvvqmFyE7WJeVL7VFDyc="; + mvnHash = "sha256-cXmnJHgKW6SGnhHFuFJP/DKNmFacfHbC3nQ2uVdIvUE="; preBuild = '' VERSION=${version} diff --git a/nixpkgs/pkgs/tools/security/donkey/default.nix b/nixpkgs/pkgs/tools/security/donkey/default.nix index 514df406f3b9..ec95715853ec 100644 --- a/nixpkgs/pkgs/tools/security/donkey/default.nix +++ b/nixpkgs/pkgs/tools/security/donkey/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { passthru.tests.version = testers.testVersion { package = donkey; }; meta = with lib; { - description = "an alternative for S/KEY's 'key' command."; + description = "An alternative for S/KEY's 'key' command"; longDescription = '' Donkey is an alternative for S/KEY's "key" command. The new feature that the original key doesn't have is print an entry for skeykeys as diff --git a/nixpkgs/pkgs/tools/security/efitools/default.nix b/nixpkgs/pkgs/tools/security/efitools/default.nix index 59cb794d718e..70032504f475 100644 --- a/nixpkgs/pkgs/tools/security/efitools/default.nix +++ b/nixpkgs/pkgs/tools/security/efitools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, gnu-efi, openssl, sbsigntool, perl, perlPackages, -help2man, fetchgit }: +help2man, fetchzip }: stdenv.mkDerivation rec { pname = "efitools"; version = "1.9.2"; @@ -16,9 +16,8 @@ stdenv.mkDerivation rec { help2man ]; - src = fetchgit { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"; - rev = "v${version}"; + src = fetchzip { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snapshot/efitools-v${version}.tar.gz"; sha256 = "0jabgl2pxvfl780yvghq131ylpf82k7banjz0ksjhlm66ik8gb1i"; }; diff --git a/nixpkgs/pkgs/tools/security/enc/default.nix b/nixpkgs/pkgs/tools/security/enc/default.nix index 646d7c80559e..ffacccf6a311 100644 --- a/nixpkgs/pkgs/tools/security/enc/default.nix +++ b/nixpkgs/pkgs/tools/security/enc/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "enc"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "life4"; repo = "enc"; rev = version; - hash = "sha256-kVK/+pR3Rzg7oCjHKr+i+lK6nhqlBN6Wj92i4SKU2l0="; + hash = "sha256-G6x17CDAKpmqvl7FTycSQ5bF0JndNP+SlUoBVUk76IQ="; }; - vendorHash = "sha256-6LNo4iBZDc0DTn8f/2PdCb6CNFCjU6o1xDkB5m/twJk="; + vendorHash = "sha256-lB4DoHB+hGKjIcrAjeCd8a5prTn8XFIWhzNakA7utHI="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix index 39f9398260f1..44cf92318235 100644 --- a/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix +++ b/nixpkgs/pkgs/tools/security/faraday-agent-dispatcher/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "faraday-agent-dispatcher"; - version = "2.6.2"; - format = "setuptools"; + version = "3.0.1"; + pyproject = true; src = fetchFromGitHub { owner = "infobyte"; repo = "faraday_agent_dispatcher"; rev = "refs/tags/${version}"; - hash = "sha256-+lsejepg/iBHo6CRAGNHjiUC7ZgboHbKu7EDmlN3lVk="; + hash = "sha256-QCxYqLZAPrhcKAFguWT2ygN/OMe2Tr7HtnMx4Kp2bGM="; }; postPatch = '' @@ -20,7 +20,12 @@ python3.pkgs.buildPythonApplication rec { --replace '"pytest-runner",' "" ''; + pythonRelaxDeps = [ + "python-socketio" + ]; + nativeBuildInputs = with python3.pkgs; [ + pythonRelaxDepsHook setuptools-scm ]; @@ -34,6 +39,7 @@ python3.pkgs.buildPythonApplication rec { pytenable python-gvm python-owasp-zap-v2-4 + python-socketio pyyaml requests syslog-rfc5424-formatter diff --git a/nixpkgs/pkgs/tools/security/flare-floss/default.nix b/nixpkgs/pkgs/tools/security/flare-floss/default.nix index 212d0a74ebb1..c9a9c8cd1380 100644 --- a/nixpkgs/pkgs/tools/security/flare-floss/default.nix +++ b/nixpkgs/pkgs/tools/security/flare-floss/default.nix @@ -33,7 +33,7 @@ python3.pkgs.buildPythonPackage rec { halo networkx pefile - pydantic + pydantic_1 rich tabulate tqdm diff --git a/nixpkgs/pkgs/tools/security/gallia/default.nix b/nixpkgs/pkgs/tools/security/gallia/default.nix index f0e71f8c9c05..5d0cc05ec46d 100644 --- a/nixpkgs/pkgs/tools/security/gallia/default.nix +++ b/nixpkgs/pkgs/tools/security/gallia/default.nix @@ -6,25 +6,18 @@ python3.pkgs.buildPythonApplication rec { pname = "gallia"; - version = "1.1.4"; - format = "pyproject"; + version = "1.5.0"; + pyproject = true; src = fetchFromGitHub { owner = "Fraunhofer-AISEC"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-McHzHK404kDB992T2f84dZHDxujpPIz4qglYMmv3kTw="; + hash = "sha256-JeEJ4xTIOFeMADnuPMLNGxB/qEPKMnaIhQ6FCUaNa7E="; }; - pythonRelaxDeps = [ - "aiofiles" - "argcomplete" - "msgspec" - ]; - nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ @@ -33,6 +26,9 @@ python3.pkgs.buildPythonApplication rec { aiosqlite argcomplete can + exitcode + platformdirs + psutil construct msgspec pydantic diff --git a/nixpkgs/pkgs/tools/security/ggshield/default.nix b/nixpkgs/pkgs/tools/security/ggshield/default.nix index 06f8796db864..50b3439732d3 100644 --- a/nixpkgs/pkgs/tools/security/ggshield/default.nix +++ b/nixpkgs/pkgs/tools/security/ggshield/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ggshield"; - version = "1.22.0"; - format = "pyproject"; + version = "1.23.0"; + pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; rev = "refs/tags/v${version}"; - hash = "sha256-AxFztqD43KqX0r8tZz4ltjUh2x42kdPqi+b/OunpPF4="; + hash = "sha256-c2EXgUs+6GA5zHHF7Cx21LIsZ+jbmQFFUwLft2q5M30="; }; pythonRelaxDeps = true; diff --git a/nixpkgs/pkgs/tools/security/grype/default.nix b/nixpkgs/pkgs/tools/security/grype/default.nix index de617344becc..188741bcf00c 100644 --- a/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/nixpkgs/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.74.0"; + version = "0.74.1"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-M/PBsCZPMh2RSrTWqe5XjErVrSi39DbQpqSzbKXA/wI="; + hash = "sha256-/s23QSg4+reF+BTbbk1MXtUC0ytdgd8olaiUTqR7LqM="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-h/rpDF1weo54DSHRM3eV//+WjSOI24zo1YmpTa3MRnE="; + vendorHash = "sha256-LNyYwnQhGZfsHrA02fHdXKRTJ83Xii3q//Tfrq3sLFc="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/tools/security/hash-identifier/default.nix b/nixpkgs/pkgs/tools/security/hash-identifier/default.nix index 2f54d5e6904f..0fe78a4a0db5 100644 --- a/nixpkgs/pkgs/tools/security/hash-identifier/default.nix +++ b/nixpkgs/pkgs/tools/security/hash-identifier/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - description = "Software to identify the different types of hashes used to encrypt data and especially passwords."; + description = "Identify the different types of hashes used to encrypt data and especially passwords"; homepage = "https://github.com/blackploit/hash-identifier"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/httpx/default.nix b/nixpkgs/pkgs/tools/security/httpx/default.nix index 294c0e0302f3..b7dd4afd94f3 100644 --- a/nixpkgs/pkgs/tools/security/httpx/default.nix +++ b/nixpkgs/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.3.7"; + version = "1.3.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "refs/tags/v${version}"; - hash = "sha256-FiCY9dZDZ92c6MayloS97Ff1trc5w4M/AIS6XORZf5U="; + hash = "sha256-mHksSCOy0vF7YRg2Pu6r8VzA8YNP8JXTCd44QoGTyww="; }; - vendorHash = "sha256-++vCyunRkLn9K1u+zXSN4TzIS9J8emc/w85ToqmG7gY="; + vendorHash = "sha256-TctifN2YhW5t+nuFVB1yPgOopLzQfgi5QIJitMlVPJc="; subPackages = [ "cmd/httpx" diff --git a/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix b/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix index de260e068249..9a13c2103016 100644 --- a/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/nixpkgs/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -4,7 +4,12 @@ , fetchpatch , openssl }: - +let + makefile = + if stdenv.isDarwin + then "makefile.mac" + else "makefile"; +in stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; version = "1682"; @@ -30,12 +35,14 @@ stdenv.mkDerivation rec { sourceRoot = "src"; + inherit makefile; + prePatch = '' # Fix hardcoded path to GCC. - substituteInPlace makefile --replace /usr/bin/gcc "${stdenv.cc}/bin/cc" + substituteInPlace ${makefile} --replace /usr/bin/gcc "${stdenv.cc}/bin/cc" # Remove problematic default CFLAGS. - substituteInPlace makefile \ + substituteInPlace ${makefile} \ --replace -Werror "" \ --replace -O0 "" \ --replace -ggdb "" @@ -49,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IBM's Software TPM 2.0, an implementation of the TCG TPM 2.0 specification"; homepage = "https://sourceforge.net/projects/ibmswtpm2/"; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ delroth ]; license = licenses.bsd3; }; diff --git a/nixpkgs/pkgs/tools/security/ioc-scan/default.nix b/nixpkgs/pkgs/tools/security/ioc-scan/default.nix index 0fea93dc5081..e080426162a6 100644 --- a/nixpkgs/pkgs/tools/security/ioc-scan/default.nix +++ b/nixpkgs/pkgs/tools/security/ioc-scan/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "ioc-scan"; - version = "1.5.0"; + version = "1.5.4"; format = "setuptools"; src = fetchFromGitHub { owner = "cisagov"; repo = "ioc-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-dRrLd41HVVHJse7nkem8Cy+ltfJRnJiWrX/WShMfcOw="; + hash = "sha256-LQljpIlTDy1uxuwj1WyygwrB5hQ7dib1ViB+SEhRJ6Y="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/security/ioccheck/default.nix b/nixpkgs/pkgs/tools/security/ioccheck/default.nix index fc457e0c7fd4..2f25aa4ea897 100644 --- a/nixpkgs/pkgs/tools/security/ioccheck/default.nix +++ b/nixpkgs/pkgs/tools/security/ioccheck/default.nix @@ -13,7 +13,7 @@ let owner = "carpedm20"; repo = "emoji"; rev = "v${version}"; - sha256 = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I="; + hash = "sha256-vKQ51RP7uy57vP3dOnHZRSp/Wz+YDzeLUR8JnIELE/I="; }; }; @@ -26,29 +26,35 @@ let owner = "tweepy"; repo = "tweepy"; rev = "v${version}"; - sha256 = "0k4bdlwjna6f1k19jki4xqgckrinkkw8b9wihzymr1l04rwd05nw"; + hash = "sha256-3BbQeCaAhlz9h5GnhficNubJHu4kTpnCDM4oKzlti0w="; }; doCheck = false; }; }; }; -in -with py.pkgs; - -buildPythonApplication rec { +in py.pkgs.buildPythonApplication rec { pname = "ioccheck"; version = "unstable-2021-09-29"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "ranguli"; - repo = pname; + repo = "ioccheck"; rev = "db02d921e2519b77523a200ca2d78417802463db"; hash = "sha256-qf5tHIpbj/BfrzUST+EzohKh1hUg09KwF+vT0tj1+FE="; }; nativeBuildInputs = with py.pkgs; [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "backoff" + "pyfiglet" + "tabulate" + "termcolor" + "vt-py" ]; propagatedBuildInputs = with py.pkgs; [ @@ -73,11 +79,7 @@ buildPythonApplication rec { postPatch = '' # Can be removed with the next release substituteInPlace pyproject.toml \ - --replace '"hurry.filesize" = "^0.9"' "" \ - --replace 'vt-py = ">=0.6.1,<0.8.0"' 'vt-py = ">=0.6.1"' \ - --replace 'backoff = "^1.10.0"' 'backoff = ">=1.10.0"' \ - --replace 'termcolor = "^1.1.0"' 'termcolor = "*"' \ - --replace 'tabulate = "^0.8.9"' 'tabulate = "*"' + --replace '"hurry.filesize" = "^0.9"' "" ''; pythonImportsCheck = [ diff --git a/nixpkgs/pkgs/tools/security/jwx/default.nix b/nixpkgs/pkgs/tools/security/jwx/default.nix index 85dc62743b6a..6841cfe573ab 100644 --- a/nixpkgs/pkgs/tools/security/jwx/default.nix +++ b/nixpkgs/pkgs/tools/security/jwx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "jwx"; - version = "2.0.18"; + version = "2.0.19"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = pname; rev = "v${version}"; - hash = "sha256-HQJu22bMgL4UbJx0+JLgGDYnyT9lO2De04tZibAcVdM="; + hash = "sha256-JR2Z1XOcTfocaXHA+q6INcIZFeuMjB+G16fRmYjOhzU="; }; - vendorHash = "sha256-o3EHPIXGLz/io0d8jhl9cxzctP3CeOjEDMQl1SY9lXg="; + vendorHash = "sha256-g97cSHGo0nw7Ker+S/qG0awUf1/UdcSkF55BjMyTfAY="; sourceRoot = "${src.name}/cmd/jwx"; diff --git a/nixpkgs/pkgs/tools/security/katana/default.nix b/nixpkgs/pkgs/tools/security/katana/default.nix index 04ae5c74ad1b..1f4a7300e228 100644 --- a/nixpkgs/pkgs/tools/security/katana/default.nix +++ b/nixpkgs/pkgs/tools/security/katana/default.nix @@ -5,18 +5,25 @@ buildGoModule rec { pname = "katana"; - version = "1.0.4"; + version = "1.0.5"; src = fetchFromGitHub { owner = "projectdiscovery"; - repo = pname; + repo = "katana"; rev = "refs/tags/v${version}"; - hash = "sha256-wpGRpgRJtywkTJ3YBk5TzXc2taPPWjOhj+Kg8hAgm7M="; + hash = "sha256-phxJhrZaJ+gw7gZWwQK0pvWWxkS4UDi77s+qgTvS/fo="; }; - vendorHash = "sha256-qqivaKipe7lfUq3Neod8JMvtMVQN4O03JpDMSMHf8YY="; + vendorHash = "sha256-go+6NOQOnmds7EuA5k076Qdib2CqGthH9BHOm0YYKaA="; - subPackages = [ "cmd/katana" ]; + subPackages = [ + "cmd/katana" + ]; + + ldflags = [ + "-w" + "-s" + ]; meta = with lib; { description = "A next-generation crawling and spidering framework"; diff --git a/nixpkgs/pkgs/tools/security/keybase/default.nix b/nixpkgs/pkgs/tools/security/keybase/default.nix index d29f17679c85..3d990468109b 100644 --- a/nixpkgs/pkgs/tools/security/keybase/default.nix +++ b/nixpkgs/pkgs/tools/security/keybase/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { homepage = "https://www.keybase.io/"; description = "The Keybase official command-line utility and service"; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ avaq carlsverre np rvolosatovs Br1ght0ne shofius ]; + maintainers = with maintainers; [ avaq np rvolosatovs Br1ght0ne shofius ]; license = licenses.bsd3; }; } diff --git a/nixpkgs/pkgs/tools/security/kube-hunter/default.nix b/nixpkgs/pkgs/tools/security/kube-hunter/default.nix index f80f5c70c98c..bc23c3845b89 100644 --- a/nixpkgs/pkgs/tools/security/kube-hunter/default.nix +++ b/nixpkgs/pkgs/tools/security/kube-hunter/default.nix @@ -14,8 +14,6 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-+M8P/VSF9SKPvq+yNPjokyhggY7hzQ9qLLhkiTNbJls="; }; - SETUPTOOLS_SCM_PRETEND_VERSION = version; - nativeBuildInputs = with python3.pkgs; [ setuptools-scm ]; diff --git a/nixpkgs/pkgs/tools/security/kubeclarity/default.nix b/nixpkgs/pkgs/tools/security/kubeclarity/default.nix index 709ba817c585..4aed36bbeaa2 100644 --- a/nixpkgs/pkgs/tools/security/kubeclarity/default.nix +++ b/nixpkgs/pkgs/tools/security/kubeclarity/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "kubeclarity"; - version = "2.23.0"; + version = "2.23.1"; src = fetchFromGitHub { owner = "openclarity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GtShdcBSa7QAwjPUPMXDrFBgNqvJEf8XQw3HbqWEieo="; + hash = "sha256-buEahr6lr+C/99ANAgYdexPX76ECW6yGMes8u2GZKh4="; }; - vendorHash = "sha256-rYUbXkf0wOPehXvAzcww0WVycATWdK72LOqbQolqoWc="; + vendorHash = "sha256-eAqF0ohZGryRh4u+j/30BObYP23yyrTecPrt+xmn9Sg="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/security/logkeys/default.nix b/nixpkgs/pkgs/tools/security/logkeys/default.nix index a0c6e0a5f628..1172250f9c48 100644 --- a/nixpkgs/pkgs/tools/security/logkeys/default.nix +++ b/nixpkgs/pkgs/tools/security/logkeys/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { preConfigure = "./autogen.sh"; meta = with lib; { - description = "A GNU/Linux keylogger that works!"; + description = "A GNU/Linux keylogger that works"; license = licenses.gpl3; homepage = "https://github.com/kernc/logkeys"; maintainers = with maintainers; [mikoim offline]; diff --git a/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix b/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix index 2abcf2065ced..56d47973b7e3 100644 --- a/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix +++ b/nixpkgs/pkgs/tools/security/mitmproxy2swagger/default.nix @@ -5,18 +5,23 @@ python3.pkgs.buildPythonApplication rec { pname = "mitmproxy2swagger"; - version = "0.11.0"; + version = "0.13.0"; format = "pyproject"; src = fetchFromGitHub { owner = "alufers"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-NwU3GtnWL90gSCbPbGnkbLX/o77NZJ4t4xME8dhWEbA="; + hash = "sha256-VHxqxee5sQWRS13V4SfY4LWaN0oxxWsNVDOEqUyKHfg="; }; nativeBuildInputs = with python3.pkgs; [ poetry-core + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "ruamel.yaml" ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/security/netexec/default.nix b/nixpkgs/pkgs/tools/security/netexec/default.nix new file mode 100644 index 000000000000..d5925365a87a --- /dev/null +++ b/nixpkgs/pkgs/tools/security/netexec/default.nix @@ -0,0 +1,172 @@ +{ lib +, fetchFromGitHub +, python3 +, buildPythonPackage +, fetchPypi +}: +let + python = python3.override { + packageOverrides = self: super: { + impacket = super.impacket.overridePythonAttrs { + version = "0.12.0.dev1"; + src = fetchFromGitHub { + owner = "Pennyw0rth"; + repo = "impacket"; + rev = "d370e6359a410063b2c9c68f6572c3b5fb178a38"; + hash = "sha256-Jozn4lKAnLQ2I53+bx0mFY++OH5P4KyqVmrS5XJUY3E="; + }; + }; + bloodhound-py = super.bloodhound-py.overridePythonAttrs (old: { + propagatedBuildInputs = + lib.lists.remove super.impacket old.propagatedBuildInputs + ++ [ self.impacket ]; + }); + }; + }; + + python-easyconfig = buildPythonPackage rec { + pname = "python-easyconfig"; + version = "0.1.7"; + src = fetchPypi { + inherit version; + pname = "Python-EasyConfig"; + hash = "sha256-tUjxmrhQtVFU9hFi8xTj27J24R47JpUbio+gaDwGuyk="; + }; + propagatedBuildInputs = with python.pkgs; [ + six + pyyaml + ]; + }; + + jsonform = buildPythonPackage rec { + pname = "jsonform"; + version = "0.0.2"; + doCheck = false; + src = fetchPypi { + inherit version; + pname = "JsonForm"; + hash = "sha256-cfi3ohU44wyphLad3gTwKYDNbNwhg6GKp8oC2VCZiOY="; + }; + propagatedBuildInputs = with python.pkgs; [ + jsonschema + ]; + }; + + jsonsir = buildPythonPackage rec { + pname = "jsonsir"; + version = "0.0.2"; + doCheck = false; + src = fetchPypi { + inherit version; + pname = "JsonSir"; + hash = "sha256-QBRHxekx94h4Uc6b8kB/401aqwsUZ7sku787dg5b0/s="; + }; + }; + + dploot = buildPythonPackage rec { + pname = "dploot"; + version = "2.2.4"; + pyproject = true; + src = fetchPypi { + inherit pname version; + hash = "sha256-40/5KOlEFvPL9ohCfR3kqoikpKFfJO22MToq3GhamKM="; + }; + nativeBuildInputs = with python.pkgs; [ + poetry-core + ]; + propagatedBuildInputs = with python.pkgs; [ + impacket + cryptography + pyasn1 + lxml + ]; + }; + + resource = buildPythonPackage rec { + pname = "resource"; + version = "0.2.1"; + doCheck = false; + src = fetchPypi { + inherit version; + pname = "Resource"; + hash = "sha256-mDVKvY7+c9WhDyEJnYC774Xs7ffKIqQW/yAlClGs2RY="; + }; + propagatedBuildInputs = with python.pkgs; [ + python-easyconfig + jsonform + jsonsir + ]; + }; +in +python.pkgs.buildPythonApplication rec { + pname = "netexec"; + version = "1.1.0"; + pyproject = true; + doCheck = true; + pythonRelaxDeps = true; + + src = fetchFromGitHub { + owner = "Pennyw0rth"; + repo = "NetExec"; + rev = "refs/tags/v${version}"; + hash = "sha256-cNkZoIdfrKs5ZvHGKGBybCWGwA6C4rqjCOEM+pX70S8="; + }; + + nativeBuildInputs = with python.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python.pkgs; [ + requests + beautifulsoup4 + lsassy + termcolor + msgpack + neo4j + pylnk3 + pypsrp + paramiko + impacket + dsinternals + xmltodict + terminaltables + aioconsole + pywerview + minikerberos + pypykatz + aardwolf + dploot + bloodhound-py + asyauth + masky + sqlalchemy + aiosqlite + pyasn1-modules + rich + python-libnmap + resource + oscrypto + ]; + + nativeCheckInputs = with python.pkgs; [ + pytest + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '{ git = "https://github.com/Pennyw0rth/impacket.git", branch = "gkdi" }' '"*"' + + substituteInPlace pyproject.toml \ + --replace '{ git = "https://github.com/Pennyw0rth/oscrypto" }' '"*"' + ''; + + meta = with lib; { + description = "Network service exploitation tool (Maintaned fork of CrackMapExec)"; + homepage = "https://github.com/Pennyw0rth/NetExec"; + changelog = "https://github.com/Pennyw0rth/NetExec/releases/tag/v${version}"; + license = with licenses; [ bsd2 ]; + mainProgram = "nxc"; + maintainers = with maintainers; [ vncsb ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/nuclei/default.nix b/nixpkgs/pkgs/tools/security/nuclei/default.nix index c0c0fdef6fb9..17915567d46c 100644 --- a/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,21 +5,26 @@ buildGoModule rec { pname = "nuclei"; - version = "3.1.3"; + version = "3.1.6"; src = fetchFromGitHub { owner = "projectdiscovery"; - repo = pname; + repo = "nuclei"; rev = "refs/tags/v${version}"; - hash = "sha256-XTKJq7bq6iNzZ4LnxQxqzbNDdNh0ixFclB3kniNvg2I="; + hash = "sha256-Xtebrmd1M46slPX/0nQRo2CEA4mGOZiUxhlokXdYReA="; }; - vendorHash = "sha256-C/CDMj+R7p0wkjHSQX6GMRDU1PEDHi8574JS/A2zrzk="; + vendorHash = "sha256-x2bx5A09hYtsn7BROXZbB8X8gFN1zI5Jg51HYZPYIno="; subPackages = [ "cmd/nuclei/" ]; + ldflags = [ + "-w" + "-s" + ]; + # Test files are not part of the release tarball doCheck = false; @@ -36,5 +41,6 @@ buildGoModule rec { changelog = "https://github.com/projectdiscovery/nuclei/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab Misaka13514 ]; + mainProgram = "nuclei"; }; } diff --git a/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix b/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix index eda2affaa262..3e01af4886d9 100644 --- a/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix +++ b/nixpkgs/pkgs/tools/security/oath-toolkit/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "oath-toolkit"; - version = "2.6.7"; + version = "2.6.10"; src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1aa620k05lsw3l3slkp2mzma40q3p9wginspn9zk8digiz7dzv9n"; + sha256 = "sha256-hsJyJPfW19rUek9r7mX2uIS/W70VxemM8sxpYl2/I5E="; }; buildInputs = [ securityDependency ]; diff --git a/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix b/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix index 48dab9b19726..c88e1d2b064d 100644 --- a/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix +++ b/nixpkgs/pkgs/tools/security/onlykey-agent/default.nix @@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec { pythonImportsCheck = [ "onlykey_agent" ]; meta = with lib; { - description = " The OnlyKey agent is essentially middleware that lets you use OnlyKey as a hardware SSH/GPG device."; + description = "Middleware that lets you use OnlyKey as a hardware SSH/GPG device"; homepage = "https://github.com/trustcrypto/onlykey-agent"; license = licenses.lgpl3Only; maintainers = with maintainers; [ kalbasit ]; diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix b/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix index c9bbabd5fb2f..74e9dab46a7e 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/audit/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Pass extension for auditing your password repository."; + description = "Pass extension for auditing your password repository"; homepage = "https://github.com/roddhjav/pass-audit"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/security/pass/extensions/file.nix b/nixpkgs/pkgs/tools/security/pass/extensions/file.nix index 43321d80855c..1c07e289ad28 100644 --- a/nixpkgs/pkgs/tools/security/pass/extensions/file.nix +++ b/nixpkgs/pkgs/tools/security/pass/extensions/file.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with lib; { - description = "A pass extension that allows to add files to password-store."; + description = "A pass extension that allows to add files to password-store"; homepage = "https://github.com/dvogt23/pass-file"; license = licenses.gpl3Plus; maintainers = with maintainers; [ taranarmo ]; diff --git a/nixpkgs/pkgs/tools/security/pcsclite/default.nix b/nixpkgs/pkgs/tools/security/pcsclite/default.nix index a4ae25715c3f..08a4b5b08d02 100644 --- a/nixpkgs/pkgs/tools/security/pcsclite/default.nix +++ b/nixpkgs/pkgs/tools/security/pcsclite/default.nix @@ -1,8 +1,9 @@ { stdenv , lib -, fetchurl +, fetchFromGitLab , autoreconfHook , autoconf-archive +, flex , pkg-config , perl , python3 @@ -10,28 +11,26 @@ , polkit , systemdLibs , IOKit +, testers +, nix-update-script , pname ? "pcsclite" , polkitSupport ? false }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "1.9.5"; + version = "2.0.1"; outputs = [ "bin" "out" "dev" "doc" "man" ]; - src = fetchurl { - url = "https://pcsclite.apdu.fr/files/pcsc-lite-${version}.tar.bz2"; - hash = "sha256-nuP5szNTdWIXeJNVmtT3uNXCPr6Cju9TBWwC2xQEnQg="; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "rousseau"; + repo = "PCSC"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-7NGlU4byGxtGBticewg8K4FUiDSQZAiB7Q/y+LaqKPo="; }; - patches = [ ./no-dropdir-literals.patch ]; - - postPatch = '' - sed -i configure.ac \ - -e "s@polkit_policy_dir=.*@polkit_policy_dir=$bin/share/polkit-1/actions@" - ''; - configureFlags = [ "--enable-confdir=/etc" # The OS should care on preparing the drivers into this location @@ -43,11 +42,9 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=${placeholder "bin"}/lib/systemd/system" ]; - postConfigure = '' - sed -i -re '/^#define *PCSCLITE_HP_DROPDIR */ { - s/(DROPDIR *)(.*)/\1(getenv("PCSCLITE_HP_DROPDIR") ? : \2)/ - }' config.h - ''; + makeFlags = [ + "POLICY_DIR=$(out)/share/polkit-1/actions" + ]; postInstall = '' # pcsc-spy is a debugging utility and it drags python into the closure @@ -56,17 +53,34 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook autoconf-archive pkg-config perl ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + flex + pkg-config + perl + ]; buildInputs = [ python3 ] ++ lib.optionals stdenv.isLinux [ systemdLibs ] ++ lib.optionals stdenv.isDarwin [ IOKit ] ++ lib.optionals polkitSupport [ dbus polkit ]; + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "pcscd --version"; + }; + updateScript = nix-update-script { }; + }; + meta = with lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; homepage = "https://pcsclite.apdu.fr/"; + changelog = "https://salsa.debian.org/rousseau/PCSC/-/blob/${finalAttrs.version}/ChangeLog"; license = licenses.bsd3; + mainProgram = "pcscd"; + maintainers = [ maintainers.anthonyroussel ]; platforms = with platforms; unix; }; -} +}) diff --git a/nixpkgs/pkgs/tools/security/pcsclite/no-dropdir-literals.patch b/nixpkgs/pkgs/tools/security/pcsclite/no-dropdir-literals.patch deleted file mode 100644 index 4c6d5554d77a..000000000000 --- a/nixpkgs/pkgs/tools/security/pcsclite/no-dropdir-literals.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/src/hotplug_libudev.c b/src/hotplug_libudev.c -index 51bd95f..84f959b 100644 ---- a/src/hotplug_libudev.c -+++ b/src/hotplug_libudev.c -@@ -120,7 +120,8 @@ static LONG HPReadBundleValues(void) - - if (NULL == hpDir) - { -- Log1(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR); -+ Log2(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: %s", -+ PCSCLITE_HP_DROPDIR); - Log1(PCSC_LOG_ERROR, "Disabling USB support for pcscd."); - return -1; - } -@@ -741,7 +742,7 @@ ULONG HPRegisterForHotplugEvents(void) - - if (driverSize <= 0) - { -- Log1(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: " -+ Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s", - PCSCLITE_HP_DROPDIR); - Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd"); - return 0; -diff --git a/src/hotplug_libusb.c b/src/hotplug_libusb.c -index 0ada9f5..d49a407 100644 ---- a/src/hotplug_libusb.c -+++ b/src/hotplug_libusb.c -@@ -142,7 +142,8 @@ static LONG HPReadBundleValues(void) - - if (hpDir == NULL) - { -- Log1(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: " PCSCLITE_HP_DROPDIR); -+ Log2(PCSC_LOG_ERROR, "Cannot open PC/SC drivers directory: %s", -+ PCSCLITE_HP_DROPDIR); - Log1(PCSC_LOG_ERROR, "Disabling USB support for pcscd."); - return -1; - } -@@ -282,7 +283,8 @@ static LONG HPReadBundleValues(void) - - if (driverSize == 0) - { -- Log1(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: " PCSCLITE_HP_DROPDIR); -+ Log2(PCSC_LOG_INFO, "No bundle files in pcsc drivers directory: %s", -+ PCSCLITE_HP_DROPDIR); - Log1(PCSC_LOG_INFO, "Disabling USB support for pcscd"); - } - #ifdef DEBUG_HOTPLUG diff --git a/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix b/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix index ed43ee382597..36fff7d34d5c 100644 --- a/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix +++ b/nixpkgs/pkgs/tools/security/pinentry-bemenu/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ jc ]; platforms = with platforms; linux; + mainProgram = "pinentry-bemenu"; }; } diff --git a/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix b/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix index a7f92818b8b7..e0fffff7cedf 100644 --- a/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix +++ b/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ seqizz ]; + mainProgram = "pinentry-rofi"; }; } diff --git a/nixpkgs/pkgs/tools/security/pinentry/default.nix b/nixpkgs/pkgs/tools/security/pinentry/default.nix index dca48f4e2108..baa78521f345 100644 --- a/nixpkgs/pkgs/tools/security/pinentry/default.nix +++ b/nixpkgs/pkgs/tools/security/pinentry/default.nix @@ -2,7 +2,7 @@ , libgpg-error, libassuan, qtbase, wrapQtAppsHook , ncurses, gtk2, gcr , withLibsecret ? true, libsecret -, enabledFlavors ? [ "curses" "tty" "emacs" ] +, enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] ++ lib.optionals (!stdenv.isDarwin) [ "qt" ] }: diff --git a/nixpkgs/pkgs/tools/security/pinentry/mac.nix b/nixpkgs/pkgs/tools/security/pinentry/mac.nix index d824a816dc90..4620aedecc75 100644 --- a/nixpkgs/pkgs/tools/security/pinentry/mac.nix +++ b/nixpkgs/pkgs/tools/security/pinentry/mac.nix @@ -85,5 +85,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Plus; homepage = "https://github.com/GPGTools/pinentry-mac"; platforms = lib.platforms.darwin; + mainProgram = passthru.binaryPath; }; } diff --git a/nixpkgs/pkgs/tools/security/quill/default.nix b/nixpkgs/pkgs/tools/security/quill/default.nix index b2a4f3528d56..5de9e8b8b3fc 100644 --- a/nixpkgs/pkgs/tools/security/quill/default.nix +++ b/nixpkgs/pkgs/tools/security/quill/default.nix @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { homepage = "https://github.com/dfinity/quill"; changelog = "https://github.com/dfinity/quill/releases/tag/v${version}"; - description = "Minimalistic ledger and governance toolkit for cold wallets on the Internet Computer."; + description = "Minimalistic ledger and governance toolkit for cold wallets on the Internet Computer"; license = licenses.asl20; maintainers = with maintainers; [ imalison ]; }; diff --git a/nixpkgs/pkgs/tools/security/responder/default.nix b/nixpkgs/pkgs/tools/security/responder/default.nix index 51120e8a575d..a51bb40ac5fd 100644 --- a/nixpkgs/pkgs/tools/security/responder/default.nix +++ b/nixpkgs/pkgs/tools/security/responder/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "responder"; - version = "3.1.3.0"; + version = "3.1.4.0"; format = "other"; src = fetchFromGitHub { owner = "lgandx"; repo = "Responder"; rev = "refs/tags/v${version}"; - hash = "sha256-ZnWUkV+9fn08Ze4468wSUtldABrmn+88N2Axc+Mip2A="; + hash = "sha256-BVSA/ZhpGz6UGyDRJUc4nlRJZ1/Y7er1vVOI+IbIqGk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/secp256k1/default.nix b/nixpkgs/pkgs/tools/security/secp256k1/default.nix index 1af6812cfc99..5494f8f26c24 100644 --- a/nixpkgs/pkgs/tools/security/secp256k1/default.nix +++ b/nixpkgs/pkgs/tools/security/secp256k1/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "secp256k1"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "secp256k1"; rev = "refs/tags/v${version}"; - sha256 = "sha256-KNEOEwxeCQybFdUFfItEF5KoZ/fZ/mahFU1LSlRyHZE="; + sha256 = "sha256-atq34GnWkSkWTWxZP4PCSF3hIjGFhQ534E+WUtLRkiM="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/nixpkgs/pkgs/tools/security/sedutil/default.nix b/nixpkgs/pkgs/tools/security/sedutil/default.nix index cb0e367fa2cc..0e83472da0e7 100644 --- a/nixpkgs/pkgs/tools/security/sedutil/default.nix +++ b/nixpkgs/pkgs/tools/security/sedutil/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook }: @@ -15,6 +16,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-NG/7aqe48ShHWW5hW8axYWV4+zX0dBE7Wy9q58l0S3E="; }; + patches = [ + # Fix for gcc-13 pending upstream inclusion: + # https://github.com/Drive-Trust-Alliance/sedutil/pull/425 + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/Drive-Trust-Alliance/sedutil/commit/927cd88cad7bea94c2eebecc18f7881f0defaccb.patch"; + hash = "sha256-/Lvn3CQd7pzNhLa7sQY8VwbyJK/jEM5FzLijTQnzXx8="; + }) + ]; + postPatch = '' patchShebangs . ''; diff --git a/nixpkgs/pkgs/tools/security/smbmap/default.nix b/nixpkgs/pkgs/tools/security/smbmap/default.nix index f4236ef2fcd3..698fd8b19448 100644 --- a/nixpkgs/pkgs/tools/security/smbmap/default.nix +++ b/nixpkgs/pkgs/tools/security/smbmap/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "smbmap"; - version = "1.9.2"; + version = "1.10.2"; format = "setuptools"; src = fetchFromGitHub { owner = "ShawnDEvans"; repo = "smbmap"; rev = "refs/tags/v${version}"; - hash = "sha256-n0cLj1K9Xt/1TlHOh9Kp/xIXYaUhmGSxrHL/yxDbfk4="; + hash = "sha256-6+kO2Wfz3gGABS4fGxoebCubzvFAaJIGnMPA+k1mckc="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/security/solo2-cli/default.nix b/nixpkgs/pkgs/tools/security/solo2-cli/default.nix index 1580b946e71e..417afd93a99c 100644 --- a/nixpkgs/pkgs/tools/security/solo2-cli/default.nix +++ b/nixpkgs/pkgs/tools/security/solo2-cli/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "cli" ]; meta = with lib; { - description = "A CLI tool for managing SoloKeys' Solo2 USB security keys."; + description = "A CLI tool for managing SoloKeys' Solo2 USB security keys"; homepage = "https://github.com/solokeys/solo2-cli"; license = with licenses; [ asl20 mit ]; # either at your option maintainers = with maintainers; [ lukegb ]; diff --git a/nixpkgs/pkgs/tools/security/stacs/default.nix b/nixpkgs/pkgs/tools/security/stacs/default.nix index 672cd082849c..205d85f0622e 100644 --- a/nixpkgs/pkgs/tools/security/stacs/default.nix +++ b/nixpkgs/pkgs/tools/security/stacs/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ click - pydantic + pydantic_1 typing-extensions yara-python ]; diff --git a/nixpkgs/pkgs/tools/security/sudo-rs/default.nix b/nixpkgs/pkgs/tools/security/sudo-rs/default.nix index 0be60c5025b7..d0e547dc2d23 100644 --- a/nixpkgs/pkgs/tools/security/sudo-rs/default.nix +++ b/nixpkgs/pkgs/tools/security/sudo-rs/default.nix @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage rec { }; meta = with lib; { - description = "A memory safe implementation of sudo and su."; + description = "A memory safe implementation of sudo and su"; homepage = "https://github.com/memorysafety/sudo-rs"; changelog = "${meta.homepage}/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 mit ]; diff --git a/nixpkgs/pkgs/tools/security/swtpm/default.nix b/nixpkgs/pkgs/tools/security/swtpm/default.nix index d132e27a8059..8c4785dee62b 100644 --- a/nixpkgs/pkgs/tools/security/swtpm/default.nix +++ b/nixpkgs/pkgs/tools/security/swtpm/default.nix @@ -14,14 +14,14 @@ , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "swtpm"; version = "0.8.1"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-QKR5S7FlMFDw4+VpyRdqixMWyzLpQkf3QCUceQvsliU="; }; @@ -100,5 +100,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/stefanberger/swtpm"; license = licenses.bsd3; maintainers = [ maintainers.baloo ]; + mainProgram = "swtpm"; }; -} +}) diff --git a/nixpkgs/pkgs/tools/security/theharvester/default.nix b/nixpkgs/pkgs/tools/security/theharvester/default.nix index 9e3d2fcdc4a4..812b30f0df9a 100644 --- a/nixpkgs/pkgs/tools/security/theharvester/default.nix +++ b/nixpkgs/pkgs/tools/security/theharvester/default.nix @@ -15,6 +15,11 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-tnCiI4bte2RSWSkEL2rwFz6WFjfRMMFiEBOvv3QMyos="; }; + postPatch = '' + # Requirements are pinned + sed -i 's/==.*//' requirements/base.txt + ''; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; @@ -68,7 +73,8 @@ python3.pkgs.buildPythonApplication rec { ''; homepage = "https://github.com/laramies/theHarvester"; changelog = "https://github.com/laramies/theHarvester/releases/tag/${version}"; - maintainers = with maintainers; [ c0bw3b fab treemo ]; license = licenses.gpl2Only; + maintainers = with maintainers; [ c0bw3b fab treemo ]; + mainProgram = "theHarvester"; }; } diff --git a/nixpkgs/pkgs/tools/security/truecrack/default.nix b/nixpkgs/pkgs/tools/security/truecrack/default.nix index c58ce4ae57b1..19ae85105657 100644 --- a/nixpkgs/pkgs/tools/security/truecrack/default.nix +++ b/nixpkgs/pkgs/tools/security/truecrack/default.nix @@ -40,7 +40,7 @@ gccStdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - description = "TrueCrack is a brute-force password cracker for TrueCrypt volumes. It works on Linux and it is optimized for Nvidia Cuda technology."; + description = "A brute-force password cracker for TrueCrypt volumes, optimized for Nvidia Cuda technology"; homepage = "https://gitlab.com/kalilinux/packages/truecrack"; broken = cudaSupport; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/tools/security/trueseeing/default.nix b/nixpkgs/pkgs/tools/security/trueseeing/default.nix index 8284a802bd88..8ab38a9a44d2 100644 --- a/nixpkgs/pkgs/tools/security/trueseeing/default.nix +++ b/nixpkgs/pkgs/tools/security/trueseeing/default.nix @@ -15,22 +15,20 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-g5OqdnPtGGV4wBwPRAjH3lweguwlfVcgpNLlq54OHKA="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "attrs~=21.4" "attrs>=21.4" - ''; - nativeBuildInputs = with python3.pkgs; [ flit-core + pythonRelaxDepsHook ]; + pythonRelaxDeps = true; + propagatedBuildInputs = with python3.pkgs; [ attrs - ipython jinja2 lxml pypubsub pyyaml + termcolor ]; # Project has no tests diff --git a/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/nixpkgs/pkgs/tools/security/trufflehog/default.nix index ac6577ceed92..2ad22b513d83 100644 --- a/nixpkgs/pkgs/tools/security/trufflehog/default.nix +++ b/nixpkgs/pkgs/tools/security/trufflehog/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.63.7"; + version = "3.63.10"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-RI2lNlPlc49E2Z88hEAQzvuXzz62ROsFpp1a9YjNd6I="; + hash = "sha256-yxeXJXHSwouDzT1u8e29piqMs20VYh4pwKFFllOCJqM="; }; - vendorHash = "sha256-oZkrRaThXwBORoib1GIW7CUF5RGZJ5d/Jd6YM4z3ZIA="; + vendorHash = "sha256-eD6PcJgwulwMbizUBDr2jLwVfsAdxiQWFqqe17wNqp0="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/security/vaultwarden/webvault.nix b/nixpkgs/pkgs/tools/security/vaultwarden/webvault.nix index 3981366448be..92948bae4bf1 100644 --- a/nixpkgs/pkgs/tools/security/vaultwarden/webvault.nix +++ b/nixpkgs/pkgs/tools/security/vaultwarden/webvault.nix @@ -7,14 +7,15 @@ }: let - version = "2023.12.0"; + version = "2024.1.1"; bw_web_builds = fetchFromGitHub { owner = "dani-garcia"; repo = "bw_web_builds"; rev = "v${version}"; - hash = "sha256-S98Yqi0PEpMF+enP/J3x/kPEe0VhErY8BNphOXmsijg="; + hash = "sha256-xtfpxcJLP0C4FdnO45gsaecOWJ/cKC++Abm7iatTH1Y="; }; + in buildNpmPackage rec { pname = "vaultwarden-webvault"; inherit version; @@ -23,13 +24,13 @@ in buildNpmPackage rec { owner = "bitwarden"; repo = "clients"; rev = "web-v${lib.removeSuffix "b" version}"; - hash = "sha256-eAwj7cWR/ojAMAvYg2/vtNWYTwVBCOnBJPy9mC5Td40="; + hash = "sha256-695iCkFhPEyyI4ekbjsdWpxgPy+bX392/X30HyL4F4Y="; }; - npmDepsHash = "sha256-VW1pGG/pc2tdSs5+HfypZv9fnQu04qkoFBTJxaYvBZo="; + npmDepsHash = "sha256-IJ5JVz9hHu3NOzFJAyzfhsMfPQgYQGntDEDuBMI/iZc="; postPatch = '' - ln -s ${bw_web_builds}/{patches,resources} .. + cp -r ${bw_web_builds}/{patches,resources} .. PATH="${git}/bin:$PATH" VAULT_VERSION="${lib.removePrefix "web-" src.rev}" \ bash ${bw_web_builds}/scripts/apply_patches.sh ''; @@ -48,6 +49,8 @@ in buildNpmPackage rec { "--workspace" "apps/web" ]; + npmFlags = [ "--legacy-peer-deps" ]; + installPhase = '' runHook preInstall mkdir -p $out/share/vaultwarden diff --git a/nixpkgs/pkgs/tools/security/websploit/default.nix b/nixpkgs/pkgs/tools/security/websploit/default.nix deleted file mode 100644 index b8db06427f86..000000000000 --- a/nixpkgs/pkgs/tools/security/websploit/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ lib, buildPythonApplication, fetchFromGitHub -, requests, scapy }: - -buildPythonApplication rec { - pname = "websploit"; - version = "4.0.4"; - - src = fetchFromGitHub { - owner = "f4rih"; - repo = pname; - rev = version; - sha256 = "LpDfJmH2FbL37Fk86CAC/bxFqM035DBN6c6FPfGpaIw="; - }; - - propagatedBuildInputs = [ - requests - scapy - ]; - - # Project has no tests - doCheck = false; - - meta = with lib; { - description = "A high level MITM framework"; - homepage = "https://github.com/f4rih/websploit"; - license = licenses.mit; - maintainers = with maintainers; [ emilytrau ]; - }; -} diff --git a/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix b/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix index 26402caa812b..a8474a1a5b3f 100644 --- a/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix +++ b/nixpkgs/pkgs/tools/security/yubikey-touch-detector/default.nix @@ -44,7 +44,7 @@ buildGoModule rec { ''; meta = with lib; { - description = "A tool to detect when your YubiKey is waiting for a touch (to send notification or display a visual indicator on the screen)."; + description = "A tool to detect when your YubiKey is waiting for a touch"; homepage = "https://github.com/maximbaz/yubikey-touch-detector"; maintainers = with maintainers; [ sumnerevans ]; license = with licenses; [ bsd2 isc ]; diff --git a/nixpkgs/pkgs/tools/security/zlint/default.nix b/nixpkgs/pkgs/tools/security/zlint/default.nix index 68db5038c6f0..ba8eeeb12fa5 100644 --- a/nixpkgs/pkgs/tools/security/zlint/default.nix +++ b/nixpkgs/pkgs/tools/security/zlint/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "zlint"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "zmap"; repo = "zlint"; rev = "v${version}"; - hash = "sha256-PpCA7BeamXWWRIXcoIGg2gufpqrzI6goXxQhJaH04cA="; + hash = "sha256-SGQOWMpjSS0XHrBjhPSRPBssCk073Hc1OlzQh/pnSRs="; }; modRoot = "v3"; - vendorHash = "sha256-MDg09cjJ/vSLjXm4l5S4v/r2YQPV4enH8V3ByBtDVfM="; + vendorHash = "sha256-LP7I7NY/Am6zWfVSvwJanCFwiLfcHKA3Fb9RIMD76a0="; postPatch = '' # Remove a package which is not declared in go.mod. diff --git a/nixpkgs/pkgs/tools/security/zsteg/default.nix b/nixpkgs/pkgs/tools/security/zsteg/default.nix index a2134d468f00..2171a77fce1a 100644 --- a/nixpkgs/pkgs/tools/security/zsteg/default.nix +++ b/nixpkgs/pkgs/tools/security/zsteg/default.nix @@ -8,7 +8,7 @@ bundlerApp { exes = [ "zsteg" ]; meta = with lib; { - description = "Detect stegano-hidden data in PNG & BMP."; + description = "Detect stegano-hidden data in PNG & BMP"; homepage = "http://zed.0xff.me/"; license = licenses.mit; maintainers = with maintainers; [ applePrincess h7x4 ]; diff --git a/nixpkgs/pkgs/tools/system/amdgpu_top/Cargo.lock b/nixpkgs/pkgs/tools/system/amdgpu_top/Cargo.lock index f19bf1d67a41..7905f0a57f32 100644 --- a/nixpkgs/pkgs/tools/system/amdgpu_top/Cargo.lock +++ b/nixpkgs/pkgs/tools/system/amdgpu_top/Cargo.lock @@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" [[package]] name = "accesskit" -version = "0.11.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" +checksum = "ca8410747ed85a17c4a1e9ed3f5a74d3e7bdcc876cf9a18ff40ae21d645997b2" dependencies = [ "enumn", "serde", @@ -36,9 +36,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "getrandom", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "amdgpu_top" -version = "0.3.1" +version = "0.6.1" dependencies = [ "amdgpu_top_gui", "amdgpu_top_json", @@ -70,7 +70,7 @@ dependencies = [ [[package]] name = "amdgpu_top_gui" -version = "0.3.1" +version = "0.6.1" dependencies = [ "eframe", "egui_plot", @@ -83,7 +83,7 @@ dependencies = [ [[package]] name = "amdgpu_top_json" -version = "0.3.1" +version = "0.6.1" dependencies = [ "libamdgpu_top", "serde_json", @@ -91,7 +91,7 @@ dependencies = [ [[package]] name = "amdgpu_top_tui" -version = "0.3.1" +version = "0.6.1" dependencies = [ "cursive", "libamdgpu_top", @@ -123,15 +123,15 @@ checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "ca87830a3e3fb156dc96cfbd31cb620265dd053be734723f22b760d6cc3c3051" [[package]] name = "arboard" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc" +checksum = "aafb29b107435aa276664c1db8954ac27a6e105cdad3c88287a199eb0e313c08" dependencies = [ "clipboard-win", "log", @@ -213,9 +213,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", "regex-automata", @@ -254,7 +254,7 @@ checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -385,9 +385,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -395,9 +395,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core-graphics" @@ -414,9 +414,9 @@ dependencies = [ [[package]] name = "core-graphics-types" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -443,9 +443,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "82a9b73a36529d9c47029b9fb3a6f0ea3cc916a261195352ba19e770fc1748b2" dependencies = [ "cfg-if", "crossbeam-utils", @@ -453,9 +453,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "c3a430a770ebd84726f584a90ee7f020d28db52c6d02138900f22341f866d39c" dependencies = [ "cfg-if", ] @@ -554,7 +554,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -565,7 +565,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -583,9 +583,9 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" dependencies = [ "powerfmt", ] @@ -635,7 +635,7 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -661,9 +661,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" [[package]] name = "ecolor" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf4e52dbbb615cfd30cf5a5265335c217b5fd8d669593cea74a517d9c605af" +checksum = "4b7637fc2e74d17e52931bac90ff4fc061ac776ada9c7fa272f24cdca5991972" dependencies = [ "bytemuck", "serde", @@ -671,9 +671,9 @@ dependencies = [ [[package]] name = "eframe" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d9efede6c8905d3fc51a5ec9a506d4da4011bbcae0253d0304580fe40af3f5" +checksum = "cdd73918a828c35a7efb4d7188ea973df4bffc589178ed95f521c917b03ddcfa" dependencies = [ "bytemuck", "cocoa", @@ -704,9 +704,9 @@ dependencies = [ [[package]] name = "egui" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd69fed5fcf4fbb8225b24e80ea6193b61e17a625db105ef0c4d71dde6eb8b7" +checksum = "c55bcb864b764eb889515a38b8924757657a250738ad15126637ee2df291ee6b" dependencies = [ "accesskit", "ahash", @@ -719,9 +719,9 @@ dependencies = [ [[package]] name = "egui-winit" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15479a96d9fadccf5dac690bdc6373b97b8e1c0dd28367058f25a5298da0195" +checksum = "3b673606b6606b12b95e3a3194d7882bf5cff302db36a520b8144c7c342e4e84" dependencies = [ "arboard", "egui", @@ -736,33 +736,33 @@ dependencies = [ [[package]] name = "egui_glow" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6726c08798822280038bbad2e32f4fc3cbed800cd51c6e34e99cd2d60cc1bc" +checksum = "262151f9d57c557c02a40a46f27b9e050a6eb0b006b94dced9c6f4519a04d489" dependencies = [ "bytemuck", "egui", "glow", "log", - "memoffset", + "memoffset 0.7.1", "wasm-bindgen", "web-sys", ] [[package]] name = "egui_plot" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f33a00fe8eb1ba56535b3dbacdecc7a1365a328908a97c5f3c81bb466be72b" +checksum = "b37b2edcdd197db41825266ae7979bd7591fa2eb6b40152375ac05eb323eb9d2" dependencies = [ "egui", ] [[package]] name = "emath" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef2b29de53074e575c18b694167ccbe6e5191f7b25fe65175a0d905a32eeec0" +checksum = "a045c6c0b44b35e98513fc1e9d183ab42881ac27caccb9fa345465601f56cce4" dependencies = [ "bytemuck", "serde", @@ -770,22 +770,22 @@ dependencies = [ [[package]] name = "enum-map" -version = "2.7.1" +version = "2.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed40247825a1a0393b91b51d475ea1063a6cbbf0847592e7f13fb427aca6a716" +checksum = "6866f3bfdf8207509a033af1a75a7b08abda06bbaaeae6669323fd5a097df2e9" dependencies = [ "enum-map-derive", ] [[package]] name = "enum-map-derive" -version = "0.15.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7933cd46e720348d29ed1493f89df9792563f272f96d8f13d18afe03b32f8cb8" +checksum = "f282cfdfe92516eb26c2af8589c274c7c17681f5ecc03c18255fe741c6aa64eb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -796,7 +796,7 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -817,14 +817,14 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] name = "epaint" -version = "0.23.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58067b840d009143934d91d8dcb8ded054d8301d7c11a517ace0a99bb1e1595e" +checksum = "7d1b9e000d21bab9b535ce78f9f7745be28b3f777f6c7223936561c5c7fefab8" dependencies = [ "ab_glyph", "ahash", @@ -845,12 +845,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.6" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -865,9 +865,9 @@ dependencies = [ [[package]] name = "faster-hex" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "239f7bfb930f820ab16a9cd95afc26f88264cf6905c960b340a615384aa3338a" +checksum = "a2a2b11eda1d40935b26cf18f6833c526845ae8c41e58d09af6adeb6f0269183" dependencies = [ "serde", ] @@ -880,9 +880,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fdeflate" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64d6dafc854908ff5da46ff3f8f473c6984119a2876a383a860246dd7841a868" +checksum = "209098dd6dfc4445aa6111f0e98653ac323eaa4dfd212c9ca3931bf9955c31bd" dependencies = [ "simd-adler32", ] @@ -927,7 +927,7 @@ dependencies = [ "intl-memoizer", "intl_pluralrules", "rustc-hash", - "self_cell", + "self_cell 0.10.3", "smallvec", "unic-langid", ] @@ -973,9 +973,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -992,9 +992,9 @@ dependencies = [ [[package]] name = "gethostname" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" +checksum = "bb65d4ba3173c56a500b555b532f72c42e8d1fe64962b518897f8959fae2c177" dependencies = [ "libc", "winapi", @@ -1054,9 +1054,9 @@ dependencies = [ [[package]] name = "gix-actor" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "948a5f9e43559d16faf583694f1c742eb401ce24ce8e6f2238caedea7486433c" +checksum = "2eadca029ef716b4378f7afb19f7ee101fde9e58ba1f1445971315ac866db417" dependencies = [ "bstr", "btoi", @@ -1068,24 +1068,24 @@ dependencies = [ [[package]] name = "gix-chunk" -version = "0.4.4" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b42ea64420f7994000130328f3c7a2038f639120518870436d31b8bde704493" +checksum = "003ec6deacf68076a0c157271a127e0bb2c031c1a41f7168cbe5d248d9b85c78" dependencies = [ "thiserror", ] [[package]] name = "gix-commitgraph" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8bc78b1a6328fa6d8b3a53b6c73997af37fd6bfc1d6c49f149e63bda5cbb36" +checksum = "85a7007ba021f059803afaf6f8a48872422abc20550ac12ede6ddea2936cec36" dependencies = [ "bstr", "gix-chunk", "gix-features", "gix-hash", - "memmap2 0.7.1", + "memmap2 0.9.3", "thiserror", ] @@ -1112,9 +1112,9 @@ dependencies = [ [[package]] name = "gix-config-value" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea7505b97f4d8e7933e29735a568ba2f86d8de466669d9f0e8321384f9972f47" +checksum = "52e0be46f4cf1f8f9e88d0e3eb7b29718aff23889563249f379119bd1ab6910e" dependencies = [ "bitflags 2.4.1", "bstr", @@ -1125,9 +1125,9 @@ dependencies = [ [[package]] name = "gix-date" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7df669639582dc7c02737642f76890b03b5544e141caba68a7d6b4eb551e0d" +checksum = "fb7f3dfb72bebe3449b5e642be64e3c6ccbe9821c8b8f19f487cf5bfbbf4067e" dependencies = [ "bstr", "itoa", @@ -1163,9 +1163,9 @@ dependencies = [ [[package]] name = "gix-features" -version = "0.36.0" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f4365ba17c4f218d7fd9ec102b8d2d3cb0ca200a835e81151ace7778aec827" +checksum = "4d46a4a5c6bb5bebec9c0d18b65ada20e6517dbd7cf855b87dd4bbdce3a771b2" dependencies = [ "crc32fast", "flate2", @@ -1181,18 +1181,18 @@ dependencies = [ [[package]] name = "gix-fs" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd171c0cae97cd0dc57e7b4601cb1ebf596450e263ef3c02be9107272c877bd" +checksum = "20e86eb040f5776a5ade092282e51cdcad398adb77d948b88d17583c2ae4e107" dependencies = [ "gix-features", ] [[package]] name = "gix-glob" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fac08925dbc14d414bd02eb45ffb4cecd912d1fce3883f867bd0103c192d3e4" +checksum = "5db19298c5eeea2961e5b3bf190767a2d1f09b8802aeb5f258e42276350aff19" dependencies = [ "bitflags 2.4.1", "bstr", @@ -1202,9 +1202,9 @@ dependencies = [ [[package]] name = "gix-hash" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1884c7b41ea0875217c1be9ce91322f90bde433e91d374d0e1276073a51ccc60" +checksum = "1f8cf8c2266f63e582b7eb206799b63aa5fa68ee510ad349f637dfe2d0653de0" dependencies = [ "faster-hex", "thiserror", @@ -1212,9 +1212,9 @@ dependencies = [ [[package]] name = "gix-hashtable" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "409268480841ad008e81c17ca5a293393fbf9f2b6c2f85b8ab9de1f0c5176a16" +checksum = "feb61880816d7ec4f0b20606b498147d480860ddd9133ba542628df2f548d3ca" dependencies = [ "gix-hash", "hashbrown", @@ -1223,9 +1223,9 @@ dependencies = [ [[package]] name = "gix-lock" -version = "11.0.0" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4feb1dcd304fe384ddc22edba9dd56a42b0800032de6537728cea2f033a4f37" +checksum = "7e5c65e6a29830a435664891ced3f3c1af010f14900226019590ee0971a22f37" dependencies = [ "gix-tempfile", "gix-utils", @@ -1234,13 +1234,13 @@ dependencies = [ [[package]] name = "gix-macros" -version = "0.1.0" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d8acb5ee668d55f0f2d19a320a3f9ef67a6999ad483e11135abcc2464ed18b6" +checksum = "d75e7ab728059f595f6ddc1ad8771b8d6a231971ae493d9d5948ecad366ee8bb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -1303,9 +1303,9 @@ dependencies = [ [[package]] name = "gix-path" -version = "0.10.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1d370115171e3ae03c5c6d4f7d096f2981a40ddccb98dfd704c773530ba73b" +checksum = "b8dd0998ab245f33d40ca2267e58d542fe54185ebd1dc41923346cf28d179fb6" dependencies = [ "bstr", "gix-trace", @@ -1316,9 +1316,9 @@ dependencies = [ [[package]] name = "gix-quote" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475c86a97dd0127ba4465fbb239abac9ea10e68301470c9791a6dd5351cdc905" +checksum = "9f7dc10303d73a960d10fb82f81188b036ac3e6b11b5795b20b1a60b51d1321f" dependencies = [ "bstr", "btoi", @@ -1393,9 +1393,9 @@ dependencies = [ [[package]] name = "gix-sec" -version = "0.10.0" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b9542ac025a8c02ed5d17b3fc031a111a384e859d0be3532ec4d58c40a0f28" +checksum = "78f6dce0c6683e2219e8169aac4b1c29e89540a8262fef7056b31d80d969408c" dependencies = [ "bitflags 2.4.1", "gix-path", @@ -1405,9 +1405,9 @@ dependencies = [ [[package]] name = "gix-tempfile" -version = "11.0.0" +version = "11.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cc2205cf10d99f70b96e04e16c55d4c7cf33efc151df1f793e29fd12a931f8" +checksum = "388dd29114a86ec69b28d1e26d6d63a662300ecf61ab3f4cc578f7d7dc9e7e23" dependencies = [ "gix-fs", "libc", @@ -1418,9 +1418,9 @@ dependencies = [ [[package]] name = "gix-trace" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96b6d623a1152c3facb79067d6e2ecdae48130030cf27d6eb21109f13bd7b836" +checksum = "e8e1127ede0475b58f4fe9c0aaa0d9bb0bad2af90bbd93ccd307c8632b863d89" [[package]] name = "gix-traverse" @@ -1440,9 +1440,9 @@ dependencies = [ [[package]] name = "gix-url" -version = "0.25.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b9ac8ed32ad45f9fc6c5f8c0be2ed911e544a5a19afd62d95d524ebaa95671" +checksum = "0c427a1a11ccfa53a4a2da47d9442c2241deee63a154bc15cc14b8312fbc4005" dependencies = [ "bstr", "gix-features", @@ -1454,18 +1454,18 @@ dependencies = [ [[package]] name = "gix-utils" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b85d89dc728613e26e0ed952a19583744e7f5240fcd4aa30d6c824ffd8b52f0f" +checksum = "de6225e2de30b6e9bca2d9f1cc4731640fcef0fb3cabddceee366e7e85d3e94f" dependencies = [ "fastrand", ] [[package]] name = "gix-validate" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05cab2b03a45b866156e052aa38619f4ece4adcb2f79978bfc249bc3b21b8c5" +checksum = "ac7cc36f496bd5d96cdca0f9289bb684480725d40db60f48194aa7723b883854" dependencies = [ "bstr", "thiserror", @@ -1560,17 +1560,17 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1626,21 +1626,21 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.39", + "syn 2.0.44", "unic-langid", ] [[package]] name = "i18n-embed-impl" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a4d5bff745c9a6e1459c490059281b353a4ab0a4e1e58b3eeeaef71f97d07b" +checksum = "81093c4701672f59416582fe3145676126fd23ba5db910acad0793c1108aaa58" dependencies = [ "find-crate", "i18n-config", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -1651,9 +1651,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -1716,9 +1716,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jni" @@ -1753,9 +1753,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -1774,7 +1774,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libamdgpu_top" -version = "0.3.1" +version = "0.6.1" dependencies = [ "anyhow", "libdrm_amdgpu_sys", @@ -1782,14 +1782,14 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.150" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libdrm_amdgpu_sys" -version = "0.2.2" -source = "git+https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs#39b31fd54578d332f8085c033a1ef073b627be6e" +version = "0.4.1" +source = "git+https://github.com/Umio-Yasuno/libdrm-amdgpu-sys-rs#d2e0bd7d1dd822b95789842d96e183ae1bb31aeb" dependencies = [ "libc", ] @@ -1838,9 +1838,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "locale_config" @@ -1882,9 +1882,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.4" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memmap2" @@ -1905,6 +1905,15 @@ dependencies = [ ] [[package]] +name = "memmap2" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45fd3a57831bf88bc63f8cebc0cf956116276e97fef3966103e96416209f7c92" +dependencies = [ + "libc", +] + +[[package]] name = "memoffset" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1914,10 +1923,13 @@ dependencies = [ ] [[package]] -name = "minimal-lexical" -version = "0.2.1" +name = "memoffset" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" +checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +dependencies = [ + "autocfg", +] [[package]] name = "miniz_oxide" @@ -1931,9 +1943,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -1979,7 +1991,7 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset", + "memoffset 0.6.5", ] [[package]] @@ -1992,24 +2004,26 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset", + "memoffset 0.6.5", ] [[package]] -name = "nohash-hasher" -version = "0.2.0" +name = "nix" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.7.1", +] [[package]] -name = "nom" -version = "7.1.3" +name = "nohash-hasher" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" [[package]] name = "num" @@ -2113,7 +2127,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] @@ -2182,9 +2196,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "orbclient" @@ -2238,15 +2252,15 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "png" @@ -2303,9 +2317,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "2dd5e8a1f1029c43224ad5898e50140c2aebb1705f19e67c918ebf5b9e797fe1" dependencies = [ "unicode-ident", ] @@ -2318,9 +2332,9 @@ checksum = "794b5bf8e2d19b53dcdcec3e4bba628e20f5b6062503ba89281fa7037dd7bbcf" [[package]] name = "quote" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "22a37c9326af5ed140c86a46655b5278de879853be5573c01df185b6f49a580a" dependencies = [ "proc-macro2", ] @@ -2403,9 +2417,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "8.0.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e7d90385b59f0a6bf3d3b757f3ca4ece2048265d70db20a2016043d4509a40" +checksum = "a82c0bbc10308ed323529fd3c1dce8badda635aa319a5ff0e6466f33b8101e3f" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -2414,22 +2428,22 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.0.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3d8c6fd84090ae348e63a84336b112b5c3918b3bf0493a581f7bd8ee623c29" +checksum = "6227c01b1783cdfee1bcf844eb44594cd16ec71c35305bf1c9fb5aade2735e16" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.39", + "syn 2.0.44", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.0.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873feff8cb7bf86fdf0a71bb21c95159f4e4a37dd7a4bd1855a940909b583ada" +checksum = "8cb0a25bfbb2d4b4402179c2cf030387d9990857ce08a32592c6238db9fa8665" dependencies = [ "sha2", "walkdir", @@ -2443,22 +2457,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.21" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "same-file" @@ -2483,35 +2497,44 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "self_cell" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef965a420fe14fdac7dd018862966a4c14094f900e1650bbc71ddd7d580c8af" +checksum = "e14e4d63b804dc0c7ec4a1e52bcb63f02c7ac94476755aa579edac21e01f915d" +dependencies = [ + "self_cell 1.0.3", +] + +[[package]] +name = "self_cell" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] name = "serde_json" -version = "1.0.108" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" +checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" dependencies = [ "itoa", "ryu", @@ -2520,9 +2543,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -2582,9 +2605,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" [[package]] name = "slotmap" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +checksum = "dbff4acf519f630b3a3ddcfaea6c06b42174d9a44bc70c620e9ed1649d58b82a" dependencies = [ "version_check", ] @@ -2661,9 +2684,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "92d27c2c202598d05175a6dd3af46824b7f747f8d8e9b14c623f19fa5069735d" dependencies = [ "proc-macro2", "quote", @@ -2672,42 +2695,42 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.8.1" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.4.1", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "b2cd5904763bad08ad5513ddbb12cf2ae273ca53fa9f68e843e236ec6dfccc09" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "3dcf4a824cce0aeacd6f38ae6f24234c8e80d68632338ebaa1443b5df9e29e19" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] [[package]] name = "time" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", @@ -2727,18 +2750,18 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] [[package]] name = "tinystr" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" +checksum = "83c02bf3c538ab32ba913408224323915f4ef9a6d61c0e85d493f355921c0ece" dependencies = [ "displaydoc", ] @@ -2835,18 +2858,18 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unic-langid" -version = "0.9.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" +checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516" dependencies = [ "unic-langid-impl", ] [[package]] name = "unic-langid-impl" -version = "0.9.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" +checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6" dependencies = [ "serde", "tinystr", @@ -2854,15 +2877,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-bom" -version = "2.0.2" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98e90c70c9f0d4d1ee6d0a7d04aa06cb9bbd53d8cfbdd62a0269a7c2eb640552" +checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" [[package]] name = "unicode-ident" @@ -2893,9 +2916,9 @@ checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -2932,9 +2955,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2942,24 +2965,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -2969,9 +2992,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2979,22 +3002,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.88" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "wayland-client" @@ -3083,9 +3106,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.65" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -3093,9 +3116,9 @@ dependencies = [ [[package]] name = "web-time" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57099a701fb3a8043f993e8228dc24229c7b942e2b009a1b962e54489ba1d3bf" +checksum = "aa30049b1c872b72c89866d458eae9f20380ab280ffd1b1e18df2d3e2d98cfe0" dependencies = [ "js-sys", "wasm-bindgen", @@ -3160,11 +3183,21 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-targets 0.48.5", + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -3186,6 +3219,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3216,6 +3258,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3228,6 +3285,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3240,6 +3303,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3252,6 +3321,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3264,6 +3339,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3276,6 +3357,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3288,6 +3375,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3300,6 +3393,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winit" version = "0.28.7" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3335,9 +3434,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.5.19" +version = "0.5.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" +checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c" dependencies = [ "memchr", ] @@ -3355,12 +3454,12 @@ dependencies = [ [[package]] name = "x11rb" -version = "0.10.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" +checksum = "b1641b26d4dec61337c35a1b1aaf9e3cba8f46f0b43636c609ab0291a648040a" dependencies = [ "gethostname", - "nix 0.24.3", + "nix 0.26.4", "winapi", "winapi-wsapoll", "x11rb-protocol", @@ -3368,21 +3467,18 @@ dependencies = [ [[package]] name = "x11rb-protocol" -version = "0.10.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" +checksum = "82d6c3f9a0fb6701fab8f6cea9b0c0bd5d6876f1f89f7fada07e558077c344bc" dependencies = [ - "nix 0.24.3", + "nix 0.26.4", ] [[package]] name = "xcursor" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" -dependencies = [ - "nom", -] +checksum = "6a0ccd7b4a5345edfcd0c3535718a4e9ff7798ffc536bb5b5a0e26ff84732911" [[package]] name = "xi-unicode" @@ -3398,20 +3494,20 @@ checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "zerocopy" -version = "0.7.25" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd369a67c0edfef15010f980c3cbe45d7f651deac2cd67ce097cd801de16557" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.25" +version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f140bda219a26ccc0cdb03dba58af72590c53b22642577d88a927bc5c87d6b" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.44", ] diff --git a/nixpkgs/pkgs/tools/system/amdgpu_top/default.nix b/nixpkgs/pkgs/tools/system/amdgpu_top/default.nix index 73742692af0c..3b220a919fef 100644 --- a/nixpkgs/pkgs/tools/system/amdgpu_top/default.nix +++ b/nixpkgs/pkgs/tools/system/amdgpu_top/default.nix @@ -14,18 +14,18 @@ rustPlatform.buildRustPackage rec { pname = "amdgpu_top"; - version = "0.3.1"; + version = "0.6.1"; src = fetchFromGitHub { owner = "Umio-Yasuno"; repo = pname; rev = "v${version}"; - hash = "sha256-bkrXm3lXJr+sZ09GeVHgfIp8JO3a/Ejrsm1Cm4eY4IU="; + hash = "sha256-/8fYoIp0EezqamKYoZYLllKm5BmljJ0iRpaM2uSPw5Q="; }; cargoLock = { outputHashes = { - "libdrm_amdgpu_sys-0.2.2" = "sha256-2QXT/6octEzokW8+0mHx02R8qQ3kCBDxZT4yyfDkM5A="; + "libdrm_amdgpu_sys-0.4.1" = "sha256-4z6f0vQHF2sAbvAoGMTrAzI953bjsA7Kw719HDuhjg4="; }; lockFile = ./Cargo.lock; }; diff --git a/nixpkgs/pkgs/tools/system/btop/default.nix b/nixpkgs/pkgs/tools/system/btop/default.nix index 6a51b29d1d1c..47d0808c4903 100644 --- a/nixpkgs/pkgs/tools/system/btop/default.nix +++ b/nixpkgs/pkgs/tools/system/btop/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, cmake , darwin , removeReferencesTo , btop @@ -9,23 +10,22 @@ stdenv.mkDerivation rec { pname = "btop"; - version = "1.2.13"; + version = "1.3.0"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - hash = "sha256-F/muCjhcnM+VqAn6FlD4lv23OLITrmtnHkFc5zv97yk="; + hash = "sha256-QQM2/LO/EHovhj+S+4x3ro/aOVrtuxteVVvYAd6feTk="; }; + nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.CoreFoundation darwin.apple_sdk_11_0.frameworks.IOKit ]; - env.ADDFLAGS = lib.optionalString stdenv.isDarwin - "-F${darwin.apple_sdk_11_0.frameworks.IOKit}/Library/Frameworks/"; - installFlags = [ "PREFIX=$(out)" ]; postInstall = '' diff --git a/nixpkgs/pkgs/tools/system/dell-command-configure/default.nix b/nixpkgs/pkgs/tools/system/dell-command-configure/default.nix index 2374d36421f7..c029a9877337 100644 --- a/nixpkgs/pkgs/tools/system/dell-command-configure/default.nix +++ b/nixpkgs/pkgs/tools/system/dell-command-configure/default.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Configure BIOS settings on Dell laptops."; + description = "Configure BIOS settings on Dell laptops"; homepage = "https://www.dell.com/support/article/us/en/19/sln311302/dell-command-configure"; license = licenses.unfree; diff --git a/nixpkgs/pkgs/tools/system/disk-filltest/default.nix b/nixpkgs/pkgs/tools/system/disk-filltest/default.nix deleted file mode 100644 index aeef6732236f..000000000000 --- a/nixpkgs/pkgs/tools/system/disk-filltest/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "disk-filltest"; - version = "0.8.2"; - - src = fetchFromGitHub { - owner = "bingmann"; - repo = "disk-filltest"; - rev = "v${version}"; - sha256 = "0qmcf5k5j7946wsbxrw4rqfj48mwl3r6kb4l3gppl97k7iyni6kj"; - }; - - preBuild = '' - substituteInPlace Makefile --replace 'prefix = /usr/local' 'prefix = $(out)' - ''; - - postInstall = '' - install -D -m0644 -t $out/share/doc COPYING README - mkdir -p $out/share/man; mv $out/man1 $out/share/man - ''; - - meta = with lib; { - description = "Simple program to detect bad disks by filling them with random data"; - longDescription = '' - disk-filltest is a tool to check storage disks for coming - failures by write files with pseudo-random data to the current - directory until the disk is full, read the files again - and verify the sequence written. It also can measure - read/write speed while filling the disk. - ''; - homepage = "https://panthema.net/2013/disk-filltest"; - license = licenses.gpl3; - maintainers = with maintainers; [ caadar ]; - platforms = platforms.all; - mainProgram = "disk-filltest"; - }; - -} diff --git a/nixpkgs/pkgs/tools/system/fancy-motd/default.nix b/nixpkgs/pkgs/tools/system/fancy-motd/default.nix index f2ac62f2874a..f05ea8adceb9 100644 --- a/nixpkgs/pkgs/tools/system/fancy-motd/default.nix +++ b/nixpkgs/pkgs/tools/system/fancy-motd/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Fancy, colorful MOTD written in bash. Server status at a glance."; + description = "Fancy, colorful MOTD written in bash. Server status at a glance"; homepage = "https://github.com/bcyran/fancy-motd"; license = licenses.mit; maintainers = with maintainers; [ rhoriguchi ]; diff --git a/nixpkgs/pkgs/tools/system/gptman/default.nix b/nixpkgs/pkgs/tools/system/gptman/default.nix index 3e3fc623a9e7..533210ee4d8f 100644 --- a/nixpkgs/pkgs/tools/system/gptman/default.nix +++ b/nixpkgs/pkgs/tools/system/gptman/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gptman"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "rust-disk-partition-management"; repo = pname; rev = "v${version}"; - hash = "sha256-Qi2nrvF566AK+JsP7V9tVQXwAU63TNpfTFZLuM/h1Ps="; + hash = "sha256-ebV61EilGggix6JSN/MW4Ka0itkSpvikLDSO005TTYY="; }; - cargoHash = "sha256-YMlwlSq14S37SqewglvxZYUL67fT66hh22t0N8h+2vk="; + cargoHash = "sha256-P+qez0oVsHBiaBYban2o8MRvF8ElLf5zb+p+tYunWWA="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/nixpkgs/pkgs/tools/system/htop/default.nix b/nixpkgs/pkgs/tools/system/htop/default.nix index 50c6ea461f36..20274695f8ac 100644 --- a/nixpkgs/pkgs/tools/system/htop/default.nix +++ b/nixpkgs/pkgs/tools/system/htop/default.nix @@ -11,13 +11,13 @@ assert systemdSupport -> stdenv.isLinux; stdenv.mkDerivation rec { pname = "htop"; - version = "3.2.2"; + version = "3.3.0"; src = fetchFromGitHub { owner = "htop-dev"; repo = pname; rev = version; - sha256 = "sha256-OrlNE1A71q4XAauYNfumV1Ev1wBpFIBxPiw7aF++yjM="; + hash = "sha256-qDhQkzY2zj2yxbgFUXwE0MGEgAFOsAhnapUuetO9WTw="; }; nativeBuildInputs = [ autoreconfHook ] diff --git a/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix b/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix index 332f58749654..7155d1359da5 100644 --- a/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix +++ b/nixpkgs/pkgs/tools/system/java-service-wrapper/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { homepage = "https://wrapper.tanukisoftware.com/"; changelog = "https://wrapper.tanukisoftware.com/doc/english/release-notes.html#${version}"; license = licenses.gpl2Only; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; maintainers = [ maintainers.suhr ]; mainProgram = "wrapper"; }; diff --git a/nixpkgs/pkgs/tools/system/journalwatch/default.nix b/nixpkgs/pkgs/tools/system/journalwatch/default.nix index 3eea1a379656..b732af477169 100644 --- a/nixpkgs/pkgs/tools/system/journalwatch/default.nix +++ b/nixpkgs/pkgs/tools/system/journalwatch/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { - description = "journalwatch is a tool to find error messages in the systemd journal."; + description = "A tool to find error messages in the systemd journal"; homepage = "https://github.com/The-Compiler/journalwatch"; license = licenses.gpl3Plus; maintainers = with maintainers; [ florianjacob ]; diff --git a/nixpkgs/pkgs/tools/system/jsvc/default.nix b/nixpkgs/pkgs/tools/system/jsvc/default.nix index 9d1b07895fc3..f8f67b0f45f9 100644 --- a/nixpkgs/pkgs/tools/system/jsvc/default.nix +++ b/nixpkgs/pkgs/tools/system/jsvc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://commons.apache.org/proper/commons-daemon"; - description = "JSVC is part of the Apache Commons Daemon software, a set of utilities and Java support classes for running Java applications as server processes."; + description = "A part of the Apache Commons Daemon software, a set of utilities and Java support classes for running Java applications as server processes"; maintainers = with lib.maintainers; [ rsynnest ]; license = lib.licenses.asl20; platforms = with lib.platforms; unix; diff --git a/nixpkgs/pkgs/tools/system/lshw/default.nix b/nixpkgs/pkgs/tools/system/lshw/default.nix deleted file mode 100644 index 5a6318ea4c21..000000000000 --- a/nixpkgs/pkgs/tools/system/lshw/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, hwdata -, gtk2 -, pkg-config -, gettext -, sqlite # compile GUI -, withGUI ? false -}: - -stdenv.mkDerivation rec { - pname = "lshw"; - # FIXME: when switching to a stable release: - # Fix repology.org by not including the prefixed B, otherwise the `pname` attr - # gets filled as `lshw-B.XX.XX` in `nix-env --query --available --attr nixpkgs.lshw --meta` - # See https://github.com/NixOS/nix/pull/4463 for a definitive fix - version = "unstable-2023-03-20"; - - src = fetchFromGitHub { - owner = "lyonel"; - repo = pname; - rev = "b4e067307906ec6f277cce5c8a882f5edd03cbbc"; - #rev = "B.${version}"; - sha256 = "sha256-ahdaQeYZEFCVxwAMJPMB9bfo3ndIiqFyM6OghXwtm1A="; - }; - - nativeBuildInputs = [ pkg-config gettext ]; - - buildInputs = [ hwdata ] - ++ lib.optionals withGUI [ gtk2 sqlite ]; - - makeFlags = [ - "PREFIX=$(out)" - "VERSION=${src.rev}" - ]; - - buildFlags = [ "all" ] ++ lib.optional withGUI "gui"; - - hardeningDisable = lib.optionals stdenv.hostPlatform.isStatic [ "fortify" ]; - - installTargets = [ "install" ] ++ lib.optional withGUI "install-gui"; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://ezix.org/project/wiki/HardwareLiSter"; - description = "Provide detailed information on the hardware configuration of the machine"; - license = licenses.gpl2; - maintainers = with maintainers; [ thiagokokada ]; - platforms = platforms.linux; - mainProgram = "lshw"; - }; -} diff --git a/nixpkgs/pkgs/tools/system/osquery/default.nix b/nixpkgs/pkgs/tools/system/osquery/default.nix index a5d7fa3d4413..5138c5374103 100644 --- a/nixpkgs/pkgs/tools/system/osquery/default.nix +++ b/nixpkgs/pkgs/tools/system/osquery/default.nix @@ -84,7 +84,7 @@ buildStdenv.mkDerivation rec { passthru.tests.osquery = nixosTests.osquery; meta = with lib; { - description = "SQL powered operating system instrumentation, monitoring, and analytics."; + description = "SQL powered operating system instrumentation, monitoring, and analytics"; longDescription = '' The system controls table is not included as it does not presently compile with glibc >= 2.32. For more information, refer to https://github.com/osquery/osquery/issues/7823 diff --git a/nixpkgs/pkgs/tools/system/smartmontools/default.nix b/nixpkgs/pkgs/tools/system/smartmontools/default.nix index 02c4340aded2..55ec05d2a9a7 100644 --- a/nixpkgs/pkgs/tools/system/smartmontools/default.nix +++ b/nixpkgs/pkgs/tools/system/smartmontools/default.nix @@ -38,7 +38,11 @@ stdenv.mkDerivation rec { cp -v ${driverdb} drivedb.h ''; - configureFlags = [ "--with-scriptpath=${scriptPath}" ]; + configureFlags = [ + "--with-scriptpath=${scriptPath}" + # does not work on NixOS + "--without-update-smart-drivedb" + ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = lib.optionals stdenv.isDarwin [ IOKit ApplicationServices ]; diff --git a/nixpkgs/pkgs/tools/system/tuptime/default.nix b/nixpkgs/pkgs/tools/system/tuptime/default.nix index d93f1a346ca6..d92f65f78ae2 100644 --- a/nixpkgs/pkgs/tools/system/tuptime/default.nix +++ b/nixpkgs/pkgs/tools/system/tuptime/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tuptime"; - version = "5.2.2"; + version = "5.2.3"; src = fetchFromGitHub { owner = "rfmoz"; repo = "tuptime"; rev = version; - sha256 = "sha256-YrZP2sovAwwfDBoKoobgkf0+7RmYFUtrV9jfBmDsNL8="; + sha256 = "sha256-kR+Pi7/nsRzmmvibp95wjj8/B/Q6FCDSn2A7vJ3sM94="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock b/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock index dfb0d3ddab71..8ed4cdce974e 100644 --- a/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock +++ b/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock @@ -28,9 +28,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "cc" @@ -107,9 +107,9 @@ checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -127,9 +127,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.151" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" [[package]] name = "liboverdrop" @@ -142,9 +142,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] name = "log" @@ -259,11 +259,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.28" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", diff --git a/nixpkgs/pkgs/tools/text/autocorrect/Cargo.lock b/nixpkgs/pkgs/tools/text/autocorrect/Cargo.lock index 82fb056857c2..5e272adb048d 100644 --- a/nixpkgs/pkgs/tools/text/autocorrect/Cargo.lock +++ b/nixpkgs/pkgs/tools/text/autocorrect/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -34,9 +34,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6" dependencies = [ "anstyle", "anstyle-parse", @@ -48,36 +48,36 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -88,7 +88,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "autocorrect" -version = "2.8.5" +version = "2.9.0" dependencies = [ "autocorrect-derive 0.3.0", "criterion", @@ -109,9 +109,9 @@ dependencies = [ [[package]] name = "autocorrect" -version = "2.8.5" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2aa23c243abf88a533e514d8e5455e668daa3a8ca93061d8eb7f22014d7ad1a" +checksum = "b426e7dbc9997d772eeb5436cbb85e95136fdf7835a8f05085b811e5482ebd49" dependencies = [ "autocorrect-derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "diff", @@ -129,9 +129,9 @@ dependencies = [ [[package]] name = "autocorrect-cli" -version = "2.8.5" +version = "2.9.0" dependencies = [ - "autocorrect 2.8.5", + "autocorrect 2.9.0", "clap", "ignore", "lazy_static", @@ -166,17 +166,17 @@ dependencies = [ [[package]] name = "autocorrect-java" -version = "2.8.5" +version = "2.9.0" dependencies = [ - "autocorrect 2.8.5", + "autocorrect 2.9.0", "jni", ] [[package]] name = "autocorrect-node" -version = "2.8.5" +version = "2.9.0" dependencies = [ - "autocorrect 2.8.5", + "autocorrect 2.9.0", "autocorrect-cli", "napi", "napi-build", @@ -185,25 +185,25 @@ dependencies = [ [[package]] name = "autocorrect-py" -version = "2.8.5" +version = "2.9.0" dependencies = [ - "autocorrect 2.8.5", + "autocorrect 2.9.0", "pyo3", ] [[package]] name = "autocorrect-rb" -version = "2.8.5" +version = "2.9.0" dependencies = [ - "autocorrect 2.8.5 (registry+https://github.com/rust-lang/crates.io-index)", + "autocorrect 2.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "magnus", ] [[package]] name = "autocorrect-wasm" -version = "2.8.5" +version = "2.9.0" dependencies = [ - "autocorrect 2.8.5", + "autocorrect 2.9.0", "serde", "serde_json", "wasm-bindgen", @@ -226,17 +226,17 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "bindgen" -version = "0.66.1" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cexpr", "clang-sys", "lazy_static", @@ -247,7 +247,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.33", + "syn 2.0.40", ] [[package]] @@ -258,9 +258,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "block-buffer" @@ -273,9 +273,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -364,14 +364,14 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading", + "libloading 0.7.4", ] [[package]] name = "clap" -version = "4.4.3" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2" dependencies = [ "clap_builder", "clap_derive", @@ -379,9 +379,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb" dependencies = [ "anstream", "anstyle", @@ -391,21 +391,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.40", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "colorchoice" @@ -445,10 +445,26 @@ dependencies = [ ] [[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -499,16 +515,6 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-deque" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -553,12 +559,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f34ba9a9bcb8645379e9de8cb3ecfcf4d1c85ba66d90deb3259206fa5aa193b" +checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" dependencies = [ "quote", - "syn 2.0.33", + "syn 2.0.40", ] [[package]] @@ -606,48 +612,37 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", "redox_syscall", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -661,66 +656,54 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-io" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" - -[[package]] -name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.33", -] +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-core", "futures-io", - "futures-macro", "futures-task", "memchr", "pin-project-lite", @@ -739,10 +722,21 @@ dependencies = [ ] [[package]] +name = "getrandom" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -752,22 +746,22 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata", + "regex-syntax", ] [[package]] name = "h2" -version = "0.3.21" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -775,7 +769,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap", "slab", "tokio", "tokio-util", @@ -790,15 +784,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hashbrown" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -808,15 +796,15 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -825,9 +813,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -863,7 +851,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "tower-service", "tracing", @@ -872,9 +860,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http", @@ -886,9 +874,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ "unicode-bidi", "unicode-normalization", @@ -896,39 +884,28 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" +checksum = "747ad1b4ae841a78e8aba0d63adbfbeaea26b517b63705d47856b73015d27060" dependencies = [ + "crossbeam-deque", "globset", - "lazy_static", "log", "memchr", - "regex", + "regex-automata", "same-file", - "thread_local", "walkdir", "winapi-util", ] [[package]] name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown", ] [[package]] @@ -951,9 +928,9 @@ checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" @@ -977,9 +954,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jni" @@ -1003,9 +980,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "cee9c64da59eae3b50095c18d3e74f8b73c0b86d2792824ff01bbce68ba229ca" dependencies = [ "wasm-bindgen", ] @@ -1024,9 +1001,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.148" +version = "0.2.151" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" +checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4" [[package]] name = "libloading" @@ -1039,16 +1016,26 @@ dependencies = [ ] [[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + +[[package]] name = "linux-raw-sys" -version = "0.4.7" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1084,9 +1071,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.6.3" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -1129,9 +1116,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi", @@ -1140,11 +1127,11 @@ dependencies = [ [[package]] name = "napi" -version = "2.13.3" +version = "2.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd063c93b900149304e3ba96ce5bf210cd4f81ef5eb80ded0d100df3e85a3ac0" +checksum = "1133249c46e92da921bafc8aba4912bf84d6c475f7625183772ed2d0844dc3a7" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "ctor", "napi-derive", "napi-sys", @@ -1154,15 +1141,15 @@ dependencies = [ [[package]] name = "napi-build" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" +checksum = "d4b4532cf86bfef556348ac65e561e3123879f0e7566cca6d43a6ff5326f13df" [[package]] name = "napi-derive" -version = "2.13.0" +version = "2.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367" +checksum = "2b0c0743f6a3f29c20851b8377f01d485a837e2bfa57dd56d519ab7ed98ae2af" dependencies = [ "cfg-if", "convert_case", @@ -1174,9 +1161,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.52" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17" +checksum = "4869e4d80615fdab57dffe38c36a5bc62fae37352a00a35ee7aca1cea41b1bb3" dependencies = [ "convert_case", "once_cell", @@ -1189,11 +1176,11 @@ dependencies = [ [[package]] name = "napi-sys" -version = "2.2.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3" +checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" dependencies = [ - "libloading", + "libloading 0.8.1", ] [[package]] @@ -1208,9 +1195,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] @@ -1242,9 +1229,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -1270,9 +1257,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", @@ -1289,15 +1276,15 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.3" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33" +checksum = "ae9cee2a55a544be8b89dc6848072af97a20f2422603c10865be2a42b580fff5" dependencies = [ "memchr", "thiserror", @@ -1306,9 +1293,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.7.3" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a" +checksum = "81d78524685f5ef2a3b3bd1cafbc9fcabb036253d9b1463e726a91cd16e2dfc2" dependencies = [ "pest", "pest_generator", @@ -1316,22 +1303,22 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.7.3" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141" +checksum = "68bd1206e71118b5356dae5ddc61c8b11e28b09ef6a31acbd15ea48a28e0c227" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.40", ] [[package]] name = "pest_meta" -version = "2.7.3" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f" +checksum = "7c747191d4ad9e4a4ab9c8798f1e82a39affe7ef9648390b7e5548d18e099de6" dependencies = [ "once_cell", "pest", @@ -1390,9 +1377,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.67" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -1477,9 +1464,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ "either", "rayon-core", @@ -1487,30 +1474,28 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] name = "rb-sys" -version = "0.9.81" +version = "0.9.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a57240b308b155b09dce81e32829966a99f52d1088b45957e4283e526c5317a1" +checksum = "7e5b8d560b60790a3e60e56e73a8c7be88ac14e6af39fc82b5eca72c71753840" dependencies = [ "rb-sys-build", ] [[package]] name = "rb-sys-build" -version = "0.9.81" +version = "0.9.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f24ce877a4c5d07f06f6aa6fec3ac95e4b357b9f73b0f5445d8cbb7266d410e8" +checksum = "c2d2bfd00002007d7e9ad93d0397437933040caf452d260c26dbef5fd95ae1a6" dependencies = [ "bindgen", "lazy_static", @@ -1518,7 +1503,7 @@ dependencies = [ "quote", "regex", "shell-words", - "syn 2.0.33", + "syn 2.0.40", ] [[package]] @@ -1529,18 +1514,18 @@ checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb" [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.5" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", @@ -1550,9 +1535,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.8" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -1561,15 +1546,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ "base64", "bytes", @@ -1593,6 +1578,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-rustls", "tower-service", @@ -1606,17 +1592,16 @@ dependencies = [ [[package]] name = "ring" -version = "0.16.20" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", + "getrandom", "libc", - "once_cell", "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1633,22 +1618,22 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustix" -version = "0.38.13" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.21.7" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", "ring", @@ -1658,18 +1643,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ "base64", ] [[package]] name = "rustls-webpki" -version = "0.101.5" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a27e3b59326c16e23d30aeb7a36a24cc0d29e71d68ff611cdfb4a01d013bed" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ "ring", "untrusted", @@ -1677,9 +1662,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "same-file" @@ -1698,9 +1683,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ "ring", "untrusted", @@ -1728,35 +1713,35 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.40", ] [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ "itoa", "ryu", @@ -1765,13 +1750,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.40", ] [[package]] @@ -1788,11 +1773,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.0", + "indexmap", "itoa", "ryu", "serde", @@ -1801,9 +1786,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -1833,15 +1818,15 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -1849,9 +1834,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", "windows-sys 0.48.0", @@ -1859,9 +1844,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "strsim" @@ -1892,9 +1877,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.33" +version = "2.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" +checksum = "13fa70a4ee923979ffb522cacce59d34421ebdea5625e1073c4326ef9d2dd42e" dependencies = [ "proc-macro2", "quote", @@ -1902,6 +1887,27 @@ dependencies = [ ] [[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] name = "tar" version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1914,15 +1920,15 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand", @@ -1933,32 +1939,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.48" +version = "1.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", + "syn 2.0.40", ] [[package]] @@ -1997,9 +1993,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.32.0" +version = "1.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9" +checksum = "841d45b238a16291a4e1584e61820b8ae57d696cc5015c459c229ccc6990cc1c" dependencies = [ "backtrace", "bytes", @@ -2007,20 +2003,20 @@ dependencies = [ "mio", "num_cpus", "pin-project-lite", - "socket2 0.5.4", + "socket2 0.5.5", "tokio-macros", "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.40", ] [[package]] @@ -2035,9 +2031,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -2055,35 +2051,34 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-core", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "ucd-trie" @@ -2093,9 +2088,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "6f2528f27a9eb2b21e69c95319b30bd0efd85d09c379741b0f78ea1d86be2416" [[package]] name = "unicode-ident" @@ -2132,15 +2127,15 @@ checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", "idna", @@ -2186,9 +2181,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" dependencies = [ "cfg-if", "serde", @@ -2198,24 +2193,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.40", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "ac36a15a220124ac510204aec1c3e5db8a22ab06fd6706d881dc6149f8ed9a12" dependencies = [ "cfg-if", "js-sys", @@ -2225,9 +2220,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2235,28 +2230,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" dependencies = [ "proc-macro2", "quote", - "syn 2.0.33", + "syn 2.0.40", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "50c24a44ec86bb68fbecd1b3efed7e85ea5621b39b35ef2766b66cd984f8010f" dependencies = [ "js-sys", "wasm-bindgen", @@ -2264,9 +2259,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "winapi" @@ -2286,9 +2281,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -2318,6 +2313,15 @@ dependencies = [ ] [[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + +[[package]] name = "windows-targets" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2348,6 +2352,21 @@ dependencies = [ ] [[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + +[[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2360,6 +2379,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2372,6 +2397,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2384,6 +2415,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2396,6 +2433,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2408,6 +2451,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2420,6 +2469,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2432,6 +2487,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "winreg" version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2443,11 +2504,13 @@ dependencies = [ [[package]] name = "xattr" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" +checksum = "d367426ae76bdfce3d8eaea6e94422afd6def7d46f9c89e2980309115b3c2c41" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] diff --git a/nixpkgs/pkgs/tools/text/autocorrect/default.nix b/nixpkgs/pkgs/tools/text/autocorrect/default.nix index fa1214762b29..676eec70076c 100644 --- a/nixpkgs/pkgs/tools/text/autocorrect/default.nix +++ b/nixpkgs/pkgs/tools/text/autocorrect/default.nix @@ -1,14 +1,14 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "autocorrect"; - version = "2.8.5"; + version = "2.9.0"; src = fetchFromGitHub { owner = "huacnlee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j59yCGGV6yiT6o+VKM1FPh87T4QG0qAeKgcKIAqpx+8="; + sha256 = "sha256-NCDJoKOH4ZaXtGXZ7bgOXrjgrY8Edui+EOOI8/yfW08="; }; cargoLock = { @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cp ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; cargoBuildFlags = [ "-p" "autocorrect-cli" ]; cargoTestFlags = [ "-p" "autocorrect-cli" ]; diff --git a/nixpkgs/pkgs/tools/text/boxes/default.nix b/nixpkgs/pkgs/tools/text/boxes/default.nix index f39349b2fbf0..5340c5eccff9 100644 --- a/nixpkgs/pkgs/tools/text/boxes/default.nix +++ b/nixpkgs/pkgs/tools/text/boxes/default.nix @@ -34,11 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Command line ASCII boxes unlimited!"; - longDescription = '' - Boxes is a command line filter program that draws ASCII art boxes around - your input text. - ''; + description = "A command line program which draws, removes, and repairs ASCII art boxes"; homepage = "https://boxes.thomasjensen.com"; license = licenses.gpl2; maintainers = with maintainers; [ waiting-for-dev ]; diff --git a/nixpkgs/pkgs/tools/text/diffsitter/default.nix b/nixpkgs/pkgs/tools/text/diffsitter/default.nix index e46286bc0e81..e3c14df85407 100644 --- a/nixpkgs/pkgs/tools/text/diffsitter/default.nix +++ b/nixpkgs/pkgs/tools/text/diffsitter/default.nix @@ -32,17 +32,17 @@ let in rustPlatform.buildRustPackage rec { pname = "diffsitter"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "afnanenayet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8nKZ8zcZSSF7Qd36kA9IQjio+TIhlQWRgMqKrsdInj4="; + hash = "sha256-rB580TlM0/HXYgPvWtm7KMtXrw6i996HyvCrNr3QmNA="; fetchSubmodules = false; }; - cargoHash = "sha256-LEBAMb9tROpjrWEfucw+2ZaytnoyJE477IH3MyeUGEA="; + cargoHash = "sha256-8ajCXoB+mVhHrstVG+QkWYfXJqDk4+XPcO6yjR4TqpQ="; buildNoDefaultFeatures = true; buildFeatures = [ diff --git a/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock b/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock index e3a8902da002..3170c0454f42 100644 --- a/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock +++ b/nixpkgs/pkgs/tools/text/difftastic/Cargo.lock @@ -253,7 +253,7 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "difftastic" -version = "0.53.1" +version = "0.54.0" dependencies = [ "aho-corasick", "assert_cmd", @@ -266,7 +266,6 @@ dependencies = [ "hashbrown 0.12.3", "humansize", "ignore", - "is-terminal", "itertools 0.11.0", "lazy_static", "libc", diff --git a/nixpkgs/pkgs/tools/text/difftastic/default.nix b/nixpkgs/pkgs/tools/text/difftastic/default.nix index 317c79239009..c38edc9af64f 100644 --- a/nixpkgs/pkgs/tools/text/difftastic/default.nix +++ b/nixpkgs/pkgs/tools/text/difftastic/default.nix @@ -17,13 +17,13 @@ in rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.53.1"; + version = "0.54.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - hash = "sha256-D//LMfwk2n5jGOXhix2jZyoppYMxVkTkg4HuNHCtHNI="; + hash = "sha256-1QnDBRhJGzKKMmvnwVoi8rTd6acBFO0hITF9d1HkizM="; }; cargoLock = { diff --git a/nixpkgs/pkgs/tools/text/epub2txt2/default.nix b/nixpkgs/pkgs/tools/text/epub2txt2/default.nix index c8645fc5fe2a..80a3ebde7454 100644 --- a/nixpkgs/pkgs/tools/text/epub2txt2/default.nix +++ b/nixpkgs/pkgs/tools/text/epub2txt2/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "CC:=$(CC)" "PREFIX:=$(out)" ]; meta = { - description = "A simple command-line utility for Linux, for extracting text from EPUB documents."; + description = "A simple command-line utility for Linux, for extracting text from EPUB documents"; homepage = "https://github.com/kevinboone/epub2txt2"; license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; diff --git a/nixpkgs/pkgs/tools/text/l2md/default.nix b/nixpkgs/pkgs/tools/text/l2md/default.nix index 758130e9f0aa..08ec219690f6 100644 --- a/nixpkgs/pkgs/tools/text/l2md/default.nix +++ b/nixpkgs/pkgs/tools/text/l2md/default.nix @@ -1,12 +1,11 @@ -{ lib, stdenv, fetchgit, libgit2 }: +{ lib, stdenv, fetchzip, libgit2 }: stdenv.mkDerivation rec { pname = "l2md"; version = "unstable-2021-10-27"; - src = fetchgit { - url = "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git"; - rev = "9db252bc1716ebaf0abd3a47a59ea78e4e6253d6"; + src = fetchzip { + url = "https://git.kernel.org/pub/scm/linux/kernel/git/dborkman/l2md.git/snapshot/l2md-9db252bc1716ebaf0abd3a47a59ea78e4e6253d6.tar.gz"; sha256 = "sha256-H/leDUwQM55akyXsmTnI2YsnG4i1KQtf4bBt1fizy8E="; }; diff --git a/nixpkgs/pkgs/tools/text/mdbook-graphviz/default.nix b/nixpkgs/pkgs/tools/text/mdbook-graphviz/default.nix index cdba18e5b020..ddb4f48fd2f7 100644 --- a/nixpkgs/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/nixpkgs/pkgs/tools/text/mdbook-graphviz/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ graphviz ]; meta = with lib; { - description = "A preprocessor for mdbook, rendering Graphviz graphs to HTML at build time."; + description = "A preprocessor for mdbook, rendering Graphviz graphs to HTML at build time"; homepage = "https://github.com/dylanowen/mdbook-graphviz"; changelog = "https://github.com/dylanowen/mdbook-graphviz/releases/tag/v${version}"; license = [ licenses.mpl20 ]; diff --git a/nixpkgs/pkgs/tools/text/mdbook-i18n-helpers/default.nix b/nixpkgs/pkgs/tools/text/mdbook-i18n-helpers/default.nix index e3485f46295a..a0c80149d6af 100644 --- a/nixpkgs/pkgs/tools/text/mdbook-i18n-helpers/default.nix +++ b/nixpkgs/pkgs/tools/text/mdbook-i18n-helpers/default.nix @@ -5,16 +5,17 @@ rustPlatform.buildRustPackage rec { pname = "mdbook-i18n-helpers"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "google"; repo = "mdbook-i18n-helpers"; - rev = "refs/tags/${version}"; - hash = "sha256-TxSALv/uqRFdv4JZ8BCiAlirMcizGRkw0YxMCBVkgo4="; + # TODO fix once upstream uses semver for tags again + rev = "refs/tags/mdbook-i18n-helpers-${version}"; + hash = "sha256-oS1U76BgTW+YnhyLPRTlIg03RR9s5oybFIdCm3MVkvc="; }; - cargoHash = "sha256-BhaSK2A/z05a75dEx8c4RHKau1HRJabOcQ6/eLvcdio="; + cargoHash = "sha256-bDv6pJTFs6U5vnWy5vcLv28Mjf7zrepsfs+JCu00xkA="; meta = with lib; { description = "Helpers for a mdbook i18n workflow based on Gettext"; diff --git a/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix b/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix index 9469c63faefb..ec4223d27dd5 100644 --- a/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix +++ b/nixpkgs/pkgs/tools/text/mdbook-katex/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; meta = with lib; { - description = "A preprocessor for mdbook, rendering LaTeX equations to HTML at build time."; + description = "A preprocessor for mdbook, rendering LaTeX equations to HTML at build time"; homepage = "https://github.com/lzanini/${pname}"; license = [ licenses.mit ]; maintainers = with maintainers; [ lovesegfault ]; diff --git a/nixpkgs/pkgs/tools/text/mdbook-linkcheck/default.nix b/nixpkgs/pkgs/tools/text/mdbook-linkcheck/default.nix index 0d2533eba48d..c144ea4be954 100644 --- a/nixpkgs/pkgs/tools/text/mdbook-linkcheck/default.nix +++ b/nixpkgs/pkgs/tools/text/mdbook-linkcheck/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { passthru.tests.version = testers.testVersion { package = mdbook-linkcheck; }; meta = with lib; { - description = "A backend for `mdbook` which will check your links for you."; + description = "A backend for `mdbook` which will check your links for you"; homepage = "https://github.com/Michael-F-Bryan/mdbook-linkcheck"; license = licenses.mit; maintainers = with maintainers; [ zhaofengli ]; diff --git a/nixpkgs/pkgs/tools/text/mdbook/default.nix b/nixpkgs/pkgs/tools/text/mdbook/default.nix index 95483b8465ed..aacdf243f997 100644 --- a/nixpkgs/pkgs/tools/text/mdbook/default.nix +++ b/nixpkgs/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.4.35"; + version = "0.4.36"; src = fetchFromGitHub { owner = "rust-lang"; repo = "mdBook"; rev = "refs/tags/v${version}"; - sha256 = "sha256-oplR34M2PbcIwrfIkA4Ttk2zt3ve883TfXGIDnfJt/4="; + sha256 = "sha256-QQSGnOWRx5KK9eJP759E1V9zFVzvRol5bdJfD9mDr5g="; }; - cargoHash = "sha256-D0XhrweO0A1+81Je4JZ0lmnbIHstNvefpmogCyB4FEE="; + cargoHash = "sha256-IlD4YI7jsWZw0Dn1PoljmhuIOqejva8HMhU4ULy32yE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/text/mdcat/default.nix b/nixpkgs/pkgs/tools/text/mdcat/default.nix index fbab292263a1..6fa512c39bf3 100644 --- a/nixpkgs/pkgs/tools/text/mdcat/default.nix +++ b/nixpkgs/pkgs/tools/text/mdcat/default.nix @@ -13,20 +13,20 @@ rustPlatform.buildRustPackage rec { pname = "mdcat"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "swsnr"; repo = "mdcat"; rev = "mdcat-${version}"; - hash = "sha256-b/iLjqNcCUGaGllSXA5eq04mz/I8cbz0pXJ/Dn+yDDo="; + hash = "sha256-2ThjIv77kdjHyOpGcQplYZXPdu+cN4oBnyHRGptN7f4="; }; nativeBuildInputs = [ pkg-config asciidoctor installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-RGpqTVafG7YzeUwTj8uU0PsqX2bq3BVg/ci9MVyeH80="; + cargoHash = "sha256-y828L8HHkFeem/76yizQWX7DpCGQP+HzJP+pQnxAn70="; nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. @@ -56,6 +56,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "cat for markdown"; homepage = "https://github.com/swsnr/mdcat"; + changelog = "https://github.com/swsnr/mdcat/releases/tag/mdcat-${version}"; license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/nixpkgs/pkgs/tools/text/mecab/default.nix b/nixpkgs/pkgs/tools/text/mecab/default.nix index 8d11343515d0..f1f9fc6503c8 100644 --- a/nixpkgs/pkgs/tools/text/mecab/default.nix +++ b/nixpkgs/pkgs/tools/text/mecab/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation (finalAttrs: ((mecab-base finalAttrs) // { license = licenses.bsd3; platforms = platforms.unix; mainProgram = "mecab"; - maintainers = with maintainers; [ auntie paveloom ]; + maintainers = with maintainers; [ auntie ]; }; })) diff --git a/nixpkgs/pkgs/tools/text/qgrep/default.nix b/nixpkgs/pkgs/tools/text/qgrep/default.nix deleted file mode 100644 index 7db56539bf2e..000000000000 --- a/nixpkgs/pkgs/tools/text/qgrep/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, CoreServices, CoreFoundation, fetchpatch }: - -stdenv.mkDerivation rec { - version = "1.1"; - pname = "qgrep"; - - src = fetchFromGitHub { - owner = "zeux"; - repo = "qgrep"; - rev = "v${version}"; - sha256 = "046ccw34vz2k5jn6gyxign5gs2qi7i50jy9b74wqv7sjf5zayrh0"; - fetchSubmodules = true; - }; - - patches = lib.optionals stdenv.isDarwin [ - (fetchpatch { - url = "https://github.com/zeux/qgrep/commit/21c4d1a5ab0f0bdaa0b5ca993c1315c041418cc6.patch"; - sha256 = "0wpxzrd9pmhgbgby17vb8279xwvkxfdd99gvv7r74indgdxqg7v8"; - }) - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices CoreFoundation ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ - # Needed with GCC 12 but breaks on darwin (with clang) or older gcc - "-Wno-error=mismatched-new-delete" - ]); - - postPatch = lib.optionalString stdenv.isAarch64 '' - substituteInPlace Makefile \ - --replace "-msse2" "" --replace "-DUSE_SSE2" "" - ''; - - installPhase = '' - install -Dm755 qgrep $out/bin/qgrep - ''; - - meta = with lib; { - description = "Fast regular expression grep for source code with incremental index updates"; - homepage = "https://github.com/zeux/qgrep"; - license = licenses.mit; - maintainers = [ maintainers.yrashk ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/tools/text/ripgrep-all/Cargo.lock b/nixpkgs/pkgs/tools/text/ripgrep-all/Cargo.lock index 381a1e62b84e..aefe51f87f92 100644 --- a/nixpkgs/pkgs/tools/text/ripgrep-all/Cargo.lock +++ b/nixpkgs/pkgs/tools/text/ripgrep-all/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -19,31 +19,21 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -64,6 +54,18 @@ dependencies = [ ] [[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] name = "android_system_properties" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -83,58 +85,57 @@ dependencies = [ [[package]] name = "anstream" -version = "0.3.2" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.0" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.71" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" dependencies = [ "backtrace", ] @@ -158,12 +159,13 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.0" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0122885821398cc923ece939e24d1056a2384ee719432397fa9db87230ff11" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "brotli", "bzip2", + "deflate64", "flate2", "futures-core", "futures-io", @@ -171,19 +173,19 @@ dependencies = [ "pin-project-lite", "tokio", "xz2", - "zstd 0.12.3+zstd.1.5.2", - "zstd-safe 6.0.5+zstd.1.5.4", + "zstd 0.13.0", + "zstd-safe 7.0.0", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.48", ] [[package]] @@ -205,18 +207,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.48", ] [[package]] name = "async-trait" -version = "0.1.68" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.48", ] [[package]] @@ -253,20 +255,26 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.67" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] [[package]] +name = "base64" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + +[[package]] name = "bincode" version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -283,15 +291,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.3.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -300,9 +308,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -310,21 +318,21 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" -version = "0.6.3" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" +checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bzip2" @@ -349,11 +357,12 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -363,15 +372,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] +name = "charset" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18e9079d1a12a2cc2bffb5db039c43661836ead4082120d5844f02555aca2d46" +dependencies = [ + "base64", + "encoding_rs", +] + +[[package]] name = "chrono" -version = "0.4.24" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", - "num-integer", "num-traits", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -391,22 +410,21 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.0" +version = "4.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc" +checksum = "80932e03c33999b9235edb8655bc9df3204adc9887c2f95b50cb1deb9fd54253" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.3.0" +version = "4.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990" +checksum = "d6c0db58c659eef1c73e444d298c27322a1b52f6927d2ad470c0c0f96fa7b8fa" dependencies = [ "anstream", "anstyle", - "bitflags 1.3.2", "clap_lex", "strsim 0.10.0", "terminal_size", @@ -414,9 +432,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "colorchoice" @@ -432,9 +450,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "crc32fast" @@ -447,11 +465,10 @@ dependencies = [ [[package]] name = "crossbeam" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" dependencies = [ - "cfg-if", "crossbeam-channel", "crossbeam-deque", "crossbeam-epoch", @@ -461,76 +478,68 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.14" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.15" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "ctor" -version = "0.1.26" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +checksum = "30d2b3721e861707777e3195b0158f950ae6dc4a27e4d02ff9f67e3eb3de199e" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] -name = "ctor" -version = "0.2.0" +name = "data-encoding" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b" -dependencies = [ - "quote", - "syn 2.0.16", -] +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "deflate64" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61ceff48ed7e0e66d428a569d36485a091c39fe118ee1220217655f6b814fa9" [[package]] name = "derive_more" @@ -595,15 +604,15 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.11" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "encoding_rs" -version = "0.8.32" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" dependencies = [ "cfg-if", ] @@ -619,9 +628,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece" dependencies = [ "humantime", "is-terminal", @@ -631,31 +640,26 @@ dependencies = [ ] [[package]] -name = "errno" -version = "0.3.1" +name = "equivalent" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] -name = "errno-dragonfly" -version = "0.1.2" +name = "errno" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] name = "fallible-iterator" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" +checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fallible-streaming-iterator" @@ -665,23 +669,20 @@ checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" -version = "0.2.21" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cbc844cecaee9d4443931972e1289c8ff485cb4cc2767cb03ca139ed6885153" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -692,12 +693,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.26" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", - "miniz_oxide 0.7.1", + "miniz_oxide", ] [[package]] @@ -708,44 +709,44 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.48", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-macro", @@ -775,9 +776,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -786,9 +787,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.27.2" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -801,26 +802,24 @@ name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.6", -] [[package]] name = "hashbrown" -version = "0.13.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.3", + "ahash", + "allocator-api2", ] [[package]] name = "hashlink" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.13.2", + "hashbrown 0.14.3", ] [[package]] @@ -843,18 +842,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "humantime" @@ -864,16 +854,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.56" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -897,66 +887,55 @@ dependencies = [ ] [[package]] -name = "instant" -version = "0.1.12" +name = "indexmap" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ - "cfg-if", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.1", - "libc", - "windows-sys 0.48.0", + "equivalent", + "hashbrown 0.14.3", ] [[package]] name = "is-terminal" -version = "0.4.7" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", + "hermit-abi 0.3.3", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "itoa" -version = "1.0.6" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.63" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] [[package]] name = "json_comments" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ee439ee368ba4a77ac70d04f14015415af8600d6c894dc1f11bd79758c57d5" +checksum = "9dbbfed4e59ba9750e15ba154fdfd9329cee16ff3df539c2666b70f58cc32105" [[package]] name = "lazy_static" @@ -966,15 +945,26 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.144" +version = "0.2.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] [[package]] name = "libsqlite3-sys" -version = "0.26.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" +checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" dependencies = [ "cc", "pkg-config", @@ -983,15 +973,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -999,12 +989,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "lzma-sys" @@ -1018,19 +1005,27 @@ dependencies = [ ] [[package]] +name = "mailparse" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b56570f5f8c0047260d1c8b5b331f62eb9c660b9dd4071a8c46f8c7d3f280aa" +dependencies = [ + "charset", + "data-encoding", + "quoted_printable", +] + +[[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] -name = "memoffset" -version = "0.8.0" +name = "mime2ext" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] +checksum = "a1a85a5069ebd40e64b1985773cc81addbe9d90d7ecf60e7b5475a57ad584c70" [[package]] name = "minimal-lexical" @@ -1040,15 +1035,6 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "miniz_oxide" version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" @@ -1058,14 +1044,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.6" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", - "log", "wasi", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] @@ -1135,46 +1120,37 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] name = "num_cpus" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.3", "libc", ] [[package]] name = "object" -version = "0.30.3" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "output_vt100" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" -dependencies = [ - "winapi", -] +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" @@ -1188,22 +1164,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.7" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.4.1", "smallvec", - "windows-sys 0.45.0", + "windows-targets 0.48.5", ] [[package]] name = "paste" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" [[package]] name = "path-clean" @@ -1213,39 +1189,39 @@ checksum = "17359afc20d7ab31fdb42bb844c8b3bb1dabd7dcf7e68428492da7f16966fcef" [[package]] name = "petgraph" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd7d28ee937e54fe3080c91faa1c3a46c06de6252988a7f4592ba2310ef22a4" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 2.1.0", ] [[package]] name = "pin-project" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead" +checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07" +checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.48", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1255,9 +1231,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a" [[package]] name = "pretty-bytes" @@ -1271,13 +1247,11 @@ dependencies = [ [[package]] name = "pretty_assertions" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" +checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" dependencies = [ - "ctor 0.1.26", "diff", - "output_vt100", "yansi", ] @@ -1307,56 +1281,74 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.58" +version = "1.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa1fb82fc0c281dd9671101b66b771ebbe1eaf967b96ac8740dcba4b70005ca8" +checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.27" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] [[package]] +name = "quoted_printable" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3866219251662ec3b26fc217e3e05bf9c4f84325234dfb96bf0bf840889e49" + +[[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall 0.2.16", + "libredox", "thiserror", ] [[package]] name = "regex" -version = "1.8.2" +version = "1.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1a59b5d8e97dee33696bf13c5ba8ab85341c002922fba050069326b9c498974" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -1365,26 +1357,26 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "ripgrep_all" -version = "1.0.0-alpha.5" +version = "0.10.6" dependencies = [ "anyhow", - "async-compression 0.4.0", + "async-compression 0.4.5", "async-recursion", "async-stream", "async-trait", "async_zip", "bincode", "bytes", - "clap 4.3.0", + "clap 4.4.17", "crossbeam", "crossbeam-channel", - "ctor 0.2.0", + "ctor", "derive_more", "directories-next", "dyn-clonable", @@ -1396,7 +1388,9 @@ dependencies = [ "json_comments", "lazy_static", "log", + "mailparse", "memchr", + "mime2ext", "paste", "path-clean", "pretty-bytes", @@ -1420,11 +1414,11 @@ dependencies = [ [[package]] name = "rusqlite" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" +checksum = "a78046161564f5e7cd9008aff3b2990b3850dc8e0349119b98e8f251e099f24d" dependencies = [ - "bitflags 2.3.1", + "bitflags 2.4.1", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -1449,32 +1443,31 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.19" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "errno", - "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "ryu" -version = "1.0.13" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "schemars" -version = "0.8.12" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "dyn-clone", - "indexmap", + "indexmap 1.9.3", "schemars_derive", "serde", "serde_json", @@ -1482,9 +1475,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.12" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", @@ -1494,34 +1487,34 @@ dependencies = [ [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.17" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" [[package]] name = "serde" -version = "1.0.163" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" +checksum = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.163" +version = "1.0.195" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" +checksum = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.48", ] [[package]] @@ -1537,9 +1530,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.111" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "176e46fa42316f18edd598015a5166857fc835ec732f5215eac6b7bdbf0a84f4" dependencies = [ "itoa", "ryu", @@ -1567,27 +1560,27 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "2593d31f82ead8df961d8bd23a64c2ccf2eb5dd34b0a34bfb4dd54011c72009e" [[package]] name = "socket2" -version = "0.4.9" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9" dependencies = [ "libc", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1639,9 +1632,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.16" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -1650,31 +1643,31 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.5.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "rustix", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ "rustix", "windows-sys 0.48.0", @@ -1691,31 +1684,31 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.40" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.40" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.48", ] [[package]] name = "tokio" -version = "1.28.1" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ - "autocfg", + "backtrace", "bytes", "libc", "mio", @@ -1730,20 +1723,20 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.48", ] [[package]] name = "tokio-rusqlite" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aa66395f5ff117faee90c9458232c936405f9227ad902038000b74b3bc1feac" +checksum = "dc785c98d0c872455381e59be1f33a8f3a6b4e852544212e37601cc2ccb21d39" dependencies = [ "crossbeam-channel", "rusqlite", @@ -1765,12 +1758,12 @@ dependencies = [ [[package]] name = "tokio-tar" version = "0.3.1" -source = "git+https://github.com/vorot93/tokio-tar#3b753b6fc2304cdd38fad04002e41e29d4edce0a" +source = "git+https://github.com/vorot93/tokio-tar#87338a76092330bc6fe60de95d83eae5597332e1" dependencies = [ "filetime", "futures-core", "libc", - "redox_syscall 0.2.16", + "redox_syscall 0.3.5", "tokio", "tokio-stream", "xattr", @@ -1778,9 +1771,9 @@ dependencies = [ [[package]] name = "tokio-test" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53474327ae5e166530d17f2d956afcb4f8a004de581b3cae10f12006bc8163e3" +checksum = "e89b3cbabd3ae862100094ae433e1def582cf86451b4e9bf83aa7ac1d8a7d719" dependencies = [ "async-stream", "bytes", @@ -1791,16 +1784,16 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", "futures-io", "futures-sink", "futures-util", - "hashbrown 0.12.3", + "hashbrown 0.14.3", "pin-project-lite", "slab", "tokio", @@ -1809,20 +1802,19 @@ dependencies = [ [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if", "pin-project-lite", "tracing-core", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", ] @@ -1843,15 +1835,15 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-segmentation" @@ -1861,9 +1853,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "utf8parse" @@ -1897,9 +1889,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.86" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1907,24 +1899,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.86" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.86" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1932,22 +1924,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.86" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.16", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.86" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "winapi" @@ -1967,9 +1959,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -1981,153 +1973,155 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.52.0", ] [[package]] name = "windows-sys" -version = "0.45.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.42.2", + "windows-targets 0.48.5", ] [[package]] name = "windows-sys" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.48.0", + "windows-targets 0.52.0", ] [[package]] name = "windows-targets" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] name = "windows-targets" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" [[package]] name = "windows_aarch64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" [[package]] name = "windows_i686_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" [[package]] name = "windows_i686_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" [[package]] name = "windows_x86_64_gnu" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" [[package]] name = "windows_x86_64_msvc" -version = "0.42.2" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "xattr" -version = "0.2.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys", + "rustix", ] [[package]] @@ -2146,6 +2140,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" [[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] name = "zstd" version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2156,11 +2170,11 @@ dependencies = [ [[package]] name = "zstd" -version = "0.12.3+zstd.1.5.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" dependencies = [ - "zstd-safe 6.0.5+zstd.1.5.4", + "zstd-safe 7.0.0", ] [[package]] @@ -2175,21 +2189,19 @@ dependencies = [ [[package]] name = "zstd-safe" -version = "6.0.5+zstd.1.5.4" +version = "7.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56d9e60b4b1758206c238a10165fbcae3ca37b01744e394c463463f6529d23b" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix b/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix index d4144698c405..9844a72f9d52 100644 --- a/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix +++ b/nixpkgs/pkgs/tools/text/ripgrep-all/default.nix @@ -11,33 +11,44 @@ , zip }: -rustPlatform.buildRustPackage rec { +let + path = [ + ffmpeg + pandoc + poppler_utils + ripgrep + zip + ]; +in rustPlatform.buildRustPackage rec { pname = "ripgrep-all"; - version = "1.0.0-alpha.5"; + version = "0.10.6"; src = fetchFromGitHub { owner = "phiresky"; - repo = pname; + repo = "ripgrep-all"; rev = "v${version}"; - sha256 = "sha256-fpDYzn4oAz6GJQef520+Vi2xI09xFjpWdAlFIAVzcoA="; + hash = "sha256-ns7RL7kiG72r07LkF6RzShNg8M2SU6tU5+gXDxzUQHM="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "tokio-tar-0.3.1" = "sha256-gp4UM6YV7P9k1FZxt3eVjyC4cK1zvpMjM5CPt2oVBEA="; + "tokio-tar-0.3.1" = "sha256-oYXcZepnQyZ13zCvECwNqbXUnov3Y6uJlpkHz1zVpRo="; }; }; nativeBuildInputs = [ makeWrapper poppler_utils ]; buildInputs = lib.optional stdenv.isDarwin Security; + nativeCheckInputs = path; + postInstall = '' wrapProgram $out/bin/rga \ - --prefix PATH ":" "${lib.makeBinPath [ ffmpeg pandoc poppler_utils ripgrep zip ]}" + --prefix PATH ":" "${lib.makeBinPath path}" ''; meta = with lib; { + changelog = "https://github.com/phiresky/ripgrep-all/blob/${src.rev}/CHANGELOG.md"; description = "Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, and more"; longDescription = '' Ripgrep, but also search in PDFs, E-Books, Office documents, zip, tar.gz, etc. diff --git a/nixpkgs/pkgs/tools/text/ruby-zoom/default.nix b/nixpkgs/pkgs/tools/text/ruby-zoom/default.nix index 965d23d0c44b..06e505816648 100644 --- a/nixpkgs/pkgs/tools/text/ruby-zoom/default.nix +++ b/nixpkgs/pkgs/tools/text/ruby-zoom/default.nix @@ -9,7 +9,7 @@ bundlerEnv { passthru.updateScript = bundlerUpdateScript "ruby-zoom"; meta = with lib; { - description = "Quickly open CLI search results in your favorite editor!"; + description = "Quickly open CLI search results in your favorite editor"; homepage = "https://gitlab.com/mjwhitta/zoom"; license = with licenses; gpl3; maintainers = with maintainers; [ vmandela nicknovitski ]; diff --git a/nixpkgs/pkgs/tools/text/runiq/default.nix b/nixpkgs/pkgs/tools/text/runiq/default.nix index 7b1e99978a45..42b9e2aef395 100644 --- a/nixpkgs/pkgs/tools/text/runiq/default.nix +++ b/nixpkgs/pkgs/tools/text/runiq/default.nix @@ -1,15 +1,19 @@ -{ fetchCrate, lib, rustPlatform }: +{ lib, rustPlatform, fetchCrate, stdenv, darwin }: rustPlatform.buildRustPackage rec { pname = "runiq"; - version = "1.2.2"; + version = "2.0.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-WPQgTQICZ0DFr+7D99UGMx+I78376IC6iIJ3tCsj0Js="; + sha256 = "sha256-qcgPuJOpK2fCsHAgzoIKF7upb9B3ySIZkpu9xf4JnCc="; }; - cargoSha256 = "sha256-QKtrd690eoPXyd5CQg5/yAiTDk297y60XaUdoeFAe0c="; + cargoHash = "sha256-WSMV0GNKNckN9uSPN647iDloGkNtaKcrZbeyglUappc="; + + buildInputs = lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Security + ]; meta = with lib; { description = "An efficient way to filter duplicate lines from input, à la uniq"; diff --git a/nixpkgs/pkgs/tools/text/sift/default.nix b/nixpkgs/pkgs/tools/text/sift/default.nix index 1e79570622c0..25dd61a3e4a0 100644 --- a/nixpkgs/pkgs/tools/text/sift/default.nix +++ b/nixpkgs/pkgs/tools/text/sift/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { meta = with lib; { description = "A fast and powerful alternative to grep"; homepage = "https://sift-tool.org"; - maintainers = with maintainers; [ carlsverre viraptor ]; + maintainers = with maintainers; [ viraptor ]; license = licenses.gpl3; }; } diff --git a/nixpkgs/pkgs/tools/text/to-html/default.nix b/nixpkgs/pkgs/tools/text/to-html/default.nix index 0b49fd8be2b1..9e176a5ad19c 100644 --- a/nixpkgs/pkgs/tools/text/to-html/default.nix +++ b/nixpkgs/pkgs/tools/text/to-html/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = { - description = "Terminal wrapper for rendering a terminal on a website by converting ANSI escape sequences to HTML."; + description = "Terminal wrapper for rendering a terminal on a website by converting ANSI escape sequences to HTML"; homepage = "https://github.com/Aloso/to-html"; changelog = "https://github.com/Aloso/to-html/blob/${src.rev}/CHANGELOG.md"; license = lib.licenses.mit; diff --git a/nixpkgs/pkgs/tools/text/transifex-client/default.nix b/nixpkgs/pkgs/tools/text/transifex-client/default.nix deleted file mode 100644 index 07a49c3d4505..000000000000 --- a/nixpkgs/pkgs/tools/text/transifex-client/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ lib -, buildPythonApplication -, fetchPypi -, python-slugify -, requests -, urllib3 -, six -, setuptools -, gitpython -, pythonRelaxDepsHook -}: - -buildPythonApplication rec { - pname = "transifex-client"; - version = "0.14.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "11dc95cefe90ebf0cef3749c8c7d85b9d389c05bd0e3389bf117685df562bd5c"; - }; - - # https://github.com/transifex/transifex-client/issues/323 - nativeBuildInputs = [ - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "python-slugify" - ]; - - propagatedBuildInputs = [ - gitpython - python-slugify - requests - setuptools - six - urllib3 - ]; - - # Requires external resources - doCheck = false; - - meta = with lib; { - description = "Transifex translation service client"; - homepage = "https://www.transifex.com/"; - license = licenses.gpl2Only; - maintainers = with maintainers; [ sikmir ]; - }; -} diff --git a/nixpkgs/pkgs/tools/text/vale/default.nix b/nixpkgs/pkgs/tools/text/vale/default.nix index b001a7fd6c3d..0622e4b5a07a 100644 --- a/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.30.0"; + version = "3.0.5"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-XTbm1wWm8+nBDN2G1Bm+FUFDV/21deGptMN5XrckMHA="; + hash = "sha256-tRsfmQ3FkRQgIg3lD8xjbn1iV2QcwDdW5pmKh96+2Gs="; }; - vendorHash = "sha256-FnzuumOIvjpoDr+yBaRc8UjMDNW8mgrJiz1ZyzNW0Ts="; + vendorHash = "sha256-AsBbJJQs+pU2UNfEFvNnPwaaabTrXvFBQLcriIA2ST4="; postInstall = '' mkdir -p $data/share/vale diff --git a/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix b/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix index 111e95c9508d..b5eb08199fc6 100644 --- a/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , autoreconfHook , pkg-config , libxml2 @@ -20,8 +21,11 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 libxslt ]; patches = [ - # Fixes an incompatible function pointer error with clang 16. - ./fix-incompatible-function-pointer.patch + (fetchpatch { + name = "0001-Fix-build-with-libxml2-2.12.patch"; + url = "https://sourceforge.net/p/xmlstar/patches/_discuss/thread/890e29655a/66ca/attachment/0001-Fix-build-with-libxml2-2.12.patch"; + hash = "sha256-XEk7aFOdrzdec1j2ffERJQbLH0AUNJA52QwA9jf4XWA="; + }) ]; preConfigure = '' diff --git a/nixpkgs/pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch b/nixpkgs/pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch deleted file mode 100644 index a0818731c217..000000000000 --- a/nixpkgs/pkgs/tools/text/xml/xmlstarlet/fix-incompatible-function-pointer.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/xml_elem.c 2012-08-12 09:18:59.000000000 -0600 -+++ b/src/xml_elem.c 2023-07-11 13:17:14.220809280 -0600 -@@ -186,7 +186,7 @@ - * put @name into @data->array[@data->offset] - */ - static void --hash_key_put(void *payload, void *data, xmlChar *name) -+hash_key_put(void *payload, void *data, const xmlChar *name) - { - ArrayDest *dest = data; - dest->array[dest->offset++] = name; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/advi/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/advi/default.nix index 3b6b2eb3048a..ff20a10c5cf4 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/advi/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/advi/default.nix @@ -64,7 +64,7 @@ ocamlPackages.buildDunePackage rec { meta = with lib; { homepage = "http://advi.inria.fr/"; - description = "Active-DVI is a Unix-platform DVI previewer and a programmable presenter for slides written in LaTeX."; + description = "A Unix-platform DVI previewer and a programmable presenter for slides written in LaTeX"; license = licenses.lgpl21Only; maintainers = [ maintainers.xworld21 ]; }; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix index 2d7f859c809c..f1816efb0cf9 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -323,6 +323,15 @@ dvisvgm = stdenv.mkDerivation { extraPrefix = "texk/dvisvgm/dvisvgm-src/"; hash = "sha256-CBCbc/woaFeLw7aBG/kSVYc3a5Q56zbAB64kK6mRy4g="; }) + + (fetchpatch { + name = "gcc-13.patch"; + url = "https://github.com/mgieseki/dvisvgm/commit/d5df85b403602c927fe56a1f692af91182a1facd.patch"; + stripLen = 1; + extraPrefix = "texk/dvisvgm/dvisvgm-src/"; + hash = "sha256-U5m9jPmfAXOQKaU+aO/h6hEAzHRPqKcdj5k8f5gU9JQ="; + excludes = [ "texk/dvisvgm/dvisvgm-src/src/ttf/TTFTable.hpp" ]; + }) ]; preConfigure = "cd texk/dvisvgm"; diff --git a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix index 1a497c6affaa..a9d6e717318f 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/texlive/default.nix @@ -2,7 +2,10 @@ - source: ../../../../../doc/languages-frameworks/texlive.xml - current html: https://nixos.org/nixpkgs/manual/#sec-language-texlive */ -{ stdenv, lib, fetchurl, runCommand, writeShellScript, writeText, buildEnv +{ lib +#, stdenv +, gcc12Stdenv +, fetchurl, runCommand, writeShellScript, writeText, buildEnv , callPackage, ghostscript_headless, harfbuzz , makeWrapper, installShellFiles , python3, ruby, perl, tk, jdk, bash, snobol4 @@ -11,6 +14,7 @@ , useFixedHashes ? true , recurseIntoAttrs }: +let stdenv = gcc12Stdenv; in let # various binaries (compiled) bin = callPackage ./bin.nix { diff --git a/nixpkgs/pkgs/tools/typesetting/typst-live/default.nix b/nixpkgs/pkgs/tools/typesetting/typst-live/default.nix index bb705c5ce96a..8968adbb5e1b 100644 --- a/nixpkgs/pkgs/tools/typesetting/typst-live/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/typst-live/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "typst-live"; - version = "0.6.0"; + version = "0.7.0"; src = fetchCrate { inherit pname version; - hash = "sha256-8YndEqhIESC3Cbe4klQfkVqesNFeZ2g1oRd1VoVrMnE="; + hash = "sha256-9GhrWhT0mYU2OOeoHGd5XY7BKO/S7cKTnURXi9dF+IU="; }; - cargoHash = "sha256-62tBefXek6W01RfdPczXBuYhrLK+wG1YQ7va7FQmAhA="; + cargoHash = "sha256-KGwmTXkY2nv5oWwjs5ZLz6u3bJ7YWJQPqOqJJNxKDkM="; nativeBuildInputs = [ makeWrapper diff --git a/nixpkgs/pkgs/tools/video/svt-av1/default.nix b/nixpkgs/pkgs/tools/video/svt-av1/default.nix index 40869c0f8f4e..d40047510f40 100644 --- a/nixpkgs/pkgs/tools/video/svt-av1/default.nix +++ b/nixpkgs/pkgs/tools/video/svt-av1/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "svt-av1"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-WKc0DNwpA9smMS3e/GDkk77FUkohwaPMgcXgji14CIw="; + hash = "sha256-JV65VuEPJBrADsGviBnE6EgZmbqJ4Z4qli6cAfUMmkw="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/virtualization/dockstarter/default.nix b/nixpkgs/pkgs/tools/virtualization/dockstarter/default.nix index 321722d753a3..40c6858da6a8 100644 --- a/nixpkgs/pkgs/tools/virtualization/dockstarter/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/dockstarter/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "DockSTARTer helps you get started with running apps in Docker."; + description = "Make it quick and easy to get up and running with Docker"; homepage = "https://dockstarter.com"; license = licenses.mit; maintainers = with maintainers; [ urandom ]; diff --git a/nixpkgs/pkgs/tools/virtualization/guestfs-tools/default.nix b/nixpkgs/pkgs/tools/virtualization/guestfs-tools/default.nix index 2b7cfb79d870..e78bd106993d 100644 --- a/nixpkgs/pkgs/tools/virtualization/guestfs-tools/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/guestfs-tools/default.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { description = "Extra tools for accessing and modifying virtual machine disk images"; license = with licenses; [ gpl2Plus lgpl21Plus ]; homepage = "https://libguestfs.org/"; - maintainers = with maintainers; [ thiagokokada ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix b/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix index 67027dc4bd28..519ffa83e660 100644 --- a/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - sha256 = "sha256-dW2rHW/37Jpk3vuu3O87nynK8Mp0IAqpkRvBDxT/++I="; + hash = "sha256-4r85RDfndLUjpAmipe3oLFcGzD4GRfPgf7wku2unoes="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix b/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix index bb823b516977..cf3a934b0bef 100644 --- a/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix @@ -10,6 +10,9 @@ , gnutar , util-linux , cpio +, bash +, coreutils +, btrfs-progs # Python packages , setuptools @@ -55,7 +58,7 @@ let in buildPythonApplication rec { pname = "mkosi"; - version = "19"; + version = "20.1"; format = "pyproject"; outputs = [ "out" "man" ]; @@ -64,7 +67,7 @@ buildPythonApplication rec { owner = "systemd"; repo = "mkosi"; rev = "v${version}"; - hash = "sha256-KjJM+KZCgUnsaEN2ZorhH0AR5nmiV2h3i7Vb3KdGFtI="; + hash = "sha256-gkn5d9ybfrV/QYKSUyzyHAouU++NCEBDT22zFMrEZt8="; }; # Fix ctypes finding library @@ -88,7 +91,10 @@ buildPythonApplication rec { ]; propagatedBuildInputs = [ + bash + btrfs-progs bubblewrap + coreutils cpio gnutar kmod diff --git a/nixpkgs/pkgs/tools/virtualization/multipass/default.nix b/nixpkgs/pkgs/tools/virtualization/multipass/default.nix index 8be9488c46e5..4d1bf855ad6f 100644 --- a/nixpkgs/pkgs/tools/virtualization/multipass/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/multipass/default.nix @@ -16,16 +16,16 @@ , qemu , qemu-utils , qtbase -, qtx11extras +, qtwayland +, wrapQtAppsHook , slang , stdenv -, wrapQtAppsHook , xterm }: let pname = "multipass"; - version = "1.12.2"; + version = "1.13.0"; # This is done here because a CMakeLists.txt from one of it's submodules tries # to modify a file, so we grab the source for the submodule here, copy it into @@ -46,7 +46,7 @@ stdenv.mkDerivation owner = "canonical"; repo = "multipass"; rev = "refs/tags/v${version}"; - hash = "sha256-1k0jbYMwfYuHmM/Cm76sbo3+mN6WypALMQBwlZ+9d+c="; + hash = "sha256-DMyIvhlkMuUyOlUw8b4312NUtpK0n8rI8nhoV6Dscyo="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' @@ -104,7 +104,7 @@ stdenv.mkDerivation libxml2 openssl qtbase - qtx11extras + qtwayland ]; nativeBuildInputs = [ @@ -134,7 +134,7 @@ stdenv.mkDerivation }; meta = with lib; { - description = "Ubuntu VMs on demand for any workstation."; + description = "Ubuntu VMs on demand for any workstation"; homepage = "https://multipass.run"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jnsgruk ]; diff --git a/nixpkgs/pkgs/tools/wayland/proycon-wayout/default.nix b/nixpkgs/pkgs/tools/wayland/proycon-wayout/default.nix index 7b0aa87694d1..d19ea6894546 100644 --- a/nixpkgs/pkgs/tools/wayland/proycon-wayout/default.nix +++ b/nixpkgs/pkgs/tools/wayland/proycon-wayout/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ wayland-protocols wayland cairo pango ]; meta = with lib; { - description = "Takes text from standard input and outputs it to a desktop-widget on Wayland desktops."; + description = "Takes text from standard input and outputs it to a desktop-widget on Wayland desktops"; homepage = "https://git.sr.ht/~proycon/wayout"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/wayland/swww/default.nix b/nixpkgs/pkgs/tools/wayland/swww/default.nix index d97c8ea28df8..9973e6b2fb69 100644 --- a/nixpkgs/pkgs/tools/wayland/swww/default.nix +++ b/nixpkgs/pkgs/tools/wayland/swww/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "swww"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { - owner = "Horus645"; + owner = "LGFae"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-9c/qBmk//NpfvPYjK2QscubFneiQYBU/7PLtTvVRmTA="; + hash = "sha256-n7YdUmIZGu7W7cX6OvVW+wbkKjFvont4hEAhZXYDQd8="; }; - cargoSha256 = "sha256-AE9bQtW5r1cjIsXA7YEP8TR94wBjaM7emOroVFq9ldE="; + cargoSha256 = "sha256-lZC71M3lbsI+itMydAp5VCz0cpSHo/FpkQFC1NlN4DU="; buildInputs = [ lz4 @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Efficient animated wallpaper daemon for wayland, controlled at runtime"; - homepage = "https://github.com/Horus645/swww"; + homepage = "https://github.com/LGFae/swww"; license = licenses.gpl3; maintainers = with maintainers; [ mateodd25 donovanglover ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/tools/wayland/wl-clip-persist/default.nix b/nixpkgs/pkgs/tools/wayland/wl-clip-persist/default.nix index 0828a34be840..2cfe8cc01743 100644 --- a/nixpkgs/pkgs/tools/wayland/wl-clip-persist/default.nix +++ b/nixpkgs/pkgs/tools/wayland/wl-clip-persist/default.nix @@ -35,6 +35,6 @@ rustPlatform.buildRustPackage { inherit (wayland.meta) platforms; license = licenses.mit; mainProgram = "wl-clip-persist"; - maintainers = with maintainers; [ thiagokokada ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix b/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix index 41a1d2786575..0e51bf0093d8 100644 --- a/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix +++ b/nixpkgs/pkgs/tools/wayland/wlr-randr/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "wlr-randr"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromSourcehut { owner = "~emersion"; repo = pname; rev = "v${version}"; - hash = "sha256-u5fsM+DCefPTXEg+ByTs0wyOlEfCj5OUeJydX6RRvo4="; + hash = "sha256-Pr9XEQUtbG3Mo/QjFMoY+oJTQIAVW+aaEjYHZqJgbbg="; }; strictDeps = true; |