Merge branch 'master' into stdenv-updates

Conflicts: pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
parent b60d44a00a b6519f08da
commit 609f8dc04b
272 changed files with 4690 additions and 2945 deletions
--- a/pkgs/development/compilers/elm/elm.nix
+++ b/pkgs/development/compilers/elm/elm.nix
@@ -5,8 +5,8 @@

 cabal.mkDerivation (self: {
  pname = "Elm";
-  version = "0.10";
-  sha256 = "0wwda9w9r3qw7b23bj4qnfj4vgl7zwwnslxmgz3rv0cmxn9klqx2";
+  version = "0.10.0.1";
+  sha256 = "1r7z2fw9v6ngr9w4lmj1l6sc78rmxvqkqlxv4a9yc5jm80k3ar0i";
  isLibrary = true;
  isExecutable = true;
  buildDepends = [
--- a/pkgs/development/compilers/ghc/with-packages.nix
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@@ -10,7 +10,7 @@ let
 in
 buildEnv {
  name = "haskell-env-${ghc.name}";
-  paths = stdenv.lib.filter (x: x ? ghc) (stdenv.lib.closePropagation (packages ++ [ghc]));
+  paths = stdenv.lib.filter (x: x ? ghc) (stdenv.lib.closePropagation packages) ++ [ghc];
  postBuild = ''
    . ${makeWrapper}/nix-support/setup-hook