Merge master into staging-next

2018-07-21 19:43:53 +02:00
parent 8213ff161c cc218fc915
commit ad47d658d1
2090 changed files with 4329 additions and 3730 deletions
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python2, fetchurl }:
+{ stdenv, fetchFromGitHub, python2 }:

 let