f553614 · typeable/nixpkgs

git.iko.soy/typeable/nixpkgs

haskellPackages.graphql-engine: 2.0.10 -> 2.3.1

haskellPackages.kriti-lang: init at 0.3.1 Towards getting hasura-related packages to work with Stackage Nightly / GHC 9.0.

commitf5536149557e611a8f8b6503bd51cb2e62306a2a authorsternenseemann <sternenseemann@systemli.org> dateTue 15 Mar 2022, 12:26 (5 years ago) parent820408b

13 files changed+194−145

compare with master

unifiedsplit

pkgs/development/haskell-modules/configuration-common.nix+30−17

@@ -1484,35 +1484,48 @@ self: super: {

14841484

14851485 # hasura packages need some extra care

14861486 graphql-engine = overrideCabal (drv: {

1487− patches = [ ./patches/graphql-engine-mapkeys.patch ];

1487+ patches = [

1488+ # Compat with unordered-containers >= 0.2.15.0

1489+ (fetchpatch {

1490+ name = "hasura-graphql-engine-updated-deps.patch";

1491+ url = "https://github.com/hasura/graphql-engine/commit/d50aae87a58794bc1fc66c7a60acb0c34b5e70c7.patch";

1492+ stripLen = 1;

1493+ excludes = [ "cabal.project.freeze" ];

1494+ sha256 = "0lb5l9vfynr85i9xs53w4mpgczp04ncxz7846n3y91ri34fa87v3";

1495+ })

1496+ # Compat with hashable >= 1.3.4.0

1497+ (fetchpatch {

1498+ name = "hasura-graphql-engine-hashable-1.3.4.0.patch";

1499+ url = "https://github.com/hasura/graphql-engine/commit/e48b2287315fb09005ffd52c0a686dc321171ae2.patch";

1500+ sha256 = "1jppnanmsyl8npyf59s0d8bgjy7bq50vkh5zx4888jy6jqh27jb6";

1501+ stripLen = 1;

1502+ })

1503+ # Compat with unordered-containers >= 0.2.17.0

1504+ (fetchpatch {

1505+ name = "hasura-graphql-engine-unordered-containers-0.2.17.0.patch";

1506+ url = "https://github.com/hasura/graphql-engine/commit/3a1eb3128a2ded2da7c5fef089738890828cce03.patch";

1507+ sha256 = "0vz7s8m8mjvv728vm4q0dvvrirvydaw7xks30b5ddj9f6a72a2f1";

1508+ stripLen = 1;

1509+ })

1510+ ];

14881511 doHaddock = false;

1489− version = "2.0.10";

1490− }) (super.graphql-engine.overrideScope (self: super: {

1512+ version = "2.3.1";

1513+ }) (super.graphql-engine.override {

14911514 immortal = self.immortal_0_2_2_1;

14921515 resource-pool = self.hasura-resource-pool;

14931516 ekg-core = self.hasura-ekg-core;

14941517 ekg-json = self.hasura-ekg-json;

1495− hspec = dontCheck self.hspec_2_9_4;

1496− hspec-core = dontCheck self.hspec-core_2_9_4;

1497− hspec-discover = dontCheck super.hspec-discover_2_9_4;

1498− }));

1499− hasura-ekg-core = doJailbreak (super.hasura-ekg-core.overrideScope (self: super: {

1500− hspec = dontCheck self.hspec_2_9_4;

1501− hspec-core = dontCheck self.hspec-core_2_9_4;

1502− hspec-discover = dontCheck super.hspec-discover_2_9_4;

1503− }));

1504− hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: {

1505− ekg-core = self.hasura-ekg-core;

1506− hspec = dontCheck self.hspec_2_9_4;

1507− hspec-core = dontCheck self.hspec-core_2_9_4;

1508− hspec-discover = dontCheck super.hspec-discover_2_9_4;

15091518 });

1519+ hasura-ekg-json = super.hasura-ekg-json.override {

1520+ ekg-core = self.hasura-ekg-core;

1521+ };

15101522 pg-client = overrideCabal (drv: {

15111523 librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ];

15121524 # wants a running DB to check against

15131525 doCheck = false;

15141526 }) (super.pg-client.override {

15151527 resource-pool = self.hasura-resource-pool;

1528+ ekg-core = self.hasura-ekg-core;

15161529 });

15171530

15181531 # https://github.com/bos/statistics/issues/170

pkgs/development/haskell-modules/non-hackage-packages.nix+1

@@ -30,6 +30,7 @@ self: super: {

3030 pg-client = self.callPackage ../misc/haskell/hasura/pg-client.nix {};

3131 graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser.nix {};

3232 graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine.nix {};

33+ kriti-lang = self.callPackage ../misc/haskell/hasura/kriti-lang.nix {};

3334 hasura-resource-pool = self.callPackage ../misc/haskell/hasura/pool.nix {};

3435 hasura-ekg-core = self.callPackage ../misc/haskell/hasura/ekg-core.nix {};

3536 hasura-ekg-json = self.callPackage ../misc/haskell/hasura/ekg-json.nix {};

pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patchdeleted−33

@@ -1,33 +0,0 @@

1−diff --git a/server/src-lib/Data/HashMap/Strict/Extended.hs b/server/src-lib/Data/HashMap/Strict/Extended.hs

2−index eaff0dfba..9902cadd0 100644

3−--- a/src-lib/Data/HashMap/Strict/Extended.hs

4−+++ b/src-lib/Data/HashMap/Strict/Extended.hs

5−@@ -7,7 +7,6 @@ module Data.HashMap.Strict.Extended

6− , groupOnNE

7− , differenceOn

8− , lpadZip

9−- , mapKeys

10− , unionsWith

11− ) where

12−

13−@@ -54,20 +53,6 @@ lpadZip left = catMaybes . flip A.alignWith left \case

14− That b -> Just (Nothing, b)

15− These a b -> Just (Just a, b)

16−

17−--- | @'mapKeys' f s@ is the map obtained by applying @f@ to each key of @s@.

18−---

19−--- The size of the result may be smaller if @f@ maps two or more distinct

20−--- keys to the same new key. In this case the value at the greatest of the

21−--- original keys is retained.

22−---

23−--- > mapKeys (+ 1) (fromList [(5,"a"), (3,"b")]) == fromList [(4, "b"), (6, "a")]

24−--- > mapKeys (\ _ -> 1) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 1 "c"

25−--- > mapKeys (\ _ -> 3) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 3 "c"

26−---

27−--- copied from https://hackage.haskell.org/package/containers-0.6.4.1/docs/src/Data.Map.Internal.html#mapKeys

28−-mapKeys :: (Ord k2, Hashable k2) => (k1 -> k2) -> HashMap k1 a -> HashMap k2 a

29−-mapKeys f = fromList . foldrWithKey (\k x xs -> (f k, x) : xs) []

30−-

31− -- | The union of a list of maps, with a combining operation:

32− -- (@'unionsWith' f == 'Prelude.foldl' ('unionWith' f) 'empty'@).

33− --

pkgs/development/misc/haskell/hasura/ekg-core.nix+8−9

@@ -1,17 +1,17 @@

11# This has been automatically generated by the script

22# ./update.sh. This should not be changed by hand.

33{ mkDerivation, async, atomic-primops, base, containers, criterion

4−, fetchgit, generic-random, ghc-prim, hashable, hspec

5−, hspec-smallcheck, HUnit, inspection-testing, lib, markdown-unlit

6−, primitive, QuickCheck, smallcheck, text, unordered-containers

4+, fetchgit, ghc-prim, hashable, hspec, hspec-smallcheck, HUnit

5+, inspection-testing, lib, markdown-unlit, primitive, QuickCheck

6+, smallcheck, text, unordered-containers

77}:

88mkDerivation {

99 pname = "ekg-core";

1010 version = "0.1.1.7";

1111 src = fetchgit {

1212 url = "https://github.com/hasura/ekg-core.git";

13− sha256 = "1s58kjg1kbhsyfyj0zwhnnws9hg9zwj9jylpwicg54yi78w962ys";

14− rev = "9fc8f94685c149a909b66bad4167455d8ae1002c";

13+ sha256 = "1syb87iav3fgj6vqjh1izdvw4g0l4mngcyhvcg2nazisw3l685z6";

14+ rev = "b0cdc337ca2a52e392d427916ba3e28246b396c0";

1515 fetchSubmodules = true;

1616 };

1717 libraryHaskellDepends = [

@@ -19,10 +19,9 @@ mkDerivation {

1919 primitive text unordered-containers

2020 ];

2121 testHaskellDepends = [

22− async atomic-primops base containers generic-random ghc-prim

23− hashable hspec hspec-smallcheck HUnit inspection-testing

24− markdown-unlit primitive QuickCheck smallcheck text

25− unordered-containers

22+ async atomic-primops base containers ghc-prim hashable hspec

23+ hspec-smallcheck HUnit inspection-testing markdown-unlit primitive

24+ QuickCheck smallcheck text unordered-containers

2625 ];

2726 testToolDepends = [ markdown-unlit ];

2827 benchmarkHaskellDepends = [ base criterion ];

pkgs/development/misc/haskell/hasura/ekg-json.nix+6−3

@@ -1,6 +1,6 @@

11# This has been automatically generated by the script

22# ./update.sh. This should not be changed by hand.

3−{ mkDerivation, aeson, base, ekg-core, fetchgit, lib, text

3+{ mkDerivation, aeson, base, ekg-core, fetchgit, hspec, lib, text

44, unordered-containers, vector

55}:

66mkDerivation {

@@ -8,13 +8,16 @@ mkDerivation {

88 version = "0.1.0.7";

99 src = fetchgit {

1010 url = "https://github.com/hasura/ekg-json.git";

11− sha256 = "1yf9x7gh66q27c3wv5m00ijf2qpiwm53jjlhrj2yc1glv684wf4v";

12− rev = "f25b9ddb7aae18059ef707a5ce30d6a54a63db13";

11+ sha256 = "17kd2f1695dmf5l95iz1w86hapc4f1gfrd0ld3ivffa2q5vxbi70";

12+ rev = "d1c5031b49a5559cf4b4f6beb0238b872890a48c";

1313 fetchSubmodules = true;

1414 };

1515 libraryHaskellDepends = [

1616 aeson base ekg-core text unordered-containers vector

1717 ];

18+ testHaskellDepends = [

19+ aeson base ekg-core hspec text unordered-containers

20+ ];

1821 homepage = "https://github.com/tibbe/ekg-json";

1922 description = "JSON encoding of ekg metrics";

2023 license = lib.licenses.bsd3;

pkgs/development/misc/haskell/hasura/graphql-engine.nix+65−50

@@ -1,39 +1,44 @@

11# This has been automatically generated by the script

22# ./update.sh. This should not be changed by hand.

3−{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding

4−, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update

5−, base, base16-bytestring, base64-bytestring, binary, byteorder

6−, bytestring, case-insensitive, ci-info, connection, containers

7−, cron, cryptonite, data-default-class, data-has, deepseq

8−, dependent-map, dependent-sum, directory, ekg-core, ekg-json

9−, exceptions, fast-logger, fetchgit, file-embed, filepath

10−, ghc-heap-view, graphql-parser, hashable, hashable-time, hspec

11−, hspec-core, hspec-expectations, hspec-expectations-lifted

12−, http-api-data, http-client, http-client-tls, http-conduit

3+{ mkDerivation, aeson, aeson-casing, aeson-qq, ansi-wl-pprint

4+, asn1-encoding, asn1-types, async, attoparsec, attoparsec-iso8601

5+, auto-update, base, base16-bytestring, base64-bytestring, binary

6+, byteorder, bytestring, case-insensitive, ci-info, conduit

7+, connection, containers, cron, cryptonite, data-default-class

8+, data-has, deepseq, dependent-map, dependent-sum, directory

9+, either, ekg-core, ekg-json, exceptions, fast-logger, fetchgit

10+, file-embed, filepath, ghc-heap-view, graphql-parser, hashable

11+, hashable-time, haskell-src-meta, hedgehog, hspec, hspec-core

12+, hspec-discover, hspec-expectations, hspec-expectations-lifted

13+, hspec-hedgehog, hspec-wai, hspec-wai-json, http-api-data

14+, http-client, http-client-tls, http-conduit, http-media

1315, http-types, immortal, insert-ordered-containers, jose

14−, kan-extensions, lens, lens-aeson, lib, lifted-async, lifted-base

15−, list-t, memory, mime-types, mmorph, monad-control, monad-loops

16−, monad-validate, mtl, mustache, mysql, mysql-simple

17−, natural-transformation, network, network-uri, odbc

18−, optparse-applicative, pem, pg-client, postgresql-binary

19−, postgresql-libpq, pretty-simple, process, profunctors, psqueues

20−, QuickCheck, quickcheck-instances, random, regex-tdfa

21−, resource-pool, retry, safe, safe-exceptions, scientific

22−, semialign, semigroups, semver, shakespeare, some, split

23−, Spock-core, stm, stm-containers, tagged, template-haskell, text

24−, text-builder, text-conversions, these, time, tls, transformers

25−, transformers-base, unix, unordered-containers, uri-encode

16+, kan-extensions, kriti-lang, lens, lens-aeson, lib, libyaml

17+, lifted-async, lifted-base, list-t, memory, mime-types, mmorph

18+, monad-control, monad-logger, monad-loops, monad-validate, mtl

19+, mustache, mysql, mysql-simple, natural-transformation, network

20+, network-uri, odbc, openapi3, optparse-applicative

21+, optparse-generic, parsec, pem, pg-client, postgresql-binary

22+, postgresql-libpq, postgresql-simple, pretty-simple, process

23+, profunctors, psqueues, QuickCheck, quickcheck-instances, random

24+, regex-tdfa, resource-pool, resourcet, retry, safe

25+, safe-exceptions, scientific, semialign, semigroups, semver

26+, shakespeare, some, split, Spock-core, stm, stm-containers, tagged

27+, template-haskell, text, text-builder, text-conversions, th-lift

28+, th-lift-instances, these, time, tls, tmp-postgres, transformers

29+, transformers-base, typed-process, unix, unliftio-core

30+, unordered-containers, uri-bytestring, uri-encode, url

2631, utf8-string, uuid, validation, vector, vector-instances, wai

27−, warp, websockets, wreq, x509, x509-store, x509-system

28−, x509-validation, yaml, zlib

32+, wai-extra, warp, websockets, witch, wreq, x509, x509-store

33+, x509-system, x509-validation, yaml, zlib

2934}:

3035mkDerivation {

3136 pname = "graphql-engine";

3237 version = "1.0.0";

3338 src = fetchgit {

3439 url = "https://github.com/hasura/graphql-engine.git";

35− sha256 = "04ns40wk1760pxi18pyqzgrk8h28mw6402zkjc1g52ny6afchs05";

36− rev = "8be851c2a1326b2caada13a3c43becd2e848db6c";

40+ sha256 = "1r19qw2wxzmngb6sjpin3dk6i5r491brcb0ir4g8kw9d0ic90hpy";

41+ rev = "1349e6cdcfdef4b06593b48fe8e2e51b9f9c94e9";

3742 fetchSubmodules = true;

3843 };

3944 postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot";

@@ -44,22 +49,23 @@ mkDerivation {

4449 attoparsec attoparsec-iso8601 auto-update base base16-bytestring

4550 base64-bytestring binary byteorder bytestring case-insensitive

4651 ci-info connection containers cron cryptonite data-default-class

47− data-has deepseq dependent-map dependent-sum directory ekg-core

48− ekg-json exceptions fast-logger file-embed filepath ghc-heap-view

49− graphql-parser hashable hashable-time http-api-data http-client

50− http-client-tls http-conduit http-types immortal

51− insert-ordered-containers jose kan-extensions lens lens-aeson

52− lifted-async lifted-base list-t memory mime-types mmorph

53− monad-control monad-loops monad-validate mtl mustache mysql

54− mysql-simple network network-uri odbc optparse-applicative pem

55− pg-client postgresql-binary postgresql-libpq pretty-simple process

56− profunctors psqueues QuickCheck quickcheck-instances random

57− regex-tdfa resource-pool retry safe-exceptions scientific semialign

58− semigroups semver shakespeare some split Spock-core stm

59− stm-containers tagged template-haskell text text-builder

60− text-conversions these time tls transformers transformers-base unix

61− unordered-containers uri-encode utf8-string uuid validation vector

62− vector-instances wai warp websockets wreq x509 x509-store

52+ data-has deepseq dependent-map dependent-sum directory either

53+ ekg-core ekg-json exceptions fast-logger file-embed filepath

54+ ghc-heap-view graphql-parser hashable hashable-time http-api-data

55+ http-client http-client-tls http-conduit http-media http-types

56+ immortal insert-ordered-containers jose kan-extensions kriti-lang

57+ lens lens-aeson lifted-async lifted-base list-t memory mime-types

58+ mmorph monad-control monad-loops monad-validate mtl mustache mysql

59+ mysql-simple network network-uri odbc openapi3 optparse-applicative

60+ optparse-generic parsec pem pg-client postgresql-binary

61+ postgresql-libpq pretty-simple process profunctors psqueues

62+ QuickCheck quickcheck-instances random regex-tdfa resource-pool

63+ retry safe-exceptions scientific semialign semigroups semver

64+ shakespeare some split Spock-core stm stm-containers tagged

65+ template-haskell text text-builder text-conversions these time tls

66+ transformers transformers-base unix unordered-containers

67+ uri-bytestring uri-encode url utf8-string uuid validation vector

68+ vector-instances wai warp websockets witch wreq x509 x509-store

6369 x509-system x509-validation yaml zlib

6470 ];

6571 executableHaskellDepends = [

@@ -67,15 +73,24 @@ mkDerivation {

6773 text-conversions time unix

6874 ];

6975 testHaskellDepends = [

70− aeson base bytestring containers cron dependent-map dependent-sum

71− graphql-parser hspec hspec-core hspec-expectations

72− hspec-expectations-lifted http-client http-client-tls http-types

73− insert-ordered-containers jose kan-extensions lens lifted-base

74− mmorph monad-control mtl natural-transformation network-uri

75− optparse-applicative pg-client process QuickCheck safe scientific

76− split template-haskell text time transformers-base

77− unordered-containers vector

76+ aeson aeson-casing aeson-qq async base bytestring case-insensitive

77+ conduit containers cron dependent-map dependent-sum ekg-core

78+ exceptions graphql-parser haskell-src-meta hedgehog hspec

79+ hspec-core hspec-discover hspec-expectations

80+ hspec-expectations-lifted hspec-hedgehog hspec-wai hspec-wai-json

81+ http-client http-client-tls http-conduit http-types

82+ insert-ordered-containers jose kan-extensions lens lens-aeson

83+ libyaml lifted-base mmorph monad-control monad-logger mtl mysql

84+ mysql-simple natural-transformation network network-uri odbc

85+ optparse-applicative parsec pg-client postgresql-libpq

86+ postgresql-simple process QuickCheck resource-pool resourcet safe

87+ safe-exceptions scientific shakespeare split Spock-core stm

88+ template-haskell text text-conversions th-lift th-lift-instances

89+ time tmp-postgres transformers transformers-base typed-process unix

90+ unliftio-core unordered-containers utf8-string vector wai wai-extra

91+ warp websockets yaml

7892 ];

93+ testToolDepends = [ hspec-discover ];

7994 doCheck = false;

8095 homepage = "https://www.hasura.io";

8196 description = "GraphQL API over Postgres";

pkgs/development/misc/haskell/hasura/graphql-parser.nix+11−12

@@ -1,30 +1,29 @@

11# This has been automatically generated by the script

22# ./update.sh. This should not be changed by hand.

3−{ mkDerivation, aeson, attoparsec, base, bytestring, containers

4−, criterion, deepseq, fetchgit, filepath, hashable, hedgehog, lib

5−, prettyprinter, scientific, template-haskell, text, text-builder

6−, th-lift-instances, unordered-containers, vector

3+{ mkDerivation, aeson, attoparsec, base, bytestring, deepseq

4+, fetchgit, hashable, hedgehog, lib, prettyprinter, scientific

5+, tasty-bench, template-haskell, text, text-builder

6+, th-lift-instances, unordered-containers

77}:

88mkDerivation {

99 pname = "graphql-parser";

1010 version = "0.2.0.0";

1111 src = fetchgit {

1212 url = "https://github.com/hasura/graphql-parser-hs.git";

13− sha256 = "0zqrh7y0cjjrscsw2hmyhdcm4nzvb5pw394pcxk8q19xx13jp9xd";

14− rev = "43562a5b7b41d380e3e31732b48637702e5aa97d";

13+ sha256 = "1xprr5wdhcfnbggkygz71v3za1mmkqv5mbm7h16kpsrhm1m9mpx8";

14+ rev = "c311bc15b8d8cef28a846d1d81b0bcc1d59bd956";

1515 fetchSubmodules = true;

1616 };

1717 libraryHaskellDepends = [

18− aeson attoparsec base bytestring containers deepseq filepath

19− hashable hedgehog prettyprinter scientific template-haskell text

20− text-builder th-lift-instances unordered-containers vector

18+ aeson attoparsec base bytestring deepseq hashable hedgehog

19+ prettyprinter scientific template-haskell text text-builder

20+ th-lift-instances unordered-containers

2121 ];

2222 testHaskellDepends = [

23− attoparsec base bytestring hedgehog prettyprinter scientific text

24− text-builder

23+ attoparsec base bytestring hedgehog prettyprinter text text-builder

2524 ];

2625 benchmarkHaskellDepends = [

27− base bytestring criterion prettyprinter text text-builder

26+ base bytestring prettyprinter tasty-bench text text-builder

2827 ];

2928 homepage = "https://github.com/hasura/graphql-parser-hs";

3029 description = "A native Haskell GraphQL parser";

pkgs/development/misc/haskell/hasura/kriti-lang.nixnew file+41

@@ -0,0 +1,41 @@

1+# This has been automatically generated by the script

2+# ./update.sh. This should not be changed by hand.

3+{ mkDerivation, aeson, aeson-pretty, alex, array, base, bytestring

4+, containers, directory, fetchgit, filepath, generic-arbitrary

5+, happy, hspec, hspec-core, hspec-golden, lens, lens-aeson, lib

6+, megaparsec, mtl, network-uri, optparse-applicative, parsec

7+, parser-combinators, pretty-simple, prettyprinter, QuickCheck

8+, raw-strings-qq, safe-exceptions, scientific, text

9+, unordered-containers, utf8-string, vector

10+}:

11+mkDerivation {

12+ pname = "kriti-lang";

13+ version = "0.3.1";

14+ src = fetchgit {

15+ url = "https://github.com/hasura/kriti-lang.git";

16+ sha256 = "09v31xp8gkc0p0gfysxyd8yb7lyb1vpgzq8550h3s3msjbapr7pj";

17+ rev = "0f0b153b93af5dc6c6e995c016ca4562e8438cec";

18+ fetchSubmodules = true;

19+ };

20+ isLibrary = true;

21+ isExecutable = true;

22+ libraryHaskellDepends = [

23+ aeson array base bytestring containers lens megaparsec mtl

24+ network-uri optparse-applicative parser-combinators prettyprinter

25+ scientific text unordered-containers utf8-string vector

26+ ];

27+ libraryToolDepends = [ alex happy ];

28+ executableHaskellDepends = [

29+ aeson base bytestring containers mtl optparse-applicative

30+ prettyprinter text utf8-string

31+ ];

32+ testHaskellDepends = [

33+ aeson aeson-pretty base bytestring containers directory filepath

34+ generic-arbitrary hspec hspec-core hspec-golden lens lens-aeson mtl

35+ optparse-applicative parsec pretty-simple prettyprinter QuickCheck

36+ raw-strings-qq safe-exceptions scientific text unordered-containers

37+ utf8-string vector

38+ ];

39+ license = lib.licenses.asl20;

40+ maintainers = with lib.maintainers; [ lassulus ];

41+}

pkgs/development/misc/haskell/hasura/pg-client.nix+18−17

@@ -1,10 +1,10 @@

11# This has been automatically generated by the script

22# ./update.sh. This should not be changed by hand.

3−{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring

4−, Cabal, criterion, ekg-core, fetchgit, file-embed, hashable

5−, hashtables, hasql, hasql-pool, hasql-transaction, hspec, lib

6−, mmorph, monad-control, mtl, postgresql, postgresql-binary

7−, postgresql-libpq, resource-pool, retry, scientific

3+{ mkDerivation, aeson, aeson-casing, async, attoparsec, base

4+, bytestring, ekg-core, fetchgit, file-embed, hashable, hashtables

5+, hasql, hasql-pool, hasql-transaction, hspec, lib, mmorph

6+, monad-control, mtl, postgresql-binary, postgresql-libpq

7+, resource-pool, retry, safe-exceptions, scientific, tasty-bench

88, template-haskell, text, text-builder, time, transformers-base

99, uuid, vector

1010}:

@@ -13,24 +13,25 @@ mkDerivation {

1313 version = "0.1.0";

1414 src = fetchgit {

1515 url = "https://github.com/hasura/pg-client-hs.git";

16− sha256 = "00h9hskv3p4mg35php5wsr2d2rjahcv29rqidb2lxl11r05psr4m";

17− rev = "5e8a2d7ebe8b96518e5a70f4d61be2550eaa4e70";

16+ sha256 = "0ga2bj0mfng25c8kxsvi8i13pnanbnhahxvbq8ijl0bysd41g7zi";

17+ rev = "09b40ad8e5d16a78f5d91fe2306676f52caadbc8";

1818 fetchSubmodules = true;

1919 };

20− setupHaskellDepends = [ base Cabal ];

2120 libraryHaskellDepends = [

22− aeson aeson-casing attoparsec base bytestring ekg-core hashable

23− hashtables mmorph monad-control mtl postgresql-binary

24− postgresql-libpq resource-pool retry scientific template-haskell

25− text text-builder time transformers-base uuid vector

21+ aeson aeson-casing async attoparsec base bytestring ekg-core

22+ hashable hashtables mmorph monad-control mtl postgresql-binary

23+ postgresql-libpq resource-pool retry safe-exceptions scientific

24+ template-haskell text text-builder time transformers-base uuid

25+ vector

26+ ];

27+ testHaskellDepends = [

28+ async base bytestring hspec mtl safe-exceptions time

2629 ];

27− librarySystemDepends = [ postgresql ];

28− testHaskellDepends = [ base bytestring hspec mtl ];

2930 benchmarkHaskellDepends = [

30− base bytestring criterion file-embed hashable hasql hasql-pool

31− hasql-transaction mtl postgresql-libpq text text-builder

31+ base bytestring file-embed hasql hasql-pool hasql-transaction mtl

32+ tasty-bench text

3233 ];

3334 homepage = "https://github.com/hasura/platform";

34− license = lib.licenses.bsd3;

35+ license = lib.licenses.asl20;

3536 maintainers = with lib.maintainers; [ lassulus ];

3637}

pkgs/development/misc/haskell/hasura/pool.nix+1−1

@@ -17,7 +17,7 @@ mkDerivation {

1717 vector

1818 ];

1919 testHaskellDepends = [ base hspec ];

20− homepage = "https://github.com/bos/pool";

20+ homepage = "http://github.com/bos/pool";

2121 description = "A high-performance striped resource pooling implementation";

2222 license = lib.licenses.bsd3;

2323 maintainers = with lib.maintainers; [ lassulus ];

pkgs/development/misc/haskell/hasura/update.sh+11−1

@@ -21,12 +21,13 @@ pgclient_derivation_file="${script_dir}/pg-client.nix"

2121pool_derivation_file="${script_dir}/pool.nix"

2222ekgcore_derivation_file="${script_dir}/ekg-core.nix"

2323ekgjson_derivation_file="${script_dir}/ekg-json.nix"

24+kritilang_derivation_file="${script_dir}/kriti-lang.nix"

2425

2526# TODO: get current revision of graphql-engine in Nixpkgs.

2627# old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$engine_derivation_file")"

2728

2829# This is the latest release version of graphql-engine on GitHub.

29−new_version=$(curl --silent "https://api.github.com/repos/hasura/graphql-engine/releases" | jq '.[0].tag_name' --raw-output)

30+new_version=$(curl --silent "https://api.github.com/repos/hasura/graphql-engine/releases" | jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output)

3031

3132echo "Running cabal2nix and outputting to ${engine_derivation_file}..."

3233

@@ -77,6 +78,15 @@ echo "# ./update.sh. This should not be changed by hand." >> "$ekgjson_derivati

7778

7879cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-json.git" >> "$ekgjson_derivation_file"

7980

81+echo "Running cabal2nix and outputting to ${kritilang_derivation_file}..."

82+

83+echo "# This has been automatically generated by the script" > "$kritilang_derivation_file"

84+echo "# ./update.sh. This should not be changed by hand." >> "$kritilang_derivation_file"

85+

86+new_kritilang_version=$(curl --silent "https://api.github.com/repos/hasura/kriti-lang/tags" | jq '.[0].name' --raw-output)

87+

88+cabal2nix --revision "$new_kritilang_version" --maintainer lassulus "https://github.com/hasura/kriti-lang.git" >> "$kritilang_derivation_file"

89+

8090echo "###################"

8191echo "please update pkgs/servers/hasura/cli.nix vendorSha256"

8292echo "please update pkgs/development/haskell-modules/configuration-common.nix graphql-engine version"

pkgs/servers/hasura/cli.nix+1−1

@@ -9,7 +9,7 @@ buildGoModule rec {

1010 subPackages = [ "cmd/hasura" ];

1111

12− vendorSha256 = "0c0zn3a3bq3g13zj1b7hz1gfd9mcc5wlch80vjgp31vgm23vvd8d";

12+ vendorSha256 = "0rjh4rs92jj56il3hg8msjz0w0iv25lydnh9v1kxmvdzy1x75b2b";

1313

1414 doCheck = false;

1515

pkgs/top-level/all-packages.nix+1−1

@@ -21485,7 +21485,7 @@ with pkgs;

2148521485

2148621486 hashi-ui = callPackage ../servers/hashi-ui {};

2148721487

21488− hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskellPackages.graphql-engine;

21488+ hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc8107.graphql-engine;

2148921489

2149021490 hasura-cli = callPackage ../servers/hasura/cli.nix { };

2149121491