mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-14 01:07:42 +00:00
Merge pull request #124347 from dguibert/dg/step-ca
This commit is contained in:
commit
250316dc72
@ -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 ];
|
||||
|
||||
|
@ -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";
|
||||
|
@ -3131,7 +3131,6 @@ in
|
||||
|
||||
step-ca = callPackage ../tools/security/step-ca {
|
||||
inherit (darwin.apple_sdk.frameworks) PCSC;
|
||||
buildGoModule = buildGo115Module;
|
||||
};
|
||||
|
||||
step-cli = callPackage ../tools/security/step-cli { };
|
||||
|
Loading…
Reference in New Issue
Block a user