ca: use upstreamed step-mks-plugin

This commit is contained in:
Aaron Bieber 2023-05-08 06:27:34 -06:00
parent 2f62807e8c
commit eff68ab450
No known key found for this signature in database
3 changed files with 2 additions and 42 deletions

View File

@ -1,7 +1,5 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let let cfg = config.services.xinCA;
cfg = config.services.xinCA;
stepKmsPlugin = pkgs.callPackage ../pkgs/step-kms-plugin.nix { };
in with lib; { in with lib; {
options = { options = {
services.xinCA = { services.xinCA = {
@ -68,7 +66,7 @@ in with lib; {
environment.sessionVariables = { STEPPATH = "/var/lib/step-ca"; }; environment.sessionVariables = { STEPPATH = "/var/lib/step-ca"; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
step-cli step-cli
stepKmsPlugin step-kms-plugin
opensc opensc
libressl libressl
]; ];

View File

@ -251,7 +251,6 @@
}; };
sliding-sync = sliding-sync =
pkgs.callPackage ./pkgs/sliding-sync.nix { inherit pkgs; }; pkgs.callPackage ./pkgs/sliding-sync.nix { inherit pkgs; };
step-kms-plugin = pkgs.callPackage ./pkgs/step-kms-plugin.nix { };
tailscaleSystray = tailscaleSystray =
pkgs.callPackage ./pkgs/tailscale-systray.nix { inherit pkgs; }; pkgs.callPackage ./pkgs/tailscale-systray.nix { inherit pkgs; };
golink = pkgs.callPackage ./pkgs/golink.nix { inherit pkgs; }; golink = pkgs.callPackage ./pkgs/golink.nix { inherit pkgs; };

View File

@ -1,37 +0,0 @@
{ lib, buildGoModule, fetchFromGitHub, pkg-config, pcsclite, softhsm, opensc
, yubihsm-shell }:
buildGoModule rec {
pname = "step-kms-plugin";
version = "0.7.0";
src = fetchFromGitHub {
owner = "smallstep";
repo = pname;
rev = "v${version}";
hash = "sha256-5oMkR997ZbPpOqazpyxEvLKbak7THAu855FC6a/Tr+4=";
};
vendorHash = "sha256-Zd2rZez5vP9uL5dolGHO8FR0ARoYP78amcakK/lKtdc=";
proxyVendor = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ opensc pcsclite softhsm yubihsm-shell ];
ldflags = [
"-w"
"-s"
"-X github.com/smallstep/step-kms-plugin/cmd.Version=${version}"
];
meta = with lib; {
description =
"step plugin to manage keys and certificates on cloud KMSs and HSMs";
homepage = "https://smallstep.com/cli/";
license = licenses.asl20;
maintainers = with maintainers; [ qbit ];
mainProgram = "step-kms-plugin";
};
}