Merge branch 'master' into closure-size

2015-11-29 16:50:26 +01:00
parent 07a0204282 a9056371a0
commit 920b1d3591
241 changed files with 13028 additions and 1473 deletions
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
      Code.
    '';
    maintainers = with maintainers; [ raskin ];
-    platforms = with platforms; linux;
+    platforms = platforms.linux;
    license = licenses.lgpl21;
    homepage = http://zbar.sourceforge.net/;
  };