From 04321ee684e9133863b93caf592454cedfc2063c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 28 Dec 2019 02:30:36 +0100 Subject: [PATCH 1/7] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.0-11-g2fb6f7e from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/5ccecb78c95e0adb7e813b649c1b88e44dc3cd43. --- .../haskell-modules/hackage-packages.nix | 207 ++++++++++++------ 1 file changed, 141 insertions(+), 66 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ea742c3e2594f..f1358ae64a16f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -17789,6 +17789,19 @@ self: { broken = true; }) {}; + "Set" = callPackage + ({ mkDerivation, base, containers, gauge, util }: + mkDerivation { + pname = "Set"; + version = "0.0.2.0"; + sha256 = "1kll1gdc4mg8sh483qj67yagcmgbbwz31xbinid0cpkcl93gccdb"; + libraryHaskellDepends = [ base containers util ]; + testHaskellDepends = [ base containers util ]; + benchmarkHaskellDepends = [ base containers gauge util ]; + description = "See README for more info"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "ShellCheck" = callPackage ({ mkDerivation, aeson, array, base, bytestring, Cabal, containers , deepseq, Diff, directory, filepath, mtl, parsec, process @@ -44595,10 +44608,8 @@ self: { }: mkDerivation { pname = "bytesmith"; - version = "0.3.1.0"; - sha256 = "1wkwxb9ygc6hii90jr7cjbv4s5d0l4wv0197p9jn4lj7h4i79iqd"; - revision = "1"; - editedCabalFile = "13maddwkl9ajczvnrsnsa9f7w20fzq8il09xh9lqhwyrz9yak4ii"; + version = "0.3.2.0"; + sha256 = "0wbmi3wgf85rkhymjiv19dq93i2mg9i74dl37lpkq317qlihgv6f"; libraryHaskellDepends = [ base byteslice bytestring contiguous primitive run-st text-short wide-word @@ -47213,20 +47224,21 @@ self: { }) {}; "call-alloy" = callPackage - ({ mkDerivation, base, bytestring, directory, file-embed, filepath - , hashable, hspec, process, split, unix + ({ mkDerivation, base, bytestring, containers, directory + , file-embed, filepath, hashable, hspec, lens, mtl, process, split + , trifecta, unix }: mkDerivation { pname = "call-alloy"; - version = "0.1.0.2"; - sha256 = "0blimzaambck8z4sy24s7d0l4v4hcaqxfbkidj2sjvgm0xidd2gb"; + version = "0.2.0.0"; + sha256 = "0rn126mxafc1mplkpvfg0i2my21960v729rnac4r92a1rl3fh0cx"; libraryHaskellDepends = [ - base bytestring directory file-embed filepath hashable process - split unix + base bytestring containers directory file-embed filepath hashable + lens mtl process split trifecta unix ]; testHaskellDepends = [ - base bytestring directory file-embed filepath hashable hspec - process split unix + base bytestring containers directory file-embed filepath hashable + hspec lens mtl process split trifecta unix ]; description = "A simple library to call Alloy given a specification"; license = stdenv.lib.licenses.mit; @@ -80750,6 +80762,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "exceptions_0_10_4" = callPackage + ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers + }: + mkDerivation { + pname = "exceptions"; + version = "0.10.4"; + sha256 = "1kw4pmx7j7zwbdwm0dyn9rcs6kp4byfxy48861yxdz6gam1zn2sd"; + libraryHaskellDepends = [ + base mtl stm template-haskell transformers + ]; + testHaskellDepends = [ + base mtl QuickCheck stm template-haskell test-framework + test-framework-hunit test-framework-quickcheck2 transformers + ]; + description = "Extensible optionally-pure exceptions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "exchangerates" = callPackage ({ mkDerivation, aeson, base, containers, directory, genvalidity , genvalidity-containers, genvalidity-hspec @@ -103077,6 +103110,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "greskell_1_0_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover + , exceptions, greskell-core, hashable, hint, hspec, semigroups + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "greskell"; + version = "1.0.0.0"; + sha256 = "11y601rmlkrd8c7wb0bxii7m25yh1avgy4ydqbawmgpyhq02s816"; + libraryHaskellDepends = [ + aeson base exceptions greskell-core hashable semigroups text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover greskell-core hint + hspec text unordered-containers + ]; + description = "Haskell binding for Gremlin graph query language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "greskell-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, QuickCheck, scientific @@ -103098,6 +103153,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "greskell-core_0_1_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , doctest-discover, hashable, hspec, QuickCheck, scientific + , semigroups, text, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "greskell-core"; + version = "0.1.3.0"; + sha256 = "0k61zir6h1is4k6ribx3qpgm5x0096rr9s2zia66pa8irvy873bb"; + libraryHaskellDepends = [ + aeson base containers hashable scientific semigroups text + unordered-containers uuid vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover hspec QuickCheck + text unordered-containers vector + ]; + description = "Haskell binding for Gremlin graph query language - core data types and tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "greskell-websocket" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text @@ -103120,6 +103197,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "greskell-websocket_0_1_2_0" = callPackage + ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring + , greskell-core, hashtables, hspec, safe-exceptions, stm, text + , unordered-containers, uuid, vector, websockets + }: + mkDerivation { + pname = "greskell-websocket"; + version = "0.1.2.0"; + sha256 = "1rqziazngjvzv53f73s7anrli904fd8ahdhp9j9k2nwqcddbk5gv"; + libraryHaskellDepends = [ + aeson async base base64-bytestring bytestring greskell-core + hashtables safe-exceptions stm text unordered-containers uuid + vector websockets + ]; + testHaskellDepends = [ + aeson base bytestring greskell-core hspec unordered-containers uuid + vector + ]; + description = "Haskell client for Gremlin Server using WebSocket serializer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "grid" = callPackage ({ mkDerivation, base, containers, QuickCheck, test-framework , test-framework-quickcheck2 @@ -110929,36 +111029,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp_0_18_0_0" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hashable - , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl - , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay - , sorted-list, stm, temporary, text, time, unordered-containers - }: - mkDerivation { - pname = "haskell-lsp"; - version = "0.18.0.0"; - sha256 = "0q9xpjgr3n7svhd9f7mmkw113avswvfm08fnbijdr1sblipd12sl"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base bytestring containers data-default - directory filepath hashable haskell-lsp-types hslogger lens mtl - network-uri rope-utf16-splay sorted-list stm temporary text time - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable hspec lens network-uri QuickCheck quickcheck-instances - rope-utf16-splay sorted-list stm text - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haskell-lsp_0_19_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable @@ -111028,24 +111098,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "haskell-lsp-types_0_18_0_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, deepseq - , filepath, hashable, lens, network-uri, scientific, text - , unordered-containers - }: - mkDerivation { - pname = "haskell-lsp-types"; - version = "0.18.0.0"; - sha256 = "1ypa3gxxcg7dl905d4nprcqzw2fcl7z7xy1hpg5har1dw3w9fyiq"; - libraryHaskellDepends = [ - aeson base bytestring data-default deepseq filepath hashable lens - network-uri scientific text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haskell-lsp-types_0_19_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, deepseq , filepath, hashable, lens, network-uri, scientific, text @@ -158534,8 +158586,8 @@ self: { ({ mkDerivation, base, comonad, HTF, MonadRandom }: mkDerivation { pname = "markov-realization"; - version = "0.3.2"; - sha256 = "08zsqpsklffp26ccrqf3kja2x5p8njn9vpy24ysha01f4j9y7has"; + version = "0.3.3"; + sha256 = "1w6rj8l40ajb5nmh3mlf99n526a17w7q9vnyn6x3j9sn0sm4csl3"; libraryHaskellDepends = [ base comonad MonadRandom ]; testHaskellDepends = [ base HTF ]; description = "Realizations of Markov chains"; @@ -163416,8 +163468,8 @@ self: { }: mkDerivation { pname = "mmsyn7h"; - version = "0.2.1.0"; - sha256 = "0ip5w42wrng87lyygawqdfwfi5ba9qam5ryc1mf7mzfcfajpfh3b"; + version = "0.2.2.1"; + sha256 = "0iidjj2j80j510dmwaxgwv4p02nxqysg67kgpsx4mvafw7rhbaiz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -163438,8 +163490,8 @@ self: { }: mkDerivation { pname = "mmsyn7ukr"; - version = "0.3.0.1"; - sha256 = "0pl8yhc1c888xxbn5y6yksdfdwakx46c9nr1mwv474ra266fkcmp"; + version = "0.3.1.0"; + sha256 = "0qzsqv7rmsf6cdaczrk9p2g5irkzrhzym6bbps6q1nhs8ckdbral"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202097,6 +202149,29 @@ self: { broken = true; }) {}; + "reg-alloc-graph-color" = callPackage + ({ mkDerivation, base, base-unicode-symbols, containers, criterion + , lenz, lenz-mtl, lenz-template, logict, Map, microlens-mtl, mtl + , peano, smallcheck, tasty, tasty-smallcheck, transformers, util + }: + mkDerivation { + pname = "reg-alloc-graph-color"; + version = "0.0.0.0"; + sha256 = "1gj9svzsnnasfca0hzpnfwkr2rh1hnzzmzd1vf51dad6c3qvmgj3"; + libraryHaskellDepends = [ + base base-unicode-symbols containers lenz lenz-mtl lenz-template + Map microlens-mtl mtl peano transformers util + ]; + testHaskellDepends = [ + base base-unicode-symbols containers logict smallcheck tasty + tasty-smallcheck transformers util + ]; + benchmarkHaskellDepends = [ base criterion ]; + doHaddock = false; + description = "Register allocation by graph colorization"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "reg-alloc-types" = callPackage ({ mkDerivation, base }: mkDerivation { From adfee0641f24d1004576d7fd17771411d4ae027e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 29 Dec 2019 02:30:34 +0100 Subject: [PATCH 2/7] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.0-11-g2fb6f7e from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/bb9a7bf4e84148ed1659a7ae28ded0867146f739. --- .../haskell-modules/hackage-packages.nix | 210 ++++++++++++++---- 1 file changed, 164 insertions(+), 46 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f1358ae64a16f..ed2fe8f992de2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -45808,37 +45808,35 @@ self: { }) {}; "cabal-helper" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-install, cabal-plan + ({ mkDerivation, base, bytestring, Cabal, cabal-plan, clock , containers, directory, filepath, ghc, ghc-paths, mtl, pretty-show - , process, semigroupoids, template-haskell, temporary, text - , transformers, unix, unix-compat, utf8-string + , process, semigroupoids, semigroups, SHA, template-haskell + , temporary, text, time, transformers, unix, unix-compat + , utf8-string }: mkDerivation { pname = "cabal-helper"; - version = "0.8.2.0"; - sha256 = "1j3h28w9sva1kj410irysl4lbwbar0nbddb9w5gv6jn82ca2dl93"; + version = "1.0.0.0"; + sha256 = "1lgr2ys50vb8gsn0rwswjbyb4x87ylcfan9qr8qa7a64m6rs5wjl"; + revision = "1"; + editedCabalFile = "0r1lc3rih1n8y5byhls4daa5ka8x8aj4vfrwr8lm41m3l4l19mb9"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ - base Cabal cabal-plan containers directory filepath mtl process - semigroupoids transformers unix unix-compat + base bytestring Cabal cabal-plan clock containers directory + filepath mtl process semigroupoids semigroups SHA template-haskell + temporary text time transformers unix unix-compat utf8-string ]; - executableHaskellDepends = [ - base bytestring Cabal cabal-plan containers directory filepath mtl - pretty-show process template-haskell temporary text transformers - unix unix-compat utf8-string - ]; - executableToolDepends = [ cabal-install ]; testHaskellDepends = [ - base bytestring Cabal cabal-plan containers directory filepath ghc - ghc-paths mtl pretty-show process template-haskell temporary text - transformers unix unix-compat utf8-string + base bytestring Cabal cabal-plan clock containers directory + filepath ghc ghc-paths mtl pretty-show process semigroupoids + semigroups SHA template-haskell temporary text time transformers + unix unix-compat utf8-string ]; - testToolDepends = [ cabal-install ]; + doHaddock = false; doCheck = false; - description = "Simple interface to some of Cabal's configuration state, mainly used by ghc-mod"; - license = stdenv.lib.licenses.gpl3; + description = "Give Haskell development tools access to Cabal project environment"; + license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -58868,6 +58866,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "contravariant-extras_0_3_5_1" = 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "control" = callPackage ({ mkDerivation, base, basic, stm, template-haskell, transformers }: @@ -77372,6 +77386,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm2nix_0_2" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary + , bytestring, containers, data-default, directory, filepath, here + , mtl, optparse-applicative, process, req, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "elm2nix"; + version = "0.2"; + sha256 = "1bv2sid1adrg3327h9611kspfxkhgwcawjq59iapp776n74x2iq4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async base binary bytestring containers data-default + directory filepath here mtl process req text transformers + unordered-containers + ]; + executableHaskellDepends = [ + ansi-wl-pprint base directory here optparse-applicative + ]; + testHaskellDepends = [ base ]; + description = "Turn your Elm project into buildable Nix project"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elminator" = callPackage ({ mkDerivation, aeson, base, containers, mtl, template-haskell , text @@ -95462,13 +95502,13 @@ self: { "gi-gdkx11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi + , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk4-x11, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers }: mkDerivation { pname = "gi-gdkx11"; - version = "3.0.9"; - sha256 = "0z3vwwpv8a85nvg2bc4cdaa8w4jmdl5mm5bxfpwmssyxcnm1xdnc"; + version = "4.0.1"; + sha256 = "1z7d8vs4l1gzm0nbi0ir2q76jcc9s685s2nhbfflyjsvclr91spm"; setupHaskellDepends = [ base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi ]; @@ -95477,10 +95517,10 @@ self: { gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text transformers ]; - libraryPkgconfigDepends = [ gtk3 ]; + libraryPkgconfigDepends = [ gtk4-x11 ]; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) gtk3;}; + }) {gtk4-x11 = null;}; "gi-ggit" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -102761,8 +102801,8 @@ self: { ({ mkDerivation, base, containers, json, text }: mkDerivation { pname = "graphql-w-persistent"; - version = "0.7.0.0"; - sha256 = "02qbwkbr8hckr6z9ivszdnwlilz7mkh6zinb33s7gas7iwzkf9jc"; + version = "0.8.0.0"; + sha256 = "1qlx89igjh37hd9az8wm8yihgnw5djamq081g8cav0rc0yh982k5"; libraryHaskellDepends = [ base containers json text ]; description = "GraphQL interface middleware for (SQL) databases"; license = stdenv.lib.licenses.isc; @@ -170804,8 +170844,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.3.3.0"; - sha256 = "0az14yg32psxkb5fm86g1gi7wd8cfq1lbn34852m6814qvk05m36"; + version = "0.4.0.0"; + sha256 = "0xmjzjzggy8yfmwxyga13q08qqhg6jw3v6g1l8dn6gs52amw4z2g"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger safe-exceptions scientific @@ -170827,8 +170867,8 @@ self: { }: mkDerivation { pname = "net-spider-cli"; - version = "0.2.0.0"; - sha256 = "0ls8j8l6nv74big5almkgmkzd9h5kdfiq4q06m86rfmbfq0cvhyk"; + version = "0.2.0.1"; + sha256 = "06lzicfgqslnvm9vpw412d00p2mxjmxx3j2694mcgpqr57s3mhlc"; libraryHaskellDepends = [ aeson base greskell-core hashable net-spider optparse-applicative text @@ -170848,8 +170888,8 @@ self: { }: mkDerivation { pname = "net-spider-pangraph"; - version = "0.1.1.1"; - sha256 = "135apkmcdlasfvj7nrgghngh5kh7bb1dp30007fj0nihp06c8nhp"; + version = "0.2.0.0"; + sha256 = "1ijaa4zsbm583s0bmhrc475p6q1gkx1wz3sg6698aciw0ip14kjs"; libraryHaskellDepends = [ base bytestring greskell net-spider pangraph text time ]; @@ -170869,8 +170909,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl"; - version = "0.3.1.0"; - sha256 = "1nhvr3ybkms7l0m0qmmh7ib147hz2vgjwcsy00bhri054xryx7q2"; + version = "0.4.0.0"; + sha256 = "0fjzq2c1d08xncb2r1mvs3zd3dwjxf3g2lpxbjxpxzndrisdshha"; libraryHaskellDepends = [ aeson base conduit conduit-parse greskell hashable ip monad-logger mtl net-spider safe-exceptions text time @@ -170891,8 +170931,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl-cli"; - version = "0.1.2.0"; - sha256 = "11qbfvxwsba4dlwgrx81yncww2ic1iafp2zg5l5rvk8cnb2z5g2n"; + version = "0.1.2.1"; + sha256 = "09iwdpgn80hmqk6vgwsijjq7sx4vr45kx58xvpip1jl6z4lpxpkv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184171,6 +184211,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-mysql-haskell_0_6_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , fast-logger, hspec, HUnit, io-streams, monad-logger + , mysql-haskell, network, persistent, persistent-qq + , persistent-template, persistent-test, QuickCheck + , quickcheck-instances, resource-pool, resourcet, text, time, tls + , transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql-haskell"; + version = "0.6.0"; + sha256 = "1b5195mrl3x79wi7qj95kx96dwwfldjfx6arb6l1ff4mmgxh3q8s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers io-streams monad-logger + mysql-haskell network persistent resource-pool resourcet text time + tls transformers unliftio-core + ]; + executableHaskellDepends = [ + base monad-logger persistent persistent-template transformers + ]; + testHaskellDepends = [ + base bytestring containers fast-logger hspec HUnit monad-logger + persistent persistent-qq persistent-template persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio-core + ]; + description = "A pure haskell backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-odbc" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , convertible, HDBC, HDBC-odbc, monad-logger, persistent @@ -204296,6 +204369,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "repline_0_2_2_0" = callPackage + ({ mkDerivation, base, containers, exceptions, haskeline, mtl + , process + }: + mkDerivation { + pname = "repline"; + version = "0.2.2.0"; + sha256 = "06f5df05j295v84j5c4k8bffwkpmrncbz4kpw4sh1pjszp1yv4d1"; + libraryHaskellDepends = [ + base containers exceptions haskeline mtl process + ]; + description = "Haskeline wrapper for GHCi-like REPL interfaces"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "repo-based-blog" = callPackage ({ mkDerivation, base, blaze-html, containers, data-default , directory, dyre, filepath, filestore, hspec, hspec-discover @@ -213690,6 +213779,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-server_0_4_5_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder + , bytestring, case-insensitive, cookie, data-default-class, entropy + , hspec, hspec-discover, http-client, http-types, jose, lens + , lens-aeson, markdown-unlit, memory, monad-time, mtl, QuickCheck + , servant, servant-auth, servant-server, tagged, text, time + , transformers, unordered-containers, wai, warp, wreq + }: + mkDerivation { + pname = "servant-auth-server"; + version = "0.4.5.0"; + sha256 = "0jvx3lj48r0awnyv87qcbf64xmqzp48bdx98xwcnrh2hk8agr56y"; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + case-insensitive cookie data-default-class entropy http-types jose + lens memory monad-time mtl servant servant-auth servant-server + tagged text time unordered-containers wai + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive hspec http-client http-types + jose lens lens-aeson mtl QuickCheck servant servant-auth + servant-server time transformers wai warp wreq + ]; + testToolDepends = [ hspec-discover markdown-unlit ]; + description = "servant-server/servant-auth compatibility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-swagger" = callPackage ({ mkDerivation, base, hspec, hspec-discover, lens, QuickCheck , servant, servant-auth, servant-swagger, swagger2, text @@ -236401,12 +236519,12 @@ self: { }) {}; "template-haskell-compat-v0208" = callPackage - ({ mkDerivation, base, base-prelude, template-haskell }: + ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "template-haskell-compat-v0208"; - version = "0.1.1.1"; - sha256 = "0il2bm5bwa4majddlzckc6jlcwx4w1kmymz9szj11hwjchgd1w3l"; - libraryHaskellDepends = [ base base-prelude template-haskell ]; + version = "0.1.2"; + sha256 = "0hssnkz77511xx4j6amcy8mwnhcifpn3vq19cap1mb0jwyp3klqx"; + libraryHaskellDepends = [ base template-haskell ]; description = "A backwards compatibility layer for Template Haskell newer than 2.8"; license = stdenv.lib.licenses.mit; }) {}; @@ -242318,7 +242436,7 @@ self: { broken = true; }) {}; - "tmp-postgres_1_34_0_0" = callPackage + "tmp-postgres_1_34_0_1" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, base64-bytestring , bytestring, containers, criterion, cryptohash-sha1, deepseq , directory, generic-monoid, hspec, mtl, network, port-utils @@ -242327,8 +242445,8 @@ self: { }: mkDerivation { pname = "tmp-postgres"; - version = "1.34.0.0"; - sha256 = "0845bjp1vgpkms865p311zv758z1i1y8874s1gmjn0c8jwgi48cs"; + version = "1.34.0.1"; + sha256 = "1sdypqxrrzbhab74b4ks76lyd2w7b0wkbwzpgmabmmbn0vrhpnx1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -267562,8 +267680,8 @@ self: { ({ mkDerivation, array, base, bytestring, hspec, lattices, mtl }: mkDerivation { pname = "yx"; - version = "0.0.4.1"; - sha256 = "0mkizcy996q7vm1d2izcxym8aw3dnzyz5nsrmbcchf0ywijw7xzi"; + version = "0.0.4.3"; + sha256 = "0km7w2rbl5l712074h79lhvn8g4bqx1qp9algm9svdz36386c8ki"; libraryHaskellDepends = [ array base bytestring lattices mtl ]; testHaskellDepends = [ array base bytestring hspec mtl ]; description = "Row-major coordinates"; From c0662f47f5e671f67199a578eb9a2df20c4946b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 14 Dec 2019 02:30:57 +0100 Subject: [PATCH 3/7] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.0-9-g650d530 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/dc5b0e7991be84acf9d800b8b4cf6ccf9f7c9d5c. --- .../haskell-modules/hackage-packages.nix | 273 +++++++++++++----- 1 file changed, 204 insertions(+), 69 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ed2fe8f992de2..788ac643e5cb8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1441,7 +1441,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) db; inherit (pkgs) dbxml; + }) {inherit (pkgs) db; inherit (pkgs) dbxml; inherit (pkgs) xercesc; inherit (pkgs) xqilla;}; "BerlekampAlgorithm" = callPackage @@ -2634,10 +2634,10 @@ self: { license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {opencv_calib3d = null; opencv_contrib = null; - opencv_core = null; opencv_features2d = null; opencv_flann = null; - opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; - opencv_legacy = null; opencv_ml = null; opencv_objdetect = null; + }) {opencv_calib3d = null; opencv_contrib = null; + opencv_core = null; opencv_features2d = null; opencv_flann = null; + opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; + opencv_legacy = null; opencv_ml = null; opencv_objdetect = null; opencv_video = null;}; "Cabal_2_2_0_1" = callPackage @@ -6470,7 +6470,7 @@ self: { librarySystemDepends = [ libGL libX11 libXext libXfixes ]; description = "A Haskell binding for GLFW"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes;}; "GLFW-OGL" = callPackage @@ -7833,7 +7833,7 @@ self: { license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {mysqlclient = null; inherit (pkgs) openssl; + }) {mysqlclient = null; inherit (pkgs) openssl; inherit (pkgs) zlib;}; "HDBC-odbc" = callPackage @@ -8137,7 +8137,7 @@ self: { description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {CEGUIBase = null; CEGUIOgreRenderer = null; + }) {CEGUIBase = null; CEGUIOgreRenderer = null; hg3dcegui050 = null;}; "HGamer3D-Common" = callPackage @@ -8289,8 +8289,8 @@ self: { description = "Ogre Binding for HGamer3D"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {OgreMain = null; OgrePaging = null; OgreProperty = null; - OgreRTShaderSystem = null; OgreTerrain = null; + }) {OgreMain = null; OgrePaging = null; OgreProperty = null; + OgreRTShaderSystem = null; OgreTerrain = null; hg3dogre050 = null;}; "HGamer3D-SDL2-Binding" = callPackage @@ -8308,7 +8308,7 @@ self: { description = "SDL2 Binding for HGamer3D"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; + }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; inherit (pkgs.xorg) libX11;}; "HGamer3D-SFML-Binding" = callPackage @@ -8326,7 +8326,7 @@ self: { description = "SFML Binding for HGamer3D"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; + }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; sfml-system = null; sfml-window = null;}; "HGamer3D-WinEvent" = callPackage @@ -14539,8 +14539,8 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {comctl32 = null; comdlg32 = null; gdi32 = null; - kernel32 = null; ole32 = null; shell32 = null; user32 = null; + }) {comctl32 = null; comdlg32 = null; gdi32 = null; + kernel32 = null; ole32 = null; shell32 = null; user32 = null; winmm = null; winspool = null;}; "ObjectName" = callPackage @@ -17155,9 +17155,9 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {csfml-audio = null; csfml-graphics = null; - csfml-network = null; csfml-system = null; csfml-window = null; - sfml-audio = null; sfml-graphics = null; sfml-network = null; + }) {csfml-audio = null; csfml-graphics = null; + csfml-network = null; csfml-system = null; csfml-window = null; + sfml-audio = null; sfml-graphics = null; sfml-network = null; sfml-system = null; sfml-window = null;}; "SFML-control" = callPackage @@ -20735,8 +20735,8 @@ self: { ]; 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) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; "X11-extras" = callPackage @@ -34120,7 +34120,7 @@ self: { license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {aviation-cessna172-weight-balance = null; + }) {aviation-cessna172-weight-balance = null; aviation-units = null; aviation-weight-balance = null;}; "avl-static" = callPackage @@ -37947,7 +37947,7 @@ self: { license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {leksah-dummy = null; leksah-main = null; + }) {leksah-dummy = null; leksah-main = null; leksah-plugin-pane = null;}; "billeksah-pane" = callPackage @@ -38744,10 +38744,10 @@ self: { ]; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; - inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; - inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; - inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm;}; "bindings-GLFW_3_3_0_0" = callPackage @@ -38770,10 +38770,10 @@ self: { description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; - inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; - inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; - inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; + inherit (pkgs.xorg) libXfixes; inherit (pkgs.xorg) libXi; + inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm;}; "bindings-K8055" = callPackage @@ -56938,6 +56938,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit_1_3_1_2" = 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.1.2"; + sha256 = "12c21vrij63z60y3xd0dkg0da8sdhfq6nj5s3p5qknys5klwpqkq"; + 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 @@ -63328,7 +63357,7 @@ self: { description = "A raw binding for the directX 11"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.none; - }) {D3DCompiler = null; d3d11 = null; d3dx11 = null; + }) {D3DCompiler = null; d3d11 = null; d3dx11 = null; d3dxof = null; dxgi = null; dxguid = null;}; "d3js" = callPackage @@ -63637,7 +63666,7 @@ self: { license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) curl; inherit (pkgs) ncurses; + }) {inherit (pkgs) curl; inherit (pkgs) ncurses; inherit (pkgs) zlib;}; "darcs-fastconvert" = callPackage @@ -84139,7 +84168,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; + }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; libavformat = null; libswscale = null;}; "ffmpeg-tutorials" = callPackage @@ -86570,7 +86599,7 @@ self: { ]; description = "FLTK bindings"; license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) fltk14; inherit (pkgs) libGL; + }) {inherit (pkgs) fltk14; inherit (pkgs) libGL; inherit (pkgs) libGLU; inherit (pkgs) pkg-config;}; "fltkhs-demos" = callPackage @@ -88714,7 +88743,7 @@ self: { description = "Interface to the Kinect device"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs) freenect; freenect_sync = null; + }) {inherit (pkgs) freenect; freenect_sync = null; libfreenect = null;}; "freer" = callPackage @@ -91286,9 +91315,9 @@ self: { ]; description = "A Haskell binding to a subset of the GD graphics library"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) expat; inherit (pkgs) fontconfig; - inherit (pkgs) freetype; inherit (pkgs) gd; - inherit (pkgs) libjpeg; inherit (pkgs) libpng; + }) {inherit (pkgs) expat; inherit (pkgs) fontconfig; + inherit (pkgs) freetype; inherit (pkgs) gd; + inherit (pkgs) libjpeg; inherit (pkgs) libpng; inherit (pkgs) zlib;}; "gdax" = callPackage @@ -96610,9 +96639,9 @@ self: { description = "manage files with git, without checking their contents into git"; license = stdenv.lib.licenses.agpl3; maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; - inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; + }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; + inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; + inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; inherit (pkgs) which;}; "git-brunch" = callPackage @@ -98690,7 +98719,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; - }) {inherit (pkgs.gnome3) gnome-keyring; + }) {inherit (pkgs.gnome3) gnome-keyring; inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage @@ -103042,7 +103071,7 @@ self: { executablePkgconfigDepends = [ libXau xcb xdmcp xlibsWrapper ]; description = "Simple clipboard manager to be integrated with rofi"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; + }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;}; "greg-client" = callPackage @@ -104594,9 +104623,9 @@ self: { license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; - inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; - inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu; + }) {inherit (pkgs) gtk2; inherit (pkgs.gnome2) gtkglext; + inherit (pkgs) libGLU; inherit (pkgs.xorg) libICE; + inherit (pkgs.xorg) libSM; inherit (pkgs.xorg) libXmu; inherit (pkgs.xorg) libXt;}; "gtkimageview" = callPackage @@ -104984,7 +105013,7 @@ self: { license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {cudd = null; epd = null; inherit (pkgs) mtr; + }) {cudd = null; epd = null; inherit (pkgs) mtr; inherit (pkgs) st; util = null;}; "hCM" = callPackage @@ -109517,6 +109546,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasbolt_0_1_4_0" = callPackage + ({ mkDerivation, base, binary, bytestring, connection, containers + , data-binary-ieee754, data-default, hex, hspec, mtl, network + , QuickCheck, text + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.4.0"; + sha256 = "1varlzj2c0sfxza6wfacrkjxq022qdvbzf8zhi3zbv1fnqqcvz0j"; + libraryHaskellDepends = [ + base binary bytestring connection containers data-binary-ieee754 + data-default mtl network text + ]; + testHaskellDepends = [ + base bytestring containers hex hspec QuickCheck text + ]; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasbolt-extras" = callPackage ({ mkDerivation, aeson, aeson-casing, base, bytestring, containers , data-default, doctest, free, hasbolt, lens, mtl @@ -116672,6 +116722,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_12_11" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri + , resource-pool, scanner, stm, test-framework, test-framework-hunit + , text, time, tls, unordered-containers, vector + }: + mkDerivation { + pname = "hedis"; + version = "0.12.11"; + sha256 = "1n83zwg011n9w2v1zz4mwpms9jh3c8mk700zya4as1jg83748xww"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq errors HTTP mtl + network network-uri resource-pool scanner stm text time tls + unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl stm test-framework + test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -116992,7 +117067,7 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {newrelic-collector-client = null; newrelic-common = null; + }) {newrelic-collector-client = null; newrelic-common = null; newrelic-transaction = null;}; "helics-wai" = callPackage @@ -118395,7 +118470,7 @@ self: { description = "File/folder watching for OS X"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" ]; - }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + }) {inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;}; "hfusion" = callPackage @@ -123905,7 +123980,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; + }) {inherit (pkgs) freeglut; inherit (pkgs) libGL; inherit (pkgs) libGLU;}; "hp2any-manager" = callPackage @@ -125099,7 +125174,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {brotlidec = null; brotlienc = null; libbrotlidec = null; + }) {brotlidec = null; brotlienc = null; libbrotlidec = null; libbrotlienc = null;}; "hs-captcha" = callPackage @@ -127291,7 +127366,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; inherit (pkgs) gsl; + }) {inherit (pkgs) blas; inherit (pkgs) gsl; inherit (pkgs) liblapack;}; "hsilop" = callPackage @@ -127674,10 +127749,10 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; - inherit (pkgs) jasper; inherit (pkgs) lcms; - inherit (pkgs) libjpeg; inherit (pkgs) libpng; - inherit (pkgs) libxml2; tiff = null; wmflite = null; + }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; + inherit (pkgs) jasper; inherit (pkgs) lcms; + inherit (pkgs) libjpeg; inherit (pkgs) libpng; + inherit (pkgs) libxml2; tiff = null; wmflite = null; inherit (pkgs) zlib;}; "hsmisc" = callPackage @@ -129530,7 +129605,7 @@ self: { license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) ncurses; inherit (pkgs) readline; + }) {inherit (pkgs) ncurses; inherit (pkgs) readline; swipl = null;}; "hsx" = callPackage @@ -153090,7 +153165,7 @@ self: { description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) git; inherit (pkgs) nettools; + }) {inherit (pkgs) git; inherit (pkgs) nettools; inherit (pkgs) ocaml; inherit (pkgs) z3;}; "liquidhaskell" = callPackage @@ -165357,7 +165432,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {gecodeint = null; gecodekernel = null; gecodesearch = null; + }) {gecodeint = null; gecodekernel = null; gecodesearch = null; gecodeset = null; gecodesupport = null;}; "monadio-unwrappable" = callPackage @@ -166201,6 +166276,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "more-containers_0_2_2_0" = callPackage + ({ mkDerivation, base, binary, containers, hspec }: + mkDerivation { + pname = "more-containers"; + version = "0.2.2.0"; + sha256 = "1i4klvfwgw608sy81mqqvd107b187gkib2rwsz6aqc4rh0vm0a87"; + libraryHaskellDepends = [ base binary containers ]; + testHaskellDepends = [ base binary containers hspec ]; + description = "A few more collections"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "more-extensible-effects" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -168128,6 +168216,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multiset_0_3_4_3" = callPackage + ({ mkDerivation, base, checkers, containers, deepseq, doctest + , QuickCheck, tasty, tasty-quickcheck + }: + mkDerivation { + pname = "multiset"; + version = "0.3.4.3"; + sha256 = "1i0mjjdv8ayfars014nch5p3jlbl1wlr1bbkp7q2iknkllasxz3r"; + libraryHaskellDepends = [ base containers deepseq ]; + testHaskellDepends = [ + base checkers doctest QuickCheck tasty tasty-quickcheck + ]; + description = "The Data.MultiSet container type"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "multiset-comb" = callPackage ({ mkDerivation, base, containers, transformers }: mkDerivation { @@ -168717,6 +168822,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mustache_2_3_1" = callPackage + ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring + , cmdargs, containers, directory, either, filepath, hspec, lens + , mtl, parsec, process, scientific, tar, template-haskell + , temporary, text, th-lift, unordered-containers, vector, wreq + , yaml, zlib + }: + mkDerivation { + pname = "mustache"; + version = "2.3.1"; + sha256 = "0j5kzlirirnj2lscxgc6r9j0if8s3pvxswjblma6yxpw6qyzk2xc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory either filepath mtl + parsec scientific template-haskell text th-lift + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson base bytestring cmdargs filepath text yaml + ]; + testHaskellDepends = [ + aeson base base-unicode-symbols bytestring directory filepath hspec + lens process tar temporary text unordered-containers wreq yaml zlib + ]; + description = "A mustache template parser library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mustache-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, directory , optparse-applicative, parsec, pretty-show, scientific, text @@ -169965,7 +170100,7 @@ self: { license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; + }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; inherit (pkgs) libGLU;}; "nanovg-simple" = callPackage @@ -173592,7 +173727,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {g = null; inherit (pkgs) glib; libnm-glib = null; + }) {g = null; inherit (pkgs) glib; libnm-glib = null; nm-glib = null;}; "nme" = callPackage @@ -175899,8 +176034,8 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; - inherit (pkgs.xorg) libXinerama; ovr = null; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + inherit (pkgs.xorg) libXinerama; ovr = null; inherit (pkgs) systemd;}; "odbc" = callPackage @@ -189332,7 +189467,7 @@ self: { license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; + }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; inherit (pkgs) pango; inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage @@ -196550,7 +196685,7 @@ self: { description = "Qt bindings"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {qtc_core = null; qtc_gui = null; qtc_network = null; + }) {qtc_core = null; qtc_gui = null; qtc_network = null; qtc_opengl = null; qtc_script = null; qtc_tools = null;}; "qtah-cpp-qt5" = callPackage @@ -233042,7 +233177,7 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; + }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; inherit (pkgs) symengine;}; "symengine-hs" = callPackage @@ -233062,7 +233197,7 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; + }) {inherit (pkgs) gmp; inherit (pkgs) gmpxx; inherit (pkgs) symengine;}; "symmetric-properties" = callPackage @@ -237369,7 +237504,7 @@ self: { description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ cdepillabout ]; - }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; + }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; vte_291 = pkgs.vte;}; "termplot" = callPackage @@ -260906,7 +261041,7 @@ self: { description = "wxHaskell C++ wrapper"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; + }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; inherit (pkgs) wxGTK;}; "wxcore" = callPackage @@ -262728,7 +262863,7 @@ self: { description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; platforms = [ "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; + }) {inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender; inherit (pkgs) wirelesstools;}; "xmonad" = callPackage From 2ec87b263f2f5be0b0472665a3c26d16a2443d9a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 19 Dec 2019 02:30:36 +0100 Subject: [PATCH 4/7] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.0-9-g650d530 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/b2a082b2fc8e96960befca45891c7673bc89d06c. --- .../haskell-modules/hackage-packages.nix | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 788ac643e5cb8..8698f53889cc7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -84897,6 +84897,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "filtrable_0_1_3_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "filtrable"; + version = "0.1.3.0"; + sha256 = "1viazb01xnw7siwrsynaxqcjrgc96gqfgmj4vxl5r3lbnb34wdl0"; + libraryHaskellDepends = [ base ]; + description = "Class of filtrable containers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fin" = callPackage ({ mkDerivation, base, dec, deepseq, hashable, inspection-testing , QuickCheck, tagged @@ -89167,6 +89179,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "from-sum_0_2_2_0" = callPackage + ({ mkDerivation, base, doctest, Glob, transformers }: + mkDerivation { + pname = "from-sum"; + version = "0.2.2.0"; + sha256 = "05fppk2hkxn67xfl6kdzdp2a5mfz63dv4yx7mvr9fbdrarxrf326"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Canonical fromMaybeM and fromEitherM functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fromhtml" = callPackage ({ mkDerivation, base, bytestring, process-extras, text }: mkDerivation { @@ -257246,6 +257271,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp-tls_3_2_9" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, data-default-class + , network, streaming-commons, tls, tls-session-manager, wai, warp + }: + mkDerivation { + pname = "warp-tls"; + version = "3.2.9"; + sha256 = "1bwd6fi0pfcszz7f7r41bjxmx1vq0594088l3hbj0s23m4lxzhs1"; + libraryHaskellDepends = [ + base bytestring cryptonite data-default-class network + streaming-commons tls tls-session-manager wai warp + ]; + description = "HTTP over TLS support for Warp via the TLS package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-tls-uid" = callPackage ({ mkDerivation, base, bytestring, data-default, network , streaming-commons, tls, unix, wai, warp, warp-tls, x509 From a6ec12debd2ab9dc1dddafaacb363eddc0dec7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= Date: Thu, 19 Dec 2019 14:41:11 +0100 Subject: [PATCH 5/7] nixos/haskell: Added quickjump option to the haskell mkDerivation When visiting local documentation via hoogle, currently for most packages the quickjump index is missing so you only get a sad error when pressing "s" to search in the current documentation. --- pkgs/development/haskell-modules/generic-builder.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index bf16e534f3e6a..b0a8e33d43ccb 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -24,6 +24,7 @@ in , doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doBenchmark ? false , doHoogle ? true +, doHaddockQuickjump ? doHoogle , editedCabalFile ? null , enableLibraryProfiling ? !(ghc.isGhcjs or false) , enableExecutableProfiling ? false @@ -396,6 +397,7 @@ stdenv.mkDerivation ({ ${optionalString (doHaddock && isLibrary) '' ${setupCommand} haddock --html \ ${optionalString doHoogle "--hoogle"} \ + ${optionalString doHaddockQuickjump "--quickjump"} \ ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \ ${stdenv.lib.concatStringsSep " " haddockFlags} ''} From b14b35851792c9b28034642e36ee1c7f65e8a106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= Date: Sat, 28 Dec 2019 21:11:18 +0100 Subject: [PATCH 6/7] quickjump only supported from 8.6 onwards --- pkgs/development/haskell-modules/generic-builder.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index b0a8e33d43ccb..31f0ef09ee1e2 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -397,7 +397,7 @@ stdenv.mkDerivation ({ ${optionalString (doHaddock && isLibrary) '' ${setupCommand} haddock --html \ ${optionalString doHoogle "--hoogle"} \ - ${optionalString doHaddockQuickjump "--quickjump"} \ + ${optionalString (doHaddockQuickjump && stdenv.lib.versionAtLeast ghc.version "8.6") "--quickjump"} \ ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \ ${stdenv.lib.concatStringsSep " " haddockFlags} ''} From 05338444f69bed9f85b3053eb7057a39c84e7aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merlin=20G=C3=B6ttlinger?= Date: Tue, 31 Dec 2019 10:31:51 +0100 Subject: [PATCH 7/7] Moved version check to default value for easier overriding --- pkgs/development/haskell-modules/generic-builder.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 31f0ef09ee1e2..0e5c2ccf66cfc 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -24,7 +24,7 @@ in , doCheck ? !isCross && stdenv.lib.versionOlder "7.4" ghc.version , doBenchmark ? false , doHoogle ? true -, doHaddockQuickjump ? doHoogle +, doHaddockQuickjump ? doHoogle && stdenv.lib.versionAtLeast ghc.version "8.6" , editedCabalFile ? null , enableLibraryProfiling ? !(ghc.isGhcjs or false) , enableExecutableProfiling ? false @@ -397,7 +397,7 @@ stdenv.mkDerivation ({ ${optionalString (doHaddock && isLibrary) '' ${setupCommand} haddock --html \ ${optionalString doHoogle "--hoogle"} \ - ${optionalString (doHaddockQuickjump && stdenv.lib.versionAtLeast ghc.version "8.6") "--quickjump"} \ + ${optionalString doHaddockQuickjump "--quickjump"} \ ${optionalString (isLibrary && hyperlinkSource) "--hyperlink-source"} \ ${stdenv.lib.concatStringsSep " " haddockFlags} ''}