diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-09 12:19:41 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-09 12:19:41 +0000 |
commit | 44846974fa623e18b76762fd183064609454b86d (patch) | |
tree | cae3eaeebbc337d8a2f300b863d3b464d2d1708c /pkgs/tools/security | |
parent | bf5cc63b6c2e73e42bb244aba95f95d3591839f2 (diff) | |
parent | 19aac4d7b107dd36413f5f282c666a565ff00b3f (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/aws-iam-authenticator/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/security/fido2luks/default.nix | 6 |
2 files changed, 11 insertions, 9 deletions
diff --git a/pkgs/tools/security/aws-iam-authenticator/default.nix b/pkgs/tools/security/aws-iam-authenticator/default.nix index e0499681848bb..524c31126eb70 100644 --- a/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -1,18 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "aws-iam-authenticator"; - version = "0.4.0"; - - goPackagePath = "github.com/kubernetes-sigs/aws-iam-authenticator"; + version = "0.5.2"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "1ghl2vms9wmvczdl2raqhy0gffxmk24h158gjb5mlw7rggzvb7bg"; + sha256 = "1xfc3a0dik4930va30sbl6687v6i5irv96fwis9lrqh5rjqnblqp"; }; + vendorSha256 = null; + + buildFlagsArray = [ "-ldflags=-s -w -X pkg.Version=v${version}" ]; + meta = with lib; { homepage = "https://github.com/kubernetes-sigs/aws-iam-authenticator"; description = "AWS IAM credentials for Kubernetes authentication"; diff --git a/pkgs/tools/security/fido2luks/default.nix b/pkgs/tools/security/fido2luks/default.nix index f8c5b4a9f12f2..24115ba923f4e 100644 --- a/pkgs/tools/security/fido2luks/default.nix +++ b/pkgs/tools/security/fido2luks/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "fido2luks"; - version = "0.2.15"; + version = "0.2.16"; src = fetchFromGitHub { owner = "shimunn"; repo = pname; rev = version; - sha256 = "1v5gxcz4zbc673i5kbsnjq8bikf7jdbn3wjfz1wppjrgwnkgvsh9"; + sha256 = "sha256-WOdbdJAcMZHSnf7AkGnEumjaDut9J8VwSJYjqLUtPXs="; }; buildInputs = [ cryptsetup ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { export LIBCLANG_PATH="${llvmPackages.libclang}/lib" ''; - cargoSha256 = "19drjql13z8bw257z10kjppxm25jlfgrpc9g1jf68ka5j2b3nx7k"; + cargoSha256 = "sha256-4VuM1bPkl9XCI9XsZIJvw3kHSKgT4P7x6I83F2KCFD0="; meta = with lib; { description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator"; |