Upgrade to latest 19.03

3 files changed, 14 insertions, 12 deletions

diff --git a/nix_path_env b/nix_path_env
new file mode 100644
index 0000000..7ded4ac
--- /dev/null
+++ b/nix_path_env
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# This will automatically upgrade to latest version at each build
+# nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz"
+nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171931.3a4ffdd38b5/nixexprs.tar.xz"
+nixpkgsPrevious="$nixpkgs"
+nixpkgsNext="$nixpkgs"
+export NIX_PATH="nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious"
+
diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index bf41e81..2094924 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -28,10 +28,6 @@ for file in $files; do
 done
 nixops set-args --argstr privateFiles "$TEMP"
 
-# This will automatically upgrade to latest version at each build
-# nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz"
-nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171840.23fd1394dc6/nixexprs.tar.xz"
-nixpkgsPrevious="$nixpkgs"
-nixpkgsNext="$nixpkgs"
-export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious"
+source $(dirname $(dirname $DIR))/nix_path_env
+export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH"
 nixops "$@"
diff --git a/scripts/make-env b/scripts/make-env
index 4dd89b7..415bd5b 100755
--- a/scripts/make-env
+++ b/scripts/make-env
@@ -1,9 +1,6 @@
 #!/bin/bash
 
-# This will automatically upgrade to latest version at each build
-# nixpkgsNext="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz"
-nixpkgsNext="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171840.23fd1394dc6/nixexprs.tar.xz"
-nixpkgsPrevious="$nixpkgsNext"
-nixpkgs="$nixpkgsNext"
-export NIX_PATH="nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+source $(dirname $DIR)/nix_path_env
 nix-env -r -i -A immaePackages -f "<nixpkgs>" "$@"