From 9ec240605d71af37ff7a337dd2767740aeeb702c Mon Sep 17 00:00:00 2001 From: Ryan Trinkle Date: Tue, 7 Oct 2014 21:34:31 -0400 Subject: [PATCH] Use optparse-applicative 0.9.1.1; 0.10 doesn't export 'reader', which causes ghcjs to fail to build --- pkgs/development/compilers/ghcjs/0.1.0.nix | 4 ++-- pkgs/development/tools/haskell/ghcjs/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/0.1.0.nix b/pkgs/development/compilers/ghcjs/0.1.0.nix index 65d68a5089f..e77569d1259 100644 --- a/pkgs/development/compilers/ghcjs/0.1.0.nix +++ b/pkgs/development/compilers/ghcjs/0.1.0.nix @@ -1,7 +1,7 @@ { cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time , zlib, aeson, attoparsec, bzlib, dataDefault, ghcPaths, hashable -, haskellSrcExts, haskellSrcMeta, lens, optparseApplicative_0_7_0_2 +, haskellSrcExts, haskellSrcMeta, lens, optparseApplicative_0_9_1_1 , parallel, safe, shelly, split, stringsearch, syb, systemFileio , systemFilepath, tar, terminfo, textBinary, unorderedContainers , vector, wlPprintText, yaml, fetchgit, Cabal, CabalGhcjs, cabalInstall @@ -34,7 +34,7 @@ cabal.mkDerivation (self: rec { buildDepends = [ filepath HTTP mtl network random stm time zlib aeson attoparsec bzlib dataDefault ghcPaths hashable haskellSrcExts haskellSrcMeta - lens optparseApplicative_0_7_0_2 parallel safe shelly split + lens optparseApplicative_0_9_1_1 parallel safe shelly split stringsearch syb systemFileio systemFilepath tar terminfo textBinary unorderedContainers vector wlPprintText yaml alex happy git gnumake gcc autoconf automake libtool patch gmp diff --git a/pkgs/development/tools/haskell/ghcjs/default.nix b/pkgs/development/tools/haskell/ghcjs/default.nix index 19e368b84f8..e3368c007df 100644 --- a/pkgs/development/tools/haskell/ghcjs/default.nix +++ b/pkgs/development/tools/haskell/ghcjs/default.nix @@ -1,7 +1,7 @@ { nodejs, cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm , testFramework, testFrameworkHunit, testFrameworkQuickcheck2, time , zlib, aeson, attoparsec, bzlib, dataDefault, ghcPaths, hashable -, haskellSrcExts, haskellSrcMeta, lens, optparseApplicative +, haskellSrcExts, haskellSrcMeta, lens, optparseApplicative_0_9_1_1 , parallel, safe, shelly, split, stringsearch, syb, systemFileio , systemFilepath, tar, terminfo, textBinary, unorderedContainers , vector, wlPprintText, yaml, fetchgit, Cabal, CabalGhcjs, cabalInstall @@ -58,7 +58,7 @@ cabal.mkDerivation (self: rec { buildDepends = [ filepath HTTP mtl network random stm time zlib aeson attoparsec bzlib dataDefault ghcPaths hashable haskellSrcExts haskellSrcMeta - lens optparseApplicative parallel safe shelly split + lens optparseApplicative_0_9_1_1 parallel safe shelly split stringsearch syb systemFileio systemFilepath tar terminfo textBinary unorderedContainers vector wlPprintText yaml alex happy git gnumake gcc autoconf automake libtool patch gmp