Merge remote-tracking branch 'origin/master' into hardened-stdenv

2016-05-18 17:10:02 +02:00
parent 9fbc20e2f8 3cd63ade16
commit f8d481754c
1470 changed files with 62103 additions and 28701 deletions
@@ -24,6 +24,6 @@ stdenv.mkDerivation rec {
    homepage = https://fedoraproject.org/wiki/Features/numad;
    license = licenses.lgpl21;
    platforms = platforms.linux;
-    maintainers = with maintainers; [ iElectric ];
+    maintainers = with maintainers; [ domenkozar ];
  };
 }