From c3ee84f573715ead89056411c699f32995ceb35d Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 20 Apr 2023 17:29:17 +0200 Subject: [PATCH 01/44] all-cabal-hashes: 2023-04-18T09:14:41Z -> 2023-04-20T12:48:01Z 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 91ec5b8a71d87..d5e3634e4ead7 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "67ecaa60725908a5bc562294a2c0e03e30858aa7", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/67ecaa60725908a5bc562294a2c0e03e30858aa7.tar.gz", - "sha256": "0yf0dliq65j5achg3iqz0hkf25jjkgxarsdsr5vl2r5h41n39qg3", - "msg": "Update from Hackage at 2023-04-18T09:14:41Z" + "commit": "943e9e42a9f8eb447fc482dca78354a0e9832e5b", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/943e9e42a9f8eb447fc482dca78354a0e9832e5b.tar.gz", + "sha256": "0dwza4wk5xm4lzmn7n7ahb9xb0zqgqhy3sgnnnmz0v9zn9kgylby", + "msg": "Update from Hackage at 2023-04-20T12:48:01Z" } From 09055b5598a5efaf40060a55811191653a2cd799 Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 20 Apr 2023 17:31:02 +0200 Subject: [PATCH 02/44] 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 | 635 ++++++++++++++---- 1 file changed, 509 insertions(+), 126 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 51c2130fc009a..3410dbd4ae9fc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -32743,8 +32743,8 @@ self: { ({ mkDerivation, base, ghc-prim, integer-gmp }: mkDerivation { pname = "aop-prelude"; - version = "0.4.1.1"; - sha256 = "0b8y58hiil7caqwn3q041r59qvm8jw2s8z8ydhs2ma7a7lrlqffm"; + version = "0.4.1.2"; + sha256 = "0fjq8aifwcs9vm8l1vz5i7vfq3ca1g8w1ffp0f6w7cgdq0i9c16y"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base ghc-prim ]; description = "prelude for Algebra of Programming"; @@ -45498,8 +45498,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "birds-of-paradise"; - version = "0.2.1.1"; - sha256 = "0gn1dkycqal2xvmprq6xqz19qnpxvhwck4h8fqc8gq30nzpq143r"; + version = "0.2.1.2"; + sha256 = "1wx04hsgdd7xlswwq2fnhc441hs2w61f4nbm4pb8ky971qnsnali"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Birds of Paradise"; @@ -54689,24 +54689,24 @@ self: { , containers, data-default-class, data-flags, deepseq, deque, df1 , di-core, di-polysemy, exceptions, focus, hashable, http-api-data , http-client, http-date, http-types, megaparsec, mime-types, mtl - , optics, polysemy, polysemy-plugin, PyF, random, reflection, req + , optics, polysemy, polysemy-plugin, random, reflection, req , safe-exceptions, scientific, stm, stm-chans, stm-containers, text , text-show, time, tls, typerep-map, unagi-chan, unboxing-vector , unordered-containers, vector, websockets, x509-system }: mkDerivation { pname = "calamity"; - version = "0.7.1.0"; - sha256 = "17jzv3di73d9pdxcp9fmprkyff1jjkmxywpf1g5a9iq0yc6l3q7f"; + version = "0.8.0.0"; + sha256 = "0gr9r9q5l1c1sn5j6dg9mxcp8pjh6cvz1l9ncvi4xvia6irxlyya"; libraryHaskellDepends = [ aeson aeson-optics async base bytestring calamity-commands colour concurrent-extra connection containers data-default-class data-flags deepseq deque df1 di-core di-polysemy exceptions focus hashable http-api-data http-client http-date http-types megaparsec - mime-types mtl optics polysemy polysemy-plugin PyF random - reflection req safe-exceptions scientific stm stm-chans - stm-containers text text-show time tls typerep-map unagi-chan - unboxing-vector unordered-containers vector websockets x509-system + mime-types mtl optics polysemy polysemy-plugin random reflection + req safe-exceptions scientific stm stm-chans stm-containers text + text-show time tls typerep-map unagi-chan unboxing-vector + unordered-containers vector websockets x509-system ]; description = "A library for writing discord bots in haskell"; license = lib.licenses.mit; @@ -67657,8 +67657,8 @@ self: { pname = "config-schema"; version = "1.3.0.0"; sha256 = "1j5br9y4s51ajxyg4aldibywqhf4qrxhrypac8jgca2irxdwb29w"; - revision = "1"; - editedCabalFile = "16f6zwa4bflb7qbii1jcdn6xjqfsvvxhhjhbqbadiwih0xppcmir"; + revision = "2"; + editedCabalFile = "0vd9s4qhf7qx1l7fsxi1j6kacnk8jzclmqy9195rd9q0xsw5dfm6"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -80687,6 +80687,90 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; + "dhall_1_42_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write + , base, base16-bytestring, bytestring, case-insensitive, cborg + , cborg-json, containers, contravariant, cryptohash-sha256 + , data-fix, deepseq, Diff, directory, doctest, dotgen, either + , exceptions, filepath, foldl, gauge, generic-random, half + , hashable, haskeline, http-client, http-client-tls, http-types + , indexed-traversable, lens-family-core, megaparsec, mmorph + , mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, tasty-silver, template-haskell, temporary, text + , text-manipulate, text-short, th-lift-instances, time + , transformers, turtle, unix-compat, unordered-containers, vector + }: + mkDerivation { + pname = "dhall"; + version = "1.42.0"; + sha256 = "0yykf7va25pqf3pxm4zx3jsjsvdxy9q6dmzxdwhbag31h8isif4w"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base + base16-bytestring bytestring case-insensitive cborg cborg-json + containers contravariant cryptohash-sha256 data-fix deepseq Diff + directory dotgen either exceptions filepath half hashable haskeline + http-client http-client-tls http-types indexed-traversable + lens-family-core megaparsec mmorph mtl network-uri + optparse-applicative parser-combinators parsers pretty-simple + prettyprinter prettyprinter-ansi-terminal profunctors repline + scientific serialise template-haskell text text-manipulate + text-short th-lift-instances time transformers unix-compat + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base + base16-bytestring bytestring case-insensitive cborg cborg-json + containers contravariant data-fix deepseq Diff directory dotgen + either exceptions filepath half hashable haskeline + indexed-traversable lens-family-core megaparsec mmorph mtl + network-uri optparse-applicative parser-combinators parsers + pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors + repline scientific serialise template-haskell text text-manipulate + text-short th-lift-instances time transformers unix-compat + unordered-containers vector + ]; + testHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base + base16-bytestring bytestring case-insensitive cborg cborg-json + containers contravariant data-fix deepseq Diff directory doctest + dotgen either exceptions filepath foldl generic-random half + hashable haskeline http-client http-client-tls indexed-traversable + lens-family-core megaparsec mmorph mockery mtl network-uri + optparse-applicative parser-combinators parsers pretty-simple + prettyprinter prettyprinter-ansi-terminal profunctors QuickCheck + quickcheck-instances repline scientific serialise special-values + spoon tasty tasty-expected-failure tasty-hunit tasty-quickcheck + tasty-silver template-haskell temporary text text-manipulate + text-short th-lift-instances time transformers turtle unix-compat + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base + base16-bytestring bytestring case-insensitive cborg cborg-json + containers contravariant data-fix deepseq Diff directory dotgen + either exceptions filepath gauge half hashable haskeline + indexed-traversable lens-family-core megaparsec mmorph mtl + network-uri optparse-applicative parser-combinators parsers + pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors + repline scientific serialise template-haskell text text-manipulate + text-short th-lift-instances time transformers unix-compat + unordered-containers vector + ]; + doCheck = false; + description = "A configuration language guaranteed to terminate"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "dhall"; + maintainers = [ lib.maintainers.Gabriel439 ]; + }) {}; + "dhall-bash" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text @@ -80712,6 +80796,30 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; + "dhall-bash_1_0_41" = callPackage + ({ mkDerivation, base, bytestring, containers, dhall + , neat-interpolation, optparse-generic, shell-escape, text + }: + mkDerivation { + pname = "dhall-bash"; + version = "1.0.41"; + sha256 = "09jz39lnahjzp4f7mfkc68gkb1whqi3v781wqp4w1nrdq8b97sra"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dhall neat-interpolation shell-escape + text + ]; + executableHaskellDepends = [ + base bytestring dhall optparse-generic text + ]; + description = "Compile Dhall to Bash"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "dhall-to-bash"; + maintainers = [ lib.maintainers.Gabriel439 ]; + }) {}; + "dhall-check" = callPackage ({ mkDerivation, base, containers, dhall, directory, filepath , fsnotify, text, trifecta @@ -80741,10 +80849,8 @@ self: { }: mkDerivation { pname = "dhall-csv"; - version = "1.0.3"; - sha256 = "1ynlyxj585v7ngsladl4dxl7pzkq0sb1j99xzzzn0nbj7x0jigbr"; - revision = "1"; - editedCabalFile = "0lkqaav7gi958jg9nwgyimqjs5rzwdjgyrk54rfvaq1k5g74d529"; + version = "1.0.4"; + sha256 = "1kmrkjc2r5l1q2hc2xq83c25zrfm7w4av0jc06ilxklf4i1kvy4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80775,10 +80881,8 @@ self: { }: mkDerivation { pname = "dhall-docs"; - version = "1.0.10"; - sha256 = "1rh6nxmjin8kvbscbhbcjsgxnlkw1r19plzpps6wkx86zfjd2ms2"; - revision = "3"; - editedCabalFile = "06pjafliw9a3pzw9846yb9rmsjrwrn7jhax7s2bsdasx5agdrfg5"; + version = "1.0.11"; + sha256 = "0i9czz2p2kv5mw7mnbpqq9nl86aqyp4z0yy115q3nfasl5ys6jlq"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -80867,6 +80971,37 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; + "dhall-json_1_7_12" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal + , base, bytestring, containers, dhall, exceptions, filepath + , lens-family-core, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, scientific, tasty, tasty-hunit + , tasty-silver, text, unordered-containers, vector + }: + mkDerivation { + pname = "dhall-json"; + version = "1.7.12"; + sha256 = "1ynm347ccqgh2jmnq9mwj3mc3zd81pwqja5ivdwxkjw08d1wsj6a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty aeson-yaml base bytestring containers dhall + exceptions filepath lens-family-core optparse-applicative + prettyprinter scientific text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bytestring dhall exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + aeson base bytestring dhall tasty tasty-hunit tasty-silver text + ]; + description = "Convert between Dhall and JSON or YAML"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.Gabriel439 ]; + }) {}; + "dhall-lex" = callPackage ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq , hspec, hspec-dirstream, scientific @@ -80896,10 +81031,8 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.1.2"; - sha256 = "1wrbi22i276wf9yw4ljxri602213fyl08zbk978l13zxglnrj4zh"; - revision = "1"; - editedCabalFile = "0kbckqb0gz06ldffbkjdp6mbpcgqfwgg3gmz6vngs9nhmlny0da7"; + version = "1.1.3"; + sha256 = "1vcdjsqd0falcx48fa58qilnwh70h6cinxbkh2rfmlhvfgmramc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80925,10 +81058,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.25"; - sha256 = "1541h6hym254dycq6h40rqn82qbk74d071k67hf62aqd9l2g4y6p"; - revision = "1"; - editedCabalFile = "05hcas28mbi1q3x5wpkapj57b7jw1q9npbhx1lyic3df7sqbjrnw"; + version = "1.1.26"; + sha256 = "1xgmmfp6bi3mnd9l335ks6xcgpfy2s2kgpcygi7i7p41f795zgma"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80952,10 +81083,8 @@ self: { }: mkDerivation { pname = "dhall-nixpkgs"; - version = "1.0.9"; - sha256 = "1j0i2qhizmzhz2l46xwklgkki6nqa6imzdqdfm6xy3gkfdlna753"; - revision = "1"; - editedCabalFile = "0140jhwf5mz9i5k1v0mbljhr77rgfvhbs5s3ak9naagnxszy725j"; + version = "1.0.10"; + sha256 = "09p1zfssqab3p3x3ngidfkf31kk5kvcx8krjiyf18vmq9fn75mm5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80977,10 +81106,8 @@ self: { }: mkDerivation { pname = "dhall-openapi"; - version = "1.0.5"; - sha256 = "1sfsjvpq28nv3njf3flki3wawm0flbdwz08x4qiv6bmki3yijpxs"; - revision = "1"; - editedCabalFile = "1pmn4wfgys6vcmhfjc26bnjw8kh9s0f5vvkcfkqnm25ydhmpl31w"; + version = "1.0.6"; + sha256 = "0jx905x17lfwb316hx6mwiwr647688nwwcikv5iadv2qr9s04yc9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81127,10 +81254,8 @@ self: { }: mkDerivation { pname = "dhall-toml"; - version = "1.0.2"; - sha256 = "1ygrh13pbsym5b6gq1bwbqacd00y7y5bnzqihzz4r84jain669yh"; - revision = "1"; - editedCabalFile = "1pxzyfqmly3gzjyk3p0xlm38bg1wi1z0a151dvlva7lx0an3d1p0"; + version = "1.0.3"; + sha256 = "0d99msfbd9dxhjh2bc5bnzwn4c5n4viv3q0n4p1mx2rw67jyra80"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81177,6 +81302,36 @@ self: { maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; + "dhall-yaml_1_2_12" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall + , dhall-json, exceptions, HsYAML, HsYAML-aeson + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , tasty, tasty-expected-failure, tasty-hunit, text, vector + }: + mkDerivation { + pname = "dhall-yaml"; + version = "1.2.12"; + sha256 = "1sh802maai9vxfrjd0w4k9cv4pklhkxid1s5xdbagywcaqdhk272"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring dhall dhall-json HsYAML HsYAML-aeson + optparse-applicative text vector + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring dhall dhall-json exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + base bytestring dhall dhall-json tasty tasty-expected-failure + tasty-hunit text + ]; + description = "Convert between Dhall and YAML"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.Gabriel439 ]; + }) {}; + "dhcp-lease-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty , tasty-hunit, text @@ -86579,15 +86734,15 @@ self: { mainProgram = "dotenv"; }) {}; - "dotenv_0_10_1_0" = callPackage + "dotenv_0_11_0_0" = callPackage ({ mkDerivation, base, base-compat, containers, directory , exceptions, hspec, hspec-discover, hspec-megaparsec, megaparsec , mtl, optparse-applicative, process, shellwords, text }: mkDerivation { pname = "dotenv"; - version = "0.10.1.0"; - sha256 = "1qyrggrpiwd1lizlbwdpg7ghz5ga9rdvbpw4rrc4vv10g7ivch57"; + version = "0.11.0.0"; + sha256 = "0cw24w6vkc17ahf0s5l2bgvv7yi0j5rlr549gz1wwa462qm9mlgi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -104467,24 +104622,24 @@ self: { mainProgram = "fourmolu"; }) {}; - "fourmolu_0_11_0_0" = callPackage + "fourmolu_0_12_0_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, binary - , bytestring, Cabal-syntax, containers, Diff, directory, dlist + , bytestring, Cabal-syntax, containers, deepseq, Diff, directory , file-embed, filepath, ghc-lib-parser, hspec, hspec-discover , hspec-megaparsec, megaparsec, MemoTrie, mtl, optparse-applicative - , path, path-io, pretty, process, QuickCheck, syb, temporary, text - , th-env, yaml + , path, path-io, pretty, process, QuickCheck, scientific, syb + , temporary, text, th-env, yaml }: mkDerivation { pname = "fourmolu"; - version = "0.11.0.0"; - sha256 = "1hs743r2saqzk4sbwqpyw8k62jhlrc914gizcw5yp0r1gpq83idr"; + version = "0.12.0.0"; + sha256 = "0689w4h3y9qr8sxzphklns59jk31ld8y6dzk424xav5zaharmjjp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base binary bytestring Cabal-syntax - containers Diff directory dlist file-embed filepath ghc-lib-parser - megaparsec MemoTrie mtl syb text yaml + containers deepseq Diff directory file-embed filepath + ghc-lib-parser megaparsec MemoTrie mtl scientific syb text yaml ]; executableHaskellDepends = [ base containers directory filepath ghc-lib-parser @@ -104731,6 +104886,17 @@ self: { broken = true; }) {}; + "fractionizer" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "fractionizer"; + version = "0.1.0.1"; + sha256 = "0jnma5p5zb94zsx00sgl56xbxw56ivdrgklwimk3cvw0ysmrsash"; + libraryHaskellDepends = [ base ]; + description = "Allows to approximate the fractional numbers between 0 and 1 with sum of two unit fractions of special types"; + license = lib.licenses.mit; + }) {}; + "frag" = callPackage ({ mkDerivation, array, base, GLUT, OpenGL, random }: mkDerivation { @@ -139162,55 +139328,57 @@ self: { }) {}; "hevm" = callPackage - ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, array, async - , base, base16, binary, brick, bytestring, cereal, containers - , cryptonite, data-dword, Decimal, deepseq, directory, filemanip - , filepath, free, gmp, haskeline, here, HUnit, lens, lens-aeson - , libff, megaparsec, memory, monad-par, mtl, multiset, operational - , optparse-generic, process, QuickCheck, quickcheck-instances - , quickcheck-text, regex, regex-tdfa, restless-git, rosezipper - , scientific, secp256k1, smt2-parser, spawn, spool, stm, tasty - , tasty-bench, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, temporary, text, time, transformers, tree-view - , tuple, unordered-containers, vector, vty, witherable, word-wrap - , wreq + ({ mkDerivation, abstract-par, aeson, aeson-optics, ansi-wl-pprint + , array, async, base, base16, binary, brick, bytestring, cereal + , containers, cryptonite, data-dword, Decimal, deepseq, directory + , filemanip, filepath, free, gmp, haskeline, here, HUnit, libff + , megaparsec, memory, monad-par, mtl, multiset, operational + , optics-core, optics-extra, optics-th, optparse-generic, process + , QuickCheck, quickcheck-instances, quickcheck-text, regex + , regex-tdfa, restless-git, rosezipper, scientific, secp256k1 + , smt2-parser, spawn, spool, stm, tasty, tasty-bench + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, temporary + , text, time, transformers, tree-view, tuple, unordered-containers + , vector, vty, witherable, word-wrap, wreq }: mkDerivation { pname = "hevm"; - version = "0.50.4"; - sha256 = "1p1k7ddyx05zx62q4z2ja6yrw6alnkv2589yydglalxsr4lv5pyb"; + version = "0.50.5"; + sha256 = "1spsq9xx69l6y7qvhz4d3m8yam7af389s7ijx9y5ki1vjr4kxrwx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - abstract-par aeson ansi-wl-pprint array async base base16 binary - brick bytestring cereal containers cryptonite data-dword Decimal - deepseq directory filemanip filepath free haskeline here HUnit lens - lens-aeson megaparsec memory monad-par mtl multiset operational - optparse-generic process QuickCheck quickcheck-instances - quickcheck-text regex regex-tdfa restless-git rosezipper scientific - smt2-parser spawn spool stm tasty tasty-bench - tasty-expected-failure tasty-hunit tasty-quickcheck temporary text - time transformers tree-view tuple unordered-containers vector vty - witherable word-wrap wreq + abstract-par aeson aeson-optics ansi-wl-pprint array async base + base16 binary brick bytestring cereal containers cryptonite + data-dword Decimal deepseq directory filemanip filepath free + haskeline here HUnit megaparsec memory monad-par mtl multiset + operational optics-core optics-extra optics-th optparse-generic + process QuickCheck quickcheck-instances quickcheck-text regex + regex-tdfa restless-git rosezipper scientific smt2-parser spawn + spool stm tasty tasty-bench tasty-expected-failure tasty-hunit + tasty-quickcheck temporary text time transformers tree-view tuple + unordered-containers vector vty witherable word-wrap wreq ]; librarySystemDepends = [ gmp libff secp256k1 ]; executableHaskellDepends = [ aeson ansi-wl-pprint async base base16 binary brick bytestring containers cryptonite data-dword deepseq directory filepath free - lens lens-aeson memory mtl operational optparse-generic process + memory mtl operational optics-core optparse-generic process QuickCheck quickcheck-text regex-tdfa spawn stm temporary text unordered-containers vector vty ]; testHaskellDepends = [ aeson array base base16 binary bytestring containers data-dword - directory filemanip filepath here HUnit lens mtl operational - process QuickCheck quickcheck-instances regex regex-tdfa - smt2-parser spawn stm tasty tasty-bench tasty-expected-failure - tasty-hunit tasty-quickcheck temporary text time vector witherable + directory filemanip filepath here HUnit mtl operational optics-core + optics-extra process QuickCheck quickcheck-instances regex + regex-tdfa smt2-parser spawn stm tasty tasty-bench + tasty-expected-failure tasty-hunit tasty-quickcheck temporary text + time vector witherable ]; testSystemDepends = [ secp256k1 ]; benchmarkHaskellDepends = [ - base bytestring here tasty tasty-bench text + base bytestring containers filemanip filepath here mtl tasty + tasty-bench text ]; doHaddock = false; description = "Ethereum virtual machine evaluator"; @@ -148057,8 +148225,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.16.3.1"; - sha256 = "1wkz2klb0byfpchbfibnafib3drqpw5ax59hl9k45da8dpg5dprl"; + version = "1.16.4.0"; + sha256 = "131jy0caw220lvlaq99k13mg2cri5mldd30caj1vfck8llfdck60"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions extra hpqtypes log-base mtl text text-show @@ -165503,6 +165671,30 @@ self: { broken = true; }) {}; + "io-classes" = callPackage + ({ mkDerivation, array, async, base, bytestring, mtl, stm, time }: + mkDerivation { + pname = "io-classes"; + version = "1.0.0.0"; + sha256 = "0506p0jv5xrx6x8dzajqb7i5wqyc5n6mhhh0liraxp54a336zl3y"; + libraryHaskellDepends = [ + array async base bytestring mtl stm time + ]; + description = "Type classes for concurrency with STM, ST and timing"; + license = lib.licenses.asl20; + }) {}; + + "io-classes-mtl" = callPackage + ({ mkDerivation, array, base, io-classes, mtl, si-timers }: + mkDerivation { + pname = "io-classes-mtl"; + version = "0.1.0.0"; + sha256 = "0rz5i28fkwifzr1layyjyz3ylxx506dndlcvh69ffra74myk29fl"; + libraryHaskellDepends = [ array base io-classes mtl si-timers ]; + description = "Experimental MTL instances for io-classes"; + license = lib.licenses.asl20; + }) {}; + "io-machine" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -165570,6 +165762,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "io-sim" = callPackage + ({ mkDerivation, array, base, containers, criterion, deque + , exceptions, io-classes, nothunks, parallel, psqueues, QuickCheck + , quiet, si-timers, strict-stm, tasty, tasty-hunit + , tasty-quickcheck, time + }: + mkDerivation { + pname = "io-sim"; + version = "1.0.0.0"; + sha256 = "1l350scmwjcc6697zfl5qw6z2hbqfgqb41c7v6ymww7nmr0qham0"; + libraryHaskellDepends = [ + base containers deque exceptions io-classes nothunks parallel + psqueues QuickCheck quiet si-timers strict-stm time + ]; + testHaskellDepends = [ + array base containers io-classes parallel QuickCheck si-timers + strict-stm tasty tasty-hunit tasty-quickcheck time + ]; + benchmarkHaskellDepends = [ base criterion io-classes ]; + description = "A pure simulator for monadic concurrency with STM"; + license = lib.licenses.asl20; + }) {}; + "io-storage" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -188212,8 +188427,8 @@ self: { }: mkDerivation { pname = "magma"; - version = "0.6.1.0"; - sha256 = "08jbc29w6gw82z6jwhqwd123dh7nbxn6gs5hqqzj3d84ik268hzx"; + version = "0.6.1.1"; + sha256 = "0zv97sjlsisgbyhjb0c1p4l3l64mxk3hj9g4dqn7xy3qskbccdf6"; libraryHaskellDepends = [ base deepseq profunctors semigroups ]; testHaskellDepends = [ base ghc-prim ]; description = "magma is an algebraic structure"; @@ -190625,7 +190840,7 @@ self: { "matterhorn" = callPackage ({ mkDerivation, aeson, aspell-pipe, async, base, base-compat - , brick, brick-skylighting, bytestring, checkers, commonmark + , bimap, brick, brick-skylighting, bytestring, checkers, commonmark , commonmark-extensions, config-ini, connection, containers , data-clist, directory, filepath, gitrev, hashable, Hclip , mattermost-api, mattermost-api-qc, microlens-platform, mtl @@ -190638,22 +190853,22 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.17.0"; - sha256 = "10n0vgphdkbdhyadiwn2a35zdazmxz2k0ibq7f1v9iyr8ylshz46"; + version = "50200.18.0"; + sha256 = "06dig3jj9q6wfc0phxxskqkkzvh4d7xarvp8m6l09nbph1v7ziwz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aspell-pipe async base base-compat brick brick-skylighting - bytestring commonmark commonmark-extensions config-ini connection - containers data-clist directory filepath gitrev hashable Hclip - mattermost-api microlens-platform mtl network-uri parsec process - random semigroups skylighting-core split stm stm-delay strict - temporary text text-zipper time timezone-olson timezone-series - transformers unix unordered-containers utf8-string uuid vector vty - word-wrap xdg-basedir + aeson aspell-pipe async base base-compat bimap brick + brick-skylighting bytestring commonmark commonmark-extensions + config-ini connection containers data-clist directory filepath + gitrev hashable Hclip mattermost-api microlens-platform mtl + network-uri parsec process random semigroups skylighting-core split + stm stm-delay strict temporary text text-zipper time timezone-olson + timezone-series transformers unix unordered-containers utf8-string + uuid vector vty word-wrap xdg-basedir ]; - executableHaskellDepends = [ base text ]; + executableHaskellDepends = [ base brick text ]; testHaskellDepends = [ base bytestring checkers commonmark containers mattermost-api mattermost-api-qc tasty tasty-hunit tasty-quickcheck text time @@ -190675,8 +190890,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "50200.13.0"; - sha256 = "128x1ygfb8g8ig4wy3cgmjh3ijkrg7vg27ylxvb1rnn4hc4lfn7i"; + version = "50200.14.0"; + sha256 = "1yl9586x7r6jy5pkbagmxr105ilp26blrjl02gpzhh07ppyah6nf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190700,8 +190915,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.13.0"; - sha256 = "0qy0jzv808hry99clfkc61sfmid8qwv3qcf2gsmana30bdxy8v57"; + version = "50200.14.0"; + sha256 = "03px6qxy9aqc7nmzy6jdh09q6k4nznr2alggd0c5c4s1f2yliknv"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -197616,8 +197831,8 @@ self: { }: mkDerivation { pname = "monadic-recursion-schemes"; - version = "0.1.13.1"; - sha256 = "1lhawvr2nywdha59ci142xk1ijqp11pgn582zgb897zrqc2wbv7s"; + version = "0.1.13.2"; + sha256 = "0jf615bjzbf690lk4xiygy4gnz1myhqrbw1mlicdikfcgii5hr3p"; libraryHaskellDepends = [ base comonad containers free mtl recursion-schemes transformers ]; @@ -207076,8 +207291,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "1.2.2"; - sha256 = "1x5ilkv1fzkqn5gm84gpkaksppmabg5bjc54chsv9kn6ggdgj5na"; + version = "1.2.3"; + sha256 = "16j7sjqrbd1f4hlblgf381b3ds0iwyi5r3czm90h4i5higa0r7cm"; libraryHaskellDepends = [ aeson array async base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client @@ -214417,8 +214632,8 @@ self: { }: mkDerivation { pname = "org-mode"; - version = "2.0.2"; - sha256 = "1fzxpal1ld8l7a4vy9ncv04vwzfb2cbimyjlq0ayl27pii7j5shm"; + version = "2.1.0"; + sha256 = "17na75gydpyz3vmsyapn7lrwc50wsl30kz53wr7rkdhvnz9f2za8"; libraryHaskellDepends = [ base containers filepath hashable megaparsec parser-combinators text time @@ -214435,8 +214650,8 @@ self: { }: mkDerivation { pname = "org-mode-lucid"; - version = "1.6.4"; - sha256 = "0xz9bsfglw7qyj2ivdz36j3ynfxq7bag29fj4mjqpg7ki5di90ja"; + version = "1.7.0"; + sha256 = "0mrs09lxk7wgch8gv4d4j881adx7619jhr1d3niy1ii55d9vl6qy"; libraryHaskellDepends = [ base containers hashable lucid org-mode text ]; @@ -234653,10 +234868,8 @@ self: { executableHaskellDepends = [ base ]; description = "Telegram bot for proof assistants"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; mainProgram = "proof-assistant-bot"; - broken = true; - }) {rzk = null;}; + }) {}; "proof-combinators" = callPackage ({ mkDerivation, base }: @@ -238086,8 +238299,8 @@ self: { ({ mkDerivation, base, subG, uniqueness-periods-vector-stats }: mkDerivation { pname = "quantizer"; - version = "0.2.1.1"; - sha256 = "073sz728am6sj9zj2n2pnzvn5asvnj8lqcb8hbi09qp36w4mgvy4"; + version = "0.3.0.2"; + sha256 = "0b28vc3ckwf7140pkzqrfay0djpiz1wfac653i9nfwn2cyrhiwpg"; libraryHaskellDepends = [ base subG uniqueness-periods-vector-stats ]; @@ -238609,8 +238822,8 @@ self: { ({ mkDerivation, base, containers, mtl, QuickCheck, random }: mkDerivation { pname = "quickcheck-dynamic"; - version = "3.0.2"; - sha256 = "0ig3v53s5fkdlpqigrh82kzydg7fzhgcrb4r7khxgzcmfh3d80hy"; + version = "3.1.0"; + sha256 = "01vav51fdzvbw9i4zkknx3dwla1p2da8v07kr4brlb3vbdb3c1kf"; libraryHaskellDepends = [ base containers mtl QuickCheck random ]; description = "A library for stateful property-based testing"; license = lib.licenses.asl20; @@ -238970,6 +239183,44 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "quickcheck-state-machine_0_7_2" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, array, base, bifunctors + , bytestring, containers, directory, doctest, exceptions, filelock + , filepath, generic-data, graphviz, hashable, hashtables, hs-rqlite + , http-client, markov-chain-usage-model, matrix, monad-logger, mtl + , network, persistent, persistent-postgresql, persistent-sqlite + , persistent-template, postgresql-simple, pretty-show, process + , QuickCheck, quickcheck-instances, random, resource-pool + , resourcet, servant, servant-client, servant-server, sop-core + , split, stm, strict, string-conversions, tasty, tasty-hunit + , tasty-quickcheck, text, time, tree-diff, unliftio, unliftio-core + , vector, wai, warp + }: + mkDerivation { + pname = "quickcheck-state-machine"; + version = "0.7.2"; + sha256 = "0q3lw0qbaffcq7rs882dyc9mdaj5rkpq51ybq84i9gwcaiz1vipd"; + libraryHaskellDepends = [ + ansi-wl-pprint base containers directory exceptions filepath + generic-data graphviz markov-chain-usage-model matrix mtl + pretty-show process QuickCheck random sop-core split text time + tree-diff unliftio + ]; + testHaskellDepends = [ + aeson array base bifunctors bytestring containers directory doctest + filelock filepath hashable hashtables hs-rqlite http-client + monad-logger mtl network persistent persistent-postgresql + persistent-sqlite persistent-template postgresql-simple pretty-show + process QuickCheck quickcheck-instances random resource-pool + resourcet servant servant-client servant-server split stm strict + string-conversions tasty tasty-hunit tasty-quickcheck text + tree-diff unliftio unliftio-core vector wai warp + ]; + description = "Test monadic programs using state machine based models"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "quickcheck-state-machine-distributed" = callPackage ({ mkDerivation, base, binary, containers, directory , distributed-process, mtl, network-transport @@ -240465,8 +240716,8 @@ self: { }: mkDerivation { pname = "random-cycle"; - version = "0.1.0.0"; - sha256 = "1l103ab5v0vyzq48s9dqyc9mkyy3z0p0nb4n14627vqy38089vim"; + version = "0.1.0.1"; + sha256 = "1q9a63v0zycjir7rlqlx25l66lbcy3sdv4pkpqpdczw1bs48wmpk"; libraryHaskellDepends = [ base mwc-random primitive random vector ]; @@ -252537,6 +252788,28 @@ self: { broken = true; }) {}; + "rzk" = callPackage + ({ mkDerivation, array, base, bifunctors, mtl, template-haskell }: + mkDerivation { + pname = "rzk"; + version = "0.2.0"; + sha256 = "0b8jphdsmx9b1k2dyx7il1ci15wsqz15zgr983kpmgsr6ggjjykn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors mtl template-haskell + ]; + executableHaskellDepends = [ + array base bifunctors mtl template-haskell + ]; + testHaskellDepends = [ + array base bifunctors mtl template-haskell + ]; + description = "An experimental proof assistant for synthetic ∞-categories"; + license = lib.licenses.bsd3; + mainProgram = "rzk"; + }) {}; + "s-cargot" = callPackage ({ mkDerivation, base, containers, HUnit, parsec, QuickCheck, text }: @@ -256470,6 +256743,28 @@ self: { license = lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; + "sdl2_2_5_5_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, linear + , SDL2, StateVar, text, transformers, vector, weigh + }: + mkDerivation { + pname = "sdl2"; + version = "2.5.5.0"; + sha256 = "1kai6mmnwz9qq7q5y8c7wmcdf9qc5m167dzy3brj11jjds4smz93"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring exceptions linear StateVar text transformers vector + ]; + librarySystemDepends = [ SDL2 ]; + libraryPkgconfigDepends = [ SDL2 ]; + testHaskellDepends = [ base deepseq linear vector weigh ]; + description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs) SDL2;}; + "sdl2-cairo" = callPackage ({ mkDerivation, base, cairo, linear, sdl2 }: mkDerivation { @@ -258359,7 +258654,7 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "sequence-formats_1_7_0" = callPackage + "sequence-formats_1_7_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers, errors , exceptions, foldl, hspec, lens-family, pipes, pipes-attoparsec , pipes-bytestring, pipes-safe, tasty, tasty-hunit, transformers @@ -258367,8 +258662,8 @@ self: { }: mkDerivation { pname = "sequence-formats"; - version = "1.7.0"; - sha256 = "09ygkfgn381312miqlwxb9ypyixbiaal2hmh0m9zs7szlp4fcp46"; + version = "1.7.1"; + sha256 = "1smf7bxa36slasi295jr59hf62cz0w7gbacmwz33vcfjdvh9ffj6"; libraryHaskellDepends = [ attoparsec base bytestring containers errors exceptions foldl lens-family pipes pipes-attoparsec pipes-bytestring pipes-safe @@ -258411,6 +258706,35 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "sequenceTools_1_5_3_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, foldl, hspec + , lens-family, optparse-applicative, pipes, pipes-group + , pipes-ordered-zip, pipes-safe, random, sequence-formats, split + , transformers, vector + }: + mkDerivation { + pname = "sequenceTools"; + version = "1.5.3.1"; + sha256 = "1h2bfapfqs03j46lx5lpyayajwicapycpyli6nkzs7h7cqiwri6f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring optparse-applicative pipes random sequence-formats + vector + ]; + executableHaskellDepends = [ + ansi-wl-pprint base bytestring foldl lens-family + optparse-applicative pipes pipes-group pipes-ordered-zip pipes-safe + random sequence-formats split transformers vector + ]; + testHaskellDepends = [ + base bytestring hspec pipes sequence-formats vector + ]; + description = "A package with tools for processing DNA sequencing data"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "sequent-core" = callPackage ({ mkDerivation, base, bytestring, containers, ghc, transformers }: mkDerivation { @@ -264574,6 +264898,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "si-timers" = callPackage + ({ mkDerivation, base, io-classes, mtl, QuickCheck, stm, tasty + , tasty-quickcheck, time + }: + mkDerivation { + pname = "si-timers"; + version = "1.0.0.0"; + sha256 = "039pzvqypvw2ymn8nb68qgkvppjnab4wkfqq4i0ygmc7f6f4q27n"; + libraryHaskellDepends = [ base io-classes mtl stm time ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; + description = "timers using SI units (seconds)"; + license = lib.licenses.asl20; + }) {}; + "sibe" = callPackage ({ mkDerivation, base, Chart, Chart-cairo, containers , data-default-class, deepseq, directory, hmatrix, JuicyPixels @@ -274094,8 +274432,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "stable-marriage"; - version = "0.2.1.1"; - sha256 = "1ddmd7xk8a8a2baahnrn7gaj3ckn27f3hlcrimgi7m03kp00am17"; + version = "0.2.1.2"; + sha256 = "1hkhwvmcp0c7c1r009ag7jb1km3zbakbg4plg6h5f0hhmc07yjzs"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim ]; description = "algorithms around stable marriage"; @@ -276387,8 +276725,8 @@ self: { }: mkDerivation { pname = "stm-actor"; - version = "0.3.0.0"; - sha256 = "03cwrb4fd62mi16g11lf06hjkwk529nh016z5vlvq9jbaxalv873"; + version = "0.3.1.0"; + sha256 = "0s68c8lrlh2d3n9k3nq6pl31lyxnvfxyd09da133lcl0msksicmf"; libraryHaskellDepends = [ base mtl stm stm-queue transformers unliftio-core ]; @@ -278180,6 +278518,29 @@ self: { broken = true; }) {}; + "streamly-statistics" = callPackage + ({ mkDerivation, base, containers, deepseq, deque, fusion-plugin + , hspec, hspec-core, mwc-random, QuickCheck, random, statistics + , streamly-core, tasty, tasty-bench, vector + }: + mkDerivation { + pname = "streamly-statistics"; + version = "0.1.0"; + sha256 = "0qm8g33abag2y9xq6cgmk3z8ilxjnz81c4qf7r8a31l89rrswx1z"; + libraryHaskellDepends = [ + base containers deque mwc-random random streamly-core + ]; + testHaskellDepends = [ + base containers hspec hspec-core QuickCheck random statistics + streamly-core vector + ]; + benchmarkHaskellDepends = [ + base deepseq fusion-plugin random streamly-core tasty tasty-bench + ]; + description = "Statistical measures for finite or infinite data streams"; + license = lib.licenses.asl20; + }) {}; + "streamproc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -278546,6 +278907,17 @@ self: { license = lib.licenses.mit; }) {}; + "strict-mvar" = callPackage + ({ mkDerivation, base, io-classes }: + mkDerivation { + pname = "strict-mvar"; + version = "1.0.0.0"; + sha256 = "0rdcxk6z0y1z5y88ggz6ph17dcpfzhasjvqx5434a2350g5iswdj"; + libraryHaskellDepends = [ base io-classes ]; + description = "Strict MVars for IO and IOSim"; + license = lib.licenses.asl20; + }) {}; + "strict-optics" = callPackage ({ mkDerivation, base, optics-core, strict }: mkDerivation { @@ -278559,6 +278931,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "strict-stm" = callPackage + ({ mkDerivation, array, base, io-classes, stm }: + mkDerivation { + pname = "strict-stm"; + version = "1.0.0.0"; + sha256 = "16z5vd0vjqzahkrdncvmvm4b2crw5bv8l1h5hi2hrj0pgll90m96"; + libraryHaskellDepends = [ array base io-classes stm ]; + description = "Strict STM interface polymorphic over stm implementation"; + license = lib.licenses.asl20; + }) {}; + "strict-tuple" = callPackage ({ mkDerivation, base, bifunctors, deepseq, hashable }: mkDerivation { From 105933e2fcb64f15fa4bbd35b36e4b385fe38d29 Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 20 Apr 2023 23:38:45 +0200 Subject: [PATCH 03/44] haskellPackages.matterhorn: remove obsolete overrides --- .../haskell-modules/configuration-common.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b166dd14de734..429f6afdee160 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -415,11 +415,11 @@ self: super: { # 2022-01-29: Tests require package to be in ghc-db. aeson-schemas = dontCheck super.aeson-schemas; - # matterhorn-50200.17.0 won't work with brick >= 0.71, brick-skylighting >= 1.0 - matterhorn = doJailbreak (super.matterhorn.overrideScope (self: super: { - brick = self.brick_0_70_1; - brick-skylighting = self.brick-skylighting_0_3; - })); + # 2023-04-20: Pretends to need brick 1.6 but the commit history here + # https://github.com/matterhorn-chat/matterhorn/commits/master/matterhorn.cabal + # makes very clear that 1.4 is equally fine. + # Generally a slightly packaging hostile bound practice. + matterhorn = doJailbreak super.matterhorn; # 2020-06-05: HACK: does not pass own build suite - `dontCheck` # 2022-11-24: jailbreak as it has too strict bounds on a bunch of things From 0bd7d2dbedc23a8e2852209701622b06e0e446b0 Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 20 Apr 2023 23:56:37 +0200 Subject: [PATCH 04/44] haskellPackages.storablevector: jailbreak to fix tests --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 429f6afdee160..1115f2477d2ea 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -415,6 +415,9 @@ self: super: { # 2022-01-29: Tests require package to be in ghc-db. aeson-schemas = dontCheck super.aeson-schemas; + # 2023-04-20: Restrictive bytestring bound in tests. + storablevector = doJailbreak super.storablevector; + # 2023-04-20: Pretends to need brick 1.6 but the commit history here # https://github.com/matterhorn-chat/matterhorn/commits/master/matterhorn.cabal # makes very clear that 1.4 is equally fine. From e3f3b9c7e4f950983fc6df68e7ef514157cdb160 Mon Sep 17 00:00:00 2001 From: Henning Thielemann Date: Fri, 21 Apr 2023 21:22:23 +0200 Subject: [PATCH 05/44] haskellPackages: remove packages from broken.yaml that are maintained by me --- .../configuration-hackage2nix/broken.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 3824cf51dbe23..0280da36f9a9f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -129,7 +129,6 @@ broken-packages: - alpino-tools - alsa - alsa-midi - - alsa-seq - altcomposition - alternative-extra - alternative-io @@ -981,7 +980,6 @@ broken-packages: - curryrs - curves - custom-prelude - - cutter - cut-the-crap - CV - d3js @@ -1208,7 +1206,6 @@ broken-packages: - docopt - docrecords - doctest-discover-configurator - - doctest-extract - doctest-prop - docusign-example - docvim @@ -1373,7 +1370,6 @@ broken-packages: - epoll - epubname - Eq - - equal-files - EqualitySolver - equational-reasoning-induction - equeue @@ -1902,7 +1898,6 @@ broken-packages: - grm - GroteTrap - groundhog - - group-by-date - groups-generic - group-theory - group-with @@ -2686,7 +2681,6 @@ broken-packages: - ieee-utils - iexcloud - ifcxt - - iff - if-instance - IFS - ig @@ -3287,7 +3281,6 @@ broken-packages: - MazesOfMonad - MBot - mbox-tools - - mbox-utility - mbug - mcl - mcm @@ -5086,7 +5079,6 @@ broken-packages: - stooq-api - storable - storable-static-array - - storablevector - stp - str - Strafunski-ATermLib @@ -5229,7 +5221,6 @@ broken-packages: - tabloid - tabs - tag-bits - - tagchup - tagged-exception-core - tagged-timers - taggy-lens From 45ec842b0bdd0f4d6cd93df49b1d25531a792bc9 Mon Sep 17 00:00:00 2001 From: Henning Thielemann Date: Fri, 21 Apr 2023 19:58:47 +0200 Subject: [PATCH 06/44] maintainers: add thielema --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cce68256a6a14..9590606a85f13 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15410,6 +15410,12 @@ githubId = 3268082; name = "Thibaut Marty"; }; + thielema = { + name = "Henning Thielemann"; + email = "nix@henning-thielemann.de"; + github = "thielema"; + githubId = 898989; + }; thled = { name = "Thomas Le Duc"; email = "dev@tleduc.de"; From 5d91d02fc4cd09457c3bb0f9928ff64dac36b062 Mon Sep 17 00:00:00 2001 From: Henning Thielemann Date: Fri, 21 Apr 2023 11:23:15 +0200 Subject: [PATCH 07/44] haskellPackages: add thielema as maintainer to configuration-hackage2nix/main.yaml --- .../configuration-hackage2nix/main.yaml | 114 +++++++++++++++++ .../haskell-modules/hackage-packages.nix | 116 ++++++++++++++++++ 2 files changed, 230 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index fc1da79172ff9..3a136b597c8de 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -433,6 +433,120 @@ package-maintainers: - rhine-gloss - simple-affine-space - time-domain + thielema: + - accelerate-arithmetic + - accelerate-fftw + - accelerate-fourier + - accelerate-utility + - align-audio + - alsa-core + - alsa-pcm + - alsa-seq + - apportionment + - audacity + - battleship-combinatorics + - bibtex + - board-games + - buffer-pipe + - cabal-flatpak + - calendar-recycling + - checksum + - check-pvp + - combinatorial + - comfort-graph + - comfort-array + - comfort-array-shape + - comfort-fftw + - comfort-glpk + - concurrent-split + - cutter + - data-accessor + - data-accessor-mtl + - data-accessor-template + - data-accessor-transformers + - data-ref + - doctest-exitcode-stdio + - doctest-extract + - doctest-lib + - dsp + - enumset + - equal-files + - event-list + - explicit-exception + - fixed-length + - fftw-ffi + - gnuplot + - group-by-date + - guarded-allocation + - iff + - interpolation + - jack + - latex + - lazyio + - markov-chain + - midi + - midi-alsa + - midi-music-box + - mbox-utility + - med-module + - monoid-transformer + - non-empty + - non-negative + - numeric-prelude + - numeric-quest + - pathtype + - pooled-io + - probability + - quickcheck-transformer + - reactive-midyim + - reactive-balsa + - reactive-jack + - sample-frame + - sample-frame-np + - set-cover + - shell-utility + - sound-collage + - sox + - soxlib + - split-record + - spreadsheet + - stm-split + - storable-record + - storable-tuple + - storablevector + - synthesizer-core + - synthesizer-dimensional + - synthesizer-alsa + - synthesizer-midi + - tagchup + - tfp + - unicode + - unique-logic + - unique-logic-tf + - unsafe + - utility-ht + - wuerfelschlange + - xml-basic + - youtube + - prelude-compat + - fft + - carray + - lapack-ffi-tools + - netlib-ffi + - blas-ffi + - lapack-ffi + - netlib-carray + - blas-carray + - lapack-carray + - netlib-comfort-array + - blas-comfort-array + - lapack-comfort-array + - lapack + - lapack-hmatrix + - hmm-lapack + - magico + - resistor-cube + - linear-circuit utdemir: - nix-tree zowoq: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3410dbd4ae9fc..418be67a03346 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -23576,6 +23576,7 @@ self: { description = "Linear algebra and interpolation using the Accelerate framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "accelerate-bignum" = callPackage @@ -23789,6 +23790,7 @@ self: { description = "Accelerate frontend to the FFTW library (Fourier transform)"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "accelerate-fourier" = callPackage @@ -23815,6 +23817,7 @@ self: { description = "Fast Fourier transform and convolution using the Accelerate framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "accelerate-fourier-benchmark" = callPackage @@ -24108,6 +24111,7 @@ self: { description = "Utility functions for the Accelerate framework"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "accentuateus" = callPackage @@ -28151,6 +28155,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "align-audio"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "align-text" = callPackage @@ -28408,6 +28413,7 @@ self: { description = "Binding to the ALSA Library API (Exceptions)"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) alsa-lib;}; "alsa-gui" = callPackage @@ -28484,6 +28490,7 @@ self: { description = "Binding to the ALSA Library API (PCM audio)"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) alsa-lib;}; "alsa-pcm-tests" = callPackage @@ -28520,6 +28527,7 @@ self: { license = lib.licenses.bsd3; platforms = lib.platforms.linux; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; broken = true; }) {inherit (pkgs) alsa-lib;}; @@ -33981,6 +33989,7 @@ self: { ]; description = "Round a set of numbers while maintaining its sum"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "approveapi" = callPackage @@ -37958,6 +37967,7 @@ self: { description = "Interchange with the Audacity sound signal editor"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "audiovisual" = callPackage @@ -41862,6 +41872,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "battleship-combinatorics"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "battleships" = callPackage @@ -43179,6 +43190,7 @@ self: { libraryHaskellDepends = [ base latex parsec utility-ht ]; description = "Parse, format and processing BibTeX files"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "bidi-icu" = callPackage @@ -46824,6 +46836,7 @@ self: { ]; description = "Auto-generated interface to Fortran BLAS via CArrays"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "blas-comfort-array" = callPackage @@ -46843,6 +46856,7 @@ self: { description = "Auto-generated interface to Fortran BLAS via comfort-array"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "blas-ffi" = callPackage @@ -46857,6 +46871,7 @@ self: { libraryPkgconfigDepends = [ blas ]; description = "Auto-generated interface to Fortran BLAS"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) blas;}; "blas-hs" = callPackage @@ -47959,6 +47974,7 @@ self: { license = "GPL"; hydraPlatforms = lib.platforms.none; mainProgram = "board-games"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "boardgame" = callPackage @@ -50403,6 +50419,7 @@ self: { description = "Read from stdin and write to stdout in large blocks"; license = lib.licenses.bsd3; mainProgram = "buffer-pipe"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "buffet" = callPackage @@ -52991,6 +53008,7 @@ self: { description = "Generate a FlatPak manifest from a Cabal package description"; license = lib.licenses.bsd3; mainProgram = "cabal-flatpak"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "cabal-fmt" = callPackage @@ -54822,6 +54840,7 @@ self: { description = "List years with the same calendars"; license = lib.licenses.bsd3; mainProgram = "calendar-recycling"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "calenderweek" = callPackage @@ -55740,6 +55759,7 @@ self: { benchmarkHaskellDepends = [ array base ]; description = "A C-compatible array library"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "carte" = callPackage @@ -58617,6 +58637,7 @@ self: { description = "Check whether module and package imports conform to the PVP"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "checked" = callPackage @@ -58691,6 +58712,7 @@ self: { libraryHaskellDepends = [ base explicit-exception utility-ht ]; description = "Compute and verify checksums of ISBN, IBAN, etc"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "chell" = callPackage @@ -64272,6 +64294,7 @@ self: { ]; description = "Count, enumerate, rank and unrank combinatorial objects"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "combinatorial-problems" = callPackage @@ -64343,6 +64366,7 @@ self: { description = "Arrays where the index type is a function of the shape type"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "comfort-array-shape" = callPackage @@ -64365,6 +64389,7 @@ self: { description = "Additional shape types for the comfort-array package"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "comfort-fftw" = callPackage @@ -64386,6 +64411,7 @@ self: { description = "High-level interface to FFTW (Fast Fourier Transform) based on comfort-array"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "comfort-glpk" = callPackage @@ -64408,6 +64434,7 @@ self: { description = "Linear Programming using GLPK and comfort-array"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) glpk;}; "comfort-graph" = callPackage @@ -64429,6 +64456,7 @@ self: { ]; description = "Graph structure with type parameters for nodes and edges"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "comic" = callPackage @@ -66512,6 +66540,7 @@ self: { libraryHaskellDepends = [ base ]; description = "MVars and Channels with distinguished input and output side"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "concurrent-st" = callPackage @@ -74198,6 +74227,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "cutter"; + maintainers = [ lib.maintainers.thielema ]; broken = true; }) {}; @@ -75034,6 +75064,7 @@ self: { libraryHaskellDepends = [ array base containers transformers ]; description = "Utilities for accessing and manipulating fields of records"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "data-accessor-monadLib" = callPackage @@ -75088,6 +75119,7 @@ self: { libraryHaskellDepends = [ base data-accessor mtl ]; description = "Use Accessor to access state in mtl State monad class"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "data-accessor-template" = callPackage @@ -75105,6 +75137,7 @@ self: { description = "Utilities for accessing and manipulating fields of records"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; broken = true; }) {}; @@ -75117,6 +75150,7 @@ self: { libraryHaskellDepends = [ base data-accessor transformers ]; description = "Use Accessor to access state in transformers State monad"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "data-array-byte" = callPackage @@ -76488,6 +76522,7 @@ self: { libraryHaskellDepends = [ base data-accessor stm transformers ]; description = "Unify STRef and IORef in plain Haskell 98"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "data-ref_0_1" = callPackage @@ -76500,6 +76535,7 @@ self: { description = "Unify STRef and IORef in plain Haskell 98"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "data-reify" = callPackage @@ -86040,6 +86076,7 @@ self: { ]; description = "Run doctest's in a Cabal.Test.exitcode-stdio environment"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "doctest-extract" = callPackage @@ -86062,6 +86099,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "doctest-extract-0.1"; + maintainers = [ lib.maintainers.thielema ]; broken = true; }) {}; @@ -86074,6 +86112,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Parts of doctest exposed as library"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.thielema ]; }) {}; "doctest-parallel" = callPackage @@ -87827,6 +87866,7 @@ self: { testHaskellDepends = [ array base containers QuickCheck ]; description = "Haskell Digital Signal Processing"; license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.thielema ]; }) {}; "dstring" = callPackage @@ -92925,6 +92965,7 @@ self: { ]; description = "Sets of enumeration values represented by machine words"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "env-extra" = callPackage @@ -93308,6 +93349,7 @@ self: { license = "GPL"; hydraPlatforms = lib.platforms.none; mainProgram = "equal-files"; + maintainers = [ lib.maintainers.thielema ]; broken = true; }) {}; @@ -94903,6 +94945,7 @@ self: { ]; description = "Event lists with relative or absolute time stamps"; license = "GPL"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "event-monad" = callPackage @@ -96636,6 +96679,7 @@ self: { libraryHaskellDepends = [ base deepseq semigroups transformers ]; description = "Exceptions which are explicit in the type signature"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "explicit-exception_0_2" = callPackage @@ -96650,6 +96694,7 @@ self: { description = "Exceptions which are explicit in the type signature"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "explicit-iomodes" = callPackage @@ -99892,6 +99937,7 @@ self: { description = "Bindings to the FFTW library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; broken = true; }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; @@ -99907,6 +99953,7 @@ self: { libraryPkgconfigDepends = [ fftw fftwFloat ]; description = "Low-level interface to FFTW (Fast Fourier Transform)"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; "fftwRaw" = callPackage @@ -101452,6 +101499,7 @@ self: { ]; description = "Lists with statically known length based on non-empty package"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "fixed-list" = callPackage @@ -118044,6 +118092,7 @@ self: { ]; description = "2D and 3D plots using gnuplot"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "gnutls" = callPackage @@ -123301,6 +123350,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "group-by-date"; + maintainers = [ lib.maintainers.thielema ]; broken = true; }) {}; @@ -124312,6 +124362,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Memory allocation with added stress tests and integrity checks"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "guarded-rewriting" = callPackage @@ -145056,6 +145107,7 @@ self: { description = "Hidden Markov Models using LAPACK primitives"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "hmp3" = callPackage @@ -161449,6 +161501,7 @@ self: { description = "Constructing and dissecting IFF files"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; broken = true; }) {}; @@ -165094,6 +165147,7 @@ self: { ]; description = "piecewise linear and cubic Hermite interpolation"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "interpolator" = callPackage @@ -167977,6 +168031,7 @@ self: { libraryPkgconfigDepends = [ libjack2 ]; description = "Bindings for the JACK Audio Connection Kit"; license = lib.licenses.gpl2Only; + maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) libjack2;}; "jack-bindings" = callPackage @@ -177356,6 +177411,7 @@ self: { description = "Numerical Linear Algebra using LAPACK"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "lapack-carray" = callPackage @@ -177374,6 +177430,7 @@ self: { ]; description = "Auto-generated interface to Fortran LAPACK via CArrays"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "lapack-comfort-array" = callPackage @@ -177393,6 +177450,7 @@ self: { description = "Auto-generated interface to Fortran LAPACK via comfort-array"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "lapack-ffi" = callPackage @@ -177405,6 +177463,7 @@ self: { libraryPkgconfigDepends = [ liblapack ]; description = "Auto-generated interface to Fortran LAPACK"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) liblapack;}; "lapack-ffi-tools" = callPackage @@ -177427,6 +177486,7 @@ self: { ]; description = "Generator for Haskell interface to Fortran LAPACK"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "lapack-hmatrix" = callPackage @@ -177444,6 +177504,7 @@ self: { description = "Conversion of objects between 'lapack' and 'hmatrix'"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "large-anon" = callPackage @@ -177656,6 +177717,7 @@ self: { libraryHaskellDepends = [ base containers utility-ht ]; description = "Parse, format and process LaTeX files"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "latex-formulae-hakyll" = callPackage @@ -178393,6 +178455,7 @@ self: { libraryHaskellDepends = [ base transformers unsafe ]; description = "Run IO actions lazily while respecting their order"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "lazyset" = callPackage @@ -182175,6 +182238,7 @@ self: { description = "Compute resistance of linear electrical circuits"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "linear-code" = callPackage @@ -188420,6 +188484,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "magico"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "magma" = callPackage @@ -189785,6 +189850,7 @@ self: { libraryHaskellDepends = [ base containers random transformers ]; description = "Markov Chains for generating random sequences with a user definable behaviour"; license = "GPL"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "markov-chain-usage-model" = callPackage @@ -191132,6 +191198,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "lsmbox"; + maintainers = [ lib.maintainers.thielema ]; broken = true; }) {}; @@ -191539,6 +191606,7 @@ self: { ]; description = "Parse song module files from Amiga MED and OctaMED"; license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.thielema ]; }) {}; "medea" = callPackage @@ -193790,6 +193858,7 @@ self: { ]; description = "Handling of MIDI messages and files"; license = "GPL"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "midi-alsa" = callPackage @@ -193805,6 +193874,7 @@ self: { license = lib.licenses.bsd3; platforms = lib.platforms.linux; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "midi-music-box" = callPackage @@ -193827,6 +193897,7 @@ self: { description = "Convert MIDI file to music box punch tape"; license = lib.licenses.bsd3; mainProgram = "midi-music-box"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "midi-simple" = callPackage @@ -198471,6 +198542,7 @@ self: { libraryHaskellDepends = [ base semigroups ]; description = "Monoid counterparts to some ubiquitous monad transformers"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "monoidal-containers" = callPackage @@ -205144,6 +205216,7 @@ self: { ]; description = "Helper modules for CArray wrappers to BLAS and LAPACK"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "netlib-comfort-array" = callPackage @@ -205160,6 +205233,7 @@ self: { description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "netlib-ffi" = callPackage @@ -205177,6 +205251,7 @@ self: { ]; description = "Helper modules for FFI to BLAS and LAPACK"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "netlines" = callPackage @@ -208493,6 +208568,7 @@ self: { ]; description = "List-like structures with static restrictions on the number of elements"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "non-empty-containers" = callPackage @@ -208558,6 +208634,7 @@ self: { testHaskellDepends = [ base QuickCheck semigroups utility-ht ]; description = "Non-negative numbers"; license = "GPL"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "nonce" = callPackage @@ -209869,6 +209946,7 @@ self: { ]; description = "An experimental alternative hierarchy of numeric type classes"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "numeric-qq" = callPackage @@ -209900,6 +209978,7 @@ self: { libraryHaskellDepends = [ array base prelude-compat ]; description = "Math and quantum mechanics"; license = "GPL"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "numeric-ranges" = callPackage @@ -219928,6 +220007,7 @@ self: { ]; description = "Type-safe replacement for System.FilePath etc"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "pathwalk" = callPackage @@ -229172,6 +229252,7 @@ self: { ]; description = "Run jobs on a limited number of threads and support data dependencies"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "pop3-client" = callPackage @@ -231894,6 +231975,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Provide Prelude and Data.List with fixed content across GHC versions"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "prelude-edsl" = callPackage @@ -233614,6 +233696,7 @@ self: { ]; description = "Probabilistic Functional Programming"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "probable" = callPackage @@ -239282,6 +239365,7 @@ self: { libraryHaskellDepends = [ base QuickCheck random transformers ]; description = "A GenT monad transformer for QuickCheck library"; license = lib.licenses.mit; + maintainers = [ lib.maintainers.thielema ]; }) {}; "quickcheck-unicode" = callPackage @@ -242271,6 +242355,7 @@ self: { license = lib.licenses.bsd3; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "reactive-banana" = callPackage @@ -242494,6 +242579,7 @@ self: { description = "Process MIDI events via reactive-banana and JACK"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "reactive-midyim" = callPackage @@ -242516,6 +242602,7 @@ self: { description = "Process MIDI events via reactive-banana"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "reactive-thread" = callPackage @@ -248127,6 +248214,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "resistor-cube"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "resolv_0_1_1_2" = callPackage @@ -253945,6 +254033,7 @@ self: { libraryHaskellDepends = [ base QuickCheck storable-record ]; description = "Handling of samples in an (audio) signal"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "sample-frame-np" = callPackage @@ -253956,6 +254045,7 @@ self: { libraryHaskellDepends = [ base numeric-prelude sample-frame ]; description = "Orphan instances for types from sample-frame and numericprelude"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "sampling" = callPackage @@ -262483,6 +262573,7 @@ self: { ]; description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "set-extra" = callPackage @@ -264109,6 +264200,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Utility functions for writing command-line programs"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "shellish" = callPackage @@ -271773,6 +271865,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "sound-collage"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "sounddelay" = callPackage @@ -271905,6 +271998,7 @@ self: { ]; description = "Play, write, read, convert audio signals using Sox"; license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.thielema ]; }) {}; "soxlib" = callPackage @@ -271926,6 +272020,7 @@ self: { description = "Write, read, convert audio signals using libsox"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) sox;}; "soyuz" = callPackage @@ -273168,6 +273263,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; mainProgram = "split-record"; + maintainers = [ lib.maintainers.thielema ]; }) {}; "split-tchan" = callPackage @@ -273361,6 +273457,7 @@ self: { ]; description = "Read and write spreadsheets from and to CSV files in a lazy way"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "sprinkles" = callPackage @@ -277007,6 +277104,7 @@ self: { libraryHaskellDepends = [ base stm ]; description = "TMVars, TVars and TChans with distinguished input and output side"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "stm-stats" = callPackage @@ -277261,6 +277359,7 @@ self: { ]; description = "Elegant definition of Storable instances for records"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "storable-static-array" = callPackage @@ -277287,6 +277386,7 @@ self: { ]; description = "Storable instance for pairs and triples"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "storable-tuple_0_1" = callPackage @@ -277301,6 +277401,7 @@ self: { description = "Storable instance for pairs and triples"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "storablevector" = callPackage @@ -277327,6 +277428,7 @@ self: { description = "Fast, packed, strict storable arrays with a list interface like ByteString"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; broken = true; }) {}; @@ -283624,6 +283726,7 @@ self: { license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "synthesizer-core" = callPackage @@ -283659,6 +283762,7 @@ self: { description = "Audio signal processing coded in Haskell: Low level part"; license = "GPL"; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "synthesizer-dimensional" = callPackage @@ -283682,6 +283786,7 @@ self: { description = "Audio signal processing with static physical dimensions"; license = "GPL"; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "synthesizer-filter" = callPackage @@ -283778,6 +283883,7 @@ self: { description = "Render audio signals from MIDI files or realtime messages"; license = "GPL"; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "sys-auth-smbclient" = callPackage @@ -284599,6 +284705,7 @@ self: { description = "alternative package for processing of tag soups"; license = "GPL"; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; broken = true; }) {}; @@ -290810,6 +290917,7 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Type-level integers, booleans, lists using type families"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "tfp-th" = callPackage @@ -302424,6 +302532,7 @@ self: { testHaskellDepends = [ base containers utility-ht ]; description = "Construct and transform unicode characters"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "unicode-collation" = callPackage @@ -303217,6 +303326,7 @@ self: { ]; description = "Solve simple simultaneous equations"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "unique-logic-tf" = callPackage @@ -303237,6 +303347,7 @@ self: { ]; description = "Solve simple simultaneous equations"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "uniqueid" = callPackage @@ -304494,6 +304605,7 @@ self: { libraryHaskellDepends = [ base ]; description = "Unified interface to unsafe functions"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "unsafe-promises" = callPackage @@ -305821,6 +305933,7 @@ self: { ]; description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "uu-cco" = callPackage @@ -316835,6 +316948,7 @@ self: { description = "Code for the dice chain problem"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; }) {}; "wumpus-basic" = callPackage @@ -318012,6 +318126,7 @@ self: { ]; description = "Basics for XML/HTML representation and processing"; license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.thielema ]; }) {}; "xml-catalog" = callPackage @@ -324191,6 +324306,7 @@ self: { description = "Upload video to YouTube via YouTube API"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; broken = true; }) {}; From 3e7b76025df2e0cb52cbbde57102734aec16a272 Mon Sep 17 00:00:00 2001 From: maralorn Date: Fri, 21 Apr 2023 23:59:15 +0200 Subject: [PATCH 08/44] 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 | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 418be67a03346..728c4ecabc5b3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -28526,9 +28526,7 @@ self: { description = "Binding to the ALSA Library API (MIDI sequencer)"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; - broken = true; }) {inherit (pkgs) alsa-lib;}; "alsa-seq-tests" = callPackage @@ -74225,10 +74223,8 @@ self: { ]; description = "Cut files according to a position list"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "cutter"; maintainers = [ lib.maintainers.thielema ]; - broken = true; }) {}; "cv-combinators" = callPackage @@ -86097,10 +86093,8 @@ self: { ]; description = "Alternative doctest implementation that extracts comments to modules"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "doctest-extract-0.1"; maintainers = [ lib.maintainers.thielema ]; - broken = true; }) {}; "doctest-lib" = callPackage @@ -93347,10 +93341,8 @@ self: { ]; description = "Shell command for finding equal files"; license = "GPL"; - hydraPlatforms = lib.platforms.none; mainProgram = "equal-files"; maintainers = [ lib.maintainers.thielema ]; - broken = true; }) {}; "equational-reasoning" = callPackage @@ -123348,10 +123340,8 @@ self: { ]; description = "Shell command for grouping files by dates into folders"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "group-by-date"; maintainers = [ lib.maintainers.thielema ]; - broken = true; }) {}; "group-theory" = callPackage @@ -161500,9 +161490,7 @@ self: { libraryHaskellDepends = [ base binary bytestring ]; description = "Constructing and dissecting IFF files"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; - broken = true; }) {}; "ifscs" = callPackage @@ -191196,10 +191184,8 @@ self: { ]; description = "List contents of an mbox file containing e-mails"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "lsmbox"; maintainers = [ lib.maintainers.thielema ]; - broken = true; }) {}; "mbtiles" = callPackage @@ -277427,9 +277413,7 @@ self: { ]; description = "Fast, packed, strict storable arrays with a list interface like ByteString"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; - broken = true; }) {}; "storablevector-carray" = callPackage @@ -284704,9 +284688,7 @@ self: { ]; description = "alternative package for processing of tag soups"; license = "GPL"; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; - broken = true; }) {}; "tagged" = callPackage From fa0a071b2eefc38727e5304e19aafe311f85b793 Mon Sep 17 00:00:00 2001 From: Henning Thielemann Date: Sat, 22 Apr 2023 12:35:28 +0200 Subject: [PATCH 09/44] haskellPackages: add buildExamples Cabal flag to audacity, med-module, spreadsheet --- pkgs/development/haskell-modules/configuration-nix.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index bf5fe55584cec..4a1d0d3dfbb31 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -177,6 +177,10 @@ self: super: builtins.intersectAttrs super { ### END HASKELL-LANGUAGE-SERVER SECTION ### ########################################### + audacity = enableCabalFlag "buildExamples" super.audacity; + med-module = enableCabalFlag "buildExamples" super.med-module; + spreadsheet = enableCabalFlag "buildExamples" super.spreadsheet; + # fix errors caused by hardening flags epanet-haskell = disableHardening ["format"] super.epanet-haskell; From 3fd9285a6367756f99fcfaccc6be0d499748a50e Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 13:05:14 +0200 Subject: [PATCH 10/44] haskellPackages.wiringPi: unsupported on aarch64-darwin --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 3a136b597c8de..893738e3d05e2 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -647,6 +647,7 @@ unsupported-platforms: VulkanMemoryAllocator: [ i686-linux, armv7l-linux, platforms.darwin ] vulkan-utils: [ platforms.darwin ] webkit2gtk3-javascriptcore: [ platforms.darwin ] + wiringPi: [ aarch64-darwin ] xattr: [ platforms.darwin ] xgboost-haskell: [ aarch64-linux, armv7l-linux ] xmobar: [ platforms.darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 728c4ecabc5b3..623240c0aa0eb 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -315140,6 +315140,7 @@ self: { executableHaskellDepends = [ base ]; description = "Access GPIO pins on Raspberry Pi via wiringPi library"; license = lib.licenses.bsd3; + badPlatforms = [ "aarch64-darwin" ]; }) {}; "witch" = callPackage From 0d30892a916d4df5d45b7bfad015dff4299b8f0e Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 13:10:44 +0200 Subject: [PATCH 11/44] haskellPackages.dhall-nix(pkgs)?: Fix build by pinning to stackage compatible versions --- .../configuration-hackage2nix/main.yaml | 4 ++ .../haskell-modules/hackage-packages.nix | 53 +++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 893738e3d05e2..9f6bb35fb23b0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -49,6 +49,10 @@ default-package-overrides: # 2023-04-13: latest version requires ghc-events >= 0.19 but it's not on LTS yet - eventlog2html < 0.10 + # 2023-04-22: For dhall < 1.42 compatibility + - dhall-nixpkgs == 1.0.9 + - dhall-nix == 1.1.25 + extra-packages: - Cabal == 2.2.* # required for jailbreak-cabal etc. - Cabal == 2.4.* # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 623240c0aa0eb..3763892798c4a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -81085,6 +81085,31 @@ self: { }) {}; "dhall-nix" = callPackage + ({ mkDerivation, base, containers, data-fix, dhall, hnix + , lens-family-core, neat-interpolation, optparse-generic, text + }: + mkDerivation { + pname = "dhall-nix"; + version = "1.1.25"; + sha256 = "1541h6hym254dycq6h40rqn82qbk74d071k67hf62aqd9l2g4y6p"; + revision = "1"; + editedCabalFile = "05hcas28mbi1q3x5wpkapj57b7jw1q9npbhx1lyic3df7sqbjrnw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-fix dhall hnix lens-family-core + neat-interpolation text + ]; + executableHaskellDepends = [ + base dhall hnix optparse-generic text + ]; + description = "Dhall to Nix compiler"; + license = lib.licenses.bsd3; + mainProgram = "dhall-to-nix"; + maintainers = [ lib.maintainers.Gabriel439 ]; + }) {}; + + "dhall-nix_1_1_26" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix , lens-family-core, neat-interpolation, optparse-generic, text }: @@ -81103,11 +81128,38 @@ self: { ]; description = "Dhall to Nix compiler"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "dhall-to-nix"; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; "dhall-nixpkgs" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring + , bytestring, data-fix, dhall, foldl, hnix, lens-family-core + , megaparsec, mmorph, neat-interpolation, network-uri + , optparse-applicative, prettyprinter, text, transformers, turtle + }: + mkDerivation { + pname = "dhall-nixpkgs"; + version = "1.0.9"; + sha256 = "1j0i2qhizmzhz2l46xwklgkki6nqa6imzdqdfm6xy3gkfdlna753"; + revision = "1"; + editedCabalFile = "0140jhwf5mz9i5k1v0mbljhr77rgfvhbs5s3ak9naagnxszy725j"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base base16-bytestring base64-bytestring bytestring data-fix + dhall foldl hnix lens-family-core megaparsec mmorph + neat-interpolation network-uri optparse-applicative prettyprinter + text transformers turtle + ]; + description = "Convert Dhall projects to Nix packages"; + license = lib.licenses.bsd3; + mainProgram = "dhall-to-nixpkgs"; + maintainers = [ lib.maintainers.Gabriel439 ]; + }) {}; + + "dhall-nixpkgs_1_0_10" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , bytestring, data-fix, dhall, foldl, hnix, lens-family-core , megaparsec, mmorph, neat-interpolation, network-uri @@ -81127,6 +81179,7 @@ self: { ]; description = "Convert Dhall projects to Nix packages"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "dhall-to-nixpkgs"; maintainers = [ lib.maintainers.Gabriel439 ]; }) {}; From 86bb552bfbc90e544072b22d27486cc3bf258d01 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 15:10:09 +0200 Subject: [PATCH 12/44] haskellPackages: Regenerate with transitive-fixed packages --- .../transitive-broken.yaml | 25 +------------------ .../haskell-modules/hackage-packages.nix | 24 ------------------ 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index cbac47ecbce68..f109a69b1d51d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -467,7 +467,6 @@ dont-distribute-packages: - algorithmic-composition-basic - algorithmic-composition-frequency-shift - algorithmic-composition-overtones - - align-audio - alms - alpha - alsa-gui @@ -698,7 +697,6 @@ dont-distribute-packages: - attoparsec-iteratee - attoparsec-text-enumerator - atuin - - audacity - audiovisual - aura - authoring @@ -762,7 +760,6 @@ dont-distribute-packages: - batching - battlenet-yesod - battleplace-api - - battleship-combinatorics - battleships - bayes-stack - bbi @@ -818,7 +815,6 @@ dont-distribute-packages: - bittorrent - bla - blakesum-demo - - blas-comfort-array - blastxml - blatex - blaze-builder-enumerator @@ -1029,10 +1025,6 @@ dont-distribute-packages: - columbia - columnar - comark - - comfort-array - - comfort-array-shape - - comfort-fftw - - comfort-glpk - commsec - commsec-keyexchange - comonad-random @@ -2269,7 +2261,6 @@ dont-distribute-packages: - hslua-objectorientation_2_3_0 - hslua-packaging_2_3_0 - hslua_2_3_0 - - hsndfile-storablevector - hspec-expectations-pretty - hspec-pg-transact - hspec-setup @@ -2563,7 +2554,6 @@ dont-distribute-packages: - language-qux - language-spelling - lapack - - lapack-comfort-array - lapack-hmatrix - large-anon - lat @@ -2769,9 +2759,7 @@ dont-distribute-packages: - metronome - micro-gateway - microformats2-types - - midi-alsa - midimory - - midisurface - mighttpd - minecraft-data - minesweeper @@ -2910,7 +2898,6 @@ dont-distribute-packages: - net-spider-rpl - net-spider-rpl-cli - netcore - - netlib-comfort-array - netlines - netstring-enumerator - nettle-frp @@ -3260,6 +3247,7 @@ dont-distribute-packages: - quickcheck-relaxng - quickcheck-state-machine - quickcheck-state-machine-distributed + - quickcheck-state-machine_0_7_2 - quicktest - quipper - quipper-algorithms @@ -3702,9 +3690,7 @@ dont-distribute-packages: - solr - sonic-visualiser - souffle-dsl - - sound-collage - source-code-server - - soxlib - sparkle - sparrow - sparsebit @@ -3722,7 +3708,6 @@ dont-distribute-packages: - spice - spike - splines - - split-record - sprinkles - sproxy - sproxy-web @@ -3767,14 +3752,12 @@ dont-distribute-packages: - stm-actor - stm-supply - stmcontrol - - storablevector-carray - storablevector-streamfusion - stratum-tool - stratux - stratux-demo - stratux-http - stratux-websockets - - streamed - streaming-fft - streaming-process - strelka @@ -3852,13 +3835,7 @@ dont-distribute-packages: - syntax-pretty - syntax-printer - syntaxnet-haskell - - synthesizer - - synthesizer-alsa - - synthesizer-core - - synthesizer-dimensional - - synthesizer-filter - synthesizer-llvm - - synthesizer-midi - sys-process - systemstats - t3-client diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3763892798c4a..222ab07aa6c1c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -28153,7 +28153,6 @@ self: { ]; description = "Find relative time displacement of two recordings of the same music"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "align-audio"; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -37964,7 +37963,6 @@ self: { ]; description = "Interchange with the Audacity sound signal editor"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -41868,7 +41866,6 @@ self: { testHaskellDepends = [ base QuickCheck ]; description = "Compute number of possible arrangements in the battleship game"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "battleship-combinatorics"; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -46853,7 +46850,6 @@ self: { ]; description = "Auto-generated interface to Fortran BLAS via comfort-array"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -64363,7 +64359,6 @@ self: { ]; description = "Arrays where the index type is a function of the shape type"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -64386,7 +64381,6 @@ self: { doHaddock = false; description = "Additional shape types for the comfort-array package"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -64408,7 +64402,6 @@ self: { ]; description = "High-level interface to FFTW (Fast Fourier Transform) based on comfort-array"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -64431,7 +64424,6 @@ self: { ]; description = "Linear Programming using GLPK and comfort-array"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) glpk;}; @@ -152777,7 +152769,6 @@ self: { libraryHaskellDepends = [ base hsndfile storablevector ]; description = "Haskell bindings for libsndfile (Data.StorableVector interface)"; license = lib.licenses.lgpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "hsndfile-vector" = callPackage @@ -177490,7 +177481,6 @@ self: { ]; description = "Auto-generated interface to Fortran LAPACK via comfort-array"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -193912,7 +193902,6 @@ self: { description = "Convert between datatypes of the midi and the alsa packages"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -194030,7 +194019,6 @@ self: { ]; description = "A control midi surface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "midisurface"; }) {}; @@ -205271,7 +205259,6 @@ self: { ]; description = "Helper modules for comfort-array wrappers to BLAS and LAPACK"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -271902,7 +271889,6 @@ self: { ]; description = "Approximate a song from other pieces of sound"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "sound-collage"; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -272058,7 +272044,6 @@ self: { libraryPkgconfigDepends = [ sox ]; description = "Write, read, convert audio signals using libsox"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {inherit (pkgs) sox;}; @@ -273300,7 +273285,6 @@ self: { ]; description = "Split a big audio file into pieces at positions of silence"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "split-record"; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -277478,7 +277462,6 @@ self: { libraryHaskellDepends = [ base carray storablevector utility-ht ]; description = "Conversion between storablevector and carray"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "storablevector-streamfusion" = callPackage @@ -277836,7 +277819,6 @@ self: { ]; description = "Programmatically edit MIDI event streams via ALSA"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "streaming" = callPackage @@ -283736,7 +283718,6 @@ self: { ]; description = "Audio signal processing coded in Haskell"; license = "GPL"; - hydraPlatforms = lib.platforms.none; }) {}; "synthesizer-alsa" = callPackage @@ -283762,7 +283743,6 @@ self: { description = "Control synthesizer effects via ALSA/MIDI"; license = lib.licenses.gpl3Only; badPlatforms = lib.platforms.darwin; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -283798,7 +283778,6 @@ self: { ]; description = "Audio signal processing coded in Haskell: Low level part"; license = "GPL"; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -283822,7 +283801,6 @@ self: { ]; description = "Audio signal processing with static physical dimensions"; license = "GPL"; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; @@ -283840,7 +283818,6 @@ self: { ]; description = "Audio signal processing coded in Haskell: Filter networks"; license = "GPL"; - hydraPlatforms = lib.platforms.none; }) {}; "synthesizer-inference" = callPackage @@ -283919,7 +283896,6 @@ self: { ]; description = "Render audio signals from MIDI files or realtime messages"; license = "GPL"; - hydraPlatforms = lib.platforms.none; maintainers = [ lib.maintainers.thielema ]; }) {}; From a9c8570af48006685d46582d8a372cbfcf2275c4 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Sat, 22 Apr 2023 09:58:48 -0400 Subject: [PATCH 13/44] haskell.packages.text-time: remove broken attribute --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 1 - 2 files changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0280da36f9a9f..d356e37928da3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5326,7 +5326,6 @@ broken-packages: - text-offset - text-position - text-register-machine - - text-time - text-trie - textual - text-utf7 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 222ab07aa6c1c..9a513dd5a53bd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -290649,7 +290649,6 @@ self: { description = "Library for Time parsing from Text into UTCTime"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "text-trie" = callPackage From 09de6885112ec46a451ee0782ec94fa0b760bea0 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Sat, 22 Apr 2023 14:15:11 +0000 Subject: [PATCH 14/44] haskell.packages.ghc96.newtype-generics: relax base bound --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index c7e7ce62219ce..743510d819879 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -93,6 +93,9 @@ self: super: { # Forbids base >= 4.18 lukko = doJailbreak super.lukko; + # Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25 + newtype-generics = assert !(self ? newtype-generics_0_6_2); doJailbreak super.newtype-generics; + # # Too strict bounds, waiting on Hackage release in nixpkgs # From e648525ff310d59278aa65b82b22c4af0222df88 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 16:16:40 +0200 Subject: [PATCH 15/44] haskellPackages: Restricte alsa packages to linux --- .../haskell-modules/configuration-hackage2nix/main.yaml | 4 +++- pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 9f6bb35fb23b0..b387f30880f93 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -703,7 +703,8 @@ supported-platforms: linux-mount: [ platforms.linux ] linux-namespaces: [ platforms.linux ] lxc: [ platforms.linux ] - midi-alsa: [ platforms.linux ] + midi-alsa: [ platforms.linux ] # alsa-core only supported on linux + midisurface: [ platforms.linux ] # alsa-core only supported on linux OrderedBits: [ platforms.x86 ] # lacks implementations for non-x86: https://github.com/choener/OrderedBits/blob/401cbbe933b1635aa33e8e9b29a4a570b0a8f044/lib/Data/Bits/Ordered.hs#L316 password: [ platforms.x86 ] # uses scrypt, which requries x86 password-instances: [ platforms.x86 ] # uses scrypt, which requries x86 @@ -712,6 +713,7 @@ supported-platforms: scat: [ platforms.x86 ] # uses scrypt, which requries x86 scrypt: [ platforms.x86 ] # https://github.com/informatikr/scrypt/issues/8 seqalign: [ platforms.x86 ] # x86 intrinsics + streamed: [ platforms.linux] # alsa-core only supported on linux swisstable: [ platforms.x86_64 ] # Needs AVX2 tasty-papi: [ platforms.linux ] # limited by pkgs.papi udev: [ platforms.linux ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 222ab07aa6c1c..498ac75bee3a8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -194019,6 +194019,7 @@ self: { ]; description = "A control midi surface"; license = lib.licenses.bsd3; + platforms = lib.platforms.linux; mainProgram = "midisurface"; }) {}; @@ -277819,6 +277820,7 @@ self: { ]; description = "Programmatically edit MIDI event streams via ALSA"; license = lib.licenses.bsd3; + platforms = lib.platforms.linux; }) {}; "streaming" = callPackage From b14722944481d6ad05e4e020a96202e810fb1836 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Sat, 22 Apr 2023 14:36:11 +0000 Subject: [PATCH 16/44] haskell.packages.ghc96.hourglass: pull test fix --- .../haskell-modules/configuration-ghc-9.6.x.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index c7e7ce62219ce..debb0b0b062f7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -122,6 +122,18 @@ self: super: { }) ] (super.foundation); + # Add support for time 1.10 + # https://github.com/vincenthz/hs-hourglass/pull/56 + hourglass = appendPatches [ + (pkgs.fetchpatch { + name = "hourglass-pr-56.patch"; + url = + "https://github.com/vincenthz/hs-hourglass/commit/cfc2a4b01f9993b1b51432f0a95fa6730d9a558a.patch"; + sha256 = "sha256-gntZf7RkaR4qzrhjrXSC69jE44SknPDBmfs4z9rVa5Q="; + }) + ] (super.hourglass); + + # Test suite doesn't compile with base-4.18 / GHC 9.6 # https://github.com/dreixel/syb/issues/40 syb = dontCheck super.syb; From 216f0b7c2986b5ec4f54c6a91921b28902fb25b6 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Sat, 22 Apr 2023 16:14:20 +0000 Subject: [PATCH 17/44] haskell.packages.ghc96.hedgehog: distribute v1.2 --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index f262f324c0301..2ba8f2e0ae86b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -75,6 +75,11 @@ self: super: { ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_1_20230312; ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_0; + # allows mtl, template-haskell, text and transformers + hedgehog = doDistribute self.hedgehog_1_2; + # allows base >= 4.18 + tasty-hedgehog = doDistribute self.tasty-hedgehog_1_4_0_1; + # # Too strict bounds without upstream fix # From 47fc92421bcfb4c498e2a4b22b3c950d02dc7c70 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Sat, 22 Apr 2023 16:22:53 +0000 Subject: [PATCH 18/44] haskell.packages.ghc96.http-api-data: distribute v0.5.1 --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index f262f324c0301..103d09253b5b8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -61,6 +61,8 @@ self: super: { inspection-testing = doDistribute self.inspection-testing_0_5_0_1; # allows base >= 4.18 OneTuple = doDistribute (dontCheck super.OneTuple_0_4_1_1); # allows base >= 4.18 primitive = doDistribute (dontCheck self.primitive_0_7_4_0); # allows base >= 4.18 + http-api-data = doDistribute self.http-api-data_0_5_1; # allows base >= 4.18 + attoparsec-iso8601 = doDistribute self.attoparsec-iso8601_1_1_0_0; # for http-api-data-0.5.1 tagged = doDistribute self.tagged_0_8_7; # allows template-haskell-2.20 some = doDistribute self.some_1_0_5; tasty-inspection-testing = doDistribute self.tasty-inspection-testing_0_2; From 039b9d39888509efc001d1abf8cd6f0bd3caae12 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Sat, 22 Apr 2023 18:04:14 +0000 Subject: [PATCH 19/44] haskell.packages.ghc96.turtle: distribute v1.6.1 --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index f262f324c0301..34ab136cbf5ba 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -66,6 +66,7 @@ self: super: { tasty-inspection-testing = doDistribute self.tasty-inspection-testing_0_2; th-abstraction = doDistribute self.th-abstraction_0_5_0_0; th-desugar = doDistribute self.th-desugar_1_15; + turtle = doDistribute self.turtle_1_6_1; # Too strict bounds on ghc-prim and template-haskell aeson = doDistribute (doJailbreak self.aeson_2_1_2_1); # Too strict bounds on ghc-prim From fb8d2ddabbbe86f424b399c7476efb40e5cfc5b7 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 20:55:01 +0200 Subject: [PATCH 20/44] all-cabal-hashes: 2023-04-20T12:48:01Z -> 2023-04-22T18:19:29Z 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 d5e3634e4ead7..08cf38c2dbcb9 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "943e9e42a9f8eb447fc482dca78354a0e9832e5b", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/943e9e42a9f8eb447fc482dca78354a0e9832e5b.tar.gz", - "sha256": "0dwza4wk5xm4lzmn7n7ahb9xb0zqgqhy3sgnnnmz0v9zn9kgylby", - "msg": "Update from Hackage at 2023-04-20T12:48:01Z" + "commit": "835ef6db789d6459876c083419d61e068de15dd3", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/835ef6db789d6459876c083419d61e068de15dd3.tar.gz", + "sha256": "11506nwsd15b3jhdydr54j0jk5pzj3qhs92c167xv0f0czw5pj8a", + "msg": "Update from Hackage at 2023-04-22T18:19:29Z" } From 1ff2b20a7a6ce576e099cb91adee070e2131bacc Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 21:21:46 +0200 Subject: [PATCH 21/44] 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 | 487 ++++++++++++++---- 1 file changed, 399 insertions(+), 88 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 071ab8445a38c..6040e5c763be9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -37105,8 +37105,8 @@ self: { }: mkDerivation { pname = "atomic-counter"; - version = "0.1.1"; - sha256 = "0gsyycj5lvq2gvq4a13kn99cx7mrv6hfv4p5n9zv3as4wbk2djpa"; + version = "0.1.2"; + sha256 = "0z6arr3g439v392shvp13dhqyydxnbbyw9dsxyjyr078hn7pp2ky"; libraryHaskellDepends = [ async base QuickCheck ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; benchmarkHaskellDepends = [ @@ -42517,8 +42517,8 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.14.1"; - sha256 = "0kq1dsyg1dcdyhlapa2zak51gb4ghfv2hnivzg7iv0x8i4sdsh2n"; + version = "0.14.2"; + sha256 = "0qgdn1f5wjvbhllcvf7s2g934hr4g2g655qq15dxwl84zz83lswg"; libraryHaskellDepends = [ base deepseq dunai MonadRandom mtl simple-affine-space transformers ]; @@ -64405,6 +64405,28 @@ self: { maintainers = [ lib.maintainers.thielema ]; }) {}; + "comfort-fftw_0_0_0_1" = callPackage + ({ mkDerivation, base, comfort-array, deepseq + , doctest-exitcode-stdio, doctest-lib, fftw-ffi, netlib-ffi + , non-empty, QuickCheck, storable-record + }: + mkDerivation { + pname = "comfort-fftw"; + version = "0.0.0.1"; + sha256 = "10934ckhl5hj4k331cdhdz6512m3hyn4bm4w1xwqja4j0arndklb"; + libraryHaskellDepends = [ + base comfort-array deepseq fftw-ffi netlib-ffi QuickCheck + ]; + testHaskellDepends = [ + base comfort-array deepseq doctest-exitcode-stdio doctest-lib + netlib-ffi non-empty QuickCheck storable-record + ]; + description = "High-level interface to FFTW (Fast Fourier Transform) based on comfort-array"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = [ lib.maintainers.thielema ]; + }) {}; + "comfort-glpk" = callPackage ({ mkDerivation, base, comfort-array, deepseq , doctest-exitcode-stdio, doctest-lib, glpk, glpk-headers @@ -69104,6 +69126,17 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "control-block" = callPackage + ({ mkDerivation, base, containers, indexed-traversable }: + mkDerivation { + pname = "control-block"; + version = "0.0.0"; + sha256 = "01bqs1bbpizmyz8ma615whjxppf1804ar98kdm4k1mij6if5znh7"; + libraryHaskellDepends = [ base containers indexed-traversable ]; + description = "Higher-order functions with their function arguments at the end"; + license = lib.licenses.bsd2; + }) {}; + "control-bool" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -70721,15 +70754,13 @@ self: { ({ mkDerivation, base, data-accessor, enumset }: mkDerivation { pname = "cpuid"; - version = "0.2.3"; - sha256 = "126xg98yaf3q61h85yrs1cm6wxlayf590l0a3h0gw6c282s8l6gq"; - revision = "1"; - editedCabalFile = "1nq08npkjpl4j047d268qrwxii5xhc30iwji7azkc8dh2gja6g2j"; + version = "0.2.3.1"; + sha256 = "0ng3wzflhqdl2z0yr89j529jf1b7qcnc4q8v5123bnnlh652a3k4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base data-accessor enumset ]; description = "Binding for the cpuid machine instruction on x86 compatible processors"; - license = "GPL"; + license = lib.licenses.gpl2Only; platforms = lib.platforms.x86; hydraPlatforms = lib.platforms.none; broken = true; @@ -80211,6 +80242,28 @@ self: { mainProgram = "desert"; }) {}; + "desktop-portal" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , data-default-class, dbus, hspec, hspec-discover, process, random + , text + }: + mkDerivation { + pname = "desktop-portal"; + version = "0.0.1.0"; + sha256 = "1vclf91l6h24w44j4a4ad72wlxgj7chiyf9h69dxzfrjd9mkxdc5"; + libraryHaskellDepends = [ + base binary bytestring containers data-default-class dbus random + text + ]; + testHaskellDepends = [ + base binary bytestring containers data-default-class dbus hspec + process random text + ]; + testToolDepends = [ hspec-discover ]; + description = "Desktop Portal"; + license = lib.licenses.mit; + }) {}; + "despair" = callPackage ({ mkDerivation, base, random }: mkDerivation { @@ -80732,6 +80785,8 @@ self: { pname = "dhall"; version = "1.42.0"; sha256 = "0yykf7va25pqf3pxm4zx3jsjsvdxy9q6dmzxdwhbag31h8isif4w"; + revision = "1"; + editedCabalFile = "01vflwxxxcwsnh63wmrz4bx4zcgw3wgsyz7gvc71m38kdsv38in4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -88276,14 +88331,14 @@ self: { maintainers = [ lib.maintainers.turion ]; }) {}; - "dunai_0_10_1" = callPackage + "dunai_0_11_0" = callPackage ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty , tasty-hunit, transformers, transformers-base }: mkDerivation { pname = "dunai"; - version = "0.10.1"; - sha256 = "10rp5hc0zafxp2zc2n1lz7j726hlshi8khry74x700474kdqgmx8"; + version = "0.11.0"; + sha256 = "0vnzvd5m917dy4jvbrs8zywq6ch0c77saj5dy04fw2gyfc0wrm3x"; libraryHaskellDepends = [ base MonadRandom simple-affine-space transformers transformers-base ]; @@ -88314,8 +88369,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.10.1"; - sha256 = "0m8ajl03chy3qbyf1iii9rmfsyy9gpcm4i2njcbwpyi5m10zx34q"; + version = "0.11.0"; + sha256 = "1rgyid4zl5xhrh728warbyzm4074dbhcal5nwzy2vlw7nbl7srfw"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -90322,8 +90377,8 @@ self: { }: mkDerivation { pname = "eflint"; - version = "3.0.0.2"; - sha256 = "14rhc9kmsb9krf5h8a8041pirp8mnlfc6kxidmdz2d4r4pd8yd8k"; + version = "3.1.0.0"; + sha256 = "1bxpw80sgsgzxsxc6niwi0zjhgqxsx4kx2q5ah2vxnkfs117fmcm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104975,10 +105030,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fractionizer"; - version = "0.1.0.1"; - sha256 = "0jnma5p5zb94zsx00sgl56xbxw56ivdrgklwimk3cvw0ysmrsash"; + version = "0.6.1.2"; + sha256 = "16hvgi7g3dx63lf6h5v9l5gjq5753kqbvfn2npqpblzvgpv7lf4s"; libraryHaskellDepends = [ base ]; - description = "Allows to approximate the fractional numbers between 0 and 1 with sum of two unit fractions of special types"; + description = "Allows to approximate the fractional numbers in the range [0.005, 1] with sum of 2 or 3 unit fractions of special types."; license = lib.licenses.mit; }) {}; @@ -153044,14 +153099,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_10_10" = callPackage + "hspec_2_11_0" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.10.10"; - sha256 = "1903bm001vh9cxmhh87p3c76136dl6aq82srqgvdb5hpsmimwjws"; + version = "2.11.0"; + sha256 = "1qfvablqypql0z1d5fyamaavddbr96ymkfsjzawra1vhcjy602mw"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -153073,14 +153128,16 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-api_2_10_0" = callPackage - ({ mkDerivation, base, hspec, hspec-core, hspec-discover }: + "hspec-api_2_11_0" = callPackage + ({ mkDerivation, base, hspec, hspec-core, hspec-discover + , transformers + }: mkDerivation { pname = "hspec-api"; - version = "2.10.0"; - sha256 = "00yfz30qfzzgb95z6bpq8s65yigqq9zg0b8icpyjk03rff2s44ch"; - libraryHaskellDepends = [ base hspec-core ]; - testHaskellDepends = [ base hspec hspec-core ]; + version = "2.11.0"; + sha256 = "1arh3bycb44dby1pqbjapxc09gg6q8bd44aqwgk8havrsnvp19ay"; + libraryHaskellDepends = [ base hspec-core transformers ]; + testHaskellDepends = [ base hspec hspec-core transformers ]; testToolDepends = [ hspec-discover ]; description = "A Testing Framework for Haskell"; license = lib.licenses.mit; @@ -153203,27 +153260,27 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_10_10" = callPackage + "hspec-core_2_11_0" = callPackage ({ mkDerivation, ansi-terminal, array, base, base-orphans , call-stack, deepseq, directory, filepath, haskell-lexer , hspec-expectations, hspec-meta, HUnit, process, QuickCheck - , quickcheck-io, random, setenv, silently, stm, temporary - , tf-random, time, transformers + , quickcheck-io, random, silently, stm, temporary, tf-random, time + , transformers }: mkDerivation { pname = "hspec-core"; - version = "2.10.10"; - sha256 = "1djmiy5xjnx71bjagmvipc5dsnvhakm03y72g3vyg7iggxqr6iv4"; + version = "2.11.0"; + sha256 = "03ni0grfgj9g39vnfy2d4ijy42kgfj7c4wshk5d7qvsd31iy5mbl"; libraryHaskellDepends = [ ansi-terminal array base call-stack deepseq directory filepath haskell-lexer hspec-expectations HUnit process QuickCheck - quickcheck-io random setenv stm tf-random time transformers + quickcheck-io random stm tf-random time transformers ]; testHaskellDepends = [ ansi-terminal array base base-orphans call-stack deepseq directory filepath haskell-lexer hspec-expectations hspec-meta HUnit process - QuickCheck quickcheck-io random setenv silently stm temporary - tf-random time transformers + QuickCheck quickcheck-io random silently stm temporary tf-random + time transformers ]; testToolDepends = [ hspec-meta ]; testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'"; @@ -153294,14 +153351,14 @@ self: { maintainers = [ lib.maintainers.maralorn ]; }) {}; - "hspec-discover_2_10_10" = callPackage + "hspec-discover_2_11_0" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, mockery , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.10.10"; - sha256 = "0cig2l1l8wgxrg2s2srzsrws5vqa0fgf249gb1g222x91s63h2d8"; + version = "2.11.0"; + sha256 = "1ii5mklpc0b7gv562qhw8s76pspfkwbiz8ff7klz2k61j0zmcywd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -165761,8 +165818,8 @@ self: { ({ mkDerivation, array, async, base, bytestring, mtl, stm, time }: mkDerivation { pname = "io-classes"; - version = "1.0.0.0"; - sha256 = "0506p0jv5xrx6x8dzajqb7i5wqyc5n6mhhh0liraxp54a336zl3y"; + version = "1.0.0.1"; + sha256 = "1akhhlrzsk1xih8l1mc0mk27p5p6hks7bxkjyvh95fghjqkgsif3"; libraryHaskellDepends = [ array async base bytestring mtl stm time ]; @@ -165774,8 +165831,8 @@ self: { ({ mkDerivation, array, base, io-classes, mtl, si-timers }: mkDerivation { pname = "io-classes-mtl"; - version = "0.1.0.0"; - sha256 = "0rz5i28fkwifzr1layyjyz3ylxx506dndlcvh69ffra74myk29fl"; + version = "0.1.0.1"; + sha256 = "0kqq14jgpkxaz106ahr20apizgdnxz2q0ih9kwgz0q4l1v106698"; libraryHaskellDepends = [ array base io-classes mtl si-timers ]; description = "Experimental MTL instances for io-classes"; license = lib.licenses.asl20; @@ -165849,18 +165906,17 @@ self: { }) {}; "io-sim" = callPackage - ({ mkDerivation, array, base, containers, criterion, deque - , exceptions, io-classes, nothunks, parallel, psqueues, QuickCheck - , quiet, si-timers, strict-stm, tasty, tasty-hunit - , tasty-quickcheck, time + ({ mkDerivation, array, base, containers, criterion, exceptions + , io-classes, nothunks, parallel, psqueues, QuickCheck, quiet + , si-timers, strict-stm, tasty, tasty-hunit, tasty-quickcheck, time }: mkDerivation { pname = "io-sim"; - version = "1.0.0.0"; - sha256 = "1l350scmwjcc6697zfl5qw6z2hbqfgqb41c7v6ymww7nmr0qham0"; + version = "1.0.0.1"; + sha256 = "0cknyc86mg5a5fc4kk0sk68j1vvfhdi3dqfvz5n27zz600h3mij5"; libraryHaskellDepends = [ - base containers deque exceptions io-classes nothunks parallel - psqueues QuickCheck quiet si-timers strict-stm time + base containers exceptions io-classes nothunks parallel psqueues + QuickCheck quiet si-timers strict-stm time ]; testHaskellDepends = [ array base containers io-classes parallel QuickCheck si-timers @@ -198679,18 +198735,18 @@ self: { "monomer-flatpak-example" = callPackage ({ mkDerivation, base, containers, data-default-class, dbus - , directory, monomer, monomer-hagrid, random, text + , desktop-portal, directory, monomer, monomer-hagrid, random, text }: mkDerivation { pname = "monomer-flatpak-example"; - version = "0.0.5.1"; - sha256 = "0lg35nlznzj4dpckxdwfbbc0ymd4s0finrlff56wwrb848dn433y"; + version = "0.0.6.0"; + sha256 = "15fx8ddhn5rysmah7lq699p0h7yb19l5g94ycb8nmjrnz8kzwikv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base containers data-default-class dbus directory monomer - monomer-hagrid random text + base containers data-default-class dbus desktop-portal directory + monomer monomer-hagrid random text ]; description = "Monomer Flatpak Example Application"; license = lib.licenses.mit; @@ -199243,6 +199299,37 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql_0_27_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , morpheus-graphql-app, morpheus-graphql-code-gen + , morpheus-graphql-core, morpheus-graphql-server + , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl + , relude, tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql"; + version = "0.27.2"; + sha256 = "1lp5a6hb8y4j7zj8fa5yvw6wffl800gwfp42k9hayh2cn4fgfmz0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-code-gen morpheus-graphql-core + morpheus-graphql-server mtl relude template-haskell text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-code-gen morpheus-graphql-core + morpheus-graphql-server morpheus-graphql-subscriptions + morpheus-graphql-tests mtl relude tasty tasty-hunit + template-haskell text transformers unordered-containers vector + ]; + description = "Morpheus GraphQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-app" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, morpheus-graphql-core @@ -199270,6 +199357,34 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-app_0_27_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, morpheus-graphql-core + , morpheus-graphql-tests, mtl, relude, scientific, tasty + , tasty-hunit, template-haskell, text, th-lift-instances + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-app"; + version = "0.27.2"; + sha256 = "1p9m9id8p737fzpmkb7ycbfvzims4qhayf3vm0d0k6bq07mlky7y"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec + morpheus-graphql-core mtl relude scientific template-haskell text + th-lift-instances transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec + morpheus-graphql-core morpheus-graphql-tests mtl relude scientific + tasty tasty-hunit template-haskell text th-lift-instances + transformers unordered-containers vector + ]; + description = "Morpheus GraphQL App"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -199324,6 +199439,38 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-client_0_27_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , file-embed, modern-uri, morpheus-graphql-code-gen-utils + , morpheus-graphql-core, morpheus-graphql-subscriptions, mtl + , prettyprinter, relude, req, tasty, tasty-hunit, template-haskell + , text, transformers, unliftio-core, unordered-containers + , websockets, wuss + }: + mkDerivation { + pname = "morpheus-graphql-client"; + version = "0.27.2"; + sha256 = "099pn7k8nw1yxh0sd6g34dwgnw7skqzh7lr8lvfl1hr1i9ak6c3q"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers file-embed modern-uri + morpheus-graphql-code-gen-utils morpheus-graphql-core + morpheus-graphql-subscriptions mtl prettyprinter relude req + template-haskell text transformers unliftio-core + unordered-containers websockets wuss + ]; + testHaskellDepends = [ + aeson base bytestring containers directory file-embed modern-uri + morpheus-graphql-code-gen-utils morpheus-graphql-core + morpheus-graphql-subscriptions mtl prettyprinter relude req tasty + tasty-hunit template-haskell text transformers unliftio-core + unordered-containers websockets wuss + ]; + description = "Morpheus GraphQL Client"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-code-gen" = callPackage ({ mkDerivation, base, bytestring, containers, file-embed, filepath , Glob, morpheus-graphql-client, morpheus-graphql-code-gen-utils @@ -199355,6 +199502,38 @@ self: { mainProgram = "morpheus"; }) {}; + "morpheus-graphql-code-gen_0_27_2" = callPackage + ({ mkDerivation, base, bytestring, containers, file-embed, filepath + , Glob, morpheus-graphql-client, morpheus-graphql-code-gen-utils + , morpheus-graphql-core, morpheus-graphql-server + , optparse-applicative, prettyprinter, relude, template-haskell + , text, unordered-containers, yaml + }: + mkDerivation { + pname = "morpheus-graphql-code-gen"; + version = "0.27.2"; + sha256 = "1p1s4szb284i53ifpzhm4p0bh2ba5ww42llljqvwhs5rwbz6lg8i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers file-embed + morpheus-graphql-code-gen-utils morpheus-graphql-core + morpheus-graphql-server prettyprinter relude template-haskell text + unordered-containers + ]; + executableHaskellDepends = [ + base bytestring containers file-embed filepath Glob + morpheus-graphql-client morpheus-graphql-code-gen-utils + morpheus-graphql-core morpheus-graphql-server optparse-applicative + prettyprinter relude template-haskell text unordered-containers + yaml + ]; + description = "Morpheus GraphQL CLI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + mainProgram = "morpheus"; + }) {}; + "morpheus-graphql-code-gen-utils" = callPackage ({ mkDerivation, base, bytestring, containers , morpheus-graphql-core, mtl, prettyprinter, relude @@ -199372,6 +199551,24 @@ self: { license = lib.licenses.bsd3; }) {}; + "morpheus-graphql-code-gen-utils_0_27_2" = callPackage + ({ mkDerivation, base, bytestring, containers + , morpheus-graphql-core, mtl, prettyprinter, relude + , template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-code-gen-utils"; + version = "0.27.2"; + sha256 = "032vsvwknlv6ha289s71cwzq1qsisn6028p8k4hyqzmvqcm5aqg7"; + libraryHaskellDepends = [ + base bytestring containers morpheus-graphql-core mtl prettyprinter + relude template-haskell text unordered-containers + ]; + description = "Morpheus GraphQL CLI"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , hashable, megaparsec, morpheus-graphql-tests, mtl, relude @@ -199398,6 +199595,33 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-core_0_27_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, megaparsec, morpheus-graphql-tests, mtl, relude + , scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-core"; + version = "0.27.2"; + sha256 = "16zff8r85aln6fl7zl48hzkij80aippg91kwdr7q5k1i0glg2c1n"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers hashable megaparsec mtl relude + scientific template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers directory hashable megaparsec + morpheus-graphql-tests mtl relude scientific tasty tasty-hunit + template-haskell text th-lift-instances transformers + unordered-containers vector + ]; + description = "Morpheus GraphQL Core"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-server" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, file-embed , morpheus-graphql-app, morpheus-graphql-core @@ -199425,6 +199649,34 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-server_0_27_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, file-embed + , morpheus-graphql-app, morpheus-graphql-core + , morpheus-graphql-subscriptions, morpheus-graphql-tests, mtl + , relude, tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "morpheus-graphql-server"; + version = "0.27.2"; + sha256 = "0jfvg2r2nhx62n10ljy6c8qg4a91jsxmzcwx6f7yj4hp2z285a2l"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers morpheus-graphql-app + morpheus-graphql-core mtl relude template-haskell text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers file-embed morpheus-graphql-app + morpheus-graphql-core morpheus-graphql-subscriptions + morpheus-graphql-tests mtl relude tasty tasty-hunit + template-haskell text transformers unordered-containers vector + ]; + description = "Morpheus GraphQL"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-subscriptions" = callPackage ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-app , morpheus-graphql-core, mtl, relude, text, transformers @@ -199443,6 +199695,25 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-subscriptions_0_27_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, morpheus-graphql-app + , morpheus-graphql-core, mtl, relude, text, transformers + , unliftio-core, unordered-containers, uuid, websockets + }: + mkDerivation { + pname = "morpheus-graphql-subscriptions"; + version = "0.27.2"; + sha256 = "0qg8nkawwjm4sak524mgbid5f9a246c8a0w6cv3x4d3w01pnk9j9"; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-app morpheus-graphql-core + mtl relude text transformers unliftio-core unordered-containers + uuid websockets + ]; + description = "Morpheus GraphQL Subscriptions"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morpheus-graphql-tests" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty , tasty-hunit, text, unordered-containers @@ -199459,6 +199730,23 @@ self: { license = lib.licenses.mit; }) {}; + "morpheus-graphql-tests_0_27_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, relude, tasty + , tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "morpheus-graphql-tests"; + version = "0.27.2"; + sha256 = "1vav6nrm26kbngzh0r5qvzg2524v30nx96s9vy61a3zmkwd9i5fc"; + libraryHaskellDepends = [ + aeson base bytestring directory relude tasty tasty-hunit text + unordered-containers + ]; + description = "Morpheus GraphQL Test"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -238274,6 +238562,8 @@ self: { pname = "quaalude"; version = "0.0.0.1"; sha256 = "0wwsrpm2s7gs2c4fwh4qvhnjywxfyf94dw715bz34q7bzyyk3lc6"; + revision = "1"; + editedCabalFile = "0mqgnxadwgz0ky3nvzqrkdnx5xb2a8qbiwvdwjmy63xhwdymy5ap"; libraryHaskellDepends = [ base ]; description = "Extremely minimal prelude"; license = lib.licenses.asl20; @@ -259792,18 +260082,12 @@ self: { }: mkDerivation { pname = "servant-combinators"; - version = "0.0.1"; - sha256 = "0c9mybvik61nk5lvz4nfm6n48qsxqfaivrx3dczajiw9l7llpij6"; - isLibrary = true; - isExecutable = true; + version = "0.0.2"; + sha256 = "19mn43f1r1gi9i2lamw3r8wds2grw76siqvdkbgpxrmicmy800h5"; libraryHaskellDepends = [ aeson base bytestring clientsession containers cookie http-types QuickCheck servant servant-server tasty text time vault wai ]; - executableHaskellDepends = [ - aeson base bytestring clientsession containers cookie http-types - QuickCheck servant servant-server tasty text time vault wai - ]; testHaskellDepends = [ aeson async base bytestring case-insensitive clientsession containers cookie http-client http-conduit http-types QuickCheck @@ -259812,7 +260096,6 @@ self: { ]; description = "Extra servant combinators for full WAI functionality"; license = lib.licenses.mit; - mainProgram = "live-test"; }) {}; "servant-conduit" = callPackage @@ -265023,8 +265306,8 @@ self: { }: mkDerivation { pname = "si-timers"; - version = "1.0.0.0"; - sha256 = "039pzvqypvw2ymn8nb68qgkvppjnab4wkfqq4i0ygmc7f6f4q27n"; + version = "1.0.0.1"; + sha256 = "112rc3178kgam5iqhih20mylbz6l2siiac5d5n1zg4dqisjnh9zn"; libraryHaskellDepends = [ base io-classes mtl stm time ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "timers using SI units (seconds)"; @@ -273474,6 +273757,8 @@ self: { pname = "spreadsheet"; version = "0.1.3.9"; sha256 = "10sdywp24c0prvgkdndimc6jnkalzbsbdb1dxw6cv86xxphk65in"; + revision = "2"; + editedCabalFile = "1z25kvb4l37nnpps8xxs4cd1qjjn592002ggw0bx5cn4k3r59wfh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -277437,8 +277722,8 @@ self: { pname = "storablevector"; version = "0.2.13.1"; sha256 = "06fgxbnc5vwmiv7dxywj7ncjhmxv0wjs0bys5hza6mrwn3sw5r2w"; - revision = "1"; - editedCabalFile = "10zazrk5fxhwmr5q2h8g0mgdgm1sd35268zjij0sv480v1znsy4i"; + revision = "2"; + editedCabalFile = "05p97fmm8jkhhyhm2gqm7knnri64sihqywr9r49s01c8fkgzm1qx"; libraryHaskellDepends = [ base deepseq non-negative QuickCheck semigroups syb transformers unsafe utility-ht @@ -278410,19 +278695,19 @@ self: { "streamly-archive" = callPackage ({ mkDerivation, archive, base, bytestring, cryptonite, directory - , filepath, QuickCheck, streamly, tar, tasty, tasty-hunit - , tasty-quickcheck, temporary, zlib + , filepath, QuickCheck, streamly, streamly-core, tar, tasty + , tasty-hunit, tasty-quickcheck, temporary, zlib }: mkDerivation { pname = "streamly-archive"; - version = "0.1.0"; - sha256 = "0094qi2n7fg7hsdaag307gmcvgrl39m4w0lz29csrk1fq4yy578x"; + version = "0.2.0"; + sha256 = "0sjshmvndrysbfpj0w05khpga2qsb375iqpfwl6d822vaaxsykq2"; enableSeparateDataOutput = true; - libraryHaskellDepends = [ base bytestring streamly ]; + libraryHaskellDepends = [ base bytestring streamly streamly-core ]; librarySystemDepends = [ archive ]; testHaskellDepends = [ base bytestring cryptonite directory filepath QuickCheck streamly - tar tasty tasty-hunit tasty-quickcheck temporary zlib + streamly-core tar tasty tasty-hunit tasty-quickcheck temporary zlib ]; testSystemDepends = [ archive ]; description = "Stream data from archives using the streamly library"; @@ -278559,17 +278844,20 @@ self: { "streamly-lmdb" = callPackage ({ mkDerivation, async, base, bytestring, directory, lmdb - , QuickCheck, streamly, tasty, tasty-quickcheck, temporary + , QuickCheck, streamly, streamly-core, tasty, tasty-quickcheck + , temporary }: mkDerivation { pname = "streamly-lmdb"; - version = "0.5.0"; - sha256 = "1hwqr95dh9da70147r6g4jwd8an0ghfnm64y2x34d8sr0zhb7j9z"; - libraryHaskellDepends = [ async base bytestring streamly ]; + version = "0.6.0"; + sha256 = "14hwv5j1vgyvvqjv2g3zqld8bml09rsbv82mq15hlj786z3snldb"; + libraryHaskellDepends = [ + async base bytestring streamly streamly-core + ]; librarySystemDepends = [ lmdb ]; testHaskellDepends = [ - async base bytestring directory QuickCheck streamly tasty - tasty-quickcheck temporary + async base bytestring directory QuickCheck streamly streamly-core + tasty tasty-quickcheck temporary ]; testSystemDepends = [ lmdb ]; description = "Stream data to or from LMDB databases using the streamly library"; @@ -279034,8 +279322,8 @@ self: { ({ mkDerivation, base, io-classes }: mkDerivation { pname = "strict-mvar"; - version = "1.0.0.0"; - sha256 = "0rdcxk6z0y1z5y88ggz6ph17dcpfzhasjvqx5434a2350g5iswdj"; + version = "1.0.0.1"; + sha256 = "1spfih00nkr5i00dj4r70g8vq0f7gr2kia6l8w2k450b2k749596"; libraryHaskellDepends = [ base io-classes ]; description = "Strict MVars for IO and IOSim"; license = lib.licenses.asl20; @@ -279058,8 +279346,8 @@ self: { ({ mkDerivation, array, base, io-classes, stm }: mkDerivation { pname = "strict-stm"; - version = "1.0.0.0"; - sha256 = "16z5vd0vjqzahkrdncvmvm4b2crw5bv8l1h5hi2hrj0pgll90m96"; + version = "1.0.0.1"; + sha256 = "0xgd8hjbb7z168pn92naicfds71fd7s316w5nhvv09bkcsj7n9mx"; libraryHaskellDepends = [ array base io-classes stm ]; description = "Strict STM interface polymorphic over stm implementation"; license = lib.licenses.asl20; @@ -281669,8 +281957,8 @@ self: { ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }: mkDerivation { pname = "svg-icons"; - version = "2.6.0.0"; - sha256 = "13vsyv1bnxp45mllfrai09n4f5a131l8v77jbf2vy4f0wzmpswpm"; + version = "2.8.0.2"; + sha256 = "1zjzi4grxzbdbbyiqm68xy3hf4xdxm7cn5g6cz7w8575yjbqghzx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -290650,7 +290938,6 @@ self: { ]; description = "Library for Time parsing from Text into UTCTime"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "text-trie" = callPackage @@ -299442,6 +299729,30 @@ self: { broken = true; }) {}; + "twirl" = callPackage + ({ mkDerivation, base, bytestring, containers, file-embed, linear + , mtl, pretty-simple, sdl2, sdl2-image, sdl2-mixer, sdl2-ttf, text + , time, transformers, vector + }: + mkDerivation { + pname = "twirl"; + version = "0.4.0.4"; + sha256 = "034sx3j2zqbf10w18c013any17pbn07sydn4r5s5s3lj5wg7g6ik"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers file-embed linear mtl pretty-simple sdl2 + sdl2-image sdl2-mixer sdl2-ttf text time transformers vector + ]; + executableHaskellDepends = [ + base bytestring containers file-embed linear mtl pretty-simple sdl2 + sdl2-image sdl2-mixer sdl2-ttf text time transformers vector + ]; + description = "Simple 2D Game Engine"; + license = lib.licenses.zlib; + mainProgram = "example"; + }) {}; + "twirp" = callPackage ({ mkDerivation, aeson, base, bytestring, http-media, http-types , proto-lens, proto-lens-jsonpb, proto-lens-runtime, servant, text From ef8559d3f4c4f69b6196ceeffb853a9dde82c9de Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Sat, 22 Apr 2023 14:52:57 +0000 Subject: [PATCH 22/44] haskell.packages.ghc96.cborg-json: allow base-4.18 --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index a0777c3db3d40..3c8daef395899 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -103,6 +103,9 @@ self: super: { # Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25 newtype-generics = assert !(self ? newtype-generics_0_6_2); doJailbreak super.newtype-generics; + # Forbids base >= 4.18, fix proposed: https://github.com/well-typed/cborg/pull/312 + cborg = assert !(self ? cborg_0_2_8_0); doJailbreak super.cborg; + cborg-json = assert !(self ? cborg_0_2_5_0); doJailbreak super.cborg-json; # # Too strict bounds, waiting on Hackage release in nixpkgs From e08455e3d6dce4792c5473949100411e62bfd396 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Sat, 22 Apr 2023 16:01:10 +0000 Subject: [PATCH 23/44] haskell.packages.ghc96.serialise: allow base-4.18 --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 3c8daef395899..3e54915b3fb7f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -106,6 +106,7 @@ self: super: { # Forbids base >= 4.18, fix proposed: https://github.com/well-typed/cborg/pull/312 cborg = assert !(self ? cborg_0_2_8_0); doJailbreak super.cborg; cborg-json = assert !(self ? cborg_0_2_5_0); doJailbreak super.cborg-json; + serialise = assert !(self ? serialise_0_2_6_0); doJailbreak super.serialise; # # Too strict bounds, waiting on Hackage release in nixpkgs From 4925760232120dc8bc26f733a692f685b86ee108 Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Sat, 22 Apr 2023 20:04:15 +0000 Subject: [PATCH 24/44] haskell.packages.ghc96: uses jailbreakForCurrentVersion --- .../haskell-modules/configuration-ghc-9.6.x.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 3e54915b3fb7f..fe20cdf7a2833 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -9,6 +9,11 @@ let overrideCabal (old: { jailbreak = assert old.revision or "0" == toString rev; true; }); + checkAgainAfter = pkg: ver: msg: act: + if builtins.compareVersions pkg.version ver <= 0 then act + else + builtins.throw "Check if '${msg}' was resolved in ${pkg.pname} ${pkg.version} and update or remove this"; + jailbreakForCurrentVersion = p: v: checkAgainAfter p v "bad bounds" (doJailbreak p); in self: super: { @@ -102,19 +107,19 @@ self: super: { lukko = doJailbreak super.lukko; # Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25 - newtype-generics = assert !(self ? newtype-generics_0_6_2); doJailbreak super.newtype-generics; + newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2"; # Forbids base >= 4.18, fix proposed: https://github.com/well-typed/cborg/pull/312 - cborg = assert !(self ? cborg_0_2_8_0); doJailbreak super.cborg; - cborg-json = assert !(self ? cborg_0_2_5_0); doJailbreak super.cborg-json; - serialise = assert !(self ? serialise_0_2_6_0); doJailbreak super.serialise; + cborg = jailbreakForCurrentVersion super.cborg "0.2.8.0"; + cborg-json = jailbreakForCurrentVersion super.cborg-json "0.2.5.0"; + serialise = jailbreakForCurrentVersion super.serialise "0.2.6.0"; # # Too strict bounds, waiting on Hackage release in nixpkgs # # base >= 4.18 is allowed in those newer versions - boring = assert !(self ? boring_0_2_1); doJailbreak super.boring; - these = assert !(self ? assoc_1_2); doJailbreak super.these; + boring = jailbreakForCurrentVersion super.boring "0.2.1"; + these = jailbreakForCurrentVersion super.these "1.2"; # XXX: We probably should be using semigroupoids 6.0.1 which is intended for 9.6 semigroupoids = doJailbreak super.semigroupoids; From 22c5bd85d8478e24874ff2b80875506f5c3711a6 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 22:25:44 +0200 Subject: [PATCH 25/44] Partially revert "haskell.packages.ghc96: uses jailbreakForCurrentVersion" This partially reverts commit 4925760232120dc8bc26f733a692f685b86ee108. --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index fe20cdf7a2833..0cfbc158a3707 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -118,8 +118,8 @@ self: super: { # # base >= 4.18 is allowed in those newer versions - boring = jailbreakForCurrentVersion super.boring "0.2.1"; - these = jailbreakForCurrentVersion super.these "1.2"; + boring = assert !(self ? boring_0_2_1); doJailbreak super.boring; + these = assert !(self ? assoc_1_2); doJailbreak super.these; # XXX: We probably should be using semigroupoids 6.0.1 which is intended for 9.6 semigroupoids = doJailbreak super.semigroupoids; From 32a7217281ff3b4f3c08457213ef33ce7facbd3e Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 22:37:45 +0200 Subject: [PATCH 26/44] haskellPackages.audacity: Add executableHaskellDepends for examples --- pkgs/development/haskell-modules/configuration-nix.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 4a1d0d3dfbb31..daedee132a888 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -177,7 +177,9 @@ self: super: builtins.intersectAttrs super { ### END HASKELL-LANGUAGE-SERVER SECTION ### ########################################### - audacity = enableCabalFlag "buildExamples" super.audacity; + audacity = enableCabalFlag "buildExamples" (overrideCabal (drv: { + executableHaskellDepends = [self.optparse-applicative self.soxlib]; + }) super.audacity); med-module = enableCabalFlag "buildExamples" super.med-module; spreadsheet = enableCabalFlag "buildExamples" super.spreadsheet; From 10a925042587729fa4265afc342098ccd4200497 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 22:38:06 +0200 Subject: [PATCH 27/44] haskellPackages.spreadsheet: Add executableHaskellDepends for examples --- pkgs/development/haskell-modules/configuration-nix.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index daedee132a888..c58e4ae798eea 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -181,7 +181,9 @@ self: super: builtins.intersectAttrs super { executableHaskellDepends = [self.optparse-applicative self.soxlib]; }) super.audacity); med-module = enableCabalFlag "buildExamples" super.med-module; - spreadsheet = enableCabalFlag "buildExamples" super.spreadsheet; + spreadsheet = enableCabalFlag "buildExamples" (overrideCabal (drv: { + executableHaskellDepends = [self.optparse-applicative self.shell-utility]; + }) super.spreadsheet); # fix errors caused by hardening flags epanet-haskell = disableHardening ["format"] super.epanet-haskell; From 799630369ab3d831415e4e7419646631991cb7cf Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 22:44:13 +0200 Subject: [PATCH 28/44] haskellPackages.comfort-fttw: Pin to fixed version --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 04bfc94ef82f5..5b4322e0695ab 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -630,6 +630,10 @@ self: super: { }) ] (dontCheck super.snappy); + # 2023-04-22: omfort-fftw 0.0.0.1 contains fixes to the tests. We can drop + # this override as soon as stackage advances. + comfort-fftw = doDistribute super.comfort-fftw_0_0_0_1; + # https://github.com/vincenthz/hs-crypto-pubkey/issues/20 crypto-pubkey = dontCheck super.crypto-pubkey; From 59f654146c9a4f0bea4588d6912429153fab8d42 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 22:56:04 +0200 Subject: [PATCH 29/44] haskellPackages.hspec*: Update overrides --- .../haskell-modules/configuration-common.nix | 26 +++++++++---------- .../configuration-ghc-9.4.x.nix | 6 ++--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5b4322e0695ab..a5897b550ea90 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -61,15 +61,15 @@ self: super: { # not solvable short of recompiling GHC. Instead of adding # allowInconsistentDependencies for all reverse dependencies of hspec-core, # just upgrade to an hspec version without the offending dependency. - hspec-core = cself.hspec-core_2_10_10; - hspec-discover = cself.hspec-discover_2_10_10; - hspec = cself.hspec_2_10_10; + hspec-core = cself.hspec-core_2_11_0; + hspec-discover = cself.hspec-discover_2_11_0; + hspec = cself.hspec_2_11_0; # hspec-discover and hspec-core depend on hspec-meta for testing which # we need to avoid since it depends on ghc as well. Since hspec*_2_10* # are overridden to take the versioned attributes as inputs, we need # to make sure to override the versioned attribute with this fix. - hspec-discover_2_10_10 = dontCheck csuper.hspec-discover_2_10_10; + hspec-discover_2_11_0 = dontCheck csuper.hspec-discover_2_11_0; # Prevent dependency on doctest which causes an inconsistent dependency # due to depending on ghc which depends on directory etc. @@ -1005,12 +1005,12 @@ self: super: { testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_10_5 ]; testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ]; }) (super.sensei.override { - hspec = self.hspec_2_10_10; + hspec = self.hspec_2_11_0; hspec-wai = self.hspec-wai.override { - hspec = self.hspec_2_10_10; + hspec = self.hspec_2_11_0; }; hspec-contrib = self.hspec-contrib.override { - hspec-core = self.hspec-core_2_10_10; + hspec-core = self.hspec-core_2_11_0; }; fsnotify = self.fsnotify_0_4_1_0; }); @@ -1674,16 +1674,16 @@ self: super: { servant-openapi3 = dontCheck super.servant-openapi3; # Give hspec 2.10.* correct dependency versions without overrideScope - hspec_2_10_10 = doDistribute (super.hspec_2_10_10.override { - hspec-discover = self.hspec-discover_2_10_10; - hspec-core = self.hspec-core_2_10_10; + hspec_2_11_0 = doDistribute (super.hspec_2_11_0.override { + hspec-discover = self.hspec-discover_2_11_0; + hspec-core = self.hspec-core_2_11_0; }); - hspec-discover_2_10_10 = doDistribute (super.hspec-discover_2_10_10.override { + hspec-discover_2_11_0 = doDistribute (super.hspec-discover_2_11_0.override { hspec-meta = self.hspec-meta_2_10_5; }); - # Need to disable tests to prevent an infinite recursion if hspec-core_2_10_10 + # Need to disable tests to prevent an infinite recursion if hspec-core_2_11_0 # is overlayed to hspec-core. - hspec-core_2_10_10 = doDistribute (dontCheck (super.hspec-core_2_10_10.override { + hspec-core_2_11_0 = doDistribute (dontCheck (super.hspec-core_2_11_0.override { hspec-meta = self.hspec-meta_2_10_5; })); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 95d9c567b7ef9..a8e9c4623e2b9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -110,10 +110,10 @@ in { # Note: Any compilation fixes need to be done on the versioned attributes, # since those are used for the internal dependencies between the versioned # hspec packages in configuration-common.nix. - hspec = self.hspec_2_10_10; - hspec-core = self.hspec-core_2_10_10; + hspec = self.hspec_2_11_0; + hspec-core = self.hspec-core_2_11_0; hspec-meta = self.hspec-meta_2_10_5; - hspec-discover = self.hspec-discover_2_10_10; + hspec-discover = self.hspec-discover_2_11_0; # the dontHaddock is due to a GHC panic. might be this bug, not sure. # https://gitlab.haskell.org/ghc/ghc/-/issues/21619 From ec4d9834ce4e7859adfec2cc92eff3c6f1dbbbef Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 23:04:42 +0200 Subject: [PATCH 30/44] haskellPackages.twirl: Unsupported on darwin --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index b387f30880f93..6eecb6192c1f0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -641,6 +641,7 @@ unsupported-platforms: spade: [ platforms.darwin ] # depends on sdl2-mixer, which doesn't work on darwin synthesizer-alsa: [ platforms.darwin ] taffybar: [ platforms.darwin ] + twirl: [ platforms.darwin ] # depends on sdl2-mixer emanote: [ x86_64-darwin ] # Depends on stork which is broken on macOS sdk < 10.14 termonad: [ platforms.darwin ] tokyotyrant-haskell: [ platforms.darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6040e5c763be9..6369e5791f8cd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -299750,6 +299750,7 @@ self: { ]; description = "Simple 2D Game Engine"; license = lib.licenses.zlib; + badPlatforms = lib.platforms.darwin; mainProgram = "example"; }) {}; From e4b66fa1a121aa9fb9121e0606918f047cd041a2 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 22 Apr 2023 20:15:05 +0200 Subject: [PATCH 31/44] maintainers/scripts/haskell: Integrate transitive-broken into regeneration script --- maintainers/scripts/haskell/mark-broken.sh | 2 - .../haskell/regenerate-hackage-packages.sh | 111 ++++++++++++++---- .../regenerate-transitive-broken-packages.sh | 1 - 3 files changed, 88 insertions(+), 26 deletions(-) diff --git a/maintainers/scripts/haskell/mark-broken.sh b/maintainers/scripts/haskell/mark-broken.sh index 2111ef52bc05f..2624311aac9db 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -32,8 +32,6 @@ EOF sort -iu "$tmpfile" >> "$broken_config" clear="env -u HOME -u NIXPKGS_CONFIG" $clear maintainers/scripts/haskell/regenerate-hackage-packages.sh -$clear maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh -$clear maintainers/scripts/haskell/regenerate-hackage-packages.sh evalline=$(maintainers/scripts/haskell/hydra-report.hs eval-info) if [[ "${1:-}" == "--do-commit" ]]; then diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 5e6b5a888ad8a..96a18aa8ed87f 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -1,22 +1,69 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git nix -I nixpkgs=. -# This script is used to regenerate nixpkgs' Haskell package set, using the -# tool hackage2nix from the nixos/cabal2nix repo. hackage2nix looks at the -# config files in pkgs/development/haskell-modules/configuration-hackage2nix -# and generates a Nix expression for package version specified there, using the -# Cabal files from the Hackage database (available under all-cabal-hashes) and -# its companion tool cabal2nix. -# -# Related scripts are update-hackage.sh, for updating the snapshot of the -# Hackage database used by hackage2nix, and update-cabal2nix-unstable.sh, -# for updating the version of hackage2nix used to perform this task. -# -# Note that this script doesn't gcroot anything, so it may be broken by an -# unfortunately timed nix-store --gc. - set -euo pipefail +self=$0 + +print_help () { +cat < $config_file << EOF dont-distribute-packages: EOF -echo "Regenerating list of transitive broken packages ..." nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $config_file From 77fb04d83ec2323a81e3319799979203ad877481 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Sun, 23 Apr 2023 19:14:53 +0300 Subject: [PATCH 32/44] haskellPackages.gtk: refactor configuration-nix - using lib.pipe --- .../haskell-modules/configuration-nix.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c58e4ae798eea..42424065e2510 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -263,11 +263,14 @@ self: super: builtins.intersectAttrs super { gio = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.gio)); glib = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.glib)); gtk3 = disableHardening ["fortify"] (super.gtk3.override { inherit (pkgs) gtk3; }); - gtk = let gtk1 = addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.gtk; - gtk2 = addPkgconfigDepend pkgs.gtk2 gtk1; - gtk3 = disableHardening ["fortify"] gtk1; - gtk4 = if pkgs.stdenv.isDarwin then appendConfigureFlag "-fhave-quartz-gtk" gtk3 else gtk4; - in gtk3; + gtk = lib.pipe super.gtk ( + [ (disableHardening ["fortify"]) + (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools) + (addPkgconfigDepends (with pkgs; [ gtk2 pcre2 util-linux libselinux libsepol pcre fribidi + libthai libdatrie xorg.libXdmcp libdeflate ])) + ] ++ + ( if pkgs.stdenv.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] ) + ); gtksourceview2 = addPkgconfigDepend pkgs.gtk2 super.gtksourceview2; gtk-traymanager = addPkgconfigDepend pkgs.gtk3 super.gtk-traymanager; From 355cb4ce6bbc3f6f238b8a92d61332b2bec753a5 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Sun, 23 Apr 2023 16:21:05 +0300 Subject: [PATCH 33/44] haskellPackages.gio: fix build - More addPkgconfigDepends - Tested pkgsets: - [x] .#haskell.packages.ghc92.gio - [x] .#haskell.packages.ghc94.gio --- pkgs/development/haskell-modules/configuration-nix.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 42424065e2510..5dba71644c5dd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -260,7 +260,11 @@ self: super: builtins.intersectAttrs super { heist = addTestToolDepend pkgs.pandoc super.heist; # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 - gio = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.gio)); + gio = lib.pipe super.gio + [ (disableHardening ["fortify"]) + (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools) + (addPkgconfigDepends (with pkgs; [ glib pcre2 util-linux libselinux libsepol pcre ])) + ]; glib = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.glib)); gtk3 = disableHardening ["fortify"] (super.gtk3.override { inherit (pkgs) gtk3; }); gtk = lib.pipe super.gtk ( From 3aa6004a884b6308f204728fa157e9d2081cd153 Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Sun, 23 Apr 2023 19:33:14 +0000 Subject: [PATCH 34/44] haskell.packages.ghc961.{aeson,singleton-bool,unliftio-core,lukko,lucid}: Remove unnecessary jailbreaks --- .../haskell-modules/configuration-ghc-9.6.x.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 0cfbc158a3707..426a545fab912 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -74,9 +74,7 @@ self: super: { th-abstraction = doDistribute self.th-abstraction_0_5_0_0; th-desugar = doDistribute self.th-desugar_1_15; turtle = doDistribute self.turtle_1_6_1; - # Too strict bounds on ghc-prim and template-haskell - aeson = doDistribute (doJailbreak self.aeson_2_1_2_1); - # Too strict bounds on ghc-prim + aeson = doDistribute self.aeson_2_1_2_1; memory = doDistribute self.memory_0_18_0; ghc-lib = doDistribute self.ghc-lib_9_6_1_20230312; @@ -88,23 +86,20 @@ self: super: { # allows base >= 4.18 tasty-hedgehog = doDistribute self.tasty-hedgehog_1_4_0_1; + # v0.1.6 forbids base >= 4.18 + singleton-bool = assert !(self ? singleton-bool_0_1_7) doDistribute super.singleton-bool_0_1_7; + # # Too strict bounds without upstream fix # # Forbids transformers >= 0.6 quickcheck-classes-base = doJailbreak super.quickcheck-classes-base; - # Forbids base >= 4.18 - singleton-bool = doJailbreak super.singleton-bool; - # Forbids base >= 4.18 - unliftio-core = doJailbreak super.unliftio-core; # Forbids mtl >= 2.3 ChasingBottoms = doJailbreak super.ChasingBottoms; # Forbids base >= 4.18 cabal-install-solver = doJailbreak super.cabal-install-solver; cabal-install = doJailbreak super.cabal-install; - # Forbids base >= 4.18 - lukko = doJailbreak super.lukko; # Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25 newtype-generics = jailbreakForCurrentVersion super.newtype-generics "0.6.2"; @@ -178,7 +173,6 @@ self: super: { rebase = doJailbreak super.rebase_1_20; rerebase = doJailbreak super.rerebase_1_20; hiedb = dontCheck super.hiedb; - lucid = doJailbreak (dontCheck super.lucid); retrie = dontCheck (super.retrie); ghc-exactprint = unmarkBroken (addBuildDepends (with self.ghc-exactprint.scope; [ From 3c108bd5d84ce59d4cb94996547e4034ccb11aa7 Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Sun, 23 Apr 2023 16:07:32 -0500 Subject: [PATCH 35/44] haskell.packages.ghc961.singleton-bool: Remove useless assert --- pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 426a545fab912..a80c10df756a7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -87,7 +87,7 @@ self: super: { tasty-hedgehog = doDistribute self.tasty-hedgehog_1_4_0_1; # v0.1.6 forbids base >= 4.18 - singleton-bool = assert !(self ? singleton-bool_0_1_7) doDistribute super.singleton-bool_0_1_7; + singleton-bool = doDistribute super.singleton-bool_0_1_7; # # Too strict bounds without upstream fix From e7ec5e110c85fcffb5d920a7fb538bb6c0318069 Mon Sep 17 00:00:00 2001 From: "Miao, ZhiCheng" Date: Sun, 23 Apr 2023 16:29:00 +0300 Subject: [PATCH 36/44] haskellPackages.gtk: fix build - More addPkgconfigDepends - doJailbreak - Tested pkgsets: - [x] .#haskell.packages.ghc92.gtk - [x] .#haskell.packages.ghc94.gtk --- pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index a8e9c4623e2b9..3721b10227c63 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -225,4 +225,6 @@ in { # failing during the Setup.hs phase: https://github.com/gtk2hs/gtk2hs/issues/323. gtk2hs-buildtools = appendPatch ./patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch super.gtk2hs-buildtools; + # Pending text-2.0 support https://github.com/gtk2hs/gtk2hs/issues/327 + gtk = doJailbreak super.gtk; } From 57bc5c6e18373b29bdb91af5d582e6bdac1cde1b Mon Sep 17 00:00:00 2001 From: MaxHearnden Date: Mon, 24 Apr 2023 10:43:26 +0100 Subject: [PATCH 37/44] haskellPackages.llvm-ffi: set LLVM --- .../development/haskell-modules/configuration-common.nix | 4 ++++ .../configuration-hackage2nix/broken.yaml | 1 - .../configuration-hackage2nix/transitive-broken.yaml | 7 ------- pkgs/development/haskell-modules/hackage-packages.nix | 9 --------- 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a5897b550ea90..4a2616ef9b1cc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2625,4 +2625,8 @@ self: super: { # compatability with other gi- packages. # Take another look when gi-webkit2 updates as it may have become compatible with libsoup-3 gi-soup = assert versions.major self.gi-webkit2.version == "4"; self.gi-soup_2_4_28; + + llvm-ffi = super.llvm-ffi.override { + LLVM = pkgs.llvmPackages_13.libllvm; + }; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index d356e37928da3..1f63ae066d72d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3150,7 +3150,6 @@ broken-packages: - ll-picosat - llsd - llvm-base - - llvm-ffi - llvm-general-pure - llvm-hs - llvm-ht diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index f109a69b1d51d..0e6bbf7cd3c88 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2510,8 +2510,6 @@ dont-distribute-packages: - kit - kmeans-par - kmeans-vector - - knead - - knead-arithmetic - knit-haskell - koji-install - koji-tool @@ -2638,14 +2636,11 @@ dont-distribute-packages: - llvm-base-types - llvm-base-util - llvm-data-interop - - llvm-dsl - llvm-extension - - llvm-extra - llvm-general - llvm-general-quote - llvm-hs-pretty - llvm-pretty-bc-parser - - llvm-tf - llvm-tools - lmonad-yesod - lnd-client @@ -3835,7 +3830,6 @@ dont-distribute-packages: - syntax-pretty - syntax-printer - syntaxnet-haskell - - synthesizer-llvm - sys-process - systemstats - t3-client @@ -3901,7 +3895,6 @@ dont-distribute-packages: - time-io-access - time-warp - timeprint - - timeseries - timezone-unix - tinkoff-invest-sdk - tintin diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6369e5791f8cd..bd06868ac0e1a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -174068,7 +174068,6 @@ self: { ]; description = "Repa-like array processing using LLVM JIT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "knead-arithmetic" = callPackage @@ -174082,7 +174081,6 @@ self: { ]; description = "Linear algebra and interpolation using LLVM JIT"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "knit" = callPackage @@ -184294,7 +184292,6 @@ self: { ]; description = "Support for writing an EDSL with LLVM-JIT as target"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "llvm-extension" = callPackage @@ -184341,7 +184338,6 @@ self: { doHaddock = false; description = "Utility functions for the llvm interface"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "llvm-ffi" = callPackage @@ -184356,8 +184352,6 @@ self: { librarySystemDepends = [ LLVM ]; description = "FFI bindings to the LLVM compiler toolkit"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {LLVM = null;}; "llvm-ffi-tools" = callPackage @@ -184627,7 +184621,6 @@ self: { doHaddock = false; description = "Bindings to the LLVM compiler toolkit using type families"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "llvm-tools" = callPackage @@ -284158,7 +284151,6 @@ self: { doHaddock = false; description = "Efficient signal processing using runtime compilation"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "synthesizer-midi" = callPackage @@ -294049,7 +294041,6 @@ self: { ]; description = "Library for Time Series processing"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "timespan" = callPackage From 045868c07b1a800a3a8c6fabaadf13613b684a67 Mon Sep 17 00:00:00 2001 From: maralorn Date: Wed, 26 Apr 2023 18:36:55 +0200 Subject: [PATCH 38/44] haskell.packages.ghc94.hspec*: remove unnecessary overrides --- .../haskell-modules/configuration-ghc-9.4.x.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 3721b10227c63..98a64926c030c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -107,14 +107,6 @@ in { base-orphans = dontCheck (doDistribute super.base-orphans); generically = addBuildDepend self.base-orphans super.generically; - # Note: Any compilation fixes need to be done on the versioned attributes, - # since those are used for the internal dependencies between the versioned - # hspec packages in configuration-common.nix. - hspec = self.hspec_2_11_0; - hspec-core = self.hspec-core_2_11_0; - hspec-meta = self.hspec-meta_2_10_5; - hspec-discover = self.hspec-discover_2_11_0; - # the dontHaddock is due to a GHC panic. might be this bug, not sure. # https://gitlab.haskell.org/ghc/ghc/-/issues/21619 # From ddcad4495c9ef24431b9082c598247d8a31df947 Mon Sep 17 00:00:00 2001 From: maralorn Date: Thu, 27 Apr 2023 21:48:57 +0200 Subject: [PATCH 39/44] haskellPackages.med-module: Temporarily disable examples to fix build --- pkgs/development/haskell-modules/configuration-nix.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9e49b30fbc1cc..069f064118593 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -180,7 +180,8 @@ self: super: builtins.intersectAttrs super { audacity = enableCabalFlag "buildExamples" (overrideCabal (drv: { executableHaskellDepends = [self.optparse-applicative self.soxlib]; }) super.audacity); - med-module = enableCabalFlag "buildExamples" super.med-module; + # 2023-04-27: Deactivating examples for now because they cause a non-trivial build failure. + # med-module = enableCabalFlag "buildExamples" super.med-module; spreadsheet = enableCabalFlag "buildExamples" (overrideCabal (drv: { executableHaskellDepends = [self.optparse-applicative self.shell-utility]; }) super.spreadsheet); From 46b2d38933fa947ac1867b494b173f3218f4b11c Mon Sep 17 00:00:00 2001 From: MaxHearnden Date: Thu, 27 Apr 2023 23:36:34 +0100 Subject: [PATCH 40/44] haskellPackages.libfuse3: disable tests --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4a2616ef9b1cc..107dd66584069 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2629,4 +2629,6 @@ self: super: { llvm-ffi = super.llvm-ffi.override { LLVM = pkgs.llvmPackages_13.libllvm; }; + + libfuse3 = dontCheck super.libfuse3; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 1f63ae066d72d..91907d2f1f01c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3074,7 +3074,6 @@ broken-packages: - lhslatex - LibClang - libexpect - - libfuse3 - libGenI - libhbb - libinfluxdb diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bd06868ac0e1a..4af8d86ec84fe 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -180486,8 +180486,6 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion unix ]; description = "A Haskell binding for libfuse-3.x"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) fuse3;}; "libgit" = callPackage From b91f1c662412279b07b12644de7c821838e549d3 Mon Sep 17 00:00:00 2001 From: MaxHearnden Date: Fri, 28 Apr 2023 10:45:22 +0100 Subject: [PATCH 41/44] haskellPackages.libfuse3: add note explaining why tests are disabled --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 107dd66584069..da63b28f37f76 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2630,5 +2630,6 @@ self: super: { LLVM = pkgs.llvmPackages_13.libllvm; }; + # libfuse3 fails to mount fuse file systems within the build environment libfuse3 = dontCheck super.libfuse3; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From f7e7809ad57126f8f33a2d289b01fedf662ccbf4 Mon Sep 17 00:00:00 2001 From: maralorn Date: Fri, 28 Apr 2023 13:47:36 +0200 Subject: [PATCH 42/44] haskellPackages.gtk: Fix eval on darwin --- pkgs/development/haskell-modules/configuration-nix.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 069f064118593..cd9abba308f5d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -264,15 +264,18 @@ self: super: builtins.intersectAttrs super { gio = lib.pipe super.gio [ (disableHardening ["fortify"]) (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools) - (addPkgconfigDepends (with pkgs; [ glib pcre2 util-linux libselinux libsepol pcre ])) + (addPkgconfigDepends (with pkgs; [ glib pcre2 util-linux pcre ] + ++ (if pkgs.stdenv.isLinux then [libselinux libsepol] else []))) ]; glib = disableHardening ["fortify"] (addPkgconfigDepend pkgs.glib (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools super.glib)); gtk3 = disableHardening ["fortify"] (super.gtk3.override { inherit (pkgs) gtk3; }); gtk = lib.pipe super.gtk ( [ (disableHardening ["fortify"]) (addBuildTool self.buildHaskellPackages.gtk2hs-buildtools) - (addPkgconfigDepends (with pkgs; [ gtk2 pcre2 util-linux libselinux libsepol pcre fribidi - libthai libdatrie xorg.libXdmcp libdeflate ])) + (addPkgconfigDepends (with pkgs; [ gtk2 pcre2 util-linux pcre fribidi + libthai libdatrie xorg.libXdmcp libdeflate + ] + ++ (if pkgs.stdenv.isLinux then [libselinux libsepol] else []))) ] ++ ( if pkgs.stdenv.isDarwin then [(appendConfigureFlag "-fhave-quartz-gtk")] else [] ) ); From c9673695ef98b1856c352766c6a3e0dae1b59ebe Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 29 Apr 2023 19:23:42 +0200 Subject: [PATCH 43/44] haskellPackages.libfuse3: restrict to linux --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 6eecb6192c1f0..f460f5ad8e706 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -698,6 +698,7 @@ supported-platforms: keid-sound-openal: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) keid-ui-dearimgui: [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …) kqueue: [ platforms.netbsd, platforms.freebsd, platforms.openbsd, platforms.darwin ] + libfuse3: [ platforms.linux ] linux-evdev: [ platforms.linux ] linux-file-extents: [ platforms.linux ] linux-inotify: [ platforms.linux ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4af8d86ec84fe..bbc50e45ee1b4 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -180486,6 +180486,7 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion unix ]; description = "A Haskell binding for libfuse-3.x"; license = lib.licenses.mit; + platforms = lib.platforms.linux; }) {inherit (pkgs) fuse3;}; "libgit" = callPackage From 3e47248c05dbdf6a63de36930b4ad6d3ab508934 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 29 Apr 2023 19:31:45 +0200 Subject: [PATCH 44/44] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh based on *evaluation [1794319](https://hydra.nixos.org/eval/1794319) of nixpkgs commit [cbd40e1](https://github.com/NixOS/nixpkgs/commits/cbd40e1eb20ce43a857eda504cec210ba45e7098) as of 2023-04-29 17:29 UTC* from the haskell-updates jobset on hydra under https://hydra.nixos.org/jobset/nixpkgs/haskell-updates --- .../configuration-hackage2nix/broken.yaml | 10 +++++++ .../transitive-broken.yaml | 6 +++++ .../haskell-modules/hackage-packages.nix | 26 +++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 91907d2f1f01c..b6cce1ca3586b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -410,6 +410,7 @@ broken-packages: - biscuit-haskell - bisect-binary - bishbosh + - bitcoind-rpc # dependency missing in job https://hydra.nixos.org/build/217579845 at 2023-04-29 - bitcoin-hs - bitcoin-keys - bitcoin-rpc @@ -1116,6 +1117,7 @@ broken-packages: - derp-lib - describe - descriptive + - desktop-portal # test failure in job https://hydra.nixos.org/build/217585702 at 2023-04-29 - deterministic-game-engine - detrospector - deunicode @@ -1644,6 +1646,7 @@ broken-packages: - ftphs - full-sessions - funbot-client + - funcons-lambda-cbv-mp # failure building executable 'lambda-cbv' in job https://hydra.nixos.org/build/217559083 at 2023-04-29 - functional-arrow - function-instances-algebra - functor-combinators @@ -3149,6 +3152,7 @@ broken-packages: - ll-picosat - llsd - llvm-base + - llvm-extra # dependency missing in job https://hydra.nixos.org/build/217586045 at 2023-04-29 - llvm-general-pure - llvm-hs - llvm-ht @@ -3345,6 +3349,7 @@ broken-packages: - microsoft-translator - mida - midi-simple + - midisurface # dependency missing in job https://hydra.nixos.org/build/217805409 at 2023-04-29 - midi-utils - mighty-metropolis # test failure in job https://hydra.nixos.org/build/214599789 at 2023-04-07 - migrant-postgresql-simple @@ -4591,6 +4596,7 @@ broken-packages: - rustls - rws - RxHaskell + - rzk # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/217574605 at 2023-04-29 - rz-pipe - SableCC2Hs - safe-buffer-monad @@ -5086,6 +5092,7 @@ broken-packages: - stratux-types - stream - streamdeck + - streamed # dependency missing in job https://hydra.nixos.org/build/217576821 at 2023-04-29 - stream-fusion - streaming-benchmarks - streaming-brotli @@ -5199,6 +5206,7 @@ broken-packages: - sync-mht - syntax-trees - syntax-trees-fork-bairyn + - synthesizer # dependency missing in job https://hydra.nixos.org/build/217577245 at 2023-04-29 - Sysmon - system-canonicalpath - system-command @@ -5393,6 +5401,7 @@ broken-packages: - time-quote - time-recurrence - time-series + - timeseries # dependency missing in job https://hydra.nixos.org/build/217565262 at 2023-04-29 - time-series-lib - timeutils - time-w3c @@ -5512,6 +5521,7 @@ broken-packages: - twilio - twiml - twine + - twirl # dependency missing in job https://hydra.nixos.org/build/217564808 at 2023-04-29 - twirp - twisty - twitchapi diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 0e6bbf7cd3c88..fd166bf7fd323 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -809,6 +809,7 @@ dont-distribute-packages: - bitcoin-block - bitcoin-tx - bitcoin-types + - bitcoind-regtest - bitfield - bitly-cli - bitmaps @@ -2510,6 +2511,8 @@ dont-distribute-packages: - kit - kmeans-par - kmeans-vector + - knead + - knead-arithmetic - knit-haskell - koji-install - koji-tool @@ -2636,6 +2639,7 @@ dont-distribute-packages: - llvm-base-types - llvm-base-util - llvm-data-interop + - llvm-dsl - llvm-extension - llvm-general - llvm-general-quote @@ -3190,6 +3194,7 @@ dont-distribute-packages: - prolog-graph-lib - prologue - prolude + - proof-assistant-bot - propane - proplang - prosidyc @@ -3830,6 +3835,7 @@ dont-distribute-packages: - syntax-pretty - syntax-printer - syntaxnet-haskell + - synthesizer-llvm - sys-process - systemstats - t3-client diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bbc50e45ee1b4..21d065b4a97de 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -46067,6 +46067,7 @@ self: { ]; description = "A library for working with bitcoin-core regtest networks"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "bitcoind-rpc-explorer"; }) {}; @@ -46089,6 +46090,8 @@ self: { ]; description = "A streamlined interface to bitcoin core using Haskoin types and Servant"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bitfield" = callPackage @@ -80262,6 +80265,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "Desktop Portal"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "despair" = callPackage @@ -106945,7 +106950,9 @@ self: { ]; description = "call-by-value lambda-calculus with meta-programming"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "lambda-cbv"; + broken = true; }) {}; "funcons-simple" = callPackage @@ -174068,6 +174075,7 @@ self: { ]; description = "Repa-like array processing using LLVM JIT"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "knead-arithmetic" = callPackage @@ -174081,6 +174089,7 @@ self: { ]; description = "Linear algebra and interpolation using LLVM JIT"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "knit" = callPackage @@ -184291,6 +184300,7 @@ self: { ]; description = "Support for writing an EDSL with LLVM-JIT as target"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "llvm-extension" = callPackage @@ -184337,6 +184347,8 @@ self: { doHaddock = false; description = "Utility functions for the llvm interface"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "llvm-ffi" = callPackage @@ -194068,7 +194080,9 @@ self: { description = "A control midi surface"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; mainProgram = "midisurface"; + broken = true; }) {}; "mighttpd" = callPackage @@ -235258,6 +235272,7 @@ self: { executableHaskellDepends = [ base ]; description = "Telegram bot for proof assistants"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "proof-assistant-bot"; }) {}; @@ -253204,7 +253219,9 @@ self: { ]; description = "An experimental proof assistant for synthetic ∞-categories"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; mainProgram = "rzk"; + broken = true; }) {}; "s-cargot" = callPackage @@ -278098,6 +278115,8 @@ self: { description = "Programmatically edit MIDI event streams via ALSA"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "streaming" = callPackage @@ -284000,6 +284019,8 @@ self: { ]; description = "Audio signal processing coded in Haskell"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "synthesizer-alsa" = callPackage @@ -284150,6 +284171,7 @@ self: { doHaddock = false; description = "Efficient signal processing using runtime compilation"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "synthesizer-midi" = callPackage @@ -294040,6 +294062,8 @@ self: { ]; description = "Library for Time Series processing"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "timespan" = callPackage @@ -299741,7 +299765,9 @@ self: { description = "Simple 2D Game Engine"; license = lib.licenses.zlib; badPlatforms = lib.platforms.darwin; + hydraPlatforms = lib.platforms.none; mainProgram = "example"; + broken = true; }) {}; "twirp" = callPackage