From 003990b6630d4b08d3bd1aa58bc1f4bb430154b2 Mon Sep 17 00:00:00 2001
From: Ben Sima <ben@bsima.me>
Date: Sat, 31 Aug 2019 00:50:27 -0700
Subject: depo: pass nixos as an argument

this allows us to centralize the nixpkgs import.
---
 default.nix                  | 6 ++++--
 depo/default.nix             | 7 ++++---
 depo/hikuj-zupip/default.nix | 7 +++----
 depo/nutin-madaj/default.nix | 5 +++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/default.nix b/default.nix
index ab8089b..b894aa2 100644
--- a/default.nix
+++ b/default.nix
@@ -1,7 +1,9 @@
 let
-  nixpkgs = import "${builtins.fetchTarball (import ./pack/nixpkgs.nix)}" {};
+  nixpkgs-tar = builtins.fetchTarball (import ./pack/nixpkgs.nix);
+  nixpkgs = import "${nixpkgs-tar}" {};
+  nixos = import "${nixpkgs-tar}/nixos";
 in
 {
-  depo = import ./depo;
+  depo = import ./depo { inherit nixos; };
   pack = import ./pack { inherit nixpkgs; };
 }
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 = [
-- 
cgit v1.2.3