Merge branch 'master' into stdenv-updates

Conflicts (simple): pkgs/applications/networking/browsers/chromium/default.nix pkgs/development/libraries/libsoup/default.nix pkgs/os-specific/linux/kernel/manual-config.nix pkgs/os-specific/linux/qemu-kvm/default.nix
2013-03-02 10:41:53 +01:00
parent 97b24ed95a a920c50cfb
commit 26af997d41
101 changed files with 2221 additions and 330 deletions
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
    '';
    homepage = http://www.scala-lang.org/;
    license = "BSD";
+    platforms = stdenv.lib.platforms.all;
  };
 }