movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-14 21:49:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

* svn.nixos.org -> nixos.org.

Browse source 
svn path=/nixos/trunk/; revision=29690
This commit is contained in:
Eelco Dolstra 2011-10-06 11:29:44 +00:00
parent 0f816374c7
commit 00ce9aaf1a
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/manual/development.xml
View file

@ -410,7 +410,7 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
crashes). It will first build or download all the dependencies of crashes). It will first build or download all the dependencies of
the test (e.g., all packages needed to run a NixOS VM). The test the test (e.g., all packages needed to run a NixOS VM). The test
is defined in <link is defined in <link
xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk/tests/nfs.nix"> xlink:href="https://nixos.org/repos/nix/nixos/trunk/tests/nfs.nix">
<filename>tests/nfs.nix</filename></link>. If the test succeeds, <filename>tests/nfs.nix</filename></link>. If the test succeeds,
<command>nix-build</command> will place a symlink <command>nix-build</command> will place a symlink
<filename>./result</filename> in the current directory pointing at <filename>./result</filename> in the current directory pointing at
@ -483,7 +483,7 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
<para> <para>
The actual Nix programming interface to VM testing is in NixOS, The actual Nix programming interface to VM testing is in NixOS,
under <link under <link
xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk/lib/testing.nix"> xlink:href="https://nixos.org/repos/nix/nixos/trunk/lib/testing.nix">
<filename>lib/testing.nix</filename></link>. This file defines a <filename>lib/testing.nix</filename></link>. This file defines a
function which takes an attribute set containing a function which takes an attribute set containing a
<literal>nixpkgs</literal> attribute (the path to a Nixpkgs <literal>nixpkgs</literal> attribute (the path to a Nixpkgs
@ -496,7 +496,7 @@ $ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/
<para> <para>
The <literal>makeTest</literal> function takes a function similar to The <literal>makeTest</literal> function takes a function similar to
that found in <link that found in <link
xlink:href="https://svn.nixos.org/repos/nix/nixos/trunk/tests/nfs.nix"> xlink:href="https://nixos.org/repos/nix/nixos/trunk/tests/nfs.nix">
<filename>tests/nfs.nix</filename></link> (discussed above). It <filename>tests/nfs.nix</filename></link> (discussed above). It
returns an attribute set containing (among others): returns an attribute set containing (among others):

6
doc/manual/installation.xml
View file

@ -35,11 +35,11 @@ $ 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.nixos.org/repos/nix/nixos/trunk"/> as xlink:href="https://nixos.org/repos/nix/nixos/trunk"/> as
<literal>nixos</literal>.</para></listitem> <literal>nixos</literal>.</para></listitem>
<listitem><para>Check out Nixpkgs from <listitem><para>Check out Nixpkgs from
<link xlink:href="https://svn.nixos.org/repos/nix/nixpkgs/trunk"/> as <link xlink:href="https://nixos.org/repos/nix/nixpkgs/trunk"/> as
<literal>nixpkgs</literal>.</para></listitem> <literal>nixpkgs</literal>.</para></listitem>
<listitem><para>Build the ISO image: <listitem><para>Build the ISO image:
@ -175,7 +175,7 @@ $ nixos-option --install</screen>
<para>Examples are available in <para>Examples are available in
<filename>/etc/nixos/nixos/doc/config-examples</filename> and some <filename>/etc/nixos/nixos/doc/config-examples</filename> and some
actual NixOS configuration can be found at <link actual NixOS configuration can be found at <link
xlink:href="https://svn.nixos.org/repos/nix/configurations/trunk/"/>.</para> xlink:href="https://nixos.org/repos/nix/configurations/trunk/"/>.</para>
</listitem> </listitem>

2
doc/manual/options-to-docbook.xsl
View file

@ -156,7 +156,7 @@
or to the local filesystem. --> or to the local filesystem. -->
<xsl:choose> <xsl:choose>
<xsl:when test="$revision != 'local' and contains(@value, '/modules/')"> <xsl:when test="$revision != 'local' and contains(@value, '/modules/')">
<xsl:attribute name="xlink:href">https://svn.nixos.org/viewvc/nix/nixos/trunk/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/>?revision=<xsl:value-of select="$revision"/></xsl:attribute> <xsl:attribute name="xlink:href">https://nixos.org/viewvc/nix/nixos/trunk/modules/<xsl:value-of select="substring-after(@value, '/modules/')"/>?revision=<xsl:value-of select="$revision"/></xsl:attribute>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:attribute name="xlink:href">file://<xsl:value-of select="@value"/></xsl:attribute> <xsl:attribute name="xlink:href">file://<xsl:value-of select="@value"/></xsl:attribute>

4
modules/installer/tools/nixos-checkout.nix
View file

@ -28,8 +28,8 @@ let
fi fi
# Check out the NixOS and Nixpkgs sources. # Check out the NixOS and Nixpkgs sources.
${pkgs.subversion}/bin/svn co https://svn.nixos.org/repos/nix/nixos/trunk nixos ${pkgs.subversion}/bin/svn co https://nixos.org/repos/nix/nixos/trunk nixos
${pkgs.subversion}/bin/svn co https://svn.nixos.org/repos/nix/nixpkgs/trunk nixpkgs ${pkgs.subversion}/bin/svn co https://nixos.org/repos/nix/nixpkgs/trunk nixpkgs
''; '';
}; };