From 2491951642a60886480c3dc698b2ea39fbec5cec Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 8 Oct 2021 12:00:59 +0200 Subject: [PATCH 1/7] all-cabal-hashes: 2021-10-05T05:41:58Z -> 2021-10-08T09:46:02Z This commit has been generated by maintainers/scripts/haskell/update-hackage.sh --- pkgs/data/misc/hackage/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json index a936679d347e..a1af75ba6ae4 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "c3251a7b66241fd25a603ea957ec88b9fa6fffa9", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c3251a7b66241fd25a603ea957ec88b9fa6fffa9.tar.gz", - "sha256": "0rpwykkvd6m5v0ay3ra9fyjgax1y67pr857s32z7l5bjgv1aap5p", - "msg": "Update from Hackage at 2021-10-05T05:41:58Z" + "commit": "ba457d86df5e8781485cf1b109f249ecf00ee4c6", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ba457d86df5e8781485cf1b109f249ecf00ee4c6.tar.gz", + "sha256": "1h1qnllhdfp6n71b36jw8kaw7kani76z3mmbigrvy8cmkbvj2mdc", + "msg": "Update from Hackage at 2021-10-08T09:46:02Z" } From fc3dedf3225f047dbfb56c80b17b4d983e0ab472 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 8 Oct 2021 12:01:42 +0200 Subject: [PATCH 2/7] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 926 +++++++----------- 1 file changed, 345 insertions(+), 581 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 313c95eca8ff..7d8e69f2b7ff 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1277,34 +1277,6 @@ self: { }) {}; "BNFC" = callPackage - ({ mkDerivation, alex, array, base, Cabal, cabal-doctest - , containers, deepseq, directory, doctest, filepath, happy, hspec - , hspec-discover, HUnit, mtl, pretty, process, QuickCheck - , string-qq, temporary, time - }: - mkDerivation { - pname = "BNFC"; - version = "2.9.2"; - sha256 = "1wn46a6rw6fwxmqp3b8nz81ag2nphyalm6l2frzg63xbdxnlwgmi"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array base containers deepseq directory filepath mtl pretty process - string-qq time - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - array base containers deepseq directory doctest filepath hspec - HUnit mtl pretty process QuickCheck string-qq temporary time - ]; - testToolDepends = [ alex happy hspec-discover ]; - description = "A compiler front-end generator"; - license = lib.licenses.bsd3; - }) {}; - - "BNFC_2_9_3" = callPackage ({ mkDerivation, alex, array, base, Cabal, cabal-doctest , containers, deepseq, directory, doctest, filepath, happy, hspec , hspec-discover, HUnit, mtl, pretty, process, QuickCheck @@ -1330,7 +1302,6 @@ self: { testToolDepends = [ alex happy hspec-discover ]; description = "A compiler front-end generator"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "BNFC-meta" = callPackage @@ -9785,26 +9756,6 @@ self: { }) {}; "HaXml" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , polyparse, pretty, random - }: - mkDerivation { - pname = "HaXml"; - version = "1.25.5"; - sha256 = "0d8jbiv53r3ndg76r3937idqdg34nhmb99vj087i73hjnv21mifb"; - revision = "4"; - editedCabalFile = "029jnlmab1llr55dmlamrn2hxkbqw7ryz1dfg19h1aip6byf4ljh"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers filepath polyparse pretty random - ]; - executableHaskellDepends = [ base directory polyparse pretty ]; - description = "Utilities for manipulating XML documents"; - license = "LGPL"; - }) {}; - - "HaXml_1_25_6" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , polyparse, pretty, random }: @@ -9820,7 +9771,6 @@ self: { executableHaskellDepends = [ base directory polyparse pretty ]; description = "Utilities for manipulating XML documents"; license = "LGPL"; - hydraPlatforms = lib.platforms.none; }) {}; "Hach" = callPackage @@ -10834,20 +10784,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.7.1"; - sha256 = "1vkcs0crifjpgr1rxkbzkwyhl4zg84m5bfxkp095mgry557gqzm8"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ base bytestring network time ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - description = "Partial OpenSSL binding for Haskell"; - license = lib.licenses.publicDomain; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_7_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: mkDerivation { pname = "HsOpenSSL"; @@ -10859,7 +10795,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Partial OpenSSL binding for Haskell"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -19078,16 +19013,18 @@ self: { }) {}; "SpaceInvaders" = callPackage - ({ mkDerivation, array, base, HGL, random, Yampa }: + ({ mkDerivation, array, base, deepseq, HGL, random + , simple-affine-space, Yampa + }: mkDerivation { pname = "SpaceInvaders"; - version = "0.4.5"; - sha256 = "1nf50gdjdm7bwxzg5ligly9v1hkkdmqd8b1f8637a9bg8sz1rzbd"; - revision = "1"; - editedCabalFile = "0s21i9snp7734amqd6q7ckbj77vsnl0mi2k939ha0phfvdisb5gy"; + version = "0.13.3"; + sha256 = "0gl1cs2msc7c8vs4zknl77wqmlmp2k4brv0asni6mlc6nigriq4f"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ array base HGL random Yampa ]; + executableHaskellDepends = [ + array base deepseq HGL random simple-affine-space Yampa + ]; description = "Video game"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -21951,8 +21888,8 @@ self: { ({ mkDerivation, base, deepseq, random, simple-affine-space }: mkDerivation { pname = "Yampa"; - version = "0.13.2"; - sha256 = "0y0jmk9cbcnhwdrjcacx5j8gb64aj61a04nxizwbds0zvibcdzgb"; + version = "0.13.3"; + sha256 = "06w2glnn5w97bjmwl88j46xkr2mkvgy5a2wwwzqq168awn436kk3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33557,12 +33494,13 @@ self: { }: mkDerivation { pname = "ascii"; - version = "1.0.1.4"; - sha256 = "0j0cx91q4kmljv2fnfa1cllmyyk2wr6vg373bdfq0cx79d6542hw"; + version = "1.0.1.6"; + sha256 = "1bxii5r24p7i68h37m6q7bjqy9fgp6s33ia9s62hwh70xkkcm8yw"; libraryHaskellDepends = [ ascii-case ascii-char ascii-group ascii-predicates ascii-superset ascii-th base bytestring data-ascii text ]; + testHaskellDepends = [ base text ]; description = "The ASCII character set and encoding"; license = lib.licenses.asl20; }) {}; @@ -33602,17 +33540,6 @@ self: { }) {}; "ascii-case" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-case"; - version = "1.0.0.4"; - sha256 = "1485y33as83f1iprdq7hl6ar7gha85678ajq80jld06wsmi9k0xa"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII letter case"; - license = lib.licenses.asl20; - }) {}; - - "ascii-case_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-case"; @@ -33622,21 +33549,9 @@ self: { testHaskellDepends = [ ascii-char base ]; description = "ASCII letter case"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-char" = callPackage - ({ mkDerivation, base, hashable }: - mkDerivation { - pname = "ascii-char"; - version = "1.0.0.8"; - sha256 = "1ajpkzq1d04ww5yif7dl4np5zhhm5ks8wxhmfdl8ygy8r7akg50d"; - libraryHaskellDepends = [ base hashable ]; - description = "A Char type representing an ASCII character"; - license = lib.licenses.asl20; - }) {}; - - "ascii-char_1_0_0_10" = callPackage ({ mkDerivation, base, hashable }: mkDerivation { pname = "ascii-char"; @@ -33646,7 +33561,6 @@ self: { testHaskellDepends = [ base ]; description = "A Char type representing an ASCII character"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-cows" = callPackage @@ -33677,17 +33591,6 @@ self: { }) {}; "ascii-group" = callPackage - ({ mkDerivation, ascii-char, base, hashable }: - mkDerivation { - pname = "ascii-group"; - version = "1.0.0.4"; - sha256 = "0h1y0dmly3yammmqwa197nf3g83x03r5jlnsv9z9zxm9bin38ac5"; - libraryHaskellDepends = [ ascii-char base hashable ]; - description = "ASCII character groups"; - license = lib.licenses.asl20; - }) {}; - - "ascii-group_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, base, hashable }: mkDerivation { pname = "ascii-group"; @@ -33697,7 +33600,6 @@ self: { testHaskellDepends = [ ascii-char base ]; description = "ASCII character groups"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-holidays" = callPackage @@ -33716,17 +33618,6 @@ self: { }) {}; "ascii-predicates" = callPackage - ({ mkDerivation, ascii-char, base }: - mkDerivation { - pname = "ascii-predicates"; - version = "1.0.0.4"; - sha256 = "0c2331y1izxw7n33pfxfb7krz4lgdf87244xlnf03x8npckb7kgq"; - libraryHaskellDepends = [ ascii-char base ]; - description = "Various categorizations of ASCII characters"; - license = lib.licenses.asl20; - }) {}; - - "ascii-predicates_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, base }: mkDerivation { pname = "ascii-predicates"; @@ -33736,7 +33627,6 @@ self: { testHaskellDepends = [ ascii-char base ]; description = "Various categorizations of ASCII characters"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-progress" = callPackage @@ -33784,19 +33674,6 @@ self: { }) {}; "ascii-superset" = callPackage - ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: - mkDerivation { - pname = "ascii-superset"; - version = "1.0.1.4"; - sha256 = "1bjkinz2p8lq4grnj5d9q1z9jsn4b8cgkqsnxjhzb3plz94i5mxk"; - libraryHaskellDepends = [ - ascii-char base bytestring hashable text - ]; - description = "Representing ASCII with refined supersets"; - license = lib.licenses.asl20; - }) {}; - - "ascii-superset_1_0_1_6" = callPackage ({ mkDerivation, ascii-char, base, bytestring, hashable, text }: mkDerivation { pname = "ascii-superset"; @@ -33808,7 +33685,6 @@ self: { testHaskellDepends = [ ascii-char base text ]; description = "Representing ASCII with refined supersets"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-table" = callPackage @@ -33829,20 +33705,6 @@ self: { }) {}; "ascii-th" = callPackage - ({ mkDerivation, ascii-char, ascii-superset, base, template-haskell - }: - mkDerivation { - pname = "ascii-th"; - version = "1.0.0.4"; - sha256 = "08vfy2gp0ppa3l95gjqrbqca3gn2aln7zvw7qpp6x7jnzjkl8dn1"; - libraryHaskellDepends = [ - ascii-char ascii-superset base template-haskell - ]; - description = "Template Haskell support for ASCII"; - license = lib.licenses.asl20; - }) {}; - - "ascii-th_1_0_0_6" = callPackage ({ mkDerivation, ascii-char, ascii-superset, base, bytestring , template-haskell, text }: @@ -33858,7 +33720,6 @@ self: { ]; description = "Template Haskell support for ASCII"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "ascii-vector-avc" = callPackage @@ -34528,24 +34389,6 @@ self: { }) {}; "async" = callPackage - ({ mkDerivation, base, hashable, HUnit, stm, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "async"; - version = "2.2.3"; - sha256 = "0p4k6872pj0aykbnc19ilam1h8fgskxlwpyg5qisaivr0fhg6yj6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base hashable stm ]; - testHaskellDepends = [ - base HUnit stm test-framework test-framework-hunit - ]; - description = "Run IO operations asynchronously and wait for their results"; - license = lib.licenses.bsd3; - }) {}; - - "async_2_2_4" = callPackage ({ mkDerivation, base, hashable, HUnit, stm, test-framework , test-framework-hunit }: @@ -34561,7 +34404,6 @@ self: { ]; description = "Run IO operations asynchronously and wait for their results"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "async-ajax" = callPackage @@ -55507,10 +55349,8 @@ self: { }: mkDerivation { pname = "cipher-aes128"; - version = "0.7.0.5"; - sha256 = "1bafr5aa9mjfzdgc6gwapvb9g04pyh4lwhv2x2m1v3ljjglg9d1w"; - revision = "1"; - editedCabalFile = "0miqp8jvgsqkgj5rxb2vjwa24ac5kdyy3b2cwxb9z0wk1ixk5ilm"; + version = "0.7.0.6"; + sha256 = "1pcxmgj9i8g3yl502lpywc75dilmaszlzixpd7wqjqr7lvasa117"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal process ]; @@ -58504,23 +58344,24 @@ self: { "cobot" = callPackage ({ mkDerivation, array, base, bytestring, clock, containers , criterion, deepseq, hspec, lens, linear, megaparsec, mtl - , parallel, random, split, template-haskell, text + , parallel, random, split, template-haskell, text, vector }: mkDerivation { pname = "cobot"; - version = "0.1.1.4"; - sha256 = "0sskb87cjq6b6splwyl4dc11vwyx4jqp4xwdsgk78awfl1zcqhxd"; + version = "0.1.1.7"; + sha256 = "12g2vfb224lax59pv6jd4061v0bdzk91w0dc034p6mzm02dpxhqr"; libraryHaskellDepends = [ array base bytestring containers deepseq lens linear megaparsec mtl - split template-haskell text + split template-haskell text vector ]; testHaskellDepends = [ array base bytestring containers deepseq hspec lens linear - megaparsec mtl split template-haskell text + megaparsec mtl split template-haskell text vector ]; benchmarkHaskellDepends = [ array base bytestring clock containers criterion deepseq lens linear megaparsec mtl parallel random split template-haskell text + vector ]; description = "Computational biology toolkit to collaborate with researchers in constructive protein engineering"; license = lib.licenses.bsd3; @@ -65050,6 +64891,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "core-data_0_2_1_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, prettyprinter, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "core-data"; + version = "0.2.1.10"; + sha256 = "151b8kym71dklgynyjsbzpggbyw7wysa8bv1pkpy94jdbflmlpaf"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable prettyprinter + scientific text unordered-containers vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -65088,6 +64947,28 @@ self: { license = lib.licenses.mit; }) {}; + "core-program_0_2_12_0" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, safe-exceptions, stm + , template-haskell, terminal-size, text, text-short, transformers + , unix + }: + mkDerivation { + pname = "core-program"; + version = "0.2.12.0"; + sha256 = "0gl1cv82h2ax8gf1jjqphkj2481plz64jqq497rvyy2cpqv72kvr"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + safe-exceptions stm template-haskell terminal-size text text-short + transformers unix + ]; + description = "Opinionated Haskell Interoperability"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "core-text" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq , fingertree, hashable, prettyprinter, template-haskell, text @@ -65105,6 +64986,24 @@ self: { license = lib.licenses.mit; }) {}; + "core-text_0_3_4_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.4.0"; + sha256 = "1013s28p90fifkkqldh35wrdrs86fhan0r8q54imb7b8c7lasj3r"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "corebot-bliki" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , directory, filepath, filestore, http-types, monads-tf, pandoc @@ -67542,14 +67441,14 @@ self: { , criterion, cryptohash-sha1, deepseq, directory, exceptions, extra , filepath, ghc-prim, gitrev, GraphSCC, happy, haskeline, heredoc , integer-gmp, libBF, MemoTrie, monad-control, monadLib, mtl - , optparse-applicative, panic, parameterized-utils, pretty, process - , random, sbv, simple-smt, stm, strict, temporary, text, tf-random + , optparse-applicative, panic, parameterized-utils, prettyprinter + , process, sbv, simple-smt, stm, strict, temporary, text, tf-random , time, transformers, transformers-base, what4 }: mkDerivation { pname = "cryptol"; - version = "2.11.0"; - sha256 = "05h751lxyym27b5kfrcss5vjg4ifpl4lqgxvvp6fz4mpbigm7ds3"; + version = "2.12.0"; + sha256 = "13h5bd6xqh3x6jqdv8a25ffyj10wdyam0flzpdxi4zd23z5b2ihp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -67557,14 +67456,14 @@ self: { array async base base-compat bv-sized bytestring containers cryptohash-sha1 deepseq directory exceptions filepath ghc-prim gitrev GraphSCC heredoc integer-gmp libBF MemoTrie monad-control - monadLib mtl panic parameterized-utils pretty process random sbv + monadLib mtl panic parameterized-utils prettyprinter process sbv simple-smt stm strict text tf-random time transformers-base what4 ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ ansi-terminal base base-compat blaze-html containers directory - extra filepath haskeline monad-control mtl optparse-applicative - process temporary text transformers + exceptions extra filepath haskeline monad-control mtl + optparse-applicative process temporary text transformers ]; benchmarkHaskellDepends = [ base criterion deepseq directory filepath sbv text @@ -78986,29 +78885,6 @@ self: { }) {}; "dl-fedora" = callPackage - ({ mkDerivation, base, bytestring, directory, extra, filepath - , http-client, http-client-tls, http-directory, http-types - , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args - , text, time, unix, xdg-userdirs - }: - mkDerivation { - pname = "dl-fedora"; - version = "0.9.1"; - sha256 = "1ryvgccwfs8yzhywcvgd5s9imr4w3sxdif79npfw3zk1rcnl23v4"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring directory extra filepath http-client - http-client-tls http-directory http-types optparse-applicative - regex-posix simple-cmd simple-cmd-args text time unix xdg-userdirs - ]; - testHaskellDepends = [ base simple-cmd ]; - description = "Fedora image download tool"; - license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - }) {}; - - "dl-fedora_0_9_2" = callPackage ({ mkDerivation, base, bytestring, directory, extra, filepath , http-client, http-client-tls, http-directory, http-types , optparse-applicative, regex-posix, simple-cmd, simple-cmd-args @@ -84257,6 +84133,19 @@ self: { license = lib.licenses.bsd3; }) {}; + "elf_0_31" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec }: + mkDerivation { + pname = "elf"; + version = "0.31"; + sha256 = "180h5kz8wmrm6hy4myp83b2sjss7dq8wxvlqryi79qscsrz9n0ln"; + libraryHaskellDepends = [ base binary bytestring ]; + testHaskellDepends = [ base bytestring containers hspec ]; + description = "An Elf parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "eliminators" = callPackage ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats , singletons, template-haskell, th-abstraction, th-desugar @@ -85445,18 +85334,6 @@ self: { }) {}; "emojis" = callPackage - ({ mkDerivation, base, containers, HUnit, text }: - mkDerivation { - pname = "emojis"; - version = "0.1"; - sha256 = "1c6zkj9gmk1y90gbdrn50hyp7mw1mggzhnr2khqd728ryipw60ss"; - libraryHaskellDepends = [ base containers text ]; - testHaskellDepends = [ base HUnit text ]; - description = "Conversion between emoji characters and their names"; - license = lib.licenses.bsd3; - }) {}; - - "emojis_0_1_1" = callPackage ({ mkDerivation, base, containers, HUnit, text }: mkDerivation { pname = "emojis"; @@ -85466,7 +85343,6 @@ self: { testHaskellDepends = [ base HUnit text ]; description = "Conversion between emoji characters and their names"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "empty" = callPackage @@ -87200,34 +87076,6 @@ self: { }) {}; "esqueleto" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring - , conduit, containers, exceptions, hspec, hspec-core, monad-logger - , mtl, mysql, mysql-simple, persistent, persistent-mysql - , persistent-postgresql, persistent-sqlite, postgresql-simple - , QuickCheck, resourcet, tagged, text, time, transformers, unliftio - , unordered-containers - }: - mkDerivation { - pname = "esqueleto"; - version = "3.5.2.2"; - sha256 = "19m4lzxhjakf1zbsvwa0xmhcln1wb8ydbsnfyhiwhgvryrhvw9ga"; - 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 hspec-core monad-logger mtl mysql mysql-simple - persistent persistent-mysql persistent-postgresql persistent-sqlite - postgresql-simple QuickCheck resourcet tagged text time - transformers unliftio unordered-containers - ]; - description = "Type-safe EDSL for SQL queries on persistent backends"; - license = lib.licenses.bsd3; - }) {}; - - "esqueleto_3_5_3_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -87253,7 +87101,23 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; + }) {}; + + "esqueleto-pgcrypto" = callPackage + ({ mkDerivation, base, esqueleto, hspec, monad-logger, persistent + , persistent-postgresql, QuickCheck, text, transformers, unliftio + }: + mkDerivation { + pname = "esqueleto-pgcrypto"; + version = "0.1.0.0"; + sha256 = "0xxs9nk6k3v7jjcrbgm0b85bncd6rzgrgflvw2w65i6dam0yr4ix"; + libraryHaskellDepends = [ base esqueleto text ]; + testHaskellDepends = [ + base esqueleto hspec monad-logger persistent persistent-postgresql + QuickCheck text transformers unliftio + ]; + description = "Esqueleto support for the pgcrypto PostgreSQL module"; + license = lib.licenses.bsd3; }) {}; "ess" = callPackage @@ -99505,8 +99369,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.20.3"; - sha256 = "1qz8grvf8zyn549zch6d3dkhzq8dmgqigf3q62141l1q7qa3b75q"; + version = "0.20.4"; + sha256 = "0yjm0s9risrc0aj1si8i403k6b1znr8szff1f8ksb5cr9j7nn7gn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101147,32 +101011,6 @@ self: { }) {}; "generic-data" = callPackage - ({ mkDerivation, ap-normalize, base, base-orphans, Cabal - , cabal-doctest, contravariant, criterion, deepseq, doctest - , generic-lens, ghc-boot-th, inspection-testing, one-liner - , QuickCheck, show-combinators, tasty, tasty-hunit - , template-haskell, unordered-containers - }: - mkDerivation { - pname = "generic-data"; - version = "0.9.2.0"; - sha256 = "00zwfr21kmgcdjfjvacn4pvs5i8bl6xbbzw95746g67ap5nz624d"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ap-normalize base base-orphans contravariant ghc-boot-th - show-combinators - ]; - testHaskellDepends = [ - base doctest generic-lens inspection-testing one-liner QuickCheck - show-combinators tasty tasty-hunit template-haskell - unordered-containers - ]; - benchmarkHaskellDepends = [ base criterion deepseq ]; - description = "Deriving instances with GHC.Generics and related utilities"; - license = lib.licenses.mit; - }) {}; - - "generic-data_0_9_2_1" = callPackage ({ mkDerivation, ap-normalize, base, base-orphans, contravariant , criterion, deepseq, generic-lens, ghc-boot-th, inspection-testing , one-liner, show-combinators, tasty, tasty-hunit, template-haskell @@ -101193,7 +101031,6 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Deriving instances with GHC.Generics and related utilities"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "generic-data-surgery" = callPackage @@ -121263,6 +121100,8 @@ self: { pname = "haskell-gi-base"; version = "0.25.0"; sha256 = "140f6amq69r39vj54i1p4c9q0ysxkvb3yjcrlbrrayf66bhw8mqy"; + revision = "1"; + editedCabalFile = "1pl2mzjdsnvvkfmr622jvw2vk9gxdql5flck4vb60nr9d970zg9r"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -134961,6 +134800,32 @@ self: { license = lib.licenses.mit; }) {}; + "honeycomb" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, bytestring + , chronos, http-client, http-client-tls, http-conduit, http-types + , microlens, mmorph, monad-control, mtl, mwc-random, profunctors + , random, resource-pool, stm, text, unliftio, unordered-containers + , uuid, vector, zlib + }: + mkDerivation { + pname = "honeycomb"; + version = "0.0.0.3"; + sha256 = "0y1z9lcf7b1dzvp20flcq75jmh2jxx2dmynfw00dwsy6s2jabhx0"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring chronos http-client + http-client-tls http-conduit http-types microlens mmorph + monad-control mtl mwc-random profunctors random resource-pool stm + text unliftio unordered-containers uuid vector zlib + ]; + testHaskellDepends = [ + aeson async auto-update base bytestring chronos http-client + http-client-tls http-conduit http-types microlens mmorph + monad-control mtl mwc-random profunctors random resource-pool stm + text unliftio unordered-containers uuid vector zlib + ]; + license = lib.licenses.bsd3; + }) {}; + "honi" = callPackage ({ mkDerivation, base, bytestring, freenect, hspec, HUnit, OpenNI2 , text @@ -151779,8 +151644,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "1.0.0"; - sha256 = "1wd2z7ngw53krg3y5klrhlndm9dilmqpvmlipjda168gqisxsscp"; + version = "1.0.1"; + sha256 = "1pw4z3h1ihb82105v1i3809icp024a6cmlic2zfgdhdqf8wvfzv4"; libraryHaskellDepends = [ base containers foldl QuickCheck safe time witherable ]; @@ -152069,25 +151934,6 @@ self: { }) {}; "invertible-grammar" = callPackage - ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter - , profunctors, semigroups, tagged, template-haskell, text - , transformers - }: - mkDerivation { - pname = "invertible-grammar"; - version = "0.1.3"; - sha256 = "160hw7p5mpajwmv8fps2gicqj3x3yr9w239pfnv9i5gsf4irnn9n"; - revision = "2"; - editedCabalFile = "1fmw3v2g22n812ppba4yibgq1wlpfwkypsxa768calxafynb3i33"; - libraryHaskellDepends = [ - base bifunctors containers mtl prettyprinter profunctors semigroups - tagged template-haskell text transformers - ]; - description = "Invertible parsing combinators framework"; - license = lib.licenses.bsd3; - }) {}; - - "invertible-grammar_0_1_3_1" = callPackage ({ mkDerivation, base, bifunctors, containers, mtl, prettyprinter , profunctors, semigroups, tagged, template-haskell, text , transformers @@ -152102,7 +151948,6 @@ self: { ]; description = "Invertible parsing combinators framework"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "invertible-hlist" = callPackage @@ -152509,12 +152354,17 @@ self: { }) {}; "ip2proxy" = callPackage - ({ mkDerivation, base, binary, bytestring, iproute }: + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-client-tls, http-types, iproute, uri-encode + }: mkDerivation { pname = "ip2proxy"; - version = "3.1.0"; - sha256 = "03naiwlxzfmym6ms03z0a9ap2x9f40aqlssyjbb37krhlmmnf0l8"; - libraryHaskellDepends = [ base binary bytestring iproute ]; + version = "3.2.0"; + sha256 = "0m50z5a32m28lfq6g8chkakvcgd6iplmx2ik0nbi2zsgfc0l209y"; + libraryHaskellDepends = [ + aeson base binary bytestring http-client http-client-tls http-types + iproute uri-encode + ]; description = "IP2Proxy Haskell package for proxy detection"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -158751,8 +158601,8 @@ self: { }: mkDerivation { pname = "kempe"; - version = "0.2.0.6"; - sha256 = "1qv867aks1vgcri7gsgim3852g7mnznarnsr97x1j3lx4qfkppnv"; + version = "0.2.0.7"; + sha256 = "0x0915nnrm03fryvwp0rcwvvqsbs1n639yjv509iz2v7wdw5kas8"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -161525,15 +161375,15 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "language-docker_10_1_2" = callPackage + "language-docker_10_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , hspec, hspec-megaparsec, HUnit, megaparsec, prettyprinter , QuickCheck, split, text, time }: mkDerivation { pname = "language-docker"; - version = "10.1.2"; - sha256 = "07h2qarbscgppn9drpl72pi2w9arigqpczrxb51q9m6xhfdx12n1"; + version = "10.2.0"; + sha256 = "193hi4ls55pzybal7q4dlzdz1a8da2155a501h02j1w4nb25glrq"; libraryHaskellDepends = [ base bytestring containers data-default-class megaparsec prettyprinter split text time @@ -162213,6 +162063,8 @@ self: { pname = "language-python"; version = "0.5.8"; sha256 = "1mf3czvnh9582klv0c9g7pcn1wx4qjwpvhv8la6afaifv6y5lki2"; + revision = "1"; + editedCabalFile = "13lc4d2b7id49yczxlqgs3zlms1g6gv0i8amk56g1jvswli6nsn9"; libraryHaskellDepends = [ array base containers monads-tf pretty transformers utf8-string ]; @@ -163504,8 +163356,8 @@ self: { }: mkDerivation { pname = "ldap-client"; - version = "0.4.1"; - sha256 = "0m253jicjn8rqdrkcqd75bcrdg7bdq313crx2b54yv5s3mz6cxi2"; + version = "0.4.2"; + sha256 = "025k631wlg6g6fcsxq403k7wn7cnqbk77w7vpmm87sngvk0i4q0v"; libraryHaskellDepends = [ asn1-encoding asn1-types async base bytestring connection containers fail network semigroups stm text @@ -167194,12 +167046,13 @@ self: { }) {}; "linebreak" = callPackage - ({ mkDerivation, base, hyphenation }: + ({ mkDerivation, base, hspec, hyphenation }: mkDerivation { pname = "linebreak"; - version = "1.0.0.3"; - sha256 = "1fds2mgsijfsc96dq95skn562iv2r341zr7v0qsz48y9fh97s3p7"; + version = "1.1.0.0"; + sha256 = "1a1yzpdr1h9a1gnf1iwsqxzpv3w13vd7yb6c0djdc1yq25q0jg7d"; libraryHaskellDepends = [ base hyphenation ]; + testHaskellDepends = [ base hspec hyphenation ]; description = "breaks strings to fit width"; license = lib.licenses.bsd3; }) {}; @@ -174011,29 +173864,6 @@ self: { }) {}; "markdown" = callPackage - ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup - , bytestring, call-stack, conduit, conduit-extra, containers - , data-default, directory, filepath, hspec, text, transformers - , xml-conduit, xml-types, xss-sanitize - }: - mkDerivation { - pname = "markdown"; - version = "0.1.17.4"; - sha256 = "1m7xf3r7wvpzdj2zic90w5b6adnjb6mjq9mycbnzcjibpr1fgqy2"; - libraryHaskellDepends = [ - attoparsec base blaze-html blaze-markup conduit conduit-extra - containers data-default text transformers xml-conduit xml-types - xss-sanitize - ]; - testHaskellDepends = [ - base blaze-html bytestring call-stack conduit conduit-extra - containers directory filepath hspec text transformers - ]; - description = "Convert Markdown to HTML, with XSS protection"; - license = lib.licenses.bsd3; - }) {}; - - "markdown_0_1_17_5" = callPackage ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup , bytestring, call-stack, conduit, conduit-extra, containers , data-default, directory, filepath, hspec, text, transformers @@ -174054,7 +173884,6 @@ self: { ]; description = "Convert Markdown to HTML, with XSS protection"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "markdown-kate" = callPackage @@ -179364,27 +179193,28 @@ self: { }) {}; "mit-3qvpPyAi6mH" = callPackage - ({ mkDerivation, base, base64, clock, directory, free, process - , record-dot-preprocessor, record-hasfield, temporary, text - , text-ansi, unix + ({ mkDerivation, base, base64, clock, containers, directory, free + , ki, process, record-dot-preprocessor, record-hasfield, temporary + , text, text-ansi, unix }: mkDerivation { pname = "mit-3qvpPyAi6mH"; - version = "3"; - sha256 = "0yy7j1ddnny5wq8ywkkmdas9qlfsi26pk0adklmh2c0kqfss4s3f"; + version = "4"; + sha256 = "14sfzb7ii0ldwkfx05r4jk4rc0nqxzi7nw81v8kgsyi0saa1ig0i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base64 clock directory process record-dot-preprocessor - record-hasfield text text-ansi unix + base base64 clock containers directory ki process + record-dot-preprocessor record-hasfield text text-ansi unix ]; executableHaskellDepends = [ - base base64 clock directory process record-dot-preprocessor - record-hasfield text text-ansi unix + base base64 clock containers directory ki process + record-dot-preprocessor record-hasfield text text-ansi unix ]; testHaskellDepends = [ - base base64 clock directory free process record-dot-preprocessor - record-hasfield temporary text text-ansi unix + base base64 clock containers directory free ki process + record-dot-preprocessor record-hasfield temporary text text-ansi + unix ]; description = "A git wrapper with a streamlined UX"; license = lib.licenses.mit; @@ -182570,8 +182400,8 @@ self: { }: mkDerivation { pname = "monomer"; - version = "1.1.0.0"; - sha256 = "1a2cszh84sgyml9yxw2yln7g1ll249aq37lqd6aqjjb7mzb9fjxm"; + version = "1.1.1.0"; + sha256 = "0jv7yc3jclqkh6z5hq47ws6pia0bhqsig06r392k95y96kal07xr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185604,28 +185434,6 @@ self: { }) {}; "murmur3" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, cereal, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "murmur3"; - version = "1.0.4"; - sha256 = "022sadxhnywbzx8crwkgky7kndxwpaddc89nq3ya4a4ikq3qvbhm"; - revision = "1"; - editedCabalFile = "130ign0n566nsrzfp4ipb2sy5hq1ymxdlmqb80zbpdc0rdkqh0x0"; - libraryHaskellDepends = [ base bytestring cereal ]; - testHaskellDepends = [ - base base16-bytestring bytestring HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - description = "Pure Haskell implementation of the MurmurHash3 x86_32 algorithm"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "murmur3_1_0_5" = callPackage ({ mkDerivation, base, base16, bytestring, cereal, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -188985,14 +188793,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "network_3_1_2_2" = callPackage + "network_3_1_2_5" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, temporary }: mkDerivation { pname = "network"; - version = "3.1.2.2"; - sha256 = "1dhflq7im3sjc6ascf12z73mhw7cqv1aqfvv3y5m9izr485jq0am"; + version = "3.1.2.5"; + sha256 = "0l8qn0m1pza4iv0x14izgpggisbk91yfipwmwpjbmcb73j7c08zj"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -191899,27 +191707,6 @@ self: { }) {}; "nonempty-containers" = callPackage - ({ mkDerivation, aeson, base, comonad, containers, deepseq - , hedgehog, hedgehog-fn, nonempty-vector, semigroupoids, tasty - , tasty-hedgehog, text, these, vector - }: - mkDerivation { - pname = "nonempty-containers"; - version = "0.3.4.3"; - sha256 = "1k58xj3cvi4s79ga5xi3ci16lh6wcxsb9qsn9ipa1kvzj0p4i5g0"; - libraryHaskellDepends = [ - aeson base comonad containers deepseq nonempty-vector semigroupoids - these vector - ]; - testHaskellDepends = [ - base comonad containers hedgehog hedgehog-fn nonempty-vector - semigroupoids tasty tasty-hedgehog text these vector - ]; - description = "Non-empty variants of containers data types, with full API"; - license = lib.licenses.bsd3; - }) {}; - - "nonempty-containers_0_3_4_4" = callPackage ({ mkDerivation, aeson, base, comonad, containers, deepseq , hedgehog, hedgehog-fn, invariant, nonempty-vector, semigroupoids , tasty, tasty-hedgehog, text, these, vector @@ -191939,7 +191726,6 @@ self: { ]; description = "Non-empty variants of containers data types, with full API"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "nonempty-lift" = callPackage @@ -195033,6 +194819,36 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_7_5_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-compat, time-locale-compat + , transformers, uuid, void + }: + mkDerivation { + pname = "opaleye"; + version = "0.7.5.0"; + sha256 = "19y6a4qkzr8bm8fxwrlvlcjqvc12kagp0wrfqrr4gxvzi200plvr"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time-compat + time-locale-compat transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time time-compat + transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -196421,20 +196237,6 @@ self: { }) {}; "operational" = callPackage - ({ mkDerivation, base, mtl, random }: - mkDerivation { - pname = "operational"; - version = "0.2.3.5"; - sha256 = "1x2abg2q9d26h1vzj40r6k7k3gqgappbs4g9d853vvg77837km4i"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl ]; - executableHaskellDepends = [ base mtl random ]; - description = "Implementation of difficult monads made easy with operational semantics"; - license = lib.licenses.bsd3; - }) {}; - - "operational_0_2_4_0" = callPackage ({ mkDerivation, base, mtl, random }: mkDerivation { pname = "operational"; @@ -196446,7 +196248,6 @@ self: { executableHaskellDepends = [ base mtl random ]; description = "Implementation of difficult monads made easy with operational semantics"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "operational-alacarte" = callPackage @@ -199340,6 +199141,8 @@ self: { pname = "pandoc-types"; version = "1.22"; sha256 = "0kr5n9yw59513pw2rjc65qs55iq0prn16prk4781arqdh7g7a09q"; + revision = "1"; + editedCabalFile = "11gfc2syn2c0x3hyyw3c6z9hxmhs8jgv2xnzr43ql00r76ka9s95"; libraryHaskellDepends = [ aeson base bytestring containers deepseq ghc-prim QuickCheck syb text transformers @@ -199602,6 +199405,48 @@ self: { license = lib.licenses.bsd3; }) {}; + "pantry_0_5_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal + , casa-client, casa-types, conduit, conduit-extra, containers + , cryptonite, cryptonite-conduit, digest, exceptions, filelock + , generic-deriving, hackage-security, hedgehog, hpack, hspec + , http-client, http-client-tls, http-conduit, http-download + , http-types, memory, mtl, network-uri, path, path-io, persistent + , persistent-sqlite, persistent-template, primitive, QuickCheck + , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint + , tar-conduit, text, text-metrics, time, transformers, unix-compat + , unliftio, unordered-containers, vector, yaml, zip-archive + }: + mkDerivation { + pname = "pantry"; + version = "0.5.3"; + sha256 = "1pb9vr615rhh0lyi392ghxdnxq5pr15y0w8f372xh046i9dinj39"; + libraryHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest filelock generic-deriving hackage-security hpack http-client + http-client-tls http-conduit http-download http-types memory mtl + network-uri path path-io persistent persistent-sqlite + persistent-template primitive resourcet rio rio-orphans + rio-prettyprint tar-conduit text text-metrics time transformers + unix-compat unliftio unordered-containers vector yaml zip-archive + ]; + testHaskellDepends = [ + aeson ansi-terminal base bytestring Cabal casa-client casa-types + conduit conduit-extra containers cryptonite cryptonite-conduit + digest exceptions filelock generic-deriving hackage-security + hedgehog hpack hspec http-client http-client-tls http-conduit + http-download http-types memory mtl network-uri path path-io + persistent persistent-sqlite persistent-template primitive + QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint + tar-conduit text text-metrics time transformers unix-compat + unliftio unordered-containers vector yaml zip-archive + ]; + description = "Content addressable Haskell package management"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -216753,10 +216598,8 @@ self: { }: mkDerivation { pname = "publish"; - version = "2.2.2"; - sha256 = "19bvdldggklzq6wqgcbvnf4jjlbdbh1l80dm92aj0405a9rhsa28"; - revision = "2"; - editedCabalFile = "19ajwrsd1l9p4cm9ckii5i6nb5w28sxl7kr129xz8kwkpj4z6lfq"; + version = "2.2.3"; + sha256 = "150zvz40r7lwmrqv7hvn07wb0gs9rcyn37ivcdv0m0h96bzy84w3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -218845,8 +218688,8 @@ self: { }: mkDerivation { pname = "quickbench"; - version = "1.0"; - sha256 = "09mrhwvz0jnjrxgj3as7d4jl739gakli5crxfmp390x6a0p2bzlb"; + version = "1.0.1"; + sha256 = "16bkhk5fskhhjqzklqwv51s1k7cxgcyr4p1vifmrd6smxvidb5rn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220034,8 +219877,8 @@ self: { }: mkDerivation { pname = "raaz"; - version = "0.3.0"; - sha256 = "0a322ji29s537kz1mazbl7grbg0s1wkz2cxg74zlvqa47xbk20k1"; + version = "0.3.4"; + sha256 = "1kqinh0vwbl5qh55ai41nmkbcfbhmjdwp5pp0xap03cd0nmn84xq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -224204,8 +224047,8 @@ self: { }: mkDerivation { pname = "reflex-ghci"; - version = "0.1.5.1"; - sha256 = "1m4sphj2qhj9ckjxjy6m4yzb2d6lq68a0fynv5q9ibc6550bm1sx"; + version = "0.1.5.2"; + sha256 = "18w9n6sm9b0ykjxqa800228b7s3y6gg8ckl6jnms3860p0cskpqq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224407,10 +224250,8 @@ self: { }: mkDerivation { pname = "reflex-process"; - version = "0.3.1.0"; - sha256 = "1z86h7wkzg69d6kw0y37pzr4ldpg9qkl8wx5mw7r1h82isb9wgbl"; - revision = "1"; - editedCabalFile = "16vwrz7amccy8j2wn9146j8lif35f7ycpssd0p649ha746s7hrf4"; + version = "0.3.1.1"; + sha256 = "15f9qn5rx6dwjnkhg5szhagxsj7vnh3bh4ad7j4jsi87m627mlj2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229838,17 +229679,6 @@ self: { }) {}; "roles" = callPackage - ({ mkDerivation, base, containers }: - mkDerivation { - pname = "roles"; - version = "0.2.0.0"; - sha256 = "181lmjmvv6285q5zh6cf991jw7d6f0g225vya3iqqb8vn8qjz7g2"; - libraryHaskellDepends = [ base containers ]; - description = "Composable class-based roles"; - license = lib.licenses.bsd3; - }) {}; - - "roles_0_2_1_0" = callPackage ({ mkDerivation, base, containers }: mkDerivation { pname = "roles"; @@ -229857,7 +229687,6 @@ self: { libraryHaskellDepends = [ base containers ]; description = "Composable class-based roles"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rollbar" = callPackage @@ -236348,6 +236177,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "semigroupoids_5_3_6" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , containers, contravariant, distributive, hashable, tagged + , template-haskell, transformers, transformers-compat + , unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.3.6"; + sha256 = "0glhqc9x8i5z3bdg23xvl2lfns95msid3h3x0jksna7i6c8j869n"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable tagged template-haskell transformers + transformers-compat unordered-containers + ]; + description = "Semigroupoids: Category sans id"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "semigroupoids-do" = callPackage ({ mkDerivation, base, semigroupoids }: mkDerivation { @@ -237653,8 +237502,8 @@ self: { pname = "servant-benchmark"; version = "0.1.2.0"; sha256 = "0lqqk410nx48g895pfxkbbk85b1ijs4bfl9zr2li2p7wwwc4gyi9"; - revision = "2"; - editedCabalFile = "1xg1w1cy44a06sb1x2j5crid9splfgay8cj20bpjdnv5sj510gd2"; + revision = "3"; + editedCabalFile = "17pj6n143lpk5nsr6j8j1a6fj45y1bv61jcm16m0fwsdmhv01866"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive http-media http-types QuickCheck servant text yaml @@ -240665,35 +240514,6 @@ self: { }) {}; "sexp-grammar" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , criterion, data-fix, deepseq, happy, invertible-grammar - , prettyprinter, QuickCheck, recursion-schemes, scientific - , semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , utf8-string - }: - mkDerivation { - pname = "sexp-grammar"; - version = "2.3.2"; - sha256 = "1rsa953pykrrfsf7lcnk4ds7vydb9p7s8irvaxvi1v4m2q2zg7a5"; - libraryHaskellDepends = [ - array base bytestring containers data-fix deepseq - invertible-grammar prettyprinter recursion-schemes scientific - semigroups text utf8-string - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - base containers invertible-grammar prettyprinter QuickCheck - scientific semigroups tasty tasty-hunit tasty-quickcheck text - utf8-string - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq text - ]; - description = "Invertible grammar combinators for S-expressions"; - license = lib.licenses.bsd3; - }) {}; - - "sexp-grammar_2_3_3" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , criterion, data-fix, deepseq, happy, invertible-grammar , prettyprinter, QuickCheck, recursion-schemes, scientific @@ -240720,7 +240540,6 @@ self: { ]; description = "Invertible grammar combinators for S-expressions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "sexp-show" = callPackage @@ -248660,6 +248479,8 @@ self: { pname = "solana-staking-csvs"; version = "0.1.1.0"; sha256 = "0ya63vgh0nf4p7hz6fj38m44wr77jj76bf2qxdgra3lpiziqsjd5"; + revision = "1"; + editedCabalFile = "14l72fkvvmiy1hmn2v3nxgx4s5z0zzyi3qf4l1i1cn54a0ln35q6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -260101,8 +259922,8 @@ self: { }: mkDerivation { pname = "system-linux-proc"; - version = "0.1.1"; - sha256 = "12iq9vw5y0pvag9gj6pzm76lh9vfvziawzqzvi35mhdn1hjwhg4b"; + version = "0.1.1.1"; + sha256 = "12nvsvmchhsqs5f3x2075v8v68inb1xz8dbv1q5x48big1bf4vv5"; libraryHaskellDepends = [ attoparsec base bytestring containers directory errors text ]; @@ -262226,6 +262047,8 @@ self: { pname = "tasty-lua"; version = "0.2.3.2"; sha256 = "0wa73ihkjcxi50lgpdzwwdx7s903lqi79hw7hxlvhbcvdly1cq53"; + revision = "1"; + editedCabalFile = "1m5mdn3riwwmvri430iq9m3yl09xsacvkp8w7vyqdmd70w3f9pcw"; libraryHaskellDepends = [ base bytestring file-embed hslua tasty text ]; @@ -267929,8 +267752,8 @@ self: { pname = "tidal-midi"; version = "0.9.10"; sha256 = "0d59s9vq2jmlb8b1bbay6n5911fjm9j04c9545p4i5visniv61b4"; - revision = "1"; - editedCabalFile = "11wkj909j2jlq19ls7q5293av648vc2k6f2064hyrqwcd68mksnj"; + revision = "2"; + editedCabalFile = "1vc5ck25wdqz8ywk2zmn2nmg1mihwkihwp2wirxmmd0qxi1v2vpf"; libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; @@ -275300,25 +275123,6 @@ self: { }) {}; "typed-process" = callPackage - ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec - , process, stm, temporary, transformers, unliftio-core - }: - mkDerivation { - pname = "typed-process"; - version = "0.2.6.1"; - sha256 = "0w4c76qln49967nnhf7f1zj3gbdfqp2qgf5ym8svhqyhp5gh61ws"; - libraryHaskellDepends = [ - async base bytestring process stm transformers unliftio-core - ]; - testHaskellDepends = [ - async base base64-bytestring bytestring hspec process stm temporary - transformers unliftio-core - ]; - description = "Run external processes, with strong typing of streams"; - license = lib.licenses.mit; - }) {}; - - "typed-process_0_2_6_3" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers, unliftio-core }: @@ -275335,7 +275139,6 @@ self: { ]; description = "Run external processes, with strong typing of streams"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "typed-spreadsheet" = callPackage @@ -285919,23 +285722,6 @@ self: { }) {}; "warp-tls" = callPackage - ({ mkDerivation, base, bytestring, cryptonite, data-default-class - , network, streaming-commons, tls, tls-session-manager, unliftio - , wai, warp - }: - mkDerivation { - pname = "warp-tls"; - version = "3.3.1"; - sha256 = "1k8f3r0l36mgwm69fikprv6pyjzj15702kq25dr9nc3sv5lcs162"; - libraryHaskellDepends = [ - base bytestring cryptonite data-default-class network - streaming-commons tls tls-session-manager unliftio wai warp - ]; - description = "HTTP over TLS support for Warp via the TLS package"; - license = lib.licenses.mit; - }) {}; - - "warp-tls_3_3_2" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, streaming-commons, tls, tls-session-manager, unliftio , wai, warp @@ -285950,7 +285736,6 @@ self: { ]; description = "HTTP over TLS support for Warp via the TLS package"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "warp-tls-uid" = callPackage @@ -290647,28 +290432,6 @@ self: { }) {}; "xeno" = 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 = lib.licenses.bsd3; - }) {}; - - "xeno_0_4_3" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-mmap, bzlib , criterion, deepseq, filepath, ghc-prim, hexml, hexpat, hspec, mtl , mutable-containers, time, vector, weigh, xml @@ -290688,7 +290451,6 @@ self: { ]; description = "A fast event-based XML parser in pure Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "xenstore" = callPackage @@ -293549,8 +293311,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.13.2"; - sha256 = "004qly1sags94p7ks1j93xziixbpi3wsblbh2d2ws78gyywqdj9f"; + version = "0.13.3"; + sha256 = "08xs3m14rqpgkjghgp2b8ddalzzs50bzf11nd9kgi72xbg451yzi"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; @@ -295316,24 +295078,6 @@ self: { }) {}; "yesod-markdown" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, bytestring - , directory, hspec, pandoc, persistent, shakespeare, text - , xss-sanitize, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-markdown"; - version = "0.12.6.11"; - sha256 = "044m6a949yifvyxbbc15ms11sdxvljvb68187h5v6xk0qw0p33i9"; - libraryHaskellDepends = [ - base blaze-html blaze-markup bytestring directory pandoc persistent - shakespeare text xss-sanitize yesod-core yesod-form - ]; - testHaskellDepends = [ base blaze-html hspec text ]; - description = "Tools for using markdown in a yesod application"; - license = lib.licenses.gpl2Only; - }) {}; - - "yesod-markdown_0_12_6_12" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bytestring , directory, hspec, pandoc, persistent, shakespeare, text , xss-sanitize, yesod-core, yesod-form @@ -295349,7 +295093,6 @@ self: { testHaskellDepends = [ base blaze-html hspec text ]; description = "Tools for using markdown in a yesod application"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-media-simple" = callPackage @@ -296309,6 +296052,8 @@ self: { pname = "yi-core"; version = "0.19.2"; sha256 = "1ipmycwf2fqk701x0d32bv03aviv7z57m0knpc3np5cvss9mjzvr"; + revision = "1"; + editedCabalFile = "1j3in75pnf72000hfia13z21d6z8vml3wg2sk35nsmr1x8r96xzf"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-default directory dlist dynamic-state exceptions filepath hashable ListLike @@ -296457,6 +296202,8 @@ self: { pname = "yi-keymap-emacs"; version = "0.19.0"; sha256 = "1pkdlkhs6am60whclfasd4axda8hlxzh7q38crmylcb89q90am1l"; + revision = "1"; + editedCabalFile = "1p9m3m25g31ysk4qkabr3vnd4nlycm4zgi56lmkzrlibbxvn6lja"; libraryHaskellDepends = [ base containers filepath Hclip microlens-platform mtl oo-prototypes text transformers-base yi-core yi-language yi-misc-modes yi-rope @@ -296476,6 +296223,8 @@ self: { pname = "yi-keymap-vim"; version = "0.19.0"; sha256 = "046552bqfd3wycx73zksffcnbakfl7xnfz1s2q9z5affpzi5iyrv"; + revision = "1"; + editedCabalFile = "0rm2nm6lki2248vx45rglslcmq9fc6cnqxrb7x8hyb56fxjyq1gz"; libraryHaskellDepends = [ attoparsec base binary containers data-default directory filepath Hclip microlens-platform mtl oo-prototypes pointedlist safe text @@ -296561,6 +296310,8 @@ self: { pname = "yi-mode-javascript"; version = "0.19.0"; sha256 = "1zgx36kagalna8lk60i0djn6mvl6ki55x4kc7mzq2mgzcs292zq1"; + revision = "1"; + editedCabalFile = "09hdiy51i9piyh6889hzjhna8g9hlblrzgzkl8x6rc6pl12dg3wc"; libraryHaskellDepends = [ array base binary data-default dlist filepath microlens-platform mtl text yi-core yi-language yi-rope @@ -297295,6 +297046,40 @@ self: { license = lib.licenses.mit; }) {}; + "zenacy-html_2_0_4" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, dlist, extra, HUnit, mtl, pretty-show + , raw-strings-qq, safe, safe-exceptions, test-framework + , test-framework-hunit, text, transformers, vector, word8 + }: + mkDerivation { + pname = "zenacy-html"; + version = "2.0.4"; + sha256 = "05jy3w7a94ns52w4a1p6xhcph09p2zzqmvncf47db9wwq6xl5ad2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers data-default dlist extra mtl pretty-show + safe safe-exceptions text transformers vector word8 + ]; + executableHaskellDepends = [ + base bytestring containers data-default dlist extra pretty-show + text vector + ]; + testHaskellDepends = [ + base bytestring containers data-default dlist extra HUnit mtl + pretty-show raw-strings-qq test-framework test-framework-hunit text + transformers + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion data-default dlist pretty-show + raw-strings-qq text + ]; + description = "A standard compliant HTML parsing library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "zenacy-unicode" = callPackage ({ mkDerivation, base, bytestring, HUnit, test-framework , test-framework-hunit, text, vector, word8 @@ -298505,26 +298290,6 @@ self: { }) {}; "zstd" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2, zlib - }: - mkDerivation { - pname = "zstd"; - version = "0.1.2.0"; - sha256 = "0vjw8r11k9kj6c63sfkwz8akq0g32g1bv6n6clvs4g2j12zq1xk8"; - libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - benchmarkHaskellDepends = [ - base bytestring criterion ghc-prim zlib - ]; - description = "Haskell bindings to the Zstandard compression algorithm"; - license = lib.licenses.bsd3; - }) {}; - - "zstd_0_1_3_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2, zlib }: @@ -298542,7 +298307,6 @@ self: { ]; description = "Haskell bindings to the Zstandard compression algorithm"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "zsyntax" = callPackage From 755cc527e1ddd9aa93e614dbcd879cd6c6d2c815 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 8 Oct 2021 12:04:25 +0200 Subject: [PATCH 3/7] haskellPackages: stackage-lts 18.12 -> 18.13 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 57 ++++++++++--------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 54521699a0c4..5e40f12bcc59 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage LTS 18.12 +# Stackage LTS 18.13 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -163,22 +163,22 @@ default-package-overrides: - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 - arrows ==0.4.4.2 - - ascii ==1.0.1.4 - - ascii-case ==1.0.0.4 - - ascii-char ==1.0.0.8 + - ascii ==1.0.1.6 + - ascii-case ==1.0.0.6 + - ascii-char ==1.0.0.10 - asciidiagram ==1.3.3.3 - - ascii-group ==1.0.0.4 - - ascii-predicates ==1.0.0.4 + - ascii-group ==1.0.0.6 + - ascii-predicates ==1.0.0.6 - ascii-progress ==0.3.3.0 - - ascii-superset ==1.0.1.4 - - ascii-th ==1.0.0.4 + - ascii-superset ==1.0.1.6 + - ascii-th ==1.0.0.6 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - asn1-types ==0.3.4 - assert-failure ==0.1.2.5 - assoc ==1.0.2 - astro ==0.4.3.0 - - async ==2.2.3 + - async ==2.2.4 - async-extra ==0.2.0.0 - async-pool ==0.9.1 - async-refresh ==0.3.0.0 @@ -277,7 +277,7 @@ default-package-overrides: - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.2.1 - bmp ==1.2.6.3 - - BNFC ==2.9.2 + - BNFC ==2.9.3 - BNFC-meta ==0.6.1 - board-games ==0.3 - boltzmann-samplers ==0.1.1.0 @@ -614,7 +614,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.2.1 - - dl-fedora ==0.9.1 + - dl-fedora ==0.9.2 - dlist ==1.0 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -683,7 +683,7 @@ default-package-overrides: - elynx-tree ==0.5.1.1 - email-validate ==2.3.2.15 - emd ==0.2.0.0 - - emojis ==0.1 + - emojis ==0.1.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - entropy ==0.4.1.6 @@ -704,7 +704,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.9 - - esqueleto ==3.5.2.2 + - esqueleto ==3.5.3.0 - essence-of-live-coding ==0.2.5 - essence-of-live-coding-gloss ==0.2.5 - essence-of-live-coding-pulse ==0.2.5 @@ -838,7 +838,7 @@ default-package-overrides: - generic-aeson ==0.2.0.12 - generic-arbitrary ==0.1.0 - generic-constraints ==1.1.1.1 - - generic-data ==0.9.2.0 + - generic-data ==0.9.2.1 - generic-data-surgery ==0.3.0.0 - generic-deriving ==1.14.1 - generic-functor ==0.2.0.0 @@ -1011,7 +1011,7 @@ default-package-overrides: - hasql-transaction ==1.0.1 - hasty-hamiltonian ==1.3.4 - HaTeX ==3.22.3.0 - - HaXml ==1.25.5 + - HaXml ==1.25.6 - haxr ==3000.11.4.1 - HCodecs ==0.5.2 - hdaemonize ==0.5.6 @@ -1107,7 +1107,7 @@ default-package-overrides: - hslua-module-path ==0.1.0.1 - hslua-module-system ==0.2.2.1 - hslua-module-text ==0.3.0.1 - - HsOpenSSL ==0.11.7.1 + - HsOpenSSL ==0.11.7.2 - HsOpenSSL-x509-system ==0.1.0.4 - hsp ==0.10.0 - hspec ==2.7.10 @@ -1259,7 +1259,7 @@ default-package-overrides: - intset-imperative ==0.1.0.0 - invariant ==0.5.4 - invertible ==0.2.0.7 - - invertible-grammar ==0.1.3 + - invertible-grammar ==0.1.3.1 - io-machine ==0.2.0.0 - io-manager ==0.1.0.3 - io-memoize ==1.1.1.0 @@ -1395,6 +1395,7 @@ default-package-overrides: - linear ==1.21.6 - linear-circuit ==0.1.0.2 - linenoise ==0.3.2 + - linux-capabilities ==0.1.0.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - liquid-fixpoint ==0.8.10.2 @@ -1446,7 +1447,7 @@ default-package-overrides: - makefile ==1.1.0.0 - managed ==1.0.8 - MapWith ==0.2.0.0 - - markdown ==0.1.17.4 + - markdown ==0.1.17.5 - markdown-unlit ==0.5.1 - markov-chain ==0.0.3.4 - massiv ==0.6.1.0 @@ -1578,7 +1579,7 @@ default-package-overrides: - multipart ==0.2.1 - multiset ==0.3.4.3 - multistate ==0.8.0.3 - - murmur3 ==1.0.4 + - murmur3 ==1.0.5 - murmur-hash ==0.1.0.9 - MusicBrainz ==0.4.1 - mustache ==2.3.1 @@ -1634,7 +1635,7 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.3 - - nonempty-containers ==0.3.4.3 + - nonempty-containers ==0.3.4.4 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.1.0 @@ -1686,7 +1687,7 @@ default-package-overrides: - opentelemetry-extra ==0.7.0 - opentelemetry-lightstep ==0.7.0 - opentelemetry-wai ==0.7.0 - - operational ==0.2.3.5 + - operational ==0.2.4.0 - operational-class ==0.3.0.0 - optics ==0.3 - optics-core ==0.3.0.1 @@ -2011,7 +2012,7 @@ default-package-overrides: - rocksdb-haskell ==1.0.1 - rocksdb-haskell-jprupp ==2.1.3 - rocksdb-query ==0.4.2 - - roles ==0.2.0.0 + - roles ==0.2.1.0 - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 @@ -2120,7 +2121,7 @@ default-package-overrides: - set-cover ==0.1.1 - setenv ==0.1.1.3 - setlocale ==1.0.0.10 - - sexp-grammar ==2.3.2 + - sexp-grammar ==2.3.3 - SHA ==1.6.4.4 - shake ==0.19.6 - shake-language-c ==0.12.0 @@ -2464,7 +2465,7 @@ default-package-overrides: - turtle ==1.5.22 - typecheck-plugin-nat-simple ==0.1.0.2 - TypeCompose ==0.9.14 - - typed-process ==0.2.6.1 + - typed-process ==0.2.6.3 - typed-uuid ==0.1.0.0 - type-equality ==1 - type-errors ==0.2.0.0 @@ -2608,7 +2609,7 @@ default-package-overrides: - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 - warp ==3.3.17 - - warp-tls ==3.3.1 + - warp-tls ==3.3.2 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 - wcwidth ==0.0.2 @@ -2660,7 +2661,7 @@ default-package-overrides: - Xauth ==0.1 - xdg-basedir ==0.2.2 - xdg-userdirs ==0.1.0.2 - - xeno ==0.4.2 + - xeno ==0.4.3 - xlsx ==0.8.4 - xlsx-tabular ==0.2.2.1 - xml ==1.3.14 @@ -2693,7 +2694,7 @@ default-package-overrides: - yesod-fb ==0.6.1 - yesod-form ==1.7.0 - yesod-gitrev ==0.2.2 - - yesod-markdown ==0.12.6.11 + - yesod-markdown ==0.12.6.12 - yesod-newsfeed ==1.7.0.0 - yesod-page-cursor ==2.0.0.9 - yesod-paginator ==1.1.1.0 @@ -2724,6 +2725,6 @@ default-package-overrides: - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - zot ==0.0.3 - - zstd ==0.1.2.0 + - zstd ==0.1.3.0 - ztail ==1.2.0.2 - zydiskell ==0.2.0.0 From 37a3e4ed31de88036929030ef910b2db861b4719 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 10 Oct 2021 16:23:30 +0200 Subject: [PATCH 4/7] haskellPackages: fix evaluation Some version upgrades caused attributes to disappear. The upgrade from language-docker 10.1.2 to 10.2.0 introduces a test failure which is caused by missing files in the release tarball, so we need to fix this up manually. --- .../haskell-modules/configuration-common.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 209391aaf5df..1d6f3a292822 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1996,9 +1996,16 @@ EOT # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. streamly-posix = doJailbreak super.streamly-posix; + # https://github.com/hadolint/language-docker/issues/72 + language-docker_10_2_0 = overrideCabal super.language-docker_10_2_0 (drv: { + testFlags = (drv.testFlags or []) ++ [ + "--skip=/Language.Docker.Integration/parse" + ]; + }); + # 2021-09-06: hadolint depends on language-docker >= 10.1 hadolint = super.hadolint.override { - language-docker = self.language-docker_10_1_2; + language-docker = self.language-docker_10_2_0; }; # 2021-09-13: hls 1.3 needs a newer lsp than stackage-lts. (lsp >= 1.2.0.1) @@ -2025,11 +2032,11 @@ EOT # Needs network >= 3.1.2 quic = super.quic.overrideScope (self: super: { - network = self.network_3_1_2_2; + network = self.network_3_1_2_3; }); http3 = super.http3.overrideScope (self: super: { - network = self.network_3_1_2_2; + network = self.network_3_1_2_5; }); } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From aadf1d5f3f7bdbb30e5b9e348dbd97bcc8369634 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 10 Oct 2021 20:28:33 +0200 Subject: [PATCH 5/7] haskellPackages.network_3_1_2_5: Use correct version in all references to this pkg --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1d6f3a292822..de595427da84 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2032,7 +2032,7 @@ EOT # Needs network >= 3.1.2 quic = super.quic.overrideScope (self: super: { - network = self.network_3_1_2_3; + network = self.network_3_1_2_5; }); http3 = super.http3.overrideScope (self: super: { diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 6826e6174a55..454af580823c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -63,7 +63,7 @@ self: super: { HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }); integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); lukko = doJailbreak super.lukko; - network = super.network_3_1_2_2; + network = super.network_3_1_2_5; parallel = doJailbreak super.parallel; primitive = doJailbreak super.primitive; regex-posix = doJailbreak super.regex-posix; From 3fab2e5082732dd121d57c17475ec03021a33f6b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 11 Oct 2021 00:10:31 +0200 Subject: [PATCH 6/7] haskell.packages.ghc921.language-haskell-extract: pin patch revision This should make it more reproducible, today's master has already diverged from the state it was in when the previous hash was obtained (for GHC 9.0.1), may need some digging to fix this in the 9.0.x configuration overlay. --- pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 454af580823c..1d46eec71e3b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -85,8 +85,8 @@ self: super: { }); doctest = dontCheck (doJailbreak super.doctest_0_18_1); language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; - sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch"; + sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; }); # 1.3.0 (on stackage) defines instances for the Option-type, which has been removed from base in GHC 9.2.x From e0ac27c6042622e0bb880818a22d509c45f39523 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Sat, 9 Oct 2021 23:00:20 +1100 Subject: [PATCH 7/7] haskell.packages.ghc921: make dependencies of ihaskell build See also https://github.com/gibiansky/IHaskell/pull/1283. --- .../configuration-ghc-9.2.x.nix | 108 ++++++++++++++++-- 1 file changed, 99 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 1d46eec71e3b..e31771a3e2fc 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -43,54 +43,129 @@ self: super: { unix = null; xhtml = null; + aeson = appendPatch (doJailbreak super.aeson) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/aeson-1.5.6.0.patch"; + sha256 = "07rk7f0lhgilxvbg2grpl1p5x25wjf9m7a0wqmi2jr0q61p9a0nl"; + # The revision information is newer than that included in the patch + excludes = ["*.cabal"]; + }); + + attoparsec = appendPatch (doJailbreak super.attoparsec_0_14_1) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/attoparsec-0.14.1.patch"; + sha256 = "0nprywmi3i9ih8mcc8afyimrfjr8pbcjxr2ywz9gwdlwdplk21da"; + }); + # 0.12.0 introduces support for 9.2 base-compat = self.base-compat_0_12_0; + base-compat-batteries = self.base-compat-batteries_0_12_0; + + basement = overrideCabal (appendPatch super.basement (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/basement-0.0.12.patch"; + sha256 = "0c8n2krz827cv87p3vb1vpl3v0k255aysjx9lq44gz3z1dhxd64z"; + })) (drv: { + # This is inside a conditional block so `doJailbreak` doesn't work + postPatch = "sed -i -e 's,<4.16,<4.17,' basement.cabal"; + }); + + # Duplicate Show instances in tests and library cause compiling tests to fail + blaze-builder = appendPatch (dontCheck super.blaze-builder) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/blaze-builder-0.4.2.1.patch"; + sha256 = "1h5ny3mlng69vwaabl3af8hlv4qi24wfw8s14lw2ksw1yjbgi0j8"; + }); + + cereal = appendPatch super.cereal (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cereal-0.5.8.1.patch"; + sha256 = "03v4nxwz9y6viaa8anxcmp4zdf2clczv4pf9fqq6lnpplpz5i128"; + }); + + # Tests fail because of typechecking changes + conduit = dontCheck super.conduit; + + constraints = appendPatch super.constraints (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/constraints-0.13.patch"; + sha256 = "0cr4qzw0fbwy97f3wx0v3mv8yc642ahpfa80kaqrq191232fzzf3"; + }); + + cryptonite = appendPatch super.cryptonite (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cryptonite-0.29.patch"; + sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09"; + }); # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; }); + doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18_1)) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/doctest-0.18.1.patch"; + sha256 = "030kdsk0fg08cgdcjpyv6z8ym1vkkrbd34aacs91y5hqzc9g79y1"; + }); + + entropy = appendPatch super.entropy (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/entropy-0.4.1.6.patch"; + sha256 = "0pbbl6m8b3snf9cz6rs0ljmacpsavayfn0s3p67hdcmndy3ndawi"; + }); + + # Tests fail in GHC 9.2 + extra = dontCheck super.extra; + # Jailbreaks & Version Updates + assoc = doJailbreak super.assoc; async = doJailbreak super.async; base64-bytestring = doJailbreak super.base64-bytestring; ChasingBottoms = doJailbreak super.ChasingBottoms; + cpphs = overrideCabal super.cpphs (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}); + cryptohash-md5 = doJailbreak super.cryptohash-md5; + cryptohash-sha1 = doJailbreak super.cryptohash-sha1; data-fix = doJailbreak super.data-fix; dec = doJailbreak super.dec; ed25519 = doJailbreak super.ed25519; + ghc-byteorder = doJailbreak super.ghc-byteorder; hackage-security = doJailbreak super.hackage-security; hashable-time = doJailbreak super.hashable-time; HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; }); - integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; }); + integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's, <1.1, <1.3,' integer-logarithms.cabal"; }); + indexed-traversable = doJailbreak super.indexed-traversable; + lifted-async = doJailbreak super.lifted-async; lukko = doJailbreak super.lukko; network = super.network_3_1_2_5; parallel = doJailbreak super.parallel; + polyparse = overrideCabal (doJailbreak super.polyparse) (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }); primitive = doJailbreak super.primitive; regex-posix = doJailbreak super.regex-posix; resolv = doJailbreak super.resolv; singleton-bool = doJailbreak super.singleton-bool; + scientific = doJailbreak super.scientific; + shelly = doJailbreak super.shelly; split = doJailbreak super.split; splitmix = doJailbreak super.splitmix; tar = doJailbreak super.tar; + these = doJailbreak super.these; time-compat = doJailbreak super.time-compat; + type-equality = doJailbreak super.type-equality; vector = doJailbreak (dontCheck super.vector); vector-binary-instances = doJailbreak super.vector-binary-instances; vector-th-unbox = doJailbreak super.vector-th-unbox; zlib = doJailbreak super.zlib; + # Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760 + alex = dontCheck super.alex; + # Apply patches from head.hackage. - alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch"; - sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4"; - }); - doctest = dontCheck (doJailbreak super.doctest_0_18_1); language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/language-haskell-extract-0.2.4.patch"; sha256 = "0w4y3v69nd3yafpml4gr23l94bdhbmx8xky48a59lckmz5x9fgxv"; }); - # 1.3.0 (on stackage) defines instances for the Option-type, which has been removed from base in GHC 9.2.x - hashable = super.hashable_1_3_3_0; + hashable = super.hashable_1_3_4_1; + + haskell-src-meta = appendPatch (doJailbreak super.haskell-src-meta) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/haskell-src-meta-0.8.7.patch"; + sha256 = "013k8hpxac226j47cdzgdf9a1j91kmm0cvv7n8zwlajbj3y9bzjp"; + }); + + # Tests depend on `parseTime` which is no longer available + hourglass = dontCheck super.hourglass; # 1.2.1 introduced support for GHC 9.2.1, stackage has 1.2.0 # The test suite indirectly depends on random, which leads to infinite recursion @@ -100,16 +175,31 @@ self: super: { lens = super.lens_5_0_1; # 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0 - memory = super.memory_0_16_0; + memory = appendPatch super.memory_0_16_0 (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/memory-0.16.0.patch"; + sha256 = "1kjganx729a6xfgfnrb3z7q6mvnidl042zrsd9n5n5a3i76nl5nl"; + }); # GHC 9.0.x doesn't like `import Spec (main)` in Main.hs # https://github.com/snoyberg/mono-traversable/issues/192 mono-traversable = dontCheck super.mono-traversable; + quickcheck-instances = appendPatch (doJailbreak super.quickcheck-instances) (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/quickcheck-instances-0.3.25.2.patch"; + sha256 = "0ndnb6wbnhxxwy69jjdpmd7gmmv6asmx1jczwz1hsn921mn1ilnp"; + # `.cabal` revision information has been included in the patch + excludes = ["*.cabal"]; + }); + # Disable tests pending resolution of # https://github.com/Soostone/retry/issues/71 retry = dontCheck super.retry; + streaming-commons = appendPatch super.streaming-commons (pkgs.fetchpatch { + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/streaming-commons-0.2.2.1.patch"; + sha256 = "04wi1jskr3j8ayh88kkx4irvhhgz0i7aj6fblzijy0fygikvidpy"; + }); + # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage hlint = super.hlint_3_3_4.overrideScope (self: super: { ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 {