From b933addd2278570a2f24f30b795d986c9ef63686 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 9 Aug 2022 16:26:20 +0900 Subject: [PATCH 01/18] haskellPackages: stackage LTS 19.17 -> LTS 19.18 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 59b9f6ad5f7c..08fd845a1b35 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 19.17 +# Stackage LTS 19.18 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -258,7 +258,7 @@ default-package-overrides: - bytestring-mmap ==0.2.2 - bytestring-strict-builder ==0.4.5.6 - bytestring-to-vector ==0.3.0.1 - - bytestring-tree-builder ==0.2.7.9 + - bytestring-tree-builder ==0.2.7.10 - bytestring-trie ==0.2.7 - bz2 ==1.0.1.0 - bzlib ==0.5.1.0 @@ -397,7 +397,7 @@ default-package-overrides: - conduino ==0.2.2.0 - conduit ==1.3.4.2 - conduit-aeson ==0.1.0.1 - - conduit-algorithms ==0.0.12.0 + - conduit-algorithms ==0.0.13.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.3 - conduit-connection ==0.1.0.5 @@ -442,7 +442,7 @@ default-package-overrides: - crc32c ==0.0.0 - credential-store ==0.1.2 - criterion ==1.5.13.0 - - criterion-measurement ==0.1.3.0 + - criterion-measurement ==0.1.4.0 - cron ==0.7.0 - crypto-api ==0.13.3 - crypto-api-tests ==0.3 @@ -604,7 +604,7 @@ default-package-overrides: - doctest-exitcode-stdio ==0.0 - doctest-extract ==0.1 - doctest-lib ==0.1 - - doctest-parallel ==0.2.3 + - doctest-parallel ==0.2.4 - doldol ==0.4.1.2 - do-list ==1.0.1 - domain ==0.1.1.3 @@ -683,7 +683,7 @@ default-package-overrides: - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.11 - - esqueleto ==3.5.5.0 + - esqueleto ==3.5.6.1 - essence-of-live-coding ==0.2.6 - essence-of-live-coding-gloss ==0.2.6 - essence-of-live-coding-pulse ==0.2.6 @@ -992,8 +992,8 @@ default-package-overrides: - hashtables ==1.2.4.2 - haskeline ==0.8.2 - haskell-awk ==1.2.0.1 - - haskell-gi ==0.26.0 - - haskell-gi-base ==0.26.0 + - haskell-gi ==0.26.1 + - haskell-gi-base ==0.26.1 - haskell-gi-overloading ==1.0 - haskell-lexer ==1.1 - haskell-lsp-types ==0.24.0.0 @@ -1007,7 +1007,7 @@ default-package-overrides: - hasktags ==0.72.0 - hasql ==1.5.1 - hasql-migration ==0.3.0 - - hasql-notifications ==0.2.0.1 + - hasql-notifications ==0.2.0.2 - hasql-optparse-applicative ==0.3.0.9 - hasql-pool ==0.5.2.2 - hasql-queue ==1.2.0.2 @@ -1176,7 +1176,7 @@ default-package-overrides: - HTTP ==4000.3.16 - http-api-data ==0.4.3 - http-api-data-qq ==0.1.0.0 - - http-client ==0.7.12 + - http-client ==0.7.13.1 - http-client-openssl ==0.3.3 - http-client-overrides ==0.1.1.0 - http-client-tls ==0.3.6.1 @@ -2229,7 +2229,7 @@ default-package-overrides: - simple-affine-space ==0.1.1 - simple-cabal ==0.1.3 - simple-cmd ==0.2.7 - - simple-cmd-args ==0.1.7 + - simple-cmd-args ==0.1.8 - simple-log ==0.9.12 - simple-media-timestamp ==0.2.0.0 - simple-media-timestamp-attoparsec ==0.1.0.0 @@ -2337,7 +2337,7 @@ default-package-overrides: - storable-record ==0.0.6 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13.1 - - store ==0.7.15 + - store ==0.7.16 - store-core ==0.4.4.4 - store-streaming ==0.2.0.3 - Stream ==0.4.7.2 From 898ef5ee50d8f8598fe0f4f1f20a94f267a441ee Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 9 Aug 2022 16:27:31 +0900 Subject: [PATCH 02/18] all-cabal-hashes: 2022-08-07T14:05:30Z -> 2022-08-09T06:14:32Z 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 0678176b571d..2edec2704601 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "7a6596613e0d6549f329cb3c2862b035667e0fc3", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7a6596613e0d6549f329cb3c2862b035667e0fc3.tar.gz", - "sha256": "07sm18dn6lsi8xjhfhm7dyw62lpln9wyhafkigc6f3xaqblz3ap4", - "msg": "Update from Hackage at 2022-08-07T14:05:30Z" + "commit": "eb862a59277fd86ad3138e9f25e793f0fe0364ba", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/eb862a59277fd86ad3138e9f25e793f0fe0364ba.tar.gz", + "sha256": "10agwlxzp76lnp4d6zncvjgv78hr3rss3j3i3bfpsn3i7af1qcw8", + "msg": "Update from Hackage at 2022-08-09T06:14:32Z" } From 1b711bc5c461aab2919a03ab62c183c593a75ec6 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 9 Aug 2022 16:29:13 +0900 Subject: [PATCH 03/18] 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 | 617 +++++++----------- 1 file changed, 252 insertions(+), 365 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2099bab820c3..d90eacaaa76c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -22533,8 +22533,8 @@ self: { ({ mkDerivation, base, deepseq, random, simple-affine-space }: mkDerivation { pname = "Yampa"; - version = "0.13.5"; - sha256 = "1l7ykhcy7qqp4dysyp3qq3nx962zsdf47iqmsz28l4chr8dxfvnm"; + version = "0.13.6"; + sha256 = "0rgwvbp0jpl4pyxrhx2s29fnz8q8xyrbm9r4i2glrf89p29vpwxy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39828,12 +39828,12 @@ self: { broken = true; }) {}; - "base_4_16_3_0" = callPackage + "base_4_17_0_0" = callPackage ({ mkDerivation, ghc-bignum, ghc-prim, rts }: mkDerivation { pname = "base"; - version = "4.16.3.0"; - sha256 = "1jgm0kpcn6b2xvnhh5l09c2khlqz85qj47il2wxalf904iw9262c"; + version = "4.17.0.0"; + sha256 = "1ma01nc34knldpp1mb0j5mv07sy28kih6529kfkm1w0c7apc0aiy"; libraryHaskellDepends = [ ghc-bignum ghc-prim rts ]; description = "Basic libraries"; license = lib.licenses.bsd3; @@ -48065,24 +48065,24 @@ self: { license = lib.licenses.bsd3; }) {}; - "brick_0_73" = callPackage - ({ mkDerivation, base, bytestring, config-ini, containers + "brick_1_0" = callPackage + ({ mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions - , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm - , template-haskell, text, text-zipper, transformers, unix, vector - , vty, word-wrap + , filepath, microlens, microlens-mtl, microlens-th, mtl, QuickCheck + , stm, template-haskell, text, text-zipper, unix, vector, vty + , word-wrap }: mkDerivation { pname = "brick"; - version = "0.73"; - sha256 = "17030aydkn9gkd8dwywhfc65lr3dnf6cib6kspfmmazh2w3qs73l"; + version = "1.0"; + sha256 = "00r0slc0yvzr789q71dr0cbixy4bw73qsiv5mldpc4f2q5sj10bk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring config-ini containers contravariant data-clist - deepseq directory dlist exceptions filepath microlens microlens-mtl - microlens-th stm template-haskell text text-zipper transformers - unix vector vty word-wrap + base bimap bytestring config-ini containers contravariant + data-clist deepseq directory dlist exceptions filepath microlens + microlens-mtl microlens-th mtl stm template-haskell text + text-zipper unix vector vty word-wrap ]; testHaskellDepends = [ base containers microlens QuickCheck vector vty @@ -48137,8 +48137,8 @@ self: { }: mkDerivation { pname = "brick-skylighting"; - version = "0.3"; - sha256 = "1wjl5ff9c7czg7azj2pi17b3kzbgb5rmwb4nkxdy86xn6d68adi1"; + version = "1.0"; + sha256 = "1nw2x9zn0jlvykm89v80fh4187bxgn8l4cljgnf4mp4ci7aqjmkr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49772,8 +49772,8 @@ self: { }: mkDerivation { pname = "by-other-names"; - version = "1.2.0.0"; - sha256 = "1272d888x7x38nw0ffqjin8c1x5da59a5rwcy2r4znc2d9plij6z"; + version = "1.2.0.1"; + sha256 = "0lmk2nbj92kyi1h74v3f4k5zhf41zbnz8pari1rqxlf7a859c7k9"; libraryHaskellDepends = [ aeson base indexed-traversable template-haskell text ]; @@ -50512,27 +50512,6 @@ self: { }) {}; "bytestring-tree-builder" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq - , QuickCheck, quickcheck-instances, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "bytestring-tree-builder"; - version = "0.2.7.9"; - sha256 = "0lmm52716b0qqnlpqgiscc92wk9n1fckydmp4vzi58h5majzpnyb"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ - base-prelude bytestring QuickCheck quickcheck-instances tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base-prelude bytestring criterion deepseq - ]; - description = "A very efficient ByteString builder implementation based on the binary tree"; - license = lib.licenses.mit; - }) {}; - - "bytestring-tree-builder_0_2_7_10" = callPackage ({ mkDerivation, base, base-prelude, bytestring, criterion, deepseq , QuickCheck, quickcheck-instances, tasty, tasty-hunit , tasty-quickcheck, text @@ -50551,7 +50530,6 @@ self: { ]; description = "A very efficient ByteString builder implementation based on the binary tree"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "bytestring-trie" = callPackage @@ -64884,41 +64862,6 @@ self: { }) {}; "conduit-algorithms" = callPackage - ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit - , conduit-combinators, conduit-extra, conduit-zstd, containers - , criterion, deepseq, directory, exceptions, fingertree, HUnit - , lzma-conduit, monad-control, mtl, QuickCheck, resourcet, stm - , stm-conduit, streaming-commons, tasty, tasty-hunit - , tasty-quickcheck, tasty-th, transformers, unliftio-core, vector - }: - mkDerivation { - pname = "conduit-algorithms"; - version = "0.0.12.0"; - sha256 = "0zq1a3f64p5rqhlhk87vvpn3m8198m9ndxshj4wdq5b3lkylh89b"; - libraryHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra conduit-zstd containers deepseq exceptions fingertree - lzma-conduit monad-control mtl resourcet stm stm-conduit - streaming-commons transformers unliftio-core vector - ]; - testHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra conduit-zstd containers deepseq directory exceptions - fingertree HUnit lzma-conduit monad-control mtl QuickCheck - resourcet stm stm-conduit streaming-commons tasty tasty-hunit - tasty-quickcheck tasty-th transformers unliftio-core vector - ]; - benchmarkHaskellDepends = [ - async base bytestring bzlib-conduit conduit conduit-combinators - conduit-extra conduit-zstd containers criterion deepseq exceptions - fingertree lzma-conduit monad-control mtl resourcet stm stm-conduit - streaming-commons transformers unliftio-core vector - ]; - description = "Conduit-based algorithms"; - license = lib.licenses.mit; - }) {}; - - "conduit-algorithms_0_0_13_0" = callPackage ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit , conduit-combinators, conduit-extra, conduit-zstd, containers , criterion, deepseq, directory, exceptions, fingertree, HUnit @@ -64951,7 +64894,6 @@ self: { ]; description = "Conduit-based algorithms"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "conduit-audio" = callPackage @@ -69650,21 +69592,6 @@ self: { }) {}; "criterion-measurement" = callPackage - ({ mkDerivation, aeson, base, base-compat, binary, containers - , deepseq, vector - }: - mkDerivation { - pname = "criterion-measurement"; - version = "0.1.3.0"; - sha256 = "1ffmjcpmdx2sx0sr3g5n2s8dhrbmh7606zfnymv2v9h1rf36xf3x"; - libraryHaskellDepends = [ - aeson base base-compat binary containers deepseq vector - ]; - description = "Criterion measurement functionality and associated types"; - license = lib.licenses.bsd3; - }) {}; - - "criterion-measurement_0_1_4_0" = callPackage ({ mkDerivation, aeson, base, base-compat, binary, containers , deepseq, vector }: @@ -69677,7 +69604,6 @@ self: { ]; description = "Criterion measurement functionality and associated types"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "criterion-plus" = callPackage @@ -82877,6 +82803,32 @@ self: { license = lib.licenses.bsd3; }) {}; + "dns_4_1_0" = callPackage + ({ mkDerivation, array, async, attoparsec, auto-update, base + , base16-bytestring, base64-bytestring, bytestring, containers + , cryptonite, doctest, hourglass, hspec, hspec-discover, iproute + , mtl, network, psqueues, QuickCheck, word8 + }: + mkDerivation { + pname = "dns"; + version = "4.1.0"; + sha256 = "1l80y48s9ryqcap587w41wrr2jzwh55gi16k7yib58xpqarcxqs5"; + libraryHaskellDepends = [ + array async attoparsec auto-update base base16-bytestring + base64-bytestring bytestring containers cryptonite hourglass + iproute mtl network psqueues + ]; + testHaskellDepends = [ + base bytestring doctest hspec iproute network QuickCheck word8 + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + testTarget = "spec"; + description = "DNS library in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "dns-patterns" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit , parser-combinators, text @@ -83708,36 +83660,6 @@ self: { }) {}; "doctest-parallel" = callPackage - ({ mkDerivation, base, base-compat, Cabal, code-page, containers - , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths - , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty - , process, QuickCheck, random, setenv, silently, stringbuilder, syb - , template-haskell, transformers, unordered-containers - }: - mkDerivation { - pname = "doctest-parallel"; - version = "0.2.3"; - sha256 = "0sk1990ksqcgc13kppbh0xljakn3qsqaxi19990fixwakhzh229v"; - revision = "1"; - editedCabalFile = "1xk6d3b56y8lvngw6q9m5qhm1v59gyk48n4677p7vrr64x0mvmzx"; - libraryHaskellDepends = [ - base base-compat Cabal code-page containers deepseq directory - exceptions extra filepath ghc ghc-paths Glob pretty process random - syb template-haskell transformers unordered-containers - ]; - testHaskellDepends = [ - base base-compat code-page containers deepseq directory exceptions - filepath ghc ghc-paths hspec hspec-core hspec-discover HUnit - mockery process QuickCheck setenv silently stringbuilder syb - transformers - ]; - testToolDepends = [ hspec-discover ]; - doHaddock = false; - description = "Test interactive Haskell examples"; - license = lib.licenses.mit; - }) {}; - - "doctest-parallel_0_2_4" = callPackage ({ mkDerivation, base, base-compat, Cabal, code-page, containers , deepseq, directory, exceptions, extra, filepath, ghc, ghc-paths , Glob, hspec, hspec-core, hspec-discover, HUnit, mockery, pretty @@ -83763,7 +83685,6 @@ self: { doHaddock = false; description = "Test interactive Haskell examples"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "doctest-prop" = callPackage @@ -91489,34 +91410,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.5.0"; - sha256 = "0ba90p3cqyr0l447dw2xzrk2fs6xv5b2c79rqsnj0bchpsigj8a0"; - 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_6_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, hspec-core, monad-logger , mtl, mysql, mysql-simple, persistent, persistent-mysql @@ -91542,7 +91435,6 @@ self: { ]; description = "Type-safe EDSL for SQL queries on persistent backends"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "esqueleto-pgcrypto" = callPackage @@ -107923,12 +107815,12 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-bignum_1_2" = callPackage + "ghc-bignum_1_3" = callPackage ({ mkDerivation }: mkDerivation { pname = "ghc-bignum"; - version = "1.2"; - sha256 = "0ldg53hirqz6yszacpajq6pf407bflyk46wjhx5g8n2cjz54vv3p"; + version = "1.3"; + sha256 = "0qchsli1aq9l2p220jpv2b4p4v7bivv59y1js07x6iqd0j9lnh5z"; description = "GHC BigNum library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -107945,14 +107837,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-boot_9_2_2" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , directory, filepath, ghc-boot-th, unix + "ghc-boot_9_4_1" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, containers + , deepseq, directory, filepath, ghc-boot-th, unix }: mkDerivation { pname = "ghc-boot"; - version = "9.2.2"; - sha256 = "0wdyaj8w08r20j4if5v3d5wh3b1f5lwdvw3wk0lx7scxz7xzs9fq"; + version = "9.4.1"; + sha256 = "0jm28sisgc0sggf3jgbf7v387xllfv0fnm0bdb0m0lfrqr4w3xmc"; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath ghc-boot-th unix @@ -107962,12 +107855,12 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-boot-th_9_2_2" = callPackage + "ghc-boot-th_9_4_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ghc-boot-th"; - version = "9.2.2"; - sha256 = "06rgdq07fkkzhfkq29nxmqiiy9ndbzb5dgij7flz113bdskq88i3"; + version = "9.4.1"; + sha256 = "0qnhnyavbm44aiq8x0cf1q7rylpv6gv4bjfiir7s2g950vdab8il"; libraryHaskellDepends = [ base ]; description = "Shared functionality between GHC and the @template-haskell@ library"; license = lib.licenses.bsd3; @@ -108460,12 +108353,12 @@ self: { broken = true; }) {}; - "ghc-heap_9_2_2" = callPackage + "ghc-heap_9_4_1" = callPackage ({ mkDerivation, base, containers, ghc-prim, rts }: mkDerivation { pname = "ghc-heap"; - version = "9.2.2"; - sha256 = "09m2kv4b3hbi5h3lm1vxfh5hwjjwzfnw22qd35ld6xq0mffz6a3f"; + version = "9.4.1"; + sha256 = "0zfz389vv7pwxivlvrf3ykij31saafk9vm32fa9xl2b4kvgc8my2"; libraryHaskellDepends = [ base containers ghc-prim rts ]; description = "Functions for walking GHC's heap"; license = lib.licenses.bsd3; @@ -108637,21 +108530,21 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib_9_2_4_20220729" = callPackage + "ghc-lib_9_4_1_20220807" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser - , ghc-prim, happy, hpc, parsec, pretty, process, rts, time + , ghc-prim, happy, hpc, parsec, pretty, process, rts, stm, time , transformers, unix }: mkDerivation { pname = "ghc-lib"; - version = "9.2.4.20220729"; - sha256 = "16whiazjynzj6qw1rmadyrxkibvmyhfzxzw42cv0ya9ijzlplhpq"; + version = "9.4.1.20220807"; + sha256 = "0anaf36bgziqy8ajc5442qf06xv06p3x46dca29qdnplckjypc51"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty - process rts time transformers unix + process rts stm time transformers unix ]; libraryToolDepends = [ alex happy ]; description = "The GHC API, decoupled from GHC versions"; @@ -108699,15 +108592,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "ghc-lib-parser_9_2_4_20220729" = callPackage + "ghc-lib-parser_9_4_1_20220807" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec , pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "9.2.4.20220729"; - sha256 = "0rlm6znxrhs3s9s6c7qblvl03lscydx3dridyp985i593jyan55s"; + version = "9.4.1.20220807"; + sha256 = "0m297q39afy2dd2gya451lgwl8wjrzcz2f72102x69qbbp3r63q2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory @@ -108780,14 +108673,14 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-lib-parser-ex_9_2_1_1" = callPackage + "ghc-lib-parser-ex_9_4_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "9.2.1.1"; - sha256 = "01004zsi4d3vd9k1d2ik284z6wnkny48yp5d2y6fi9hgba11d53q"; + version = "9.4.0.0"; + sha256 = "06qrfg4icp66lyhzncvsaqdcmsijayrlgi91x65a2nd2l0wz6gyf"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -109041,13 +108934,14 @@ self: { broken = true; }) {}; - "ghc-prim_0_8_0" = callPackage - ({ mkDerivation, base, c, Cabal, rts }: + "ghc-prim_0_9_0" = callPackage + ({ mkDerivation, base, c, Cabal, directory, filepath, process, rts + }: mkDerivation { pname = "ghc-prim"; - version = "0.8.0"; - sha256 = "1nryf4smajnqxw29s5hbzmv7psjl6qrcvkk12zzh7x3nkf4qr8ss"; - setupHaskellDepends = [ base Cabal ]; + version = "0.9.0"; + sha256 = "1r2iwinvyv75g0iaki8qil5vbc8vn18pszp98bh210rw95jz1j0w"; + setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ rts ]; librarySystemDepends = [ c ]; description = "GHC primitives"; @@ -127057,28 +126951,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, directory, doctest, filepath, glib - , gobject-introspection, haskell-gi-base, mtl, pretty-show, process - , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.26.0"; - sha256 = "0k8xpllviq67zm72dwnh5k05x8l42irzh7sdxi1jwjjm26sc3xm9"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal attoparsec base bytestring Cabal containers directory - filepath haskell-gi-base mtl pretty-show process regex-tdfa safe - text transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_26_1" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -127098,22 +126970,9 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; - version = "0.26.0"; - sha256 = "1skxqs8vp8q42g59j7sa1zr25fnqjahbngpgrc2bqs6r5yj00mb7"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - description = "Foundation for libraries generated by haskell-gi"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib;}; - - "haskell-gi-base_0_26_1" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; @@ -127123,7 +126982,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-gi-overloading" = callPackage @@ -130758,26 +130616,6 @@ self: { }) {}; "hasql-notifications" = callPackage - ({ mkDerivation, base, bytestring, hasql, hasql-pool, hspec - , postgresql-libpq, QuickCheck, text - }: - mkDerivation { - pname = "hasql-notifications"; - version = "0.2.0.1"; - sha256 = "191591sif15khm3qhkkr2y4406fi9ikvhfchhq3jszqxhjmjwpkv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring hasql hasql-pool postgresql-libpq text - ]; - executableHaskellDepends = [ base hasql ]; - testHaskellDepends = [ base bytestring hasql hspec QuickCheck ]; - description = "LISTEN/NOTIFY support for Hasql"; - license = lib.licenses.bsd3; - mainProgram = "hasql-notifications"; - }) {}; - - "hasql-notifications_0_2_0_2" = callPackage ({ mkDerivation, base, bytestring, hasql, hasql-pool, hspec , postgresql-libpq, QuickCheck, text }: @@ -130794,7 +130632,6 @@ self: { testHaskellDepends = [ base bytestring hasql hspec QuickCheck ]; description = "LISTEN/NOTIFY support for Hasql"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hasql-notifications"; }) {}; @@ -141579,8 +141416,8 @@ self: { }: mkDerivation { pname = "hol"; - version = "1.3"; - sha256 = "067grmahi268xx8ajy032p43rcggksky6vi6hqxr82i2dzs217l6"; + version = "1.4"; + sha256 = "18jj3b04lk20k8s50bvp7p4qhqz0nl5b55sc3ai42l203rvdfc9f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -149061,6 +148898,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "hspec-tmp-proc_0_5_1_1" = callPackage + ({ mkDerivation, base, hspec, tmp-proc }: + mkDerivation { + pname = "hspec-tmp-proc"; + version = "0.5.1.1"; + sha256 = "1wd3pz9q7p8z7917qblzldzchvdfwp625bbysxbdi41186wfd0dh"; + libraryHaskellDepends = [ base hspec tmp-proc ]; + description = "Simplify use of tmp-proc from hspec tests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-wai" = callPackage ({ mkDerivation, base, base-compat, bytestring, case-insensitive , hspec, hspec-core, hspec-expectations, http-types, QuickCheck @@ -150876,35 +150725,6 @@ self: { }) {}; "http-client" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , deepseq, directory, exceptions, filepath, ghc-prim, hspec - , hspec-discover, http-types, iproute, mime-types, monad-control - , network, network-uri, random, stm, streaming-commons, text, time - , transformers, zlib - }: - mkDerivation { - pname = "http-client"; - version = "0.7.12"; - sha256 = "03mfkrf2zl3jga2hihx7aq7qymzgnk31ldvbk66y70c3i1jpgxb2"; - libraryHaskellDepends = [ - array async base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie deepseq exceptions filepath - ghc-prim http-types iproute mime-types network network-uri random - stm streaming-commons text time transformers - ]; - testHaskellDepends = [ - async base blaze-builder bytestring case-insensitive containers - cookie deepseq directory hspec http-types monad-control network - network-uri streaming-commons text time transformers zlib - ]; - testToolDepends = [ hspec-discover ]; - doCheck = false; - description = "An HTTP client engine"; - license = lib.licenses.mit; - }) {}; - - "http-client_0_7_13_1" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -150931,7 +150751,6 @@ self: { doCheck = false; description = "An HTTP client engine"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -155264,8 +155083,8 @@ self: { }: mkDerivation { pname = "hypergeomatrix"; - version = "1.0.0.0"; - sha256 = "1i3ailplycpwsqcsyfsr783pi9fphd51dq1l008r2nx7im6ndmyx"; + version = "1.1.0.0"; + sha256 = "1463xpbm3q8ifnjsgddfplpsjnzzfksmpy8g21l2zqmcvghb64bn"; libraryHaskellDepends = [ array base containers cyclotomic ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Hypergeometric function of a matrix argument"; @@ -159354,13 +159173,13 @@ self: { broken = true; }) {}; - "integer-gmp_1_0_3_0" = callPackage - ({ mkDerivation, ghc-prim }: + "integer-gmp_1_1" = callPackage + ({ mkDerivation, base, ghc-bignum, ghc-prim }: mkDerivation { pname = "integer-gmp"; - version = "1.0.3.0"; - sha256 = "06302vwkc99l5gdbk3r25w84gi9cj18jcf8ipi189vpnmw42awwf"; - libraryHaskellDepends = [ ghc-prim ]; + version = "1.1"; + sha256 = "0fb34d8vw6lazg18imswprxn6v937d72cl09kvdd3419v13rakwk"; + libraryHaskellDepends = [ base ghc-bignum ghc-prim ]; description = "Integer library based on GMP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -161382,6 +161201,28 @@ self: { broken = true; }) {}; + "iris" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colourista + , directory, hspec, mtl, optparse-applicative, process, text + , unliftio-core + }: + mkDerivation { + pname = "iris"; + version = "0.0.0.0"; + sha256 = "15khmxdhc7mxlps2kgr82m29xy9b5nwcxsl3wfw6xiigjw1w2m0b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring directory mtl optparse-applicative + process text unliftio-core + ]; + executableHaskellDepends = [ base colourista mtl ]; + testHaskellDepends = [ base hspec text ]; + description = "Haskell CLI framework"; + license = lib.licenses.mpl20; + mainProgram = "iris-example"; + }) {}; + "iron-mq" = callPackage ({ mkDerivation, aeson, base, http-client, lens, text, wreq }: mkDerivation { @@ -162689,6 +162530,21 @@ self: { broken = true; }) {}; + "jackpolynomials" = callPackage + ({ mkDerivation, array, base, ilist, lens, math-functions + , mpolynomials, numeric-prelude + }: + mkDerivation { + pname = "jackpolynomials"; + version = "1.0.0.0"; + sha256 = "13marv1cl4c5xprwjn7yz3hbwln2cnmxski945saf3azs67ki824"; + libraryHaskellDepends = [ + array base ilist lens math-functions mpolynomials numeric-prelude + ]; + description = "Jack, zonal, and Schur polynomials"; + license = lib.licenses.gpl3Only; + }) {}; + "jacobi-roots" = callPackage ({ mkDerivation, base, binary, bytestring, doctest, vector }: mkDerivation { @@ -197671,8 +197527,8 @@ self: { ({ mkDerivation, base, hspec, optics-core, text }: mkDerivation { pname = "nat-optics"; - version = "1.0.0.4"; - sha256 = "0r9disaj26f17k84zkkfxj1glin2vdgfk8ss5fyag6xr6imzp17s"; + version = "1.0.1.0"; + sha256 = "146q35ni26fq02f7pdzjp2h0kwp9593r2dzg4bxl1zvlrb850c1a"; libraryHaskellDepends = [ base optics-core text ]; testHaskellDepends = [ base hspec optics-core text ]; description = "Refinement types for natural numbers with an optics interface"; @@ -203782,8 +203638,8 @@ self: { }: mkDerivation { pname = "nvim-hs-contrib"; - version = "2.0.0.0"; - sha256 = "0xqwvvhs2bpa146dnf4nkihx9lk9flwj3fyar2d4fchdfyszrbzr"; + version = "2.0.0.1"; + sha256 = "15ds92qxhax0y9d9zl1sz061ali1rj9vwvcjn415ph1cyqgr3ink"; libraryHaskellDepends = [ base bytestring data-default directory filepath messagepack mtl nvim-hs prettyprinter prettyprinter-ansi-terminal text time @@ -256278,17 +256134,6 @@ self: { }) {}; "simple-cmd-args" = callPackage - ({ mkDerivation, base, optparse-applicative }: - mkDerivation { - pname = "simple-cmd-args"; - version = "0.1.7"; - sha256 = "0lf0pyiv02sg2yh9avj92fm75sni61qnaq3rmjw5vlczy03ksxpc"; - libraryHaskellDepends = [ base optparse-applicative ]; - description = "Simple command args parsing and execution"; - license = lib.licenses.bsd3; - }) {}; - - "simple-cmd-args_0_1_8" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "simple-cmd-args"; @@ -256297,7 +256142,6 @@ self: { libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "simple-conduit" = callPackage @@ -267619,55 +267463,6 @@ self: { }) {}; "store" = callPackage - ({ mkDerivation, array, async, base, base-orphans - , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector - , clock, containers, contravariant, criterion, cryptohash, deepseq - , directory, filepath, free, ghc-prim, hashable, hspec - , hspec-discover, hspec-smallcheck, integer-gmp, lifted-base - , monad-control, mono-traversable, nats, network, primitive - , resourcet, safe, smallcheck, store-core, syb, template-haskell - , text, th-lift, th-lift-instances, th-orphans, th-reify-many - , th-utilities, time, transformers, unordered-containers, vector - , vector-binary-instances, void, weigh - }: - mkDerivation { - pname = "store"; - version = "0.7.15"; - sha256 = "0ws8gck230q2wcmgbpynvppd122ag1rksjjg67wcy62dfkzdk264"; - libraryHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring containers contravariant cryptohash deepseq directory - filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp - lifted-base monad-control mono-traversable nats network primitive - resourcet safe smallcheck store-core syb template-haskell text - th-lift th-lift-instances th-orphans th-reify-many th-utilities - time transformers unordered-containers vector void - ]; - testHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring clock containers contravariant cryptohash deepseq - directory filepath free ghc-prim hashable hspec hspec-smallcheck - integer-gmp lifted-base monad-control mono-traversable nats network - primitive resourcet safe smallcheck store-core syb template-haskell - text th-lift th-lift-instances th-orphans th-reify-many - th-utilities time transformers unordered-containers vector void - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - array async base base-orphans base64-bytestring bifunctors - bytestring cereal cereal-vector containers contravariant criterion - cryptohash deepseq directory filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control - mono-traversable nats network primitive resourcet safe smallcheck - store-core syb template-haskell text th-lift th-lift-instances - th-orphans th-reify-many th-utilities time transformers - unordered-containers vector vector-binary-instances void weigh - ]; - description = "Fast binary serialization"; - license = lib.licenses.mit; - }) {}; - - "store_0_7_16" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector , clock, containers, contravariant, criterion, cryptohash, deepseq @@ -267714,7 +267509,6 @@ self: { ]; description = "Fast binary serialization"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "store-core" = callPackage @@ -277267,13 +277061,15 @@ self: { broken = true; }) {}; - "template-haskell_2_18_0_0" = callPackage - ({ mkDerivation, base, ghc-boot-th, ghc-prim, pretty }: + "template-haskell_2_19_0_0" = callPackage + ({ mkDerivation, base, filepath, ghc-boot-th, ghc-prim, pretty }: mkDerivation { pname = "template-haskell"; - version = "2.18.0.0"; - sha256 = "0mcb7psdkyx9ddwkny0ymvadrsy2dnj82d6jdm23c63zv99z3g1r"; - libraryHaskellDepends = [ base ghc-boot-th ghc-prim pretty ]; + version = "2.19.0.0"; + sha256 = "1zdg1bivfhi9imcs1z38f71f7cpy2sy7bqpnzly7550g3w55p0q5"; + libraryHaskellDepends = [ + base filepath ghc-boot-th ghc-prim pretty + ]; description = "Support library for Template Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -284062,6 +283858,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "tmp-proc_0_5_1_1" = callPackage + ({ mkDerivation, async, base, bytestring, connection, data-default + , hspec, http-client, http-client-tls, http-types, mtl, network + , process, req, text, unliftio, wai, warp, warp-tls + }: + mkDerivation { + pname = "tmp-proc"; + version = "0.5.1.1"; + sha256 = "1z1pk3c5d021hy2jpcfg246ydvk62k6x5103qjis4rl82s6yy89y"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base bytestring mtl network process text unliftio wai warp + warp-tls + ]; + testHaskellDepends = [ + base bytestring connection data-default hspec http-client + http-client-tls http-types req text wai warp warp-tls + ]; + description = "Run 'tmp' processes in integration tests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tmp-proc-example" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, hedis, hspec , hspec-tmp-proc, http-client, http-client-tls, monad-logger, mtl @@ -284072,8 +283893,8 @@ self: { }: mkDerivation { pname = "tmp-proc-example"; - version = "0.5.0.0"; - sha256 = "00cpx35z3s8pk8jn53kkxmkcwmrslyaw0xnr7hgbmh1f1nadbc05"; + version = "0.5.1.1"; + sha256 = "1ilvyj511yh2hk3blaqbk7djchidfbrpgqckh7563k1kx7i6vkn0"; libraryHaskellDepends = [ aeson base bytestring exceptions hedis hspec hspec-tmp-proc http-client http-client-tls monad-logger mtl persistent @@ -284094,8 +283915,8 @@ self: { }: mkDerivation { pname = "tmp-proc-postgres"; - version = "0.5.0.0"; - sha256 = "15jfmh7g6nslnvwdn24hrsgd0rs5ikvc1fid33i2a2am89myf8x0"; + version = "0.5.1.1"; + sha256 = "0nwcxzny8xkbq5lpd6mf0dhr45s26ysyg7saa2zdbvf8d7a79hlh"; libraryHaskellDepends = [ base bytestring postgresql-simple text tmp-proc ]; @@ -284113,8 +283934,8 @@ self: { }: mkDerivation { pname = "tmp-proc-rabbitmq"; - version = "0.5.0.0"; - sha256 = "0nl05a1zycrs955lnv1skq00bpkj776z9mbllax8zswskkd5ggn8"; + version = "0.5.1.1"; + sha256 = "0fp412v2n2sgysr17ih591xn8cip6v86kdvgqbpsw4bcasbw154d"; libraryHaskellDepends = [ amqp base bytestring text tmp-proc ]; testHaskellDepends = [ amqp base bytestring hspec hspec-tmp-proc text tmp-proc @@ -284129,8 +283950,8 @@ self: { }: mkDerivation { pname = "tmp-proc-redis"; - version = "0.5.0.1"; - sha256 = "15ggm9624nijnm9xwnw8pla347f7qwfxibmnk39xixxdh2g034qn"; + version = "0.5.1.1"; + sha256 = "0wx734zdxbr3674254d440dvf78nd2ckscy0n6gkkal9xggs92cz"; libraryHaskellDepends = [ base bytestring hedis text tmp-proc ]; testHaskellDepends = [ base bytestring hedis hspec hspec-tmp-proc text tmp-proc @@ -284145,8 +283966,8 @@ self: { }: mkDerivation { pname = "tmp-proc-zipkin"; - version = "0.5.0.0"; - sha256 = "0lcxggzh550xlk65dsl94mk0y72szk63wxn23mg5xwbj4xzn6j9s"; + version = "0.5.1.1"; + sha256 = "1gy09qpvlzqdpcbnz2dq3dira6s9d3ndshch2fw7raxyk9dzrnmf"; libraryHaskellDepends = [ base bytestring http-client text tmp-proc tracing ]; @@ -287687,6 +287508,8 @@ self: { pname = "ttc"; version = "1.2.0.0"; sha256 = "0x5xq00ls290s3ivzzlg4dq0rgzx1x6nzkch49ylwvb5xicmzgm5"; + revision = "1"; + editedCabalFile = "181lvsk3j5jp4249dcbvqksn5hkmnal3x3cllmi3a7nf4a8g4pwp"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base bytestring tasty tasty-hunit template-haskell text @@ -297009,8 +296832,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.2"; sha256 = "0j81m09xxv24zziv0nanfppckzmas5184jr3npjhc9w49r3cm94a"; - revision = "1"; - editedCabalFile = "1kwjmjmp5pk9n9hps2y8kzjz4p42mcmzki8mypfhc0360n97r0wn"; + revision = "2"; + editedCabalFile = "088588xdqdm9y7r04l74fkckhrvmfhgsx6iv0wq36yff05dij630"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -299837,6 +299660,35 @@ self: { broken = true; }) {}; + "wai-middleware-delegate_0_1_3_1" = callPackage + ({ mkDerivation, async, base, blaze-builder, bytestring + , bytestring-lexing, case-insensitive, conduit, conduit-extra + , connection, data-default, hspec, http-client, http-client-tls + , http-conduit, http-types, network, random, resourcet + , streaming-commons, text, vault, wai, wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "wai-middleware-delegate"; + version = "0.1.3.1"; + sha256 = "05lrkcg1xkf0ci9nvzdvnrjmqnygqxs3yrvrjfwbml9p003cp33p"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + async base blaze-builder bytestring case-insensitive conduit + conduit-extra data-default http-client http-conduit http-types + streaming-commons text wai wai-conduit + ]; + testHaskellDepends = [ + async base blaze-builder bytestring bytestring-lexing + case-insensitive conduit conduit-extra connection data-default + hspec http-client http-client-tls http-conduit http-types network + random resourcet text vault wai wai-conduit warp warp-tls + ]; + description = "WAI middleware that delegates handling of requests"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "wai-middleware-etag" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash , filepath, http-date, http-types, unix-compat @@ -300944,6 +300796,41 @@ self: { license = lib.licenses.mit; }) {}; + "warp_3_3_22" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, gauge + , ghc-prim, hashable, hspec, hspec-discover, http-client, http-date + , http-types, http2, HUnit, iproute, network, process, QuickCheck + , simple-sendfile, stm, streaming-commons, text, time, time-manager + , unix, unix-compat, unliftio, vault, wai, word8, x509 + }: + mkDerivation { + pname = "warp"; + version = "3.3.22"; + sha256 = "0gjgy2ilsldzqvv4gnaapvg1ijf5ri8wav240j6vr1igl5pkh9pa"; + libraryHaskellDepends = [ + array auto-update base bsb-http-chunked bytestring case-insensitive + containers ghc-prim hashable http-date http-types http2 iproute + network simple-sendfile stm streaming-commons text time-manager + unix unix-compat unliftio vault wai word8 x509 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory ghc-prim hashable hspec + http-client http-date http-types http2 HUnit iproute network + process QuickCheck simple-sendfile stm streaming-commons text time + time-manager unix unix-compat unliftio vault wai word8 x509 + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network time-manager unix unix-compat unliftio x509 + ]; + description = "A fast, light-weight web server for WAI applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -309076,8 +308963,8 @@ self: { }: mkDerivation { pname = "yampa-test"; - version = "0.13.5"; - sha256 = "1dc2cicrd6w1y5z14xp0h1zd1xwkj8sm5ihqlpwyvikqnzlvvi7z"; + version = "0.13.6"; + sha256 = "0zcfq6g2jd6qwrr0ar99b57wnphbfvmdpgnnl62mvmgarvmgkgs6"; libraryHaskellDepends = [ base normaldistribution QuickCheck Yampa ]; From 323f8b5d00065fde1b32af8a737e9b67875d6da2 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 10 Aug 2022 14:07:31 +0900 Subject: [PATCH 04/18] haskellPackages: remove brick-related overrides --- .../haskell-modules/configuration-common.nix | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3db220ab901a..0f2107f1cf2f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -351,24 +351,6 @@ self: super: { lensref = dontCheck super.lensref; lvmrun = disableHardening ["format"] (dontCheck super.lvmrun); matplotlib = dontCheck super.matplotlib; - - brick_0_73 = doDistribute (super.brick_0_73.overrideScope (self: super: { - vty = self.vty_5_36; - text-zipper = self.text-zipper_0_12; - })); - - # https://github.com/matterhorn-chat/matterhorn/issues/679 they do not want to be on stackage - matterhorn = doJailbreak (appendPatches [ - # Fix build with brick 0.73 - (fetchpatch { - name = "matterhorn-brick-0.72.patch"; - url = "https://github.com/matterhorn-chat/matterhorn/commit/d52df3342b8420e219095aad477205e47fbef11b.patch"; - sha256 = "1ifvv926g9m8niyc9nl1hy9bkx4kf12ciyv2v8vnrzz3njp4fsrz"; - }) - ] (super.matterhorn.overrideScope (self: super: { - brick = self.brick_0_73; - }))); - memcache = dontCheck super.memcache; metrics = dontCheck super.metrics; milena = dontCheck super.milena; From 7c8cdf1de15c76139da1b04c18e43422fb22c9d9 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 10 Aug 2022 15:18:40 +0900 Subject: [PATCH 05/18] haskellPackages: sort extra-packages --- .../configuration-hackage2nix/main.yaml | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index b0819a649e88..9a1d4245ef43 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -93,56 +93,56 @@ default-package-overrides: - hasql-dynamic-statements < 0.3.1.2 extra-packages: - - aeson < 2 # required by pantry-0.5.2 - - base16-bytestring < 1 # required for cabal-install etc. - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. - Cabal == 3.2.* # required for cabal-install etc. - Cabal == 3.4.* # required for cabal-install etc. + - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 + - ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this + - aeson < 2 # required by pantry-0.5.2 + - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now + - base16-bytestring < 1 # required for cabal-install etc. + - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9 + - clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0 + - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - dhall == 1.29.0 # required for ats-pkg - dhall == 1.38.1 # required for spago - - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 + - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.* + - fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0 + - ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7 + - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4 + - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 + - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 + - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7 + - ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1 - haddock == 2.23.* # required on GHC < 8.10.x - haddock-api == 2.23.* # required on GHC < 8.10.x - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy == 1.19.12 # for ghcjs - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 + - hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17 + - hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17 + - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 + - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 + - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 + - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - language-javascript == 0.7.0.0 # required by purescript - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - optparse-applicative < 0.16 # needed for niv-0.2.19 + - ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10 - pantry == 0.5.2.1 # needed for stack-2.7.3 + - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 + - relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6 - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - sbv == 7.13 # required for pkgs.petrinizer - - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4 - - ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7 - - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7 - - ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1 - - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.* - - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - - ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10 - - ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this + - tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format + - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 - - attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now - - relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6 - - clay < 0.14 # 2022-03-20: Needed for neuron 1.0.0.0 - - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format - - tasty-hspec == 1.1.6 # 2022-04-07: Needed for elm-format - - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - - bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9 - - fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0 - - hnix-store-core == 0.5.0.0 # 2022-06-17: Until hnix 0.17 - - hnix-store-remote == 0.5.0.0 # 2022-06-17: Until hnix 0.17 - - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 package-maintainers: abbradar: From 389a9b25845e685d11ccc077d3876b9abb060119 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 10 Aug 2022 15:24:47 +0900 Subject: [PATCH 06/18] haskellPackages: add ghc-9.2 versions for ghc-lib-parser and ghc-lib-parser-ex --- .../configuration-hackage2nix/main.yaml | 2 + .../haskell-modules/hackage-packages.nix | 41 +++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 9a1d4245ef43..6b58f7a18911 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -115,7 +115,9 @@ extra-packages: - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4 - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 + - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2 - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7 + - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 9.2 - ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1 - haddock == 2.23.* # required on GHC < 8.10.x - haddock-api == 2.23.* # required on GHC < 8.10.x diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d90eacaaa76c..c8acb65f4a98 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -108592,6 +108592,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser_9_2_4_20220729" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec + , pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "9.2.4.20220729"; + sha256 = "0rlm6znxrhs3s9s6c7qblvl03lscydx3dridyp985i593jyan55s"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-prim parsec pretty process time + transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser_9_4_1_20220807" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec @@ -108673,6 +108694,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib-parser-ex_9_2_1_1" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "9.2.1.1"; + sha256 = "01004zsi4d3vd9k1d2ik284z6wnkny48yp5d2y6fi9hgba11d53q"; + libraryHaskellDepends = [ + base bytestring containers ghc-lib-parser uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc-lib-parser tasty tasty-hunit + uniplate + ]; + description = "Algorithms on GHC parse trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser-ex_9_4_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate From a0bc125f9452eb67dd5ba4004de6cc81f674dec8 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 10 Aug 2022 22:39:06 +0900 Subject: [PATCH 07/18] haskellPackages.ghc-lib_9_2_4_20220729: generate for ghc-9.2 --- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 6b58f7a18911..3a04d39e5d47 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -114,6 +114,7 @@ extra-packages: - ghc-api-compat == 8.10.7 # 2022-02-17: preserve for GHC 8.10.7 - ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4 - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 + - ghc-lib == 9.2.* # 2022-02-17: preserve for GHC 9.2 - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 9.2 - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c8acb65f4a98..61e86cbcc36a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -108530,6 +108530,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib_9_2_4_20220729" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-lib-parser + , ghc-prim, happy, hpc, parsec, pretty, process, rts, time + , transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "9.2.4.20220729"; + sha256 = "16whiazjynzj6qw1rmadyrxkibvmyhfzxzw42cv0ya9ijzlplhpq"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-lib-parser ghc-prim hpc parsec pretty + process rts time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib_9_4_1_20220807" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-lib-parser From 90eb3d4d635bd4c71e9d05dd3d840d1830435abf Mon Sep 17 00:00:00 2001 From: Philipp Joram Date: Sun, 7 Aug 2022 01:07:55 +0300 Subject: [PATCH 08/18] haskellPackages: unbreak nvim-hs-contrib Version 2.0.0.1 of nvim-hs-contrib was released on Hackage, which fixes compilation with GHC 9. --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 2 files changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 79cb323d1d4f..694dd2292244 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3525,7 +3525,6 @@ broken-packages: - numhask-histogram - numhask-prelude - Nutri - - nvim-hs-contrib - NXTDSL - nyan-interpolation-core - nylas diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 61e86cbcc36a..d90aefcac56f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -203714,8 +203714,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell plugin backend for neovim"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "nvim-hs-ghcid" = callPackage From d8bddf35281fc7b9efffeece0f6530b99bcf61bd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 13 Aug 2022 18:27:34 +0200 Subject: [PATCH 09/18] matterhorn: build with brick 0.70.1 --- .../haskell-modules/configuration-common.nix | 5 +++ .../configuration-hackage2nix/main.yaml | 3 ++ .../haskell-modules/hackage-packages.nix | 45 +++++++++++++++++++ 3 files changed, 53 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0f2107f1cf2f..7e4efcd72ce4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -237,6 +237,11 @@ self: super: { # base bound digit = doJailbreak super.digit; + # matterhorn-50200.17.0 won't work with brick >= 0.71 + matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: { + brick = self.brick_0_70_1; + })); + # 2020-06-05: HACK: does not pass own build suite - `dontCheck` # 2022-06-17: Use hnix-store 0.5 until hnix 0.17 hnix = generateOptparseApplicativeCompletion "hnix" (dontCheck ( diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 3a04d39e5d47..dfd932a074b7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -91,6 +91,8 @@ default-package-overrides: - reflex-dom-core < 0.7.0.2 # Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage - hasql-dynamic-statements < 0.3.1.2 + # Its dependency brick >= 1.0 is not yet in stackage + - brick-skylighting < 1.0 extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. @@ -146,6 +148,7 @@ extra-packages: - vty == 5.35.1 # 2022-07-08: needed for glirc-2.39.0.1 - weeder == 2.2.* # 2022-02-21: preserve for GHC 8.10.7 - weeder == 2.3.* # 2022-05-31: preserve for GHC 9.0.2 + - brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0 package-maintainers: abbradar: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d90aefcac56f..d657c44e4e81 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -48065,6 +48065,33 @@ self: { license = lib.licenses.bsd3; }) {}; + "brick_0_70_1" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.70.1"; + sha256 = "18i1i06ll6pklzaazcl2bzbi3w5zdn43l9wvkclhfcmddjy19lp4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "brick_1_0" = callPackage ({ mkDerivation, base, bimap, bytestring, config-ini, containers , contravariant, data-clist, deepseq, directory, dlist, exceptions @@ -48132,6 +48159,23 @@ self: { }) {}; "brick-skylighting" = callPackage + ({ mkDerivation, base, brick, containers, skylighting-core, text + , vty + }: + mkDerivation { + pname = "brick-skylighting"; + version = "0.3"; + sha256 = "1wjl5ff9c7czg7azj2pi17b3kzbgb5rmwb4nkxdy86xn6d68adi1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base brick containers skylighting-core text vty + ]; + description = "Show syntax-highlighted text in your Brick UI"; + license = lib.licenses.bsd3; + }) {}; + + "brick-skylighting_1_0" = callPackage ({ mkDerivation, base, brick, containers, skylighting-core, text , vty }: @@ -48146,6 +48190,7 @@ self: { ]; description = "Show syntax-highlighted text in your Brick UI"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "bricks" = callPackage From 44c848bc0230252290495b10ac7f03a77f8a949c Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 9 Aug 2022 01:00:20 +0200 Subject: [PATCH 10/18] haskell.compilers.ghc941: 9.4.0.20220721 -> 9.4.1 Co-authored-by: sternenseemann --- pkgs/development/compilers/ghc/9.4.1.nix | 31 ++++++------------- ...1-fix-bootstrapping-with-profiling-2.patch | 18 +++++++++++ 2 files changed, 27 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/compilers/ghc/ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch diff --git a/pkgs/development/compilers/ghc/9.4.1.nix b/pkgs/development/compilers/ghc/9.4.1.nix index e24f9fbb3767..ff7695427dde 100644 --- a/pkgs/development/compilers/ghc/9.4.1.nix +++ b/pkgs/development/compilers/ghc/9.4.1.nix @@ -177,32 +177,27 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; stdenv.mkDerivation (rec { - version = "9.4.0.20220721"; + version = "9.4.1"; pname = "${targetPrefix}ghc${variantSuffix}"; src = fetchurl { - url = "https://downloads.haskell.org/ghc/9.4.1-rc1/ghc-${version}-src.tar.xz"; - sha256 = "bca8c52f76d8747a66291181de2de7bdf9ff80093808fe39bf5cbff0f116c426"; + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; + sha256 = "sha256-y/7UZAvfAl4zulVDPa+M32mPTgSZrnqADd5EqC5zluM="; }; enableParallelBuilding = true; outputs = [ "out" "doc" ]; + patches = [ - # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 + # add missing profiling targets in make build system (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; - sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; - extraPrefix = "utils/haddock/"; - stripLen = 1; - }) - # fix race condition in make build system - (fetchpatch { - name = "ghc-hs-boot-copying-fix.patch"; - url = "https://gitlab.haskell.org/ghc/ghc/-/commit/4f17eff0cbd125eca55b68f4927befdd45008eb6.diff"; - sha256 = "0anq3w9z9mhxb0wx6rvxac3n7rl3apcma9zk3r9zz9hj9v7vkqzx"; + name = "ghc-9.4.1-fix-bootstrapping-with-profiling-1.patch"; + url = "https://gitlab.haskell.org/ghc/ghc/-/commit/47b4fea08bd0ef1476b8d134c7baf06157fe5fa5.diff"; + sha256 = "sha256-oYQWg9cK0RNL9I+kap8KER+iiKim73zG6URQs8BeAXU="; }) + ./ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch ]; postPatch = "patchShebangs ."; @@ -240,14 +235,6 @@ stdenv.mkDerivation (rec { '' + '' echo -n "${buildMK}" > mk/build.mk - # GHC 9.4.1-rc1 tarball is not properly prepared, also the boot script has been renamed - # https://gitlab.haskell.org/ghc/ghc/-/issues/21626#note_444654 - # TODO(@sternenseemann): make source-dist rules include all boot-generated files - ./boot.source - - # Too restrictive upper bound on Cabal the make build system chokes on - # XXX(@sternenseemann): this should be upstreamed - substituteInPlace utils/ghc-cabal/ghc-cabal.cabal --replace "3.8" "3.9" sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' diff --git a/pkgs/development/compilers/ghc/ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch b/pkgs/development/compilers/ghc/ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch new file mode 100644 index 000000000000..e10fb5cb280d --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch @@ -0,0 +1,18 @@ +diff --git a/ghc.mk b/ghc.mk +index dd65e7adfe..b91af56078 100644 +--- a/ghc.mk ++++ b/ghc.mk +@@ -509,11 +509,13 @@ libraries/containers/containers/dist-install/build/Data/IntMap/Internal.o: libra + libraries/containers/containers/dist-install/build/Data/Graph.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi + libraries/containers/containers/dist-install/build/Data/Set/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi + libraries/containers/containers/dist-install/build/Data/IntSet/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi ++libraries/containers/containers/dist-install/build/Data/Sequence/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi + + libraries/containers/containers/dist-install/build/Data/IntMap/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi + libraries/containers/containers/dist-install/build/Data/Graph.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi + libraries/containers/containers/dist-install/build/Data/Set/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi + libraries/containers/containers/dist-install/build/Data/IntSet/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi ++libraries/containers/containers/dist-install/build/Data/Sequence/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi + + ifeq "$(BIGNUM_BACKEND)" "gmp" + GMP_ENABLED = YES From d0706da55e4f028b8f91d32ea6c9d20a5f4429b0 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 13 Aug 2022 18:49:57 +0200 Subject: [PATCH 11/18] haskell.compiler.ghc941: bootstrap using (binary) GHC 8.10.7 This shortens the bootstrap chain for 9.4.1 and should be kinder on rebuilds. It requires some messing around in the configure file, since it is not officially supported by upstream (but known to work). For now it saves us the hassle of adding another bindist to nixpkgs. When we support hadrian, we'll be able to use the already packaged 9.2.2 bindist. --- pkgs/development/compilers/ghc/9.4.1.nix | 7 +++++++ pkgs/top-level/haskell-packages.nix | 12 +++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/9.4.1.nix b/pkgs/development/compilers/ghc/9.4.1.nix index ff7695427dde..71921f5e7639 100644 --- a/pkgs/development/compilers/ghc/9.4.1.nix +++ b/pkgs/development/compilers/ghc/9.4.1.nix @@ -264,6 +264,13 @@ stdenv.mkDerivation (rec { --replace '*-android*|*-gnueabi*)' \ '*-android*|*-gnueabi*|*-musleabi*)' done + '' + # HACK: allow bootstrapping with GHC 8.10 which works fine, as we don't have + # binary 9.0 packaged. Bootstrapping with 9.2 is broken without hadrian. + + '' + substituteInPlace configure --replace \ + 'MinBootGhcVersion="9.0"' \ + 'MinBootGhcVersion="8.10"' ''; # TODO(@Ericson2314): Always pass "--target" and always prefix. diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 744ddcb879e6..29dc3e594835 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -157,10 +157,16 @@ in { }; ghc941 = callPackage ../development/compilers/ghc/9.4.1.nix { bootPkgs = - # TODO(@sternenseemann): Package 9.0.2 bindist or wait for upstream fix - # Need to use 902 due to + # 9.2 is broken due to # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - packages.ghc902; + # Use 8.10 as a workaround, TODO: maybe package binary 9.0? + # aarch ghc8107Binary exceeds max output size on hydra + if stdenv.hostPlatform.isAarch then + packages.ghc8107BinaryMinimal + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then + packages.ghc8107 + else + packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and From ddada35b50fb79d7448f68380bf995a80d5cbb72 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 14 Aug 2022 17:33:45 +0200 Subject: [PATCH 12/18] haskell.compiler.ghc941: bootstrap using GHC 9.0.2 on arm text.cabal has the following snippet mandating this: -- GHC 8.10 has linking issues (probably TH-related) on ARM. if (arch(aarch64) || arch(arm)) && impl(ghc == 8.10.*) build-depends: base < 0 Since we're now testing 9.0.2 for bootstrapping on Hydra, we can also use the proper GHC version for powerpc64le. --- pkgs/top-level/haskell-packages.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 29dc3e594835..b38853008757 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -157,14 +157,17 @@ in { }; ghc941 = callPackage ../development/compilers/ghc/9.4.1.nix { bootPkgs = - # 9.2 is broken due to + # Building with 9.2 is broken due to # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - # Use 8.10 as a workaround, TODO: maybe package binary 9.0? - # aarch ghc8107Binary exceeds max output size on hydra + # Use 8.10 as a workaround where possible to keep bootstrap path short. + + # On ARM text won't build with GHC 8.10.* if stdenv.hostPlatform.isAarch then - packages.ghc8107BinaryMinimal + # TODO(@sternenseemann): package bindist + packages.ghc902 + # No suitable bindists for powerpc64le else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then - packages.ghc8107 + packages.ghc902 else packages.ghc8107Binary; inherit (buildPackages.python3Packages) sphinx; From 1f546560cfb1e353ae0de05936261be5042896ff Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 15 Aug 2022 13:16:30 +0900 Subject: [PATCH 13/18] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 24 +++++++++ .../transitive-broken.yaml | 6 ++- .../haskell-modules/hackage-packages.nix | 54 ++++++++++++++++++- 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 694dd2292244..7dd148095723 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -269,6 +269,7 @@ broken-packages: - awesomium-raw - aws-cloudfront-signer - aws-ec2 + - aws-ec2-knownhosts - aws-general - aws-lambda-haskell-runtime - aws-lambda-runtime @@ -550,6 +551,7 @@ broken-packages: - cabal-upload - cabalvchk - cabin + - cabocha - cached - cache-polysemy - caching @@ -557,6 +559,7 @@ broken-packages: - cafeteria-prelude - caffegraph - cairo-core + - cake3 - cal3d - calamity - caledon @@ -1203,6 +1206,7 @@ broken-packages: - dump-core - dunai-core - Dung + - duplo - dura - dvault - dvdread @@ -1957,6 +1961,7 @@ broken-packages: - hashtables-plus - hasim - hask + - haskades - haskanoid - haskarrow - haskbot-core @@ -2138,6 +2143,7 @@ broken-packages: - heterogeneous-list-literals - hetris - heukarya + - hevm - HExcel - hexchat - hexif @@ -2206,6 +2212,7 @@ broken-packages: - hinter - hinterface - hipchat-hs + - hipe - Hipmunk - hipsql-api - hircules @@ -2551,6 +2558,7 @@ broken-packages: - hylolib - hyperdrive - hyperfunctions + - hypergeomatrix - hyper-haskell-server - hyperion - hyperloglogplus @@ -2677,6 +2685,7 @@ broken-packages: - ireal - iri - iridium + - iris - iron-mq - irt - isdicom @@ -2720,6 +2729,7 @@ broken-packages: - jinquantities - jml-web-service - jni + - jobqueue - join-api - joinlist - joint @@ -2780,6 +2790,7 @@ broken-packages: - Kalman - kangaroo - karabiner-config + - karps - katip-datadog - katip-elasticsearch - katip-kafka @@ -2824,6 +2835,7 @@ broken-packages: - korea-holidays - kraken - krank + - krapsh - Kriens - krpc - KSP @@ -2887,6 +2899,7 @@ broken-packages: - language-webidl - LargeCardinalHierarchy - Lastik + - latest-npm-version - latex-formulae-image - latex-svg-image - LATS @@ -3042,6 +3055,7 @@ broken-packages: - lojbanParser - lojbanXiragan - lol + - lol-calculus - longboi - longshot - lookup-tables @@ -3201,6 +3215,7 @@ broken-packages: - miconix-test - microgroove - microlens-each + - micrologger - micro-recursion-schemes - microsoft-translator - mida @@ -3477,6 +3492,7 @@ broken-packages: - niagra - nibblestring - nice-html + - nicovideo-translator - nitro - nix-delegate - nix-eval @@ -3807,6 +3823,7 @@ broken-packages: - phraskell - Phsu - phybin + - pia-forward - pi-calculus - picedit - pickle @@ -4064,6 +4081,7 @@ broken-packages: - pushbullet-types - pusher-haskell - pusher-ws + - pushme - push-notifications - putlenses - puzzle-draw @@ -4495,6 +4513,7 @@ broken-packages: - servant-static-th - servant-streaming - servant-streamly + - servant-util - servant-wasm - servant-yaml - servant-zeppelin @@ -5036,6 +5055,7 @@ broken-packages: - tex2txt - texbuilder - text1 + - text-all - text-and-plots - text-ascii - text-builder-linear @@ -5133,6 +5153,10 @@ broken-packages: - tkhs - tkyprof - tmp-proc-example + - tmp-proc-postgres + - tmp-proc-rabbitmq + - tmp-proc-redis + - tmp-proc-zipkin - todo - tofromxml - to-haskell diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index d8a294a01307..ce32dae48c36 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1502,6 +1502,7 @@ dont-distribute-packages: - gbu - gdax - gdiff-ig + - gedcom - geek - geek-server - gelatin-freetype2 @@ -2544,6 +2545,7 @@ dont-distribute-packages: - lol-cpp - lol-repa - lol-tests + - lol-typing - loli - loop-effin - looper @@ -2827,7 +2829,6 @@ dont-distribute-packages: - numhask-hedgehog - numhask-range - numhask-test - - nvim-hs-ghcid - nyan - nyan-interpolation - nyan-interpolation-simple @@ -3395,6 +3396,7 @@ dont-distribute-packages: - servant-streaming-server - servant-swagger-tags - servant-to-elm + - servant-util-beam-pg - servant-waargonaut - servant-zeppelin-client - servant-zeppelin-server @@ -3634,6 +3636,7 @@ dont-distribute-packages: - syntaxnet-haskell - synthesizer-llvm - sys-process + - systemstats - t3-client - ta - tag-stream @@ -3841,6 +3844,7 @@ dont-distribute-packages: - urbit-airlock - urbit-api - ureader + - urembed - uri-enumerator - uri-enumerator-file - usb diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index d657c44e4e81..51aca8548da2 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -38244,6 +38244,8 @@ self: { ]; description = "Capture and manage AWS EC2 known_host pubkeys"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "aws-elastic-transcoder" = callPackage @@ -52562,6 +52564,8 @@ self: { librarySystemDepends = [ cabocha ]; testHaskellDepends = [ base text-format ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {cabocha = null;}; "cache" = callPackage @@ -52988,6 +52992,8 @@ self: { ]; description = "Third cake the Makefile EDSL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "cakyrespa" = callPackage @@ -85802,7 +85808,9 @@ self: { ]; description = "Frontend development build tool"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "duplo"; + broken = true; }) {}; "dura" = callPackage @@ -105326,6 +105334,7 @@ self: { testHaskellDepends = [ base hspec megaparsec text-all ]; description = "Parser for the GEDCOM genealogy file format"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "geek" = callPackage @@ -126232,7 +126241,9 @@ self: { ]; description = "Utility to generate bindings for BlackBerry Cascades"; license = "unknown"; + hydraPlatforms = lib.platforms.none; mainProgram = "haskades"; + broken = true; }) {}; "haskakafka" = callPackage @@ -135209,7 +135220,9 @@ self: { testSystemDepends = [ secp256k1 ]; description = "Ethereum virtual machine evaluator"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "hevm"; + broken = true; }) {inherit (pkgs) libff; inherit (pkgs) secp256k1;}; "hevolisa" = callPackage @@ -137801,6 +137814,8 @@ self: { ]; description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hips" = callPackage @@ -155197,6 +155212,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Hypergeometric function of a matrix argument"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hypergeometric" = callPackage @@ -161328,7 +161345,9 @@ self: { testHaskellDepends = [ base hspec text ]; description = "Haskell CLI framework"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "iris-example"; + broken = true; }) {}; "iron-mq" = callPackage @@ -163511,6 +163530,8 @@ self: { ]; description = "A job queue library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "jobs-ui" = callPackage @@ -166364,6 +166385,8 @@ self: { ]; description = "Haskell bindings for Spark Dataframes and Datasets"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "karver" = callPackage @@ -168701,6 +168724,8 @@ self: { ]; description = "Haskell bindings for Spark Dataframes and Datasets"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "krpc" = callPackage @@ -171863,7 +171888,9 @@ self: { ]; description = "Find the latest version of a package on npm"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "latest-npm-version"; + broken = true; }) {}; "latex" = callPackage @@ -179820,7 +179847,9 @@ self: { ]; description = "Calculus for LOL (λω language)"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "lol-calculus"; + broken = true; }) {}; "lol-cpp" = callPackage @@ -179905,6 +179934,7 @@ self: { ]; description = "Type inferencer for LOL (λω language)"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "loli" = callPackage @@ -187519,6 +187549,8 @@ self: { testHaskellDepends = [ aeson base hspec text ]; description = "A super simple logging module"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "microsoft-translator" = callPackage @@ -200928,7 +200960,9 @@ self: { executableHaskellDepends = [ base ]; description = "Nico Nico Douga (ニコニコ動画) Comment Translator"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "nicovideo-translator"; + broken = true; }) {}; "nikepub" = callPackage @@ -203779,7 +203813,6 @@ self: { executableHaskellDepends = [ base nvim-hs ]; description = "Neovim plugin that runs ghcid to update the quickfix list"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; mainProgram = "nvim-hs-ghcid"; }) {}; @@ -216874,7 +216907,9 @@ self: { ]; description = "Set up port forwarding with the Private Internet Access VPN service"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; mainProgram = "pia-forward"; + broken = true; }) {}; "pianola" = callPackage @@ -229434,7 +229469,9 @@ self: { ]; description = "Tool to synchronize directories with rsync, zfs or git-annex"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "pushme"; + broken = true; }) {}; "pushover" = callPackage @@ -252736,7 +252773,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Servant servers utilities"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "servant-util-examples"; + broken = true; }) {}; "servant-util-beam-pg" = callPackage @@ -252767,6 +252806,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Implementation of servant-util primitives for beam-postgres"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "servant-util-beam-pg-examples"; }) {}; @@ -273869,6 +273909,7 @@ self: { ]; description = "An application that regularly logs system stats for later analysis"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "systemstats"; }) {}; @@ -279090,6 +279131,8 @@ self: { ]; description = "Everything Data.Text related in one package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "text-and-plots" = callPackage @@ -284032,6 +284075,8 @@ self: { ]; description = "Shows how to run a PostgreSQL database as a tmp proc"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tmp-proc-rabbitmq" = callPackage @@ -284048,6 +284093,8 @@ self: { ]; description = "Shows how to run RabbitMQ as a tmp proc"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tmp-proc-redis" = callPackage @@ -284064,6 +284111,8 @@ self: { ]; description = "Shows how to run redis as a tmp proc"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tmp-proc-zipkin" = callPackage @@ -284082,6 +284131,8 @@ self: { ]; description = "Shows how to run redis as a tmp proc"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tmpl" = callPackage @@ -293814,6 +293865,7 @@ self: { ]; description = "Ur/Web static content generator"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "urembed"; }) {}; From 7fdb28022fe5b52c75b43ae8fb7df59df871df02 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Mon, 15 Aug 2022 13:51:15 +0900 Subject: [PATCH 14/18] ihaskell: don't build on hydra ihaskell has an indirect dependency on the Python package mistune, which is currently marked as insecure. --- pkgs/development/tools/haskell/ihaskell/wrapper.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 4a8482314108..d37147253180 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -24,4 +24,9 @@ buildEnv { fi done ''; + meta = { + # ihaskell has an indirect dependency on the Python package mistune, which + # is marked insecure. + hydraPlatforms = lib.platforms.none; + }; } From 60f7d2774145a52a0292f3b8f38d0432d487148b Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Thu, 18 Aug 2022 13:22:37 +0900 Subject: [PATCH 15/18] hedgewars: mark broken --- pkgs/games/hedgewars/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 7ea8257e192a..5173cdbd60b0 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -107,5 +107,7 @@ stdenv.mkDerivation rec { all movement on the battlefield has ceased).''; maintainers = with maintainers; [ kragniz fpletz ]; inherit (fpc.meta) platforms; + # https://github.com/NixOS/nixpkgs/pull/185755#issuecomment-1219024584 + broken = true; }; } From dc594280fd18dc5f0f2be1039e2375711327f8a3 Mon Sep 17 00:00:00 2001 From: Stefan Matting Date: Thu, 18 Aug 2022 14:43:13 +0200 Subject: [PATCH 16/18] haskell-language-server: fix with ghc-lib >= 9.0 and ghc <= 8.10.7 This cherry-picks the relevant changes from https://github.com/haskell/haskell-language-server/pull/2854 into the 8.10.x version of hls-hlint-plugin, as suggested in https://github.com/NixOS/nixpkgs/issues/168064#issuecomment-1146691884 Co-Authored-By: Florian Klink --- .../haskell-modules/configuration-ghc-8.10.x.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index d0eb90da4b7d..b9dfb671ef87 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -92,13 +92,15 @@ self: super: { mime-string = disableOptimization super.mime-string; # Older compilers need the latest ghc-lib to build this package. - hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: { - # Workaround for https://github.com/haskell/haskell-language-server/issues/2728 - postPatch = '' - sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs - ''; - }) - super.hls-hlint-plugin); + # Fix build with ghc-lib >= 9.0 and ghc <= 8.10.7 + # https://github.com/haskell/haskell-language-server/issues/2728 + hls-hlint-plugin = addBuildDepend self.ghc-lib (appendPatch (pkgs.fetchpatch { + name = "hls-hlint-plugin-workaround.patch"; + url = "https://github.com/haskell/haskell-language-server/pull/2854.patch"; + hash = "sha256-bLGu0OQtXsmMF3rZM+R6k7bsZm4Vgf2r0ert5Wunong="; + stripLen = 2; + includes = ["src/Ide/Plugin/Hlint.hs"]; + }) super.hls-hlint-plugin); haskell-language-server = appendConfigureFlags [ "-f-stylishhaskell" From f303875b7ed45cf5389934ea499c6567528ffe14 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 19 Aug 2022 13:01:44 +0900 Subject: [PATCH 17/18] hedgewars: don't build on hydra --- pkgs/games/hedgewars/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 5173cdbd60b0..9d23b94f6c66 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -109,5 +109,6 @@ stdenv.mkDerivation rec { inherit (fpc.meta) platforms; # https://github.com/NixOS/nixpkgs/pull/185755#issuecomment-1219024584 broken = true; + hydraPlatforms = platforms.none; }; } From 97c5787fad8362d6535a6b598b10d025a10daa2a Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Fri, 19 Aug 2022 13:04:43 +0900 Subject: [PATCH 18/18] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 7dd148095723..21cb8cc51a4a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3541,6 +3541,7 @@ broken-packages: - numhask-histogram - numhask-prelude - Nutri + - nvim-hs-ghcid - NXTDSL - nyan-interpolation-core - nylas diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 51aca8548da2..bdbf8803137f 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -203813,7 +203813,9 @@ self: { executableHaskellDepends = [ base nvim-hs ]; description = "Neovim plugin that runs ghcid to update the quickfix list"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; mainProgram = "nvim-hs-ghcid"; + broken = true; }) {}; "nvvm" = callPackage