···92 </para>
93 <programlisting>
94$ nix-env -qaP coreutils
95-nixos.pkgs.coreutils coreutils-8.23
96</programlisting>
97 <para>
98 If your system responds like that (most NixOS installatios will),
99 then the attribute path to <literal>haskellPackages</literal> is
100- <literal>nixos.pkgs.haskellPackages</literal>. Thus, if you want to
101 use <literal>nix-env</literal> without giving an explicit
102 <literal>-f</literal> flag, then that's the way to do it:
103 </para>
104 <programlisting>
105-$ nix-env -qaP -A nixos.pkgs.haskellPackages
106-$ nix-env -iA nixos.pkgs.haskellPackages.cabal-install
107</programlisting>
108 <para>
109 Our current default compiler is GHC 7.10.x and the
···92 </para>
93 <programlisting>
94$ nix-env -qaP coreutils
95+nixos.coreutils coreutils-8.23
96</programlisting>
97 <para>
98 If your system responds like that (most NixOS installatios will),
99 then the attribute path to <literal>haskellPackages</literal> is
100+ <literal>nixos.haskellPackages</literal>. Thus, if you want to
101 use <literal>nix-env</literal> without giving an explicit
102 <literal>-f</literal> flag, then that's the way to do it:
103 </para>
104 <programlisting>
105+$ nix-env -qaP -A nixos.haskellPackages
106+$ nix-env -iA nixos.haskellPackages.cabal-install
107</programlisting>
108 <para>
109 Our current default compiler is GHC 7.10.x and the
···11Mozilla Thunderbird:
1213<screen>
14-$ nix-env -iA nixos.pkgs.thunderbird</screen>
1516If you invoke this as root, the package is installed in the Nix
17profile <filename>/nix/var/nix/profiles/default</filename> and visible
···11Mozilla Thunderbird:
1213<screen>
14+$ nix-env -iA nixos.thunderbird</screen>
1516If you invoke this as root, the package is installed in the Nix
17profile <filename>/nix/var/nix/profiles/default</filename> and visible
···23<para>You can get a list of the available packages as follows:
24<screen>
25$ nix-env -qaP '*' --description
26-nixos.pkgs.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded
27<replaceable>...</replaceable>
28</screen>
2930The first column in the output is the <emphasis>attribute
31name</emphasis>, such as
32-<literal>nixos.pkgs.thunderbird</literal>. (The
33<literal>nixos</literal> prefix allows distinguishing between
34different channels that you might have.)</para>
35
···23<para>You can get a list of the available packages as follows:
24<screen>
25$ nix-env -qaP '*' --description
26+nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded
27<replaceable>...</replaceable>
28</screen>
2930The first column in the output is the <emphasis>attribute
31name</emphasis>, such as
32+<literal>nixos.thunderbird</literal>. (The
33<literal>nixos</literal> prefix allows distinguishing between
34different channels that you might have.)</para>
35
···1-/* Terrible backward compatibility hack to get the path to Nixpkgs
2- from here. Usually, that's the relative path ‘../..’. However,
3- when using the NixOS channel, <nixos> resolves to a symlink to
4- nixpkgs/nixos, so ‘../..’ doesn't resolve to the top-level Nixpkgs
5- directory but one above it. So check for that situation. */
6-if builtins.pathExists ../../.version then import ../..
7-else if builtins.pathExists ../../nixpkgs then import ../../nixpkgs
8-else abort "Can't find Nixpkgs, please set ‘NIX_PATH=nixpkgs=/path/to/nixpkgs’."
···00000000
+8-9
nixos/modules/installer/cd-dvd/channel.nix
···910 # We need a copy of the Nix expressions for Nixpkgs and NixOS on the
11 # CD. These are installed into the "nixos" channel of the root
12- # user, as expected by nixos-rebuild/nixos-install.
013 channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}"
14- { expr = readFile ../../../lib/channel-expr.nix; }
15 ''
16- mkdir -p $out/nixos
17- cp -prd ${pkgs.path} $out/nixos/nixpkgs
18- ln -s nixpkgs/nixos $out/nixos/nixos
19 chmod -R u+w $out/nixos
20- rm -rf $out/nixos/nixpkgs/.git
21- echo -n ${config.system.nixosVersion} > $out/nixos/nixpkgs/.version
22- echo -n "" > $out/nixos/nixpkgs/.version-suffix
23- echo "$expr" > $out/nixos/default.nix
24 '';
2526in
···910 # We need a copy of the Nix expressions for Nixpkgs and NixOS on the
11 # CD. These are installed into the "nixos" channel of the root
12+ # user, as expected by nixos-rebuild/nixos-install. FIXME: merge
13+ # with make-channel.nix.
14 channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}"
15+ { }
16 ''
17+ mkdir -p $out
18+ cp -prd ${pkgs.path} $out/nixos
019 chmod -R u+w $out/nixos
20+ ln -s . $out/nixos/nixpkgs
21+ rm -rf $out/nixos/.git
22+ echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix
023 '';
2425in
···5354# Build a network of VMs
5556-nix-build '<nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
57 --argstr networkExpr $networkExpr $noOutLinkArg $showTraceArg
···5354# Build a network of VMs
5556+nix-build '<nixpkgs/nixos/modules/installer/tools/nixos-build-vms/build-vms.nix>' \
57 --argstr networkExpr $networkExpr $noOutLinkArg $showTraceArg
+1-1
nixos/modules/installer/tools/nixos-checkout.nix
···2728 if [ -z "$(type -P git)" ]; then
29 echo "installing Git..."
30- nix-env -iA nixos.pkgs.git || nix-env -i git
31 fi
3233 # Move any old nixpkgs directories out of the way.
···2728 if [ -z "$(type -P git)" ]; then
29 echo "installing Git..."
30+ nix-env -iA nixos.git
31 fi
3233 # Move any old nixpkgs directories out of the way.
+1-7
nixos/modules/installer/tools/nixos-install.sh
···256chroot $mountPoint /nix/var/nix/profiles/system/activate
257258259-# Some systems may not be prepared to use NixOS' paths.
260-export PATH=/run/current-system/sw/bin:/run/current-system/sw/sbin:$PATH
261-export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs
262-export NIX_PATH=$NIX_PATH:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
263-264-265# Ask the user to set a root password.
266-if [ "$(chroot $mountPoint nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then
267 echo "setting root password..."
268 chroot $mountPoint /var/setuid-wrappers/passwd
269fi
···256chroot $mountPoint /nix/var/nix/profiles/system/activate
257258000000259# Ask the user to set a root password.
260+if [ "$(chroot $mountPoint /run/current-system/sw/bin/sh -l -c "nix-instantiate --eval '<nixpkgs/nixos>' -A config.users.mutableUsers")" = true ] && [ -t 0 ] ; then
261 echo "setting root password..."
262 chroot $mountPoint /var/setuid-wrappers/passwd
263fi
+2-2
nixos/modules/installer/tools/nixos-rebuild.sh
···157 if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
158 machine="$(uname -m)"
159 if [ "$machine" = x86_64 ]; then
160- nixStorePath=/nix/store/ffig6yaggbh12dh9y5pnf1grf5lqyipz-nix-1.8
161 elif [[ "$machine" =~ i.86 ]]; then
162- nixStorePath=/nix/store/lglhfp4mimfa5wzjjf1kqz6f5wlsj2mn-nix-1.8
163 else
164 echo "$0: unsupported platform"
165 exit 1
···157 if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
158 machine="$(uname -m)"
159 if [ "$machine" = x86_64 ]; then
160+ nixStorePath=/nix/store/664kxr14kfgx4dl095crvmr7pbh9xlh5-nix-1.9
161 elif [[ "$machine" =~ i.86 ]]; then
162+ nixStorePath=/nix/store/p7xdvz72xx3rhm121jclsbdmmcds7xh6-nix-1.9
163 else
164 echo "$0: unsupported platform"
165 exit 1
+1-1
nixos/modules/misc/assertions.nix
···30 };
3132 };
33- # impl of assertions is in <nixos/modules/system/activation/top-level.nix>
34}
···30 };
3132 };
33+ # impl of assertions is in <nixpkgs/nixos/modules/system/activation/top-level.nix>
34}
···46 $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
4748 # Make sure we have a NixOS tree (required by ‘nixos-container create’).
49- $machine->succeed("PAGER=cat nix-env -qa -A nixos.pkgs.hello >&2");
5051 # Create some containers imperatively.
52 my $id1 = $machine->succeed("nixos-container create foo --ensure-unique-name");
···46 $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null");
4748 # Make sure we have a NixOS tree (required by ‘nixos-container create’).
49+ $machine->succeed("PAGER=cat nix-env -qa -A nixos.hello >&2");
5051 # Create some containers imperatively.
52 my $id1 = $machine->succeed("nixos-container create foo --ensure-unique-name");
···41 unix = null;
4243 # binary is not a core library for this compiler.
44- binary = self.binary_0_7_5_0;
4546 # deepseq is not a core library for this compiler.
47 deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
···41 unix = null;
4243 # binary is not a core library for this compiler.
44+ binary = self.binary_0_7_6_1;
4546 # deepseq is not a core library for this compiler.
47 deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
···35 unix = null;
3637 # binary is not a core library for this compiler.
38- binary = self.binary_0_7_5_0;
3940 # deepseq is not a core library for this compiler.
41 deepseq = self.deepseq_1_4_1_1;
···6970 # Needs hashable on pre 7.10.x compilers.
71 nats = addBuildDepend super.nats self.hashable;
0007273}
···35 unix = null;
3637 # binary is not a core library for this compiler.
38+ binary = self.binary_0_7_6_1;
3940 # deepseq is not a core library for this compiler.
41 deepseq = self.deepseq_1_4_1_1;
···6970 # Needs hashable on pre 7.10.x compilers.
71 nats = addBuildDepend super.nats self.hashable;
72+73+ # Newer versions require bytestring >=0.10.
74+ tar = super.tar_0_4_1_0;
7576}
···23stdenv.mkDerivation rec {
4 name = "yaws-${version}";
5- version = "1.99";
67 src = fetchurl {
8 url = "http://yaws.hyber.org/download/${name}.tar.gz";
9- sha256 = "057ymg84ji4pfi3xai6kis3mk8zks2ynbiam0x68cb4cb1yfzwcl";
10 };
1112 # The tarball includes a symlink yaws -> yaws-1.95, which seems to be
···23stdenv.mkDerivation rec {
4 name = "yaws-${version}";
5+ version = "2.0";
67 src = fetchurl {
8 url = "http://yaws.hyber.org/download/${name}.tar.gz";
9+ sha256 = "1gwk44a07n7yvg900yrlfc6qpvjl64k2h2hddd1jaaay8lgpcch6";
10 };
1112 # The tarball includes a symlink yaws -> yaws-1.95, which seems to be