From 50aff7e07b1b25d8ec89a0d774cfd9c7ea0664e8 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Fri, 7 Oct 2016 10:57:54 +0200 Subject: [PATCH 1/2] texrunner: Fix build Tests fail due to nonexistent tex executables. --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b997c5634c2c..4e9f723b6ccd 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -269,6 +269,7 @@ self: super: { snowball = dontCheck super.snowball; sophia = dontCheck super.sophia; test-sandbox = dontCheck super.test-sandbox; + texrunner = dontCheck super.texrunner; users-postgresql-simple = dontCheck super.users-postgresql-simple; wai-middleware-hmac = dontCheck super.wai-middleware-hmac; xkbcommon = dontCheck super.xkbcommon; From 7c741722e20ac2d22e97163498c2bce27af2a2c0 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Fri, 7 Oct 2016 12:00:12 +0200 Subject: [PATCH 2/2] diagrams-pgf: Fix dependencies --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4e9f723b6ccd..be7cf7302b70 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -643,6 +643,11 @@ self: super: { ''; })); + # Requires optparse-applicative 0.13.0.0 + diagrams-pgf = super.diagrams-pgf.overrideScope (self: super: { + optparse-applicative = self.optparse-applicative_0_13_0_0; + }); + # Patch to consider NIX_GHC just like xmonad does dyre = appendPatch super.dyre ./patches/dyre-nix.patch;