public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #124595 from mohe2015/backport-124347-21.05

Browse Source
This commit is contained in:
Sandro 2021-06-01 10:01:00 +02:00 committed by GitHub
commit 4eb41db7d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/security/step-ca/default.nix
View File

@ -11,16 +11,16 @@
buildGoModule rec { buildGoModule rec {
pname = "step-ca"; pname = "step-ca";
version = "0.15.11"; version = "0.15.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "smallstep"; owner = "smallstep";
repo = "certificates"; repo = "certificates";
rev = "v${version}"; rev = "v${version}";
sha256 = "wFRs3n6V0z2keNVtqFw1q5jpA6BvNK5EftsNhichfsY="; sha256 = "sha256-YYYpMHEis/zoRsdwW70X8zn0FMsW+2vMYdlWxr3qqzY==";
}; };
vendorSha256 = "f1NdszqYYx6X1HqwqG26jjfjXq1gDXLOrh64ccKRQ90="; vendorSha256 = "sha256-mjj+70/ioqcchB3X5vZPb0Oa7lA/qKh5zEpidT0jrEs=";
nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ];

10
pkgs/tools/security/step-cli/default.nix
View File

@ -1,26 +1,24 @@
{ lib { lib
, buildGoModule , buildGoModule
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
}: }:
buildGoModule rec { buildGoModule rec {
pname = "step-cli"; 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 { src = fetchFromGitHub {
owner = "smallstep"; owner = "smallstep";
repo = "cli"; repo = "cli";
rev = "3ddc5aaafccb23ba9a20abfa70109a2923f298e3"; rev = "v${version}";
sha256 = "1kd04hi764xa3f9p6aw6k9f6wa4y6xsmzby5jxvvkhim4w78brw0"; sha256 = "sha256-/HqCG3LscwogLXvZlL2CVo2Pj1hVRnOMPCmG1hxrG/I=";
}; };
preCheck = '' preCheck = ''
# Tries to connect to smallstep.com # Tries to connect to smallstep.com
rm command/certificate/remote_test.go rm command/certificate/remote_test.go
''; '';
vendorSha256 = "04hckq78g1p04b2q0rq4xw6d880hqhkabbx1pc3pf8r1m6jxwz10"; vendorSha256 = "sha256-plQgIqs6QUbzndn8C0ByKceGtz/JxZ1Rx0fXWHNJ0kM=";
meta = with lib; { meta = with lib; {
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";

1
pkgs/top-level/all-packages.nix
View File

@ -3121,7 +3121,6 @@ in
step-ca = callPackage ../tools/security/step-ca { step-ca = callPackage ../tools/security/step-ca {
inherit (darwin.apple_sdk.frameworks) PCSC; inherit (darwin.apple_sdk.frameworks) PCSC;
buildGoModule = buildGo115Module;
}; };
step-cli = callPackage ../tools/security/step-cli { }; step-cli = callPackage ../tools/security/step-cli { };