summary refs log tree commit diff
path: root/pkgs/development/misc
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2021-09-29 23:24:50 +0200
committerGitHub <noreply@github.com>2021-09-29 23:24:50 +0200
commit53432e913babb19b9872c52bb035970386aa0e02 (patch)
tree381e8c4b3bf105c16995a8145e84f3d7a0f2ef6d /pkgs/development/misc
parent054b18dcde8d52d9a4e904767fd31b2dc66a31bc (diff)
parentd7a85018482d184f4043b6fac356e9aff05e3800 (diff)
downloadnixpkgs-53432e913babb19b9872c52bb035970386aa0e02.tar
nixpkgs-53432e913babb19b9872c52bb035970386aa0e02.tar.gz
nixpkgs-53432e913babb19b9872c52bb035970386aa0e02.tar.bz2
nixpkgs-53432e913babb19b9872c52bb035970386aa0e02.tar.lz
nixpkgs-53432e913babb19b9872c52bb035970386aa0e02.tar.xz
nixpkgs-53432e913babb19b9872c52bb035970386aa0e02.tar.zst
nixpkgs-53432e913babb19b9872c52bb035970386aa0e02.zip
Merge pull request #138596 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
Diffstat (limited to 'pkgs/development/misc')
-rw-r--r--pkgs/development/misc/haskell/hasura/graphql-engine.nix69
-rw-r--r--pkgs/development/misc/haskell/hasura/graphql-parser.nix4
-rw-r--r--pkgs/development/misc/haskell/hasura/pg-client.nix4
-rw-r--r--pkgs/development/misc/haskell/hasura/pool.nix4
4 files changed, 42 insertions, 39 deletions
diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine.nix b/pkgs/development/misc/haskell/hasura/graphql-engine.nix
index d8faf171451..ba9d1d5bf9f 100644
--- a/pkgs/development/misc/haskell/hasura/graphql-engine.nix
+++ b/pkgs/development/misc/haskell/hasura/graphql-engine.nix
@@ -3,35 +3,37 @@
 { mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding
 , asn1-types, async, attoparsec, attoparsec-iso8601, auto-update
 , base, base16-bytestring, base64-bytestring, binary, byteorder
-, bytestring, case-insensitive, ci-info, containers, cron
-, cryptonite, data-has, deepseq, dependent-map, dependent-sum
-, directory, ekg-core, ekg-json, exceptions, fast-logger, fetchgit
-, file-embed, filepath, ghc-heap-view, graphql-parser, hashable
-, hashable-time, hspec, hspec-core, hspec-expectations
-, hspec-expectations-lifted, http-api-data, http-client
-, http-client-tls, http-conduit, http-types, immortal
-, insert-ordered-containers, jose, kan-extensions, lens, lens-aeson
-, lib, lifted-async, lifted-base, list-t, memory, mime-types
-, mmorph, monad-control, monad-loops, monad-validate, mtl, mustache
-, mysql, mysql-simple, natural-transformation, network, network-uri
-, odbc, optparse-applicative, pem, pg-client, postgresql-binary
+, bytestring, case-insensitive, ci-info, connection, containers
+, cron, cryptonite, data-default-class, data-has, deepseq
+, dependent-map, dependent-sum, directory, ekg-core, ekg-json
+, exceptions, fast-logger, fetchgit, file-embed, filepath
+, ghc-heap-view, graphql-parser, hashable, hashable-time, hspec
+, hspec-core, hspec-expectations, hspec-expectations-lifted
+, http-api-data, http-client, http-client-tls, http-conduit
+, http-types, immortal, insert-ordered-containers, jose
+, kan-extensions, lens, lens-aeson, lib, lifted-async, lifted-base
+, list-t, memory, mime-types, mmorph, monad-control, monad-loops
+, monad-validate, mtl, mustache, mysql, mysql-simple
+, natural-transformation, network, network-uri, odbc
+, optparse-applicative, pem, pg-client, postgresql-binary
 , postgresql-libpq, pretty-simple, process, profunctors, psqueues
 , QuickCheck, quickcheck-instances, random, regex-tdfa
 , resource-pool, retry, safe, safe-exceptions, scientific
 , semialign, semigroups, semver, shakespeare, some, split
 , Spock-core, stm, stm-containers, tagged, template-haskell, text
-, text-builder, text-conversions, these, time, transformers
+, text-builder, text-conversions, these, time, tls, transformers
 , transformers-base, unix, unordered-containers, uri-encode
 , utf8-string, uuid, validation, vector, vector-instances, wai
-, warp, websockets, wreq, x509, x509-store, yaml, zlib
+, warp, websockets, wreq, x509, x509-store, x509-system
+, x509-validation, yaml, zlib
 }:
 mkDerivation {
   pname = "graphql-engine";
   version = "1.0.0";
   src = fetchgit {
     url = "https://github.com/hasura/graphql-engine.git";
-    sha256 = "04s8rczvm0l5dbh14g2vav2wbqb4fg51471fncqf36s59img14b7";
-    rev = "cf6f3edc1f6df7843dfb91be6dcb0fd7cc94d133";
+    sha256 = "0ky23f700pmzb6anx44xzh6dixixmn7kq1ypj0yy4kqiqzqdb2dg";
+    rev = "7c35ffb36561214390d0d545d418746f29a29ba4";
     fetchSubmodules = true;
   };
   postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot";
@@ -41,23 +43,24 @@ mkDerivation {
     aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async
     attoparsec attoparsec-iso8601 auto-update base base16-bytestring
     base64-bytestring binary byteorder bytestring case-insensitive
-    ci-info containers cron cryptonite data-has deepseq dependent-map
-    dependent-sum directory ekg-core ekg-json exceptions fast-logger
-    file-embed filepath ghc-heap-view graphql-parser hashable
-    hashable-time http-api-data http-client http-client-tls
-    http-conduit http-types immortal insert-ordered-containers jose
-    kan-extensions lens lens-aeson lifted-async lifted-base list-t
-    memory mime-types mmorph monad-control monad-loops monad-validate
-    mtl mustache mysql mysql-simple network network-uri odbc
-    optparse-applicative pem pg-client postgresql-binary
-    postgresql-libpq pretty-simple process profunctors psqueues
-    QuickCheck quickcheck-instances random regex-tdfa resource-pool
-    retry safe-exceptions scientific semialign semigroups semver
-    shakespeare some split Spock-core stm stm-containers tagged
-    template-haskell text text-builder text-conversions these time
-    transformers transformers-base unix unordered-containers uri-encode
-    utf8-string uuid validation vector vector-instances wai warp
-    websockets wreq x509 x509-store yaml zlib
+    ci-info connection containers cron cryptonite data-default-class
+    data-has deepseq dependent-map dependent-sum directory ekg-core
+    ekg-json exceptions fast-logger file-embed filepath ghc-heap-view
+    graphql-parser hashable hashable-time http-api-data http-client
+    http-client-tls http-conduit http-types immortal
+    insert-ordered-containers jose kan-extensions lens lens-aeson
+    lifted-async lifted-base list-t memory mime-types mmorph
+    monad-control monad-loops monad-validate mtl mustache mysql
+    mysql-simple network network-uri odbc optparse-applicative pem
+    pg-client postgresql-binary postgresql-libpq pretty-simple process
+    profunctors psqueues QuickCheck quickcheck-instances random
+    regex-tdfa resource-pool retry safe-exceptions scientific semialign
+    semigroups semver shakespeare some split Spock-core stm
+    stm-containers tagged template-haskell text text-builder
+    text-conversions these time tls transformers transformers-base unix
+    unordered-containers uri-encode utf8-string uuid validation vector
+    vector-instances wai warp websockets wreq x509 x509-store
+    x509-system x509-validation yaml zlib
   ];
   executableHaskellDepends = [
     base bytestring ekg-core kan-extensions pg-client text
diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser.nix b/pkgs/development/misc/haskell/hasura/graphql-parser.nix
index 0033584a159..a447ac01540 100644
--- a/pkgs/development/misc/haskell/hasura/graphql-parser.nix
+++ b/pkgs/development/misc/haskell/hasura/graphql-parser.nix
@@ -10,8 +10,8 @@ mkDerivation {
   version = "0.2.0.0";
   src = fetchgit {
     url = "https://github.com/hasura/graphql-parser-hs.git";
-    sha256 = "015b1h475k8wmhm9hkrvyxr985x7d8yc0xgcdqj7vmziixvfwwwj";
-    rev = "79beb0e85e00422a8a15318c0bc573765fc7b246";
+    sha256 = "0zqrh7y0cjjrscsw2hmyhdcm4nzvb5pw394pcxk8q19xx13jp9xd";
+    rev = "43562a5b7b41d380e3e31732b48637702e5aa97d";
     fetchSubmodules = true;
   };
   libraryHaskellDepends = [
diff --git a/pkgs/development/misc/haskell/hasura/pg-client.nix b/pkgs/development/misc/haskell/hasura/pg-client.nix
index d1eb5e156e6..52f179f9923 100644
--- a/pkgs/development/misc/haskell/hasura/pg-client.nix
+++ b/pkgs/development/misc/haskell/hasura/pg-client.nix
@@ -13,8 +13,8 @@ mkDerivation {
   version = "0.1.0";
   src = fetchgit {
     url = "https://github.com/hasura/pg-client-hs.git";
-    sha256 = "1y79s3ai4h82szpm1j5n5ygybqr7cza9l0raxf39vgn66jhy1jd2";
-    rev = "92975d0f8f933c8d06913dc97af259253bf7fb5f";
+    sha256 = "00h9hskv3p4mg35php5wsr2d2rjahcv29rqidb2lxl11r05psr4m";
+    rev = "5e8a2d7ebe8b96518e5a70f4d61be2550eaa4e70";
     fetchSubmodules = true;
   };
   setupHaskellDepends = [ base Cabal ];
diff --git a/pkgs/development/misc/haskell/hasura/pool.nix b/pkgs/development/misc/haskell/hasura/pool.nix
index a12d61f0fe2..48954114a4a 100644
--- a/pkgs/development/misc/haskell/hasura/pool.nix
+++ b/pkgs/development/misc/haskell/hasura/pool.nix
@@ -8,8 +8,8 @@ mkDerivation {
   version = "0.2.3.2";
   src = fetchgit {
     url = "https://github.com/hasura/pool.git";
-    sha256 = "00q1fxh72fgjwl1pi3lnp4xg8f3kfm6q12gs9scinwbymfgzarms";
-    rev = "bc4c3f739a8fb8ec4444336a34662895831c9acf";
+    sha256 = "02wa32fl5wq5fk59id54xmxiqjl564r4rhsc79xsgf2j2spj0v94";
+    rev = "dc56753338e7b61220a09bed0469c6dcc5e9fb52";
     fetchSubmodules = true;
   };
   libraryHaskellDepends = [