diff --git a/pkgs/triton-utils.nix b/pkgs/triton-utils.nix index b9bd25f..573e952 100644 --- a/pkgs/triton-utils.nix +++ b/pkgs/triton-utils.nix @@ -1,13 +1,13 @@ -{ pkgs, ... }: +{ pkgs, caCertVersion, ... }: pkgs.stdenv.mkDerivation { pname = "triton-utils"; - version = "0.0.6"; + version = caCertVersion; src = pkgs.lib.cleanSource ./.; installPhase = '' mkdir -p $out/bin $out/share/certs cd ./utils - cp ./cacert-2022-10-11.pem $out/share/certs + cp ./cacert-${caCertVersion}.pem $out/share/certs cp ./ttp.sh $out/bin cp ./unset-env.sh $out/bin ''; diff --git a/tritonshell.nix b/tritonshell.nix index 966cd15..e816cb7 100644 --- a/tritonshell.nix +++ b/tritonshell.nix @@ -5,6 +5,7 @@ let dataCenters = tritonConfig.dataCenters; mantaDomain = tritonConfig.mantaDomain; tritonApiDomain = tritonConfig.tritonApiDomain; + caCertVersion = "2022-10-11"; in { # devshell docs: https://numtide.github.io/devshell/modules_schema.html @@ -64,7 +65,7 @@ in # see overlay.nix docker-compose_1 # shell scripts and utilities to set and unset triton environment variables - self.packages.${system}.triton-utils + self.packages.${system}.triton-utils { inherit caCertVersion; } self.packages.${system}.triton-docker-env # useful for working with JSON data bunyan-rs @@ -77,7 +78,7 @@ in # see: https://github.com/joyent/triton-docker-cli/issues/17 { name = "CURL_CA_BUNDLE"; - value = "${self.packages.${system}.triton-utils}/share/certs/cacert-2022-07-19.pem"; + value = "${self.packages.${system}.triton-utils}/share/certs/cacert-${caCertVersion}.pem"; } { name = "CONSUL_HTTP_ADDR";