Merge pull request #5 from obadz/release-16.09

use 16.09 channel by default
This commit is contained in:
Eric Litak 2016-09-07 17:01:28 -07:00 committed by GitHub
commit 1f9ecc40f6

View file

@ -47,8 +47,6 @@
set -ex set -ex
nixpkgs="https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz"
makeConf() { makeConf() {
# NB <<"EOF" quotes / $ ` in heredocs, <<EOF does not # NB <<"EOF" quotes / $ ` in heredocs, <<EOF does not
mkdir -p /etc/nixos mkdir -p /etc/nixos
@ -156,11 +154,15 @@ curl https://nixos.org/nix/install | sh
source ~/.nix-profile/etc/profile.d/nix.sh source ~/.nix-profile/etc/profile.d/nix.sh
nix-channel --remove \* [ -z "$NIX_CHANNEL"] && NIX_CHANNEL="nixos-16.09"
export NIX_PATH="nixpkgs=$nixpkgs" nix-channel --remove nixpkgs
nix-channel --add "https://nixos.org/channels/$NIX_CHANNEL" nixos
nix-channel --update
export NIXOS_CONFIG=/etc/nixos/configuration.nix export NIXOS_CONFIG=/etc/nixos/configuration.nix
nix-env --set \ nix-env --set \
-I nixpkgs=$HOME/.nix-defexpr/channels/nixos \
-f '<nixpkgs/nixos>' \ -f '<nixpkgs/nixos>' \
-p /nix/var/nix/profiles/system \ -p /nix/var/nix/profiles/system \
-A system -A system
@ -177,6 +179,7 @@ touch /etc/NIXOS
cat > /etc/NIXOS_LUSTRATE << EOF cat > /etc/NIXOS_LUSTRATE << EOF
etc/nixos etc/nixos
etc/resolv.conf etc/resolv.conf
root/.nix-defexpr/channels
EOF EOF
mv -v /boot /boot.bak && mv -v /boot /boot.bak &&