Refactor configuration and overlays

7 files changed, 8 insertions, 7 deletions

diff --git a/nixops/custom_nixops.nix b/nixops/custom_nixops.nix
new file mode 100644
index 0000000..f024a4d
--- /dev/null
+++ b/nixops/custom_nixops.nix
@@ -0,0 +1,2 @@
+with import <nixpkgs> { overlays = builtins.attrValues (import ../overlays); };
+nixops
diff --git a/nixops/eldiron.nix b/nixops/eldiron.nix
index 4994041..718d483 100644
--- a/nixops/eldiron.nix
+++ b/nixops/eldiron.nix
@@ -11,8 +11,7 @@
     _module.args = {
       pkgsNext = import <nixpkgsNext> {};
       pkgsPrevious = import <nixpkgsPrevious> {};
-      mylibs = import ../libs.nix { nixpkgs = pkgs; };
-      mypkgs = import ../default.nix;
+      mylibs = import ../libs.nix { inherit pkgs; };
       myconfig = {
         inherit privateFiles;
         env = import "${privateFiles}/environment.nix";
diff --git a/nixops/modules/websites/tools/ether/etherpad_lite.nix b/nixops/modules/websites/tools/ether/etherpad_lite.nix
index 14ad565..e67497b 100644
--- a/nixops/modules/websites/tools/ether/etherpad_lite.nix
+++ b/nixops/modules/websites/tools/ether/etherpad_lite.nix
@@ -47,7 +47,7 @@ let
       text =
         # Make sure we’re not rebuilding whole libreoffice just because of a
         # dependency
-        let libreoffice = (import <nixpkgs> {}).libreoffice-fresh;
+        let libreoffice = (import <nixpkgs> { overlays = []; }).libreoffice-fresh;
         in
         ''
           {
diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index 12f661a..d03784e 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -9,7 +9,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
 source $(dirname $(dirname $DIR))/nix_path_env
-nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops"
+nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops"
 
 TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files)
 chmod go-rwx $TEMP
diff --git a/nixops/scripts/pull_deployment b/nixops/scripts/pull_deployment
index bc4a999..10f71fe 100755
--- a/nixops/scripts/pull_deployment
+++ b/nixops/scripts/pull_deployment
@@ -9,7 +9,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
 source $(dirname $(dirname $DIR))/nix_path_env
-nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops"
+nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops"
 
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 
diff --git a/nixops/scripts/push_deployment b/nixops/scripts/push_deployment
index 067b665..6c67fab 100755
--- a/nixops/scripts/push_deployment
+++ b/nixops/scripts/push_deployment
@@ -9,6 +9,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
 source $(dirname $(dirname $DIR))/nix_path_env
-nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops"
+nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops"
 
 $nixops export | pass insert -m $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment
diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 55dd9d9..1586265 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -136,7 +136,7 @@ fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $(dirname $(dirname $DIR))/nix_path_env
-nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops"
+nixops="$(nix-build --no-out-link "$(dirname $DIR)/custom_nixops.nix")/bin/nixops"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"