From 05bf5320827b3105abfc450da60228ca01f90c2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Aug 2020 21:05:07 +0200 Subject: pandoc: update to version 2.10.1 Stackage wants us to stay at 2.9.x, but that version is really quite old now and updating the new version actually simplifies our code because a couple of overrides are no longer necessary. --- .../haskell-modules/configuration-common.nix | 39 +++++----------------- .../haskell-modules/configuration-ghc-8.10.x.nix | 6 ---- 2 files changed, 9 insertions(+), 36 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 676af26adaba9..b63b2fa00f52a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1017,11 +1017,6 @@ self: super: { })]; }); - # 2020-06-05: HACK: In Nixpkgs currently this is - # old pandoc version 2.7.4 to current 2.9.2.1, - # test suite failures: https://github.com/jgm/pandoc/issues/5582 - pandoc = dontCheck super.pandoc; - # Fix build with attr-2.4.48 (see #53716) xattr = appendPatch super.xattr ./patches/xattr-fix-build.patch; @@ -1385,38 +1380,14 @@ self: super: { # https://github.com/jgm/commonmark-hs/issues/55 commonmark-extensions = dontCheck super.commonmark-extensions; - # The overrides in the following lines all have the following causes: - # * neuron needs commonmark-pandoc - # * which needs a newer pandoc-types (>= 1.21) - # * which means we need a newer pandoc (>= 2.10) - # * which needs a newer hslua (1.1.2) and a newer jira-wiki-markup (1.3.2) - # Then we need to apply those overrides to all transitive dependencies - # All of this will be obsolete, when pandoc 2.10 hits stack lts. - commonmark-pandoc = super.commonmark-pandoc.override { - pandoc-types = self.pandoc-types_1_21; - }; - reflex-dom-pandoc = super.reflex-dom-pandoc.override { - pandoc-types = self.pandoc-types_1_21; - }; - pandoc_2_10_1 = super.pandoc_2_10_1.overrideScope (self: super: { - pandoc-types = self.pandoc-types_1_21; - hslua = self.hslua_1_1_2; - jira-wiki-markup = self.jira-wiki-markup_1_3_2; - }); - # Apply version-bump patch that is not contained in released version yet. # Upstream PR: https://github.com/srid/neuron/pull/304 - neuron = (appendPatch super.neuron (pkgs.fetchpatch { + neuron = appendPatch super.neuron (pkgs.fetchpatch { url= "https://github.com/srid/neuron/commit/9ddcb7e9d63b8266d1372ef7c14c13b6b5277990.patch"; sha256 = "01f9v3jnl05fnpd624wv3a0j5prcbnf62ysa16fbc0vabw19zv1b"; excludes = [ "commonmark-hs/github.json" ]; stripLen = 2; extraPrefix = ""; - })) - # See comment about overrides above commonmark-pandoc - .overrideScope (self: super: { - pandoc = self.pandoc_2_10_1; - pandoc-types = self.pandoc-types_1_21; }); # Testsuite trying to run `which haskeline-examples-Test` @@ -1457,6 +1428,14 @@ self: super: { # resolving https://github.com/NixOS/nixpkgs/issues/81915. cryptonite = self.cryptonite_0_27; + # We want the latest version of Pandoc. + hslua = self.hslua_1_1_2; + jira-wiki-markup = self.jira-wiki-markup_1_3_2; + pandoc = self.pandoc_2_10_1; + pandoc-citeproc = self.pandoc-citeproc_0_17_0_2; + pandoc-plot = self.pandoc-plot_0_9_2_0; + pandoc-types = self.pandoc-types_1_21; + # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 5fcff7d9df9d9..b153d239cb76f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -119,10 +119,4 @@ self: super: { executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; })); - # We want the latest version of Pandoc. - pandoc = self.pandoc_2_10_1; - pandoc-citeproc = self.pandoc-citeproc_0_17_0_2; - pandoc-plot = self.pandoc-plot_0_9_2_0; - pandoc-types = self.pandoc-types_1_21; - } -- cgit 1.4.1 From 90adc4b99005afc0f236fcf3e85713e70891b067 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 28 Aug 2020 21:31:20 +0200 Subject: haskell-rfc5051: update to latest version to fix pandoc-citeproc --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b63b2fa00f52a..7bd25db08a32f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1435,6 +1435,7 @@ self: super: { pandoc-citeproc = self.pandoc-citeproc_0_17_0_2; pandoc-plot = self.pandoc-plot_0_9_2_0; pandoc-types = self.pandoc-types_1_21; + rfc5051 = self.rfc5051_0_2; # INSERT NEW OVERRIDES ABOVE THIS LINE -- cgit 1.4.1 From 0efaa948e7c1a5e8dce7558e47602abd999fb9c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 29 Aug 2020 02:30:26 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/ba17676480693ee7354ff25897f8cf1aefd28571. --- .../haskell-modules/hackage-packages.nix | 29 ++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 36c45377d9785..b18db5a7ba5b9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -155666,8 +155666,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "2.0.0"; - sha256 = "0dfs9nq3vcf8w2k1x51pixb4wb47rg9nzyjgfpzx6vip296ivyf7"; + version = "2.0.1"; + sha256 = "19jp9809jrh3swvsji5zgbqg4qg5gayv6bj0svq00wyzaisns3dd"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -219963,6 +219963,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "safe-json_1_1_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, dlist + , generic-arbitrary, hashable, quickcheck-instances, scientific + , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time + , unordered-containers, uuid, uuid-types, vector + }: + mkDerivation { + pname = "safe-json"; + version = "1.1.1"; + sha256 = "1307fm7kmls0sd2gb5zcl75rcxxy550ksaf145s54c06qjcihhjg"; + libraryHaskellDepends = [ + aeson base bytestring containers dlist hashable scientific tasty + tasty-hunit tasty-quickcheck text time unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + aeson base bytestring containers dlist generic-arbitrary hashable + quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck + temporary text time unordered-containers uuid uuid-types vector + ]; + description = "Automatic JSON format versioning"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe-lazy-io" = callPackage ({ mkDerivation, base, extensible-exceptions, parallel, strict-io }: -- cgit 1.4.1 From 4eb6f6b18f6811fb7de9c795d86c1ca01f3ada8f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 30 Aug 2020 02:30:28 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/f23325d9cd92e534218a5281caacb8f7cbcccd33. --- .../haskell-modules/hackage-packages.nix | 169 +++++++++++++++++---- 1 file changed, 140 insertions(+), 29 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b18db5a7ba5b9..5babf37c4bd18 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -12770,8 +12770,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "LiterateMarkdown"; - version = "0.1.0.0"; - sha256 = "0v9j7kqjvkrafxl4ahfqj1xvigim9vnd3kflgqagzccrgx9kz5gv"; + version = "0.1.0.1"; + sha256 = "0rgjf6blrg8rq75872bpwp6cn3bg89718cy6ik2m22881zfvr2m7"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -96806,12 +96806,12 @@ self: { }) {}; "generic-match" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, generics-sop }: mkDerivation { pname = "generic-match"; - version = "0.2.0.2"; - sha256 = "16r43gzl3a8ycxbhggqk09mrm63r9db85nk1j2x4j4lzcwap7bid"; - libraryHaskellDepends = [ base ]; + version = "0.3.0.0"; + sha256 = "1h27gd7f0px3xgan9liqwav8xhl0smn6nhdmi7ggd18mjafa1ngv"; + libraryHaskellDepends = [ base generics-sop ]; description = "First class pattern matching"; license = stdenv.lib.licenses.mit; }) {}; @@ -108134,9 +108134,8 @@ self: { }: mkDerivation { pname = "graphql"; - version = "0.9.0.0"; - sha256 = "1lyzrnbf1w3j60wwi8cwbh1hxzvsw8vn9aymy1qzxgjgmi2wx94g"; - enableSeparateDataOutput = true; + version = "0.10.0.0"; + sha256 = "0j0l8jmfnn3aw9vmk5z571ly9vk711hsz7cdklc243539vfnsywn"; libraryHaskellDepends = [ aeson base conduit containers exceptions hspec-expectations megaparsec parser-combinators scientific text transformers @@ -126754,23 +126753,23 @@ self: { }) {}; "hledger-flow" = callPackage - ({ mkDerivation, base, containers, foldl, HUnit - , optparse-applicative, stm, text, time, turtle + ({ mkDerivation, base, containers, exceptions, foldl, HUnit + , optparse-applicative, path, path-io, stm, text, time, turtle }: mkDerivation { pname = "hledger-flow"; - version = "0.13.2.0"; - sha256 = "1zajlqbayr6vm45y3901xwgg6acjn8fwx73mm9bnbsbxfzxn4g7d"; + version = "0.14.0.0"; + sha256 = "0p8b04kkby1w13zhlrvkpivd17myjdri8c4mwm4l89khkakj94ma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers foldl stm text time turtle + base containers exceptions foldl path path-io stm text time turtle ]; executableHaskellDepends = [ - base optparse-applicative text turtle + base optparse-applicative path text turtle ]; testHaskellDepends = [ - base containers foldl HUnit stm text turtle + base containers foldl HUnit path path-io stm text turtle ]; description = "An hledger workflow focusing on automated statement import and classification"; license = stdenv.lib.licenses.gpl3; @@ -137174,15 +137173,15 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "http-link-header_1_1_1" = callPackage + "http-link-header_1_2_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, criterion, directory , errors, hspec, hspec-attoparsec, http-api-data, network-uri , QuickCheck, text, transformers }: mkDerivation { pname = "http-link-header"; - version = "1.1.1"; - sha256 = "0bgffcmdswmpw3gl2yricz56y0cxb4x8l0j0qs60c6h16rcp5xwh"; + version = "1.2.0"; + sha256 = "1y0vr8fi8pap7ixbafp2lxvdk9hh56h370jw7qd11gm2032nnvg9"; libraryHaskellDepends = [ attoparsec base bytestring errors http-api-data network-uri text ]; @@ -157891,8 +157890,8 @@ self: { }: mkDerivation { pname = "libfuse3"; - version = "0.1.0.0"; - sha256 = "0qwlaqcpmi7dfsjk219z0hrqmayg46qx1cwj1vcz1nfv8jlm8yif"; + version = "0.1.1.0"; + sha256 = "0jnh6by1k42h8kl78anh8lqwhymdz2xgynm82vidsd7jjzanmf3j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166394,6 +166393,30 @@ self: { broken = true; }) {}; + "massiv_0_5_4_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , doctest, exceptions, mersenne-random-pure64, primitive + , QuickCheck, random, scheduler, splitmix, template-haskell + , unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "0.5.4.0"; + sha256 = "0dmm6x5izmjl1l803fvmxzqrh0jpg56z2aid228a4c44n620dzln"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions primitive + scheduler unliftio-core vector + ]; + testHaskellDepends = [ + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color , data-default-class, deepseq, doctest, exceptions, filepath, hspec @@ -166489,6 +166512,30 @@ self: { broken = true; }) {}; + "massiv-test_0_1_4" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , data-default-class, deepseq, exceptions, genvalidity-hspec, hspec + , massiv, mwc-random, primitive, QuickCheck, scheduler, unliftio + , vector + }: + mkDerivation { + pname = "massiv-test"; + version = "0.1.4"; + sha256 = "1qhvph2s6bkw3zb43arq1zvrfyr09phqjwxhzsqxi2x2fcrdyvyn"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions hspec massiv + primitive QuickCheck scheduler unliftio vector + ]; + testHaskellDepends = [ + base bytestring containers data-default deepseq genvalidity-hspec + hspec massiv mwc-random primitive QuickCheck scheduler vector + ]; + description = "Library that contains generators, properties and tests for Massiv Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "master-plan" = callPackage ({ mkDerivation, base, diagrams, diagrams-lib, diagrams-rasterific , hspec, megaparsec, mtl, optparse-applicative, QuickCheck @@ -198974,6 +199021,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polysemy-test" = callPackage + ({ mkDerivation, base-noprelude, containers, either, hedgehog, path + , path-io, polysemy, polysemy-plugin, relude, string-interpolate + , tasty, tasty-hedgehog, text + }: + mkDerivation { + pname = "polysemy-test"; + version = "0.2.0.0"; + sha256 = "10kakaipasw1gbipjl4x23cma9f6iv3ma547a26b70ysap6c41ys"; + libraryHaskellDepends = [ + base-noprelude containers either hedgehog path path-io polysemy + polysemy-plugin relude string-interpolate tasty tasty-hedgehog text + ]; + testHaskellDepends = [ + base-noprelude containers either hedgehog path path-io polysemy + polysemy-plugin relude string-interpolate tasty tasty-hedgehog text + ]; + description = "Polysemy effects for testing"; + license = "BSD-2-Clause-Patent"; + }) {}; + "polysemy-webserver" = callPackage ({ mkDerivation, base, bytestring, hspec, http-conduit, http-types , polysemy, polysemy-plugin, text, wai, wai-websockets, warp @@ -202656,6 +202724,36 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "primal" = callPackage + ({ mkDerivation, base, deepseq, doctest, template-haskell + , transformers + }: + mkDerivation { + pname = "primal"; + version = "0.1.0.0"; + sha256 = "0y60m1249n5mzglmbkhv98lzzmmkxs2k0mn882kqs89h04hfx546"; + libraryHaskellDepends = [ base deepseq transformers ]; + testHaskellDepends = [ base doctest template-haskell ]; + description = "Primeval world of Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "primal-memory" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, primal + , primitive, random + }: + mkDerivation { + pname = "primal-memory"; + version = "0.1.0.0"; + sha256 = "0lvz5kj6bvlgz1jykcv8dri77pjmy6fzppvk9vlvh4cx22zh9y5m"; + libraryHaskellDepends = [ base bytestring deepseq primal ]; + benchmarkHaskellDepends = [ + base criterion deepseq primal primitive random + ]; + description = "Unified interface for memory managemenet"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "primes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -211391,7 +211489,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "reanimate_0_4_2_0" = callPackage + "reanimate_0_4_3_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base , base64-bytestring, bytestring, cassava, cereal, colour , containers, cubicbezier, directory, filelock, filepath, fsnotify @@ -211404,8 +211502,8 @@ self: { }: mkDerivation { pname = "reanimate"; - version = "0.4.2.0"; - sha256 = "0dihh2k0cvh17qb37pfn1h6g620yzp923wrjqy22qbmlld896snk"; + version = "0.4.3.0"; + sha256 = "0rp9qfp8fhz6cxrw9gcva9crxpayrm7a49m1fmma1x9dw4x79b1q"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring @@ -227286,7 +227384,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-swagger_1_1_8" = callPackage + "servant-swagger_1_1_9" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , Cabal, cabal-doctest, directory, doctest, filepath, hspec , hspec-discover, http-media, insert-ordered-containers, lens @@ -227296,8 +227394,8 @@ self: { }: mkDerivation { pname = "servant-swagger"; - version = "1.1.8"; - sha256 = "16zmrakgiwf9rb9bvw3mjbmkqixyms42ymh7g1vyvz399plfn0c7"; + version = "1.1.9"; + sha256 = "1l9wll3m3z2dhhhyh8ff1ybn89j5xqiwp110d932yk8dydjdwvs2"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -249479,6 +249577,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "template-haskell-optics" = callPackage + ({ mkDerivation, base, containers, optics-core, template-haskell }: + mkDerivation { + pname = "template-haskell-optics"; + version = "0.1"; + sha256 = "019njh3w321dsyx892snxl16arypf04mw415s8f1771wcd3l4q8n"; + libraryHaskellDepends = [ + base containers optics-core template-haskell + ]; + description = "Optics for template-haskell types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "template-haskell-util" = callPackage ({ mkDerivation, base, GenericPretty, ghc-prim, template-haskell }: mkDerivation { @@ -281522,8 +281633,8 @@ self: { }: mkDerivation { pname = "z3"; - version = "408.1"; - sha256 = "1r54d289rdfvxqk0774hhh0x2kj8zsh7graahqwwp76r911jb8bp"; + version = "408.2"; + sha256 = "1fjf9pfj3fhhcd0ak8rm6m5im2il8n5d21z8yv5c32xnsgj7z89a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers transformers ]; -- cgit 1.4.1 From bacb4d7e2200a0b81155341d8638d44cd0c449d9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 31 Aug 2020 02:30:36 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/f254e267909a2864552389abe416f6377916f967. --- .../haskell-modules/hackage-packages.nix | 145 +++++++++++++++++---- 1 file changed, 117 insertions(+), 28 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5babf37c4bd18..33255d53e4b67 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24102,7 +24102,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "aeson_1_5_3_0" = callPackage + "aeson_1_5_4_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring , bytestring, containers, data-fix, deepseq, Diff, directory, dlist @@ -24114,8 +24114,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.5.3.0"; - sha256 = "0slqxmm4rikndzq2rmgydaqgf9qqnni62bgr0zihf25d65mgk3lm"; + version = "1.5.4.0"; + sha256 = "17qgrli6xy3cds5k9ijdsmnl89h48w89mgqqy6kfah1bjlzs3l40"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers data-fix deepseq dlist ghc-prim hashable primitive scientific @@ -26222,6 +26222,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ally-invest" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, bytestring + , http-client, http-client-tls, safe, text, time + }: + mkDerivation { + pname = "ally-invest"; + version = "0.1.0.0"; + sha256 = "0n6vz0xd4y4div0p63mnbpng2dqwrsmrdhs25r10xw2wc2bznl79"; + libraryHaskellDepends = [ + aeson authenticate-oauth base bytestring http-client + http-client-tls safe text time + ]; + testHaskellDepends = [ + aeson authenticate-oauth base bytestring http-client + http-client-tls safe text time + ]; + description = "Ally Invest integration library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "almost-fix" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -46447,8 +46467,8 @@ self: { }: mkDerivation { pname = "bv-sized"; - version = "1.0.1"; - sha256 = "12l69p95z1ihwbfhlm0wyr1bdhs52ng4fvdsqxhgn0bpx9skzw73"; + version = "1.0.2"; + sha256 = "0lx7cm7404r71ciksv8g58797k6x02zh337ra88syhj7nzlnij5w"; libraryHaskellDepends = [ base bitwise bytestring panic parameterized-utils th-lift ]; @@ -48005,8 +48025,8 @@ self: { }: mkDerivation { pname = "cabal-fmt"; - version = "0.1.3"; - sha256 = "1d91kmx2q6ygx2avwgi9ihkdazngjf7i3ajyp3cmry5ahvv62x7z"; + version = "0.1.4"; + sha256 = "0akc63g7h21nyyr9m0dwjlnxqw8k26zx5s2mzn8zak2q9i88ds1b"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -48017,7 +48037,8 @@ self: { base bytestring directory filepath optparse-applicative ]; testHaskellDepends = [ - base bytestring Cabal filepath process tasty tasty-golden + base bytestring Cabal containers filepath process tasty + tasty-golden ]; doHaddock = false; description = "Format .cabal files"; @@ -66373,8 +66394,8 @@ self: { }: mkDerivation { pname = "cut-the-crap"; - version = "1.4.0"; - sha256 = "03xip8a9inqir8zm244ffv92ag5r7z8hlh0qz7z4vfdmg54mhhnq"; + version = "1.4.1"; + sha256 = "0rm3m6x9y81j94z857k7i07d4h9lz7ffgymbs7v6gyv4hslrw6bi"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83462,6 +83483,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "esqueleto_3_3_3_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql + , mysql-simple, persistent, persistent-mysql, persistent-postgresql + , persistent-sqlite, persistent-template, postgresql-libpq + , postgresql-simple, resourcet, tagged, text, time, transformers + , unliftio, unordered-containers, vector + }: + mkDerivation { + pname = "esqueleto"; + version = "3.3.3.3"; + sha256 = "14h6x4bj39ffz7arn9ddyjabb5s2a8ynphjvha606lz4mcv3mxkv"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged text time transformers + unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec monad-logger mtl mysql mysql-simple persistent + persistent-mysql persistent-postgresql persistent-sqlite + persistent-template postgresql-libpq postgresql-simple resourcet + tagged text time transformers unliftio unordered-containers vector + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ess" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -89192,15 +89242,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "filtrable_0_1_5_0" = callPackage - ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck - , transformers + "filtrable_0_1_6_0" = callPackage + ({ mkDerivation, base, containers, smallcheck, tasty + , tasty-smallcheck, transformers }: mkDerivation { pname = "filtrable"; - version = "0.1.5.0"; - sha256 = "0glarxd5yaflyhy8ni6q0kzrhgwi8msr3q4zf6by80g2qd33kvh8"; - libraryHaskellDepends = [ base transformers ]; + version = "0.1.6.0"; + sha256 = "058jl7wjaxzvcayc9qzpikxvi9x42civ4sb02jh66rcvpndbfh5y"; + libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; description = "Class of filtrable containers"; license = stdenv.lib.licenses.bsd3; @@ -189371,8 +189421,8 @@ self: { }: mkDerivation { pname = "pandoc-emphasize-code"; - version = "0.2.4"; - sha256 = "0fz0pkxx64d8bvrsg9s704mhhw9djq74x56dbv5w3y65nch8p3a5"; + version = "0.3.0"; + sha256 = "02bg6aippqbjzx1dqzq63qh4ggm6pyw6p8p5iay9ldxdgx4jicnc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229008,8 +229058,8 @@ self: { }: mkDerivation { pname = "shake-futhark"; - version = "0.1.0.0"; - sha256 = "1wxp025dmlal1nm7f7s16pzgx42sawfcnz3lv6krilhr7ynb92ss"; + version = "0.1.0.1"; + sha256 = "110kvha6makrirdpc3x2r2lnazy4nn2xc8s5ydaz64fx9838mlra"; libraryHaskellDepends = [ base containers filepath futhark shake text ]; @@ -244472,15 +244522,13 @@ self: { "supernova" = callPackage ({ mkDerivation, aeson, async, base, bifunctor, binary, bytestring - , Cabal, crc32c, exceptions, lens-family-core, logging, managed - , network, proto-lens, proto-lens-runtime, proto-lens-setup - , streamly, text, unliftio + , crc32c, exceptions, lens-family-core, logging, managed, network + , proto-lens, proto-lens-runtime, streamly, text, unliftio }: mkDerivation { pname = "supernova"; - version = "0.0.1"; - sha256 = "0v0x1xk63kxrf2ihhdr24z7ami557d3w2zizd0g8xqp02pr5gs8z"; - setupHaskellDepends = [ base Cabal proto-lens-setup ]; + version = "0.0.2"; + sha256 = "0nqylb2qqqyxqw2f9smdl3hiv4kbi8hphxndp4v1yx3hq3zhdbjj"; libraryHaskellDepends = [ base bifunctor binary bytestring crc32c exceptions lens-family-core logging managed network proto-lens proto-lens-runtime text unliftio @@ -254868,6 +254916,25 @@ self: { broken = true; }) {}; + "timezone-detect" = callPackage + ({ mkDerivation, base, directory, hspec, hspec-discover, time + , timezone-olson, timezone-series + }: + mkDerivation { + pname = "timezone-detect"; + version = "0.2.2.0"; + sha256 = "0ksjc83iq48msyk4fy90rdn09y3bannslic2cycn7rjzw14kz206"; + libraryHaskellDepends = [ + base time timezone-olson timezone-series + ]; + testHaskellDepends = [ + base directory hspec time timezone-olson timezone-series + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell bindings for the zone-detect C library; plus tz-aware utils"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "timezone-olson" = callPackage ({ mkDerivation, base, binary, bytestring, extensible-exceptions , time, timezone-series @@ -261301,8 +261368,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.7.7.1"; - sha256 = "0yjw4fm7n7qdb9rib7q5nirnw0cdvqy2g05lidxw5pkgdbi9np3m"; + version = "0.7.8.1"; + sha256 = "060fg6s7yjasimhx7nz4cxymlsxdv9pshs4sv83vwj31nw33kr7b"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -262886,6 +262953,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "uniqueness-periods-vector" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "uniqueness-periods-vector"; + version = "0.1.0.0"; + sha256 = "0c5ywfpcy71dqxsvsxk1xkmnhaa9fsnaypr6rnv1igiv1qc8fqkc"; + libraryHaskellDepends = [ base vector ]; + description = "Generalization of the uniqueness-periods and uniqueness-periods-general packages functionality"; + license = stdenv.lib.licenses.mit; + }) {}; + + "uniqueness-periods-vector-common" = callPackage + ({ mkDerivation, base, vector }: + mkDerivation { + pname = "uniqueness-periods-vector-common"; + version = "0.1.0.0"; + sha256 = "0lkkanqi2l2c6fmf1nasb6kigdp0gfi9qncsl07i8jmbk6wxppss"; + libraryHaskellDepends = [ base vector ]; + description = "Generalization of the dobutokO-poetry-general package functionality"; + license = stdenv.lib.licenses.mit; + }) {}; + "unit" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { -- cgit 1.4.1 From f5f40fe2922599073d87ea04bf90b4d7c5ec1487 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2020 02:30:25 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/a91f6a268b0c2e7e951113d08bb2e5953b07ab31. --- .../haskell-modules/hackage-packages.nix | 229 +++++++++++++++++---- 1 file changed, 194 insertions(+), 35 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 33255d53e4b67..8ddd476321d3b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -25983,15 +25983,18 @@ self: { }) {}; "algebra-driven-design" = callPackage - ({ mkDerivation, base, containers, file-embed, JuicyPixels, mtl - , QuickCheck, quickspec + ({ mkDerivation, base, bytestring, containers, dlist, file-embed + , generic-data, hashable, JuicyPixels, monoid-subclasses + , monoidal-containers, mtl, multiset, QuickCheck, quickspec }: mkDerivation { pname = "algebra-driven-design"; - version = "0.1.0.1"; - sha256 = "0jydvrmrz6kvrbk8hv0mb01g67j0bdxi519s7blwf3gfkxfjvyyv"; + version = "0.1.1.0"; + sha256 = "0xjgxi7dfw66nkrhd9avkfi4r3jiq6wif32160ipy343vlhrcb37"; libraryHaskellDepends = [ - base containers file-embed JuicyPixels mtl QuickCheck quickspec + base bytestring containers dlist file-embed generic-data hashable + JuicyPixels monoid-subclasses monoidal-containers mtl multiset + QuickCheck quickspec ]; description = "Companion library for the book Algebra-Driven Design by Sandy Maguire"; license = stdenv.lib.licenses.bsd3; @@ -62299,6 +62302,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conversions" = callPackage + ({ mkDerivation, base, bytestring, control-bool, devtools + , exceptions, mtl, source-constraints, template-haskell, text + , unliftio-core + }: + mkDerivation { + pname = "conversions"; + version = "0.0.3"; + sha256 = "1fn7ras17maswl7fw5hdbw02b8wjlzs2gcfwdxrw9xipjbw81hir"; + libraryHaskellDepends = [ + base bytestring control-bool devtools exceptions mtl + source-constraints template-haskell text unliftio-core + ]; + testHaskellDepends = [ + base bytestring control-bool devtools exceptions mtl + source-constraints template-haskell text unliftio-core + ]; + description = "Injective explicit total and partial conversions"; + license = stdenv.lib.licenses.mit; + }) {}; + "convert" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , data-default, impossible, lens, template-haskell, text @@ -66387,15 +66411,15 @@ self: { }) {}; "cut-the-crap" = callPackage - ({ mkDerivation, base, exceptions, generic-lens, hspec, hspec-core - , lens, optparse-applicative, pocketsphinx, QuickCheck + ({ mkDerivation, base, c2hs, exceptions, generic-lens, hspec + , hspec-core, lens, optparse-applicative, pocketsphinx, QuickCheck , quickcheck-classes, regex-tdfa, shelly, sphinxbase , system-filepath, temporary, text, time, unliftio-core }: mkDerivation { pname = "cut-the-crap"; - version = "1.4.1"; - sha256 = "0rm3m6x9y81j94z857k7i07d4h9lz7ffgymbs7v6gyv4hslrw6bi"; + version = "1.4.2"; + sha256 = "16l8ar38nl2sgsbwjslhxd8z2wyjmdgmi51sic3vvyv7n6b9mr51"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -66403,17 +66427,20 @@ self: { shelly system-filepath temporary text time unliftio-core ]; libraryPkgconfigDepends = [ pocketsphinx sphinxbase ]; + libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base exceptions generic-lens lens optparse-applicative regex-tdfa shelly system-filepath temporary text time unliftio-core ]; executablePkgconfigDepends = [ pocketsphinx sphinxbase ]; + executableToolDepends = [ c2hs ]; testHaskellDepends = [ base exceptions generic-lens hspec hspec-core lens optparse-applicative QuickCheck quickcheck-classes regex-tdfa shelly system-filepath temporary text time unliftio-core ]; testPkgconfigDepends = [ pocketsphinx sphinxbase ]; + testToolDepends = [ c2hs ]; description = "Cuts out uninteresting parts of videos by detecting silences"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -71986,8 +72013,8 @@ self: { }: mkDerivation { pname = "devtools"; - version = "0.0.2"; - sha256 = "1p5695sgp48mznk9pb9kl24j9wa9gwq344hr3cdzzsvabfi1pkz2"; + version = "0.0.3"; + sha256 = "09lwvi4mbwkhazzmngpblxh2bvvxz1j4ndzsh3bp3nwwwa0xiihm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124966,7 +124993,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hie-bios_0_7_0" = callPackage + "hie-bios_0_7_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, containers, cryptohash-sha1, deepseq , directory, extra, file-embed, filepath, ghc, hslogger @@ -124976,8 +125003,8 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.7.0"; - sha256 = "17jfiyxq1m0n1i9a565niczivkkxdd36l9gxqbhfafxsykggliab"; + version = "0.7.1"; + sha256 = "00gkr4dbbs70vnd6y90iirss88j8ax714l9jmwdfkmslwd4m2ml8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126834,8 +126861,8 @@ self: { }: mkDerivation { pname = "hledger-iadd"; - version = "1.3.11"; - sha256 = "1pqjyybbnhckz16in6skx3582aykk2yq5bf4ghbhj8iqbm3cczqf"; + version = "1.3.12"; + sha256 = "0klrqss2ch4yi50m1rybznzsjg4ahbx7rg9n8w5svpf34fdlp048"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134205,6 +134232,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_7_3" = callPackage + ({ mkDerivation, base, hspec-core, hspec-discover + , hspec-expectations, QuickCheck + }: + mkDerivation { + pname = "hspec"; + version = "2.7.3"; + sha256 = "1vapw2pqj64p36lqvlxdprlp4gwswr0hbh42b89xnhq4pax7h4b9"; + libraryHaskellDepends = [ + base hspec-core hspec-discover hspec-expectations QuickCheck + ]; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -134287,6 +134330,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_7_3" = callPackage + ({ mkDerivation, ansi-terminal, array, base, call-stack, clock + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, stm, temporary, tf-random, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.7.3"; + sha256 = "10cnlasg8x3nzrqwqyr4bdrlcpknyzki193pk3rq9wrkdf2cs9zc"; + libraryHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv stm tf-random transformers + ]; + testHaskellDepends = [ + ansi-terminal array base call-stack clock deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently stm temporary tf-random + transformers + ]; + testToolDepends = [ hspec-meta ]; + testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-dirstream" = callPackage ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core , pipes, pipes-safe, system-filepath, text @@ -134324,6 +134395,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_7_3" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + }: + mkDerivation { + pname = "hspec-discover"; + version = "2.7.3"; + sha256 = "0qaqh45q79ryq5zr0shdc1lb9r1qb4b89y6zib6w0dn0bh68wpjm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath hspec-meta QuickCheck + ]; + testToolDepends = [ hspec-meta ]; + description = "Automatically discover and run Hspec tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -169398,6 +169489,34 @@ self: { broken = true; }) {}; + "micro-gateway" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, case-insensitive + , containers, cookie, data-default-class, hslogger, http-client + , http-types, network-uri, optparse-applicative, scotty, signature + , stm, streaming-commons, text, time, unix-time + , unordered-containers, wai, wai-cors, wai-websockets, warp + , websockets, yaml + }: + mkDerivation { + pname = "micro-gateway"; + version = "1.1.0.0"; + sha256 = "1jb703vcqncxw12cmgmyg63rw6fmfa4mv1685z6vab3xzq7kvxv7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring case-insensitive containers cookie + hslogger http-client http-types scotty signature stm text time + unix-time unordered-containers wai websockets + ]; + executableHaskellDepends = [ + aeson base bytestring data-default-class http-client network-uri + optparse-applicative scotty streaming-commons text wai-cors + wai-websockets warp websockets yaml + ]; + description = "A Micro service gateway"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "micro-recursion-schemes" = callPackage ({ mkDerivation, base, cpphs, HUnit, template-haskell , th-abstraction @@ -171840,8 +171959,8 @@ self: { ({ mkDerivation, base, doctest, typelits-witnesses }: mkDerivation { pname = "modular-arithmetic"; - version = "2.0.0.0"; - sha256 = "1mwhjn315vgpvf95ay6rf77hwpb7hjfw9bcginnz4cb30nn8kvl9"; + version = "2.0.0.1"; + sha256 = "132cxgrw6lsdkpqi69v1f9jgl5icslwi5qclv4rc03hn0mcnl2sz"; libraryHaskellDepends = [ base typelits-witnesses ]; testHaskellDepends = [ base doctest typelits-witnesses ]; description = "A type for integers modulo some constant"; @@ -175022,17 +175141,17 @@ self: { "mprelude" = callPackage ({ mkDerivation, base, devtools, source-constraints, text - , text-conversions + , unliftio-core }: mkDerivation { pname = "mprelude"; - version = "0.1.0"; - sha256 = "0p7zx0b49dp2vd3mx3knfl9gqbh6sj2znc372bmh6ja57g1kv8ds"; + version = "0.2.0"; + sha256 = "0llkcbilz138zlrqmsny74g9ybjf665h7w84g0q0rli9dvjnc4bl"; libraryHaskellDepends = [ - base source-constraints text text-conversions + base source-constraints text unliftio-core ]; testHaskellDepends = [ - base devtools source-constraints text text-conversions + base devtools source-constraints text unliftio-core ]; description = "A minimalish prelude"; license = stdenv.lib.licenses.bsd3; @@ -189876,8 +189995,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.2.9"; - sha256 = "0gl5h4krn2aigxfqppa4fr8vir2s5xrh8s363frh82fgdxblhjgc"; + version = "0.3.0"; + sha256 = "1k9b714rb9cgapn0vgwymrq7ma1lmq6klmlv37c6gqmb1c5k7ijh"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -197944,8 +198063,8 @@ self: { }: mkDerivation { pname = "plot"; - version = "0.2.3.10"; - sha256 = "0dva2kvf3193qc7zb9ydmzpffaj9lm6qy79n5zv66jnbccyp36lf"; + version = "0.2.3.11"; + sha256 = "0img30argzgxcgwam3iqc3xasgizbbcrghd2vkmqahmv7g3l36di"; libraryHaskellDepends = [ array base cairo colour hmatrix mtl pango transformers ]; @@ -208283,8 +208402,8 @@ self: { }: mkDerivation { pname = "quickspec"; - version = "2.1.4"; - sha256 = "0h07s2dk4kjqv3hspazjwqbr8p78g2n5ah75h0a6ywdfgdy2z621"; + version = "2.1.5"; + sha256 = "0j8mcn9616r40hdl0jy6mqac7i31mhlsgv421m1hc8pj1kabpc0i"; libraryHaskellDepends = [ base constraints containers data-lens-light dlist QuickCheck quickcheck-instances random spoon template-haskell transformers @@ -232701,14 +232820,14 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_9" = callPackage + "skylighting_0_10" = callPackage ({ mkDerivation, base, binary, blaze-html, bytestring, containers , directory, filepath, pretty-show, skylighting-core, text }: mkDerivation { pname = "skylighting"; - version = "0.9"; - sha256 = "1855k1xjh38r389zvlzga7dkc3scj65ip9frvvkagxa2ls1irfp1"; + version = "0.10"; + sha256 = "1gi6pfi5rcmql0gdcjyb114phkc0xnkrhk6y2h6yvx4jflzpw4lj"; configureFlags = [ "-fexecutable" ]; isLibrary = true; isExecutable = true; @@ -232756,7 +232875,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "skylighting-core_0_9" = callPackage + "skylighting-core_0_10" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring , case-insensitive, colour, containers, criterion, Diff, directory @@ -232766,8 +232885,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.9"; - sha256 = "0gljyp007pcym2b0azg0sn654kmss9xwim84xw7hxc1q8rwvdxhr"; + version = "0.10"; + sha256 = "1b2ldgdgq0a1wg7nlfpzm1rag8hbmm7gnirrm78cd72kycrmly60"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -262975,6 +263094,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "uniqueness-periods-vector-general" = callPackage + ({ mkDerivation, base, uniqueness-periods-vector + , uniqueness-periods-vector-common, vector + }: + mkDerivation { + pname = "uniqueness-periods-vector-general"; + version = "0.1.0.0"; + sha256 = "0ndvi6rn2nyqy93z09qr08f6mprjwa3jaaz11ykwv5b2c3a30pn4"; + libraryHaskellDepends = [ + base uniqueness-periods-vector uniqueness-periods-vector-common + vector + ]; + description = "Generalization of the functionality of the dobutokO-poetry-general-languages package"; + license = stdenv.lib.licenses.mit; + }) {}; + "unit" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -279877,6 +280012,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-page-cursor" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations-lifted, http-link-header, http-types, lens + , lens-aeson, monad-logger, mtl, network-uri, persistent + , persistent-sqlite, persistent-template, scientific, text, time + , unliftio, unliftio-core, wai-extra, yesod, yesod-core, yesod-test + }: + mkDerivation { + pname = "yesod-page-cursor"; + version = "1.0.0.1"; + sha256 = "0grh7pnzhxicanf2ipnb0ivq5lal9h42jd2kbbypgxp7qhvp69g3"; + libraryHaskellDepends = [ + aeson base bytestring containers http-link-header network-uri text + unliftio yesod-core + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-expectations-lifted + http-link-header http-types lens lens-aeson monad-logger mtl + persistent persistent-sqlite persistent-template scientific text + time unliftio unliftio-core wai-extra yesod yesod-core yesod-test + ]; + license = stdenv.lib.licenses.mit; + }) {}; + "yesod-paginate" = callPackage ({ mkDerivation, base, template-haskell, yesod }: mkDerivation { -- cgit 1.4.1 From d9183136e8c35174c96fd8f1713f5cd476e70559 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2020 10:58:41 +0200 Subject: LTS Haskell 16.12 --- .../haskell-modules/configuration-hackage2nix.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 82dbdcf933436..93e6579f4fce3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.11 + # LTS Haskell 16.12 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -512,7 +512,7 @@ default-package-overrides: - constraints ==0.12 - constraint-tuples ==0.1.2 - contravariant ==1.5.2 - - contravariant-extras ==0.3.5.1 + - contravariant-extras ==0.3.5.2 - control-bool ==0.2.1 - control-monad-free ==0.6.2 - control-monad-omega ==0.3.2 @@ -760,7 +760,7 @@ default-package-overrides: - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - - extra ==1.7.6 + - extra ==1.7.7 - extractable-singleton ==0.0.1 - extrapolate ==0.4.2 - fail ==4.9.0.0 @@ -931,7 +931,7 @@ default-package-overrides: - gi-graphene ==1.0.1 - gi-gtk ==3.0.33 - gi-gtk-hs ==0.3.8.1 - - ginger ==0.10.0.5 + - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 - gi-pango ==1.0.22 - giphy-api ==0.7.0.0 @@ -1190,7 +1190,7 @@ default-package-overrides: - ieee754 ==0.8.0 - if ==0.1.0.0 - iff ==0.0.6 - - ihaskell ==0.10.1.1 + - ihaskell ==0.10.1.2 - ihs ==0.1.0.3 - ilist ==0.4.0.1 - imagesize-conduit ==1.1 @@ -1242,7 +1242,7 @@ default-package-overrides: - iproute ==1.7.9 - IPv6Addr ==1.1.5 - ipynb ==0.1.0.1 - - ipython-kernel ==0.10.2.0 + - ipython-kernel ==0.10.2.1 - irc ==0.6.1.0 - irc-client ==1.1.1.1 - irc-conduit ==0.3.0.4 @@ -1369,7 +1369,7 @@ default-package-overrides: - logging ==3.0.5 - logging-facade ==0.3.0 - logging-facade-syslog ==1 - - logict ==0.7.0.2 + - logict ==0.7.0.3 - loop ==0.3.0 - loopbreaker ==0.1.1.1 - lrucache ==1.2.0.1 @@ -1906,7 +1906,7 @@ default-package-overrides: - safe-exceptions-checked ==0.1.0 - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 - - safe-json ==1.1.0 + - safe-json ==1.1.1 - safe-money ==0.9 - SafeSemaphore ==0.10.1 - salak ==0.3.6 @@ -1996,7 +1996,7 @@ default-package-overrides: - sexp-grammar ==2.1.0 - SHA ==1.6.4.4 - shake-plus ==0.1.10.0 - - shakespeare ==2.0.24.1 + - shakespeare ==2.0.25 - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 @@ -2182,7 +2182,7 @@ default-package-overrides: - TCache ==0.12.1 - tce-conf ==1.3 - tdigest ==0.2.1 - - template-haskell-compat-v0208 ==0.1.2.1 + - template-haskell-compat-v0208 ==0.1.4 - temporary ==1.3 - temporary-rc ==1.2.0.3 - temporary-resourcet ==0.1.0.1 @@ -2463,7 +2463,7 @@ default-package-overrides: - writer-cps-transformers ==0.5.6.1 - wss-client ==0.3.0.0 - wuss ==1.1.17 - - X11 ==1.9.1 + - X11 ==1.9.2 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 - x509 ==1.7.5 -- cgit 1.4.1 From d22463bf7f190da94080b8031a35de006e7f3eeb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 1 Sep 2020 10:59:26 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/c93a6c8875cce4228879f7d81e5ab96446e27320. --- .../haskell-modules/hackage-packages.nix | 269 +++------------------ 1 file changed, 37 insertions(+), 232 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8ddd476321d3b..a79b867d1e325 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -21304,24 +21304,6 @@ self: { }) {}; "X11" = callPackage - ({ mkDerivation, base, data-default, libX11, libXext, libXinerama - , libXrandr, libXrender, libXScrnSaver - }: - mkDerivation { - pname = "X11"; - version = "1.9.1"; - sha256 = "0gg6852mrlgl8zng1j84fismz7k81jr5fk92glgkscf8q6ryg0bm"; - libraryHaskellDepends = [ base data-default ]; - librarySystemDepends = [ - libX11 libXext libXinerama libXrandr libXrender libXScrnSaver - ]; - description = "A binding to the X11 graphics library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; - inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; - inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; - - "X11_1_9_2" = callPackage ({ mkDerivation, base, data-default, libX11, libXext, libXinerama , libXrandr, libXrender, libXScrnSaver }: @@ -21335,7 +21317,6 @@ self: { ]; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; @@ -25989,8 +25970,8 @@ self: { }: mkDerivation { pname = "algebra-driven-design"; - version = "0.1.1.0"; - sha256 = "0xjgxi7dfw66nkrhd9avkfi4r3jiq6wif32160ipy343vlhrcb37"; + version = "0.1.1.1"; + sha256 = "0dp622a70biscjh1r0yyr9mz65g8p2wz60jrzrq8yhs1y4gsigs0"; libraryHaskellDepends = [ base bytestring containers dlist file-embed generic-data hashable JuicyPixels monoid-subclasses monoidal-containers mtl multiset @@ -59766,6 +59747,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit_1_3_2_1" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, gauge, hspec, kan-extensions + , mono-traversable, mtl, mwc-random, primitive, QuickCheck + , resourcet, safe, silently, split, text, transformers, unix + , unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "conduit"; + version = "1.3.2.1"; + sha256 = "0kyl1zspkp14vrgxgc2zpy9rd9h6aa7m9f385sgshysnhbc7hbg5"; + libraryHaskellDepends = [ + base bytestring directory exceptions filepath mono-traversable mtl + primitive resourcet text transformers unix unliftio-core vector + ]; + testHaskellDepends = [ + base bytestring containers directory exceptions filepath hspec + mono-traversable mtl QuickCheck resourcet safe silently split text + transformers unliftio vector + ]; + benchmarkHaskellDepends = [ + base containers deepseq gauge hspec kan-extensions mwc-random + transformers vector + ]; + description = "Streaming data processing library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-algorithms" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, conduit-zstd, containers @@ -61915,21 +61925,6 @@ self: { }) {}; "contravariant-extras" = callPackage - ({ mkDerivation, base, contravariant, template-haskell - , template-haskell-compat-v0208 - }: - mkDerivation { - pname = "contravariant-extras"; - version = "0.3.5.1"; - sha256 = "0r9bg6mrm5whv7inpp9m2agwbnk70vg0v7nrflpxkif81scpq0z9"; - libraryHaskellDepends = [ - base contravariant template-haskell template-haskell-compat-v0208 - ]; - description = "Extras for the \"contravariant\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "contravariant-extras_0_3_5_2" = callPackage ({ mkDerivation, base, contravariant, template-haskell , template-haskell-compat-v0208 }: @@ -61942,7 +61937,6 @@ self: { ]; description = "Extras for the \"contravariant\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control" = callPackage @@ -86195,24 +86189,6 @@ self: { }) {}; "extra" = callPackage - ({ mkDerivation, base, clock, directory, filepath, process - , QuickCheck, quickcheck-instances, time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.7.6"; - sha256 = "1mdqw88crblabxz4sg803ww6pkl5prnjnpjwh11n32y2npky5ask"; - libraryHaskellDepends = [ - base clock directory filepath process time unix - ]; - testHaskellDepends = [ - base directory filepath QuickCheck quickcheck-instances unix - ]; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_7_7" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, quickcheck-instances, time, unix }: @@ -86228,7 +86204,6 @@ self: { ]; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "extract-dependencies" = callPackage @@ -101613,38 +101588,6 @@ self: { }) {}; "ginger" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , data-default, filepath, http-types, mtl, optparse-applicative - , parsec, process, regex-tdfa, safe, scientific, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , utf8-string, vector, yaml - }: - mkDerivation { - pname = "ginger"; - version = "0.10.0.5"; - sha256 = "187118g5fs97msdab4jmhrwy28hhi81ihyc1v6rfb535bsnm70sw"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring data-default filepath http-types - mtl parsec regex-tdfa safe scientific text time transformers - unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson base bytestring data-default optparse-applicative process - text transformers unordered-containers utf8-string yaml - ]; - testHaskellDepends = [ - aeson base bytestring data-default mtl tasty tasty-hunit - tasty-quickcheck text time transformers unordered-containers - utf8-string - ]; - description = "An implementation of the Jinja2 template language in Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ginger_0_10_1_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , data-default, filepath, http-types, mtl, optparse-applicative , parsec, process, regex-tdfa, safe, scientific, tasty, tasty-hunit @@ -101674,7 +101617,6 @@ self: { ]; description = "An implementation of the Jinja2 template language in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gingersnap" = callPackage @@ -142047,41 +141989,6 @@ self: { }) {}; "ihaskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal - , cmdargs, containers, directory, filepath, ghc, ghc-boot - , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint - , hspec, hspec-contrib, http-client, http-client-tls, HUnit - , ipython-kernel, mtl, parsec, process, random, raw-strings-qq - , setenv, shelly, split, stm, strict, text, time, transformers - , unix, unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "ihaskell"; - version = "0.10.1.1"; - sha256 = "10rsdcc2l0gkhapvi5vzjc7m2bwv67k4iy3vjkx8i92jk6023y64"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring cereal cmdargs containers - directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline - haskell-src-exts hlint http-client http-client-tls ipython-kernel - mtl parsec process random shelly split stm strict text time - transformers unix unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory ghc ipython-kernel - process strict text transformers unix unordered-containers - ]; - testHaskellDepends = [ - base directory ghc ghc-paths here hspec hspec-contrib HUnit - raw-strings-qq setenv shelly text transformers - ]; - description = "A Haskell backend kernel for the IPython project"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ihaskell_0_10_1_2" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal , cmdargs, containers, directory, filepath, ghc, ghc-boot , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint @@ -142114,7 +142021,6 @@ self: { ]; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ihaskell-aeson" = callPackage @@ -146177,28 +146083,6 @@ self: { }) {}; "ipython-kernel" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text - , containers, cryptonite, directory, filepath, memory, mtl, parsec - , process, temporary, text, transformers, unordered-containers - , uuid, zeromq4-haskell - }: - mkDerivation { - pname = "ipython-kernel"; - version = "0.10.2.0"; - sha256 = "0ylqbcs7xdhkm0if18f1cmz4144gx0p4r9wgggbzphfx8v8lhz9a"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring cereal cereal-text containers cryptonite - directory filepath memory mtl parsec process temporary text - transformers unordered-containers uuid zeromq4-haskell - ]; - description = "A library for creating kernels for IPython frontends"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ipython-kernel_0_10_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text , containers, cryptonite, directory, filepath, memory, mtl, parsec , process, temporary, text, transformers, unordered-containers @@ -146218,7 +146102,6 @@ self: { ]; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc" = callPackage @@ -154395,8 +154278,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.3.0.1"; - sha256 = "0681w4rz547if52yk0k32drhllx0k906nir0gs6xv0pqxkjc07ri"; + version = "1.3.0.2"; + sha256 = "1dldip54xd54kbfgc3kl79z86p6c4q37vx43r3qpymxpc85kid84"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -162609,18 +162492,6 @@ self: { }) {}; "logict" = callPackage - ({ mkDerivation, base, mtl, tasty, tasty-hunit }: - mkDerivation { - pname = "logict"; - version = "0.7.0.2"; - sha256 = "1xfgdsxg0lp8m0a2cb83rcxrnnc37asfikay2kydi933anh9ihfc"; - libraryHaskellDepends = [ base mtl ]; - testHaskellDepends = [ base mtl tasty tasty-hunit ]; - description = "A backtracking logic-programming monad"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "logict_0_7_0_3" = callPackage ({ mkDerivation, base, mtl, tasty, tasty-hunit }: mkDerivation { pname = "logict"; @@ -162630,7 +162501,6 @@ self: { testHaskellDepends = [ base mtl tasty tasty-hunit ]; description = "A backtracking logic-programming monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logict-state" = callPackage @@ -220205,32 +220075,6 @@ self: { }) {}; "safe-json" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, dlist - , generic-arbitrary, hashable, quickcheck-instances, scientific - , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time - , unordered-containers, uuid, uuid-types, vector - }: - mkDerivation { - pname = "safe-json"; - version = "1.1.0"; - sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw"; - revision = "4"; - editedCabalFile = "12z5z68bfrzv3laagbssdcv7g97bpk2wf1bjirrivbhdbslf6l4q"; - libraryHaskellDepends = [ - aeson base bytestring containers dlist hashable scientific tasty - tasty-hunit tasty-quickcheck text time unordered-containers - uuid-types vector - ]; - testHaskellDepends = [ - aeson base bytestring containers dlist generic-arbitrary hashable - quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck - temporary text time unordered-containers uuid uuid-types vector - ]; - description = "Automatic JSON format versioning"; - license = stdenv.lib.licenses.mit; - }) {}; - - "safe-json_1_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, dlist , generic-arbitrary, hashable, quickcheck-instances, scientific , tasty, tasty-hunit, tasty-quickcheck, temporary, text, time @@ -220252,7 +220096,6 @@ self: { ]; description = "Automatic JSON format versioning"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-lazy-io" = callPackage @@ -229430,31 +229273,6 @@ self: { }) {}; "shakespeare" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, th-lift, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.0.24.1"; - sha256 = "0r9msld629fh9h98iclhd30h1rbg1xqzjqxj64k0n1p39fkx4ndm"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - th-lift time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - - "shakespeare_2_0_25" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec , process, scientific, template-haskell, text, th-lift, time @@ -229476,7 +229294,6 @@ self: { ]; description = "A toolkit for making compile-time interpolated templates"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -241486,8 +241303,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.7.6"; - sha256 = "1gzax38chn57ybikvddk6g8msyv52y5s30yndpp64bdh3kqwlchq"; + version = "0.7.7"; + sha256 = "152blmvnp8k0bh9bw6ddzmb2rhs0a36v1k0fza39n88sldx504s3"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash deepseq directory @@ -241542,8 +241359,8 @@ self: { }: mkDerivation { pname = "store-streaming"; - version = "0.2.0.2"; - sha256 = "1hnzpyw5l90nrm3vlrwbv8517iaaq0razfjj6m8a41jy2lkgf4gz"; + version = "0.2.0.3"; + sha256 = "0b164ixsqgrar4riqlm3ip5rfbinapk6md7hnz32gzcmrgav283q"; libraryHaskellDepends = [ async base bytestring conduit free resourcet store store-core streaming-commons text transformers @@ -249722,17 +249539,6 @@ self: { }) {}; "template-haskell-compat-v0208" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "template-haskell-compat-v0208"; - version = "0.1.2.1"; - sha256 = "1c8m1z46j6azvxd6hrr76rb7gq6bxfwg3j8m25p260hrss595c06"; - libraryHaskellDepends = [ base template-haskell ]; - description = "A backwards compatibility layer for Template Haskell newer than 2.8"; - license = stdenv.lib.licenses.mit; - }) {}; - - "template-haskell-compat-v0208_0_1_4" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; @@ -249741,7 +249547,6 @@ self: { libraryHaskellDepends = [ base template-haskell ]; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template-haskell-optics" = callPackage -- cgit 1.4.1 From 2a45bc29fcfa12662945e5b52861042c3e737582 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 2 Sep 2020 02:30:26 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/e85cb5656b1ef7f113518de0acd4a35aef88f65b. --- .../haskell-modules/hackage-packages.nix | 237 ++++++++++++++++----- 1 file changed, 185 insertions(+), 52 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a79b867d1e325..7a7a92fc48218 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -10781,6 +10781,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_4_19" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.4.19"; + sha256 = "0iy3qrir13kp1c7a0xwj2ngfwhqxqbc5j0vj5mi0w3arv7w0x6ds"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -22551,8 +22566,8 @@ self: { }: mkDerivation { pname = "accelerate-kullback-liebler"; - version = "0.1.2.0"; - sha256 = "16psmn0wakrrym8m98ing4nrh8r7qvbn04b28sicl5jdbfhg1fdn"; + version = "0.1.2.1"; + sha256 = "1pvgm5w8m7226wa139h49fd0f5bsrz3a7x30wx3mzjn80acgsm63"; libraryHaskellDepends = [ accelerate base mwc-random-accelerate ]; testHaskellDepends = [ accelerate accelerate-llvm-native accelerate-llvm-ptx base @@ -31842,6 +31857,8 @@ self: { pname = "arbtt"; version = "0.10.2"; sha256 = "02izfga7nv2saq4d1xwigq41hhbc02830sjppqsqw6vcb8082vs1"; + revision = "1"; + editedCabalFile = "10b6ax854a4ig33iwcg21vad4gpgibfpb6xqkxd80hvkrj4gqd62"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -58176,14 +58193,16 @@ self: { }) {}; "compact-sequences" = callPackage - ({ mkDerivation, base, containers, primitive, transformers }: + ({ mkDerivation, base, mtl, primitive, QuickCheck, tasty + , tasty-quickcheck, transformers + }: mkDerivation { pname = "compact-sequences"; - version = "0.1.0.0"; - sha256 = "148zjnnnn82vgn4ybs5z6nx9xv2wd73q2cavaa2nyjn1kcqqw7a8"; - libraryHaskellDepends = [ base containers primitive transformers ]; - testHaskellDepends = [ base ]; - description = "Stacks and queues with compact representations"; + version = "0.2.0.0"; + sha256 = "0v7s99d7syspgc8z8mhdykyrsjyx0r0vjyf64plidndld2zg0swn"; + libraryHaskellDepends = [ base mtl primitive transformers ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + description = "Stacks, queues, and deques with compact representations"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -65080,8 +65099,8 @@ self: { }: mkDerivation { pname = "cryptol"; - version = "2.9.0"; - sha256 = "0bxx4pslmyjaqhskbi95a67fmpjhnbmgcys68xzs2y8ndjnz9jrb"; + version = "2.9.1"; + sha256 = "0c484pla89igj77x5n2n50a1la8j4jaqpc0pc58c1pcijffxac5l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -111392,8 +111411,8 @@ self: { pname = "hackage-security"; version = "0.6.0.1"; sha256 = "05rgz31cmp52137j4jk0074z8lfgk8mrf2x56bzw28asmxrv8qli"; - revision = "2"; - editedCabalFile = "12m1a5jggzjz3d1q5j41dcs51hi1vwqqxrba0h9jiajv11f3hb39"; + revision = "3"; + editedCabalFile = "03cc99ynscxhmw1mxm2xn2ywvfnl1zfb3rdbbcc7fvm92nznzpyi"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring Cabal containers cryptohash-sha256 directory ed25519 filepath ghc-prim @@ -134174,14 +134193,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec_2_7_3" = callPackage + "hspec_2_7_4" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.7.3"; - sha256 = "1vapw2pqj64p36lqvlxdprlp4gwswr0hbh42b89xnhq4pax7h4b9"; + version = "2.7.4"; + sha256 = "0zql8cl025ai3yx2dhp1sgvmw8n4ngqbrlmb42hcgv26q8qnvhmi"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -134272,7 +134291,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-core_2_7_3" = callPackage + "hspec-core_2_7_4" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -134280,8 +134299,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.7.3"; - sha256 = "10cnlasg8x3nzrqwqyr4bdrlcpknyzki193pk3rq9wrkdf2cs9zc"; + version = "2.7.4"; + sha256 = "1k0rs9399m6bzmndc9ybs26mxrzkl9pifrijvknysbaqfcifmq35"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -134337,13 +134356,13 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-discover_2_7_3" = callPackage + "hspec-discover_2_7_4" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.7.3"; - sha256 = "0qaqh45q79ryq5zr0shdc1lb9r1qb4b89y6zib6w0dn0bh68wpjm"; + version = "2.7.4"; + sha256 = "02laain23bcnzsl65347qr5knvrmrlhd0kzc0d88kx59lpzm27a0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -149721,8 +149740,8 @@ self: { }: mkDerivation { pname = "json5hs"; - version = "0.1.2.2"; - sha256 = "19r1ripvalrhvlqdk0pvm18b4a8sibdwlc60i2yj7da10rdx5cv1"; + version = "0.1.3.1"; + sha256 = "18i01c0045c26s80g69wdgyk9aa3pj092z0s6hmq9z5xddid2s8h"; libraryHaskellDepends = [ array base bytestring containers mtl pretty syb text ]; @@ -159663,19 +159682,22 @@ self: { }) {}; "lingo" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , filepath, hspec, raw-strings-qq, text, yaml + ({ mkDerivation, base, bytestring, containers, directory, filepath + , hspec, raw-strings-qq, text, yaml }: mkDerivation { pname = "lingo"; - version = "0.3.2.0"; - sha256 = "0qym6svpvxsxbhbppk0lkpp2zbqa13f0njkxnpyz5id581c3v8hx"; - setupHaskellDepends = [ - base bytestring Cabal containers directory filepath text yaml - ]; + version = "0.5.0.0"; + sha256 = "11ggxcaci3d20vyrgv50xzjrhr3n3y460ixb90hd87wja0m7xnij"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers filepath raw-strings-qq text yaml ]; + executableHaskellDepends = [ + base bytestring containers directory filepath raw-strings-qq text + yaml + ]; testHaskellDepends = [ base hspec ]; description = "File extension based programming language detection"; license = stdenv.lib.licenses.bsd3; @@ -203198,6 +203220,17 @@ self: { broken = true; }) {}; + "print-info" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "print-info"; + version = "0.1.3.0"; + sha256 = "02wl9hq7jkz4yzkb744xwgnbss0w2sdpi02d3ms2q5rvc03ixnh6"; + libraryHaskellDepends = [ base ]; + description = "Can be used to coordinate the printing output"; + license = stdenv.lib.licenses.mit; + }) {}; + "printcess" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, lens, mtl , QuickCheck, transformers @@ -211951,8 +211984,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.4.1"; - sha256 = "09r4a9h4rd48nqdn08v3mvibqvgb0ym05142jrk0qqq8f4la3dni"; + version = "2.2.4.2"; + sha256 = "15ahlgm0dilapk0y5jhwdvrims7nyzdsbdccq4x9jj0ddsszqr02"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -225658,6 +225691,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-conduit_0_15_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, conduit + , http-client, http-media, mtl, resourcet, servant, servant-client + , servant-server, unliftio-core, wai, warp + }: + mkDerivation { + pname = "servant-conduit"; + version = "0.15.1"; + sha256 = "1vy3ihypb0zm2yd16rq120qw3898i3c0mahh2jysssv65g0avdwp"; + libraryHaskellDepends = [ + base bytestring conduit mtl resourcet servant unliftio-core + ]; + testHaskellDepends = [ + base base-compat bytestring conduit http-client http-media + resourcet servant servant-client servant-server wai warp + ]; + description = "Servant Stream support for conduit"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-csharp" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , heredocs, http-types, lens, mtl, servant, servant-foreign @@ -225770,7 +225824,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-docs_0_11_5" = callPackage + "servant-docs_0_11_6" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , case-insensitive, hashable, http-media, http-types, lens, servant , string-conversions, tasty, tasty-golden, tasty-hunit, text @@ -225778,8 +225832,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.11.5"; - sha256 = "0i51f33w5bz8j6jj9j5ivg7kll510nc0hmkhdrh3q0qagbpwryfx"; + version = "0.11.6"; + sha256 = "07qabs5xi6dw8anmrnl2135fps901k4y1s2xywgdxhqyg01rljhq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226008,14 +226062,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-foreign_0_15_1" = callPackage + "servant-foreign_0_15_2" = callPackage ({ mkDerivation, base, base-compat, hspec, hspec-discover , http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.15.1"; - sha256 = "024pd3a5pf4gqx5y2is7n38a7qyfanw13w5jy4j5a81zjmfxnwk7"; + version = "0.15.2"; + sha256 = "0vxm80cnd4w8zpyq7brnnjmcarb0vj7xgikwpc0il1w6hjgis7vl"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -226412,6 +226466,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-machines_0_15_1" = callPackage + ({ mkDerivation, base, base-compat, bytestring, http-client + , http-media, machines, mtl, servant, servant-client + , servant-server, wai, warp + }: + mkDerivation { + pname = "servant-machines"; + version = "0.15.1"; + sha256 = "0k8abcc72s5bzcf2vmjkxxjnhk45rww6hr3l93msm2510hi6gda4"; + libraryHaskellDepends = [ base bytestring machines mtl servant ]; + testHaskellDepends = [ + base base-compat bytestring http-client http-media machines servant + servant-client servant-server wai warp + ]; + description = "Servant Stream support for machines"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-match" = callPackage ({ mkDerivation, base, bytestring, hspec, http-types, network-uri , servant, text, utf8-string @@ -226669,6 +226742,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-pipes_0_15_2" = callPackage + ({ mkDerivation, base, base-compat, bytestring, http-client + , http-media, monad-control, mtl, pipes, pipes-bytestring + , pipes-safe, servant, servant-client, servant-server, wai, warp + }: + mkDerivation { + pname = "servant-pipes"; + version = "0.15.2"; + sha256 = "1r5irq09j64iapi5n9mzsph984r5f7cyr6zz4sw3xqh648dmf75h"; + libraryHaskellDepends = [ + base bytestring monad-control mtl pipes pipes-safe servant + ]; + testHaskellDepends = [ + base base-compat bytestring http-client http-media pipes + pipes-bytestring pipes-safe servant servant-client servant-server + wai warp + ]; + description = "Servant Stream support for pipes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-pool" = callPackage ({ mkDerivation, base, resource-pool, servant, time }: mkDerivation { @@ -227396,7 +227491,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-swagger_1_1_9" = callPackage + "servant-swagger_1_1_10" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , Cabal, cabal-doctest, directory, doctest, filepath, hspec , hspec-discover, http-media, insert-ordered-containers, lens @@ -227406,8 +227501,8 @@ self: { }: mkDerivation { pname = "servant-swagger"; - version = "1.1.9"; - sha256 = "1l9wll3m3z2dhhhyh8ff1ybn89j5xqiwp110d932yk8dydjdwvs2"; + version = "1.1.10"; + sha256 = "0y6zylhs4z0nfz75d4i2azcq0yh2bd4inanwblx4035dgkk1q78a"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -246968,6 +247063,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tabular_0_2_2_8" = callPackage + ({ mkDerivation, base, csv, html, mtl }: + mkDerivation { + pname = "tabular"; + version = "0.2.2.8"; + sha256 = "0z936gh8n8i8qdkagyxwd9gqq13skd5fv013vdvwsibrxkm0czfb"; + libraryHaskellDepends = [ base csv html mtl ]; + description = "Two-dimensional data tables with rendering functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "taffybar" = callPackage ({ mkDerivation, ansi-terminal, base, broadcast-chan, bytestring , ConfigFile, containers, dbus, dbus-hslogger, directory, dyre @@ -249549,6 +249656,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_5" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.5"; + sha256 = "1s1ynp568i7y5v062kliia46c3cmaijslf2hlmdkkqfdvf8fmzp1"; + libraryHaskellDepends = [ base template-haskell ]; + description = "A backwards compatibility layer for Template Haskell newer than 2.8"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "template-haskell-optics" = callPackage ({ mkDerivation, base, containers, optics-core, template-haskell }: mkDerivation { @@ -262900,21 +263019,31 @@ self: { }) {}; "uniqueness-periods-vector-general" = callPackage - ({ mkDerivation, base, uniqueness-periods-vector - , uniqueness-periods-vector-common, vector + ({ mkDerivation, base, print-info, uniqueness-periods-vector-common + , vector }: mkDerivation { pname = "uniqueness-periods-vector-general"; - version = "0.1.0.0"; - sha256 = "0ndvi6rn2nyqy93z09qr08f6mprjwa3jaaz11ykwv5b2c3a30pn4"; + version = "0.2.0.0"; + sha256 = "0aqjj08y6jf03dcwcvshxm9vzqyk6i05758c994d0xz23pzwi2lx"; libraryHaskellDepends = [ - base uniqueness-periods-vector uniqueness-periods-vector-common - vector + base print-info uniqueness-periods-vector-common vector ]; description = "Generalization of the functionality of the dobutokO-poetry-general-languages package"; license = stdenv.lib.licenses.mit; }) {}; + "uniqueness-periods-vector-properties" = callPackage + ({ mkDerivation, base, uniqueness-periods-vector, vector }: + mkDerivation { + pname = "uniqueness-periods-vector-properties"; + version = "0.1.1.1"; + sha256 = "17bwchd6acnr457rhkrqsanl67nps2d6722ap781havnsvqlff0x"; + libraryHaskellDepends = [ base uniqueness-periods-vector vector ]; + description = "Metrics for the maximum element for the uniqueness-periods-vector packages family"; + license = stdenv.lib.licenses.mit; + }) {}; + "unit" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { @@ -266841,15 +266970,19 @@ self: { }) {}; "vector-fftw" = callPackage - ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: + ({ mkDerivation, base, fftw, primitive, QuickCheck + , storable-complex, test-framework, test-framework-quickcheck2 + , vector + }: mkDerivation { pname = "vector-fftw"; - version = "0.1.3.8"; - sha256 = "0xlr4566hh6lnpinzrk623a96jnb8mp8mq6cymlsl8y38qx36jp6"; - revision = "3"; - editedCabalFile = "0wh7sa71gl1ssqqd4axyvwxlmkfb0n3hm90imjvg0vsp7g2y7zs0"; + version = "0.1.4.0"; + sha256 = "1ns5jhdx585s3jmcslscibf7ryaya3ca1shc4ysrikrp1mzx1jky"; libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ fftw ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 vector + ]; description = "A binding to the fftw library for one-dimensional vectors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; -- cgit 1.4.1 From d9cd2ca21dcb10589b0a780558e553ca23fd06be Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 2 Sep 2020 14:12:02 +0200 Subject: haskellPackages.pandoc-crossref: mark unbroken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 93e6579f4fce3..6a538e281d099 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8335,7 +8335,6 @@ broken-packages: - pam - pan-os-syslog - panda - - pandoc-crossref - pandoc-emphasize-code - pandoc-filter-graphviz - pandoc-include -- cgit 1.4.1 From 6be7f90931197d047aa12732ddc37ab756d71e85 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 2 Sep 2020 20:46:00 +0200 Subject: haskellPackages.haskell-language-server: Fix eval --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7bd25db08a32f..cfb31e2e52c6b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1445,7 +1445,7 @@ self: super: { # Test disabled: it seems to freeze (is it just that it takes a long time ?) ghcide = dontCheck super.hls-ghcide; # we are faster than stack here - hie-bios = dontCheck super.hie-bios_0_7_0; + hie-bios = dontCheck super.hie-bios_0_7_1; lsp-test = dontCheck super.lsp-test_0_11_0_4; # fourmolu can‘t compile with an older aeson aeson = dontCheck super.aeson_1_5_2_0; -- cgit 1.4.1 From 4ac1c225ed8cd21e10b36207764e60ced8c34511 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 3 Sep 2020 02:30:24 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/99b594fbc83a22d6bebb43a6a63f994d472b2680. --- .../haskell-modules/hackage-packages.nix | 240 ++++++++++++++------- 1 file changed, 164 insertions(+), 76 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7a7a92fc48218..256e33cb40b2d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -22568,6 +22568,8 @@ self: { pname = "accelerate-kullback-liebler"; version = "0.1.2.1"; sha256 = "1pvgm5w8m7226wa139h49fd0f5bsrz3a7x30wx3mzjn80acgsm63"; + revision = "1"; + editedCabalFile = "1255a274j1ssiy934kl507giyv6zjmwiipqfj72gjik6ss0ih2vz"; libraryHaskellDepends = [ accelerate base mwc-random-accelerate ]; testHaskellDepends = [ accelerate accelerate-llvm-native accelerate-llvm-ptx base @@ -99781,46 +99783,52 @@ self: { "ghcide" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, containers, cryptohash-sha1, data-default - , deepseq, directory, extra, filepath, fuzzy, ghc, ghc-boot - , ghc-boot-th, ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev + , binary, bytestring, Chart, Chart-diagrams, containers + , cryptohash-sha1, data-default, deepseq, diagrams, diagrams-svg + , directory, extra, filepath, fuzzy, ghc, ghc-boot, ghc-boot-th + , ghc-check, ghc-paths, ghc-typelits-knownnat, gitrev , haddock-library, hashable, haskell-lsp, haskell-lsp-types , hie-bios, hslogger, lens, lsp-test, mtl, network-uri - , optparse-applicative, parser-combinators, prettyprinter - , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances - , regex-tdfa, rope-utf16-splay, safe-exceptions, shake, sorted-list - , stm, syb, tasty, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, tasty-rerun, text, time, transformers, unix - , unordered-containers, utf8-string + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , process, QuickCheck, quickcheck-instances, regex-tdfa + , rope-utf16-splay, safe, safe-exceptions, shake, sorted-list, stm + , syb, tasty, tasty-expected-failure, tasty-hunit, tasty-quickcheck + , tasty-rerun, text, time, transformers, unix, unordered-containers + , utf8-string, yaml }: mkDerivation { pname = "ghcide"; - version = "0.2.0"; - sha256 = "1zadj34583qp8xz0iv2r0anqh96r94jv13iary5bk1m9zbhf4f7v"; + version = "0.3.0"; + sha256 = "001g3240qd9q9j00cmvz9d0b73mbf8mv5204cyf5jh04xcd09908"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson array async base binary bytestring containers data-default - deepseq directory extra filepath fuzzy ghc ghc-boot ghc-boot-th - haddock-library hashable haskell-lsp haskell-lsp-types hslogger mtl - network-uri prettyprinter prettyprinter-ansi-terminal regex-tdfa - rope-utf16-splay safe-exceptions shake sorted-list stm syb text - time transformers unix unordered-containers utf8-string + aeson array async base base16-bytestring binary bytestring + containers cryptohash-sha1 data-default deepseq directory extra + filepath fuzzy ghc ghc-boot ghc-boot-th ghc-check ghc-paths + haddock-library hashable haskell-lsp haskell-lsp-types hie-bios + hslogger mtl network-uri prettyprinter prettyprinter-ansi-terminal + regex-tdfa rope-utf16-splay safe safe-exceptions shake sorted-list + stm syb text time transformers unix unordered-containers + utf8-string ]; executableHaskellDepends = [ - aeson async base base16-bytestring binary bytestring containers - cryptohash-sha1 data-default deepseq directory extra filepath ghc - ghc-check ghc-paths gitrev hashable haskell-lsp haskell-lsp-types - hie-bios hslogger optparse-applicative shake text time + aeson base bytestring containers data-default directory extra + filepath gitrev hashable haskell-lsp haskell-lsp-types hie-bios + lsp-test optparse-applicative process safe-exceptions text unordered-containers ]; testHaskellDepends = [ - aeson base bytestring containers directory extra filepath ghc - ghc-typelits-knownnat haddock-library haskell-lsp haskell-lsp-types - lens lsp-test network-uri parser-combinators QuickCheck - quickcheck-instances rope-utf16-splay shake tasty - tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun - text + aeson base binary bytestring containers directory extra filepath + ghc ghc-typelits-knownnat haddock-library haskell-lsp + haskell-lsp-types lens lsp-test network-uri optparse-applicative + process QuickCheck quickcheck-instances rope-utf16-splay safe + safe-exceptions shake tasty tasty-expected-failure tasty-hunit + tasty-quickcheck tasty-rerun text + ]; + benchmarkHaskellDepends = [ + aeson base Chart Chart-diagrams diagrams diagrams-svg directory + extra filepath shake text yaml ]; description = "The core of an IDE"; license = stdenv.lib.licenses.asl20; @@ -104359,8 +104367,8 @@ self: { pname = "godot-haskell"; version = "0.1.0.0"; sha256 = "02nvs84bq4nif235iycjwkxmabvs0avwm2xilpwv8kddv95z1f8i"; - revision = "3"; - editedCabalFile = "0dpvraw31gpzzlsy7j7mv99jvmwhldycll1hnbw2iscb5zs2g409"; + revision = "4"; + editedCabalFile = "06mb33ll7m24dr6mvzi2r6v0bl6k0680y751563zhz0ybrjypckk"; libraryHaskellDepends = [ aeson ansi-wl-pprint base bytestring casing colour containers lens linear mtl parsec parsers stm template-haskell text @@ -121840,6 +121848,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heapsize" = callPackage + ({ mkDerivation, base, criterion, deepseq, ghc-heap, hashable + , primitive, unordered-containers + }: + mkDerivation { + pname = "heapsize"; + version = "0.1"; + sha256 = "0cmzmz6f572is70sp79fxriywl5d19rcb8c32x22c2yazyl6c6d9"; + libraryHaskellDepends = [ + base deepseq ghc-heap hashable primitive unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq primitive ]; + description = "Determine the size of runtime data structures"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "heapsort" = callPackage ({ mkDerivation, array, base }: mkDerivation { @@ -126696,10 +126720,8 @@ self: { }: mkDerivation { pname = "hledger"; - version = "1.18.1"; - sha256 = "1yl6akcbmz5qy559m0k0cndwb6wdzvq2jqn7ahc46v3ai6hwk20c"; - revision = "1"; - editedCabalFile = "1fz1wwpxf6scr8nnrd2n1g92vya9bd0l54fcx3sqhyk5kaf8kp2z"; + version = "1.19"; + sha256 = "0kbvdpplc7h2xi1kzyk78wnmdxa32psn8swgk1apyzz36m03pax1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126796,8 +126818,8 @@ self: { }: mkDerivation { pname = "hledger-flow"; - version = "0.14.0.0"; - sha256 = "0p8b04kkby1w13zhlrvkpivd17myjdri8c4mwm4l89khkakj94ma"; + version = "0.14.1.0"; + sha256 = "0xw2dqlvfi898d89f3srszylx9p3pasg3mmj6qqnwr5ng612pf4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126887,35 +126909,33 @@ self: { ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array, base , base-compat-batteries, blaze-markup, bytestring, call-stack , cassava, cassava-megaparsec, cmdargs, containers, data-default - , Decimal, deepseq, directory, doctest, extra, fgl, file-embed - , filepath, Glob, hashtables, megaparsec, mtl, old-time, parsec + , Decimal, directory, doctest, extra, fgl, file-embed, filepath + , Glob, hashtables, megaparsec, mtl, old-time, parsec , parser-combinators, pretty-show, regex-tdfa, safe, split, tabular , tasty, tasty-hunit, template-haskell, text, time, timeit - , transformers, uglymemo, utf8-string + , transformers, uglymemo, unordered-containers, utf8-string }: mkDerivation { pname = "hledger-lib"; - version = "1.18.1"; - sha256 = "16fd3412n4vdnjacngjx5078yzmypn389m91308kgbd8anv6bhj4"; - revision = "1"; - editedCabalFile = "1icjbfzdq2yd3h6qx245xyb4qahxih97rx63qhxx3vaicvph40pk"; + version = "1.19"; + sha256 = "0asg5zxi664p1csjs70c40jnrq8z4fhawbjm0v6sl8sbx7pn1rj1"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec - cmdargs containers data-default Decimal deepseq directory extra fgl + cmdargs containers data-default Decimal directory extra fgl file-embed filepath Glob hashtables megaparsec mtl old-time parsec parser-combinators pretty-show regex-tdfa safe split tabular tasty tasty-hunit template-haskell text time timeit transformers uglymemo - utf8-string + unordered-containers utf8-string ]; testHaskellDepends = [ aeson aeson-pretty ansi-terminal array base base-compat-batteries blaze-markup bytestring call-stack cassava cassava-megaparsec - cmdargs containers data-default Decimal deepseq directory doctest - extra fgl file-embed filepath Glob hashtables megaparsec mtl - old-time parsec parser-combinators pretty-show regex-tdfa safe - split tabular tasty tasty-hunit template-haskell text time timeit - transformers uglymemo utf8-string + cmdargs containers data-default Decimal directory doctest extra fgl + file-embed filepath Glob hashtables megaparsec mtl old-time parsec + parser-combinators pretty-show regex-tdfa safe split tabular tasty + tasty-hunit template-haskell text time timeit transformers uglymemo + unordered-containers utf8-string ]; description = "A reusable library providing the core functionality of hledger"; license = stdenv.lib.licenses.gpl3; @@ -126974,8 +126994,8 @@ self: { }: mkDerivation { pname = "hledger-ui"; - version = "1.18.1"; - sha256 = "0ggfz93f14znnjzkznzblsdk6iqbwwj2yxzx5rgsr0xcjzm8gx64"; + version = "1.19"; + sha256 = "1xi67k28b63cbg38771dqncwdh6qrcnb0gr31r5hwkglznk3ajss"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -127022,10 +127042,8 @@ self: { }: mkDerivation { pname = "hledger-web"; - version = "1.18.1"; - sha256 = "1s10xyiqs77xl949m7rc71a4511i755yiv88jb0pc32xba7a2b1y"; - revision = "1"; - editedCabalFile = "01amhyjlw6xjh97zhxx8j05jszw0c0wnv7ka835n7rjnnv8199l3"; + version = "1.19"; + sha256 = "1nmacg23smaagfwzr7qwnlwiswdr4gb8zkscgxkiyfl5z97gy58y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159687,8 +159705,8 @@ self: { }: mkDerivation { pname = "lingo"; - version = "0.5.0.0"; - sha256 = "11ggxcaci3d20vyrgv50xzjrhr3n3y460ixb90hd87wja0m7xnij"; + version = "0.5.0.1"; + sha256 = "0h57g6r2n9q8asx35prn8p5mn35qnp8cy2pdrrpmrvhq7islwd8s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163272,6 +163290,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lrucaching-haxl" = callPackage + ({ mkDerivation, base, hashable, haxl, lrucaching, psqueues }: + mkDerivation { + pname = "lrucaching-haxl"; + version = "0.1.0.0"; + sha256 = "0pn2f671ak1grzjigyvan5wagh9vyqhsz86jfy1z281rd2pw4gk2"; + libraryHaskellDepends = [ base hashable haxl lrucaching psqueues ]; + description = "Combine lrucaching and haxl"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ls-usb" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base-unicode-symbols , cmdtheline, text, usb, usb-id-database, vector @@ -171377,8 +171406,8 @@ self: { pname = "mmark-ext"; version = "0.2.1.2"; sha256 = "1s44vznj8hkk7iymnzczbglxnw1q84gmm8q9yiwh0jkiw4kdi91c"; - revision = "2"; - editedCabalFile = "0q633c7zv0liaz0a46llgy21x0snbfhl33qx9plh2sxhjvhvhmpj"; + revision = "3"; + editedCabalFile = "02i6577qislr0qvgmfamcixpxgb7bh68lg18n3vkq6xbnjxdpwpx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base foldl ghc-syntax-highlighter lucid microlens mmark modern-uri @@ -174031,6 +174060,8 @@ self: { pname = "monoidal-containers"; version = "0.6.0.1"; sha256 = "1j5mfs0ysvwk3jsmq4hlj4l3kasfc28lk1b3xaymf9dw48ac5j82"; + revision = "1"; + editedCabalFile = "06agyfnhr4cr42m4zj7xwl5an3skbjvba53a5i6sl9890gx7mml3"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign semigroups these unordered-containers @@ -189381,8 +189412,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.7.0"; - sha256 = "1mw5bcl0z1vps4xz72pznr1b9ag1g9sxhm2f51wm3236z9q28za6"; + version = "0.3.8.0"; + sha256 = "1dg253ddpf4rinnng1wl8cl37wpbbc1ycigmgihwrsd41r4yv7rd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -189406,8 +189437,6 @@ self: { ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pandoc-csv2table" = callPackage @@ -205531,8 +205560,8 @@ self: { }: mkDerivation { pname = "psql-utils"; - version = "0.1.0.0"; - sha256 = "09s26lqqdy2qah6i0yim9g2h61hramhij7r9kbcccbc3fgv4sd6s"; + version = "0.2.0.0"; + sha256 = "0y195pymiy31d8pyq71hjrh58s3hfzaa58l7qskbf3biyy159sxz"; libraryHaskellDepends = [ aeson base hashable postgresql-simple resource-pool time ]; @@ -212269,6 +212298,21 @@ self: { broken = true; }) {}; + "rediscaching-haxl" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, hashable, haxl + , hedis, network, time + }: + mkDerivation { + pname = "rediscaching-haxl"; + version = "0.1.0.0"; + sha256 = "0mgmrcw1p9q4njrmjal9ckxkli8wb2g12njqaj6xlkin2xz5ym8j"; + libraryHaskellDepends = [ + aeson async base bytestring hashable haxl hedis network time + ]; + description = "Combine redis caching and haxl"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "redland" = callPackage ({ mkDerivation, base, deepseq, raptor2, redland }: mkDerivation { @@ -222540,6 +222584,17 @@ self: { broken = true; }) {}; + "scotty-haxl" = callPackage + ({ mkDerivation, base, haxl, scotty, text }: + mkDerivation { + pname = "scotty-haxl"; + version = "0.1.0.0"; + sha256 = "06wcvjpaar8zd2y6p9j4pxs4l7rkw84s1kmcvacafkw43h1d2bx2"; + libraryHaskellDepends = [ base haxl scotty text ]; + description = "Combine scotty and haxl"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scotty-params-parser" = callPackage ({ mkDerivation, base-prelude, matcher, scotty, success, text , transformers, unordered-containers @@ -222645,6 +222700,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "scotty-utils" = callPackage + ({ mkDerivation, aeson, aeson-result, base, http-types, scotty + , text + }: + mkDerivation { + pname = "scotty-utils"; + version = "0.1.0.0"; + sha256 = "0f77b5xmr5gwswz15i5833karfr1qvyaaiy58khd75n9awfx5jqv"; + libraryHaskellDepends = [ + aeson aeson-result base http-types scotty text + ]; + description = "Scotty utils library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "scotty-view" = callPackage ({ mkDerivation, base, scotty, text, transformers }: mkDerivation { @@ -241529,15 +241599,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_57_0" = callPackage + "stratosphere_0_58_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.57.0"; - sha256 = "1ksxy117bizi4bnj7skv5hq7rsw2gz0w5yg5b3xhc6ialkq9in4z"; + version = "0.58.0"; + sha256 = "17yi1h5rcnhvwzpd27hz5pw1dznmdhg58jwsp37bfxns0hx35ywn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -243231,8 +243301,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.5.0"; - sha256 = "06b5qx20zkvaqvn98jqmq0vqrpkgfvab5wjq7lwlcdm9nn7nrsgi"; + version = "2.6.2"; + sha256 = "00bjr71lawn1ar18vm3p849ffr6r6fmgwn2ksg4vas5rmmy2vwib"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -243247,8 +243317,8 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-client }: mkDerivation { pname = "stripe-haskell"; - version = "2.5.0"; - sha256 = "0qazqygkg6hlfvz6wg3gk2am7qnxzsfqjqh6mgyandz9l141pyx5"; + version = "2.6.2"; + sha256 = "02ydf9i632r2clhvf1f9v0yx7vmpmh37mch1jshazrw3my6sq1vl"; libraryHaskellDepends = [ base stripe-core stripe-http-client ]; description = "Stripe API for Haskell"; license = stdenv.lib.licenses.mit; @@ -243262,8 +243332,8 @@ self: { }: mkDerivation { pname = "stripe-http-client"; - version = "2.5.0"; - sha256 = "1386d2bhql56kazxx89icl1j5ikhhza2cv934x19s5lqsl8089yi"; + version = "2.6.2"; + sha256 = "0xz8dc2mh5mscc3mp5n4h2sch1winpaf7sy1w4s87vv68304jfg3"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls http-types stripe-core text @@ -243332,6 +243402,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stripe-signature_1_0_0_6" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite + , memory, stripe-concepts, text + }: + mkDerivation { + pname = "stripe-signature"; + version = "1.0.0.6"; + sha256 = "0lp3fli9g5yvlxy8f0md2d3wv6z45mw0929b8c0y2xkcsdjvpp5l"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cryptonite memory stripe-concepts + text + ]; + testHaskellDepends = [ base bytestring text ]; + description = "Verification of Stripe webhook signatures"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stripe-tests" = callPackage ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core , mtl, random, stripe-core, text, time, transformers @@ -243339,8 +243427,8 @@ self: { }: mkDerivation { pname = "stripe-tests"; - version = "2.5.0"; - sha256 = "0jqxzdriaysf2lya8p9lc1ind2m4b4nz15dn7vb3sx74vw6lp4s3"; + version = "2.6.2"; + sha256 = "06r1jyf6rjmnd6p2grfs0s0f5x6sswsxw9ip7x81rh9cz5qdshdg"; libraryHaskellDepends = [ aeson base bytestring free hspec hspec-core mtl random stripe-core text time transformers unordered-containers -- cgit 1.4.1 From ad7f8917fd5f330769884efa82ffc304348441eb Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 3 Sep 2020 21:01:42 +0200 Subject: haskellPackages.monoidal-containers: Remove patch --- pkgs/development/haskell-modules/configuration-common.nix | 7 ------- 1 file changed, 7 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index cfb31e2e52c6b..f621bfe541b74 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1231,13 +1231,6 @@ self: super: { x509-validation = dontCheck super.x509-validation; tls = dontCheck super.tls; - # Upstream PR: https://github.com/bgamari/monoidal-containers/pull/62 - # Bump these version bound - monoidal-containers = appendPatch super.monoidal-containers (pkgs.fetchpatch { - url = "https://github.com/bgamari/monoidal-containers/commit/715093b22a015398a1390f636be6f39a0de83254.patch"; - sha256="1lfxvwp8g55ljxvj50acsb0wjhrvp2hvir8y0j5pfjkd1kq628ng"; - }); - patch = appendPatches super.patch [ # Upstream PR: https://github.com/reflex-frp/patch/pull/20 # Makes tests work with hlint 3 -- cgit 1.4.1 From a29ed35bc7af11418e7319150f57a7beab0a8f9a Mon Sep 17 00:00:00 2001 From: Ariel Nunez <54999+ingenieroariel@users.noreply.github.com> Date: Thu, 13 Aug 2020 15:43:19 -0500 Subject: hasura: 1.2.1 -> 1.3.1-beta.1 --- .../haskell-modules/configuration-common.nix | 32 +++++++++ .../haskell-modules/configuration-ghc-8.10.x.nix | 10 +++ .../haskell-modules/configuration-ghc-8.8.x.nix | 7 ++ .../haskell-modules/configuration-hackage2nix.yaml | 13 ++-- .../haskell-modules/hackage-packages.nix | 77 ++++++++++++++++++---- .../haskell-modules/non-hackage-packages.nix | 9 +++ .../patches/hasura-884-compat.patch | 26 ++++++++ .../misc/haskell/hasura/ci-info/default.nix | 22 +++++++ .../misc/haskell/hasura/graphql-engine/default.nix | 73 ++++++++++++++++++++ .../misc/haskell/hasura/graphql-parser/default.nix | 36 ++++++++++ .../misc/haskell/hasura/pg-client/default.nix | 30 +++++++++ pkgs/servers/hasura/ci-info.nix | 22 ------- pkgs/servers/hasura/cli.nix | 2 +- pkgs/servers/hasura/default.nix | 63 ------------------ pkgs/servers/hasura/dependent-map.nix | 13 ---- pkgs/servers/hasura/dependent-sum.nix | 10 --- pkgs/servers/hasura/ghc-heap-view.nix | 18 ----- pkgs/servers/hasura/graphql-engine.nix | 71 -------------------- pkgs/servers/hasura/graphql-parser.nix | 35 ---------- pkgs/servers/hasura/immortal.nix | 17 ----- pkgs/servers/hasura/network-uri.nix | 18 ----- pkgs/servers/hasura/pg-client.nix | 30 --------- pkgs/servers/hasura/these.nix | 25 ------- pkgs/top-level/all-packages.nix | 14 +--- 24 files changed, 321 insertions(+), 352 deletions(-) create mode 100644 pkgs/development/haskell-modules/patches/hasura-884-compat.patch create mode 100644 pkgs/development/misc/haskell/hasura/ci-info/default.nix create mode 100644 pkgs/development/misc/haskell/hasura/graphql-engine/default.nix create mode 100644 pkgs/development/misc/haskell/hasura/graphql-parser/default.nix create mode 100644 pkgs/development/misc/haskell/hasura/pg-client/default.nix delete mode 100644 pkgs/servers/hasura/ci-info.nix delete mode 100644 pkgs/servers/hasura/default.nix delete mode 100644 pkgs/servers/hasura/dependent-map.nix delete mode 100644 pkgs/servers/hasura/dependent-sum.nix delete mode 100644 pkgs/servers/hasura/ghc-heap-view.nix delete mode 100644 pkgs/servers/hasura/graphql-engine.nix delete mode 100644 pkgs/servers/hasura/graphql-parser.nix delete mode 100644 pkgs/servers/hasura/immortal.nix delete mode 100644 pkgs/servers/hasura/network-uri.nix delete mode 100644 pkgs/servers/hasura/pg-client.nix delete mode 100644 pkgs/servers/hasura/these.nix (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f621bfe541b74..e28107d5ae419 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1386,6 +1386,38 @@ self: super: { # Testsuite trying to run `which haskeline-examples-Test` haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0; + # Tests for list-t, superbuffer, and stm-containers + # depend on HTF and it is broken, 2020-08-23 + list-t = dontCheck super.list-t; + superbuffer = dontCheck super.superbuffer; + stm-containers = dontCheck super.stm-containers; + + # Fails with "supports custom headers" + Spock-core = dontCheck super.Spock-core; + + # Needed by Hasura 1.3.1 + dependent-map_0_2_4_0 = super.dependent-map_0_2_4_0.override { + dependent-sum = self.dependent-sum_0_4; + }; + + # Hasura 1.3.1 + # Because of ghc-heap-view, profiling needs to be disabled. + graphql-engine = disableLibraryProfiling( overrideCabal (super.graphql-engine.override { + immortal = self.immortal_0_2_2_1; + dependent-map = self.dependent-map_0_2_4_0; + dependent-sum = self.dependent-sum_0_4; + witherable = self.witherable_0_3_2; + }) (drv: { + # version in cabal file is invalid + version = "1.3.1-beta1"; + # hasura needs VERSION env exported during build + preBuild = "export VERSION=1.3.1-beta1"; + })); + + graphql-parser = super.graphql-parser.override { + protolude = self.protolude_0_3_0; + }; + # Requires repline 0.4 which is the default only for ghc8101, override for the rest zre = super.zre.override { repline = self.repline_0_4_0_0.override { diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index b153d239cb76f..35a7d425a5b60 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -76,6 +76,16 @@ self: super: { singletons = self.singletons_2_7; th-desugar = self.th-desugar_1_11; + insert-ordered-containers = super.insert-ordered-containers.override { + optics-core = self.optics-core_0_3_0_1; + optics-extra = self.optics-extra_0_3.override { + optics-core = self.optics-core_0_3_0_1; + }; + }; + + # Jailbreaking because monoidal-containers hasn‘t bumped it's base dependency for 8.10. + monoidal-containers = doJailbreak super.monoidal-containers; + # `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need # the `ghc-lib-parser` dependency on GHC >= 8.8. However, because we have # multiple verions of `ghc-lib-parser(-ex)` available, and the default ones diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 204b5d5a08cf7..c63605fbfc243 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,6 +41,13 @@ self: super: { unix = null; xhtml = null; + # Hasura 1.3.1 + # Because of ghc-heap-view, profiling needs to be disabled. + graphql-engine = overrideCabal (super.graphql-engine) (drv: { + # GHC 8.8.x needs a revert of https://github.com/hasura/graphql-engine/commit/a77bb0570f4210fb826985e17a84ddcc4c95d3ea + patches = [ ./patches/hasura-884-compat.patch ]; + }); + # GHC 8.8.x can build haddock version 2.23.* haddock = self.haddock_2_23_1; haddock-api = self.haddock-api_2_23_1; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 6a538e281d099..a653e559701d5 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2617,6 +2617,13 @@ extra-packages: - yesod-persistent < 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 - yesod-static ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 - yesod-test ^>= 1.5 # pre-lts-11.x versions neeed by git-annex 6.20180227 + - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 + - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 + - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 + - witherable == 0.3.2 # required by Hasura 1.3.1, 2020-08-20 + - protolude == 0.3.0 # required by Hasura 1.3.1, 2020-08-20 + - optics-core == 0.3.0.1 # required by Hasura 1.3.1, 2020-08-20 + - base-compat == 0.11.1 # required by Hasura 1.3.1, 2020-08-20 package-maintainers: peti: @@ -7368,7 +7375,6 @@ broken-packages: - list-mux - list-prompt - list-remote-forwards - - list-t - list-t-attoparsec - list-t-html-parser - list-t-http-client @@ -8741,7 +8747,6 @@ broken-packages: - prim-array - prim-ref - primes-type - - primitive-extras - primitive-indexed - primitive-maybe - primitive-simd @@ -9874,7 +9879,6 @@ broken-packages: - Spock-api-ghcjs - Spock-api-server - Spock-auth - - Spock-core - Spock-digestive - Spock-lucid - Spock-worker @@ -9982,9 +9986,7 @@ broken-packages: - STL - STLinkUSB - stm-chunked-queues - - stm-containers - stm-firehose - - stm-hamt - stm-promise - stm-stats - stm-supply @@ -10075,7 +10077,6 @@ broken-packages: - sunroof-server - super-user-spark - superbubbles - - superbuffer - supercollider-ht - supercollider-midi - superconstraints diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 256e33cb40b2d..3d32a337d7f0e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -18976,8 +18976,6 @@ self: { ]; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Spock-digestive" = callPackage @@ -71274,6 +71272,20 @@ self: { broken = true; }) {}; + "dependent-map_0_2_4_0" = callPackage + ({ mkDerivation, base, containers, dependent-sum }: + mkDerivation { + pname = "dependent-map"; + version = "0.2.4.0"; + sha256 = "0il2naf6gdkvkhscvqd8kg9v911vdhqp9h10z5546mninnyrdcsx"; + revision = "1"; + editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1"; + libraryHaskellDepends = [ base containers dependent-sum ]; + description = "Dependent finite maps (partial dependent products)"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dependent-map" = callPackage ({ mkDerivation, base, constraints-extras, containers , dependent-sum @@ -71321,6 +71333,18 @@ self: { broken = true; }) {}; + "dependent-sum_0_4" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "dependent-sum"; + version = "0.4"; + sha256 = "07hs9s78wiybwjwkal2yq65hdavq0gg1h2ld7wbph61s2nsfrpm8"; + libraryHaskellDepends = [ base ]; + description = "Dependent sum type"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dependent-sum" = callPackage ({ mkDerivation, base, constraints-extras, some }: mkDerivation { @@ -142704,6 +142728,25 @@ self: { broken = true; }) {}; + "immortal_0_2_2_1" = callPackage + ({ mkDerivation, base, lifted-base, monad-control, stm, tasty + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "immortal"; + version = "0.2.2.1"; + sha256 = "13lddk62byx8w41k80d24q31mmijacnqqz64zrrkls9si2ia2jpd"; + libraryHaskellDepends = [ + base lifted-base monad-control stm transformers-base + ]; + testHaskellDepends = [ + base lifted-base stm tasty tasty-hunit transformers + ]; + description = "Spawn threads that never die (unless told to do so)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "immortal" = callPackage ({ mkDerivation, base, stm, tasty, tasty-hunit, transformers , unliftio-core @@ -160639,8 +160682,6 @@ self: { testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; description = "ListT done right"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "list-t-attoparsec" = callPackage @@ -203027,8 +203068,6 @@ self: { ]; description = "Extras for the \"primitive\" library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "primitive-foreign" = callPackage @@ -240984,8 +241023,6 @@ self: { ]; description = "Containers for STM"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stm-delay" = callPackage @@ -241055,8 +241092,6 @@ self: { ]; description = "STM-specialised Hash Array Mapped Trie"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stm-io-hooks" = callPackage @@ -244515,8 +244550,6 @@ self: { ]; description = "Efficiently build a bytestring from smaller chunks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "supercollider-ht" = callPackage @@ -273203,6 +273236,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "witherable_0_3_2" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable + , monoidal-containers, transformers, transformers-compat + , unordered-containers, vector + }: + mkDerivation { + pname = "witherable"; + version = "0.3.2"; + sha256 = "1iqf3kc9h599lbiym8rf9b4fhj31lqwm1cxqz6x02q9dxyrcprmi"; + revision = "1"; + editedCabalFile = "01mprffm41km3pm5nlpsp2ig2izgl6ll9ylrym3dg01f9609aa0z"; + libraryHaskellDepends = [ + base base-orphans containers hashable monoidal-containers + transformers transformers-compat unordered-containers vector + ]; + description = "filterable traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witherable" = callPackage ({ mkDerivation, base, base-orphans, containers, hashable, lens , monoidal-containers, transformers, transformers-compat diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix index 8801f1f1ddd86..dc6dbe6506142 100644 --- a/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -23,4 +23,13 @@ self: super: { # both are auto-generated by pkgs/development/tools/haskell/haskell-language-server/update.sh haskell-language-server = self.callPackage ../tools/haskell/haskell-language-server { }; hls-ghcide = self.callPackage ../tools/haskell/haskell-language-server/hls-ghcide.nix { }; + + # cabal2nix --revision https://github.com/hasura/ci-info-hs.git + ci-info = self.callPackage ../misc/haskell/hasura/ci-info {}; + # cabal2nix --revision https://github.com/hasura/pg-client-hs.git + pg-client = self.callPackage ../misc/haskell/hasura/pg-client {}; + # cabal2nix --revision https://github.com/hasura/graphql-parser-hs.git + graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser {}; + # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git + graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine {}; } diff --git a/pkgs/development/haskell-modules/patches/hasura-884-compat.patch b/pkgs/development/haskell-modules/patches/hasura-884-compat.patch new file mode 100644 index 0000000000000..bc000ba9cca21 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/hasura-884-compat.patch @@ -0,0 +1,26 @@ +diff --git server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs +index 6cb70cf0..0c3789cd 100644 +--- server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs ++++ server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs +@@ -45,7 +45,7 @@ import GHC.AssertNF + import qualified ListT + import qualified Network.WebSockets as WS + import qualified StmContainers.Map as STMMap +-import qualified System.IO.Error as E ++--import qualified System.IO.Error as E + + import qualified Hasura.Logging as L + +@@ -287,12 +287,6 @@ createServerApp (WSServer logger@(L.Logger writeLog) serverStatus) wsHandlers !p + let rcv = forever $ do + -- Process all messages serially (important!), in a separate thread: + msg <- liftIO $ +- -- Re-throw "receiveloop: resource vanished (Connection reset by peer)" : +- -- https://github.com/yesodweb/wai/blob/master/warp/Network/Wai/Handler/Warp/Recv.hs#L112 +- -- as WS exception signaling cleanup below. It's not clear why exactly this gets +- -- raised occasionally; I suspect an equivalent handler is missing from WS itself. +- -- Regardless this should be safe: +- handleJust (guard . E.isResourceVanishedError) (\()-> throw WS.ConnectionClosed) $ + WS.receiveData conn + writeLog $ WSLog wsId (EMessageReceived $ TBS.fromLBS msg) Nothing + _hOnMessage wsHandlers wsConn msg diff --git a/pkgs/development/misc/haskell/hasura/ci-info/default.nix b/pkgs/development/misc/haskell/hasura/ci-info/default.nix new file mode 100644 index 0000000000000..53c85a2e5ba19 --- /dev/null +++ b/pkgs/development/misc/haskell/hasura/ci-info/default.nix @@ -0,0 +1,22 @@ +{ mkDerivation, aeson, aeson-casing, base, fetchgit, hashable +, hpack, stdenv, template-haskell, text, th-lift-instances +, unordered-containers +}: +mkDerivation { + pname = "ci-info"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/ci-info-hs.git"; + sha256 = "0rn1799z4y7z1c6ijrr0gscarg25zmnfq0z9rrmk4ad727vf1ppc"; + rev = "6af5a68450347a02295a9cd050d05a8b2f5c06ab"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson aeson-casing base hashable template-haskell text + th-lift-instances unordered-containers + ]; + libraryToolDepends = [ hpack ]; + prePatch = "hpack"; + homepage = "https://github.com/hasura/ci-info-hs#readme"; + license = stdenv.lib.licenses.mit; +} diff --git a/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix new file mode 100644 index 0000000000000..0bd68afae4b80 --- /dev/null +++ b/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix @@ -0,0 +1,73 @@ +{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding +, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update +, base, base64-bytestring, byteorder, bytestring, case-insensitive +, ci-info, containers, criterion, cryptonite, data-has, deepseq +, dependent-map, dependent-sum, directory, ekg-core, ekg-json +, fast-logger, fetchgit, file-embed, filepath, generic-arbitrary +, ghc-heap-view, graphql-parser, hashable, hspec, hspec-core +, hspec-expectations-lifted, http-client, http-client-tls +, http-types, immortal, insert-ordered-containers, jose, lens +, lifted-async, lifted-base, list-t, mime-types, monad-control +, monad-time, monad-validate, mtl, mustache, mwc-probability +, mwc-random, natural-transformation, network, network-uri +, optparse-applicative, pem, pg-client, postgresql-binary +, postgresql-libpq, process, profunctors, psqueues, QuickCheck +, regex-tdfa, safe, scientific, semver, shakespeare, split +, Spock-core, stdenv, stm, stm-containers, template-haskell, text +, text-builder, text-conversions, th-lift-instances, these, time +, transformers, transformers-base, unix, unordered-containers +, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets +, wreq, x509, yaml, zlib, witherable, semialign, validation, cron +}: +mkDerivation { + pname = "graphql-engine"; + version = "1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/graphql-engine.git"; + sha256 = "sha256-tNKoi3dtoXj0nn4qBgLBroo7SgX7SdVaHtBqjs1S3hQ="; + rev = "1e3eb035d3c915032ba23e502bcb0132b4d54202"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async + attoparsec attoparsec-iso8601 auto-update base base64-bytestring + byteorder bytestring case-insensitive ci-info containers cryptonite + data-has deepseq dependent-map dependent-sum directory ekg-core + ekg-json fast-logger file-embed filepath generic-arbitrary + ghc-heap-view graphql-parser hashable http-client http-client-tls + http-types immortal insert-ordered-containers jose lens + lifted-async lifted-base list-t mime-types monad-control monad-time + monad-validate mtl mustache network network-uri + optparse-applicative pem pg-client postgresql-binary + postgresql-libpq process profunctors psqueues QuickCheck regex-tdfa + scientific semver shakespeare split Spock-core stm stm-containers + template-haskell text text-builder text-conversions + th-lift-instances these time transformers transformers-base unix + unordered-containers uri-encode uuid vector wai wai-websockets warp + websockets wreq x509 yaml zlib + witherable semialign validation + cron + ]; + executableHaskellDepends = [ + base bytestring pg-client text text-conversions + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-core hspec-expectations-lifted + http-client http-client-tls lifted-base monad-control mtl + natural-transformation optparse-applicative pg-client process + QuickCheck safe split text time transformers-base + unordered-containers + ]; + benchmarkHaskellDepends = [ + async base bytestring criterion deepseq mwc-probability mwc-random + split text vector + ]; + doCheck = false; + homepage = "https://www.hasura.io"; + description = "GraphQL API over Postgres"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ offline ]; +} diff --git a/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix new file mode 100644 index 0000000000000..991b5384d5c21 --- /dev/null +++ b/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix @@ -0,0 +1,36 @@ +{ mkDerivation, aeson, attoparsec, base, bytestring, containers +, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter +, protolude, regex-tdfa, scientific, stdenv, template-haskell, text +, text-builder, th-lift-instances, unordered-containers, vector +}: +mkDerivation { + pname = "graphql-parser"; + version = "0.1.0.1"; + src = fetchgit { + url = "https://github.com/hasura/graphql-parser-hs.git"; + sha256 = "sha256-oem/h0AQPk7eSM/P6wMoWV9KirxutE4hnQWwrpQ6TGk="; + rev = "ba8e26fef1488cf3c8c08e86f02730f56ec84e1f"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers filepath hedgehog + prettyprinter protolude regex-tdfa scientific template-haskell text + text-builder th-lift-instances unordered-containers vector + ]; + libraryToolDepends = [ hpack ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers filepath hedgehog + prettyprinter protolude regex-tdfa scientific template-haskell text + text-builder th-lift-instances unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson attoparsec base bytestring containers criterion filepath + hedgehog prettyprinter protolude regex-tdfa scientific + template-haskell text text-builder th-lift-instances + unordered-containers vector + ]; + doCheck = false; + prePatch = "hpack"; + homepage = "https://github.com/hasura/graphql-parser-hs#readme"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/development/misc/haskell/hasura/pg-client/default.nix b/pkgs/development/misc/haskell/hasura/pg-client/default.nix new file mode 100644 index 0000000000000..725e5e7f64084 --- /dev/null +++ b/pkgs/development/misc/haskell/hasura/pg-client/default.nix @@ -0,0 +1,30 @@ +{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring +, criterion, fetchgit, file-embed, hashable, hashtables, hasql +, hasql-pool, hasql-transaction, monad-control, mtl +, postgresql-binary, postgresql-libpq, resource-pool, retry +, scientific, stdenv, template-haskell, text, text-builder, th-lift +, th-lift-instances, time, transformers-base, uuid, vector +}: +mkDerivation { + pname = "pg-client"; + version = "0.1.0"; + src = fetchgit { + url = "https://github.com/hasura/pg-client-hs.git"; + sha256 = "1941gj5yp24kx0xb1nd774nwp5vnpsp6m83isqkwpyz9spl4sq7l"; + rev = "70a849d09bea9461e72c5a5bbde06df65aab61c0"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson aeson-casing attoparsec base bytestring hashable hashtables + monad-control mtl postgresql-binary postgresql-libpq resource-pool + retry scientific template-haskell text text-builder th-lift + th-lift-instances time transformers-base uuid vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base bytestring criterion file-embed hashable hasql hasql-pool + hasql-transaction mtl postgresql-libpq text text-builder + ]; + homepage = "https://github.com/hasura/platform"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/ci-info.nix b/pkgs/servers/hasura/ci-info.nix deleted file mode 100644 index 53c85a2e5ba19..0000000000000 --- a/pkgs/servers/hasura/ci-info.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ mkDerivation, aeson, aeson-casing, base, fetchgit, hashable -, hpack, stdenv, template-haskell, text, th-lift-instances -, unordered-containers -}: -mkDerivation { - pname = "ci-info"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/hasura/ci-info-hs.git"; - sha256 = "0rn1799z4y7z1c6ijrr0gscarg25zmnfq0z9rrmk4ad727vf1ppc"; - rev = "6af5a68450347a02295a9cd050d05a8b2f5c06ab"; - fetchSubmodules = true; - }; - libraryHaskellDepends = [ - aeson aeson-casing base hashable template-haskell text - th-lift-instances unordered-containers - ]; - libraryToolDepends = [ hpack ]; - prePatch = "hpack"; - homepage = "https://github.com/hasura/ci-info-hs#readme"; - license = stdenv.lib.licenses.mit; -} diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index 88b6b418dd9bd..af2f6f2a11f3f 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -9,7 +9,7 @@ buildGoModule rec { subPackages = [ "cmd/hasura" ]; - vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a"; + vendorSha256 = "sha256-Fp6o3xZ/964q8yzJJFrqWZtQ5zYNy6Wreh42YxWjNbU="; doCheck = false; diff --git a/pkgs/servers/hasura/default.nix b/pkgs/servers/hasura/default.nix deleted file mode 100644 index 0852746603514..0000000000000 --- a/pkgs/servers/hasura/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ haskell }: - -with haskell.lib; - -let - # version in cabal file is invalid - version = "1.2.1"; - - pkgs = haskell.packages.ghc865.override { - overrides = self: super: { - # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git - hasura-graphql-engine = justStaticExecutables - ((self.callPackage ./graphql-engine.nix { }).overrideDerivation (d: { - name = "graphql-engine-${version}"; - - inherit version; - - # hasura needs VERSION env exported during build - preBuild = "export VERSION=${version}"; - })); - - hasura-cli = self.callPackage ./cli.nix { - hasura-graphql-engine = self.hasura-graphql-engine // { - inherit version; - }; - }; - - # internal dependencies, non published on hackage (find revisions in cabal.project file) - # cabal2nix --revision https://github.com/hasura/ci-info-hs.git - ci-info = self.callPackage ./ci-info.nix { }; - # cabal2nix --revision https://github.com/hasura/graphql-parser-hs.git - graphql-parser = self.callPackage ./graphql-parser.nix { }; - # cabal2nix --revision https://github.com/hasura/pg-client-hs.git - pg-client = self.callPackage ./pg-client.nix { }; - - # version constrained dependencies, without these hasura will not build, - # find versions in graphql-engine.cabal - # cabal2nix cabal://dependent-map-0.2.4.0 - dependent-map = self.callPackage ./dependent-map.nix { }; - # cabal2nix cabal://dependent-sum-0.4 - dependent-sum = self.callPackage ./dependent-sum.nix { }; - # cabal2nix cabal://these-0.7.6 - these = doJailbreak (self.callPackage ./these.nix { }); - # cabal2nix cabal://immortal-0.2.2.1 - immortal = self.callPackage ./immortal.nix { }; - # cabal2nix cabal://network-uri-2.6.1.0 - network-uri = self.callPackage ./network-uri.nix { }; - # cabal2nix cabal://ghc-heap-view-0.6.0 - ghc-heap-view = disableLibraryProfiling (self.callPackage ./ghc-heap-view.nix { }); - - # unmark broewn packages and do required modifications - stm-hamt = doJailbreak (unmarkBroken super.stm-hamt); - superbuffer = dontCheck (doJailbreak (unmarkBroken super.superbuffer)); - Spock-core = dontCheck (unmarkBroken super.Spock-core); - stm-containers = dontCheck (unmarkBroken super.stm-containers); - ekg-json = unmarkBroken super.ekg-json; - list-t = dontCheck (unmarkBroken super.list-t); - primitive-extras = unmarkBroken super.primitive-extras; - }; - }; -in { - inherit (pkgs) hasura-graphql-engine hasura-cli; -} diff --git a/pkgs/servers/hasura/dependent-map.nix b/pkgs/servers/hasura/dependent-map.nix deleted file mode 100644 index 68ebb616b5f6f..0000000000000 --- a/pkgs/servers/hasura/dependent-map.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ mkDerivation, base, containers, dependent-sum, stdenv }: -mkDerivation { - pname = "dependent-map"; - version = "0.2.4.0"; - sha256 = "5db396bdb5d156434af920c074316c3b84b4d39ba8e1cd349c7bb6679cb28246"; - revision = "1"; - editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1"; - libraryHaskellDepends = [ base containers dependent-sum ]; - homepage = "https://github.com/mokus0/dependent-map"; - description = "Dependent finite maps (partial dependent products)"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; -} diff --git a/pkgs/servers/hasura/dependent-sum.nix b/pkgs/servers/hasura/dependent-sum.nix deleted file mode 100644 index 90717b8736604..0000000000000 --- a/pkgs/servers/hasura/dependent-sum.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ mkDerivation, base, stdenv }: -mkDerivation { - pname = "dependent-sum"; - version = "0.4"; - sha256 = "a8deecb4153a1878173f8d0a18de0378ab068bc15e5035b9e4cb478e8e4e1a1e"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/mokus0/dependent-sum"; - description = "Dependent sum type"; - license = stdenv.lib.licenses.publicDomain; -} diff --git a/pkgs/servers/hasura/ghc-heap-view.nix b/pkgs/servers/hasura/ghc-heap-view.nix deleted file mode 100644 index 54c873baee4bd..0000000000000 --- a/pkgs/servers/hasura/ghc-heap-view.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ mkDerivation, base, binary, bytestring, Cabal, containers -, deepseq, filepath, ghc-heap, stdenv, template-haskell -, transformers -}: -mkDerivation { - pname = "ghc-heap-view"; - version = "0.6.0"; - sha256 = "99ed6034d02a7a942e1b6ed970e9f7028dcdfd5b5d29fd8a0fb89f1a5e7c5ec8"; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal filepath ]; - libraryHaskellDepends = [ - base binary bytestring containers ghc-heap template-haskell - transformers - ]; - testHaskellDepends = [ base deepseq ]; - description = "Extract the heap representation of Haskell values and thunks"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/servers/hasura/graphql-engine.nix b/pkgs/servers/hasura/graphql-engine.nix deleted file mode 100644 index 05ba895be080a..0000000000000 --- a/pkgs/servers/hasura/graphql-engine.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding -, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update -, base, base64-bytestring, byteorder, bytestring, case-insensitive -, ci-info, containers, criterion, cryptonite, data-has, deepseq -, dependent-map, dependent-sum, directory, ekg-core, ekg-json -, fast-logger, fetchgit, file-embed, filepath, generic-arbitrary -, ghc-heap-view, graphql-parser, hashable, hspec, hspec-core -, hspec-expectations-lifted, http-client, http-client-tls -, http-types, immortal, insert-ordered-containers, jose, lens -, lifted-async, lifted-base, list-t, mime-types, monad-control -, monad-time, monad-validate, mtl, mustache, mwc-probability -, mwc-random, natural-transformation, network, network-uri -, optparse-applicative, pem, pg-client, postgresql-binary -, postgresql-libpq, process, profunctors, psqueues, QuickCheck -, regex-tdfa, safe, scientific, semver, shakespeare, split -, Spock-core, stdenv, stm, stm-containers, template-haskell, text -, text-builder, text-conversions, th-lift-instances, these, time -, transformers, transformers-base, unix, unordered-containers -, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets -, wreq, x509, yaml, zlib -}: -mkDerivation { - pname = "graphql-engine"; - version = "1.0.0"; - src = fetchgit { - url = "https://github.com/hasura/graphql-engine.git"; - sha256 = "0hg44zl3gqa8lq7kggwgmgbsgdc7zrv5cxs507vilg11xklsbz4l"; - rev = "27b0b59361cebecd074bd59123f602e7b013bac1"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async - attoparsec attoparsec-iso8601 auto-update base base64-bytestring - byteorder bytestring case-insensitive ci-info containers cryptonite - data-has deepseq dependent-map dependent-sum directory ekg-core - ekg-json fast-logger file-embed filepath generic-arbitrary - ghc-heap-view graphql-parser hashable http-client http-client-tls - http-types immortal insert-ordered-containers jose lens - lifted-async lifted-base list-t mime-types monad-control monad-time - monad-validate mtl mustache network network-uri - optparse-applicative pem pg-client postgresql-binary - postgresql-libpq process profunctors psqueues QuickCheck regex-tdfa - scientific semver shakespeare split Spock-core stm stm-containers - template-haskell text text-builder text-conversions - th-lift-instances these time transformers transformers-base unix - unordered-containers uri-encode uuid vector wai wai-websockets warp - websockets wreq x509 yaml zlib - ]; - executableHaskellDepends = [ - base bytestring pg-client text text-conversions - ]; - testHaskellDepends = [ - aeson base bytestring hspec hspec-core hspec-expectations-lifted - http-client http-client-tls lifted-base monad-control mtl - natural-transformation optparse-applicative pg-client process - QuickCheck safe split text time transformers-base - unordered-containers - ]; - benchmarkHaskellDepends = [ - async base bytestring criterion deepseq mwc-probability mwc-random - split text vector - ]; - doCheck = false; - homepage = "https://www.hasura.io"; - description = "GraphQL API over Postgres"; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ offline ]; -} diff --git a/pkgs/servers/hasura/graphql-parser.nix b/pkgs/servers/hasura/graphql-parser.nix deleted file mode 100644 index 8066bb83dd0ac..0000000000000 --- a/pkgs/servers/hasura/graphql-parser.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ mkDerivation, aeson, attoparsec, base, bytestring, containers -, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter -, protolude, regex-tdfa, scientific, stdenv, template-haskell, text -, text-builder, th-lift-instances, unordered-containers, vector -}: -mkDerivation { - pname = "graphql-parser"; - version = "0.1.0.0"; - src = fetchgit { - url = "https://github.com/hasura/graphql-parser-hs.git"; - sha256 = "0vz0sqqmr1l02d3f1pc5k7rm7vpxmg5d5ijvdcwdm34yw6x5lz1v"; - rev = "623ad78aa46e7ba2ef1aa58134ad6136b0a85071"; - fetchSubmodules = true; - }; - libraryHaskellDepends = [ - aeson attoparsec base bytestring containers filepath hedgehog - prettyprinter protolude regex-tdfa scientific template-haskell text - text-builder th-lift-instances unordered-containers vector - ]; - libraryToolDepends = [ hpack ]; - testHaskellDepends = [ - aeson attoparsec base bytestring containers filepath hedgehog - prettyprinter protolude regex-tdfa scientific template-haskell text - text-builder th-lift-instances unordered-containers vector - ]; - benchmarkHaskellDepends = [ - aeson attoparsec base bytestring containers criterion filepath - hedgehog prettyprinter protolude regex-tdfa scientific - template-haskell text text-builder th-lift-instances - unordered-containers vector - ]; - prePatch = "hpack"; - homepage = "https://github.com/hasura/graphql-parser-hs#readme"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/servers/hasura/immortal.nix b/pkgs/servers/hasura/immortal.nix deleted file mode 100644 index c53f0f18709ca..0000000000000 --- a/pkgs/servers/hasura/immortal.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ mkDerivation, base, lifted-base, monad-control, stdenv, stm -, tasty, tasty-hunit, transformers, transformers-base -}: -mkDerivation { - pname = "immortal"; - version = "0.2.2.1"; - sha256 = "ed4aa1a2883a693a73fec47c8c2d5332d61a0626a2013403e1a8fb25cc6c8d8e"; - libraryHaskellDepends = [ - base lifted-base monad-control stm transformers-base - ]; - testHaskellDepends = [ - base lifted-base stm tasty tasty-hunit transformers - ]; - homepage = "https://github.com/feuerbach/immortal"; - description = "Spawn threads that never die (unless told to do so)"; - license = stdenv.lib.licenses.mit; -} diff --git a/pkgs/servers/hasura/network-uri.nix b/pkgs/servers/hasura/network-uri.nix deleted file mode 100644 index 45016d470a8d1..0000000000000 --- a/pkgs/servers/hasura/network-uri.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ mkDerivation, base, deepseq, HUnit, parsec, stdenv -, test-framework, test-framework-hunit, test-framework-quickcheck2 -}: -mkDerivation { - pname = "network-uri"; - version = "2.6.1.0"; - sha256 = "423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0"; - revision = "1"; - editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32"; - libraryHaskellDepends = [ base deepseq parsec ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - homepage = "https://github.com/haskell/network-uri"; - description = "URI manipulation"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/servers/hasura/pg-client.nix b/pkgs/servers/hasura/pg-client.nix deleted file mode 100644 index 725e5e7f64084..0000000000000 --- a/pkgs/servers/hasura/pg-client.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring -, criterion, fetchgit, file-embed, hashable, hashtables, hasql -, hasql-pool, hasql-transaction, monad-control, mtl -, postgresql-binary, postgresql-libpq, resource-pool, retry -, scientific, stdenv, template-haskell, text, text-builder, th-lift -, th-lift-instances, time, transformers-base, uuid, vector -}: -mkDerivation { - pname = "pg-client"; - version = "0.1.0"; - src = fetchgit { - url = "https://github.com/hasura/pg-client-hs.git"; - sha256 = "1941gj5yp24kx0xb1nd774nwp5vnpsp6m83isqkwpyz9spl4sq7l"; - rev = "70a849d09bea9461e72c5a5bbde06df65aab61c0"; - fetchSubmodules = true; - }; - libraryHaskellDepends = [ - aeson aeson-casing attoparsec base bytestring hashable hashtables - monad-control mtl postgresql-binary postgresql-libpq resource-pool - retry scientific template-haskell text text-builder th-lift - th-lift-instances time transformers-base uuid vector - ]; - testHaskellDepends = [ base ]; - benchmarkHaskellDepends = [ - base bytestring criterion file-embed hashable hasql hasql-pool - hasql-transaction mtl postgresql-libpq text text-builder - ]; - homepage = "https://github.com/hasura/platform"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/servers/hasura/these.nix b/pkgs/servers/hasura/these.nix deleted file mode 100644 index 396f9e2a28248..0000000000000 --- a/pkgs/servers/hasura/these.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ mkDerivation, aeson, base, base-compat, bifunctors, binary -, containers, data-default-class, deepseq, hashable, keys, lens -, mtl, QuickCheck, quickcheck-instances, semigroupoids, stdenv -, tasty, tasty-quickcheck, transformers, transformers-compat -, unordered-containers, vector, vector-instances -}: -mkDerivation { - pname = "these"; - version = "0.7.6"; - sha256 = "9464b83d98e626360a8ad9836ba77e5201cd1e9c89b95b1b11a28ef3c23ac746"; - libraryHaskellDepends = [ - aeson base base-compat bifunctors binary containers - data-default-class deepseq hashable keys lens mtl QuickCheck - semigroupoids transformers transformers-compat unordered-containers - vector vector-instances - ]; - testHaskellDepends = [ - aeson base base-compat bifunctors binary containers hashable lens - QuickCheck quickcheck-instances tasty tasty-quickcheck transformers - unordered-containers vector - ]; - homepage = "https://github.com/isomorphism/these"; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; - license = stdenv.lib.licenses.bsd3; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02caffbfa8303..844622abdfa36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16300,17 +16300,9 @@ in hashi-ui = callPackage ../servers/hashi-ui {}; - /* This package duplicates a lot of functionality from haskellPackages - instead of using the packages we maintain there. Now, a recent update to - haskellPackages causes these tools to fail evaluation, and I have been - unable to mark them as "broken" in a way that ofBorg bot recognizes. Since - I don't want to merge code into master that generates evaluation errors, I - have no other idea but to comment them out entirely. - - inherit (callPackage ../servers/hasura { }) - hasura-cli - hasura-graphql-engine; - */ + hasura-graphql-engine = haskellPackages.graphql-engine; + + hasura-cli = callPackage ../servers/hasura/cli.nix { }; heapster = callPackage ../servers/monitoring/heapster { }; -- cgit 1.4.1 From cca4dcd2b7e53df28c56aded71a566e48c9697fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 02:30:23 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/f491652f2c15d37105f94a7821159839a6661da0. --- .../haskell-modules/hackage-packages.nix | 130 ++++++++++++++++----- 1 file changed, 102 insertions(+), 28 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3d32a337d7f0e..88eacf36b332c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -37546,15 +37546,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "base16_0_3_0_0" = callPackage + "base16_0_3_0_1" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion , deepseq, primitive, QuickCheck, random-bytestring, tasty , tasty-hunit, tasty-quickcheck, text, text-short }: mkDerivation { pname = "base16"; - version = "0.3.0.0"; - sha256 = "151g3lxma65z0hqi3pqy57bidkhibvdsppkl37p1cldg7whvc708"; + version = "0.3.0.1"; + sha256 = "10id9h9mas4kb4kfiz7hhp2hhwnb9mh92pr327c53jqxi4hazgnd"; libraryHaskellDepends = [ base bytestring deepseq primitive text text-short ]; @@ -49385,7 +49385,7 @@ self: { "calamity" = callPackage ({ mkDerivation, aeson, async, base, bytestring, colour , concurrent-extra, containers, data-default-class, data-flags - , deepseq, deque, df1, di-polysemy, exceptions, fmt, focus + , deepseq, deque, df1, di-core, di-polysemy, exceptions, fmt, focus , generic-lens, generic-override, generic-override-aeson, hashable , http-date, http-types, lens, lens-aeson, megaparsec, mime-types , mtl, polysemy, polysemy-plugin, reflection, safe-exceptions @@ -49395,11 +49395,11 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.19.2"; - sha256 = "14vw42zsyzcdi5nmgfl2mi4zxqbkvmd525ybsx324qj3cp3k8mn6"; + version = "0.1.20.0"; + sha256 = "0b11nkh4wynb8rdhn8qym5422l0nc49shkkp2mfbwh7yhmzaqwrh"; libraryHaskellDepends = [ aeson async base bytestring colour concurrent-extra containers - data-default-class data-flags deepseq deque df1 di-polysemy + data-default-class data-flags deepseq deque df1 di-core di-polysemy exceptions fmt focus generic-lens generic-override generic-override-aeson hashable http-date http-types lens lens-aeson megaparsec mime-types mtl polysemy polysemy-plugin @@ -72957,8 +72957,8 @@ self: { ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: mkDerivation { pname = "di-polysemy"; - version = "0.1.4.0"; - sha256 = "0p9wyli73skjbdbb0dgqb3p37rbijpadywsi0dwjdwdzpddjarcm"; + version = "0.2.0.0"; + sha256 = "09n9kjfv6zx016zkglr0ya0gmi18xdgl08iv7pvh41h0mp435aaq"; libraryHaskellDepends = [ base df1 di-core di-df1 di-handle polysemy ]; @@ -82076,6 +82076,29 @@ self: { broken = true; }) {}; + "encryptable" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, esqueleto + , generic-arbitrary, hspec, persistent, persistent-template + , QuickCheck, quickcheck-instances, text, universum + }: + mkDerivation { + pname = "encryptable"; + version = "0.1"; + sha256 = "0svvzk2js91qzcmbsfjcs2qs65a2b5ywgbpnyqidz53dlnbbk2r1"; + libraryHaskellDepends = [ + base bytestring cryptonite esqueleto generic-arbitrary hspec + persistent persistent-template QuickCheck quickcheck-instances text + universum + ]; + testHaskellDepends = [ + base bytestring cryptonite esqueleto generic-arbitrary hspec + persistent persistent-template QuickCheck quickcheck-instances text + universum + ]; + description = "Typed encryption with persistent support"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "endo" = callPackage ({ mkDerivation, base, between, data-default-class, mtl , transformers @@ -83082,6 +83105,20 @@ self: { broken = true; }) {}; + "errata" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "errata"; + version = "0.1.0.0"; + sha256 = "193m9c0409jvk6s8acqad3dg5x97mr6814gq0diyc3yc7b7mdmvf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers text ]; + executableHaskellDepends = [ base containers text ]; + description = "Source code error pretty printing"; + license = stdenv.lib.licenses.mit; + }) {}; + "errno" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -126897,8 +126934,8 @@ self: { }: mkDerivation { pname = "hledger-interest"; - version = "1.5.5"; - sha256 = "1rsi0mpdgi0g7m07y8bd3gpw5jc8saxw15ab7yhxif4m7dfwjgmg"; + version = "1.6.0"; + sha256 = "0s0pmdm1vk4ib5ncs9mxyzr3dx5m6ji9778kddzqwxc9y9gvq5sq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -148980,6 +149017,8 @@ self: { pname = "json-api-lib"; version = "0.3.0.0"; sha256 = "14lycfqjp3v6lnr4vqagps80dpvy8z6gs6sqq3qz184xyw4m2ini"; + revision = "1"; + editedCabalFile = "16k87v87lq2xf3rbig4229a2gc3p6s9a771g48a95xc0rk4k4hkk"; libraryHaskellDepends = [ aeson base containers data-default deepseq lens lens-aeson text unordered-containers uri-encode @@ -165309,6 +165348,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "managed_1_0_8" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "managed"; + version = "1.0.8"; + sha256 = "00wzfy9facwgimrilz7bxaigr79w10733h8zfgyhll644p2rnz38"; + libraryHaskellDepends = [ base transformers ]; + description = "A monad for managed values"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "manatee" = callPackage ({ mkDerivation, base, binary, cairo, containers, dbus-client , dbus-core, derive, directory, filepath, gtk, gtk-serialized-event @@ -189453,8 +189504,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.8.0"; - sha256 = "1dg253ddpf4rinnng1wl8cl37wpbbc1ycigmgihwrsd41r4yv7rd"; + version = "0.3.8.1"; + sha256 = "15h484xq015jy65mzaqjqyi4ppnqfrdvvj1llmp8k00vb2xcrzrr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -199086,29 +199137,29 @@ self: { ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring , case-insensitive, co-log-core, co-log-polysemy, composition , containers, data-default, either, hedgehog, http-client - , http-client-tls, http-conduit, http-types, lens, mono-traversable - , network, polysemy, polysemy-plugin, relude, servant - , servant-client, servant-server, string-interpolate, tasty - , tasty-hedgehog, template-haskell, text, warp + , http-client-tls, http-conduit, http-types, lens, network + , polysemy, polysemy-plugin, relude, servant, servant-client + , servant-server, string-interpolate, tasty, tasty-hedgehog + , template-haskell, text, warp }: mkDerivation { pname = "polysemy-http"; - version = "0.1.0.0"; - sha256 = "025dch3cq8bgyy78yg4jrcxxmkdyl03y38zrgjhfv00rrwcffhm0"; + version = "0.2.0.1"; + sha256 = "0a8sq6pfwskviqkblz5i7c2f604xpkv7j07kfngci3xspbskk71v"; libraryHaskellDepends = [ aeson ansi-terminal base-noprelude bytestring case-insensitive co-log-core co-log-polysemy composition containers data-default either http-client http-client-tls http-conduit http-types lens - mono-traversable polysemy polysemy-plugin relude string-interpolate - template-haskell text + polysemy polysemy-plugin relude string-interpolate template-haskell + text ]; testHaskellDepends = [ aeson ansi-terminal base-noprelude bytestring case-insensitive co-log-core co-log-polysemy composition containers data-default either hedgehog http-client http-client-tls http-conduit http-types - lens mono-traversable network polysemy polysemy-plugin relude - servant servant-client servant-server string-interpolate tasty - tasty-hedgehog template-haskell text warp + lens network polysemy polysemy-plugin relude servant servant-client + servant-server string-interpolate tasty tasty-hedgehog + template-haskell text warp ]; description = "Polysemy effect for http-client"; license = "BSD-2-Clause-Patent"; @@ -209527,8 +209578,8 @@ self: { pname = "random"; version = "1.2.0"; sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; - revision = "1"; - editedCabalFile = "11l9bcjy63qvcm4n7djp2l1l8668hbckkkdb2nj5g6iyy9pb2sa9"; + revision = "2"; + editedCabalFile = "1pjpv8rzbwhr881ayxbvz4filvx3qkdx13pa21407p5fiyf208a3"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest mwc-random primitive smallcheck @@ -255086,8 +255137,8 @@ self: { }: mkDerivation { pname = "timezone-detect"; - version = "0.2.2.0"; - sha256 = "0ksjc83iq48msyk4fy90rdn09y3bannslic2cycn7rjzw14kz206"; + version = "0.3.0.0"; + sha256 = "10pv88wmz8zqr1h3zh66skbkma2zz3gvwjaalnpfz5ii2dgl27yy"; libraryHaskellDepends = [ base time timezone-olson timezone-series ]; @@ -275490,6 +275541,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xeno_0_4_2" = callPackage + ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib + , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl + , mutable-containers, time, vector, weigh, xml + }: + mkDerivation { + pname = "xeno"; + version = "0.4.2"; + sha256 = "0dvjzh7yyijwy2d6215wlxlln9h0ng6bnqasfh38prp6sllxk25j"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base bytestring deepseq mtl mutable-containers vector + ]; + testHaskellDepends = [ base bytestring hexml hspec ]; + benchmarkHaskellDepends = [ + base bytestring bytestring-mmap bzlib criterion deepseq filepath + ghc-prim hexml hexpat time weigh xml + ]; + description = "A fast event-based XML parser in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xenstore" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, network }: mkDerivation { -- cgit 1.4.1 From 037e178a437d56e6f41406cdac679ae75f72a83f Mon Sep 17 00:00:00 2001 From: maralorn Date: Fri, 4 Sep 2020 02:58:04 +0200 Subject: haskellPackages.ghcide: Fix build (#97052) --- pkgs/development/haskell-modules/configuration-common.nix | 10 +++++++++- .../development/haskell-modules/configuration-hackage2nix.yaml | 3 --- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e28107d5ae419..bcb849732f8b0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1209,7 +1209,15 @@ self: super: { # this will probably need to get updated with every ghcide update, # we need an override because ghcide is tracking haskell-lsp closely. - ghcide = dontCheck (super.ghcide.override { ghc-check = self.ghc-check_0_3_0_1; }); + ghcide = dontCheck (appendPatch (super.ghcide.override { + hie-bios = dontCheck super.hie-bios_0_7_1; + lsp-test = dontCheck self.lsp-test_0_11_0_4; + }) (pkgs.fetchpatch { + # This patch loosens the hie-bios upper bound. + # It is already merged into upstream and won‘t be needed for ghcide 0.4.0 + url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch"; + sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz"; + })); # hasn‘t bumped upper bounds # upstream: https://github.com/obsidiansystems/which/pull/6 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a653e559701d5..831fd242cc13b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2563,7 +2563,6 @@ extra-packages: - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - doctemplates == 0.8 # required by pandoc-2.9.x - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - - ghc-check == 0.3.0.1 # only version compatible with ghcide 0.2.0 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - gi-gdk == 3.0.23 # required for gi-pango 1.0.23 - gi-gtk == 3.0.35 # required for gi-pango 1.0.23 @@ -2575,8 +2574,6 @@ extra-packages: - happy <1.19.6 # newer versions break Agda - happy == 1.19.9 # for purescript - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - - haskell-lsp == 0.22.* # required for ghcide 0.2.0 - - haskell-lsp-types == 0.22.* # required for ghcide 0.2.0 - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hoogle == 5.0.14 # required by hie-hoogle -- cgit 1.4.1 From 89cfe0167937b52e2fe06666ec02e18aa83fd9cb Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 4 Sep 2020 03:24:17 +0200 Subject: haskellPackages.haskell-language-server: 0.3.0 -> 0.4.0 --- pkgs/development/haskell-modules/configuration-common.nix | 11 +++++++++-- .../tools/haskell/haskell-language-server/default.nix | 6 +++--- .../tools/haskell/haskell-language-server/hls-ghcide.nix | 6 +++--- .../tools/haskell/haskell-language-server/update.sh | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index bcb849732f8b0..5c111f7d1c80c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1473,10 +1473,11 @@ self: super: { # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let + inherit (self) hls-ghcide; hlsScopeOverride = self: super: { # haskell-language-server uses its own fork of ghcide # Test disabled: it seems to freeze (is it just that it takes a long time ?) - ghcide = dontCheck super.hls-ghcide; + ghcide = hls-ghcide; # we are faster than stack here hie-bios = dontCheck super.hie-bios_0_7_1; lsp-test = dontCheck super.lsp-test_0_11_0_4; @@ -1488,7 +1489,13 @@ self: super: { in { # jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357) haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride)); - hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride); + hls-ghcide = appendPatch (dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride)) + (pkgs.fetchpatch { + # This patch loosens the hie-bios upper bound. + # It is already merged into upstream and won‘t be needed for ghcide 0.4.0 + url = "https://github.com/haskell/ghcide/commit/3e1b3620948870a4da8808ca0c0897fbd3ecad16.patch"; + sha256 = "1jwn7jgi740x6wwv1k0mz9d4z0b9p3mzs54pdg4nfq0h2v7zxchz"; + }); fourmolu = super.fourmolu.overrideScope hlsScopeOverride; } ) // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/tools/haskell/haskell-language-server/default.nix b/pkgs/development/tools/haskell/haskell-language-server/default.nix index 9373b902dbd78..c29ed6ce07ef7 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/default.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/default.nix @@ -11,11 +11,11 @@ }: mkDerivation { pname = "haskell-language-server"; - version = "0.3.0.0"; + version = "0.4.0.0"; src = fetchgit { url = "https://github.com/haskell/haskell-language-server.git"; - sha256 = "0gh3sgy6a08d8d3q6r2qn5r817ilzka2qkp0g0y6wsx7rjwag0yx"; - rev = "23dda97f583e8ff39993b89c01bbd1ac24187605"; + sha256 = "157bsq6i824bl6krw7znp0byd8ibaqsq7mfwnkl741dmrflsxpa9"; + rev = "cb861b878ae01911b066182ff0d8080050c3b2d6"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix index 9674ca1272d45..c6a9b31fb7383 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix @@ -17,9 +17,9 @@ mkDerivation { pname = "ghcide"; version = "0.2.0"; src = fetchgit { - url = "https://github.com/wz1000/ghcide"; - sha256 = "112bsk2660750n94gnsgrvd30rk0ccxb8dbhka606a11pcqv5cgx"; - rev = "3f6cd4553279ec47d1599b502720791a4f4613cd"; + url = "https://github.com/haskell/ghcide"; + sha256 = "1zq7ngaak8il91a309rl51dghzasnk4m2sm3av6d93cyqyra1hfc"; + rev = "078e3d3c0d319f83841ccbcdc60ff5f0e243f6be"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh index 002ccab401112..2f2741e9a49aa 100755 --- a/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -29,7 +29,7 @@ ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell echo "Updating haskell-language-server's ghcide from old version $ghcide_old_version to new version $ghcide_new_version." echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..." -cabal2nix --revision "$ghcide_new_version" "https://github.com/wz1000/ghcide" > "$ghcide_derivation_file" +cabal2nix --revision "$ghcide_new_version" "https://github.com/haskell/ghcide" > "$ghcide_derivation_file" # =========================== -- cgit 1.4.1 From adad7ff23244ebb90743327932e5edcf75752126 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:55:37 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-14-g12d3fb3 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/43aab36e8f475c48624aea2d96371aeb4a57be20. --- .../haskell-modules/hackage-packages.nix | 144 ++++++++++++++++----- 1 file changed, 111 insertions(+), 33 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 88eacf36b332c..a2bf6d0f4a737 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8892,8 +8892,8 @@ self: { }: mkDerivation { pname = "HPDF"; - version = "1.5.0"; - sha256 = "0bwj0haxw9a061xzn5zh2qc5d958n0g9izbnn0w08dazfjyl8v46"; + version = "1.5.1"; + sha256 = "0kqbfzcqapxvkg52mixqjhxb79ziyfsfvazbzrwjvhp9nqhikn6y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -98460,22 +98460,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-check_0_3_0_1" = callPackage - ({ mkDerivation, base, filepath, ghc, ghc-paths, process - , template-haskell, transformers - }: - mkDerivation { - pname = "ghc-check"; - version = "0.3.0.1"; - sha256 = "180xqs4g90v9sdjb0b3baqk62gbnw1xkv76wdq5ap49q0730s3vz"; - libraryHaskellDepends = [ - base filepath ghc ghc-paths process template-haskell transformers - ]; - description = "detect mismatches between compile-time and run-time versions of the ghc api"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-check" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-paths, process, safe-exceptions, template-haskell @@ -134702,6 +134686,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-megaparsec_2_2_0" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-expectations + , megaparsec + }: + mkDerivation { + pname = "hspec-megaparsec"; + version = "2.2.0"; + sha256 = "0hyf06gzzqd6sqd76crwxycwgx804sd39z7i0c2vmv1qgsxv82gn"; + libraryHaskellDepends = [ + base containers hspec-expectations megaparsec + ]; + testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; + description = "Utility functions for testing Megaparsec parsers with Hspec"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-meta" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, HUnit @@ -143658,20 +143659,20 @@ self: { ({ mkDerivation, base, cleveland, constraints, containers, fmt , hedgehog, hspec-expectations, HUnit, lorentz, morley , morley-prelude, reflection, singletons, tasty, tasty-discover - , tasty-hedgehog, tasty-hunit-compat, template-haskell, vinyl + , tasty-hedgehog, tasty-hunit-compat, vinyl, with-utf8 }: mkDerivation { pname = "indigo"; - version = "0.2.0"; - sha256 = "070ha5s8yirci7zdnh8gy8hdh158zsj7z7blwsr7inw753fsh1jp"; + version = "0.2.1"; + sha256 = "07zgqg6d4ijfvdg0q9lgfi545c903lc6mbcc9mzyfl4b3gpxqfpj"; libraryHaskellDepends = [ base constraints containers lorentz morley morley-prelude - reflection singletons template-haskell vinyl + reflection singletons vinyl with-utf8 ]; testHaskellDepends = [ base cleveland containers fmt hedgehog hspec-expectations HUnit lorentz morley morley-prelude singletons tasty tasty-hedgehog - tasty-hunit-compat + tasty-hunit-compat with-utf8 ]; testToolDepends = [ tasty-discover ]; description = "Convenient imperative eDSL over Lorentz"; @@ -168289,6 +168290,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "megaparsec_9_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , criterion, deepseq, mtl, parser-combinators, scientific, text + , transformers, weigh + }: + mkDerivation { + pname = "megaparsec"; + version = "9.0.0"; + sha256 = "1x10f2b14ww306am9w06s23va26ab3vwdh0jk67ql6ybigxh0asi"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers deepseq mtl + parser-combinators scientific text transformers + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq text weigh + ]; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "megaparsec-tests" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , hspec, hspec-discover, hspec-expectations, hspec-megaparsec @@ -168315,6 +168337,31 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "megaparsec-tests_9_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , hspec, hspec-discover, hspec-expectations, hspec-megaparsec + , megaparsec, mtl, parser-combinators, QuickCheck, scientific, text + , transformers + }: + mkDerivation { + pname = "megaparsec-tests"; + version = "9.0.0"; + sha256 = "0zm246r8k48mj5v2dxjan7dsrcnw54bcm27swi5mh8c0yb3vcvab"; + libraryHaskellDepends = [ + base bytestring containers hspec hspec-expectations + hspec-megaparsec megaparsec mtl QuickCheck text transformers + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers hspec + hspec-expectations hspec-megaparsec megaparsec mtl + parser-combinators QuickCheck scientific text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Test utilities and the test suite of Megaparsec"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -170331,6 +170378,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mime-mail-ses_0_4_3" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , byteable, bytestring, case-insensitive, conduit, cryptohash + , http-client, http-client-tls, http-conduit, http-types, mime-mail + , optparse-applicative, tasty, tasty-hunit, text, time, xml-conduit + , xml-types + }: + mkDerivation { + pname = "mime-mail-ses"; + version = "0.4.3"; + sha256 = "0v4b0y28kf7mx80z16j82wmaccpggkc262f7cn9g9j2nfayy2xhj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring byteable bytestring + case-insensitive conduit cryptohash http-client http-client-tls + http-conduit http-types mime-mail text time xml-conduit xml-types + ]; + executableHaskellDepends = [ + base http-client http-client-tls mime-mail optparse-applicative + text + ]; + testHaskellDepends = [ + base bytestring case-insensitive tasty tasty-hunit time + ]; + description = "Send mime-mail messages via Amazon SES"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mime-string" = callPackage ({ mkDerivation, base, base64-string, bytestring, iconv, mtl , network, old-locale, old-time, random @@ -236095,10 +236172,10 @@ self: { ({ mkDerivation, base, socket }: mkDerivation { pname = "socket-icmp"; - version = "0.1.0.0"; - sha256 = "14lfvbhcq1ri9bfc0qiymh8qv8b7q78lzfbr5qsarh8rb85ii2vj"; + version = "0.1.0.1"; + sha256 = "1wvrdgz0ybacbzg91vi8jiswr02lj7hz61cksmcfii2qsmzpfgb7"; libraryHaskellDepends = [ base socket ]; - description = "Definitions for ICMP with the `socket` library"; + description = "Definitions for using ICMP with the `socket` library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -245415,13 +245492,14 @@ self: { }) {}; "swiss-ephemeris" = callPackage - ({ mkDerivation, base, directory, hspec, hspec-discover }: + ({ mkDerivation, base, directory, hspec, hspec-discover, QuickCheck + }: mkDerivation { pname = "swiss-ephemeris"; - version = "0.1.0.2"; - sha256 = "0kjph3dy7ii767zpjdqi2ya08vgahhwkbf1fp48n26vfilcwppc9"; + version = "0.2.0.0"; + sha256 = "12va8a5brad7jqafvp1d4m3kvc0a00w2961jl0kyn4iq7kbgapdb"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base directory hspec ]; + testHaskellDepends = [ base directory hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the Swiss Ephemeris C library"; license = stdenv.lib.licenses.gpl2; @@ -248468,14 +248546,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-expected-failure_0_12" = callPackage + "tasty-expected-failure_0_12_1" = callPackage ({ mkDerivation, base, hedgehog, tagged, tasty, tasty-golden , tasty-hedgehog, tasty-hunit, unbounded-delays }: mkDerivation { pname = "tasty-expected-failure"; - version = "0.12"; - sha256 = "1yhbgrbsghr3cxy4rxb7wfl9xbasm00xky3hrw4zyyl87r7gs6v6"; + version = "0.12.1"; + sha256 = "1r4xljml8w55q6qpjj94ig2yic398624fld3dwjfcbaldgbacpmm"; libraryHaskellDepends = [ base tagged tasty unbounded-delays ]; testHaskellDepends = [ base hedgehog tasty tasty-golden tasty-hedgehog tasty-hunit -- cgit 1.4.1 From 2126263e9d52da619073c8f7d65f0d17c726922b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 20:10:03 +0200 Subject: hackage2nix: disable failing builds to avoid evaluation errors on Hydra --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 831fd242cc13b..a1bd7681abad9 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4090,6 +4090,7 @@ broken-packages: - Control-Monad-ST2 - contstuff-monads-tf - contstuff-transformers + - conversions - convert - convert-annotation - convertible-ascii @@ -7478,6 +7479,7 @@ broken-packages: - lp-diagrams - lp-diagrams-svg - LRU + - lrucaching-haxl - ls-usb - lscabal - LslPlus @@ -9043,6 +9045,7 @@ broken-packages: - redis-hs - redis-io - redis-simple + - rediscaching-haxl - redland - Redmine - reduce-equations @@ -9394,6 +9397,7 @@ broken-packages: - scotty-fay - scotty-format - scotty-hastache + - scotty-haxl - scotty-resource - scotty-rest - scotty-session @@ -11328,3 +11332,4 @@ broken-packages: - Zwaluw - zxcvbn-dvorak - zxcvbn-hs + -- cgit 1.4.1 From 688d248e3de911ae37f02f36e861470771a3042f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 20:27:58 +0200 Subject: liquidhaskell and friends don't compile with ghc-8.8.x. --- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index c63605fbfc243..a2562e44527b5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -114,4 +114,16 @@ self: super: { # cabal-fmt requires Cabal3 cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; }; + # liquidhaskell does not support ghc version 8.8.x. + liquid = markBroken super.liquid; + liquid-base = markBroken super.liquid-base; + liquid-bytestring = markBroken super.liquid-bytestring; + liquid-containers = markBroken super.liquid-containers; + liquid-ghc-prim = markBroken super.liquid-ghc-prim; + liquid-parallel = markBroken super.liquid-parallel; + liquid-platform = markBroken super.liquid-platform; + liquid-prelude = markBroken super.liquid-prelude; + liquid-vector = markBroken super.liquid-vector; + liquidhaskell = markBroken super.liquidhaskell; + } -- cgit 1.4.1 From 4f42007ef95cfafe39e81062ed4c49a9fa1d4679 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 20:51:05 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-15-g1073700 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/037ebc86aa430ea8ad5a7542132ba7a3f69ab99b. --- .../haskell-modules/hackage-packages.nix | 83 ++++++++++++++-------- 1 file changed, 55 insertions(+), 28 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a2bf6d0f4a737..4408271b18ff5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -62334,6 +62334,8 @@ self: { ]; description = "Injective explicit total and partial conversions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "convert" = callPackage @@ -65941,8 +65943,8 @@ self: { pname = "cue-sheet"; version = "2.0.1"; sha256 = "0papll3xcq2ipmya61jr71gf3zx2swmys829x5sbz7lv6abj9r3i"; - revision = "1"; - editedCabalFile = "0md9051a0jp4vkss15dyyf1w7ylpqmvzfdj9xb1rgj95s1x7cx2g"; + revision = "2"; + editedCabalFile = "0kblqr8mjmps56a7pbjwnby5ik8grmj15l1qir7q9kbn44x4s8l3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers exceptions megaparsec mtl QuickCheck @@ -81505,8 +81507,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.3.4"; - sha256 = "0pm8gwaz6yzdhqw4cs98kbardcc6qsnvzx67f48hamrqvnvqa2ym"; + version = "0.4.0"; + sha256 = "0qhq3h1va7pfcz58mkdw690v88jr3ynk2rrwl0s5qdz8xxvs5n3a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -81526,8 +81528,8 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.3.4"; - sha256 = "0kd92zkafnx6bbzpn9xswl2wnkzzgjwmd7l6ycj43vrlgigp27v6"; + version = "0.4.0"; + sha256 = "0ikk9xk71xyn1fmhzx59lfyk9skjkvhg19xb2afhcylnbg41f3wz"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random parallel primitive statistics @@ -81546,8 +81548,8 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.3.4"; - sha256 = "16ckh34xywxggq0vf4aig912zb8n1fybz52k1vchrj0y0rxbvsa4"; + version = "0.4.0"; + sha256 = "02g67w8xracbasnkha383vz0ls1haxr78ia27k292lx572l17dvv"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; @@ -81563,8 +81565,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.3.4"; - sha256 = "1zz0b2p8znigy5m12qacsdb52h09c2khc3l7i8glirhca74flsif"; + version = "0.4.0"; + sha256 = "03dh4rjdgn580niljgrl0cfw5h2mah8q1252jq3jx8349jxgpcmh"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices mwc-random parallel primitive vector vector-th-unbox word8 @@ -81587,8 +81589,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.3.4"; - sha256 = "0nldyxbj3ym4nnq62asi70w9c8h79s10g50gr7dkhdgbr07v47vs"; + version = "0.4.0"; + sha256 = "0n8rf7y4qxhx35fhbhj4yc541ydsx8qvy66d11sl5a836gmsv0rr"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 deepseq directory fast-logger hmatrix @@ -81610,8 +81612,8 @@ self: { }: mkDerivation { pname = "elynx-tree"; - version = "0.3.4"; - sha256 = "1xhrmpnqg4gjr262xqi31rc406l40v0f5yfj0ah7jb1z45m23hsk"; + version = "0.4.0"; + sha256 = "1j22gkg1971wrih4gs4bxzkghvd3ddj85s6s5mcqhrfxmdnpsn2c"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers deepseq double-conversion elynx-nexus math-functions mwc-random primitive @@ -109504,7 +109506,7 @@ self: { license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;}; + }) {gst-plugins-base = null; gstreamer = null;}; "gt-tools" = callPackage ({ mkDerivation, base, containers, extensible-exceptions, haskeline @@ -121789,8 +121791,8 @@ self: { }: mkDerivation { pname = "headed-megaparsec"; - version = "0.1.0.4"; - sha256 = "1nl66j4fqmjcxkrmhm7jnbqqpw48727wfbb9xn0cz4yy1brivjrb"; + version = "0.2"; + sha256 = "1s2alhwmkk5czilm1m2dp72xpbdjhn7yhghrs1aca2js71x5j7qj"; libraryHaskellDepends = [ base case-insensitive megaparsec parser-combinators selective ]; @@ -154217,6 +154219,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-c_0_9" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers, deepseq + , directory, filepath, happy, mtl, pretty, process, syb + }: + mkDerivation { + pname = "language-c"; + version = "0.9"; + sha256 = "0a2z97ajdbql583jcganadi9frqj09cidqb1hlh0gl6w6aj82kii"; + libraryHaskellDepends = [ + array base bytestring containers deepseq directory filepath mtl + pretty process syb + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ base directory filepath process ]; + description = "Analysis and generation of C code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-c-comments" = callPackage ({ mkDerivation, alex, array, base, language-c }: mkDerivation { @@ -163380,6 +163401,8 @@ self: { libraryHaskellDepends = [ base hashable haxl lrucaching psqueues ]; description = "Combine lrucaching and haxl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ls-usb" = callPackage @@ -179382,15 +179405,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "neat-interpolation_0_5_1_1" = callPackage + "neat-interpolation_0_5_1_2" = callPackage ({ mkDerivation, base, megaparsec, QuickCheck, quickcheck-instances , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell , text }: mkDerivation { pname = "neat-interpolation"; - version = "0.5.1.1"; - sha256 = "1bjl2k3b42kqwq15fsnjxxcadsch5dck9cwf8zvnh4gkyfmkbbx4"; + version = "0.5.1.2"; + sha256 = "18c48r5qwrapkjh35l5dng3ahkkn1ch47vc4nzjwh4a9va94laln"; libraryHaskellDepends = [ base megaparsec template-haskell text ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -200977,8 +201000,8 @@ self: { }: mkDerivation { pname = "postgresql-syntax"; - version = "0.3.0.2"; - sha256 = "1gl0k3idcgpnahh8mv01mjzhc4yx6i3f7shfa7mqhcgs6r1ccdhz"; + version = "0.3.0.3"; + sha256 = "0zylrzd8dfks1jdx1yq1i2n2a7sxa8b04h6km9lx3bdpbpv84y7i"; libraryHaskellDepends = [ base bytestring case-insensitive fast-builder hashable headed-megaparsec megaparsec parser-combinators text text-builder @@ -205552,8 +205575,8 @@ self: { }: mkDerivation { pname = "provenience"; - version = "0.1.0.2"; - sha256 = "0wzja3vv21wgwxlmwcfc6vbkdr80jjkhxbxa41zz1i78j8cc3bri"; + version = "0.1.1.0"; + sha256 = "020kfw1laishiqy8npg2f2llq7dv1djii0d0khjfw7f1scy4x10n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212478,6 +212501,8 @@ self: { ]; description = "Combine redis caching and haxl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "redland" = callPackage @@ -222760,6 +222785,8 @@ self: { libraryHaskellDepends = [ base haxl scotty text ]; description = "Combine scotty and haxl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "scotty-params-parser" = callPackage @@ -233576,8 +233603,8 @@ self: { }: mkDerivation { pname = "slynx"; - version = "0.3.4"; - sha256 = "1qyi231wvi62cgjanqy7n4ypddf1xr59914cghvglgjwrpz9fljp"; + version = "0.4.0"; + sha256 = "10a6nqpr422c80vmzjx1r2wgbhkc2kjn7kvmavc0cx1752wn79kc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -255789,8 +255816,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.3.4"; - sha256 = "10nn1043z5gzm0zrw5z0fxalwrh48wvxlwq65nanjajwb612w1p4"; + version = "0.4.0"; + sha256 = "1gsyyw8bvlc15z6hy7cd9w6v6wgjg9ra19w9vp6kajlyzyw5j1kw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ -- cgit 1.4.1 From 059a7a4419c337e8e7ebc865956f4220b473fb92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 21:00:09 +0200 Subject: haskell-neat-interpolation: update the override for the latest version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5c111f7d1c80c..0a61c0accb4ac 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -212,7 +212,7 @@ self: super: { # https://github.com/haskell-nix/hnix/issues/676 # Once neat-interpolation >= 0.4 is in our stack release, # (which should happen soon), we can remove this override - neat-interpolation = self.neat-interpolation_0_5_1_1; + neat-interpolation = self.neat-interpolation_0_5_1_2; }); # Fails for non-obvious reasons while attempting to use doctest. -- cgit 1.4.1 From 85cef2f373894237f2f991fd4d4a8b3ec6d2b2b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 21:08:05 +0200 Subject: hackage2nix: disable failing builds to avoid evaluation errors on Hydra --- .../haskell-modules/configuration-hackage2nix.yaml | 41 +++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a1bd7681abad9..c62e3a160e806 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3916,6 +3916,7 @@ broken-packages: - codemonitor - codepad - codeworld-api + - codex - codo-notation - coin - coinbase-exchange @@ -4186,6 +4187,7 @@ broken-packages: - cryptocipher - cryptocompare - cryptoconditions + - cryptoids - cryptol - cryptsy-api - crystalfontz @@ -4728,6 +4730,7 @@ broken-packages: - enchant - encoding - encoding-io + - encryptable - engine-io - engine-io-growler - engine-io-snap @@ -4974,6 +4977,7 @@ broken-packages: - FileManip - FileManipCompat - fileneglect + - filepath-crypto - filepath-io-access - FilePather - filepather @@ -5464,10 +5468,12 @@ broken-packages: - google-drive - google-html5-slide - google-mail-filters + - google-maps-geocoding - google-oauth2 - google-oauth2-easy - google-search - google-server-api + - google-static-maps - google-translate - GoogleCodeJam - GoogleDirections @@ -5660,18 +5666,25 @@ broken-packages: - hakismet - hakka - hako + - hakyll - hakyll-agda - hakyll-blaze-templates - hakyll-contrib - hakyll-contrib-csv - hakyll-contrib-elm + - hakyll-contrib-hyphenation - hakyll-contrib-links - hakyll-convert + - hakyll-dhall - hakyll-dir-list + - hakyll-favicon - hakyll-filestore + - hakyll-images - hakyll-ogmarkup - hakyll-R + - hakyll-sass - hakyll-series + - hakyll-shakespeare - hakyll-shortcode - hakyll-shortcut-links - hakyll-typescript @@ -6233,6 +6246,7 @@ broken-packages: - HLogger - hlogger - hlongurl + - hlrdb - hls - hlwm - hly @@ -6745,8 +6759,20 @@ broken-packages: - ignore - igraph - igrf + - ihaskell + - ihaskell-aeson - ihaskell-basic + - ihaskell-blaze + - ihaskell-charts + - ihaskell-diagrams - ihaskell-display + - ihaskell-gnuplot + - ihaskell-graphviz + - ihaskell-hatex + - ihaskell-hvega + - ihaskell-inline-r + - ihaskell-juicypixels + - ihaskell-magic - ihaskell-parsec - ihaskell-plot - ihaskell-rlangqq @@ -7219,6 +7245,8 @@ broken-packages: - latest-npm-version - latex-formulae-hakyll - latex-formulae-pandoc + - latex-svg-hakyll + - latex-svg-pandoc - LATS - launchdarkly-server-sdk - launchpad-control @@ -8340,9 +8368,11 @@ broken-packages: - pam - pan-os-syslog - panda + - pandoc-csv2table - pandoc-emphasize-code - pandoc-filter-graphviz - pandoc-include + - pandoc-include-code - pandoc-japanese-filters - pandoc-lens - pandoc-markdown-ghci-filter @@ -8352,6 +8382,7 @@ broken-packages: - pandoc-pyplot - pandoc-sidenote - pandoc-unlit + - pandoc-utils - PandocAgda - pang-a-lambda - pangraph @@ -8644,6 +8675,7 @@ broken-packages: - polysemy-http - polysemy-optics - polysemy-RandomFu + - polysemy-test - polysemy-webserver - polysemy-zoo - polyseq @@ -8745,6 +8777,8 @@ broken-packages: - prim - prim-array - prim-ref + - primal + - primal-memory - primes-type - primitive-indexed - primitive-maybe @@ -9678,6 +9712,7 @@ broken-packages: - siphon - siren-json - sirkel + - sitepipe - sixfiguregroup - sized-grid - sized-types @@ -10043,6 +10078,8 @@ broken-packages: - stripe-haskell - stripe-http-client - stripe-http-streams + - stripe-scotty + - stripe-signature - stripe-tests - strongswan-sql - structural-induction @@ -10237,6 +10274,7 @@ broken-packages: - tellbot - tempi - template-default + - template-haskell-optics - template-haskell-util - template-hsml - template-yj @@ -10385,6 +10423,7 @@ broken-packages: - timeseries - timespan - timeutils + - timezone-detect - timezone-olson-th - timezone-unix - tini @@ -10735,6 +10774,7 @@ broken-packages: - uuagc-diagrams - uuid-aeson - uuid-bytes + - uuid-crypto - uvector - uvector-algorithms - uxadt @@ -11332,4 +11372,3 @@ broken-packages: - Zwaluw - zxcvbn-dvorak - zxcvbn-hs - -- cgit 1.4.1 From c7f24ae3e771f8a203676267a3d3821e08fe5d34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 21:14:56 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-15-g1073700 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/85155b55bca3ad2c44a2ef8633148308d1847619. --- .../haskell-modules/hackage-packages.nix | 109 ++++++++++++++++++--- 1 file changed, 95 insertions(+), 14 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4408271b18ff5..2706c709477b3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -56745,6 +56745,8 @@ self: { ]; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "codo-notation" = callPackage @@ -65058,6 +65060,8 @@ self: { ]; description = "Reversable and secure encoding of object ids as a bytestring"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "cryptoids-class" = callPackage @@ -82099,6 +82103,8 @@ self: { ]; description = "Typed encryption with persistent support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "endo" = callPackage @@ -89118,6 +89124,8 @@ self: { ]; description = "Reversable and secure encoding of object ids as filepaths"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "filepath-io-access" = callPackage @@ -106855,6 +106863,8 @@ self: { ]; description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-oauth2" = callPackage @@ -106987,6 +106997,8 @@ self: { ]; description = "Bindings to the Google Maps Static API (formerly Static Maps API)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "google-translate" = callPackage @@ -112541,6 +112553,8 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -112654,6 +112668,8 @@ self: { libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ]; description = "automatic hyphenation for Hakyll"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-contrib-links" = callPackage @@ -112718,6 +112734,8 @@ self: { executableHaskellDepends = [ base dhall hakyll ]; description = "Dhall compiler for Hakyll"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-dir-list" = callPackage @@ -112762,6 +112780,8 @@ self: { executableHaskellDepends = [ base hakyll ]; testHaskellDepends = [ base ]; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-filestore" = callPackage @@ -112799,6 +112819,8 @@ self: { ]; description = "Hakyll utilities to work with images"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-ogmarkup" = callPackage @@ -112827,6 +112849,8 @@ self: { ]; description = "Hakyll SASS compiler over hsass"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-series" = callPackage @@ -112857,6 +112881,8 @@ self: { ]; description = "Hakyll Hamlet compiler"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hakyll-shortcode" = callPackage @@ -127319,6 +127345,8 @@ self: { ]; description = "High-level Redis Database"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hlrdb-core" = callPackage @@ -142122,6 +142150,8 @@ self: { ]; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-aeson" = callPackage @@ -142137,6 +142167,8 @@ self: { ]; description = "IHaskell display instances for Aeson"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-basic" = callPackage @@ -142161,6 +142193,8 @@ self: { libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ]; description = "IHaskell display instances for blaze-html types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-charts" = callPackage @@ -142177,6 +142211,8 @@ self: { ]; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-diagrams" = callPackage @@ -142193,6 +142229,8 @@ self: { ]; description = "IHaskell display instances for diagram types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-display" = callPackage @@ -142217,6 +142255,8 @@ self: { libraryHaskellDepends = [ base bytestring gnuplot ihaskell ]; description = "IHaskell display instance for Gnuplot (from gnuplot package)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-graphviz" = callPackage @@ -142228,6 +142268,8 @@ self: { libraryHaskellDepends = [ base bytestring ihaskell process ]; description = "IHaskell display instance for GraphViz (external binary)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-hatex" = callPackage @@ -142239,6 +142281,8 @@ self: { libraryHaskellDepends = [ base HaTeX ihaskell text ]; description = "IHaskell display instances for hatex"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-hvega" = callPackage @@ -142250,6 +142294,8 @@ self: { libraryHaskellDepends = [ aeson base hvega ihaskell text ]; description = "IHaskell display instance for hvega types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-inline-r" = callPackage @@ -142267,6 +142313,8 @@ self: { ]; description = "Embed R quasiquotes and plots in IHaskell notebooks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-juicypixels" = callPackage @@ -142281,6 +142329,8 @@ self: { ]; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-magic" = callPackage @@ -142297,6 +142347,8 @@ self: { ]; description = "IHaskell display instances for bytestrings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ihaskell-parsec" = callPackage @@ -155756,6 +155808,8 @@ self: { ]; description = "Use actual LaTeX to render formulae inside Hakyll pages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "latex-svg-image" = callPackage @@ -155792,6 +155846,8 @@ self: { executableHaskellDepends = [ base latex-svg-image pandoc-types ]; description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lattices" = callPackage @@ -189644,6 +189700,8 @@ self: { executableHaskellDepends = [ base csv pandoc pandoc-types ]; description = "Convert CSV to Pandoc Table Markdown"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-emphasize-code" = callPackage @@ -189754,6 +189812,8 @@ self: { ]; description = "A Pandoc filter for including code from source files"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-japanese-filters" = callPackage @@ -190084,6 +190144,8 @@ self: { ]; description = "Utility functions to work with Pandoc in Haskell applications"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "pandoc-vimhl" = callPackage @@ -199322,6 +199384,8 @@ self: { ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "polysemy-webserver" = callPackage @@ -203018,6 +203082,8 @@ self: { testHaskellDepends = [ base doctest template-haskell ]; description = "Primeval world of Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primal-memory" = callPackage @@ -203034,6 +203100,8 @@ self: { ]; description = "Unified interface for memory managemenet"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primes" = callPackage @@ -221553,31 +221621,31 @@ self: { }) {}; "sbv" = callPackage - ({ mkDerivation, array, async, base, bytestring, containers - , crackNum, deepseq, directory, doctest, filepath, gauge - , generic-deriving, Glob, hlint, mtl, pretty, process, QuickCheck - , random, silently, syb, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, time, transformers, z3 + ({ mkDerivation, array, async, base, bench-show, bytestring + , containers, crackNum, deepseq, directory, doctest, filepath + , gauge, Glob, hlint, mtl, pretty, process, QuickCheck, random + , silently, syb, tasty, tasty-golden, tasty-hunit, tasty-quickcheck + , template-haskell, time, transformers, z3 }: mkDerivation { pname = "sbv"; - version = "8.7"; - sha256 = "0iipl3ra0ih6fjxfs4p554va5243rg1ddkllfdbs7y2sj697841l"; + version = "8.8"; + sha256 = "0xm05g9kxh38jjbssnhyw6c8q4rsyjndm2b8r36cqwx0n607zvgy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array async base containers crackNum deepseq directory filepath - generic-deriving mtl pretty process QuickCheck random syb - template-haskell time transformers + array async base containers crackNum deepseq directory filepath mtl + pretty process QuickCheck random syb template-haskell time + transformers ]; testHaskellDepends = [ base bytestring containers crackNum directory doctest filepath Glob - hlint mtl QuickCheck random syb tasty tasty-golden tasty-hunit - tasty-quickcheck template-haskell + hlint mtl QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck ]; testSystemDepends = [ z3 ]; benchmarkHaskellDepends = [ - base containers crackNum deepseq directory filepath gauge mtl - process random silently syb + base bench-show containers crackNum deepseq directory filepath + gauge mtl process random silently syb time ]; description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; license = stdenv.lib.licenses.bsd3; @@ -232564,6 +232632,8 @@ self: { ]; description = "A simple to understand static site generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sixel" = callPackage @@ -243573,6 +243643,8 @@ self: { ]; description = "Listen for Stripe webhook events with Scotty"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stripe-signature" = callPackage @@ -243590,6 +243662,8 @@ self: { testHaskellDepends = [ base bytestring text ]; description = "Verification of Stripe webhook signatures"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stripe-signature_1_0_0_6" = callPackage @@ -243608,6 +243682,7 @@ self: { description = "Verification of Stripe webhook signatures"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stripe-tests" = callPackage @@ -249956,6 +250031,8 @@ self: { ]; description = "Optics for template-haskell types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "template-haskell-util" = callPackage @@ -255253,6 +255330,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell bindings for the zone-detect C library; plus tz-aware utils"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "timezone-olson" = callPackage @@ -265832,6 +265911,8 @@ self: { ]; description = "Reversable and secure encoding of object ids as uuids"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "uuid-le" = callPackage -- cgit 1.4.1 From 8065407b6311a59f08a13f6898376bcd40b47ed7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 21:29:21 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-15-g1073700 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/18ef8de8fa8811e9c250ea7e0c3dc1057151863a. --- pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs') diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2706c709477b3..3c1f3ef56474c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24834,6 +24834,8 @@ self: { pname = "aeson-schemas"; version = "1.2.0"; sha256 = "1fc8zzpkq6alkbl0v473h8diin8lqpliq6d3bsrh5bfny8yapvpk"; + revision = "1"; + editedCabalFile = "1kcsnpb4img9a122yz9lf7s0ils7ppbjyknbck2m8ip977kv04dp"; libraryHaskellDepends = [ aeson base bytestring first-class-families megaparsec template-haskell text unordered-containers -- cgit 1.4.1