public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put the NixOS channel in an option

Browse Source
This commit is contained in:
Eelco Dolstra 2013-10-24 15:09:00 +02:00
parent 8c65a2a181
commit 373c14614b
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/modules/misc/version.nix
View File

@ -24,6 +24,13 @@ with pkgs.lib;
description = "NixOS release code name."; description = "NixOS release code name.";
}; };
system.defaultChannel = mkOption {
internal = true;
type = types.uniq types.string;
default = https://nixos.org/channels/nixos-unstable;
description = "Default NixOS channel to which the root user is subscribed.";
};
}; };
config = { config = {

2
nixos/modules/programs/shell.nix
View File

@ -39,7 +39,7 @@ in
# Subscribe the root user to the NixOS channel by default. # Subscribe the root user to the NixOS channel by default.
if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then if [ "$USER" = root -a ! -e $HOME/.nix-channels ]; then
echo "http://nixos.org/channels/nixos-unstable nixos" > $HOME/.nix-channels echo "${config.system.defaultChannel} nixos" > $HOME/.nix-channels
fi fi
# Create the per-user garbage collector roots directory. # Create the per-user garbage collector roots directory.