diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index b68e48025512d..314b2fea9c755 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -86,12 +86,12 @@ let in stdenv.mkDerivation (rec { - version = "8.10.0.20200108"; + version = "8.10.0.20200123"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/8.10.1-rc1/ghc-${version}-src.tar.xz"; - sha256 = "1xm6cb3s2x3rycnyvkh12mp65xi3zbwrk5ima8sg7c245f3dl0ay"; + sha256 = "162s5g33s918i12qfcqdj5wanc10xg07g5lq3gpm5j7c1v0y1zrf"; }; enableParallelBuilding = true; diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index c93fc5b7e4519..513987dae7b3f 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -132,6 +132,37 @@ let main = defaultMain ''; + # This awk expression transforms a package conf file like + # + # author: John Doe + # description: + # The purpose of this library is to do + # foo and bar among other things + # + # into a more easily processeable form: + # + # author: John Doe + # description: The purpose of this library is to do foo and bar among other things + unprettyConf = builtins.toFile "unpretty-cabal-conf.awk" '' + /^[^ ]+:/ { + # When the line starts with a new field, terminate the previous one with a newline + if (started == 1) print "" + # to strip leading spaces + $1=$1 + printf "%s", $0 + started=1 + } + + /^ +/ { + # to strip leading spaces + $1=$1 + printf " %s", $0 + } + + # Terminate the final field with a newline + END { print "" } + ''; + crossCabalFlags = [ "--with-ghc=${ghcCommand}" "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg" @@ -344,12 +375,22 @@ stdenv.mkDerivation ({ # libraries) from all the dependencies. local dynamicLinksDir="$out/lib/links" mkdir -p $dynamicLinksDir - for d in $(grep dynamic-library-dirs "$packageConfDir/"*|awk '{print $2}'|sort -u); do - ln -s "$d/"*.dylib $dynamicLinksDir + + # Unprettify all package conf files before reading/writing them + for d in "$packageConfDir/"*; do + # gawk -i inplace seems to strip the last newline + gawk -f ${unprettyConf} "$d" > tmp + mv tmp "$d" + done + + for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do + for lib in "$d/"*.dylib; do + ln -s "$lib" "$dynamicLinksDir" + done done # Edit the local package DB to reference the links directory. for f in "$packageConfDir/"*.conf; do - sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," $f + sed -i "s,dynamic-library-dirs: .*,dynamic-library-dirs: $dynamicLinksDir," "$f" done '') + '' ${ghcCommand}-pkg --${packageDbFlag}="$packageConfDir" recache @@ -418,10 +459,6 @@ stdenv.mkDerivation ({ runHook postHaddock ''; - # The scary sed expression handles two cases in v2.5 Cabal's package configs: - # 1. 'id: short-name-0.0.1-9yvw8HF06tiAXuxm5U8KjO' - # 2. 'id:\n - # very-long-descriptive-useful-name-0.0.1-9yvw8HF06tiAXuxm5U8KjO' installPhase = '' runHook preInstall @@ -436,8 +473,9 @@ stdenv.mkDerivation ({ rmdir "$packageConfFile" fi for packageConfFile in "$packageConfDir/"*; do - local pkgId=$( ${gnused}/bin/sed -n -e ':a' -e '/^id:$/N; s/id:\n[ ]*\([^\n]*\).*$/\1/p; s/id:[ ]*\([^\n]*\)$/\1/p; ta' $packageConfFile ) - mv $packageConfFile $packageConfDir/$pkgId.conf + local pkgId=$(gawk -f ${unprettyConf} "$packageConfFile" \ + | grep '^id:' | cut -d' ' -f2) + mv "$packageConfFile" "$packageConfDir/$pkgId.conf" done # delete confdir if there are no libraries diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index dd8d563e42e29..d0bd845bee341 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -16777,6 +16777,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Rasterific_0_7_5_1" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity + , free, JuicyPixels, mtl, primitive, transformers, vector + , vector-algorithms + }: + mkDerivation { + pname = "Rasterific"; + version = "0.7.5.1"; + sha256 = "0n2kamiymfnh93yc8zn3bjjnxlz1q2yyc33f9h2ahyn4wzfw64n6"; + libraryHaskellDepends = [ + base bytestring containers dlist FontyFruity free JuicyPixels mtl + primitive transformers vector vector-algorithms + ]; + description = "A pure haskell drawing engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ReadArgs" = callPackage ({ mkDerivation, base, hspec, system-filepath, text }: mkDerivation { @@ -31060,6 +31078,22 @@ self: { broken = true; }) {}; + "arduino-copilot" = callPackage + ({ mkDerivation, base, copilot, copilot-c99, directory, filepath + , mtl, optparse-applicative, unix + }: + mkDerivation { + pname = "arduino-copilot"; + version = "1.0.1"; + sha256 = "1j3d0s8niv6cqk1yh6ifkhrygsg7xh0jq254895v4di1fvky5sr8"; + libraryHaskellDepends = [ + base copilot copilot-c99 directory filepath mtl + optparse-applicative unix + ]; + description = "Arduino programming in haskell using the Copilot stream DSL"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "arena" = callPackage ({ mkDerivation, base, bytes, bytestring, containers, criterion , digest, directory, filepath, mtl, persistent-vector, safe @@ -37447,13 +37481,15 @@ self: { }) {}; "bearriver" = callPackage - ({ mkDerivation, base, dunai, MonadRandom, mtl, transformers }: + ({ mkDerivation, base, dunai, MonadRandom, mtl, simple-affine-space + , transformers + }: mkDerivation { pname = "bearriver"; - version = "0.13.1"; - sha256 = "1mkvn05gdazg8inc61vzswwcm53m6xpv7ly4gs5ms6bfqh406xm5"; + version = "0.13.1.1"; + sha256 = "0gqlwj30rghlqsik1i7w2yrccpf7h4pm3adnq6v7dprnhfcz1pkw"; libraryHaskellDepends = [ - base dunai MonadRandom mtl transformers + base dunai MonadRandom mtl simple-affine-space transformers ]; description = "A replacement of Yampa based on Monadic Stream Functions"; license = stdenv.lib.licenses.bsd3; @@ -45525,15 +45561,20 @@ self: { }) {}; "bz2" = callPackage - ({ mkDerivation, base, bytestring, c2hs }: + ({ mkDerivation, base, bytestring, c2hs, criterion, filepath, tasty + , tasty-golden, tasty-hunit + }: mkDerivation { pname = "bz2"; - version = "0.1.0.1"; - sha256 = "07ry2y8xlm6m54qqriwmrcw2m9dal5mr728y3gzsfy104f1w80bf"; - revision = "1"; - editedCabalFile = "0wbhhcmi7wjyjp82sj0ifi3i5hblzdda66jyzcb66rdwi2547jd2"; + version = "0.1.1.1"; + sha256 = "17ckzljzl62bfmhbahxafq5v8xhwpalhxl5x2s83lp2jwc5gal52"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bytestring filepath tasty tasty-golden tasty-hunit + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; description = "Bindings to libbz2"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -45542,8 +45583,8 @@ self: { ({ mkDerivation, base, bytestring, composition-prelude }: mkDerivation { pname = "bzip-signature"; - version = "0.1.1.0"; - sha256 = "154birx50dzgpiz3x34lmd2flmwv41y5b6kvx6imskzqf3nwmcv2"; + version = "0.1.1.1"; + sha256 = "10xd38zgfkp1jngw45hkbi3am04zy3dciwly1pralbf8drf2sn8b"; libraryHaskellDepends = [ base bytestring composition-prelude ]; description = "Backpack signature for BZip compression"; license = stdenv.lib.licenses.bsd3; @@ -45932,8 +45973,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.1.3"; - sha256 = "03x5p2yz6vdrhl8dnmgc7phbsmrg7x51syg41i2hjcw9bm2js8wg"; + version = "1.0.1.5"; + sha256 = "0bzxpr1lalj3i4qickxpch3ky5d686k1rdba2aymhcr8g89l4m0m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54054,19 +54095,20 @@ self: { }) {}; "cmt" = callPackage - ({ mkDerivation, attoparsec, base, classy-prelude, containers - , directory, file-embed, filepath, process, tasty, tasty-discover - , tasty-expected-failure, tasty-hunit, terminal-size, text + ({ mkDerivation, ansi-terminal, attoparsec, base, classy-prelude + , containers, directory, file-embed, filepath, process, tasty + , tasty-discover, tasty-expected-failure, tasty-hunit + , terminal-size, text }: mkDerivation { pname = "cmt"; - version = "0.5.0.0"; - sha256 = "0wnnqzcqxk976q0zy35gi9l46w2fdjvqnx2nxijmfsxj3f221ggx"; + version = "0.7.0.0"; + sha256 = "0lyah3c1nyplss0hacha90wdnpzy1zgspb4gg2c0y0c45x4sfy9h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base classy-prelude containers directory filepath - process terminal-size text + ansi-terminal attoparsec base classy-prelude containers directory + file-embed filepath process terminal-size text ]; executableHaskellDepends = [ base classy-prelude ]; testHaskellDepends = [ @@ -58015,6 +58057,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "conferer-hedis" = callPackage + ({ mkDerivation, base, conferer, hedis, hspec, text }: + mkDerivation { + pname = "conferer-hedis"; + version = "0.2.0.0"; + sha256 = "0h09lzjg8lhhql6zmr0c7mz8rlaskvkadmcl1xwj76cm1kg3hlwx"; + libraryHaskellDepends = [ base conferer hedis text ]; + testHaskellDepends = [ base conferer hedis hspec text ]; + description = "conferer's FromConfig instances for hedis settings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "conferer-hspec" = callPackage ({ mkDerivation, base, conferer, hspec, hspec-core, text }: mkDerivation { @@ -58367,6 +58421,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "configuration-tools_0_4_2" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , base-unicode-symbols, base64-bytestring, bytestring, Cabal + , case-insensitive, connection, data-default, deepseq, directory + , dlist, enclosed-exceptions, filepath, http-client + , http-client-tls, http-types, monad-control, mtl, network-uri + , optparse-applicative, process, profunctors, semigroupoids + , semigroups, text, tls, transformers, unordered-containers, wai + , warp, warp-tls, x509, x509-system, x509-validation, yaml + }: + mkDerivation { + pname = "configuration-tools"; + version = "0.4.2"; + sha256 = "08wzgd38adlrgp9s8330hsp3h1jmhnlaj3fyvkxgljlmyyzlw70q"; + setupHaskellDepends = [ + base bytestring Cabal directory filepath process + ]; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base-unicode-symbols + base64-bytestring bytestring Cabal case-insensitive connection + data-default deepseq directory dlist enclosed-exceptions filepath + http-client http-client-tls http-types monad-control mtl + network-uri optparse-applicative process profunctors semigroupoids + semigroups text tls transformers unordered-containers x509 + x509-system x509-validation yaml + ]; + testHaskellDepends = [ + base base-unicode-symbols bytestring Cabal enclosed-exceptions + http-types monad-control mtl text transformers unordered-containers + wai warp warp-tls yaml + ]; + description = "Tools for specifying and parsing configurations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "configurator" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , hashable, HUnit, test-framework, test-framework-hunit, text @@ -60752,21 +60842,21 @@ self: { }) {}; "cpkg" = callPackage - ({ mkDerivation, base, binary, bytestring, bzlib - , composition-prelude, containers, cpphs, dhall, dir-traverse - , directory, filemanip, filepath, hashable, hspec, hspec-megaparsec - , http-client, http-client-tls, libarchive, lzlib, lzma, megaparsec - , microlens, mtl, network-uri, optparse-applicative, prettyprinter - , process, recursion, temporary, text, zip-archive, zlib, zstd + ({ mkDerivation, base, binary, bytestring, bz2, composition-prelude + , containers, cpphs, dhall, dir-traverse, directory, filemanip + , filepath, hashable, hspec, hspec-megaparsec, http-client + , http-client-tls, libarchive, lzlib, lzma, megaparsec, microlens + , mtl, network-uri, optparse-applicative, prettyprinter, process + , recursion, temporary, text, zip-archive, zlib, zstd }: mkDerivation { pname = "cpkg"; - version = "0.2.4.1"; - sha256 = "0amv5kwba1amh6nsqfh6bb2gm7a3ky5lrjjr9c88w0qfyk8rr3am"; + version = "0.2.4.2"; + sha256 = "174hrcr05idx8kbh6r1bdaz2z098qrfvli3yblm4znap1cha99l0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring bzlib composition-prelude containers dhall + base binary bytestring bz2 composition-prelude containers dhall dir-traverse directory filemanip filepath hashable http-client http-client-tls libarchive lzlib lzma megaparsec microlens mtl network-uri prettyprinter process recursion temporary text @@ -71896,8 +71986,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.2.0"; - sha256 = "0qqhzvv3ilylmpg6bn0pgg0ww6biqikfardpsqn4b78vqqp7pxjd"; + version = "1.3.0"; + sha256 = "0yfqlv8ijpii12ajhmrd0i32s0h238irsda0kd224nvgizc1hzqj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -75436,15 +75526,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dunai_0_5_2_1" = callPackage - ({ mkDerivation, base, MonadRandom, transformers, transformers-base + "dunai_0_6_0" = callPackage + ({ mkDerivation, base, MonadRandom, simple-affine-space + , transformers, transformers-base }: mkDerivation { pname = "dunai"; - version = "0.5.2.1"; - sha256 = "18ccvjmr03v4fghlv2hcb3g4c9zrq0ccasr2i9r71dp07mhrpaba"; + version = "0.6.0"; + sha256 = "00ww23294xq8jh9mlg3rd0yz33vl09vdd176hja3l0yskd8cpbxn"; libraryHaskellDepends = [ - base MonadRandom transformers transformers-base + base MonadRandom simple-affine-space transformers transformers-base ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; @@ -79577,10 +79668,8 @@ self: { }: mkDerivation { pname = "equational-reasoning"; - version = "0.6.0.0"; - sha256 = "1cf74r1zdb289x27linjg8di5gcsi1jg771gyb0rqaf5carl9b0f"; - revision = "1"; - editedCabalFile = "19dbxan77gsqy4v23npfbq5p3qwb6wz3r7mhs6290ghpfhzy8yp4"; + version = "0.6.0.1"; + sha256 = "0al3ms7gxd1ws8bs694h7ka2rg9kn3v36qgwrxm2hq4ys80y7r65"; libraryHaskellDepends = [ base containers template-haskell th-desugar th-extras void ]; @@ -80228,7 +80317,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "esqueleto_3_3_1" = callPackage + "esqueleto_3_3_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -80238,8 +80327,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.3.1"; - sha256 = "19s7grwdjh39w13c34wg8kkcc0r17a9vbriz9g4z0hcz6yv7ajx2"; + version = "3.3.1.1"; + sha256 = "1qi28ma8j5kfygjxnixlazxsyrkdqv8ljz3icwqi5dlscsnj6v3v"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -89905,6 +89994,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "from-sum_0_2_3_0" = callPackage + ({ mkDerivation, base, doctest, Glob, transformers }: + mkDerivation { + pname = "from-sum"; + version = "0.2.3.0"; + sha256 = "1rdsynimmq81y3g5c8z9yvlqhsl99hnvjq4wvdci5ql788cq4m81"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Combinators for working with Maybe and Either"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fromhtml" = callPackage ({ mkDerivation, base, bytestring, process-extras, text }: mkDerivation { @@ -94848,8 +94950,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.8.2"; - sha256 = "1651nwlja2n2z03js0plhiihms52j1663lx4wcvzm33synh6xa4j"; + version = "8.8.3.0"; + sha256 = "01xlp9drkwdh5n822x2pvga95lpvwa195lf9wpnx8z9v5sj2lksa"; libraryHaskellDepends = [ base bytestring ghc-lib-parser uniplate ]; @@ -115899,10 +116001,8 @@ self: { }: mkDerivation { pname = "haxr"; - version = "3000.11.3.1"; - sha256 = "1wyb848mb0b6idkbi5jarsf6qi1zzl3yh6xd05g228kykii8k9mg"; - revision = "1"; - editedCabalFile = "1g5vqgpk02kx502w0klps88i0h0mfwmb8ai14xm5b90jmd9kndn3"; + version = "3000.11.4"; + sha256 = "1pyf0wjifsvsnx7zzhbn8ps0n578r0p89p2ib0nx1rsi2f1x21i5"; libraryHaskellDepends = [ array base base-compat base64-bytestring blaze-builder bytestring HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat @@ -117786,8 +117886,8 @@ self: { pname = "heist"; version = "1.1.0.1"; sha256 = "1j4h9fwny4hl2m5lgsd257lvm9057fb0hmnaqjw8a9k4hyx7hmqq"; - revision = "1"; - editedCabalFile = "08ihm07rqkhaxgnxr4ix08chxpqs0gps2b5xv79lzbl6cn6rj63c"; + revision = "2"; + editedCabalFile = "1w9iabqa3pm2160275z6mh658zlyp7vkj18ch064ry3y3a6cymbk"; libraryHaskellDepends = [ aeson attoparsec base blaze-builder blaze-html bytestring containers directory directory-tree dlist filepath hashable @@ -143026,8 +143126,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "joint"; - version = "0.1.4"; - sha256 = "1q1fsi5c5mzdvy7sg0abgbivmgg8dr2whxsyfhm20dy6z1hqav65"; + version = "0.1.5"; + sha256 = "065n7na9064l50xsh1lf4qkzpa7360can0axncl49d6gcxk1gh1i"; libraryHaskellDepends = [ base ]; description = "Trying to compose non-composable"; license = stdenv.lib.licenses.bsd3; @@ -145160,6 +145260,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kanji_3_4_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, containers, criterion + , deepseq, hashable, HUnit-approx, microlens, microlens-aeson + , optparse-applicative, tasty, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "kanji"; + version = "3.4.1"; + sha256 = "1pgzmwn738yl2ac7al0fzr8cabp8gh1qzbhhi0ylxy4x6s90ll2r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers deepseq hashable text + ]; + executableHaskellDepends = [ + aeson aeson-pretty base containers microlens microlens-aeson + optparse-applicative text transformers + ]; + testHaskellDepends = [ + aeson base containers HUnit-approx tasty tasty-hunit text + ]; + benchmarkHaskellDepends = [ aeson base containers criterion text ]; + description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kansas-comet" = callPackage ({ mkDerivation, aeson, base, containers, data-default-class , scotty, stm, text, time, transformers, unordered-containers @@ -156289,6 +156416,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_3_9" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , prettyprinter, semigroups, stm, stm-delay, text, time + , transformers, transformers-base, unliftio-core + }: + mkDerivation { + pname = "logging-effect"; + version = "1.3.9"; + sha256 = "18g0yw5k0xcpiz3chag61smjc9fi4iy99sv9sqhq8f2v61p355dr"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl prettyprinter + semigroups stm stm-delay text time transformers transformers-base + unliftio-core + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + prettyprinter text time + ]; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, prettyprinter @@ -164913,8 +165064,8 @@ self: { }: mkDerivation { pname = "mmsyn7ukr"; - version = "0.9.3.0"; - sha256 = "1qqr5zkzs03bhj6gmld60j5sxrhw2myiy8aip4svs2xyz3f8wp04"; + version = "0.9.4.2"; + sha256 = "1sppsbi9aw9a3hmfhgb0ncwjy0frj2zp36dhk9qag3n0qgcv1jrb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171027,15 +171178,18 @@ self: { }) {}; "n-ary-functor" = callPackage - ({ mkDerivation, base, doctest, doctest-discover }: + ({ mkDerivation, base, Cabal, cabal-doctest, doctest + , natural-transformation, transformers + }: mkDerivation { pname = "n-ary-functor"; - version = "0.1.0.0"; - sha256 = "1v1ki6mfgj7jhj7w94w15sisd57akwlb0c2s3bczvj47f7f8p7vi"; - revision = "1"; - editedCabalFile = "1pnl2kx406l99icyii50mr3vdaa6hxcsbgh37sh43my3l5dkfl57"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest doctest-discover ]; + version = "1.0"; + sha256 = "18ny8fvg9cz4l6zvrvw0jcjbkp7x75h3cl3p20chlqhnl3m17zlx"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base natural-transformation transformers + ]; + testHaskellDepends = [ base doctest ]; description = "An n-ary version of Functor"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -174987,6 +175141,33 @@ self: { license = "GPL"; }) {}; + "nix-freeze-tree" = callPackage + ({ mkDerivation, base, binary, bytestring, data-fix, directory + , directory-tree, hnix, hnix-store-core, HUnit + , optparse-applicative, path, prettyprinter, raw-strings-qq, tasty + , tasty-discover, tasty-hunit, text, transformers + }: + mkDerivation { + pname = "nix-freeze-tree"; + version = "0.1.0.0"; + sha256 = "06l323g6qx87lbs9hbmnjr0b40f548w8496p7pihxrla1kb2v31x"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring data-fix directory directory-tree hnix + hnix-store-core optparse-applicative path prettyprinter + raw-strings-qq text transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit optparse-applicative tasty tasty-discover tasty-hunit + ]; + testToolDepends = [ tasty-discover ]; + doHaddock = false; + description = "Convert a tree of files into fixed-output derivations"; + license = stdenv.lib.licenses.agpl3Plus; + }) {}; + "nix-paths" = callPackage ({ mkDerivation, base, nix, process }: mkDerivation { @@ -177591,6 +177772,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "oeis_0_3_10" = callPackage + ({ mkDerivation, base, HTTP, HUnit, network, network-uri + , test-framework, test-framework-hunit + }: + mkDerivation { + pname = "oeis"; + version = "0.3.10"; + sha256 = "0aa5i0328k8pf0y439b95c3ipv70lfabvv55jp64pwb9kx6p5ymv"; + libraryHaskellDepends = [ base HTTP network network-uri ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + ]; + description = "Interface to the Online Encyclopedia of Integer Sequences (OEIS)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "oeis2" = callPackage ({ mkDerivation, aeson, base, containers, hspec, http-conduit, lens , lens-aeson, QuickCheck, text, vector @@ -177707,8 +177905,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.4.0.1"; - sha256 = "0761m8yi8yrqspf9hig6pbdzchz8nvc9qn995wz4v0wklcypiagr"; + version = "0.5.0.0"; + sha256 = "09ykb49qzg0hpkjgylmilvy9dkcsxlv1lxrp0mwqamq4vxkm2wz3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178889,6 +179087,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opentelemetry" = callPackage + ({ mkDerivation, async, base, clock, exceptions, hashable, random + , tasty, tasty-discover, tasty-quickcheck, text + , unordered-containers + }: + mkDerivation { + pname = "opentelemetry"; + version = "0.0.0.0"; + sha256 = "14k1lskdan3p7pddch9h0vr56ksyb4vnkm79rn4nlv4m9ycbxs7l"; + libraryHaskellDepends = [ + base clock exceptions hashable random text unordered-containers + ]; + testHaskellDepends = [ + async base tasty tasty-discover tasty-quickcheck + ]; + testToolDepends = [ tasty-discover ]; + license = stdenv.lib.licenses.asl20; + }) {}; + + "opentelemetry-lightstep" = callPackage + ({ mkDerivation, async, base, exceptions, http-types, http2 + , http2-client, http2-client-grpc, http2-grpc-proto-lens, lens, mtl + , network, opentelemetry, proto-lens, proto-lens-protobuf-types + , proto-lens-runtime, text, unordered-containers + }: + mkDerivation { + pname = "opentelemetry-lightstep"; + version = "0.0.0.0"; + sha256 = "1nnpis5ka6fgf0vmvcf68zqnjw69pvs91qm6slsgv58aww6fn9a2"; + libraryHaskellDepends = [ + base exceptions http-types http2 http2-client http2-client-grpc + http2-grpc-proto-lens lens mtl network opentelemetry proto-lens + proto-lens-protobuf-types proto-lens-runtime text + unordered-containers + ]; + testHaskellDepends = [ async base opentelemetry ]; + license = stdenv.lib.licenses.asl20; + }) {}; + "opentheory" = callPackage ({ mkDerivation, base, opentheory-primitive, QuickCheck }: mkDerivation { @@ -185985,6 +186222,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistent-pagination_0_1_1_1" = callPackage + ({ mkDerivation, base, conduit, containers, esqueleto, foldl, hspec + , hspec-discover, microlens, mtl, persistent, persistent-sqlite + , persistent-template, QuickCheck, time + }: + mkDerivation { + pname = "persistent-pagination"; + version = "0.1.1.1"; + sha256 = "03rxynxj2xx25l1zy42f06649m57blpx4inadb2a4dgz62zzyk5q"; + libraryHaskellDepends = [ + base conduit esqueleto foldl microlens mtl persistent + ]; + testHaskellDepends = [ + base conduit containers esqueleto hspec hspec-discover mtl + persistent persistent-sqlite persistent-template QuickCheck time + ]; + testToolDepends = [ hspec-discover ]; + description = "Efficient and correct pagination for persistent or esqueleto queries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-parser" = callPackage ({ mkDerivation, attoparsec, base, hspec, text }: mkDerivation { @@ -195584,8 +195843,8 @@ self: { }: mkDerivation { pname = "prometheus-metrics-ghc"; - version = "1.0.0"; - sha256 = "15zzj9dy9kfvkcypgnvh8xa6xsx0489ck8f30bm8958qp0za145z"; + version = "1.0.1"; + sha256 = "18816z271daza8yl6sqagv4y26f977d66s26kvjq680pykcflxwx"; libraryHaskellDepends = [ base prometheus-client text utf8-string ]; @@ -223609,6 +223868,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "smallcheck-kind-generics" = callPackage + ({ mkDerivation, base, gauge, kind-generics, kind-generics-th + , smallcheck + }: + mkDerivation { + pname = "smallcheck-kind-generics"; + version = "0.0.0.0"; + sha256 = "1jgscfg172k6s3sbiyh387phsl0bxqysk1hlyz00h1587g65rnkk"; + libraryHaskellDepends = [ + base kind-generics kind-generics-th smallcheck + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base gauge ]; + description = "See README for more info"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smallcheck-laws" = callPackage ({ mkDerivation, base, smallcheck, smallcheck-series }: mkDerivation { @@ -241071,6 +241347,24 @@ self: { broken = true; }) {}; + "text-offset" = callPackage + ({ mkDerivation, base, bytestring, HUnit, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, vector + }: + mkDerivation { + pname = "text-offset"; + version = "0.1.0.0"; + sha256 = "0milfq5nnz4ar5ka3yvcf2vxh9cw5p272j7q8ysaf6vajbax4bq0"; + libraryHaskellDepends = [ base text vector ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text + ]; + description = "Library for converting between line/column and byte offset"; + license = stdenv.lib.licenses.asl20; + }) {}; + "text-plus" = callPackage ({ mkDerivation, base, bytestring, doctest, HTF, pretty, QuickCheck , strict-data, text, util-plus @@ -256178,8 +256472,8 @@ self: { }: mkDerivation { pname = "vectortiles"; - version = "1.5.0"; - sha256 = "1vy990m7vlsw0ffi0ys7xpz97npw0b3vldw6ykhcsyxhvhg6jrif"; + version = "1.5.1"; + sha256 = "1g5n7xrpzj1kfbmk97lak6p7m0g7irkcmd5cl0gh23bxsfzmbnkh"; libraryHaskellDepends = [ base bytestring containers deepseq hashable mtl protocol-buffers protocol-buffers-descriptor text transformers unordered-containers @@ -267328,6 +267622,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod_1_6_0_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit + , data-default-class, directory, fast-logger, monad-logger + , semigroups, shakespeare, streaming-commons, template-haskell + , text, unix, unordered-containers, wai, wai-extra, wai-logger + , warp, yaml, yesod-core, yesod-form, yesod-persistent + }: + mkDerivation { + pname = "yesod"; + version = "1.6.0.1"; + sha256 = "113qm6x4q2s08l5423j1ksc3bdlbf9pxj4y9p8nf36gbz6dy6xqh"; + libraryHaskellDepends = [ + aeson base bytestring conduit data-default-class directory + fast-logger monad-logger semigroups shakespeare streaming-commons + template-haskell text unix unordered-containers wai wai-extra + wai-logger warp yaml yesod-core yesod-form yesod-persistent + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-alerts" = callPackage ({ mkDerivation, alerts, base, blaze-html, blaze-markup, safe, text , yesod-core @@ -267434,6 +267750,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_6_8_1" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , cryptonite, data-default, email-validate, file-embed, http-client + , http-client-tls, http-conduit, http-types, memory, network-uri + , nonce, persistent, random, safe, shakespeare, template-haskell + , text, time, transformers, unliftio, unliftio-core + , unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.6.8.1"; + sha256 = "1zpmcywc8qkx93y05r8zgzds8wj5sg6b5jhzi17g6fwnaha2i1qj"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-client-tls http-conduit http-types + memory network-uri nonce persistent random safe shakespeare + template-haskell text time transformers unliftio unliftio-core + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -268016,6 +268361,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_17_1" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, fast-logger + , gauge, hspec, hspec-expectations, http-types, HUnit, memory + , monad-logger, mtl, network, parsec, path-pieces, primitive + , random, resourcet, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.17.1"; + sha256 = "1dkn0fd0d27zr252r65gnim7fmjn5bjcc4xrcw5wl0y6icyqbd7r"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -270558,6 +270941,19 @@ self: { broken = true; }) {}; + "zbar" = callPackage + ({ mkDerivation, base, c2hs, zbar }: + mkDerivation { + pname = "zbar"; + version = "0.1.1.0"; + sha256 = "03d81yxqf15q0ryynni55pww0z5v313yg0nb00r8zlibn96mjf5z"; + libraryHaskellDepends = [ base ]; + libraryPkgconfigDepends = [ zbar ]; + libraryToolDepends = [ c2hs ]; + description = "zbar bindings in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) zbar;}; + "zcache" = callPackage ({ mkDerivation, array, base, containers, mersenne-random-pure64 }: mkDerivation {