Merge 'staging' into closure-size

- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.

1 files changed, 11 insertions, 10 deletions

diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix
index c5087a692f9..fd6fe516de7 100644
--- a/pkgs/development/libraries/haskell/purescript/default.nix
+++ b/pkgs/development/libraries/haskell/purescript/default.nix
@@ -1,27 +1,28 @@
 # This file was auto-generated by cabal2nix. Please do NOT edit manually!
 
-{ cabal, cmdtheline, filepath, haskeline, monadUnify, mtl, parsec
-, patternArrows, time, transformers, unorderedContainers
-, utf8String, xdgBasedir
+{ cabal, fileEmbed, filepath, haskeline, monadUnify, mtl, nodejs
+, optparseApplicative, parsec, patternArrows, time, transformers
+, unorderedContainers, utf8String
 }:
 
 cabal.mkDerivation (self: {
   pname = "purescript";
-  version = "0.5.4.1";
-  sha256 = "1d2i2sspr1dbzjznk70flvnik0b2m226a3z0rkqwrjjbl92bhgwb";
+  version = "0.6.3";
+  sha256 = "0hd6aslsfw2jd06wyfzi1kr86vfj91ywvgl9rv9cyawzczk7l7v4";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    cmdtheline filepath haskeline monadUnify mtl parsec patternArrows
-    time transformers unorderedContainers utf8String xdgBasedir
+    fileEmbed filepath haskeline monadUnify mtl optparseApplicative
+    parsec patternArrows time transformers unorderedContainers
+    utf8String
+  ];
+  testDepends = [
+    filepath mtl nodejs parsec transformers utf8String
   ];
-  testDepends = [ filepath mtl parsec transformers utf8String ];
-  doCheck = false;
   meta = {
     homepage = "http://www.purescript.org/";
     description = "PureScript Programming Language Compiler";
     license = self.stdenv.lib.licenses.mit;
     platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
   };
 })