diff --git a/pkgs/applications/editors/your-editor/default.nix b/pkgs/applications/editors/your-editor/default.nix index b5e524ea529e..c54911041069 100644 --- a/pkgs/applications/editors/your-editor/default.nix +++ b/pkgs/applications/editors/your-editor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "your-editor"; - version = "1504"; + version = "1505"; src = fetchFromGitHub { owner = "your-editor"; repo = "yed"; rev = version; - sha256 = "sha256-EUDkuCMhBz/Gs4DW3V6fqU583MzqXy1r08WDnUN76cw="; + sha256 = "sha256-4HPrBr1M8J484qu1cXpZyVdLu3+/IYoNnNV9vSd4SlY="; }; installPhase = '' diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c17c6f81438d..34662144b184 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -73,13 +73,13 @@ "vendorHash": "sha256-DqAHkNxfI1txtW9PadHzgWuRCiuV/CVqq/qba+e0O7M=" }, "argocd": { - "hash": "sha256-FDI/kmgTWVhxJcy3ss8VABntOXJAIDIcz4cB6WtJd2Y=", + "hash": "sha256-nxNZ0W8tcnnUhqf2S8tM6CvupYS4ALamYg3zYZQScA8=", "homepage": "https://registry.terraform.io/providers/oboukili/argocd", "owner": "oboukili", "repo": "terraform-provider-argocd", - "rev": "v4.3.0", + "rev": "v5.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-99PwwxVHfRGC0QCQGhifRzqWFOHZ1R7Ge2ou7OjiggQ=" + "vendorHash": "sha256-KgEX0h+WgcVjMMgNb5QJJNQjqAxQ8ATolVXZBro+adQ=" }, "auth0": { "hash": "sha256-y2pjk+rSLAM7H4XjwvwZSNFW4+9EhN3fb01cml6RTb0=", @@ -901,13 +901,13 @@ "vendorHash": "sha256-sV6JPKzpA1+uoUBmdWpUSk70cl9ofQqr7USbK+4RVDs=" }, "postgresql": { - "hash": "sha256-6QqXp0riYy6pJPmESrUv3J9BDY9Sl44/U2sIB663Gfw=", + "hash": "sha256-VQu0NrBbBx951V+H10Q1/pmYjtwg2vuFW25mNXZ3NoI=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", - "rev": "v1.18.0", + "rev": "v1.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-o2+Uuz0dStf33WZuTFLkJX5rg4G7sJ23/+q+xtQ4mhE=" + "vendorHash": "sha256-JsKxNS2JlYIfTsiV/2WVB51i2OuZI1PNZDrxOuloaX0=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index e594e7d4ec35..e8e2beb8e497 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.207"; + version = "1.2.212"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-qAptDffM4ZufEPmrhxlGgMyNoih7JYptUVnPfyXy7ok="; + hash = "sha256-P1cmimlSOHtBXOYW3uYbAQ6Jfh7huk121Jdz/5zp8PY="; }; - vendorHash = "sha256-QQ0CjyBz1gY6o2I45DA9iD7rrJGVTvWvl4u8ZHuHNeg="; + vendorHash = "sha256-YGC6+pJyohwiM8Bg+C5GrhaqsZeKE+gHOI21ot3xj14="; proxyVendor = true; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix index d3fc0e15bda0..b58d702b2dd6 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "obs-pipewire-audio-capture"; - version = "1.0.5"; + version = "1.1.0"; src = fetchFromGitHub { owner = "dimtpap"; repo = pname; rev = "${version}"; - sha256 = "sha256-AXqBdwu5ayzQPIVOhqspDHnQo422y3WGA+kmW1DzoL0="; + sha256 = "sha256-gcOH8gJuP03MxhJbgl941yTtm2XIHmqHWVwkRCVATkQ="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; diff --git a/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix b/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix new file mode 100644 index 000000000000..85e78f86cc3b --- /dev/null +++ b/pkgs/development/interpreters/bqn/cbqn/cbqn-bytecode.nix @@ -0,0 +1,35 @@ +{ lib +, fetchFromGitHub +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation { + pname = "cbqn-bytecode"; + version = "unstable-2023-01-27"; + + src = fetchFromGitHub { + owner = "dzaima"; + repo = "cbqnBytecode"; + rev = "b2f47806ea770451d06d04e20177baeaec92e6dd"; + hash = "sha256-dukpEB5qg6jF4AIHKK+atTvCKZTVtJ1M/nw7+SNp250="; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -D $src/gen/{compiles,explain,formatter,runtime0,runtime1,src} -t $out/dev + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/dzaima/cbqnBytecode"; + description = "CBQN precompiled bytecode"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/interpreters/bqn/cbqn/default.nix b/pkgs/development/interpreters/bqn/cbqn/default.nix index bd07f3ca7ede..632aa8ca1e48 100644 --- a/pkgs/development/interpreters/bqn/cbqn/default.nix +++ b/pkgs/development/interpreters/bqn/cbqn/default.nix @@ -1,10 +1,13 @@ -{ lib +{ callPackage +, lib , stdenv +, stdenvNoCC , fetchFromGitHub , genBytecode ? false , bqn-path ? null , mbqn-source ? null , enableReplxx ? false +, enableSingeli ? stdenv.hostPlatform.avx2Support # No support for macOS' .dylib on the CBQN side , enableLibcbqn ? stdenv.hostPlatform.isLinux , libffi @@ -12,33 +15,22 @@ }: let - # TODO: these submodules should be separated libraries - cbqn-bytecode-files = fetchFromGitHub { - name = "cbqn-bytecode-files"; - owner = "dzaima"; - repo = "CBQN"; - rev = "3df8ae563a626ff7ae0683643092f0c3bc2481e5"; - hash = "sha256:0rh9qp1bdm9aa77l0kn9n4jdy08gl6l7898lncskxiq9id6xvyb8"; - }; - replxx-submodule = fetchFromGitHub { - name = "replxx-submodule"; - owner = "dzaima"; - repo = "replxx"; - rev = "ba94c293caad52486df8712e808783df9a8f4501"; - hash = "sha256-pMLvURksj/5k5b6BTwWxjomoROMOE5+GRjyaoqu/iYE="; - }; + cbqn-bytecode-submodule = + callPackage ./cbqn-bytecode.nix { inherit lib fetchFromGitHub stdenvNoCC; }; + replxx-submodule = callPackage ./replxx.nix { inherit lib fetchFromGitHub stdenvNoCC; }; + singeli-submodule = callPackage ./singeli.nix { inherit lib fetchFromGitHub stdenvNoCC; }; in assert genBytecode -> ((bqn-path != null) && (mbqn-source != null)); stdenv.mkDerivation rec { pname = "cbqn" + lib.optionalString (!genBytecode) "-standalone"; - version = "0.pre+date=2022-11-27"; + version = "unstable-2023-02-01"; src = fetchFromGitHub { owner = "dzaima"; repo = "CBQN"; - rev = "49c0d9a355698f54fff2c0caa177e2b341fabb45"; - hash = "sha256-jm2ZzFxhr9o4nFR2rjYJz/4GH+WFnfU4QDovrOPI3jQ="; + rev = "05c1270344908e98c9f2d06b3671c3646f8634c3"; + hash = "sha256-wKeyYWMgTZPr+Ienz3xnsXeD67vwdK4sXbQlW+GpQho="; }; nativeBuildInputs = [ @@ -62,7 +54,7 @@ stdenv.mkDerivation rec { buildFlags = [ # interpreter binary - "o3" + (lib.flatten (if enableSingeli then ["o3n-singeli" "f='-mavx2'"] else ["o3"])) ] ++ lib.optionals enableLibcbqn [ # embeddable interpreter as a shared lib "shared-o3" @@ -74,11 +66,14 @@ stdenv.mkDerivation rec { '' + (if genBytecode then '' ${bqn-path} ./build/genRuntime ${mbqn-source} build/bytecodeLocal/ '' else '' - cp ${cbqn-bytecode-files}/src/gen/{compiles,explain,formatter,runtime0,runtime1,src} build/bytecodeLocal/gen/ + cp -r ${cbqn-bytecode-submodule}/dev/* build/bytecodeLocal/gen/ '') + lib.optionalString enableReplxx '' - cp -r ${replxx-submodule} build/replxxLocal/ - ''; + cp -r ${replxx-submodule}/dev/* build/replxxLocal/ + '' + + lib.optionalString enableSingeli '' + cp -r ${singeli-submodule}/dev/* build/singeliLocal/ + ''; outputs = [ "out" @@ -88,20 +83,20 @@ stdenv.mkDerivation rec { ]; installPhase = '' - runHook preInstall + runHook preInstall - mkdir -p $out/bin/ - cp BQN -t $out/bin/ - # note guard condition for case-insensitive filesystems - [ -e $out/bin/bqn ] || ln -s $out/bin/BQN $out/bin/bqn - [ -e $out/bin/cbqn ] || ln -s $out/bin/BQN $out/bin/cbqn + mkdir -p $out/bin/ + cp BQN -t $out/bin/ + # note guard condition for case-insensitive filesystems + [ -e $out/bin/bqn ] || ln -s $out/bin/BQN $out/bin/bqn + [ -e $out/bin/cbqn ] || ln -s $out/bin/BQN $out/bin/cbqn '' + lib.optionalString enableLibcbqn '' - install -Dm644 include/bqnffi.h -t "$dev/include" - install -Dm755 libcbqn${stdenv.hostPlatform.extensions.sharedLibrary} -t "$lib/lib" + install -Dm644 include/bqnffi.h -t "$dev/include" + install -Dm755 libcbqn${stdenv.hostPlatform.extensions.sharedLibrary} -t "$lib/lib" '' + '' - runHook postInstall + runHook postInstall ''; meta = with lib; { @@ -112,5 +107,4 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } -# TODO: version cbqn-bytecode-files # TODO: test suite diff --git a/pkgs/development/interpreters/bqn/cbqn/replxx.nix b/pkgs/development/interpreters/bqn/cbqn/replxx.nix new file mode 100644 index 000000000000..afe6cef2aed3 --- /dev/null +++ b/pkgs/development/interpreters/bqn/cbqn/replxx.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation { + pname = "replxx"; + version = "unstable-2023-01-21"; + + src = fetchFromGitHub { + owner = "dzaima"; + repo = "replxx"; + rev = "eb6bcecff4ca6051120c99e9dd64c3bd20fcc42f"; + hash = "sha256-cb486FGF+4sUxgBbRfnbTTnZn2WQ3p93fSwDRCEtFJg="; + }; + + dontConfigure = true; + # The CBQN derivation will build replxx, here we just provide the source files. + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/dev + cp -r $src $out/dev + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/dzaima/replxx"; + description = "A replxx fork for CBQN"; + license = licenses.free; + maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/interpreters/bqn/cbqn/singeli.nix b/pkgs/development/interpreters/bqn/cbqn/singeli.nix new file mode 100644 index 000000000000..3dfade53dfc2 --- /dev/null +++ b/pkgs/development/interpreters/bqn/cbqn/singeli.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, stdenvNoCC +}: + +stdenvNoCC.mkDerivation { + pname = "singeli"; + version = "unstable-2023-01-23"; + + src = fetchFromGitHub { + owner = "mlochbaum"; + repo = "Singeli"; + rev = "0bc519ccbbe4051204d40bfc861a5bed7132e95f"; + hash = "sha256-zo4yr9t3hp6BOX1ac3md6R/O+hl5MphZdCmI8nNP9Yc="; + }; + + dontConfigure = true; + # The CBQN derivation will build Singeli, here we just provide the source files. + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/dev + cp -r $src $out/dev + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/mlochbaum/Singeli"; + description = "A metaprogramming DSL for SIMD"; + license = licenses.isc; + maintainers = with maintainers; [ AndersonTorres sternenseemann synthetica shnarazk ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index db3c6f92a8ed..b9388663ca36 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "sha256-u/K1R0ILoDvHvHb0QzGB4YHlIf70jVeVEmrquv2U0S8="; + sha256 = "sha256-F4q8cHM1CLp9FLZTo6WmxEiK2sqmAx3LOHevNXn2kOw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 23bbd84a2096..faa6fde2a7e8 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, gmp }: +{ lib, gccStdenv, fetchurl, gmp }: -stdenv.mkDerivation rec { +gccStdenv.mkDerivation rec { pname = "cln"; version = "1.3.6"; diff --git a/pkgs/development/libraries/llhttp/default.nix b/pkgs/development/libraries/llhttp/default.nix new file mode 100644 index 000000000000..90f274c9e560 --- /dev/null +++ b/pkgs/development/libraries/llhttp/default.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "llhttp"; + version = "8.1.0"; + + src = fetchFromGitHub { + owner = "nodejs"; + repo = "llhttp"; + rev = "release/v${version}"; + hash = "sha256-pBGjcT5MiCSJI12TiH1XH5eAzIeylCdP/82L3o38BJo="; + }; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DBUILD_STATIC_LIBS=ON" + ]; + + meta = with lib; { + description = "Port of http_parser to llparse"; + homepage = "https://llhttp.org/"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/python-modules/aardwolf/default.nix b/pkgs/development/python-modules/aardwolf/default.nix index 9e4cac5855e6..525c034f3bed 100644 --- a/pkgs/development/python-modules/aardwolf/default.nix +++ b/pkgs/development/python-modules/aardwolf/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , arc4 , asn1crypto , asn1tools @@ -7,6 +8,7 @@ , buildPythonPackage , colorama , fetchFromGitHub +, iconv , minikerberos , pillow , pyperclip @@ -62,6 +64,8 @@ buildPythonPackage rec { tqdm unicrypto winsspi + ] ++ lib.optionals (stdenv.isDarwin) [ + iconv ]; # Module doesn't have tests diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index 28c1c2c7fef8..f33dae1b1b7f 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { "TestPipRunner" "TestPythonPipWorkflow" "TestRubyWorkflow" + "TestRustCargo" # Tests which are passing locally but not on Hydra "test_copy_dependencies_action_1_multiple_files" "test_move_dependencies_action_1_multiple_files" diff --git a/pkgs/development/python-modules/flask-restx/default.nix b/pkgs/development/python-modules/flask-restx/default.nix index d2b30ba052fd..cdee90d222a6 100644 --- a/pkgs/development/python-modules/flask-restx/default.nix +++ b/pkgs/development/python-modules/flask-restx/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "flask-restx"; - version = "1.0.6"; + version = "1.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "python-restx"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Rp+TQjAZqgIS6jmj0PAqshD+5a3JPOr2Qw5l4INxK/Y="; + hash = "sha256-alXuo6TGDX2ko6VIKpAtyrg0EBkxEnC3DabH8GYqEs0="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/schema-salad/default.nix b/pkgs/development/python-modules/schema-salad/default.nix index 323406e15283..7e0e7bdbd8bc 100644 --- a/pkgs/development/python-modules/schema-salad/default.nix +++ b/pkgs/development/python-modules/schema-salad/default.nix @@ -50,6 +50,7 @@ buildPythonPackage rec { "test_outputBinding" # Test requires network "test_yaml_tab_error" + "test_bad_schemas" ]; pythonImportsCheck = [ diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index 1bbeee4f55bd..777c9c1689cc 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "2.0.0"; + version = "2.0.1"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-2WKRB4mMiML7POCAd9G0IROTKujcsJT591h1bmSX63E="; + hash = "sha256-aEM+kQoqF2p9oSqh/qqwyw8BDSM2qvcDjGc6qD2e0Bg="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/ddosify/default.nix b/pkgs/development/tools/ddosify/default.nix index d83e6048d993..bf6c59e8e08b 100644 --- a/pkgs/development/tools/ddosify/default.nix +++ b/pkgs/development/tools/ddosify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ddosify"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-pY4rgval017KX2I7ZNbvEbqRAqluC7rS3VzYJos7C94="; + sha256 = "sha256-Fimr2h0sjZQ1OnFx2DghCGqrfyLZ/SGeRIoLlAAgk3g="; }; vendorHash = "sha256-3y5ppTtvGqwWhgnVBpP4gf26DHKPnSNYK4jfhBiYDwY="; diff --git a/pkgs/development/tools/revive/default.nix b/pkgs/development/tools/revive/default.nix index b5bc7c111cb3..8ce52abc2f7f 100644 --- a/pkgs/development/tools/revive/default.nix +++ b/pkgs/development/tools/revive/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "revive"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "mgechev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J+LAv0cLG+ucvOywLhaL/LObMO4tPUcLEv+dItHcPBI="; + sha256 = "sha256-Iqe3iFE9hTPUgIO6MoPHAkr+KU5mEJ3ZY4Oh9xhXido="; # 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; @@ -35,7 +35,7 @@ buildGoModule rec { # The following tests fail when built by nix: # - # $ nix log /nix/store/build-revive.1.3.0.drv | grep FAIL + # $ nix log /nix/store/build-revive.1.3.1.drv | grep FAIL # # --- FAIL: TestAll (0.01s) # --- FAIL: TestTimeEqual (0.00s) diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 4659863e0fa8..358421cebae7 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -2,6 +2,12 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "Inflector" +version = "0.11.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" + [[package]] name = "adler" version = "1.0.2" @@ -86,7 +92,7 @@ version = "2.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9834fcc22e0874394a010230586367d4a3e9f11b560f469262678547e1d2575e" dependencies = [ - "bstr 1.2.0", + "bstr 1.3.0", "doc-comment", "predicates", "predicates-core", @@ -175,9 +181,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f0778972c64420fdedc63f09919c8a88bda7b25135357fd25a5d9f3257e832" +checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" dependencies = [ "memchr", "once_cell", @@ -283,9 +289,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.1.6" +version = "4.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0b0588d44d4d63a87dbd75c136c166bbfd9a86a31cb89e09906521c7d3f5e3" +checksum = "c3d7ae14b20b94cb02149ed21a86c423859cbe18dc7ed69845cace50e52b40a5" dependencies = [ "bitflags", "clap_derive", @@ -298,39 +304,50 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.1.1" +version = "4.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6540eedc41f8a5a76cf3d8d458057dcdf817be4158a55b5f861f7a5483de75" +checksum = "bd125be87bf4c255ebc50de0b7f4d2a6201e8ac3dc86e39c0ad081dc5e7236fe" dependencies = [ - "clap 4.1.6", + "clap 4.1.8", ] [[package]] name = "clap_complete_command" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4160b4a4f72ef58bd766bad27c09e6ef1cc9d82a22f6a0f55d152985a4a48e31" +checksum = "183495371ea78d4c9ff638bfc6497d46fed2396e4f9c50aebc1278a4a9919a3d" dependencies = [ - "clap 4.1.6", + "clap 4.1.8", "clap_complete", "clap_complete_fig", + "clap_complete_nushell", ] [[package]] name = "clap_complete_fig" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf0c76d8fcf782a1102ccfcd10ca8246e7fdd609c1cd6deddbb96cb638e9bb5c" +checksum = "63a06158a72dbb088f864887b4409fd22600ba379f3cee3040f842234cc5c2d0" dependencies = [ - "clap 4.1.6", + "clap 4.1.8", + "clap_complete", +] + +[[package]] +name = "clap_complete_nushell" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7fa41f5e6aa83bd151b70fd0ceaee703d68cd669522795dc812df9edad1252c" +dependencies = [ + "clap 4.1.8", "clap_complete", ] [[package]] name = "clap_derive" -version = "4.1.0" +version = "4.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" +checksum = "44bec8e5c9d09e439c4335b1af0abaab56dcf3b94999a936e1bb47b9134288f0" dependencies = [ "heck", "proc-macro-error", @@ -421,9 +438,9 @@ dependencies = [ [[package]] name = "console_log" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494" +checksum = "878ad067d4089144a36ee412d665916c665430eb84c0057b9987f424a5d15c03" dependencies = [ "log", "web-sys", @@ -549,10 +566,20 @@ dependencies = [ ] [[package]] -name = "cxx" -version = "1.0.90" +name = "ctor" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90d59d9acd2a682b4e40605a242f6670eaa58c5957471cbf85e8aa6a0b97a5e8" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn", +] + +[[package]] +name = "cxx" +version = "1.0.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" dependencies = [ "cc", "cxxbridge-flags", @@ -562,9 +589,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.90" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebfa40bda659dd5c864e65f4c9a2b0aff19bea56b017b9b77c73d3766a453a38" +checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" dependencies = [ "cc", "codespan-reporting", @@ -577,15 +604,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.90" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "457ce6757c5c70dc6ecdbda6925b958aae7f959bda7d8fb9bde889e34a09dc03" +checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" [[package]] name = "cxxbridge-macro" -version = "1.0.90" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf883b7aacd7b2aeb2a7b338648ee19f57c140d4ee8e52c68979c6b2f7f2263" +checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" dependencies = [ "proc-macro2", "quote", @@ -753,10 +780,10 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flake8-to-ruff" -version = "0.0.248" +version = "0.0.257" dependencies = [ "anyhow", - "clap 4.1.6", + "clap 4.1.8", "colored", "configparser", "once_cell", @@ -840,7 +867,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc" dependencies = [ "aho-corasick", - "bstr 1.2.0", + "bstr 1.3.0", "fnv", "log", "regex", @@ -990,9 +1017,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.26.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f0f08b46e4379744de2ab67aa8f7de3ffd1da3e275adc41fcc82053ede46ff" +checksum = "fea5b3894afe466b4bcf0388630fc15e11938a6074af0cd637c825ba2ec8a099" dependencies = [ "console", "lazy_static", @@ -1024,10 +1051,23 @@ dependencies = [ ] [[package]] -name = "is-terminal" -version = "0.4.3" +name = "is-macro" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" +checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20" +dependencies = [ + "Inflector", + "pmutil", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "is-terminal" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" dependencies = [ "hermit-abi 0.3.1", "io-lifetimes", @@ -1035,15 +1075,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "is_executable" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9acdc6d67b75e626ad644734e8bc6df893d9cd2a834129065d3dd6158ea9c8" -dependencies = [ - "winapi", -] - [[package]] name = "itertools" version = "0.10.5" @@ -1059,12 +1090,6 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" -[[package]] -name = "joinery" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5" - [[package]] name = "js-sys" version = "0.3.61" @@ -1171,7 +1196,7 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "libcst" version = "0.1.0" -source = "git+https://github.com/charliermarsh/LibCST?rev=f2f0b7a487a8725d161fe8b3ed73a6758b21e177#f2f0b7a487a8725d161fe8b3ed73a6758b21e177" +source = "git+https://github.com/charliermarsh/LibCST?rev=80e4c1399f95e5beb532fdd1e209ad2dbb470438#80e4c1399f95e5beb532fdd1e209ad2dbb470438" dependencies = [ "chic", "itertools", @@ -1186,7 +1211,7 @@ dependencies = [ [[package]] name = "libcst_derive" version = "0.1.0" -source = "git+https://github.com/charliermarsh/LibCST?rev=f2f0b7a487a8725d161fe8b3ed73a6758b21e177#f2f0b7a487a8725d161fe8b3ed73a6758b21e177" +source = "git+https://github.com/charliermarsh/LibCST?rev=80e4c1399f95e5beb532fdd1e209ad2dbb470438#80e4c1399f95e5beb532fdd1e209ad2dbb470438" dependencies = [ "quote", "syn", @@ -1292,14 +1317,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -1348,15 +1373,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "nom8" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" -dependencies = [ - "memchr", -] - [[package]] name = "notify" version = "5.1.0" @@ -1384,7 +1400,6 @@ dependencies = [ "autocfg", "num-integer", "num-traits", - "serde", ] [[package]] @@ -1394,7 +1409,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ "num-traits", - "serde", ] [[package]] @@ -1426,32 +1440,11 @@ dependencies = [ "libc", ] -[[package]] -name = "num_enum" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d829733185c1ca374f17e52b762f24f535ec625d2cc1f070e34c8a9068f341b" -dependencies = [ - "num_enum_derive", -] - -[[package]] -name = "num_enum_derive" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be1598bf1c313dcdd12092e3f1920f463462525a21b7b4e11b4168353d0123e" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "once_cell" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "oorandom" @@ -1465,6 +1458,15 @@ version = "6.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +[[package]] +name = "output_vt100" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66" +dependencies = [ + "winapi", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -1512,6 +1514,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "pathdiff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" + [[package]] name = "peg" version = "0.8.1" @@ -1539,6 +1547,18 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fa00462b37ead6d11a82c9d568b26682d78e0477dc02d1966c013af80969739" +[[package]] +name = "pep440_rs" +version = "0.2.0" +source = "git+https://github.com/konstin/pep440-rs.git?rev=a8fef4ec47f4c25b070b39cdbe6a0b9847e49941#a8fef4ec47f4c25b070b39cdbe6a0b9847e49941" +dependencies = [ + "lazy_static", + "regex", + "serde", + "tracing", + "unicode-width", +] + [[package]] name = "percent-encoding" version = "2.2.0" @@ -1686,6 +1706,17 @@ dependencies = [ "plotters-backend", ] +[[package]] +name = "pmutil" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1726,13 +1757,15 @@ dependencies = [ ] [[package]] -name = "proc-macro-crate" +name = "pretty_assertions" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66618389e4ec1c7afe67d51a9bf34ff9236480f8d51e7489b7d5ab0303c13f34" +checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" dependencies = [ - "once_cell", - "toml_edit", + "ctor", + "diff", + "output_vt100", + "yansi", ] [[package]] @@ -1838,9 +1871,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -1848,9 +1881,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -1910,6 +1943,28 @@ dependencies = [ "winapi", ] +[[package]] +name = "result-like" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccc7ce6435c33898517a30e85578cd204cbb696875efb93dec19a2d31294f810" +dependencies = [ + "result-like-derive", +] + +[[package]] +name = "result-like-derive" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fabf0a2e54f711c68c50d49f648a1a8a37adcb57353f518ac4df374f0788f42" +dependencies = [ + "pmutil", + "proc-macro2", + "quote", + "syn", + "syn-ext", +] + [[package]] name = "ring" version = "0.16.20" @@ -1927,29 +1982,24 @@ dependencies = [ [[package]] name = "ruff" -version = "0.0.248" +version = "0.0.257" dependencies = [ "anyhow", "bisection", "bitflags", - "cfg-if", "chrono", - "clap 4.1.6", + "clap 4.1.8", "colored", - "console_error_panic_hook", - "console_log", "criterion", "dirs", "fern", - "getrandom", "glob", "globset", "ignore", "imperative", "insta", - "is_executable", + "is-macro", "itertools", - "js-sys", "libcst", "log", "natord", @@ -1958,16 +2008,23 @@ dependencies = [ "num-traits", "once_cell", "path-absolutize", + "pathdiff", + "pep440_rs", + "pretty_assertions", "regex", + "result-like", + "ruff_cache", + "ruff_diagnostics", "ruff_macros", - "ruff_python", + "ruff_python_ast", + "ruff_python_stdlib", + "ruff_rustpython", "rustc-hash", "rustpython-common", "rustpython-parser", "schemars", "semver", "serde", - "serde-wasm-bindgen", "shellexpand", "smallvec", "strum", @@ -1975,15 +2032,38 @@ dependencies = [ "test-case", "textwrap", "thiserror", - "titlecase", "toml", - "wasm-bindgen", - "wasm-bindgen-test", +] + +[[package]] +name = "ruff_benchmark" +version = "0.0.0" +dependencies = [ + "criterion", + "mimalloc", + "once_cell", + "ruff", + "serde", + "serde_json", + "tikv-jemallocator", + "ureq", + "url", +] + +[[package]] +name = "ruff_cache" +version = "0.0.0" +dependencies = [ + "filetime", + "globset", + "itertools", + "regex", + "ruff_macros", ] [[package]] name = "ruff_cli" -version = "0.0.248" +version = "0.0.257" dependencies = [ "annotate-snippets 0.9.1", "anyhow", @@ -1993,7 +2073,7 @@ dependencies = [ "bitflags", "cachedir", "chrono", - "clap 4.1.6", + "clap 4.1.8", "clap_complete_command", "clearscreen", "colored", @@ -2009,9 +2089,12 @@ dependencies = [ "rayon", "regex", "ruff", + "ruff_cache", + "ruff_diagnostics", "rustc-hash", "serde", "serde_json", + "shellexpand", "similar", "strum", "textwrap", @@ -2025,13 +2108,15 @@ name = "ruff_dev" version = "0.0.0" dependencies = [ "anyhow", - "clap 4.1.6", + "clap 4.1.8", "itertools", "libcst", "once_cell", + "pretty_assertions", "regex", "ruff", "ruff_cli", + "ruff_diagnostics", "rustpython-common", "rustpython-parser", "schemars", @@ -2041,6 +2126,15 @@ dependencies = [ "textwrap", ] +[[package]] +name = "ruff_diagnostics" +version = "0.0.0" +dependencies = [ + "ruff_python_ast", + "rustpython-parser", + "serde", +] + [[package]] name = "ruff_formatter" version = "0.0.0" @@ -2067,7 +2161,52 @@ dependencies = [ ] [[package]] -name = "ruff_python" +name = "ruff_python_ast" +version = "0.0.0" +dependencies = [ + "anyhow", + "bitflags", + "is-macro", + "itertools", + "log", + "nohash-hasher", + "num-bigint", + "num-traits", + "once_cell", + "regex", + "ruff_python_stdlib", + "ruff_rustpython", + "rustc-hash", + "rustpython-common", + "rustpython-parser", + "smallvec", +] + +[[package]] +name = "ruff_python_formatter" +version = "0.0.0" +dependencies = [ + "anyhow", + "clap 4.1.8", + "insta", + "is-macro", + "itertools", + "once_cell", + "ruff_formatter", + "ruff_python_ast", + "ruff_python_stdlib", + "ruff_rustpython", + "ruff_testing_macros", + "ruff_text_size", + "rustc-hash", + "rustpython-common", + "rustpython-parser", + "similar", + "test-case", +] + +[[package]] +name = "ruff_python_stdlib" version = "0.0.0" dependencies = [ "once_cell", @@ -2076,19 +2215,23 @@ dependencies = [ ] [[package]] -name = "ruff_python_formatter" +name = "ruff_rustpython" version = "0.0.0" dependencies = [ "anyhow", - "clap 4.1.6", - "insta", "once_cell", - "ruff_formatter", - "ruff_text_size", - "rustc-hash", "rustpython-common", "rustpython-parser", - "test-case", +] + +[[package]] +name = "ruff_testing_macros" +version = "0.0.0" +dependencies = [ + "glob", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -2101,6 +2244,25 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "ruff_wasm" +version = "0.0.0" +dependencies = [ + "console_error_panic_hook", + "console_log", + "getrandom", + "js-sys", + "log", + "ruff", + "ruff_python_ast", + "ruff_rustpython", + "rustpython-parser", + "serde", + "serde-wasm-bindgen", + "wasm-bindgen", + "wasm-bindgen-test", +] + [[package]] name = "rust-stemmers" version = "1.2.0" @@ -2146,7 +2308,7 @@ dependencies = [ [[package]] name = "rustpython-ast" version = "0.2.0" -source = "git+https://github.com/RustPython/RustPython.git?rev=61b48f108982d865524f86624a9d5bc2ae3bccef#61b48f108982d865524f86624a9d5bc2ae3bccef" +source = "git+https://github.com/RustPython/RustPython.git?rev=c15f670f2c30cfae6b41a1874893590148c74bc4#c15f670f2c30cfae6b41a1874893590148c74bc4" dependencies = [ "num-bigint", "rustpython-compiler-core", @@ -2155,7 +2317,7 @@ dependencies = [ [[package]] name = "rustpython-common" version = "0.2.0" -source = "git+https://github.com/RustPython/RustPython.git?rev=61b48f108982d865524f86624a9d5bc2ae3bccef#61b48f108982d865524f86624a9d5bc2ae3bccef" +source = "git+https://github.com/RustPython/RustPython.git?rev=c15f670f2c30cfae6b41a1874893590148c74bc4#c15f670f2c30cfae6b41a1874893590148c74bc4" dependencies = [ "ascii", "bitflags", @@ -2180,24 +2342,21 @@ dependencies = [ [[package]] name = "rustpython-compiler-core" version = "0.2.0" -source = "git+https://github.com/RustPython/RustPython.git?rev=61b48f108982d865524f86624a9d5bc2ae3bccef#61b48f108982d865524f86624a9d5bc2ae3bccef" +source = "git+https://github.com/RustPython/RustPython.git?rev=c15f670f2c30cfae6b41a1874893590148c74bc4#c15f670f2c30cfae6b41a1874893590148c74bc4" dependencies = [ - "bincode", "bitflags", "bstr 0.2.17", "itertools", "lz4_flex", "num-bigint", "num-complex", - "num_enum", "serde", - "thiserror", ] [[package]] name = "rustpython-parser" version = "0.2.0" -source = "git+https://github.com/RustPython/RustPython.git?rev=61b48f108982d865524f86624a9d5bc2ae3bccef#61b48f108982d865524f86624a9d5bc2ae3bccef" +source = "git+https://github.com/RustPython/RustPython.git?rev=c15f670f2c30cfae6b41a1874893590148c74bc4#c15f670f2c30cfae6b41a1874893590148c74bc4" dependencies = [ "ahash", "anyhow", @@ -2212,7 +2371,7 @@ dependencies = [ "rustc-hash", "rustpython-ast", "rustpython-compiler-core", - "thiserror", + "serde", "tiny-keccak", "unic-emoji-char", "unic-ucd-ident", @@ -2242,9 +2401,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5fb6c61f29e723026dc8e923d94c694313212abbecbbe5f55a7748eec5b307" +checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" dependencies = [ "dyn-clone", "schemars_derive", @@ -2254,9 +2413,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.11" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f188d036977451159430f3b8dc82ec76364a42b7e289c2b18a9a18f4470058e9" +checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" dependencies = [ "proc-macro2", "quote", @@ -2309,9 +2468,9 @@ dependencies = [ [[package]] name = "serde-wasm-bindgen" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" dependencies = [ "js-sys", "serde", @@ -2468,15 +2627,24 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "syn-ext" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b86cb2b68c5b3c078cac02588bc23f3c04bb828c5d3aedd17980876ec6a7be6" +dependencies = [ + "syn", +] + [[package]] name = "tempfile" version = "3.3.0" @@ -2532,18 +2700,18 @@ checksum = "95059e91184749cb66be6dc994f67f182b6d897cb3df74a5bf66b5e709295fd8" [[package]] name = "test-case" -version = "2.2.2" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21d6cf5a7dffb3f9dceec8e6b8ca528d9bd71d36c9f074defb548ce161f598c0" +checksum = "679b019fb241da62cc449b33b224d19ebe1c6767b495569765115dd7f7f9fba4" dependencies = [ "test-case-macros", ] [[package]] -name = "test-case-macros" -version = "2.2.2" +name = "test-case-core" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e45b7bf6e19353ddd832745c8fcf77a17a93171df7151187f26623f2b75b5b26" +checksum = "72dc21b5887f4032c4656502d085dc28f2afbb686f25f216472bb0526f4b1b88" dependencies = [ "cfg-if", "proc-macro-error", @@ -2552,6 +2720,19 @@ dependencies = [ "syn", ] +[[package]] +name = "test-case-macros" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3786898e0be151a96f730fd529b0e8a10f5990fa2a7ea14e37ca27613c05190" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn", + "test-case-core", +] + [[package]] name = "textwrap" version = "0.16.0" @@ -2658,22 +2839,11 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "titlecase" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38397a8cdb017cfeb48bf6c154d6de975ac69ffeed35980fde199d2ee0842042" -dependencies = [ - "joinery", - "lazy_static", - "regex", -] - [[package]] name = "toml" -version = "0.6.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb9d890e4dc9298b70f740f615f2e05b9db37dce531f6b24fb77ac993f9f217" +checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6" dependencies = [ "serde", "serde_spanned", @@ -2683,24 +2853,24 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.18.1" +version = "0.19.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c59d8dd7d0dcbc6428bf7aa2f0e823e26e43b3c9aca15bbc9475d23e5fa12b" +checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" dependencies = [ "indexmap", - "nom8", "serde", "serde_spanned", "toml_datetime", + "winnow", ] [[package]] @@ -2711,9 +2881,21 @@ checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "pin-project-lite", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "tracing-core" version = "0.1.30" @@ -2854,9 +3036,11 @@ checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "unicode_names2" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029df4cc8238cefc911704ff8fa210853a0f3bce2694d8f51181dd41ee0f3301" +version = "0.6.0" +source = "git+https://github.com/youknowone/unicode_names2.git?rev=4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde#4ce16aa85cbcdd9cc830410f1a72ef9a235f2fde" +dependencies = [ + "phf", +] [[package]] name = "untrusted" @@ -3189,6 +3373,15 @@ version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" +[[package]] +name = "winnow" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658" +dependencies = [ + "memchr", +] + [[package]] name = "yaml-rust" version = "0.4.5" @@ -3198,6 +3391,12 @@ dependencies = [ "linked-hash-map", ] +[[package]] +name = "yansi" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + [[package]] name = "yansi-term" version = "0.1.2" diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 27dddf233f7e..cecbb999484b 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.248"; + version = "0.0.257"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - hash = "sha256-qsjn8AW6Wx0ZaTht9BToQxYWngrrrR8LIIWcNfr8fXw="; + hash = "sha256-PkKUQPkZtwqvWhWsO4Pej/T1haJvMP7HpF6XjZSoqQg="; }; # We have to use importCargoLock here because `cargo vendor` currently doesn't support workspace @@ -22,8 +22,14 @@ rustPlatform.buildRustPackage rec { cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "libcst-0.1.0" = "sha256-66Td5jnLEEDHgYapsSmxfgIE43T7PSTYRznllIOw81U="; - "rustpython-ast-0.2.0" = "sha256-k2WHnRtqSzdawHQKOfTjvyZxgRWXRv9dvSzfYC7171o="; + "libcst-0.1.0" = "sha256-jG9jYJP4reACkFLrQBWOYH6nbKniNyFVItD0cTZ+nW0="; + "libcst_derive-0.1.0" = "sha256-jG9jYJP4reACkFLrQBWOYH6nbKniNyFVItD0cTZ+nW0="; + "pep440_rs-0.2.0" = "sha256-wDJGz7SbHItYsg0+EgIoH48WFdV6MEg+HkeE07JE6AU="; + "rustpython-ast-0.2.0" = "sha256-0SHtycgDVOtiz7JZwd1v9lv2exxemcntm9lciih+pgc="; + "rustpython-common-0.2.0" = "sha256-0SHtycgDVOtiz7JZwd1v9lv2exxemcntm9lciih+pgc="; + "rustpython-compiler-core-0.2.0" = "sha256-0SHtycgDVOtiz7JZwd1v9lv2exxemcntm9lciih+pgc="; + "rustpython-parser-0.2.0" = "sha256-0SHtycgDVOtiz7JZwd1v9lv2exxemcntm9lciih+pgc="; + "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg="; }; }; diff --git a/pkgs/development/tools/rust/cargo-machete/default.nix b/pkgs/development/tools/rust/cargo-machete/default.nix new file mode 100644 index 000000000000..b68aecced887 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-machete/default.nix @@ -0,0 +1,29 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-machete"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "bnjbvr"; + repo = "cargo-machete"; + rev = "v${version}"; + hash = "sha256-AOi4SnFkt82iQIP3bp/9JIaYiqjiEjKvJKUvrLQJTX8="; + }; + + cargoHash = "sha256-Q/2py0zgCYgnxFpcJD5PfNfIfIEUjtjFPjxDe25f0BQ="; + + # tests require internet access + doCheck = false; + + meta = with lib; { + description = "A Cargo tool that detects unused dependencies in Rust projects"; + homepage = "https://github.com/bnjbvr/cargo-machete"; + changelog = "https://github.com/bnjbvr/cargo-machete/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-vet/default.nix b/pkgs/development/tools/rust/cargo-vet/default.nix index 638bc0bdea22..93aa13a4f6ba 100644 --- a/pkgs/development/tools/rust/cargo-vet/default.nix +++ b/pkgs/development/tools/rust/cargo-vet/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-vet"; - version = "0.3.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "mozilla"; repo = pname; - rev = "0.3"; - sha256 = "sha256-m+2Rbaa7wtzdUyl8VzrGsxtZPhQMwlrx6okhc4zZNsI="; + rev = version; + sha256 = "sha256-nBhm6EDs99oKdUxT+N+IC7fY/U0yyeJyr6vbaZaiGSI="; }; - cargoSha256 = "sha256-2Ri/CvTZ/RQqxHSgl05kaCbg0ATJapaFEF6y8fWGSwM="; + cargoSha256 = "sha256-M6CdYL8CDfFH0RaYGel6dC3LxQZzq9YbU8ecH9CWEr8="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 32736d0ffa96..9f0e15c05128 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.484"; + version = "0.0.492"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-2//mxYTF6lAolj5aQOXF12NOwEa/VPoen9LNxD7gYDo="; + hash = "sha256-15OzhjiN5pk+V72vTm/lItrQLtBleHC+V5NX3yWePXU="; }; - vendorHash = "sha256-2y671bvOmkKEqbcttcCG1L1by/J8gkGZxts7kFyTIxk="; + vendorHash = "sha256-w5S1LDttRHvJ4MJ+wXHREOU2/j0JVjoaoFcsfVhXaTU="; subPackages = [ "." ]; diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index e41e33b4003c..730587f7de03 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "jumpy"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "fishfolk"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5hgd4t9ZKHmv8wzED7Tn+ykzUM0EbQqRX15HBHzXtJY="; + sha256 = "sha256-vBnHNc/kCyZ8gTWhQShn4lBQECguFBzBd7xIfLBgm7A="; }; - cargoSha256 = "sha256-cK5n75T+Kkd6F4q4MFZNn0R6W6Nk2/H23AGhIe2FCig="; + cargoSha256 = "sha256-ZnDerzDdCLjslszSn0z0BevP5qpkuYDCDLyv66+psdo="; auditable = true; # TODO: remove when this is the default @@ -49,9 +49,7 @@ rustPlatform.buildRustPackage rec { rustPlatform.bindgenHook ]; - postPatch = '' - touch ../$(stripHash $cargoDeps)/taffy/README.md - ''; + cargoBuildFlags = [ "--bin" "jumpy" ]; postInstall = '' mkdir $out/share diff --git a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix index 5a00e51d890d..e0170042027b 100644 --- a/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-project/alsa-tools/default.nix @@ -6,7 +6,6 @@ , gtk2 , gtk3 , pkg-config -, python3 }: stdenv.mkDerivation (self: { @@ -20,7 +19,6 @@ stdenv.mkDerivation (self: { nativeBuildInputs = [ pkg-config - python3 ]; buildInputs = [ @@ -40,7 +38,7 @@ stdenv.mkDerivation (self: { "hdspconf" "hdsploader" "hdspmixer" - "hwmixvolume" + # "hwmixvolume" # Requires old, unmaintained, abandoned EOL Python 2 "ld10k1" # "qlo10k1" # needs Qt "mixartloader" @@ -50,14 +48,10 @@ stdenv.mkDerivation (self: { # "seq" # mysterious configure error "sscape_ctl" "us428control" - # "usx2yloader" # tries to create /etc/hptplug/usb + # "usx2yloader" # tries to create /etc/hotplug/usb "vxloader" ]; - postPatch = '' - patchShebangs hwmixvolume/ - ''; - configurePhase = '' runHook preConfigure @@ -74,8 +68,8 @@ stdenv.mkDerivation (self: { buildPhase = '' runHook preBuild - echo "Building $tool:" for tool in $TOOLSET; do + echo "Building $tool:" pushd "$tool" make popd @@ -87,8 +81,8 @@ stdenv.mkDerivation (self: { installPhase = '' runHook preInstall - echo "Installing $tool:" for tool in $TOOLSET; do + echo "Installing $tool:" pushd "$tool" make install popd diff --git a/pkgs/os-specific/linux/alsa-project/default.nix b/pkgs/os-specific/linux/alsa-project/default.nix new file mode 100644 index 000000000000..15077cc8d77a --- /dev/null +++ b/pkgs/os-specific/linux/alsa-project/default.nix @@ -0,0 +1,13 @@ +{ lib, pkgs }: + +lib.makeScope pkgs.newScope (self: { + alsa-firmware = self.callPackage ./alsa-firmware { }; + alsa-lib = self.callPackage ./alsa-lib { }; + alsa-oss = self.callPackage ./alsa-oss { }; + alsa-plugins = self.callPackage ./alsa-plugins { }; + alsa-plugins-wrapper = self.callPackage ./alsa-plugins/wrapper.nix { }; + alsa-tools = self.callPackage ./alsa-tools { }; + alsa-topology-conf = self.callPackage ./alsa-topology-conf { }; + alsa-ucm-conf = self.callPackage ./alsa-ucm-conf { }; + alsa-utils = self.callPackage ./alsa-utils { fftw = pkgs.fftwFloat; }; +}) diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix index 9903dbb1184e..ae5ac99b6645 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/default.nix @@ -35,7 +35,7 @@ mkYarnPackage rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-WolkDSS5wPxtltKzq4Er2nAQ0GrsF3imim3/Ge4eguQ="; + hash = "sha256-bxDqv7KofinDuYDB1F0ZKWUQnz+ErU+OZc6i77nzM9Q="; }; packageResolutions = { diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json index 6676f3bb9c30..8b9701d09d76 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/package.json +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/package.json @@ -1,6 +1,6 @@ { "name": "matrix-hookshot", - "version": "2.7.0", + "version": "3.0.0", "description": "A bridge between Matrix and multiple project management services, such as GitHub, GitLab and JIRA.", "main": "lib/app.js", "repository": "https://github.com/matrix-org/matrix-hookshot", @@ -67,7 +67,6 @@ "source-map-support": "^0.5.21", "string-argv": "^0.3.1", "tiny-typed-emitter": "^2.1.0", - "uuid": "^8.3.2", "vm2": "^3.9.11", "winston": "^3.3.3", "xml2js": "^0.4.23", @@ -105,7 +104,7 @@ "sass": "^1.51.0", "ts-node": "^10.4.0", "typescript": "^4.5.2", - "vite": "^2.9.13", - "vite-svg-loader": "^3.4.0" + "vite": "^4.1.4", + "vite-svg-loader": "^4.0.0" } } diff --git a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json index d726307eeb00..b4c0f27ecfa0 100644 --- a/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json +++ b/pkgs/servers/matrix-synapse/matrix-hookshot/pin.json @@ -1,5 +1,5 @@ { - "version": "2.7.0", - "srcHash": "rW5fqKshnF2S4w55V2GaAa2RFVM+YbwRum9OwTTpYuA=", - "yarnHash": "0q71901ra9m9rbbczal1imqfba4b07bpr8hkpw1d1r9ghc2xjay4" + "version": "3.0.0", + "srcHash": "2fuDV2h97VdBADygMeyk2B5etFKkQdNZeOWlhMD4hJk=", + "yarnHash": "0ivizv90wrbz583xjvbakv6vg782h7pjm5zbm8wb9qkpnj735avz" } diff --git a/pkgs/servers/tautulli/default.nix b/pkgs/servers/tautulli/default.nix index e68cbf073e01..9a567630298c 100644 --- a/pkgs/servers/tautulli/default.nix +++ b/pkgs/servers/tautulli/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "Tautulli"; - version = "2.11.1"; + version = "2.12.2"; format = "other"; pythonPath = [ setuptools ]; @@ -12,7 +12,7 @@ buildPythonApplication rec { owner = "Tautulli"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9hWTnBi8t3ZJzrDvvViQ/jYDdbNCabVAion9E9sjqRQ="; + sha256 = "sha256-d2JGVmUQQMlwoEg3hsPB3jgUrUpui5Zsdf9Eq61TyZI="; }; installPhase = '' diff --git a/pkgs/tools/admin/bom/default.nix b/pkgs/tools/admin/bom/default.nix new file mode 100644 index 000000000000..f80c153fb447 --- /dev/null +++ b/pkgs/tools/admin/bom/default.nix @@ -0,0 +1,69 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "bom"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "kubernetes-sigs"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-HgBpEIUaeVCMkbu1KtBh0LGZQGFLyj3rF0cYDt8vDRk="; + # 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; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/COMMIT + # '0000-00-00T00:00:00Z' + date -u -d "@$(git log -1 --pretty=%ct)" "+'%Y-%m-%dT%H:%M:%SZ'" > $out/SOURCE_DATE_EPOCH + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + vendorSha256 = "sha256-m5IK/+mbwGSX8tQUMED8+H52o89QOJk8mhUXumZm+wo="; + + nativeBuildInputs = [ installShellFiles ]; + + ldflags = [ + "-s" + "-w" + "-X sigs.k8s.io/release-utils/version.gitVersion=v${version}" + "-X sigs.k8s.io/release-utils/version.gitTreeState=clean" + ]; + + # ldflags based on metadata from git and source + preBuild = '' + ldflags+=" -X sigs.k8s.io/release-utils/version.gitCommit=$(cat COMMIT)" + ldflags+=" -X sigs.k8s.io/release-utils/version.buildDate=$(cat SOURCE_DATE_EPOCH)" + ''; + + postInstall = '' + installShellCompletion --cmd bom \ + --bash <($out/bin/bom completion bash) \ + --fish <($out/bin/bom completion fish) \ + --zsh <($out/bin/bom completion zsh) + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/bom --help + $out/bin/bom version 2>&1 | grep "v${version}" + runHook postInstallCheck + ''; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/kubernetes-sigs/bom"; + changelog = "https://github.com/kubernetes-sigs/bom/releases/tag/v${version}"; + description = "A utility to generate SPDX-compliant Bill of Materials manifests"; + license = licenses.asl20; + maintainers = with maintainers; [ developer-guy ]; + }; +} diff --git a/pkgs/tools/filesystems/stratisd/default.nix b/pkgs/tools/filesystems/stratisd/default.nix index 0b16c7465294..cdfbe47d8457 100644 --- a/pkgs/tools/filesystems/stratisd/default.nix +++ b/pkgs/tools/filesystems/stratisd/default.nix @@ -10,6 +10,7 @@ , cryptsetup , util-linux , udev +, lvm2 , systemd , xfsprogs , thin-provisioning-tools @@ -25,18 +26,18 @@ stdenv.mkDerivation rec { pname = "stratisd"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "stratis-storage"; repo = pname; rev = "v${version}"; - hash = "sha256-PM+griFtuFT9g+Pqx33frWrucVCXSzfyWAJJXAzrMtI="; + hash = "sha256-vnN0SO3KbmSQPDGqn4hnrVSxv5ebSDTOoPim1EKWweQ="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; - hash = "sha256-P5GKMNifnEvGcsg0hGZn6hg3/S44fUIzqf5Qjp4R/EM="; + hash = "sha256-Cl/6A3SNMKWzuu1JLYgzzXc8XSp+ws+YtAvfPCXZGEA="; }; postPatch = '' @@ -68,6 +69,7 @@ stdenv.mkDerivation rec { cryptsetup util-linux udev + lvm2 ]; EXECUTABLES_PATHS = lib.makeBinPath ([ diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 5723d40141de..4465c68ab3c1 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.10.0"; + version = "1.10.3"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "sha256-JJSAU9z3JOlvfW6AW/P/KrjhOcD0ax8TmqgqM48rlAo="; + sha256 = "sha256-P4t16rCKsL6FwDVXDC2XkgUGcAlWCPt1iXoBmhDZRzk="; }; - cargoHash = "sha256-UV2iQFbeGvJs8kEowYRNv8DxEGwaIWL1/3A2oUCcauw="; + cargoHash = "sha256-IAaaR4DWKnCd9IrqIR3v2dEv4IVEoBwBEJErqLRaVmA="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index f963b607cf40..9bce40e1f686 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-03-15"; + version = "2023-03-17"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-qP14hkYO8gXD9C3B6uhBnYDx3YZMbbvtzHOSKFtFSmA="; + hash = "sha256-mqGNwyFmTTY8ITzom4GDvZXXI1YUkVKdfIHRqnVLuMs="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/feroxbuster/default.nix b/pkgs/tools/security/feroxbuster/default.nix index 985d328decb8..859f34af602c 100644 --- a/pkgs/tools/security/feroxbuster/default.nix +++ b/pkgs/tools/security/feroxbuster/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "feroxbuster"; - version = "2.7.1"; + version = "2.9.1"; src = fetchFromGitHub { owner = "epi052"; repo = pname; - rev = version; - hash = "sha256-B6FeY5pWW5+y/0HlVedkm8ol2z9GXgEYe5j7/uMhqsw="; + rev = "refs/tags/v${version}"; + hash = "sha256-l+F4Zmeoq2ozgd+xq5n+cevThr8ub/7GiLq3Fe+C9yY="; }; # disable linker overrides on aarch64-linux @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { rm .cargo/config ''; - cargoSha256 = "sha256-OFgt8yu2wlvkP/wjlmRRl8UyD9MUx9/0Rcs6K8jLkjo="; + cargoSha256 = "sha256-ivwXgHAg7+DnaIOBw9S2gIzJeoge0eStFtKZkJhrTYE="; OPENSSL_NO_VENDOR = true; diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix index 041a066ed37f..050e5c365b70 100644 --- a/pkgs/tools/security/naabu/default.nix +++ b/pkgs/tools/security/naabu/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.1.2"; + version = "2.1.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; rev = "refs/tags/v${version}"; - hash = "sha256-o+5UOyFg1jhFmBDtkVPgJVk50fPt0uxvV6qiPrRtQZw="; + hash = "sha256-U3rJNYESBL+js2uyBcT2x+XoC2qBseKyCLvwlc5a2rA="; }; - vendorHash = "sha256-Y7eQeoTt0TM4ZKWKVbltYY+k9Vq0TroVywQduwvlLQg="; + vendorHash = "sha256-YB2gZYoAyoIK44DTfHvYOyhNggkp4HaC2dvtCy2hc38="; buildInputs = [ libpcap diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 9e534298198c..13ea6a8992e8 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.8.9"; + version = "2.9.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-YjcvxDCIXHyc/7+lpg29wDrpe8WmQPWbhXvpIpWO17k="; + hash = "sha256-158nIO3HvLjc9IuL0Yt92VPHgASKEQy/eTOByMehHC8="; }; - vendorHash = "sha256-DE2S70Jfd6Vgx7BXGbhSWTbRIbp8cbiuf8bolHCYMxg="; + vendorHash = "sha256-k4Dq1GjRzdD4vkydMWFWVQZR/mwGjZCcy7Gr5QDejUs="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c1c1e1d543d..ece0711a4211 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5901,6 +5901,8 @@ with pkgs; bogofilter = callPackage ../tools/misc/bogofilter { }; + bom = callPackage ../tools/admin/bom { }; + bomber-go = callPackage ../development/tools/bomber-go { }; bomutils = callPackage ../tools/archivers/bomutils { }; @@ -15981,6 +15983,7 @@ with pkgs; cargo-llvm-cov = callPackage ../development/tools/rust/cargo-llvm-cov { }; cargo-llvm-lines = callPackage ../development/tools/rust/cargo-llvm-lines { }; cargo-lock = callPackage ../development/tools/rust/cargo-lock { }; + cargo-machete = callPackage ../development/tools/rust/cargo-machete { }; cargo-outdated = callPackage ../development/tools/rust/cargo-outdated { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration; }; @@ -22355,6 +22358,8 @@ with pkgs; live555 = callPackage ../development/libraries/live555 { }; + llhttp = callPackage ../development/libraries/llhttp { }; + log4cpp = callPackage ../development/libraries/log4cpp { }; log4cxx = callPackage ../development/libraries/log4cxx { }; @@ -25912,17 +25917,16 @@ with pkgs; tinyalsa = callPackage ../os-specific/linux/tinyalsa { }; - alsa-firmware = callPackage ../os-specific/linux/alsa-project/alsa-firmware { }; - alsa-lib = callPackage ../os-specific/linux/alsa-project/alsa-lib { }; - alsa-oss = callPackage ../os-specific/linux/alsa-project/alsa-oss { }; - alsa-plugins = callPackage ../os-specific/linux/alsa-project/alsa-plugins { }; - alsa-plugins-wrapper = callPackage ../os-specific/linux/alsa-project/alsa-plugins/wrapper.nix { }; - alsa-tools = callPackage ../os-specific/linux/alsa-project/alsa-tools { }; - alsa-topology-conf = callPackage ../os-specific/linux/alsa-project/alsa-topology-conf { }; - alsa-ucm-conf = callPackage ../os-specific/linux/alsa-project/alsa-ucm-conf { }; - alsa-utils = callPackage ../os-specific/linux/alsa-project/alsa-utils { - fftw = fftwFloat; - }; + inherit (callPackage ../os-specific/linux/alsa-project { }) + alsa-firmware + alsa-lib + alsa-oss + alsa-plugins + alsa-plugins-wrapper + alsa-tools + alsa-topology-conf + alsa-ucm-conf + alsa-utils; inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware