diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-07 12:01:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-07 12:01:05 +0000 |
| commit | bd8af84d7d6b545b4269c188fa5f1ece1df38e36 (patch) | |
| tree | 631966d35540ae74672d08dcb3fd3346be7cbff7 /pkgs/tools/security | |
| parent | b48a41c77cbffd5a7e08fbc9643f2eca10417bbb (diff) | |
| parent | d1acd89e0116ff88eba80541027429fc922612e9 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/bypass403/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/security/kubescape/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/pinentry/default.nix | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/security/bypass403/default.nix b/pkgs/tools/security/bypass403/default.nix index 5bf40766883a9..3d1569cf55774 100644 --- a/pkgs/tools/security/bypass403/default.nix +++ b/pkgs/tools/security/bypass403/default.nix @@ -21,5 +21,8 @@ buildGoModule rec { homepage = "https://github.com/drsigned/bypass403"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; + + # https://github.com/drsigned/bypass403 no longer exists + broken = true; }; } diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 8f5382d381087..e6fece66ea953 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubescape"; - version = "1.0.137"; + version = "1.0.138"; src = fetchFromGitHub { owner = "armosec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2VjC5icIKF7VO7Tli/mk/gXbIzZxkFm7Aigwl+BVQ6g="; + sha256 = "sha256-/Rp4eNlvlONiH3F6Zv9GDUF26tmSuhFGUL1MoKOFSEc="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index f34acafc9fe94..2de900483f09b 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -3,7 +3,7 @@ , ncurses, gtk2, gcr, libcap, libsecret , enabledFlavors ? [ "curses" "tty" "gtk2" "emacs" ] ++ lib.optionals stdenv.isLinux [ "gnome3" ] - ++ lib.optionals (stdenv.hostPlatform.system != "aarch64-darwin") [ "qt" ] + ++ lib.optionals (!stdenv.isDarwin) [ "qt" ] }: with lib; |