Merge branch 'master' into staging-next

Hydra: ?compare=1472947
2018-08-12 10:33:41 +02:00
parent 580cab57e4 bb3f7d14a1
commit 00df25ee57
298 changed files with 3752 additions and 5727 deletions
@@ -36,6 +36,7 @@ stdenv.mkDerivation {

  meta = with stdenv.lib; {
    platforms = platforms.linux;
+    license = licenses.gpl2;
    maintainers = with maintainers; [ basvandijk ];
  };
 }