diff options
Diffstat (limited to 'pkgs/development/tools')
152 files changed, 1155 insertions, 2710 deletions
diff --git a/pkgs/development/tools/abuild/default.nix b/pkgs/development/tools/abuild/default.nix index 42fb141fd7cad..4cabeaa7d020b 100644 --- a/pkgs/development/tools/abuild/default.nix +++ b/pkgs/development/tools/abuild/default.nix @@ -11,6 +11,7 @@ , busybox , apk-tools , perl +, findutils }: stdenv.mkDerivation rec { @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { scdoc makeWrapper file + findutils ]; patchPhase = '' diff --git a/pkgs/development/tools/altair-graphql-client/default.nix b/pkgs/development/tools/altair-graphql-client/default.nix index 87270962248fe..ab3edcd4cdc8a 100644 --- a/pkgs/development/tools/altair-graphql-client/default.nix +++ b/pkgs/development/tools/altair-graphql-client/default.nix @@ -2,11 +2,11 @@ let pname = "altair"; - version = "7.1.0"; + version = "7.2.2"; src = fetchurl { url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage"; - sha256 = "sha256-27X2BSGcHMSxt3ry+EO/Z6Bq8rqlvNNME0ehBUWxN9s="; + sha256 = "sha256-kxO6lBqZzvfFrl+A/FK7L+XXmwn9fV8G5Y6dwfhbpbU="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 414771b2773ba..5b31e4ae2de7b 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.144"; + version = "3.2.174"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-BF2xeHoVb6uSqRB9kTj6QX4pDUkj49xdBOC2SbZ0qjE="; + hash = "sha256-5R5WKeXmT4hMhjd+Laafqx4UXfvGf+2lMh34XpMs3vQ="; }; patches = [ ./flake8-compat-5.x.patch ]; @@ -47,7 +47,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index fa5881a1cb0c2..a71e385e0a398 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.17.5"; + version = "2.17.6"; dontConfigure = true; dontBuild = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - hash = "sha256-Ay+8NOYq1sBIDhCoju2/L8Ghegmxz5NmtpBLb0hqH/E="; + hash = "sha256-Xw/lyA4J0FkU0MTXbOanDJ+rLCEGCOP7BX9sApu+K6s="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix deleted file mode 100644 index bf30b47d54ee1..0000000000000 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub - -, docbook_xml_dtd_45 -, docbook_xsl -, installShellFiles -, libxslt -, pcre -, pkg-config -, python3 -, which -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "cppcheck"; - version = "2.14.1"; - - outputs = [ "out" "man" ]; - - src = fetchFromGitHub { - owner = "danmar"; - repo = "cppcheck"; - rev = finalAttrs.version; - hash = "sha256-KXE3zmhaTweQhs0Qh7Xd5ILiuGVewtrvOkRkt8hjU58="; - }; - - nativeBuildInputs = [ - docbook_xml_dtd_45 - docbook_xsl - installShellFiles - libxslt - pkg-config - python3 - which - ]; - - buildInputs = [ - pcre - (python3.withPackages (ps: [ ps.pygments ])) - ]; - - makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ]; - - enableParallelBuilding = true; - strictDeps = true; - - # test/testcondition.cpp:4949(TestCondition::alwaysTrueContainer): Assertion failed. - doCheck = !(stdenv.isLinux && stdenv.isAarch64); - doInstallCheck = true; - - postPatch = '' - substituteInPlace Makefile \ - --replace 'PCRE_CONFIG = $(shell which pcre-config)' 'PCRE_CONFIG = $(PKG_CONFIG) libpcre' - ''; - - postBuild = '' - make DB2MAN=${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl man - ''; - - postInstall = '' - installManPage cppcheck.1 - ''; - - installCheckPhase = '' - runHook preInstallCheck - - echo 'int main() {}' > ./installcheck.cpp - $out/bin/cppcheck ./installcheck.cpp > /dev/null - - runHook postInstallCheck - ''; - - meta = { - description = "Static analysis tool for C/C++ code"; - homepage = "http://cppcheck.sourceforge.net"; - license = lib.licenses.gpl3Plus; - longDescription = '' - Check C/C++ code for memory leaks, mismatching allocation-deallocation, - buffer overruns and more. - ''; - maintainers = with lib.maintainers; [ joachifm paveloom ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 0ae0c3559300c..956e460deca39 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.237.2"; + version = "0.238.3"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-VL547H8cGxuhx5Ho5gRVl60CUQ5EcBuH+xoE0zM5m7A="; + hash = "sha256-WlHta/wXTULehopXeIUdNAQb12Lf0SJnm1HIVHTDshA="; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 87234ba584dbe..f682196a458f0 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -37,12 +37,12 @@ in stdenv.mkDerivation rec { pname = "frama-c"; - version = "28.1"; - slang = "Nickel"; + version = "29.0"; + slang = "Copper"; src = fetchurl { url = "https://frama-c.com/download/frama-c-${version}-${slang}.tar.gz"; - hash = "sha256-AiC8dDt9okaM65JvMx7cfd+qfGA7pHli3j4zyOHj9ZM="; + hash = "sha256-0vuzuND/g5RYcunm+iWOk0pwY2DmmNrjtNX5ca3fdJM="; }; preConfigure = '' diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index c5e3b43eea061..0ed0ef816f092 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -16,9 +16,8 @@ let perlPackages.DevelCover perlPackages.GD perlPackages.JSONXS - perlPackages.MemoryProcess perlPackages.PathTools - ]; + ] ++ lib.optionals (!stdenv.isDarwin) [ perlPackages.MemoryProcess ]; in stdenv.mkDerivation rec { pname = "lcov"; diff --git a/pkgs/development/tools/analysis/snyk/default.nix b/pkgs/development/tools/analysis/snyk/default.nix index 1c983d6bfd6dd..41f1af56422c3 100644 --- a/pkgs/development/tools/analysis/snyk/default.nix +++ b/pkgs/development/tools/analysis/snyk/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "snyk"; - version = "1.1291.0"; + version = "1.1292.1"; src = fetchFromGitHub { owner = "snyk"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-m70XujX2KOTvObjeBtoAbrYddi/+pLDLPXf/o+/DtmU="; + hash = "sha256-N54fSRYTFOlmfpommEFIqbMP5IBkhatMwx4CQ8fd5QI="; }; - npmDepsHash = "sha256-f7sY7eCF8k28UnGyKqOP/exhsZQzUC70nIIjEOXEeC4="; + npmDepsHash = "sha256-VHZqc111cC8AANogxXVg4BFlngdmrrt7E+tCMF5Rl7g="; postPatch = '' substituteInPlace package.json \ diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index a765966e35cb8..d9a851d09824f 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-aws"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-1ttqSRz++xJdpJIQ+rSCiGFhN5EJwW6tbAporc8J0LU="; + hash = "sha256-sgAr4kUBjKIH+DgI5XqH/Zs3uL0yiYwlBa6vO0m++xM="; }; - vendorHash = "sha256-4QH/KehKBSNQhW8z/tk5ExAXKQNQ5Rl3RKyj+0jm/eI="; + vendorHash = "sha256-B2QFjJKwfQYZP8ypiv7bNkFNr3ejP42WA/bmv4Jz46c="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 28aa1e39e89e1..3a97b63216b59 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "tfsec"; - version = "1.28.6"; + version = "1.28.9"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "tfsec"; rev = "refs/tags/v${version}"; - hash = "sha256-Dc6eXw1qGr2KxRoG3Odfa07s2SYdnxVbJHeVQdETBIs="; + hash = "sha256-Dulbo5ZTw4+1XxjpnZ1aIsVPLVEqwQKdNMv+L9/j1wc="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { # "-extldflags '-fno-PIC -static'" ]; - vendorHash = "sha256-RxsoTNj/V1UgcMq7vbjGlkJCMEVyvfmSz2IPncs53hY="; + vendorHash = "sha256-Hu530cBJWGtvMmQ6gbROXf5JBfkOfc4nwznsKBTegUk="; subPackages = [ "cmd/tfsec" diff --git a/pkgs/development/tools/bearer/default.nix b/pkgs/development/tools/bearer/default.nix index 30f7defdfe428..735c7383f720d 100644 --- a/pkgs/development/tools/bearer/default.nix +++ b/pkgs/development/tools/bearer/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "bearer"; - version = "1.43.8"; + version = "1.45.0"; src = fetchFromGitHub { owner = "bearer"; repo = "bearer"; rev = "refs/tags/v${version}"; - hash = "sha256-rDmS13eDPYE/UmyCRsBi1wHOZerYf9QS/pOiPKVxwKA="; + hash = "sha256-6q9mUv1S44shGr3ScqLNTw1AiFS2sQmAMionsEdfOOw="; }; - vendorHash = "sha256-7rTbLnFfdmRQgQfx2w/mO3Ac5ENEFm5XPzApKwlImkE="; + vendorHash = "sha256-q3JnxFSnMePBfwFdrj69uh65UXqeL0+QUvGjzkS2lGs="; subPackages = [ "cmd/bearer" ]; diff --git a/pkgs/development/tools/biome/default.nix b/pkgs/development/tools/biome/default.nix index 5674846952518..3cf1402c556ed 100644 --- a/pkgs/development/tools/biome/default.nix +++ b/pkgs/development/tools/biome/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "biome"; - version = "1.7.3"; + version = "1.8.1"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "cli/v${version}"; - hash = "sha256-iSL0PRHj32PpKoUogej0bc/zXGpS4ZgZG/+9Pewhl4k="; + hash = "sha256-RR4yHrLeEHNLe0Nr8FHm+u+DFJihbibRax41Ss9HDV8="; }; - cargoHash = "sha256-no6ZrH1Ma+n66SLgA3h9dQX8FgeVjFVkxfqR35F/prs="; + cargoHash = "sha256-xCA1kxt70lrCrPygMe98eF8RC/l47EnJPjLaXBccBRE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index 6b485b80ea1c0..a74b029d327ad 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { installPhase = '' runHook preInstall - ./b2 install --prefix="$out" + ./b2 ${lib.optionalString (stdenv.cc.isClang) "toolset=clang "}install --prefix="$out" # older versions of b2 created this symlink, # which we want to support building via useBoost. diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 3edfe7aea5746..be6c65faec9b8 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "buf"; - version = "1.32.2"; + version = "1.34.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; rev = "v${version}"; - hash = "sha256-lSK1ETeCnK/NeCHaZoHcgFO5OhbE6XcvbJg1+p9x4Hg="; + hash = "sha256-a2OuxstfZcN49CLn4Tk6DeCXUKZOrMQ7pNDicmNxVRA="; }; - vendorHash = "sha256-LMjDR8tTZPLiIKxvdGjeaVMOh76eYhmAlI7lDJ7HG7I="; + vendorHash = "sha256-rAuFXXoC0zp/n+2Ogxrj7Ji3wpQ45XloOs7nI8K41eo="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index a2f007a0fcf4f..39d974e0f3b8e 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = with python3.pkgs; [ - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index 778a8c2f221b2..173c87ca0a6a5 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.26.1"; + version = "1.26.4"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-XgOtPL3gzSRX+VWAsNo6zMCh6tQoeH1HvH6oycS6S70="; + hash = "sha256-+vgP8Nu/t7pxU/YGIIi8zd0zuAzZFdpcZLGnjZgqYGM="; }; - cargoHash = "sha256-maqdfN8UXcAU3UGxjE6PJWxyilKWJZPkfXY7tu72LTk="; + cargoHash = "sha256-WDBAuzUCjZxayXeEdxvWAHZyYRQLDMz3QkNO9QT/DyI="; env = { RUSTFLAGS = "-C strip=symbols"; diff --git a/pkgs/development/tools/build-managers/scala-cli/sources.json b/pkgs/development/tools/build-managers/scala-cli/sources.json index 27db1b9db55e1..676c8eebb07bf 100644 --- a/pkgs/development/tools/build-managers/scala-cli/sources.json +++ b/pkgs/development/tools/build-managers/scala-cli/sources.json @@ -1,21 +1,21 @@ { - "version": "1.3.2", + "version": "1.4.0", "assets": { "aarch64-darwin": { "asset": "scala-cli-aarch64-apple-darwin.gz", - "sha256": "0xs60pnqsxxkamcq0n0am4jbnx4lgnr91ngcwxk0ccfpqf24jpk8" + "sha256": "1k9yc868lh7yjvxf81pg9n1sdyb2c566i6qwrf7kxczn0s9sa12h" }, "aarch64-linux": { "asset": "scala-cli-aarch64-pc-linux.gz", - "sha256": "1419s6dnwk703mkp209m5fxqphx8g65h0b2kam3zs9z9rii3mjvs" + "sha256": "08chhm364m5lbl1wr5xiww3mmm8d31hfw07s4jdsrmpjvxx0yrhg" }, "x86_64-darwin": { "asset": "scala-cli-x86_64-apple-darwin.gz", - "sha256": "0ms7yggldckkyayz8wksyg79kgk6xl13g47a2jc7q66syzr495yw" + "sha256": "1a1ng800aaydvp83wrvxdxw3x6zcdgl2g7fa3zz5h2ba208xjv62" }, "x86_64-linux": { "asset": "scala-cli-x86_64-pc-linux.gz", - "sha256": "1jy5xz8n79ck8gxcmy14ldsaj7dfrwrqgdfhp5h39hzvgcs1mjvl" + "sha256": "1cav0c0bhag64mic1c37l9zb21zyasshcyl3r12y939fmc9icnww" } } } diff --git a/pkgs/development/tools/bundletool/default.nix b/pkgs/development/tools/bundletool/default.nix index d6f92f25bdfcc..d524da13cfac9 100644 --- a/pkgs/development/tools/bundletool/default.nix +++ b/pkgs/development/tools/bundletool/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "bundletool"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { url = "https://github.com/google/bundletool/releases/download/${version}/bundletool-all-${version}.jar"; - sha256 = "sha256-ggeZb4Oig5r9WtboUy2nSF6gaHS4BiohqUs+Lrl+s5Y="; + sha256 = "sha256-VOvuHx3oNn2a0mtGcr+yl2sLEhQuFdaD/HuOJU/GzBs="; }; dontUnpack = true; diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index d3f0ffa2e3b56..03c301f193626 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -51,6 +51,6 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/peterheesterman/chit"; license = licenses.mit; - maintainers = with maintainers; [ figsoda lilyball ]; + maintainers = with maintainers; [ figsoda ]; }; } diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix index e63e0d06ea14c..29b6cb3d8a381 100644 --- a/pkgs/development/tools/circup/default.nix +++ b/pkgs/development/tools/circup/default.nix @@ -21,7 +21,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ setuptools-scm - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/clickable/default.nix b/pkgs/development/tools/clickable/default.nix deleted file mode 100644 index 5400e4189379d..0000000000000 --- a/pkgs/development/tools/clickable/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ lib -, fetchFromGitLab -, buildPythonPackage -, cookiecutter -, requests -, pyyaml -, jsonschema -, argcomplete -, pytestCheckHook -, watchdog -, stdenv -}: - -buildPythonPackage rec { - pname = "clickable"; - version = "7.11.0"; - - src = fetchFromGitLab { - owner = "clickable"; - repo = "clickable"; - rev = "v${version}"; - sha256 = "sha256-OVS+FK2ABoKbBFLDc3drcjeaa3yO9/8Ah8FzlN2fd8g="; - }; - - propagatedBuildInputs = [ - cookiecutter - requests - pyyaml - jsonschema - argcomplete - watchdog - ]; - - nativeCheckInputs = [ pytestCheckHook ]; - - disabledTests = [ - # Tests require docker - "test_cpp_plugin" - "test_html" - "test_python" - "test_qml_only" - "test_rust" - "test_review" - "test_click_build" - "test_no_device" - "test_no_file_temp" - "test_update" - "test_lib_build" - "test_clean" - "test_temp_exception" - "test_create_interactive" - "test_create_non_interactive" - "test_kill" - "test_writable_image" - "test_no_desktop_mode" - "test_no_lock" - "test_run_default_command" - "test_run" - "test_no_container_mode_log" - "test_custom_mode_log" - "test_skip_desktop_mode" - "test_log" - "test_custom_lock_file" - "test_launch_custom" - "test_launch" - "test_devices" - "test_install" - "test_skip_container_mode" - ] ++ - # There are no docker images available for the aarch64 architecutre - # which are required for tests. - lib.optionals stdenv.isAarch64 [ - "test_arch" - "test_restricted_arch" - ]; - - meta = { - description = "Build system for Ubuntu Touch apps"; - mainProgram = "clickable"; - homepage = "https://clickable-ut.dev"; - changelog = "https://clickable-ut.dev/en/latest/changelog.html"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ ilyakooo0 ]; - }; -} diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index 2ca64c5c74e67..12471d9d47981 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.36.0"; + version = "0.37.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-OFfcr8BXkTEB6lxImwHVFxnvursGcg83dVWsjegKf4w="; + hash = "sha256-5kQGUO0TBoqeQNc2gmaLDju7cE3wOz/DOO34vB405SA="; }; - vendorHash = "sha256-ealTxDNG6uJc0Lb20e8W3zv0azgpwI2kBn92d0lWaoc="; + vendorHash = "sha256-4ZPLscZWF9GfNMU70TjR5+Hi/rvm43n+GvqxFUu13JU="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/development/tools/cocoapods/default.nix b/pkgs/development/tools/cocoapods/default.nix index 54411fc015863..49f7cc3134afb 100644 --- a/pkgs/development/tools/cocoapods/default.nix +++ b/pkgs/development/tools/cocoapods/default.nix @@ -19,7 +19,6 @@ bundlerApp { platforms = platforms.darwin; maintainers = with maintainers; [ peterromfeldhk - lilyball ]; mainProgram = "pod"; }; diff --git a/pkgs/development/tools/codeowners/default.nix b/pkgs/development/tools/codeowners/default.nix index 703d46efa7fe3..3c7bdb1ff222a 100644 --- a/pkgs/development/tools/codeowners/default.nix +++ b/pkgs/development/tools/codeowners/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "codeowners"; - version = "1.1.2"; + version = "1.2.1"; src = fetchFromGitHub { owner = "hmarr"; repo = pname; rev = "v${version}"; - hash = "sha256-bjSlt439Y5hmbxR6s4J37ao+P2tuKNuwqRg872P+MUg="; + hash = "sha256-PMT3ihxCD4TNgTZOD4KB9Od1djIhnlMa8zuD6t1OieU="; }; - vendorHash = "sha256-G+oaX3SXsHJu3lq6n8dLmoRXDAYcFkrYarwePB/MdEU="; + vendorHash = "sha256-CpGlw4xe+gg2IRov9Atd8Z7XbXs1zkIYxvBVpsY/gxg="; meta = with lib; { description = "CLI and Go library for Github's CODEOWNERS file"; diff --git a/pkgs/development/tools/coder/default.nix b/pkgs/development/tools/coder/default.nix index 2da9a90e4280b..bef9cdaa6cc89 100644 --- a/pkgs/development/tools/coder/default.nix +++ b/pkgs/development/tools/coder/default.nix @@ -13,21 +13,21 @@ let channels = { stable = { - version = "2.11.3"; + version = "2.11.4"; hash = { - x86_64-linux = "sha256-TaEl7J/Zo/K+j8EGpIauQYR5UucALviuSk0/jgiK83U="; - x86_64-darwin = "sha256-qM2YTvHGeAi1F4V79YoDdsp1NbHFah8L0bppUhmzZyY="; - aarch64-linux = "sha256-gLaxi3h2JrnVecS/k3YHuWM1R1oLXKg5R1aeh3GVREY="; - aarch64-darwin = "sha256-SochFDBspdKfw1xd2FiyI9bp2Y3SbdgbGtzwUDyMsLE="; + x86_64-linux = "sha256-um7bwlHzPh6dF2KspGLQfzSVywWdImUc0U/HTkWT2jA="; + x86_64-darwin = "sha256-AiT63c47obiGnf9Vo0C2F3YoVLWdbH/+pkgFT0Tvzew="; + aarch64-linux = "sha256-7tl58GmO5pBsjSkiF/Oy1r3a+Giko/+2Ir7r4V6vy4c="; + aarch64-darwin = "sha256-e86dqZptcQeGlCclLRfNW3Ku9UucW0vXHBGC7r/0Apc="; }; }; mainline = { - version = "2.12.2"; + version = "2.12.3"; hash = { - x86_64-linux = "sha256-UJnJ64zwuDKzc/yKLQnj//3tXZ/GJpzUUw8KoH3Uf14="; - x86_64-darwin = "sha256-d+BWUEMvta7ZkCOqMTafuR5suIDWPauwTzGOpPDF+ck="; - aarch64-linux = "sha256-ayZZhqL3YLjaUDmHOiY4yXg/+tGR7HpLcwojuagqkKg="; - aarch64-darwin = "sha256-EYB7YLScshBInLBOXVfYs+f+OWC7OF9tEmhhG25pPSo="; + x86_64-linux = "sha256-cg2Xr4yZXVFl081fGYztDa35TnaQYmS/uMqc1z5UAmc="; + x86_64-darwin = "sha256-zK/I/D5N5hcFMrBxebaA5WSRml0RaKrSX1FI/+YSXxI="; + aarch64-linux = "sha256-KRIdyQFTBmhEm0hkdoilYNlQhcpagilc5fZ6k18Riu4="; + aarch64-darwin = "sha256-4q6Sz+ZguMxznPuwf0Ip+KWTDKPPZ/ICdvltVLmQinE="; }; }; }; diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index a0e11089497c2..66d347a058d6b 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -2,14 +2,12 @@ , stdenv , buildPythonApplication , fetchFromGitHub -, fetchpatch , makeWrapper # Tie withPlugins through the fixed point here, so it will receive an # overridden version properly , buildbot , pythonOlder , python -, pythonRelaxDepsHook , twisted , jinja2 , msgpack @@ -73,7 +71,7 @@ let in buildPythonApplication rec { pname = "buildbot"; - version = "3.11.3"; + version = "4.0.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -82,11 +80,10 @@ buildPythonApplication rec { owner = "buildbot"; repo = "buildbot"; rev = "v${version}"; - hash = "sha256-rDbAWLoEEjygW72YDBsVwiaHdRTVYA9IFxY3XMDleho="; + hash = "sha256-uJj7bSRGdYkA7Jl0qe/DncexWXNfQEEPcqGI7AbwX1w="; }; build-system = [ - pythonRelaxDepsHook ]; pythonRelaxDeps = [ @@ -137,13 +134,6 @@ buildPythonApplication rec { # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch - # Fix gitpoller, source: https://github.com/buildbot/buildbot/pull/7664 - # Included in next release. - (fetchpatch { - url = "https://github.com/buildbot/buildbot/commit/dd5d61e63e3b0740cc538a225ccf104ccecfc734.patch"; - sha256 = "sha256-CL6uRaKxh8uCBfWQ0tNiLh2Ym0HVatWni8hcuTyAAw0="; - excludes = ["master/buildbot/test/unit/changes/test_gitpoller.py"]; - }) ]; postPatch = '' @@ -171,8 +161,11 @@ buildPythonApplication rec { passthru = { inherit withPlugins; - tests.buildbot = nixosTests.buildbot; updateScript = ./update.sh; + } // lib.optionalAttrs stdenv.isLinux { + tests = { + inherit (nixosTests) buildbot; + }; }; meta = with lib; { diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index a93cbf28e3b84..3f982a2a36a4c 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -1,15 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k, buildbot }: +{ lib, buildPythonPackage, isPy3k, buildbot }: -buildPythonPackage rec { +buildPythonPackage { pname = "buildbot_pkg"; - inherit (buildbot) version; - - src = fetchPypi { - inherit pname version; - hash = "sha256-pO2TmTwbY0cnR+882pl7wDiR6JEK+sHHpAltKmTxiIM="; - }; + inherit (buildbot) src version; postPatch = '' + cd pkg # Their listdir function filters out `node_modules` folders. # Do we have to care about that with Nix...? substituteInPlace buildbot_pkg.py --replace "os.listdir = listdir" "" diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 7403498a8c614..45c4d56308945 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, callPackage, mock, cairosvg, klein, jinja2, buildbot-pkg }: +{ lib, buildPythonPackage, fetchurl, callPackage, mock, cairosvg, klein, jinja2, buildbot-pkg }: { # this is exposed for potential plugins to use and for nix-update inherit buildbot-pkg; @@ -6,9 +6,9 @@ pname = "buildbot_www"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-EL5iZ257VXnL+29Jr6r3PVeURX1AcugfZ4RLTjClsXo="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-OzH7ckNL09s4r3f6PIc3q9lLT3NgCdIf0IMwJtwlKiY="; }; # Remove unnecessary circular dependency on buildbot @@ -33,9 +33,9 @@ pname = "buildbot_www_react"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-5QLw5nXnU+z11E5Tgvu9bbbpCTRpV2zXndukcZPRjtE="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-lfurzhNJ5DvuPCD/WJ3k+ajuZzhNF6zGOgSuuD0/+Ys="; }; # Remove unnecessary circular dependency on buildbot @@ -60,9 +60,9 @@ pname = "buildbot_console_view"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-tzqifo9A/KJF9dLpO7jblVaDjx7++v0wLz1Olc79JxI="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-uKNqnqUkNkd14/6QcquyWp1v59bNWcTB4s8lRO9hkUc="; }; buildInputs = [ buildbot-pkg ]; @@ -82,9 +82,9 @@ pname = "buildbot_react_console_view"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-fzaqYmaO+vWnQpUvOsPCny3W27atcIHsgeGV6dKEJeg="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-wUrhPbd71F3OfXI5Re1xPnc1/vZxYXxdxX58fnWKjYE="; }; buildInputs = [ buildbot-pkg ]; @@ -104,9 +104,9 @@ pname = "buildbot_waterfall_view"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-BLIs91k8/A4LYMTDgct7TOWFoLU4qK47Javr8qRzkZQ="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-qc5mP7V2cOR3SOt224i8HVoAyWHvVYbsqfIQvPjesmE="; }; buildInputs = [ buildbot-pkg ]; @@ -126,9 +126,9 @@ pname = "buildbot_react_waterfall_view"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-dX+tp+WidfLy612+41jz+do/iXQTaIQPcetG8td3jp4="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-s6L4oF/wTOfM9uKFEJ/mjnQWE6oPRcd32lM1p2ox9+I="; }; buildInputs = [ buildbot-pkg ]; @@ -148,9 +148,9 @@ pname = "buildbot_grid_view"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-2kLGdvmf2mnF21gkDCf6h+bhnsxveaNNh95qczRY824="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-tZRwDqWYjBwguqA6T3ZoY38+QFogXKiTzbg1qjs/spE="; }; buildInputs = [ buildbot-pkg ]; @@ -170,9 +170,9 @@ pname = "buildbot_react_grid_view"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-rIAbk9+6Wi1PCjizHp9p6jpCwaBgBT5Ch1Sa4VKDoww="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-t++yXEgM4l40grSVccjx399TM/vUTmQOSInfH+Wqi50="; }; buildInputs = [ buildbot-pkg ]; @@ -192,9 +192,9 @@ pname = "buildbot_wsgi_dashboards"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-D9mjEKFrh+ytNbpuN/06XbiBnKjFLopXfjDg28j7niw="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-MkrMcaf2UeUYjkwcdhj4rhBwEtVESJEMtGa7RArNLz0="; }; buildInputs = [ buildbot-pkg ]; @@ -214,9 +214,9 @@ pname = "buildbot_react_wsgi_dashboards"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-q3In0IMAIBUjxSzv4LlH9EJukLYJ3WzoEYkFBZB96W8="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-iCAtKOl/8sfCwa3tsK2oQ+ybs0TVF5uWg4Jv/r7oPWg="; }; buildInputs = [ buildbot-pkg ]; @@ -236,9 +236,9 @@ pname = "buildbot_badges"; inherit (buildbot-pkg) version; - src = fetchPypi { - inherit pname version; - hash = "sha256-TK4KYn3CWxymTsKWeqHr2i5rdO9ZDHvJrb9RqfKNJV4="; + src = fetchurl { + url = "https://github.com/buildbot/buildbot/releases/download/v${version}/${pname}-${version}.tar.gz"; + hash = "sha256-28vj6wUZEnVUSUWrveJ5tdIjN+l4RDewPnm3IVQPXn4="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/update.sh b/pkgs/development/tools/continuous-integration/buildbot/update.sh index 3936594617c1b..b1e407ef165b3 100755 --- a/pkgs/development/tools/continuous-integration/buildbot/update.sh +++ b/pkgs/development/tools/continuous-integration/buildbot/update.sh @@ -3,8 +3,6 @@ set -eu -o pipefail nix-update buildbot -nix-update --version=skip buildbot-worker -nix-update --version=skip buildbot-plugins.buildbot-pkg nix-update --version=skip buildbot-plugins.www nix-update --version=skip buildbot-plugins.www-react nix-update --version=skip buildbot-plugins.console-view diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index 071559eccf6c2..aacdf92e30a53 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -1,6 +1,5 @@ { lib , buildPythonPackage -, fetchPypi , buildbot , stdenv @@ -22,16 +21,12 @@ , nixosTests }: -buildPythonPackage (rec { +buildPythonPackage ({ pname = "buildbot_worker"; - inherit (buildbot) version; - - src = fetchPypi { - inherit pname version; - hash = "sha256-TFymBnUufOEWZ/IUKd7nebZ+yl58ZChFkGrUxOXn28g="; - }; + inherit (buildbot) src version; postPatch = '' + cd worker substituteInPlace buildbot_worker/scripts/logwatcher.py \ --replace /usr/bin/tail "${coreutils}/bin/tail" ''; diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix index e50259bed2366..31299c031e8fe 100644 --- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cirrus-cli"; - version = "0.119.1"; + version = "0.120.2"; src = fetchFromGitHub { owner = "cirruslabs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nEGeh0ZTYE4Ff0x+1G38KUFcUsr39kvM8QUfmHCFyK4="; + hash = "sha256-IVhO8F5KhwCDJ4cm/Iu9vSuAKAF3l1vIjIqSzfYn9Ck="; }; - vendorHash = "sha256-rL4bXt6VBG2b9nZ1M2FF6E8ODPT3UF4aRHSJqpVWyTw="; + vendorHash = "sha256-R5H48idKHTTECEffpQIZgj9xMlHgHCL5OFbe3ZAda/o="; ldflags = [ "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}" diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 3cb8c66f36532..ae72eae909421 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "2.5.15"; + version = "2.5.16"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; rev = "v${version}"; - hash = "sha256-FKOpHvturPJQOhWJh5I7JwDhp0X0Y0ppFejTW1hG6Fk="; + hash = "sha256-FvL7LGgSMxflr7X9Z1qe9qPmDcqEr7ZGM36mtOhlTWY="; }; vendorHash = "sha256-vwcItklYe6ljFdGTxef19plaI5OMoOtQohY0xZLBUos="; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 4ff96bfd32679..f04c55d03fbbc 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.17.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-r0C03K/jyL8P0iysa6R1AaHVpB6Bw/FUwBIz7V/rGak="; + hash = "sha256-74pbcY8qAFUOuj/1LCIQ4DHAcxubQcnWDS/oCa2MN3c="; }; - vendorHash = "sha256-8NVkpJEAp3UsM2BnZVcavK+89MELo0T96tTcY0pke6Q="; + vendorHash = "sha256-3gNyB2xwdYNXhWru7smIbNoyM+bqiXvash8NJ7O8pQQ="; doCheck = false; diff --git a/pkgs/development/tools/djlint/default.nix b/pkgs/development/tools/djlint/default.nix index d84afa203e5b3..07af36e98ceed 100644 --- a/pkgs/development/tools/djlint/default.nix +++ b/pkgs/development/tools/djlint/default.nix @@ -17,7 +17,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; pythonRelaxDeps = [ diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 2e4bb56d0f256..0db8f1f4fbfcc 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "doctl"; - version = "1.107.0"; + version = "1.108.0"; vendorHash = null; @@ -31,7 +31,7 @@ buildGoModule rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "sha256-svwFIM1lJI60bdmzZS/QZSzy30HtOf498GgnqLFGKAQ="; + sha256 = "sha256-7qfzayuCpjOY8n+bixvm1OcS+BumkZJ0Oyn1xfNezX4="; }; meta = with lib; { diff --git a/pkgs/development/tools/documentation/gi-docgen/default.nix b/pkgs/development/tools/documentation/gi-docgen/default.nix index b2652f6ca9fd5..9d5da739745f5 100644 --- a/pkgs/development/tools/documentation/gi-docgen/default.nix +++ b/pkgs/development/tools/documentation/gi-docgen/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gi-docgen"; - version = "2023.3"; + version = "2024.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz"; - hash = "sha256-TesfCXc/cGJZrGUgUNp7PuWYcbw/1c+3foEdt0mNyOc="; + hash = "sha256-hwx3+WIEYszknjVUKkLcFhL8hYcz6D274kjFNUWK7B4="; }; depsBuildBuild = [ diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix index e4f81e56456e0..d2b69af76ed13 100644 --- a/pkgs/development/tools/drm_info/default.nix +++ b/pkgs/development/tools/drm_info/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mainProgram = "drm_info"; homepage = "https://github.com/ascent12/drm_info"; license = licenses.mit; - maintainers = with maintainers; [ tadeokondrak ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/tools/electron/binary/default.nix b/pkgs/development/tools/electron/binary/default.nix index b884428cf8b73..07637d13e9f25 100644 --- a/pkgs/development/tools/electron/binary/default.nix +++ b/pkgs/development/tools/electron/binary/default.nix @@ -1,8 +1,11 @@ +let + infoJson = builtins.fromJSON (builtins.readFile ./info.json); +in + { lib, callPackage }: let mkElectron = callPackage ./generic.nix { }; - infoJson = builtins.fromJSON (builtins.readFile ./info.json); in lib.mapAttrs' (majorVersion: info: lib.nameValuePair diff --git a/pkgs/development/tools/enochecker-test/default.nix b/pkgs/development/tools/enochecker-test/default.nix index 7e0f25317eac4..ca6a49e3502fd 100644 --- a/pkgs/development/tools/enochecker-test/default.nix +++ b/pkgs/development/tools/enochecker-test/default.nix @@ -2,7 +2,6 @@ , buildPythonApplication , fetchPypi , pythonOlder -, pythonRelaxDepsHook , certifi , charset-normalizer @@ -34,7 +33,6 @@ buildPythonApplication rec { }; nativeBuildInputs = [ - pythonRelaxDepsHook ]; pythonRelaxDeps = true; diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix index 5dfb508441d59..d499083b523a4 100644 --- a/pkgs/development/tools/extism-cli/default.nix +++ b/pkgs/development/tools/extism-cli/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "extism-cli"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "extism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-b+X0pFrKhcfzucUM8akV061zslkdF1Jc9X1aqCqXagU="; + hash = "sha256-kAdvQtc3FWXQffL1KRg4peeAJ+0439n609jTV9u11aA="; }; - vendorHash = "sha256-5QSZDPRMlLVyOQGCSxNC5BBiuegschkHA0sWvOVAODI="; + vendorHash = "sha256-yQ6LGWNVWxrUqFskt22+G9OfbcKfHXh1bf4uNoATsxg="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix index a8bffafdd1c65..2b4d1d505db30 100644 --- a/pkgs/development/tools/fable/default.nix +++ b/pkgs/development/tools/fable/default.nix @@ -4,7 +4,7 @@ buildDotnetGlobalTool { pname = "fable"; version = "4.18.0"; - nugetSha256 = "sha256-PbrFjpltRx4lnQDgQrOKSVHwttePMfOnjljOddkFbmY="; + nugetHash = "sha256-PbrFjpltRx4lnQDgQrOKSVHwttePMfOnjljOddkFbmY="; passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/pkgs/development/tools/fable/update.sh b/pkgs/development/tools/fable/update.sh index 9d23084ebd85a..181570d1a0dee 100755 --- a/pkgs/development/tools/fable/update.sh +++ b/pkgs/development/tools/fable/update.sh @@ -36,4 +36,4 @@ NUGET_URL="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.r HASH=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$NUGET_URL")") sed -i "s/version = \".*\"/version = \"$VER\"/" "$NIX_DRV" -sed -i "s#nugetSha256 = \"sha256-.\{44\}\"#nugetSha256 = \"$HASH\"#" "$NIX_DRV" +sed -i "s#nugetHash = \"sha256-.\{44\}\"#nugetHash = \"$HASH\"#" "$NIX_DRV" diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 4bf70a004d3eb..e8790999e1530 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -4,7 +4,6 @@ , apksigner , buildPythonApplication , python3 -, pythonRelaxDepsHook , installShellFiles , androguard , babel @@ -59,7 +58,6 @@ buildPythonApplication rec { ''; nativeBuildInputs = [ - pythonRelaxDepsHook installShellFiles ]; diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index 4218896faf13d..c1fd0b4598f1a 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "13.11.3"; + version = "13.12.0"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; rev = "v${version}"; - hash = "sha256-JgmiWcWGGJOv9P0x/WSlkVhmcNSIX12jKZuZBSHxqkg="; + hash = "sha256-w6tzqbNma7gTnUXOkPtcENO2XcchTXqueZlg08C8vF8="; }; - npmDepsHash = "sha256-dDIw8R2126HLqhU+8dq7zroJ7YHHiV6s8yTSrmtgURM="; + npmDepsHash = "sha256-7/5cZOYMQ3b77aRZkBA5jTDm+PnepzdW6I8RyBNr7oo="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json diff --git a/pkgs/development/tools/fx/default.nix b/pkgs/development/tools/fx/default.nix deleted file mode 100644 index bcb458f0b6478..0000000000000 --- a/pkgs/development/tools/fx/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: - -buildGoModule rec { - pname = "fx"; - version = "34.0.0"; - - src = fetchFromGitHub { - owner = "antonmedv"; - repo = pname; - rev = version; - hash = "sha256-gVeeCJOqrEua5quID1n1928oHtP9gfIDe4erVn1y2Eo="; - }; - - nativeBuildInputs = [ installShellFiles ]; - - vendorHash = "sha256-otORAeD9+J6/10TDusEnFfRRxTb/52Zk7Ttaw46xnsU=/sTS1mJw="; - - postInstall = '' - installShellCompletion --cmd fx \ - --bash <($out/bin/fx --comp bash) \ - --fish <($out/bin/fx --comp fish) \ - --zsh <($out/bin/fx --comp zsh) - ''; - - meta = with lib; { - description = "Terminal JSON viewer"; - mainProgram = "fx"; - homepage = "https://github.com/antonmedv/fx"; - changelog = "https://github.com/antonmedv/fx/releases/tag/${src.rev}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda ]; - }; -} diff --git a/pkgs/development/tools/gauge/plugins/js/default.nix b/pkgs/development/tools/gauge/plugins/js/default.nix index 621cbbbc1938e..20af0ab0f8f97 100644 --- a/pkgs/development/tools/gauge/plugins/js/default.nix +++ b/pkgs/development/tools/gauge/plugins/js/default.nix @@ -7,17 +7,17 @@ }: buildNpmPackage rec { pname = "gauge-plugin-js"; - version = "4.0.1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "getgauge"; repo = "gauge-js"; rev = "v${version}"; - hash = "sha256-qCn4EKndd0eM3X0+aLrCwvmEG5fgUfpVm76cg/n7B84="; + hash = "sha256-OUjB/ZETv8z3YDf/ftyqL8oKDEqyp1h1pK5IgEcq+rw="; fetchSubmodules = true; }; - npmDepsHash = "sha256-5XkFwCFqNMe5xc/Tx69uUV7KMtgY7Z3zE7hbtxYqRf0="; + npmDepsHash = "sha256-EZlSfFYJvlVFkuXcktHnWuAEAcUmKxO6tzgMqRDcCeY="; npmBuildScript = "package"; buildInputs = [ nodejs ]; diff --git a/pkgs/development/tools/git-ps-rs/default.nix b/pkgs/development/tools/git-ps-rs/default.nix index b9e41327237bd..af4b52a9fad0c 100644 --- a/pkgs/development/tools/git-ps-rs/default.nix +++ b/pkgs/development/tools/git-ps-rs/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "git-ps-rs"; - version = "7.1.1"; + version = "7.2.0"; src = fetchFromGitHub { owner = "uptech"; repo = "git-ps-rs"; rev = version; - hash = "sha256-HkiCc/5Xx+1IKMz/vXPXwUp3c8qSjobhQaIJCzq8dqQ="; + hash = "sha256-OkQLuTZ4CFxA8Ezpo7ChVDR3BzLzlF/EOkZjTIbjJl4="; }; - cargoHash = "sha256-r4cmnLkW8ocTcTECAbCk3S94T09lOUzHLQIGHv97W54="; + cargoHash = "sha256-9SmUGSHPhByBkSyuyNSBCsYsWxF7e13i00Jbf4COOj4="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 84885d912129f..da706dcdb30a9 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -18,6 +18,7 @@ , docbook-xsl-nons , docbook_xml_dtd_42 , gnome +, adwaita-icon-theme , gdk-pixbuf , libxslt , gsettings-desktop-schemas @@ -55,7 +56,7 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 gsettings-desktop-schemas gdk-pixbuf - gnome.adwaita-icon-theme + adwaita-icon-theme ] ++ lib.optionals enableWebkit2gtk [ webkitgtk_4_1 ]; diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index dc533daf99a38..94186dc643c6c 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -28,7 +28,7 @@ mavenJdk8.buildMavenPackage rec { sha256 = "sha256-z38I61JR4oiAkImkbwcvXoK5QsdoR986dDrOzhHsCeY="; }; - mvnHash = "sha256-Qbx1cNKFtSEnzhFImtCz2psYts2yhTDKzjmBBZavWwU="; + mvnHash = "sha256-es8M7gV2z1V9VpWOxanJwQyiemabiUw3n4heJB8Q75A="; nativeBuildInputs = [ jdk8 makeWrapper ]; diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix index 9b50f9c67e745..e3660c66048e0 100644 --- a/pkgs/development/tools/go-containerregistry/default.nix +++ b/pkgs/development/tools/go-containerregistry/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: let bins = [ "crane" "gcrane" ]; in @@ -14,6 +14,8 @@ buildGoModule rec { }; vendorHash = null; + nativeBuildInputs = [ installShellFiles ]; + subPackages = [ "cmd/crane" "cmd/gcrane" ]; outputs = [ "out" ] ++ bins; @@ -29,7 +31,14 @@ buildGoModule rec { mv $out/bin/${bin} ''$${bin}/bin/ && ln -s ''$${bin}/bin/${bin} $out/bin/ '') bins - ); + ) + '' + for cmd in crane gcrane; do + installShellCompletion --cmd "$cmd" \ + --bash <($GOPATH/bin/$cmd completion bash) \ + --fish <($GOPATH/bin/$cmd completion fish) \ + --zsh <($GOPATH/bin/$cmd completion zsh) + done + ''; # NOTE: no tests doCheck = false; diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix index 61a67acb99ded..2dbd3fdf70876 100644 --- a/pkgs/development/tools/gqlgenc/default.nix +++ b/pkgs/development/tools/gqlgenc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.22.0"; + version = "0.23.2"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-hGX9DiGpJOOjQEaT9qnpeS1ODfo4pd03WlvT3aaSK2w="; + sha256 = "sha256-a+/X2q9Rii/8odXGICNOB7uWXd6vfqquP+wGvT/tRUo="; }; excludedPackages = [ "example" ]; diff --git a/pkgs/development/tools/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index ac1704eecd617..2cf429e6a09dd 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "hcloud"; - version = "1.43.1"; + version = "1.44.2"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-XPDaywSCvXc9jo8bNxaF9Pj6Vs+Hz0MxDPbbnRNW3VI="; + hash = "sha256-ZslnJr5VJ6eHjBm1azaANGj9hHXKo+sRJXmW4xjRMhg="; }; - vendorHash = "sha256-pN+HMsZ2FpxwF/yPfYGwJNj9i4fgnE3cKo3mti3KoR0="; + vendorHash = "sha256-pDBuuHuG2Xk1R3BP1Ds2uY5I7brXWg1ULKQgmuuQVP4="; ldflags = [ "-s" diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix index 1bf0321b4378b..342cc4009edf4 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/development/tools/hotdoc/default.nix @@ -121,6 +121,6 @@ buildPythonApplication rec { description = "Tastiest API documentation system"; homepage = "https://hotdoc.github.io/"; license = [ licenses.lgpl21Plus ]; - maintainers = with maintainers; [ lilyinstarlight ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/jaq/default.nix b/pkgs/development/tools/jaq/default.nix index fd1604f0c2167..c9e6f1221efa0 100644 --- a/pkgs/development/tools/jaq/default.nix +++ b/pkgs/development/tools/jaq/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "jaq"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "01mf02"; repo = "jaq"; rev = "v${version}"; - hash = "sha256-6HqZBJeUaYykTZLSrqQN0Rt6rvnvzb53T56oy06wIUw="; + hash = "sha256-Lk8lss9ZwyN7fuWwHm7e7HvYNIUSNelswoYhZ+Dr6iw="; }; - cargoHash = "sha256-Zais+yGfrzxKrKA4uAG65uzhamnuYxQEKkIaeiOlcLQ="; + cargoHash = "sha256-0YPzPRBqO9otX9kSxufeW/M0TggKAoSTsChbOhMjv74="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/development/tools/java/java-language-server/default.nix index b0cc4df31ab9b..94b771dc53cb0 100644 --- a/pkgs/development/tools/java/java-language-server/default.nix +++ b/pkgs/development/tools/java/java-language-server/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, jdk, maven +, jdk_headless, maven , makeWrapper }: @@ -25,7 +25,7 @@ maven.buildMavenPackage rec { mvnFetchExtraArgs.dontConfigure = true; mvnHash = "sha256-2uthmSjFQ43N5lgV11DsxuGce+ZptZsmRLTgjDo0M2w="; - nativeBuildInputs = [ jdk makeWrapper ]; + nativeBuildInputs = [ jdk_headless makeWrapper ]; dontConfigure = true; preBuild = '' diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix index fc5cd68217ed7..23d9859eeb876 100644 --- a/pkgs/development/tools/jazzy/default.nix +++ b/pkgs/development/tools/jazzy/default.nix @@ -14,7 +14,6 @@ bundlerApp { platforms = platforms.darwin; maintainers = with maintainers; [ peterromfeldhk - lilyball nicknovitski ]; }; diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index 32c131cf78595..8d4ec0d1c5a65 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { outputs = [ "bin" "doc" "man" "dev" "lib" "out" ]; + # https://github.com/jqlang/jq/issues/2871 + postPatch = lib.optionalString stdenv.isFreeBSD '' + substituteInPlace Makefile.am --replace-fail "tests/mantest" "" --replace-fail "tests/optionaltest" "" + ''; + # Upstream script that writes the version that's eventually compiled # and printed in `jq --help` relies on a .git directory which our src # doesn't keep. diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index af08a7dfa43de..2d19cc70a2250 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-NlSb0UNe61AG/BQyUFqZEug3VnGTi0W0o0CblvV+oDg="; + hash = "sha256-OgIU+xWkQnU+ngeMrOkMFaQuvcMfVzKvukcJTgInyxM="; }; subPackages = [ "./" ]; diff --git a/pkgs/development/tools/konf/default.nix b/pkgs/development/tools/konf/default.nix index bfbf71b6f5f14..dcba4474f0d32 100644 --- a/pkgs/development/tools/konf/default.nix +++ b/pkgs/development/tools/konf/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "konf"; - version = "0.5.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "SimonTheLeg"; repo = "konf-go"; rev = "v${version}"; - hash = "sha256-uzB3quuex00Gp7YRkgo7gF92oPcBoQtLwG6hqMzK6oo="; + hash = "sha256-GSrR2uLeGodmE1egRtvTyWhJckYUnI97n7dnmjPvu3k="; }; vendorHash = "sha256-sB3j19HrTtaRqNcooqNy8vBvuzxxyGDa7MOtiGoVgN8="; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index ee0e34f144c9e..0fe6c0fb43dff 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kubie"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "sha256-3sFtYUFUYYHDqF22XJ+pmg+fW2f03IS5CgIXjWg2+Bo="; + sha256 = "sha256-TjZ8n88uldCNfpdReE/SYPkj0m6bBA2lI4SyNAhPFFM="; }; - cargoHash = "sha256-9eUGGDBoeF6EM3Np95rFHU3luGuVZk5iE4kIYlUnEEw="; + cargoHash = "sha256-AkeKAPzgKDvnS+eyAh8MJfPOPFF+v6Rje3eXu7LM6Pk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/kustomize/kustomize-sops.nix b/pkgs/development/tools/kustomize/kustomize-sops.nix index 07cb98726f049..b12d583d6a860 100644 --- a/pkgs/development/tools/kustomize/kustomize-sops.nix +++ b/pkgs/development/tools/kustomize/kustomize-sops.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kustomize-sops"; - version = "4.3.1"; + version = "4.3.2"; src = fetchFromGitHub { owner = "viaduct-ai"; repo = pname; rev = "v${version}"; - hash = "sha256-zEiRbbQzUqFHNtrzyZDNEaXT/T+TfB6KqOXkdjrCiW4="; + hash = "sha256-FSRjPXS4Dk5oH8EO7TW6iHdGNvVhaQ7gZJ+qROXUU3U="; }; - vendorHash = "sha256-aNrhS4oCG5DB3yjolWL49DtNqZA5dNRqQ2YPBeKQzWI="; + vendorHash = "sha256-1qnNJltam04uLMhH8YftAl2jjEZP2UhVIMp9Vcy3jeg="; installPhase = '' mkdir -p $out/lib/viaduct.ai/v1/ksops-exec/ diff --git a/pkgs/development/tools/language-servers/csharp-ls/default.nix b/pkgs/development/tools/language-servers/csharp-ls/default.nix index 0972bac8c8486..5cae31845563e 100644 --- a/pkgs/development/tools/language-servers/csharp-ls/default.nix +++ b/pkgs/development/tools/language-servers/csharp-ls/default.nix @@ -10,7 +10,7 @@ buildDotnetGlobalTool rec { pname = "csharp-ls"; version = "0.14.0"; - nugetSha256 = "sha256-agcx7VPIqGhl3NzdGLPwXYJsRuvSjL4SdbNg9vFjIh4="; + nugetHash = "sha256-agcx7VPIqGhl3NzdGLPwXYJsRuvSjL4SdbNg9vFjIh4="; dotnet-sdk = sdk_8_0; dotnet-runtime = sdk_8_0; diff --git a/pkgs/development/tools/language-servers/gopls/default.nix b/pkgs/development/tools/language-servers/gopls/default.nix index 9c1203486e797..655a6a8c1ff4e 100644 --- a/pkgs/development/tools/language-servers/gopls/default.nix +++ b/pkgs/development/tools/language-servers/gopls/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "gopls"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; rev = "gopls/v${version}"; - hash = "sha256-X5XBYTD+DIbHFBMWkLGosZUORexYt83mML/akUzrnFk="; + hash = "sha256-4RpQrlFj0stefVBouxyYN3Pf0PkYZ4cn4IKIskqUhVY="; }; modRoot = "gopls"; - vendorHash = "sha256-XH3kSfnlwmbOLkWJCjKmU1ghCkarn23M0q0vJQHkCe0="; + vendorHash = "sha256-D+ew0XyHRns1i9KAdV5vhCs3Uu338EujYjwU6IIZ8OY="; # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30 ldflags = [ "-X main.version=v${version}" ]; diff --git a/pkgs/development/tools/language-servers/helm-ls/default.nix b/pkgs/development/tools/language-servers/helm-ls/default.nix index 73f2facc840e8..92929511e9766 100644 --- a/pkgs/development/tools/language-servers/helm-ls/default.nix +++ b/pkgs/development/tools/language-servers/helm-ls/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "helm-ls"; - version = "0.0.17"; + version = "0.0.18"; src = fetchFromGitHub { owner = "mrjosh"; repo = "helm-ls"; rev = "v${version}"; - hash = "sha256-c72QFlsCPBW4biTMh1nxQIEkKPjmSmxOD93Kzduswyo="; + hash = "sha256-nOb7hoUOQfmpCYqui+hw5hcL/pURvsMXlksa8KUBjSY="; }; vendorHash = "sha256-jGC8JNlorw0FSc0HhFdUVZJDCNaX4PWPaFKRklufIsQ="; diff --git a/pkgs/development/tools/language-servers/neocmakelsp/default.nix b/pkgs/development/tools/language-servers/neocmakelsp/default.nix index a8d0e373a110d..41d5b50891e52 100644 --- a/pkgs/development/tools/language-servers/neocmakelsp/default.nix +++ b/pkgs/development/tools/language-servers/neocmakelsp/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "neocmakelsp"; - version = "0.7.6"; + version = "0.7.7"; src = fetchFromGitHub { owner = "Decodetalkers"; repo = "neocmakelsp"; rev = "v${version}"; - hash = "sha256-V8bbJg7h/TCv0y8Kwz3h6XMKtxKjJKduCj9e1vcd6AQ="; + hash = "sha256-IfseZsHCSuF1zGq8u3mPju0gxVtR0a7ibHV+tEK6wh0="; }; - cargoHash = "sha256-kR4QJ1QFewI5jKPX9/P1z5J9hnWBIhWExF6JgmDzoJw="; + cargoHash = "sha256-QaoyaeFfoxVoTh4Sg/6EXYPsUD1nNG7MPSH2EeYMLn0="; meta = with lib; { description = "Cmake lsp based on tower-lsp and treesitter"; diff --git a/pkgs/development/tools/language-servers/pylyzer/Cargo.lock b/pkgs/development/tools/language-servers/pylyzer/Cargo.lock index 6127a15eead72..9e1987bba3e7a 100644 --- a/pkgs/development/tools/language-servers/pylyzer/Cargo.lock +++ b/pkgs/development/tools/language-servers/pylyzer/Cargo.lock @@ -10,9 +10,9 @@ checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -37,21 +37,21 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -80,10 +80,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" + +[[package]] name = "cc" -version = "1.0.90" +version = "1.0.104" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" +checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" [[package]] name = "cfg-if" @@ -105,28 +111,28 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.68", ] [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "els" -version = "0.1.48-nightly.2" +version = "0.1.52-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1160cfdc48996a3f0f1e8e5b2d060e48ab7245e3931eef154fe0afc4de6d55e" +checksum = "1bd0a3c0bfdf681ff58dde3d15efc100f712df1ae1d7d9388cbd8107cb7e3c79" dependencies = [ "erg_common", "erg_compiler", @@ -138,9 +144,9 @@ dependencies = [ [[package]] name = "erg_common" -version = "0.6.36-nightly.2" +version = "0.6.40-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f19dd94255e83e016cd6d7cd18e99e9c927e2144cf9d17e759271c40c6cf1dcd" +checksum = "4c80f1574b5268d421f2067bdde5776f9363512706d011587432d2a0886eba56" dependencies = [ "backtrace-on-stack-overflow", "erg_proc_macros", @@ -150,9 +156,9 @@ dependencies = [ [[package]] name = "erg_compiler" -version = "0.6.36-nightly.2" +version = "0.6.40-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4712faf4c949016d752e7d697dab1df44043eaf94bea5a2ada73b1ab70dfe0" +checksum = "1efdec52061fad5d2238053cb15105d125e55cf116863e1b5337b8d286941ae3" dependencies = [ "erg_common", "erg_parser", @@ -160,9 +166,9 @@ dependencies = [ [[package]] name = "erg_parser" -version = "0.6.36-nightly.2" +version = "0.6.40-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791e826192978d665e46aa30aa7330ef470b90e6e5ebe38c2b32a2a4141bc919" +checksum = "926d6768a062c5851b20eda7f77aed41e7f326b8589ae4b8703b13c49364eab5" dependencies = [ "erg_common", "erg_proc_macros", @@ -171,9 +177,9 @@ dependencies = [ [[package]] name = "erg_proc_macros" -version = "0.6.36-nightly.2" +version = "0.6.40-nightly.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119857fa1bb184c6b2adba2e3b2a71797f6c7865bc6d4fdddac988fda9e55b77" +checksum = "da422e93bd4346cf04fadf410bc6b63881cda0842c1d976ee5a7f2b8ae29927e" dependencies = [ "quote", "syn 1.0.109", @@ -199,9 +205,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "libc", @@ -210,15 +216,15 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", ] @@ -242,7 +248,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.68", ] [[package]] @@ -256,9 +262,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "lalrpop-util" @@ -268,9 +274,9 @@ checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libm" @@ -280,9 +286,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ "autocfg", "scopeguard", @@ -290,9 +296,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lsp-types" @@ -300,7 +306,7 @@ version = "0.93.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51" dependencies = [ - "bitflags", + "bitflags 1.3.2", "serde", "serde_json", "serde_repr", @@ -309,9 +315,9 @@ dependencies = [ [[package]] name = "malachite" -version = "0.4.5" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53ff327de42075f680ba15c5cb3c417687eb7241ce2063a91d0186ce5c5e77ee" +checksum = "0b6ea071913d15f7e0566bc4768aae3918906ea77f0abbb387ca7c0dc9303f90" dependencies = [ "malachite-base", "malachite-nz", @@ -320,9 +326,9 @@ dependencies = [ [[package]] name = "malachite-base" -version = "0.4.5" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e960ee0e7e1b8eec9229f5b20d6b191762574225144ea638eb961d065c97b55d" +checksum = "44c817c713ff9f16e06cfdc23baa3fecf1b71eaaac714816a98a560f4e350aa6" dependencies = [ "hashbrown", "itertools", @@ -345,9 +351,9 @@ dependencies = [ [[package]] name = "malachite-nz" -version = "0.4.5" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770aaf1a4d59a82ed3d8644eb66aff7492a6dd7476def275a922d04d77ca8e57" +checksum = "603729facf62429736ac17a9fc9fe1bf7e0eb8bde3da3b18cc2b6153150464d5" dependencies = [ "itertools", "libm", @@ -356,9 +362,9 @@ dependencies = [ [[package]] name = "malachite-q" -version = "0.4.5" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a9dfca114f6b582595990ccfc287cace633aa95f890ade5b1fc099b7175d3b" +checksum = "c73844ccbf0e9baaf34d4a6d187f0d6a925ce8e74ef37a67d238e7d65529b38c" dependencies = [ "itertools", "malachite-base", @@ -367,9 +373,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memoffset" @@ -382,9 +388,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] @@ -406,7 +412,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if", "libc", @@ -424,18 +430,18 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", ] [[package]] name = "object" -version = "0.32.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" dependencies = [ "memchr", ] @@ -448,9 +454,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core", @@ -458,9 +464,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", @@ -471,9 +477,9 @@ dependencies = [ [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "percent-encoding" @@ -527,16 +533,16 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] [[package]] name = "py2erg" -version = "0.0.54" +version = "0.0.55" dependencies = [ "erg_common", "erg_compiler", @@ -546,7 +552,7 @@ dependencies = [ [[package]] name = "pylyzer" -version = "0.0.54" +version = "0.0.55" dependencies = [ "els", "erg_common", @@ -558,9 +564,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -597,18 +603,18 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags", + "bitflags 2.6.0", ] [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc-hash" @@ -628,7 +634,7 @@ dependencies = [ [[package]] name = "rustpython-ast" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser#9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" +source = "git+https://github.com/RustPython/Parser#51b5f80ae3080dfec2db815a299a69873fb9ca65" dependencies = [ "is-macro", "malachite-bigint", @@ -639,7 +645,7 @@ dependencies = [ [[package]] name = "rustpython-parser" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser#9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" +source = "git+https://github.com/RustPython/Parser#51b5f80ae3080dfec2db815a299a69873fb9ca65" dependencies = [ "anyhow", "is-macro", @@ -662,7 +668,7 @@ dependencies = [ [[package]] name = "rustpython-parser-core" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser#9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" +source = "git+https://github.com/RustPython/Parser#51b5f80ae3080dfec2db815a299a69873fb9ca65" dependencies = [ "is-macro", "memchr", @@ -672,7 +678,7 @@ dependencies = [ [[package]] name = "rustpython-parser-vendored" version = "0.3.1" -source = "git+https://github.com/RustPython/Parser#9ce55aefdeb35e2f706ce0b02d5a2dfe6295fc57" +source = "git+https://github.com/RustPython/Parser#51b5f80ae3080dfec2db815a299a69873fb9ca65" dependencies = [ "memchr", "once_cell", @@ -680,9 +686,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "scopeguard" @@ -692,35 +698,35 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.68", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -729,13 +735,13 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" +checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.68", ] [[package]] @@ -746,9 +752,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "static_assertions" @@ -769,9 +775,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -799,9 +805,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -887,9 +893,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" @@ -921,9 +927,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -945,13 +951,14 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "windows-targets" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", "windows_i686_gnu", + "windows_i686_gnullvm", "windows_i686_msvc", "windows_x86_64_gnu", "windows_x86_64_gnullvm", @@ -960,62 +967,68 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.48.5" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.48.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "zerocopy" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.32" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.68", ] diff --git a/pkgs/development/tools/language-servers/pylyzer/default.nix b/pkgs/development/tools/language-servers/pylyzer/default.nix index 95814084800d5..3dd2e90ead0bb 100644 --- a/pkgs/development/tools/language-servers/pylyzer/default.nix +++ b/pkgs/development/tools/language-servers/pylyzer/default.nix @@ -8,23 +8,26 @@ , writeScriptBin , darwin , which +, nix-update-script +, testers +, pylyzer }: rustPlatform.buildRustPackage rec { pname = "pylyzer"; - version = "0.0.54"; + version = "0.0.55"; src = fetchFromGitHub { owner = "mtshiba"; repo = "pylyzer"; rev = "refs/tags/v${version}"; - hash = "sha256-GUZMzV0yztlLcxvuTAuRoQ4eQhoMMyqjdu3cfOCJCJE="; + hash = "sha256-19SkaTDZK05o5OTPGe4AAEx3mJHOtCrknlJgrf4+oq0="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "rustpython-ast-0.3.1" = "sha256-q9N+z3F6YICQuUMp3a10OS792tCq0GiSSlkcaLxi3Gs="; + "rustpython-ast-0.3.1" = "sha256-KjglE3KvA9F7eg9pPTV6+PrLxiWnCgtkMOsFsoPC5N8="; }; }; @@ -65,11 +68,17 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/pylyzer --set ERG_PATH $out/lib/erg ''; - meta = with lib; { + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = pylyzer; }; + }; + + meta = { description = "Fast static code analyzer & language server for Python"; homepage = "https://github.com/mtshiba/pylyzer"; changelog = "https://github.com/mtshiba/pylyzer/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ natsukium ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ natsukium ]; + mainProgram = "pylyzer"; }; } diff --git a/pkgs/development/tools/language-servers/ruff-lsp/default.nix b/pkgs/development/tools/language-servers/ruff-lsp/default.nix index cf14e02435448..be327cae1ba08 100644 --- a/pkgs/development/tools/language-servers/ruff-lsp/default.nix +++ b/pkgs/development/tools/language-servers/ruff-lsp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "ruff-lsp"; - version = "0.0.53"; + version = "0.0.54"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "astral-sh"; repo = "ruff-lsp"; rev = "refs/tags/v${version}"; - hash = "sha256-gtMqIsgGCzSBo5D4+Ne8tUloDV9+MufYkN96yr7XVd4="; + hash = "sha256-VSuEjrRiHWA78DWQgbj0D+GFjhXrREUOHUcQpFqflcw="; }; postPatch = '' @@ -32,11 +32,11 @@ buildPythonPackage rec { sed -i '/"ruff>=/d' pyproject.toml ''; - nativeBuildInputs = [ + build-system = [ hatchling ]; - propagatedBuildInputs = [ + dependencies = [ packaging pygls lsprotocol @@ -63,12 +63,12 @@ buildPythonPackage rec { "--unset PYTHONPATH" ]; - meta = with lib; { + meta = { changelog = "https://github.com/astral-sh/ruff-lsp/releases/tag/v${version}"; description = "Language Server Protocol implementation for Ruff"; homepage = "https://github.com/astral-sh/ruff-lsp"; - license = licenses.mit; + license = lib.licenses.mit; mainProgram = "ruff-lsp"; - maintainers = with maintainers; [ figsoda kalekseev ]; + maintainers = with lib.maintainers; [ figsoda kalekseev ]; }; } diff --git a/pkgs/development/tools/language-servers/vhdl-ls/default.nix b/pkgs/development/tools/language-servers/vhdl-ls/default.nix index dabd9484499aa..791b3365b1f8e 100644 --- a/pkgs/development/tools/language-servers/vhdl-ls/default.nix +++ b/pkgs/development/tools/language-servers/vhdl-ls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vhdl-ls"; - version = "0.81.0"; + version = "0.82.0"; src = fetchFromGitHub { owner = "VHDL-LS"; repo = "rust_hdl"; rev = "v${version}"; - hash = "sha256-iF8HIfxC7WM5YT85HfCTM5hu5yCFnHpDposGDAO3qJI="; + hash = "sha256-nAtC0AFNexI7gdVjroP2GlsES7d+E2RZY0d4VMddvXI="; }; - cargoHash = "sha256-hkmaMzeQLd3l6A3xyLAZk+MrEeUKPd7H2N4Nsz7nBmk="; + cargoHash = "sha256-oM5cROdSHEoGbn7eF/gvu+f0ymhxADR9u7uRB8iH1qc="; postPatch = '' substituteInPlace vhdl_lang/src/config.rs \ diff --git a/pkgs/development/tools/language-servers/yaml-language-server/default.nix b/pkgs/development/tools/language-servers/yaml-language-server/default.nix index 90aae9d0d82bf..585ea255ef7d5 100644 --- a/pkgs/development/tools/language-servers/yaml-language-server/default.nix +++ b/pkgs/development/tools/language-servers/yaml-language-server/default.nix @@ -1,10 +1,14 @@ { lib -, mkYarnPackage -, fetchYarnDeps , fetchFromGitHub +, fetchYarnDeps +, fixup-yarn-lock +, makeWrapper +, nodejs +, stdenv +, yarn }: -mkYarnPackage rec { +stdenv.mkDerivation rec { pname = "yaml-language-server"; version = "1.15.0"; @@ -15,21 +19,54 @@ mkYarnPackage rec { hash = "sha256-Y3Q/y9UIiy7US8Jl4vxT0Pfw8h3hiXK+Cu9TEQHyAaA="; }; - packageJSON = ./package.json; offlineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; hash = "sha256-zHcxZ4VU6CGux72Nsy0foU4gFshK1wO/LTfnwOoirmg="; }; + nativeBuildInputs = [ + makeWrapper + fixup-yarn-lock + yarn + ]; + + buildInputs = [ + nodejs + ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror "$offlineCache" + fixup-yarn-lock yarn.lock + yarn --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive install + patchShebangs node_modules + + runHook postConfigure + ''; + buildPhase = '' runHook preBuild - export HOME=$(mktemp -d) - yarn --offline build + yarn --offline compile + yarn --offline build:libs runHook postBuild ''; + installPhase = '' + runHook preInstall + + yarn --offline --production install + + mkdir -p $out/bin $out/lib/node_modules/yaml-language-server + cp -r . $out/lib/node_modules/yaml-language-server + ln -s $out/lib/node_modules/yaml-language-server/bin/yaml-language-server $out/bin/ + + runHook postInstall + ''; + meta = { changelog = "https://github.com/redhat-developer/yaml-language-server/blob/${src.rev}/CHANGELOG.md"; description = "Language Server for YAML Files"; diff --git a/pkgs/development/tools/manifest-tool/default.nix b/pkgs/development/tools/manifest-tool/default.nix index e4688cb60d8b4..fe85fb0c451c8 100644 --- a/pkgs/development/tools/manifest-tool/default.nix +++ b/pkgs/development/tools/manifest-tool/default.nix @@ -9,14 +9,14 @@ buildGoModule rec { pname = "manifest-tool"; - version = "2.1.6"; + version = "2.1.7"; modRoot = "v2"; src = fetchFromGitHub { owner = "estesp"; repo = "manifest-tool"; rev = "v${version}"; - hash = "sha256-/u60hi/KnPVWlNh6nxjXpH0ct5PLVE44deGxhzbayD0="; + hash = "sha256-f3rl4ktqvZlqIBmk9WeZ0IUil2bEAdusdCIvtqm9Gwk="; leaveDotGit = true; postFetch = '' git -C $out rev-parse HEAD > $out/.git-revision diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix index 87fab7031e229..cd7ef00e80361 100644 --- a/pkgs/development/tools/melange/default.nix +++ b/pkgs/development/tools/melange/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-31v9xANoots+tAY9XErouoFDcnLXYaChRwRmZ9vdqCs="; + hash = "sha256-GSYsmXERdxSmd9IPfgkg2dEtFHnYQpAFXnCiZJ8CAM0="; # 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; @@ -25,7 +25,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-jliPUJ1lSoh6QszOvz9aBs2KAJwL19dRKCVTpDLgg2s="; + vendorHash = "sha256-czsCvos9C6AwV+PiwkNHePWT6NvE8GhnvfiAbKKXQuU="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 7e9e83ea6fb3a..35dfd3efac54c 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "4.4.3"; + version = "4.5.0"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-lRZs/+oClNdSGapBDt9hROfergHi1cGeP5jlkL8LWxs="; + sha256 = "sha256-zmXBP0lCviqlMhKdbmZeko9XR0AJY9R+YkkKXAA2NW8="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index a8c253e4333cc..1c91797b9dd98 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.63"; + version = "0.2.64"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-umYP/U1UjqWbF1YDZYbQrlMubhxr80FFBDS1NeiI9wI="; + hash = "sha256-r/d961IQVZgKh1eT7tFE1KFVwMhp7E8z+jV1AaqBtiQ="; }; - vendorHash = "sha256-Dt6V1zngSra4ZMSboHzreqwxgH5ovMIB+Bq3eWK6tjA="; + vendorHash = "sha256-FveFo78LuTFKEch/5uqdwksS6c7MLbl+xQvZGSVmTko="; doCheck = false; diff --git a/pkgs/development/tools/misc/astyle/default.nix b/pkgs/development/tools/misc/astyle/default.nix index 139233ef1f761..9912736cf31ad 100644 --- a/pkgs/development/tools/misc/astyle/default.nix +++ b/pkgs/development/tools/misc/astyle/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "astyle"; - version = "3.5"; + version = "3.5.1"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-3vwct7+oY77EcOg2wldDmhGZyiyLE6ZSoyf9eMj1kjw="; + hash = "sha256-dHoVlcvZeX2+r4SgKDaUHOiNYpSNMFG/WNdL4N10ojQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/tools/misc/binutils/0001-libtool.m4-update-macos-version-detection-block.patch b/pkgs/development/tools/misc/binutils/0001-libtool.m4-update-macos-version-detection-block.patch index e601be3a33082..f487ed7083332 100644 --- a/pkgs/development/tools/misc/binutils/0001-libtool.m4-update-macos-version-detection-block.patch +++ b/pkgs/development/tools/misc/binutils/0001-libtool.m4-update-macos-version-detection-block.patch @@ -1,47 +1,24 @@ -From 33a8dc728eb5da3e1d3439c96810d1f6b2660b89 Mon Sep 17 00:00:00 2001 -From: Andrew Childs <andrew.childs@bibo.com.ph> -Date: Tue, 22 Feb 2022 12:24:46 +0900 +From 368f26bfece3899a8c992cfec66427266918ab80 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode <randy@largeandhighquality.com> +Date: Thu, 4 Jul 2024 12:20:34 -0400 Subject: [PATCH] libtool.m4: update macos version detection block -Includes upstream change -9e8c882517082fe5755f2524d23efb02f1522490 --- - libtool.m4 | 21 ++++++++------------- - 1 file changed, 8 insertions(+), 13 deletions(-) + libtool.m4 | 1 + + 1 file changed, 1 insertion(+) diff --git a/libtool.m4 b/libtool.m4 -index 7a711249304..f452efb4300 100644 +index e36fdd3c0e2..dd4725f8cd1 100644 --- a/libtool.m4 +++ b/libtool.m4 -@@ -996,20 +996,15 @@ _LT_EOF - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; - darwin1.*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- darwin*) # darwin 5.x on -- # if running on 10.5 or later, the deployment target defaults -- # to the OS version, if on x86, and 10.4, the deployment -- # target defaults to 10.4. Don't you love it? -- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -- 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -- 10.[[012]][[,.]]*) -- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -- 10.*) -- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; -+ darwin*) -+ case $MACOSX_DEPLOYMENT_TARGET,$host in -+ 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) -+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; -+ *) -+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - esac +@@ -1011,6 +1011,7 @@ _LT_EOF + _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' + ;; + *) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}dynamic_lookup' + ;; + esac ;; - esac -- -2.34.1 +2.45.1 diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index a60457e73591e..308ac9d5913fb 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -16,6 +16,7 @@ in , perl , substitute , zlib +, CoreServices , enableGold ? withGold stdenv.targetPlatform , enableGoldDefault ? false @@ -33,12 +34,12 @@ assert enableGoldDefault -> enableGold; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; - version = "2.41"; + version = "2.42"; srcs = { normal = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - hash = "sha256-pMS+wFL3uDcAJOYDieGUN38/SLVmGEGOpRBn9nqqsws="; + hash = "sha256-qlSFDr2lBkxyzU7C2bBWwpQlKZFIY1DZqXqypt/frxI="; }; vc4-none = fetchFromGitHub { owner = "itszor"; @@ -66,11 +67,6 @@ stdenv.mkDerivation (finalAttrs: { # fetchpatch! All mutable patches (generated by GitHub or cgit) that are # needed here should be included directly in Nixpkgs as files. patches = [ - # Upstream patch to fix llvm testsuite failure when loading powerpc - # objects: - # https://sourceware.org/PR30794 - ./gold-powerpc-for-llvm.patch - # Make binutils output deterministic by default. ./deterministic.patch @@ -80,9 +76,6 @@ stdenv.mkDerivation (finalAttrs: { ./0001-Revert-libtool.m4-fix-the-NM-nm-over-here-B-option-w.patch ./0001-Revert-libtool.m4-fix-nm-BSD-flag-detection.patch - # Required for newer macos versions - ./0001-libtool.m4-update-macos-version-detection-block.patch - # For some reason bfd ld doesn't search DT_RPATH when cross-compiling. It's # not clear why this behavior was decided upon but it has the unfortunate # consequence that the linker will fail to find transitive dependencies of @@ -95,6 +88,11 @@ stdenv.mkDerivation (finalAttrs: { # not need to know binutils' BINDIR at all. It's an absolute path # where libraries are stored. ./plugins-no-BINDIR.patch + ] ++ lib.optionals buildPlatform.isDarwin [ + # Note: Conditional to avoid Linux rebuilds on staging-next. Remove the conditional with the next update. + # ld64 needs `-undefined dynamic_lookup` to link `libctf-nobfd.dylib`, but the Darwin + # version detection in `libtool.m4` fails to detect the Darwin version correctly. + ./0001-libtool.m4-update-macos-version-detection-block.patch ] ++ lib.optional targetPlatform.isiOS ./support-ios.patch # Adds AVR-specific options to "size" for compatibility with Atmel's downstream distribution @@ -128,7 +126,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals targetPlatform.isVc4 [ flex ] ; - buildInputs = [ zlib gettext ]; + buildInputs = [ zlib gettext ] ++ lib.optionals buildPlatform.isDarwin [ CoreServices ]; inherit noSysDirs; diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix index e562a6aec078b..4460d3dd8b200 100644 --- a/pkgs/development/tools/misc/blackfire/default.nix +++ b/pkgs/development/tools/misc/blackfire/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.28.6"; + version = "2.28.7"; src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}"); @@ -57,23 +57,23 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "IeeBIW0yvyWawBOL1nzbL/KsVF79eskKili7jL+i40A="; + sha256 = "XovtaEOUy67KyfYsF0KmzDNef7Jt01gkWrAq+xPS3uQ="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "LrDqaGeR9g4m/MSdYFqEigyR58U/4lThA/+YbI+Lsa8="; + sha256 = "C4LutO/wGjFOIOsulCoAmeHSkLCPgNGVd5vRclwoP9g="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "nLDJ6Nf+Zo8hoiHXlKJ1qGMmuT3LHsLkRDpQ43qYX1k="; + sha256 = "FBuwu1EYjDTMSW/slt94kxsXzSqhqPdUspM5XYNzHsw="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "3xYrGJZjnIUTZiKnoTBDtfvJ9+jN9RntcqiHBhcsiIU="; + sha256 = "g7fsG6sWdRmXvL1S9vI3yNHDKSWOdzLrp7Ydpw1jNss="; }; "x86_64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "YOWlxKEFRVtcw2HauIMGVTEter0jmKH6Yp2pQ0NGHlA="; + sha256 = "Ht3K297MExglKmtws/RvhQHFPhf1bTkIoNRvT/yJ+CM="; }; }; diff --git a/pkgs/development/tools/misc/blackfire/php-probe.nix b/pkgs/development/tools/misc/blackfire/php-probe.nix index c30dde82aaa62..fb2bf3964bdbc 100644 --- a/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -14,47 +14,47 @@ assert lib.assertMsg (!php.ztsSupport) "blackfire only supports non zts versions let phpMajor = lib.versions.majorMinor php.version; - version = "1.92.17"; + version = "1.92.18"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-BhAoC4q29toEq281aC2NRZ4uUhUDsl5QyiCh1dXpsLA="; - "8.2" = "sha256-jgqTRr9fOQQ/+bbJvXKq6kPeFGvUTs7gfBpkpeeFhWs="; - "8.3" = "sha256-McWJ+Ruyb7ySgDo8u7umgCjbh6dVd08wHYAxDMqjVGQ="; + "8.1" = "sha256-5PVYDcyjarTG8RZaqEMvS8FK4DOw9goSaz9WZQtjvFo="; + "8.2" = "sha256-2E+LmM0ZAkE4iIyo6Mxu8jJjX1aLHelsJRzM9Yo9D4g="; + "8.3" = "sha256-Rm1E+ouUz50Wq4bjGnBwDpVN9C3JXu9zF6jmcrn6Xzg="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-LRYSUZUqkSbjs5UZzNGGQKvf1aGyixqRQV1SYa7ica0="; - "8.2" = "sha256-VuPod48wx6rCSsZEV98AzqrD+a0t+yI0+9EifLjcROE="; - "8.3" = "sha256-r7+IVjLx0hpPWPL0sRSIUd4sBye1avQ0IW00fLIhfEY="; + "8.1" = "sha256-iJucmU/ytes45VJAhsJHsvovbZ/mHtj+ChVv1vsL/XU="; + "8.2" = "sha256-0Xc6d6ibfnkHEwwkseNWj52DesxVmBRD9oRZRS36XOI="; + "8.3" = "sha256-x89Ub3LDstdzqdMDcF0mMpwDGufNDNRAp2yeZLNXnoQ="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-JQTqbWbFC3kEHuYQTXL70T7clIPZTje0E6LBAjyBQdc="; - "8.2" = "sha256-uhm8SlbOwzd2HKUXha9jWoxYPzDEbiOo4GXQDby4BYA="; - "8.3" = "sha256-w99LTLpkk6rvTXZU2Qwi5DA40Zyw2/c4060Beusfebk="; + "8.1" = "sha256-wESvg1iqPMvT9EjTNLJk5GtzgW80UigmR0m4Rr8VVaQ="; + "8.2" = "sha256-/1hlgAVITlLM2i7aa3cIF/eci/q68rDT+wsB+zBxIzg="; + "8.3" = "sha256-oABuQk6uZxC/Ry1DcpKbULso5CzEZEIod0GECxbLROk="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-sXxVKZSEL1VVFoh41hWwF1KR9hX2R7SwUQ4et+ouJYs="; - "8.2" = "sha256-wA9oTpbUX967crg4Gq+AI04HtWmitodgTKNm1EEWltI="; - "8.3" = "sha256-l7C7k/6tYfkUJ2qkeY52XjP6uDfXm0Mk/xM0hoRvsEM="; + "8.1" = "sha256-hLPM07WVu1jPaaxR8YPeGcL05nrDG8LTVUJ9IoMKLWE="; + "8.2" = "sha256-2gUmMr55r2FBMlmd/dyXQaXMEfod9tG8/QY0fo0NJxc="; + "8.3" = "sha256-H+y1+671+V60GHHKP/0ss+A8t/h2HdGkRgARsqyJJ3M="; }; }; "x86_64-darwin" = { system = "amd64"; hash = { - "8.1" = "sha256-SDS7JaktrW9z9R0jDwd+Q3W13KnPknuIoKaaJddORW8="; - "8.2" = "sha256-pwFI4A4eUZKEZ5tDDlFTz5O+as7LXuyWdESgZI6soHQ="; - "8.3" = "sha256-H++ksK3IjHDCbGD3BaVpWlKx8OH0G3Luktx2pu0GCj0="; + "8.1" = "sha256-Mm+CiC6dBb1JOs+Z/3dPSJNdKqvRLruYEFihsY52bpI="; + "8.2" = "sha256-OXemTJV4exlTQj6MGBxMOA8TuXw3e6iXTD2i/gott2A="; + "8.3" = "sha256-VtGUwhKAXr+P6+sn65Hyo8Dxh+Iyd/K3dwlqQmH0ElI="; }; }; }; diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix deleted file mode 100644 index f3e30557ae9bd..0000000000000 --- a/pkgs/development/tools/misc/dart-sass/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ lib -, fetchFromGitHub -, buildDartApplication -, buf -, protoc-gen-dart -, testers -, dart-sass -, runCommand -, writeText -}: - -let - embedded-protocol-version = "2.7.1"; - - embedded-protocol = fetchFromGitHub { - owner = "sass"; - repo = "sass"; - rev = "refs/tags/embedded-protocol-${embedded-protocol-version}"; - hash = "sha256-6bGH/klCYxuq7CrOJVF8ySafhLJwet5ppBcpI8dzeCQ="; - }; -in -buildDartApplication rec { - pname = "dart-sass"; - version = "1.77.4"; - - src = fetchFromGitHub { - owner = "sass"; - repo = pname; - rev = version; - hash = "sha256-xHOZDeK6xYnfrb6yih6jzRDZLRvyp0EeKZynEq3A4aI="; - }; - - pubspecLock = lib.importJSON ./pubspec.lock.json; - - nativeBuildInputs = [ - buf - protoc-gen-dart - ]; - - preConfigure = '' - mkdir -p build - ln -s ${embedded-protocol} build/language - HOME="$TMPDIR" buf generate - ''; - - dartCompileFlags = [ "--define=version=${version}" ]; - - meta = with lib; { - homepage = "https://github.com/sass/dart-sass"; - description = "Reference implementation of Sass, written in Dart"; - mainProgram = "sass"; - license = licenses.mit; - maintainers = with maintainers; [ lelgenio ]; - }; - - passthru = { - inherit embedded-protocol-version embedded-protocol; - updateScript = ./update.sh; - tests = { - version = testers.testVersion { - package = dart-sass; - command = "dart-sass --version"; - }; - - simple = testers.testEqualContents { - assertion = "dart-sass compiles a basic scss file"; - expected = writeText "expected" '' - body h1{color:#123} - ''; - actual = runCommand "actual" - { - nativeBuildInputs = [ dart-sass ]; - base = writeText "base" '' - body { - $color: #123; - h1 { - color: $color; - } - } - ''; - } '' - dart-sass --style=compressed $base > $out - ''; - }; - }; - }; -} diff --git a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json b/pkgs/development/tools/misc/dart-sass/pubspec.lock.json deleted file mode 100644 index da5e7ea435f1f..0000000000000 --- a/pkgs/development/tools/misc/dart-sass/pubspec.lock.json +++ /dev/null @@ -1,837 +0,0 @@ -{ - "packages": { - "_fe_analyzer_shared": { - "dependency": "transitive", - "description": { - "name": "_fe_analyzer_shared", - "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "67.0.0" - }, - "analyzer": { - "dependency": "direct dev", - "description": { - "name": "analyzer", - "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.4.1" - }, - "archive": { - "dependency": "direct dev", - "description": { - "name": "archive", - "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.6.1" - }, - "args": { - "dependency": "direct main", - "description": { - "name": "args", - "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.0" - }, - "async": { - "dependency": "direct main", - "description": { - "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.11.0" - }, - "boolean_selector": { - "dependency": "transitive", - "description": { - "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "charcode": { - "dependency": "direct main", - "description": { - "name": "charcode", - "sha256": "fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.1" - }, - "checked_yaml": { - "dependency": "transitive", - "description": { - "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "cli_pkg": { - "dependency": "direct main", - "description": { - "name": "cli_pkg", - "sha256": "f812467b5d6a5f26ad0fba5dcfc95133df02edbae47dfa4ade3df5d2b5afdcf2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.10.0" - }, - "cli_repl": { - "dependency": "direct main", - "description": { - "name": "cli_repl", - "sha256": "a2ee06d98f211cb960c777519cb3d14e882acd90fe5e078668e3ab4baab0ddd4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.3" - }, - "cli_util": { - "dependency": "direct dev", - "description": { - "name": "cli_util", - "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.1" - }, - "collection": { - "dependency": "direct main", - "description": { - "name": "collection", - "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.18.0" - }, - "convert": { - "dependency": "transitive", - "description": { - "name": "convert", - "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.1" - }, - "coverage": { - "dependency": "transitive", - "description": { - "name": "coverage", - "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.8.0" - }, - "crypto": { - "dependency": "direct dev", - "description": { - "name": "crypto", - "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "csslib": { - "dependency": "transitive", - "description": { - "name": "csslib", - "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "dart_mappable": { - "dependency": "transitive", - "description": { - "name": "dart_mappable", - "sha256": "47269caf2060533c29b823ff7fa9706502355ffcb61e7f2a374e3a0fb2f2c3f0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.2" - }, - "dart_style": { - "dependency": "direct dev", - "description": { - "name": "dart_style", - "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.6" - }, - "dartdoc": { - "dependency": "direct dev", - "description": { - "name": "dartdoc", - "sha256": "76de402781a647e55f356f1ae4446a400a573421f84c95da13dda4754cdbcceb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.0.8" - }, - "ffi": { - "dependency": "transitive", - "description": { - "name": "ffi", - "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "file": { - "dependency": "transitive", - "description": { - "name": "file", - "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, - "fixnum": { - "dependency": "transitive", - "description": { - "name": "fixnum", - "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "frontend_server_client": { - "dependency": "transitive", - "description": { - "name": "frontend_server_client", - "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.0" - }, - "glob": { - "dependency": "transitive", - "description": { - "name": "glob", - "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "grinder": { - "dependency": "direct dev", - "description": { - "name": "grinder", - "sha256": "e1996e485d2b56bb164a8585679758d488fbf567273f51c432c8733fee1f6188", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.5" - }, - "html": { - "dependency": "transitive", - "description": { - "name": "html", - "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.15.4" - }, - "http": { - "dependency": "direct main", - "description": { - "name": "http", - "sha256": "761a297c042deedc1ffbb156d6e2af13886bb305c2a343a4d972504cd67dd938", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "http_multi_server": { - "dependency": "transitive", - "description": { - "name": "http_multi_server", - "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "http_parser": { - "dependency": "transitive", - "description": { - "name": "http_parser", - "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.2" - }, - "io": { - "dependency": "transitive", - "description": { - "name": "io", - "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "js": { - "dependency": "direct main", - "description": { - "name": "js", - "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.7" - }, - "json_annotation": { - "dependency": "transitive", - "description": { - "name": "json_annotation", - "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.9.0" - }, - "lints": { - "dependency": "direct dev", - "description": { - "name": "lints", - "sha256": "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.0" - }, - "logging": { - "dependency": "transitive", - "description": { - "name": "logging", - "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "markdown": { - "dependency": "transitive", - "description": { - "name": "markdown", - "sha256": "ef2a1298144e3f985cc736b22e0ccdaf188b5b3970648f2d9dc13efd1d9df051", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.2.2" - }, - "matcher": { - "dependency": "transitive", - "description": { - "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.16+1" - }, - "meta": { - "dependency": "direct main", - "description": { - "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.15.0" - }, - "mime": { - "dependency": "transitive", - "description": { - "name": "mime", - "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.5" - }, - "native_stack_traces": { - "dependency": "transitive", - "description": { - "name": "native_stack_traces", - "sha256": "64d2f4bcf3b69326fb9bc91b4dd3a06f94bb5bbc3a65e25ae6467ace0b34bfd3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.7" - }, - "native_synchronization": { - "dependency": "direct main", - "description": { - "name": "native_synchronization", - "sha256": "ff200fe0a64d733ff7d4dde2005271c297db81007604c8cd21037959858133ab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "node_interop": { - "dependency": "direct main", - "description": { - "name": "node_interop", - "sha256": "3af2420c728173806f4378cf89c53ba9f27f7f67792b898561bff9d390deb98e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "node_preamble": { - "dependency": "direct dev", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "oauth2": { - "dependency": "transitive", - "description": { - "name": "oauth2", - "sha256": "c4013ef62be37744efdc0861878fd9e9285f34db1f9e331cc34100d7674feb42", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "package_config": { - "dependency": "direct main", - "description": { - "name": "package_config", - "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "path": { - "dependency": "direct main", - "description": { - "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.9.0" - }, - "petitparser": { - "dependency": "transitive", - "description": { - "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.2" - }, - "pool": { - "dependency": "direct main", - "description": { - "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.1" - }, - "protobuf": { - "dependency": "direct main", - "description": { - "name": "protobuf", - "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.0" - }, - "protoc_plugin": { - "dependency": "direct dev", - "description": { - "name": "protoc_plugin", - "sha256": "fb0554851c9eca30bd18405fbbfe81e39166d4a2f0e5b770606fd69da3da0b2f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "21.1.2" - }, - "pub_api_client": { - "dependency": "direct dev", - "description": { - "name": "pub_api_client", - "sha256": "cc3d2c93df3823553de6a3e7d3ac09a3f43f8c271af4f43c2795266090ac9625", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.7.0" - }, - "pub_semver": { - "dependency": "direct main", - "description": { - "name": "pub_semver", - "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "pubspec": { - "dependency": "transitive", - "description": { - "name": "pubspec", - "sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.0" - }, - "pubspec_parse": { - "dependency": "direct dev", - "description": { - "name": "pubspec_parse", - "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.0" - }, - "quiver": { - "dependency": "transitive", - "description": { - "name": "quiver", - "sha256": "b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "retry": { - "dependency": "transitive", - "description": { - "name": "retry", - "sha256": "822e118d5b3aafed083109c72d5f484c6dc66707885e07c0fbcb8b986bba7efc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, - "shelf": { - "dependency": "transitive", - "description": { - "name": "shelf", - "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.1" - }, - "shelf_packages_handler": { - "dependency": "transitive", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_static": { - "dependency": "transitive", - "description": { - "name": "shelf_static", - "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "shelf_web_socket": { - "dependency": "transitive", - "description": { - "name": "shelf_web_socket", - "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "source_map_stack_trace": { - "dependency": "transitive", - "description": { - "name": "source_map_stack_trace", - "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "source_maps": { - "dependency": "direct main", - "description": { - "name": "source_maps", - "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.12" - }, - "source_span": { - "dependency": "direct main", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "stack_trace": { - "dependency": "direct main", - "description": { - "name": "stack_trace", - "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.1" - }, - "stream_channel": { - "dependency": "direct main", - "description": { - "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "stream_transform": { - "dependency": "direct main", - "description": { - "name": "stream_transform", - "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "string_scanner": { - "dependency": "direct main", - "description": { - "name": "string_scanner", - "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "term_glyph": { - "dependency": "direct main", - "description": { - "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "test": { - "dependency": "direct dev", - "description": { - "name": "test", - "sha256": "d11b55850c68c1f6c0cf00eabded4e66c4043feaf6c0d7ce4a36785137df6331", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.25.5" - }, - "test_api": { - "dependency": "transitive", - "description": { - "name": "test_api", - "sha256": "2419f20b0c8677b2d67c8ac4d1ac7372d862dc6c460cdbb052b40155408cd794", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.1" - }, - "test_core": { - "dependency": "transitive", - "description": { - "name": "test_core", - "sha256": "4d070a6bc36c1c4e89f20d353bfd71dc30cdf2bd0e14349090af360a029ab292", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.2" - }, - "test_descriptor": { - "dependency": "direct dev", - "description": { - "name": "test_descriptor", - "sha256": "abe245e8b0d61245684127fe32343542c25dc2a1ce8f405531637241d98d07e4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.1" - }, - "test_process": { - "dependency": "direct dev", - "description": { - "name": "test_process", - "sha256": "217f19b538926e4922bdb2a01410100ec4e3beb4cc48eae5ae6b20037b07bbd6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "type_plus": { - "dependency": "transitive", - "description": { - "name": "type_plus", - "sha256": "d5d1019471f0d38b91603adb9b5fd4ce7ab903c879d2fbf1a3f80a630a03fcc9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "typed_data": { - "dependency": "direct main", - "description": { - "name": "typed_data", - "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.2" - }, - "uri": { - "dependency": "transitive", - "description": { - "name": "uri", - "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "vm_service": { - "dependency": "transitive", - "description": { - "name": "vm_service", - "sha256": "360c4271613beb44db559547d02f8b0dc044741d0eeb9aa6ccdb47e8ec54c63a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "14.2.3" - }, - "watcher": { - "dependency": "direct main", - "description": { - "name": "watcher", - "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "web": { - "dependency": "transitive", - "description": { - "name": "web", - "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.1" - }, - "web_socket": { - "dependency": "transitive", - "description": { - "name": "web_socket", - "sha256": "24301d8c293ce6fe327ffe6f59d8fd8834735f0ec36e4fd383ec7ff8a64aa078", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.5" - }, - "web_socket_channel": { - "dependency": "transitive", - "description": { - "name": "web_socket_channel", - "sha256": "a2d56211ee4d35d9b344d9d4ce60f362e4f5d1aafb988302906bd732bc731276", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "webkit_inspection_protocol": { - "dependency": "transitive", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "xml": { - "dependency": "transitive", - "description": { - "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.5.0" - }, - "yaml": { - "dependency": "direct dev", - "description": { - "name": "yaml", - "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - } - }, - "sdks": { - "dart": ">=3.3.0 <4.0.0" - } -} diff --git a/pkgs/development/tools/misc/dart-sass/update.sh b/pkgs/development/tools/misc/dart-sass/update.sh deleted file mode 100755 index 595349e1387c2..0000000000000 --- a/pkgs/development/tools/misc/dart-sass/update.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p yq ripgrep common-updater-scripts dart - -set -xeu -o pipefail - -PACKAGE_DIR="$(realpath "$(dirname "$0")")" -cd "$PACKAGE_DIR/.." -while ! test -f default.nix; do cd .. ; done -NIXPKGS_DIR="$PWD" - -dart_sass_version="$( - list-git-tags --url=https://github.com/sass/dart-sass \ - | rg '^\d' \ - | sort --version-sort \ - | tail -n1 -)" - -embedded_protocol_version="$( - list-git-tags --url=https://github.com/sass/sass \ - | rg '^embedded-protocol-(.*)' -r '$1' \ - | sort --version-sort \ - | tail -n1 -)" - -cd "$NIXPKGS_DIR" -update-source-version dart-sass "$dart_sass_version" -update-source-version dart-sass "$embedded_protocol_version" \ - --version-key=embedded-protocol-version \ - --source-key=embedded-protocol - -TMPDIR="$(mktemp -d)" -cd "$TMPDIR" - -src="$(nix-build --no-link "$NIXPKGS_DIR" -A dart-sass.src)" -cp $src/pubspec.* . - -# Maybe one day upstream will ship a pubspec.lock, -# until then we must generate a fresh one -if ! test -f pubspec.lock; then - dart pub update -fi - -yq . pubspec.lock > "$PACKAGE_DIR/pubspec.lock.json" - -rm -rf "$TMPDIR" diff --git a/pkgs/development/tools/misc/direvent/default.nix b/pkgs/development/tools/misc/direvent/default.nix index bc7b7b5160a13..3e3de9f26676e 100644 --- a/pkgs/development/tools/misc/direvent/default.nix +++ b/pkgs/development/tools/misc/direvent/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "direvent"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "mirror://gnu/direvent/direvent-${version}.tar.gz"; - sha256 = "sha256-lAWop32kn+krvkrxi/kl/5H20zdMELfXAKAxusuUxJc="; + sha256 = "sha256-HbvGGSqrZ+NFclFIYD1XDGooKDgMlkIVdir5FSTXlbo="; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 983576a753347..954312b729b55 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -17,8 +17,11 @@ let sha256 = "0zjba1090awxkmgifr9jnjkxf41zhzc4f6mrnbayn3v6s77ca9x4"; }; - nativeBuildInputs = [ pkg-config autoconf automake ]; - buildInputs = [popt avahi python3 gtk3 which procps libiberty_static]; + nativeBuildInputs = [ + pkg-config autoconf automake which + (python3.withPackages (p: [ p.setuptools ])) + ]; + buildInputs = [ popt avahi gtk3 procps libiberty_static ]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 66560a91fcabd..aa9bed97069d1 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "editorconfig-checker"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; rev = "v${version}"; - hash = "sha256-jqaYJmezekSKdwg8gNdU/DH6S83dPc5WmTU3nfvKjwo="; + hash = "sha256-HgWfR0kOtP2cSSRGMPuy1qGqcS/4QAWPeBU+lwHnYqI="; }; - vendorHash = "sha256-mPYxBqM4VoSmhtobKAn6p3BXIFGrUzs8gA9x97SmbTw="; + vendorHash = "sha256-P5lOx9CH37Z7mkDshbwS+XJZQdQiqNKl71wR1iUvpm8="; doCheck = false; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index d75cb7f8bc9e5..7c3eb4e194235 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "editorconfig-core-c"; - version = "0.12.8"; + version = "0.12.9"; outputs = [ "out" "dev" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "editorconfig"; repo = "editorconfig-core-c"; rev = "v${finalAttrs.version}"; - hash = "sha256-zhWq87X8n7iyp5HBmV2ZTjcN09zQ/sBXPrGmQT0iRr4="; + hash = "sha256-myJNJxKwgmgm+P2MqnYmW8OC0oYcInL+Suyf/xwX9xo="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 757c4269e79b2..7f3d79f6a3d78 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -6,11 +6,11 @@ let pygments = python3Packages.pygments; in stdenv.mkDerivation rec { pname = "global"; - version = "6.6.12"; + version = "6.6.13"; src = fetchurl { url = "mirror://gnu/global/${pname}-${version}.tar.gz"; - hash = "sha256-VCpbBoQOFOylSLS7YLRMCtzwECTmjrNi+L9xYAeIWQE="; + hash = "sha256-lF80lzDaAfd4VNmBHKj4AWaclGE5WimWbY2Iy2cDNHs="; }; nativeBuildInputs = [ libtool makeWrapper ]; diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index b906456116c56..6e3124556f547 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -6,6 +6,7 @@ , git , openssh , nixosTests +, fetchpatch }: buildGoModule rec { @@ -19,6 +20,19 @@ buildGoModule rec { sha256 = "sha256-Qdk57zLjTXLdDEmB6K+sZAym5s0BekJJa/CpYeOBOcY="; }; + patches = [ + # add check config flag + # https://github.com/hound-search/hound/pull/485/files + (fetchpatch { + url = "https://github.com/MarcelCoding/hound/commit/b2f1cef335eff235394de336593687236a3b88bb.patch"; + hash = "sha256-3+EBvnA8JIx2P6YM+8LpojDIX7hNXJ0vwVN4oSAouZ4="; + }) + (fetchpatch { + url = "https://github.com/MarcelCoding/hound/commit/f917a457570ad8659d02fca4311cc91cadcadc00.patch"; + hash = "sha256-CGvcIoSbgiayli5B8JRjvGfLuH2fscNpNTEm7xwkfpo="; + }) + ]; + vendorHash = "sha256-0psvz4bnhGuwwSAXvQp0ju0GebxoUyY2Rjp/D43KF78="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 29d0a94e301ff..996bfeacb2d16 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -24,14 +24,14 @@ with two "luarocks" derivations. }: stdenv.mkDerivation (finalAttrs: { - pname = "luarocks"; - version = "3.11.0"; + pname = "luarocks_bootstrap"; + version = "3.11.1"; src = fetchFromGitHub { owner = "luarocks"; repo = "luarocks"; rev = "v${finalAttrs.version}"; - hash = "sha256-mSwwBuLWoMT38iYaV/BTdDmmBz4heTRJzxBHC0Vrvc4="; + hash = "sha256-GglygI8HP+aDFEuucOkjQ2Pgfv4+jW+og+2vL3KoZCQ="; }; patches = [ @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' sed -e "1s@.*@#! ${lua}/bin/lua$LUA_SUFFIX@" -i "$out"/bin/* substituteInPlace $out/etc/luarocks/* \ - --replace '${lua.luaOnBuild}' '${lua}' + --replace-fail '${lua.luaOnBuild}' '${lua}' '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd luarocks \ diff --git a/pkgs/development/tools/misc/regex-cli/default.nix b/pkgs/development/tools/misc/regex-cli/default.nix index eede6bb4d102b..0f197e66181d4 100644 --- a/pkgs/development/tools/misc/regex-cli/default.nix +++ b/pkgs/development/tools/misc/regex-cli/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "regex-cli"; - version = "0.2.0"; + version = "0.2.1"; src = fetchCrate { inherit pname version; - hash = "sha256-Uo1y3L4l/Ik//NoBLsCqvQmC7ZGaSt0XzT1wDGCoU4U="; + hash = "sha256-lHjChrjjqO7pApj7OA8BM2XvmU3iS+kEMPYSfb/C61U="; }; - cargoHash = "sha256-O0KAY9XeP+LFcvAwO5SbF5yMHU1KZ77UdkAGAcx1hHc="; + cargoHash = "sha256-5uxy2iAIUh60QjEPtkOP7A86ha4CY5+1QgzdIsEKPIs="; meta = with lib; { description = "Command line tool for debugging, ad hoc benchmarking and generating regular expressions"; diff --git a/pkgs/development/tools/misc/scip/default.nix b/pkgs/development/tools/misc/scip/default.nix index c36d4c5b08864..f31673a12f733 100644 --- a/pkgs/development/tools/misc/scip/default.nix +++ b/pkgs/development/tools/misc/scip/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "scip"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "scip"; rev = "v${version}"; - hash = "sha256-aSApi6fEKQP5bpuda2Zz6i/5xkyH+mxch803toJsZm8="; + hash = "sha256-o7DWSFd3rPSAOmhTvtI9X0tySNhDL7Jh7iDW8eIYn3w="; }; - vendorHash = "sha256-3Tq2cexcxHjaH6WIz2hneE1QeBSGoMINBncKbqxODxQ="; + vendorHash = "sha256-iFlbZvbj30UpgxJdndpLYcUZSTLQAO2MqJGb/6hO8Uc="; ldflags = [ "-s" diff --git a/pkgs/development/tools/misc/terser/default.nix b/pkgs/development/tools/misc/terser/default.nix index 9fe2e386b7ce7..efb4a364a68ea 100644 --- a/pkgs/development/tools/misc/terser/default.nix +++ b/pkgs/development/tools/misc/terser/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "terser"; - version = "5.31.0"; + version = "5.31.1"; src = fetchFromGitHub { owner = "terser"; repo = "terser"; rev = "v${version}"; - hash = "sha256-rZYzeNBUaimetn/NRugsx6Czc0NxMzAKN58DRcae7pM="; + hash = "sha256-yKJPV6JGZTNCMjHh8v+MgnhaMuGF5cVHGEIJei896Hg="; }; - npmDepsHash = "sha256-SKL//hww6I3RDkqEUBrM0xDSuoPOCArvKKiBz68JtRo="; + npmDepsHash = "sha256-E50RrEllhmluWe726KRmD2pcXbD2bSkWz8x6FeF+kOU="; meta = with lib; { description = "JavaScript parser, mangler and compressor toolkit for ES6+"; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 8d9a63fcf550c..2008d134b5380 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { ''; homepage = "https://github.com/XAMPPRocky/tokei"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ gebner lilyball ]; + maintainers = with maintainers; [ gebner ]; mainProgram = "tokei"; }; } diff --git a/pkgs/development/tools/misc/unixbench/default.nix b/pkgs/development/tools/misc/unixbench/default.nix index 4edd464a763d2..d5f060af82cf5 100644 --- a/pkgs/development/tools/misc/unixbench/default.nix +++ b/pkgs/development/tools/misc/unixbench/default.nix @@ -6,7 +6,7 @@ , installShellFiles , perl , xorg -, libGL +, libGLX , coreutils , unixtools , targetPackages @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ] ++ lib.optionals withGL [ xorg.libX11 xorg.libXext - libGL + libGLX ]; runtimeDependencies = [ diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix index 829ccd8775f6d..7cda9afee8981 100644 --- a/pkgs/development/tools/misc/wishbone-tool/default.nix +++ b/pkgs/development/tools/misc/wishbone-tool/default.nix @@ -1,25 +1,23 @@ { lib, fetchFromGitHub, rustPlatform, libusb-compat-0_1 }: let - version = "0.6.9"; + version = "0.7.9"; src = fetchFromGitHub { owner = "litex-hub"; repo = "wishbone-utils"; rev = "v${version}"; - sha256 = "0gq359ybxnqvcp93cn154bs9kwlai62gnm71yvl2nhzjdlcr3fhp"; + hash = "sha256-Gl0bxHJ8Y0ytYJxToYAR2tVkD4YNMihk+zRpieSvMGE="; }; in rustPlatform.buildRustPackage { pname = "wishbone-tool"; inherit version; - src = "${src}/wishbone-tool"; + inherit src; - # N.B. The cargo vendor consistency checker searches in "source" for lockfile - cargoDepsHook = '' - ln -s wishbone-tool source - ''; - cargoSha256 = "1b12wpmzv7wxidc4hd8hmp8iwqhqlycxh8bdv3rf701sqsazkc5x"; + sourceRoot = "${src.name}/wishbone-tool"; + + cargoHash = "sha256-wOw3v47AekJUW+8dpHVysheA+42HwEahn/hriYF7CfA="; buildInputs = [ libusb-compat-0_1 ]; @@ -27,7 +25,7 @@ rustPlatform.buildRustPackage { description = "Manipulate a Wishbone device over some sort of bridge"; mainProgram = "wishbone-tool"; homepage = "https://github.com/litex-hub/wishbone-utils"; - license = licenses.bsd2; + license = licenses.asl20; maintainers = with maintainers; [ edef ]; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/mongosh/package-lock.json b/pkgs/development/tools/mongosh/package-lock.json index b87274ea83301..3df3810340081 100644 --- a/pkgs/development/tools/mongosh/package-lock.json +++ b/pkgs/development/tools/mongosh/package-lock.json @@ -1,15 +1,15 @@ { "name": "mongosh", - "version": "2.2.9", + "version": "2.2.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mongosh", - "version": "2.2.9", + "version": "2.2.10", "license": "Apache-2.0", "dependencies": { - "@mongosh/cli-repl": "2.2.9" + "@mongosh/cli-repl": "2.2.10" }, "bin": { "mongosh": "bin/mongosh.js" @@ -146,16 +146,16 @@ } }, "node_modules/@aws-sdk/client-cognito-identity": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.598.0.tgz", - "integrity": "sha512-N/1lnkhkzk1Il8WEZBWR713/7sDEqBtl/1AS6dfgw6Zh7NWUYSwBkZx6xdN8KogDu4CFExRHhilNOgI1JMug3w==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.606.0.tgz", + "integrity": "sha512-CJ3kovUg7HAn3trqo0WxVw3PJoaHxiGU1U+Ok8Vx/sL81+auyyiasT09M/NcchRqwAooKvUi44sVD0ih7Zi9Nw==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.598.0", - "@aws-sdk/client-sts": "3.598.0", + "@aws-sdk/client-sso-oidc": "3.606.0", + "@aws-sdk/client-sts": "3.606.0", "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/credential-provider-node": "3.600.0", "@aws-sdk/middleware-host-header": "3.598.0", "@aws-sdk/middleware-logger": "3.598.0", "@aws-sdk/middleware-recursion-detection": "3.598.0", @@ -245,15 +245,14 @@ } }, "node_modules/@aws-sdk/client-sso-oidc": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.598.0.tgz", - "integrity": "sha512-jfdH1pAO9Tt8Nkta/JJLoUnwl7jaRdxToQTJfUtE+o3+0JP5sA4LfC2rBkJSWcU5BdAA+kyOs5Lv776DlN04Vg==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.606.0.tgz", + "integrity": "sha512-gL1FHPS6hwgMNS/A+Qh5bUyHOeRVOqdb7c6+i+9gR3wtGvt2lvoSm8w5DhS08Xiiacz2AqYRDEapp0xuyCrbBQ==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sts": "3.598.0", "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/credential-provider-node": "3.600.0", "@aws-sdk/middleware-host-header": "3.598.0", "@aws-sdk/middleware-logger": "3.598.0", "@aws-sdk/middleware-recursion-detection": "3.598.0", @@ -292,18 +291,21 @@ }, "engines": { "node": ">=16.0.0" + }, + "peerDependencies": { + "@aws-sdk/client-sts": "^3.606.0" } }, "node_modules/@aws-sdk/client-sts": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.598.0.tgz", - "integrity": "sha512-bXhz/cHL0iB9UH9IFtMaJJf4F8mV+HzncETCRFzZ9SyUMt5rP9j8A7VZknqGYSx/6mI8SsB1XJQkWSbhn6FiSQ==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/client-sts/-/client-sts-3.606.0.tgz", + "integrity": "sha512-b11mAhjrkm3MMiAPoMGcmd6vsaz2120lg8rHG/NZCo9vB1K6Kc7WP+a1Q05TRMseer2egTtpWJfn44aVO97VqA==", "dependencies": { "@aws-crypto/sha256-browser": "5.2.0", "@aws-crypto/sha256-js": "5.2.0", - "@aws-sdk/client-sso-oidc": "3.598.0", + "@aws-sdk/client-sso-oidc": "3.606.0", "@aws-sdk/core": "3.598.0", - "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/credential-provider-node": "3.600.0", "@aws-sdk/middleware-host-header": "3.598.0", "@aws-sdk/middleware-logger": "3.598.0", "@aws-sdk/middleware-recursion-detection": "3.598.0", @@ -362,11 +364,11 @@ } }, "node_modules/@aws-sdk/credential-provider-cognito-identity": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.598.0.tgz", - "integrity": "sha512-u6oocRReswkA2mFlOwtCetgmEr9B+Yhle3K13x37rb1lQgq1wUuWUvHU7U9v26hUZIhfUpigV/Mgr/RQZB6+Yw==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.606.0.tgz", + "integrity": "sha512-4wGvXilFLkozs4/dMnn9NvxZbL9oyyReoF9aR3kGUZ0QVO8cCBp/Zkr8IXZifhVBo9/esJdMFnR9lEXR7Yuleg==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.598.0", + "@aws-sdk/client-cognito-identity": "3.606.0", "@aws-sdk/types": "3.598.0", "@smithy/property-provider": "^3.1.1", "@smithy/types": "^3.1.0", @@ -434,9 +436,9 @@ } }, "node_modules/@aws-sdk/credential-provider-node": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.598.0.tgz", - "integrity": "sha512-sXTlqL5I/awlF9Dg2MQ17SfrEaABVnsj2mf4jF5qQrIRhfbvQOIYdEqdy8Rn1AWlJMz/N450SGzc0XJ5owxxqw==", + "version": "3.600.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.600.0.tgz", + "integrity": "sha512-1pC7MPMYD45J7yFjA90SxpR0yaSvy+yZiq23aXhAPZLYgJBAxHLu0s0mDCk/piWGPh8+UGur5K0bVdx4B1D5hw==", "dependencies": { "@aws-sdk/credential-provider-env": "3.598.0", "@aws-sdk/credential-provider-http": "3.598.0", @@ -505,18 +507,18 @@ } }, "node_modules/@aws-sdk/credential-providers": { - "version": "3.598.0", - "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.598.0.tgz", - "integrity": "sha512-IFZwH3F2rA2WbpYFUxOeu/M3/9p4+oRbKVLDZlaaDtwwuZ9VHEbnkUm20zOgSXeVExa3qgYhJvg7H5JrqxP97A==", + "version": "3.606.0", + "resolved": "https://registry.npmmirror.com/@aws-sdk/credential-providers/-/credential-providers-3.606.0.tgz", + "integrity": "sha512-34hswGNDWBFvp4Hi4Gv9DIJ4Ks0Nbg8w3emFsPVHLqqI6X2Wd0hJTf+mi1kMhy/AQXt5LisKLw6wjNIKD2+KGg==", "dependencies": { - "@aws-sdk/client-cognito-identity": "3.598.0", + "@aws-sdk/client-cognito-identity": "3.606.0", "@aws-sdk/client-sso": "3.598.0", - "@aws-sdk/client-sts": "3.598.0", - "@aws-sdk/credential-provider-cognito-identity": "3.598.0", + "@aws-sdk/client-sts": "3.606.0", + "@aws-sdk/credential-provider-cognito-identity": "3.606.0", "@aws-sdk/credential-provider-env": "3.598.0", "@aws-sdk/credential-provider-http": "3.598.0", "@aws-sdk/credential-provider-ini": "3.598.0", - "@aws-sdk/credential-provider-node": "3.598.0", + "@aws-sdk/credential-provider-node": "3.600.0", "@aws-sdk/credential-provider-process": "3.598.0", "@aws-sdk/credential-provider-sso": "3.598.0", "@aws-sdk/credential-provider-web-identity": "3.598.0", @@ -1168,9 +1170,9 @@ } }, "node_modules/@mongodb-js/mongodb-constants": { - "version": "0.10.1", - "resolved": "https://registry.npmmirror.com/@mongodb-js/mongodb-constants/-/mongodb-constants-0.10.1.tgz", - "integrity": "sha512-zs6LSjci2JwkEgc43nmwI4LM0fYRnJpID2tw1NJ2IlqpmW9x1dQFjv1IG401yPr+eoB+Ktzy+EezDrTKl1fMbA==", + "version": "0.10.2", + "resolved": "https://registry.npmmirror.com/@mongodb-js/mongodb-constants/-/mongodb-constants-0.10.2.tgz", + "integrity": "sha512-ss0c6IxhSJZwDiY18We3vjFwrCL+1HJntMInFSthJ6oM61yiCCz5m8TfUjNGJQCXhPqok7sM9RSRcKrn43u0cg==", "dependencies": { "semver": "^7.5.4" } @@ -1202,12 +1204,12 @@ } }, "node_modules/@mongosh/arg-parser": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.9.tgz", - "integrity": "sha512-Bc9v3cmhpfOG3LKRnOyZ/kfDJcQB1mNm7JWD2wJsaFBsWb4S1VXh50l23vC8HIj6vU6QYHGIAc5ikSxZ+shfyQ==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/arg-parser/-/arg-parser-2.2.10.tgz", + "integrity": "sha512-QvXziAmACrFty7id5I0s3ZOetIc1wWhjtpytGMtchEiusTQOO+NJy74UMrxK+NGxKPDRL0MroRIo05/LEfPkJg==", "dependencies": { - "@mongosh/errors": "2.2.9", - "@mongosh/i18n": "2.2.9", + "@mongosh/errors": "2.2.10", + "@mongosh/i18n": "2.2.10", "mongodb-connection-string-url": "^3.0.1" }, "engines": { @@ -1215,9 +1217,9 @@ } }, "node_modules/@mongosh/async-rewriter2": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.9.tgz", - "integrity": "sha512-JiS0VxGLoHNfLF9zox1dY0jX/3+ygdziigbTfS1AkKWt/Nmf/DURBFFjgLqs3mn3V3qYE4mUCmbeB9G1f6yMYA==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/async-rewriter2/-/async-rewriter2-2.2.10.tgz", + "integrity": "sha512-ssY+WxY/oOHPZAIjrYzUYhCr1K2towzshxQpYw3nk5JyjTdvN4gc0xnrWMNLJonEOD/ADTdlneFshQhuh/V1vQ==", "dependencies": { "@babel/core": "^7.22.8", "@babel/plugin-transform-destructuring": "^7.22.5", @@ -1233,12 +1235,12 @@ } }, "node_modules/@mongosh/autocomplete": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.9.tgz", - "integrity": "sha512-uwBtG2bQVk6N8/A7Jjl6w/FQZKIAUrrfeBA7q4kZ6XWzBY1CKcNOG1Kq5tTrN5xp82Au+FLF0rhFBy195fas0Q==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/autocomplete/-/autocomplete-2.2.10.tgz", + "integrity": "sha512-iLrZ1vfA67jKwEWtSKGYAZ7QM5beYFo4AsmiV+KCXwtcZref3dX1OgcjBvRW8dRvSonz8/7RnN9r8QtsTyw2xw==", "dependencies": { "@mongodb-js/mongodb-constants": "^0.10.1", - "@mongosh/shell-api": "2.2.9", + "@mongosh/shell-api": "2.2.10", "semver": "^7.5.4" }, "engines": { @@ -1246,25 +1248,25 @@ } }, "node_modules/@mongosh/cli-repl": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.9.tgz", - "integrity": "sha512-9gcu2lG9d9aFT+KPRVXpgX84Ounpp0/uuBFln5XuZfKXZwoWbpWD7zJ3mBdzAQKyuZ5SR2x6NokGGZbEbLGhrA==", - "dependencies": { - "@mongosh/arg-parser": "2.2.9", - "@mongosh/autocomplete": "2.2.9", - "@mongosh/editor": "2.2.9", - "@mongosh/errors": "2.2.9", - "@mongosh/history": "2.2.9", - "@mongosh/i18n": "2.2.9", - "@mongosh/import-node-fetch": "2.2.9", - "@mongosh/js-multiline-to-singleline": "2.2.9", - "@mongosh/logging": "2.2.9", - "@mongosh/service-provider-core": "2.2.9", - "@mongosh/service-provider-server": "2.2.9", - "@mongosh/shell-api": "2.2.9", - "@mongosh/shell-evaluator": "2.2.9", - "@mongosh/snippet-manager": "2.2.9", - "@mongosh/types": "2.2.9", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/cli-repl/-/cli-repl-2.2.10.tgz", + "integrity": "sha512-fjn+GZlsChPqn2A+hWiSgxNcGxO96hPBcv2TDfnXwtMSQySPBavJoayBDbEnazRHxgbAxqpmTV4UfWPOX+jYvA==", + "dependencies": { + "@mongosh/arg-parser": "2.2.10", + "@mongosh/autocomplete": "2.2.10", + "@mongosh/editor": "2.2.10", + "@mongosh/errors": "2.2.10", + "@mongosh/history": "2.2.10", + "@mongosh/i18n": "2.2.10", + "@mongosh/import-node-fetch": "2.2.10", + "@mongosh/js-multiline-to-singleline": "2.2.10", + "@mongosh/logging": "2.2.10", + "@mongosh/service-provider-core": "2.2.10", + "@mongosh/service-provider-server": "2.2.10", + "@mongosh/shell-api": "2.2.10", + "@mongosh/shell-evaluator": "2.2.10", + "@mongosh/snippet-manager": "2.2.10", + "@mongosh/types": "2.2.10", "@segment/analytics-node": "^1.3.0", "ansi-escape-sequences": "^5.1.2", "askcharacter": "^2.0.4", @@ -1297,15 +1299,15 @@ } }, "node_modules/@mongosh/editor": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.9.tgz", - "integrity": "sha512-kTCgkeZBg1AYLKq65elwusyDiKeTyh5l4W3yg2yGvuzhk1I73DPsSkA+E2TWpqVgzsTeRXUbmySSMrKxx/t+mA==", - "dependencies": { - "@mongosh/js-multiline-to-singleline": "2.2.9", - "@mongosh/service-provider-core": "2.2.9", - "@mongosh/shell-api": "2.2.9", - "@mongosh/shell-evaluator": "2.2.9", - "@mongosh/types": "2.2.9", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/editor/-/editor-2.2.10.tgz", + "integrity": "sha512-iYNvhBbTNXwR0Dt9bj+hwJFAWVttS2F+zl6vzvF/wcA1THddFi4A8LboWMvDtpb7YF5woHCXIW3Oc3gHOUSW/g==", + "dependencies": { + "@mongosh/js-multiline-to-singleline": "2.2.10", + "@mongosh/service-provider-core": "2.2.10", + "@mongosh/shell-api": "2.2.10", + "@mongosh/shell-evaluator": "2.2.10", + "@mongosh/types": "2.2.10", "js-beautify": "^1.15.1" }, "engines": { @@ -1313,17 +1315,17 @@ } }, "node_modules/@mongosh/errors": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.9.tgz", - "integrity": "sha512-gN7czs7VK1OoG6H2Cq4gVVUZZPUeBxsBBKeOOFQIGy6QH5IAr4pm/w17K5dhOEoGhdH37h3WOp3dS24z/6NF0A==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/errors/-/errors-2.2.10.tgz", + "integrity": "sha512-jR8dv9MYYRwr+Yri/KI6HAuob0zdVBQOrMvjc+ygBbTIkL3wh1iOrjZKZuYUsjei1FDxLA8NywftAoHDchq2Tg==", "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/history": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.9.tgz", - "integrity": "sha512-Irm8s2z48T+OMADrmJSe+xvCXMkPUCCTltGgVY3w+vm42ftfd6k3ZXGlVu+j/QNCp1D4HmRLDY6RmnQLFb2IUw==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/history/-/history-2.2.10.tgz", + "integrity": "sha512-EmMKvsytTXq/1tAwxZUvl+6+gCrarWdEDB9mO9vTCFneOgB0ao2jpo7KA9Jc63r8RYhDH78dtjFsSuFeox3AiA==", "dependencies": { "mongodb-connection-string-url": "^3.0.1", "mongodb-redact": "^0.2.3" @@ -1333,20 +1335,20 @@ } }, "node_modules/@mongosh/i18n": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.9.tgz", - "integrity": "sha512-AhEEAHV/2ytZ1swDV7VmKYt4D0P+2pqf8khR3OwOg5RJ0Cx8vRS4RdWvszxKeA26s2zlPMRiherwPTdAEc5zww==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/i18n/-/i18n-2.2.10.tgz", + "integrity": "sha512-TxyFOhdXqCN0AXGcWziPzZ+YBf8KthnZIbOVSyA+C1a0jynfMf+XBnLnNpwvKfGZUeQ1VyZkrKLPopG7e2nuIA==", "dependencies": { - "@mongosh/errors": "2.2.9" + "@mongosh/errors": "2.2.10" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/import-node-fetch": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.9.tgz", - "integrity": "sha512-YbC6nJjnR1kSOZHVD/8gx6hh8eZkkZ9r4M9NFyDTTynbKgZNCwMtFBtl10zYsNMLJOCKW6o8vJ2YFsBLdZNyww==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/import-node-fetch/-/import-node-fetch-2.2.10.tgz", + "integrity": "sha512-c0xG7P7HjKn3ND/aK7gyADRFhXc5CogADfX6exkFlM3z5A8HVCZ0o8/x7m0oi3IIHyCvebvEatbZJ+HjdiR8UQ==", "dependencies": { "node-fetch": "^3.3.2" }, @@ -1355,9 +1357,9 @@ } }, "node_modules/@mongosh/js-multiline-to-singleline": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.9.tgz", - "integrity": "sha512-3EPqCQ64zwqR7PpdITBd3e8grpnwE7XIohuVbYXNo48Hlnz0Gdc8QAjSwQF2LO51ozCmPVcrQqCjVuLjdtPBUA==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/js-multiline-to-singleline/-/js-multiline-to-singleline-2.2.10.tgz", + "integrity": "sha512-MynI6HGlZ0kPqRfx83+9/An39laBzjlc2f6DzDIiO9FVGYcEYMScIG6e0U06M8fiarqeftprSW9dBdc1KQkeEw==", "dependencies": { "@babel/core": "^7.16.12", "@babel/types": "^7.21.2" @@ -1367,14 +1369,14 @@ } }, "node_modules/@mongosh/logging": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.9.tgz", - "integrity": "sha512-/LvJ3Rk2B5Po7JkG/suZIaJybAzCUSvNGRmobwR6HeDJ4RwKMKvPUJrUYu1GXXQqdLNDXH2o9eEWojMk/IA3LQ==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/logging/-/logging-2.2.10.tgz", + "integrity": "sha512-0z3L23rtaASh1E2hV/wSWxDTycxktbD2XVUnSW1YbyRfePd7YOwVeUhNeFYUf1Qq2q2KeTdxgMaP5/BodY+h5A==", "dependencies": { "@mongodb-js/devtools-connect": "^3.0.1", - "@mongosh/errors": "2.2.9", - "@mongosh/history": "2.2.9", - "@mongosh/types": "2.2.9", + "@mongosh/errors": "2.2.10", + "@mongosh/history": "2.2.10", + "@mongosh/types": "2.2.10", "mongodb-log-writer": "^1.4.2", "mongodb-redact": "^0.2.3" }, @@ -1383,12 +1385,12 @@ } }, "node_modules/@mongosh/service-provider-core": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.9.tgz", - "integrity": "sha512-QJ+4TBD30C3cGoKoBtGOH82RVTKNMcBG1vhs8rfRheajivMLEBka2Hk/49R6yv9lhSfwgueH57+6EFNdqVFgSQ==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-core/-/service-provider-core-2.2.10.tgz", + "integrity": "sha512-XB+G24WjTIYXnHoToJhDJMwMV7pCcgCwgme0MiE6lzcYs5HwlHhk9tzBwv0+i+3NcCb5SMqU38iUMuGG6jKJdQ==", "dependencies": { "@aws-sdk/credential-providers": "^3.525.0", - "@mongosh/errors": "2.2.9", + "@mongosh/errors": "2.2.10", "bson": "^6.7.0", "mongodb": "^6.7.0", "mongodb-build-info": "^1.7.2" @@ -1401,15 +1403,15 @@ } }, "node_modules/@mongosh/service-provider-server": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.9.tgz", - "integrity": "sha512-G4pXkwvvlnFW5sLQAbgDwqpt0tBJHlsQPJN+eMT9N6gRtEnhxAnOuOGA4zKTcaOZN2bTnzd6F7Yu5Z5AOOVXUA==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/service-provider-server/-/service-provider-server-2.2.10.tgz", + "integrity": "sha512-7WxxKZgXNdW7f6vUCmqqWPexPOFqy/n155rFeyWhRVBI5mdbb/Sb5vsdqo1+6AyDpCXsLdl8CldsqmOfGKG36A==", "dependencies": { "@mongodb-js/devtools-connect": "^3.0.1", "@mongodb-js/oidc-plugin": "^1.0.2", - "@mongosh/errors": "2.2.9", - "@mongosh/service-provider-core": "2.2.9", - "@mongosh/types": "2.2.9", + "@mongosh/errors": "2.2.10", + "@mongosh/service-provider-core": "2.2.10", + "@mongosh/types": "2.2.10", "aws4": "^1.12.0", "mongodb": "^6.7.0", "mongodb-connection-string-url": "^3.0.1", @@ -1424,15 +1426,15 @@ } }, "node_modules/@mongosh/shell-api": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.9.tgz", - "integrity": "sha512-1Wo2RJ1vpYY/LRKKyIgl9vn7nycBVpO+iAaOFRSI0VxcW7dujROIm+XLBzqvJql/0qeqfnQGXv+jCTb13emduw==", - "dependencies": { - "@mongosh/arg-parser": "2.2.9", - "@mongosh/errors": "2.2.9", - "@mongosh/history": "2.2.9", - "@mongosh/i18n": "2.2.9", - "@mongosh/service-provider-core": "2.2.9", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-api/-/shell-api-2.2.10.tgz", + "integrity": "sha512-Cgcb0U5wqzmTmwAmMkSqhZ3fR4PjqNJ2px61i/9JzWAgIEDSbv9Xni3mcfDRQd/qjLHCEUlAPFgEBu7Cpk0qBQ==", + "dependencies": { + "@mongosh/arg-parser": "2.2.10", + "@mongosh/errors": "2.2.10", + "@mongosh/history": "2.2.10", + "@mongosh/i18n": "2.2.10", + "@mongosh/service-provider-core": "2.2.10", "mongodb-redact": "^0.2.3" }, "engines": { @@ -1440,27 +1442,27 @@ } }, "node_modules/@mongosh/shell-evaluator": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.9.tgz", - "integrity": "sha512-p56jKPaRfFKT4yW3FrmLeawy/8qL7x2q9Gx88e0iJhBI3ybft0dQ1tWvX3mMg6YxZGNsDeHgPSAwNlFAy3lxiQ==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/shell-evaluator/-/shell-evaluator-2.2.10.tgz", + "integrity": "sha512-9v/p5WDu+Ur7+jhXajkBOvpINcRORA1UpdMOV4sBGQ623VbmoDd7xFeFPoi0uWzV50qW5yNRlh3+dvsG/jdKmQ==", "dependencies": { - "@mongosh/async-rewriter2": "2.2.9", - "@mongosh/history": "2.2.9", - "@mongosh/shell-api": "2.2.9" + "@mongosh/async-rewriter2": "2.2.10", + "@mongosh/history": "2.2.10", + "@mongosh/shell-api": "2.2.10" }, "engines": { "node": ">=14.15.1" } }, "node_modules/@mongosh/snippet-manager": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.9.tgz", - "integrity": "sha512-JG9Svfoh1z30U7mwbojx0Wm2BkVd6wqqkkpxucgJ9ba2DG7VvgN4iez6HQa+eA3KmMKVII7IzYnt/J0gOum80g==", - "dependencies": { - "@mongosh/errors": "2.2.9", - "@mongosh/import-node-fetch": "2.2.9", - "@mongosh/shell-api": "2.2.9", - "@mongosh/types": "2.2.9", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/snippet-manager/-/snippet-manager-2.2.10.tgz", + "integrity": "sha512-y49cANhiCZYaWjaJFLh1ByPJhNAoyZvpI9R1sbA0MC7fu2kWxd91a6mWVWI4ZZPgHGXmpGkAK0/4MpWcUGymsQ==", + "dependencies": { + "@mongosh/errors": "2.2.10", + "@mongosh/import-node-fetch": "2.2.10", + "@mongosh/shell-api": "2.2.10", + "@mongosh/types": "2.2.10", "bson": "^6.7.0", "cross-spawn": "^7.0.3", "escape-string-regexp": "^4.0.0", @@ -1472,9 +1474,9 @@ } }, "node_modules/@mongosh/types": { - "version": "2.2.9", - "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.9.tgz", - "integrity": "sha512-Vo91tPc24nrybDsE/wQXbKynB3VC8BvF+yallZpMvLNtckr5q7nTuaTBWG5Er1myPA5MQhZm6DgpsIWR1YnGgg==", + "version": "2.2.10", + "resolved": "https://registry.npmmirror.com/@mongosh/types/-/types-2.2.10.tgz", + "integrity": "sha512-BfCcmbC3givNCgYZxf6aUJy+/nHg2By6Hs9gZ/WMGgiedMuL5fRE18dGlwy3Aog7Jc6tVkBCMtOpYgjVnUPoxQ==", "dependencies": { "@mongodb-js/devtools-connect": "^3.0.1" }, @@ -1588,11 +1590,11 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" }, "node_modules/@smithy/abort-controller": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/abort-controller/-/abort-controller-3.0.1.tgz", - "integrity": "sha512-Jb7jg4E+C+uvrUQi+h9kbILY6ts6fglKZzseMCHlH9ayq+1f5QdpYf8MV/xppuiN6DAMJAmwGz53GwP3213dmA==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/abort-controller/-/abort-controller-3.1.1.tgz", + "integrity": "sha512-MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1600,14 +1602,14 @@ } }, "node_modules/@smithy/config-resolver": { - "version": "3.0.2", - "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.2.tgz", - "integrity": "sha512-wUyG6ezpp2sWAvfqmSYTROwFUmJqKV78GLf55WODrosBcT0BAMd9bOLO4HRhynWBgAobPml2cF9ZOdgCe00r+g==", + "version": "3.0.4", + "resolved": "https://registry.npmmirror.com/@smithy/config-resolver/-/config-resolver-3.0.4.tgz", + "integrity": "sha512-VwiOk7TwXoE7NlNguV/aPq1hFH72tqkHCw8eWXbr2xHspRyyv9DLpLXhq+Ieje+NwoqXrY0xyQjPXdOE6cGcHA==", "dependencies": { - "@smithy/node-config-provider": "^3.1.1", - "@smithy/types": "^3.1.0", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/types": "^3.3.0", "@smithy/util-config-provider": "^3.0.0", - "@smithy/util-middleware": "^3.0.1", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1615,17 +1617,17 @@ } }, "node_modules/@smithy/core": { - "version": "2.2.2", - "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.2.2.tgz", - "integrity": "sha512-bxZr4ZTqS6hMSQGYdcsfFQTFU0MO2xKLbkqZMSRDM+ruQ0nY00lFJUeLhXe7fqohSEd1y5wKu1Ap0bVJPzpmHg==", - "dependencies": { - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-retry": "^3.0.5", - "@smithy/middleware-serde": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/smithy-client": "^3.1.3", - "@smithy/types": "^3.1.0", - "@smithy/util-middleware": "^3.0.1", + "version": "2.2.4", + "resolved": "https://registry.npmmirror.com/@smithy/core/-/core-2.2.4.tgz", + "integrity": "sha512-qdY3LpMOUyLM/gfjjMQZui+UTNS7kBRDWlvyIhVOql5dn2J3isk9qUTBtQ1CbDH8MTugHis1zu3h4rH+Qmmh4g==", + "dependencies": { + "@smithy/middleware-endpoint": "^3.0.4", + "@smithy/middleware-retry": "^3.0.7", + "@smithy/middleware-serde": "^3.0.3", + "@smithy/protocol-http": "^4.0.3", + "@smithy/smithy-client": "^3.1.5", + "@smithy/types": "^3.3.0", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1633,14 +1635,14 @@ } }, "node_modules/@smithy/credential-provider-imds": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.1.tgz", - "integrity": "sha512-htndP0LwHdE3R3Nam9ZyVWhwPYOmD4xCL79kqvNxy8u/bv0huuy574CSiRY4cvEICgimv8jlVfLeZ7zZqbnB2g==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.3.tgz", + "integrity": "sha512-U1Yrv6hx/mRK6k8AncuI6jLUx9rn0VVSd9NPEX6pyYFBfkSkChOc/n4zUb8alHUVg83TbI4OdZVo1X0Zfj3ijA==", "dependencies": { - "@smithy/node-config-provider": "^3.1.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/property-provider": "^3.1.3", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1648,23 +1650,23 @@ } }, "node_modules/@smithy/fetch-http-handler": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.0.3.tgz", - "integrity": "sha512-31x2MokxJL/u5U/BdElvVRotOGjUcOOvI2pb5TZ02umBLw+vVHImiLn+khbN0SblaFXNRzPoGrKwXylNjV3skw==", + "version": "3.2.0", + "resolved": "https://registry.npmmirror.com/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.0.tgz", + "integrity": "sha512-vFvDxMrc6sO5Atec8PaISckMcAwsCrRhYxwUylg97bRT2KZoumOF7qk5+6EVUtuM1IG9AJV5aqXnHln9ZdXHpg==", "dependencies": { - "@smithy/protocol-http": "^4.0.1", - "@smithy/querystring-builder": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/protocol-http": "^4.0.3", + "@smithy/querystring-builder": "^3.0.3", + "@smithy/types": "^3.3.0", "@smithy/util-base64": "^3.0.0", "tslib": "^2.6.2" } }, "node_modules/@smithy/hash-node": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/hash-node/-/hash-node-3.0.1.tgz", - "integrity": "sha512-w2ncjgk2EYO2+WhAsSQA8owzoOSY7IL1qVytlwpnL1pFGWTjIoIh5nROkEKXY51unB63bMGZqDiVoXaFbyKDlg==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/hash-node/-/hash-node-3.0.3.tgz", + "integrity": "sha512-2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" @@ -1674,11 +1676,11 @@ } }, "node_modules/@smithy/invalid-dependency": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.1.tgz", - "integrity": "sha512-RSNF/32BKygXKKMyS7koyuAq1rcdW5p5c4EFa77QenBFze9As+JiRnV9OWBh2cB/ejGZalEZjvIrMLHwJl7aGA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz", + "integrity": "sha512-ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" } }, @@ -1694,12 +1696,12 @@ } }, "node_modules/@smithy/middleware-content-length": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.1.tgz", - "integrity": "sha512-6QdK/VbrCfXD5/QolE2W/ok6VqxD+SM28Ds8iSlEHXZwv4buLsvWyvoEEy0322K/g5uFgPzBmZjGqesTmPL+yQ==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.3.tgz", + "integrity": "sha512-Dbz2bzexReYIQDWMr+gZhpwBetNXzbhnEMhYKA6urqmojO14CsXjnsoPYO8UL/xxcawn8ZsuVU61ElkLSltIUQ==", "dependencies": { - "@smithy/protocol-http": "^4.0.1", - "@smithy/types": "^3.1.0", + "@smithy/protocol-http": "^4.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1707,16 +1709,16 @@ } }, "node_modules/@smithy/middleware-endpoint": { - "version": "3.0.2", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.2.tgz", - "integrity": "sha512-gWEaGYB3Bei17Oiy/F2IlUPpBazNXImytoOdJ1xbrUOaJKAOiUhx8/4FOnYLLJHdAwa9PlvJ2ULda2f/Dnwi9w==", - "dependencies": { - "@smithy/middleware-serde": "^3.0.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", - "@smithy/url-parser": "^3.0.1", - "@smithy/util-middleware": "^3.0.1", + "version": "3.0.4", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.4.tgz", + "integrity": "sha512-whUJMEPwl3ANIbXjBXZVdJNgfV2ZU8ayln7xUM47rXL2txuenI7jQ/VFFwCzy5lCmXScjp6zYtptW5Evud8e9g==", + "dependencies": { + "@smithy/middleware-serde": "^3.0.3", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.3", + "@smithy/types": "^3.3.0", + "@smithy/url-parser": "^3.0.3", + "@smithy/util-middleware": "^3.0.3", "tslib": "^2.6.2" }, "engines": { @@ -1724,17 +1726,17 @@ } }, "node_modules/@smithy/middleware-retry": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.5.tgz", - "integrity": "sha512-nKAmmea9Wm0d94obPqVgjxW2zzaNemxcTzjgd17LhGKI23D66UQKI5gpoWDsnE+R4tfuZe9dCcw8gmTVEwFpRA==", - "dependencies": { - "@smithy/node-config-provider": "^3.1.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/service-error-classification": "^3.0.1", - "@smithy/smithy-client": "^3.1.3", - "@smithy/types": "^3.1.0", - "@smithy/util-middleware": "^3.0.1", - "@smithy/util-retry": "^3.0.1", + "version": "3.0.7", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-retry/-/middleware-retry-3.0.7.tgz", + "integrity": "sha512-f5q7Y09G+2h5ivkSx5CHvlAT4qRR3jBFEsfXyQ9nFNiWQlr8c48blnu5cmbTQ+p1xmIO14UXzKoF8d7Tm0Gsjw==", + "dependencies": { + "@smithy/node-config-provider": "^3.1.3", + "@smithy/protocol-http": "^4.0.3", + "@smithy/service-error-classification": "^3.0.3", + "@smithy/smithy-client": "^3.1.5", + "@smithy/types": "^3.3.0", + "@smithy/util-middleware": "^3.0.3", + "@smithy/util-retry": "^3.0.3", "tslib": "^2.6.2", "uuid": "^9.0.1" }, @@ -1743,11 +1745,11 @@ } }, "node_modules/@smithy/middleware-serde": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-serde/-/middleware-serde-3.0.1.tgz", - "integrity": "sha512-ak6H/ZRN05r5+SR0/IUc5zOSyh2qp3HReg1KkrnaSLXmncy9lwOjNqybX4L4x55/e5mtVDn1uf/gQ6bw5neJPw==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz", + "integrity": "sha512-puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1755,11 +1757,11 @@ } }, "node_modules/@smithy/middleware-stack": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/middleware-stack/-/middleware-stack-3.0.1.tgz", - "integrity": "sha512-fS5uT//y1SlBdkzIvgmWQ9FufwMXrHSSbuR25ygMy1CRDIZkcBMoF4oTMYNfR9kBlVBcVzlv7joFdNrFuQirPA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz", + "integrity": "sha512-r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1767,13 +1769,13 @@ } }, "node_modules/@smithy/node-config-provider": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.1.1.tgz", - "integrity": "sha512-z5G7+ysL4yUtMghUd2zrLkecu0mTfnYlt5dR76g/HsFqf7evFazwiZP1ag2EJenGxNBDwDM5g8nm11NPogiUVA==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/node-config-provider/-/node-config-provider-3.1.3.tgz", + "integrity": "sha512-rxdpAZczzholz6CYZxtqDu/aKTxATD5DAUDVj7HoEulq+pDSQVWzbg0btZDlxeFfa6bb2b5tUvgdX5+k8jUqcg==", "dependencies": { - "@smithy/property-provider": "^3.1.1", - "@smithy/shared-ini-file-loader": "^3.1.1", - "@smithy/types": "^3.1.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/shared-ini-file-loader": "^3.1.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1781,14 +1783,14 @@ } }, "node_modules/@smithy/node-http-handler": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.0.1.tgz", - "integrity": "sha512-hlBI6MuREA4o1wBMEt+QNhUzoDtFFvwR6ecufimlx9D79jPybE/r8kNorphXOi91PgSO9S2fxRjcKCLk7Jw8zA==", + "version": "3.1.1", + "resolved": "https://registry.npmmirror.com/@smithy/node-http-handler/-/node-http-handler-3.1.1.tgz", + "integrity": "sha512-L71NLyPeP450r2J/mfu1jMc//Z1YnqJt2eSNw7uhiItaONnBLDA68J5jgxq8+MBDsYnFwNAIc7dBG1ImiWBiwg==", "dependencies": { - "@smithy/abort-controller": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/querystring-builder": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/abort-controller": "^3.1.1", + "@smithy/protocol-http": "^4.0.3", + "@smithy/querystring-builder": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1796,11 +1798,11 @@ } }, "node_modules/@smithy/property-provider": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/property-provider/-/property-provider-3.1.1.tgz", - "integrity": "sha512-YknOMZcQkB5on+MU0DvbToCmT2YPtTETMXW0D3+/Iln7ezT+Zm1GMHhCW1dOH/X/+LkkQD9aXEoCX/B10s4Xdw==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/property-provider/-/property-provider-3.1.3.tgz", + "integrity": "sha512-zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1808,11 +1810,11 @@ } }, "node_modules/@smithy/protocol-http": { - "version": "4.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.1.tgz", - "integrity": "sha512-eBhm9zwcFPEazc654c0BEWtxYAzrw+OhoSf5pkwKzfftWKXRoqEhwOE2Pvn30v0iAdo7Mfsfb6pi1NnZlGCMpg==", + "version": "4.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/protocol-http/-/protocol-http-4.0.3.tgz", + "integrity": "sha512-x5jmrCWwQlx+Zv4jAtc33ijJ+vqqYN+c/ZkrnpvEe/uDas7AT7A/4Rc2CdfxgWv4WFGmEqODIrrUToPN6DDkGw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1820,11 +1822,11 @@ } }, "node_modules/@smithy/querystring-builder": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/querystring-builder/-/querystring-builder-3.0.1.tgz", - "integrity": "sha512-vKitpnG/2KOMVlx3x1S3FkBH075EROG3wcrcDaNerQNh8yuqnSL23btCD2UyX4i4lpPzNW6VFdxbn2Z25b/g5Q==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz", + "integrity": "sha512-vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "@smithy/util-uri-escape": "^3.0.0", "tslib": "^2.6.2" }, @@ -1833,11 +1835,11 @@ } }, "node_modules/@smithy/querystring-parser": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/querystring-parser/-/querystring-parser-3.0.1.tgz", - "integrity": "sha512-Qt8DMC05lVS8NcQx94lfVbZSX+2Ym7032b/JR8AlboAa/D669kPzqb35dkjkvAG6+NWmUchef3ENtrD6F+5n8Q==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz", + "integrity": "sha512-zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1845,22 +1847,22 @@ } }, "node_modules/@smithy/service-error-classification": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/service-error-classification/-/service-error-classification-3.0.1.tgz", - "integrity": "sha512-ubFUvIePjDCyIzZ+pLETqNC6KXJ/fc6g+/baqel7Zf6kJI/kZKgjwkCI7zbUhoUuOZ/4eA/87YasVu40b/B4bA==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz", + "integrity": "sha512-Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==", "dependencies": { - "@smithy/types": "^3.1.0" + "@smithy/types": "^3.3.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@smithy/shared-ini-file-loader": { - "version": "3.1.1", - "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.1.tgz", - "integrity": "sha512-nD6tXIX2126/P9e3wqRY1bm9dTtPZwRDyjVOd18G28o+1UOG+kOVgUwujE795HslSuPlEgqzsH5sgNP1hDjj9g==", + "version": "3.1.3", + "resolved": "https://registry.npmmirror.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.3.tgz", + "integrity": "sha512-Z8Y3+08vgoDgl4HENqNnnzSISAaGrF2RoKupoC47u2wiMp+Z8P/8mDh1CL8+8ujfi2U5naNvopSBmP/BUj8b5w==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -1868,14 +1870,14 @@ } }, "node_modules/@smithy/signature-v4": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-3.1.0.tgz", - "integrity": "sha512-m0/6LW3IQ3/JBcdhqjpkpABPTPhcejqeAn0U877zxBdNLiWAnG2WmCe5MfkUyVuvpFTPQnQwCo/0ZBR4uF5kxg==", + "version": "3.1.2", + "resolved": "https://registry.npmmirror.com/@smithy/signature-v4/-/signature-v4-3.1.2.tgz", + "integrity": "sha512-3BcPylEsYtD0esM4Hoyml/+s7WP2LFhcM3J2AGdcL2vx9O60TtfpDOL72gjb4lU8NeRPeKAwR77YNyyGvMbuEA==", "dependencies": { "@smithy/is-array-buffer": "^3.0.0", - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "@smithy/util-hex-encoding": "^3.0.0", - "@smithy/util-middleware": "^3.0.1", + "@smithy/util-middleware": "^3.0.3", "@smithy/util-uri-escape": "^3.0.0", "@smithy/util-utf8": "^3.0.0", "tslib": "^2.6.2" @@ -1885,15 +1887,15 @@ } }, "node_modules/@smithy/smithy-client": { - "version": "3.1.3", - "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.3.tgz", - "integrity": "sha512-YVz+akpR5lIIRPJfhE4sqoHYwMys6/33vsFvDof+71FCwa4jkVfMpzKv9TKrG/EDb5TV+YtjdXkwywdqlUOQXA==", - "dependencies": { - "@smithy/middleware-endpoint": "^3.0.2", - "@smithy/middleware-stack": "^3.0.1", - "@smithy/protocol-http": "^4.0.1", - "@smithy/types": "^3.1.0", - "@smithy/util-stream": "^3.0.3", + "version": "3.1.5", + "resolved": "https://registry.npmmirror.com/@smithy/smithy-client/-/smithy-client-3.1.5.tgz", + "integrity": "sha512-x9bL9Mx2CT2P1OiUlHM+ZNpbVU6TgT32f9CmTRzqIHA7M4vYrROCWEoC3o4xHNJASoGd4Opos3cXYPgh+/m4Ww==", + "dependencies": { + "@smithy/middleware-endpoint": "^3.0.4", + "@smithy/middleware-stack": "^3.0.3", + "@smithy/protocol-http": "^4.0.3", + "@smithy/types": "^3.3.0", + "@smithy/util-stream": "^3.0.5", "tslib": "^2.6.2" }, "engines": { @@ -1901,9 +1903,9 @@ } }, "node_modules/@smithy/types": { - "version": "3.1.0", - "resolved": "https://registry.npmmirror.com/@smithy/types/-/types-3.1.0.tgz", - "integrity": "sha512-qi4SeCVOUPjhSSZrxxB/mB8DrmuSFUcJnD9KXjuP+7C3LV/KFV4kpuUSH3OHDZgQB9TEH/1sO/Fq/5HyaK9MPw==", + "version": "3.3.0", + "resolved": "https://registry.npmmirror.com/@smithy/types/-/types-3.3.0.tgz", + "integrity": "sha512-IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==", "dependencies": { "tslib": "^2.6.2" }, @@ -1912,12 +1914,12 @@ } }, "node_modules/@smithy/url-parser": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/url-parser/-/url-parser-3.0.1.tgz", - "integrity": "sha512-G140IlNFlzYWVCedC4E2d6NycM1dCUbe5CnsGW1hmGt4hYKiGOw0v7lVru9WAn5T2w09QEjl4fOESWjGmCvVmg==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/url-parser/-/url-parser-3.0.3.tgz", + "integrity": "sha512-pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==", "dependencies": { - "@smithy/querystring-parser": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/querystring-parser": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" } }, @@ -1977,13 +1979,13 @@ } }, "node_modules/@smithy/util-defaults-mode-browser": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.5.tgz", - "integrity": "sha512-VZkJ+bXCHcNSMhX8EReGyFcc/Err94YGqeEKbbxkVz2TgKlacsoplpi+kxOMVbQq/tq9sQx5ajBKG+nl2GNuxw==", + "version": "3.0.7", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.7.tgz", + "integrity": "sha512-Q2txLyvQyGfmjsaDbVV7Sg8psefpFcrnlGapDzXGFRPFKRBeEg6OvFK8FljqjeHSaCZ6/UuzQExUPqBR/2qlDA==", "dependencies": { - "@smithy/property-provider": "^3.1.1", - "@smithy/smithy-client": "^3.1.3", - "@smithy/types": "^3.1.0", + "@smithy/property-provider": "^3.1.3", + "@smithy/smithy-client": "^3.1.5", + "@smithy/types": "^3.3.0", "bowser": "^2.11.0", "tslib": "^2.6.2" }, @@ -1992,16 +1994,16 @@ } }, "node_modules/@smithy/util-defaults-mode-node": { - "version": "3.0.5", - "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.5.tgz", - "integrity": "sha512-jy19cFQA0k4f8VUDFsZVBey3rmI8EuXCw/xh/abdiq6S1qdwdfZ5coviuyYd//LPszf2yWIYkLpvmLF9qbhLGg==", - "dependencies": { - "@smithy/config-resolver": "^3.0.2", - "@smithy/credential-provider-imds": "^3.1.1", - "@smithy/node-config-provider": "^3.1.1", - "@smithy/property-provider": "^3.1.1", - "@smithy/smithy-client": "^3.1.3", - "@smithy/types": "^3.1.0", + "version": "3.0.7", + "resolved": "https://registry.npmmirror.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.7.tgz", + "integrity": "sha512-F4Qcj1fG6MGi2BSWCslfsMSwllws/WzYONBGtLybyY+halAcXdWhcew+mej8M5SKd5hqPYp4f7b+ABQEaeytgg==", + "dependencies": { + "@smithy/config-resolver": "^3.0.4", + "@smithy/credential-provider-imds": "^3.1.3", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/property-provider": "^3.1.3", + "@smithy/smithy-client": "^3.1.5", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2009,12 +2011,12 @@ } }, "node_modules/@smithy/util-endpoints": { - "version": "2.0.2", - "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.2.tgz", - "integrity": "sha512-4zFOcBFQvifd2LSD4a1dKvfIWWwh4sWNtS3oZ7mpob/qPPmJseqKB148iT+hWCDsG//TmI+8vjYPgZdvnkYlTg==", + "version": "2.0.4", + "resolved": "https://registry.npmmirror.com/@smithy/util-endpoints/-/util-endpoints-2.0.4.tgz", + "integrity": "sha512-ZAtNf+vXAsgzgRutDDiklU09ZzZiiV/nATyqde4Um4priTmasDH+eLpp3tspL0hS2dEootyFMhu1Y6Y+tzpWBQ==", "dependencies": { - "@smithy/node-config-provider": "^3.1.1", - "@smithy/types": "^3.1.0", + "@smithy/node-config-provider": "^3.1.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2033,11 +2035,11 @@ } }, "node_modules/@smithy/util-middleware": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-middleware/-/util-middleware-3.0.1.tgz", - "integrity": "sha512-WRODCQtUsO7vIvfrdxS8RFPeLKcewYtaCglZsBsedIKSUGIIvMlZT5oh+pCe72I+1L+OjnZuqRNpN2LKhWA4KQ==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/util-middleware/-/util-middleware-3.0.3.tgz", + "integrity": "sha512-l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==", "dependencies": { - "@smithy/types": "^3.1.0", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2045,12 +2047,12 @@ } }, "node_modules/@smithy/util-retry": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@smithy/util-retry/-/util-retry-3.0.1.tgz", - "integrity": "sha512-5lRtYm+8fNFEUTdqZXg5M4ppVp40rMIJfR1TpbHAhKQgPIDpWT+iYMaqgnwEbtpi9U1smyUOPv5Sg+M1neOBgw==", + "version": "3.0.3", + "resolved": "https://registry.npmmirror.com/@smithy/util-retry/-/util-retry-3.0.3.tgz", + "integrity": "sha512-AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==", "dependencies": { - "@smithy/service-error-classification": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/service-error-classification": "^3.0.3", + "@smithy/types": "^3.3.0", "tslib": "^2.6.2" }, "engines": { @@ -2058,13 +2060,13 @@ } }, "node_modules/@smithy/util-stream": { - "version": "3.0.3", - "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.0.3.tgz", - "integrity": "sha512-ztOvXkXKJromRHNzvrLEW/vvTQPnxPBRHA0gR0QX61LnHDgrm4TBT4EQNpWwwHCD1N0nnEL5bEkzo2dt2t34Kg==", + "version": "3.0.5", + "resolved": "https://registry.npmmirror.com/@smithy/util-stream/-/util-stream-3.0.5.tgz", + "integrity": "sha512-xC3L5PKMAT/Bh8fmHNXP9sdQ4+4aKVUU3EEJ2CF/lLk7R+wtMJM+v/1B4en7jO++Wa5spGzFDBCl0QxgbUc5Ug==", "dependencies": { - "@smithy/fetch-http-handler": "^3.0.3", - "@smithy/node-http-handler": "^3.0.1", - "@smithy/types": "^3.1.0", + "@smithy/fetch-http-handler": "^3.2.0", + "@smithy/node-http-handler": "^3.1.1", + "@smithy/types": "^3.3.0", "@smithy/util-base64": "^3.0.0", "@smithy/util-buffer-from": "^3.0.0", "@smithy/util-hex-encoding": "^3.0.0", @@ -2480,9 +2482,9 @@ } }, "node_modules/bson": { - "version": "6.7.0", - "resolved": "https://registry.npmmirror.com/bson/-/bson-6.7.0.tgz", - "integrity": "sha512-w2IquM5mYzYZv6rs3uN2DZTOBe2a0zXLj53TGDqwF4l6Sz/XsISrisXOJihArF9+BZ6Cq/GjVht7Sjfmri7ytQ==", + "version": "6.8.0", + "resolved": "https://registry.npmmirror.com/bson/-/bson-6.8.0.tgz", + "integrity": "sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==", "engines": { "node": ">=16.20.1" } @@ -2551,9 +2553,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001636", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz", - "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==", + "version": "1.0.30001638", + "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001638.tgz", + "integrity": "sha512-5SuJUJ7cZnhPpeLHaH0c/HPAnAHZvS6ElWyHK9GSIbVOQABLzowiI2pjmpvZ1WEbkyz46iFd4UXlOHR5SqgfMQ==", "funding": [ { "type": "opencollective", @@ -2860,9 +2862,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.805", - "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.805.tgz", - "integrity": "sha512-8W4UJwX/w9T0QSzINJckTKG6CYpAUTqsaWcWIsdud3I1FYJcMgW9QqT1/4CBff/pP/TihWh13OmiyY8neto6vw==" + "version": "1.4.815", + "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.815.tgz", + "integrity": "sha512-OvpTT2ItpOXJL7IGcYakRjHCt8L5GrrN/wHCQsRB4PQa1X9fe+X9oen245mIId7s14xvArCGSTIq644yPUKKLg==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -3451,14 +3453,15 @@ } }, "node_modules/glob": { - "version": "10.4.1", - "resolved": "https://registry.npmmirror.com/glob/-/glob-10.4.1.tgz", - "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==", + "version": "10.4.2", + "resolved": "https://registry.npmmirror.com/glob/-/glob-10.4.2.tgz", + "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==", "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { @@ -3472,9 +3475,9 @@ } }, "node_modules/glob/node_modules/minimatch": { - "version": "9.0.4", - "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.4.tgz", - "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", + "version": "9.0.5", + "resolved": "https://registry.npmmirror.com/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -3615,9 +3618,9 @@ } }, "node_modules/https-proxy-agent": { - "version": "7.0.4", - "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz", - "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==", + "version": "7.0.5", + "resolved": "https://registry.npmmirror.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz", + "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==", "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -3810,9 +3813,9 @@ } }, "node_modules/joi": { - "version": "17.13.1", - "resolved": "https://registry.npmmirror.com/joi/-/joi-17.13.1.tgz", - "integrity": "sha512-vaBlIKCyo4FCUtCm7Eu4QZd/q02bWcxfUO6YSXAZOWF6gzcLBeba8kwotUdYJjDLW8Cz8RywsSOqiNJZW0mNvg==", + "version": "17.13.3", + "resolved": "https://registry.npmmirror.com/joi/-/joi-17.13.3.tgz", + "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==", "dependencies": { "@hapi/hoek": "^9.3.0", "@hapi/topo": "^5.1.0", @@ -3822,9 +3825,9 @@ } }, "node_modules/jose": { - "version": "4.15.5", - "resolved": "https://registry.npmmirror.com/jose/-/jose-4.15.5.tgz", - "integrity": "sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==", + "version": "4.15.7", + "resolved": "https://registry.npmmirror.com/jose/-/jose-4.15.7.tgz", + "integrity": "sha512-L7ioP+JAuZe8v+T5+zVI9Tx8LtU8BL7NxkyDFVMv+Qr3JW0jSoYDedLtodaXwfqMpeCyx4WXFNyu9tJt4WvC1A==", "funding": { "url": "https://github.com/sponsors/panva" } @@ -4138,9 +4141,9 @@ "optional": true }, "node_modules/mongodb": { - "version": "6.7.0", - "resolved": "https://registry.npmmirror.com/mongodb/-/mongodb-6.7.0.tgz", - "integrity": "sha512-TMKyHdtMcO0fYBNORiYdmM25ijsHs+Njs963r4Tro4OQZzqYigAzYQouwWRg4OIaiLRUEGUh/1UAcH5lxdSLIA==", + "version": "6.8.0", + "resolved": "https://registry.npmmirror.com/mongodb/-/mongodb-6.8.0.tgz", + "integrity": "sha512-HGQ9NWDle5WvwMnrvUxsFYPd3JEbqD3RgABHBQRuoCEND0qzhsd0iH5ypHsf1eJ+sXmvmyKpP+FLOKY8Il7jMw==", "dependencies": { "@mongodb-js/saslprep": "^1.1.5", "bson": "^6.7.0", @@ -4421,9 +4424,12 @@ } }, "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.13.2", + "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -4531,18 +4537,18 @@ } }, "node_modules/pac-proxy-agent": { - "version": "7.0.1", - "resolved": "https://registry.npmmirror.com/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz", - "integrity": "sha512-ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==", + "version": "7.0.2", + "resolved": "https://registry.npmmirror.com/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz", + "integrity": "sha512-BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==", "dependencies": { "@tootallnate/quickjs-emscripten": "^0.23.0", "agent-base": "^7.0.2", "debug": "^4.3.4", "get-uri": "^6.0.1", "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.2", - "pac-resolver": "^7.0.0", - "socks-proxy-agent": "^8.0.2" + "https-proxy-agent": "^7.0.5", + "pac-resolver": "^7.0.1", + "socks-proxy-agent": "^8.0.4" }, "engines": { "node": ">= 14" @@ -4560,6 +4566,11 @@ "node": ">= 14" } }, + "node_modules/package-json-from-dist": { + "version": "1.0.0", + "resolved": "https://registry.npmmirror.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz", + "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==" + }, "node_modules/parseurl": { "version": "1.3.3", "resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz", @@ -4592,9 +4603,9 @@ } }, "node_modules/path-scurry/node_modules/lru-cache": { - "version": "10.2.2", - "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-10.2.2.tgz", - "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==", + "version": "10.3.0", + "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-10.3.0.tgz", + "integrity": "sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==", "engines": { "node": "14 || >=16.14" } @@ -5183,13 +5194,13 @@ } }, "node_modules/socks-proxy-agent": { - "version": "8.0.3", - "resolved": "https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz", - "integrity": "sha512-VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==", + "version": "8.0.4", + "resolved": "https://registry.npmmirror.com/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz", + "integrity": "sha512-GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==", "dependencies": { "agent-base": "^7.1.1", "debug": "^4.3.4", - "socks": "^2.7.1" + "socks": "^2.8.3" }, "engines": { "node": ">= 14" diff --git a/pkgs/development/tools/mongosh/source.json b/pkgs/development/tools/mongosh/source.json index cdebe929bf966..d9e301c949b23 100644 --- a/pkgs/development/tools/mongosh/source.json +++ b/pkgs/development/tools/mongosh/source.json @@ -1,6 +1,6 @@ { - "version": "2.2.9", - "integrity": "sha512-7zROoz9tFqBW3t4aI6pO9S6GmGuDWb9m8hT0w91uL6CXTHUcYH7XM4INR2jr3+qXFYLkaXZ1WQoLgmuoJoSj7g==", - "filename": "mongosh-2.2.9.tgz", - "deps": "sha256-wefY8JDdtabrtlJfsT4iZsCwYIbIxv8T+U2S29Hl2O4=" + "version": "2.2.10", + "integrity": "sha512-VTuZLREjLMzUDD/s0QEvJFF18A2mvYgxbEfGFr22vDS1se47bxgPcvvuDGQCQvVWC6OG+f75qkwtp8jPkYWa4w==", + "filename": "mongosh-2.2.10.tgz", + "deps": "sha256-iSbFG/Xh2EtGCJfcTLLTJm4BMrTHnnhYuk+FIVE/TJI=" } diff --git a/pkgs/development/tools/nasmfmt/default.nix b/pkgs/development/tools/nasmfmt/default.nix index eda6940f079f7..e57dcffac2c0b 100644 --- a/pkgs/development/tools/nasmfmt/default.nix +++ b/pkgs/development/tools/nasmfmt/default.nix @@ -24,6 +24,6 @@ buildGoModule rec { mainProgram = "nasmfmt"; homepage = "https://github.com/yamnikov-oleg/nasmfmt"; license = licenses.mit; - maintainers = with maintainers; [ ckie ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/neil/default.nix b/pkgs/development/tools/neil/default.nix index 8331ecde3e615..6249685b503ba 100644 --- a/pkgs/development/tools/neil/default.nix +++ b/pkgs/development/tools/neil/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "neil"; - version = "0.3.65"; + version = "0.3.66"; src = fetchFromGitHub { owner = "babashka"; repo = "neil"; rev = "v${version}"; - sha256 = "sha256-QhWoCEoM04/MlUgCFCeAR7kF6QSg0joz/i9ZbXRQtDs="; + sha256 = "sha256-Gh4bhJh5ZB2ZEp3cx1D/r1qyc5SLdQ7RGGR12UaFW/k="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index 98a48c27742ca..0c8fd4b4e7b43 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib }: stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-ocamlbuild"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "ocaml"; repo = "ocamlbuild"; rev = version; - sha256 = "sha256-dfcNu4ugOYu/M0rRQla7lXum/g1UzncdLGmpPYo0QUM="; + sha256 = "sha256-j4Nd5flyvshIo+XFtBS0fKqdd9YcxYsjE7ty6rZLDRc="; }; createFindlibDestdir = true; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 6c2d5175c3f51..06161d95c4b2c 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.65.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-nf/xQ5744cplTNYkwaUbGv7Dw0BGf52dWTjnTVa9qL8="; + hash = "sha256-fx7k6KvL0uy2NXLDLpCnN1ux9MGEO1CbX6TdLweVzag="; }; vendorHash = null; diff --git a/pkgs/development/tools/osslsigncode/default.nix b/pkgs/development/tools/osslsigncode/default.nix index f622e11b14d0e..2fe91c46bcd3e 100644 --- a/pkgs/development/tools/osslsigncode/default.nix +++ b/pkgs/development/tools/osslsigncode/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "osslsigncode"; - version = "2.8"; + version = "2.9"; src = fetchFromGitHub { owner = "mtrojnar"; repo = pname; rev = version; - sha256 = "sha256-FcrymV0n/Bv0cS9Dx6sG+ifilBiPfaG+xpQvH9mvylQ="; + sha256 = "sha256-ENMFhIVQhPL4FDW9Ne2YGR3sXjvW55NN1bErfr/kDZg="; }; nativeBuildInputs = [ cmake pkg-config python3 ]; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index d2fad639aa21b..50d56bf9ec9ce 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "packer"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - hash = "sha256-LU3URVklSjpsQas9xtvIU2OcyMZHqkcA7WaUYCQHfns="; + hash = "sha256-GjC8nc8gpYQ3v0IYJc6vz0809PD6kTWx/HE1UOhTYc0="; }; - vendorHash = "sha256-ipinfk+nFAeyND1HNOehHd+0l5meOPOgbkmCzJlvw+A="; + vendorHash = "sha256-Xmmc30W1ZfMc7YSQswyCjw1KyDA5qi8W+kZ1L7cM3cQ="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 311be4ccdc29a..f06a2b5424ef1 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -35,7 +35,10 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { + # Skip non-release tags like `python-experimental`. + extraArgs = [ "--version-regex" "([0-9.]+)" ]; + }; tests = { inherit ninja php spamassassin; }; diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix index d6a47cfebf4bd..6ef6fb3c5f72a 100644 --- a/pkgs/development/tools/pnpm/default.nix +++ b/pkgs/development/tools/pnpm/default.nix @@ -8,8 +8,8 @@ let hash = "sha256-aR/hdu6pqKgN8g5JdvPftEoEhBzriFY4/iomF0+B5l4="; }; "9" = { - version = "9.3.0"; - hash = "sha256-4fno0aFmB6Rt08FYtfen3HlFUB0cYiLUVNY9Az0dkY8="; + version = "9.4.0"; + hash = "sha256-tv0L/aVV5+WErX5WswxosB1aBPnuk5ifS5PKhHPEnHQ="; }; }; diff --git a/pkgs/development/tools/pnpm/fetch-deps/default.nix b/pkgs/development/tools/pnpm/fetch-deps/default.nix index 83972abf8b08a..eb8b847960c53 100644 --- a/pkgs/development/tools/pnpm/fetch-deps/default.nix +++ b/pkgs/development/tools/pnpm/fetch-deps/default.nix @@ -1,17 +1,17 @@ { + lib, stdenvNoCC, - fetchurl, callPackage, jq, moreutils, cacert, makeSetupHook, pnpm, + yq, }: { fetchDeps = { - src, hash ? "", pname, ... @@ -36,15 +36,22 @@ name = "${pname}-pnpm-deps"; nativeBuildInputs = [ + cacert jq moreutils pnpm - cacert + yq ]; installPhase = '' runHook preInstall + lockfileVersion="$(yq -r .lockfileVersion pnpm-lock.yaml)" + if [[ ''${lockfileVersion:0:1} -gt ${lib.versions.major pnpm.version} ]]; then + echo "ERROR: lockfileVersion $lockfileVersion in pnpm-lock.yaml is too new for the provided pnpm version ${lib.versions.major pnpm.version}!" + exit 1 + fi + export HOME=$(mktemp -d) pnpm config set store-dir $out # Some packages produce platform dependent outputs. We do not want to cache those in the global store diff --git a/pkgs/development/tools/prettierd/default.nix b/pkgs/development/tools/prettierd/default.nix deleted file mode 100644 index bf7ab9e692036..0000000000000 --- a/pkgs/development/tools/prettierd/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, mkYarnPackage -, fetchFromGitHub -, makeWrapper -, nodejs -, fetchYarnDeps -, -}: -mkYarnPackage rec { - pname = "prettierd"; - version = "0.25.3"; - - src = fetchFromGitHub { - owner = "fsouza"; - repo = "prettierd"; - rev = "v${version}"; - hash = "sha256-3lvFZ5/p+1kPnHIR2PlQtCY3SVo1rs8IuBigLaabxAE="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - hash = "sha256-Ti2b102pzUKB6Xy3LwZ7DlrnW0cRscgNLTUIAKz+6Us="; - }; - - packageJSON = ./package.json; - - nativeBuildInputs = [ makeWrapper ]; - - buildPhase = '' - runHook preBuild - export HOME=$(mktemp -d) - yarn --offline build - runHook postBuild - ''; - - # prettierd needs to be wrapped with nodejs so that it can be executed - postInstall = '' - wrapProgram "$out/bin/prettierd" --prefix PATH : "${nodejs}/bin" - ''; - - doDist = false; - - meta = with lib; { - mainProgram = "prettierd"; - description = "Prettier, as a daemon, for improved formatting speed"; - homepage = "https://github.com/fsouza/prettierd"; - license = licenses.isc; - changelog = "https://github.com/fsouza/prettierd/blob/${src.rev}/CHANGELOG.md"; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ NotAShelf n3oney ]; - }; -} diff --git a/pkgs/development/tools/prettierd/package.json b/pkgs/development/tools/prettierd/package.json deleted file mode 100644 index 085e4ab73f7c3..0000000000000 --- a/pkgs/development/tools/prettierd/package.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "name": "@fsouza/prettierd", - "version": "0.25.3", - "description": "prettier, as a daemon", - "bin": { - "prettierd": "./bin/prettierd" - }, - "scripts": { - "prepare": "yarn build", - "build": "tsc -b", - "run": "node bin/prettierd", - "start": "node bin/prettierd start", - "prettier:check": "prettier --check .", - "prettier:fix": "prettier --write ." - }, - "repository": { - "type": "git", - "url": "git+https://github.com/fsouza/prettierd.git" - }, - "author": "Francisco Souza", - "license": "ISC", - "bugs": { - "url": "https://github.com/fsouza/prettierd/issues" - }, - "homepage": "https://github.com/fsouza/prettierd", - "devDependencies": { - "@types/node": "^20.12.7", - "@types/prettier": "^3.0.0", - "typescript": "^5.4.5" - }, - "dependencies": { - "core_d": "^6.1.0", - "prettier": "^3.2.5" - }, - "files": [ - "bin", - "dist", - "LICENSE", - "README.md" - ], - "optionalDependencies": { - "@babel/parser": "^7.24.4", - "@typescript-eslint/typescript-estree": "^7.6.0" - } -} diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix index 598b2570600e7..58fab74c98841 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -27,7 +27,6 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ poetry-core - pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix index cd2d261aa7218..52a54fbeeaa13 100644 --- a/pkgs/development/tools/protoc-gen-go/default.nix +++ b/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.34.1"; + version = "1.34.2"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - hash = "sha256-xbfqN/t6q5dFpg1CkxwxAQkUs8obfckMDqytYzuDwF4="; + hash = "sha256-467+AhA3tADBg6+qbTd1SvLW+INL/1QVR8PzfAMYKFA="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; diff --git a/pkgs/development/tools/protolint/default.nix b/pkgs/development/tools/protolint/default.nix index 6fecadca5e7ae..a9252814d28e8 100644 --- a/pkgs/development/tools/protolint/default.nix +++ b/pkgs/development/tools/protolint/default.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "protolint"; - version = "0.49.8"; + version = "0.50.1"; src = fetchFromGitHub { owner = "yoheimuta"; repo = pname; rev = "v${version}"; - hash = "sha256-x4xjFXpyuZRBcE6I+s3GCJmTg/nm9lHHnXNAKOFA5RQ="; + hash = "sha256-zn9bxOWJWlF3lpVAuJQTTnBqNeTAZg+0bPVGAzf3a54="; }; - vendorHash = "sha256-xHBiY2SHprGxmjaNqHPUMc0oa4iQ9L3X8ydvEiG5om4="; + vendorHash = "sha256-E3pzeu+JA97z2q21ARTgwTPldhWODqkCP7rQMMKygAw="; # Something about the way we run tests causes issues. It doesn't happen # when using "go test" directly: diff --git a/pkgs/development/tools/pyenv/default.nix b/pkgs/development/tools/pyenv/default.nix index 9f761ef0be276..5088c01b4882a 100644 --- a/pkgs/development/tools/pyenv/default.nix +++ b/pkgs/development/tools/pyenv/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pyenv"; - version = "2.4.3"; + version = "2.4.5"; src = fetchFromGitHub { owner = "pyenv"; repo = "pyenv"; rev = "refs/tags/v${version}"; - hash = "sha256-jYBKTrpc3KI1iW/VCw4Udk4TS8dXFGg5WgbEWZ+vWqE="; + hash = "sha256-0MMPbn6BaIn623nHYuNYsiMIFF0y2fAYmjxZ/XESyTg="; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index c9e219f82bd47..100aba324db36 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -1,23 +1,23 @@ { lib, rustPlatform, fetchFromGitHub, pkg-config, openssl, stdenv, CoreServices -, Security }: +, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.9.0"; + version = "3.9.3"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-eMbeU9DflGXQRqoXnTlMmCJUsCvAywjmckDqxhT+LD8="; + hash = "sha256-8K+awKsSQotPqVJg7SkpPCjenU6a/cqEZogqwQAe0I8="; }; - cargoHash = "sha256-rYHvvGyD49+n7DHHd0CKCwd6w5WgWONWGxW2vXm7DL4="; + cargoHash = "sha256-2KNSPn0zrx5zwF9g29x3/L/ptza+NstBu4Lc1PR4ymE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] - ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index a11f60bf99c4a..f5b2b5a36198e 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2024.06.17.00"; + version = "2024.07.01.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "reindeer"; rev = "refs/tags/v${version}"; - hash = "sha256-J3ZrlX83TE63Go4qp+lMhexkuaV0ZgHNYga8qxZF0wI="; + hash = "sha256-eA2eD/762/hJQ7p/V/Hw1dYzkqnqXZymdg8ef2wi8to="; }; - cargoHash = "sha256-xqDMfGNvlyFo3v9GmESfRG+WyQKbzTojOqtYK/tMPxo="; + cargoHash = "sha256-hyySKUDeZ7aPXQ7f4grgYY3cTkhE82rrh2EFasrnGX0="; nativeBuildInputs = [ pkg-config ]; buildInputs = diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix deleted file mode 100644 index 5f8a751aa0c79..0000000000000 --- a/pkgs/development/tools/repository-managers/nexus/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre_headless, gawk }: - -stdenv.mkDerivation rec { - pname = "nexus"; - version = "3.68.1-02"; - - src = fetchurl { - url = "https://download.sonatype.com/nexus/3/nexus-${version}-unix.tar.gz"; - hash = "sha256-VHS4KDFgU3djteDzDAe43TZIwRG/8bb7u3usoOCJS5M="; - }; - - preferLocalBuild = true; - - sourceRoot = "${pname}-${version}"; - - nativeBuildInputs = [ makeWrapper ]; - - patches = [ ./nexus-bin.patch ./nexus-vm-opts.patch ]; - - postPatch = '' - substituteInPlace bin/nexus.vmoptions \ - --replace ../sonatype-work /var/lib/sonatype-work \ - --replace etc/karaf $out/etc/karaf \ - --replace =. =$out - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -rfv * .install4j $out - rm -fv $out/bin/nexus.bat - - wrapProgram $out/bin/nexus \ - --set JAVA_HOME ${jre_headless} \ - --set ALTERNATIVE_NAME "nexus" \ - --prefix PATH "${lib.makeBinPath [ gawk ]}" - - runHook postInstall - ''; - - meta = with lib; { - description = "Repository manager for binary software components"; - homepage = "https://www.sonatype.com/products/sonatype-nexus-oss"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.epl10; - platforms = platforms.all; - maintainers = with maintainers; [ aespinosa ironpinguin zaninime ]; - }; -} diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch b/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch deleted file mode 100644 index 14bcc973aae74..0000000000000 --- a/pkgs/development/tools/repository-managers/nexus/nexus-bin.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/bin/nexus b/bin/nexus -index d06cb44..37c606e 100755 ---- a/bin/nexus -+++ b/bin/nexus -@@ -88,7 +88,7 @@ create_db_entry() { - fi - db_new_file=${db_file}_new - if [ -f "$db_file" ]; then -- awk '$2 != "'"$test_dir"'" {print $0}' $db_file > $db_new_file -+ awk '$2 != "'"$test_dir"'" {print $scriptname}' $db_file > $db_new_file - rm "$db_file" - mv "$db_new_file" "$db_file" - fi -@@ -246,7 +246,7 @@ read_vmoptions() { - - unpack_file() { - if [ -f "$1" ]; then -- jar_file=`echo "$1" | awk '{ print substr($0,1,length-5) }'` -+ jar_file=`echo "$1" | awk '{ print substr($scriptname,1,length-5) }'` - bin/unpack200 -r "$1" "$jar_file" - - if [ $? -ne 0 ]; then -@@ -377,9 +377,14 @@ fi - - old_pwd=`pwd` - --progname=`basename "$0"` --linkdir=`dirname "$0"` -+scriptname=$0 - -+if [ ! -z "$ALTERNATIVE_NAME" ]; then -+ scriptname=`dirname "$0"`"/"$ALTERNATIVE_NAME -+fi -+ -+progname=`basename "$scriptname"` -+linkdir=`dirname "$scriptname"` - cd "$linkdir" - prg="$progname" - -@@ -590,7 +595,7 @@ return_code=$? - - ;; - *) -- echo "Usage: $0 {start|stop|run|run-redirect|status|restart|force-reload}" -+ echo "Usage: $scriptname {start|stop|run|run-redirect|status|restart|force-reload}" - exit 1 - ;; - esac diff --git a/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch b/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch deleted file mode 100644 index 744b4b96a56bb..0000000000000 --- a/pkgs/development/tools/repository-managers/nexus/nexus-vm-opts.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/bin/nexus b/bin/nexus -index e7ed3fb..8db766b 100755 ---- a/bin/nexus -+++ b/bin/nexus -@@ -440,7 +440,8 @@ add_class_path "$app_home/lib/boot/org.apache.karaf.diagnostic.boot-4.0.9.jar" - add_class_path "$app_home/lib/boot/org.apache.karaf.jaas.boot-4.0.9.jar" - - vmoptions_val="" --read_vmoptions "$prg_dir/$progname.vmoptions" -+VM_OPTS=${VM_OPTS_FILE:-"$prg_dir/$progname.vmoptions"} -+read_vmoptions "$VM_OPTS" - INSTALL4J_ADD_VM_PARAMS="$INSTALL4J_ADD_VM_PARAMS $vmoptions_val" - - diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix index c62211d697ecd..96d938ad20401 100644 --- a/pkgs/development/tools/rgp/default.nix +++ b/pkgs/development/tools/rgp/default.nix @@ -7,6 +7,7 @@ , fontconfig , freetype , glib +, libdrm , libGLU , libglvnd , libICE @@ -21,15 +22,15 @@ }: let - buildNum = "2023-12-04-1282"; + buildNum = "2024-04-18-1396"; in stdenv.mkDerivation { pname = "rgp"; - version = "2.0"; + version = "2.1"; src = fetchurl { url = "https://gpuopen.com/download/radeon-developer-tool-suite/RadeonDeveloperToolSuite-${buildNum}.tgz"; - hash = "sha256-gGkINq0tmOCkZJMxtoURHikqEGXGuRAP6Y6PEOLqmI0="; + hash = "sha256-mP5tmq252IsWYVRGNKVib8ZbM5M4srUKXJ3x2ff4YhM="; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; @@ -39,6 +40,7 @@ stdenv.mkDerivation { fontconfig freetype glib + libdrm libGLU libglvnd libICE diff --git a/pkgs/development/tools/rubyfmt/0003-ignore-warnings.patch b/pkgs/development/tools/rubyfmt/0003-ignore-warnings.patch new file mode 100644 index 0000000000000..6c46ebb060876 --- /dev/null +++ b/pkgs/development/tools/rubyfmt/0003-ignore-warnings.patch @@ -0,0 +1,21 @@ +diff --git i/librubyfmt/build.rs w/librubyfmt/build.rs +index 296b749..941a4ca 100644 +--- i/librubyfmt/build.rs ++++ w/librubyfmt/build.rs +@@ -166,6 +166,7 @@ fn run_configure(ruby_checkout_path: &Path) -> Output { + command + .arg("--target=aarch64-unknown-linux-gnu") + .arg("--host=x86_64") ++ .arg("--disable-werror") + .env("CC", "aarch64-linux-gnu-gcc") + .env("AR", "aarch64-linux-gnu-ar") + .env("RANLIB", "aarch64-linux-gnu-ranlib"); +diff --git i/librubyfmt/src/lib.rs w/librubyfmt/src/lib.rs +index 9b94b5f..b78e99f 100644 +--- i/librubyfmt/src/lib.rs ++++ w/librubyfmt/src/lib.rs +@@ -1,4 +1,3 @@ +-#![deny(warnings, missing_copy_implementations)] + #![allow(clippy::upper_case_acronyms, clippy::enum_variant_names)] + + use serde::de::value; \ No newline at end of file diff --git a/pkgs/development/tools/rubyfmt/default.nix b/pkgs/development/tools/rubyfmt/default.nix index 272fe25a5b14e..287959dbf0b57 100644 --- a/pkgs/development/tools/rubyfmt/default.nix +++ b/pkgs/development/tools/rubyfmt/default.nix @@ -61,6 +61,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ # Avoid checking whether ruby gitsubmodule is up-to-date. ./0002-remove-dependency-on-git.patch + # Avoid failing on unused variable warnings. + ./0003-ignore-warnings.patch ]; cargoHash = "sha256-QZ26GmsKyENkzdCGg2peie/aJhEt7KQAF/lwsibonDk="; @@ -71,17 +73,12 @@ rustPlatform.buildRustPackage rec { mv $out/bin/rubyfmt{-main,} ''; - meta = with lib; { + meta = { description = "Ruby autoformatter"; homepage = "https://github.com/fables-tales/rubyfmt"; - license = licenses.mit; - maintainers = with maintainers; [ bobvanderlinden ]; - # https://github.com/NixOS/nixpkgs/issues/320722 - broken = true - # = note: Undefined symbols for architecture x86_64: - # "_utimensat", referenced from: - # _utime_internal in librubyfmt-3c969812b3b27083.rlib(file.o) - || stdenv.isDarwin && stdenv.isx86_64; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bobvanderlinden ]; + broken = stdenv.isDarwin; mainProgram = "rubyfmt"; }; } diff --git a/pkgs/development/tools/ruff/Cargo.lock b/pkgs/development/tools/ruff/Cargo.lock index 6d910ad0ab5ad..fc0c35f537593 100644 --- a/pkgs/development/tools/ruff/Cargo.lock +++ b/pkgs/development/tools/ruff/Cargo.lock @@ -376,7 +376,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -617,7 +617,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.10.0", - "syn 2.0.66", + "syn", ] [[package]] @@ -628,7 +628,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -692,17 +692,6 @@ dependencies = [ ] [[package]] -name = "displaydoc" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] name = "drop_bomb" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -766,6 +755,17 @@ dependencies = [ ] [[package]] +name = "etcetera" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +dependencies = [ + "cfg-if", + "home", + "windows-sys 0.48.0", +] + +[[package]] name = "eyre" version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -978,124 +978,6 @@ dependencies = [ ] [[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] name = "ident_case" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1103,14 +985,12 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "1.0.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", + "unicode-bidi", + "unicode-normalization", ] [[package]] @@ -1260,7 +1140,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -1386,14 +1266,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2ae40017ac09cd2c6a53504cb3c871c7f2b41466eac5bc66ba63f39073b467b" dependencies = [ "quote", - "syn 2.0.66", + "syn", ] [[package]] name = "libmimalloc-sys" -version = "0.1.38" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7bb23d733dfcc8af652a78b7bf232f0e967710d044732185e561e47c0336b6" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -1422,12 +1302,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - -[[package]] name = "lock_api" version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1496,9 +1370,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mimalloc" -version = "0.1.42" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9186d86b79b52f4a77af65604b51225e8db1d6ee7e3f41aec1e40829c71a176" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -1859,9 +1733,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1973,24 +1847,38 @@ dependencies = [ "dashmap", "hashbrown 0.14.5", "indexmap", - "insta", "is-macro", "notify", "parking_lot", "rayon", - "red_knot_python_semantic", + "red_knot_module_resolver", "ruff_index", "ruff_notebook", "ruff_python_ast", "ruff_python_parser", - "ruff_python_stdlib", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", "smol_str", "tempfile", "tracing", "tracing-subscriber", "tracing-tree", +] + +[[package]] +name = "red_knot_module_resolver" +version = "0.0.0" +dependencies = [ + "anyhow", + "insta", + "path-slash", + "ruff_db", + "ruff_python_stdlib", + "rustc-hash 2.0.0", + "salsa", + "smol_str", + "tempfile", + "tracing", "walkdir", "zip", ] @@ -2003,17 +1891,16 @@ dependencies = [ "bitflags 2.5.0", "hashbrown 0.14.5", "indexmap", + "red_knot_module_resolver", "ruff_db", "ruff_index", "ruff_python_ast", "ruff_python_parser", - "ruff_python_stdlib", "ruff_text_size", - "rustc-hash", - "salsa-2022", + "rustc-hash 2.0.0", + "salsa", "smallvec", "smol_str", - "tempfile", "tracing", ] @@ -2098,7 +1985,7 @@ dependencies = [ [[package]] name = "ruff" -version = "0.4.10" +version = "0.5.0" dependencies = [ "anyhow", "argfile", @@ -2133,7 +2020,7 @@ dependencies = [ "ruff_source_file", "ruff_text_size", "ruff_workspace", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "serde_json", "shellexpand", @@ -2189,14 +2076,14 @@ dependencies = [ "countme", "dashmap", "filetime", - "itertools 0.13.0", + "insta", "once_cell", "ruff_python_ast", "ruff_python_parser", "ruff_source_file", "ruff_text_size", - "rustc-hash", - "salsa-2022", + "rustc-hash 2.0.0", + "salsa", "tracing", "zip", ] @@ -2227,7 +2114,6 @@ dependencies = [ "ruff_python_parser", "ruff_python_stdlib", "ruff_python_trivia", - "ruff_text_size", "ruff_workspace", "schemars", "serde", @@ -2260,7 +2146,7 @@ dependencies = [ "ruff_cache", "ruff_macros", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "static_assertions", @@ -2278,7 +2164,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.4.10" +version = "0.5.0" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2320,7 +2206,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "serde_json", @@ -2345,7 +2231,7 @@ dependencies = [ "proc-macro2", "quote", "ruff_python_trivia", - "syn 2.0.66", + "syn", ] [[package]] @@ -2379,7 +2265,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", "serde", ] @@ -2426,7 +2312,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "serde_json", @@ -2472,7 +2358,7 @@ dependencies = [ "ruff_python_trivia", "ruff_source_file", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", "static_assertions", "unicode-ident", "unicode-normalization", @@ -2502,7 +2388,7 @@ dependencies = [ "ruff_python_stdlib", "ruff_source_file", "ruff_text_size", - "rustc-hash", + "rustc-hash 2.0.0", ] [[package]] @@ -2558,7 +2444,7 @@ dependencies = [ "ruff_source_file", "ruff_text_size", "ruff_workspace", - "rustc-hash", + "rustc-hash 2.0.0", "serde", "serde_json", "shellexpand", @@ -2618,7 +2504,7 @@ version = "0.0.0" dependencies = [ "anyhow", "colored", - "dirs 5.0.1", + "etcetera", "glob", "globset", "ignore", @@ -2637,7 +2523,7 @@ dependencies = [ "ruff_python_ast", "ruff_python_formatter", "ruff_source_file", - "rustc-hash", + "rustc-hash 2.0.0", "schemars", "serde", "shellexpand", @@ -2663,6 +2549,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] +name = "rustc-hash" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" + +[[package]] name = "rustix" version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2719,9 +2611,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] -name = "salsa-2022" -version = "0.1.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=05b4e3ebdcdc47730cdd359e7e97fb2470527279#05b4e3ebdcdc47730cdd359e7e97fb2470527279" +name = "salsa" +version = "0.18.0" +source = "git+https://github.com/salsa-rs/salsa.git?rev=f706aa2d32d473ee633a77c1af01d180c85da308#f706aa2d32d473ee633a77c1af01d180c85da308" dependencies = [ "arc-swap", "crossbeam", @@ -2731,21 +2623,22 @@ dependencies = [ "indexmap", "log", "parking_lot", - "rustc-hash", - "salsa-2022-macros", + "rustc-hash 1.1.0", + "salsa-macros", "smallvec", ] [[package]] -name = "salsa-2022-macros" -version = "0.1.0" -source = "git+https://github.com/salsa-rs/salsa.git?rev=05b4e3ebdcdc47730cdd359e7e97fb2470527279#05b4e3ebdcdc47730cdd359e7e97fb2470527279" +name = "salsa-macros" +version = "0.18.0" +source = "git+https://github.com/salsa-rs/salsa.git?rev=f706aa2d32d473ee633a77c1af01d180c85da308#f706aa2d32d473ee633a77c1af01d180c85da308" dependencies = [ "eyre", "heck 0.4.1", "proc-macro2", "quote", - "syn 1.0.109", + "syn", + "synstructure", ] [[package]] @@ -2778,7 +2671,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.66", + "syn", ] [[package]] @@ -2827,7 +2720,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -2838,7 +2731,7 @@ checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -2860,7 +2753,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -2901,7 +2794,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -2956,12 +2849,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2990,9 +2877,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" dependencies = [ "strum_macros", ] @@ -3007,7 +2894,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.66", + "syn", ] [[package]] @@ -3018,20 +2905,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[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.66" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -3046,7 +2922,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3102,7 +2978,7 @@ dependencies = [ "cfg-if", "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3113,7 +2989,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", "test-case-core", ] @@ -3134,7 +3010,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3168,16 +3044,6 @@ dependencies = [ ] [[package]] -name = "tinystr" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" -dependencies = [ - "displaydoc", - "zerovec", -] - -[[package]] name = "tinytemplate" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3256,7 +3122,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3371,6 +3237,12 @@ dependencies = [ ] [[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] name = "unicode-ident" version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3387,9 +3259,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode_names2" @@ -3444,9 +3316,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -3455,18 +3327,6 @@ dependencies = [ ] [[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - -[[package]] name = "utf8parse" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3492,7 +3352,7 @@ checksum = "9881bea7cbe687e36c9ab3b778c36cd0487402e270304e8b1296d5085303c1a2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3577,7 +3437,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn", "wasm-bindgen-shared", ] @@ -3611,7 +3471,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3644,7 +3504,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn", ] [[package]] @@ -3882,18 +3742,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" [[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - -[[package]] name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3909,30 +3757,6 @@ dependencies = [ ] [[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure", -] - -[[package]] name = "zerocopy" version = "0.7.32" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3949,28 +3773,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", -] - -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure", + "syn", ] [[package]] @@ -3980,28 +3783,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] -name = "zerovec" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] name = "zip" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index a58eadf632ff4..6a68f3a7b8204 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.4.10"; + version = "0.5.0"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; - rev = "refs/tags/v${version}"; - hash = "sha256-FRBuvXtnbxRWoI0f8SM0U0Z5TRyX5Tbgq3d34Oh2bG4="; + rev = "refs/tags/${version}"; + hash = "sha256-OjMoa247om4DLPZ6u0XPMd5L+LYlVzHL39plCCr/fYE="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "lsp-types-0.95.1" = "sha256-8Oh299exWXVi6A39pALOISNfp8XBya8z+KT/Z7suRxQ="; - "salsa-2022-0.1.0" = "sha256-mt+X1hO+5ZrCAgy6N4aArnixJ9GjY/KwM0uIMUSrDsg="; + "salsa-0.18.0" = "sha256-keVEmSwV1Su1RlOTaIu253FZidk279qA+rXcCeuOggc="; }; }; @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage rec { "--skip=semantic::types::infer::tests::resolve_visible_def" ]; - postInstall = '' + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd ruff \ --bash <($out/bin/ruff generate-shell-completion bash) \ --fish <($out/bin/ruff generate-shell-completion fish) \ @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Extremely fast Python linter"; homepage = "https://github.com/astral-sh/ruff"; - changelog = "https://github.com/astral-sh/ruff/releases/tag/v${version}"; + changelog = "https://github.com/astral-sh/ruff/releases/tag/${version}"; license = lib.licenses.mit; mainProgram = "ruff"; maintainers = with lib.maintainers; [ diff --git a/pkgs/development/tools/rust/cargo-deb/default.nix b/pkgs/development/tools/rust/cargo-deb/default.nix index 693b92d746766..27c60b4039018 100644 --- a/pkgs/development/tools/rust/cargo-deb/default.nix +++ b/pkgs/development/tools/rust/cargo-deb/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "kornelski"; repo = pname; rev = "v${version}"; - hash = "sha256-iXqYaRDRaqmI7Y3oEE1fFKYFX/+7Rt3qpzpQ5+l8Z3w="; + hash = "sha256-fJJMbibX/i/l1Qc/V4+loHJ+G/+nnstB0a1dlXkJjk0="; }; - cargoHash = "sha256-LRE18jzgx/aONJkeqzEyDWrWNyp/FmxUGmOy3A9vA7Q="; + cargoHash = "sha256-SelvLaI+vG4PzBcxphBpeFM0nRtaQoTHvuS/8P8/Cig="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/development/tools/rust/cargo-dist/default.nix b/pkgs/development/tools/rust/cargo-dist/default.nix index 50eb5146262e9..e8a97f906d05a 100644 --- a/pkgs/development/tools/rust/cargo-dist/default.nix +++ b/pkgs/development/tools/rust/cargo-dist/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-dist"; - version = "0.16.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "axodotdev"; repo = "cargo-dist"; rev = "v${version}"; - hash = "sha256-KF8fdUfAXfSLIzt9+7sgbrDgKe+6478eXCGFxxX/WC0="; + hash = "sha256-r7f4Ev/ucOFo4cu8zy+UDb2aJh35IMjgwuQ96j0pnw8="; }; - cargoHash = "sha256-jrHcr/YsMTEk+X1/puausYI75Ozqdi8hol7sRFUJkPU="; + cargoHash = "sha256-GvzYoCbpn/q+jXyIfNgZ7j0cyCiJk7ipICAeGgMfkyw="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/development/tools/rust/cargo-mutants/default.nix b/pkgs/development/tools/rust/cargo-mutants/default.nix index e712518ece890..1a54ba51a9a6f 100644 --- a/pkgs/development/tools/rust/cargo-mutants/default.nix +++ b/pkgs/development/tools/rust/cargo-mutants/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-mutants"; - version = "24.5.0"; + version = "24.7.0"; src = fetchFromGitHub { owner = "sourcefrog"; repo = "cargo-mutants"; rev = "v${version}"; - hash = "sha256-qKgHlFb7sraXTpqf6QsOspzHGWtVZAUSOl3rl6pqQJk="; + hash = "sha256-cDwNjPuXa6cpgGUDAAZVWZulcAYM6p5vUQrCs9njuUs="; }; - cargoHash = "sha256-h9nhE7pSwxE2NKJQtlA6Exwh36pC6Lp0y3u0AEh39N4="; + cargoHash = "sha256-6igY0LzjwPNmVxXTgj+RE5GpK/EyBRhv0yqHp15051s="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.SystemConfiguration diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix index 4d2fcecfc5de5..6509fa381c885 100644 --- a/pkgs/development/tools/rust/cargo-public-api/default.nix +++ b/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-public-api"; - version = "0.35.1"; + version = "0.36.0"; src = fetchCrate { inherit pname version; - hash = "sha256-Jz4sdf/Heh0+rnz2JP5TJFqRPCdi1Km+PSoafkmq/6Y="; + hash = "sha256-Umxkm+GCXsb60l9Gq417cynoy7D30Hlh6r04HoWGVPA="; }; - cargoHash = "sha256-K45PT28cxYWn7lF/ghhgCXcLA9uZUiI+3WMYeU3bbzM="; + cargoHash = "sha256-Aj9SykzdAZJSw8wQ5QHLhtWaxo2tnjjdJZnPIp3fsVw="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-run-bin/default.nix b/pkgs/development/tools/rust/cargo-run-bin/default.nix index a12ebb8caf9b7..e72f5d0742730 100644 --- a/pkgs/development/tools/rust/cargo-run-bin/default.nix +++ b/pkgs/development/tools/rust/cargo-run-bin/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-run-bin"; - version = "1.7.2"; + version = "1.7.3"; src = fetchCrate { inherit pname version; - hash = "sha256-VhDCOTabj/HHc6bYdAUOErvxXOzyY3+e7GccZcb1cSQ="; + hash = "sha256-VMlia5EEnNiNkOzwdTZwoaKtAxHz5xAxxnGlGoSbD80="; }; - cargoHash = "sha256-riWWxv3FsBrgzVUWGtKvV4WjhgsXImLpiS9EJ40kCn8="; + cargoHash = "sha256-DFsDUoYq+TE8ifwQIl5YfoeUl8udIf1z35rFmLe/4To="; # multiple impurities in tests doCheck = false; diff --git a/pkgs/development/tools/rust/cargo-show-asm/default.nix b/pkgs/development/tools/rust/cargo-show-asm/default.nix index 24b64c0cdf6f7..02823914e15af 100644 --- a/pkgs/development/tools/rust/cargo-show-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-show-asm/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-show-asm"; - version = "0.2.36"; + version = "0.2.38"; src = fetchCrate { inherit pname version; - hash = "sha256-Ptv8txt7YXPh1QvFwsoRbBQgeLBGn6iVqst1GHU+JJw="; + hash = "sha256-CYnW6wv4aL/Qs6IwPaRi9w8/iNMo5to0J3z4zTdgHaE="; }; - cargoHash = "sha256-GkhFbRhEJ+7ikqkNPydKx3Ty8KRsGts5UnwA8bl8Po8="; + cargoHash = "sha256-jRsxP4b1URTDcnp8VsZvSTaPNOBBwq570eCn2jfQSGg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 7b1613cfd7268..828f50e467c38 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.46"; + version = "1.0.48"; src = fetchCrate { inherit pname version; - hash = "sha256-wQo9HDVb7m+FdrMnNVAESEK3k3wrsZYvVpIMu2YNhS8="; + hash = "sha256-BrWJKM7Vkvjlkn3PCBe45epQc2SkjKVlttQF0/AHSls="; }; - cargoHash = "sha256-tj9bbT7UlsVbEibtomB7rFK/V6Jdo5K0uoeuXw1yq+o="; + cargoHash = "sha256-Dkz3QJchUAn4/kQsmQcSfxVrRdiCA2qJSOTszfvE4No="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration diff --git a/pkgs/development/tools/rust/cargo-tauri/default.nix b/pkgs/development/tools/rust/cargo-tauri/default.nix index db1a2821de963..d6bc6ed754076 100644 --- a/pkgs/development/tools/rust/cargo-tauri/default.nix +++ b/pkgs/development/tools/rust/cargo-tauri/default.nix @@ -17,20 +17,20 @@ let in rustPlatform.buildRustPackage rec { pname = "tauri"; - version = "1.6.8"; + version = "1.7.1"; src = fetchFromGitHub { owner = "tauri-apps"; repo = pname; rev = "tauri-v${version}"; - hash = "sha256-6GUgxSfuy2v38lYVdjsN0vd63/Aci0ERgG2kF2E2AFA="; + hash = "sha256-xQsj+NjfWc4nU/MKPzWal6n+YZpruypPoUm926JiI7k="; }; # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 sourceRoot = "${src.name}/tooling/cli"; - cargoHash = "sha256-HC+6AoBx51ahK6QA1Ug7jaKftkE5W3FS629uQ0yrV3Q="; + cargoHash = "sha256-xcytn3cV1Tw6O9glihbyCvERuUBA1yioR4PIbL1T53Q="; buildInputs = [ openssl ] ++ lib.optionals stdenv.isLinux [ glibc libsoup cairo gtk3 webkitgtk ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index e54021554004e..7aca9708590b7 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.47"; + version = "0.1.49"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1XnCGbOkAmQycwAAEbkoX9xHqBZWYM9v5fp8BdFv7RM="; + sha256 = "sha256-XIr1erxW2S7Ok0DqsDtLn9wRT874o7tIWrt+HrjHACs="; }; - cargoHash = "sha256-awEqrvmu9Kgqlz43/yJFM45WfUXZPLix5LKLtwiXV7U="; + cargoHash = "sha256-x++h5FOb5LXV9miRYZjnZcmp2Djn0P2gdBLAOO977IU="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/rust/cargo-zigbuild/default.nix b/pkgs/development/tools/rust/cargo-zigbuild/default.nix index 4ffd90ca1f830..d4ba928a104de 100644 --- a/pkgs/development/tools/rust/cargo-zigbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-zigbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-zigbuild"; - version = "0.18.4"; + version = "0.19.0"; src = fetchFromGitHub { owner = "messense"; repo = pname; rev = "v${version}"; - hash = "sha256-J9R/cT58wjvDcS5AKhGtbxbFYiNGFBmrLtIF2CfTIaE="; + hash = "sha256-1WTV6XqV9Y7d6WlH7rBb0Lfki6ftf+3z/azqQwzcOts="; }; - cargoHash = "sha256-F9QOlYpKAQx7xF6yyGa/tOkziEyXCg5LW6gH0X6uXRc="; + cargoHash = "sha256-Msi3V8mVnz9AqXdci79N9cbCouOyvVI4NdUAFP2IEsg="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/rust/crate2nix/default.nix b/pkgs/development/tools/rust/crate2nix/default.nix deleted file mode 100644 index a32a76aeb898f..0000000000000 --- a/pkgs/development/tools/rust/crate2nix/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, makeWrapper - -, cargo -, nix -, nix-prefetch-git -}: - -rustPlatform.buildRustPackage rec { - pname = "crate2nix"; - version = "0.14.0"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = pname; - rev = version; - hash = "sha256-rGT3CW64cJS9nlnWPFWSc1iEa3dNZecVVuPVGzcsHe8="; - }; - - sourceRoot = "${src.name}/crate2nix"; - - cargoHash = "sha256-YoE6wrQNQcRo/yaiVpASU2VOmHCPM4pDgTejn0ovOVY="; - - nativeBuildInputs = [ makeWrapper ]; - - # Tests use nix(1), which tries (and fails) to set up /nix/var inside the - # sandbox - doCheck = false; - - postFixup = '' - wrapProgram $out/bin/crate2nix \ - --suffix PATH ":" ${lib.makeBinPath [ cargo nix nix-prefetch-git ]} - - rm -rf $out/lib $out/bin/crate2nix.d - mkdir -p \ - $out/share/bash-completion/completions \ - $out/share/zsh/vendor-completions - $out/bin/crate2nix completions -s 'bash' -o $out/share/bash-completion/completions - $out/bin/crate2nix completions -s 'zsh' -o $out/share/zsh/vendor-completions - ''; - - meta = with lib; { - description = "Nix build file generator for Rust crates"; - mainProgram = "crate2nix"; - longDescription = '' - Crate2nix generates Nix files from Cargo.toml/lock files - so that you can build every crate individually in a Nix sandbox. - ''; - homepage = "https://github.com/nix-community/crate2nix"; - license = licenses.asl20; - maintainers = with maintainers; [ kolloch cole-h ]; - platforms = platforms.all; - }; -} - diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index f7c213c13dd50..266cd54fdfd2d 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "maturin"; - version = "1.5.1"; + version = "1.6.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - hash = "sha256-3rID2epV1pCwpofFf9Wuafs1SlBWH7e7/4HPaSUAriQ="; + hash = "sha256-cKX5fDPQElNLAur2PF6J5050QnMNrazMTCVtGmjwmxQ="; }; - cargoHash = "sha256-hPyPMQm/Oege0PPjYIrd1fEDOGqoQ1ffS2l6o8je4t4="; + cargoHash = "sha256-EuMPcJAGz564cC9UWrlihBxRUJCtqw4jvP/SQgx2L/0="; buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; diff --git a/pkgs/development/tools/rust/panamax/default.nix b/pkgs/development/tools/rust/panamax/default.nix index 4eb4963760397..0073c6087736f 100644 --- a/pkgs/development/tools/rust/panamax/default.nix +++ b/pkgs/development/tools/rust/panamax/default.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage rec { pname = "panamax"; - version = "1.0.12"; + version = "1.0.14"; src = fetchCrate { inherit pname version; - sha256 = "sha256-nHAsKvNEhGDVrLx8K7xnm7TuCxaZcYwlQ6xjVRvDdSk="; + sha256 = "sha256-gIgw6JMGpHNXE/PZoz3jRdmjIWy4hETYf24Nd7/Jr/g="; }; - cargoSha256 = "sha256-ydZ0KM/g9k0ux7Zr4crlxnKCC9N/qPzn1wmzbTIyz7o="; + cargoHash = "sha256-doEBlUVmXxbuPkDgliWr+LfG5KAMVEGpvLyQpoCzSTc="; nativeBuildInputs = [ pkg-config ]; @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { zlib ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration ]; meta = with lib; { diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 941460c35d451..6443cae2f58cd 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2024-06-11"; - cargoSha256 = "sha256-mo3TGaUI1gjJX64Di7+M40CzHkIuFAuXl27yJ9GPkPU="; + version = "2024-06-24"; + cargoSha256 = "sha256-w28YJmL4km+5LBKyo1QlVG376HZ2SyEXPu6SslSvVfg="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-/N0sZW3xiivMm5klk9zBtzMlO+uaxnUq35kI3bakLx8="; + sha256 = "sha256-jzZRTQjXhiwEdzo/SlxP72BUa7g0LVr7MEsaR7A/geg="; }; cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ]; diff --git a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix index 963e134075ed7..49be63a2b99c2 100644 --- a/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix +++ b/pkgs/development/tools/rust/rust-analyzer/test-neovim-lsp.nix @@ -9,20 +9,33 @@ runCommand "test-neovim-rust-analyzer" { } ''; + # NB. Wait for server done type calculations before sending `hover` request, + # otherwise it would return `{unknown}`. + # Ref: https://github.com/rust-lang/rust-analyzer/blob/7b11fdeb681c12002861b9804a388efde81c9647/docs/dev/lsp-extensions.md#server-status nvimConfig = /* lua */ '' + local caps = vim.lsp.protocol.make_client_capabilities() + caps["experimental"] = { serverStatusNotification = true } vim.lsp.buf_attach_client(vim.api.nvim_get_current_buf(), vim.lsp.start_client({ cmd = { "rust-analyzer" }, + capabilities = caps, handlers = { - ["$/progress"] = function(_, msg, ctx) - if msg.token == "rustAnalyzer/Indexing" and msg.value.kind == "end" then - vim.cmd("goto 23") -- let mut |var =... - vim.lsp.buf.hover() + ["experimental/serverStatus"] = function(_, msg, ctx) + if msg.health == "ok" then + if msg.quiescent then + vim.cmd("goto 23") -- let mut |var =... + vim.lsp.buf.hover() + end + else + print("error: server status is not ok: ") + vim.cmd("q") end end, ["textDocument/hover"] = function(_, msg, ctx) - -- Keep newlines. - io.write(msg.contents.value) - vim.cmd("q") + if msg then + -- Keep newlines. + io.write(msg.contents.value) + vim.cmd("q") + end end, }, on_error = function(code) diff --git a/pkgs/development/tools/schemacrawler/default.nix b/pkgs/development/tools/schemacrawler/default.nix index 0d4ffad569770..11a0c0fa77542 100644 --- a/pkgs/development/tools/schemacrawler/default.nix +++ b/pkgs/development/tools/schemacrawler/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemacrawler"; - version = "16.21.2"; + version = "16.21.4"; src = fetchzip { url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-M8kHJOkbxJGpZWOZ1asGYPM76ZWSpkaYIAfWsaisXLs="; + hash = "sha256-8/Wf5RfR8Tb32VyBhHPAtbiqQN1LsnOxy98MWNPkWrM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/sem/default.nix b/pkgs/development/tools/sem/default.nix index 81ae332a66e5d..e8cd2256a59b0 100644 --- a/pkgs/development/tools/sem/default.nix +++ b/pkgs/development/tools/sem/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sem"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "semaphoreci"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-ZizmDuEu3D8cVOMw0k1yBXlLft+nzOPnqv5Yi6vk5AM="; + sha256 = "sha256-bShQ+paDM9AdrdPrtwyQ5Mytf/SNZ4fVMDT2ZNswt3o="; }; vendorHash = "sha256-p8+M+pRp12P7tYlFpXjU94JcJOugQpD8rFdowhonh74="; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index 8c56bb08a9761..deab8539ef142 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, freeglut +{ lib, stdenv, makeSetupHook, fetchFromGitHub, libelf, which, pkg-config, libglut , avrgcc, avrlibc , libGLU, libGL , GLUT }: @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ which pkg-config avrgcc ] ++ lib.optional stdenv.isDarwin setupHookDarwin; - buildInputs = [ libelf freeglut libGLU libGL ] + buildInputs = [ libelf libglut libGLU libGL ] ++ lib.optional stdenv.isDarwin GLUT; # remove forbidden references to $TMPDIR diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/development/tools/skjold/default.nix index 75de1dfe1eb24..bbd5f57a778d0 100644 --- a/pkgs/development/tools/skjold/default.nix +++ b/pkgs/development/tools/skjold/default.nix @@ -20,7 +20,6 @@ python3.pkgs.buildPythonApplication rec { build-system = with python3.pkgs; [ poetry-core ]; - nativeBuildInputs = with python3.pkgs; [ pythonRelaxDepsHook ]; dependencies = with python3.pkgs; [ click diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 0bd4d805a143f..dba5da20c2633 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.3.0"; + version = "3.3.1"; src = fetchzip { url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip"; - hash = "sha256-dTTTcmR4C9UiYEfiKHr0sJBtHg/+sJcGIdrXSOoK1mw="; + hash = "sha256-3Mlid+hvHVjAw5pE6vyieSHWH8Zkoty3GuwE1gB5yQM="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 7fe099fd69c4c..093be6c4bdb54 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,16 +8,16 @@ }: buildGoModule rec { pname = "turso-cli"; - version = "0.95.0"; + version = "0.96.0"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-9QrDtqF9A3UhStKtwkq/FCULoJQz+RjS7yEolZbBLCw="; + hash = "sha256-SgUlGzQy+K+GhrbZR/lnKyLsI5cjXxBu/SpNqlfe5IA="; }; - vendorHash = "sha256-2NjdjB09WYzHjQEl2hMUWN1/xsj/Hlr8lVYU/pkxTqQ="; + vendorHash = "sha256-Za8njJ0aExZe2LmQe6q9Q0Phjo1ot3bYK/zGNzyi7fo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/twilio-cli/default.nix b/pkgs/development/tools/twilio-cli/default.nix index fe0544b671378..a37c79b34f248 100644 --- a/pkgs/development/tools/twilio-cli/default.nix +++ b/pkgs/development/tools/twilio-cli/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "twilio-cli"; - version = "5.21.0"; + version = "5.21.1"; src = fetchzip { url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; - hash = "sha256-rtI89baKJS4itwTcHY9IjKeskQO6mz/c746wdVy4cG4="; + hash = "sha256-0hriMtxmqjQrR/gAdOk8RfyPQp2ZYCdyt/sMTUqC1/4="; }; buildInputs = [ nodejs-slim ]; diff --git a/pkgs/development/tools/twitch-cli/default.nix b/pkgs/development/tools/twitch-cli/default.nix index d9eab6a35691d..2aa819a0a4dd5 100644 --- a/pkgs/development/tools/twitch-cli/default.nix +++ b/pkgs/development/tools/twitch-cli/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "twitch-cli"; - version = "1.1.22"; + version = "1.1.23"; src = fetchFromGitHub { owner = "twitchdev"; repo = pname; rev = "v${version}"; - hash = "sha256-9tbU9gR8UHg98UKZ9ganapAz1bar18xb7ISvKoeuwe4="; + hash = "sha256-BAVnXxkUXCKYq5hCPRtZu33andYm2ic4Vbx9an0MwFw="; }; patches = [ ./application-name.patch ]; - vendorHash = "sha256-1uUokMeI0D/apDFJLq+Go5BQp1JMYxJQF8nKvw52E7o="; + vendorHash = "sha256-Z5bWS4oqjkEfOsvBzupKKnF6rJPU0TLVdwxDkIKcBQY="; ldflags = [ "-s" diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index cff5a27f87b66..62b6b615385af 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.22.9"; + version = "1.23.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-FD9Sn1NwiahrYv99avwC2wtoTlwnqiuE7dCNPsD0+y4="; + hash = "sha256-46WXCImBqWmU82zIgulVyoB2/aGWXYunWDdQDsxMlOs="; }; - cargoHash = "sha256-NmF2pBru3iCOfl5q3Td9HBxi9VGmilUK3q3JckUeu/o="; + cargoHash = "sha256-29F4n9yuyGxQSZY4tJ8KaHXKLmpCPuUKDwOoyWBfmgk="; meta = with lib; { description = "Source code spell checker"; diff --git a/pkgs/development/tools/vultr-cli/default.nix b/pkgs/development/tools/vultr-cli/default.nix index b6afbdf4df717..1a1cd76c5acb6 100644 --- a/pkgs/development/tools/vultr-cli/default.nix +++ b/pkgs/development/tools/vultr-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vultr-cli"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - hash = "sha256-iMd/PXcLa3Z5yNsebub0MSZvionm6ERNlBJANvymP7Y="; + hash = "sha256-Gn2N/v3qFqxI2ZU94GNuzpHoXgPeJaAO+ODjb5ff1aI="; }; - vendorHash = "sha256-sBG6T+wVEFvgNdPJt5Fe7SIzetkxAqGW7VgyXV7wUSs="; + vendorHash = "sha256-kglG6Mhe1XUqblt+0ZR8FPPTrBKjxb1xG8bPXQrrzxE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/wails/default.nix b/pkgs/development/tools/wails/default.nix index 9a158be022f39..8988424d7738a 100644 --- a/pkgs/development/tools/wails/default.nix +++ b/pkgs/development/tools/wails/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "wails"; - version = "2.8.2"; + version = "2.9.1"; src = fetchFromGitHub { owner = "wailsapp"; repo = pname; rev = "v${version}"; - hash = "sha256-oJ/kxYphBTXxt7Da1x4GW/a78YV+m32iC/4N3MDjU/A="; + hash = "sha256-dtfFeNK7ZfqriK4S0/+Wor1hUJv5kgnRWURVqt+RrNU="; } + "/v2"; vendorHash = "sha256-15Vo4AKmd9qOF0ea1klTlrXJOUs+IHvsNT2rw4R7ZiU="; diff --git a/pkgs/development/tools/web-ext/default.nix b/pkgs/development/tools/web-ext/default.nix index 2c1688e38c021..bfbfbdf5c1c8d 100644 --- a/pkgs/development/tools/web-ext/default.nix +++ b/pkgs/development/tools/web-ext/default.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "web-ext"; - version = "8.0.0"; + version = "8.2.0"; src = fetchFromGitHub { owner = "mozilla"; repo = "web-ext"; rev = version; - hash = "sha256-lMfvD5EVWpDcX54nJI3eReF/EMMuZYxtKdHKwk4Lrxk="; + hash = "sha256-5q1vB1EN+Qmss6o6qn4BAaNSwLJBhC8joFJVzncBx6k="; }; - npmDepsHash = "sha256-RVyIpzVom48/avot9bbjXYg2E5+b3GlCHaKNfMEk968="; + npmDepsHash = "sha256-MGuLCuTTUdh2L64j41K6GvCdquCDYPPPEk1Z/9R6sNA="; npmBuildFlags = [ "--production" ]; diff --git a/pkgs/development/tools/yamlfmt/default.nix b/pkgs/development/tools/yamlfmt/default.nix index 89132f4c83fbf..0287fd6f8bd8a 100644 --- a/pkgs/development/tools/yamlfmt/default.nix +++ b/pkgs/development/tools/yamlfmt/default.nix @@ -1,19 +1,28 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, yamlfmt }: buildGoModule rec { pname = "yamlfmt"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VAXDkD4JLoiTomCNtuex/ZEAZtWDEEg5cxETYemvQW8="; + hash = "sha256-B1bRYG7ldewdyK8K2Yy5liQcEqv/3/67cQD8JKp8vQI="; }; vendorHash = "sha256-UfULQw7wAEJjTFp6+ACF5Ki04eFKeUEgmbt1c8pUolA="; - doCheck = false; + ldflags = [ + "-s" + "-w" + "-X main.version=${version}" + "-X main.commit=${src.rev}" + ]; + + passthru.tests.version = testers.testVersion { + package = yamlfmt; + }; meta = with lib; { description = "Extensible command line tool or library to format yaml files"; diff --git a/pkgs/development/tools/yarn-berry/default.nix b/pkgs/development/tools/yarn-berry/default.nix index 4b1ff6de268f5..954fc03b00beb 100644 --- a/pkgs/development/tools/yarn-berry/default.nix +++ b/pkgs/development/tools/yarn-berry/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "yarn-berry"; - version = "4.2.2"; + version = "4.3.1"; src = fetchFromGitHub { owner = "yarnpkg"; repo = "berry"; rev = "@yarnpkg/cli/${finalAttrs.version}"; - hash = "sha256-dOWcfeWotWgx1ctY/TEuxH1gkgp9Gxou6jaymJMBHLE="; + hash = "sha256-aV86k5gjHIbd09YDwC6aHA1tPl+p9Lt0cYVVvtNTDlY="; }; buildInputs = [ |