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

* URL updates.

Browse Source 
svn path=/nixos/trunk/; revision=11801
This commit is contained in:
Eelco Dolstra 2008-05-09 15:08:43 +00:00
parent c612af3564
commit cc7f3c7aaa
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -2,4 +2,4 @@
NixOS is a Linux distribution based on the purely functional package NixOS is a Linux distribution based on the purely functional package
management system Nix. More information can be found at management system Nix. More information can be found at
http://nix.cs.uu.nl/nixos and in the manual in doc/manual. http://nixos.org/nixos and in the manual in doc/manual.

12
doc/manual/installation.xml
View File

@ -11,14 +11,14 @@
<title>Building the installation CD</title> <title>Building the installation CD</title>
<para>Instead of building an installation CD, you could just download <para>Instead of building an installation CD, you could just download
one from <link xlink:href="http://nix.cs.uu.nl/nixos/"/>. If you want one from <link xlink:href="http://nixos.org/nixos/"/>. If you want
(or need) to build it yourself: (or need) to build it yourself:
<orderedlist> <orderedlist>
<listitem><para>Make sure that you have a <emphasis>very</emphasis> <listitem><para>Make sure that you have a <emphasis>very</emphasis>
recent pre-release version of Nix installed (<link recent pre-release version of Nix installed (<link
xlink:href="http://nix.cs.uu.nl/dist/nix/nix-unstable-latest/"/>). xlink:href="http://nixos.org/releases/nix/nix-unstable/"/>).
The NixOS Nix expressions frequently use bleeding-edge features. If The NixOS Nix expressions frequently use bleeding-edge features. If
you get any kind of expression evaluation error, try to upgrade your you get any kind of expression evaluation error, try to upgrade your
Nix.</para></listitem> Nix.</para></listitem>
@ -29,18 +29,18 @@ one from <link xlink:href="http://nix.cs.uu.nl/nixos/"/>. If you want
channel to speed up building, i.e., channel to speed up building, i.e.,
<screen> <screen>
$ nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable $ nix-channel --add http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable
$ nix-channel --update</screen> $ nix-channel --update</screen>
</para></listitem> </para></listitem>
<listitem><para>Check out NixOS from <link <listitem><para>Check out NixOS from <link
xlink:href="https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk"/> as xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk"/> as
<literal>nixos</literal>.</para></listitem> <literal>nixos</literal>.</para></listitem>
<listitem><para>If you don’t already have Nixpkgs checkout, Check <listitem><para>If you don’t already have Nixpkgs checkout, Check
out Nixpkgs from <link out Nixpkgs from <link
xlink:href="https://svn.cs.uu.nl:12443/repos/trace/nixos/trunk"/> as xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk"/> as
<literal>nixpkgs</literal>.</para></listitem> <literal>nixpkgs</literal>.</para></listitem>
<listitem><para>In the directory <literal>nixos</literal>, make a <listitem><para>In the directory <literal>nixos</literal>, make a
@ -174,7 +174,7 @@ $ nixos-hardware-scan > /mnt/etc/nixos/configuration.nix</screen>
<para>More examples of NixOS configurations for some actual <para>More examples of NixOS configurations for some actual
machines can be found at <link machines can be found at <link
xlink:href="https://svn.cs.uu.nl:12443/repos/trace/configurations/trunk/"/>.</para> xlink:href="https://svn.nixos.org/repos/nix/configurations/trunk/"/>.</para>
<note><para>It is very important that you specify in the option <note><para>It is very important that you specify in the option
<option>boot.initrd.extraKernelModules</option> all kernel modules <option>boot.initrd.extraKernelModules</option> all kernel modules

2
installer/nixos-checkout.sh
View File

@ -16,7 +16,7 @@ fi
# Obtain Subversion. # Obtain Subversion.
if test -z "$(type -tp svn)"; then if test -z "$(type -tp svn)"; then
#nix-channel --add http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable #nix-channel --add http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable
#nix-channel --update #nix-channel --update
nix-env -i subversion nix-env -i subversion
fi fi

8
system/options.nix
View File

@ -2014,7 +2014,7 @@
nixpkgsURL = mkOption { nixpkgsURL = mkOption {
default = ""; default = "";
example = http://nix.cs.uu.nl/dist/nix/nixpkgs-0.11pre7577; example = http://nixos.org/releases/nix/nixpkgs-0.11pre7577;
description = " description = "
URL of the Nixpkgs distribution to use when building the URL of the Nixpkgs distribution to use when building the
installation CD. installation CD.
@ -2022,10 +2022,10 @@
}; };
manifests = mkOption { manifests = mkOption {
default = [http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST]; default = [http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST];
example = example =
[ http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable/MANIFEST [ http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/MANIFEST
http://nix.cs.uu.nl/dist/nix/channels-v3/nixpkgs-stable/MANIFEST http://nixos.org/releases/nixpkgs/channels/nixpkgs-stable/MANIFEST
]; ];
description = " description = "
URLs of manifests to be downloaded when you run URLs of manifests to be downloaded when you run