Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
This commit is contained in:
Vladimír Čunát
@@ -953,17 +953,13 @@ self: super: {
|
||||
# Tries to read a file it is not allowed to in the test suite
|
||||
load-env = dontCheck super.load-env;
|
||||
|
||||
# hledger needs a newer megaparsec version than we have in LTS 12.x.
|
||||
hledger-lib = super.hledger-lib.overrideScope (self: super: {
|
||||
# cassava-megaparsec = self.cassava-megaparsec_2_0_0;
|
||||
# hspec-megaparsec = self.hspec-megaparsec_2_0_0;
|
||||
# megaparsec = self.megaparsec_7_0_4;
|
||||
});
|
||||
|
||||
# Copy hledger man pages from data directory into the proper place. This code
|
||||
# should be moved into the cabal2nix generator.
|
||||
hledger = overrideCabal super.hledger (drv: {
|
||||
postInstall = ''
|
||||
# Don't install files that don't belong into this package to avoid
|
||||
# conflicts when hledger and hledger-ui end up in the same profile.
|
||||
rm embeddedfiles/hledger-{api,ui,web}.*
|
||||
for i in $(seq 1 9); do
|
||||
for j in embeddedfiles/*.$i; do
|
||||
mkdir -p $out/share/man/man$i
|
||||
@@ -974,7 +970,7 @@ self: super: {
|
||||
cp -v embeddedfiles/*.info* $out/share/info/
|
||||
'';
|
||||
});
|
||||
hledger-ui = (overrideCabal super.hledger-ui (drv: {
|
||||
hledger-ui = overrideCabal super.hledger-ui (drv: {
|
||||
postInstall = ''
|
||||
for i in $(seq 1 9); do
|
||||
for j in *.$i; do
|
||||
@@ -985,11 +981,6 @@ self: super: {
|
||||
mkdir -p $out/share/info
|
||||
cp -v *.info* $out/share/info/
|
||||
'';
|
||||
})).overrideScope (self: super: {
|
||||
# cassava-megaparsec = self.cassava-megaparsec_2_0_0;
|
||||
# config-ini = self.config-ini_0_2_4_0;
|
||||
# hspec-megaparsec = self.hspec-megaparsec_2_0_0;
|
||||
# megaparsec = self.megaparsec_7_0_4;
|
||||
});
|
||||
hledger-web = overrideCabal super.hledger-web (drv: {
|
||||
postInstall = ''
|
||||
|
||||
@@ -45,7 +45,6 @@ self: super: {
|
||||
unordered-containers = dontCheck super.unordered-containers;
|
||||
|
||||
# Test suite does not compile.
|
||||
cereal = dontCheck super.cereal;
|
||||
data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x
|
||||
dates = doJailbreak super.dates; # base >=4.9 && <4.12
|
||||
Diff = dontCheck super.Diff;
|
||||
@@ -54,7 +53,6 @@ self: super: {
|
||||
hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82
|
||||
http-api-data = doJailbreak super.http-api-data;
|
||||
persistent-sqlite = dontCheck super.persistent-sqlite;
|
||||
psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x
|
||||
system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience"
|
||||
unicode-transforms = dontCheck super.unicode-transforms;
|
||||
wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17
|
||||
|
||||
@@ -52,7 +52,6 @@ self: super: {
|
||||
unordered-containers = dontCheck super.unordered-containers;
|
||||
|
||||
# Test suite does not compile.
|
||||
cereal = dontCheck super.cereal;
|
||||
data-clist = doJailbreak super.data-clist; # won't cope with QuickCheck 2.12.x
|
||||
dates = doJailbreak super.dates; # base >=4.9 && <4.12
|
||||
Diff = dontCheck super.Diff;
|
||||
@@ -60,7 +59,6 @@ self: super: {
|
||||
hpc-coveralls = doJailbreak super.hpc-coveralls; # https://github.com/guillaume-nargeot/hpc-coveralls/issues/82
|
||||
http-api-data = doJailbreak super.http-api-data;
|
||||
persistent-sqlite = dontCheck super.persistent-sqlite;
|
||||
psqueues = dontCheck super.psqueues; # won't cope with QuickCheck 2.12.x
|
||||
system-fileio = dontCheck super.system-fileio; # avoid dependency on broken "patience"
|
||||
unicode-transforms = dontCheck super.unicode-transforms;
|
||||
wl-pprint-extras = doJailbreak super.wl-pprint-extras; # containers >=0.4 && <0.6 is too tight; https://github.com/ekmett/wl-pprint-extras/issues/17
|
||||
|
||||
@@ -487,6 +487,9 @@ self: super: builtins.intersectAttrs super {
|
||||
# https://github.com/plow-technologies/servant-streaming/issues/12
|
||||
servant-streaming-server = dontCheck super.servant-streaming-server;
|
||||
|
||||
# https://github.com/haskell-servant/servant/pull/1128
|
||||
servant-client-core = appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch;
|
||||
|
||||
# tests run executable, relying on PATH
|
||||
# without this, tests fail with "Couldn't launch intero process"
|
||||
intero = overrideCabal super.intero (drv: {
|
||||
|
||||
@@ -19,6 +19,7 @@ in
|
||||
, buildTools ? [], libraryToolDepends ? [], executableToolDepends ? [], testToolDepends ? [], benchmarkToolDepends ? []
|
||||
, configureFlags ? []
|
||||
, buildFlags ? []
|
||||
, haddockFlags ? []
|
||||
, description ? ""
|
||||
, doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version
|
||||
, doBenchmark ? false
|
||||
@@ -372,7 +373,8 @@ stdenv.mkDerivation ({
|
||||
${optionalString (doHaddock && isLibrary) ''
|
||||
${setupCommand} haddock --html \
|
||||
${optionalString doHoogle "--hoogle"} \
|
||||
${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"}
|
||||
${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \
|
||||
${stdenv.lib.concatStringsSep " " haddockFlags}
|
||||
''}
|
||||
runHook postHaddock
|
||||
'';
|
||||
|
||||
+189
-45
@@ -28729,8 +28729,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "arbor-monad-metric";
|
||||
version = "1.1.1";
|
||||
sha256 = "1ypacqjd7hf5s7r4w432v9yndxxb40w9kwhxhlqzc4wim798vj3h";
|
||||
version = "1.2.0";
|
||||
sha256 = "0mn6pc5h1rwd3w2cw393skm62yxii21j5f7q9rlpdw7np9xgwfcf";
|
||||
libraryHaskellDepends = [
|
||||
base containers generic-lens lens mtl resourcet stm text
|
||||
transformers
|
||||
@@ -29818,7 +29818,7 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"asif_4_0_0" = callPackage
|
||||
"asif_4_0_1" = callPackage
|
||||
({ mkDerivation, attoparsec, base, binary, bytestring, conduit
|
||||
, conduit-combinators, conduit-extra, containers, cpu, directory
|
||||
, either, exceptions, foldl, generic-lens, hedgehog, hspec, hw-bits
|
||||
@@ -29828,8 +29828,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "asif";
|
||||
version = "4.0.0";
|
||||
sha256 = "1xf5x7jm01w30l2cwb3m9sv5qimnc2n6a6dhrykq81ajcf5ix0p6";
|
||||
version = "4.0.1";
|
||||
sha256 = "172vqpdv9jjqj8vzq2v2pfvkmjpkhlpl03mafqk5cvdj72a7vy3s";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
@@ -60432,8 +60432,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "datadog-tracing";
|
||||
version = "1.0.1";
|
||||
sha256 = "007cpk9iwxy4jgj6fr1yih090dxgbj9d6jpc6kf3610p0a14nlzq";
|
||||
version = "1.1.0";
|
||||
sha256 = "1zrdbgljm35r8nqw0lg4pq1ywcv76ifplgdh860zq9sjdz5f5lxi";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
@@ -61738,10 +61738,8 @@ self: {
|
||||
({ mkDerivation, base, tasty, tasty-hunit }:
|
||||
mkDerivation {
|
||||
pname = "decimal-literals";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "0zsykb1ydihcd6x7v5xx1i0v5wn6a48g7ndzi68iwhivmj0qxyi7";
|
||||
revision = "3";
|
||||
editedCabalFile = "0v53iwn2f5fhjhzf8zgzxrc1inp1bb0qjsghf1jlcp98az7avsjb";
|
||||
version = "0.1.0.1";
|
||||
sha256 = "0lbpnc4c266fbqjzzrnig648zzsqfaphlxqwyly9xd15qggzasb0";
|
||||
libraryHaskellDepends = [ base ];
|
||||
testHaskellDepends = [ base tasty tasty-hunit ];
|
||||
description = "Preprocessing decimal literals more or less as they are (instead of via fractions)";
|
||||
@@ -84030,6 +84028,19 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"genvalidity_0_7_0_1" = callPackage
|
||||
({ mkDerivation, base, hspec, hspec-core, QuickCheck, validity }:
|
||||
mkDerivation {
|
||||
pname = "genvalidity";
|
||||
version = "0.7.0.1";
|
||||
sha256 = "1fgd551nv6y5qs2ya9576yl3dfwnb38z6pg2pg9fbdjnk18wikzz";
|
||||
libraryHaskellDepends = [ base QuickCheck validity ];
|
||||
testHaskellDepends = [ base hspec hspec-core QuickCheck ];
|
||||
description = "Testing utilities for the validity library";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"genvalidity-aeson" = callPackage
|
||||
({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec
|
||||
, genvalidity-scientific, genvalidity-text
|
||||
@@ -97487,26 +97498,28 @@ self: {
|
||||
|
||||
"halive" = callPackage
|
||||
({ mkDerivation, base, bytestring, containers, directory, filepath
|
||||
, foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, linear
|
||||
, mtl, process, random, sdl2, signal, stm, text, time, transformers
|
||||
, foreign-store, fsnotify, ghc, ghc-boot, ghc-paths, gl, hspec
|
||||
, lens, linear, mtl, pretty-show, process, random, sdl2, signal
|
||||
, stm, text, time, transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "halive";
|
||||
version = "0.1.3";
|
||||
sha256 = "0rffds6m31b80vv2l2qpbzx3pfya4kz6nlp9w6frc6k94zdba378";
|
||||
version = "0.1.6";
|
||||
sha256 = "19mlbl8psb5gxw6xsgiw5kxw4fvmfl552acalj05s6h9gsl4hcnh";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
base containers directory filepath foreign-store fsnotify ghc
|
||||
ghc-boot ghc-paths mtl process signal stm time transformers
|
||||
ghc-boot ghc-paths mtl process signal stm text time transformers
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base directory filepath fsnotify ghc ghc-paths process stm
|
||||
transformers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base bytestring containers filepath foreign-store gl linear mtl
|
||||
random sdl2 stm text time
|
||||
base bytestring containers directory filepath foreign-store ghc
|
||||
ghc-paths gl hspec lens linear mtl pretty-show random sdl2 stm text
|
||||
time
|
||||
];
|
||||
description = "A live recompiler";
|
||||
license = stdenv.lib.licenses.bsd2;
|
||||
@@ -102618,8 +102631,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "haskoin-store";
|
||||
version = "0.10.1";
|
||||
sha256 = "0z9qsjnzkvzgf0asrdigyph4i3623hkq10542xh0kjq56hnglcn2";
|
||||
version = "0.11.0";
|
||||
sha256 = "03rhbp4rc4ycmnj5gsa79pjzgmp659xwbajaqfns4xgb3d0nhylx";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
@@ -118412,8 +118425,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "http-conduit-downloader";
|
||||
version = "1.0.31";
|
||||
sha256 = "1ng41s2y176223blzxdywlv7hmbdh7i5nwr63la7jfnd9rcdr83c";
|
||||
version = "1.0.33";
|
||||
sha256 = "07pn2p143rfmvax3zx53hlgh0rfynn60g0z6cw6vazrxap4v3pr3";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring conduit connection data-default HsOpenSSL
|
||||
http-client http-conduit http-types mtl network network-uri
|
||||
@@ -133831,6 +133844,50 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"language-puppet_1_4_3" = callPackage
|
||||
({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base
|
||||
, base16-bytestring, bytestring, case-insensitive, containers
|
||||
, cryptonite, directory, filecache, filepath, formatting, Glob
|
||||
, hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data
|
||||
, http-client, lens, lens-aeson, megaparsec, memory, mtl
|
||||
, operational, optparse-applicative, parsec, parser-combinators
|
||||
, pcre-utils, protolude, random, regex-pcre-builtin, scientific
|
||||
, servant, servant-client, split, stm, strict-base-types, temporary
|
||||
, text, time, transformers, unix, unordered-containers, vector
|
||||
, yaml
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "language-puppet";
|
||||
version = "1.4.3";
|
||||
sha256 = "1sh0i487w7mz5c0scly1s11xzha4dbp2wdiwdks3203c5yrjdfq7";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
enableSeparateDataOutput = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
|
||||
case-insensitive containers cryptonite directory filecache filepath
|
||||
formatting hashable hruby hslogger http-api-data http-client lens
|
||||
lens-aeson megaparsec memory mtl operational parsec
|
||||
parser-combinators pcre-utils protolude random regex-pcre-builtin
|
||||
scientific servant servant-client split stm strict-base-types text
|
||||
time transformers unix unordered-containers vector yaml
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
aeson ansi-wl-pprint async base bytestring containers Glob hslogger
|
||||
http-client lens mtl optparse-applicative regex-pcre-builtin
|
||||
strict-base-types text transformers unordered-containers vector
|
||||
yaml
|
||||
];
|
||||
testHaskellDepends = [
|
||||
base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl
|
||||
pcre-utils scientific strict-base-types temporary text transformers
|
||||
unordered-containers vector
|
||||
];
|
||||
description = "Tools to parse and evaluate the Puppet DSL";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"language-python" = callPackage
|
||||
({ mkDerivation, alex, array, base, containers, happy, monads-tf
|
||||
, pretty, transformers, utf8-string
|
||||
@@ -137351,6 +137408,35 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"line-bot-sdk" = callPackage
|
||||
({ mkDerivation, aeson, base, base64-bytestring, bytestring
|
||||
, cryptohash-sha256, errors, hspec, hspec-wai, hspec-wai-json
|
||||
, http-client, http-client-tls, http-types, scientific, servant
|
||||
, servant-client, servant-client-core, servant-server
|
||||
, string-conversions, text, time, transformers, wai, wai-extra
|
||||
, warp
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "line-bot-sdk";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "0kcnxldqks6nvifzsdlkrkfypmj2yzavs675bw96x721mxb63czp";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson base base64-bytestring bytestring cryptohash-sha256 errors
|
||||
http-client http-client-tls http-types scientific servant
|
||||
servant-client servant-client-core servant-server
|
||||
string-conversions text time transformers wai wai-extra
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
base servant servant-client servant-server time transformers wai
|
||||
wai-extra warp
|
||||
];
|
||||
testHaskellDepends = [ aeson base hspec hspec-wai hspec-wai-json ];
|
||||
description = "Haskell SDK for LINE Messaging API";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"line-break" = callPackage
|
||||
({ mkDerivation, base }:
|
||||
mkDerivation {
|
||||
@@ -166727,15 +166813,16 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "pinch";
|
||||
version = "0.3.4.0";
|
||||
sha256 = "10rmk6f9cb2l7dyybwpbin0i5dqdg59d17m627kj9abyrlhcyf8a";
|
||||
version = "0.3.4.1";
|
||||
sha256 = "1yrw0g68j7jl9q19byq10nfg4rvn3wr49sganx8k4mr46j8pa0sk";
|
||||
libraryHaskellDepends = [
|
||||
array base bytestring containers deepseq ghc-prim hashable
|
||||
semigroups text unordered-containers vector
|
||||
];
|
||||
libraryToolDepends = [ hspec-discover ];
|
||||
testHaskellDepends = [
|
||||
base bytestring containers hspec hspec-discover QuickCheck
|
||||
semigroups text unordered-containers vector
|
||||
base bytestring containers hspec QuickCheck semigroups text
|
||||
unordered-containers vector
|
||||
];
|
||||
testToolDepends = [ hspec-discover ];
|
||||
description = "An alternative implementation of Thrift for Haskell";
|
||||
@@ -174242,6 +174329,24 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"protocol-radius-test_0_1_0_0" = callPackage
|
||||
({ mkDerivation, base, bytestring, cereal, containers
|
||||
, protocol-radius, QuickCheck, quickcheck-simple, transformers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "protocol-radius-test";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "1zgfq76k86jf1jpm14mpb8iaiya0d6vz0lrmbwc0fn34hqhkcd88";
|
||||
libraryHaskellDepends = [
|
||||
base bytestring cereal containers protocol-radius QuickCheck
|
||||
quickcheck-simple transformers
|
||||
];
|
||||
testHaskellDepends = [ base quickcheck-simple ];
|
||||
description = "testsuit of protocol-radius haskell package";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"protolude" = callPackage
|
||||
({ mkDerivation, array, async, base, bytestring, containers
|
||||
, deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text
|
||||
@@ -174337,6 +174442,18 @@ self: {
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
}) {};
|
||||
|
||||
"proxied_0_3_1" = callPackage
|
||||
({ mkDerivation, base }:
|
||||
mkDerivation {
|
||||
pname = "proxied";
|
||||
version = "0.3.1";
|
||||
sha256 = "0ldcyvzg5i4axkn5qwgkc8vrc0f0715842ca41d7237p1bh98s4r";
|
||||
libraryHaskellDepends = [ base ];
|
||||
description = "Make functions consume Proxy instead of undefined";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"proxy" = callPackage
|
||||
({ mkDerivation, base }:
|
||||
mkDerivation {
|
||||
@@ -178681,7 +178798,7 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"rattletrap_6_2_2" = callPackage
|
||||
"rattletrap_6_2_3" = callPackage
|
||||
({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits
|
||||
, bytestring, clock, containers, filepath, http-client
|
||||
, http-client-tls, HUnit, template-haskell, temporary, text
|
||||
@@ -178689,8 +178806,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "rattletrap";
|
||||
version = "6.2.2";
|
||||
sha256 = "06gbvkg6wn7dql954bzbw8l1460hk2f9055404q0a949qlmmqb3p";
|
||||
version = "6.2.3";
|
||||
sha256 = "0h542a6i1rc1zh2xy4fc9cdaq424hka77mxndg2ka8a0c0mj0jfp";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
@@ -195483,8 +195600,8 @@ self: {
|
||||
({ mkDerivation, base, optparse-applicative }:
|
||||
mkDerivation {
|
||||
pname = "simple-cmd-args";
|
||||
version = "0.1.0";
|
||||
sha256 = "1cwh2ikk1iccbm5yq7hihk3yhfg4zbxsi8q1jpjavzlcs18sfnll";
|
||||
version = "0.1.0.1";
|
||||
sha256 = "1fs528gr70ppwfz1yalvjdfdxf7b7zxcc9cvsmdba8r1m489qp9d";
|
||||
libraryHaskellDepends = [ base optparse-applicative ];
|
||||
description = "Simple command args parsing and execution";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
@@ -214478,6 +214595,8 @@ self: {
|
||||
pname = "these-skinny";
|
||||
version = "0.7.4";
|
||||
sha256 = "0hlxf94ir99y0yzm9pq8cvs7vbar4bpj1w1ibs96hrx2biwfbnkr";
|
||||
revision = "1";
|
||||
editedCabalFile = "057hgdbc5ch43cn5qz0kr02iws9p1l24z23pifll29iazzl1jk6c";
|
||||
libraryHaskellDepends = [ base deepseq ];
|
||||
description = "A fork of the 'these' package without the dependency bloat";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
@@ -224696,8 +224815,8 @@ self: {
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "uuagc";
|
||||
version = "0.9.52.1";
|
||||
sha256 = "1191a1jr1s76wjdrfzafy1ibf7a7xpg54dvwhwz4kr1jrc9jn2cq";
|
||||
version = "0.9.52.2";
|
||||
sha256 = "1wqva95nmz9yx9b60jjwkpb73pq9m4g9l4iq739xnj6llwckpb8y";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
@@ -225268,6 +225387,19 @@ self: {
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"validity_0_9_0_1" = callPackage
|
||||
({ mkDerivation, base, hspec }:
|
||||
mkDerivation {
|
||||
pname = "validity";
|
||||
version = "0.9.0.1";
|
||||
sha256 = "112wchq5l39fi9bkfkljic7bh1rd5gvz4lwjjw9pajg0zj51pyib";
|
||||
libraryHaskellDepends = [ base ];
|
||||
testHaskellDepends = [ base hspec ];
|
||||
description = "Validity typeclass";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"validity-aeson" = callPackage
|
||||
({ mkDerivation, aeson, base, validity, validity-scientific
|
||||
, validity-text, validity-unordered-containers, validity-vector
|
||||
@@ -226900,6 +227032,17 @@ self: {
|
||||
hydraPlatforms = stdenv.lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"vinyl-named-sugar" = callPackage
|
||||
({ mkDerivation, base, vinyl }:
|
||||
mkDerivation {
|
||||
pname = "vinyl-named-sugar";
|
||||
version = "0.1.0.0";
|
||||
sha256 = "19wbdavf5zb967r4qkw6ksd2yakp4cnlq1hffzzywssm50zakc3h";
|
||||
libraryHaskellDepends = [ base vinyl ];
|
||||
description = "Syntax sugar for vinyl records using overloaded labels";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
}) {};
|
||||
|
||||
"vinyl-operational" = callPackage
|
||||
({ mkDerivation, base, operational, operational-extra, vinyl-plus
|
||||
}:
|
||||
@@ -227488,28 +227631,29 @@ self: {
|
||||
, hedgehog-fn, hoist-error, hw-balancedparens, hw-bits, hw-json
|
||||
, hw-prim, hw-rankselect, lens, mmorph, mtl, nats, natural, parsers
|
||||
, scientific, semigroupoids, semigroups, tagged, tasty
|
||||
, tasty-expected-failure, tasty-hedgehog, tasty-hunit
|
||||
, template-haskell, text, transformers, vector, witherable
|
||||
, wl-pprint-annotated, zippers
|
||||
, tasty-expected-failure, tasty-golden, tasty-hedgehog, tasty-hunit
|
||||
, template-haskell, text, transformers, unordered-containers
|
||||
, vector, witherable, wl-pprint-annotated, zippers
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "waargonaut";
|
||||
version = "0.5.2.2";
|
||||
sha256 = "06kkgn6p28c29f9i3qs2wxmbsg449d7awi4h7giakws6ny1min95";
|
||||
version = "0.6.0.0";
|
||||
sha256 = "1nbykbgx9qzwzcilg2kmrr51fggczynn6kv7a60vsxxckkqlgy8j";
|
||||
setupHaskellDepends = [ base Cabal cabal-doctest ];
|
||||
libraryHaskellDepends = [
|
||||
base bifunctors bytestring containers contravariant digit
|
||||
distributive errors generics-sop hoist-error hw-balancedparens
|
||||
hw-bits hw-json hw-prim hw-rankselect lens mmorph mtl nats natural
|
||||
parsers scientific semigroupoids semigroups tagged text
|
||||
transformers vector witherable wl-pprint-annotated zippers
|
||||
attoparsec base bifunctors bytestring containers contravariant
|
||||
digit distributive errors generics-sop hoist-error
|
||||
hw-balancedparens hw-bits hw-json hw-prim hw-rankselect lens mmorph
|
||||
mtl nats natural parsers scientific semigroupoids semigroups tagged
|
||||
text transformers unordered-containers vector witherable
|
||||
wl-pprint-annotated zippers
|
||||
];
|
||||
testHaskellDepends = [
|
||||
attoparsec base bytestring containers contravariant digit directory
|
||||
distributive doctest filepath generics-sop hedgehog hedgehog-fn
|
||||
lens mtl natural scientific semigroupoids semigroups tagged tasty
|
||||
tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell
|
||||
text vector zippers
|
||||
tasty-expected-failure tasty-golden tasty-hedgehog tasty-hunit
|
||||
template-haskell text unordered-containers vector zippers
|
||||
];
|
||||
description = "JSON wrangling";
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
|
||||
@@ -0,0 +1,82 @@
|
||||
diff --git a/src/Servant/Client/Core/Internal/HasClient.hs b/src/Servant/Client/Core/Internal/HasClient.hs
|
||||
index 712007006..6be92ec6d 100644
|
||||
--- a/src/Servant/Client/Core/Internal/HasClient.hs
|
||||
+++ b/src/Servant/Client/Core/Internal/HasClient.hs
|
||||
@@ -16,6 +16,8 @@ module Servant.Client.Core.Internal.HasClient where
|
||||
import Prelude ()
|
||||
import Prelude.Compat
|
||||
|
||||
+import Control.Concurrent.MVar
|
||||
+ (modifyMVar, newMVar)
|
||||
import qualified Data.ByteString as BS
|
||||
import qualified Data.ByteString.Lazy as BL
|
||||
import Data.Foldable
|
||||
@@ -36,13 +38,14 @@ import qualified Network.HTTP.Types as H
|
||||
import Servant.API
|
||||
((:<|>) ((:<|>)), (:>), AuthProtect, BasicAuth, BasicAuthData,
|
||||
BuildHeadersTo (..), Capture', CaptureAll, Description,
|
||||
- EmptyAPI, FramingUnrender (..), FromSourceIO (..), Header',
|
||||
- Headers (..), HttpVersion, IsSecure, MimeRender (mimeRender),
|
||||
+ EmptyAPI, FramingRender (..), FramingUnrender (..),
|
||||
+ FromSourceIO (..), Header', Headers (..), HttpVersion,
|
||||
+ IsSecure, MimeRender (mimeRender),
|
||||
MimeUnrender (mimeUnrender), NoContent (NoContent), QueryFlag,
|
||||
QueryParam', QueryParams, Raw, ReflectMethod (..), RemoteHost,
|
||||
ReqBody', SBoolI, Stream, StreamBody', Summary, ToHttpApiData,
|
||||
- Vault, Verb, WithNamedContext, contentType, getHeadersHList,
|
||||
- getResponse, toQueryParam, toUrlPiece)
|
||||
+ ToSourceIO (..), Vault, Verb, WithNamedContext, contentType,
|
||||
+ getHeadersHList, getResponse, toQueryParam, toUrlPiece)
|
||||
import Servant.API.ContentTypes
|
||||
(contentTypes)
|
||||
import Servant.API.Modifiers
|
||||
@@ -538,7 +541,7 @@ instance (MimeRender ct a, HasClient m api)
|
||||
hoistClientMonad pm (Proxy :: Proxy api) f (cl a)
|
||||
|
||||
instance
|
||||
- ( HasClient m api
|
||||
+ ( HasClient m api, MimeRender ctype chunk, FramingRender framing, ToSourceIO chunk a
|
||||
) => HasClient m (StreamBody' mods framing ctype a :> api)
|
||||
where
|
||||
|
||||
@@ -547,7 +550,39 @@ instance
|
||||
hoistClientMonad pm _ f cl = \a ->
|
||||
hoistClientMonad pm (Proxy :: Proxy api) f (cl a)
|
||||
|
||||
- clientWithRoute _pm Proxy _req _body = error "HasClient @StreamBody"
|
||||
+ clientWithRoute pm Proxy req body
|
||||
+ = clientWithRoute pm (Proxy :: Proxy api)
|
||||
+ $ setRequestBody (RequestBodyStreamChunked givesPopper) (contentType ctypeP) req
|
||||
+ where
|
||||
+ ctypeP = Proxy :: Proxy ctype
|
||||
+ framingP = Proxy :: Proxy framing
|
||||
+
|
||||
+ sourceIO = framingRender
|
||||
+ framingP
|
||||
+ (mimeRender ctypeP :: chunk -> BL.ByteString)
|
||||
+ (toSourceIO body)
|
||||
+
|
||||
+ -- not pretty.
|
||||
+ givesPopper :: (IO BS.ByteString -> IO ()) -> IO ()
|
||||
+ givesPopper needsPopper = S.unSourceT sourceIO $ \step0 -> do
|
||||
+ ref <- newMVar step0
|
||||
+
|
||||
+ -- Note sure we need locking, but it's feels safer.
|
||||
+ let popper :: IO BS.ByteString
|
||||
+ popper = modifyMVar ref nextBs
|
||||
+
|
||||
+ needsPopper popper
|
||||
+
|
||||
+ nextBs S.Stop = return (S.Stop, BS.empty)
|
||||
+ nextBs (S.Error err) = fail err
|
||||
+ nextBs (S.Skip s) = nextBs s
|
||||
+ nextBs (S.Effect ms) = ms >>= nextBs
|
||||
+ nextBs (S.Yield lbs s) = case BL.toChunks lbs of
|
||||
+ [] -> nextBs s
|
||||
+ (x:xs) | BS.null x -> nextBs step'
|
||||
+ | otherwise -> return (step', x)
|
||||
+ where
|
||||
+ step' = S.Yield (BL.fromChunks xs) s
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user