Make the use of nixpkgs more homogeneous for env

diff --git a/default.nix b/default.nix
index eddefa952cf9d1d20de8a5e85206f260aeadee2f..e5fc5f4ac598e741772c53c48331a7775fc27062 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,5 +1,5 @@
-with import <immaeNixpkgsNext> {};
-with import ./libs.nix { nixpkgs = import <immaeNixpkgsNext> {}; };
+with import <nixpkgs> {};
+with import ./libs.nix { nixpkgs = import <nixpkgs> {}; };
 let
   mypkgs = {};
 
@@ -93,7 +93,7 @@ let
     };
   };
 
-  mypkgs.terminal-velocity = with python3Packages; buildPythonApplication rec {
+  mypkgs.terminal-velocity = with python36Packages; buildPythonApplication rec {
     pname = "terminal-velocity-git";
     version = "0.2.0";
 

diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index 7cc409f79f602553307c77a68f016e0282109590..d6b66bdb3f98363b0e80d6a5aee0fa0091602344 100755 (executable)
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -28,6 +28,8 @@ for file in $files; do
 done
 nixops set-args --argstr privateFiles "$TEMP"
 
+# 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="https://releases.nixos.org/nixos/18.09/nixos-18.09.1834.9d608a6f592/nixexprs.tar.xz"
 nixpkgs="$nixpkgsNext"

diff --git a/scripts/make-env b/scripts/make-env
index ec108652d48c188f021c9f1f3b01875405b1c9a4..4dd89b7086d930d92a085b69a5dc39863e416b57 100755 (executable)
--- a/scripts/make-env
+++ b/scripts/make-env
@@ -1,3 +1,9 @@
 #!/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"
 nix-env -r -i -A immaePackages -f "<nixpkgs>" "$@"