diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-17 00:01:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-17 00:01:37 +0000 |
| commit | 6d11e6d03e043373ad9fe20033940339354562de (patch) | |
| tree | 05591f3535ae7418bf76d07bbc874c851a4d8d59 /pkgs/development/tools | |
| parent | 046dece8d7483f86de1f7da446b44ec64144ed23 (diff) | |
| parent | 8d3b6e10f19d75cdc8b4367b3321370e76641145 (diff) | |
| download | nixpkgs-6d11e6d03e043373ad9fe20033940339354562de.tar nixpkgs-6d11e6d03e043373ad9fe20033940339354562de.tar.gz nixpkgs-6d11e6d03e043373ad9fe20033940339354562de.tar.bz2 nixpkgs-6d11e6d03e043373ad9fe20033940339354562de.tar.lz nixpkgs-6d11e6d03e043373ad9fe20033940339354562de.tar.xz nixpkgs-6d11e6d03e043373ad9fe20033940339354562de.tar.zst nixpkgs-6d11e6d03e043373ad9fe20033940339354562de.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/analysis/tfsec/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/rq/default.nix | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/development/tools/analysis/tfsec/default.nix b/pkgs/development/tools/analysis/tfsec/default.nix index 7b028e28ed5..af47f65d298 100644 --- a/pkgs/development/tools/analysis/tfsec/default.nix +++ b/pkgs/development/tools/analysis/tfsec/default.nix @@ -5,13 +5,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.48.2"; + version = "0.48.7"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZJHm+shCbyM2cyLW5ZgrqLMwnnvp7IOHI5+Ta2gdaNQ="; + sha256 = "sha256-8OOi2YWxn50iXdH5rqxZ2/qIlS6JX/7P3HMaPpnBH6I="; }; goPackagePath = "github.com/aquasecurity/tfsec"; diff --git a/pkgs/development/tools/rq/default.nix b/pkgs/development/tools/rq/default.nix index 7d222e03bc9..68669e88516 100644 --- a/pkgs/development/tools/rq/default.nix +++ b/pkgs/development/tools/rq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, libiconv, llvmPackages, v8 }: +{ stdenv, lib, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "rq"; @@ -13,9 +13,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0071q08f75qrxdkbx1b9phqpbj15r79jbh391y32acifi7hr35hj"; - buildInputs = [ llvmPackages.libclang v8 ] - ++ lib.optionals stdenv.isDarwin [ libiconv ]; - postPatch = '' # Remove #[deny(warnings)] which is equivalent to -Werror in C. # Prevents build failures when upgrading rustc, which may give more warnings. @@ -23,11 +20,6 @@ rustPlatform.buildRustPackage rec { --replace "#![deny(warnings)]" "" ''; - configurePhase = '' - export LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib" - export V8_SOURCE="${v8}" - ''; - meta = with lib; { description = "A tool for doing record analysis and transformation"; homepage = "https://github.com/dflemstr/rq"; |