Merge remote-tracking branch 'upstream/master' into staging

2018-08-04 15:17:42 +03:00
parent 7a337cde31 20f1388c3f
commit 008fd5fcf5
132 changed files with 6166 additions and 2582 deletions
--- a/doc/quick-start.xml
+++ b/doc/quick-start.xml
@@ -9,7 +9,7 @@
    <para>
     Checkout the Nixpkgs source tree:
 <screen>
-$ git clone git://github.com/NixOS/nixpkgs.git 
+$ git clone https://github.com/NixOS/nixpkgs
 $ cd nixpkgs</screen>
    </para>
   </listitem>