git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #167031 from NixOS/haskell-updates

haskellPackages: update stackage and hackage

commit5a073591c9d9c2fe4a1e11a1f765706f0d7faaf6 authorsternenseemann <sternenseemann@systemli.org> dateThu 7 Apr 2022, 01:50 (5 years ago) parent6e385105eeb531
33 files changed+918−367
maintainers/scripts/haskell/merge-and-open-pr.sh+1−1 nixos/modules/services/misc/gitit.nix+1−1 pkgs/data/misc/hackage/default.nix+2−1 pkgs/data/misc/hackage/pin.json+4−4 pkgs/development/compilers/ghc/9.0.2.nix+12 pkgs/development/haskell-modules/HACKING.md+1−1 pkgs/development/haskell-modules/configuration-common.nix+33−32 pkgs/development/haskell-modules/configuration-darwin.nix−2 pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix+7 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+6 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+7 pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix+10 pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix+9 pkgs/development/haskell-modules/configuration-ghc-head.nix+9 pkgs/development/haskell-modules/configuration-ghcjs.nix+1−1 pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml+4 pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml+2 pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml+2−1 pkgs/development/haskell-modules/generic-builder.nix+7−5 pkgs/development/haskell-modules/hackage-packages.nix+632−186 pkgs/development/haskell-modules/non-hackage-packages.nix+1 pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch−33 pkgs/development/haskell-modules/with-packages-wrapper.nix+4−4 pkgs/development/misc/haskell/hasura/ekg-core.nix+8−9 pkgs/development/misc/haskell/hasura/ekg-json.nix+6−3 pkgs/development/misc/haskell/hasura/graphql-engine.nix+65−50 pkgs/development/misc/haskell/hasura/graphql-parser.nix+11−12 pkgs/development/misc/haskell/hasura/kriti-lang.nix+41 pkgs/development/misc/haskell/hasura/pg-client.nix+18−17 pkgs/development/misc/haskell/hasura/pool.nix+1−1 pkgs/development/misc/haskell/hasura/update.sh+11−1 pkgs/servers/hasura/cli.nix+1−1 pkgs/top-level/all-packages.nix+1−1
maintainers/scripts/haskell/merge-and-open-pr.sh+1−1
@@ -99,7 +99,7 @@ This PR is the regular merge of the \`haskell-updates\` branch into \`master\`.
9999
100100This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. You may be able to find an up-to-date Hydra build report at [cdepillabout/nix-haskell-updates-status](https://github.com/cdepillabout/nix-haskell-updates-status).
101101
102−We roughly aim to merge these \`haskell-updates\` PRs at least once every two weeks. See the @NixOS/haskell [team calendar](https://cloud.maralorn.de/apps/calendar/p/Mw5WLnzsP7fC4Zky) for who is currently in charge of this branch.
102+We roughly aim to merge these \`haskell-updates\` PRs at least once every two weeks. See the @NixOS/haskell [team calendar](https://cloud.maralorn.de/apps/calendar/p/H6migHmKX7xHoTFa) for who is currently in charge of this branch.
103103
104104### haskellPackages Workflow Summary
105105
nixos/modules/services/misc/gitit.nix+1−1
@@ -10,7 +10,7 @@ let
1010
1111 toYesNo = b: if b then "yes" else "no";
1212
13− gititShared = with cfg.haskellPackages; gitit + "/share/" + pkgs.stdenv.hostPlatform.system + "-" + ghc.name + "/" + gitit.pname + "-" + gitit.version;
13+ gititShared = with cfg.haskellPackages; gitit + "/share/" + ghc.targetPrefix + ghc.haskellCompilerName + "/" + gitit.pname + "-" + gitit.version;
1414
1515 gititWithPkgs = hsPkgs: extras: hsPkgs.ghcWithPackages (self: with self; [ gitit ] ++ (extras self));
1616
pkgs/data/misc/hackage/default.nix+2−1
@@ -1,10 +1,11 @@
11# Hackage database snapshot, used by maintainers/scripts/regenerate-hackage-packages.sh
22# and callHackage
3−{ fetchurl }:
3+{ lib, fetchurl }:
44let
55 pin = builtins.fromJSON (builtins.readFile ./pin.json);
66in
77fetchurl {
88 inherit (pin) url sha256;
9+ name = "all-cabal-hashes-${lib.substring 0 7 pin.commit}.tar.gz";
910 passthru.updateScript = ../../../../maintainers/scripts/haskell/update-hackage.sh;
1011}
pkgs/data/misc/hackage/pin.json+4−4
@@ -1,6 +1,6 @@
11{
2− "commit": "a02557e981025a281de13f66204c2cd2e788732f",
3− "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a02557e981025a281de13f66204c2cd2e788732f.tar.gz",
4− "sha256": "0c6jg9s4p65ynkkk0z6p9q4whz5hs1vmbq8zsn7pavxkzwa8ych1",
5− "msg": "Update from Hackage at 2022-03-30T19:23:57Z"
2+ "commit": "e4f120f36a6e55fc2fe15c5ed774773420d38108",
3+ "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e4f120f36a6e55fc2fe15c5ed774773420d38108.tar.gz",
4+ "sha256": "16ljr256nrlmmsll2pbnf0xk07mqbcwa9n6d0mc2j44vyb478qwl",
5+ "msg": "Update from Hackage at 2022-04-03T10:13:27Z"
66}
pkgs/development/compilers/ghc/9.0.2.nix+12
@@ -5,6 +5,7 @@
55, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx, xattr
66, autoSignDarwinBinariesHook
77, bash
8+, fetchpatch
89
910, libiconv ? null, ncurses
1011, glibcLocales ? null
@@ -182,6 +183,17 @@ stdenv.mkDerivation (rec {
182183
183184 outputs = [ "out" "doc" ];
184185
186+ patches = [
187+ # Add flag that fixes C++ exception handling; opt-in. Merged in 9.4 and 9.2.2.
188+ # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7423
189+ (fetchpatch {
190+ name = "ghc-9.0.2-fcompact-unwind.patch";
191+ # Note that the test suite is not packaged.
192+ url = "https://gitlab.haskell.org/ghc/ghc/-/commit/c6132c782d974a7701e7f6447bdcd2bf6db4299a.patch?merge_request_iid=7423";
193+ sha256 = "sha256-b4feGZIaKDj/UKjWTNY6/jH4s2iate0wAgMxG3rAbZI=";
194+ })
195+ ];
196+
185197 postPatch = "patchShebangs .";
186198
187199 # GHC needs the locale configured during the Haddock phase.
pkgs/development/haskell-modules/HACKING.md+1−1
@@ -345,7 +345,7 @@ Here are some additional tips that didn't fit in above.
345345 [release-haskell.nix](../../top-level/release-haskell.nix).
346346
347347 1. Update the
348− [Nextcloud Calendar](https://cloud.maralorn.de/apps/calendar/p/Mw5WLnzsP7fC4Zky)
348+ [Nextcloud Calendar](https://cloud.maralorn.de/apps/calendar/p/H6migHmKX7xHoTFa)
349349 and work the new member into the `haskell-updates` rotation.
350350
351351 1. Optionally, have the new member add themselves to the Haskell
pkgs/development/haskell-modules/configuration-common.nix+33−32
@@ -619,7 +619,7 @@ self: super: {
619619 doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335
620620 executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.buildPackages.emacs];
621621 postInstall = ''
622− local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" )
622+ local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/*/${drv.pname}-${drv.version}/elisp" )
623623 make -C $lispdir
624624 mkdir -p $data/share/emacs/site-lisp
625625 ln -s "$lispdir/"*.el{,c} $data/share/emacs/site-lisp/
@@ -654,7 +654,7 @@ self: super: {
654654 # cannot easily byte-compile these files, unfortunately, because they
655655 # depend on a new version of haskell-mode that we don't have yet.
656656 postInstall = ''
657− local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" )
657+ local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/"*"/${drv.pname}-"*"/elisp" )
658658 mkdir -p $data/share/emacs
659659 ln -s $lispdir $data/share/emacs/site-lisp
660660 '';
@@ -665,7 +665,7 @@ self: super: {
665665 # We cannot easily byte-compile these files, unfortunately, because they
666666 # depend on a new version of haskell-mode that we don't have yet.
667667 postInstall = ''
668− local lispdir=( "$data/share/${self.ghc.name}/"*"/${drv.pname}-"*"/elisp" )
668+ local lispdir=( "$data/share/${self.ghc.targetPrefix}${self.ghc.haskellCompilerName}/"*"/${drv.pname}-"*"/elisp" )
669669 mkdir -p $data/share/emacs
670670 ln -s $lispdir $data/share/emacs/site-lisp
671671 '';
@@ -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
@@ -2044,18 +2057,6 @@ self: super: {
20442057 '' + (drv.postPatch or "");
20452058 }) (doJailbreak super.jsaddle);
20462059
2047− # 2022-03-22: PR for haskell-gi-base compat https://github.com/ghcjs/jsaddle/pull/129
2048− jsaddle-webkit2gtk =
2049− appendPatch (
2050− fetchpatch {
2051− name = "haskell-gi-base-0.26-compat-patch";
2052− url = "https://github.com/ghcjs/jsaddle/commit/c9a9ad39addea469f7e3f5bc6b1c778fefaab5d8.patch";
2053− sha256 = "sha256-4njoOxtJH2jVqiPmW8f9hGUqpzI3yJ1XP4u85QgmvjU=";
2054− relative = "jsaddle-webkit2gtk";
2055− }
2056− )
2057− super.jsaddle-webkit2gtk;
2058−
20592060 # 2022-03-22: Jailbreak for base bound: https://github.com/reflex-frp/reflex-dom/pull/433
20602061 reflex-dom = assert super.reflex-dom.version == "0.6.1.1"; doJailbreak super.reflex-dom;
20612062
pkgs/development/haskell-modules/configuration-darwin.nix−2
@@ -287,8 +287,6 @@ self: super: ({
287287 # https://github.com/fpco/unliftio/issues/87
288288 unliftio = dontCheck super.unliftio;
289289
290− # https://github.com/fpco/inline-c/issues/127
291− inline-c-cpp = dontCheck super.inline-c-cpp;
292290
293291 # https://github.com/haskell-crypto/cryptonite/issues/360
294292 cryptonite = appendPatch ./patches/cryptonite-remove-argon2.patch super.cryptonite;
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix+7
@@ -2,6 +2,10 @@
22
33with haskellLib;
44
5+let
6+ inherit (pkgs.stdenv.hostPlatform) isDarwin;
7+in
8+
59self: super: {
610
711 llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
@@ -121,4 +125,7 @@ self: super: {
121125 ] super.mysql-simple;
122126
123127 taffybar = markUnbroken (doDistribute super.taffybar);
128+
129+ # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0)
130+ inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp;
124131}
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+6
@@ -2,6 +2,10 @@
22
33with haskellLib;
44
5+let
6+ inherit (pkgs.stdenv.hostPlatform) isDarwin;
7+in
8+
59self: super: {
610
711 llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
@@ -104,4 +108,6 @@ self: super: {
104108
105109 mime-string = disableOptimization super.mime-string;
106110
111+ # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0)
112+ inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp;
107113}
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+7
@@ -2,6 +2,10 @@
22
33with haskellLib;
44
5+let
6+ inherit (pkgs.stdenv.hostPlatform) isDarwin;
7+in
8+
59self: super: {
610
711 llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
@@ -150,4 +154,7 @@ self: super: {
150154 mysql-simple = addBuildDepends [
151155 self.blaze-textual
152156 ] super.mysql-simple;
157+
158+ # https://github.com/fpco/inline-c/issues/127 (recommend to upgrade to Nixpkgs GHC >=9.0)
159+ inline-c-cpp = (if isDarwin then dontCheck else x: x) super.inline-c-cpp;
153160}
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix+10
@@ -2,6 +2,10 @@
22
33with haskellLib;
44
5+let
6+ inherit (pkgs.stdenv.hostPlatform) isDarwin;
7+in
8+
59self: super: {
610
711 llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
@@ -118,4 +122,10 @@ self: super: {
118122 multistate = doJailbreak super.multistate;
119123 # https://github.com/lspitzner/butcher/issues/7
120124 butcher = doJailbreak super.butcher;
125+
126+ # We use a GHC patch to support the fix for https://github.com/fpco/inline-c/issues/127
127+ # which means that the upstream cabal file isn't allowed to add the flag.
128+ inline-c-cpp =
129+ (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x)
130+ super.inline-c-cpp;
121131}
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix+9
@@ -2,6 +2,10 @@
22
33with haskellLib;
44
5+let
6+ inherit (pkgs.stdenv.hostPlatform) isDarwin;
7+in
8+
59self: super: {
610
711 llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
@@ -236,4 +240,9 @@ self: super: {
236240 hls-retrie-plugin = null;
237241 hls-splice-plugin = null;
238242 }));
243+
244+ # https://github.com/fpco/inline-c/pull/131
245+ inline-c-cpp =
246+ (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x)
247+ super.inline-c-cpp;
239248}
pkgs/development/haskell-modules/configuration-ghc-head.nix+9
@@ -9,6 +9,10 @@
99
1010with haskellLib;
1111
12+let
13+ inherit (pkgs.stdenv.hostPlatform) isDarwin;
14+in
15+
1216self: super: {
1317
1418 llvmPackages = pkgs.lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
@@ -74,4 +78,9 @@ self: super: {
7478 # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
7579 stack = doJailbreak super.stack;
7680
81+ # https://github.com/fpco/inline-c/pull/131
82+ # and/or https://gitlab.haskell.org/ghc/ghc/-/merge_requests/7739
83+ inline-c-cpp =
84+ (if isDarwin then appendConfigureFlags ["--ghc-option=-fcompact-unwind"] else x: x)
85+ super.inline-c-cpp;
7786}
pkgs/development/haskell-modules/configuration-ghcjs.nix+1−1
@@ -19,7 +19,7 @@ self: super:
1919 jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle;
2020
2121 ghcjs-base = dontCheck (self.callPackage ../compilers/ghcjs/ghcjs-base.nix {
22− fetchgit = pkgs.buildPackages.fetchgit;
22+ fetchFromGitHub = pkgs.buildPackages.fetchFromGitHub;
2323 });
2424
2525 # GHCJS does not ship with the same core packages as GHC.
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml+4
@@ -1392,6 +1392,7 @@ broken-packages:
13921392 - fast-nats
13931393 - fastpbkdf2
13941394 - FastPush
1395+ - fast-tags
13951396 - FastxPipe
13961397 - fathead-util
13971398 - fb
@@ -3959,6 +3960,7 @@ broken-packages:
39593960 - powerdns
39603961 - powermate
39613962 - powerpc
3963+ - powerqueue-levelmem
39623964 - pprecord
39633965 - PPrinter
39643966 - pqc
@@ -4705,6 +4707,7 @@ broken-packages:
47054707 - socketio
47064708 - sockets-and-pipes
47074709 - socket-sctp
4710+ - socketson
47084711 - socket-unix
47094712 - sodium
47104713 - soegtk
@@ -5205,6 +5208,7 @@ broken-packages:
52055208 - trial-tomland
52065209 - trigger
52075210 - trim
5211+ - tripLL
52085212 - trivia
52095213 - tropical
52105214 - true-name
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml+2
@@ -327,6 +327,8 @@ package-maintainers:
327327 - hercules-ci-cli
328328 - hercules-ci-cnix-expr
329329 - hercules-ci-cnix-store
330+ - inline-c
331+ - inline-c-cpp
330332 rvl:
331333 - taffybar
332334 - arbtt
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml+2−1
@@ -928,6 +928,7 @@ dont-distribute-packages:
928928 - cfopu
929929 - chainweb-mining-client
930930 - chalkboard-viewer
931+ - chapelure
931932 - charade
932933 - chart-cli
933934 - chart-svg-various
@@ -1354,7 +1355,6 @@ dont-distribute-packages:
13541355 - errors-ext
13551356 - ersatz-toysat
13561357 - esotericbot
1357− - espial
13581358 - estimators
13591359 - estreps
13601360 - eternity
@@ -1433,6 +1433,7 @@ dont-distribute-packages:
14331433 - feed-translator
14341434 - feed2lj
14351435 - feed2twitter
1436+ - feedback
14361437 - fei-base
14371438 - fei-dataiter
14381439 - fei-datasets
pkgs/development/haskell-modules/generic-builder.nix+7−5
@@ -196,13 +196,13 @@ let
196196 "--prefix=$out"
197197 "--libdir=\\$prefix/lib/\\$compiler"
198198 "--libsubdir=\\$abi/\\$libname"
199− (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghc.name}")
199+ (optionalString enableSeparateDataOutput "--datadir=$data/share/${ghcNameWithPrefix}")
200200 (optionalString enableSeparateDocOutput "--docdir=${docdir "$doc"}")
201201 ] ++ optionals stdenv.hasCC [
202202 "--with-gcc=$CC" # Clang won't work without that extra information.
203203 ] ++ [
204204 "--package-db=$packageConfDir"
205− (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}")
205+ (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghcNameWithPrefix}/${pname}-${version}")
206206 (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
207207 (optionalString enableParallelBuilding "--ghc-options=${parallelBuildingFlags}")
208208 (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
@@ -275,6 +275,8 @@ let
275275 ghcCommand' = if isGhcjs then "ghcjs" else "ghc";
276276 ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
277277
278+ ghcNameWithPrefix = "${ghc.targetPrefix}${ghc.haskellCompilerName}";
279+
278280 nativeGhcCommand = "${nativeGhc.targetPrefix}ghc";
279281
280282 buildPkgDb = ghcName: packageConfDir: ''
@@ -350,14 +352,14 @@ stdenv.mkDerivation ({
350352 # pkgs* arrays defined in stdenv/setup.hs
351353 + ''
352354 for p in "''${pkgsBuildBuild[@]}" "''${pkgsBuildHost[@]}" "''${pkgsBuildTarget[@]}"; do
353− ${buildPkgDb nativeGhc.name "$setupPackageConfDir"}
355+ ${buildPkgDb "${nativeGhcCommand}-${nativeGhc.version}" "$setupPackageConfDir"}
354356 done
355357 ${nativeGhcCommand}-pkg --${nativePackageDbFlag}="$setupPackageConfDir" recache
356358 ''
357359 # For normal components
358360 + ''
359361 for p in "''${pkgsHostHost[@]}" "''${pkgsHostTarget[@]}"; do
360− ${buildPkgDb ghc.name "$packageConfDir"}
362+ ${buildPkgDb ghcNameWithPrefix "$packageConfDir"}
361363 if [ -d "$p/include" ]; then
362364 configureFlags+=" --extra-include-dirs=$p/include"
363365 fi
@@ -494,7 +496,7 @@ stdenv.mkDerivation ({
494496 # just the target specified; "install" will error here, since not all targets have been built.
495497 else ''
496498 ${setupCommand} copy ${buildTarget}
497− local packageConfDir="$out/lib/${ghc.name}/package.conf.d"
499+ local packageConfDir="$out/lib/${ghcNameWithPrefix}/package.conf.d"
498500 local packageConfFile="$packageConfDir/${pname}-${version}.conf"
499501 mkdir -p "$packageConfDir"
500502 ${setupCommand} register --gen-pkg-config=$packageConfFile
pkgs/development/haskell-modules/hackage-packages.nix+632−186
@@ -840,6 +840,42 @@ self: {
840840 maintainers = with lib.maintainers; [ abbradar turion ];
841841 }) {inherit (pkgs) emacs;};
842842
843+ "Agda_2_6_2_2" = callPackage
844+ ({ mkDerivation, aeson, alex, array, async, base, binary
845+ , blaze-html, boxes, bytestring, Cabal, case-insensitive
846+ , containers, data-hash, deepseq, directory, edit-distance, emacs
847+ , equivalence, exceptions, filepath, ghc-compact, gitrev, happy
848+ , hashable, hashtables, haskeline, monad-control, mtl, murmur-hash
849+ , parallel, pretty, process, regex-tdfa, split, stm, strict
850+ , template-haskell, text, time, transformers, unordered-containers
851+ , uri-encode, zlib
852+ }:
853+ mkDerivation {
854+ pname = "Agda";
855+ version = "2.6.2.2";
856+ sha256 = "0yjjbhc593ylrm4mq4j01nkdvh7xqsg5in30wxj4y53vf5hkggp5";
857+ isLibrary = true;
858+ isExecutable = true;
859+ enableSeparateDataOutput = true;
860+ setupHaskellDepends = [ base Cabal directory filepath process ];
861+ libraryHaskellDepends = [
862+ aeson array async base binary blaze-html boxes bytestring
863+ case-insensitive containers data-hash deepseq directory
864+ edit-distance equivalence exceptions filepath ghc-compact gitrev
865+ hashable hashtables haskeline monad-control mtl murmur-hash
866+ parallel pretty process regex-tdfa split stm strict
867+ template-haskell text time transformers unordered-containers
868+ uri-encode zlib
869+ ];
870+ libraryToolDepends = [ alex happy ];
871+ executableHaskellDepends = [ base directory filepath process ];
872+ executableToolDepends = [ emacs ];
873+ description = "A dependently typed functional programming language and proof assistant";
874+ license = "unknown";
875+ hydraPlatforms = lib.platforms.none;
876+ maintainers = with lib.maintainers; [ abbradar turion ];
877+ }) {inherit (pkgs) emacs;};
878+
843879 "Agda-executable" = callPackage
844880 ({ mkDerivation, Agda, base }:
845881 mkDerivation {
@@ -40127,8 +40163,8 @@ self: {
4012740163 }:
4012840164 mkDerivation {
4012940165 pname = "bcp47";
40130− version = "0.2.0.5";
40131− sha256 = "1drfv04v5137c726c9bpz8lh1c0blb4mfnca4dgzai91pjk026sd";
40166+ version = "0.2.0.6";
40167+ sha256 = "0k226jmpv6fnifbmbgdfvbj375an5g7bzzlcvfa1n5x65512ibp2";
4013240168 libraryHaskellDepends = [
4013340169 aeson base containers country generic-arbitrary iso639 megaparsec
4013440170 QuickCheck text
@@ -40147,8 +40183,8 @@ self: {
4014740183 }:
4014840184 mkDerivation {
4014940185 pname = "bcp47-orphans";
40150− version = "0.1.0.4";
40151− sha256 = "08kx00dxmwj0vxazcd2s88q069swnzjfnj61kla5pczaz0aqh11w";
40186+ version = "0.1.0.5";
40187+ sha256 = "1h5pqcb1snmbbvcfpjcqrfbk9l8wry6i0mlz6vm347arhfwc62cd";
4015240188 libraryHaskellDepends = [
4015340189 base bcp47 cassava errors esqueleto hashable http-api-data
4015440190 path-pieces persistent text
@@ -47076,6 +47112,33 @@ self: {
4707647112 license = lib.licenses.bsd3;
4707747113 }) {};
4707847114
47115+ "brick_0_68_1" = callPackage
47116+ ({ mkDerivation, base, bytestring, config-ini, containers
47117+ , contravariant, data-clist, deepseq, directory, dlist, exceptions
47118+ , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm
47119+ , template-haskell, text, text-zipper, transformers, unix, vector
47120+ , vty, word-wrap
47121+ }:
47122+ mkDerivation {
47123+ pname = "brick";
47124+ version = "0.68.1";
47125+ sha256 = "17pzp9p4rmd82smxwz2kh1jjd5ssy5b86jnv7a4ac1g1zgnnki0r";
47126+ isLibrary = true;
47127+ isExecutable = true;
47128+ libraryHaskellDepends = [
47129+ base bytestring config-ini containers contravariant data-clist
47130+ deepseq directory dlist exceptions filepath microlens microlens-mtl
47131+ microlens-th stm template-haskell text text-zipper transformers
47132+ unix vector vty word-wrap
47133+ ];
47134+ testHaskellDepends = [
47135+ base containers microlens QuickCheck vector
47136+ ];
47137+ description = "A declarative terminal user interface library";
47138+ license = lib.licenses.bsd3;
47139+ hydraPlatforms = lib.platforms.none;
47140+ }) {};
47141+
4707947142 "brick-dropdownmenu" = callPackage
4708047143 ({ mkDerivation, base, brick, containers, microlens, microlens-ghc
4708147144 , microlens-th, pointedlist, vector, vty
@@ -47977,8 +48040,8 @@ self: {
4797748040 }:
4797848041 mkDerivation {
4797948042 pname = "bugsnag";
47980− version = "1.0.0.0";
47981− sha256 = "0s0ppjhn1qylbcia2rpccq7xma26ch1qk9lq578df4i1djpl07zl";
48043+ version = "1.0.0.1";
48044+ sha256 = "1sbm85r2ia5k4rdbz8yqgd5x01b2l5kw0p4knj8mr8cr37fqzp8b";
4798248045 isLibrary = true;
4798348046 isExecutable = true;
4798448047 libraryHaskellDepends = [
@@ -47986,7 +48049,7 @@ self: {
4798648049 http-client-tls parsec template-haskell text th-lift-instances
4798748050 ua-parser unordered-containers
4798848051 ];
47989− testHaskellDepends = [ base hspec text unliftio ];
48052+ testHaskellDepends = [ base hspec unliftio ];
4799048053 description = "Bugsnag error reporter for Haskell";
4799148054 license = lib.licenses.mit;
4799248055 }) {};
@@ -48040,8 +48103,8 @@ self: {
4804048103 }:
4804148104 mkDerivation {
4804248105 pname = "bugsnag-wai";
48043− version = "1.0.0.0";
48044− sha256 = "0qarc8w1vprklccrr4i8z5x6m4qry2f09fi43ac7jnh1axywv93a";
48106+ version = "1.0.0.1";
48107+ sha256 = "0f3x4m9nl277rhg2pwrja9xh6fffrwl2dm1cf3jiyngkrbrfck0w";
4804548108 isLibrary = true;
4804648109 isExecutable = true;
4804748110 libraryHaskellDepends = [
@@ -48059,8 +48122,8 @@ self: {
4805948122 }:
4806048123 mkDerivation {
4806148124 pname = "bugsnag-yesod";
48062− version = "1.0.0.0";
48063− sha256 = "181qdsq7dnzsna05g78r613mgfl3shxx6n0zllnzf4m3c05vq5j6";
48125+ version = "1.0.0.1";
48126+ sha256 = "06w2ndxk8czwdfwyy3ylkhzagbaxx6gkix8lwybks0vsxwjr6w83";
4806448127 isLibrary = true;
4806548128 isExecutable = true;
4806648129 libraryHaskellDepends = [
@@ -54620,19 +54683,19 @@ self: {
5462054683
5462154684 "cfn-flip" = callPackage
5462254685 ({ mkDerivation, aeson, base, bytestring, conduit, doctest
54623− , filepath, Glob, hspec, libyaml, resourcet, text, unliftio
54624− , unliftio-core, yaml
54686+ , filepath, Glob, hspec, libyaml, text, unliftio, unliftio-core
54687+ , yaml
5462554688 }:
5462654689 mkDerivation {
5462754690 pname = "cfn-flip";
54628− version = "0.1.0.1";
54629− sha256 = "0vykc7lwjarbf0zqkjfms5sv82vsd64q102qrmvl3qs8mil0vkv2";
54691+ version = "0.1.0.2";
54692+ sha256 = "16n45ik3g33fqfqry7l8pa0gcljymvw9wkg9n3qal8570q5k82ds";
5463054693 libraryHaskellDepends = [
54631− aeson base bytestring conduit libyaml resourcet text unliftio
54632− unliftio-core yaml
54694+ aeson base bytestring conduit libyaml text unliftio unliftio-core
54695+ yaml
5463354696 ];
5463454697 testHaskellDepends = [
54635− aeson base conduit doctest filepath Glob hspec libyaml yaml
54698+ aeson base doctest filepath Glob hspec libyaml yaml
5463654699 ];
5463754700 description = "Haskell implementation of aws/cfn-flip";
5463854701 license = lib.licenses.mit;
@@ -54990,6 +55053,27 @@ self: {
5499055053 license = lib.licenses.bsd3;
5499155054 }) {};
5499255055
55056+ "chapelure" = callPackage
55057+ ({ mkDerivation, ansi-terminal, base, colour, containers
55058+ , hsluv-haskell, hspec, nonempty-vector, optics-core, prettyprinter
55059+ , string-qq, text, text-display, vector
55060+ }:
55061+ mkDerivation {
55062+ pname = "chapelure";
55063+ version = "0.0.1.0";
55064+ sha256 = "0avlif17mx59vmla2gj649f73hglf38yhcwpblzly8yif2nnwj07";
55065+ libraryHaskellDepends = [
55066+ ansi-terminal base colour containers hsluv-haskell nonempty-vector
55067+ optics-core prettyprinter text text-display vector
55068+ ];
55069+ testHaskellDepends = [
55070+ base hspec nonempty-vector prettyprinter string-qq text vector
55071+ ];
55072+ description = "A diagnostics library for Haskell";
55073+ license = lib.licenses.mit;
55074+ hydraPlatforms = lib.platforms.none;
55075+ }) {};
55076+
5499355077 "char-decode" = callPackage
5499455078 ({ mkDerivation, base, bytestring, QuickCheck, tasty
5499555079 , tasty-quickcheck, text
@@ -56805,6 +56889,33 @@ self: {
5680556889 license = lib.licenses.bsd2;
5680656890 }) {};
5680756891
56892+ "citeproc_0_7" = callPackage
56893+ ({ mkDerivation, aeson, attoparsec, base, bytestring
56894+ , case-insensitive, containers, data-default, Diff, directory
56895+ , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific
56896+ , text, timeit, transformers, unicode-collation, uniplate, vector
56897+ , xml-conduit
56898+ }:
56899+ mkDerivation {
56900+ pname = "citeproc";
56901+ version = "0.7";
56902+ sha256 = "1xsfsz6hdp0ickps1qafkfn7pwjxc22a5ib3bl99jdjbx7fql6h9";
56903+ isLibrary = true;
56904+ isExecutable = true;
56905+ libraryHaskellDepends = [
56906+ aeson attoparsec base bytestring case-insensitive containers
56907+ data-default file-embed filepath pandoc-types safe scientific text
56908+ transformers unicode-collation uniplate vector xml-conduit
56909+ ];
56910+ testHaskellDepends = [
56911+ aeson base bytestring containers Diff directory filepath mtl pretty
56912+ text timeit transformers
56913+ ];
56914+ description = "Generates citations and bibliography from CSL styles";
56915+ license = lib.licenses.bsd2;
56916+ hydraPlatforms = lib.platforms.none;
56917+ }) {};
56918+
5680856919 "citeproc-hs" = callPackage
5680956920 ({ mkDerivation, base, bytestring, containers, directory, filepath
5681056921 , hexpat, hs-bibutils, HTTP, json, mtl, network, network-uri
@@ -58619,6 +58730,26 @@ self: {
5861958730 license = lib.licenses.mit;
5862058731 }) {};
5862158732
58733+ "closed_0_2_0_2" = callPackage
58734+ ({ mkDerivation, aeson, base, cassava, deepseq, hashable, hspec
58735+ , markdown-unlit, persistent, QuickCheck, text, vector
58736+ }:
58737+ mkDerivation {
58738+ pname = "closed";
58739+ version = "0.2.0.2";
58740+ sha256 = "0dh73bayq78a0idbh2lprmb8hazj03g4ma5gcmad06bq01nl9yxh";
58741+ libraryHaskellDepends = [
58742+ aeson base cassava deepseq hashable persistent QuickCheck text
58743+ ];
58744+ testHaskellDepends = [
58745+ aeson base cassava hspec markdown-unlit persistent text vector
58746+ ];
58747+ testToolDepends = [ markdown-unlit ];
58748+ description = "Integers bounded by a closed interval";
58749+ license = lib.licenses.mit;
58750+ hydraPlatforms = lib.platforms.none;
58751+ }) {};
58752+
5862258753 "closed-classes" = callPackage
5862358754 ({ mkDerivation, base, template-haskell }:
5862458755 mkDerivation {
@@ -61242,6 +61373,29 @@ self: {
6124261373 license = lib.licenses.bsd3;
6124361374 }) {};
6124461375
61376+ "commonmark_0_2_2" = callPackage
61377+ ({ mkDerivation, base, bytestring, containers, parsec, tasty
61378+ , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers
61379+ , unicode-data, unicode-transforms
61380+ }:
61381+ mkDerivation {
61382+ pname = "commonmark";
61383+ version = "0.2.2";
61384+ sha256 = "0kmjc9xgzy33kxz842mw5rdywip3lmk7v3ambrs87nakawgl42xp";
61385+ libraryHaskellDepends = [
61386+ base bytestring containers parsec text transformers unicode-data
61387+ unicode-transforms
61388+ ];
61389+ testHaskellDepends = [
61390+ base parsec tasty tasty-hunit tasty-quickcheck text
61391+ unicode-transforms
61392+ ];
61393+ benchmarkHaskellDepends = [ base tasty-bench text ];
61394+ description = "Pure Haskell commonmark parser";
61395+ license = lib.licenses.bsd3;
61396+ hydraPlatforms = lib.platforms.none;
61397+ }) {};
61398+
6124561399 "commonmark-cli" = callPackage
6124661400 ({ mkDerivation, aeson, ansi-terminal, base, bytestring, commonmark
6124761401 , commonmark-extensions, commonmark-pandoc, containers, mtl
@@ -61283,6 +61437,28 @@ self: {
6128361437 license = lib.licenses.bsd3;
6128461438 }) {};
6128561439
61440+ "commonmark-extensions_0_2_3_1" = callPackage
61441+ ({ mkDerivation, base, commonmark, containers, emojis, filepath
61442+ , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text
61443+ , transformers
61444+ }:
61445+ mkDerivation {
61446+ pname = "commonmark-extensions";
61447+ version = "0.2.3.1";
61448+ sha256 = "1hnhaxw7mpsbcgqz1vlxy0xnnkgh590hi6gv1wk5fw1j12viqdzi";
61449+ libraryHaskellDepends = [
61450+ base commonmark containers emojis filepath network-uri parsec text
61451+ transformers
61452+ ];
61453+ testHaskellDepends = [
61454+ base commonmark parsec tasty tasty-hunit text
61455+ ];
61456+ benchmarkHaskellDepends = [ base commonmark tasty-bench text ];
61457+ description = "Pure Haskell commonmark parser";
61458+ license = lib.licenses.bsd3;
61459+ hydraPlatforms = lib.platforms.none;
61460+ }) {};
61461+
6128661462 "commonmark-pandoc" = callPackage
6128761463 ({ mkDerivation, base, commonmark, commonmark-extensions
6128861464 , pandoc-types, text
@@ -69819,13 +69995,13 @@ self: {
6981969995 }) {inherit (pkgs) curl;};
6982069996
6982169997 "curl-aeson" = callPackage
69822− ({ mkDerivation, aeson, base, curl, text, utf8-string }:
69998+ ({ mkDerivation, aeson, base, bytestring, curl, text }:
6982369999 mkDerivation {
6982470000 pname = "curl-aeson";
69825− version = "0.0.4";
69826− sha256 = "1fpi448f6bgf3rbw3zxf7r9nwyhv9q67zan5sixnad1y7lqxivrx";
69827− libraryHaskellDepends = [ aeson base curl text utf8-string ];
69828− description = "Communicate with HTTP service using JSON";
70001+ version = "0.1.0.1";
70002+ sha256 = "1hiz2rwbycl2nx5k1157nnl661rk1gkj7m4vc4qac1saqvf9jxdz";
70003+ libraryHaskellDepends = [ aeson base bytestring curl text ];
70004+ description = "Communicate with web services using JSON";
6982970005 license = lib.licenses.bsd3;
6983070006 hydraPlatforms = lib.platforms.none;
6983170007 broken = true;
@@ -74710,18 +74886,14 @@ self: {
7471074886 hydraPlatforms = lib.platforms.none;
7471174887 }) {};
7471274888
74713− "deepseq_1_4_6_1" = callPackage
74714− ({ mkDerivation, array, base, ghc-prim, HUnit, test-framework
74715− , test-framework-hunit
74716− }:
74889+ "deepseq_1_4_7_0" = callPackage
74890+ ({ mkDerivation, array, base, ghc-prim }:
7471774891 mkDerivation {
7471874892 pname = "deepseq";
74719− version = "1.4.6.1";
74720− sha256 = "178k97l6yh8bklnkzqsla4l2vms16ys126abs7d5i0fcnyj472fm";
74721− libraryHaskellDepends = [ array base ];
74722− testHaskellDepends = [
74723− array base ghc-prim HUnit test-framework test-framework-hunit
74724− ];
74893+ version = "1.4.7.0";
74894+ sha256 = "0sm00rsw714y73qr5zihz5fhxw0hahs6ksmf8wa60m1qwb9jcy9v";
74895+ libraryHaskellDepends = [ array base ghc-prim ];
74896+ testHaskellDepends = [ array base ghc-prim ];
7472574897 description = "Deep evaluation of data structures";
7472674898 license = lib.licenses.bsd3;
7472774899 hydraPlatforms = lib.platforms.none;
@@ -75927,8 +76099,8 @@ self: {
7592776099 }:
7592876100 mkDerivation {
7592976101 pname = "deriving-trans";
75930− version = "0.3.1.0";
75931− sha256 = "0x7kk9b08f9fplkycw2202qil3rh5l2x7l7whjlv30b0v5k885xz";
76102+ version = "0.3.2.0";
76103+ sha256 = "0w13274j1qn6qdx9kmd01qbcwhnpvqn4rvrnpv60gwqfi4hwgcqs";
7593276104 libraryHaskellDepends = [
7593376105 base monad-control mtl transformers transformers-base
7593476106 ];
@@ -76566,6 +76738,8 @@ self: {
7656676738 pname = "dhall";
7656776739 version = "1.41.1";
7656876740 sha256 = "09flx2mfl8mzszn0hx80fai3ryiwgjkbxyklfkpmm5hw1smkdslv";
76741+ revision = "1";
76742+ editedCabalFile = "19lgfkyg1p9crrf3gi508zya477vma2ks7ib7hw0r84sl4jjiaji";
7656976743 isLibrary = true;
7657076744 isExecutable = true;
7657176745 enableSeparateDataOutput = true;
@@ -81276,6 +81450,28 @@ self: {
8127681450 license = lib.licenses.bsd3;
8127781451 }) {};
8127881452
81453+ "doclayout_0_4" = callPackage
81454+ ({ mkDerivation, base, containers, criterion, deepseq, emojis, mtl
81455+ , safe, tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text
81456+ }:
81457+ mkDerivation {
81458+ pname = "doclayout";
81459+ version = "0.4";
81460+ sha256 = "18xkzywfw0hl3hgbq9z36hs040vb0iz9yygx33cybxfi4i0dwbkx";
81461+ enableSeparateDataOutput = true;
81462+ libraryHaskellDepends = [ base containers emojis mtl safe text ];
81463+ testHaskellDepends = [
81464+ base emojis mtl tasty tasty-golden tasty-hunit tasty-quickcheck
81465+ text
81466+ ];
81467+ benchmarkHaskellDepends = [
81468+ base criterion deepseq emojis mtl text
81469+ ];
81470+ description = "A prettyprinting library for laying out text documents";
81471+ license = lib.licenses.bsd3;
81472+ hydraPlatforms = lib.platforms.none;
81473+ }) {};
81474+
8127981475 "docopt" = callPackage
8128081476 ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
8128181477 , HUnit, parsec, split, template-haskell, text
@@ -88652,68 +88848,66 @@ self: {
8865288848 }) {};
8865388849
8865488850 "espial" = callPackage
88655− ({ mkDerivation, aeson, attoparsec, base, bcrypt, bytestring
88656− , case-insensitive, classy-prelude, classy-prelude-conduit
88657− , classy-prelude-yesod, conduit, containers, data-default
88658− , directory, ekg, ekg-core, entropy, esqueleto, fast-logger
88659− , file-embed, foreign-store, hjsmin, hscolour, hspec, http-api-data
88660− , http-client, http-client-tls, http-conduit, http-types
88661− , iso8601-time, microlens, monad-logger, monad-metrics, mtl
88662− , optparse-generic, parser-combinators, persistent
88851+ ({ mkDerivation, aeson, attoparsec, base, bcrypt, blaze-html
88852+ , bytestring, case-insensitive, classy-prelude
88853+ , classy-prelude-conduit, classy-prelude-yesod, conduit, connection
88854+ , containers, data-default, directory, entropy, esqueleto
88855+ , fast-logger, file-embed, foreign-store, hjsmin, hscolour, hspec
88856+ , html-entities, http-api-data, http-client, http-client-tls
88857+ , http-conduit, http-types, iso8601-time, microlens, monad-logger
88858+ , mtl, optparse-generic, parser-combinators, persistent
8866388859 , persistent-sqlite, persistent-template, pretty-show, safe
8866488860 , shakespeare, template-haskell, text, time, transformers
88665− , unordered-containers, vector, wai, wai-extra, wai-logger
88666− , wai-middleware-metrics, warp, yaml, yesod, yesod-auth, yesod-core
88667− , yesod-form, yesod-static, yesod-test
88861+ , unordered-containers, vector, wai, wai-extra, wai-logger, warp
88862+ , yaml, yesod, yesod-auth, yesod-core, yesod-form, yesod-newsfeed
88863+ , yesod-static, yesod-test
8866888864 }:
8866988865 mkDerivation {
8867088866 pname = "espial";
88671− version = "0.0.7";
88672− sha256 = "06nlmz8j6f64dgbd9y9b7i9fd1bv32yxijx764zlvy75i6vbips5";
88867+ version = "0.0.9";
88868+ sha256 = "128vwdmilvvxwaylslway3d6mx4ad9pcx5y2x74x38hi9mpmrylc";
8867388869 isLibrary = true;
8867488870 isExecutable = true;
8867588871 libraryHaskellDepends = [
88676− aeson attoparsec base bcrypt bytestring case-insensitive
88872+ aeson attoparsec base bcrypt blaze-html bytestring case-insensitive
8867788873 classy-prelude classy-prelude-conduit classy-prelude-yesod conduit
88678− containers data-default directory ekg ekg-core entropy esqueleto
88679− fast-logger file-embed foreign-store hjsmin hscolour http-api-data
88680− http-client http-client-tls http-conduit http-types iso8601-time
88681− microlens monad-logger monad-metrics mtl parser-combinators
88874+ connection containers data-default directory entropy esqueleto
88875+ fast-logger file-embed foreign-store hjsmin hscolour html-entities
88876+ http-api-data http-client http-client-tls http-conduit http-types
88877+ iso8601-time microlens monad-logger mtl parser-combinators
8868288878 persistent persistent-sqlite persistent-template pretty-show safe
8868388879 shakespeare template-haskell text time transformers
88684− unordered-containers vector wai wai-extra wai-logger
88685− wai-middleware-metrics warp yaml yesod yesod-auth yesod-core
88686− yesod-form yesod-static
88880+ unordered-containers vector wai wai-extra wai-logger warp yaml
88881+ yesod yesod-auth yesod-core yesod-form yesod-newsfeed yesod-static
8868788882 ];
8868888883 executableHaskellDepends = [
88689− aeson attoparsec base bcrypt bytestring case-insensitive
88884+ aeson attoparsec base bcrypt blaze-html bytestring case-insensitive
8869088885 classy-prelude classy-prelude-conduit classy-prelude-yesod conduit
88691− containers data-default directory ekg ekg-core entropy esqueleto
88692− fast-logger file-embed foreign-store hjsmin hscolour http-api-data
88693− http-client http-client-tls http-conduit http-types iso8601-time
88694− microlens monad-logger monad-metrics mtl optparse-generic
88886+ connection containers data-default directory entropy esqueleto
88887+ fast-logger file-embed foreign-store hjsmin hscolour html-entities
88888+ http-api-data http-client http-client-tls http-conduit http-types
88889+ iso8601-time microlens monad-logger mtl optparse-generic
8869588890 parser-combinators persistent persistent-sqlite persistent-template
8869688891 pretty-show safe shakespeare template-haskell text time
8869788892 transformers unordered-containers vector wai wai-extra wai-logger
88698− wai-middleware-metrics warp yaml yesod yesod-auth yesod-core
88699− yesod-form yesod-static
88893+ warp yaml yesod yesod-auth yesod-core yesod-form yesod-newsfeed
88894+ yesod-static
8870088895 ];
8870188896 testHaskellDepends = [
88702− aeson attoparsec base bcrypt bytestring case-insensitive
88897+ aeson attoparsec base bcrypt blaze-html bytestring case-insensitive
8870388898 classy-prelude classy-prelude-conduit classy-prelude-yesod conduit
88704− containers data-default directory ekg ekg-core entropy esqueleto
88899+ connection containers data-default directory entropy esqueleto
8870588900 fast-logger file-embed foreign-store hjsmin hscolour hspec
88706− http-api-data http-client http-client-tls http-conduit http-types
88707− iso8601-time microlens monad-logger monad-metrics mtl
88901+ html-entities http-api-data http-client http-client-tls
88902+ http-conduit http-types iso8601-time microlens monad-logger mtl
8870888903 parser-combinators persistent persistent-sqlite persistent-template
8870988904 pretty-show safe shakespeare template-haskell text time
8871088905 transformers unordered-containers vector wai wai-extra wai-logger
88711− wai-middleware-metrics warp yaml yesod yesod-auth yesod-core
88712− yesod-form yesod-static yesod-test
88906+ warp yaml yesod yesod-auth yesod-core yesod-form yesod-newsfeed
88907+ yesod-static yesod-test
8871388908 ];
8871488909 description = "Espial is an open-source, web-based bookmarking server";
8871588910 license = lib.licenses.agpl3Only;
88716− hydraPlatforms = lib.platforms.none;
8871788911 }) {};
8871888912
8871988913 "esqueleto" = callPackage
@@ -88746,7 +88940,7 @@ self: {
8874688940 license = lib.licenses.bsd3;
8874788941 }) {};
8874888942
88749− "esqueleto_3_5_3_2" = callPackage
88943+ "esqueleto_3_5_4_0" = callPackage
8875088944 ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring
8875188945 , conduit, containers, exceptions, hspec, hspec-core, monad-logger
8875288946 , mtl, mysql, mysql-simple, persistent, persistent-mysql
@@ -88756,8 +88950,8 @@ self: {
8875688950 }:
8875788951 mkDerivation {
8875888952 pname = "esqueleto";
88759− version = "3.5.3.2";
88760− sha256 = "0sdp8zxa8jqql1dmhm0wf20hj5yd3853ha7f8wg24dvbjff8z1yj";
88953+ version = "3.5.4.0";
88954+ sha256 = "1c38kx04nkk68bj76mkbjbmw9fhb3ljn3j8mwsls6q7m4z49m6yy";
8876188955 libraryHaskellDepends = [
8876288956 aeson attoparsec base blaze-html bytestring conduit containers
8876388957 monad-logger persistent resourcet tagged text time transformers
@@ -92239,6 +92433,34 @@ self: {
9223992433 broken = true;
9224092434 }) {};
9224192435
92436+ "faktory_1_1_2_2" = callPackage
92437+ ({ mkDerivation, aeson, aeson-casing, aeson-qq, async, base
92438+ , bytestring, connection, cryptonite, errors, hspec, markdown-unlit
92439+ , megaparsec, memory, mtl, network, random, safe-exceptions
92440+ , scanner, semigroups, text, time, unix, unordered-containers
92441+ }:
92442+ mkDerivation {
92443+ pname = "faktory";
92444+ version = "1.1.2.2";
92445+ sha256 = "0vkjd20wpzb170lisk1sb4508h56mgjbk4f5qbi6k8vvbdipiaqy";
92446+ isLibrary = true;
92447+ isExecutable = true;
92448+ libraryHaskellDepends = [
92449+ aeson aeson-casing base bytestring connection cryptonite errors
92450+ megaparsec memory mtl network random safe-exceptions scanner
92451+ semigroups text time unix unordered-containers
92452+ ];
92453+ executableHaskellDepends = [ aeson base safe-exceptions ];
92454+ testHaskellDepends = [
92455+ aeson aeson-qq async base hspec markdown-unlit mtl time
92456+ ];
92457+ testToolDepends = [ markdown-unlit ];
92458+ description = "Faktory Worker for Haskell";
92459+ license = lib.licenses.mit;
92460+ hydraPlatforms = lib.platforms.none;
92461+ broken = true;
92462+ }) {};
92463+
9224292464 "fallible" = callPackage
9224392465 ({ mkDerivation, base, transformers }:
9224492466 mkDerivation {
@@ -92524,6 +92746,8 @@ self: {
9252492746 ];
9252592747 description = "Fast incremental vi and emacs tags";
9252692748 license = lib.licenses.bsd3;
92749+ hydraPlatforms = lib.platforms.none;
92750+ broken = true;
9252792751 }) {};
9252892752
9252992753 "fast-tagsoup" = callPackage
@@ -93640,6 +93864,31 @@ self: {
9364093864 hydraPlatforms = lib.platforms.none;
9364193865 }) {};
9364293866
93867+ "feedback" = callPackage
93868+ ({ mkDerivation, autodocodec, autodocodec-yaml, base, conduit
93869+ , containers, envparse, fsnotify, optparse-applicative, path
93870+ , path-io, pretty-show, safe-coloured-text
93871+ , safe-coloured-text-layout, safe-coloured-text-terminfo, text
93872+ , time, typed-process, unliftio, yaml
93873+ }:
93874+ mkDerivation {
93875+ pname = "feedback";
93876+ version = "0.0.0.0";
93877+ sha256 = "1y4p38cd0cqg4r43y2p0n2i99q83vnhm7gswx0j34p58isrbad4x";
93878+ isLibrary = true;
93879+ isExecutable = true;
93880+ libraryHaskellDepends = [
93881+ autodocodec autodocodec-yaml base conduit containers envparse
93882+ fsnotify optparse-applicative path path-io pretty-show
93883+ safe-coloured-text safe-coloured-text-layout
93884+ safe-coloured-text-terminfo text time typed-process unliftio yaml
93885+ ];
93886+ executableHaskellDepends = [ base ];
93887+ description = "Declarative feedback loop manager";
93888+ license = lib.licenses.gpl3Only;
93889+ hydraPlatforms = lib.platforms.none;
93890+ }) {};
93891+
9364393892 "fei-base" = callPackage
9364493893 ({ mkDerivation, attoparsec, base, c2hs, constraints, deepseq
9364593894 , haskell-src-exts, hslogger, lens, mxnet, optparse-applicative
@@ -98833,13 +99082,13 @@ self: {
9883399082 , persistent-postgresql, postgresql-simple, primitive, process
9883499083 , resource-pool, retry, rio, safe, semigroupoids, template-haskell
9883599084 , temporary, text, time, transformers, transformers-base, unliftio
98836− , unliftio-core, unordered-containers, vector, wai, wai-extra, yaml
98837− , yesod, yesod-core
99085+ , unordered-containers, vector, wai, wai-extra, yaml, yesod
99086+ , yesod-core
9883899087 }:
9883999088 mkDerivation {
9884099089 pname = "freckle-app";
98841− version = "1.0.2.9";
98842− sha256 = "000frzvydpmyn547za0zlf7w38avcgspvjpcakalsdv5vzj83kk5";
99090+ version = "1.0.2.10";
99091+ sha256 = "05y2b4lfc0wxygjrvjlw3nfl9s1x9km095k2vzj57mb58zkr3kyv";
9884399092 libraryHaskellDepends = [
9884499093 aeson ansi-terminal base bytestring case-insensitive conduit
9884599094 containers data-default datadog doctest ekg-core errors exceptions
@@ -98850,8 +99099,7 @@ self: {
9885099099 network-uri persistent persistent-postgresql postgresql-simple
9885199100 primitive process resource-pool retry rio safe semigroupoids
9885299101 template-haskell text time transformers transformers-base unliftio
98853− unliftio-core unordered-containers vector wai wai-extra yaml yesod
98854− yesod-core
99102+ unordered-containers vector wai wai-extra yaml yesod yesod-core
9885599103 ];
9885699104 testHaskellDepends = [
9885799105 aeson base bytestring directory hspec http-types lens lens-aeson
@@ -106535,12 +106783,12 @@ self: {
106535106783 license = lib.licenses.mit;
106536106784 }) {};
106537106785
106538− "ghcjs-base_0_2_0_3" = callPackage
106786+ "ghcjs-base_0_2_1_0" = callPackage
106539106787 ({ mkDerivation }:
106540106788 mkDerivation {
106541106789 pname = "ghcjs-base";
106542− version = "0.2.0.3";
106543− sha256 = "09sv5p57l8jczbycasbb06h4qsifi5fagxwsr665yil1gickfxyg";
106790+ version = "0.2.1.0";
106791+ sha256 = "05dw3kvrwgipxjg1i3gfirqz260azcmgj1rwp7m37a94q4550bcq";
106544106792 description = "base library for GHCJS";
106545106793 license = lib.licenses.mit;
106546106794 hydraPlatforms = lib.platforms.none;
@@ -115214,6 +115462,31 @@ self: {
115214115462 license = lib.licenses.mit;
115215115463 }) {};
115216115464
115465+ "graphula_2_0_1_1" = callPackage
115466+ ({ mkDerivation, base, containers, directory, generic-arbitrary
115467+ , generics-eot, hspec, HUnit, markdown-unlit, monad-logger, mtl
115468+ , persistent, persistent-sqlite, QuickCheck, random, resourcet
115469+ , semigroups, temporary, text, transformers, unliftio
115470+ , unliftio-core
115471+ }:
115472+ mkDerivation {
115473+ pname = "graphula";
115474+ version = "2.0.1.1";
115475+ sha256 = "0gn33jz9nb2pf1mkjzwnf04l0shnvj520qb0jmz6d87w79jiqdlj";
115476+ libraryHaskellDepends = [
115477+ base containers directory generics-eot HUnit mtl persistent
115478+ QuickCheck random semigroups temporary text unliftio unliftio-core
115479+ ];
115480+ testHaskellDepends = [
115481+ base generic-arbitrary hspec markdown-unlit monad-logger persistent
115482+ persistent-sqlite QuickCheck resourcet transformers unliftio-core
115483+ ];
115484+ testToolDepends = [ markdown-unlit ];
115485+ description = "A simple interface for generating persistent data and linking its dependencies";
115486+ license = lib.licenses.mit;
115487+ hydraPlatforms = lib.platforms.none;
115488+ }) {};
115489+
115217115490 "graphula-core" = callPackage
115218115491 ({ mkDerivation, aeson, base, bytestring, containers, directory
115219115492 , generics-eot, hspec, http-api-data, HUnit, markdown-unlit
@@ -115332,6 +115605,23 @@ self: {
115332115605 license = lib.licenses.mit;
115333115606 }) {};
115334115607
115608+ "gravatar_0_8_1" = callPackage
115609+ ({ mkDerivation, base, bytestring, data-default, doctest, Glob
115610+ , hspec, HTTP, pureMD5, text
115611+ }:
115612+ mkDerivation {
115613+ pname = "gravatar";
115614+ version = "0.8.1";
115615+ sha256 = "0ijcv15kihy6125fm2kyxi997fxii3hvr62lx25nri5aa0qy6vkw";
115616+ libraryHaskellDepends = [
115617+ base bytestring data-default HTTP pureMD5 text
115618+ ];
115619+ testHaskellDepends = [ base doctest Glob hspec ];
115620+ description = "Generate Gravatar image URLs";
115621+ license = lib.licenses.mit;
115622+ hydraPlatforms = lib.platforms.none;
115623+ }) {};
115624+
115335115625 "gray-code" = callPackage
115336115626 ({ mkDerivation, base, QuickCheck }:
115337115627 mkDerivation {
@@ -118872,8 +119162,8 @@ self: {
118872119162 }:
118873119163 mkDerivation {
118874119164 pname = "hadolint";
118875− version = "2.9.3";
118876− sha256 = "0kiy570s08qf9gqphbbv5kzhfkbc3m1jpzpszpb52rbmflmgwi7m";
119165+ version = "2.10.0";
119166+ sha256 = "19szxwz633n8zk0zm9hzw029npy9my84kdygxv9jbmy69ndyw9d6";
118877119167 isLibrary = true;
118878119168 isExecutable = true;
118879119169 libraryHaskellDepends = [
@@ -138819,8 +139109,8 @@ self: {
138819139109 pname = "hpc-lcov";
138820139110 version = "1.0.1";
138821139111 sha256 = "01ws5y2vavgm7151dcabw3jwny1prrnzn5b04q76m5gc6a36wivl";
138822− revision = "2";
138823− editedCabalFile = "1sbd4wk977hh7jvy2ingmavkqx7fzicfa70figipa7lzdq3lg0ls";
139112+ revision = "3";
139113+ editedCabalFile = "1nq636asnibbx6mrx18kr02pcg3jr2m28z40vk9iydmz6lr5msni";
138824139114 isLibrary = true;
138825139115 isExecutable = true;
138826139116 libraryHaskellDepends = [ base containers hpc ];
@@ -139370,8 +139660,8 @@ self: {
139370139660 }:
139371139661 mkDerivation {
139372139662 pname = "hquantlib";
139373− version = "0.0.5.0";
139374− sha256 = "1zi31y89kdbid3xjvpsd2iqwvn8a7d2i5518maigkmhp5v1lg0w6";
139663+ version = "0.0.5.1";
139664+ sha256 = "0fbmji48ry3adq9lfpxwfx2q064cbrav8wq2ykaqsszgq9yiysc8";
139375139665 isLibrary = true;
139376139666 isExecutable = true;
139377139667 libraryHaskellDepends = [
@@ -139395,8 +139685,8 @@ self: {
139395139685 ({ mkDerivation, base, time }:
139396139686 mkDerivation {
139397139687 pname = "hquantlib-time";
139398− version = "0.0.4.1";
139399− sha256 = "0g2j7m14ic40lhcnbvfjya3qh7ngx658qlmrr0dzr5r1ywcyv75c";
139688+ version = "0.0.5.1";
139689+ sha256 = "1jvcpcnss3hgnjp6isbpbmjml068gasrlj376sbv7diynh8a4rlf";
139400139690 libraryHaskellDepends = [ base time ];
139401139691 description = "HQuantLib Time is a business calendar functions extracted from HQuantLib";
139402139692 license = "LGPL";
@@ -143449,14 +143739,14 @@ self: {
143449143739 license = lib.licenses.mit;
143450143740 }) {};
143451143741
143452− "hspec_2_9_4" = callPackage
143742+ "hspec_2_9_5" = callPackage
143453143743 ({ mkDerivation, base, hspec-core, hspec-discover
143454143744 , hspec-expectations, QuickCheck
143455143745 }:
143456143746 mkDerivation {
143457143747 pname = "hspec";
143458− version = "2.9.4";
143459− sha256 = "1s009dn0hkqfn5c0y0xfja18wps430f2dkga9mfrrndhvlvx8fm3";
143748+ version = "2.9.5";
143749+ sha256 = "170fsms5gmp3yxcw3if35mpv6sq9mi6k259szspbh3qdp3d1z6mc";
143460143750 libraryHaskellDepends = [
143461143751 base hspec-core hspec-discover hspec-expectations QuickCheck
143462143752 ];
@@ -143548,7 +143838,7 @@ self: {
143548143838 license = lib.licenses.mit;
143549143839 }) {};
143550143840
143551− "hspec-core_2_9_4" = callPackage
143841+ "hspec-core_2_9_5" = callPackage
143552143842 ({ mkDerivation, ansi-terminal, array, base, base-orphans
143553143843 , call-stack, clock, deepseq, directory, filepath, ghc, ghc-boot-th
143554143844 , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
@@ -143557,8 +143847,8 @@ self: {
143557143847 }:
143558143848 mkDerivation {
143559143849 pname = "hspec-core";
143560− version = "2.9.4";
143561− sha256 = "0bkr2hywmlawyyrp27xgfd4a080bk1i5kj81hcxbg2w8y0i7r0w4";
143850+ version = "2.9.5";
143851+ sha256 = "0xyn90l7rar1av65bld7fs499mn1vpyga4vpz2ygi7lvc59lm0ay";
143562143852 libraryHaskellDepends = [
143563143853 ansi-terminal array base call-stack clock deepseq directory
143564143854 filepath ghc ghc-boot-th hspec-expectations HUnit QuickCheck
@@ -143616,14 +143906,14 @@ self: {
143616143906 maintainers = with lib.maintainers; [ maralorn ];
143617143907 }) {};
143618143908
143619− "hspec-discover_2_9_4" = callPackage
143909+ "hspec-discover_2_9_5" = callPackage
143620143910 ({ mkDerivation, base, directory, filepath, hspec-meta, mockery
143621143911 , QuickCheck
143622143912 }:
143623143913 mkDerivation {
143624143914 pname = "hspec-discover";
143625− version = "2.9.4";
143626− sha256 = "16y3z6f32bbnkxw142y90hs0512rh2mp9904ffahmag9m95qfbnv";
143915+ version = "2.9.5";
143916+ sha256 = "0sd2bkwdgnzkb4gjaqk9q21s0qnp0q3n19yf4phb4qvl878rvnpk";
143627143917 isLibrary = true;
143628143918 isExecutable = true;
143629143919 libraryHaskellDepends = [ base directory filepath ];
@@ -143666,6 +143956,24 @@ self: {
143666143956 license = lib.licenses.mit;
143667143957 }) {};
143668143958
143959+ "hspec-expectations-json_1_0_0_6" = callPackage
143960+ ({ mkDerivation, aeson, aeson-pretty, aeson-qq, base, Diff, hspec
143961+ , HUnit, scientific, text, unordered-containers, vector
143962+ }:
143963+ mkDerivation {
143964+ pname = "hspec-expectations-json";
143965+ version = "1.0.0.6";
143966+ sha256 = "1gb4i4vc6f59vp120asl6fr20n6d9xnibvnfxjd94knflidhq80n";
143967+ libraryHaskellDepends = [
143968+ aeson aeson-pretty base Diff HUnit scientific text
143969+ unordered-containers vector
143970+ ];
143971+ testHaskellDepends = [ aeson-qq base hspec ];
143972+ description = "Hspec expectations for JSON Values";
143973+ license = lib.licenses.mit;
143974+ hydraPlatforms = lib.platforms.none;
143975+ }) {};
143976+
143669143977 "hspec-expectations-lens" = callPackage
143670143978 ({ mkDerivation, base, hspec, hspec-expectations, HUnit, lens
143671143979 , silently
@@ -143866,22 +144174,22 @@ self: {
143866144174 broken = true;
143867144175 }) {};
143868144176
143869− "hspec-junit-formatter_1_1_0_1" = callPackage
144177+ "hspec-junit-formatter_1_1_0_2" = callPackage
143870144178 ({ mkDerivation, base, conduit, containers, directory, exceptions
143871144179 , filepath, hspec, hspec-core, iso8601-time, markdown-unlit
143872144180 , temporary, text, time, xml-conduit, xml-types
143873144181 }:
143874144182 mkDerivation {
143875144183 pname = "hspec-junit-formatter";
143876− version = "1.1.0.1";
143877− sha256 = "194r8bxfn525mn8vq4dcfkbsn668s11yz4mdqbfr5qy29i1bzm5p";
144184+ version = "1.1.0.2";
144185+ sha256 = "1gzgfisji7w4gsixlchlrg5ylkmdqq2mk5sc0jdwqxz865kjq01g";
143878144186 libraryHaskellDepends = [
143879144187 base conduit containers directory exceptions filepath hspec-core
143880144188 iso8601-time text time xml-conduit xml-types
143881144189 ];
143882144190 testHaskellDepends = [
143883− base containers filepath hspec hspec-core markdown-unlit temporary
143884− text xml-conduit
144191+ base containers filepath hspec markdown-unlit temporary text
144192+ xml-conduit
143885144193 ];
143886144194 testToolDepends = [ markdown-unlit ];
143887144195 description = "A JUnit XML runner/formatter for hspec";
@@ -148055,14 +148363,17 @@ self: {
148055148363 }) {};
148056148364
148057148365 "hw-aeson" = callPackage
148058− ({ mkDerivation, aeson, base, doctest, doctest-discover, hedgehog
148059− , hspec, hspec-discover, text
148366+ ({ mkDerivation, aeson, base, containers, doctest, doctest-discover
148367+ , hedgehog, hspec, hspec-discover, text, text-short
148368+ , unordered-containers
148060148369 }:
148061148370 mkDerivation {
148062148371 pname = "hw-aeson";
148063− version = "0.1.2.0";
148064− sha256 = "0a4x97laraxyyrpkklj4qxwgh7lmxxnzdg7y0ki9041ck8ymsmdr";
148065− libraryHaskellDepends = [ aeson base text ];
148372+ version = "0.1.5.0";
148373+ sha256 = "0dzwn1k467dij8ihqzxq6vhm5faqqjndvyw0ikwjhwh0lf1h38cz";
148374+ libraryHaskellDepends = [
148375+ aeson base containers text text-short unordered-containers
148376+ ];
148066148377 testHaskellDepends = [
148067148378 aeson base doctest doctest-discover hedgehog hspec
148068148379 ];
@@ -153701,6 +154012,7 @@ self: {
153701154012 ];
153702154013 description = "Write Haskell source files including C code inline. No FFI required.";
153703154014 license = lib.licenses.mit;
154015+ maintainers = with lib.maintainers; [ roberth ];
153704154016 }) {};
153705154017
153706154018 "inline-c-cpp" = callPackage
@@ -153721,6 +154033,7 @@ self: {
153721154033 ];
153722154034 description = "Lets you embed C++ code into Haskell";
153723154035 license = lib.licenses.mit;
154036+ maintainers = with lib.maintainers; [ roberth ];
153724154037 }) {};
153725154038
153726154039 "inline-c-win32" = callPackage
@@ -157370,13 +157683,13 @@ self: {
157370157683 ({ mkDerivation, alex, array, base, bytestring, containers
157371157684 , criterion, deepseq, directory, filepath, happy, microlens
157372157685 , microlens-mtl, mtl, optparse-applicative, prettyprinter
157373− , recursion, regex-rure, split, tasty, tasty-hunit, text
157686+ , recursion, regex-rure, silently, split, tasty, tasty-hunit, text
157374157687 , transformers, vector
157375157688 }:
157376157689 mkDerivation {
157377157690 pname = "jacinda";
157378− version = "0.3.1.0";
157379− sha256 = "1nn3c91fhq46ng2yh9425cpxlk5mksalx5wrv1d7z0xn5m1v1387";
157691+ version = "1.0.0.0";
157692+ sha256 = "1yskpr3mvfhzxcjf0f9sf3mhsg892vqkx5kd4vz4w6wk3vv1iz3i";
157380157693 isLibrary = false;
157381157694 isExecutable = true;
157382157695 enableSeparateDataOutput = true;
@@ -157390,7 +157703,9 @@ self: {
157390157703 base bytestring optparse-applicative
157391157704 ];
157392157705 testHaskellDepends = [ base bytestring tasty tasty-hunit ];
157393− benchmarkHaskellDepends = [ base criterion deepseq ];
157706+ benchmarkHaskellDepends = [
157707+ base bytestring criterion deepseq silently
157708+ ];
157394157709 doHaddock = false;
157395157710 description = "Functional, expression-oriented data processing language";
157396157711 license = lib.licenses.agpl3Only;
@@ -158642,8 +158957,8 @@ self: {
158642158957 }:
158643158958 mkDerivation {
158644158959 pname = "jsaddle";
158645− version = "0.9.8.1";
158646− sha256 = "19jszi6b2fhgz8cb0a4p6ixjg78c28cr78abwjcffbx173jp981h";
158960+ version = "0.9.8.2";
158961+ sha256 = "17xffxyl4h8fbb608gzhflli89qxhrzf38bp9l8n2w2bwix7w01i";
158647158962 libraryHaskellDepends = [
158648158963 aeson attoparsec base base-compat base64-bytestring bytestring
158649158964 containers deepseq exceptions filepath ghc-prim http-types lens
@@ -158660,8 +158975,8 @@ self: {
158660158975 }:
158661158976 mkDerivation {
158662158977 pname = "jsaddle-clib";
158663− version = "0.9.8.0";
158664− sha256 = "0axgfkxgvm4awvklss2pqa8a4112m3q7k38h71anxs6i199lgkyq";
158978+ version = "0.9.8.2";
158979+ sha256 = "0nbsjmn52dr0rfslz6c7f16z7brc76ljq78bkkbq3aj8ljadh0p6";
158665158980 libraryHaskellDepends = [
158666158981 aeson base base-compat bytestring data-default jsaddle text
158667158982 ];
@@ -158716,8 +159031,8 @@ self: {
158716159031 }:
158717159032 mkDerivation {
158718159033 pname = "jsaddle-warp";
158719− version = "0.9.8.0";
158720− sha256 = "06bf071xnfx7mjzf7jdyjspjw28s2z3br5gmx9vcs7paji20c8np";
159034+ version = "0.9.8.2";
159035+ sha256 = "12914i4l7hkwvwvzf25vr7zywc6xp9cq0mfzr57kzw6ga1y3gvxb";
158721159036 libraryHaskellDepends = [
158722159037 aeson base bytestring containers foreign-store http-types jsaddle
158723159038 stm text time transformers wai wai-websockets warp websockets
@@ -158743,8 +159058,8 @@ self: {
158743159058 }:
158744159059 mkDerivation {
158745159060 pname = "jsaddle-webkit2gtk";
158746− version = "0.9.8.1";
158747− sha256 = "1q4hyjlvw3m2139s1rp658hkqhnayk00nijdymjr8606d7cfyp7p";
159061+ version = "0.9.8.2";
159062+ sha256 = "0cqn013dzn5wwap74i5j9kd6maxsqxb84zys6p80kjl5vnk5pvxh";
158748159063 libraryHaskellDepends = [
158749159064 aeson base bytestring directory gi-gio gi-glib gi-gtk
158750159065 gi-javascriptcore gi-webkit2 haskell-gi-base haskell-gi-overloading
@@ -158780,8 +159095,8 @@ self: {
158780159095 ({ mkDerivation }:
158781159096 mkDerivation {
158782159097 pname = "jsaddle-wkwebview";
158783− version = "0.9.8.0";
158784− sha256 = "1cjncl2jqnx4j83pmcnnvcc0rswhwwb5grwh636b11yyp4vv58dw";
159098+ version = "0.9.8.2";
159099+ sha256 = "07qba7bnygnsy3yg4mk8bn8wfzca43cd7mzzjp5b4yracchvljqj";
158785159100 description = "Interface for JavaScript that works with GHCJS and GHC";
158786159101 license = lib.licenses.mit;
158787159102 hydraPlatforms = lib.platforms.none;
@@ -184127,15 +184442,15 @@ self: {
184127184442 }) {};
184128184443
184129184444 "monad-control-identity" = callPackage
184130− ({ mkDerivation, base, monad-control, transformers
184445+ ({ mkDerivation, base, monad-control, stm, transformers
184131184446 , transformers-base
184132184447 }:
184133184448 mkDerivation {
184134184449 pname = "monad-control-identity";
184135− version = "0.1.0.3";
184136− sha256 = "0nxsyhyvp04xr7js2z8mvmh2w2b2fwv5zzkbgjagm6l51pqpam6q";
184450+ version = "0.2.0.0";
184451+ sha256 = "1b636vakpqprwfb0cb7fpcsff8adq4frj4g98vv1yaxzi56rjbb1";
184137184452 libraryHaskellDepends = [
184138− base monad-control transformers transformers-base
184453+ base monad-control stm transformers transformers-base
184139184454 ];
184140184455 description = "Stronger classes than monad-control";
184141184456 license = lib.licenses.bsd3;
@@ -186489,8 +186804,8 @@ self: {
186489186804 }:
186490186805 mkDerivation {
186491186806 pname = "morpheus-graphql";
186492− version = "0.19.0";
186493− sha256 = "0yfqbpis3385hqm3xlyx0ks2jnrwvkx898g2m2rb3qskaqblfcj9";
186807+ version = "0.19.3";
186808+ sha256 = "0vg48x6sb5rg7mzx905qjv026yq4b76kxfyfpakiw3xybqpcdw0w";
186494186809 enableSeparateDataOutput = true;
186495186810 libraryHaskellDepends = [
186496186811 aeson base bytestring containers morpheus-graphql-app
@@ -186518,8 +186833,8 @@ self: {
186518186833 }:
186519186834 mkDerivation {
186520186835 pname = "morpheus-graphql-app";
186521− version = "0.19.0";
186522− sha256 = "0k7bl9gs8sdmfi5wdka5rjlp5vjn7py8n8a09rwws7kgqa3lvd0n";
186836+ version = "0.19.3";
186837+ sha256 = "0v00xp6hhaxbjp6kl124cj22p57hnqdkg8kksms9cp2h7f88vm3g";
186523186838 enableSeparateDataOutput = true;
186524186839 libraryHaskellDepends = [
186525186840 aeson base bytestring containers hashable megaparsec
@@ -186566,8 +186881,8 @@ self: {
186566186881 }:
186567186882 mkDerivation {
186568186883 pname = "morpheus-graphql-client";
186569− version = "0.19.0";
186570− sha256 = "00hgxi8c7alfpvhxwcb7gcxki14vaasmg1qycfnyj7s2715w6i4c";
186884+ version = "0.19.3";
186885+ sha256 = "1vfk1rlm2lkra5xfp9zh3f4q70xhb42v4zyfy1xk6x9k2k919pmg";
186571186886 enableSeparateDataOutput = true;
186572186887 libraryHaskellDepends = [
186573186888 aeson base bytestring morpheus-graphql-code-gen
@@ -186591,8 +186906,8 @@ self: {
186591186906 }:
186592186907 mkDerivation {
186593186908 pname = "morpheus-graphql-code-gen";
186594− version = "0.19.0";
186595− sha256 = "0avy4imllxlfyfw3fvwb0nzwd03pwdr0s67k3a2gymhqqz3zf37i";
186909+ version = "0.19.3";
186910+ sha256 = "0l9g0pnp3vvlpc5kdhgnvwqgid4d25wgr1mnlqc44s350si623qa";
186596186911 isLibrary = true;
186597186912 isExecutable = true;
186598186913 libraryHaskellDepends = [
@@ -186617,8 +186932,8 @@ self: {
186617186932 }:
186618186933 mkDerivation {
186619186934 pname = "morpheus-graphql-core";
186620− version = "0.19.0";
186621− sha256 = "03sr4yy0n5wr53xk1x623d1zj03v6zpsv7csafp5m40kijx0bl2q";
186935+ version = "0.19.3";
186936+ sha256 = "0frd7hvy94q4iknih4ph11kgklk5a70yryhmbfhjipv5141ysrns";
186622186937 enableSeparateDataOutput = true;
186623186938 libraryHaskellDepends = [
186624186939 aeson base bytestring containers hashable megaparsec mtl relude
@@ -186645,8 +186960,8 @@ self: {
186645186960 }:
186646186961 mkDerivation {
186647186962 pname = "morpheus-graphql-subscriptions";
186648− version = "0.19.0";
186649− sha256 = "179cwrmyj42hzd70qymrg7y5ll6ld5miadhlr0w0mqbfqnbj0lbv";
186963+ version = "0.19.3";
186964+ sha256 = "16flpss0b3qvdcwazsfisw8f0dw5z5p4rrxm7bpr2j54dlz98c7n";
186650186965 libraryHaskellDepends = [
186651186966 aeson base bytestring morpheus-graphql-app morpheus-graphql-core
186652186967 mtl relude text transformers unliftio-core unordered-containers
@@ -186678,14 +186993,14 @@ self: {
186678186993 license = lib.licenses.mit;
186679186994 }) {};
186680186995
186681− "morpheus-graphql-tests_0_19_0" = callPackage
186996+ "morpheus-graphql-tests_0_19_3" = callPackage
186682186997 ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty
186683186998 , tasty-hunit, text, unordered-containers
186684186999 }:
186685187000 mkDerivation {
186686187001 pname = "morpheus-graphql-tests";
186687− version = "0.19.0";
186688− sha256 = "1ymwgsdj4gl88rarqjgb0bx05gdanqxwghz8ws2hh5cvn9m9g4sb";
187002+ version = "0.19.3";
187003+ sha256 = "1w10l9l0774hjhq8h0bxlqmksd8g350ccdv5ja86j89lb4glnxla";
186689187004 libraryHaskellDepends = [
186690187005 aeson base bytestring directory relude tasty tasty-hunit text
186691187006 unordered-containers
@@ -190750,8 +191065,8 @@ self: {
190750191065 pname = "named";
190751191066 version = "0.3.0.1";
190752191067 sha256 = "0dnp4qbhn6ci2dlp230gpq8c5z26wb2liani1myc598g2b3c2qij";
190753− revision = "2";
190754− editedCabalFile = "03g6y6viakybmxpv9jnlbhq5yvchwdp2f1cvcdvlm10c5wkl71a1";
191068+ revision = "3";
191069+ editedCabalFile = "1rfli2b4asgasvgp7zjvydhxbyd0vx44vr7yck2760wz1crkzhhn";
190755191070 libraryHaskellDepends = [ base ];
190756191071 testHaskellDepends = [ base ];
190757191072 description = "Named parameters (keyword arguments) for Haskell";
@@ -192045,8 +192360,8 @@ self: {
192045192360 }:
192046192361 mkDerivation {
192047192362 pname = "net-mqtt-rpc";
192048− version = "0.2.0.0";
192049− sha256 = "1ql1hjvx41gspjbpr4rldrcn0xj483g2cphvxbb51m4x6n690lkn";
192363+ version = "0.2.0.1";
192364+ sha256 = "079029bfzp9srgxz8655kkiwvccc0164hg4dpmg7f22qis0dd8vp";
192050192365 isLibrary = true;
192051192366 isExecutable = true;
192052192367 libraryHaskellDepends = [
@@ -195660,6 +195975,19 @@ self: {
195660195975 license = lib.licenses.mit;
195661195976 }) {};
195662195977
195978+ "nonempty-zipper_1_0_0_4" = callPackage
195979+ ({ mkDerivation, base, comonad, deepseq, doctest, Glob, safe }:
195980+ mkDerivation {
195981+ pname = "nonempty-zipper";
195982+ version = "1.0.0.4";
195983+ sha256 = "19r7lxjwiscg5ml7l2bx6sizb2rlbxmv81shqwnf8yjbnmpibmkp";
195984+ libraryHaskellDepends = [ base comonad deepseq safe ];
195985+ testHaskellDepends = [ base comonad deepseq doctest Glob safe ];
195986+ description = "A non-empty comonadic list zipper";
195987+ license = lib.licenses.mit;
195988+ hydraPlatforms = lib.platforms.none;
195989+ }) {};
195990+
195663195991 "nonemptymap" = callPackage
195664195992 ({ mkDerivation, base, containers, semigroupoids }:
195665195993 mkDerivation {
@@ -202971,7 +203299,7 @@ self: {
202971203299 license = lib.licenses.gpl2Plus;
202972203300 }) {};
202973203301
202974− "pandoc-plot_1_5_0" = callPackage
203302+ "pandoc-plot_1_5_1" = callPackage
202975203303 ({ mkDerivation, aeson, base, bytestring, containers, criterion
202976203304 , data-default, directory, filepath, gitrev, hashable, hspec
202977203305 , hspec-expectations, lifted-async, lifted-base, mtl
@@ -202981,8 +203309,8 @@ self: {
202981203309 }:
202982203310 mkDerivation {
202983203311 pname = "pandoc-plot";
202984− version = "1.5.0";
202985− sha256 = "1naq6kfzxghxn6gzkp0697sdmfjdr2hk790d2rrwx72zv66g35vy";
203312+ version = "1.5.1";
203313+ sha256 = "0n0kazc43j4q39r9fp3400clbnpm0nsghv07pv16lwdjbl67sv91";
202986203314 isLibrary = true;
202987203315 isExecutable = true;
202988203316 libraryHaskellDepends = [
@@ -203103,6 +203431,30 @@ self: {
203103203431 license = lib.licenses.bsd3;
203104203432 }) {};
203105203433
203434+ "pandoc-types_1_22_2" = callPackage
203435+ ({ mkDerivation, aeson, base, bytestring, containers, criterion
203436+ , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb
203437+ , test-framework, test-framework-hunit, test-framework-quickcheck2
203438+ , text, transformers
203439+ }:
203440+ mkDerivation {
203441+ pname = "pandoc-types";
203442+ version = "1.22.2";
203443+ sha256 = "1m5lln26ixzswx6pb1n7iv99w8i9gii6lhg07whg56jl2gvfghk0";
203444+ libraryHaskellDepends = [
203445+ aeson base bytestring containers deepseq ghc-prim QuickCheck syb
203446+ text transformers
203447+ ];
203448+ testHaskellDepends = [
203449+ aeson base bytestring containers HUnit QuickCheck string-qq syb
203450+ test-framework test-framework-hunit test-framework-quickcheck2 text
203451+ ];
203452+ benchmarkHaskellDepends = [ base criterion text ];
203453+ description = "Types for representing a structured document";
203454+ license = lib.licenses.bsd3;
203455+ hydraPlatforms = lib.platforms.none;
203456+ }) {};
203457+
203106203458 "pandoc-unlit" = callPackage
203107203459 ({ mkDerivation, base, pandoc }:
203108203460 mkDerivation {
@@ -216355,6 +216707,8 @@ self: {
216355216707 benchmarkSystemDepends = [ leveldb snappy ];
216356216708 description = "A high performance in memory and LevelDB backend for powerqueue";
216357216709 license = lib.licenses.bsd3;
216710+ hydraPlatforms = lib.platforms.none;
216711+ broken = true;
216358216712 }) {inherit (pkgs) leveldb; inherit (pkgs) snappy;};
216359216713
216360216714 "powerqueue-sqs" = callPackage
@@ -220070,20 +220424,18 @@ self: {
220070220424 ({ mkDerivation, aeson, aeson-pretty, attoparsec, base
220071220425 , base64-bytestring, binary, bytestring, cereal, containers
220072220426 , contravariant, deepseq, doctest, filepath, foldl
220073− , generic-arbitrary, hashable, haskell-src
220427+ , generic-arbitrary, hashable, haskell-src, hedgehog
220074220428 , insert-ordered-containers, lens, mtl, neat-interpolation
220075220429 , optparse-applicative, optparse-generic, parsec, parsers, pretty
220076220430 , pretty-show, proto3-wire, QuickCheck, quickcheck-instances
220077220431 , range-set-list, safe, swagger2, system-filepath, tasty
220078− , tasty-hunit, tasty-quickcheck, text, time, transformers, turtle
220079− , vector
220432+ , tasty-hedgehog, tasty-hunit, tasty-quickcheck, text, time
220433+ , transformers, turtle, vector
220080220434 }:
220081220435 mkDerivation {
220082220436 pname = "proto3-suite";
220083− version = "0.4.2";
220084− sha256 = "015cg6brf6v0h2h2d36hqqr9i69vr30bhc35av55v0d65ya0sczz";
220085− revision = "1";
220086− editedCabalFile = "1s9mr6y31kbm0f316i7q0w4qgmi0mas23dhbam6i9pshfa0bav0x";
220437+ version = "0.5.0";
220438+ sha256 = "09y09y321jflxlrx13b9fm4v3f3k4j475wpp0bilmc4ygq9bxjcm";
220087220439 isLibrary = true;
220088220440 isExecutable = true;
220089220441 enableSeparateDataOutput = true;
@@ -220101,11 +220453,11 @@ self: {
220101220453 ];
220102220454 testHaskellDepends = [
220103220455 aeson attoparsec base base64-bytestring bytestring cereal
220104− containers deepseq doctest generic-arbitrary mtl pretty-show
220105− proto3-wire QuickCheck swagger2 tasty tasty-hunit tasty-quickcheck
220106− text transformers turtle vector
220456+ containers deepseq doctest generic-arbitrary hedgehog mtl
220457+ pretty-show proto3-wire QuickCheck swagger2 tasty tasty-hedgehog
220458+ tasty-hunit tasty-quickcheck text transformers turtle vector
220107220459 ];
220108− description = "A low level library for writing out data in the Protocol Buffers wire format";
220460+ description = "A higher-level API to the proto3-wire library";
220109220461 license = lib.licenses.asl20;
220110220462 hydraPlatforms = lib.platforms.none;
220111220463 }) {};
@@ -220432,8 +220784,8 @@ self: {
220432220784 }:
220433220785 mkDerivation {
220434220786 pname = "provenience";
220435− version = "0.1.2.2";
220436− sha256 = "1glilqib6bs1kbb0yyrzqxbsijrcrdm9q3cgmymgacc7kllc616n";
220787+ version = "0.1.2.3";
220788+ sha256 = "1pv1xdzxsdgahv1i7nxdm0di7hs36zr57rpkny666myracdh1wvh";
220437220789 isLibrary = true;
220438220790 isExecutable = true;
220439220791 libraryHaskellDepends = [
@@ -221443,8 +221795,8 @@ self: {
221443221795 }:
221444221796 mkDerivation {
221445221797 pname = "purescript";
221446− version = "0.14.7";
221447− sha256 = "0a8ia3qk6x6c42kkp00bdsnrpsrypy6i0bpavm844b0ny8dalqlr";
221798+ version = "0.14.9";
221799+ sha256 = "13canh915v668ii58y880b6zgzga3qmxxiblljs9qsdpwx1q7yzd";
221448221800 isLibrary = true;
221449221801 isExecutable = true;
221450221802 libraryHaskellDepends = [
@@ -253170,6 +253522,8 @@ self: {
253170253522 ];
253171253523 description = "A small websocket backend provider";
253172253524 license = lib.licenses.mit;
253525+ hydraPlatforms = lib.platforms.none;
253526+ broken = true;
253173253527 }) {};
253174253528
253175253529 "socks" = callPackage
@@ -260426,8 +260780,8 @@ self: {
260426260780 pname = "string-interpolate";
260427260781 version = "0.3.1.1";
260428260782 sha256 = "0hhzvrs9msyqsxwsqqm55lyxf85vhg4vcsszl735zsbs7431av69";
260429− revision = "2";
260430− editedCabalFile = "1blxy1ld69i8bg2340j0dcrcbdrqqnx5q8v47jda6183jfzwrxr6";
260783+ revision = "3";
260784+ editedCabalFile = "0kpk5mwmi7qzvx0hkiq6pwfyid99ic95zmxc36xxfpw4qxfc7024";
260431260785 libraryHaskellDepends = [
260432260786 base bytestring haskell-src-exts haskell-src-meta split
260433260787 template-haskell text text-conversions utf8-string
@@ -261325,8 +261679,8 @@ self: {
261325261679 }:
261326261680 mkDerivation {
261327261681 pname = "stylish-haskell";
261328− version = "0.14.0.1";
261329− sha256 = "109d7xf0k86c6hgdc0lgn9fvlqg4gag9nrj52z9ajw7s4qi3y3f1";
261682+ version = "0.14.1.0";
261683+ sha256 = "1chgkxqbnrgq7w9zzx118igp08h9vfgp150akazmgimy378cadlk";
261330261684 isLibrary = true;
261331261685 isExecutable = true;
261332261686 libraryHaskellDepends = [
@@ -263329,14 +263683,14 @@ self: {
263329263683 }:
263330263684 mkDerivation {
263331263685 pname = "sydtest-servant";
263332− version = "0.2.0.0";
263333− sha256 = "063bjik3yx7wbawdw1x4yw8ba8k83bq2xysczkl3mxqhj4c0ngx9";
263686+ version = "0.2.0.1";
263687+ sha256 = "1yclwmcqp6wkcd980ha7a93dz99zc55mcw2z5fwhk3gfwdpdfyfj";
263334263688 libraryHaskellDepends = [
263335263689 base http-client servant servant-client servant-server sydtest
263336263690 sydtest-wai
263337263691 ];
263338263692 testHaskellDepends = [
263339− base servant servant-client servant-server stm sydtest
263693+ base servant servant-client servant-server stm sydtest sydtest-wai
263340263694 ];
263341263695 testToolDepends = [ sydtest-discover ];
263342263696 description = "A servant companion library for sydtest";
@@ -267811,6 +268165,32 @@ self: {
267811268165 license = lib.licenses.bsd3;
267812268166 }) {};
267813268167
268168+ "telegram-bot-simple_0_4_5" = callPackage
268169+ ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cron
268170+ , filepath, hashable, http-api-data, http-client, http-client-tls
268171+ , monad-control, mtl, pretty-show, profunctors, servant
268172+ , servant-client, servant-multipart-api, servant-multipart-client
268173+ , split, stm, template-haskell, text, time, transformers
268174+ , unordered-containers
268175+ }:
268176+ mkDerivation {
268177+ pname = "telegram-bot-simple";
268178+ version = "0.4.5";
268179+ sha256 = "0c2j0dmx6j15c8csmv64zc3m7qnbvnf5aqan7qjc8d5yfzbxr4nr";
268180+ isLibrary = true;
268181+ isExecutable = true;
268182+ libraryHaskellDepends = [
268183+ aeson aeson-pretty base bytestring cron filepath hashable
268184+ http-api-data http-client http-client-tls monad-control mtl
268185+ pretty-show profunctors servant servant-client
268186+ servant-multipart-api servant-multipart-client split stm
268187+ template-haskell text time transformers unordered-containers
268188+ ];
268189+ description = "Easy to use library for building Telegram bots";
268190+ license = lib.licenses.bsd3;
268191+ hydraPlatforms = lib.platforms.none;
268192+ }) {};
268193+
267814268194 "telegram-raw-api" = callPackage
267815268195 ({ mkDerivation, aeson, base, bytestring, deriving-aeson
267816268196 , generic-lens, hashable, http-client, http-client-tls, http-media
@@ -268751,12 +269131,8 @@ self: {
268751269131 ({ mkDerivation, base, reactive-banana, termbox }:
268752269132 mkDerivation {
268753269133 pname = "termbox-banana";
268754− version = "0.3.0";
268755− sha256 = "07nn1jff33zb80vhzkw48fik5d5w7j7q982ihpsbb6gbqp5azx5s";
268756− revision = "1";
268757− editedCabalFile = "0k62lbwigk97shxlx5c34d2k81ndims9nc36rlcv34s0iig0lh7d";
268758− isLibrary = true;
268759− isExecutable = true;
269134+ version = "0.3.1";
269135+ sha256 = "0vni6wpdmqmbm7ypckr17qbjwilwilj3bibbmn6lv096n1wn751h";
268760269136 libraryHaskellDepends = [ base reactive-banana termbox ];
268761269137 description = "reactive-banana + termbox";
268762269138 license = lib.licenses.bsd3;
@@ -269834,6 +270210,29 @@ self: {
269834270210 license = lib.licenses.gpl2Only;
269835270211 }) {};
269836270212
270213+ "texmath_0_12_5" = callPackage
270214+ ({ mkDerivation, base, bytestring, containers, directory, filepath
270215+ , mtl, pandoc-types, parsec, pretty-show, split, syb, tagged, tasty
270216+ , tasty-golden, text, xml
270217+ }:
270218+ mkDerivation {
270219+ pname = "texmath";
270220+ version = "0.12.5";
270221+ sha256 = "16i40va03v04222wn92fz62jri3094mfim6kdqk29335gamn0yk9";
270222+ isLibrary = true;
270223+ isExecutable = true;
270224+ libraryHaskellDepends = [
270225+ base containers mtl pandoc-types parsec split syb text xml
270226+ ];
270227+ testHaskellDepends = [
270228+ base bytestring directory filepath pretty-show tagged tasty
270229+ tasty-golden text xml
270230+ ];
270231+ description = "Conversion between math formats";
270232+ license = lib.licenses.gpl2Only;
270233+ hydraPlatforms = lib.platforms.none;
270234+ }) {};
270235+
269837270236 "texrunner" = callPackage
269838270237 ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
269839270238 , HUnit, io-streams, lens, mtl, process, semigroups, temporary
@@ -271753,15 +272152,13 @@ self: {
271753272152 }) {};
271754272153
271755272154 "theatre" = callPackage
271756− ({ mkDerivation, base, contravariant, semigroups, slave-thread
271757− , unagi-chan
271758− }:
272155+ ({ mkDerivation, base, contravariant, slave-thread, unagi-chan }:
271759272156 mkDerivation {
271760272157 pname = "theatre";
271761− version = "1.0.0.1";
271762− sha256 = "0vcli8i0vrxv8fzjdyp684fvp7640xmwc3yawz12mfvxcpgrs2xq";
272158+ version = "1.0.0.2";
272159+ sha256 = "1iwl4wswhav9d5vnfgwx9w9sms785jwxxc0vx7p5x2kb9hf3d8ac";
271763272160 libraryHaskellDepends = [
271764− base contravariant semigroups slave-thread unagi-chan
272161+ base contravariant slave-thread unagi-chan
271765272162 ];
271766272163 description = "Minimalistic actor library";
271767272164 license = lib.licenses.mit;
@@ -277583,6 +277980,8 @@ self: {
277583277980 ];
277584277981 description = "A very simple triple store";
277585277982 license = lib.licenses.mit;
277983+ hydraPlatforms = lib.platforms.none;
277984+ broken = true;
277586277985 }) {};
277587277986
277588277987 "triplesec" = callPackage
@@ -300938,6 +301337,30 @@ self: {
300938301337 license = lib.licenses.bsd3;
300939301338 }) {};
300940301339
301340+ "yesod-paginator_1_1_2_1" = callPackage
301341+ ({ mkDerivation, base, blaze-markup, doctest, hspec, path-pieces
301342+ , persistent, QuickCheck, quickcheck-classes, safe, text
301343+ , transformers, uri-encode, yesod-core, yesod-test
301344+ }:
301345+ mkDerivation {
301346+ pname = "yesod-paginator";
301347+ version = "1.1.2.1";
301348+ sha256 = "0d27jh5qizi9ppf7lvvpmmlih80hhgl5znjbknl12r95pkcjjy2r";
301349+ isLibrary = true;
301350+ isExecutable = true;
301351+ libraryHaskellDepends = [
301352+ base blaze-markup path-pieces persistent safe text transformers
301353+ uri-encode yesod-core
301354+ ];
301355+ testHaskellDepends = [
301356+ base doctest hspec QuickCheck quickcheck-classes yesod-core
301357+ yesod-test
301358+ ];
301359+ description = "A pagination approach for yesod";
301360+ license = lib.licenses.mit;
301361+ hydraPlatforms = lib.platforms.none;
301362+ }) {};
301363+
300941301364 "yesod-paypal-rest" = callPackage
300942301365 ({ mkDerivation, base, paypal-rest-client, time, yesod-core }:
300943301366 mkDerivation {
@@ -301267,6 +301690,29 @@ self: {
301267301690 license = lib.licenses.mit;
301268301691 }) {};
301269301692
301693+ "yesod-routes-flow_3_0_0_2" = callPackage
301694+ ({ mkDerivation, attoparsec, base, classy-prelude, containers
301695+ , hspec, hspec-expectations, semigroups, shakespeare, system-fileio
301696+ , system-filepath, text, yesod-core
301697+ }:
301698+ mkDerivation {
301699+ pname = "yesod-routes-flow";
301700+ version = "3.0.0.2";
301701+ sha256 = "1gw6a5089j0a1c0aivlznsqld1r8wc6babjcc7c7vzy7wpnc87c9";
301702+ libraryHaskellDepends = [
301703+ attoparsec base classy-prelude containers system-fileio
301704+ system-filepath text yesod-core
301705+ ];
301706+ testHaskellDepends = [
301707+ attoparsec base classy-prelude containers hspec hspec-expectations
301708+ semigroups shakespeare system-fileio system-filepath text
301709+ yesod-core
301710+ ];
301711+ description = "Generate Flow routes for Yesod";
301712+ license = lib.licenses.mit;
301713+ hydraPlatforms = lib.platforms.none;
301714+ }) {};
301715+
301270301716 "yesod-routes-typescript" = callPackage
301271301717 ({ mkDerivation, attoparsec, base, classy-prelude, system-fileio
301272301718 , text, yesod-core, yesod-routes
@@ -304166,12 +304612,12 @@ self: {
304166304612 }:
304167304613 mkDerivation {
304168304614 pname = "zuul";
304169− version = "0.1.0.0";
304170− sha256 = "1agacvixl6s3np8jizmy9vbpzhbb0am9hs8qlc5sqvbg98qr8x1v";
304615+ version = "0.1.1.0";
304616+ sha256 = "0pwiy690z32c9b5x2x1pmcczby7xwby6z8jsgl25zkrb07yagxz4";
304171304617 isLibrary = true;
304172304618 isExecutable = true;
304173304619 libraryHaskellDepends = [
304174− aeson base http-client http-client-tls text
304620+ aeson base containers http-client http-client-tls text
304175304621 ];
304176304622 executableHaskellDepends = [
304177304623 aeson aeson-pretty base containers directory filepath
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/haskell-modules/with-packages-wrapper.nix+4−4
@@ -51,7 +51,7 @@ let
5151 ghcCommand = "${ghc.targetPrefix}${ghcCommand'}";
5252 ghcCommandCaps= lib.toUpper ghcCommand';
5353 libDir = if isHaLVM then "$out/lib/HaLVM-${ghc.version}"
54− else "$out/lib/${ghcCommand}-${ghc.version}";
54+ else "$out/lib/${ghc.targetPrefix}${ghc.haskellCompilerName}";
5555 docDir = "$out/share/doc/ghc/html";
5656 packageCfgDir = "${libDir}/package.conf.d";
5757 paths = lib.filter (x: x ? isHaskellLibrary) (lib.closePropagation packages);
@@ -121,7 +121,7 @@ symlinkJoin {
121121
122122 '' + (lib.optionalString (stdenv.targetPlatform.isDarwin && !isGhcjs && !stdenv.targetPlatform.isiOS) ''
123123 # Work around a linker limit in macOS Sierra (see generic-builder.nix):
124− local packageConfDir="$out/lib/${ghc.name}/package.conf.d";
124+ local packageConfDir="${packageCfgDir}";
125125 local dynamicLinksDir="$out/lib/links"
126126 mkdir -p $dynamicLinksDir
127127 # Clean up the old links that may have been (transitively) included by
@@ -148,8 +148,8 @@ symlinkJoin {
148148 # to another nix derivation, so they are not writable. Removing
149149 # them allow the correct behavior of ghc-pkg recache
150150 # See: https://github.com/NixOS/nixpkgs/issues/79441
151− rm $out/lib/${ghc.name}/package.conf.d/package.cache.lock
152− rm $out/lib/${ghc.name}/package.conf.d/package.cache
151+ rm ${packageCfgDir}/package.cache.lock
152+ rm ${packageCfgDir}/package.cache
153153
154154 $out/bin/${ghcCommand}-pkg recache
155155 ''}
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 {
99
1010 subPackages = [ "cmd/hasura" ];
1111
12− vendorSha256 = "0c0zn3a3bq3g13zj1b7hz1gfd9mcc5wlch80vjgp31vgm23vvd8d";
12+ vendorSha256 = "0rjh4rs92jj56il3hg8msjz0w0iv25lydnh9v1kxmvdzy1x75b2b";
1313
1414 doCheck = false;
1515
pkgs/top-level/all-packages.nix+1−1
@@ -21393,7 +21393,7 @@ with pkgs;
2139321393
2139421394 hashi-ui = callPackage ../servers/hashi-ui {};
2139521395
21396− hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskellPackages.graphql-engine;
21396+ hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc8107.graphql-engine;
2139721397
2139821398 hasura-cli = callPackage ../servers/hasura/cli.nix { };
2139921399