diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-03 00:06:54 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-03 00:06:54 +0000 |
| commit | 2a58d6a7886b804b63c5939628b16c71de7b676b (patch) | |
| tree | 5faed644adc4cd8a883604130a5cbd215b82bd41 /pkgs/tools/security | |
| parent | a97d52b3484b545c32b0a5a2d35b589fa435a074 (diff) | |
| parent | 764670261a559e0e2e89dcce487fb9bd3ae19f9e (diff) | |
| download | nixpkgs-2a58d6a7886b804b63c5939628b16c71de7b676b.tar nixpkgs-2a58d6a7886b804b63c5939628b16c71de7b676b.tar.gz nixpkgs-2a58d6a7886b804b63c5939628b16c71de7b676b.tar.bz2 nixpkgs-2a58d6a7886b804b63c5939628b16c71de7b676b.tar.lz nixpkgs-2a58d6a7886b804b63c5939628b16c71de7b676b.tar.xz nixpkgs-2a58d6a7886b804b63c5939628b16c71de7b676b.tar.zst nixpkgs-2a58d6a7886b804b63c5939628b16c71de7b676b.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/fprot/default.nix | 42 | ||||
| -rw-r--r-- | pkgs/tools/security/step-cli/default.nix | 6 |
2 files changed, 3 insertions, 45 deletions
diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix deleted file mode 100644 index 6b930adcc26..00000000000 --- a/pkgs/tools/security/fprot/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib, stdenv, fetchurl }: - -stdenv.mkDerivation { - - pname = "f-prot"; - version = "6.2.1"; - - src = fetchurl { - url = "http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz"; - sha256 = "0qlsrkanf0inplwv1i6hqbimdg91syf5ggd1vahsm9lhivmnr0v5"; - }; - - installPhase = '' - mkdir -p $out/bin - cp fpscan $out/bin - - mkdir -p $out/opt/f-prot - cp fpupdate $out/opt/f-prot - cp product.data.default $out/opt/f-prot/product.data - cp license.key $out/opt/f-prot/ - cp f-prot.conf.default $out/opt/f-prot/f-prot.conf - ln -s $out/opt/f-prot/fpupdate $out/bin/fpupdate - - patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate - - mkdir -p $out/share/man/ - mkdir -p $out/share/man/man1 - cp doc/man/fpscan.1 $out/share/man/man1 - mkdir -p $out/share/man/man5 - cp doc/man/f-prot.conf.5 $out/share/man/man5 - mkdir -p $out/share/man/man8 - cp doc/man/fpupdate.8 $out/share/man/man8 - ''; - - meta = with lib; { - homepage = "http://www.f-prot.com"; - description = "A popular proprietary antivirus program"; - license = licenses.unfree; - maintainers = [ ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index e91a35b808c..0f8f37a4890 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "step-cli"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-gMJFzfqQsxOXPRdRj48c3FKhXsPLEmegiENa2OHWEGo="; + sha256 = "sha256-Ki6MrLVJf2U4Q0y6jtOQZOti/m3SULWNKZ9SdirlOVA="; }; ldflags = [ @@ -25,7 +25,7 @@ buildGoModule rec { rm command/certificate/remote_test.go ''; - vendorSha256 = "sha256-wnMQPnL8M57BOY9QmawLpqtWv+n3GdfIadJ3PwuicOU="; + vendorSha256 = "sha256-ftBZQmtrnGFMZRXDKmMyqnfxuY5vtrZDXVR43yd1shk="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; |