Merge master into staging

2018-04-08 10:54:17 +02:00
parent f9e17ca3f6 62dc989963
commit 595a72589f
150 changed files with 2923 additions and 772 deletions
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
    homepage = http://www.icewm.org/;
    license = licenses.lgpl2;
    maintainers = [ maintainers.AndersonTorres ];
-    platforms = platforms.unix;
+    platforms = platforms.linux;
  };
 }