Merge master into staging-next

2018-12-03 12:18:43 +01:00
parent 077b7e5880 e869896d00
commit a510aa2672
388 changed files with 3023 additions and 1285 deletions
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {

    license = licenses.gpl3Plus;

-    homepage = http://www.gnu.org/software/wget/;
+    homepage = https://www.gnu.org/software/wget/;

    maintainers = with maintainers; [ fpletz ];
    platforms = platforms.all;