diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:31 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-28 11:30:49 +0200 |
commit | f64d84698eb3f4d833e846336ff99a73331c31f7 (patch) | |
tree | 1120886b680851bc8b8f8d337af3503ecd4a3d71 /doc/quick-start.xml | |
parent | 3e4a382d6753a057256c7ef1e9f52ae9e07bd677 (diff) | |
parent | 30431e71608576baf880567b2894ad2a542f8d5e (diff) | |
download | nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.gz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.bz2 nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.lz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.xz nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.tar.zst nixlib-f64d84698eb3f4d833e846336ff99a73331c31f7.zip |
Merge remote-tracking branch 'origin/master' into staging
Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix
Diffstat (limited to 'doc/quick-start.xml')
-rw-r--r-- | doc/quick-start.xml | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/doc/quick-start.xml b/doc/quick-start.xml index 49c674052b95..0f11a906d771 100644 --- a/doc/quick-start.xml +++ b/doc/quick-start.xml @@ -155,9 +155,10 @@ $ git add pkgs/development/libraries/libfoo/default.nix</screen> </listitem> <listitem> - <para>You can use <command>nix-prefetch-url</command> + <para>You can use <command>nix-prefetch-url</command> (or similar nix-prefetch-git, etc) <replaceable>url</replaceable> to get the SHA-256 hash of - source distributions.</para> + source distributions. There are similar commands as <command>nix-prefetch-git</command> and + <command>nix-prefetch-hg</command> available in <literal>nix-prefetch-scripts</literal> package.</para> </listitem> <listitem> @@ -221,17 +222,10 @@ $ nix-env -f . -iA libfoo</screen> </listitem> <listitem> - <para>Optionally commit the new package, or send a patch to + <para>Optionally commit the new package and open a pull request, or send a patch to <literal>nix-dev@cs.uu.nl</literal>.</para> </listitem> - <listitem> - <para>If you want the TU Delft build farm to build binaries of the - package and make them available in the <link - xlink:href="http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable/"><literal>nixpkgs</literal> - channel</link>, add it to <link - xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/release.nix"><filename>pkgs/top-level/release.nix</filename></link>.</para> - </listitem> </orderedlist> |