1 files changed, 3 insertions, 6 deletions
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
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-# 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"
+source $(dirname $DIR)/nix_path_env
-nixpkgsPrevious="$nixpkgsNext"
-nixpkgs="$nixpkgsNext"
-export NIX_PATH="nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious"
 nix-env -r -i -A immaePackages -f "<nixpkgs>" "$@"

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 @@
1	#!/bin/bash	1	#!/bin/bash
2		2
3	# This will automatically upgrade to latest version at each build	3	DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
4	# nixpkgsNext="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz"	4
5	nixpkgsNext="https://releases.nixos.org/nixos/19.03/nixos-19.03beta171840.23fd1394dc6/nixexprs.tar.xz"	5	source $(dirname $DIR)/nix_path_env
6	nixpkgsPrevious="$nixpkgsNext"
7	nixpkgs="$nixpkgsNext"
8	export NIX_PATH="nixpkgs=$nixpkgs:nixpkgsNext=$nixpkgsNext:nixpkgsPrevious=$nixpkgsPrevious"
9	nix-env -r -i -A immaePackages -f "<nixpkgs>" "$@"	6	nix-env -r -i -A immaePackages -f "<nixpkgs>" "$@"