···9292 </para>
9393 <programlisting>
9494$ nix-env -qaP coreutils
9595-nixos.pkgs.coreutils coreutils-8.23
9595+nixos.coreutils coreutils-8.23
9696</programlisting>
9797 <para>
9898 If your system responds like that (most NixOS installatios will),
9999 then the attribute path to <literal>haskellPackages</literal> is
100100- <literal>nixos.pkgs.haskellPackages</literal>. Thus, if you want to
100100+ <literal>nixos.haskellPackages</literal>. Thus, if you want to
101101 use <literal>nix-env</literal> without giving an explicit
102102 <literal>-f</literal> flag, then that's the way to do it:
103103 </para>
104104 <programlisting>
105105-$ nix-env -qaP -A nixos.pkgs.haskellPackages
106106-$ nix-env -iA nixos.pkgs.haskellPackages.cabal-install
105105+$ nix-env -qaP -A nixos.haskellPackages
106106+$ nix-env -iA nixos.haskellPackages.cabal-install
107107</programlisting>
108108 <para>
109109 Our current default compiler is GHC 7.10.x and the
···1111Mozilla Thunderbird:
12121313<screen>
1414-$ nix-env -iA nixos.pkgs.thunderbird</screen>
1414+$ nix-env -iA nixos.thunderbird</screen>
15151616If you invoke this as root, the package is installed in the Nix
1717profile <filename>/nix/var/nix/profiles/default</filename> and visible
···2323<para>You can get a list of the available packages as follows:
2424<screen>
2525$ nix-env -qaP '*' --description
2626-nixos.pkgs.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded
2626+nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded
2727<replaceable>...</replaceable>
2828</screen>
29293030The first column in the output is the <emphasis>attribute
3131name</emphasis>, such as
3232-<literal>nixos.pkgs.thunderbird</literal>. (The
3232+<literal>nixos.thunderbird</literal>. (The
3333<literal>nixos</literal> prefix allows distinguishing between
3434different channels that you might have.)</para>
3535
+9
nixos/doc/manual/release-notes/rl-unstable.xml
···188188 </para>
189189</listitem>
190190191191+<listitem>
192192+ <para>
193193+ The Nix expression search path (<envar>NIX_PATH</envar>) no longer
194194+ contains <filename>/etc/nixos/nixpkgs</filename> by default. You
195195+ can override <envar>NIX_PATH</envar> by setting
196196+ <option>nix.nixPath</option>.
197197+ </para>
198198+</listitem>
199199+191200</itemizedlist>
192201</para>
193202
···11-/* Terrible backward compatibility hack to get the path to Nixpkgs
22- from here. Usually, that's the relative path ‘../..’. However,
33- when using the NixOS channel, <nixos> resolves to a symlink to
44- nixpkgs/nixos, so ‘../..’ doesn't resolve to the top-level Nixpkgs
55- directory but one above it. So check for that situation. */
66-if builtins.pathExists ../../.version then import ../..
77-else if builtins.pathExists ../../nixpkgs then import ../../nixpkgs
88-else abort "Can't find Nixpkgs, please set ‘NIX_PATH=nixpkgs=/path/to/nixpkgs’."
+8-9
nixos/modules/installer/cd-dvd/channel.nix
···991010 # We need a copy of the Nix expressions for Nixpkgs and NixOS on the
1111 # CD. These are installed into the "nixos" channel of the root
1212- # user, as expected by nixos-rebuild/nixos-install.
1212+ # user, as expected by nixos-rebuild/nixos-install. FIXME: merge
1313+ # with make-channel.nix.
1314 channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}"
1414- { expr = readFile ../../../lib/channel-expr.nix; }
1515+ { }
1516 ''
1616- mkdir -p $out/nixos
1717- cp -prd ${pkgs.path} $out/nixos/nixpkgs
1818- ln -s nixpkgs/nixos $out/nixos/nixos
1717+ mkdir -p $out
1818+ cp -prd ${pkgs.path} $out/nixos
1919 chmod -R u+w $out/nixos
2020- rm -rf $out/nixos/nixpkgs/.git
2121- echo -n ${config.system.nixosVersion} > $out/nixos/nixpkgs/.version
2222- echo -n "" > $out/nixos/nixpkgs/.version-suffix
2323- echo "$expr" > $out/nixos/default.nix
2020+ ln -s . $out/nixos/nixpkgs
2121+ rm -rf $out/nixos/.git
2222+ echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix
2423 '';
25242625in
···53535454# Build a network of VMs
55555656-nix-build '<nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
5656+nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
5757 --argstr networkExpr $networkExpr $noOutLinkArg $showTraceArg
+1-1
nixos/modules/installer/tools/nixos-checkout.nix
···27272828 if [ -z "$(type -P git)" ]; then
2929 echo "installing Git..."
3030- nix-env -iA nixos.pkgs.git || nix-env -i git
3030+ nix-env -iA nixos.git
3131 fi
32323333 # Move any old nixpkgs directories out of the way.
+1-7
nixos/modules/installer/tools/nixos-install.sh
···256256chroot $mountPoint /nix/var/nix/profiles/system/activate
257257258258259259-# Some systems may not be prepared to use NixOS' paths.
260260-export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin:$PATH
261261-export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs
262262-export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
263263-264264-265259# Ask the user to set a root password.
266266-if [ "$(chroot $mountPoint nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then
260260+if [ "$(chroot $mountPoint /run/current-system/sw/bin/sh -l -c "nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers")" = true ] && [ -t 0 ] ; then
267261 echo "setting root password..."
268262 chroot $mountPoint /var/setuid-wrappers/passwd
269263fi
+2-2
nixos/modules/installer/tools/nixos-rebuild.sh
···157157 if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
158158 machine="$(uname -m)"
159159 if [ "$machine" = x86_64 ]; then
160160- nixStorePath=/nix/store/ffig6yaggbh12dh9y5pnf1grf5lqyipz-nix-1.8
160160+ nixStorePath=/nix/store/664kxr14kfgx4dl095crvmr7pbh9xlh5-nix-1.9
161161 elif [[ "$machine" =~ i.86 ]]; then
162162- nixStorePath=/nix/store/lglhfp4mimfa5wzjjf1kqz6f5wlsj2mn-nix-1.8
162162+ nixStorePath=/nix/store/p7xdvz72xx3rhm121jclsbdmmcds7xh6-nix-1.9
163163 else
164164 echo "$0: unsupported platform"
165165 exit 1
+1-1
nixos/modules/misc/assertions.nix
···3030 };
31313232 };
3333- # impl of assertions is in <nixos/modules/system/activation/top-level.nix>
3333+ # impl of assertions is in <nixpkgs/nixos/modules/system/activation/top-level.nix>
3434}
···4646 $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
47474848 # Make sure we have a NixOS tree (required by ‘nixos-container create’).
4949- $machine->succeed("PAGER=cat nix-env -qa -A nixos.pkgs.hello >&2");
4949+ $machine->succeed("PAGER=cat nix-env -qa -A nixos.hello >&2");
50505151 # Create some containers imperatively.
5252 my $id1 = $machine->succeed("nixos-container create foo --ensure-unique-name");
···4141 unix = null;
42424343 # binary is not a core library for this compiler.
4444- binary = self.binary_0_7_5_0;
4444+ binary = self.binary_0_7_6_1;
45454646 # deepseq is not a core library for this compiler.
4747 deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
···3535 unix = null;
36363737 # binary is not a core library for this compiler.
3838- binary = self.binary_0_7_5_0;
3838+ binary = self.binary_0_7_6_1;
39394040 # deepseq is not a core library for this compiler.
4141 deepseq = self.deepseq_1_4_1_1;
···69697070 # Needs hashable on pre 7.10.x compilers.
7171 nats = addBuildDepend super.nats self.hashable;
7272+7373+ # Newer versions require bytestring >=0.10.
7474+ tar = super.tar_0_4_1_0;
72757376}
···3636 six
3737 ];
38383939- # Tests are in <nixos/tests/blivet.nix>.
3939+ # Tests are in <nixpkgs/nixos/tests/blivet.nix>.
4040 doCheck = false;
41414242 meta = with stdenv.lib; {