diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-01 10:01:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 10:01:00 +0200 |
| commit | 4eb41db7d8f5aba19c0e05a99bc726476140fdb2 (patch) | |
| tree | 94d45bf15c9cfc0f0b88599a6b84b5860caca635 | |
| parent | Merge pull request #125175 from NixOS/backport-125174-to-release-21.05 (diff) | |
| parent | step-ca: use latest buildGoModule (diff) | |
| download | nixpkgs-4eb41db7d8f5aba19c0e05a99bc726476140fdb2.tar.gz | |
Merge pull request #124595 from mohe2015/backport-124347-21.05
| -rw-r--r-- | pkgs/tools/security/step-ca/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/security/step-cli/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 7 insertions, 10 deletions
diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 84fe06e6c19c..f72f3c978ffe 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "step-ca"; - version = "0.15.11"; + version = "0.15.15"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "wFRs3n6V0z2keNVtqFw1q5jpA6BvNK5EftsNhichfsY="; + sha256 = "sha256-YYYpMHEis/zoRsdwW70X8zn0FMsW+2vMYdlWxr3qqzY=="; }; - vendorSha256 = "f1NdszqYYx6X1HqwqG26jjfjXq1gDXLOrh64ccKRQ90="; + vendorSha256 = "sha256-mjj+70/ioqcchB3X5vZPb0Oa7lA/qKh5zEpidT0jrEs="; nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index 2b6ec57bbf2b..a13eec71eb84 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -1,26 +1,24 @@ { lib , buildGoModule , fetchFromGitHub -, fetchpatch }: buildGoModule rec { pname = "step-cli"; - version = "0.15.3-22-g3ddc5aa"; + version = "0.15.16"; - # 0.15.3 isn't enough, because we need https://github.com/smallstep/cli/pull/394 src = fetchFromGitHub { owner = "smallstep"; repo = "cli"; - rev = "3ddc5aaafccb23ba9a20abfa70109a2923f298e3"; - sha256 = "1kd04hi764xa3f9p6aw6k9f6wa4y6xsmzby5jxvvkhim4w78brw0"; + rev = "v${version}"; + sha256 = "sha256-/HqCG3LscwogLXvZlL2CVo2Pj1hVRnOMPCmG1hxrG/I="; }; preCheck = '' # Tries to connect to smallstep.com rm command/certificate/remote_test.go ''; - vendorSha256 = "04hckq78g1p04b2q0rq4xw6d880hqhkabbx1pc3pf8r1m6jxwz10"; + vendorSha256 = "sha256-plQgIqs6QUbzndn8C0ByKceGtz/JxZ1Rx0fXWHNJ0kM="; meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7357848ce23b..9b9a0199fd67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3121,7 +3121,6 @@ in step-ca = callPackage ../tools/security/step-ca { inherit (darwin.apple_sdk.frameworks) PCSC; - buildGoModule = buildGo115Module; }; step-cli = callPackage ../tools/security/step-cli { }; |