nixpkgs.diff

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6c3eb98..ee29a14 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -93888,17 +93888,17 @@ self: {
 
   "http-client-tls_0_3_0" = callPackage
     ({ mkDerivation, base, bytestring, connection, data-default-class
-     , hspec, http-client, http-types, network, tls
+     , hspec, http-client_0_5_1, http-types, network, tls
      }:
      mkDerivation {
        pname = "http-client-tls";
        version = "0.3.0";
        sha256 = "811b30a53156dc12e3eb34f8921778f081521ef388b7f4d7ce6c59d086cb3358";
        libraryHaskellDepends = [
-         base bytestring connection data-default-class http-client network
+         base bytestring connection data-default-class http-client_0_5_1 network
          tls
        ];
-       testHaskellDepends = [ base hspec http-client http-types ];
+       testHaskellDepends = [ base hspec http-client_0_5_1 http-types ];
        jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/snoyberg/http-client";
@@ -93958,8 +93958,8 @@ self: {
   "http-conduit_2_2_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, connection, cookie
-     , data-default-class, exceptions, hspec, http-client
-     , http-client-tls, http-types, HUnit, lifted-base, monad-control
+     , data-default-class, exceptions, hspec, http-client_0_5_1
+     , http-client-tls_0_3_0, http-types, HUnit, lifted-base, monad-control
      , mtl, network, resourcet, streaming-commons, temporary, text, time
      , transformers, utf8-string, wai, wai-conduit, warp, warp-tls
      }:
@@ -93970,14 +93970,14 @@ self: {
        revision = "1";
        editedCabalFile = "372b74352618af28ae28dca7d7b4cbe38e07f0e132554e15f4376f8ae1ef6617";
        libraryHaskellDepends = [
-         aeson base bytestring conduit conduit-extra exceptions http-client
-         http-client-tls http-types lifted-base monad-control mtl resourcet
+         aeson base bytestring conduit conduit-extra exceptions http-client_0_5_1
+         http-client-tls_0_3_0 http-types lifted-base monad-control mtl resourcet
          transformers
        ];
        testHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive conduit
          conduit-extra connection cookie data-default-class hspec
-         http-client http-types HUnit lifted-base network resourcet
+         http-client_0_5_1 http-types HUnit lifted-base network resourcet
          streaming-commons temporary text time transformers utf8-string wai
          wai-conduit warp warp-tls
        ];
@@ -125691,6 +125691,7 @@ self: {
        description = "Utilities and combinators for parsing command line options";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
+       doCheck = false;
      }) {};
 
   "optparse-declarative" = callPackage
@@ -125734,7 +125735,7 @@ self: {
      }) {};
 
   "optparse-simple" = callPackage
-    ({ mkDerivation, base, either, gitrev, optparse-applicative
+    ({ mkDerivation, base, either, gitrev, optparse-applicative_0_13_0_0
      , template-haskell, transformers
      }:
      mkDerivation {
@@ -125742,7 +125743,7 @@ self: {
        version = "0.0.3";
        sha256 = "4547f0a6c1bd959b1d9c3c2a5fabee39ac9a19dffabbb2d75461a2d461df8c7e";
        libraryHaskellDepends = [
-         base either gitrev optparse-applicative template-haskell
+         base either gitrev optparse-applicative_0_13_0_0 template-haskell
          transformers
        ];
        description = "Simple interface to optparse-applicative";

shell.patch

--- shell.nix	2016-08-23 14:47:20.105707722 +0300
+++ shell.nix1	2016-08-23 13:45:34.585450752 +0300
@@ -11,11 +11,11 @@
       , cryptohash, cryptohash-conduit, deepseq, directory, edit-distance
       , either, enclosed-exceptions, errors, exceptions, extra
       , fast-logger, filelock, filepath, fsnotify, generic-deriving
-      , gitrev, hashable, hastache, hit, hpack, hpc, hspec, http-client
-      , http-client-tls, http-conduit, http-types, lifted-async
+      , gitrev, hashable, hastache, hit, hpack, hpc, hspec, http-client_0_5_1
+      , http-client-tls_0_3_0, http-conduit_2_2_0, http-types, lifted-async
       , lifted-base, microlens, monad-control, monad-logger, monad-unlift
       , mono-traversable, mtl, neat-interpolation, open-browser
-      , optparse-applicative, optparse-simple, path, path-io, persistent
+      , optparse-applicative_0_13_0_0, optparse-simple, path, path-io, persistent
       , persistent-sqlite, persistent-template, pretty, process
       , project-template, QuickCheck, regex-applicative-text, resourcet
       , retry, safe, semigroups, smallcheck, split, stdenv, stm, store
@@ -38,10 +38,10 @@
           conduit-extra containers cryptohash cryptohash-conduit deepseq
           directory edit-distance either enclosed-exceptions errors
           exceptions extra fast-logger filelock filepath fsnotify
-          generic-deriving hashable hastache hit hpack hpc http-client
-          http-client-tls http-conduit http-types lifted-async lifted-base
+          generic-deriving hashable hastache hit hpack hpc http-client_0_5_1
+          http-client-tls_0_3_0 http-conduit_2_2_0 http-types lifted-async lifted-base
           microlens monad-control monad-logger monad-unlift mtl open-browser
-          optparse-applicative path path-io persistent persistent-sqlite
+          optparse-applicative_0_13_0_0 path path-io persistent persistent-sqlite
           persistent-template pretty process project-template
           regex-applicative-text resourcet retry safe semigroups split stm
           store streaming-commons tar template-haskell temporary text
@@ -51,14 +51,14 @@
         ];
         executableHaskellDepends = [
           base bytestring Cabal containers directory either filelock filepath
-          gitrev hpack http-client lifted-base microlens monad-control
-          monad-logger mtl optparse-applicative optparse-simple path path-io
+          gitrev hpack http-client_0_5_1 lifted-base microlens monad-control
+          monad-logger mtl optparse-applicative_0_13_0_0 optparse-simple path path-io
           text transformers
         ];
         testHaskellDepends = [
           async attoparsec base bytestring Cabal conduit conduit-extra
           containers cryptohash directory exceptions filepath hspec
-          http-conduit monad-logger mono-traversable neat-interpolation path
+          http-conduit_2_2_0 monad-logger mono-traversable neat-interpolation path
           path-io process QuickCheck resourcet retry smallcheck store
           template-haskell temporary text th-reify-many transformers
           unix-compat vector