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

Strip indentation from programlistings

Browse Source
This commit is contained in:
Eelco Dolstra 2015-06-03 17:04:26 +02:00
parent 35ff30c73f
commit 07b212b09d
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
doc/coding-conventions.xml
View File

@ -620,33 +620,39 @@ evaluate correctly.</para>
fetchers from <literal>pkgs/build-support/</literal>. As an example going fetchers from <literal>pkgs/build-support/</literal>. As an example going
from bad to good: from bad to good:
<itemizedlist> <itemizedlist>
<listitem><para>Uses <literal>git://</literal> which won't be proxied. <listitem>
<programlisting> <para>Uses <literal>git://</literal> which won't be proxied.
src = fetchgit { <programlisting>
src = fetchgit {
url = "git://github.com/NixOS/nix.git"; url = "git://github.com/NixOS/nix.git";
rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
} }
</programlisting></para> </programlisting>
</para>
</listitem> </listitem>
<listitem><para>This is ok, but an archive fetch will still be faster. <listitem>
<programlisting> <para>This is ok, but an archive fetch will still be faster.
src = fetchgit { <programlisting>
src = fetchgit {
url = "https://github.com/NixOS/nix.git"; url = "https://github.com/NixOS/nix.git";
rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg"; sha256 = "1cw5fszffl5pkpa6s6wjnkiv6lm5k618s32sp60kvmvpy7a2v9kg";
} }
</programlisting></para> </programlisting>
</para>
</listitem> </listitem>
<listitem><para>Fetches a snapshot archive and you get the rev you want. <listitem>
<programlisting> <para>Fetches a snapshot archive and you get the rev you want.
src = fetchFromGitHub { <programlisting>
src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae"; rev = "1f795f9f44607cc5bec70d1300150bfefcef2aae";
sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9"; sha256 = "04yri911rj9j19qqqn6m82266fl05pz98inasni0vxr1cf1gdgv9";
} }
</programlisting></para> </programlisting>
</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</para> </para>