From 497ce9ee1c249dd0ccb8203fe757435462293197 Mon Sep 17 00:00:00 2001 From: dsx Date: Fri, 30 Oct 2020 00:31:21 -0400 Subject: [PATCH 01/10] Add step-ca 0.15.5 --- pkgs/tools/security/step-ca/0.15.nix | 38 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/tools/security/step-ca/0.15.nix diff --git a/pkgs/tools/security/step-ca/0.15.nix b/pkgs/tools/security/step-ca/0.15.nix new file mode 100644 index 0000000000000..dfcd94c10ea1e --- /dev/null +++ b/pkgs/tools/security/step-ca/0.15.nix @@ -0,0 +1,38 @@ +{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }: +let + sha256 = "01y4wi6j1frfpd6ndwrxw4sr9rwhj8m96mvp76rnszzwgvlydgd4"; + vendorSha256 = "1is4rvga3anmzqqd1bmdw3014lxrvnm19jrfpyvmdqh7pc7cm4i5"; + version = "0.15.5"; +in +buildGoModule { + pname = "step-ca"; + version = version; + + src = fetchFromGitHub { + owner = "smallstep"; + repo = "certificates"; + rev = "v${version}"; + sha256 = sha256; + }; + + goPackagePath = "github.com/smallstep/certificates"; + vendorSha256 = vendorSha256; + + buildPhase = '' + runHook preBuild + CGO_ENABLED=0 go build -v -o bin/step-ca -ldflags='-w -X "main.Version=${version}" -X "main.BuildTime=1969-12-31 00:00 UTC"' github.com/smallstep/certificates/cmd/step-ca + ''; + + installPhase = '' + mkdir -p $out/bin + cp -v bin/* $out/bin + ''; + + 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"; + homepage = "https://smallstep.com/certificates/"; + license = licenses.asl20; + maintainers = with maintainers; [ cmcdragonkai ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e85382c7891ba..d5a3cb3892349 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2518,6 +2518,8 @@ in step-ca = callPackage ../tools/security/step-ca { }; + step-ca_0_15 = callPackage ../tools/security/step-ca/0.15.nix { }; + step-cli = callPackage ../tools/security/step-cli { }; string-machine = callPackage ../applications/audio/string-machine { }; From d8b101c1248c8cb210a15813f057d297d5c30a24 Mon Sep 17 00:00:00 2001 From: dsx Date: Fri, 30 Oct 2020 16:41:44 +0000 Subject: [PATCH 02/10] Update 0.15.nix Removed unnecessary buildGoPackage. --- pkgs/tools/security/step-ca/0.15.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/step-ca/0.15.nix b/pkgs/tools/security/step-ca/0.15.nix index dfcd94c10ea1e..988f8c64a95a2 100644 --- a/pkgs/tools/security/step-ca/0.15.nix +++ b/pkgs/tools/security/step-ca/0.15.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: let sha256 = "01y4wi6j1frfpd6ndwrxw4sr9rwhj8m96mvp76rnszzwgvlydgd4"; vendorSha256 = "1is4rvga3anmzqqd1bmdw3014lxrvnm19jrfpyvmdqh7pc7cm4i5"; From 718101583d0e8dd1865b2bc5a935905e96777a09 Mon Sep 17 00:00:00 2001 From: dsx Date: Fri, 30 Oct 2020 17:30:55 +0000 Subject: [PATCH 03/10] Update default.nix --- pkgs/tools/security/step-ca/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index e5574be8ab941..5a627c16f3eb9 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -16,7 +16,8 @@ buildGoPackage rec { goDeps = ./deps.nix; 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"; + description = "A private certificate authority (X.509 & SSH) & ACME server"; + longDescription = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; homepage = "https://smallstep.com/certificates/"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; From 4cec1d13a877d36af284b8d89177aa9a57d3f5d0 Mon Sep 17 00:00:00 2001 From: dsx Date: Fri, 30 Oct 2020 17:31:03 +0000 Subject: [PATCH 04/10] Update 0.15.nix Update description --- pkgs/tools/security/step-ca/0.15.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/step-ca/0.15.nix b/pkgs/tools/security/step-ca/0.15.nix index 988f8c64a95a2..af4556c175e90 100644 --- a/pkgs/tools/security/step-ca/0.15.nix +++ b/pkgs/tools/security/step-ca/0.15.nix @@ -29,10 +29,11 @@ buildGoModule { ''; 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"; + description = "A private certificate authority (X.509 & SSH) & ACME server"; + longDescription = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; homepage = "https://smallstep.com/certificates/"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; platforms.linux ++ platforms.darwin; }; } From 83b03bf2cbf88f4672b36a4242d3e3ce0c5a6f0e Mon Sep 17 00:00:00 2001 From: dsx Date: Fri, 30 Oct 2020 17:31:56 +0000 Subject: [PATCH 05/10] Update 0.15.nix --- pkgs/tools/security/step-ca/0.15.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/step-ca/0.15.nix b/pkgs/tools/security/step-ca/0.15.nix index af4556c175e90..d5cde98cf4eb9 100644 --- a/pkgs/tools/security/step-ca/0.15.nix +++ b/pkgs/tools/security/step-ca/0.15.nix @@ -34,6 +34,6 @@ buildGoModule { homepage = "https://smallstep.com/certificates/"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; - platforms = with platforms; platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } From 7dd706cbe43cdf66f78e5b3e69f77490fea95ddc Mon Sep 17 00:00:00 2001 From: dsx Date: Fri, 30 Oct 2020 17:32:31 +0000 Subject: [PATCH 06/10] Update default.nix --- pkgs/tools/security/step-ca/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index 5a627c16f3eb9..f1394914fbd23 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -21,6 +21,6 @@ buildGoPackage rec { homepage = "https://smallstep.com/certificates/"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = with platforms; linux ++ darwin; }; } From 607f82b1838f50f3ca7a057ea35effea69cafe96 Mon Sep 17 00:00:00 2001 From: dsx Date: Fri, 30 Oct 2020 18:20:11 +0000 Subject: [PATCH 07/10] Update default.nix --- pkgs/tools/security/step-ca/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/tools/security/step-ca/default.nix index f1394914fbd23..645b01e763a54 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/tools/security/step-ca/default.nix @@ -17,7 +17,10 @@ buildGoPackage rec { meta = with lib; { description = "A private certificate authority (X.509 & SSH) & ACME server"; - longDescription = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; + longDescription = '' + A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, + so you can use TLS everywhere & SSO for SSH + ''; homepage = "https://smallstep.com/certificates/"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; From 7ab0dc1dbf70e1fe6be5c928a7a34ee174479a5b Mon Sep 17 00:00:00 2001 From: dsx Date: Fri, 30 Oct 2020 18:20:32 +0000 Subject: [PATCH 08/10] Update 0.15.nix --- pkgs/tools/security/step-ca/0.15.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/step-ca/0.15.nix b/pkgs/tools/security/step-ca/0.15.nix index d5cde98cf4eb9..85cca70c4f6d5 100644 --- a/pkgs/tools/security/step-ca/0.15.nix +++ b/pkgs/tools/security/step-ca/0.15.nix @@ -30,7 +30,10 @@ buildGoModule { meta = with lib; { description = "A private certificate authority (X.509 & SSH) & ACME server"; - longDescription = "A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, so you can use TLS everywhere & SSO for SSH"; + longDescription = '' + A private certificate authority (X.509 & SSH) & ACME server for secure automated certificate management, + so you can use TLS everywhere & SSO for SSH + ''; homepage = "https://smallstep.com/certificates/"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; From be19b75641d7a9964ec939ffa2aa95f946c51de5 Mon Sep 17 00:00:00 2001 From: dsx Date: Fri, 30 Oct 2020 21:20:58 +0000 Subject: [PATCH 09/10] Update 0.15.nix --- pkgs/tools/security/step-ca/0.15.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/step-ca/0.15.nix b/pkgs/tools/security/step-ca/0.15.nix index 85cca70c4f6d5..235d36619c4d0 100644 --- a/pkgs/tools/security/step-ca/0.15.nix +++ b/pkgs/tools/security/step-ca/0.15.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }: let sha256 = "01y4wi6j1frfpd6ndwrxw4sr9rwhj8m96mvp76rnszzwgvlydgd4"; vendorSha256 = "1is4rvga3anmzqqd1bmdw3014lxrvnm19jrfpyvmdqh7pc7cm4i5"; @@ -9,10 +9,10 @@ buildGoModule { version = version; src = fetchFromGitHub { + inherit sha256; owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = sha256; }; goPackagePath = "github.com/smallstep/certificates"; @@ -20,7 +20,7 @@ buildGoModule { buildPhase = '' runHook preBuild - CGO_ENABLED=0 go build -v -o bin/step-ca -ldflags='-w -X "main.Version=${version}" -X "main.BuildTime=1969-12-31 00:00 UTC"' github.com/smallstep/certificates/cmd/step-ca + CGO_ENABLED=0 go build -v -o bin/step-ca -ldflags='-w -X "main.Version=${version}" -X "main.BuildTime=1969-12-31 23:59 UTC"' github.com/smallstep/certificates/cmd/step-ca ''; installPhase = '' From 9e88b956bfbd628d56954481f6b55fd27e9743bc Mon Sep 17 00:00:00 2001 From: dsx Date: Fri, 30 Oct 2020 23:26:32 +0000 Subject: [PATCH 10/10] Update 0.15.nix --- pkgs/tools/security/step-ca/0.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/step-ca/0.15.nix b/pkgs/tools/security/step-ca/0.15.nix index 235d36619c4d0..2242f6db9af9d 100644 --- a/pkgs/tools/security/step-ca/0.15.nix +++ b/pkgs/tools/security/step-ca/0.15.nix @@ -5,8 +5,9 @@ let version = "0.15.5"; in buildGoModule { + inherit vendorSha256; + inherit version; pname = "step-ca"; - version = version; src = fetchFromGitHub { inherit sha256; @@ -16,7 +17,6 @@ buildGoModule { }; goPackagePath = "github.com/smallstep/certificates"; - vendorSha256 = vendorSha256; buildPhase = '' runHook preBuild