From 326ca0f6900142b138512e3b2528b8bad39750d5 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 10 Aug 2014 23:18:57 -0500 Subject: [PATCH] Many minor fixes to get things building after recent compiler changes --- .../applications/editors/emacs-24/macport.nix | 11 ++++---- .../libraries/haskell/aeson/0.7.0.6.nix | 27 +++++++++++++++++++ .../libraries/haskell/criterion/default.nix | 1 + .../libraries/haskell/hfsevents/default.nix | 4 +-- .../development/libraries/libtiff/default.nix | 2 +- pkgs/development/tools/watchman/default.nix | 1 + pkgs/tools/system/tree/default.nix | 2 +- pkgs/top-level/all-packages.nix | 13 ++------- pkgs/top-level/haskell-defaults.nix | 6 ++--- pkgs/top-level/haskell-packages.nix | 1 + 10 files changed, 43 insertions(+), 25 deletions(-) create mode 100644 pkgs/development/libraries/haskell/aeson/0.7.0.6.nix diff --git a/pkgs/applications/editors/emacs-24/macport.nix b/pkgs/applications/editors/emacs-24/macport.nix index 4c599916d94..d9b32351040 100644 --- a/pkgs/applications/editors/emacs-24/macport.nix +++ b/pkgs/applications/editors/emacs-24/macport.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx"; }; + patches = [ ./darwin-new-sections.patch ]; + buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ]; postUnpack = '' @@ -53,16 +55,13 @@ stdenv.mkDerivation rec { postInstall = '' cat >$out/share/emacs/site-lisp/site-start.el <= 4.7 transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x zipArchive = super.zipArchive_0_2_2_1; # works without binary 0.7.x diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index e19a45eb864..2fcfcf4fcb8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -142,6 +142,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in AES = callPackage ../development/libraries/haskell/AES {}; aeson_0_7_0_4 = callPackage ../development/libraries/haskell/aeson/0.7.0.4.nix { blazeBuilder = null; }; + aeson_0_7_0_6 = callPackage ../development/libraries/haskell/aeson/0.7.0.6.nix { blazeBuilder = null; }; aeson_0_8_0_0 = callPackage ../development/libraries/haskell/aeson/0.8.0.0.nix { blazeBuilder = null; }; aeson = self.aeson_0_8_0_0;