chore(nix): Move files around to conform to new read-tree layout
Broadly speaking, the following things are included: * there is now a uniform `args` struct that is passed to all derivations, package headers have been changed appropriately * overrides are now loaded from a separate `override` folder just using read-tree.nix * third-party packages have moved into the `third_party` attribute set
This commit is contained in:
parent
4d852e2ef7
commit
c1c379848a
19 changed files with 109 additions and 99 deletions
|
|
@ -11,19 +11,19 @@ readonly TARGET_TOOL=$(basename $0)
|
|||
|
||||
case "${TARGET_TOOL}" in
|
||||
terraform)
|
||||
attr="terraform-gcp"
|
||||
attr="third_party.terraform-gcp"
|
||||
;;
|
||||
kontemplate)
|
||||
attr="kontemplate"
|
||||
;;
|
||||
blog_cli)
|
||||
attr="tazjin.blog_cli"
|
||||
attr="tools.blog_cli"
|
||||
;;
|
||||
stern)
|
||||
attr="stern"
|
||||
;;
|
||||
pass)
|
||||
attr="tazjin.kms_pass"
|
||||
attr="tools.kms_pass"
|
||||
;;
|
||||
*)
|
||||
echo "The tool '${TARGET_TOOL}' is currently not installed in this repository."
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{ buildGoPackage }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
buildGoPackage {
|
||||
pkgs.buildGoPackage {
|
||||
name = "blog_cli";
|
||||
goPackagePath = "github.com/tazjin/personal/blog_cli";
|
||||
src = ./.;
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@
|
|||
#
|
||||
# Only the 'show' and 'insert' commands are supported.
|
||||
|
||||
{ google-cloud-sdk, tree, writeShellScriptBin
|
||||
, project, region, keyring, key }:
|
||||
{ pkgs, kms, ... }:
|
||||
|
||||
writeShellScriptBin "pass" ''
|
||||
let inherit (pkgs) google-cloud-sdk tree writeShellScriptBin;
|
||||
in writeShellScriptBin "pass" ''
|
||||
set -eo pipefail
|
||||
|
||||
CMD="$1"
|
||||
|
|
@ -34,20 +34,20 @@ writeShellScriptBin "pass" ''
|
|||
show)
|
||||
secret_check
|
||||
${google-cloud-sdk}/bin/gcloud kms decrypt \
|
||||
--project ${project} \
|
||||
--location ${region} \
|
||||
--keyring ${keyring} \
|
||||
--key ${key} \
|
||||
--project ${kms.project} \
|
||||
--location ${kms.region} \
|
||||
--keyring ${kms.keyring} \
|
||||
--key ${kms.key} \
|
||||
--ciphertext-file $SECRET_PATH \
|
||||
--plaintext-file -
|
||||
;;
|
||||
insert)
|
||||
secret_check
|
||||
${google-cloud-sdk}/bin/gcloud kms encrypt \
|
||||
--project ${project} \
|
||||
--location ${region} \
|
||||
--keyring ${keyring} \
|
||||
--key ${key} \
|
||||
--project ${kms.project} \
|
||||
--location ${kms.region} \
|
||||
--keyring ${kms.keyring} \
|
||||
--key ${kms.key} \
|
||||
--ciphertext-file $SECRET_PATH \
|
||||
--plaintext-file -
|
||||
echo "Inserted secret '$SECRET'"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue