diff options
| -rw-r--r-- | ci/scripts/build-socrates.sh | 3 | ||||
| -rw-r--r-- | nixos/socrates/configuration.nix | 2 | ||||
| -rw-r--r-- | third_party/default.nix | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/ci/scripts/build-socrates.sh b/ci/scripts/build-socrates.sh new file mode 100644 index 000000000000..5b642b741270 --- /dev/null +++ b/ci/scripts/build-socrates.sh @@ -0,0 +1,3 @@ +set -e + +/home/wpcarro/.nix-profile/bin/rebuild diff --git a/nixos/socrates/configuration.nix b/nixos/socrates/configuration.nix index 7d958dbdeb73..b9d2b23485bb 100644 --- a/nixos/socrates/configuration.nix +++ b/nixos/socrates/configuration.nix @@ -6,8 +6,8 @@ let # I'm building this using `nixos-rebuild`. When I better understand how to # build socrates using readTree, prefer defining this as an anonymous # function. - pkgs = import <nixpkgs> {}; briefcase = import <briefcase> {}; + pkgs = briefcase.third_party.pkgs; trimNewline = x: pkgs.lib.removeSuffix "\n" x; readSecret = x: trimNewline (builtins.readFile ("/etc/secrets/" + x)); diff --git a/third_party/default.nix b/third_party/default.nix new file mode 100644 index 000000000000..8135d756e365 --- /dev/null +++ b/third_party/default.nix @@ -0,0 +1,5 @@ +{ pkgs, unstable, briefcase, depot, ... }: + +# Exposing these to be available as briefcase.third_party.pkgs for example. + +{ inherit pkgs unstable briefcase depot; } |