X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fmake-env;h=25aa869a210453a83699c3ceb4e523e2bc01a09d;hb=fe696f35f5e0789d4bc448bca4bbaf93d1182175;hp=4dd89b7086d930d92a085b69a5dc39863e416b57;hpb=a542de1164b0b2ddaa41aef13e7635b891913f86;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/scripts/make-env b/scripts/make-env
index 4dd89b7..25aa869 100755
--- a/scripts/make-env
+++ b/scripts/make-env
@@ -1,9 +1,12 @@
 #!/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>" "$@"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+eval "$(make --no-print-directory -C $(dirname $DIR) nix-path)"
+nix-env -r -i -A myEnvironments.immae-eu -f "<nixpkgs>" "$@"
+result=$?
+
+cat >> $(dirname $DIR)/versions_log <<EOF
+Ran $(date) with args "$@" and returned "$result"
+$(make --no-print-directory -C $(dirname $DIR) nix-info | sed -e "s/^/    /")
+EOF