about summary refs log tree commit diff
path: root/pkgs/tools/security
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-05-06 08:12:40 +0200
committerVladimír Čunát <v@cunat.cz>2020-05-06 08:20:05 +0200
commit54eb2d10184124a8bd6cc01ff815c30aa8aebf35 (patch)
tree2152ad58471446689a35e1466ef865baac1f8964 /pkgs/tools/security
parentee8cde8d1cc4faea6502ffac90af20bfe86328a2 (diff)
parent1906fc5bd10a7bbab35136325fa3251a043361b2 (diff)
downloadnixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar
nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.gz
nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.bz2
nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.lz
nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.xz
nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.tar.zst
nixlib-54eb2d10184124a8bd6cc01ff815c30aa8aebf35.zip
Merge branch 'staging-next'
Status on Hydra for linuxes seems good enough:
https://hydra.nixos.org/eval/1585703?filter=linux&compare=1585482&full=#tabs-now-fail
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r--pkgs/tools/security/notary/default.nix2
-rw-r--r--pkgs/tools/security/vault/default.nix2
-rw-r--r--pkgs/tools/security/verifpal/default.nix4
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix
index 4f0b5f2c9548..15797fc86650 100644
--- a/pkgs/tools/security/notary/default.nix
+++ b/pkgs/tools/security/notary/default.nix
@@ -26,7 +26,7 @@ buildGoPackage rec {
 
   installPhase = ''
     runHook preInstall
-    install -D bin/notary $bin/bin/notary
+    install -D bin/notary $out/bin/notary
     runHook postInstall
   '';
 
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 0520db1ff8cf..515b5884999e 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -23,7 +23,7 @@ buildGoPackage rec {
   ];
 
   postInstall = ''
-    echo "complete -C $bin/bin/vault vault" > vault.bash
+    echo "complete -C $out/bin/vault vault" > vault.bash
     installShellCompletion vault.bash
   '';
 
diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix
index 95afb580d4e1..e1e5e100bd11 100644
--- a/pkgs/tools/security/verifpal/default.nix
+++ b/pkgs/tools/security/verifpal/default.nix
@@ -28,8 +28,8 @@ buildGoPackage rec {
   '';
 
   installPhase = ''
-    mkdir -p $bin/bin
-    cp go/src/$goPackagePath/build/bin/linux/verifpal $bin/bin/
+    mkdir -p $out/bin
+    cp go/src/$goPackagePath/build/bin/linux/verifpal $out/bin/
   '';
 
   meta = {