mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix-profile.sh: Don't create .nix-channels

Browse source 
This is already done by the installer, so no need to do it again.

(cherry picked from commit 26762ceb8629af95300c0cc8c372a99282060dc1)
This commit is contained in:
Eelco Dolstra 2019-10-09 18:30:31 +02:00
parent 923b6bd83c
commit 2522757e83
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 0 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/nix-profile-daemon.sh.in
View file

@ -15,11 +15,6 @@ if test -w $HOME; then
fi
fi
# Subscribe the root user to the NixOS channel by default.
if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
echo "https://nixos.org/channels/nixpkgs-unstable nixpkgs" > $HOME/.nix-channels
fi
# Set up a default Nix expression from which to install stuff.
if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
rm -f $HOME/.nix-defexpr

5
scripts/nix-profile.sh.in
View file

@ -22,11 +22,6 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
fi
fi
# Subscribe the user to the unstable Nixpkgs channel by default.
if [ ! -e "$HOME/.nix-channels" ]; then
echo "https://nixos.org/channels/nixpkgs-unstable nixpkgs" > "$HOME/.nix-channels"
fi
# Set up a default Nix expression from which to install stuff.
__nix_defexpr="$HOME"/.nix-defexpr
[ -L "$__nix_defexpr" ] && rm -f "$__nix_defexpr"

1
tests/nix-profile.sh
View file

@ -9,4 +9,3 @@ USER=$user $SHELL -e -c ". $TEST_ROOT/nix-profile.sh; set"
USER=$user $SHELL -e -c ". $TEST_ROOT/nix-profile.sh" # test idempotency
[ -L $TEST_HOME/.nix-profile ]
[ -e $TEST_HOME/.nix-channels ]