diff --git a/pkgs/tools/security/step-ca/default.nix b/pkgs/by-name/st/step-ca/package.nix similarity index 82% rename from pkgs/tools/security/step-ca/default.nix rename to pkgs/by-name/st/step-ca/package.nix index f37c05f93fbb..911c479c7189 100644 --- a/pkgs/tools/security/step-ca/default.nix +++ b/pkgs/by-name/st/step-ca/package.nix @@ -5,24 +5,24 @@ buildGoModule, coreutils, pcsclite, - PCSC, pkg-config, hsmSupport ? true, nixosTests, + darwin, }: buildGoModule rec { pname = "step-ca"; - version = "0.27.2"; + version = "0.27.5"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "refs/tags/v${version}"; - hash = "sha256-byVWNab6Q3yryluhMomzLkRNfXQ/68pAq+YGFjbvX1o="; + hash = "sha256-0KIAO9KPP9Lrrw9IIaRdlmmfJ0mwQK0ne//Zofu3TfE="; }; - vendorHash = "sha256-gQEGCbVgtKIaUgBkfpVwLXoUg1EUhaQFn9JZvV5Rjhc="; + vendorHash = "sha256-yi4mbuCaT6ydnZwhqqhqMI7bF6IwHm0UqfR5JM81/Ik="; ldflags = [ "-w" @@ -33,9 +33,9 @@ buildGoModule rec { buildInputs = lib.optionals (hsmSupport && stdenv.hostPlatform.isLinux) [ pcsclite ] - ++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ PCSC ]; - + ++ lib.optionals (hsmSupport && stdenv.hostPlatform.isDarwin) [ darwin.apple_sdk.frameworks.PCSC ]; postPatch = '' + substituteInPlace authority/http_client_test.go --replace-fail 't.Run("SystemCertPool", func(t *testing.T) {' 't.Skip("SystemCertPool", func(t *testing.T) {' substituteInPlace systemd/step-ca.service --replace "/bin/kill" "${coreutils}/bin/kill" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e5ff9659f3e..3d52d3da67fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5877,10 +5877,6 @@ with pkgs; callPackage ../tools/misc/steampipe-packages { } ); - step-ca = callPackage ../tools/security/step-ca { - inherit (darwin.apple_sdk.frameworks) PCSC; - }; - step-kms-plugin = callPackage ../tools/security/step-kms-plugin { }; string-machine = callPackage ../applications/audio/string-machine { };