Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

smallstep: 0.13.3 -> 0.14.6 #93711

Merged
merged 2 commits into from
Dec 26, 2020
Merged

smallstep: 0.13.3 -> 0.14.6 #93711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba89f01
step-ca: 0.13.3 -> 0.15.6
arianvp Dec 22, 2020
6e7fb7d
step-cli: 0.13.3 -> 0.15.3
arianvp Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions pkgs/tools/security/step-ca/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,35 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ stdenv
, lib
, fetchFromGitHub
, buildGoModule
, pcsclite
, PCSC
, pkg-config
}:

buildGoPackage rec {
buildGoModule rec {
pname = "step-ca";
version = "0.13.3";

goPackagePath = "github.com/smallstep/certificates";
version = "0.15.6";

src = fetchFromGitHub {
owner = "smallstep";
repo = "certificates";
rev = "v${version}";
sha256 = "1i42j7v5a5qqqb9ng8irblfyzykhyws0394q3zac290ymjijxbnq";
sha256 = "0n26692ph4q4cmrqammfazmx1k9p2bydwqc57q4hz5ni6jd31zbz";
};

goDeps = ./deps.nix;
SuperSandro2000 marked this conversation as resolved.
Show resolved Hide resolved
vendorSha256 = "0w0phyqymcg2h2jjasxmkf4ryn4y1bqahcy94rs738cqr5ifyfbg";

nativeBuildInputs = [ pkg-config ];

buildInputs =
lib.optional stdenv.isLinux (lib.getDev pcsclite)
++ lib.optional stdenv.isDarwin PCSC;

# Tests fail on darwin with
# panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: bind: operation not permitted [recovered]
# probably some sandboxing issue
doCheck = stdenv.isLinux;

meta = with lib; {
description = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH";
Expand Down
291 changes: 0 additions & 291 deletions pkgs/tools/security/step-ca/deps.nix
View file
Open in desktop

This file was deleted.

23 changes: 15 additions & 8 deletions pkgs/tools/security/step-cli/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,26 @@
{ lib, buildGoPackage, fetchFromGitHub }:
{ lib
, buildGoModule
, fetchFromGitHub
, fetchpatch
}:

buildGoPackage rec {
buildGoModule rec {
pname = "step-cli";
version = "0.13.3";

goPackagePath = "github.com/smallstep/cli";
version = "0.15.3-22-g3ddc5aa";

# 0.15.3 isn't enough, because we need https://github.com/smallstep/cli/pull/394
SuperSandro2000 marked this conversation as resolved.
Show resolved Hide resolved
src = fetchFromGitHub {
owner = "smallstep";
repo = "cli";
rev = "v${version}";
sha256 = "0b5hk9a8yq1nyh8m1gmf28yiha95xwsc4dk321g84hvai7g47pbr";
rev = "3ddc5aaafccb23ba9a20abfa70109a2923f298e3";
sha256 = "1kd04hi764xa3f9p6aw6k9f6wa4y6xsmzby5jxvvkhim4w78brw0";
};

goDeps = ./deps.nix;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That file should be deleted.

preCheck = ''
# Tries to connect to smallstep.com
rm command/certificate/remote_test.go
'';
vendorSha256 = "04hckq78g1p04b2q0rq4xw6d880hqhkabbx1pc3pf8r1m6jxwz10";

meta = with lib; {
description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc";
Expand Down
Loading