echo working copies beeing used when calling showSyntax (help output)
svn path=/nixos/trunk/; revision=12729
This commit is contained in:
parent
90198db08c
commit
b0b4c0e2b3
1 changed files with 12 additions and 7 deletions
|
@ -1,5 +1,10 @@
|
|||
#! @shell@ -e
|
||||
|
||||
# Allow the location of NixOS sources and the system configuration
|
||||
# file to be overridden.
|
||||
NIXOS=${NIXOS:-@defaultNIXOS@}
|
||||
NIXPKGS=${NIXPKGS:-@defaultNIXPKGS@}
|
||||
NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
|
||||
|
||||
showSyntax() {
|
||||
# !!! more or less cut&paste from
|
||||
|
@ -13,6 +18,13 @@ test: activate the configuration, but don't make it the boot default
|
|||
build: build the configuration, but don't make it the default or
|
||||
activate it
|
||||
dry-run: just show what store paths would be built/downloaded
|
||||
|
||||
by env overridable settings:
|
||||
NIXOS=${NIXOS}
|
||||
NIXPKGS=${NIXPKGS}
|
||||
NIXOS_CONFIG=${NIXOS_CONFIG}
|
||||
"
|
||||
|
||||
EOF
|
||||
exit 1
|
||||
}
|
||||
|
@ -40,13 +52,6 @@ if test "$action" = dry-run; then
|
|||
fi
|
||||
|
||||
|
||||
# Allow the location of NixOS sources and the system configuration
|
||||
# file to be overridden.
|
||||
NIXOS=${NIXOS:-@defaultNIXOS@}
|
||||
NIXPKGS=${NIXPKGS:-@defaultNIXPKGS@}
|
||||
NIXOS_CONFIG=${NIXOS_CONFIG:-/etc/nixos/configuration.nix}
|
||||
|
||||
|
||||
# If the Nix daemon is running, then use it. This allows us to use
|
||||
# the latest Nix from Nixpkgs (below) for expression evaluation, while
|
||||
# still using the old Nix (via the daemon) for actual store access.
|
||||
|
|
Loading…
Reference in a new issue