From 42efb3b08a489938f6aea96adb3bc928b6317773 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Mon, 17 Aug 2020 10:44:55 +0100 Subject: [PATCH] Support build-briefcase.sh For now, I'm supporting two CI pipelines: - build-socrates - build-briefcase Conceptually, build-briefcase should cover what build-socrates does now, but eventually I would like build-socrates to call `switch-to-configuration` so that all of my websites, etc. stay fresh. --- ci/scripts/build-briefcase.sh | 6 ++++++ default.nix | 1 - nixos/socrates/default.nix | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 ci/scripts/build-briefcase.sh diff --git a/ci/scripts/build-briefcase.sh b/ci/scripts/build-briefcase.sh new file mode 100644 index 000000000..dfe828650 --- /dev/null +++ b/ci/scripts/build-briefcase.sh @@ -0,0 +1,6 @@ +set -euo pipefail + +nix-build . \ + -I briefcase="$(pwd)" \ + -I nixpkgs=/home/wpcarro/nixpkgs-channel \ + --show-trace diff --git a/default.nix b/default.nix index 25a54f3ca..319ecc866 100644 --- a/default.nix +++ b/default.nix @@ -29,7 +29,6 @@ in { website = readTree ./website; lisp = readTree ./lisp; gopkgs = readTree ./gopkgs; - monzo_ynab = readTree ./monzo_ynab; third_party = readTree ./third_party; tools = readTree ./tools; buildHaskell = readTree ./buildHaskell; diff --git a/nixos/socrates/default.nix b/nixos/socrates/default.nix index ebb62036b..389112385 100644 --- a/nixos/socrates/default.nix +++ b/nixos/socrates/default.nix @@ -118,7 +118,7 @@ in { # systemd.services.monzo-token-server = { # enable = true; # description = "Ensure my Monzo access token is valid"; - # script = "${briefcase.monzo_ynab.tokens}/bin/token-server"; + # script = "${briefcase.tools.monzo_ynab.tokens}/bin/token-server"; # # TODO(wpcarro): I'm unsure of the size of this security risk, but if a # # non-root user runs `systemctl cat monzo-token-server`, they could read the # # following, sensitive environment variables.