Unverified Commit f1f4eb1e authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

Merge pull request #312626 from jpds/step-ldflags-version 

step-ca: Set version in ldflags so this is correctly displayed in startup
parents 8a255576 52743c88

nixos/tests/step-ca.nix

+2 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ import ./make-test-python.nix ({ pkgs, ... }: 
      ''

        catester.start()

        caserver.wait_for_unit("step-ca.service")

        caserver.succeed("journalctl -o cat -u step-ca.service | grep '${pkgs.step-ca.version}'")



        caclient.wait_for_unit("acme-finished-caclient.target")

        catester.succeed("curl https://caclient/ | grep \"Welcome to nginx!\"")

pkgs/tools/security/step-ca/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ buildGoModule rec { 


  vendorHash = "sha256-XlfdIg8YHCeCvc7kZczUxlxUonyZSQATgsxLTMvNDk4=";



  ldflags = [

    "-w"

    "-X main.Version=${version}"

  ];



  nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ];



  buildInputs =