diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-15 19:32:38 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-15 19:32:38 +0100 |
| commit | 6b8e2555ef013b579cda57025b17d662e0f1fe1f (patch) | |
| tree | 5a83c673af26c9976acd5a5dfa20e09e06898047 /nixpkgs/pkgs/tools | |
| parent | 66ca7a150b5c051f0728f13134e6265cc46f370c (diff) | |
| parent | 02357adddd0889782362d999628de9d309d202dc (diff) | |
| download | nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.gz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.bz2 nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.lz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.xz nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.tar.zst nixlib-6b8e2555ef013b579cda57025b17d662e0f1fe1f.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/tools')
233 files changed, 3034 insertions, 6282 deletions
diff --git a/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix b/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix index ed8b1363d5f8..cf46239939b5 100644 --- a/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix +++ b/nixpkgs/pkgs/tools/X11/xdg-utils/default.nix @@ -69,7 +69,8 @@ stdenv.mkDerivation rec { substituteInPlace $out/bin/xdg-open \ --replace "/usr/bin/printf" "${coreutils}/bin/printf" \ - --replace "gdbus" "${glib}/bin/gdbus" + --replace "gdbus" "${glib}/bin/gdbus" \ + --replace "mimeopen" "${perlPackages.FileMimeInfo}/bin/mimeopen" substituteInPlace $out/bin/xdg-mime \ --replace "/usr/bin/file" "${file}/bin/file" diff --git a/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix b/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix index eb713b56a050..fd0737a848c8 100644 --- a/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.186"; + version = "3.0.189"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-Uz34+Z9JH9clAFwbTn8RXxokv0yMD05lrYGexUQwmjo="; + sha256 = "sha256-XSFIf2/k6uRHTSpvSpFApU+RjS5WlYVFoVJiyOU7Lvg="; }; - vendorHash = "sha256-9vrfctA1r0eheCBU0CeTgjs/JVt4CB3o3n5KVeFuaRI="; + vendorHash = "sha256-5Pmd1gQ0nS3h43YXGP4s8uZNQAH30o1s8y8r1nuh6b0="; subPackages = [ "main" ]; diff --git a/nixpkgs/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix b/nixpkgs/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix index 526730e72228..2bc331cc1874 100644 --- a/nixpkgs/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix @@ -1,12 +1,29 @@ { lib -, python3Packages +, python3 , fetchPypi , nix-update-script , testers , aws-encryption-sdk-cli }: -python3Packages.buildPythonApplication rec { +let + localPython = python3.override { + self = localPython; + packageOverrides = final: prev: { + urllib3 = prev.urllib3.overridePythonAttrs (prev: rec { + pyproject = true; + version = "1.26.18"; + nativeBuildInputs = with final; [ setuptools ]; + src = prev.src.override { + inherit version; + hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA="; + }; + }); + }; + }; +in + +localPython.pkgs.buildPythonApplication rec { pname = "aws-encryption-sdk-cli"; version = "4.1.0"; @@ -15,15 +32,16 @@ python3Packages.buildPythonApplication rec { hash = "sha256-OCbt0OkDVfpzUIogbsKzaPAle2L6l6N3cmZoS2hEaSM="; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with localPython.pkgs; [ attrs aws-encryption-sdk base64io + urllib3 ]; doCheck = true; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with localPython.pkgs; [ mock pytest-mock pytestCheckHook diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 657ce55e400b..0c447be4e7f2 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -5,14 +5,14 @@ }: let - version = "2.54.0"; + version = "2.55.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - hash = "sha256-LbGDPZe4AWl6wnZ5GtiiM4O5EsCHEHX420lBIJJ0+Kk="; + hash = "sha256-+4ju+KOQ9LG1nzYnHOZ4mvXf6SazcrIgw/Q2mvetPMc="; }; # put packages that needs to be overridden in the py package scope @@ -288,4 +288,3 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { platforms = platforms.all; }; }) - diff --git a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index ab7760038732..9893e9e1e29c 100644 --- a/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -106,7 +106,6 @@ let azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "30.3.0" "tar.gz" "sha256-5Sl4Y0D4YqpqIYp61qW+trn7VYM8XKoIUcwzFNBJO2M="; azure-mgmt-containerinstance = overrideAzureMgmtPackage super.azure-mgmt-containerinstance "10.1.0" "zip" "sha256-eNQ3rbKFdPRIyDjtXwH5ztN4GWCYBh3rWdn3AxcEwX4="; azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "10.1.0" "zip" "sha256-VrX9YfYNvlA8+eNqHCp35BAeQZzQKakZs7ZZKwT8oYc="; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "27.0.0" "tar.gz" "sha256-IdGo2A65YiMJJ8S18Ji+FfnnylNhs8vFOQpfA91wgNM="; azure-mgmt-core = overrideAzureMgmtPackage super.azure-mgmt-core "1.3.2" "zip" "sha256-B/Sv6COlXXBLBI1h7f3BMYwFHtWfJEAyEmNQvpXp1QE="; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "9.3.0" "tar.gz" "sha256-02DisUN2/auBDhPgE9aUvEvYwoQUQC4NYGD/PQZOl/Y="; azure-mgmt-databoxedge = overrideAzureMgmtPackage super.azure-mgmt-databoxedge "1.0.0" "zip" "sha256-BAkAYrwejwDC9FMVo7zrD7OzR57BR01xuINC4TSZsIc="; @@ -164,8 +163,10 @@ let azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "10.0.0b1" "zip" "sha256-1CiZuTXYhIb74eGQZUJHHzovYNnnVd3Ydu1UCy2Bu00="; - azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" - "sha256-nri3eB/UQQ7p4gfNDDmDuvnlhBS1tKGISdCYVuNrrN4="; + azure-mgmt-kusto = (overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" + "sha256-nri3eB/UQQ7p4gfNDDmDuvnlhBS1tKGISdCYVuNrrN4=").overridePythonAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ self.msrest self.msrestazure ]; + }); azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" "sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40=r"; diff --git a/nixpkgs/pkgs/tools/admin/cf-vault/default.nix b/nixpkgs/pkgs/tools/admin/cf-vault/default.nix index 3dd693b13d59..13d3ea13d9f4 100644 --- a/nixpkgs/pkgs/tools/admin/cf-vault/default.nix +++ b/nixpkgs/pkgs/tools/admin/cf-vault/default.nix @@ -1,16 +1,16 @@ {buildGoModule, fetchFromGitHub, lib}: buildGoModule rec { pname = "cf-vault"; - version = "0.0.16"; + version = "0.0.17"; src = fetchFromGitHub { owner = "jacobbednarz"; repo = pname; rev = version; - sha256 = "sha256-puuP7L8KJ3MvlWz5tOeov8HZad+Lvo64DqTbaKPfg6o="; + sha256 = "sha256-wSTbg+dQrTbfL4M4XdwZXS04mjIFtD0RY1vK0CUHkso="; }; - vendorHash = "sha256-cnv3vustgougdfU9RlyP4O3e7kx9nNzzJm1Q2d+sCDo="; + vendorHash = "sha256-b9Ni4H2sk2gU+0zLOBg0P4ssqSJYTHnAvnmMHXha5us="; meta = with lib; { description = '' diff --git a/nixpkgs/pkgs/tools/admin/chamber/default.nix b/nixpkgs/pkgs/tools/admin/chamber/default.nix index 0dca98037997..6e115f6eb6a5 100644 --- a/nixpkgs/pkgs/tools/admin/chamber/default.nix +++ b/nixpkgs/pkgs/tools/admin/chamber/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "chamber"; - version = "2.13.4"; + version = "2.13.5"; src = fetchFromGitHub { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J6sLDalvUl4SgSyr5DK/tW7DyRa/qdKw6zornz1R2ck="; + sha256 = "sha256-uwTEHxaPG1jDeR+84ZrsP6bg5DBsKIeuHeZAtgrsy/s="; }; CGO_ENABLED = 0; diff --git a/nixpkgs/pkgs/tools/admin/colmena/default.nix b/nixpkgs/pkgs/tools/admin/colmena/default.nix index ceb544753b21..6cb763c88d1e 100644 --- a/nixpkgs/pkgs/tools/admin/colmena/default.nix +++ b/nixpkgs/pkgs/tools/admin/colmena/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { passthru = { # We guarantee CLI and Nix API stability for the same minor version - apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitString "." version)); + apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion version)); tests.version = testers.testVersion { package = colmena; }; }; diff --git a/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix b/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix index 331d83292bf4..2c78ce3ed9ad 100644 --- a/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/copilot-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "copilot-cli"; - version = "1.32.0"; + version = "1.32.1"; src = fetchFromGitHub { owner = "aws"; repo = pname; rev = "v${version}"; - hash = "sha256-w63mNGDUc5YrlBrqsXRyy4SPC35kNKWhiHe6Sfc30tI="; + hash = "sha256-OdzycH+52F6lfCErKlsVFiPE2gxU22ySV5uPA6zBXUg="; }; - vendorHash = "sha256-8hZFsYMZQ8RxImEG2t0kfukbRjAJMEDSYF+ryLOZelc="; + vendorHash = "sha256-5Nlo5Ol4YdO3XI5RhpFfBgprVUV5DUkySvCXeFZqulk="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix b/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix index 5b7aed1f125f..7b1bd3cd24a7 100644 --- a/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "credhub-cli"; - version = "2.9.22"; + version = "2.9.24"; src = fetchFromGitHub { owner = "cloudfoundry-incubator"; repo = "credhub-cli"; rev = version; - sha256 = "sha256-snQLZ/bHYDdC62Ti1E4zUmBHR8TtrKCx0BC2i6GAfdE="; + sha256 = "sha256-9SEdMK9KECte9QEfosju0PHxlDWwbQkn4QKi/XgFVuY="; }; # these tests require network access that we're not going to give them diff --git a/nixpkgs/pkgs/tools/admin/lxd/default.nix b/nixpkgs/pkgs/tools/admin/lxd/default.nix index 13589edd6bdc..4a70d2276573 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -18,11 +18,11 @@ buildGoModule rec { pname = "lxd-unwrapped"; - version = "5.19"; + version = "5.20"; src = fetchurl { url = "https://github.com/canonical/lxd/releases/download/lxd-${version}/lxd-${version}.tar.gz"; - hash = "sha256-Ttw3Hox+GfoI8dE2KpZ2HUTblOPFBUs63IBRI18lAiM="; + hash = "sha256-L5WLdX9M3mTQ81eNoL2p7lllo6cOwJVu3fgofRKQFn8="; }; vendorHash = null; @@ -86,8 +86,8 @@ buildGoModule rec { description = "Daemon based on liblxc offering a REST API to manage containers"; homepage = "https://ubuntu.com/lxd"; changelog = "https://github.com/canonical/lxd/releases/tag/lxd-${version}"; - license = licenses.asl20; - maintainers = with maintainers; [ marsam adamcstephens ]; + license = with licenses; [ asl20 agpl3 ]; + maintainers = teams.lxc.members; platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/admin/lxd/ui.nix b/nixpkgs/pkgs/tools/admin/lxd/ui.nix index 7e3f1427008e..16fdb4c33175 100644 --- a/nixpkgs/pkgs/tools/admin/lxd/ui.nix +++ b/nixpkgs/pkgs/tools/admin/lxd/ui.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { description = "Web user interface for LXD."; homepage = "https://github.com/canonical/lxd-ui"; license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ jnsgruk ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix b/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix index 38fd3fc1e12f..b27c95793ca2 100644 --- a/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix +++ b/nixpkgs/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "scaleway-cli"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "sha256-Q65X2lsR5jyWXxxmkvUA0yG4miD+KUSBGRFXvH4KBGY="; + sha256 = "sha256-wx/247ZNbdNdRiGLTfCig1JAjmXZX0aCHbOgelzMcyw="; }; - vendorHash = "sha256-mZ2XFZS5tqtRUhdo6AOCY4xSaYgxUEy1OFbyzsbCEnU="; + vendorHash = "sha256-FftJsXM9sexRqBKrIeTdWh5Z0eYIK3acDNtptqqILD8="; ldflags = [ "-w" diff --git a/nixpkgs/pkgs/tools/admin/trivy/default.nix b/nixpkgs/pkgs/tools/admin/trivy/default.nix index 6a0d93483b77..a385cd14da46 100644 --- a/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -7,19 +7,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.47.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ahy6wiBoOwS3MIrAIg2gIk2gkmphkCJUYAUtqVydA2Q="; + hash = "sha256-NINEitFZm1d0foG1P+evLiXXNVNwzK3PMCicksDaBFc="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-qG4z52oVa3sgu8QKX8UbHsk/aSfacgZShX298WUu2oU="; + vendorHash = "sha256-EYcOOQBwzXu87q0EfJr7TUypGJW3qtosP3ARLssPOS8="; subPackages = [ "cmd/trivy" ]; diff --git a/nixpkgs/pkgs/tools/admin/turbovnc/default.nix b/nixpkgs/pkgs/tools/admin/turbovnc/default.nix index 801fe1ba4a14..aaba4768a924 100644 --- a/nixpkgs/pkgs/tools/admin/turbovnc/default.nix +++ b/nixpkgs/pkgs/tools/admin/turbovnc/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "turbovnc"; - version = "3.0.3"; + version = "3.1"; src = fetchFromGitHub { owner = "TurboVNC"; repo = "turbovnc"; rev = finalAttrs.version; - hash = "sha256-akkkbDb5ZHTG5GEEeDm1ns60GedQ+DnFXgVMZumRQHc="; + hash = "sha256-nMqH/jhw4GhffGYR+WGcUnF6EOFSS6HDuSKvjoCtGkk="; }; # TODO: diff --git a/nixpkgs/pkgs/tools/audio/fmtoy/default.nix b/nixpkgs/pkgs/tools/audio/fmtoy/default.nix deleted file mode 100644 index 69a0f570d3bc..000000000000 --- a/nixpkgs/pkgs/tools/audio/fmtoy/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, unstableGitUpdater -, dos2unix -, pkg-config -, zlib -, alsa-lib -, libjack2 -}: - -stdenv.mkDerivation rec { - pname = "fmtoy"; - version = "unstable-2022-12-23"; - - src = fetchFromGitHub { - owner = "vampirefrog"; - repo = "fmtoy"; - rev = "78b61b5e9bc0c6874962dc4040456581c9999b36"; - sha256 = "r5zbr6TCxzDiQvDsLQu/QwNfem1K4Ahaji0yIz/2yl0="; - }; - - postPatch = '' - dos2unix Makefile - # Don't hardcode compilers - sed -i -e '/CC=/d' -e '/CXX=/d' Makefile - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' - # Remove Linux-only program & its dependencies - sed -i -e '/PROGS/ s/fmtoy_jack//' Makefile - substituteInPlace Makefile \ - --replace '$(shell pkg-config alsa jack --cflags)' "" - ''; - - nativeBuildInputs = [ - dos2unix - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - pkg-config - ]; - - buildInputs = [ - zlib - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - libjack2 - ]; - - enableParallelBuilding = true; - - installPhase = '' - runHook preInstall - - for prog in $(grep 'PROGS=' Makefile | cut -d= -f2-); do - install -Dm755 $prog $out/bin/$prog - done - - runHook postInstall - ''; - - passthru.updateScript = unstableGitUpdater { - url = "https://github.com/vampirefrog/fmtoy.git"; - }; - - meta = with lib; { - homepage = "https://github.com/vampirefrog/fmtoy"; - description = "Tools for FM voices for Yamaha YM chips (OPL, OPM and OPN series)"; - # Unclear if gpl3Only or gpl3Plus - # https://github.com/vampirefrog/fmtoy/issues/1 - license = licenses.gpl3; - maintainers = with maintainers; [ OPNA2608 ]; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/tools/audio/piper/fix-compilation-with-newer-onnxruntime.patch b/nixpkgs/pkgs/tools/audio/piper/fix-compilation-with-newer-onnxruntime.patch deleted file mode 100644 index 9d2e46bb4e91..000000000000 --- a/nixpkgs/pkgs/tools/audio/piper/fix-compilation-with-newer-onnxruntime.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/src/cpp/synthesize.hpp b/src/cpp/synthesize.hpp -index ef61aef..4c7db7a 100644 ---- a/synthesize.hpp -+++ b/synthesize.hpp -@@ -119,11 +119,11 @@ void synthesize(SynthesisConfig &synthesisConfig, ModelSession &session, - - // Clean up - for (size_t i = 0; i < outputTensors.size(); i++) { -- Ort::OrtRelease(outputTensors[i].release()); -+ Ort::detail::OrtRelease(outputTensors[i].release()); - } - - for (size_t i = 0; i < inputTensors.size(); i++) { -- Ort::OrtRelease(inputTensors[i].release()); -+ Ort::detail::OrtRelease(inputTensors[i].release()); - } - } - } // namespace larynx diff --git a/nixpkgs/pkgs/tools/audio/spotdl/default.nix b/nixpkgs/pkgs/tools/audio/spotdl/default.nix index 9bbceae0b688..a825fd2e1e39 100644 --- a/nixpkgs/pkgs/tools/audio/spotdl/default.nix +++ b/nixpkgs/pkgs/tools/audio/spotdl/default.nix @@ -9,14 +9,14 @@ let python = python3; in python.pkgs.buildPythonApplication rec { pname = "spotdl"; - version = "4.2.2"; + version = "4.2.4"; pyproject = true; src = fetchFromGitHub { owner = "spotDL"; repo = "spotify-downloader"; rev = "refs/tags/v${version}"; - hash = "sha256-pJr0OGUI3OcFsmvn9eqkvpFeF1EkHDdNoWc91s8h9O8="; + hash = "sha256-U0UA94t7WdCeU9Y86rcnT8BzXVx8ryhD3MTJxmNBYcc="; }; nativeBuildInputs = with python.pkgs; [ @@ -79,8 +79,10 @@ in python.pkgs.buildPythonApplication rec { "test_download_ffmpeg" "test_download_song" "test_preload_song" - "test_ytm_get_results" + "test_yt_get_results" + "test_yt_search" "test_ytm_search" + "test_ytm_get_results" ]; makeWrapperArgs = [ diff --git a/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix b/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix index 452af0a18b40..c8121e8ffbaf 100644 --- a/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix +++ b/nixpkgs/pkgs/tools/audio/whisper-ctranslate2/default.nix @@ -5,7 +5,7 @@ }: let pname = "whisper-ctranslate2"; - version = "0.3.2"; + version = "0.3.4"; in python3.pkgs.buildPythonApplication { inherit pname version; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication { owner = "Softcatala"; repo = "whisper-ctranslate2"; rev = version; - hash = "sha256-9Y9y7DihDnbREaeARCGC7ctwwBAoZPpIWDAOdeDnB6E="; + hash = "sha256-6tbCEvoOd97/rWC8XwKUS2FJXaB7PKReCctWRaYqUGU="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/backup/borgbackup/default.nix b/nixpkgs/pkgs/tools/backup/borgbackup/default.nix index e11f3f1ad498..33c5aa527218 100644 --- a/nixpkgs/pkgs/tools/backup/borgbackup/default.nix +++ b/nixpkgs/pkgs/tools/backup/borgbackup/default.nix @@ -16,12 +16,12 @@ python3Packages.buildPythonApplication rec { pname = "borgbackup"; - version = "1.2.6"; + version = "1.2.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-t6b48IYDnu7HkHC5FPPGUe1/NhLJZTdK+RDSd8eiE50="; + hash = "sha256-9j8oozg8BBlxzsh7BhyjmoFbX9RF2ySqgXLKxBfZQRo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix b/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix index f4c9fba781fa..50ab894de89e 100644 --- a/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix +++ b/nixpkgs/pkgs/tools/backup/pgbackrest/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { pname = "pgbackrest"; - version = "2.48"; + version = "2.49"; src = fetchFromGitHub { owner = "pgbackrest"; repo = "pgbackrest"; rev = "release/${version}"; - sha256 = "sha256-RaNF5ufQafZjE2MfOlFOXkot/JEJCQOuiuIYgJolkbU="; + sha256 = "sha256-i1IcBNrobhgu+B/ezKFknTiqiZe6LktBxf9YU8JS2Wc="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/backup/restic/default.nix b/nixpkgs/pkgs/tools/backup/restic/default.nix index a3223c04e297..72220f17d26e 100644 --- a/nixpkgs/pkgs/tools/backup/restic/default.nix +++ b/nixpkgs/pkgs/tools/backup/restic/default.nix @@ -48,5 +48,6 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; maintainers = [ maintainers.mbrgm maintainers.dotlambda ]; + mainProgram = "restic"; }; } diff --git a/nixpkgs/pkgs/tools/backup/zrepl/default.nix b/nixpkgs/pkgs/tools/backup/zrepl/default.nix index 0a45c8c2aef1..b0e0f75fe8c6 100644 --- a/nixpkgs/pkgs/tools/backup/zrepl/default.nix +++ b/nixpkgs/pkgs/tools/backup/zrepl/default.nix @@ -45,5 +45,6 @@ buildGoModule rec { platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ cole-h danderson mdlayher ]; + mainProgram = "zrepl"; }; } diff --git a/nixpkgs/pkgs/tools/cd-dvd/mkcue/default.nix b/nixpkgs/pkgs/tools/cd-dvd/mkcue/default.nix index 575adecbd521..34893b9f68a5 100644 --- a/nixpkgs/pkgs/tools/cd-dvd/mkcue/default.nix +++ b/nixpkgs/pkgs/tools/cd-dvd/mkcue/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0rs897wp08z4hd904bjb5sl4lb8qxj82x5ayklr28bhg9pd5gbra"; }; + env.CXXFLAGS = "-std=c++98"; + preInstall = "mkdir -pv $out/bin"; postInstall = "chmod -v +w $out/bin/mkcue"; diff --git a/nixpkgs/pkgs/tools/compression/bzip3/default.nix b/nixpkgs/pkgs/tools/compression/bzip3/default.nix index 6e21a352d06f..135b253229ad 100644 --- a/nixpkgs/pkgs/tools/compression/bzip3/default.nix +++ b/nixpkgs/pkgs/tools/compression/bzip3/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "bzip3"; - version = "1.3.2"; + version = "1.4.0"; outputs = [ "bin" "dev" "out" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "kspalaiologos"; repo = "bzip3"; rev = finalAttrs.version; - hash = "sha256-nSmKpOwlbxbUN2TJwsS2CFP5UV2ODOKXFHAUsCje7mc="; + hash = "sha256-UVCZWcjlueKSGYqdm7oiJ5i7/irkWv7IOyeCWT2r4sk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/compression/ouch/default.nix b/nixpkgs/pkgs/tools/compression/ouch/default.nix index a1b4131ca703..5321982f189e 100644 --- a/nixpkgs/pkgs/tools/compression/ouch/default.nix +++ b/nixpkgs/pkgs/tools/compression/ouch/default.nix @@ -7,6 +7,7 @@ , xz , zlib , zstd +, stdenv }: rustPlatform.buildRustPackage rec { @@ -28,12 +29,19 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "zstd/pkg-config" ]; + preCheck = '' + substituteInPlace tests/ui.rs \ + --replace 'format!(r"/private{path}")' 'path.to_string()' + ''; + postInstall = '' installManPage artifacts/*.1 installShellCompletion artifacts/ouch.{bash,fish} --zsh artifacts/_ouch ''; - env.OUCH_ARTIFACTS_FOLDER = "artifacts"; + env = { OUCH_ARTIFACTS_FOLDER = "artifacts"; } // + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + lib.optionalAttrs stdenv.cc.isClang { NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; }; meta = with lib; { description = "A command-line utility for easily compressing and decompressing files and directories"; diff --git a/nixpkgs/pkgs/tools/compression/upx/default.nix b/nixpkgs/pkgs/tools/compression/upx/default.nix index 9af509100e00..6c22984b3641 100644 --- a/nixpkgs/pkgs/tools/compression/upx/default.nix +++ b/nixpkgs/pkgs/tools/compression/upx/default.nix @@ -1,18 +1,29 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, nix-update-script +, testers +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "upx"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "upx"; - repo = pname; - rev = "v${version}"; + repo = "upx"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - sha256 = "sha256-PRfIJSjmeXjbslqWnKrHUPdOJfZU08nr4wXoAnP9qm0="; + sha256 = "sha256-s4cZAb0rhCJrHI//IXLNYLhOzX1NRmN/t5IFgurwI30="; }; nativeBuildInputs = [ cmake ]; + passthru = { + updateScript = nix-update-script { }; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + }; + meta = with lib; { homepage = "https://upx.github.io/"; description = "The Ultimate Packer for eXecutables"; @@ -20,4 +31,4 @@ stdenv.mkDerivation rec { platforms = platforms.unix; mainProgram = "upx"; }; -} +}) diff --git a/nixpkgs/pkgs/tools/compression/xz/default.nix b/nixpkgs/pkgs/tools/compression/xz/default.nix index adc73d926c90..e8e0ae2439f2 100644 --- a/nixpkgs/pkgs/tools/compression/xz/default.nix +++ b/nixpkgs/pkgs/tools/compression/xz/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "xz"; - version = "5.4.4"; + version = "5.4.5"; src = fetchurl { url = "https://tukaani.org/xz/xz-${version}.tar.bz2"; - sha256 = "sha256-C2/N4aw46QQzolVvUAwGWVC5vNLWAgBu/DNHgr3+YpY="; + sha256 = "sha256-jM9f/4aMAG8pUi44b7TGobZkY/vKZaTPw8S9WW6JXnk="; }; strictDeps = true; diff --git a/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix b/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix index b355b0eb6864..b5fe1a4e85ea 100644 --- a/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "android-file-transfer"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "whoozle"; repo = "android-file-transfer-linux"; rev = "v${version}"; - sha256 = "125rq8ji83nw6chfw43i0h9c38hjqh1qjibb0gnf9wrigar9zc8b"; + sha256 = "sha256-UOARMtOnG6tekmOsIWRZbl2y32mR0kPD6w7IHRG8VsU="; }; patches = [ ./darwin-dont-vendor-dependencies.patch ]; diff --git a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix index 8614c03ed906..f7d5ce61d81c 100644 --- a/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.17.5"; + version = "1.17.6"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/bindfs-${finalAttrs.version}.tar.gz"; - hash = "sha256-Wj2xu7soSOtDqzapI8mVgx0xmAd/2J6VHbXQt55i2mQ="; + hash = "sha256-076zzGm7K2gCzFOViOkh/qlz7WGRsTPyAkcZMR0cwYs="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/filesystems/blobfuse/install-adls.patch b/nixpkgs/pkgs/tools/filesystems/blobfuse/install-adls.patch deleted file mode 100644 index e48f4d592f68..000000000000 --- a/nixpkgs/pkgs/tools/filesystems/blobfuse/install-adls.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/adls/CMakeLists.txt b/adls/CMakeLists.txt -index 1fb7146..22e663a 100644 ---- a/adls/CMakeLists.txt -+++ b/adls/CMakeLists.txt -@@ -50,3 +50,9 @@ if(BUILD_TESTS) - string(REGEX REPLACE "([^;]+)" "${CMAKE_CURRENT_SOURCE_DIR}/\\1" AZURE_STORAGE_ADLS_TEST_SOURCES "${AZURE_STORAGE_ADLS_TEST_SOURCES}") - set(AZURE_STORAGE_ADLS_TEST_SOURCES ${AZURE_STORAGE_ADLS_TEST_SOURCES} PARENT_SCOPE) - endif() -+ -+install(TARGETS azure-storage-adls -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib -+ RUNTIME DESTINATION bin) -+ diff --git a/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix b/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix index 429617e5eae2..a2f1c51e7e12 100644 --- a/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/bonnie/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, perl }: +{ lib +, stdenv +, fetchurl +, fetchpatch +}: stdenv.mkDerivation rec { pname = "bonnie++"; @@ -6,17 +10,25 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.coker.com.au/bonnie++/bonnie++-${version}.tgz"; - sha256 = "sha256-qNM7vYG8frVZzlv25YS5tT+uo5zPtK6S5Y8nJX5Gjw4="; + hash = "sha256-qNM7vYG8frVZzlv25YS5tT+uo5zPtK6S5Y8nJX5Gjw4="; }; - enableParallelBuilding = true; + patches = [ + (fetchpatch { + name = "bonnie++-2.00a-gcc11.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-benchmarks/bonnie++/files/bonnie++-2.00a-gcc11.patch?id=d0f29755e969c805fbd6240905e3925671340666"; + hash = "sha256-/cIC4HYQco5Nv1UoTELl2OGD5hdWhbz3L0+GjN/vcdE="; + }) + ]; - buildInputs = [ perl ]; + enableParallelBuilding = true; meta = { - homepage = "http://www.coker.com.au/bonnie++/"; description = "Hard drive and file system benchmark suite"; - license = lib.licenses.gpl2; + homepage = "http://www.coker.com.au/bonnie++/"; + license = lib.licenses.gpl2Only; + mainProgram = "bonnie++"; + maintainers = with lib.maintainers; [ wegank ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/nixpkgs/pkgs/tools/filesystems/ceph-csi/default.nix b/nixpkgs/pkgs/tools/filesystems/ceph-csi/default.nix index 5ca2e416a1d4..c63eb034dfee 100644 --- a/nixpkgs/pkgs/tools/filesystems/ceph-csi/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ceph-csi/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ceph-csi"; - version = "3.9.0"; + version = "3.10.0"; nativeBuildInputs = [ go ]; buildInputs = [ ceph ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "ceph"; repo = "ceph-csi"; rev = "v${version}"; - sha256 = "sha256-dKn79EIveepeMzFPweQ3BE3YMCg7mj8EycMbBH8J8PQ="; + sha256 = "sha256-k7eipiBcr/a2V62tEtiQrduk5Cj8KGxbmiVo4x6BVwE="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index 241bf71985a0..f38cd4be880c 100644 --- a/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -28,8 +28,10 @@ , doxygen , gperf , graphviz +, gnugrep , gtest , icu +, kmod , libcap , libcap_ng , libnl @@ -294,10 +296,14 @@ in rec { pythonPath = [ ceph-python-env "${placeholder "out"}/${ceph-python-env.sitePackages}" ]; + # replace /sbin and /bin based paths with direct nix store paths + # increase the `command` buffer size since 2 nix store paths cannot fit within 128 characters preConfigure ='' - substituteInPlace src/common/module.c --replace "/sbin/modinfo" "modinfo" - substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe" - substituteInPlace src/common/module.c --replace "/bin/grep" "grep" + substituteInPlace src/common/module.c \ + --replace "char command[128];" "char command[256];" \ + --replace "/sbin/modinfo" "${kmod}/bin/modinfo" \ + --replace "/sbin/modprobe" "${kmod}/bin/modprobe" \ + --replace "/bin/grep" "${gnugrep}/bin/grep" # install target needs to be in PYTHONPATH for "*.pth support" check to succeed # set PYTHONPATH, so the build system doesn't silently skip installing ceph-volume and others diff --git a/nixpkgs/pkgs/tools/filesystems/davfs2/isdir.patch b/nixpkgs/pkgs/tools/filesystems/davfs2/isdir.patch deleted file mode 100644 index ae69b4460f5a..000000000000 --- a/nixpkgs/pkgs/tools/filesystems/davfs2/isdir.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur davfs2-1.4.5-old/src/dav_coda.c davfs2-1.4.5-new/src/dav_coda.c ---- davfs2-1.4.5-old/src/dav_coda.c 2009-06-04 20:30:32.000000000 +0200 -+++ davfs2-1.4.5-new/src/dav_coda.c 2011-02-09 19:51:22.260530572 +0100 -@@ -52,6 +52,10 @@ - #ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> - #endif -+#ifdef HAVE_SYS_STAT_H -+#include <sys/stat.h> -+#endif -+ - - #include "defaults.h" - #include "mount_davfs.h" -diff -ur davfs2-1.4.5-old/src/dav_fuse.c davfs2-1.4.5-new/src/dav_fuse.c ---- davfs2-1.4.5-old/src/dav_fuse.c 2009-06-30 20:06:44.000000000 +0200 -+++ davfs2-1.4.5-new/src/dav_fuse.c 2011-02-09 19:52:23.938220524 +0100 -@@ -41,6 +41,12 @@ - #ifdef HAVE_UNISTD_H - #include <unistd.h> - #endif -+#ifdef HAVE_SYS_TYPES_H -+#include <sys/types.h> -+#endif -+#ifdef HAVE_SYS_STAT_H -+#include <sys/stat.h> -+#endif - - #include "defaults.h" - #include "mount_davfs.h" diff --git a/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix b/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix index e5804f378529..e48a7506db42 100644 --- a/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/dwarfs/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "dwarfs"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "mhx"; repo = "dwarfs"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-DcPRrATI2cpLZWAL+sSCoXvJ1R0O3yHqhlJW1aEpDpA="; + hash = "sha256-lFJW9rmUhiHyu+unGuONcgbsJg9h9MSvNyECmarRF/M="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/filesystems/idsk/default.nix b/nixpkgs/pkgs/tools/filesystems/idsk/default.nix deleted file mode 100644 index 5e78a1266873..000000000000 --- a/nixpkgs/pkgs/tools/filesystems/idsk/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: - -stdenv.mkDerivation rec { - - pname = "idsk"; - version = "0.20"; - - src = fetchFromGitHub { - repo = "idsk"; - owner = "cpcsdk"; - rev = "v${version}"; - sha256 = "05zbdkb9s6sfkni6k927795w2fqdhnf3i7kgl27715sdmmdab05d"; - }; - - nativeBuildInputs = [ cmake ]; - - env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isGNU [ - # Needed with GCC 12 but breaks on darwin (with clang) - "-std=c++14" - ]); - - installPhase = '' - mkdir -p $out/bin - cp iDSK $out/bin - ''; - - meta = with lib; { - description = "Manipulating CPC dsk images and files"; - homepage = "https://github.com/cpcsdk/idsk" ; - license = licenses.mit; - maintainers = [ ]; - mainProgram = "iDSK"; - platforms = platforms.all; - }; -} diff --git a/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix b/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix index 2640ba8b8519..b955aa870c0f 100644 --- a/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix +++ b/nixpkgs/pkgs/tools/filesystems/stuffbin/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "stuffbin"; - version = "1.1.0"; + version = "1.2.0"; vendorHash = null; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "knadh"; repo = "stuffbin"; rev = "v${version}"; - sha256 = "sha256-M72xNh7bKUMLzA+M8bJB++kJ5KCrkboQm1v8BasP3Yo="; + sha256 = "sha256-roXjE0t4iwrL2y/G2oePYL2AbTwd9uzQPtgdY14WeZk="; }; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/games/ajour/default.nix b/nixpkgs/pkgs/tools/games/ajour/default.nix index bf783c7f4776..0f90a794987e 100644 --- a/nixpkgs/pkgs/tools/games/ajour/default.nix +++ b/nixpkgs/pkgs/tools/games/ajour/default.nix @@ -70,6 +70,12 @@ in rustPlatform.buildRustPackage rec { libxkbcommon ]; + postInstall = '' + mkdir -p $out/share + cp -r resources/logo $out/share/icons + install -Dm444 resources/linux/ajour.desktop -t $out/share/applications + ''; + fixupPhase = '' patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}:$(patchelf --print-rpath $out/bin/ajour)" $out/bin/ajour wrapProgram $out/bin/ajour --prefix PATH ":" ${lib.makeBinPath [ zenity kdialog ]} diff --git a/nixpkgs/pkgs/tools/games/igir/default.nix b/nixpkgs/pkgs/tools/games/igir/default.nix new file mode 100644 index 000000000000..51b8060d32dc --- /dev/null +++ b/nixpkgs/pkgs/tools/games/igir/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "igir"; + version = "2.0.6"; + + src = fetchFromGitHub { + owner = "emmercm"; + repo = "igir"; + rev = "v${version}"; + hash = "sha256-HIhk60I5VUMHBUp5EQGpE7RZ0KiYwVMl1jEX9zb5ttA="; + }; + + npmDepsHash = "sha256-P+H6q+jwfJFMb5qtOS3OCVUu9MtZ+Knaog0qyP3FpFo="; + + # I have no clue why I have to do this + postPatch = '' + patchShebangs scripts/update-readme-help.sh + ''; + + meta = with lib; { + description = "A video game ROM collection manager to help filter, sort, patch, archive, and report on collections on any OS"; + homepage = "https://igir.io"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ TheBrainScrambler ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix b/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix index dd7ebc6f3b43..eb0222ba8448 100644 --- a/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix +++ b/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix @@ -29,13 +29,13 @@ with rec { stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-COZO4LTrM/kZp85uNGwB9eaF27Xf7NVg4hcshaCJBwI="; + sha256 = "sha256-7/GBzqgXh8sU3Pl30eH9Mi24PPIqayQqNuhkMnn5Lq0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix b/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix index fa4cb75d174b..9332b25babfb 100644 --- a/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix +++ b/nixpkgs/pkgs/tools/graphics/cuneiform/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, cmake, imagemagick }: +{ lib, stdenv, fetchurl, cmake, imagemagick, testers }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "cuneiform"; version = "1.1.0"; @@ -30,10 +30,23 @@ stdenv.mkDerivation { rm cuneiform_src/Kern/hhh/tigerh/h/strings.h ''; + # make the install path match the rpath + postInstall = '' + if [[ -d ''${!outputLib}/lib64 ]]; then + mv ''${!outputLib}/lib64 ''${!outputLib}/lib + ln -s lib ''${!outputLib}/lib64 + fi + ''; + buildInputs = [ imagemagick ]; nativeBuildInputs = [ cmake ]; + passthru.tests = testers.testVersion { + package = finalAttrs.finalPackage; + command = "cuneiform"; + }; + meta = with lib; { description = "Multi-language OCR system"; homepage = "https://launchpad.net/cuneiform-linux"; @@ -42,4 +55,4 @@ stdenv.mkDerivation { maintainers = [ maintainers.raskin ]; mainProgram = "cuneiform"; }; -} +}) diff --git a/nixpkgs/pkgs/tools/graphics/mangohud/default.nix b/nixpkgs/pkgs/tools/graphics/mangohud/default.nix index e42ca26cfb08..5dc243ec2d7e 100644 --- a/nixpkgs/pkgs/tools/graphics/mangohud/default.nix +++ b/nixpkgs/pkgs/tools/graphics/mangohud/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { # Unpack subproject sources postUnpack = ''( cd "$sourceRoot/subprojects" - ${lib.optionalString finalAttrs.doCheck '' + ${lib.optionalString finalAttrs.finalPackage.doCheck '' cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka ''} cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} @@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dwith_wayland=enabled" "-Duse_system_spdlog=enabled" - "-Dtests=${if finalAttrs.doCheck then "enabled" else "disabled"}" + "-Dtests=${if finalAttrs.finalPackage.doCheck then "enabled" else "disabled"}" ] ++ lib.optionals gamescopeSupport [ "-Dmangoapp=true" "-Dmangoapp_layer=true" @@ -215,7 +215,7 @@ stdenv.mkDerivation (finalAttrs: { addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so" '' + lib.optionalString gamescopeSupport '' addOpenGLRunpath "$out/bin/mangoapp" - '' + lib.optionalString finalAttrs.doCheck '' + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' # libcmocka.so is only used for tests rm "$out/lib/libcmocka.so" ''; diff --git a/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix b/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix index c480f99651dc..a537e16d96ae 100644 --- a/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix +++ b/nixpkgs/pkgs/tools/graphics/pngtoico/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libpng }: +{ lib, stdenv, fetchurl, libpng, fetchpatch }: stdenv.mkDerivation rec { pname = "pngtoico"; @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph"; }; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/pngtoico/files/pngtoico-1.0.1-libpng15.patch"; + hash = "sha256-MeRV4FL37Wq7aFRnjbxPokcBKmPM+h94cnFJmdvHAt0="; + }) + ]; + configurePhase = '' sed -i s,/usr/local,$out, Makefile ''; diff --git a/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix new file mode 100644 index 000000000000..b8e34332e8ae --- /dev/null +++ b/nixpkgs/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, extra-cmake-modules +, fcitx5 +, gettext +, go +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fcitx5-bamboo"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "fcitx"; + repo = "fcitx5-bamboo"; + rev = finalAttrs.version; + hash = "sha256-EcpuZN2JU6HSuiQgBPBsoYftdHypiyFlrUxDBlVW6eo="; + fetchSubmodules = true; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + gettext + go + ]; + + buildInputs = [ + fcitx5 + extra-cmake-modules + ]; + + preConfigure = '' + export GOCACHE=$TMPDIR/go-cache + ''; + + meta = { + description = "Vietnamese input method engine support for Fcitx"; + homepage = "https://github.com/fcitx/fcitx5-bamboo"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ eclairevoyant ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/nixpkgs/pkgs/tools/inputmethods/footswitch/default.nix b/nixpkgs/pkgs/tools/inputmethods/footswitch/default.nix deleted file mode 100644 index a01069c9284f..000000000000 --- a/nixpkgs/pkgs/tools/inputmethods/footswitch/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, hidapi }: - -stdenv.mkDerivation { - pname = "footswitch"; - version = "unstable-2022-04-12"; - - src = fetchFromGitHub { - owner = "rgerganov"; - repo = "footswitch"; - rev = "1cf63643e18e688e4ebe96451db24edf52338cc0"; - sha256 = "0gfvi2wgrljndyz889cjjh2q13994fnaf11n7hpdd82c4wgg06kj"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ hidapi ]; - - postPatch = '' - substituteInPlace Makefile \ - --replace /usr/local $out \ - --replace /usr/bin/install install \ - --replace /etc/udev $out/lib/udev - ''; - - preInstall = '' - mkdir -p $out/bin $out/lib/udev/rules.d - ''; - - meta = with lib; { - description = "Command line utlities for programming PCsensor and Scythe foot switches."; - homepage = "https://github.com/rgerganov/footswitch"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; [ baloo ]; - }; -} diff --git a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix index 52b50b7cbb41..3ca3eba56840 100644 --- a/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -13,13 +13,13 @@ in stdenv.mkDerivation rec { pname = "ibus-typing-booster"; - version = "2.24.4"; + version = "2.24.5"; src = fetchFromGitHub { owner = "mike-fabian"; repo = "ibus-typing-booster"; rev = version; - hash = "sha256-f/KtHm8R1MJORWKmv487hm80MeX2l0Ybd1ZjKHGFq0A="; + hash = "sha256-GMkudpQ91Qwyj7wJIl7LTx+v+goCUccxJggCAvEtL30="; }; nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook gobject-introspection ]; diff --git a/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix b/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix index a8bffd9989a9..dc0ed25a3efe 100644 --- a/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/nixpkgs/pkgs/tools/inputmethods/m17n-db/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "m17n-db"; - version = "1.8.2"; + version = "1.8.5"; src = fetchurl { url = "https://download.savannah.gnu.org/releases/m17n/m17n-db-${version}.tar.gz"; - sha256 = "sha256-vHR+J9ct9YoH9DG3JdeuQJIyLbxGEUykBTgoIbK6XGk="; + sha256 = "sha256-to//QiwKKGTuVuLEUXOCEzuYG7S6ObU/R4lc2LHApzY="; }; nativeBuildInputs = [ gettext ]; diff --git a/nixpkgs/pkgs/tools/misc/bibutils/default.nix b/nixpkgs/pkgs/tools/misc/bibutils/default.nix index 66a518407025..c454e8cfa1d8 100644 --- a/nixpkgs/pkgs/tools/misc/bibutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/bibutils/default.nix @@ -18,13 +18,22 @@ stdenv.mkDerivation rec { --replace '-Wl,-soname,$(SONAME)' "" ''; + # the configure script is not generated by autoconf + # and do not recognize --build/--host cross compilation flags + configurePlatforms = [ ]; + configureFlags = [ (if static then "--static" else "--dynamic") "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ]; + dontAddPrefix = true; + makeFlags = [ + "CC:=$(CC)" + ]; + doCheck = true; checkTarget = "test"; preCheck = lib.optionalString stdenv.isDarwin '' diff --git a/nixpkgs/pkgs/tools/misc/bogofilter/default.nix b/nixpkgs/pkgs/tools/misc/bogofilter/default.nix index 0446a58efbc4..df78108e43e2 100644 --- a/nixpkgs/pkgs/tools/misc/bogofilter/default.nix +++ b/nixpkgs/pkgs/tools/misc/bogofilter/default.nix @@ -1,21 +1,31 @@ -{fetchurl, lib, stdenv, flex, db}: +{ lib +, stdenv +, fetchurl +, flex +, db +, makeWrapper +, pax +}: stdenv.mkDerivation rec { pname = "bogofilter"; - version = "1.2.4"; + version = "1.2.5"; src = fetchurl { - url = "mirror://sourceforge/bogofilter/bogofilter-${version}.tar.bz2"; - sha256 = "1d56n2m9inm8gnzm88aa27xl2a7sp7aff3484vmflpqkinjqf0p1"; + url = "mirror://sourceforge/bogofilter/bogofilter-${version}.tar.xz"; + hash = "sha256-MkihNzv/VSxQCDStvqS2yu4EIkUWrlgfslpMam3uieo="; }; - # FIXME: We would need `pax' as a "propagated build input" (for use - # by the `bf_tar' script) but we don't have it currently. + nativeBuildInputs = [ makeWrapper ]; buildInputs = [ flex db ]; doCheck = false; # needs "y" tool + postInstall = '' + wrapProgram "$out/bin/bf_tar" --prefix PATH : "${lib.makeBinPath [ pax ]}" + ''; + meta = { homepage = "http://bogofilter.sourceforge.net/"; longDescription = '' diff --git a/nixpkgs/pkgs/tools/misc/broot/default.nix b/nixpkgs/pkgs/tools/misc/broot/default.nix index afa31e2feaf1..a540a0c7d495 100644 --- a/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.29.0"; + version = "1.30.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-Wx+hUm0y7w0+IYtaRE5X/5Ra37mMEMEliYFbl7c03Ww="; + hash = "sha256-2uHsmxD0pn39DvESdVzm0qHEvpmMpE2GD1R3p7XMJEI="; }; - cargoHash = "sha256-7B5Uxr1SsAx+mRpvQPSW7pemxp11WngEIK6vF2cbzh4="; + cargoHash = "sha256-3UW1zSklxi4Ot3h7N8sEevYJMQydkxW9lPcfUouDSy8="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix b/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix index 916f349dc508..e6858863fc4e 100644 --- a/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix +++ b/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-4thb0AFlSYQ90SkdyTSiFUc6vTRpt6KX2nH/thMuv4o="; + sha256 = "sha256-C046oNN+tGvVIakCGJKKQBNHX+L1naaMDIk7tNGNjeQ="; }; vendorHash = "sha256-bfxF0qlEbZDczEuFhckqsG00/IzuM18ut/AQ9EMwdh0="; diff --git a/nixpkgs/pkgs/tools/misc/changelogger/default.nix b/nixpkgs/pkgs/tools/misc/changelogger/default.nix index 165f63c468ad..bae346ca37c5 100644 --- a/nixpkgs/pkgs/tools/misc/changelogger/default.nix +++ b/nixpkgs/pkgs/tools/misc/changelogger/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "changelogger"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "MarkusFreitag"; repo = pname; rev = "v${version}"; - sha256 = "sha256-g3d4BEVMQGBEKx+YVPjPrypWQNtEun/pSRgAsJY/RT4="; + sha256 = "sha256-XDiO8r1HpdsfBKzFLnsWdxte2EqL1blPH21137fNm5M="; }; vendorHash = "sha256-E6J+0tZriskBnXdhQOQA240c3z+laXM5honoREjHPfM="; diff --git a/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/nixpkgs/pkgs/tools/misc/coreutils/default.nix index beee4241c541..c1279a69ccf7 100644 --- a/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -32,11 +32,11 @@ let in stdenv.mkDerivation rec { pname = "coreutils" + (optionalString (!minimal) "-full"); - version = "9.3"; + version = "9.4"; src = fetchurl { url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz"; - hash = "sha256-rbz8/omSNbceh2jc8HzVMlILf1T5qAZIQ/jRmakEu6o="; + hash = "sha256-6mE6TPRGEjJukXIBu7zfvTAd4h/8O1m25cB+BAsnXlI="; }; postPatch = '' @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { # Some target platforms, especially when building inside a container have # issues with the inotify test. - sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail-2/inotify-dir-recreate.sh + sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail/inotify-dir-recreate.sh # sandbox does not allow setgid sed '2i echo Skipping chmod setgid test && exit 77' -i ./tests/chmod/setgid.sh @@ -77,10 +77,8 @@ stdenv.mkDerivation rec { echo "int main() { return 77; }" > gnulib-tests/test-getlogin.c '' ])) + (optionalString stdenv.isAarch64 '' - sed '2i print "Skipping tail assert test"; exit 77' -i ./tests/tail-2/assert.sh - # Sometimes fails: https://github.com/NixOS/nixpkgs/pull/143097#issuecomment-954462584 - sed '2i echo Skipping cut huge range test && exit 77' -i ./tests/misc/cut-huge-range.sh + sed '2i echo Skipping cut huge range test && exit 77' -i ./tests/cut/cut-huge-range.sh ''); outputs = [ "out" "info" ]; diff --git a/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix b/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix index b58a7d819bad..ae17b51025dc 100644 --- a/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/desktop-file-utils/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch , pkg-config , meson , ninja @@ -11,26 +10,13 @@ stdenv.mkDerivation rec { pname = "desktop-file-utils"; - version = "0.26"; + version = "0.27"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "02bkfi6fyk4c0gh2avd897882ww5zl7qg7bzzf28qb57kvkvsvdj"; + hash = "sha256-oIF985zjhbZiGIBAfFbx8pgWjAQMIDLO34jVt2r/6DY="; }; - patches = [ - # Support Desktop Entry Specification v1.5. - # https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/merge_requests/11 - (fetchpatch { - url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/425177a28b6215e0745f95100160a08e810fd47c.patch"; - sha256 = "zu9EqTnQQGi5HqKh431JqigtJi+b16RuXSWQYbuuyxA="; - }) - (fetchpatch { - url = "https://gitlab.freedesktop.org/xdg/desktop-file-utils/-/commit/56d220dd679c7c3a8f995a41a27a7d6f3df49dea.patch"; - sha256 = "p4kamGIm2QBHfIbvDnx+qu5Gi7OU3Z0nQKr39SsEKqk="; - }) - ]; - nativeBuildInputs = [ pkg-config meson diff --git a/nixpkgs/pkgs/tools/misc/diffoci/default.nix b/nixpkgs/pkgs/tools/misc/diffoci/default.nix index df7cc71140aa..3c7de46e01e8 100644 --- a/nixpkgs/pkgs/tools/misc/diffoci/default.nix +++ b/nixpkgs/pkgs/tools/misc/diffoci/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "diffoci"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitHub { owner = "reproducible-containers"; repo = "diffoci"; rev = "v${version}"; - hash = "sha256-Rrwwo1OCE2gn6MGt5XVddb8bJtoN7iAtxzr2MxyHcwk="; + hash = "sha256-BTggky5behIxbVxyDZ09uobw0FBopboE9uUBEVgCgR4="; }; - vendorHash = "sha256-18rsa91PiqZv70EK3K6K1l6N2mIpoVpkX29amKCo5cg="; + vendorHash = "sha256-4C35LBxSm6EkcOznQY1hT2vX9bwFfps/q76VqqPKBfI="; ldflags = [ "-s" "-w" ]; diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index 61617044792b..4636266e0279 100644 --- a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , abootimg +, acl , apksigcopier , apksigner , apktool @@ -78,11 +79,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "252"; + version = "253"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-NmYv5htZT2v04vVksIWGuaPI1rXfNmrVSmErT/faBbQ="; + hash = "sha256-xI+SIEUPKFxz7sk9qqE1ibSJX0WRPnJEpco0Mqv7Wp8="; }; outputs = [ @@ -112,16 +113,20 @@ python3.pkgs.buildPythonApplication rec { # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh # # Still missing these tools: + # Android-specific tools: # aapt2 # dexdump - # docx2txt - # getfacl + # Darwin-specific tools: # lipo # otool - # r2pipe + # Other tools: + # docx2txt <- makes tests broken: + # > FAILED tests/comparators/test_docx.py::test_diff - IndexError: list index out of range + # > FAILED tests/comparators/test_docx.py::test_compare_non_existing - AssertionError # # We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.). pythonPath = lib.filter (lib.meta.availableOn stdenv.hostPlatform) ([ + acl binutils-unwrapped-all-targets bzip2 cdrkit @@ -209,6 +214,7 @@ python3.pkgs.buildPythonApplication rec { guestfs h5py pdfminer-six + # docx2txt, breaks the tests. ]) # oggvideotools is broken on Darwin, please put it back when it will be fixed? ++ lib.optionals stdenv.isLinux [ oggvideotools ] diff --git a/nixpkgs/pkgs/tools/misc/dotter/default.nix b/nixpkgs/pkgs/tools/misc/dotter/default.nix index 2abe844531b5..bcabb2ef8aac 100644 --- a/nixpkgs/pkgs/tools/misc/dotter/default.nix +++ b/nixpkgs/pkgs/tools/misc/dotter/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${version}"; - hash = "sha256-mAvTy/11a9RGSQpElhpKMzsMC7vA7cbeHsNRy9MnIjw="; + hash = "sha256-Xmdg5ITKWhL5AxTS7z4f9ecigQpBqna+kZclA+mDJhA="; }; - cargoHash = "sha256-XsDp/ssoNVdTHDTPm2ucgBeYmFgbeBIxQ/NsGjCl5Qg="; + cargoHash = "sha256-W8khm9E5f/PROVJDAUr57nAiTEXV4a0fepzV00HoT8c="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/nixpkgs/pkgs/tools/misc/dua/default.nix b/nixpkgs/pkgs/tools/misc/dua/default.nix index 6ed80c30b740..f27acd85d9d4 100644 --- a/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -7,13 +7,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.20.3"; + version = "2.21.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - hash = "sha256-9Qt6/LH30nz4oyP+kXhExzKpPcHRRGYkG43Mjl/ZBoc="; + hash = "sha256-szpM3PxIMcKJaCinzZltneCSJCDkPGvXOaGqa9hx9IQ="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-xBuc+nh3koLn4/wgrvVjWVc9mjX/6ElAN4n9dWxs5fs="; + cargoHash = "sha256-/10trywiFX0UvePxlWek1uXTBRVk4saE+n1RJipinaw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Foundation diff --git a/nixpkgs/pkgs/tools/misc/fastfetch/default.nix b/nixpkgs/pkgs/tools/misc/fastfetch/default.nix index adab3390de1d..53be29dcfa3c 100644 --- a/nixpkgs/pkgs/tools/misc/fastfetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/fastfetch/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastfetch"; - version = "2.2.3"; + version = "2.3.4"; src = fetchFromGitHub { owner = "fastfetch-cli"; repo = "fastfetch"; rev = finalAttrs.version; - hash = "sha256-JaD0R1vfHoWMhipMtTW0dlggR7RbD2evHfHrjoZJBmk="; + hash = "sha256-jZeecymhjbXYE05zRF2dWHBS3hhRm1BmLB906YAlp+A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/fend/default.nix b/nixpkgs/pkgs/tools/misc/fend/default.nix index 7abb37592c6a..82c99628e1b0 100644 --- a/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "printfn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-An1biuaqPeRniJZroxoT2o9IEA4XFf5l6ut4nmOsQJI="; + sha256 = "sha256-4N2MSs4Uhd0NcS57b6qIJd8ovnUVjLiLniMsHTdZHCo="; }; - cargoHash = "sha256-gnFu0JsMt1wMfifF6EnjDwwydFnVyqpkHV0cyR5Qt3Y="; + cargoHash = "sha256-Y8LfkFPM4MKxwW6xk93+vCASkVfsMp3GugjH/kIAvQ8="; nativeBuildInputs = [ pandoc installShellFiles copyDesktopItems ]; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix b/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix index 7af4f5dac48d..722905df951f 100644 --- a/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix +++ b/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix @@ -1,9 +1,11 @@ -{ lib, buildNpmPackage, fetchFromGitHub, avahi-compat, nodejs, python3 }: +{ lib, buildNpmPackage, fetchFromGitHub, avahi-compat, nodejs_18, python3 }: buildNpmPackage rec { pname = "fx-cast-bridge"; version = "0.3.1"; + nodejs = nodejs_18; + src = fetchFromGitHub { owner = "hensm"; repo = "fx_cast"; diff --git a/nixpkgs/pkgs/tools/misc/glasgow/0001-Relax-Amaranth-git-dependency.patch b/nixpkgs/pkgs/tools/misc/glasgow/0001-Relax-Amaranth-git-dependency.patch deleted file mode 100644 index 3d4f674ff2c4..000000000000 --- a/nixpkgs/pkgs/tools/misc/glasgow/0001-Relax-Amaranth-git-dependency.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 95d86c080a559d9c9f0498fb93d43d3fef377080 Mon Sep 17 00:00:00 2001 -From: Jack Leightcap <jack@leightcap.com> -Date: Sat, 13 May 2023 17:28:54 -0400 -Subject: [PATCH] Relax Amaranth git dependency - -Signed-off-by: Jack Leightcap <jack@leightcap.com> ---- - software/pyproject.toml | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/software/pyproject.toml b/software/pyproject.toml -index 6d1e2f1..6dfcc9e 100644 ---- a/software/pyproject.toml -+++ b/software/pyproject.toml -@@ -20,8 +20,8 @@ classifiers = [ - ] - - dependencies = [ -- "amaranth @ git+https://github.com/amaranth-lang/amaranth.git", -- "fx2>=0.11", -+ "amaranth", -+ "fx2", - "libusb1>=1.8.1", - "aiohttp~=3.8", - "pyvcd", --- -2.38.4 - diff --git a/nixpkgs/pkgs/tools/misc/grub/default.nix b/nixpkgs/pkgs/tools/misc/grub/default.nix index 52ccfa8ccaaa..727c6ae073e6 100644 --- a/nixpkgs/pkgs/tools/misc/grub/default.nix +++ b/nixpkgs/pkgs/tools/misc/grub/default.nix @@ -91,6 +91,32 @@ stdenv.mkDerivation rec { revert = true; hash = "sha256-p8Kcv9d7ri4eJU6Fgqyzdj0hV5MHSe50AF02FPDJx2Y="; }) + + # Fixes for NTFS bugs (CVE-2023-4692 and CVE-2023-4693) + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=43651027d24e62a7a463254165e1e46e42aecdea"; + hash = "sha256-/oudbfL8Ph7ZsgsFUI0YIddji+7okFRG12E/rDsgvNM="; + }) + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=0ed2458cc4eff6d9a9199527e2a0b6d445802f94"; + hash = "sha256-6EhLzVapN2n62Lgo+PnB4SRvDkYWFkrKNinCvArRUXk="; + }) + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7e5f031a6a6a3decc2360a7b0c71abbe598e7354"; + hash = "sha256-R2vmVGidm1ZFxopt/71y2816z2i/vvPrthZE52oc4CI="; + }) + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=7a5a116739fa6d8a625da7d6b9272c9a2462f967"; + hash = "sha256-T1LglEcUl9GXQjJ6Y4fKuFyFAujNRbcAb9KoNkl6jXs="; + }) + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=1fe82c41e070385e273d7bb1cfb482627a3c28e8"; + hash = "sha256-x/V7bmRaNxo8NNOUwVti59n9ST/2yTJ/blWjk3omdqE="; + }) + (fetchpatch { + url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=e58b870ff926415e23fc386af41ff81b2f588763"; + hash = "sha256-a0faNQafL+uRIglnILkLj64ROWxqmczQTQSu3VdklSk="; + }) ]; postPatch = if kbdcompSupport then '' diff --git a/nixpkgs/pkgs/tools/misc/gti/default.nix b/nixpkgs/pkgs/tools/misc/gti/default.nix index b60abc97e92c..9e396f33e6a1 100644 --- a/nixpkgs/pkgs/tools/misc/gti/default.nix +++ b/nixpkgs/pkgs/tools/misc/gti/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gti"; - version = "1.8.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "rwos"; repo = "gti"; rev = "v${version}"; - sha256 = "sha256-x6ncvnZPPrVcQYwtwkSenW+ri0L6FpuDa7U7uYUqiyk="; + sha256 = "sha256-DUDCFcaB38Xkp3lLfEhjGC0j430dphXFBVhGzm7/Bp0="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/hdf5/bin-mv.patch b/nixpkgs/pkgs/tools/misc/hdf5/bin-mv.patch deleted file mode 100644 index 45649977e566..000000000000 --- a/nixpkgs/pkgs/tools/misc/hdf5/bin-mv.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -rc hdf5-1.8.5/configure hdf5-1.8.5-new/configure -*** hdf5-1.8.5/configure 2010-06-04 20:26:04.000000000 +0200 ---- hdf5-1.8.5-new/configure 2010-08-02 10:30:26.000000000 +0200 -*************** -*** 30587,30598 **** - sed 's/#define /#define H5_/' <src/H5config.h |\ - sed 's/#undef /#undef H5_/' >pubconf - if test ! -f src/H5pubconf.h; then -! /bin/mv -f pubconf src/H5pubconf.h - elif (diff pubconf src/H5pubconf.h >/dev/null); then - rm -f pubconf - echo "src/H5pubconf.h is unchanged" - else -! /bin/mv -f pubconf src/H5pubconf.h - fi - echo "Post process src/libhdf5.settings" - sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP ---- 30587,30598 ---- - sed 's/#define /#define H5_/' <src/H5config.h |\ - sed 's/#undef /#undef H5_/' >pubconf - if test ! -f src/H5pubconf.h; then -! mv -f pubconf src/H5pubconf.h - elif (diff pubconf src/H5pubconf.h >/dev/null); then - rm -f pubconf - echo "src/H5pubconf.h is unchanged" - else -! mv -f pubconf src/H5pubconf.h - fi - echo "Post process src/libhdf5.settings" - sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP diff --git a/nixpkgs/pkgs/tools/misc/hyfetch/default.nix b/nixpkgs/pkgs/tools/misc/hyfetch/default.nix index 3621ad675b24..2e906541bda1 100644 --- a/nixpkgs/pkgs/tools/misc/hyfetch/default.nix +++ b/nixpkgs/pkgs/tools/misc/hyfetch/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "hyfetch"; - version = "1.4.10"; + version = "1.4.11"; format = "setuptools"; src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; rev = "refs/tags/${version}"; - hash = "sha256-B8FAMXot+QV7Q2bJuTsRsrxHSr/2f+WNTKrZqFXewdE="; + hash = "sha256-xzN/tbS5BUvpKeozesE99gNp3NRDjvf4Qx7BHLc4svo="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/misc/infracost/default.nix b/nixpkgs/pkgs/tools/misc/infracost/default.nix index 6b0f4edd5a77..ce555facf410 100644 --- a/nixpkgs/pkgs/tools/misc/infracost/default.nix +++ b/nixpkgs/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.10.30"; + version = "0.10.31"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-YHhaOf2MNrFHv29pEnhkOjFH30Mi5Oi6gYkSH6PZhU4="; + sha256 = "sha256-slZFZu+NEOLy4oxdcZwW2OhabGxE/RPsfEhO0W6+gT0="; }; - vendorHash = "sha256-yjPtNTfkL8+fkmXW98SnpboMqdsjQYCif65sn0jjLgc="; + vendorHash = "sha256-o8CMISBU5C/SDexeEiwnxTC9hvbCWUrm6a/2TOE9Bmw="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/kak-lsp/0001-Use-full-Perl-path.patch b/nixpkgs/pkgs/tools/misc/kak-lsp/0001-Use-full-Perl-path.patch new file mode 100644 index 000000000000..38f0d38cb215 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/kak-lsp/0001-Use-full-Perl-path.patch @@ -0,0 +1,37 @@ +From b93660cfa8a80a5e5bf72e1f06fb7bf95272c7e4 Mon Sep 17 00:00:00 2001 +From: PoweredByPie <poweredbypie@users.noreply.github.com> +Date: Fri, 8 Dec 2023 04:39:01 -0800 +Subject: [PATCH] Use full Perl path + +--- + rc/lsp.kak | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/rc/lsp.kak b/rc/lsp.kak +index d695a2e..7c6a436 100644 +--- a/rc/lsp.kak ++++ b/rc/lsp.kak +@@ -2339,11 +2339,6 @@ define-command -hidden lsp-snippets-insert-completion -params 1 %{ evaluate-comm + }} + + define-command lsp-snippets-insert -hidden -params 1 %[ +- evaluate-commands %sh{ +- if ! command -v perl > /dev/null 2>&1; then +- printf "fail '''perl'' must be installed to use the ''snippets-insert'' command'" +- fi +- } + evaluate-commands -draft -save-regs '^"' %[ + set-register '"' %arg{1} + execute-keys <a-P> +@@ -2397,7 +2392,7 @@ define-command lsp-snippets-insert -hidden -params 1 %[ + + define-command -hidden lsp-snippets-insert-perl-impl %[ + evaluate-commands %sh[ # $kak_quoted_selections +- perl -e ' ++ @perlPath@/bin/perl -e ' + use strict; + use warnings; + use Text::ParseWords(); +-- +2.42.0 + diff --git a/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix b/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix index 1f494dea8438..9a19d40bed23 100644 --- a/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix +++ b/nixpkgs/pkgs/tools/misc/kak-lsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, CoreServices, Security, SystemConfiguration }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, perl, CoreServices, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "kak-lsp"; @@ -13,13 +13,20 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-+3cpAL+8X8L833kmZapUoGSwHOj+hnDN6oDNJZ6y24Q="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; + buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; + + patches = [ ./0001-Use-full-Perl-path.patch ]; + + postPatch = '' + substituteInPlace rc/lsp.kak \ + --subst-var-by perlPath ${lib.getBin perl} + ''; meta = with lib; { description = "Kakoune Language Server Protocol Client"; homepage = "https://github.com/kak-lsp/kak-lsp"; license = with licenses; [ unlicense /* or */ mit ]; - maintainers = [ maintainers.spacekookie ]; + maintainers = with maintainers; [ spacekookie poweredbypie ]; mainProgram = "kak-lsp"; }; } diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/fix-gcc11-compilation.patch b/nixpkgs/pkgs/tools/misc/libbitcoin/fix-gcc11-compilation.patch deleted file mode 100644 index fe1b9777275e..000000000000 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/fix-gcc11-compilation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/bitcoin/bitcoin/wallet/dictionary.hpp b/include/bitcoin/bitcoin/wallet/dictionary.hpp -index 632f1afc..63a51764 100644 ---- a/include/bitcoin/bitcoin/wallet/dictionary.hpp -+++ b/include/bitcoin/bitcoin/wallet/dictionary.hpp -@@ -19,6 +19,7 @@ - #ifndef LIBBITCOIN_WALLET_DICTIONARY_HPP - #define LIBBITCOIN_WALLET_DICTIONARY_HPP - -+#include <cstddef> - #include <array> - #include <vector> - #include <bitcoin/bitcoin/compat.hpp> diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index a940fba29676..266ef9accca6 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -1,18 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, libbitcoin-protocol }: -let +stdenv.mkDerivation rec { pname = "libbitcoin-client"; - version = "3.5.0"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.8.0"; src = fetchFromGitHub { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "0a9c00f1pfi8wczbfd1djkvr7di3iw1ynak6if910w01dkhbm6v4"; + hash = "sha256-5qbxixaozHFsOcBxnuGEfNJyGL8UaYCOPwPakfc0bAg="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index 7d00e4c09add..48c8e9a4f721 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -1,18 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin-client, libbitcoin-network }: -let +stdenv.mkDerivation rec { pname = "libbitcoin-explorer"; - version = "3.5.0"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.8.0"; src = fetchFromGitHub { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "033nrdzrha4kypxk4biixjsbjd16r4m2mjvpid4gdj5hzbbj1p93"; + hash = "sha256-NUAtjrfRbZg5ewQo4PZ1HEoG8GRrsPcNb78UYMHqdyo="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index 5d330ee3cacc..ee9cb1da687f 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -1,18 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, zeromq }: -let +stdenv.mkDerivation rec { pname = "libbitcoin-network"; - version = "3.5.0"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.8.0"; src = fetchFromGitHub { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "0vqg3i40kwmbys4lyp82xvg2nx3ik4qhc66gcm8k66a86wpj9ji6"; + hash = "sha256-zDT92bvA779mzTodpKugCoxapB6vY2jCMSGZEkJLTXQ="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 06f6546e964d..57e55400aa27 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -1,18 +1,15 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , boost, libbitcoin, secp256k1, zeromq }: -let +stdenv.mkDerivation rec { pname = "libbitcoin-protocol"; - version = "3.5.0"; - -in stdenv.mkDerivation { - name = "${pname}-${version}"; + version = "3.8.0"; src = fetchFromGitHub { owner = "libbitcoin"; repo = pname; rev = "v${version}"; - sha256 = "1ln9r04hlnc7qmv17rakyhrnzw1a541pg5jc1sw3ccn90a5x6cfv"; + hash = "sha256-xf0qQQnZ8h6ent1sgkVTo55+9drZM8Zbx0deYZnLBho="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 347d6eae7ce4..70a0f9bff6ef 100644 --- a/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libbitcoin"; - version = "3.6.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1rppyp3zpb6ymwangjpblwf6qh4y3d1hczrjx8aavmrq7hznnrhq"; + hash = "sha256-7fxj2hnuGRUS4QSQ1w0s3looe9pMvE2U50/yhNyBMf0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -18,8 +18,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - patches = [ ./fix-gcc11-compilation.patch ]; - configureFlags = [ "--with-tests=no" "--with-boost=${boost.dev}" diff --git a/nixpkgs/pkgs/tools/misc/man-db/default.nix b/nixpkgs/pkgs/tools/misc/man-db/default.nix index b52628373594..e5829a56a8b4 100644 --- a/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -1,7 +1,6 @@ { buildPackages , db , fetchurl -, fetchpatch , groff , gzip , lib @@ -17,11 +16,11 @@ stdenv.mkDerivation rec { pname = "man-db"; - version = "2.11.2"; + version = "2.12.0"; src = fetchurl { url = "mirror://savannah/man-db/man-db-${version}.tar.xz"; - hash = "sha256-z/oe5Ol0vnhkbEZQjm3S8358WJqqspOMwQZPBY/vn40="; + hash = "sha256-QVpihKInZK0i/w9mcQ2FO+d5DdRRzXFDbj0lx02ZapU="; }; outputs = [ "out" "doc" ]; @@ -34,32 +33,6 @@ stdenv.mkDerivation rec { patches = [ ./systemwide-man-db-conf.patch - # Remove the patches below when updating to the next man-db release. - # Patches addressing https://gitlab.com/man-db/man-db/-/issues/25 ... - (fetchpatch { - name = "update-warning-regex"; - url = "https://gitlab.com/man-db/man-db/-/commit/b12ffb9df7.patch"; - hash = "sha256-F+whRppaMZwgmGPKTXu2j1vZMNAm3vGNzNZcz9pg8Jc="; - }) - (fetchpatch { - name = "fix-test-failures-when-iconv-not-available"; - url = "https://gitlab.com/man-db/man-db/-/commit/26f46a60e5.patch"; - hash = "sha256-W1a6GkYn4J3py7GLZc37xmQBQR18Xvcvj4fJoZ21+0k="; - # The following files are excluded from the patch as they fail to apply - # cleanly on the 2.11.2 sources and are deemed irrelevant for building man-db. - excludes = [ "NEWS.md" ]; - }) - # ... and https://gitlab.com/man-db/man-db/-/issues/26. - (fetchpatch { - name = "improve-lexgrog-portability"; - url = "https://gitlab.com/man-db/man-db/-/commit/bbf7701c4f.patch"; - hash = "sha256-QLOVgV0S2NxxTBObD8bJFR1QDH0p2RGMJXLVNagfddc="; - }) - (fetchpatch { - name = "avoid-translation-fallout-from-lexgrog-fix"; - url = "https://gitlab.com/man-db/man-db/-/commit/043c3cb83c.patch"; - hash = "sha256-w12/LOGN9gO85zmqX7zookA55w3WUxBMJgWInpH5wms="; - }) ]; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix index 0f0d92c59fa0..e714861c1aa6 100644 --- a/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/mongodb-tools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mongo-tools"; - version = "100.9.1"; + version = "100.9.3"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-tools"; rev = version; - sha256 = "sha256-c+pzpDUDx6xqpELLM32z0T5mGlF0qk6wqyS1OU9NkRs="; + sha256 = "sha256-l3A7ykkQCkT34EdgpcSJpFsZq1gE9GII9gzaXJaUwEk="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/misc/nb/default.nix b/nixpkgs/pkgs/tools/misc/nb/default.nix index 56513d35c779..d9d7110e77ce 100644 --- a/nixpkgs/pkgs/tools/misc/nb/default.nix +++ b/nixpkgs/pkgs/tools/misc/nb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nb"; - version = "7.8.0"; + version = "7.9.0"; src = fetchFromGitHub { owner = "xwmx"; repo = "nb"; rev = version; - sha256 = "sha256-8TOEPPtwxbTlm5nGMjOmH8lvsDu0vNgvxaUOgKS1l/g="; + sha256 = "sha256-5pKRZfLEFoB9abQdUTETMJhhgDFqlH/URipUv3cLnxQ="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix b/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix deleted file mode 100644 index d4e461bb77e1..000000000000 --- a/nixpkgs/pkgs/tools/misc/nix-direnv/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, nix -}: -stdenv.mkDerivation (finalAttrs:{ - pname = "nix-direnv"; - version = "2.5.1"; - - src = fetchFromGitHub { - owner = "nix-community"; - repo = "nix-direnv"; - rev = finalAttrs.version; - hash = "sha256-rMQ+Nb6WqXm66g2TpF8E0Io9WBR0ve06MW8I759gl2M="; - }; - - # Substitute instead of wrapping because the resulting file is - # getting sourced, not executed: - postPatch = '' - sed -i "1a NIX_BIN_PREFIX=${nix}/bin/" direnvrc - ''; - - installPhase = '' - runHook preInstall - install -m500 -D direnvrc $out/share/nix-direnv/direnvrc - runHook postInstall - ''; - - meta = { - description = "A fast, persistent use_nix implementation for direnv"; - homepage = "https://github.com/nix-community/nix-direnv"; - license = lib.licenses.mit; - platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ mic92 bbenne10 ]; - }; -}) diff --git a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix index 092d591b88a8..b078361bf057 100644 --- a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.90.0"; + version = "0.90.1"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-FL0lNlofXHTdn5o6g4FHNYauzJkjCKTrspSXP9slp/A="; + hash = "sha256-JKcYvJtuN38VrhcVFHRc0CKTH+x8HShs1/Ui0iN1jNo="; }; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-6Vr4Nk4mp505H3oAznAQ2mJl6qYFbHyO5MqgYeinnf8="; + vendorHash = "sha256-vaWOUc4CwiCDqe1szrBcgbHXQH/OkGTN0iqh+3CKPLQ="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/ostree/default.nix b/nixpkgs/pkgs/tools/misc/ostree/default.nix index c8485d4a2fa4..dcb4065a02c0 100644 --- a/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -119,6 +119,10 @@ in stdenv.mkDerivation rec { makeFlags = [ "installed_testdir=${placeholder "installedTests"}/libexec/installed-tests/libostree" "installed_test_metadir=${placeholder "installedTests"}/share/installed-tests/libostree" + # Setting this flag was required as workaround for a clang bug, but seems not relevant anymore. + # https://github.com/ostreedev/ostree/commit/fd8795f3874d623db7a82bec56904648fe2c1eb7 + # See also Makefile-libostree.am + "INTROSPECTION_SCANNER_ENV=" ]; preConfigure = '' diff --git a/nixpkgs/pkgs/tools/misc/parallel/default.nix b/nixpkgs/pkgs/tools/misc/parallel/default.nix index a2aee41eff75..8a724c0b8698 100644 --- a/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20231022"; + version = "20231122"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - sha256 = "sha256-k/K5TxhQeYpLXdoiva6G2ramVl41JYYOCORvJWPzJow="; + sha256 = "sha256-giyc+KoXFSCthn2xPvE0Jmab0WTIG5AKPby1VmEb6uI="; }; outputs = [ "out" "man" "doc" ]; diff --git a/nixpkgs/pkgs/tools/misc/pls/default.nix b/nixpkgs/pkgs/tools/misc/pls/default.nix deleted file mode 100644 index c6d6d2e52835..000000000000 --- a/nixpkgs/pkgs/tools/misc/pls/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib, python3, fetchFromGitHub }: - -python3.pkgs.buildPythonApplication rec { - pname = "pls"; - version = "5.4.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "dhruvkb"; - repo = "pls"; - rev = version; - sha256 = "sha256-h93Kz+ETdHfnzypa8JjMvbzA1o/KS1UuTG8/vhEt7Vo="; - }; - - nativeBuildInputs = [ python3.pkgs.poetry-core ]; - - propagatedBuildInputs = with python3.pkgs; [ - pyyaml - requests - rich - ]; - - nativeCheckInputs = with python3.pkgs; [ - freezegun - jsonschema - pytestCheckHook - ]; - - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'rich = "^12.5.1"' 'rich = "*"' \ - ''; - - pytestFlagsArray = [ "tests/" "--ignore=tests/e2e" ]; - - pythonImportsCheck = [ "pls" ]; - - meta = with lib; { - homepage = "https://dhruvkb.github.io/pls/"; - description = "Prettier and powerful ls"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ arjan-s ]; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/rtx/default.nix b/nixpkgs/pkgs/tools/misc/rtx/default.nix index 51cba8e4b375..80469864d361 100644 --- a/nixpkgs/pkgs/tools/misc/rtx/default.nix +++ b/nixpkgs/pkgs/tools/misc/rtx/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "rtx"; - version = "2023.11.2"; + version = "2023.12.18"; src = fetchFromGitHub { owner = "jdx"; repo = "rtx"; rev = "v${version}"; - hash = "sha256-OdqHyxqufJJTfP7frjLKf5R0WNySDyZc7Sh0Mpdord0="; + hash = "sha256-RjILdhH0Gg9VRvyVFukUrreYHnwtC+5MfXT+v4cT7/Y="; }; - cargoHash = "sha256-KOte3zmJllrMp6OaKuFtUsRjdRKlSAxdJp1iJEOPcF0="; + cargoHash = "sha256-1/Te4JfPDE0gbMysnQbF2SH/oMq+b3fyVgIHaQx1m5E="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/nixpkgs/pkgs/tools/misc/steampipe/default.nix b/nixpkgs/pkgs/tools/misc/steampipe/default.nix index 44f0cb5f17da..238d6bb2a623 100644 --- a/nixpkgs/pkgs/tools/misc/steampipe/default.nix +++ b/nixpkgs/pkgs/tools/misc/steampipe/default.nix @@ -1,17 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "steampipe"; - version = "0.20.12"; + version = "0.21.1"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - sha256 = "sha256-/vcxK/tX4kvDnQCqO8olHZodAbPDDvz1domJZ1WJqPU="; + hash = "sha256-UTKonirf27C3q3tYznMfNtAQ3S7T1Vzlwz05jAoLfoI="; }; - vendorHash = "sha256-VuUzo+afUazXH7jaR4Qm5Kfr6qiyHqdGLJWS3MX8oOA="; + vendorHash = "sha256-zzXAAxN2PRqAx4LDJjVAoLm1HnhVdBe/Mzyuai8CEXg="; proxyVendor = true; patchPhase = '' @@ -27,6 +27,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; + # panic: could not create backups directory: mkdir /var/empty/.steampipe: operation not permitted + doCheck = !stdenv.isDarwin; + postInstall = '' INSTALL_DIR=$(mktemp -d) installShellCompletion --cmd steampipe \ diff --git a/nixpkgs/pkgs/tools/misc/svu/default.nix b/nixpkgs/pkgs/tools/misc/svu/default.nix index 352f4d0ab721..0fafaffc153b 100644 --- a/nixpkgs/pkgs/tools/misc/svu/default.nix +++ b/nixpkgs/pkgs/tools/misc/svu/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "svu"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "caarlos0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FmSBh2XxwxmIbX2TILnk+YUYbMQQbOb89uvnpl4b+7Y="; + sha256 = "sha256-MztFramrNqxYmdTRf857HOC7H66dLvezG6LL9njxWUs="; }; vendorHash = "sha256-+e1oL08KvBSNaRepGR2SBBrEDJaGxl5V9rOBysGEfQs="; diff --git a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix index 594c6de654af..4e8d7ca8f9fe 100644 --- a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ttyplot"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - sha256 = "sha256-lZLjTmSKxGJhUMELcIPjycpuRR3m9oz/Vh1/FEUzMOQ="; + sha256 = "sha256-BYMdGNDl8HUin1Hu4Fqgx305a/tTt1fztqlT2vDeTh8="; }; buildInputs = [ ncurses ]; diff --git a/nixpkgs/pkgs/tools/misc/usbview/default.nix b/nixpkgs/pkgs/tools/misc/usbview/default.nix index 71a4ddeefd8d..17402fe76120 100644 --- a/nixpkgs/pkgs/tools/misc/usbview/default.nix +++ b/nixpkgs/pkgs/tools/misc/usbview/default.nix @@ -3,23 +3,25 @@ , fetchFromGitHub , autoreconfHook , pkg-config +, imagemagick , gtk3 }: stdenv.mkDerivation rec { pname = "usbview"; - version = "2.0"; + version = "3.1"; src = fetchFromGitHub { owner = "gregkh"; repo = "usbview"; rev = "v${version}"; - sha256 = "1cw5jjpidjn34rxdjslpdlj99k4dqaq1kz6mplv5hgjdddijvn5p"; + hash = "sha256-h+sB83BYsrB2VxwtatPWNiM0WdTCMY289nh+/0o8GOw="; }; nativeBuildInputs = [ autoreconfHook pkg-config + imagemagick ]; buildInputs = [ @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { description = "USB viewer for Linux"; license = licenses.gpl2Only; homepage = "http://www.kroah.com/linux-usb/"; - maintainers = with maintainers; [ shamilton ]; + maintainers = with maintainers; [ shamilton h7x4 ]; platforms = platforms.linux; mainProgram = "usbview"; }; diff --git a/nixpkgs/pkgs/tools/misc/vector/default.nix b/nixpkgs/pkgs/tools/misc/vector/default.nix index ddd6e32e16d4..14048bc4845c 100644 --- a/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -13,6 +13,7 @@ , libiconv , coreutils , CoreServices +, SystemConfiguration , tzdata , cmake , perl @@ -62,8 +63,9 @@ rustPlatform.buildRustPackage { }; }; nativeBuildInputs = [ pkg-config cmake perl git rustPlatform.bindgenHook ]; - buildInputs = [ oniguruma openssl protobuf rdkafka zstd rust-jemalloc-sys ] - ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ]; + buildInputs = + [ oniguruma openssl protobuf rdkafka zstd rust-jemalloc-sys ] + ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices SystemConfiguration ]; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; diff --git a/nixpkgs/pkgs/tools/misc/vtm/default.nix b/nixpkgs/pkgs/tools/misc/vtm/default.nix index ee7b301df861..47a78ea41ef6 100644 --- a/nixpkgs/pkgs/tools/misc/vtm/default.nix +++ b/nixpkgs/pkgs/tools/misc/vtm/default.nix @@ -4,27 +4,29 @@ , cmake }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "vtm"; - version = "0.9.16"; + version = "0.9.27"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; - rev = "v${version}"; - sha256 = "sha256-nX7T3TAGgxAB65X8D2HlI+3T6p7aH3bwG3N1pScX/4g="; + rev = "v${finalAttrs.version}"; + hash = "sha256-BiXKwFZDi0boE1kCqbIn6uFjQ/oliyNbqmamyAwnqdM="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; cmakeFlags = [ "../src" ]; - meta = with lib; { + meta = { description = "Terminal multiplexer with window manager and session sharing"; homepage = "https://vtm.netxs.online/"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ ahuzik ]; + license = lib.licenses.mit; mainProgram = "vtm"; + maintainers = with lib.maintainers; [ ahuzik ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/nixpkgs/pkgs/tools/misc/wakapi/default.nix b/nixpkgs/pkgs/tools/misc/wakapi/default.nix index 9cf4efb0df33..954924c3ca22 100644 --- a/nixpkgs/pkgs/tools/misc/wakapi/default.nix +++ b/nixpkgs/pkgs/tools/misc/wakapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakapi"; - version = "2.9.2"; + version = "2.10.0"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-BRIcStqRzwoFG9HkWBpfumeCzbrSI0Hg//a0iDQtNw8="; + sha256 = "sha256-CyMzhEKaTiLODjXbHqkqEJNeCsssCjmdVOzg3vXVjJY="; }; - vendorHash = "sha256-SqkE4vTT+QoLhKrQcGa2L5WmD+fCX7vli4FjgwLnqjg="; + vendorHash = "sha256-+FYeaIQXHZyrik/9OICl2zk+OA8X9bry7JCQbdf9QGs="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; diff --git a/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix b/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix index 26d3d34e58c4..443cfa85f808 100644 --- a/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.0.52"; + version = "1.0.54"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-6x2H+WY23XxBWmAqD2Lsc4TdCY76XiR/BhSU++XuIFY="; + hash = "sha256-ZiOuD7aiBI1virfcXzxHnX5/uPZRc+Nntg24K2b9Mbo="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-1YnoHL+FKXhopcW0Scya22sRBwantRH9gF7w/rxU0H8="; + cargoHash = "sha256-OPNxs5WSQEatIJQ48GYjCzwM4twvQd38W/xsFgU9dB0="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix b/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix index eee35ea8c9d4..61d76205a6d6 100644 --- a/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/nixpkgs/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -1,38 +1,53 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , pkg-config , openssl , check , pcsclite , PCSC , gengetopt +, help2man , cmake +, zlib , withApplePCSC ? stdenv.isDarwin -, gitUpdater +, nix-update-script , testers -, yubico-piv-tool }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "yubico-piv-tool"; - version = "2.3.1"; + version = "2.4.1"; - src = fetchurl { - url = "https://developers.yubico.com/yubico-piv-tool/Releases/yubico-piv-tool-${version}.tar.gz"; - hash = "sha256-2ona/YthhapjU0Z1P53bKa8pvEq9kt2B832dZWC11k4="; + outputs = [ "out" "dev" "man" ]; + + src = fetchFromGitHub { + owner = "Yubico"; + repo = "yubico-piv-tool"; + rev = "refs/tags/yubico-piv-tool-${finalAttrs.version}"; + hash = "sha256-KprY5BX7Fi/qWRT1pda9g8fqnmDB1Bh7oFM7sCwViuw="; }; postPatch = '' substituteInPlace CMakeLists.txt --replace "-Werror" "" ''; - nativeBuildInputs = [ pkg-config cmake gengetopt ]; - buildInputs = [ openssl check ] - ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); + nativeBuildInputs = [ + pkg-config + cmake + gengetopt + help2man + ]; + + buildInputs = [ + openssl + check + zlib.dev + ] + ++ (if withApplePCSC then [ PCSC ] else [ pcsclite ]); cmakeFlags = [ - "-DGENERATE_MAN_PAGES=OFF" # Use the man page generated at release time + "-DGENERATE_MAN_PAGES=ON" "-DCMAKE_INSTALL_BINDIR=bin" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_MANDIR=share/man" @@ -42,13 +57,11 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ]; passthru = { - updateScript = gitUpdater { - url = "https://github.com/Yubico/yubico-piv-tool.git"; - rev-prefix = "yubico-piv-tool-"; + updateScript = nix-update-script { + extraArgs = [ "--version-regex" "yubico-piv-tool-([0-9.]+)$" ]; }; tests.version = testers.testVersion { - inherit version; - package = yubico-piv-tool; + package = finalAttrs.finalPackage; command = "yubico-piv-tool --version"; }; }; @@ -72,4 +85,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ viraptor anthonyroussel ]; mainProgram = "yubico-piv-tool"; }; -} +}) diff --git a/nixpkgs/pkgs/tools/misc/yutto/default.nix b/nixpkgs/pkgs/tools/misc/yutto/default.nix index a9b5e224e07a..1b98c2a38fbd 100644 --- a/nixpkgs/pkgs/tools/misc/yutto/default.nix +++ b/nixpkgs/pkgs/tools/misc/yutto/default.nix @@ -9,14 +9,14 @@ with python3.pkgs; buildPythonApplication rec { pname = "yutto"; - version = "2.0.0b30"; + version = "2.0.0b31"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-QQExmnpn+CgNRyV/cQbYpgGCM2r8DzOMdNzgN+DvSos="; + hash = "sha256-PWUZ4adH6uaNRIXVMGN3Yun7muYljQC8xDeEes0MB2U="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/zoxide/default.nix b/nixpkgs/pkgs/tools/misc/zoxide/default.nix index 2489a21a1925..44863361a088 100644 --- a/nixpkgs/pkgs/tools/misc/zoxide/default.nix +++ b/nixpkgs/pkgs/tools/misc/zoxide/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.9.2"; + version = "unstable-2023-11-20"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; - rev = "v${version}"; - sha256 = "sha256-h/T3McaKKASwQt+0SBBxFXMnYyt+0Xl+5i8IulUAdnU="; + rev = "3022cf3686b85288e6fbecb2bd23ad113fd83f3b"; + sha256 = "sha256-ut+/F7cQ5Xamb7T45a78i0mjqnNG9/73jPNaDLxzAx8="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { --replace '"fzf"' '"${fzf}/bin/fzf"' ''; - cargoSha256 = "sha256-uu7zi6prnfbi4EQ0+0QcTEo/t5CIwNEQgJkIgxSk5u4="; + cargoSha256 = "sha256-JRWlHwPFqNC/IIKQqRQszx4HHW1XsmROA67KmnxkmWQ="; postInstall = '' installManPage man/man*/* @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; - changelog = "https://github.com/ajeetdsouza/zoxide/raw/v${version}/CHANGELOG.md"; + # changelog = "https://github.com/ajeetdsouza/zoxide/raw/v${version}/CHANGELOG.md"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ysndr cole-h SuperSandro2000 ]; mainProgram = "zoxide"; diff --git a/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix b/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix index 48e64b202c6e..9d4c0267c76a 100644 --- a/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix +++ b/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { else "Remote user information server"; platforms = platforms.linux; license = licenses.bsdOriginal; + mainProgram = "finger"; }; } # TODO: multiple outputs (manpage) diff --git a/nixpkgs/pkgs/tools/networking/corkscrew/default.nix b/nixpkgs/pkgs/tools/networking/corkscrew/default.nix index 3aacb0da6a2e..757a07c91989 100644 --- a/nixpkgs/pkgs/tools/networking/corkscrew/default.nix +++ b/nixpkgs/pkgs/tools/networking/corkscrew/default.nix @@ -1,23 +1,22 @@ -{ lib, stdenv, fetchurl, automake }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "corkscrew"; version = "2.0"; - - src = fetchurl { - url = "http://agroman.net/corkscrew/corkscrew-${version}.tar.gz"; - sha256 = "0d0fcbb41cba4a81c4ab494459472086f377f9edb78a2e2238ed19b58956b0be"; + src = fetchFromGitHub { + owner = "bryanpkc"; + repo = pname; + rev = "v${version}"; + hash = "sha256-JiddvTbuOysenrVWGUEyKSzpCF1PJaYWQUdz3FuLCdw="; }; - preConfigure = '' - ln -sf ${automake}/share/automake-*/config.sub config.sub - ln -sf ${automake}/share/automake-*/config.guess config.guess - ''; + nativeBuildInputs = [ autoreconfHook ]; meta = with lib; { - homepage = "http://agroman.net/corkscrew/"; + homepage = "https://github.com/bryanpkc/corkscrew"; description = "A tool for tunneling SSH through HTTP proxies"; license = lib.licenses.gpl2; platforms = platforms.unix; }; } + diff --git a/nixpkgs/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch b/nixpkgs/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch deleted file mode 100644 index 088f9b4032d2..000000000000 --- a/nixpkgs/pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch +++ /dev/null @@ -1,53 +0,0 @@ -On darwin, providing SystemConfiguration to curl currently results in a -reference loop, so we have to disable the check for it and the feature -which requires it (NAT64). - -Patching actual configure script here as we also don't want to require -autoconf in the bootstrap loop just to regenerate a patched configure.ac. - ---- a/configure 2021-10-16 00:51:59.000000000 +0100 -+++ b/configure 2021-10-16 01:06:46.000000000 +0100 -@@ -21556,7 +221556,7 @@ - if test "x$build_for_macos" != xno; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - printf "%s\n" "yes" >&6; } -- LDFLAGS="$LDFLAGS -framework CoreFoundation -framework CoreServices -framework SystemConfiguration" -+ LDFLAGS="$LDFLAGS -framework CoreFoundation" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 - printf "%s\n" "no" >&6; } -@@ -22211,9 +22211,6 @@ - fi - - --if test "$HAVE_GETHOSTBYNAME" != "1"; then -- as_fn_error $? "couldn't find libraries for gethostbyname()" "$LINENO" 5 --fi - - - curl_includes_winsock2="\ -diff --git a/lib/curl_setup.h b/lib/curl_setup.h -index b43714da7..7674778b7 100644 ---- a/lib/curl_setup.h -+++ b/lib/curl_setup.h -@@ -250,20 +250,6 @@ - - #include <curl/system.h> - --/* -- * Use getaddrinfo to resolve the IPv4 address literal. If the current network -- * interface doesn't support IPv4, but supports IPv6, NAT64, and DNS64, -- * performing this task will result in a synthesized IPv6 address. -- */ --#if defined(__APPLE__) && !defined(USE_ARES) --#include <TargetConditionals.h> --#define USE_RESOLVE_ON_IPS 1 --# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \ -- defined(ENABLE_IPV6) --# define CURL_MACOS_CALL_COPYPROXIES 1 --# endif --#endif -- - #ifdef USE_LWIPSOCK - # include <lwip/init.h> - # include <lwip/sockets.h> diff --git a/nixpkgs/pkgs/tools/networking/davix/default.nix b/nixpkgs/pkgs/tools/networking/davix/default.nix index 68a9a8c19ff2..159fd0f15410 100644 --- a/nixpkgs/pkgs/tools/networking/davix/default.nix +++ b/nixpkgs/pkgs/tools/networking/davix/default.nix @@ -26,7 +26,7 @@ let boolToUpper = b: lib.toUpper (lib.boolToString b); in stdenv.mkDerivation rec { - version = "0.8.4"; + version = "0.8.5"; pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy"; nativeBuildInputs = [ cmake pkg-config python3 ]; buildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # https://github.com/cern-fts/davix/releases/tag/R_0_8_0 src = fetchurl { url = "https://github.com/cern-fts/davix/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/davix-${version}.tar.gz"; - sha256 = "sha256-UZ1W90bobqP9YVvEnlWbUg3wfgUeHKPYwJIGeVjzsrc="; + sha256 = "sha256-+c4hvMLtJI94JQWdF1d4dmFiWMNRd9dPrY+FSoGKh/k="; }; preConfigure = '' diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix index aac49a7b83b2..59891528b55a 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -118,7 +118,7 @@ in buildGoModule rec { ''; homepage = "https://www.datadoghq.com"; license = licenses.bsd3; - maintainers = with maintainers; [ thoughtpolice domenkozar rvl viraptor ]; + maintainers = with maintainers; [ thoughtpolice domenkozar viraptor ]; # never built on aarch64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin && stdenv.isAarch64; }; diff --git a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index 1dbedea50232..4d1334505f32 100644 --- a/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/nixpkgs/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -4,7 +4,7 @@ datadog-agent.overrideAttrs (attrs: { meta = with lib; attrs.meta // { description = "Live process collector for the DataDog Agent v7"; - maintainers = with maintainers; [ domenkozar rvl ]; + maintainers = with maintainers; [ domenkozar ]; }; subPackages = [ "cmd/process-agent" ]; postInstall = null; diff --git a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix index 40cfa4077227..2d7a646299ad 100644 --- a/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix +++ b/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix @@ -40,8 +40,6 @@ stdenv.mkDerivation rec { substituteInPlace hooks/dhcpcd-run-hooks.in --replace /bin/sh ${runtimeShell} ''; - preConfigure = "patchShebangs ./configure"; - configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" diff --git a/nixpkgs/pkgs/tools/networking/driftnet/libwebsockets-4.3.0.patch b/nixpkgs/pkgs/tools/networking/driftnet/libwebsockets-4.3.0.patch deleted file mode 100644 index 5e5cfd50af3e..000000000000 --- a/nixpkgs/pkgs/tools/networking/driftnet/libwebsockets-4.3.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/http_display/httpd.c b/src/http_display/httpd.c -index f4709ef..7921d23 100644 ---- a/src/http_display/httpd.c -+++ b/src/http_display/httpd.c -@@ -191,7 +191,6 @@ static void * http_server_dispatch(void *arg) - LWSMPRO_FILE, /* mount type is a directory in a filesystem */ - 1, /* strlen("/"), ie length of the mountpoint */ - NULL, -- { NULL, NULL } // sentinel - }; - - memset(&info, 0, sizeof info); diff --git a/nixpkgs/pkgs/tools/networking/gping/default.nix b/nixpkgs/pkgs/tools/networking/gping/default.nix index 158b2cb275bc..4a31bb1494b7 100644 --- a/nixpkgs/pkgs/tools/networking/gping/default.nix +++ b/nixpkgs/pkgs/tools/networking/gping/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "gping-v${version}"; - hash = "sha256-22Nio6yfkL9HWNrI+kk5dGfojTtB/h0sizCWH9w9so8="; + hash = "sha256-t9USry3I6tc8EKsfkq28/hPJMbaf0BqqOdzCl3oXd60="; }; - cargoHash = "sha256-YfvcCnFXDoZXp/Aug0jVQkilsvSzS+JF90U0QvVFksE="; + cargoHash = "sha256-QERmZOyC4U6ZpCkL7ap5MRvPEE2vqK/tD+CrBLg07J0="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/nixpkgs/pkgs/tools/networking/hping/default.nix b/nixpkgs/pkgs/tools/networking/hping/default.nix index 33663a44d2a9..11a8cad05b9c 100644 --- a/nixpkgs/pkgs/tools/networking/hping/default.nix +++ b/nixpkgs/pkgs/tools/networking/hping/default.nix @@ -28,6 +28,13 @@ stdenv.mkDerivation rec { '' + lib.optionalString stdenv.isLinux '' sed -i -e 's|#include <net/bpf.h>|#include <pcap/bpf.h>|' \ libpcap_stuff.c script.c + '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + substituteInPlace configure --replace 'BYTEORDER=`./byteorder -m`' BYTEORDER=${ + { + littleEndian = "__LITTLE_ENDIAN_BITFIELD"; + bigEndian = "__BIG_ENDIAN_BITFIELD"; + }.${stdenv.hostPlatform.parsed.cpu.significantByte.name}} + substituteInPlace Makefile.in --replace './hping3 -v' "" ''; configureFlags = [ (if withTcl then "TCLSH=${tcl}/bin/tclsh" else "--no-tcl") ]; diff --git a/nixpkgs/pkgs/tools/networking/magic-wormhole-rs/default.nix b/nixpkgs/pkgs/tools/networking/magic-wormhole-rs/default.nix index 530ac45ab2b3..5cdf5150b683 100644 --- a/nixpkgs/pkgs/tools/networking/magic-wormhole-rs/default.nix +++ b/nixpkgs/pkgs/tools/networking/magic-wormhole-rs/default.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "magic-wormhole-rs"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "magic-wormhole"; repo = "magic-wormhole.rs"; rev = version; - sha256 = "sha256-gNHtlbYWQvgboIG++N1680a4ql66PTF45DJGz521zzk="; + sha256 = "sha256-6dRnOAclHcPayY0e5guhWR5CLaKzp5TlEU5esLvYQg8="; }; - cargoSha256 = "sha256-powJrbVVBWtIg0CV7ZdhaVIQA+VhEPtPCts7f8Sl1VY="; + cargoHash = "sha256-SPhTvj2DYNzuAtWamDhsgtCTUpQXtnhoRRSE745tB/k="; buildInputs = [ libxcb ] ++ lib.optionals stdenv.isDarwin [ Security AppKit ]; diff --git a/nixpkgs/pkgs/tools/networking/maubot/wrapper.nix b/nixpkgs/pkgs/tools/networking/maubot/wrapper.nix index baa0c29052e9..6f4c577110be 100644 --- a/nixpkgs/pkgs/tools/networking/maubot/wrapper.nix +++ b/nixpkgs/pkgs/tools/networking/maubot/wrapper.nix @@ -39,7 +39,7 @@ let wrapper = { pythonPackages ? (_: [ ]), plugins ? (_: [ ]), baseConfig ? null if builtins.isNull (baseConfig.server.override_resource_path or null) then "${unwrapped}/${python3.sitePackages}/maubot/management/frontend/build" else baseConfig.server.override_resource_path; - })})} $out/${python3.sitePackages}/maubot/example-config.yaml + })} $out/${python3.sitePackages}/maubot/example-config.yaml rm -rf $out/bin ''} mkdir -p $out/bin diff --git a/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/nixpkgs/pkgs/tools/networking/minio-client/default.nix index 21183437c02a..b40ba824be1b 100644 --- a/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2023-09-07T22-48-55Z"; + version = "2023-10-30T18-43-32Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-DW6G37SLYzXkh8EHXhczloIZxNQS2+ON2kXe5VsQSZg="; + sha256 = "sha256-4WYJaFVB/+ERMNKvfDZvJGEiImwISM8fXLbi+Y986AM="; }; - vendorHash = "sha256-NbqqvV34Bzv2AmMYlN133RI7jNh96Jmo8065D3RxClI="; + vendorHash = "sha256-YDXkJVFK09I/Ic3ZBlO2AtybH6+RfwLmBCldX4i41Po="; subPackages = [ "." ]; diff --git a/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix b/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix index 6888b5aa4ab2..1812dc690e18 100644 --- a/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix +++ b/nixpkgs/pkgs/tools/networking/mozillavpn/default.nix @@ -26,13 +26,13 @@ let pname = "mozillavpn"; - version = "2.16.1"; + version = "2.19.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-UMWBn3DoEU1fG7qh6F0GOhOqod+grPwp15wSSdP0eCo="; + hash = "sha256-aXfxUtGm+vq8U3jYTxYhOP7UXL6ukCJgmGQO2Wsqobo="; }; patches = [ ]; @@ -46,19 +46,19 @@ let inherit src patches; name = "${pname}-${version}-extension-bridge"; preBuild = "cd extension/bridge"; - hash = "sha256-1wYTRc+NehiHwAd/2CmsJNv/TV6wH5wXwNiUdjzEUIk="; + hash = "sha256-23GTXsbjL8qfGA5NdPlrbdaA8rg8vOZsZCXvevi7Chc="; }; signatureDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}-signature"; preBuild = "cd signature"; - hash = "sha256-oaKkQWMYkAy1c2biVt+GyjHBeYb2XkuRvFrWQJJIdPw="; + hash = "sha256-TB172hVIilDTl+y0shNp55if+FhrXjWSaGNF7K6GSH8="; }; qtgleanDeps = rustPlatform.fetchCargoTarball { inherit src patches; name = "${pname}-${version}-qtglean"; preBuild = "cd qtglean"; - hash = "sha256-cqfiOBS8xFC2BbYp6BJWK6NHIU0tILSgu4eo3Ik4YqY="; + hash = "sha256-tfQ2ogSDDXNPeygBy+el+71iwcafSfY78hvYPHurKPE="; }; in @@ -110,7 +110,7 @@ stdenv.mkDerivation { dontCargoSetupPostUnpack = true; postPatch = '' - substituteInPlace src/apps/vpn/cmake/linux.cmake \ + substituteInPlace src/cmake/linux.cmake \ --replace '/etc/xdg/autostart' "$out/etc/xdg/autostart" \ --replace '/usr/share/dbus-1' "$out/share/dbus-1" \ --replace '${"$"}{SYSTEMD_UNIT_DIR}' "$out/lib/systemd/system" diff --git a/nixpkgs/pkgs/tools/networking/nbd/default.nix b/nixpkgs/pkgs/tools/networking/nbd/default.nix index e0efbe31f8eb..c7cb5632dfe4 100644 --- a/nixpkgs/pkgs/tools/networking/nbd/default.nix +++ b/nixpkgs/pkgs/tools/networking/nbd/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, which, bison, nixosTests, linuxHeaders, gnutls }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, which +, bison +, nixosTests +, libnl +, linuxHeaders +, gnutls +}: stdenv.mkDerivation rec { pname = "nbd"; @@ -9,15 +20,23 @@ stdenv.mkDerivation rec { hash = "sha256-9cj9D8tXsckmWU0OV/NWQy7ghni+8dQNCI8IMPDL3Qo="; }; - buildInputs = [ glib gnutls ] - ++ lib.optionals stdenv.isLinux [ linuxHeaders ]; + nativeBuildInputs = [ + pkg-config + which + bison + ]; - nativeBuildInputs = [ pkg-config which bison ]; + buildInputs = [ + glib + gnutls + ] ++ lib.optionals stdenv.isLinux [ + libnl + linuxHeaders + ]; - postInstall = '' - mkdir -p "$out/share/doc/nbd-${version}" - cp README.md "$out/share/doc/nbd-${version}/" - ''; + configureFlags = [ + "--sysconfdir=/etc" + ]; doCheck = !stdenv.isDarwin; @@ -30,5 +49,6 @@ stdenv.mkDerivation rec { description = "Map arbitrary files as block devices over the network"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ nickcao ]; }; } diff --git a/nixpkgs/pkgs/tools/networking/nebula/default.nix b/nixpkgs/pkgs/tools/networking/nebula/default.nix index 4147adf50749..1f474fccfd31 100644 --- a/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nebula"; - version = "1.7.2"; + version = "1.8.0"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/kEXrcMFnrnnD+6754EDoOvn4czh0rJGEjlXkmCzb1w="; + hash = "sha256-9WlccDDTChw3N+alN9l3ABLBywBLMoxDUyDgtNkXsTg="; }; - vendorHash = "sha256-VZzSdl8R1y7rCF2vz7e+5nAkb3wlJymNWCXwZZUvg4A="; + vendorHash = "sha256-QeRmIgN0UuX6CYopTS2IUwduEHn9NIhHsdPQN//eK2Y="; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; diff --git a/nixpkgs/pkgs/tools/networking/nexttrace/default.nix b/nixpkgs/pkgs/tools/networking/nexttrace/default.nix index c4f033184ebe..6db79ab5ceac 100644 --- a/nixpkgs/pkgs/tools/networking/nexttrace/default.nix +++ b/nixpkgs/pkgs/tools/networking/nexttrace/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "nexttrace"; - version = "1.2.3.1"; + version = "1.2.6"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${version}"; - sha256 = "sha256-uY3Cjemv+iFOrWm7lXzRprIljqHCLWOF6DyDURrH39g="; + sha256 = "sha256-UD6+oFXYk5VWD9MZdE3ECnyYJSe7v88D9gkIAj+e7Bw="; }; - vendorHash = "sha256-sugEN7sKBwEKsfX1MBwOiyH1aq1995HL+Yv7Q8XaPAo="; + vendorHash = "sha256-2lDkNbsAgEMSKK7ODpjJEL0ZM4N1khzGuio1645Xxqo="; doCheck = false; # Tests require a network connection. diff --git a/nixpkgs/pkgs/tools/networking/ngrok/versions.json b/nixpkgs/pkgs/tools/networking/ngrok/versions.json index ef2b4e3d235d..3b52e8f92372 100644 --- a/nixpkgs/pkgs/tools/networking/ngrok/versions.json +++ b/nixpkgs/pkgs/tools/networking/ngrok/versions.json @@ -1,38 +1,38 @@ { "linux-386": { "sys": "linux-386", - "url": "https://bin.equinox.io/a/3ndXunLZxr9/ngrok-v3-3.4.0-linux-386", - "sha256": "96b00658e46ce78226f426642999aec1c5593532ef975ada7b3a88550d5fd462", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/4gMs8FHXopG/ngrok-v3-3.5.0-linux-386", + "sha256": "2ab242193e01222d1c5cbfe85389200b97fc3af91374bd4b9c8d86812db7d589", + "version": "3.5.0" }, "linux-amd64": { "sys": "linux-amd64", - "url": "https://bin.equinox.io/a/8U3NahKrMb7/ngrok-v3-3.4.0-linux-amd64", - "sha256": "f84e8e7b22ed5ee07f7256c5811ab154fcc6f4a75607af87fad214cf5d4cc850", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/7qHLVJPrTcc/ngrok-v3-3.5.0-linux-amd64", + "sha256": "bd44f722df4435daf61c4bef4fe45d8abdbbf5ccd6c371b6ab405a07fb469c06", + "version": "3.5.0" }, "linux-arm": { "sys": "linux-arm", - "url": "https://bin.equinox.io/a/jcENzdnK9si/ngrok-v3-3.4.0-linux-arm", - "sha256": "dc56d43e353dcea410f30593c858e0240c22c9db1a803e436f8f2540143f9c10", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/ciuckTnS7RJ/ngrok-v3-3.5.0-linux-arm", + "sha256": "ba0ab1d956a0b05e35da6901691bd18166acc6a833c993e8f6b80f6d608e1d8c", + "version": "3.5.0" }, "linux-arm64": { "sys": "linux-arm64", - "url": "https://bin.equinox.io/a/hmadqCe6Lnv/ngrok-v3-3.4.0-linux-arm64", - "sha256": "203ac71b0af764438ad6b0fc27df71e2e8c10204eec88d670dc78f4b92dc9116", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/iutMKiLdVzF/ngrok-v3-3.5.0-linux-arm64", + "sha256": "85b5ecc96a56a1d19324acb3ca3a38e11a9075be8cb97ee466a1538f8711a69d", + "version": "3.5.0" }, "darwin-amd64": { "sys": "darwin-amd64", - "url": "https://bin.equinox.io/a/3GTEBnkQhkx/ngrok-v3-3.4.0-darwin-amd64", - "sha256": "562384f2eeaa4d1ffedd17599f7ddb7968acd6267b6b06e2a3664e2e61a4dd92", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/hrb7DpXGSDS/ngrok-v3-3.5.0-darwin-amd64", + "sha256": "3380a2e742600fcef21e390291c4224e3e23fb31e832b695f922a24899125808", + "version": "3.5.0" }, "darwin-arm64": { "sys": "darwin-arm64", - "url": "https://bin.equinox.io/a/eFiJHNHzRfi/ngrok-v3-3.4.0-darwin-arm64", - "sha256": "9fb23648c449a773eea5c0edf7c35b42b4f6432ad0bae5d7fa7321c71cd0f545", - "version": "3.4.0" + "url": "https://bin.equinox.io/a/aH6hGnhtNbT/ngrok-v3-3.5.0-darwin-arm64", + "sha256": "cbfd0bcd1d53aa1bc3b6afa54e0c8f01d77f6a369727f4f6eb1451b3a1eab3df", + "version": "3.5.0" } } diff --git a/nixpkgs/pkgs/tools/networking/nikto/default.nix b/nixpkgs/pkgs/tools/networking/nikto/default.nix index e1abcb6c140d..df03cc8c3ce7 100644 --- a/nixpkgs/pkgs/tools/networking/nikto/default.nix +++ b/nixpkgs/pkgs/tools/networking/nikto/default.nix @@ -6,20 +6,23 @@ , installShellFiles }: +let + version = "2.5.0"; +in stdenv.mkDerivation rec { pname = "nikto"; - version = "2.2.0"; + inherit version; src = fetchFromGitHub { owner = "sullo"; repo = "nikto"; - rev = "c83d0461edd75c02677dea53da2896644f35ecab"; - sha256 = "0vwq2zdxir67cn78ls11qf1smd54nppy266v7ajm5rqdc47q7fy2"; + rev = version; + sha256 = "sha256-lWiDbWc2BWAUgyaIm0tvZytja02WogYRoc7na4sHiNM="; }; # Nikto searches its configuration file based on its current path # This fixes the current path regex for the wrapped executable. - patches = [ ./NIKTODIR-nix-wrapper-fix.patch ]; + patches = [ ./nix-wrapper-fix.patch ]; postPatch = '' # EXECDIR needs to be changed to the path where we copy the programs stuff @@ -31,10 +34,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; - propagatedBuildInputs = [ perlPackages.NetSSLeay ]; - buildInputs = [ perlPackages.perl + perlPackages.NetSSLeay ]; installPhase = '' @@ -44,7 +46,6 @@ stdenv.mkDerivation rec { install -Dm 755 "program/nikto.pl" "$out/bin/nikto" install -Dm 644 program/nikto.conf.default "$out/etc/nikto.conf" installManPage documentation/nikto.1 - install -Dm 644 program/docs/nikto_manual.html "$out/share/doc/${pname}/manual.html" install -Dm 644 README.md "$out/share/doc/${pname}/README" runHook postInstall ''; @@ -58,6 +59,7 @@ stdenv.mkDerivation rec { description = "Web server scanner"; license = licenses.gpl2Plus; homepage = "https://cirt.net/Nikto2"; + changelog = "https://github.com/sullo/nikto/releases/tag/${version}"; maintainers = with maintainers; [ shamilton ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/networking/nikto/NIKTODIR-nix-wrapper-fix.patch b/nixpkgs/pkgs/tools/networking/nikto/nix-wrapper-fix.patch index d3caea1b26fd..bc05d774577e 100644 --- a/nixpkgs/pkgs/tools/networking/nikto/NIKTODIR-nix-wrapper-fix.patch +++ b/nixpkgs/pkgs/tools/networking/nikto/nix-wrapper-fix.patch @@ -1,26 +1,26 @@ -diff --color -ur a/program/nikto.pl b/program/nikto.pl ---- a/program/nikto.pl 2021-01-30 12:05:54.915072538 +0100 -+++ b/program/nikto.pl 2021-01-30 12:36:42.877729231 +0100 -@@ -223,7 +223,8 @@ +diff --git a/program/nikto.pl b/program/nikto.pl +index 2cb07f9..323e666 100755 +--- a/program/nikto.pl ++++ b/program/nikto.pl +@@ -243,7 +243,7 @@ sub config_init { # Guess Nikto current directory my $NIKTODIR = abs_path($0); chomp($NIKTODIR); - $NIKTODIR =~ s#[\\/]nikto.pl$##; + $NIKTODIR =~ s#[\\/]bin[\\/]\.nikto-wrapped$##; -+ # Guess user's home directory -- to support Windows foreach my $var (split(/ /, "HOME USERPROFILE")) { -@@ -231,10 +232,10 @@ +@@ -251,10 +251,10 @@ sub config_init { } # Read the conf files in order (previous values are over-written with each, if multiple found) -- push(@CF,"$NIKTODIR/nikto.conf.default"); +- push(@CF, "$NIKTODIR/nikto.conf.default"); + push(@CF,"$NIKTODIR/etc/nikto.conf.default"); - push(@CF,"/etc/nikto.conf"); - push(@CF,"$home/nikto.conf"); -- push(@CF,"$NIKTODIR/nikto.conf"); + push(@CF, "/etc/nikto.conf"); + push(@CF, "$home/nikto.conf"); +- push(@CF, "$NIKTODIR/nikto.conf"); + push(@CF,"$NIKTODIR/etc/nikto.conf"); - push(@CF,"nikto.conf"); - push(@CF,"$VARIABLES{'configfile'}"); + push(@CF, "nikto.conf"); + push(@CF, "$VARIABLES{'configfile'}"); diff --git a/nixpkgs/pkgs/tools/networking/octodns/default.nix b/nixpkgs/pkgs/tools/networking/octodns/default.nix new file mode 100644 index 000000000000..56226c29d0e9 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/octodns/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, setuptools +, wheel +, pytestCheckHook +, dnspython +, fqdn +, idna +, natsort +, python-dateutil +, pyyaml +, python +, runCommand +}: + +buildPythonPackage rec { + pname = "octodns"; + version = "1.4.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns"; + rev = "v${version}"; + hash = "sha256-l4JGodbUmFxHFeEaxgClEozHcbyYP0F2yj5gDqV88IA="; + }; + + nativeBuildInputs = [ + setuptools + wheel + pytestCheckHook + ]; + + propagatedBuildInputs = [ + dnspython + fqdn + idna + natsort + python-dateutil + pyyaml + ]; + + pythonImportsCheck = [ "octodns" ]; + + passthru.withProviders = ps: let + pyEnv = python.withPackages ps; + in runCommand "octodns-with-providers" { } '' + mkdir -p $out/bin + ln -st $out/bin ${pyEnv}/bin/octodns-* + ''; + + meta = with lib; { + description = "Tools for managing DNS across multiple providers"; + homepage = "https://github.com/octodns/octodns"; + changelog = "https://github.com/octodns/octodns/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/octodns/providers/bind/default.nix b/nixpkgs/pkgs/tools/networking/octodns/providers/bind/default.nix new file mode 100644 index 000000000000..46631ebd8e15 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/octodns/providers/bind/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, octodns +, pytestCheckHook +, pythonOlder +, dnspython +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "octodns-bind"; + version = "0.0.5"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-bind"; + rev = "v${version}"; + hash = "sha256-0ia/xYarrOiLZa8KU0s5wtCGtXIyxSl6OcwNkSJb/rA="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + octodns + dnspython + ]; + + env.OCTODNS_RELEASE = 1; + + pythonImportsCheck = [ "octodns_bind" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = " RFC compliant (Bind9) provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-bind"; + changelog = "https://github.com/octodns/octodns-bind/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/octodns/providers/hetzner/default.nix b/nixpkgs/pkgs/tools/networking/octodns/providers/hetzner/default.nix new file mode 100644 index 000000000000..eb0903964b71 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/octodns/providers/hetzner/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, octodns +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "octodns-hetzner"; + # the latest release tag is over a year behind. + version = "0.0.2-unstable-2023-09-29"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-hetzner"; + rev = "620840593a520dac9e365240b3ab361ded309c8e"; + hash = "sha256-WdYy8tc0+PYsKuyp3uqOzbxwhLSZ+06L3JVaTSATEKM="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + octodns + requests + ]; + + pythonImportsCheck = [ "octodns_hetzner" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + meta = with lib; { + description = "Hetzner DNS provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-hetzner/"; + changelog = "https://github.com/octodns/octodns-hetzner/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/nixpkgs/pkgs/tools/networking/octodns/providers/powerdns/default.nix new file mode 100644 index 000000000000..68ddc56112b2 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/octodns/providers/powerdns/default.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, octodns +, pytestCheckHook +, pythonOlder +, requests +, requests-mock +, setuptools +, wheel +}: + +buildPythonPackage rec { + pname = "octodns-powerdns"; + version = "0.0.5"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "octodns"; + repo = "octodns-powerdns"; + rev = "v${version}"; + hash = "sha256-jt0+JnpCgvsoqMcC9mANX7uq2WPTiI2JQjwQi7LGWj0="; + }; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + octodns + requests + ]; + + env.OCTODNS_RELEASE = 1; + + pythonImportsCheck = [ "octodns_powerdns" ]; + + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; + + meta = with lib; { + description = "PowerDNS API provider for octoDNS"; + homepage = "https://github.com/octodns/octodns-powerdns/"; + changelog = "https://github.com/octodns/octodns-powerdns/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/ofono/default.nix b/nixpkgs/pkgs/tools/networking/ofono/default.nix index 4872900b0fb7..b52912d5e9a0 100644 --- a/nixpkgs/pkgs/tools/networking/ofono/default.nix +++ b/nixpkgs/pkgs/tools/networking/ofono/default.nix @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { pname = "ofono"; - version = "2.1"; + version = "2.2"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/ofono/ofono.git"; rev = version; - sha256 = "sha256-GxQfh/ps5oM9G6B1EVgnjo8LqHD1hMqdnju1PCQq3kA="; + sha256 = "sha256-mnh0qzmgPDfimN/M33HntYj90Xcgc/uF8tKbzeQV1Yg="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/networking/openvpn/auth-ldap-fix-conftest.patch b/nixpkgs/pkgs/tools/networking/openvpn/auth-ldap-fix-conftest.patch new file mode 100644 index 000000000000..c571fda5d3c1 --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/openvpn/auth-ldap-fix-conftest.patch @@ -0,0 +1,36 @@ +diff --git a/aclocal.m4 b/aclocal.m4 +index e5b7dbf..01cecf1 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -73,6 +73,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + AC_LANG_PROGRAM([ + #include <objc/objc.h> + #include <objc/Object.h> ++ #include <stdio.h> + ], [ + Object *obj = @<:@Object alloc@:>@; + puts(@<:@obj name@:>@); +@@ -94,6 +95,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + AC_LANG_PROGRAM([ + #include <objc/objc.h> + #include <objc/Object.h> ++ #include <stdio.h> + ], [ + Object *obj = @<:@Object alloc@:>@; + puts(@<:@obj name@:>@); +@@ -131,6 +133,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + AC_LANG_PROGRAM([ + #include <objc/objc.h> + #include <objc/objc-api.h> ++ #include <stdio.h> + ], [ + id class = objc_lookUpClass("Object"); + id obj = @<:@class alloc@:>@; +@@ -162,6 +165,7 @@ AC_DEFUN([OD_OBJC_RUNTIME],[ + #else + #include <objc/objc-api.h> + #endif ++ #include <stdio.h> + ], [ + #ifdef __GNU_LIBOBJC_ + Class class = objc_lookUpClass("Object"); diff --git a/nixpkgs/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/nixpkgs/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix index 70dacddafc37..df93dacb4711 100644 --- a/nixpkgs/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix +++ b/nixpkgs/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { sha256 = "1j30sygj8nm8wjqxzpb7pfzr3dxqxggswzxd7z5yk7y04c0yp1hb"; }; + patches = [ + ./auth-ldap-fix-conftest.patch + ]; + nativeBuildInputs = [ autoreconfHook gnustep.base diff --git a/nixpkgs/pkgs/tools/networking/photon/destdir.patch b/nixpkgs/pkgs/tools/networking/photon/destdir.patch deleted file mode 100644 index e6cf997f2e7c..000000000000 --- a/nixpkgs/pkgs/tools/networking/photon/destdir.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/photon.py.old b/photon.py -index 92498e4..f7e2c3d 100644 ---- a/photon.py.old -+++ b/photon.py -@@ -185,7 +185,7 @@ if args.user_agent: - user_agents = args.user_agent.split(',') - else: - user_agents = [] -- with open(os.getcwd() + '/core/user-agents.txt', 'r') as uas: -+ with open('DESTDIR/core/user-agents.txt', 'r') as uas: - for agent in uas: - user_agents.append(agent.strip('\n')) - -@@ -534,4 +534,4 @@ if args.export: - if not colors: # if colors are disabled - print ('%s Results saved in %s directory' % (good, output_dir)) - else: -- print ('%s Results saved in \033[;1m%s\033[0m directory' % (good, output_dir)) -\ No newline at end of file -+ print ('%s Results saved in \033[;1m%s\033[0m directory' % (good, output_dir)) diff --git a/nixpkgs/pkgs/tools/networking/ratman/default.nix b/nixpkgs/pkgs/tools/networking/ratman/default.nix index ce017731bd4a..a78840095d88 100644 --- a/nixpkgs/pkgs/tools/networking/ratman/default.nix +++ b/nixpkgs/pkgs/tools/networking/ratman/default.nix @@ -6,7 +6,7 @@ , protobuf , rustPlatform , fetchYarnDeps -, fixup_yarn_lock +, prefetch-yarn-deps , stdenv , yarn , nodejs @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-pWjKL41r/bTvWv+5qCgCFVL9+o64BiV2/ISdLeKEOqE="; }; - nativeBuildInputs = [ yarn nodejs ]; + nativeBuildInputs = [ yarn nodejs prefetch-yarn-deps ]; outputs = [ "out" "dist" ]; @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { yarn config --offline set yarn-offline-mirror ${yarnDeps} # Fixup "resolved"-entries in yarn.lock to match our offline cache - ${fixup_yarn_lock}/bin/fixup_yarn_lock yarn.lock + fixup-yarn-lock yarn.lock yarn install --offline --frozen-lockfile --ignore-scripts --no-progress --non-interactive diff --git a/nixpkgs/pkgs/tools/networking/sing-box/default.nix b/nixpkgs/pkgs/tools/networking/sing-box/default.nix index d75a49f6c9e6..cc826474d3eb 100644 --- a/nixpkgs/pkgs/tools/networking/sing-box/default.nix +++ b/nixpkgs/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.7.1"; + version = "1.7.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-5n5AnuJQvw/26X3UWdLvegFhwYzjtS7o0d4cN3c3bfQ="; + hash = "sha256-6SWcepENdbkwv4qq4nuxSINAxXWZmLcj5NwJ3nBnKu8="; }; - vendorHash = "sha256-UvLZY4vMS6dI6z9kPcSzbB/cW/7rfbrlhcWh51q5sak="; + vendorHash = "sha256-8R3bVwziiC9n10dA8Zus7L0VyjWYKkdSszb44HqR8tE="; tags = [ "with_quic" diff --git a/nixpkgs/pkgs/tools/networking/snowflake/default.nix b/nixpkgs/pkgs/tools/networking/snowflake/default.nix index c4d26ae53d96..071305f951cf 100644 --- a/nixpkgs/pkgs/tools/networking/snowflake/default.nix +++ b/nixpkgs/pkgs/tools/networking/snowflake/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "snowflake"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "anti-censorship/pluggable-transports"; repo = "snowflake"; rev = "v${version}"; - sha256 = "sha256-vurNOJuu9bKmyLM3Agr8wHwMybLrtrJFSrlrc+lWiWQ="; + sha256 = "sha256-/bip6hjYDTcSdtqeHxWcH7Yn4VepGVy3ki/kZWEQaPE="; }; - vendorHash = "sha256-Bjd3HIVEQgrcBffcZPQhQygN/ZOPWTbN9oimmX4B1oQ="; + vendorHash = "sha256-dpOJE6FHaumL6vapigLTobS1r42DIFV8LHfVNvyZnsU="; meta = with lib; { description = "System to defeat internet censorship"; diff --git a/nixpkgs/pkgs/tools/networking/strongswan/default.nix b/nixpkgs/pkgs/tools/networking/strongswan/default.nix index 64c01b0ffe4f..a2094802712c 100644 --- a/nixpkgs/pkgs/tools/networking/strongswan/default.nix +++ b/nixpkgs/pkgs/tools/networking/strongswan/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "strongswan"; - version = "5.9.11"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading! + version = "5.9.12"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading! src = fetchFromGitHub { owner = "strongswan"; repo = "strongswan"; rev = version; - hash = "sha256-DjVmDUEEJnf5kaia1f+Yow9g4+l3itOmoXR8/vVSssU="; + hash = "sha256-0s6I+ukA5XFAC0aJFKl9hjHDml2gMzXDn977EDxsZZ4="; }; dontPatchELF = true; diff --git a/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix b/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix index b5aa064f7390..e2d74a586d81 100644 --- a/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix +++ b/nixpkgs/pkgs/tools/networking/subnetcalc/default.nix @@ -1,20 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, cmake, ninja }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "subnetcalc"; - version = "2.4.22"; + version = "2.4.23"; src = fetchFromGitHub { owner = "dreibh"; - repo = pname; - rev = "${pname}-${version}"; - sha256 = "sha256-5sDEMS4RgHdGQZAT2MVF/Ls0KXwdKzX+05uQpHhCZn8="; + repo = "subnetcalc"; + rev = "subnetcalc-${finalAttrs.version}"; + hash = "sha256-uX/roOWjeuuuEFpBbF+hEPDOo0RTR79WpyNvr9U7wR4="; }; - nativeBuildInputs = [ cmake ninja ]; + nativeBuildInputs = [ + cmake + ninja + ]; - meta = with lib; { + meta = { description = "SubNetCalc is an IPv4/IPv6 subnet address calculator"; + homepage = "https://www.uni-due.de/~be0001/subnetcalc/"; + license = lib.licenses.gpl3Plus; longDescription = '' SubNetCalc is an IPv4/IPv6 subnet address calculator. For given IPv4 or IPv6 address and netmask or prefix length, it calculates network address, @@ -23,9 +33,8 @@ stdenv.mkDerivation rec { Furthermore, it prints useful information on specific address types (e.g. type, scope, interface ID, etc.). ''; - homepage = "https://www.uni-due.de/~be0001/subnetcalc/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ atila ]; - platforms = platforms.unix; + mainProgram = "subnetcalc"; + maintainers = with lib.maintainers; [ atila ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix b/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix index 8778b90b2b02..855c559448a2 100644 --- a/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix +++ b/nixpkgs/pkgs/tools/networking/tinyproxy/default.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Only; platforms = platforms.all; maintainers = [ maintainers.carlosdagos ]; + mainProgram = "tinyproxy"; }; } diff --git a/nixpkgs/pkgs/tools/networking/trippy/default.nix b/nixpkgs/pkgs/tools/networking/trippy/default.nix index 9b88ee4b799d..933150aebb9f 100644 --- a/nixpkgs/pkgs/tools/networking/trippy/default.nix +++ b/nixpkgs/pkgs/tools/networking/trippy/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "trippy"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "fujiapple852"; repo = "trippy"; rev = version; - hash = "sha256-2bh4wNP8sQcojjjbx5DQctlkwCTYcPdSkpW4OCOyp9k="; + hash = "sha256-Q5WPpCm1RNLlNX8G1U160O2wJz+y+KMScApjx6gIBCg="; }; - cargoHash = "sha256-C8SUceX9RwUyiCknmuRfBqG0vjesS54bZQHwi7krwKo="; + cargoHash = "sha256-brvfAZZ3L0loZQowcRfkS7o7ZYQB9hr5o1rgMSWaljU="; meta = with lib; { description = "A network diagnostic tool"; diff --git a/nixpkgs/pkgs/tools/networking/unbound/default.nix b/nixpkgs/pkgs/tools/networking/unbound/default.nix index a1a908340003..9d5c73286b6f 100644 --- a/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -47,24 +47,15 @@ , gnutls }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "unbound"; - version = "1.18.0"; + version = "1.19.0"; src = fetchurl { - url = "https://nlnetlabs.nl/downloads/unbound/unbound-${version}.tar.gz"; - hash = "sha256-PalUkKhc/2Qg8m+uC4Skn1ES3xvxt/w0+HJPAggstxI="; + url = "https://nlnetlabs.nl/downloads/unbound/unbound-${finalAttrs.version}.tar.gz"; + hash = "sha256-qXUyRohUxhwt5IykFw3oVP07yVyAQ7sM+w/iZgWWZiQ="; }; - patches = [ - # Backport: fix libunbound with nettle. - (fetchpatch { - url = "https://github.com/NLnetLabs/unbound/commit/654a7eab62cbd1844d483cc4a0f2cf2fbcbaf00a.patch"; - excludes = [ "doc/Changelog" ]; - hash = "sha256-n3FCeZESFrrn6Wcf28Hb8WZs1eMHWjbsf2WCFOXU3lI="; - }) - ]; - outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB nativeBuildInputs = [ makeWrapper pkg-config ] @@ -157,7 +148,7 @@ stdenv.mkDerivation rec { + ''substituteInPlace "$lib/lib/libunbound.la" '' + lib.concatMapStrings (pkg: lib.optionalString (pkg ? dev) " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' --replace '-R${pkg.dev}/lib' '-R${pkg.out}/lib'") - (builtins.filter (p: p != null) buildInputs); + (builtins.filter (p: p != null) finalAttrs.buildInputs); passthru.tests = { inherit gnutls; @@ -172,4 +163,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ajs124 ]; platforms = platforms.unix; }; -} +}) diff --git a/nixpkgs/pkgs/tools/networking/wakelan/default.nix b/nixpkgs/pkgs/tools/networking/wakelan/default.nix index 7e9bcc1a70ca..3416b33281d3 100644 --- a/nixpkgs/pkgs/tools/networking/wakelan/default.nix +++ b/nixpkgs/pkgs/tools/networking/wakelan/default.nix @@ -9,6 +9,9 @@ stdenv.mkDerivation rec { hash = "sha256-PfXrj4d2SHmatiPPFxjsxvhusML1HTRNjoYEQtzFzW8="; }; + # code predates c99 + env.CFLAGS = "-std=c89"; + preInstall = '' mkdir -p $out/man/man1 $out/bin ''; diff --git a/nixpkgs/pkgs/tools/networking/xray/default.nix b/nixpkgs/pkgs/tools/networking/xray/default.nix index 6d810aaee62e..bb317055dc04 100644 --- a/nixpkgs/pkgs/tools/networking/xray/default.nix +++ b/nixpkgs/pkgs/tools/networking/xray/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "xray"; - version = "1.8.4"; + version = "1.8.6"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - hash = "sha256-Hu0BP4BzoELRjJ8WdF3JS/ffxd3bpH+kauWqaMh/o1I="; + hash = "sha256-M1iu/93eOBIk9VxYKNJm/TPx9G35yO5SpcQm/lAJ1Q8="; }; - vendorHash = "sha256-ihTOKtppOTYdulzwIwD8oWaS2OPs+QCdqPTvqucw7xY="; + vendorHash = "sha256-zLnYjZmrsWd/WwtkkLiA8Eoh7aDJz+TsvK0yvIrSr8c="; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/networking/zrok/default.nix b/nixpkgs/pkgs/tools/networking/zrok/default.nix index 7b49b4a26b97..74fb313d9fc7 100644 --- a/nixpkgs/pkgs/tools/networking/zrok/default.nix +++ b/nixpkgs/pkgs/tools/networking/zrok/default.nix @@ -1,4 +1,7 @@ -{ lib, stdenv, fetchzip }: +{ lib +, stdenv +, fetchzip +}: let inherit (stdenv.hostPlatform) system; @@ -10,20 +13,20 @@ let armv7l-linux = "linux_armv7"; }.${system} or throwSystem; - sha256 = { - x86_64-linux = "sha256-6oYZY1Ry4U/nR99DNsr7ZqTd/AAot+yrOHY75UXEuWY="; - aarch64-linux = "sha256-/XAv/ptvUsWLF/iIOiqm/PoCLhVTL3Cnmd0YdqLBthk="; - armv7l-linux = "sha256-CbtzY2q7HnqCcolTFyTphWbHN/VdSt/rs8q3tjHHNqc="; + hash = { + x86_64-linux = "sha256-vAX7vx13eHyPuDe4q5b8dQD90l5bbnncMGlXnegumxM="; + aarch64-linux = "sha256-6x/E0uAPFOsuoJ/ePLV483M07Rqj5pkcpETOVq9RXKU="; + armv7l-linux = "sha256-UlpqoKfjyGLNKvSrXqqsiiq/wTlfmBmPfynDoFT/nuQ="; }.${system} or throwSystem; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "zrok"; - version = "0.4.15"; + version = "0.4.18"; src = fetchzip { - url = "https://github.com/openziti/zrok/releases/download/v${version}/zrok_${version}_${plat}.tar.gz"; + url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; stripRoot = false; - inherit sha256; + inherit hash; }; updateScript = ./update.sh; @@ -31,19 +34,23 @@ stdenv.mkDerivation rec { installPhase = let interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")"; in '' + runHook preInstall + mkdir -p $out/bin cp zrok $out/bin/ chmod +x $out/bin/zrok patchelf --set-interpreter "${interpreter}" "$out/bin/zrok" + + runHook postInstall ''; meta = { description = "Geo-scale, next-generation sharing platform built on top of OpenZiti"; homepage = "https://zrok.io"; + license = lib.licenses.asl20; + mainProgram = "zrok"; maintainers = [ lib.maintainers.bandresen ]; platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = lib.licenses.asl20; }; - -} +}) diff --git a/nixpkgs/pkgs/tools/package-management/dnf5/default.nix b/nixpkgs/pkgs/tools/package-management/dnf5/default.nix index f9a44a8a70b5..41e7fe04480e 100644 --- a/nixpkgs/pkgs/tools/package-management/dnf5/default.nix +++ b/nixpkgs/pkgs/tools/package-management/dnf5/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnf5"; - version = "5.1.8"; + version = "5.1.9"; outputs = [ "out" "man" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rpm-software-management"; repo = "dnf5"; rev = finalAttrs.version; - hash = "sha256-1g3g+6EborZd2ppPMZcy0Wjv07zetATHb/sCkuZz5UM="; + hash = "sha256-H8zbxNsGkuKIDPwGWfKJEy5gTo2Mm13VKwce+h9NEro="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/package-management/libcomps/default.nix b/nixpkgs/pkgs/tools/package-management/libcomps/default.nix new file mode 100644 index 000000000000..89c2982497df --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/libcomps/default.nix @@ -0,0 +1,65 @@ +{ lib +, check +, cmake +, doxygen +, expat +, fetchFromGitHub +, libxml2 +, python +, sphinx +, stdenv +, zlib +}: + +stdenv.mkDerivation rec { + pname = "libcomps"; + version = "0.1.20"; + + outputs = [ "out" "dev" "py" ]; + + src = fetchFromGitHub { + owner = "rpm-software-management"; + repo = "libcomps"; + rev = version; + hash = "sha256-IX4du1+G7lwWrGnllydnBDap2aqK5pzos1Mdyu4MzOU="; + }; + + patches = [ + ./fix-python-install-dir.patch + ]; + + postPatch = '' + substituteInPlace libcomps/src/python/src/CMakeLists.txt \ + --replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}" + ''; + + nativeBuildInputs = [ + check + cmake + doxygen + python + sphinx + ]; + + buildInputs = [ + expat + libxml2 + zlib + ]; + + dontUseCmakeBuildDir = true; + cmakeDir = "libcomps"; + + postFixup = '' + ls $out/lib + moveToOutput "lib/${python.libPrefix}" "$py" + ''; + + meta = with lib; { + description = "Comps XML file manipulation library"; + homepage = "https://github.com/rpm-software-management/libcomps"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ katexochen ]; + platforms = platforms.unix; + }; +} diff --git a/nixpkgs/pkgs/tools/package-management/libcomps/fix-python-install-dir.patch b/nixpkgs/pkgs/tools/package-management/libcomps/fix-python-install-dir.patch new file mode 100644 index 000000000000..958b4c80843c --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/libcomps/fix-python-install-dir.patch @@ -0,0 +1,13 @@ +diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt +index d22b84e..57bd1c2 100644 +--- a/libcomps/src/python/src/CMakeLists.txt ++++ b/libcomps/src/python/src/CMakeLists.txt +@@ -85,7 +85,7 @@ IF (SKBUILD) + INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps) + INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps) + ELSE () +- EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++ SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@") + + INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps) + #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION diff --git a/nixpkgs/pkgs/tools/package-management/libdnf/default.nix b/nixpkgs/pkgs/tools/package-management/libdnf/default.nix index 739210ce9240..e7ecfc9c94db 100644 --- a/nixpkgs/pkgs/tools/package-management/libdnf/default.nix +++ b/nixpkgs/pkgs/tools/package-management/libdnf/default.nix @@ -15,12 +15,19 @@ , libyaml , rpm , zchunk +, cppunit +, python +, swig +, glib +, sphinx }: stdenv.mkDerivation rec { pname = "libdnf"; version = "0.72.0"; + outputs = [ "out" "dev" "py" ]; + src = fetchFromGitHub { owner = "rpm-software-management"; repo = pname; @@ -36,12 +43,16 @@ stdenv.mkDerivation rec { buildInputs = [ check + cppunit openssl json_c libsmartcols libyaml libmodulemd zchunk + python + swig + sphinx ]; propagatedBuildInputs = [ @@ -56,29 +67,38 @@ stdenv.mkDerivation rec { cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake cmake/modules/ ''; - postPatch = '' - # See https://github.com/NixOS/nixpkgs/issues/107428 - substituteInPlace CMakeLists.txt \ - --replace "enable_testing()" "" \ - --replace "add_subdirectory(tests)" "" + patches = [ + ./fix-python-install-dir.patch + ]; + postPatch = '' # https://github.com/rpm-software-management/libdnf/issues/1518 substituteInPlace libdnf/libdnf.pc.in \ --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ + substituteInPlace cmake/modules/FindPythonInstDir.cmake \ + --replace "@PYTHON_INSTALL_DIR@" "$out/${python.sitePackages}" ''; cmakeFlags = [ "-DWITH_GTKDOC=OFF" "-DWITH_HTML=OFF" - "-DWITH_BINDINGS=OFF" + "-DPYTHON_DESIRED=${lib.head (lib.splitString ["."] python.version)}" ]; + postInstall = '' + rm -r $out/${python.sitePackages}/hawkey/test + ''; + + postFixup = '' + moveToOutput "lib/${python.libPrefix}" "$py" + ''; + meta = with lib; { description = "Package management library"; homepage = "https://github.com/rpm-software-management/libdnf"; changelog = "https://github.com/rpm-software-management/libdnf/releases/tag/${version}"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ rb2k ]; + maintainers = with maintainers; [ rb2k katexochen ]; }; } diff --git a/nixpkgs/pkgs/tools/package-management/libdnf/fix-python-install-dir.patch b/nixpkgs/pkgs/tools/package-management/libdnf/fix-python-install-dir.patch new file mode 100644 index 000000000000..d08ec9deec02 --- /dev/null +++ b/nixpkgs/pkgs/tools/package-management/libdnf/fix-python-install-dir.patch @@ -0,0 +1,12 @@ +diff --git a/cmake/modules/FindPythonInstDir.cmake b/cmake/modules/FindPythonInstDir.cmake +index ed098ded..2a2e1543 100644 +--- a/cmake/modules/FindPythonInstDir.cmake ++++ b/cmake/modules/FindPythonInstDir.cmake +@@ -1,6 +1 @@ +-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " +-from sys import stdout +-from sysconfig import get_path +-path=get_path(name='platlib', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'}) +-stdout.write(path)" +-OUTPUT_VARIABLE PYTHON_INSTALL_DIR) ++SET(PYTHON_INSTALL_DIR "@PYTHON_INSTALL_DIR@") diff --git a/nixpkgs/pkgs/tools/package-management/micromamba/default.nix b/nixpkgs/pkgs/tools/package-management/micromamba/default.nix index 182f58ea9da8..5ff23ec7188d 100644 --- a/nixpkgs/pkgs/tools/package-management/micromamba/default.nix +++ b/nixpkgs/pkgs/tools/package-management/micromamba/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "micromamba"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = "micromamba-" + version; - hash = "sha256-/9CzcnPd1D8jSl/pfl54+8/728r+GCqWFXahl47MJ3g="; + hash = "sha256-29SuR4RDW0+yNR1RHlm3I4avy0CjBTGxv1FKxMDZxO0="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix b/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix index b5cc15704c32..8a4e523e98b5 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "nix-doc"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "lf-"; repo = "nix-doc"; - sha256 = "sha256-H81U0gR/7oWjP1z7JC8tTek+tqzTwyJWgaJQOSyNn5M="; + sha256 = "sha256-yL0oG0NiQ7OdGQ/kZxQbSbNphKapu5HBFNP5E2fVe+Y="; }; doCheck = true; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { RUSTFLAGS = "-Z relro-level=partial"; }; - cargoSha256 = "sha256-yYVDToPLhGUYLrPNyyKwsYXe3QOTR26wtl3SCw4Za5s="; + cargoSha256 = "sha256-4bzLZt45ZLTZyZPZ4Nkvz7mNe4oqOIoaZUbCbNWBKG0="; meta = with lib; { description = "An interactive Nix documentation tool"; diff --git a/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix b/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix index defc680968d4..f2326f979412 100644 --- a/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix +++ b/nixpkgs/pkgs/tools/package-management/nix-eval-jobs/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { pname = "nix-eval-jobs"; - version = "2.18.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - hash = "sha256-k/yMWbtMHpiNHeR0ihNPV/idOUSRJuhf0RSCodxmOhc="; + hash = "sha256-5HtkRw7QERr+cvImFnBOXuR7wFk/BH4Nn6HaiEnBrfk="; }; buildInputs = [ boost diff --git a/nixpkgs/pkgs/tools/package-management/reuse/default.nix b/nixpkgs/pkgs/tools/package-management/reuse/default.nix deleted file mode 100644 index 38e79765aafb..000000000000 --- a/nixpkgs/pkgs/tools/package-management/reuse/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ lib, python3Packages, fetchFromGitHub }: - -python3Packages.buildPythonApplication rec { - pname = "reuse"; - version = "2.1.0"; - format = "pyproject"; - - src = fetchFromGitHub { - owner = "fsfe"; - repo = "reuse-tool"; - rev = "refs/tags/v${version}"; - hash = "sha256-MEQiuBxe/ctHlAnmLhQY4QH62uAcHb7CGfZz+iZCRSk="; - }; - - nativeBuildInputs = with python3Packages; [ - poetry-core - ]; - - propagatedBuildInputs = with python3Packages; [ - binaryornot - boolean-py - debian - jinja2 - license-expression - ]; - - nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; - - disabledTestPaths = [ - # pytest wants to execute the actual source files for some reason, which fails with ImportPathMismatchError() - "src/reuse" - ]; - - meta = with lib; { - description = "A tool for compliance with the REUSE Initiative recommendations"; - homepage = "https://github.com/fsfe/reuse-tool"; - license = with licenses; [ asl20 cc-by-sa-40 cc0 gpl3Plus ]; - maintainers = with maintainers; [ FlorianFranzen Luflosi ]; - mainProgram = "reuse"; - }; -} diff --git a/nixpkgs/pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch b/nixpkgs/pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch deleted file mode 100644 index 5dfbfd780f1c..000000000000 --- a/nixpkgs/pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index d6b9dc1..ce7c493 100644 ---- a/Makefile -+++ b/Makefile -@@ -601,7 +601,7 @@ install-localstatedir: - endif - - --install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-localstatedir -+install: all $(if $(BUILD_DOCS),install-doc) install-datadir - ifneq ($(TOOLS),) - $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) - endif diff --git a/nixpkgs/pkgs/tools/security/amoco/default.nix b/nixpkgs/pkgs/tools/security/amoco/default.nix index a9c182ca4cbc..fe16ad9596dd 100644 --- a/nixpkgs/pkgs/tools/security/amoco/default.nix +++ b/nixpkgs/pkgs/tools/security/amoco/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { prompt-toolkit pygments # pyside6 - z3 + z3-solver ]; }; diff --git a/nixpkgs/pkgs/tools/security/arti/default.nix b/nixpkgs/pkgs/tools/security/arti/default.nix index 8d198520d263..47e5ded8581f 100644 --- a/nixpkgs/pkgs/tools/security/arti/default.nix +++ b/nixpkgs/pkgs/tools/security/arti/default.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { pname = "arti"; - version = "1.1.10"; + version = "1.1.11"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "core"; repo = "arti"; rev = "arti-v${version}"; - sha256 = "sha256-/O13n9YPY0RhSnSM9vJzLTXNuXT6iWrPo7S8EnnKIkw="; + sha256 = "sha256-4/qlO+/GY5/U+jEMCuinqAZPyqtBiyaJ4TGkz8JV5AI="; }; - cargoHash = "sha256-LfqieUMWRL+86p0DyitxdfUGVwPtfhcwiwKYMqOZtdc="; + cargoHash = "sha256-NNf2iQyqZvBo6yVJo1Co67ivnILqfynjy5HCQxRJNKM="; nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix b/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix index f186c43721f4..046f173ce100 100644 --- a/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.6.12"; + version = "0.6.14"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-IIlAsxxEYjR7+wdWExdsQAH0x4yOXZ+bVQWwn7mrhRw="; + hash = "sha256-NWYTOHqeCxIgKvslezHAZT1GastWcbavWdfmY6KlbXc="; }; - vendorHash = "sha256-RcZqnyZtonE4qeu+llL1OPGPG93/Rx8ESWM5wapZ1BM="; + vendorHash = "sha256-TDsY05jnutNIKx0z6/8vGvsgYCIKBkTxh9mXqk4IR38="; ldflags = let PKG = "sigs.k8s.io/aws-iam-authenticator"; in [ "-s" diff --git a/nixpkgs/pkgs/tools/security/bitwarden/cli.nix b/nixpkgs/pkgs/tools/security/bitwarden/cli.nix index dd35294ba34a..0ff814617429 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden/cli.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden/cli.nix @@ -10,18 +10,18 @@ buildNpmPackage rec { pname = "bitwarden-cli"; - version = "2023.10.0"; + version = "2023.12.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "cli-v${version}"; - hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ="; + hash = "sha256-WYhLKV3j3Ktite5u1H4fSku38hCCrMzKoxtjq6aT9yo="; }; nodejs = nodejs_18; - npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o="; + npmDepsHash = "sha256-bnYpvHO9Pnob+MbrSshv03mSwXCADH/2xw33nLVKMdg="; nativeBuildInputs = [ python3 diff --git a/nixpkgs/pkgs/tools/security/bitwarden/default.nix b/nixpkgs/pkgs/tools/security/bitwarden/default.nix index f3c836fd3860..c08da90f59b4 100644 --- a/nixpkgs/pkgs/tools/security/bitwarden/default.nix +++ b/nixpkgs/pkgs/tools/security/bitwarden/default.nix @@ -3,7 +3,7 @@ , cargo , copyDesktopItems , dbus -, electron_25 +, electron_27 , fetchFromGitHub , fetchpatch2 , glib @@ -25,16 +25,16 @@ let description = "A secure and free password manager for all of your devices"; icon = "bitwarden"; - electron = electron_25; + electron = electron_27; in buildNpmPackage rec { pname = "bitwarden"; - version = "2023.10.1"; + version = "2023.12.0"; src = fetchFromGitHub { owner = "bitwarden"; repo = "clients"; rev = "desktop-v${version}"; - hash = "sha256-cwSIMN40d1ySUSxBl8jXLVndnJJvPnLiTxkYnA3Pqws="; + hash = "sha256-WYhLKV3j3Ktite5u1H4fSku38hCCrMzKoxtjq6aT9yo="; }; patches = [ @@ -43,20 +43,22 @@ in buildNpmPackage rec { url = "https://github.com/solopasha/bitwarden_flatpak/raw/daec07b067b9cec5e260b44a53216fc65866ba1d/wayland-clipboard.patch"; hash = "sha256-hcaRa9Nl7MYaTNwmB5Qdm65Mtufv3z+IPwLDPiO3pcw="; }) + # Workaround Electron 25 EOL and 26 has https://github.com/bitwarden/clients/issues/6560 + ./electron-27.patch ]; nodejs = nodejs_18; makeCacheWritable = true; npmWorkspace = "apps/desktop"; - npmDepsHash = "sha256-KN8C9Y0tfhHVagk+CUMpI/bIRChhzxC9M27HkU4aTEc="; + npmDepsHash = "sha256-QwG+D0M94HN1AyQlmzKeScZyksiUr5A9igEaox9DYN4="; cargoDeps = rustPlatform.fetchCargoTarball { name = "${pname}-${version}"; inherit patches src; patchFlags = [ "-p4" ]; sourceRoot = "${src.name}/${cargoRoot}"; - hash = "sha256-AmtdmOR3aZJTZiFbkwRXjeTOJdcN40bTmWx4Ss3JNJ8="; + hash = "sha256-pCy3hGhI3mXm4uTOaFMykOzJqK2PC0t0hE8MrJKtA/k="; }; cargoRoot = "apps/desktop/desktop_native"; diff --git a/nixpkgs/pkgs/tools/security/bitwarden/electron-27.patch b/nixpkgs/pkgs/tools/security/bitwarden/electron-27.patch new file mode 100644 index 000000000000..5b2af2ce30f4 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/bitwarden/electron-27.patch @@ -0,0 +1,69 @@ +From e2c15e826fe9d4d2d12868ef5409e423e3191b58 Mon Sep 17 00:00:00 2001 +From: Daniel James Smith <2670567+djsmith85@users.noreply.github.com> +Date: Fri, 8 Dec 2023 13:07:46 +0100 +Subject: [PATCH] Bump electron to v27.1.3 (#7134) + +Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com> + +(cherry picked from commit d76602343f36d8e17a9b0204e0290488456c96d5) +--- + apps/desktop/electron-builder.json | 2 +- + package-lock.json | 8 ++++---- + package.json | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/apps/desktop/electron-builder.json b/apps/desktop/electron-builder.json +index 69d1c0074f..a12870bd96 100644 +--- a/apps/desktop/electron-builder.json ++++ b/apps/desktop/electron-builder.json +@@ -19,7 +19,7 @@ + "**/node_modules/@bitwarden/desktop-native/index.js", + "**/node_modules/@bitwarden/desktop-native/desktop_native.${platform}-${arch}*.node" + ], +- "electronVersion": "25.9.1", ++ "electronVersion": "27.1.3", + "generateUpdatesFilesForAllChannels": true, + "publish": { + "provider": "generic", +diff --git a/package-lock.json b/package-lock.json +index 3f0afde95b..9b7b2dbcd9 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -125,7 +125,7 @@ + "cross-env": "7.0.3", + "css-loader": "6.8.1", + "del": "6.1.1", +- "electron": "25.9.1", ++ "electron": "27.1.3", + "electron-builder": "23.6.0", + "electron-log": "5.0.0", + "electron-reload": "2.0.0-alpha.1", +@@ -20173,9 +20173,9 @@ + } + }, + "node_modules/electron": { +- "version": "25.9.1", +- "resolved": "https://registry.npmjs.org/electron/-/electron-25.9.1.tgz", +- "integrity": "sha512-Uo/Fh7igjoUXA/f90iTATZJesQEArVL1uLA672JefNWTLymdKSZkJKiCciu/Xnd0TS6qvdIOUGuJFSTQnKskXQ==", ++ "version": "27.1.3", ++ "resolved": "https://registry.npmjs.org/electron/-/electron-27.1.3.tgz", ++ "integrity": "sha512-7eD8VMhhlL5J531OOawn00eMthUkX1e3qN5Nqd7eMK8bg5HxQBrn8bdPlvUEnCano9KhrVwaDnGeuzWoDOGpjQ==", + "dev": true, + "hasInstallScript": true, + "dependencies": { +diff --git a/package.json b/package.json +index 9ee884b31d..4a5c3513fd 100644 +--- a/package.json ++++ b/package.json +@@ -88,7 +88,7 @@ + "cross-env": "7.0.3", + "css-loader": "6.8.1", + "del": "6.1.1", +- "electron": "25.9.1", ++ "electron": "27.1.3", + "electron-builder": "23.6.0", + "electron-log": "5.0.0", + "electron-reload": "2.0.0-alpha.1", +-- +2.42.0 + diff --git a/nixpkgs/pkgs/tools/security/ccid/default.nix b/nixpkgs/pkgs/tools/security/ccid/default.nix index 5006007035ee..c13ec56c4b6a 100644 --- a/nixpkgs/pkgs/tools/security/ccid/default.nix +++ b/nixpkgs/pkgs/tools/security/ccid/default.nix @@ -1,12 +1,22 @@ -{ lib, stdenv, fetchurl, pcsclite, pkg-config, libusb1, perl }: +{ lib +, stdenv +, fetchurl +, flex +, pcsclite +, pkg-config +, libusb1 +, perl +, zlib +, gitUpdater +}: stdenv.mkDerivation rec { pname = "ccid"; - version = "1.5.2"; + version = "1.5.4"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "sha256-E5NEh+b4tI9pmhbTZ8x6GvejyodN5yGsbpYzvrhuchk="; + hash = "sha256-boMq3Bcuzc/e4rVvMxRGhIgsvpctr/GTjnqcc6ZPiL8="; }; postPatch = '' @@ -14,21 +24,50 @@ stdenv.mkDerivation rec { substituteInPlace src/Makefile.in --replace /bin/echo echo ''; - preConfigure = '' - configureFlagsArray+=("--enable-usbdropdir=$out/pcsc/drivers") - ''; + configureFlags = [ + "--enable-twinserial" + "--enable-serialconfdir=${placeholder "out"}/etc/reader.conf.d" + "--enable-ccidtwindir=${placeholder "out"}/pcsc/drivers/serial" + "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers" + ]; + + # error: call to undeclared function 'InterruptRead'; + # ISO C99 and later do not support implicit function declarations + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration"; + }; + + nativeBuildInputs = [ + flex + pkg-config + perl + ]; - nativeBuildInputs = [ pkg-config perl ]; - buildInputs = [ pcsclite libusb1 ]; + buildInputs = [ + pcsclite + libusb1 + zlib + ]; + + postInstall = '' + install -Dm 0444 -t $out/lib/udev/rules.d src/92_pcscd_ccid.rules + substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \ + --replace "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd" + ''; # The resulting shared object ends up outside of the default paths which are # usually getting stripped. stripDebugList = ["pcsc"]; + passthru.updateScript = gitUpdater { + url = "https://salsa.debian.org/rousseau/CCID.git"; + }; + meta = with lib; { - description = "ccid drivers for pcsclite"; + description = "PC/SC driver for USB CCID smart card readers"; homepage = "https://ccid.apdu.fr/"; - license = licenses.gpl2Plus; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.anthonyroussel ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/security/cfripper/default.nix b/nixpkgs/pkgs/tools/security/cfripper/default.nix index 440ca40ec68d..080fc8ae3e32 100644 --- a/nixpkgs/pkgs/tools/security/cfripper/default.nix +++ b/nixpkgs/pkgs/tools/security/cfripper/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "cfripper"; - version = "1.15.1"; + version = "1.15.2"; src = fetchFromGitHub { owner = "Skyscanner"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Gtg4zoMTOW/nrFm7PF4/96VGcMALg2msVZ3E7lGm5KA="; + hash = "sha256-SmD3Dq5LicPRe3lWFsq4zqM/yDZ1LsgRwSUA5/RbN9I="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/security/cnspec/default.nix b/nixpkgs/pkgs/tools/security/cnspec/default.nix index b1f8cbb81b2a..40e9eb46ea97 100644 --- a/nixpkgs/pkgs/tools/security/cnspec/default.nix +++ b/nixpkgs/pkgs/tools/security/cnspec/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "cnspec"; - version = "9.9.3"; + version = "9.11.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; rev = "refs/tags/v${version}"; - hash = "sha256-OlM/gcwHQWfXmKLcDDHh3okvqHIELRL+dRQJ6dOcItc="; + hash = "sha256-Lcky8+tY91ndZEJ6ZcBxxLHYj6k7U0Yu6BKs5MiB15U="; }; proxyVendor = true; - vendorHash = "sha256-yhPixXldWUhJURZ/lIScIAbhsw/b/JCjYi1+Y5UOnnQ="; + vendorHash = "sha256-bFnlvstu+yYteq719r9g0A2sNJAaxV/jZR9Ww3FoG28="; subPackages = [ "apps/cnspec" diff --git a/nixpkgs/pkgs/tools/security/cosign/default.nix b/nixpkgs/pkgs/tools/security/cosign/default.nix index 3e8acc96f29e..0cdf5b0839ea 100644 --- a/nixpkgs/pkgs/tools/security/cosign/default.nix +++ b/nixpkgs/pkgs/tools/security/cosign/default.nix @@ -13,13 +13,13 @@ }: buildGoModule rec { pname = "cosign"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - hash = "sha256-J/CQonW/ICrNUSQXVZPMR+WACZYJH0eH6bXhdXE27TY="; + hash = "sha256-QZWF0ysZFu3rt8dIXb5uddyDhT2FfWUyder8YR2BtQc="; }; buildInputs = @@ -28,7 +28,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config installShellFiles ]; - vendorHash = "sha256-RPwU6W6a9mnfriyz3ASvamZ3jEG6C2ug/MTp1Pahc/Q="; + vendorHash = "sha256-WeNRg3Nw2b6NiV8z7tGZIlWUHZxXuTG7MPF9DgfdmUQ="; subPackages = [ "cmd/cosign" diff --git a/nixpkgs/pkgs/tools/security/cryptomator/default.nix b/nixpkgs/pkgs/tools/security/cryptomator/default.nix index f910cf8467ed..c80be56319f1 100644 --- a/nixpkgs/pkgs/tools/security/cryptomator/default.nix +++ b/nixpkgs/pkgs/tools/security/cryptomator/default.nix @@ -2,6 +2,7 @@ , autoPatchelfHook , fuse3 , maven, jdk, makeShellWrapper, glib, wrapGAppsHook +, libayatana-appindicator }: @@ -22,15 +23,14 @@ mavenJdk.buildMavenPackage rec { hash = "sha256-NMNlDEUpwKUywzhXhxlNX7NiE+6wOov2Yt8nTfbKTNI="; }; - mvnParameters = "-Dmaven.test.skip=true"; - mvnHash = "sha256-jIHMUj7ZQFu4XAvWUywj4f0PbmLHGtU5VRG0ZuKm3mA="; + mvnParameters = "-Dmaven.test.skip=true -Plinux"; + mvnHash = "sha256-cmwU9k7TRRJ07bT1EmY3pIBkvvqmFyE7WJeVL7VFDyc="; preBuild = '' VERSION=${version} SEMVER_STR=${version} ''; - # This is based on the instructins in https://github.com/cryptomator/cryptomator/blob/develop/dist/linux/appimage/build.sh installPhase = '' mkdir -p $out/bin/ $out/share/cryptomator/libs/ $out/share/cryptomator/mods/ @@ -38,8 +38,9 @@ mavenJdk.buildMavenPackage rec { cp target/libs/* $out/share/cryptomator/libs/ cp target/mods/* target/cryptomator-*.jar $out/share/cryptomator/mods/ - makeShellWrapper ${jdk}/bin/java $out/bin/cryptomator \ + makeShellWrapper ${jdk}/bin/java $out/bin/${pname} \ --add-flags "--enable-preview" \ + --add-flags "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.purejava.appindicator" \ --add-flags "--class-path '$out/share/cryptomator/libs/*'" \ --add-flags "--module-path '$out/share/cryptomator/mods'" \ --add-flags "-Dfile.encoding='utf-8'" \ @@ -49,17 +50,17 @@ mavenJdk.buildMavenPackage rec { --add-flags "-Dcryptomator.p12Path='@{userhome}/.config/Cryptomator/key.p12'" \ --add-flags "-Dcryptomator.ipcSocketPath='@{userhome}/.config/Cryptomator/ipc.socket'" \ --add-flags "-Dcryptomator.mountPointsDir='@{userhome}/.local/share/Cryptomator/mnt'" \ - --add-flags "-Dcryptomator.showTrayIcon=false" \ - --add-flags "-Dcryptomator.buildNumber='nix'" \ + --add-flags "-Dcryptomator.showTrayIcon=true" \ + --add-flags "-Dcryptomator.buildNumber='nix-${src.rev}'" \ --add-flags "-Dcryptomator.appVersion='${version}'" \ - --add-flags "-Djdk.gtk.version=3" \ + --add-flags "-Djava.net.useSystemProxies=true" \ --add-flags "-Xss20m" \ --add-flags "-Xmx512m" \ - --add-flags "-Djavafx.embed.singleThread=true " \ - --add-flags "-Dawt.useSystemAAFontSettings=on" \ + --add-flags "-Dcryptomator.disableUpdateCheck=true" \ + --add-flags "-Dcryptomator.integrationsLinux.trayIconsDir='$out/share/icons/hicolor/symbolic/apps'" \ --add-flags "--module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator" \ --prefix PATH : "$out/share/cryptomator/libs/:${lib.makeBinPath [ jdk glib ]}" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse3 ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ fuse3 libayatana-appindicator ]}" \ --set JAVA_HOME "${jdk.home}" # install desktop entry and icons @@ -80,7 +81,7 @@ mavenJdk.buildMavenPackage rec { wrapGAppsHook jdk ]; - buildInputs = [ fuse3 jdk glib ]; + buildInputs = [ fuse3 jdk glib libayatana-appindicator ]; meta = with lib; { description = "Free client-side encryption for your cloud files"; diff --git a/nixpkgs/pkgs/tools/security/cyclonedx-gomod/default.nix b/nixpkgs/pkgs/tools/security/cyclonedx-gomod/default.nix index d9e740fcf644..d4c9a4b6b465 100644 --- a/nixpkgs/pkgs/tools/security/cyclonedx-gomod/default.nix +++ b/nixpkgs/pkgs/tools/security/cyclonedx-gomod/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "cyclonedx-gomod"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - hash = "sha256-JczDfNBYT/Ap2lDucEvuT8NAwuQgmavOUvtznI6Q+Zc="; + hash = "sha256-whAHZDUQBJaYu+OZiqcYzWxOru1GXDQ4FMDCj+ngCDs="; }; - vendorHash = "sha256-5Mn+f+oVwbn2qGaZct5+9f6tOBXfsB/I72yD7fHUrC8="; + vendorHash = "sha256-FpsZonGJSzbAsnM00qq/qiTJLUN4q08dR+6rhTKvX0I="; # Tests require network access and cyclonedx executable doCheck = false; diff --git a/nixpkgs/pkgs/tools/security/dalfox/default.nix b/nixpkgs/pkgs/tools/security/dalfox/default.nix index b6d21b801efc..8c72a93d340f 100644 --- a/nixpkgs/pkgs/tools/security/dalfox/default.nix +++ b/nixpkgs/pkgs/tools/security/dalfox/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dalfox"; - version = "2.9.0"; + version = "2.9.1"; src = fetchFromGitHub { owner = "hahwul"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-AG5CNqkxPQJQ+HN3JGUIgSYxgFigmUqVGn1yAHmo7Mo="; + sha256 = "sha256-7wSmPmS8m+rYhYlREzKlPUiUfDvru9zwFFvSCDq6JY8="; }; - vendorHash = "sha256-OLT85GOcTnWmU+ZRem2+vY29nzvzXhnmIN2W+U6phPk="; + vendorHash = "sha256-W+37EL3e7G+U0EZUDuVqjZpfIf5+HcirH8NVsC+1NvA="; # Tests require network access doCheck = false; diff --git a/nixpkgs/pkgs/tools/security/doppler/default.nix b/nixpkgs/pkgs/tools/security/doppler/default.nix index 272caf42e90e..92b964ad2c95 100644 --- a/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.66.3"; + version = "3.66.5"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "sha256-zS5nIULnzoOG43nNcVb6MdmKNDcDK75mh3SOMB5BXIY="; + sha256 = "sha256-/kcGfTDthm4gp1M4lSeY1x8Q7EWVX2pZVjF2rAbz+Es="; }; vendorHash = "sha256-FOmaK6S61fkzybpDx6qfi6m4e2IaqBpavaFhEgIvmqw="; diff --git a/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/nixpkgs/pkgs/tools/security/exploitdb/default.nix index acfbad10cd55..6572b0561fad 100644 --- a/nixpkgs/pkgs/tools/security/exploitdb/default.nix +++ b/nixpkgs/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-12-02"; + version = "2023-12-13"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rITeDc1PQFjV4ZlBK97T+hvIzuWMIoPxBLscqkXiMwc="; + hash = "sha256-DnGHtEF31MN82IrCPcH5HlRdcu6A5XACkOTT3ytzrig="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/fscan/default.nix b/nixpkgs/pkgs/tools/security/fscan/default.nix index cda7fb968d3d..00ce9d8ec78e 100644 --- a/nixpkgs/pkgs/tools/security/fscan/default.nix +++ b/nixpkgs/pkgs/tools/security/fscan/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fscan"; - version = "1.8.3"; + version = "1.8.3-build3"; src = fetchFromGitHub { owner = "shadow1ng"; repo = "fscan"; rev = version; - hash = "sha256-uoM/nMtgIqyzpOoSQKD5k4LXAXoA8G5N4In8tZlngqs="; + hash = "sha256-GtOCd8JaR6tx8hoB+P9QXrEnN7Wvmv7jddhc2/8hjvQ="; }; vendorHash = "sha256-hvb2IfypwYauF3ubE36u0bTU+l/FWP/CZt6dFd9zc6s="; @@ -18,7 +18,6 @@ buildGoModule rec { homepage = "https://github.com/shadow1ng/fscan"; license = licenses.mit; maintainers = with maintainers; [ Misaka13514 ]; - platforms = with platforms; unix ++ windows; mainProgram = "fscan"; }; } diff --git a/nixpkgs/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/nixpkgs/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch deleted file mode 100644 index 65804bac7642..000000000000 --- a/nixpkgs/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c -index 903fb5b..d5611dc 100644 ---- a/tools/gpgkey2ssh.c -+++ b/tools/gpgkey2ssh.c -@@ -268,7 +268,7 @@ main (int argc, char **argv) - keyid = argv[1]; - - ret = asprintf (&command, -- "gpg --list-keys --with-colons --with-key-data '%s'", -+ "@out@/bin/gpg --list-keys --with-colons --with-key-data '%s'", - keyid); - assert (ret > 0); - - diff --git a/nixpkgs/pkgs/tools/security/gotestwaf/default.nix b/nixpkgs/pkgs/tools/security/gotestwaf/default.nix index 8f9d8776687f..78ba5e06e4b9 100644 --- a/nixpkgs/pkgs/tools/security/gotestwaf/default.nix +++ b/nixpkgs/pkgs/tools/security/gotestwaf/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.8"; + version = "0.4.9"; src = fetchFromGitHub { owner = "wallarm"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-5cvyKCzisfuoMPuQpiRnIBCTw2yMdA1yavKNS9OwW58="; + hash = "sha256-fBmn+p5uVGnI4lyL12cX4S8eda79k2Y0RPQG9iZQs2Q="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/security/grype/default.nix b/nixpkgs/pkgs/tools/security/grype/default.nix index ff996562572b..db955a1a2086 100644 --- a/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/nixpkgs/pkgs/tools/security/grype/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "grype"; - version = "0.69.1"; + version = "0.73.4"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AXw2mtN4FC6EKWN8dObrU04+WSHDWLY19FSWqQlkq/Q="; + hash = "sha256-cYhgLMKj8fo49zr+NC7SARiyybCnqXf+DgB+6IkwkAw="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-iitWThvWVfeJMLcJLgmFnVguFVF4DejObZPZ3qB5cY0="; + vendorHash = "sha256-Zx8gJZVkobKjrGysrqYd6Hv2bGqEgOQ+EGSKDvOM33M="; nativeBuildInputs = [ installShellFiles @@ -73,6 +73,8 @@ buildGoModule rec { --replace "TestCmd" "SkipCmd" substituteInPlace grype/pkg/provider_test.go \ --replace "TestSyftLocationExcludes" "SkipSyftLocationExcludes" + substituteInPlace test/cli/cmd_test.go \ + --replace "Test_descriptorNameAndVersionSet" "Skip_descriptorNameAndVersionSet" # remove tests that depend on git substituteInPlace test/cli/db_validations_test.go \ --replace "TestDBValidations" "SkipDBValidations" @@ -83,6 +85,8 @@ buildGoModule rec { --replace "TestSBOMInput_AsArgument" "SkipSBOMInput_AsArgument" substituteInPlace test/cli/subprocess_test.go \ --replace "TestSubprocessStdin" "SkipSubprocessStdin" + substituteInPlace grype/internal/packagemetadata/names_test.go \ + --replace "TestAllNames" "SkipAllNames" # segfault rm grype/db/v5/namespace/cpe/namespace_test.go diff --git a/nixpkgs/pkgs/tools/security/himitsu/default.nix b/nixpkgs/pkgs/tools/security/himitsu/default.nix index 2dc1ba5ba9bb..ae647768c7f4 100644 --- a/nixpkgs/pkgs/tools/security/himitsu/default.nix +++ b/nixpkgs/pkgs/tools/security/himitsu/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "himitsu"; - version = "0.4"; + version = "0.5"; src = fetchFromSourcehut { name = pname + "-src"; owner = "~sircmpwn"; repo = pname; rev = version; - hash = "sha256-Y2QSzYfG1F9Z8MjeVvQ3+Snff+nqSjeK6VNzRaRDLYo="; + hash = "sha256-rZ3gzVz7V3psHAMxTCaJXZh4uP4gIeyb9Bf23kzCBWg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/jadx/default.nix b/nixpkgs/pkgs/tools/security/jadx/default.nix index 10f67d5f0b35..a1fbd44b0232 100644 --- a/nixpkgs/pkgs/tools/security/jadx/default.nix +++ b/nixpkgs/pkgs/tools/security/jadx/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , gradle , jdk +, quark-engine , makeWrapper , perl , imagemagick @@ -114,7 +115,9 @@ in stdenv.mkDerivation (finalAttrs: { cp -R build/jadx/lib $out for prog in jadx jadx-gui; do cp build/jadx/bin/$prog $out/bin - wrapProgram $out/bin/$prog --set JAVA_HOME ${jdk.home} + wrapProgram $out/bin/$prog \ + --set JAVA_HOME ${jdk.home} \ + --prefix PATH : "${lib.makeBinPath [ quark-engine ]}" done for size in 16 32 48; do @@ -153,6 +156,6 @@ in stdenv.mkDerivation (finalAttrs: { ]; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ delroth ]; + maintainers = with maintainers; [ delroth emilytrau ]; }; }) diff --git a/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix b/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix index c44733034b5a..66a8c3c13061 100644 --- a/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix +++ b/nixpkgs/pkgs/tools/security/libmodsecurity/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "libmodsecurity"; - version = "3.0.10"; + version = "3.0.11"; src = fetchFromGitHub { owner = "SpiderLabs"; repo = "ModSecurity"; rev = "v${version}"; - sha256 = "sha256-VaoPpJ0twuGWU7G9AvKK4kq9Ed0BeG2J7B81sOuJVrE="; + sha256 = "sha256-dbAX4lokmiUc+glhTG0PPaD/WEXcoQX0AQ/WZwJQYPY="; fetchSubmodules = true; }; diff --git a/nixpkgs/pkgs/tools/security/metasploit/Gemfile b/nixpkgs/pkgs/tools/security/metasploit/Gemfile index b16aa8a0ddb3..6e3c08b9910e 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/Gemfile +++ b/nixpkgs/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.45" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.46" diff --git a/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock index bdef38c32aad..83abed7e7435 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock +++ b/nixpkgs/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: dd2f4b923912fc2ffc84d4a1d5e3bbccd5a8efc1 - ref: refs/tags/6.3.45 + revision: f05bef8a949ac002f2a17308a55b7afa84ca5882 + ref: refs/tags/6.3.46 specs: - metasploit-framework (6.3.45) + metasploit-framework (6.3.46) actionpack (~> 7.0.0) activerecord (~> 7.0.0) activesupport (~> 7.0.0) @@ -105,66 +105,67 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (7.0.7.2) - actionview (= 7.0.7.2) - activesupport (= 7.0.7.2) + actionpack (7.0.8) + actionview (= 7.0.8) + activesupport (= 7.0.8) rack (~> 2.0, >= 2.2.4) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actionview (7.0.7.2) - activesupport (= 7.0.7.2) + actionview (7.0.8) + activesupport (= 7.0.8) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activemodel (7.0.7.2) - activesupport (= 7.0.7.2) - activerecord (7.0.7.2) - activemodel (= 7.0.7.2) - activesupport (= 7.0.7.2) - activesupport (7.0.7.2) + activemodel (7.0.8) + activesupport (= 7.0.8) + activerecord (7.0.8) + activemodel (= 7.0.8) + activesupport (= 7.0.8) + activesupport (7.0.8) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) - addressable (2.8.5) + addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) afm (0.2.2) arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) - aws-eventstream (1.2.0) - aws-partitions (1.811.0) - aws-sdk-core (3.181.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-eventstream (1.3.0) + aws-partitions (1.864.0) + aws-sdk-core (3.190.0) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.402.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-ec2 (1.430.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-ec2instanceconnect (1.32.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-ec2instanceconnect (1.36.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-iam (1.86.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-iam (1.92.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-kms (1.71.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-kms (1.74.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.134.0) - aws-sdk-core (~> 3, >= 3.181.0) + aws-sdk-s3 (1.141.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sdk-ssm (1.156.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sigv4 (~> 1.8) + aws-sdk-ssm (1.162.0) + aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sigv4 (1.6.0) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) - bcrypt (3.1.19) + base64 (0.2.0) + bcrypt (3.1.20) bcrypt_pbkdf (1.1.0) bindata (2.4.15) - bootsnap (1.16.0) + bootsnap (1.17.0) msgpack (~> 1.2) bson (4.15.0) builder (3.2.4) @@ -173,11 +174,10 @@ GEM cookiejar (0.3.3) crass (1.0.6) daemons (1.4.1) - date (3.3.3) + date (3.3.4) dnsruby (1.70.0) simpleidn (~> 0.2.1) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) + domain_name (0.6.20231109) ed25519 (1.3.0) em-http-request (1.1.7) addressable (>= 2.3.4) @@ -189,9 +189,10 @@ GEM eventmachine (>= 1.0.0.beta.4) erubi (1.12.0) eventmachine (1.2.7) - faker (3.2.1) + faker (3.2.2) i18n (>= 1.8.11, < 2) - faraday (2.7.10) + faraday (2.7.12) + base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) @@ -200,7 +201,7 @@ GEM faye-websocket (0.11.3) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) - ffi (1.15.5) + ffi (1.16.3) filesize (0.2.0) gssapi (1.3.1) ffi (>= 1.0.1) @@ -224,21 +225,21 @@ GEM jmespath (1.6.2) jsobfu (0.4.2) rkelly-remix - json (2.6.3) + json (2.7.1) little-plugger (1.1.4) logging (2.3.1) little-plugger (~> 1.1) multi_json (~> 1.14) - loofah (2.21.3) + loofah (2.22.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) metasm (1.0.5) - metasploit-concern (5.0.1) + metasploit-concern (5.0.2) activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) zeitwerk - metasploit-credential (6.0.5) + metasploit-credential (6.0.6) metasploit-concern metasploit-model metasploit_data_models (>= 5.0.0) @@ -248,12 +249,12 @@ GEM rex-socket rubyntlm rubyzip - metasploit-model (5.0.1) + metasploit-model (5.0.2) activemodel (~> 7.0) activesupport (~> 7.0) railties (~> 7.0) metasploit-payloads (2.0.159) - metasploit_data_models (6.0.2) + metasploit_data_models (6.0.3) activerecord (~> 7.0) activesupport (~> 7.0) arel-helpers @@ -265,26 +266,26 @@ GEM webrick metasploit_payloads-mettle (1.0.26) method_source (1.0.0) - mini_portile2 (2.8.4) - minitest (5.19.0) + mini_portile2 (2.8.5) + minitest (5.20.0) mqtt (0.6.0) msgpack (1.6.1) multi_json (1.15.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) nessus_rest (0.1.6) - net-imap (0.3.7) + net-imap (0.4.7) date net-protocol net-ldap (0.18.0) - net-protocol (0.2.1) + net-protocol (0.2.2) timeout - net-smtp (0.3.3) + net-smtp (0.4.0) net-protocol net-ssh (7.2.0) network_interface (0.0.4) nexpose (7.3.0) - nio4r (2.5.9) + nio4r (2.7.0) nokogiri (1.14.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) @@ -305,11 +306,11 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.5.3) - public_suffix (5.0.3) - puma (6.3.1) + pg (1.5.4) + public_suffix (5.0.4) + puma (6.4.0) nio4r (~> 2.0) - racc (1.7.1) + racc (1.7.3) rack (2.2.8) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) @@ -322,77 +323,77 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.0.7.2) - actionpack (= 7.0.7.2) - activesupport (= 7.0.7.2) + railties (7.0.8) + actionpack (= 7.0.8) + activesupport (= 7.0.8) method_source rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) - rake (13.0.6) + rake (13.1.0) rasn1 (0.12.1) strptime (~> 0.2.5) rb-readline (0.5.5) recog (3.1.2) nokogiri redcarpet (3.6.0) - reline (0.3.8) + reline (0.4.1) io-console (~> 0.5) - rex-arch (0.1.14) + rex-arch (0.1.15) rex-text - rex-bin_tools (0.1.8) + rex-bin_tools (0.1.9) metasm rex-arch rex-core rex-struct2 rex-text rex-core (0.1.31) - rex-encoder (0.1.6) + rex-encoder (0.1.7) metasm rex-arch rex-text - rex-exploitation (0.1.38) + rex-exploitation (0.1.39) jsobfu metasm rex-arch rex-encoder rex-text rexml - rex-java (0.1.6) - rex-mime (0.1.7) + rex-java (0.1.7) + rex-mime (0.1.8) rex-text - rex-nop (0.1.2) + rex-nop (0.1.3) rex-arch - rex-ole (0.1.7) + rex-ole (0.1.8) rex-text - rex-powershell (0.1.98) + rex-powershell (0.1.99) rex-random_identifier rex-text ruby-rc4 - rex-random_identifier (0.1.10) + rex-random_identifier (0.1.11) rex-text - rex-registry (0.1.4) - rex-rop_builder (0.1.4) + rex-registry (0.1.5) + rex-rop_builder (0.1.5) metasm rex-core rex-text - rex-socket (0.1.52) + rex-socket (0.1.55) rex-core - rex-sslscan (0.1.9) + rex-sslscan (0.1.10) rex-core rex-socket rex-text - rex-struct2 (0.1.3) - rex-text (0.2.52) - rex-zip (0.1.4) + rex-struct2 (0.1.4) + rex-text (0.2.55) + rex-zip (0.1.5) rex-text rexml (3.2.6) rkelly-remix (0.0.7) ruby-macho (4.0.0) - ruby-mysql (4.0.0) + ruby-mysql (4.1.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.2.5) + ruby_smb (3.2.8) bindata openssl-ccm openssl-cmac @@ -410,7 +411,7 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.1.0) tilt (~> 2.0) - sqlite3 (1.6.3) + sqlite3 (1.6.9) mini_portile2 (~> 2.8.0) sshkey (3.0.0) strptime (0.2.5) @@ -419,9 +420,9 @@ GEM daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) rack (>= 1, < 3) - thor (1.2.2) - tilt (2.2.0) - timeout (0.4.0) + thor (1.3.0) + tilt (2.3.0) + timeout (0.4.1) ttfunk (1.7.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) @@ -429,7 +430,7 @@ GEM tzinfo (>= 1.0.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.2) + unf_ext (0.0.9.1) unix-crypt (1.3.1) warden (1.2.9) rack (>= 2.0.9) @@ -453,7 +454,7 @@ GEM activesupport (>= 4.2, < 8.0) xmlrpc (0.3.3) webrick - zeitwerk (2.6.11) + zeitwerk (2.6.12) PLATFORMS ruby @@ -462,4 +463,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 2.4.22 + 2.4.13 diff --git a/nixpkgs/pkgs/tools/security/metasploit/default.nix b/nixpkgs/pkgs/tools/security/metasploit/default.nix index 842fc64b6440..6ba303d15983 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/default.nix +++ b/nixpkgs/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.3.45"; + version = "6.3.46"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = "refs/tags/${version}"; - hash = "sha256-vDTbuvMkudwV3rCEEwE62emXNSMgXR1XHyVB3sDN56Y="; + hash = "sha256-aKQfy4PRl+aOamvlutFX16c3b4qGcVLfOtA+l2bhAOo="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/metasploit/gemset.nix b/nixpkgs/pkgs/tools/security/metasploit/gemset.nix index d6d0ced8a5d1..ebaf66de9b60 100644 --- a/nixpkgs/pkgs/tools/security/metasploit/gemset.nix +++ b/nixpkgs/pkgs/tools/security/metasploit/gemset.nix @@ -4,60 +4,60 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qamc5ly521wk9i1658h9jv7avmyyp92kffa1da2fn5zk0wgyhf4"; + sha256 = "1l319p0gipfgq8bp8dvbv97qqb72rad9zcqn5snhgv20cmpqr69b"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "151zxb61bb6q7g0sn34qz79k8bg02vmb8mmnsn0fr15lxw92dfhm"; + sha256 = "0xnpdwj1d8m6c2d90jp9cs50ggiz0jj02ls2h9lg68k4k8mnjbd2"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1crjq1dznlbsrwd5yijxraz1591xmg4vdcwwnmrw4nh6hrwq5fj5"; + sha256 = "004w8zaz2g3y6lnrsvlcmljll0m3ndqpgwf0wfscgq6iysibiglm"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03vrssdqaqm41w27s21r37skdfxa41midvjy37i2zh3rnbnq8ps2"; + sha256 = "04wavps80q3pvhvfbmi4gs102y1p6mxbg8xylzvib35b6m92adpj"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vlzcnyqlbchaq85phmdv73ydlc18xpvxy1cbsk191cwd29i7q32"; + sha256 = "188kbwkn1lbhz40ala8ykp20jzqphgc68g3d8flin8cqa2xid0s5"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; addressable = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; + sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr"; type = "gem"; }; - version = "2.8.5"; + version = "2.8.6"; }; afm = { groups = ["default"]; @@ -94,110 +94,120 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; aws-partitions = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0082fsywglghvam55i4jz7cj2vyd8hb8b7658cr9yqlwna9j1sp3"; + sha256 = "16n1d0bh3zy925y4f8flrnkfir2smsj0j31zslfaz6vf6cvi9qjs"; type = "gem"; }; - version = "1.811.0"; + version = "1.864.0"; }; aws-sdk-core = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjw9cf6ldbw50xi5ric8d63r8kybpsvaqxh2v6n7374hfady73i"; + sha256 = "19nglxz49nlzgsvnivb3bdm17vxjn1ng2br8659xv48nzjrmyid3"; type = "gem"; }; - version = "3.181.0"; + version = "3.190.0"; }; aws-sdk-ec2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kl5b8m0ad2dxj2r0f5wkphfwhnpq820jbzrdmxyh20kivckv33c"; + sha256 = "1zyazx97nskgl9xzspg2q1rji02p2jv789v8qd1qz6hknz0z6r5f"; type = "gem"; }; - version = "1.402.0"; + version = "1.430.0"; }; aws-sdk-ec2instanceconnect = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jbvh6v2kbybk1qjzhzrl82d7advh6hf3va9zyaxlrcijkz6jjg4"; + sha256 = "1iifrmdls17a3hniq43iyj9q4mr8iy0danqmy65xbh05bnqq2ca9"; type = "gem"; }; - version = "1.32.0"; + version = "1.36.0"; }; aws-sdk-iam = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bp18pi29zncznkzkjzlg5j1cl99q41xvw0z5qx9q55mcwaj7i8"; + sha256 = "0whclpcvbdy7gzvqpk8734nxjfxs3362k197xl1wnrpixklkacyz"; type = "gem"; }; - version = "1.86.0"; + version = "1.92.0"; }; aws-sdk-kms = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zr5w2cjd895abyn7y5gifhq37bxcinssvdx2l1qmlkllbdxbwq0"; + sha256 = "1isrj19kzy9sb7a76a1c2n5x0d9lg1h2n7fp7cn13xjis0hpnlxj"; type = "gem"; }; - version = "1.71.0"; + version = "1.74.0"; }; aws-sdk-s3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fbz259as60xnf563z9byp8blq5fsc81h92h3wicai4bmz45w4r5"; + sha256 = "0bnhpmi0iiaj88rqc5lhhnp2gyrk4fs8xz51lj36wwzng94qinya"; type = "gem"; }; - version = "1.134.0"; + version = "1.141.0"; }; aws-sdk-ssm = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "178nnrlpz5ihx5615i1mml7ymg2pklvfxxakhhwcjbys52cz6jsk"; + sha256 = "0xz10344dwm4pj8qnl19bnh99arxp7cd9mn2alslrnw7y2gipzz1"; type = "gem"; }; - version = "1.156.0"; + version = "1.162.0"; }; aws-sigv4 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z889c4c1w7wsjm3szg64ay5j51kjl4pdf94nlr1yks2rlanm7na"; + sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4"; type = "gem"; }; - version = "1.6.0"; + version = "1.8.0"; + }; + base64 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; }; bcrypt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14crcsmcsyiskr9xzgzcfz2dr74zg1jvavrrxpf5vnn9q75fakz9"; + sha256 = "16a0g2q40biv93i1hch3gw8rbmhp77qnnifj1k0a6m7dng3zh444"; type = "gem"; }; - version = "3.1.19"; + version = "3.1.20"; }; bcrypt_pbkdf = { groups = ["default"]; @@ -224,10 +234,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vcg52gwl64xhhal6kwk1pc01y1klzdlnv1awyk89kb91z010x7q"; + sha256 = "0iqkzby0fdgi786m873nm0ckmc847wy9a4ydinb29m7hd3fs83kb"; type = "gem"; }; - version = "1.16.0"; + version = "1.17.0"; }; bson = { groups = ["default"]; @@ -304,10 +314,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; + sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp"; type = "gem"; }; - version = "3.3.3"; + version = "3.3.4"; }; dnsruby = { groups = ["default"]; @@ -324,10 +334,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + sha256 = "1gpciaifmxql8h01ci12qq08dnqrdlzkkz6fmia9v9yc3r9a29si"; type = "gem"; }; - version = "0.5.20190701"; + version = "0.6.20231109"; }; ed25519 = { groups = ["default"]; @@ -384,20 +394,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ysiqlvyy1351bzx7h92r93a35s32l8giyf9bac6sgr142sh3cnn"; + sha256 = "1ic47k6f0q6xl9g2yxa3x60gfbwx98wnx75qnbhhgk0zc7a5ijhy"; type = "gem"; }; - version = "3.2.1"; + version = "3.2.2"; }; faraday = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; + sha256 = "19w1lzipnxs6vy3y0pw1mf956f768ppzgfrnlpwgrpnjjv9xqf7d"; type = "gem"; }; - version = "2.7.10"; + version = "2.7.12"; }; faraday-net_http = { groups = ["default"]; @@ -434,10 +444,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; filesize = { groups = ["default"]; @@ -584,10 +594,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; + sha256 = "0r9jmjhg2ly3l736flk7r2al47b5c8cayh0gqkq0yhjqzc9a6zhq"; type = "gem"; }; - version = "2.6.3"; + version = "2.7.1"; }; little-plugger = { groups = ["default"]; @@ -614,10 +624,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p744kjpb5zk2ihklbykzii77alycjc04vpnm2ch2f3cp65imlj3"; + sha256 = "1zkjqf37v2d7s11176cb35cl83wls5gm3adnfkn2zcc61h3nxmqh"; type = "gem"; }; - version = "2.21.3"; + version = "2.22.0"; }; metasm = { groups = ["default"]; @@ -634,42 +644,42 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12qhihgrhlxcr8pss42blf9jx6sdwp85kg0790n6lf6knz9yi7yc"; + sha256 = "1w06rcr3fa4lq4dhq49b5wh6pd3lj6daf3mq3wmx5zzi4gv0mlic"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.2"; }; metasploit-credential = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pdfrbw8442aspvf4h691p542sgm6rj2xfl3bfc6rplmz82j1ay5"; + sha256 = "1nmh37pss5bsxjasl52pi9jxnzv75wacpnhrif5cprg6jxwn8dzl"; type = "gem"; }; - version = "6.0.5"; + version = "6.0.6"; }; metasploit-framework = { groups = ["default"]; platforms = []; source = { fetchSubmodules = false; - rev = "dd2f4b923912fc2ffc84d4a1d5e3bbccd5a8efc1"; - sha256 = "19p7rp0dwh953xbisp904csrgsfr780i715hvqaxrf94yfxdnd5w"; + rev = "f05bef8a949ac002f2a17308a55b7afa84ca5882"; + sha256 = "1sh0w5k9fgnh7bgm4wc6i9pkg9ypaz8vmrbbda7fd5yihg5iz938"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.3.45"; + version = "6.3.46"; }; metasploit-model = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01i35h3wl7qly2kx20f5r1x00grmfd5vnarjvi3qjjyy380qw793"; + sha256 = "0vn50jnvdanmqbjm9xmp0i4xwzc9g3c6g2c4b59i2bz47kwp1pi7"; type = "gem"; }; - version = "5.0.1"; + version = "5.0.2"; }; metasploit-payloads = { groups = ["default"]; @@ -686,10 +696,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07k32bv9qnxg9vcq29p0r6qcfrhwby3aydpir3z8a7h8iz17lz9i"; + sha256 = "1h22d30aviskjg1jm7a65jy5ynjpw92wg8hzv5mknhlbsv4dhzkm"; type = "gem"; }; - version = "6.0.2"; + version = "6.0.3"; }; metasploit_payloads-mettle = { groups = ["default"]; @@ -716,20 +726,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.19.0"; + version = "5.20.0"; }; mqtt = { groups = ["default"]; @@ -786,10 +796,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; + sha256 = "0541lfqaz46h8s3fks11vsd1iqzmgjjw3c0jp9agg92zblwj0axs"; type = "gem"; }; - version = "0.3.7"; + version = "0.4.7"; }; net-ldap = { groups = ["default"]; @@ -806,20 +816,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; + sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa"; type = "gem"; }; - version = "0.2.1"; + version = "0.2.2"; }; net-smtp = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6md06hm5bf6rv53sk54dl2vg038pg8kglwv3rayx0vk2mdql9x"; + sha256 = "1rx3758w0bmbr21s2nsc6llflsrnp50fwdnly3ixra4v53gbhzid"; type = "gem"; }; - version = "0.3.3"; + version = "0.4.0"; }; net-ssh = { groups = ["default"]; @@ -856,10 +866,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w9978zwjf1qhy3amkivab0f9syz6a7k0xgydjidaf7xc831d78f"; + sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm"; type = "gem"; }; - version = "2.5.9"; + version = "2.7.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -967,40 +977,40 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zcvxmfa8hxkhpp59fhxyxy1arp70f11zi1jh9c7bsdfspifb7kb"; + sha256 = "0pfj771p5a29yyyw58qacks464sl86d5m3jxjl5rlqqw2m3v5xq4"; type = "gem"; }; - version = "1.5.3"; + version = "1.5.4"; }; public_suffix = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n9j7mczl15r3kwqrah09cxj8hxdfawiqxa60kga2bmxl9flfz9k"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "5.0.3"; + version = "5.0.4"; }; puma = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x4dwx2shx0p7lsms97r85r7ji7zv57bjy3i1kmcpxc8bxvrr67c"; + sha256 = "1y8jcw80zcxvdq0id329lzmp5pzx7hpac227d7sgjkblc89s3pfm"; type = "gem"; }; - version = "6.3.1"; + version = "6.4.0"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.3"; }; rack = { groups = ["default"]; @@ -1057,20 +1067,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01pdn9sn7kawwrvrbr3vz44j287xbka8mm7nrv9cl510y8gzxi2x"; + sha256 = "0sfc16zrcn4jgf5xczb08n6prhmqqgg9f0b4mn73zlzg6cwmqchj"; type = "gem"; }; - version = "7.0.7.2"; + version = "7.0.8"; }; rake = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy"; type = "gem"; }; - version = "13.0.6"; + version = "13.1.0"; }; rasn1 = { groups = ["default"]; @@ -1117,30 +1127,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb"; + sha256 = "1hi6zfj6zqzxcbamhjm9w9cswv62f76l8gsdfcnmhpw35cyxphh8"; type = "gem"; }; - version = "0.3.8"; + version = "0.4.1"; }; rex-arch = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gi9641869pg30ij7ba3r2z89flvdqsma4spbpww6c8ph62iy4bp"; + sha256 = "1gxjhiqdbh4ix76rqhaghzy1vsz22gcdfdwj9lqnfifibk7wabpa"; type = "gem"; }; - version = "0.1.14"; + version = "0.1.15"; }; rex-bin_tools = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0p5r2h0zaixdjhp9k0jq0vgsvbhifx2jh3p9pr2w80qda1hkgqgj"; + sha256 = "0hdkjv9g04d9k6mq1j9fxg9l6ifzym5i204majhzb9hqkfgslw5p"; type = "gem"; }; - version = "0.1.8"; + version = "0.1.9"; }; rex-core = { groups = ["default"]; @@ -1157,150 +1167,150 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15c2yqrvn3hxf6gn4cqrz2l65rdh68gbk2a7lwdq43nchfjnsnvg"; + sha256 = "1rlpxmw4amqf04vn14my6aim5iya0wh5gpi1hrvnqq9xnhkpk2qs"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; rex-exploitation = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1afz3qvdmaav542klxz2jwwgrayhw1lyrivmpfv5jk2c613cky3n"; + sha256 = "1pdr7zz9hm7bihq6055jjzdrklp7qn1m50ddr63ilr32wlgldjvh"; type = "gem"; }; - version = "0.1.38"; + version = "0.1.39"; }; rex-java = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0g8xdj7ij4y51wgh6l29al6i107bqn6pwql6za7ahms75m8s9dys"; + sha256 = "1ynqlq1xqnw9asqnkszbjds972xm98fz92yq5ywrxz7p3x66ybbp"; type = "gem"; }; - version = "0.1.6"; + version = "0.1.7"; }; rex-mime = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "00qpd5i8naw601q6aij652gw8x6my5d5drf63lq9fridjrqj0nja"; + sha256 = "0gi2xidygk6j7zwml6225d221bc3s7n2if5g1v1w45ksl19499b3"; type = "gem"; }; - version = "0.1.7"; + version = "0.1.8"; }; rex-nop = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yjlmgmaaa65lkd6jrm71g8yfn8xy91jl07nd1v90xp9jrzrrl92"; + sha256 = "1vavmdzv5aw20izhrbf2f180dwvrraw8i9bh4yz5gsapjizcqrhy"; type = "gem"; }; - version = "0.1.2"; + version = "0.1.3"; }; rex-ole = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rlsy1a4lig7iqvb4zn60fpf125v8k4bjrjzakks74prjb2qmqnp"; + sha256 = "0vbiqg120gqd0kfa7kw2jg4jy4y2favsm6kqvysxfjfwp6vfycl6"; type = "gem"; }; - version = "0.1.7"; + version = "0.1.8"; }; rex-powershell = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bsf88faglr04ag71cplyhhmy7drp1cqs2dqq77m7q8w1ibk8rj"; + sha256 = "0kvzw1fnj05cwbczajclwnpv60zky48hjc5svckapfgx8c5mi69f"; type = "gem"; }; - version = "0.1.98"; + version = "0.1.99"; }; rex-random_identifier = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11gdz9n44jlhq1w5swq63705gliwjc7jg7avgprgw2j4sscnypjp"; + sha256 = "1qxc05f0xvradyp50vz8s1h9lzgh9c31nz8yq7r22bph03v71f0c"; type = "gem"; }; - version = "0.1.10"; + version = "0.1.11"; }; rex-registry = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09b6jhcih4srrh0j52v49vbffqz8ngki6qpmq9b2wdabqnw63d1v"; + sha256 = "1sbcs0lkl8b57d5xdlfffrpwxpvvwfcfbgzqc9p7xgmqb1xl2s62"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rex-rop_builder = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ssynxq3kc86v3xnc6jx8pg5zh13q61wl2klqbi9hzn2n8lhdgvj"; + sha256 = "1gbc9sssyzbq1s2nk0ajc9y0x4v10cp4za4f4gbssrjw4d3zf9dl"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rex-socket = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b8pymg7c6yjb2jc73sky917rdq2kmn9cwxlhm7703yc3y1fyj2x"; + sha256 = "0qs8fq14ivhnhssq966ikxdis864gw80pfbxllbs35v0njw46nj3"; type = "gem"; }; - version = "0.1.52"; + version = "0.1.55"; }; rex-sslscan = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lgwadsmdwdkv9irxlvrc2x0wh1c1r1b9254blpc797ksh5qm4l1"; + sha256 = "0plcz9jwpg1yw206ljky3mk6dk31j24jdmcpnky5k9m2npsp0jlf"; type = "gem"; }; - version = "0.1.9"; + version = "0.1.10"; }; rex-struct2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hp8yv55j995dl587hismwa7ydyprs03c75gia6rwp7v5bhshy4n"; + sha256 = "1p6afmicm1adlngp196604rrgb1nsly10y8nphva5h5vncismscz"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; rex-text = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xibdr82pr0p4h7jixf4r56y70rqzda5287bv3mw43r9vwsi949f"; + sha256 = "1finkvvmxa654mldx1vqpnl9w1xvjp0s7lyb7qjymlphvbj3mi40"; type = "gem"; }; - version = "0.2.52"; + version = "0.2.55"; }; rex-zip = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0azm4g4dm9k6vrav769vn0gffrv7pgxknlj4dr9yav632920cvqj"; + sha256 = "15jjb3ldndi9p5x7pb3dllkrm4cy3p7dccy4rxz0vh5m4vlqbhsd"; type = "gem"; }; - version = "0.1.4"; + version = "0.1.5"; }; rexml = { groups = ["default"]; @@ -1337,10 +1347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sh12qscqrc1ihgy7734r4vrg9kzd9lifwsfk4n1r5i4gv5q0jd2"; + sha256 = "1g6wcnzqsbqg2q1lfbhlz4z9rq306az2xx8kk8dnr60dziy1a5b5"; type = "gem"; }; - version = "4.0.0"; + version = "4.1.0"; }; ruby-rc4 = { groups = ["default"]; @@ -1367,10 +1377,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "075ib787qp2g0ghx0pww76ff843l09y5d5h1x63zbnxzm3q3v4dz"; + sha256 = "199szf6px6lxpxbig57xsy6phg7jka0w3psyhmfrp3gdcv7f851w"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.8"; }; rubyntlm = { groups = ["default"]; @@ -1423,15 +1433,14 @@ version = "3.1.0"; }; sqlite3 = { - dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0h95kr5529qv786mfk8r2jjdsdi6v7v3k3dpz69mrcc9i0vpdd37"; + sha256 = "08irz5llz31im8pmkk5k0kw433jyyji1qa98xkdmpphncdjr38am"; type = "gem"; }; - version = "1.6.3"; + version = "1.6.9"; }; sshkey = { groups = ["default"]; @@ -1478,30 +1487,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7j2wn14h1pl4smibasw0bp66kg626drxb59z7rzflch99cd4rg"; + sha256 = "1hx77jxkrwi66yvs10wfxqa8s25ds25ywgrrf66acm9nbfg7zp0s"; type = "gem"; }; - version = "1.2.2"; + version = "1.3.0"; }; tilt = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bmjgbv8158klwp2r3klxjwaj93nh1sbl4xvj9wsha0ic478avz7"; + sha256 = "0p3l7v619hwfi781l3r7ypyv1l8hivp09r18kmkn6g11c4yr1pc2"; type = "gem"; }; - version = "2.2.0"; + version = "2.3.0"; }; timeout = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1d9cvm0f4zdpwa795v3zv4973y5zk59j7s1x3yn90jjrhcz1yvfd"; + sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg"; type = "gem"; }; - version = "0.4.0"; + version = "0.4.1"; }; ttfunk = { groups = ["default"]; @@ -1548,10 +1557,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; + sha256 = "1sf6bxvf6x8gihv6j63iakixmdddgls58cpxpg32chckb2l18qcj"; type = "gem"; }; - version = "0.0.8.2"; + version = "0.0.9.1"; }; unix-crypt = { groups = ["default"]; @@ -1658,9 +1667,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mwdd445w63khz13hpv17m2br5xngyjl3jdj08xizjbm78i2zrxd"; + sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; type = "gem"; }; - version = "2.6.11"; + version = "2.6.12"; }; } diff --git a/nixpkgs/pkgs/tools/security/metasploit/update.sh b/nixpkgs/pkgs/tools/security/metasploit/update.sh index ba41b78c0e8d..45f820d7870a 100755 --- a/nixpkgs/pkgs/tools/security/metasploit/update.sh +++ b/nixpkgs/pkgs/tools/security/metasploit/update.sh @@ -13,5 +13,8 @@ bundler install bundix sed -i '/[ ]*dependencies =/d' gemset.nix +# Hacks +sed -i 's/nokogiri = {/nokogiri = {\n dependencies = ["mini_portile2" "racc"];/g' gemset.nix + cd "../../../../" nix-update metasploit --version "$latest" diff --git a/nixpkgs/pkgs/tools/security/nitrokey-app2/default.nix b/nixpkgs/pkgs/tools/security/nitrokey-app2/default.nix index a3e3a82ec234..15e756a7053b 100644 --- a/nixpkgs/pkgs/tools/security/nitrokey-app2/default.nix +++ b/nixpkgs/pkgs/tools/security/nitrokey-app2/default.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, pynitrokey , wrapQtAppsHook }: diff --git a/nixpkgs/pkgs/tools/security/nuclei/default.nix b/nixpkgs/pkgs/tools/security/nuclei/default.nix index 013b18a36d2b..cad235dafb25 100644 --- a/nixpkgs/pkgs/tools/security/nuclei/default.nix +++ b/nixpkgs/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Bx/ryoftrhDExugtvviRU4f4pIlerV2ehJWAJUGizvs="; + hash = "sha256-/oTZIjLWLOUSzv36qa57Q1YpIJEz0fIaLsYkuuQ2Y6o="; }; - vendorHash = "sha256-r5m9yvdy7Bnh9QvcrAwwO6od2C7JCcxwFx4p+W8qlMY="; + vendorHash = "sha256-e7iaR1u1EubWrq9Ktkz4b3GJGDdvnLfguym+r2qAYS0="; subPackages = [ "cmd/nuclei/" diff --git a/nixpkgs/pkgs/tools/security/opensc/default.nix b/nixpkgs/pkgs/tools/security/opensc/default.nix index 9b5b6fba8b24..856921edbf18 100644 --- a/nixpkgs/pkgs/tools/security/opensc/default.nix +++ b/nixpkgs/pkgs/tools/security/opensc/default.nix @@ -8,23 +8,15 @@ stdenv.mkDerivation rec { pname = "opensc"; - version = "0.23.0"; + version = "0.24.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; - sha256 = "sha256-Yo8dwk7+d6q+hi7DmJ0GJM6/pmiDOiyEm/tEBSbCU8k="; + sha256 = "sha256-1mm0b4AAtX0AgjShpU1FR6e7pUkea5TOJdIGkNQgjuE="; }; - patches = [ - (fetchpatch { - name = "CVE-2023-2977.patch"; - url = "https://github.com/OpenSC/OpenSC/commit/81944d1529202bd28359bede57c0a15deb65ba8a.patch"; - hash = "sha256-rCeYYKPtv3pii5zgDP5x9Kl2r98p3uxyBSCYlPJZR/s="; - }) - ]; - nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ zlib readline openssl libassuan diff --git a/nixpkgs/pkgs/tools/security/ossec/agent.nix b/nixpkgs/pkgs/tools/security/ossec/agent.nix new file mode 100644 index 000000000000..003d2141c567 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/ossec/agent.nix @@ -0,0 +1,69 @@ +{ lib, stdenv, fetchFromGitHub, which, pcre2, zlib, ncurses, openssl }: +let + version = "unstable-2023-08-09"; +in +stdenv.mkDerivation { + pname = "ossec-agent"; + inherit version; + + src = fetchFromGitHub { + owner = "ossec"; + repo = "ossec-hids"; + rev = "c8a36b0af3d4ee5252855b90236407cbfb996eb2"; + sha256 = "sha256-AZ8iubyhNHXGR/l+hA61ifNDUoan7AQ42l/uRTt5GmE="; + }; + + # clear is used during the build process + nativeBuildInputs = [ ncurses ]; + + buildInputs = [ which pcre2 zlib openssl ]; + + # patch to remove root manipulation, install phase which tries to add users to the system, and init phase which tries to modify the system to launch files + patches = [ ./no-root.patch ]; + + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of + # `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here + env.NIX_CFLAGS_COMPILE = "-fcommon"; + + buildPhase = '' + mkdir $out + export USER_DIR="$out" # just to satisy the script + ./install.sh <<EOF +en + +agent +127.0.0.1 +yes +yes +yes +EOF + + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + mv $out/active-response/bin/* $out/bin + mv $out/etc $out/share + mv $out/queue $out/share + mv $out/var $out/share + mv $out/agentless $out/share + mv $out/.ssh $out/share + rm -r $out/active-response + rm -r $out/tmp + + runHook postInstall + ''; + + meta = with lib; { + description = "Open source host-based instrusion detection system"; + homepage = "https://www.ossec.net"; + license = licenses.gpl2; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.all; + }; +} + diff --git a/nixpkgs/pkgs/tools/security/ossec/default.nix b/nixpkgs/pkgs/tools/security/ossec/default.nix deleted file mode 100644 index 1aa606f59274..000000000000 --- a/nixpkgs/pkgs/tools/security/ossec/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ lib, stdenv, fetchurl, which }: - -stdenv.mkDerivation rec { - pname = "ossec-client"; - version = "2.6"; - - src = fetchurl { - url = "https://www.ossec.net/files/ossec-hids-${version}.tar.gz"; - sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip"; - }; - - buildInputs = [ which ]; - - patches = [ ./no-root.patch ]; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of - # `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - buildPhase = '' - echo "en - -agent -$out -no -127.0.0.1 -yes -yes -yes - - -" | ./install.sh - ''; - - meta = with lib; { - description = "Open source host-based instrusion detection system"; - homepage = "https://www.ossec.net"; - license = licenses.gpl2; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; - }; -} - diff --git a/nixpkgs/pkgs/tools/security/ossec/no-root.patch b/nixpkgs/pkgs/tools/security/ossec/no-root.patch index ea6e9c54a9ae..ef2f28560070 100644 --- a/nixpkgs/pkgs/tools/security/ossec/no-root.patch +++ b/nixpkgs/pkgs/tools/security/ossec/no-root.patch @@ -1,7 +1,8 @@ -diff -Naur ossec-hids-2.6-orig/install.sh ossec-hids-2.6/install.sh ---- ossec-hids-2.6-orig/install.sh 2011-07-11 15:36:58.000000000 -0400 -+++ ossec-hids-2.6/install.sh 2012-07-09 09:58:57.970692818 -0400 -@@ -119,14 +119,14 @@ +diff --git a/install.sh b/install.sh +index 387bde1a..cb6dcbf2 100755 +--- a/install.sh ++++ b/install.sh +@@ -126,14 +126,14 @@ Install() # Generate the /etc/ossec-init.conf VERSION_FILE="./src/VERSION" VERSION=`cat ${VERSION_FILE}` @@ -12,19 +13,38 @@ diff -Naur ossec-hids-2.6-orig/install.sh ossec-hids-2.6/install.sh - echo "TYPE=\"${INSTYPE}\"" >> ${OSSEC_INIT} - chmod 600 ${OSSEC_INIT} - cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT} -- chmod 644 ${INSTALLDIR}${OSSEC_INIT} -+ echo chmod 700 ${OSSEC_INIT} > /dev/null 2>&1 -+ echo "DIRECTORY=\"${INSTALLDIR}\"" > ${INSTALLDIR}${OSSEC_INIT} -+ echo "VERSION=\"${VERSION}\"" >> ${INSTALLDIR}${OSSEC_INIT} -+ echo "DATE=\"`date`\"" >> ${INSTALLDIR}${OSSEC_INIT} -+ echo "TYPE=\"${INSTYPE}\"" >> ${INSTALLDIR}${OSSEC_INIT} -+ echo chmod 600 ${OSSEC_INIT} -+ echo cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT} -+ echo chmod 644 ${INSTALLDIR}${OSSEC_INIT} +- chmod 640 ${INSTALLDIR}${OSSEC_INIT} ++ # chmod 700 ${OSSEC_INIT} > /dev/null 2>&1 ++ # echo "DIRECTORY=\"${INSTALLDIR}\"" > ${OSSEC_INIT} ++ # echo "VERSION=\"${VERSION}\"" >> ${OSSEC_INIT} ++ # echo "DATE=\"`date`\"" >> ${OSSEC_INIT} ++ # echo "TYPE=\"${INSTYPE}\"" >> ${OSSEC_INIT} ++ # chmod 600 ${OSSEC_INIT} ++ # cp -pr ${OSSEC_INIT} ${INSTALLDIR}${OSSEC_INIT} ++ # chmod 640 ${INSTALLDIR}${OSSEC_INIT} # If update_rules is set, we need to tweak -@@ -926,11 +926,6 @@ +@@ -148,12 +148,12 @@ Install() + fi + + # Calling the init script to start ossec hids during boot +- if [ "X${update_only}" = "X" ]; then +- runInit +- if [ $? = 1 ]; then +- notmodified="yes" +- fi +- fi ++ # if [ "X${update_only}" = "X" ]; then ++ # runInit ++ # if [ $? = 1 ]; then ++ # notmodified="yes" ++ # fi ++ # fi + + } + +@@ -965,10 +965,10 @@ main() catError "0x1-location"; fi @@ -32,145 +52,246 @@ diff -Naur ossec-hids-2.6-orig/install.sh ossec-hids-2.6/install.sh - if [ ! "X$ME" = "Xroot" ]; then - catError "0x2-beroot"; - fi -- ++ # # Must be root ++ # if [ ! "X$ME" = "Xroot" ]; then ++ # catError "0x2-beroot"; ++ # fi + # Checking dependencies checkDependencies - -diff -Naur ossec-hids-2.6-orig/src/InstallAgent.sh ossec-hids-2.6/src/InstallAgent.sh ---- ossec-hids-2.6-orig/src/InstallAgent.sh 2011-07-11 15:36:58.000000000 -0400 -+++ ossec-hids-2.6/src/InstallAgent.sh 2012-07-09 09:56:12.061870552 -0400 -@@ -80,7 +80,7 @@ +diff --git a/src/Makefile b/src/Makefile +index 7fc04c0b..0eb27a0a 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -144,7 +144,7 @@ endif + ifeq (${uname_S},AIX) + INSTALL_CMD?=./install-shim-aix.ksh -m $(1) -o $(2) -g $(3) else - grep "^${USER}" /etc/passwd > /dev/null 2>&1 - if [ ! $? = 0 ]; then -- /usr/sbin/groupadd ${GROUP} -+ echo /usr/sbin/groupadd ${GROUP} - - # We first check if /sbin/nologin is present. If it is not, - # we look for bin/false. If none of them is present, we -@@ -93,7 +93,7 @@ - OSMYSHELL="/bin/false" - fi - fi -- /usr/sbin/useradd -d ${DIR} -s ${OSMYSHELL} -g ${GROUP} ${USER} -+ echo /usr/sbin/useradd -d ${DIR} -s ${OSMYSHELL} -g ${GROUP} ${USER} - fi - fi - -@@ -105,31 +105,31 @@ - done - - # Default for all directories --chmod -R 550 ${DIR} --chown -R root:${GROUP} ${DIR} -+echo chmod -R 550 ${DIR} -+echo chown -R root:${GROUP} ${DIR} - - # To the ossec queue (default for agentd to read) --chown -R ${USER}:${GROUP} ${DIR}/queue/ossec --chmod -R 770 ${DIR}/queue/ossec -+echo chown -R ${USER}:${GROUP} ${DIR}/queue/ossec -+echo chmod -R 770 ${DIR}/queue/ossec - - # For the logging user --chown -R ${USER}:${GROUP} ${DIR}/logs --chmod -R 750 ${DIR}/logs --chmod -R 775 ${DIR}/queue/rids --touch ${DIR}/logs/ossec.log --chown ${USER}:${GROUP} ${DIR}/logs/ossec.log --chmod 664 ${DIR}/logs/ossec.log +- INSTALL_CMD?=install -m $(1) -o $(2) -g $(3) ++ INSTALL_CMD?=install + endif + + ifdef DEBUGAD +@@ -404,10 +404,10 @@ endif + install: install-${TARGET} + + install-agent: install-common +- $(call INSTALL_CMD,0550,root,0) ossec-agentd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) agent-auth ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-agentd ${PREFIX}/bin ++ $(call INSTALL_CMD) agent-auth ${PREFIX}/bin + +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/rids + + install-local: install-server-generic + +@@ -416,133 +416,126 @@ install-hybrid: install-server-generic + install-server: install-server-generic + + install-common: build +- ./init/adduser.sh ${OSSEC_USER} ${OSSEC_USER_MAIL} ${OSSEC_USER_REM} ${OSSEC_GROUP} ${PREFIX} +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/ +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs +- $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/ossec.log - --chown -R ${USER}:${GROUP} ${DIR}/queue/diff --chmod -R 750 ${DIR}/queue/diff --chmod 740 ${DIR}/queue/diff/* > /dev/null 2>&1 -+echo chown -R ${USER}:${GROUP} ${DIR}/logs -+echo chmod -R 750 ${DIR}/logs -+echo chmod -R 775 ${DIR}/queue/rids -+echo touch ${DIR}/logs/ossec.log -+echo chown ${USER}:${GROUP} ${DIR}/logs/ossec.log -+echo chmod 664 ${DIR}/logs/ossec.log -+ -+echo chown -R ${USER}:${GROUP} ${DIR}/queue/diff -+echo chmod -R 750 ${DIR}/queue/diff -+echo chmod 740 ${DIR}/queue/diff/* "> /dev/null 2>&1" +- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-logcollector ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-syscheckd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-execd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) manage_agents ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ../contrib/util.sh ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control ++ $(call INSTALL_CMD) -d ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-logcollector ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-syscheckd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-execd ${PREFIX}/bin ++ $(call INSTALL_CMD) manage_agents ${PREFIX}/bin ++ $(call INSTALL_CMD) ../contrib/util.sh ${PREFIX}/bin/ ++ $(call INSTALL_CMD) ${OSSEC_CONTROL_SRC} ${PREFIX}/bin/ossec-control + ifeq (${LUA_ENABLE},yes) +- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua +- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/native +- $(call INSTALL_CMD,0550,root,0) -d ${PREFIX}/lua/compiled +- $(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/ ++ $(call INSTALL_CMD) -d ${PREFIX}/lua ++ $(call INSTALL_CMD) -d ${PREFIX}/lua/native ++ $(call INSTALL_CMD) -d ${PREFIX}/lua/compiled ++ $(call INSTALL_CMD) ${EXTERNAL_LUA}src/ossec-lua ${PREFIX}/bin/ ++ $(call INSTALL_CMD) ${EXTERNAL_LUA}src/ossec-luac ${PREFIX}/bin/ + endif +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/queue +- $(call INSTALL_CMD,0770,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/alerts +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/ossec +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/syscheck +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/diff ++ $(call INSTALL_CMD) -d ${PREFIX}/queue ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/alerts ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/ossec ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/syscheck ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/diff +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/etc ++ $(call INSTALL_CMD) -d ${PREFIX}/etc + ifeq (${INSTALL_LOCALTIME},yes) +- $(call INSTALL_CMD,0440,root,${OSSEC_GROUP}) /etc/localtime ${PREFIX}/etc ++ $(call INSTALL_CMD) /etc/localtime ${PREFIX}/etc + endif + ifeq (${INSTALL_RESOLVCONF},yes) +- $(call INSTALL_CMD,0440,root,${OSSEC_GROUP}) /etc/resolv.conf ${PREFIX}/etc ++ $(call INSTALL_CMD) /etc/resolv.conf ${PREFIX}/etc + endif - # For the etc dir --chmod 550 ${DIR}/etc --chown -R root:${GROUP} ${DIR}/etc -+echo chmod 550 ${DIR}/etc -+echo chown -R root:${GROUP} ${DIR}/etc +- $(call INSTALL_CMD,1550,root,${OSSEC_GROUP}) -d ${PREFIX}/tmp ++ $(call INSTALL_CMD) -d ${PREFIX}/tmp + + ifneq (,$(wildcard /etc/TIMEZONE)) +- $(call INSTALL_CMD,440,root,${OSSEC_GROUP}) /etc/TIMEZONE ${PREFIX}/etc/ ++ $(call INSTALL_CMD) /etc/TIMEZONE ${PREFIX}/etc/ + endif + # Solaris Needs some extra files + ifeq (${uname_S},SunOS) +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/usr/share/lib/zoneinfo/ ++ $(call INSTALL_CMD) -d ${PREFIX}/usr/share/lib/zoneinfo/ + cp -r /usr/share/lib/zoneinfo/* ${PREFIX}/usr/share/lib/zoneinfo/ + endif +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/internal_options.conf ${PREFIX}/etc/ ++ $(call INSTALL_CMD) -b ../etc/internal_options.conf ${PREFIX}/etc/ + ifeq (,$(wildcard ${PREFIX}/etc/local_internal_options.conf)) +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf ++ $(call INSTALL_CMD) ../etc/local_internal_options.conf ${PREFIX}/etc/local_internal_options.conf + endif + ifeq (,$(wildcard ${PREFIX}/etc/client.keys)) +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) /dev/null ${PREFIX}/etc/client.keys ++ $(call INSTALL_CMD) /dev/null ${PREFIX}/etc/client.keys + endif + ifeq (,$(wildcard ${PREFIX}/etc/ossec.conf)) + ifneq (,$(wildcard ../etc/ossec.mc)) +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/ossec.mc ${PREFIX}/etc/ossec.conf ++ $(call INSTALL_CMD) ../etc/ossec.mc ${PREFIX}/etc/ossec.conf + else +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf ++ $(call INSTALL_CMD) ${OSSEC_CONF_SRC} ${PREFIX}/etc/ossec.conf + endif + endif + +- $(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/etc/shared +- $(call INSTALL_CMD,0640,${OSSEC_USER},${OSSEC_GROUP}) rootcheck/db/*.txt ${PREFIX}/etc/shared/ ++ $(call INSTALL_CMD) -d ${PREFIX}/etc/shared ++ $(call INSTALL_CMD) rootcheck/db/*.txt ${PREFIX}/etc/shared/ + +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/active-response/bin +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/agentless +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) agentlessd/scripts/* ${PREFIX}/agentless/ ++ $(call INSTALL_CMD) -d ${PREFIX}/active-response ++ $(call INSTALL_CMD) -d ${PREFIX}/active-response/bin ++ $(call INSTALL_CMD) -d ${PREFIX}/agentless ++ $(call INSTALL_CMD) agentlessd/scripts/* ${PREFIX}/agentless/ + +- $(call INSTALL_CMD,0700,root,${OSSEC_GROUP}) -d ${PREFIX}/.ssh ++ $(call INSTALL_CMD) -d ${PREFIX}/.ssh + +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/*.sh ${PREFIX}/active-response/bin/ +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/ ++ $(call INSTALL_CMD) ../active-response/*.sh ${PREFIX}/active-response/bin/ ++ $(call INSTALL_CMD) ../active-response/firewalls/*.sh ${PREFIX}/active-response/bin/ + +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/var +- $(call INSTALL_CMD,0770,root,${OSSEC_GROUP}) -d ${PREFIX}/var/run +- +- ./init/fw-check.sh execute ++ $(call INSTALL_CMD) -d ${PREFIX}/var ++ $(call INSTALL_CMD) -d ${PREFIX}/var/run - ls /etc/localtime > /dev/null 2>&1 - if [ $? = 0 ]; then -@@ -167,25 +167,25 @@ - cp -pr ../etc/client.keys ${DIR}/etc/ > /dev/null 2>&1 - cp -pr agentlessd/scripts/* ${DIR}/agentless/ --chown root:${GROUP} ${DIR}/etc/internal_options.conf --chown root:${GROUP} ${DIR}/etc/local_internal_options.conf > /dev/null 2>&1 --chown root:${GROUP} ${DIR}/etc/client.keys > /dev/null 2>&1 --chown root:${GROUP} ${DIR}/agentless/* --chown ${USER}:${GROUP} ${DIR}/.ssh --chown -R root:${GROUP} ${DIR}/etc/shared + + install-server-generic: install-common +- $(call INSTALL_CMD,0660,${OSSEC_USER},${OSSEC_GROUP}) /dev/null ${PREFIX}/logs/active-responses.log +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/archives +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/alerts +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/logs/firewall +- +- $(call INSTALL_CMD,0550,root,0) ossec-agentlessd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-analysisd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-monitord ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-reportd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-maild ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-remoted ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-logtest ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-csyslogd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-authd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-dbd ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) ossec-makelists ${PREFIX}/bin +- $(call INSTALL_CMD,0550,root,0) verify-agent-conf ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) clear_stats ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) list_agents ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) ossec-regex ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) syscheck_update ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) agent_control ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) syscheck_control ${PREFIX}/bin/ +- $(call INSTALL_CMD,0550,root,0) rootcheck_control ${PREFIX}/bin/ - --chmod 550 ${DIR}/etc --chmod 440 ${DIR}/etc/internal_options.conf --chmod 440 ${DIR}/etc/local_internal_options.conf > /dev/null 2>&1 --chmod 440 ${DIR}/etc/client.keys > /dev/null 2>&1 --chmod -R 770 ${DIR}/etc/shared # ossec must be able to write to it --chmod 550 ${DIR}/agentless/* --chmod 700 ${DIR}/.ssh -+echo chown root:${GROUP} ${DIR}/etc/internal_options.conf -+echo chown root:${GROUP} ${DIR}/etc/local_internal_options.conf "> /dev/null 2>&1" -+echo chown root:${GROUP} ${DIR}/etc/client.keys "> /dev/null 2>&1" -+echo chown root:${GROUP} ${DIR}/agentless/* -+echo chown ${USER}:${GROUP} ${DIR}/.ssh -+echo chown -R root:${GROUP} ${DIR}/etc/shared +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/stats +- $(call INSTALL_CMD,0550,root,${OSSEC_GROUP}) -d ${PREFIX}/rules ++ $(call INSTALL_CMD) /dev/null ${PREFIX}/logs/active-responses.log ++ $(call INSTALL_CMD) -d ${PREFIX}/logs/archives ++ $(call INSTALL_CMD) -d ${PREFIX}/logs/alerts ++ $(call INSTALL_CMD) -d ${PREFIX}/logs/firewall + -+echo chmod 550 ${DIR}/etc -+echo chmod 440 ${DIR}/etc/internal_options.conf -+echo chmod 440 ${DIR}/etc/local_internal_options.conf > /dev/null 2>&1 -+echo chmod 440 ${DIR}/etc/client.keys > /dev/null 2>&1 -+echo chmod -R 770 ${DIR}/etc/shared # ossec must be able to write to it -+echo chmod 550 ${DIR}/agentless/* -+echo chmod 700 ${DIR}/.ssh - - - # For the /var/run --chmod 770 ${DIR}/var/run --chown root:${GROUP} ${DIR}/var/run -+echo chmod 770 ${DIR}/var/run -+echo chown root:${GROUP} ${DIR}/var/run - - - # Moving the binary files -@@ -201,11 +201,11 @@ - sh ./init/fw-check.sh execute > /dev/null - cp -pr ../active-response/*.sh ${DIR}/active-response/bin/ - cp -pr ../active-response/firewalls/*.sh ${DIR}/active-response/bin/ --chmod 755 ${DIR}/active-response/bin/* --chown root:${GROUP} ${DIR}/active-response/bin/* -+echo chmod 755 ${DIR}/active-response/bin/* -+echo chown root:${GROUP} ${DIR}/active-response/bin/* - --chown root:${GROUP} ${DIR}/bin/* --chmod 550 ${DIR}/bin/* -+echo chown root:${GROUP} ${DIR}/bin/* -+echo chmod 550 ${DIR}/bin/* - - - # Moving the config file -@@ -221,8 +221,8 @@ - else - cp -pr ../etc/ossec-agent.conf ${DIR}/etc/ossec.conf - fi --chown root:${GROUP} ${DIR}/etc/ossec.conf --chmod 440 ${DIR}/etc/ossec.conf -+echo chown root:${GROUP} ${DIR}/etc/ossec.conf -+echo chmod 440 ${DIR}/etc/ossec.conf ++ $(call INSTALL_CMD) ossec-agentlessd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-analysisd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-monitord ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-reportd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-maild ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-remoted ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-logtest ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-csyslogd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-authd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-dbd ${PREFIX}/bin ++ $(call INSTALL_CMD) ossec-makelists ${PREFIX}/bin ++ $(call INSTALL_CMD) verify-agent-conf ${PREFIX}/bin/ ++ $(call INSTALL_CMD) clear_stats ${PREFIX}/bin/ ++ $(call INSTALL_CMD) list_agents ${PREFIX}/bin/ ++ $(call INSTALL_CMD) ossec-regex ${PREFIX}/bin/ ++ $(call INSTALL_CMD) syscheck_update ${PREFIX}/bin/ ++ $(call INSTALL_CMD) agent_control ${PREFIX}/bin/ ++ $(call INSTALL_CMD) syscheck_control ${PREFIX}/bin/ ++ $(call INSTALL_CMD) rootcheck_control ${PREFIX}/bin/ ++ ++ $(call INSTALL_CMD) -d ${PREFIX}/stats ++ $(call INSTALL_CMD) -d ${PREFIX}/rules + ifneq (,$(wildcard ${PREFIX}/rules/local_rules.xml)) + cp ${PREFIX}/rules/local_rules.xml ${PREFIX}/rules/local_rules.xml.installbackup +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml ++ $(call INSTALL_CMD) -b ../etc/rules/*.xml ${PREFIX}/rules ++ $(call INSTALL_CMD) ${PREFIX}/rules/local_rules.xml.installbackup ${PREFIX}/rules/local_rules.xml + rm ${PREFIX}/rules/local_rules.xml.installbackup + else +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) -b ../etc/rules/*.xml ${PREFIX}/rules ++ $(call INSTALL_CMD) -b ../etc/rules/*.xml ${PREFIX}/rules + endif + +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/fts ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/fts + +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/rootcheck ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/rootcheck + +- $(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/agent-info +- $(call INSTALL_CMD,0750,${OSSEC_USER},${OSSEC_GROUP}) -d ${PREFIX}/queue/agentless ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/agent-info ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/agentless + +- $(call INSTALL_CMD,0750,${OSSEC_USER_REM},${OSSEC_GROUP}) -d ${PREFIX}/queue/rids ++ $(call INSTALL_CMD) -d ${PREFIX}/queue/rids +- $(call INSTALL_CMD,0640,root,${OSSEC_GROUP}) ../etc/decoder.xml ${PREFIX}/etc/ ++ $(call INSTALL_CMD) ../etc/decoder.xml ${PREFIX}/etc/ + rm -f ${PREFIX}/etc/shared/merged.mg diff --git a/nixpkgs/pkgs/tools/security/ossec/server.nix b/nixpkgs/pkgs/tools/security/ossec/server.nix new file mode 100644 index 000000000000..1a7a3e813675 --- /dev/null +++ b/nixpkgs/pkgs/tools/security/ossec/server.nix @@ -0,0 +1,70 @@ +{ lib, stdenv, fetchFromGitHub, which, pcre2, zlib, ncurses, openssl }: +let + version = "unstable-2023-08-09"; +in +stdenv.mkDerivation { + pname = "ossec-server"; + inherit version; + + src = fetchFromGitHub { + owner = "ossec"; + repo = "ossec-hids"; + rev = "c8a36b0af3d4ee5252855b90236407cbfb996eb2"; + sha256 = "sha256-AZ8iubyhNHXGR/l+hA61ifNDUoan7AQ42l/uRTt5GmE="; + }; + + # clear is used during the build process + nativeBuildInputs = [ ncurses ]; + + buildInputs = [ which pcre2 zlib openssl ]; + + # patch to remove root manipulation, install phase which tries to add users to the system, and init phase which tries to modify the system to launch files + patches = [ ./no-root.patch ]; + + # Workaround build failure on -fno-common toolchains like upstream + # gcc-10. Otherwise build fails as: + # ld: src/common/mgmt/pint-worker-external.po:(.data.rel.local+0x0): multiple definition of + # `PINT_worker_external_impl'; src/common/mgmt/pint-mgmt.po:(.bss+0x20): first defined here + env.NIX_CFLAGS_COMPILE = "-fcommon"; + + buildPhase = '' + mkdir -p $out/logs + export USER_DIR="$out" # just to satisy the script + ./install.sh <<EOF +en + +server +n +n +EOF + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + mv $out/active-response/bin/* $out/bin + mv $out/etc $out/share + mv $out/queue $out/share + mv $out/var $out/share + mv $out/agentless $out/share + mv $out/.ssh $out/share + mv $out/logs $out/share + mv $out/rules $out/share + mv $out/stats $out/share + rm -r $out/active-response + rm -r $out/tmp + ls -lah $out + + runHook postInstall + ''; + + meta = with lib; { + description = "Open source host-based instrusion detection system"; + homepage = "https://www.ossec.net"; + license = licenses.gpl2; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.all; + }; +} + diff --git a/nixpkgs/pkgs/tools/security/pcsctools/default.nix b/nixpkgs/pkgs/tools/security/pcsctools/default.nix index ec2a5f3fb305..7aadeb5c02b8 100644 --- a/nixpkgs/pkgs/tools/security/pcsctools/default.nix +++ b/nixpkgs/pkgs/tools/security/pcsctools/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/scriptor \ - --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl ]}" + --set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC ]}" wrapProgram $out/bin/gscriptor \ - --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl GlibObjectIntrospection Glib Gtk3 Pango Cairo CairoGObject ]}" + --set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC GlibObjectIntrospection Glib Gtk3 Pango Cairo CairoGObject ]}" wrapProgram $out/bin/ATR_analysis \ - --set PERL5LIB "${with perlPackages; makePerlPath [ pcscperl ]}" + --set PERL5LIB "${with perlPackages; makePerlPath [ ChipcardPCSC ]}" wrapProgram $out/bin/pcsc_scan \ --prefix PATH : "$out/bin:${lib.makeBinPath [ coreutils wget ]}" diff --git a/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix b/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix index 67b23697525c..a7f92818b8b7 100644 --- a/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix +++ b/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "pinentry-rofi"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "plattfot"; repo = pname; rev = version; - sha256 = "sha256-H9Y7oPLpDuKtIy80HLS8/iXpOq8ZKiy8ZIH2NwguetY="; + sha256 = "sha256-6dhzzxjE3GE5JZTirMLeMh91BS2wzDZoubgf4Wefe1o="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/security/pynitrokey/default.nix b/nixpkgs/pkgs/tools/security/pynitrokey/default.nix deleted file mode 100644 index 2d1979c1b0c1..000000000000 --- a/nixpkgs/pkgs/tools/security/pynitrokey/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ lib -, buildPythonApplication -, fetchPypi -, pythonRelaxDepsHook -, installShellFiles -, libnitrokey -, flit-core -, certifi -, cffi -, click -, cryptography -, ecdsa -, fido2 -, intelhex -, nkdfu -, python-dateutil -, pyusb -, requests -, spsdk -, tqdm -, tlv8 -, typing-extensions -, pyserial -, protobuf -, click-aliases -, semver -, nethsm -, importlib-metadata -}: - -let - pname = "pynitrokey"; - version = "0.4.43"; - mainProgram = "nitropy"; -in - -buildPythonApplication { - inherit pname version; - pyproject = true; - - src = fetchPypi { - inherit pname version; - hash = "sha256-dYOdokqALDg4Xn7N6Yd0skM/tit+j5+xY73sm9k76hE="; - }; - - propagatedBuildInputs = [ - certifi - cffi - click - cryptography - ecdsa - fido2 - intelhex - nkdfu - python-dateutil - pyusb - requests - spsdk - tqdm - tlv8 - typing-extensions - pyserial - protobuf - click-aliases - semver - nethsm - importlib-metadata - ]; - - nativeBuildInputs = [ - flit-core - installShellFiles - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = true; - - # pythonRelaxDepsHook runs in postBuild so cannot be used - pypaBuildFlags = [ "--skip-dependency-check" ]; - - # libnitrokey is not propagated to users of the pynitrokey Python package. - # It is only usable from the wrapped bin/nitropy - makeWrapperArgs = [ - "--set LIBNK_PATH ${lib.makeLibraryPath [ libnitrokey ]}" - ]; - - # no tests - doCheck = false; - - pythonImportsCheck = [ "pynitrokey" ]; - - postInstall = '' - installShellCompletion --cmd ${mainProgram} \ - --bash <(_NITROPY_COMPLETE=bash_source $out/bin/${mainProgram}) \ - --zsh <(_NITROPY_COMPLETE=zsh_source $out/bin/${mainProgram}) \ - --fish <(_NITROPY_COMPLETE=fish_source $out/bin/${mainProgram}) - ''; - - meta = with lib; { - description = "Python client for Nitrokey devices"; - homepage = "https://github.com/Nitrokey/pynitrokey"; - changelog = "https://github.com/Nitrokey/pynitrokey/releases/tag/v${version}"; - license = with licenses; [ asl20 mit ]; - maintainers = with maintainers; [ frogamic ]; - inherit mainProgram; - }; -} diff --git a/nixpkgs/pkgs/tools/security/rblake2sum/default.nix b/nixpkgs/pkgs/tools/security/rblake2sum/default.nix index a5a4a1bce76c..8f2a86836356 100644 --- a/nixpkgs/pkgs/tools/security/rblake2sum/default.nix +++ b/nixpkgs/pkgs/tools/security/rblake2sum/default.nix @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/crev-dev/rblake2sum"; license = [ licenses.mit ]; maintainers = with maintainers; [ dpc ]; + mainProgram = "rblake2sum"; }; } diff --git a/nixpkgs/pkgs/tools/security/rblake3sum/default.nix b/nixpkgs/pkgs/tools/security/rblake3sum/default.nix new file mode 100644 index 000000000000..341dcd06fb6a --- /dev/null +++ b/nixpkgs/pkgs/tools/security/rblake3sum/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, Security +}: +rustPlatform.buildRustPackage { + pname = "rblake3sum"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "rustshop"; + repo = "rblake3sum"; + rev = "6a8e2576ccc05214eacb75b75a9d4cfdf272161c"; + hash = "sha256-UFk6SJVA58WXhH1CIuT48MEF19yPUe1HD+ekn4LDj8g="; + }; + + cargoHash = "sha256-SE/Zg/UEV/vhB/VDcn8Y70OUIoxbJBh6H2QgFMkWPc4="; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + meta = with lib; { + description = "A recursive blake3 digest (hash) of a file-system path"; + homepage = "https://github.com/rustshop/rblake3sum"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ dpc ]; + mainProgram = "rblake3sum"; + }; +} diff --git a/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/nixpkgs/pkgs/tools/security/saml2aws/default.nix index e6eff66bb60f..a4246f3c4df4 100644 --- a/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.12"; + version = "2.36.13"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-egsAUaGYe06hlPUE4J4acdrfMlDEY/8g0g9KPPJyMlI="; + sha256 = "sha256-cLH1GcMgTPnPJVpHOQkW71hf0MKusL8NRc1YQsNSW2I="; }; - vendorHash = "sha256-hdt/XhxMuR6YlvY/Qu2AjY5F75YvYLlv0LfuMwJQkl4="; + vendorHash = "sha256-E3WYExtV4VsrBZ0uEQZ36CUCK+qf8LTPlNwcdO0eEzA="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/nixpkgs/pkgs/tools/security/sigma-cli/default.nix b/nixpkgs/pkgs/tools/security/sigma-cli/default.nix index d0dc599edd8c..817f45995643 100644 --- a/nixpkgs/pkgs/tools/security/sigma-cli/default.nix +++ b/nixpkgs/pkgs/tools/security/sigma-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sigma-cli"; - version = "0.7.10"; + version = "0.7.11"; pyproject = true; src = fetchFromGitHub { owner = "SigmaHQ"; repo = "sigma-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-Sy9adkmR7Vu7kI75XG0PXihFogPaNwzHH2U5uSz9mZA="; + hash = "sha256-cNrI+YWwLK9sgvVYPOcTXW29omVRqnhh/458FuaoODo="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/security/sss-cli/default.nix b/nixpkgs/pkgs/tools/security/sss-cli/default.nix new file mode 100644 index 000000000000..80daa4a6627e --- /dev/null +++ b/nixpkgs/pkgs/tools/security/sss-cli/default.nix @@ -0,0 +1,27 @@ +{ lib +, rustPlatform +, fetchFromGitHub +}: + +rustPlatform.buildRustPackage rec { + pname = "sss-cli"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "dsprenkels"; + repo = "sss-cli"; + rev = "v${version}"; + hash = "sha256-9Wht+t48SsWpj1z2yY6P7G+h9StmuqfMdODtyPffhak="; + }; + + cargoPatches = [ ./fix-cargo-lock.patch ]; + + cargoHash = "sha256-nKb0J9ym3ZYC80KemwQwT5vVtQUngYD4/091hAIYAiU="; + + meta = with lib; { + homepage = "https://github.com/dsprenkels/sss-cli"; + description = "Command line program for secret-sharing strings"; + license = licenses.mit; + maintainers = with maintainers; [ laalsaas ]; + }; +} diff --git a/nixpkgs/pkgs/tools/security/sss-cli/fix-cargo-lock.patch b/nixpkgs/pkgs/tools/security/sss-cli/fix-cargo-lock.patch new file mode 100644 index 000000000000..4af581c4962d --- /dev/null +++ b/nixpkgs/pkgs/tools/security/sss-cli/fix-cargo-lock.patch @@ -0,0 +1,21 @@ +diff --git a/Cargo.lock b/Cargo.lock +index a57c5d8..27278d9 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,5 +1,7 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. ++version = 3 ++ + [[package]] + name = "aho-corasick" + version = "0.7.15" +@@ -253,7 +255,7 @@ dependencies = [ + + [[package]] + name = "shamirsecretsharing-cli" +-version = "0.1.0" ++version = "0.1.1" + dependencies = [ + "atty", + "clap", diff --git a/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix b/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix index 66413b1798ac..9e948bf52dd6 100644 --- a/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix +++ b/nixpkgs/pkgs/tools/security/step-kms-plugin/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-kms-plugin"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "smallstep"; repo = pname; rev = "v${version}"; - hash = "sha256-pbSv3qTQkeYWtg5HKu9kUIWYw6t6yKKA4GQuiwGEPD8="; + hash = "sha256-l0MMcLghhqVVQAdhk0a0nDqYvJbXCV2PFbRtiGQcDn0="; }; - vendorHash = "sha256-hb1Nn/+PVhhBByQ8I9MuUEd5di5jEZVMtSpm0+qBXQk="; + vendorHash = "sha256-3du8KlM08N5hKmzZWYZdfPOL5R+BspbK6ABF+RSJzHg="; proxyVendor = true; diff --git a/nixpkgs/pkgs/tools/security/sudo/default.nix b/nixpkgs/pkgs/tools/security/sudo/default.nix index 40056ec72eb8..0ad8255a201a 100644 --- a/nixpkgs/pkgs/tools/security/sudo/default.nix +++ b/nixpkgs/pkgs/tools/security/sudo/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.9.15p2"; + version = "1.9.15p3"; src = fetchurl { url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; - hash = "sha256-GZwM2/p+/P/6nIhoSo4vsgamK3CjFlB+SpHInIc7vMg="; + hash = "sha256-eMh6HM7EL3oJUAL+KxR4pRBgNjWeNiuGdTSo4AVqBJQ="; }; prePatch = '' diff --git a/nixpkgs/pkgs/tools/security/terrascan/default.nix b/nixpkgs/pkgs/tools/security/terrascan/default.nix index 9bff2f0679e4..c492ce43709e 100644 --- a/nixpkgs/pkgs/tools/security/terrascan/default.nix +++ b/nixpkgs/pkgs/tools/security/terrascan/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "terrascan"; - version = "1.18.5"; + version = "1.18.7"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RDKy588qUvs0SGysz4DnQMliKiTJn4GA53kDyMZhzQE="; + hash = "sha256-i621Qi0wlDYMpK/srFAiwALJ0cwMGh5jNlCqj8fM96w="; }; vendorHash = "sha256-9zD81p/UjH43B0aeqlItP9vrGMaT/zhVYv60ot153Gc="; diff --git a/nixpkgs/pkgs/tools/security/tor/default.nix b/nixpkgs/pkgs/tools/security/tor/default.nix index 34088e3afbc6..5fc68c0a1c29 100644 --- a/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/nixpkgs/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.8.9"; + version = "0.4.8.10"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "sha256-Wbt9iJD2ExtM5TRPPc6l3rIYK39PEP8MtOTYHxGyz2U="; + sha256 = "sha256-5ii0+rcO20cncVsjzykxN1qfdoWsCPLFnqSYoXhGOoY="; }; outputs = [ "out" "geoip" ]; diff --git a/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix b/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix index 4e8fd919f9ae..d622ab5b93da 100644 --- a/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix +++ b/nixpkgs/pkgs/tools/security/tpm2-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tpm2-tools"; - version = "5.5"; + version = "5.6"; src = fetchurl { url = "https://github.com/tpm2-software/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-H9tJxzBTe/2u0IiISIGmHjv9Eh6VfsC9zu7AJhI2wSM="; + sha256 = "sha256-Usi8uq3KCCq/5et+5JZ9LWMthLFndnXy8HG20uwizsM="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/security/vals/default.nix b/nixpkgs/pkgs/tools/security/vals/default.nix index 9282bf7bb9ce..0ecca297a222 100644 --- a/nixpkgs/pkgs/tools/security/vals/default.nix +++ b/nixpkgs/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.28.0"; + version = "0.30.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "variantdev"; repo = pname; - sha256 = "sha256-6sKwRYbWaKrnMLU+G4/s3CTjUYeovsWttAvk1MnIFPI="; + sha256 = "sha256-3nzbib/oNrbnvjJ+4Z3zU2h6HSnemPap2fvufJKQIdk="; }; - vendorHash = "sha256-CwRhtC+Ome/oyTSd8rPpQ3TgBkFb9CM3XRc0k2g2lHU="; + vendorHash = "sha256-6i6CHa3kNe9QW87l6KjShxX/qpf1U+1c9oUoPBi1qO4="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/security/vault/default.nix b/nixpkgs/pkgs/tools/security/vault/default.nix index fb9ce6fd6d5a..e86c160dbd4b 100644 --- a/nixpkgs/pkgs/tools/security/vault/default.nix +++ b/nixpkgs/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.14.4"; + version = "1.14.8"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-E7lEKsbl2L6KhLgAZbemCaTIjbsvl3wg3oCURn/Judc="; + sha256 = "sha256-sGCODCBgsxyr96zu9ntPmMM/gHVBBO+oo5+XsdbCK4E="; }; - vendorHash = "sha256-8ytAT7qVXAIfoeMyTBMJ6DiWn74sRM1WrrOYaKTlKMo="; + vendorHash = "sha256-zpHjZjgCgf4b2FAJQ22eVgq0YGoVvxGYJ3h/3ZRiyrQ="; proxyVendor = true; diff --git a/nixpkgs/pkgs/tools/security/vault/vault-bin.nix b/nixpkgs/pkgs/tools/security/vault/vault-bin.nix index ca392d68a96d..abb548e68775 100644 --- a/nixpkgs/pkgs/tools/security/vault/vault-bin.nix +++ b/nixpkgs/pkgs/tools/security/vault/vault-bin.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "vault-bin"; - version = "1.15.2"; + version = "1.15.4"; src = let @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-aawDrQu8wEZqJ/uyCJjtWcgy8Ut34B5P+odqddE5P3M="; - aarch64-linux = "sha256-thLVw//yIgPCAV9CdrRlINLg+cO5aB279I2aboZMF6w="; - i686-linux = "sha256-bUhtnQB5YZdDuB4uondln0D3itoTr+1FaqjgTiT76WA="; - x86_64-darwin = "sha256-+wZrWwbpibtCla1ydhDnLJsHrVymLzEXVE1KftZ+pOs="; - aarch64-darwin = "sha256-2FGiCzIAEyXTqRaKEDZK5d/PWl4EmvJl9NieiOdgOeY="; + x86_64-linux = "sha256-E1tNqPkaZVnJXtV+ENt2Ajpdq0AYMPZSFMLAFiSxknY="; + aarch64-linux = "sha256-p+pYU4WenDHZmQQQFTm2ttHjxL+63NWy8G+cbAZLJEI="; + i686-linux = "sha256-FoClSgz/QAD7uktFcYmKsCXnS8kIm8a7BLd2N29Z/fE="; + x86_64-darwin = "sha256-Lykhs/tTFDBqk8SJ26k712oMUAhXlmBeNNi3Ve/M1B4="; + aarch64-darwin = "sha256-r9OamlIgFUGgIFX1baQCdBsDGmPwZoTVu+Zab99KnhM="; }; in fetchzip { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { description = "A tool for managing secrets, this binary includes the UI"; homepage = "https://www.vaultproject.io"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.mpl20; + license = licenses.bsl11; maintainers = with maintainers; teams.serokell.members ++ [ offline psyanticy Chili-Man techknowlogick mkaito ]; mainProgram = "vault"; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; diff --git a/nixpkgs/pkgs/tools/security/volatility/default.nix b/nixpkgs/pkgs/tools/security/volatility/default.nix deleted file mode 100644 index 9a4f27a0debc..000000000000 --- a/nixpkgs/pkgs/tools/security/volatility/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchFromGitHub, python2Packages }: - -python2Packages.buildPythonApplication rec { - pname = "volatility"; - version = "2.6.1"; - - src = fetchFromGitHub { - owner = "volatilityfoundation"; - repo = pname; - rev = version; - sha256 = "1v92allp3cv3akk71kljcwxr27h1k067dsq7j9h8jnlwk9jxh6rf"; - }; - - doCheck = false; - - propagatedBuildInputs = with python2Packages; [ pycrypto distorm3 pillow ]; - - meta = with lib; { - homepage = "https://www.volatilityfoundation.org/"; - description = "Advanced memory forensics framework"; - maintainers = with maintainers; [ bosu ]; - license = licenses.gpl2Plus; - broken = true; - }; -} diff --git a/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock b/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock index b233f57a5817..186144a3b1a9 100644 --- a/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock +++ b/nixpkgs/pkgs/tools/security/wpscan/Gemfile.lock @@ -1,57 +1,57 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.1.7.4) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.4) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - cms_scanner (0.13.8) - ethon (>= 0.14, < 0.16) + cms_scanner (0.13.9) + ethon (>= 0.14, < 0.17) get_process_mem (~> 0.2.5) - nokogiri (>= 1.11.4, < 1.14.0) + nokogiri (>= 1.11.4, < 1.16.0) opt_parse_validator (~> 1.9.5) - public_suffix (~> 4.0.3) - ruby-progressbar (>= 1.10, < 1.12) - sys-proctable (~> 1.2.2) + public_suffix (>= 4.0.3, < 5.1.0) + ruby-progressbar (>= 1.10, < 1.14) + sys-proctable (>= 1.2.2, < 1.4.0) typhoeus (>= 1.3, < 1.5) xmlrpc (~> 0.3) yajl-ruby (~> 1.4.1) concurrent-ruby (1.2.2) - ethon (0.15.0) + ethon (0.16.0) ffi (>= 1.15.0) - ffi (1.15.5) + ffi (1.16.3) get_process_mem (0.2.7) ffi (~> 1.0) i18n (1.14.1) concurrent-ruby (~> 1.0) - mini_portile2 (2.8.2) - minitest (5.18.1) - nokogiri (1.13.10) - mini_portile2 (~> 2.8.0) + mini_portile2 (2.8.5) + minitest (5.20.0) + nokogiri (1.15.5) + mini_portile2 (~> 2.8.2) racc (~> 1.4) opt_parse_validator (1.9.5) activesupport (>= 5.2, < 6.2.0) addressable (>= 2.5, < 2.9) - public_suffix (4.0.7) - racc (1.7.1) - ruby-progressbar (1.11.0) - sys-proctable (1.2.7) + public_suffix (5.0.4) + racc (1.7.3) + ruby-progressbar (1.13.0) + sys-proctable (1.3.0) ffi (~> 1.1) - typhoeus (1.4.0) + typhoeus (1.4.1) ethon (>= 0.9.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) webrick (1.8.1) - wpscan (3.8.24) - cms_scanner (~> 0.13.8) - xmlrpc (0.3.2) + wpscan (3.8.25) + cms_scanner (~> 0.13.9) + xmlrpc (0.3.3) webrick yajl-ruby (1.4.3) - zeitwerk (2.6.8) + zeitwerk (2.6.12) PLATFORMS ruby @@ -60,4 +60,4 @@ DEPENDENCIES wpscan BUNDLED WITH - 2.4.13 + 2.4.22 diff --git a/nixpkgs/pkgs/tools/security/wpscan/gemset.nix b/nixpkgs/pkgs/tools/security/wpscan/gemset.nix index 5cae455dd014..abe19a29bf8f 100644 --- a/nixpkgs/pkgs/tools/security/wpscan/gemset.nix +++ b/nixpkgs/pkgs/tools/security/wpscan/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0s465919p6fcgcsqin8w8hay2m598dvnzks490hbsb0p68sdz69m"; + sha256 = "1nhrdih0rk46i0s6x7nqhbypmj1hf23zl5gfl9xasb6k4r2a1dxk"; type = "gem"; }; - version = "6.1.7.4"; + version = "6.1.7.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + sha256 = "05r1fwy487klqkya7vzia8hnklcxy4vr92m9dmni3prfwk6zpw33"; type = "gem"; }; - version = "2.8.4"; + version = "2.8.5"; }; cms_scanner = { dependencies = ["ethon" "get_process_mem" "nokogiri" "opt_parse_validator" "public_suffix" "ruby-progressbar" "sys-proctable" "typhoeus" "xmlrpc" "yajl-ruby"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15d7djrrkrcwznglgkr4y80jbsbxaf071qhjnn4i1c4n7nszwwfj"; + sha256 = "0p3vdkkd04r31d503z5v0480xlq1fhiw77icbk5s17y6dwfacydy"; type = "gem"; }; - version = "0.13.8"; + version = "0.13.9"; }; concurrent-ruby = { groups = ["default"]; @@ -48,20 +48,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kd7c61f28f810fgxg480j7457nlvqarza9c2ra0zhav0dd80288"; + sha256 = "17ix0mijpsy3y0c6ywrk5ibarmvqzjsirjyprpsy3hwax8fdm85v"; type = "gem"; }; - version = "0.15.0"; + version = "0.16.0"; }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd"; type = "gem"; }; - version = "1.15.5"; + version = "1.16.3"; }; get_process_mem = { dependencies = ["ffi"]; @@ -90,20 +90,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "1kl9c3kdchjabrihdqfmcplk3lq4cw1rr9f378y6q22qwy5dndvs"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.5"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; + sha256 = "0bkmfi9mb49m0fkdhl2g38i3xxa02d411gg0m8x0gvbwfmmg5ym3"; type = "gem"; }; - version = "5.18.1"; + version = "5.20.0"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -111,10 +111,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0n79k78c5vdcyl0m3y3l5x9kxl6xf5lgriwi2vd665qmdkr01vnk"; + sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12"; type = "gem"; }; - version = "1.13.10"; + version = "1.15.5"; }; opt_parse_validator = { dependencies = ["activesupport" "addressable"]; @@ -132,30 +132,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1f3knlwfwm05sfbaihrxm4g772b79032q14c16q4b38z8bi63qcb"; + sha256 = "1bni4qjrsh2q49pnmmd6if4iv3ak36bd2cckrs6npl111n769k9m"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.4"; }; racc = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11v3l46mwnlzlc371wr3x6yylpgafgwdf0q7hc7c1lzx6r414r5g"; + sha256 = "01b9662zd2x9bp4rdjfid07h09zxj7kvn7f5fghbqhzc625ap1dp"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.3"; }; ruby-progressbar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc"; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; type = "gem"; }; - version = "1.11.0"; + version = "1.13.0"; }; sys-proctable = { dependencies = ["ffi"]; @@ -163,10 +163,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121ix0bl19pawhljs17sfgddkd0hgxlhchsz9kxw14ipmskjq9ah"; + sha256 = "0m3fj6j1qpfszqnsvr6wpak0d9vw5ggylaqkalhl3m50kbbimxii"; type = "gem"; }; - version = "1.2.7"; + version = "1.3.0"; }; typhoeus = { dependencies = ["ethon"]; @@ -174,10 +174,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m22yrkmbj81rzhlny81j427qdvz57yk5wbcf3km0nf3bl6qiygz"; + sha256 = "0z7gamf6s83wy0yqms3bi4srirn3fc0lc7n65lqanidxcj1xn5qw"; type = "gem"; }; - version = "1.4.0"; + version = "1.4.1"; }; tzinfo = { dependencies = ["concurrent-ruby"]; @@ -206,10 +206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qh7x5sjx1i9h8zrp86qz126brxbqx0c3wxc8vn7fpln0y78nw9q"; + sha256 = "1x04asq0aznbm6m79jlsv7mjbhq755759s4bi3qbyrv5rwpy7hji"; type = "gem"; }; - version = "3.8.24"; + version = "3.8.25"; }; xmlrpc = { dependencies = ["webrick"]; @@ -217,10 +217,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xa79ry3976ylap38cr5g6q3m81plm611flqd3dwgnmgbkycb6jp"; + sha256 = "0fwfnccagsjrbvrav5nbk3zracj9zncr7i375nn20jd4cfy4cggc"; type = "gem"; }; - version = "0.3.2"; + version = "0.3.3"; }; yajl-ruby = { groups = ["default"]; @@ -237,9 +237,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + sha256 = "1gir0if4nryl1jhwi28669gjwhxb7gzrm1fcc8xzsch3bnbi47jn"; type = "gem"; }; - version = "2.6.8"; + version = "2.6.12"; }; } diff --git a/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix b/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix index f6bfe6db6958..edc02b3f4465 100644 --- a/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix +++ b/nixpkgs/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.131"; + version = "1.0.137"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-92OpvUt+0iN+UdEGjDdVCjUUlbuOjUgOjc+DGMUnx9U="; + sha256 = "sha256-+/P+pt79kGIr399c3oTwqbvtMc1nJNRhBYmYJsLrmDg="; }; - cargoHash = "sha256-FaQwxt3XcDOXlzcKEdMyE9TpmGykQOnJdxtM3EqMpfU="; + cargoHash = "sha256-QCWlyuoogrU09JvP+X5If1KcYjaoL0zVhBexXwSqc1U="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/nixpkgs/pkgs/tools/system/gnome-resources/default.nix b/nixpkgs/pkgs/tools/system/gnome-resources/default.nix new file mode 100644 index 000000000000..4a6bdbcf95de --- /dev/null +++ b/nixpkgs/pkgs/tools/system/gnome-resources/default.nix @@ -0,0 +1,71 @@ +{ fetchFromGitHub +, stdenv +, lib +, appstream-glib +, cargo +, desktop-file-utils +, meson +, pkg-config +, rustPlatform +, rustc +, glib +, wrapGAppsHook4 +, systemd +, polkit +, dmidecode +, gtk4 +, libadwaita +, ninja +}: +stdenv.mkDerivation rec { + pname = "gnome-resources"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "nokyan"; + repo = "resources"; + rev = "v${version}"; + hash = "sha256-OVz1vsmOtH/5sEuyl2BfDqG2/9D1HGtHA0FtPntKQT0="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + hash = "sha256-SkCEA9CKqzy0wSIUj0DG6asIysD7G9i3nJ9jwhwAUqY="; + }; + + nativeBuildInputs = [ + pkg-config + desktop-file-utils + appstream-glib + meson + ninja + rustc + cargo + rustPlatform.cargoSetupHook + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + polkit + systemd + ]; + + postPatch = '' + substituteInPlace src/utils/memory.rs \ + --replace '"dmidecode"' '"${dmidecode}/bin/dmidecode"' + ''; + + mesonFlags = [ "-Dprofile=default" ]; + + meta = with lib; { + homepage = "https://github.com/nokyan/resources"; + description = "Monitor your system resources and processes"; + license = licenses.gpl3Plus; + mainProgram = "resources"; + maintainers = with maintainers; [ ewuuwe ]; + platforms = platforms.linux; + }; +} diff --git a/nixpkgs/pkgs/tools/system/lshw/default.nix b/nixpkgs/pkgs/tools/system/lshw/default.nix index 9878f82b9d09..5a6318ea4c21 100644 --- a/nixpkgs/pkgs/tools/system/lshw/default.nix +++ b/nixpkgs/pkgs/tools/system/lshw/default.nix @@ -37,6 +37,8 @@ stdenv.mkDerivation rec { buildFlags = [ "all" ] ++ lib.optional withGUI "gui"; + hardeningDisable = lib.optionals stdenv.hostPlatform.isStatic [ "fortify" ]; + installTargets = [ "install" ] ++ lib.optional withGUI "install-gui"; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/system/netdata/default.nix b/nixpkgs/pkgs/tools/system/netdata/default.nix index e6f65a8c0f5e..4248b00003ec 100644 --- a/nixpkgs/pkgs/tools/system/netdata/default.nix +++ b/nixpkgs/pkgs/tools/system/netdata/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # Don't forget to update go.d.plugin.nix as well - version = "1.43.2"; + version = "1.44.0"; pname = "netdata"; src = fetchFromGitHub { @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { repo = "netdata"; rev = "v${version}"; hash = if withCloudUi - then "sha256-ZhSuU2VTJPFJ3ja5eHx5uTuR19LleoID8Efr9FTyg74=" - else "sha256-t2awo118mYbuoNiKiAxM5xpRmQSha+/NR5G+shsotek="; + then "sha256-8kkOpMfcYPcHI3GuevZ2NYjJjlZvrvBgIs883Zsztgw=" + else "sha256-Kui3sV8OzBri4h47qD10snQgdvdi6yi/2z4cXWREcxE="; fetchSubmodules = true; # Remove v2 dashboard distributed under NCUL1. Make sure an empty diff --git a/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix b/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix index 6e64d33f7fb9..71af680b238c 100644 --- a/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix @@ -2,16 +2,16 @@ buildGo121Module rec { pname = "netdata-go-plugins"; - version = "0.56.4"; + version = "0.57.2"; src = fetchFromGitHub { owner = "netdata"; repo = "go.d.plugin"; rev = "v${version}"; - hash = "sha256-7dR1TL2Ycb+7yHoFklrKdXXxIG4Tx+fAG5ScAAtbVRw="; + hash = "sha256-Qtk1/sQxWAGPHid6tPlwylyHvhxwWTJMT8TwCd/gazk="; }; - vendorHash = "sha256-Faa+7tT3sPxlT6eQEmFotOJnt9b49ffDPEHt5V7tQa0="; + vendorHash = "sha256-SFXf99cSA8sncAzZqj2eiiJFhyD4TXQipGAeM2Hivak="; doCheck = false; diff --git a/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch b/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch index 6e24d707d0ae..039376fe4e3a 100644 --- a/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch +++ b/nixpkgs/pkgs/tools/system/netdata/no-files-in-etc-and-var.patch @@ -1,8 +1,8 @@ -diff --git a/collectors/Makefile.am b/collectors/Makefile.am -index 2aec3dd3e..27385ec28 100644 ---- a/collectors/Makefile.am -+++ b/collectors/Makefile.am -@@ -31,7 +31,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d +diff --git c/collectors/Makefile.am i/collectors/Makefile.am +index 1bbb2e0ef..96c400d33 100644 +--- c/collectors/Makefile.am ++++ i/collectors/Makefile.am +@@ -33,7 +33,7 @@ usercustompluginsconfigdir=$(configdir)/custom-plugins.d usergoconfigdir=$(configdir)/go.d # Explicitly install directories to avoid permission issues due to umask @@ -11,10 +11,10 @@ index 2aec3dd3e..27385ec28 100644 $(INSTALL) -d $(DESTDIR)$(usercustompluginsconfigdir) $(INSTALL) -d $(DESTDIR)$(usergoconfigdir) -diff --git a/collectors/charts.d.plugin/Makefile.am b/collectors/charts.d.plugin/Makefile.am -index 03c7f0a94..01985db01 100644 ---- a/collectors/charts.d.plugin/Makefile.am -+++ b/collectors/charts.d.plugin/Makefile.am +diff --git c/collectors/charts.d.plugin/Makefile.am i/collectors/charts.d.plugin/Makefile.am +index f82992fd4..4cac1ae4f 100644 +--- c/collectors/charts.d.plugin/Makefile.am ++++ i/collectors/charts.d.plugin/Makefile.am @@ -34,7 +34,7 @@ dist_userchartsconfig_DATA = \ $(NULL) @@ -24,10 +24,10 @@ index 03c7f0a94..01985db01 100644 $(INSTALL) -d $(DESTDIR)$(userchartsconfigdir) chartsconfigdir=$(libconfigdir)/charts.d -diff --git a/collectors/ebpf.plugin/Makefile.am b/collectors/ebpf.plugin/Makefile.am +diff --git c/collectors/ebpf.plugin/Makefile.am i/collectors/ebpf.plugin/Makefile.am index 2d5f92a6b..8b11c7502 100644 ---- a/collectors/ebpf.plugin/Makefile.am -+++ b/collectors/ebpf.plugin/Makefile.am +--- c/collectors/ebpf.plugin/Makefile.am ++++ i/collectors/ebpf.plugin/Makefile.am @@ -9,7 +9,7 @@ SUFFIXES = .in userebpfconfigdir=$(configdir)/ebpf.d @@ -37,10 +37,10 @@ index 2d5f92a6b..8b11c7502 100644 $(INSTALL) -d $(DESTDIR)$(userebpfconfigdir) dist_noinst_DATA = \ -diff --git a/collectors/python.d.plugin/Makefile.am b/collectors/python.d.plugin/Makefile.am +diff --git c/collectors/python.d.plugin/Makefile.am i/collectors/python.d.plugin/Makefile.am index ca49c1c02..1b9bcc446 100644 ---- a/collectors/python.d.plugin/Makefile.am -+++ b/collectors/python.d.plugin/Makefile.am +--- c/collectors/python.d.plugin/Makefile.am ++++ i/collectors/python.d.plugin/Makefile.am @@ -32,7 +32,7 @@ dist_userpythonconfig_DATA = \ $(NULL) @@ -50,10 +50,10 @@ index ca49c1c02..1b9bcc446 100644 $(INSTALL) -d $(DESTDIR)$(userpythonconfigdir) pythonconfigdir=$(libconfigdir)/python.d -diff --git a/collectors/statsd.plugin/Makefile.am b/collectors/statsd.plugin/Makefile.am +diff --git c/collectors/statsd.plugin/Makefile.am i/collectors/statsd.plugin/Makefile.am index c8144c137..f8aaa89b6 100644 ---- a/collectors/statsd.plugin/Makefile.am -+++ b/collectors/statsd.plugin/Makefile.am +--- c/collectors/statsd.plugin/Makefile.am ++++ i/collectors/statsd.plugin/Makefile.am @@ -19,5 +19,5 @@ dist_userstatsdconfig_DATA = \ $(NULL) @@ -61,10 +61,10 @@ index c8144c137..f8aaa89b6 100644 -install-exec-local: +no-install-exec-local: $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir) -diff --git a/health/Makefile.am b/health/Makefile.am -index 20e000860..add0137b3 100644 ---- a/health/Makefile.am -+++ b/health/Makefile.am +diff --git c/health/Makefile.am i/health/Makefile.am +index 7d7bca4cc..3086876dd 100644 +--- c/health/Makefile.am ++++ i/health/Makefile.am @@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \ $(NULL) @@ -74,11 +74,24 @@ index 20e000860..add0137b3 100644 $(INSTALL) -d $(DESTDIR)$(userhealthconfigdir) healthconfigdir=$(libconfigdir)/health.d -diff --git a/system/Makefile.am b/system/Makefile.am -index 54e9278c8..e7cc7acea 100644 ---- a/system/Makefile.am -+++ b/system/Makefile.am -@@ -21,12 +21,9 @@ include $(top_srcdir)/build/subst.inc +diff --git c/logsmanagement/Makefile.am i/logsmanagement/Makefile.am +index 33f08d556..1f08cbae9 100644 +--- c/logsmanagement/Makefile.am ++++ i/logsmanagement/Makefile.am +@@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in + userlogsmanagconfigdir=$(configdir)/logsmanagement.d + + # Explicitly install directories to avoid permission issues due to umask +-install-exec-local: ++no-install-exec-local: + $(INSTALL) -d $(DESTDIR)$(userlogsmanagconfigdir) + + dist_libconfig_DATA = \ +diff --git c/system/Makefile.am i/system/Makefile.am +index 1e96f6f4f..98122ecdc 100644 +--- c/system/Makefile.am ++++ i/system/Makefile.am +@@ -22,12 +22,9 @@ include $(top_srcdir)/build/subst.inc SUFFIXES = .in dist_config_SCRIPTS = \ @@ -91,7 +104,7 @@ index 54e9278c8..e7cc7acea 100644 $(NULL) libconfigvnodesdir=$(libconfigdir)/vnodes -@@ -46,7 +43,7 @@ libsysrunitdir=$(libsysdir)/runit +@@ -47,7 +44,7 @@ libsysrunitdir=$(libsysdir)/runit libsyssystemddir=$(libsysdir)/systemd # Explicitly install directories to avoid permission issues due to umask @@ -100,10 +113,10 @@ index 54e9278c8..e7cc7acea 100644 $(INSTALL) -d $(DESTDIR)$(configdir) $(INSTALL) -d $(DESTDIR)$(libsysdir) $(INSTALL) -d $(DESTDIR)$(libsyscrondir) -diff --git a/web/Makefile.am b/web/Makefile.am +diff --git c/web/Makefile.am i/web/Makefile.am index be2c545c3..55f373114 100644 ---- a/web/Makefile.am -+++ b/web/Makefile.am +--- c/web/Makefile.am ++++ i/web/Makefile.am @@ -13,7 +13,7 @@ SUBDIRS = \ usersslconfigdir=$(configdir)/ssl diff --git a/nixpkgs/pkgs/tools/system/skeema/default.nix b/nixpkgs/pkgs/tools/system/skeema/default.nix index 1d5c7c4886a9..38d6c4d1f75a 100644 --- a/nixpkgs/pkgs/tools/system/skeema/default.nix +++ b/nixpkgs/pkgs/tools/system/skeema/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skeema"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "skeema"; repo = "skeema"; rev = "v${version}"; - hash = "sha256-BXjcn9oakTvaWPYIsAsjYRwQ1aKhZ4PAV2AkxSVOF/I="; + hash = "sha256-S7eMqaz8BZ80AwIrVmX+rnEgIwEdy8q65FIy6Mac4CY="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 40211cb4e71b..ecef593219d3 100644 --- a/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.17.01"; + version = "0.17.02"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-hTwA0BT8r54Gnyf/itP2onQE6zhNEoejseuIEwvx4D8="; + hash = "sha256-9pdTxGH9Oghg0Brxi6v/3ghsuT2aX/bAGVQPNjik3Zk="; }; postPatch = '' diff --git a/nixpkgs/pkgs/tools/system/tree/default.nix b/nixpkgs/pkgs/tools/system/tree/default.nix index cb52cbdccb38..191f9466f339 100644 --- a/nixpkgs/pkgs/tools/system/tree/default.nix +++ b/nixpkgs/pkgs/tools/system/tree/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "http://mama.indstate.edu/users/ice/tree/"; + homepage = "https://oldmanprogrammer.net/source.php?dir=projects/tree"; description = "Command to produce a depth indented directory listing"; license = licenses.gpl2; longDescription = '' diff --git a/nixpkgs/pkgs/tools/system/zenith/Cargo.lock b/nixpkgs/pkgs/tools/system/zenith/Cargo.lock index 401042eea326..0c7828d6a445 100644 --- a/nixpkgs/pkgs/tools/system/zenith/Cargo.lock +++ b/nixpkgs/pkgs/tools/system/zenith/Cargo.lock @@ -9,13 +9,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] -name = "aho-corasick" -version = "0.7.15" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5" -dependencies = [ - "memchr", -] +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] name = "android_system_properties" @@ -27,36 +24,27 @@ dependencies = [ ] [[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - -[[package]] name = "async-channel" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14485364214912d3b19cc3435dde4df66065127f05fa0d75c712f36f12c2f28" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] [[package]] name = "async-executor" -version = "1.4.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" +checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499" dependencies = [ + "async-lock", "async-task", "concurrent-queue", - "fastrand", + "fastrand 2.0.1", "futures-lite", - "once_cell", "slab", ] @@ -74,97 +62,101 @@ dependencies = [ [[package]] name = "async-io" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8121296a9f05be7f34aa4196b1747243b3b62e048bb7906f644f3fbfc490cf7" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ "async-lock", "autocfg", + "cfg-if 1.0.0", "concurrent-queue", "futures-lite", - "libc", "log", "parking", "polling", + "rustix 0.37.25", "slab", "socket2", "waker-fn", - "winapi", ] [[package]] name = "async-lock" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8101efe8695a6c17e02911402145357e718ac92d3ff88ae8419e84b1707b685" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", - "futures-lite", + "event-listener 2.5.3", ] [[package]] name = "async-net" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4051e67316bc7eff608fe723df5d32ed639946adcd69e07df41fd42a7b411f1f" +checksum = "0434b1ed18ce1cf5769b8ac540e33f01fa9471058b5e89da9e06f3c882a8c12f" dependencies = [ "async-io", - "autocfg", "blocking", "futures-lite", ] [[package]] name = "async-process" -version = "1.5.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02111fd8655a613c25069ea89fc8d9bb89331fa77486eb3bc059ee757cfa481c" +checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88" dependencies = [ "async-io", - "autocfg", + "async-lock", + "async-signal", "blocking", "cfg-if 1.0.0", - "event-listener", + "event-listener 3.0.0", "futures-lite", - "libc", - "once_cell", - "signal-hook", - "winapi", + "rustix 0.38.19", + "windows-sys", +] + +[[package]] +name = "async-signal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2a5415b7abcdc9cd7d63d6badba5288b2ca017e3fbd4173b8f405449f1a2399" +dependencies = [ + "async-io", + "async-lock", + "atomic-waker", + "cfg-if 1.0.0", + "futures-core", + "futures-io", + "rustix 0.38.19", + "signal-hook-registry", + "slab", + "windows-sys", ] [[package]] name = "async-task" -version = "4.3.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" [[package]] name = "async-trait" -version = "0.1.58" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "atomic-waker" -version = "1.0.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -183,15 +175,13 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.59.2" +version = "0.63.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bd2a9a458e8f4304c52c43ebb0cfbd520289f8379a52e329a38afda99bf8eb8" +checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", - "clap", - "env_logger 0.9.1", "lazy_static", "lazycell", "log", @@ -201,6 +191,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", + "syn 1.0.109", "which", ] @@ -211,30 +202,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + +[[package]] name = "blocking" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", + "async-lock", "async-task", - "atomic-waker", - "fastrand", + "fastrand 2.0.1", + "futures-io", "futures-lite", - "once_cell", + "piper", + "tracing", ] [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byte-unit" -version = "4.0.17" +version = "4.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581ad4b3d627b0c09a0ccb2912148f839acaca0b93cf54cbe42b6c674e86079c" +checksum = "da78b32057b8fdfc352504708feeba7216dcd65a2c9ab02978cbd288d1279b6c" dependencies = [ "serde", "utf8-width", @@ -242,15 +241,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" - -[[package]] -name = "cache-padded" -version = "1.2.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "cassowary" @@ -260,9 +253,12 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.74" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +dependencies = [ + "libc", +] [[package]] name = "cexpr" @@ -287,24 +283,23 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.22" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfd4d1b31faaa3a89d7934dbded3111da0d2ef28e3ebccdb4f0179f5929d1ef1" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ + "android-tzdata", "iana-time-zone", "js-sys", - "num-integer", "num-traits", - "time", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] name = "clang-sys" -version = "1.4.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -312,47 +307,12 @@ dependencies = [ ] [[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] name = "concurrent-queue" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af4780a44ab5696ea9e28294517f1fffb421a83a25af521333c838635509db9c" -dependencies = [ - "cache-padded", -] - -[[package]] -name = "core-foundation" -version = "0.7.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ - "core-foundation-sys 0.7.0", - "libc", + "crossbeam-utils", ] [[package]] @@ -361,21 +321,15 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys 0.8.3", + "core-foundation-sys", "libc", ] [[package]] name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "crc32fast" @@ -387,20 +341,10 @@ dependencies = [ ] [[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -409,33 +353,33 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.11" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f916dfc5d356b0ed9dae65f1db9fc9770aa2851d2662b988ccf4fe3516e86348" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "memoffset", + "memoffset 0.9.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.12" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edbafec5fa1f196ca66527c1b12c2ec4745ca14b50f1ad8f9f6f720b55d11fac" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossterm" -version = "0.25.0" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags", + "bitflags 2.4.0", "crossterm_winapi", "libc", "mio", @@ -447,58 +391,14 @@ dependencies = [ [[package]] name = "crossterm_winapi" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" dependencies = [ "winapi", ] [[package]] -name = "cxx" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] name = "darling" version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -518,8 +418,8 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.9.3", - "syn", + "strsim", + "syn 1.0.109", ] [[package]] @@ -530,7 +430,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -582,30 +482,27 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "either" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "env_logger" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c90bf5f19754d10198ccb95b70664fc925bd1fc090a0fd9a6ebc54acc8cd6272" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "atty", - "humantime", "log", - "regex", - "termcolor", ] [[package]] -name = "env_logger" -version = "0.10.0" +name = "errno" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "log", + "libc", + "windows-sys", ] [[package]] @@ -615,19 +512,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] +name = "event-listener" +version = "3.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e56284f00d94c1bc7fd3c77027b4623c88c1f53d8d2394c6199f2921dea325" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] [[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + +[[package]] name = "flate2" -version = "1.0.24" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "miniz_oxide", @@ -641,9 +555,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -656,9 +570,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -666,15 +580,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -683,17 +597,17 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" dependencies = [ - "fastrand", + "fastrand 1.9.0", "futures-core", "futures-io", "memchr", @@ -704,26 +618,26 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-timer" @@ -733,9 +647,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -751,20 +665,20 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "gumdrop" @@ -783,10 +697,16 @@ checksum = "729f9bd3449d77e7831a18abfb7ba2f99ee813dfd15b8c2167c9a54ba20aa99d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] name = "heim" version = "0.1.0-rc.1" source = "git+https://github.com/bvaisvil/heim.git?branch=zenith_changes#509c858dce58e2de0b1b772170ee2be21a58149b" @@ -809,13 +729,13 @@ version = "0.1.0-rc.1" source = "git+https://github.com/bvaisvil/heim.git?branch=zenith_changes#509c858dce58e2de0b1b772170ee2be21a58149b" dependencies = [ "cfg-if 1.0.0", - "core-foundation 0.9.3", + "core-foundation", "futures-core", "futures-util", "lazy_static", "libc", "mach", - "nix", + "nix 0.23.2", "pin-utils", "uom 0.31.1", "winapi", @@ -844,9 +764,9 @@ name = "heim-disk" version = "0.1.0-rc.1" source = "git+https://github.com/bvaisvil/heim.git?branch=zenith_changes#509c858dce58e2de0b1b772170ee2be21a58149b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", - "core-foundation 0.9.3", + "core-foundation", "heim-common", "heim-runtime", "libc", @@ -891,13 +811,13 @@ name = "heim-net" version = "0.1.0-rc.1" source = "git+https://github.com/bvaisvil/heim.git?branch=zenith_changes#509c858dce58e2de0b1b772170ee2be21a58149b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "heim-common", "heim-runtime", "libc", "macaddr", - "nix", + "nix 0.23.2", "widestring", "winapi", ] @@ -961,41 +881,40 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.19" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] -name = "humantime" -version = "2.1.0" +name = "home" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" dependencies = [ "android_system_properties", - "core-foundation-sys 0.8.3", + "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[package]] name = "iana-time-zone-haiku" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" dependencies = [ - "cxx", - "cxx-build", + "cc", ] [[package]] @@ -1005,6 +924,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[package]] name = "instant" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1014,10 +939,30 @@ dependencies = [ ] [[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys", +] + +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + +[[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" dependencies = [ "wasm-bindgen", ] @@ -1036,34 +981,37 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.137" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libloading" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if 1.0.0", "winapi", ] [[package]] -name = "link-cplusplus" -version = "1.0.7" +name = "linux-raw-sys" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" -dependencies = [ - "cc", -] +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + +[[package]] +name = "linux-raw-sys" +version = "0.4.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "linux-taskstats" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5fe0070f80bc563d4fc21f2b064eb314a944ad167edb64dc76eb37fa8826401" +checksum = "60fdd14efd42f7d3383f76d5da9cbc1056ac6497be7352eadfabef14a5d699c0" dependencies = [ "bindgen", "libc", @@ -1074,9 +1022,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" dependencies = [ "autocfg", "scopeguard", @@ -1084,12 +1032,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "macaddr" @@ -1107,6 +1052,15 @@ dependencies = [ ] [[package]] +name = "mach2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +dependencies = [ + "libc", +] + +[[package]] name = "memchr" version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1122,6 +1076,15 @@ dependencies = [ ] [[package]] +name = "memoffset" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +dependencies = [ + "autocfg", +] + +[[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1129,30 +1092,30 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.5.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96590ba8f175222643a85693f33d26e9c8a015f599c216509b1a6894af675d34" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.5" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys", ] [[package]] name = "netlink-sys" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" +checksum = "6471bf08e7ac0135876a9581bf3217ef0333c191c128d34878079f42ee150411" dependencies = [ "bytes", "libc", @@ -1161,22 +1124,33 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cc", "cfg-if 1.0.0", "libc", - "memoffset", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", ] [[package]] name = "nom" -version = "7.1.1" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", @@ -1193,13 +1167,13 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "cfb77679af88f8b125209d354a202862602672222e7f2313fdd6dc349bad4712" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -1225,30 +1199,20 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", ] [[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] name = "nvml-wrapper" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "288bd66a5a56d8c97b178412b328419b3fdec261c0cbc4628ddc49cc16db8fc6" +checksum = "7cd21b9f5a1cce3c3515c9ffa85f5c7443e07162dae0ccf4339bb7ca38ad3454" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libloading", "nvml-wrapper-sys", "static_assertions", @@ -1258,33 +1222,33 @@ dependencies = [ [[package]] name = "nvml-wrapper-sys" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3d606d4edf766969f16828ec047ca9aa96652a17bd353dc0613bfaca49b61d6" +checksum = "c961a2ea9e91c59a69b78e69090f6f5b867bb46c0c56de9482da232437c4987e" dependencies = [ "libloading", ] [[package]] name = "once_cell" -version = "1.16.0" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "ordered-float" -version = "2.10.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ "num-traits", ] [[package]] name = "parking" -version = "2.0.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "parking_lot" @@ -1298,18 +1262,24 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.4" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0" +checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.3.5", "smallvec", - "windows-sys", + "windows-targets", ] [[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] name = "peeking_take_while" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1317,9 +1287,9 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -1328,6 +1298,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + +[[package]] name = "platforms" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1335,67 +1316,82 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polling" -version = "2.4.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab4609a838d88b73d8238967b60dd115cc08d38e2bbaf51ee1e4b695f89122e2" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", + "bitflags 1.3.2", "cfg-if 1.0.0", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "winapi", + "pin-project-lite", + "windows-sys", ] [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.21" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] [[package]] +name = "ratatui" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e2e4cd95294a85c3b4446e63ef054eea43e0205b1fd60120c16b74ff7ff96ad" +dependencies = [ + "bitflags 2.4.0", + "cassowary", + "crossterm", + "indoc", + "itertools", + "paste", + "strum", + "unicode-segmentation", + "unicode-width", +] + +[[package]] name = "raw-cpuid" version = "9.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1733f6f80c9c24268736a501cd00d41a9849b4faa7a9f9334c096e5d10553206" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "rayon" -version = "1.5.3" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ - "autocfg", - "crossbeam-deque", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "num_cpus", ] [[package]] @@ -1404,7 +1400,16 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", ] [[package]] @@ -1414,26 +1419,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.4.6" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" +checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f" dependencies = [ - "aho-corasick", - "memchr", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.27" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rustc-hash" @@ -1442,48 +1445,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] -name = "scopeguard" -version = "1.1.0" +name = "rustix" +version = "0.37.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys", +] [[package]] -name = "scratch" -version = "1.0.2" +name = "rustix" +version = "0.38.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" +dependencies = [ + "bitflags 2.4.0", + "errno", + "libc", + "linux-raw-sys 0.4.10", + "windows-sys", +] + +[[package]] +name = "rustversion" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.147" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.147" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook" -version = "0.3.14" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" dependencies = [ "libc", "signal-hook-registry", @@ -1502,33 +1532,33 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] name = "slab" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ "autocfg", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smol" -version = "1.2.5" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cf3b5351f3e783c1d79ab5fc604eeed8b8ae9abd36b166e8b87a089efd85e4" +checksum = "13f2b548cd8447f8de0fdf1c592929f70f4fc7039a05e47404b0d096ec6987a1" dependencies = [ "async-channel", "async-executor", @@ -1539,14 +1569,13 @@ dependencies = [ "async-process", "blocking", "futures-lite", - "once_cell", ] [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -1554,18 +1583,18 @@ dependencies = [ [[package]] name = "starship-battery" -version = "0.7.9" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3336198ad004af4447ae69be4f4e562c26814570f8f0c1e37858405a294e015d" +checksum = "36335b5b5ba5328b4ad2024807423010b7f533a7e5315dfd9df0acbc9d2c550e" dependencies = [ "cfg-if 1.0.0", - "core-foundation 0.7.0", + "core-foundation", "lazycell", "libc", - "mach", - "nix", + "mach2", + "nix 0.26.4", "num-traits", - "uom 0.30.0", + "uom 0.35.0", "winapi", ] @@ -1577,21 +1606,48 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.8.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] -name = "strsim" -version = "0.9.3" +name = "strum" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.25.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.38", +] [[package]] name = "syn" -version = "1.0.103" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -1613,108 +1669,82 @@ dependencies = [ ] [[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] -name = "time" -version = "0.1.44" +name = "tracing" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", + "pin-project-lite", + "tracing-core", ] [[package]] -name = "tui" -version = "0.19.0" +name = "tracing-core" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" -dependencies = [ - "bitflags", - "cassowary", - "crossterm", - "unicode-segmentation", - "unicode-width", -] +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" [[package]] name = "typenum" -version = "1.15.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "uom" -version = "0.30.0" +version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e76503e636584f1e10b9b3b9498538279561adcef5412927ba00c2b32c4ce5ed" +checksum = "b1ee6bfd0a27bf614353809a035cf6880b74239ec6c5e39a7b2860ca16809137" dependencies = [ + "num-rational", "num-traits", "typenum", ] [[package]] name = "uom" -version = "0.31.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1ee6bfd0a27bf614353809a035cf6880b74239ec6c5e39a7b2860ca16809137" +checksum = "8362194c7a9845a7a7f3562173d6e1da3f24f7132018cb78fe77a5b4474187b2" dependencies = [ - "num-rational", "num-traits", "typenum", ] @@ -1736,22 +1766,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5190c9442dcdaf0ddd50f37420417d219ae5261bbf5db120d0f9bab996c9cba1" [[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "wasi" @@ -1761,9 +1779,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -1771,24 +1789,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1796,41 +1814,33 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" - -[[package]] -name = "wepoll-ffi" -version = "0.1.2" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "which" -version = "4.3.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c831fbbee9e129a8cf93e7747a82da9d95ba8e16621cae60ec2cdc849bacb7b" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.19", ] [[package]] @@ -1856,25 +1866,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] -name = "winapi-util" -version = "0.1.5" +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "winapi", + "windows-targets", ] [[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" +name = "windows-sys" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] [[package]] -name = "windows-sys" -version = "0.42.0" +name = "windows-targets" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1887,45 +1906,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "wrapcenum-derive" @@ -1936,7 +1955,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1948,7 +1967,7 @@ dependencies = [ "chrono", "crossterm", "dirs-next", - "env_logger 0.10.0", + "env_logger", "flate2", "futures", "gumdrop", @@ -1959,12 +1978,12 @@ dependencies = [ "num-derive", "num-traits", "nvml-wrapper", + "ratatui", "serde", "serde_derive", "signal-hook", "starship-battery", "sysinfo", - "tui", "unicode-width", "users", ] diff --git a/nixpkgs/pkgs/tools/system/zenith/default.nix b/nixpkgs/pkgs/tools/system/zenith/default.nix index 52ad79fab689..af8231e96c6d 100644 --- a/nixpkgs/pkgs/tools/system/zenith/default.nix +++ b/nixpkgs/pkgs/tools/system/zenith/default.nix @@ -11,13 +11,13 @@ assert nvidiaSupport -> stdenv.isLinux; rustPlatform.buildRustPackage rec { pname = "zenith"; - version = "0.14.0"; + version = "0.14.0-unstable-2023-11-21"; src = fetchFromGitHub { owner = "bvaisvil"; repo = pname; - rev = version; - sha256 = "sha256-GrrdE9Ih8x8N2HN+1NfxfthfHbufLAT/Ac+ZZWW5Zg8="; + rev = "0ed09e6a68c1517b4d050f5e3163421718226040"; + hash = "sha256-vw/ar2Qi06HxPfPsfcxtfRhMTqY4FCE+7tCfe9sLEv0="; }; # remove cargo config so it can find the linker on aarch64-linux @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { + lib.optionalString nvidiaSupport ", and NVIDIA GPU usage"; homepage = "https://github.com/bvaisvil/zenith"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ wegank ]; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock b/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock index 29c643c10bd4..68ccd9d23b5f 100644 --- a/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock +++ b/nixpkgs/pkgs/tools/system/zram-generator/Cargo.lock @@ -79,12 +79,12 @@ dependencies = [ [[package]] name = "errno" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -142,9 +142,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" +checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" [[package]] name = "log" @@ -192,9 +192,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -259,15 +259,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.24" +version = "0.38.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" +checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316" dependencies = [ "bitflags 2.4.1", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -291,7 +291,7 @@ dependencies = [ "fastrand", "redox_syscall", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -327,7 +327,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -336,13 +345,28 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", ] [[package]] @@ -352,42 +376,84 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + +[[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + +[[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + +[[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + +[[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + +[[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + +[[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] name = "zram-generator" version = "1.1.2" dependencies = [ diff --git a/nixpkgs/pkgs/tools/text/chroma/default.nix b/nixpkgs/pkgs/tools/text/chroma/default.nix index af5241de7a05..2b59831529db 100644 --- a/nixpkgs/pkgs/tools/text/chroma/default.nix +++ b/nixpkgs/pkgs/tools/text/chroma/default.nix @@ -33,5 +33,6 @@ buildGoModule rec { description = "A general purpose syntax highlighter in pure Go"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; + mainProgram = "chroma"; }; } diff --git a/nixpkgs/pkgs/tools/text/colordiff/default.nix b/nixpkgs/pkgs/tools/text/colordiff/default.nix index 4146429e2839..69473bd2c6f6 100644 --- a/nixpkgs/pkgs/tools/text/colordiff/default.nix +++ b/nixpkgs/pkgs/tools/text/colordiff/default.nix @@ -35,5 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ SuperSandro2000 ]; + mainProgram = "colordiff"; }; } diff --git a/nixpkgs/pkgs/tools/text/d2/default.nix b/nixpkgs/pkgs/tools/text/d2/default.nix index bca032d6ddf9..4e426085374d 100644 --- a/nixpkgs/pkgs/tools/text/d2/default.nix +++ b/nixpkgs/pkgs/tools/text/d2/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "d2"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-bp45tkV7f6rGDAmhle/e3cHIqa7nPakANvk4QxetLts="; + hash = "sha256-4kSnwJTS+am9ATlUPsWLGccHXFQqrEcK0GtaqqW7fdQ="; }; - vendorHash = "sha256-QMptNFCoJouI555WkA+4TJhaEzQgJJmca3jVpM3neeI="; + vendorHash = "sha256-BEYww1wsf9nxE48TNvyFkddF0TwQg7e5BoolvvKewYg="; excludedPackages = [ "./e2etests" ]; diff --git a/nixpkgs/pkgs/tools/text/enscript/0001-use-system-getopt.patch b/nixpkgs/pkgs/tools/text/enscript/0001-use-system-getopt.patch new file mode 100644 index 000000000000..0ae8776f361e --- /dev/null +++ b/nixpkgs/pkgs/tools/text/enscript/0001-use-system-getopt.patch @@ -0,0 +1,68 @@ +From 4c5cbf6db71cf2981fc836ed370c82149748d8ea Mon Sep 17 00:00:00 2001 +From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> +Date: Wed, 6 Dec 2023 22:57:19 +0000 +Subject: [PATCH] use system getopt + +the file compat/getopt.h also needs to be removed otherwise it will +create conflicts with the system includes +--- + compat/Makefile.am | 4 ++-- + compat/Makefile.in | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/compat/Makefile.am b/compat/Makefile.am +index aefc06f..23aaf81 100644 +--- a/compat/Makefile.am ++++ b/compat/Makefile.am +@@ -25,7 +25,7 @@ + AUTOMAKE_OPTIONS = no-dependencies + + noinst_LIBRARIES = libcompat.a +-libcompat_a_SOURCES = getopt.c getopt1.c xalloc.c regex.c ++libcompat_a_SOURCES = xalloc.c regex.c + libcompat_a_LIBADD = @LIBOBJS@ @ALLOCA@ + libcompat_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@ + +@@ -34,7 +34,7 @@ libcompat_a_SOURCES_windelta = \ + +../w32/getpwd.c \ + +../w32/getuid.c + +-noinst_HEADERS = getopt.h regex.h xalloc.h ++noinst_HEADERS = regex.h xalloc.h + + EXTRA_DIST = ChangeLog.old strerror.c memmove.c memcpy.c strtol.c \ + strtoul.c gettext.h +diff --git a/compat/Makefile.in b/compat/Makefile.in +index edfc620..dee05d7 100644 +--- a/compat/Makefile.in ++++ b/compat/Makefile.in +@@ -137,7 +137,7 @@ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) + am__v_AR_0 = @echo " AR " $@; + am__v_AR_1 = + libcompat_a_AR = $(AR) $(ARFLAGS) +-am_libcompat_a_OBJECTS = getopt.$(OBJEXT) getopt1.$(OBJEXT) \ ++am_libcompat_a_OBJECTS = \ + xalloc.$(OBJEXT) regex.$(OBJEXT) + libcompat_a_OBJECTS = $(am_libcompat_a_OBJECTS) + AM_V_P = $(am__v_P_@AM_V@) +@@ -326,7 +326,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = no-dependencies + noinst_LIBRARIES = libcompat.a +-libcompat_a_SOURCES = getopt.c getopt1.c xalloc.c regex.c ++libcompat_a_SOURCES = xalloc.c regex.c + libcompat_a_LIBADD = @LIBOBJS@ @ALLOCA@ + libcompat_a_DEPENDENCIES = @LIBOBJS@ @ALLOCA@ + libcompat_a_SOURCES_windelta = \ +@@ -334,7 +334,7 @@ libcompat_a_SOURCES_windelta = \ + +../w32/getpwd.c \ + +../w32/getuid.c + +-noinst_HEADERS = getopt.h regex.h xalloc.h ++noinst_HEADERS = regex.h xalloc.h + EXTRA_DIST = ChangeLog.old strerror.c memmove.c memcpy.c strtol.c \ + strtoul.c gettext.h + +-- +2.42.0 + diff --git a/nixpkgs/pkgs/tools/text/enscript/default.nix b/nixpkgs/pkgs/tools/text/enscript/default.nix index 1299ef78679c..e5aeb75ca626 100644 --- a/nixpkgs/pkgs/tools/text/enscript/default.nix +++ b/nixpkgs/pkgs/tools/text/enscript/default.nix @@ -9,12 +9,20 @@ stdenv.mkDerivation rec { sha256 = "1fy0ymvzrrvs889zanxcaxjfcxarm2d3k43c9frmbl1ld7dblmkd"; }; - preBuild = - '' - # Fix building on Darwin with GCC. - substituteInPlace compat/regex.c --replace \ - __private_extern__ '__attribute__ ((visibility ("hidden")))' - ''; + patches = [ + # fix compile failure on macos. use system getopt like linux + # requires that compat/getopt.h is also removed + # https://savannah.gnu.org/bugs/?64307 + ./0001-use-system-getopt.patch + ]; + + postPatch = '' + # the delete component of 0001-use-system-getopt.patch + rm compat/getopt.h + # Fix building on Darwin with GCC. + substituteInPlace compat/regex.c --replace \ + __private_extern__ '__attribute__ ((visibility ("hidden")))' + ''; buildInputs = [ gettext ]; diff --git a/nixpkgs/pkgs/tools/text/fastmod/default.nix b/nixpkgs/pkgs/tools/text/fastmod/default.nix index a9f1b79c474a..f8317d70d778 100644 --- a/nixpkgs/pkgs/tools/text/fastmod/default.nix +++ b/nixpkgs/pkgs/tools/text/fastmod/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "fastmod"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "facebookincubator"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j5+6ijJ04/Non7AUSN35OhfZ04MiPUDU4V1HLwZaM9k="; + sha256 = "sha256-A/3vzfwaStoQ9gdNM8yjmL2J/pQjj6yb68WThiTF+1E="; }; - cargoSha256 = "sha256-RNTnP3RKRZXo3+L54y/8nBunGbsxVY72sbl+ZrqfeMI="; + cargoHash = "sha256-sFrABp4oYhel+GONFsTbunq+4We2DicvF9A3FT/ZArc="; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/nixpkgs/pkgs/tools/text/gtree/default.nix b/nixpkgs/pkgs/tools/text/gtree/default.nix index e151a1467446..19f53e5f0e0a 100644 --- a/nixpkgs/pkgs/tools/text/gtree/default.nix +++ b/nixpkgs/pkgs/tools/text/gtree/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gtree"; - version = "1.10.3"; + version = "1.10.4"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-KFEYkhCLMcJ4NkHu0kkuG70EvJQ3HYDvicmomcMJZjc="; + hash = "sha256-2x84nPSXNPM6MtHa90rg9V5aQIplBDW4WTzRyYUqT8A="; }; vendorHash = "sha256-rvVrVv73gW26UUy1MyxKDjUgX1mrMMii+l8qU2hLOek="; diff --git a/nixpkgs/pkgs/tools/text/miller/default.nix b/nixpkgs/pkgs/tools/text/miller/default.nix index 3a4198fa630e..e2c5fac26f7d 100644 --- a/nixpkgs/pkgs/tools/text/miller/default.nix +++ b/nixpkgs/pkgs/tools/text/miller/default.nix @@ -11,8 +11,15 @@ buildGoModule rec { sha256 = "sha256-g2Jnqo3U9acyqohGpcEEogq871qJQTc7k0/oIawAQW8="; }; + outputs = [ "out" "man" ]; + vendorHash = "sha256-/1/FTQL3Ki8QzL+1J4Ah8kwiJyGPd024di/1MC8gtkE="; + postInstall = '' + mkdir -p $man/share/man/man1 + mv ./man/mlr.1 $man/share/man/man1 + ''; + subPackages = [ "cmd/mlr" ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/text/ugrep/default.nix b/nixpkgs/pkgs/tools/text/ugrep/default.nix index ff034c853a7a..c1c4cef126ea 100644 --- a/nixpkgs/pkgs/tools/text/ugrep/default.nix +++ b/nixpkgs/pkgs/tools/text/ugrep/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep"; - version = "4.3.4"; + version = "4.3.6"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep"; rev = "v${finalAttrs.version}"; - hash = "sha256-rA6qgjzlR7a7bf5v2q1vMx1QXcKgnK5wK1Ix9CfbPro="; + hash = "sha256-eCOSUtSPIRaoc7pIyQAftcwG3P8321qk6GPbeDNNevI="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/typesetting/tex/catdvi/default.nix b/nixpkgs/pkgs/tools/typesetting/tex/catdvi/default.nix index 924aa57ece99..1958a2f4c073 100644 --- a/nixpkgs/pkgs/tools/typesetting/tex/catdvi/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/tex/catdvi/default.nix @@ -28,6 +28,11 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + # fix implicit-int compile error in test code used in configure script + postPatch = '' + sed -i 's/^main()/int main()/' configure + ''; + hardeningDisable = [ "format" ]; outputs = [ "out" ] ++ lib.optional (with stdenv; buildPlatform.canExecute hostPlatform) "dev"; diff --git a/nixpkgs/pkgs/tools/typesetting/typst/Cargo.lock b/nixpkgs/pkgs/tools/typesetting/typst/Cargo.lock deleted file mode 100644 index ae81d73200a3..000000000000 --- a/nixpkgs/pkgs/tools/typesetting/typst/Cargo.lock +++ /dev/null @@ -1,3781 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aes" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" -dependencies = [ - "cfg-if", - "cipher", - "cpufeatures", -] - -[[package]] -name = "ahash" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" -dependencies = [ - "cfg-if", - "getrandom", - "once_cell", - "version_check", - "zerocopy", -] - -[[package]] -name = "aho-corasick" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -dependencies = [ - "memchr", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - -[[package]] -name = "anstream" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys", -] - -[[package]] -name = "approx" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" -dependencies = [ - "num-traits", -] - -[[package]] -name = "arrayref" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" - -[[package]] -name = "arrayvec" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "az" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b7e4c2464d97fe331d41de9d5db0def0a96f4d823b8b32a2efd503578988973" - -[[package]] -name = "base64" -version = "0.21.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" - -[[package]] -name = "base64ct" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" - -[[package]] -name = "biblatex" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e41df82f0d1c4919d946bb0c7c3d179b6071246243d308a1bdee6cfecee3bc7" -dependencies = [ - "numerals", - "paste", - "strum", - "unicode-normalization", - "unscanny", -] - -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" -dependencies = [ - "serde", -] - -[[package]] -name = "bitvec" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bumpalo" -version = "3.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" - -[[package]] -name = "bytecheck" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" -dependencies = [ - "bytecheck_derive", - "ptr_meta", - "simdutf8", -] - -[[package]] -name = "bytecheck_derive" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "bytemuck" -version = "1.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "bzip2" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb116a6ef3f6c3698828873ad02c3014b3c85cadb88496095628e3ef1e347f8" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "cc" -version = "1.0.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "jobserver", - "libc", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "chinese-number" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9cec9efb10b00914876c7e7b1fdaec572b888443b4046cd11ba91eb8c5a1ccb" -dependencies = [ - "chinese-variant", - "enum-ordinalize", - "num-bigint", - "num-traits", -] - -[[package]] -name = "chinese-variant" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aeea139b89efab957972956e5d3e4efb66a6c261f726abf6911040cc8ef700f7" - -[[package]] -name = "chrono" -version = "0.4.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "windows-targets", -] - -[[package]] -name = "ciborium" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" -dependencies = [ - "ciborium-io", - "ciborium-ll", - "serde", -] - -[[package]] -name = "ciborium-io" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" - -[[package]] -name = "ciborium-ll" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" -dependencies = [ - "ciborium-io", - "half", -] - -[[package]] -name = "cipher" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" -dependencies = [ - "crypto-common", - "inout", -] - -[[package]] -name = "citationberg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c857faf24e89710f105b623c174508070a9e11e056a749f251ca4c56f59ad88" -dependencies = [ - "quick-xml 0.28.2", - "serde", -] - -[[package]] -name = "clap" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_complete" -version = "4.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffe91f06a11b4b9420f62103854e90867812cd5d01557f853c5ee8e791b12ae" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_derive" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - -[[package]] -name = "clap_mangen" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3be86020147691e1d2ef58f75346a3d4d94807bfc473e377d52f09f0f7d77f7" -dependencies = [ - "clap", - "roff", -] - -[[package]] -name = "cobs" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - -[[package]] -name = "comemo" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" -dependencies = [ - "comemo-macros", - "siphasher", -] - -[[package]] -name = "comemo-macros" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168cc09917f6a014a4cf6ed166d1b541a20a768c60f9cc348f25203ee8312940" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "core-foundation-sys" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" - -[[package]] -name = "core_maths" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" -dependencies = [ - "libm", -] - -[[package]] -name = "cpufeatures" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "csv" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac574ff4d437a7b5ad237ef331c17ccca63c46479e5b5453eb8e10bb99a759fe" -dependencies = [ - "csv-core", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "csv-core" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efa2b3d7902f4b634a20cae3c9c4e6209dc4779feb6863329607560143efa70" -dependencies = [ - "memchr", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.2", - "lock_api", - "once_cell", - "parking_lot_core", -] - -[[package]] -name = "data-url" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41b319d1b62ffbd002e057f36bebd1f42b9f97927c9577461d855f3513c4289f" - -[[package]] -name = "deranged" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", - "subtle", -] - -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users", - "windows-sys", -] - -[[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.38", -] - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "ecow" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ea5e3f9cda726431da9d1a8d5a29785d544b31e98e1ca7a210906244002e02" -dependencies = [ - "serde", -] - -[[package]] -name = "either" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" - -[[package]] -name = "embedded-io" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced" - -[[package]] -name = "enum-ordinalize" -version = "3.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" -dependencies = [ - "num-bigint", - "num-traits", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "env_logger" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" -dependencies = [ - "log", -] - -[[package]] -name = "env_proxy" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a5019be18538406a43b5419a5501461f0c8b49ea7dfda0cfc32f4e51fc44be1" -dependencies = [ - "log", - "url", -] - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" -dependencies = [ - "libc", - "windows-sys", -] - -[[package]] -name = "fancy-regex" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" -dependencies = [ - "bit-set", - "regex", -] - -[[package]] -name = "fast-srgb8" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1" - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "fastrand" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" - -[[package]] -name = "fdeflate" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" -dependencies = [ - "simd-adler32", -] - -[[package]] -name = "filetime" -version = "0.2.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.3.5", - "windows-sys", -] - -[[package]] -name = "flate2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "float-cmp" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "fontconfig-parser" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4" -dependencies = [ - "roxmltree", -] - -[[package]] -name = "fontdb" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020e203f177c0fb250fb19455a252e838d2bbbce1f80f25ecc42402aafa8cd38" -dependencies = [ - "fontconfig-parser", - "log", - "memmap2", - "slotmap", - "tinyvec", - "ttf-parser", -] - -[[package]] -name = "form_urlencoded" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "funty" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "gif" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "half" -version = "1.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.7", -] - -[[package]] -name = "hashbrown" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" - -[[package]] -name = "hayagriva" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5af3d464a6b5ae882f15fe1da4e696fd96b77fee78ded933e0ad81d1d87cbc5" -dependencies = [ - "biblatex", - "ciborium", - "citationberg", - "indexmap 2.0.2", - "numerals", - "paste", - "rkyv", - "serde", - "serde_yaml 0.9.27", - "thiserror", - "unic-langid", - "unicode-segmentation", - "unscanny", - "url", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" - -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - -[[package]] -name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "hypher" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94bf16dd62ea2bec617a6f8a3e1ba03107311783069a647787ac689d1f35321e" - -[[package]] -name = "iai" -version = "0.1.1" -source = "git+https://github.com/typst/iai#3f0f92736408ebce6545808b98e0cb2aea89b7dd" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - -[[package]] -name = "icu_collections" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3907b2246e8dd5a29ead8a965e7c0c8a90e9b928e614a4279257d45c5e553e91" -dependencies = [ - "displaydoc", - "serde", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f284eb342dc49d3e9d9f3b188489d76b5d22dfb1d1a5e0d1941811253bac625c" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6551daf80882d8e68eee186cc19e132d8bde1b1f059a79b93384a5ca0e8fc5e7" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a741eba5431f75eb2f1f9022d3cffabcadda6771e54fb4e77c8ba8653e4da44" - -[[package]] -name = "icu_properties" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3477ae70f8ca8dc08ff7574b5398ed0a2f2e4e6b66bdff2558a92ed67e262be1" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "serde", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98507b488098f45eb95ef495612a2012e4d8ad6095dda86cb2f1728aa2204a60" - -[[package]] -name = "icu_provider" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68acdef80034b5e35d8524e9817479d389a4f9774f3f0cbe1bf3884d80fd5934" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "postcard", - "serde", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_adapters" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36b380ef2d3d93b015cd0563d7e0d005cc07f82a5503716dbc191798d0079e1d" -dependencies = [ - "icu_locid", - "icu_locid_transform", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_provider_blob" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31326d28c7f95a964a4f0ee86c24002da5f6db907e3bcb079949b4ff103b6a9" -dependencies = [ - "icu_provider", - "postcard", - "serde", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2060258edfcfe32ca7058849bf0f146cb5c59aadbedf480333c0d0002f97bc99" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "icu_segmenter" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb3c1981ce2187a745f391a741cb14e77453325acb3b2e014b05da51c0a39f2" -dependencies = [ - "core_maths", - "displaydoc", - "icu_collections", - "icu_locid", - "icu_provider", - "icu_segmenter_data", - "serde", - "utf8_iter", - "zerovec", -] - -[[package]] -name = "icu_segmenter_data" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9703f6713044d1c0a1335a6d78ffece4c9380582416ace6feeb608e84d279fc7" - -[[package]] -name = "idna" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "if_chain" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb56e1aa765b4b4f3aadfab769793b7087bb03a4ea4920644a6d238e2df5b9ed" - -[[package]] -name = "image" -version = "0.24.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif", - "jpeg-decoder", - "num-rational", - "num-traits", - "png", -] - -[[package]] -name = "imagesize" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" - -[[package]] -name = "include_dir" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e" -dependencies = [ - "include_dir_macros", -] - -[[package]] -name = "include_dir_macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f" -dependencies = [ - "proc-macro2", - "quote", -] - -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", -] - -[[package]] -name = "indexmap" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" -dependencies = [ - "equivalent", - "hashbrown 0.14.2", - "rayon", - "serde", -] - -[[package]] -name = "indexmap-nostd" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" - -[[package]] -name = "inferno" -version = "0.11.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c50453ec3a6555fad17b1cd1a80d16af5bc7cb35094f64e429fd46549018c6a3" -dependencies = [ - "ahash 0.8.6", - "clap", - "crossbeam-channel", - "crossbeam-utils", - "dashmap", - "env_logger", - "indexmap 2.0.2", - "is-terminal", - "itoa", - "log", - "num-format", - "once_cell", - "quick-xml 0.26.0", - "rgb", - "str_stack", -] - -[[package]] -name = "inotify" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" -dependencies = [ - "bitflags 1.3.2", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - -[[package]] -name = "inout" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" -dependencies = [ - "generic-array", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "is-docker" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" -dependencies = [ - "once_cell", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", -] - -[[package]] -name = "is-wsl" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" -dependencies = [ - "is-docker", - "once_cell", -] - -[[package]] -name = "itoa" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" - -[[package]] -name = "jobserver" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" -dependencies = [ - "libc", -] - -[[package]] -name = "jpeg-decoder" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" - -[[package]] -name = "js-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "kqueue" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - -[[package]] -name = "kurbo" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd85a5776cd9500c2e2059c8c76c3b01528566b7fcbaf8098b55a33fc298849b" -dependencies = [ - "arrayvec", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" - -[[package]] -name = "libdeflate-sys" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "012437ac39c1e7d7ba12af3aceceb5c93149779aa17c2b1c483f33954957ddc8" -dependencies = [ - "cc", -] - -[[package]] -name = "libdeflater" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58b30f982ddb14aae2a24a7ed7b3d512d687c2483493f95de7a6d167942a19c3" -dependencies = [ - "libdeflate-sys", -] - -[[package]] -name = "libm" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" - -[[package]] -name = "line-wrap" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30344350a2a51da54c1d53be93fade8a237e545dbcc4bdbe635413f2117cab9" -dependencies = [ - "safemem", -] - -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - -[[package]] -name = "linux-raw-sys" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" - -[[package]] -name = "lipsum" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5e9ef2d2ad6fe67a59ace27c203c8d3a71d195532ee82e3bbe0d5f9a9ca541" -dependencies = [ - "rand", - "rand_chacha", -] - -[[package]] -name = "litemap" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2647d5b7134127971a6de0d533c49de2159167e7f259c427195f87168a1" - -[[package]] -name = "lock_api" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - -[[package]] -name = "lzma-sys" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "memchr" -version = "2.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" - -[[package]] -name = "memmap2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed" -dependencies = [ - "libc", -] - -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", - "simd-adler32", -] - -[[package]] -name = "mio" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys", -] - -[[package]] -name = "notify" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" -dependencies = [ - "bitflags 2.4.1", - "crossbeam-channel", - "filetime", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "walkdir", - "windows-sys", -] - -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-format" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" -dependencies = [ - "arrayvec", - "itoa", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" -dependencies = [ - "autocfg", -] - -[[package]] -name = "numerals" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25be21376a772d15f97ae789845340a9651d3c4246ff5ebb6a2b35f9c37bd31" - -[[package]] -name = "once_cell" -version = "1.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" - -[[package]] -name = "open" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8" -dependencies = [ - "is-wsl", - "libc", - "pathdiff", -] - -[[package]] -name = "option-ext" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" - -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - -[[package]] -name = "oxipng" -version = "8.0.0" -source = "git+https://github.com/typst/oxipng?rev=b8ec65b#b8ec65b3ca42dde33c85149b6e402e891527f802" -dependencies = [ - "bitvec", - "crossbeam-channel", - "filetime", - "indexmap 2.0.2", - "libdeflater", - "log", - "rayon", - "rgb", - "rustc-hash", - "rustc_version", - "zopfli", -] - -[[package]] -name = "palette" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e2f34147767aa758aa649415b50a69eeb46a67f9dc7db8011eeb3d84b351dc" -dependencies = [ - "approx", - "fast-srgb8", - "libm", - "palette_derive", -] - -[[package]] -name = "palette_derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7db010ec5ff3d4385e4f133916faacd9dad0f6a09394c92d825b3aed310fa0a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall 0.4.1", - "smallvec", - "windows-targets", -] - -[[package]] -name = "password-hash" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" -dependencies = [ - "base64ct", - "rand_core", - "subtle", -] - -[[package]] -name = "paste" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" - -[[package]] -name = "pathdiff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest", - "hmac", - "password-hash", - "sha2", -] - -[[package]] -name = "pdf-writer" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "690874e8cf95d36ddffbdbdaad6ef8714c88bf8085996b673559389a04e38a02" -dependencies = [ - "bitflags 1.3.2", - "itoa", - "memchr", - "ryu", -] - -[[package]] -name = "percent-encoding" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" - -[[package]] -name = "pico-args" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315" - -[[package]] -name = "pin-project-lite" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" - -[[package]] -name = "pixglyph" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f67591f21f6668e63c1cd85adab066ac8a92bc7b962668dd8042197a6e4b8f8f" -dependencies = [ - "ttf-parser", -] - -[[package]] -name = "pkg-config" -version = "0.3.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" - -[[package]] -name = "plist" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" -dependencies = [ - "base64", - "indexmap 1.9.3", - "line-wrap", - "quick-xml 0.30.0", - "serde", - "time", -] - -[[package]] -name = "png" -version = "0.17.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "fdeflate", - "flate2", - "miniz_oxide", -] - -[[package]] -name = "postcard" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55c51ee6c0db07e68448e336cf8ea4131a620edefebf9893e759b2d793420f8" -dependencies = [ - "cobs", - "embedded-io", - "serde", -] - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" - -[[package]] -name = "ppv-lite86" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" - -[[package]] -name = "proc-macro2" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a1a2f1f0a7ecff9c31abbe177637be0e97a0aef46cf8738ece09327985d998" -dependencies = [ - "bitflags 1.3.2", - "getopts", - "memchr", - "unicase", -] - -[[package]] -name = "quick-xml" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f50b1c63b38611e7d4d7f68b82d3ad0cc71a2ad2e7f61fc10f1328d917c93cd" -dependencies = [ - "memchr", -] - -[[package]] -name = "quick-xml" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" -dependencies = [ - "memchr", - "serde", -] - -[[package]] -name = "quick-xml" -version = "0.30.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eff6510e86862b57b210fd8cbe8ed3f0d7d600b9c2863cd4549a2e033c66e956" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "radium" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" - -[[package]] -name = "rand" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" -dependencies = [ - "rand_core", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" - -[[package]] -name = "rayon" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "rctree" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b42e27ef78c35d3998403c1d26f3efd9e135d3e5121b0a4845cc5cc27547f4f" - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - -[[package]] -name = "redox_users" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" -dependencies = [ - "getrandom", - "redox_syscall 0.2.16", - "thiserror", -] - -[[package]] -name = "regex" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-automata" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax 0.8.2", -] - -[[package]] -name = "regex-syntax" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" - -[[package]] -name = "regex-syntax" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" - -[[package]] -name = "rend" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" -dependencies = [ - "bytecheck", -] - -[[package]] -name = "resvg" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7980f653f9a7db31acff916a262c3b78c562919263edea29bf41a056e20497" -dependencies = [ - "gif", - "jpeg-decoder", - "log", - "pico-args", - "png", - "rgb", - "svgtypes", - "tiny-skia", - "usvg", -] - -[[package]] -name = "rgb" -version = "0.8.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8" -dependencies = [ - "bytemuck", -] - -[[package]] -name = "ring" -version = "0.17.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" -dependencies = [ - "cc", - "getrandom", - "libc", - "spin", - "untrusted", - "windows-sys", -] - -[[package]] -name = "rkyv" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" -dependencies = [ - "bitvec", - "bytecheck", - "hashbrown 0.12.3", - "ptr_meta", - "rend", - "rkyv_derive", - "seahash", - "tinyvec", - "uuid", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "roff" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" - -[[package]] -name = "roxmltree" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "862340e351ce1b271a378ec53f304a5558f7db87f3769dc655a8f6ecbb68b302" -dependencies = [ - "xmlparser", -] - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustc_version" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -dependencies = [ - "semver", -] - -[[package]] -name = "rustix" -version = "0.38.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3" -dependencies = [ - "bitflags 2.4.1", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", -] - -[[package]] -name = "rustls" -version = "0.21.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustversion" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" - -[[package]] -name = "rustybuzz" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71cd15fef9112a1f94ac64b58d1e4628192631ad6af4dc69997f995459c874e7" -dependencies = [ - "bitflags 1.3.2", - "bytemuck", - "smallvec", - "ttf-parser", - "unicode-bidi-mirroring", - "unicode-ccc", - "unicode-properties", - "unicode-script", -] - -[[package]] -name = "ryu" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" - -[[package]] -name = "safemem" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "sct" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "self-replace" -version = "1.3.5" -source = "git+https://github.com/typst/self-replace#2e6d5e4808bba73b713fd85cf5616b7d846143c2" -dependencies = [ - "fastrand 1.9.0", - "tempfile", - "windows-sys", -] - -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" - -[[package]] -name = "serde" -version = "1.0.190" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.190" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "serde_json" -version = "1.0.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap 1.9.3", - "ryu", - "serde", - "yaml-rust", -] - -[[package]] -name = "serde_yaml" -version = "0.9.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" -dependencies = [ - "indexmap 2.0.2", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - -[[package]] -name = "sha1" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "simd-adler32" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" - -[[package]] -name = "simdutf8" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" - -[[package]] -name = "simplecss" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a11be7c62927d9427e9f40f3444d5499d868648e2edbc4e2116de69e7ec0e89d" -dependencies = [ - "log", -] - -[[package]] -name = "siphasher" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" - -[[package]] -name = "slotmap" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" -dependencies = [ - "version_check", -] - -[[package]] -name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "spin" -version = "0.9.8" -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 = "stacker" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" -dependencies = [ - "cc", - "cfg-if", - "libc", - "psm", - "winapi", -] - -[[package]] -name = "str_stack" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091b6114800a5f2141aee1d1b9d6ca3592ac062dc5decb3764ec5895a47b4eb" - -[[package]] -name = "strict-num" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" -dependencies = [ - "float-cmp", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strum" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" -dependencies = [ - "strum_macros", -] - -[[package]] -name = "strum_macros" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", -] - -[[package]] -name = "subsetter" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09eab8a83bff89ba2200bd4c59be45c7c787f988431b936099a5a266c957f2f9" - -[[package]] -name = "subtle" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" - -[[package]] -name = "svg2pdf" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "363c5346967da04bf3ebb3d8bafa7f52c53c810167047904df1960eac3fc08b7" -dependencies = [ - "image", - "miniz_oxide", - "pdf-writer", - "usvg", -] - -[[package]] -name = "svgtypes" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71499ff2d42f59d26edb21369a308ede691421f79ebc0f001e2b1fd3a7c9e52" -dependencies = [ - "kurbo", - "siphasher", -] - -[[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.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "synstructure" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", - "unicode-xid", -] - -[[package]] -name = "syntect" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91" -dependencies = [ - "bincode", - "bitflags 1.3.2", - "fancy-regex", - "flate2", - "fnv", - "once_cell", - "plist", - "regex-syntax 0.7.5", - "serde", - "serde_json", - "thiserror", - "walkdir", - "yaml-rust", -] - -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - -[[package]] -name = "tar" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tempfile" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" -dependencies = [ - "cfg-if", - "fastrand 2.0.1", - "redox_syscall 0.4.1", - "rustix", - "windows-sys", -] - -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.50" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "thread_local" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "time" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" -dependencies = [ - "deranged", - "itoa", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" -dependencies = [ - "time-core", -] - -[[package]] -name = "tiny-skia" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b72a92a05db376db09fe6d50b7948d106011761c05a6a45e23e17ee9b556222" -dependencies = [ - "arrayref", - "arrayvec", - "bytemuck", - "cfg-if", - "log", - "png", - "tiny-skia-path", -] - -[[package]] -name = "tiny-skia-path" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac3865b9708fc7e1961a65c3a4fa55e984272f33092d3c859929f887fceb647" -dependencies = [ - "arrayref", - "bytemuck", - "strict-num", -] - -[[package]] -name = "tinystr" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5d0e245e80bdc9b4e5356fc45a72184abbc3861992603f515270e9340f5a219" -dependencies = [ - "displaydoc", - "serde", - "zerovec", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "toml" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ff9e3abce27ee2c9a37f9ad37238c1bdd4e789c84ba37df76aa4d528f5072cc" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - -[[package]] -name = "toml_datetime" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.20.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" -dependencies = [ - "indexmap 2.0.2", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tracing" -version = "0.1.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" -dependencies = [ - "pin-project-lite", - "tracing-attributes", - "tracing-core", -] - -[[package]] -name = "tracing-attributes" -version = "0.1.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "tracing-core" -version = "0.1.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" -dependencies = [ - "once_cell", - "valuable", -] - -[[package]] -name = "tracing-error" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" -dependencies = [ - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-flame" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" -dependencies = [ - "lazy_static", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" -dependencies = [ - "nu-ansi-term", - "sharded-slab", - "smallvec", - "thread_local", - "tracing-core", - "tracing-log", -] - -[[package]] -name = "ttf-parser" -version = "0.19.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" - -[[package]] -name = "typed-arena" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "typst" -version = "0.9.0" -dependencies = [ - "base64", - "bitflags 2.4.1", - "bytemuck", - "comemo", - "ecow", - "flate2", - "fontdb", - "image", - "indexmap 2.0.2", - "kurbo", - "log", - "miniz_oxide", - "once_cell", - "palette", - "pdf-writer", - "pixglyph", - "regex", - "resvg", - "roxmltree", - "rustybuzz", - "serde", - "siphasher", - "stacker", - "subsetter", - "svg2pdf", - "time", - "tiny-skia", - "toml", - "tracing", - "ttf-parser", - "typst-macros", - "typst-syntax", - "unicode-ident", - "unicode-math-class", - "unicode-properties", - "unicode-segmentation", - "unscanny", - "usvg", - "wasmi", - "xmlparser", - "xmlwriter", - "xmp-writer", -] - -[[package]] -name = "typst-cli" -version = "0.9.0" -dependencies = [ - "chrono", - "clap", - "clap_complete", - "clap_mangen", - "codespan-reporting", - "comemo", - "dirs", - "ecow", - "env_proxy", - "filetime", - "flate2", - "fontdb", - "inferno", - "notify", - "once_cell", - "open", - "pathdiff", - "rustls", - "rustls-pemfile", - "same-file", - "self-replace", - "semver", - "serde", - "serde_json", - "serde_yaml 0.9.27", - "siphasher", - "tar", - "tempfile", - "tracing", - "tracing-error", - "tracing-flame", - "tracing-subscriber", - "typst", - "typst-library", - "ureq", - "xz2", - "zip", -] - -[[package]] -name = "typst-docs" -version = "0.9.0" -dependencies = [ - "comemo", - "ecow", - "heck", - "include_dir", - "once_cell", - "pulldown-cmark", - "serde", - "serde_yaml 0.9.27", - "syntect", - "typed-arena", - "typst", - "typst-library", - "unicode_names2", - "unscanny", - "yaml-front-matter", -] - -[[package]] -name = "typst-ide" -version = "0.9.0" -dependencies = [ - "comemo", - "ecow", - "if_chain", - "log", - "serde", - "typst", - "unscanny", -] - -[[package]] -name = "typst-library" -version = "0.9.0" -dependencies = [ - "az", - "chinese-number", - "ciborium", - "comemo", - "csv", - "ecow", - "hayagriva", - "hypher", - "icu_properties", - "icu_provider", - "icu_provider_adapters", - "icu_provider_blob", - "icu_segmenter", - "indexmap 2.0.2", - "kurbo", - "lipsum", - "log", - "once_cell", - "roxmltree", - "rustybuzz", - "serde_json", - "serde_yaml 0.9.27", - "smallvec", - "syntect", - "time", - "toml", - "tracing", - "ttf-parser", - "typed-arena", - "typst", - "unicode-bidi", - "unicode-math-class", - "unicode-script", - "unicode-segmentation", -] - -[[package]] -name = "typst-macros" -version = "0.9.0" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "typst-syntax" -version = "0.9.0" -dependencies = [ - "comemo", - "ecow", - "once_cell", - "serde", - "tracing", - "unicode-ident", - "unicode-math-class", - "unicode-segmentation", - "unscanny", -] - -[[package]] -name = "typst-tests" -version = "0.9.0" -dependencies = [ - "clap", - "comemo", - "ecow", - "iai", - "once_cell", - "oxipng", - "rayon", - "tiny-skia", - "ttf-parser", - "typst", - "typst-library", - "unscanny", - "walkdir", -] - -[[package]] -name = "unic-langid" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f" -dependencies = [ - "unic-langid-impl", -] - -[[package]] -name = "unic-langid-impl" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff" -dependencies = [ - "serde", - "tinystr", -] - -[[package]] -name = "unicase" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" - -[[package]] -name = "unicode-bidi-mirroring" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56d12260fb92d52f9008be7e4bca09f584780eb2266dc8fecc6a192bec561694" - -[[package]] -name = "unicode-ccc" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2520efa644f8268dce4dcd3050eaa7fc044fca03961e9998ac7e2e92b77cf1" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-math-class" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d246cf599d5fae3c8d56e04b20eb519adb89a8af8d0b0fbcded369aa3647d65" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-properties" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7f91c8b21fbbaa18853c3d0801c78f4fc94cdb976699bb03e832e75f7fd22f0" - -[[package]] -name = "unicode-script" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc" - -[[package]] -name = "unicode-segmentation" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" - -[[package]] -name = "unicode-vo" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" - -[[package]] -name = "unicode-width" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" - -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - -[[package]] -name = "unicode_names2" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446c96c6dd42604779487f0a981060717156648c1706aa1f464677f03c6cc059" - -[[package]] -name = "unsafe-libyaml" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" - -[[package]] -name = "unscanny" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9df2af067a7953e9c3831320f35c1cc0600c30d44d9f7a12b01db1cd88d6b47" - -[[package]] -name = "untrusted" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" - -[[package]] -name = "ureq" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" -dependencies = [ - "base64", - "flate2", - "log", - "once_cell", - "rustls", - "rustls-webpki", - "serde", - "serde_json", - "url", - "webpki-roots", -] - -[[package]] -name = "url" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", - "serde", -] - -[[package]] -name = "usvg" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c51daa774fe9ee5efcf7b4fec13019b8119cda764d9a8b5b06df02bb1445c656" -dependencies = [ - "base64", - "log", - "pico-args", - "usvg-parser", - "usvg-text-layout", - "usvg-tree", - "xmlwriter", -] - -[[package]] -name = "usvg-parser" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45c88a5ffaa338f0e978ecf3d4e00d8f9f493e29bed0752e1a808a1db16afc40" -dependencies = [ - "data-url", - "flate2", - "imagesize", - "kurbo", - "log", - "roxmltree", - "simplecss", - "siphasher", - "svgtypes", - "usvg-tree", -] - -[[package]] -name = "usvg-text-layout" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2374378cb7a3fb8f33894e0fdb8625e1bbc4f25312db8d91f862130b541593" -dependencies = [ - "fontdb", - "kurbo", - "log", - "rustybuzz", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "usvg-tree", -] - -[[package]] -name = "usvg-tree" -version = "0.36.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cacb0c5edeaf3e80e5afcf5b0d4004cc1d36318befc9a7c6606507e5d0f4062" -dependencies = [ - "rctree", - "strict-num", - "svgtypes", - "tiny-skia-path", -] - -[[package]] -name = "utf8_iter" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a8922555b9500e3d865caed19330172cd67cbf82203f1a3311d8c305cc9f33" - -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - -[[package]] -name = "uuid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" - -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wasm-bindgen" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" -dependencies = [ - "cfg-if", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn 2.0.38", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.87" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" - -[[package]] -name = "wasmi" -version = "0.31.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f341edb80021141d4ae6468cbeefc50798716a347d4085c3811900049ea8945" -dependencies = [ - "smallvec", - "spin", - "wasmi_arena", - "wasmi_core", - "wasmparser-nostd", -] - -[[package]] -name = "wasmi_arena" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "401c1f35e413fac1846d4843745589d9ec678977ab35a384db8ae7830525d468" - -[[package]] -name = "wasmi_core" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", -] - -[[package]] -name = "wasmparser-nostd" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724" -dependencies = [ - "indexmap-nostd", -] - -[[package]] -name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-core" -version = "0.51.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "winnow" -version = "0.5.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "176b6138793677221d420fd2f0aeeced263f197688b36484660da767bca2fa32" -dependencies = [ - "memchr", -] - -[[package]] -name = "writeable" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0af0c3d13faebf8dda0b5256fa7096a2d5ccb662f7b9f54a40fe201077ab1c2" - -[[package]] -name = "wyz" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" -dependencies = [ - "tap", -] - -[[package]] -name = "xattr" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985" -dependencies = [ - "libc", -] - -[[package]] -name = "xmlparser" -version = "0.13.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" - -[[package]] -name = "xmlwriter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9" - -[[package]] -name = "xmp-writer" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4543ba138f64a94b19e1e9c66c165bca7e03d470e1c066cb76ea279d9d0e1989" - -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - -[[package]] -name = "yaml-front-matter" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94fb32d2b438e3fddf901fbfe9eb87b34d63853ca6c6da5d2ab7e27031e0bae" -dependencies = [ - "serde", - "serde_yaml 0.8.26", -] - -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - -[[package]] -name = "yoke" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", - "synstructure", -] - -[[package]] -name = "zerocopy" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd66a62464e3ffd4e37bd09950c2b9dd6c4f8767380fabba0d523f9a775bc85a" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "255c4596d41e6916ced49cfafea18727b24d67878fa180ddfd69b9df34fd1726" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "zerofrom" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "655b0814c5c0b19ade497851070c640773304939a6c0fd5f5fb43da0696d05b7" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", - "synstructure", -] - -[[package]] -name = "zerovec" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1194130c5b155bf8ae50ab16c86ab758cd695cf9ad176d2f870b744cbdbb572e" -dependencies = [ - "serde", - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acabf549809064225ff8878baedc4ce3732ac3b07e7c7ce6e5c2ccdbc485c324" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] -name = "zip" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" -dependencies = [ - "aes", - "byteorder", - "bzip2", - "constant_time_eq", - "crc32fast", - "crossbeam-utils", - "flate2", - "hmac", - "pbkdf2", - "sha1", - "time", - "zstd", -] - -[[package]] -name = "zopfli" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0650ae6a051326d798eb099b632f1afb0d323d25ee4ec82ffb0779512084d5" -dependencies = [ - "crc32fast", - "log", - "simd-adler32", - "typed-arena", -] - -[[package]] -name = "zstd" -version = "0.11.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "5.0.2+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d2a5585e04f9eea4b2a3d1eca508c4dee9592a89ef6f450c11719da0726f4db" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.9+zstd.1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/nixpkgs/pkgs/tools/typesetting/typst/default.nix b/nixpkgs/pkgs/tools/typesetting/typst/default.nix deleted file mode 100644 index eeb25fa30bde..000000000000 --- a/nixpkgs/pkgs/tools/typesetting/typst/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, installShellFiles -, stdenv -, darwin -}: - -rustPlatform.buildRustPackage rec { - pname = "typst"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "typst"; - repo = "typst"; - rev = "v${version}"; - hash = "sha256-LwRB/AQE8TZZyHEQ7kKB10itzEgYjg4R/k+YFqmutDc="; - }; - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "iai-0.1.1" = "sha256-EdNzCPht5chg7uF9O8CtPWR/bzSYyfYIXNdLltqdlR0="; - "oxipng-8.0.0" = "sha256-KIbSsQEjwJ12DxYpBTUD1g9CqJqCfSAmnFcSTiGIoio="; - "self-replace-1.3.5" = "sha256-N57nmLHgxhVR1CDtkgjYwpo1ypdGyVpjJY7vzuncxDc="; - }; - }; - - nativeBuildInputs = [ - installShellFiles - ]; - - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.CoreServices - ]; - - env = { - GEN_ARTIFACTS = "artifacts"; - }; - - postInstall = '' - installManPage crates/typst-cli/artifacts/*.1 - installShellCompletion \ - crates/typst-cli/artifacts/typst.{bash,fish} \ - --zsh crates/typst-cli/artifacts/_typst - ''; - - meta = with lib; { - description = "A new markup-based typesetting system that is powerful and easy to learn"; - homepage = "https://typst.app"; - changelog = "https://github.com/typst/typst/releases/tag/${src.rev}"; - license = licenses.asl20; - maintainers = with maintainers; [ drupol figsoda kanashimia ]; - mainProgram = "typst"; - }; -} diff --git a/nixpkgs/pkgs/tools/typesetting/typstfmt/Cargo.lock b/nixpkgs/pkgs/tools/typesetting/typstfmt/Cargo.lock index 8f560ac59e5d..ecfb8d4030f5 100644 --- a/nixpkgs/pkgs/tools/typesetting/typstfmt/Cargo.lock +++ b/nixpkgs/pkgs/tools/typesetting/typstfmt/Cargo.lock @@ -18,6 +18,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + +[[package]] name = "bstr" version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -30,9 +36,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019" +checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c" dependencies = [ "memchr", "serde", @@ -46,9 +52,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "comemo" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a097f142aeb5b03af73595536cd55f5d649fca4d656379aac86b3af133cf92" +checksum = "bf5705468fa80602ee6a5f9318306e6c428bffd53e43209a78bc05e6e667c6f4" dependencies = [ "comemo-macros", "siphasher", @@ -56,13 +62,13 @@ dependencies = [ [[package]] name = "comemo-macros" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168cc09917f6a014a4cf6ed166d1b541a20a768c60f9cc348f25203ee8312940" +checksum = "54af6ac68ada2d161fa9cc1ab52676228e340866d094d6542107e74b82acc095" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn", ] [[package]] @@ -137,16 +143,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "libc", @@ -166,28 +166,28 @@ dependencies = [ [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", - "bstr 1.7.0", - "fnv", + "bstr 1.8.0", "log", - "regex", + "regex-automata 0.4.3", + "regex-syntax", ] [[package]] name = "hashbrown" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown", @@ -229,9 +229,20 @@ checksum = "baff4b617f7df3d896f97fe922b64817f6cd9a756bb81d40f8883f2f66dcb401" [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall", +] [[package]] name = "linked-hash-map" @@ -281,9 +292,9 @@ checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" dependencies = [ "unicode-ident", ] @@ -299,21 +310,21 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ "getrandom", - "redox_syscall", + "libredox", "thiserror", ] @@ -363,29 +374,29 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.189" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -421,32 +432,21 @@ dependencies = [ [[package]] name = "siphasher" -version = "0.3.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +checksum = "54ac45299ccbd390721be55b412d41931911f654fa99e2cb8bfb57184b2061fe" [[package]] name = "smallvec" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" - -[[package]] -name = "syn" -version = "1.0.109" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", @@ -470,7 +470,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn", ] [[package]] @@ -506,9 +506,9 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -545,7 +545,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn", ] [[package]] @@ -560,20 +560,20 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "nu-ansi-term", "sharded-slab", @@ -601,7 +601,7 @@ dependencies = [ [[package]] name = "typstfmt" -version = "0.2.6" +version = "0.2.7" dependencies = [ "confy", "lexopt", @@ -610,7 +610,7 @@ dependencies = [ [[package]] name = "typstfmt_lib" -version = "0.2.6" +version = "0.2.7" dependencies = [ "globmatch", "insta", @@ -770,9 +770,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "b7e87b8dfbe3baffbe687eef2e164e32286eff31a5ee16463ce03d991643ec94" dependencies = [ "memchr", ] diff --git a/nixpkgs/pkgs/tools/typesetting/typstfmt/default.nix b/nixpkgs/pkgs/tools/typesetting/typstfmt/default.nix index cec70394e4f9..2305998e94a2 100644 --- a/nixpkgs/pkgs/tools/typesetting/typstfmt/default.nix +++ b/nixpkgs/pkgs/tools/typesetting/typstfmt/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "typstfmt"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "astrale-sharp"; repo = "typstfmt"; rev = version; - hash = "sha256-UUVbnxIj7kQVpZvSbbB11i6wAvdTnXVk5cNSNoGBeRM="; + hash = "sha256-LBYsTCjZ+U+lgd7Z3H1sBcWwseoHsuepPd66bWgfvhI="; }; cargoLock = { diff --git a/nixpkgs/pkgs/tools/video/swfmill/default.nix b/nixpkgs/pkgs/tools/video/swfmill/default.nix index c93534bf1a20..8e6d0baf7e72 100644 --- a/nixpkgs/pkgs/tools/video/swfmill/default.nix +++ b/nixpkgs/pkgs/tools/video/swfmill/default.nix @@ -14,11 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libxslt freetype libpng libxml2 ]; + # fatal error: 'libxml/xpath.h' file not found + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${libxml2.dev}/include/libxml2"; + meta = { description = "An xml2swf and swf2xml processor with import functionalities"; homepage = "http://swfmill.org"; license = lib.licenses.gpl2; - platforms = lib.platforms.linux; + platforms = lib.platforms.unix; mainProgram = "swfmill"; }; } diff --git a/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix b/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix index e6b867139165..da2f1a909156 100644 --- a/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/distrobuilder/default.nix @@ -60,7 +60,7 @@ buildGoModule rec { description = "System container image builder for LXC and LXD"; homepage = "https://github.com/lxc/distrobuilder"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ megheaiulian adamcstephens ]; + maintainers = lib.teams.lxc.members; platforms = lib.platforms.linux; mainProgram = "distrobuilder"; }; diff --git a/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix b/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix index 38ffb1cd4838..c996a5c1124c 100644 --- a/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix @@ -30,21 +30,11 @@ let url = "https://github.com/systemd/systemd/commit/81e04781106e3db24e9cf63c1d5fdd8215dc3f42.patch"; hash = "sha256-KO3poIsvdeepPmXWQXNaJJCPpmBb4sVmO+ur4om9f5k="; }) - # Propagate SOURCE_DATE_EPOCH to mcopy. Remove when upgrading to systemd 255. - (fetchpatch { - url = "https://github.com/systemd/systemd/commit/4947de275a5553399854cc748f4f13e4ae2ba069.patch"; - hash = "sha256-YIZZyc3f8pQO9fMAxiNhDdV8TtL4pXoh+hwHBzRWtfo="; - }) # repart: make sure rewinddir() is called before readdir() when performing rm -rf. Remove when upgrading to systemd 255. (fetchpatch { url = "https://github.com/systemd/systemd/commit/6bbb893b90e2dcb05fb310ba4608f9c9dc587845.patch"; hash = "sha256-A6cF2QAeYHGc0u0V1JMxIcV5shzf5x3Q6K+blZOWSn4="; }) - # Set timezone to UTC when invoking mcopy. Remove when upgrading to systemd 255. - (fetchpatch { - url = "https://github.com/systemd/systemd/commit/b2942c76adc5bb6a3e073aa5cee57834ee3a9813.patch"; - hash = "sha256-phGln3Gs9p8CsEe+1laGrm9xcUJWVbNBW0W8oR9/7YU="; - }) ]; })).override { withRepart = true; diff --git a/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix index e78b36c9f84f..cea1553e0bc6 100644 --- a/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -6,16 +6,17 @@ buildGoModule rec { pname = "xe-guest-utilities"; - version = "7.30.0"; + version = "8.3.1"; src = fetchFromGitHub { owner = "xenserver"; repo = "xe-guest-utilities"; rev = "v${version}"; - hash = "sha256-gMb8QIUg8t0SiTtUzqeh4XM5hHgCXuf5KlV3OeoU0LI="; + hash = "sha256-d0WdezcT44ExeHSnoJ3Dn0u/IRlhWreOZPSVw6Q1h/w="; }; - vendorHash = "sha256-zhpDvo8iujE426/gxJY+Pqfv99vLNKHqyMQbbXIKodY="; + deleteVendor = true; + vendorHash = "sha256-X/BI+ZhoqCGCmJfccyEBVgZc70aRTp3rL5j+rBWG5fE="; postPatch = '' substituteInPlace mk/xen-vcpu-hotplug.rules \ diff --git a/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix b/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix index 51edcc0ea3a2..91ec1e80267f 100644 --- a/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix +++ b/nixpkgs/pkgs/tools/wayland/mpvpaper/default.nix @@ -2,7 +2,6 @@ , lib , meson , ninja -, wlroots , wayland , wayland-protocols , wayland-scanner @@ -17,13 +16,13 @@ stdenv.mkDerivation rec { pname = "mpvpaper"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "GhostNaN"; repo = pname; rev = version; - sha256 = "sha256-0LjIwOY2hBUb0nziD3HLP2Ek5+8v3ntssRFD9eQgWkc="; + sha256 = "sha256-pJPoI47KKazVT6RfqyftZe+lPe6Kn2cllRSfq0twUpQ="; }; strictDeps = true; @@ -37,7 +36,6 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - wlroots wayland wayland-protocols egl-wayland diff --git a/nixpkgs/pkgs/tools/wayland/swayimg/default.nix b/nixpkgs/pkgs/tools/wayland/swayimg/default.nix deleted file mode 100644 index 78a7ab67bad9..000000000000 --- a/nixpkgs/pkgs/tools/wayland/swayimg/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch -, meson -, ninja -, pkg-config -, wayland-scanner -, wayland -, wayland-protocols -, json_c -, libxkbcommon -, fontconfig -, giflib -, libheif -, libjpeg -, libwebp -, libtiff -, librsvg -, libpng -, libjxl -, libexif -, bash-completion -}: -stdenv.mkDerivation rec { - pname = "swayimg"; - version = "1.11"; - - src = fetchFromGitHub { - owner = "artemsen"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-UwIufR3EwbpNVHD1GypV3qNgiqDRllwtxAM0CZPodn0="; - }; - - patches = [ - (fetchpatch { - name = "link-libwebp-1.3.1.patch"; - url = "https://github.com/artemsen/swayimg/commit/bd3d6c838c699b876fd8c19b408c475eb47e17b6.patch"; - hash = "sha256-2aMq/GTqyKw+CQr8o8ij4P4yNjBXYKXShQUknStUb5c="; - }) - ]; - - strictDeps = true; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ meson ninja pkg-config wayland-scanner ]; - - buildInputs = [ - bash-completion - wayland - wayland-protocols - json_c - libxkbcommon - fontconfig - giflib - libheif - libjpeg - libwebp - libtiff - librsvg - libpng - libjxl - libexif - ]; - - meta = with lib; { - homepage = "https://github.com/artemsen/swayimg"; - description = "Image viewer for Sway/Wayland"; - changelog = "https://github.com/artemsen/swayimg/releases/tag/v${version}"; - license = licenses.mit; - maintainers = with maintainers; [ matthewcroughan ]; - platforms = platforms.linux; - mainProgram = "swayimg"; - }; -} diff --git a/nixpkgs/pkgs/tools/wayland/swaysome/default.nix b/nixpkgs/pkgs/tools/wayland/swaysome/default.nix index 4acf4115a048..308592e450f9 100644 --- a/nixpkgs/pkgs/tools/wayland/swaysome/default.nix +++ b/nixpkgs/pkgs/tools/wayland/swaysome/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swaysome"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitLab { owner = "hyask"; repo = pname; rev = version; - sha256 = "sha256-KmGAp0EPnnM+hPRpUGsbt+NU2v5mcPaRUqo0pqUr1L8="; + sha256 = "sha256-U5W/9VL1t1/R4ADPxseBV6CMKx04I4vbp7sFmSqRZXk="; }; - cargoHash = "sha256-9sOR99CaTyMQoGMKP2Cag6YNxmgEqNPE/kiJPziqB9U="; + cargoHash = "sha256-QA3EQsYgjwx8QX50yaxiJyAPDlpYYqiqLiXco1kJmw0="; meta = with lib; { description = "Helper to make sway behave more like awesomewm"; diff --git a/nixpkgs/pkgs/tools/wayland/wob/default.nix b/nixpkgs/pkgs/tools/wayland/wob/default.nix index 67f7904192f9..f51ae7dc7657 100644 --- a/nixpkgs/pkgs/tools/wayland/wob/default.nix +++ b/nixpkgs/pkgs/tools/wayland/wob/default.nix @@ -5,6 +5,7 @@ , meson , ninja , pkg-config +, cmocka , scdoc , wayland-scanner , wayland @@ -14,13 +15,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.14.2"; + version = "0.15.1"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "sha256-u4jLVLGcMTgDEgN8jW5d59m3GorJX7Z6+qKhzvbON3k="; + sha256 = "sha256-9LFAEo17w861ldMJU+t1oLAKoM6gJc4Em4tSwQDXbKU="; }; strictDeps = true; @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; - buildInputs = [ inih wayland wayland-protocols ] + buildInputs = [ cmocka inih wayland wayland-protocols ] ++ lib.optional stdenv.isLinux libseccomp; mesonFlags = lib.optional stdenv.isLinux "-Dseccomp=enabled"; |