diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-10 00:35:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 00:35:16 +0000 |
| commit | e090cb1f9624c82bd1d48e6dd588eae92d153be3 (patch) | |
| tree | eb82b1480993c84bd5a9ca97b23a292f9171867a /pkgs/tools/security | |
| parent | 8064cff79ce80a1feb14ab9225f3664af4cb25e0 (diff) | |
| parent | 66e66b9d481386f4c7a6b998f32ce794af0182ae (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
| -rw-r--r-- | pkgs/tools/security/1password-gui/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/aws-iam-authenticator/default.nix | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index 7c3495e608eea..709d16672098d 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.11-3"; + version = "0.9.12-3"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-vkW0LphgJsIVsdI7CjA2hOvxnjO77GA5eEKElIR4PkU="; + hash = "sha256-IK4BuZKM2U8vz7m8waJhoh3tQ539wGLcIDNiYGUou24="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index 524c31126eb70..f0eda76821dbb 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -13,7 +13,9 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ "-ldflags=-s -w -X pkg.Version=v${version}" ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=v${version}" ]; + + subPackages = [ "cmd/aws-iam-authenticator" ]; meta = with lib; { homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; |