diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-10-09 00:03:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-09 00:03:29 +0000 |
| commit | 130aa9ca683614c52029aa0a2ca75edba490b0cc (patch) | |
| tree | b611ebc90548501121ed9692cc9aee87fb613b54 /pkgs/tools | |
| parent | 28555454d30c3f86403a8457c29034464a5ebdb2 (diff) | |
| parent | 4811946ebfff3f94ef885949b2e1bbf4a799454c (diff) | |
| download | nixpkgs-130aa9ca683614c52029aa0a2ca75edba490b0cc.tar nixpkgs-130aa9ca683614c52029aa0a2ca75edba490b0cc.tar.gz nixpkgs-130aa9ca683614c52029aa0a2ca75edba490b0cc.tar.bz2 nixpkgs-130aa9ca683614c52029aa0a2ca75edba490b0cc.tar.lz nixpkgs-130aa9ca683614c52029aa0a2ca75edba490b0cc.tar.xz nixpkgs-130aa9ca683614c52029aa0a2ca75edba490b0cc.tar.zst nixpkgs-130aa9ca683614c52029aa0a2ca75edba490b0cc.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/security/exploitdb/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/nuclei/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/typesetting/tectonic/default.nix | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 28eea75bbb6..53b44417b40 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-09-24"; + version = "2022-10-07"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QroDg06vAyeFeA2Gy0iFJ5bc277EkMV1Xz92c+xrUF0="; + hash = "sha256-gO2NCQSmaJA6Bg6LKBc0qVi147KzGp2MtXizpM0v1yQ="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index e60c953fd5a..cfbb9446cfa 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.7.7"; + version = "2.7.8"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - sha256 = "sha256-61oq7h/e9aFCEwvrKRx1zyITw/X2obRsnyycO94tW0A="; + sha256 = "sha256-FIWhWW2jOQF4OztLov67+RuhDnpRyD7EN27Gcr4Wa90="; }; - vendorSha256 = "sha256-HZZutN6hG/wNBz1hy0S3kWd/LmaeAvn1NlB917xmCDo="; + vendorSha256 = "sha256-qIEKGnFURtfh8CdHSbAtEaQRrsjfpvwyK+uPmYNXpiA="; modRoot = "./v2"; subPackages = [ diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 27417284caf..0eaf307591f 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -7,7 +7,7 @@ , harfbuzz , openssl , pkg-config -, makeWrapper +, makeBinaryWrapper , biber , icu }: @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "awDVjJLwgpSMbwptmLhczaxB5HqvsdvEOUsLYb/zTUc="; - nativeBuildInputs = [ pkg-config makeWrapper ]; + nativeBuildInputs = [ pkg-config makeBinaryWrapper ]; buildInputs = [ icu fontconfig harfbuzz openssl ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]); @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { # https://github.com/tectonic-typesetting/tectonic/releases/tag/tectonic%400.7.0 postInstall = '' wrapProgram $out/bin/tectonic \ - --prefix PATH "${lib.getBin biber}/bin" + --prefix PATH : "${lib.getBin biber}/bin" '' + lib.optionalString stdenv.isLinux '' substituteInPlace dist/appimage/tectonic.desktop \ --replace Exec=tectonic Exec=$out/bin/tectonic |