diff options
| author | Ben Sima <ben@bsima.me> | 2019-08-31 00:50:27 -0700 |
|---|---|---|
| committer | Ben Sima <ben@bsima.me> | 2019-08-31 00:50:27 -0700 |
| commit | 003990b6630d4b08d3bd1aa58bc1f4bb430154b2 (patch) | |
| tree | a53a33950adcdd6e44faf15bcb5030e4e08d85c0 /depo | |
| parent | 19732ae8d1da6347ab48c1123758fde6ace7a734 (diff) | |
depo: pass nixos as an argument
this allows us to centralize the nixpkgs import.
Diffstat (limited to 'depo')
| -rw-r--r-- | depo/default.nix | 7 | ||||
| -rw-r--r-- | depo/hikuj-zupip/default.nix | 7 | ||||
| -rw-r--r-- | depo/nutin-madaj/default.nix | 5 |
3 files changed, 10 insertions, 9 deletions
diff --git a/depo/default.nix b/depo/default.nix index 131320d..e2c5d6a 100644 --- a/depo/default.nix +++ b/depo/default.nix @@ -1,5 +1,6 @@ -{ -nutin-madaj = import ./nutin-madaj; -hikuj-zupip = import ./hikuj-zupip; +{ nixos }: +{ + nutin-madaj = import ./nutin-madaj { inherit nixos; }; + hikuj-zupip = import ./hikuj-zupip { inherit nixos; }; } diff --git a/depo/hikuj-zupip/default.nix b/depo/hikuj-zupip/default.nix index e297a3e..31de11f 100644 --- a/depo/hikuj-zupip/default.nix +++ b/depo/hikuj-zupip/default.nix @@ -1,13 +1,12 @@ +{ nixos }: + /* hidor-kahih - main development/build server. Lives in ben's living room. */ -let - nixpkgs = builtins.fetchTarball (import ../../pack/nixpkgs.nix); -in -import "${nixpkgs}/nixos" { +nixos { system = "x86_64-linux"; configuration = { nixpkgs.overlays = [ diff --git a/depo/nutin-madaj/default.nix b/depo/nutin-madaj/default.nix index 4fae1e3..374755e 100644 --- a/depo/nutin-madaj/default.nix +++ b/depo/nutin-madaj/default.nix @@ -1,3 +1,5 @@ +{ nixos }: + /* nutin-madaj - cloud infrastructure server. @@ -10,7 +12,6 @@ stuff deployed. */ let - nixpkgs = builtins.fetchTarball (import ../../pack/nixpkgs.nix); nixos-mailserver = builtins.fetchTarball { url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/v2.2.1/nixos-mailserver-v2.2.1.tar.gz"; sha256 = "03d49v8qnid9g9rha0wg2z6vic06mhp0b049s3whccn1axvs2zzx"; @@ -18,7 +19,7 @@ let ibbPort = "3000"; fathomPort = "3030"; in -import "${nixpkgs}/nixos" { +nixos { system = "x86_64-linux"; configuration = { imports = [ |