From bf3a3b62e4a98d3b721ff222d7a457e3c013aaf5 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 19 Jun 2021 14:18:17 +0200 Subject: [PATCH 01/43] haskellPackages: switch from stackage-nightly to stackage-lts 18.0 --- .../scripts/haskell/update-stackage.sh | 25 +-- .../configuration-hackage2nix/stackage.yaml | 190 ++++++++++-------- 2 files changed, 109 insertions(+), 106 deletions(-) diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 7a0e1e1f81ab..ecf38dc4b900 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -11,15 +11,17 @@ stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stac trap "rm ${tmpfile} ${tmpfile}.new" 0 touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors. -curl -L -s "https://stackage.org/nightly/cabal.config" >"$tmpfile" -old_version=$(grep "# Stackage Nightly" $stackage_config | sed -E 's/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/\1/') -version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.nightly-//p" "$tmpfile") +curl -L -s "https://stackage.org/lts/cabal.config" >"$tmpfile" +old_version=$(grep "# Stackage" $stackage_config | sed -E 's/.*([0-9]{2}\.[0-9]+)/\1/') +version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.lts-//p" "$tmpfile") if [[ "$old_version" == "$version" ]]; then echo "No new stackage version" exit 0 # Nothing to do fi +echo "Updating Stackage LTS from $old_version to $version." + # Create a simple yaml version of the file. sed -r \ -e '/^--/d' \ @@ -31,7 +33,7 @@ sed -r \ < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new" cat > $stackage_config << EOF -# Stackage Nightly $version +# Stackage LTS $version # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -39,29 +41,16 @@ EOF # Drop restrictions on some tools where we always want the latest version. sed -r \ - -e '/ cabal-install /d' \ -e '/ cabal2nix /d' \ - -e '/ cabal2spec /d' \ -e '/ distribution-nixpkgs /d' \ - -e '/ git-annex /d' \ - -e '/ hindent /d' \ - -e '/ hledger/d' \ - -e '/ hlint /d' \ - -e '/ hoogle /d' \ - -e '/ hopenssl /d' \ -e '/ jailbreak-cabal /d' \ - -e '/ json-autotype/d' \ -e '/ language-nix /d' \ - -e '/ shake /d' \ - -e '/ ShellCheck /d' \ - -e '/ stack /d' \ - -e '/ weeder /d' \ < "${tmpfile}.new" >> $stackage_config if [[ "${1:-}" == "--do-commit" ]]; then git add $stackage_config git commit -F - << EOF -haskellPackages: stackage-nightly $old_version -> $version +haskellPackages: stackage-lts $old_version -> $version This commit has been generated by maintainers/scripts/haskell/update-stackage.sh EOF diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index 2ebd11bd006c..69f518322c2a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml @@ -1,4 +1,4 @@ -# Stackage Nightly 2021-06-10 +# Stackage LTS 18.0 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -28,7 +28,7 @@ default-package-overrides: - aeson-picker ==0.1.0.5 - aeson-pretty ==0.8.8 - aeson-qq ==0.8.3 - - aeson-schemas ==1.3.3 + - aeson-schemas ==1.3.4 - aeson-typescript ==0.3.0.1 - aeson-with ==0.1.2.0 - aeson-yak ==0.1.1.3 @@ -195,12 +195,11 @@ default-package-overrides: - attoparsec-path ==0.0.0.1 - audacity ==0.0.2 - aur ==7.0.6 - - aura ==3.2.4 + - aura ==3.2.5 - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - autoexporter ==1.1.20 - auto-update ==0.1.6 - - avers ==0.0.17.1 - avro ==0.5.2.0 - aws-cloudfront-signed-cookies ==0.2.0.8 - aws-xray-client ==0.1.0.0 @@ -237,7 +236,7 @@ default-package-overrides: - bech32 ==1.1.0 - bech32-th ==1.0.2 - bench ==1.0.12 - - benchpress ==0.2.2.16 + - benchpress ==0.2.2.17 - between ==0.11.0.0 - bibtex ==0.1.0.6 - bifunctors ==5.5.11 @@ -279,7 +278,7 @@ default-package-overrides: - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - bmp ==1.2.6.3 - - BNFC ==2.9.1 + - BNFC ==2.9.2 - BNFC-meta ==0.6.1 - board-games ==0.3 - boltzmann-samplers ==0.1.1.0 @@ -304,7 +303,7 @@ default-package-overrides: - buffer-builder ==0.2.4.7 - buffer-pipe ==0.0 - bugsnag-haskell ==0.0.4.1 - - bugsnag-hs ==0.2.0.3 + - bugsnag-hs ==0.2.0.4 - bugzilla-redhat ==0.3.1 - burrito ==1.2.0.2 - butcher ==1.3.3.2 @@ -329,7 +328,8 @@ default-package-overrides: - bzlib ==0.5.1.0 - bzlib-conduit ==0.3.0.2 - c14n ==0.1.0.1 - - c2hs ==0.28.7 + - c2hs ==0.28.8 + - cabal2spec ==2.6.2 - cabal-appimage ==0.3.0.2 - cabal-debian ==5.1 - cabal-doctest ==1.0.8 @@ -393,8 +393,8 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - - circular ==0.3.1.1 - - citeproc ==0.3.0.9 + - circular ==0.4.0.0 + - citeproc ==0.4.0.1 - clash-ghc ==1.4.2 - clash-lib ==1.4.2 - clash-prelude ==1.4.2 @@ -404,8 +404,7 @@ default-package-overrides: - clientsession ==0.9.1.2 - climb ==0.3.3 - Clipboard ==2.3.2.0 - - clock ==0.8 - - clock-extras ==0.1.0.2 + - clock ==0.8.2 - closed ==0.2.0.1 - clumpiness ==0.17.0.2 - ClustalParser ==1.3.0 @@ -425,9 +424,9 @@ default-package-overrides: - combinatorial ==0.1.0.1 - comfort-array ==0.4.1 - comfort-graph ==0.0.3.1 - - commonmark ==0.1.1.4 - - commonmark-extensions ==0.2.0.4 - - commonmark-pandoc ==0.2.0.1 + - commonmark ==0.2 + - commonmark-extensions ==0.2.1.2 + - commonmark-pandoc ==0.2.1 - commutative ==0.0.2 - comonad ==5.0.8 - comonad-extras ==4.0.1 @@ -502,7 +501,7 @@ default-package-overrides: - cryptohash-sha1 ==0.11.100.1 - cryptohash-sha256 ==0.11.102.0 - cryptohash-sha512 ==0.11.100.1 - - cryptonite ==0.28 + - cryptonite ==0.29 - cryptonite-conduit ==0.2.2 - cryptonite-openssl ==0.7 - crypto-numbers ==0.2.7 @@ -622,9 +621,9 @@ default-package-overrides: - dockerfile ==0.2.0 - doclayout ==0.3.0.2 - doctemplates ==0.9 - - doctest ==0.16.3 + - doctest ==0.17 - doctest-discover ==0.2.0.0 - - doctest-driver-gen ==0.3.0.3 + - doctest-driver-gen ==0.3.0.4 - doctest-exitcode-stdio ==0.0 - doctest-extract ==0.1 - doctest-lib ==0.1 @@ -675,12 +674,12 @@ default-package-overrides: - elm-bridge ==0.6.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - - elynx ==0.5.0.2 - - elynx-markov ==0.5.0.2 - - elynx-nexus ==0.5.0.2 - - elynx-seq ==0.5.0.2 - - elynx-tools ==0.5.0.2 - - elynx-tree ==0.5.0.2 + - elynx ==0.5.1.1 + - elynx-markov ==0.5.1.1 + - elynx-nexus ==0.5.1.1 + - elynx-seq ==0.5.1.1 + - elynx-tools ==0.5.1.1 + - elynx-tree ==0.5.1.1 - email-validate ==2.3.2.13 - emd ==0.2.0.0 - emojis ==0.1 @@ -736,14 +735,14 @@ default-package-overrides: - extensible-exceptions ==0.1.1.4 - extra ==1.7.9 - extractable-singleton ==0.0.1 - - extrapolate ==0.4.4 + - extrapolate ==0.4.6 - fail ==4.9.0.0 - failable ==1.2.4.0 - fakedata ==0.8.0 - fakedata-parser ==0.1.0.0 - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - - faktory ==1.0.3.0 + - faktory ==1.0.3.1 - fast-digits ==0.3.0.0 - fast-logger ==3.0.5 - fast-math ==1.0.2 @@ -804,7 +803,7 @@ default-package-overrides: - forkable-monad ==0.2.0.3 - forma ==1.1.3 - format-numbers ==0.1.0.1 - - formatting ==6.3.7 + - formatting ==7.1.2 - foundation ==0.0.26.1 - fourmolu ==0.3.0.0 - free ==5.1.7 @@ -840,7 +839,7 @@ default-package-overrides: - generic-constraints ==1.1.1.1 - generic-data ==0.9.2.0 - generic-data-surgery ==0.3.0.0 - - generic-deriving ==1.13.1 + - generic-deriving ==1.14 - generic-functor ==0.2.0.0 - generic-lens ==2.1.0.0 - generic-lens-core ==2.1.0.0 @@ -884,7 +883,7 @@ default-package-overrides: - geojson ==4.0.2 - getopt-generics ==0.13.0.4 - ghc-byteorder ==4.11.0.0.10 - - ghc-check ==0.5.0.4 + - ghc-check ==0.5.0.5 - ghc-core ==0.5.6 - ghc-events ==0.17.0 - ghc-exactprint ==0.6.4 @@ -906,25 +905,24 @@ default-package-overrides: - ghc-typelits-natnormalise ==0.7.4 - ghc-typelits-presburger ==0.6.0.0 - ghost-buster ==0.1.1.0 - - gi-atk ==2.0.22 - - gi-cairo ==1.0.24 - - gi-cairo-connector ==0.1.0 - - gi-cairo-render ==0.1.0 - - gi-dbusmenu ==0.4.8 - - gi-dbusmenugtk3 ==0.4.9 - - gi-gdk ==3.0.23 - - gi-gdkpixbuf ==2.0.24 - - gi-gdkx11 ==3.0.10 - - gi-gio ==2.0.27 - - gi-glib ==2.0.24 - - gi-gobject ==2.0.25 - - gi-graphene ==1.0.2 - - gi-gtk ==3.0.36 - - gi-gtk-hs ==0.3.9 - - gi-harfbuzz ==0.0.3 + - gi-atk ==2.0.23 + - gi-cairo ==1.0.25 + - gi-dbusmenu ==0.4.9 + - gi-dbusmenugtk3 ==0.4.10 + - gi-gdk ==3.0.24 + - gi-gdkpixbuf ==2.0.26 + - gi-gdkx11 ==3.0.11 + - gi-gio ==2.0.28 + - gi-glib ==2.0.25 + - gi-gmodule ==2.0.1 + - gi-gobject ==2.0.26 + - gi-graphene ==1.0.3 + - gi-gtk ==3.0.37 + - gi-gtk-hs ==0.3.10 + - gi-harfbuzz ==0.0.4 - ginger ==0.10.1.0 - gingersnap ==0.3.1.0 - - gi-pango ==1.0.23 + - gi-pango ==1.0.24 - githash ==0.1.6.0 - github-release ==1.3.7 - github-rest ==1.0.3 @@ -932,7 +930,7 @@ default-package-overrides: - github-webhooks ==0.15.0 - gitlab-haskell ==0.2.5 - gitrev ==1.3.1 - - gi-xlib ==2.0.9 + - gi-xlib ==2.0.10 - gl ==0.9 - glabrous ==2.0.4 - GLFW-b ==3.3.0.0 @@ -962,13 +960,12 @@ default-package-overrides: - groom ==0.1.2.1 - group-by-date ==0.1.0.4 - groups ==0.5.3 - - gtk-sni-tray ==0.1.6.2 - gtk-strut ==0.1.3.0 - guarded-allocation ==0.0.1 - H ==0.9.0.1 - hackage-db ==2.1.1 - hackage-security ==0.6.0.1 - - haddock-library ==1.9.0 + - haddock-library ==1.10.0 - hadoop-streaming ==0.2.0.3 - hakyll-convert ==0.3.0.4 - hal ==0.4.8 @@ -976,7 +973,7 @@ default-package-overrides: - hall-symbols ==0.1.0.6 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - - hapistrano ==0.4.1.4 + - hapistrano ==0.4.2.0 - happstack-server ==7.7.1 - happy ==1.20.0 - happy-meta ==0.2.0.11 @@ -990,8 +987,8 @@ default-package-overrides: - hashtables ==1.2.4.1 - haskeline ==0.8.1.2 - haskell-awk ==1.2.0.1 - - haskell-gi ==0.24.7 - - haskell-gi-base ==0.24.5 + - haskell-gi ==0.25.0 + - haskell-gi-base ==0.25.0 - haskell-gi-overloading ==1.0 - haskell-import-graph ==1.0.4 - haskell-lexer ==1.1 @@ -1037,6 +1034,8 @@ default-package-overrides: - hexpat ==0.20.13 - hformat ==0.3.3.1 - hfsevents ==0.1.6 + - hgeometry ==0.12.0.4 + - hgeometry-combinatorial ==0.12.0.3 - hgrev ==0.2.6 - hidapi ==0.1.7 - hie-bios ==0.7.5 @@ -1049,9 +1048,17 @@ default-package-overrides: - hjsmin ==0.2.0.4 - hkd-default ==1.1.0.0 - hkgr ==0.3 + - hledger ==1.21 + - hledger-iadd ==1.3.14 + - hledger-interest ==1.6.1 + - hledger-lib ==1.21 + - hledger-stockquotes ==0.1.2.0 + - hledger-ui ==1.21 + - hledger-web ==1.21 - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.10.1 + - hlint ==3.2.7 - hmatrix ==0.20.2 - hmatrix-backprop ==0.1.3.0 - hmatrix-gsl ==0.19.0.1 @@ -1062,8 +1069,10 @@ default-package-overrides: - hmpfr ==0.4.4 - hnock ==0.4.0 - hoauth2 ==1.16.0 + - hoogle ==5.0.18.1 - hOpenPGP ==2.9.5 - hopenpgp-tools ==0.23.6 + - hopenssl ==2.2.4 - hopfli ==0.2.2.1 - hosc ==0.18.1 - hostname ==1.0 @@ -1113,7 +1122,7 @@ default-package-overrides: - hspec-golden-aeson ==0.7.0.0 - hspec-hedgehog ==0.0.1.2 - hspec-junit-formatter ==1.0.0.4 - - hspec-leancheck ==0.0.4 + - hspec-leancheck ==0.0.6 - hspec-megaparsec ==2.2.0 - hspec-meta ==2.7.8 - hspec-need-env ==0.1.0.7 @@ -1263,7 +1272,7 @@ default-package-overrides: - io-streams ==1.5.2.1 - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.2 - - ipa ==0.3.1 + - ipa ==0.3.1.1 - iproute ==1.7.11 - IPv6Addr ==2.0.2 - ipynb ==0.1.0.1 @@ -1285,7 +1294,7 @@ default-package-overrides: - ix-shapable ==0.1.0 - jack ==0.7.2 - jalaali ==1.0.0.0 - - jira-wiki-markup ==1.3.5 + - jira-wiki-markup ==1.4.0 - jose ==0.8.4 - jose-jwt ==0.9.2 - js-chart ==2.9.4.1 @@ -1331,7 +1340,7 @@ default-package-overrides: - lame ==0.2.0 - language-avro ==0.1.3.1 - language-bash ==0.9.2 - - language-c ==0.8.3 + - language-c ==0.9.0.1 - language-c-quote ==0.13 - language-docker ==10.0.1 - language-java ==0.2.9 @@ -1458,7 +1467,7 @@ default-package-overrides: - maximal-cliques ==0.1.1 - mbox ==0.3.4 - mbox-utility ==0.0.3.1 - - mcmc ==0.4.0.0 + - mcmc ==0.5.0.0 - mcmc-types ==1.0.3 - medea ==1.2.0 - median-stream ==0.7.0.0 @@ -1471,6 +1480,7 @@ default-package-overrides: - mercury-api ==0.1.0.2 - mergeful ==0.2.0.0 - mergeless ==0.3.0.0 + - mersenne-random ==1.0.0.1 - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 - metrics ==0.4.1.1 @@ -1544,8 +1554,8 @@ default-package-overrides: - monad-time ==0.3.1.0 - monad-unlift ==0.2.0 - monad-unlift-ref ==0.2.1 - - mongoDB ==2.7.0.0 - - monoid-subclasses ==1.0.1 + - mongoDB ==2.7.1.1 + - monoid-subclasses ==1.1 - monoid-transformer ==0.0.4 - mono-traversable ==1.0.15.1 - mono-traversable-instances ==0.1.1.0 @@ -1575,7 +1585,7 @@ default-package-overrides: - mustache ==2.3.1 - mutable-containers ==0.3.4 - mwc-probability ==2.3.1 - - mwc-random ==0.14.0.0 + - mwc-random ==0.15.0.1 - mwc-random-monad ==0.7.3.1 - mx-state-codes ==1.0.0.0 - mysql ==0.2.0.1 @@ -1595,7 +1605,7 @@ default-package-overrides: - netlib-carray ==0.1 - netlib-comfort-array ==0.0.0.1 - netlib-ffi ==0.1.1 - - net-mqtt ==0.7.1.0 + - net-mqtt ==0.7.1.1 - net-mqtt-lens ==0.1.0.0 - netpbm ==1.0.4 - nettle ==0.3.0 @@ -1636,8 +1646,8 @@ default-package-overrides: - nowdoc ==0.1.1.0 - nqe ==0.6.3 - nri-env-parser ==0.1.0.7 - - nri-observability ==0.1.0.2 - - nri-prelude ==0.6.0.1 + - nri-observability ==0.1.0.3 + - nri-prelude ==0.6.0.2 - nsis ==0.3.3 - numbers ==3000.2.0.2 - numeric-extras ==0.1 @@ -1652,8 +1662,8 @@ default-package-overrides: - nvim-hs-ghcid ==2.0.0.0 - oauthenticated ==0.2.1.0 - ObjectName ==1.1.0.1 - - o-clock ==1.2.0.1 - - odbc ==0.2.2 + - o-clock ==1.2.1 + - odbc ==0.2.5 - oeis2 ==1.0.5 - ofx ==0.4.4.0 - old-locale ==1.0.0.7 @@ -1698,7 +1708,7 @@ default-package-overrides: - pager ==0.1.1.0 - pagination ==0.2.2 - pagure-cli ==0.2 - - pandoc ==2.13 + - pandoc ==2.14.0.2 - pandoc-dhall-decoder ==0.1.0.1 - pandoc-plot ==1.2.3 - pandoc-throw ==0.1.0.0 @@ -1721,7 +1731,7 @@ default-package-overrides: - password ==3.0.0.0 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 - - path ==0.7.1 + - path ==0.8.0 - path-binary-instance ==0.1.0.1 - path-extensions ==0.1.1.0 - path-extra ==0.2.0 @@ -1741,7 +1751,7 @@ default-package-overrides: - pdfinfo ==1.5.4 - peano ==0.1.0.1 - pem ==0.2.4 - - percent-format ==0.0.1 + - percent-format ==0.0.2 - peregrin ==0.3.1 - perfect-hash-generator ==0.2.0.6 - perfect-vector-shuffle ==0.1.1.1 @@ -1871,7 +1881,7 @@ default-package-overrides: - pureMD5 ==2.1.3 - purescript-bridge ==0.14.0.0 - pushbullet-types ==0.4.1.0 - - pusher-http-haskell ==2.1.0.2 + - pusher-http-haskell ==2.1.0.3 - pvar ==1.0.0.0 - PyF ==0.9.0.3 - qchas ==1.1.0.1 @@ -1932,6 +1942,8 @@ default-package-overrides: - readable ==0.3.1 - read-editor ==0.1.0.2 - read-env-var ==1.0.0.0 + - reanimate ==1.1.4.0 + - reanimate-svg ==0.13.0.1 - rebase ==1.13.0.1 - record-dot-preprocessor ==0.2.11 - record-hasfield ==1.0 @@ -2003,7 +2015,7 @@ default-package-overrides: - rosezipper ==0.2 - rot13 ==0.2.0.1 - rpmbuild-order ==0.4.5 - - rp-tree ==0.4 + - rp-tree ==0.6 - RSA ==2.4.1 - runmemo ==1.0.0.1 - rvar ==0.2.0.6 @@ -2024,7 +2036,7 @@ default-package-overrides: - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.5 - - sandwich ==0.1.0.7 + - sandwich ==0.1.0.8 - sandwich-quickcheck ==0.1.0.5 - sandwich-slack ==0.1.0.4 - sandwich-webdriver ==0.1.0.5 @@ -2068,7 +2080,7 @@ default-package-overrides: - seqid ==0.6.2 - seqid-streams ==0.7.2 - sequence-formats ==1.6.1 - - sequenceTools ==1.4.0.5 + - sequenceTools ==1.5.0 - serf ==0.1.1.0 - serialise ==0.2.3.0 - servant ==0.18.2 @@ -2108,11 +2120,13 @@ default-package-overrides: - setlocale ==1.0.0.10 - sexp-grammar ==2.3.0 - SHA ==1.6.4.4 + - shake ==0.19.4 - shake-language-c ==0.12.0 - shake-plus ==0.3.3.1 - shake-plus-extended ==0.4.1.0 - shakespeare ==2.0.25 - shared-memory ==0.2.0.0 + - ShellCheck ==0.7.2 - shell-conduit ==5.0.0 - shell-escape ==0.2.0 - shellmet ==0.0.4.0 @@ -2153,7 +2167,7 @@ default-package-overrides: - slack-progressbar ==0.1.0.1 - slick ==1.1.1.0 - slist ==0.2.0.0 - - slynx ==0.5.0.2 + - slynx ==0.5.1.1 - smallcheck ==1.2.1 - smash ==0.1.2 - smash-aeson ==0.1.0.0 @@ -2182,7 +2196,7 @@ default-package-overrides: - sparse-tensor ==0.2.1.5 - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - - speculate ==0.4.8 + - speculate ==0.4.10 - speedy-slice ==0.3.2 - Spintax ==0.3.6 - splice ==0.6.1.1 @@ -2200,6 +2214,7 @@ default-package-overrides: - squeather ==0.8.0.0 - srcloc ==0.6 - stache ==2.3.0 + - stack ==2.7.1 - stackcollapse-ghc ==0.0.1.3 - stack-templatizer ==0.1.0.2 - stateref ==0.3 @@ -2211,10 +2226,8 @@ default-package-overrides: - step-function ==0.2 - stm-chans ==3.0.0.4 - stm-conduit ==4.0.1 - - stm-containers ==1.2 - stm-delay ==0.1.1.1 - stm-extras ==0.1.0.3 - - stm-hamt ==1.2.0.6 - stm-lifted ==2.5.0.0 - STMonadTrans ==0.4.5 - stm-split ==0.0.2.1 @@ -2267,7 +2280,7 @@ default-package-overrides: - swagger ==0.3.0 - swagger2 ==2.6 - sweet-egison ==0.1.1.3 - - swish ==0.10.0.4 + - swish ==0.10.0.5 - syb ==0.7.2.1 - sydtest ==0.2.0.0 - sydtest-discover ==0.0.0.0 @@ -2305,13 +2318,13 @@ default-package-overrides: - tasty-expected-failure ==0.12.3 - tasty-focus ==1.0.1 - tasty-golden ==2.3.4 - - tasty-hedgehog ==1.0.1.0 + - tasty-hedgehog ==1.1.0.0 - tasty-hspec ==1.1.6 - tasty-hunit ==0.10.0.3 - tasty-hunit-compat ==0.2.0.1 - tasty-inspection-testing ==0.1 - tasty-kat ==0.0.3 - - tasty-leancheck ==0.0.1 + - tasty-leancheck ==0.0.2 - tasty-lua ==0.2.3.2 - tasty-program ==1.0.5 - tasty-quickcheck ==0.10.1.2 @@ -2336,12 +2349,12 @@ default-package-overrides: - terminal-size ==0.3.2.1 - test-framework ==0.8.2.0 - test-framework-hunit ==0.3.0.2 - - test-framework-leancheck ==0.0.1 + - test-framework-leancheck ==0.0.4 - test-framework-quickcheck2 ==0.3.0.5 - test-framework-smallcheck ==0.2 - test-fun ==0.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.2 + - texmath ==0.12.3 - text-ansi ==0.1.1 - text-binary ==0.2.1.1 - text-builder ==0.6.6.2 @@ -2395,7 +2408,7 @@ default-package-overrides: - th-test-utils ==1.1.0 - th-utilities ==0.2.4.3 - thyme ==0.3.5.5 - - tidal ==1.7.4 + - tidal ==1.7.5 - tile ==0.3.0.0 - time-compat ==1.9.5 - timeit ==2.0 @@ -2416,7 +2429,7 @@ default-package-overrides: - tls ==1.5.5 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 - - tlynx ==0.5.0.2 + - tlynx ==0.5.1.1 - tmapchan ==0.0.3 - tmapmvar ==0.0.4 - tmp-postgres ==1.34.1.0 @@ -2480,9 +2493,11 @@ default-package-overrides: - unexceptionalio ==0.5.1 - unexceptionalio-trans ==0.5.1 - unicode ==0.0.1.1 + - unicode-collation ==0.1.3 - unicode-show ==0.1.0.4 - unicode-transforms ==0.3.7.1 - unification-fd ==0.11.1 + - union-angle ==0.1.0.1 - union-find ==0.2 - unipatterns ==0.0.0.0 - uniplate ==1.6.13 @@ -2558,7 +2573,7 @@ default-package-overrides: - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.9 - verbosity ==0.4.0.0 - - versions ==4.0.3 + - versions ==5.0.0 - vformat ==0.14.1.0 - vformat-aeson ==0.1.0.1 - vformat-time ==0.1.0.0 @@ -2576,7 +2591,7 @@ default-package-overrides: - wai-feature-flags ==0.1.0.1 - wai-handler-launch ==3.0.3.1 - wai-logger ==2.3.6 - - wai-middleware-auth ==0.2.4.1 + - wai-middleware-auth ==0.2.5.0 - wai-middleware-caching ==0.1.0.2 - wai-middleware-clacks ==0.1.0.1 - wai-middleware-prometheus ==1.0.0 @@ -2594,7 +2609,6 @@ default-package-overrides: - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 - wcwidth ==0.0.2 - - webby ==1.0.1 - webdriver ==0.9.0.1 - webex-teams-api ==0.2.0.1 - webex-teams-conduit ==0.2.0.1 @@ -2633,7 +2647,7 @@ default-package-overrides: - writer-cps-transformers ==0.5.6.1 - wss-client ==0.3.0.0 - wuss ==1.1.18 - - X11 ==1.9.2 + - X11 ==1.10 - X11-xft ==0.3.1 - x11-xim ==0.0.9.0 - x509 ==1.7.5 @@ -2674,7 +2688,7 @@ default-package-overrides: - yesod-bin ==1.6.1 - yesod-core ==1.6.20.1 - yesod-fb ==0.6.1 - - yesod-form ==1.6.7 + - yesod-form ==1.7.0 - yesod-gitrev ==0.2.1 - yesod-markdown ==0.12.6.11 - yesod-newsfeed ==1.7.0.0 From 465f4e27be80a6deef115bacc0dc9eaa51e5fb5a Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 19 Jun 2021 14:22:10 +0200 Subject: [PATCH 02/43] all-cabal-hashes: 2021-06-12T16:23:24Z -> 2021-06-19T11:58:52Z 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 3fc3fc21e477..0a817a2e3317 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "7708395682f798fe3649bd05387ab571fcf8890c", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7708395682f798fe3649bd05387ab571fcf8890c.tar.gz", - "sha256": "0pfv9nmccp9q6p77lmyh8jqkvq1ad392zyy72g8y6kdsgy71nir5", - "msg": "Update from Hackage at 2021-06-12T16:23:24Z" + "commit": "cdeee115727dc5beb9b502f510d7daa96373f275", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/cdeee115727dc5beb9b502f510d7daa96373f275.tar.gz", + "sha256": "1hfa2g1qa9dqzzhdwranpxxy16a35iq89lq3xrknc3b14mdg9xj3", + "msg": "Update from Hackage at 2021-06-19T11:58:52Z" } From 9398b5f08e6de26da44872c403ed0297f68dab15 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sat, 19 Jun 2021 14:23:50 +0200 Subject: [PATCH 03/43] 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 | 3075 ++++++++--------- 1 file changed, 1396 insertions(+), 1679 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e0d8cde491ce..a826fb1f550c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -816,6 +816,42 @@ self: { maintainers = with lib.maintainers; [ abbradar turion ]; }) {inherit (pkgs) emacs;}; + "Agda_2_6_2" = callPackage + ({ mkDerivation, aeson, alex, array, async, base, binary + , blaze-html, boxes, bytestring, Cabal, case-insensitive + , containers, data-hash, deepseq, directory, edit-distance, emacs + , equivalence, exceptions, filepath, ghc-compact, gitrev, happy + , hashable, hashtables, haskeline, monad-control, mtl, murmur-hash + , parallel, pretty, process, regex-tdfa, split, stm, strict + , template-haskell, text, time, transformers, unordered-containers + , uri-encode, zlib + }: + mkDerivation { + pname = "Agda"; + version = "2.6.2"; + sha256 = "159hznnsxg7hlp80r1wqizyd7gwgnq0j13cm4d27cns0ganslb07"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal directory filepath process ]; + libraryHaskellDepends = [ + aeson array async base binary blaze-html boxes bytestring + case-insensitive containers data-hash deepseq directory + edit-distance equivalence exceptions filepath ghc-compact gitrev + hashable hashtables haskeline monad-control mtl murmur-hash + parallel pretty process regex-tdfa split stm strict + template-haskell text time transformers unordered-containers + uri-encode zlib + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ base directory filepath process ]; + executableToolDepends = [ emacs ]; + description = "A dependently typed functional programming language and proof assistant"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ abbradar turion ]; + }) {inherit (pkgs) emacs;}; + "Agda-executable" = callPackage ({ mkDerivation, Agda, base }: mkDerivation { @@ -1267,8 +1303,8 @@ self: { }: mkDerivation { pname = "BNFC"; - version = "2.9.1"; - sha256 = "0670in07lr9fgkx0c7zci8rn8c7g8nimkmpzy5w9swfp4rp3gbkk"; + version = "2.9.2"; + sha256 = "1wn46a6rw6fwxmqp3b8nz81ag2nphyalm6l2frzg63xbdxnlwgmi"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -10032,15 +10068,16 @@ self: { "HaskellNet-SSL" = callPackage ({ mkDerivation, base, bytestring, connection, data-default - , HaskellNet, network, tls + , HaskellNet, network, network-bsd }: mkDerivation { pname = "HaskellNet-SSL"; - version = "0.3.4.1"; - sha256 = "0j36zcx5vfg4jzc7vvfj4ifcvcgyy2sn9rxnxj3vg2cw77idqyp1"; + version = "0.3.4.4"; + sha256 = "031d1a8ryzkm3xsyh1gh8d8kxq9i7pc9r5l2vjpkzgba31s5fbia"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring connection data-default HaskellNet network tls + base bytestring connection data-default HaskellNet network + network-bsd ]; description = "Helpers to connect to SSL/TLS mail servers with HaskellNet"; license = lib.licenses.bsd3; @@ -13064,8 +13101,8 @@ self: { }: mkDerivation { pname = "MagicHaskeller"; - version = "0.9.6.8"; - sha256 = "1091s8jrynjb76wg5r53kp0siv0dgbsxsb9y2djrq1iz06h01m55"; + version = "0.9.6.10"; + sha256 = "04rfddv8hldjavks7pn3s9p80cgpzlz3x9f9d7y6wyz98zcqxpbf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -15914,12 +15951,11 @@ self: { ({ mkDerivation, base, PortMidi }: mkDerivation { pname = "PortMidi-simple"; - version = "0.1.0.0"; - sha256 = "17bl26jlpd48ag42kbjdirqhpahxaiax5sy7p3j1jylhiargijcd"; + version = "0.1.0.1"; + sha256 = "1xi0117296jxc15vpjxd228p31hb5bm47wakiinlp1rdvvil63lc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base PortMidi ]; - executableHaskellDepends = [ base PortMidi ]; description = "Simplified PortMidi wrapper"; license = lib.licenses.bsd3; platforms = [ @@ -21363,24 +21399,6 @@ self: { }) {}; "X11" = callPackage - ({ mkDerivation, base, data-default, libX11, libXext, libXinerama - , libXrandr, libXrender, libXScrnSaver - }: - mkDerivation { - pname = "X11"; - version = "1.9.2"; - sha256 = "013yny4dwbs98kp7245j8dv81h4p1cdwn2rsf2hvhsplg6ixkc05"; - libraryHaskellDepends = [ base data-default ]; - librarySystemDepends = [ - libX11 libXext libXinerama libXrandr libXrender libXScrnSaver - ]; - description = "A binding to the X11 graphics library"; - license = lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; - inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; - inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; - - "X11_1_10" = callPackage ({ mkDerivation, base, data-default-class, libX11, libXext , libXinerama, libXrandr, libXrender, libXScrnSaver }: @@ -21394,7 +21412,6 @@ self: { ]; description = "A binding to the X11 graphics library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; @@ -21878,8 +21895,8 @@ self: { }: mkDerivation { pname = "Z-Data"; - version = "0.8.7.0"; - sha256 = "0a68ymcgmack4z4zz9vb20g2jgs41ga00fc4612rq9qjywn26yxd"; + version = "0.8.8.0"; + sha256 = "01x0z7fv0nyyisc9ras79nwbys4g9d13kxwnvgdi8m9p6jvcgy8s"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq ghc-prim @@ -25000,8 +25017,8 @@ self: { }: mkDerivation { pname = "aeson-schemas"; - version = "1.3.3"; - sha256 = "1dhi4pf8ariqr5g79cnr52rxfi1ywp2sv9sazw51rgv1k4gb3492"; + version = "1.3.4"; + sha256 = "087pjsjycna4hlzn72bik4jfd8vclfyqh730zll4a2dc7l776g5x"; libraryHaskellDepends = [ aeson base first-class-families hashable megaparsec template-haskell text unordered-containers @@ -30775,8 +30792,8 @@ self: { ({ mkDerivation, base, ghc-prim, integer-gmp }: mkDerivation { pname = "aop-prelude"; - version = "0.4.1.0"; - sha256 = "1ha39yfmiw61g907h83wsjw9zyvvkzi7zbr3y9dcciv2cgnb5h6a"; + version = "0.4.1.1"; + sha256 = "0b8y58hiil7caqwn3q041r59qvm8jw2s8z8ydhs2ma7a7lrlqffm"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base ghc-prim ]; description = "prelude for Algebra of Programming"; @@ -35402,41 +35419,6 @@ self: { }) {}; "aura" = callPackage - ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring - , containers, filepath, hashable, http-client, http-client-tls - , http-types, language-bash, megaparsec, network-uri - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers - , typed-process, versions - }: - mkDerivation { - pname = "aura"; - version = "3.2.4"; - sha256 = "0d3v3kpy4acd7pyysy5dw25b4154v7jwgydipmrczfxicrf02aa0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson algebraic-graphs aur base bytestring containers filepath - hashable http-client http-types language-bash megaparsec - network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler - stm text time transformers typed-process versions - ]; - executableHaskellDepends = [ - aeson aur base bytestring containers http-client http-client-tls - megaparsec optparse-applicative prettyprinter - prettyprinter-ansi-terminal rio scheduler text transformers - typed-process versions - ]; - testHaskellDepends = [ - base bytestring containers megaparsec rio tasty tasty-hunit text - versions - ]; - description = "A secure package manager for Arch Linux and the AUR"; - license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; - }) {}; - - "aura_3_2_5" = callPackage ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring , containers, filepath, hashable, http-client, http-client-tls , http-types, language-bash, megaparsec, network-uri @@ -39560,6 +39542,8 @@ self: { pname = "bench-show"; version = "0.3.1"; sha256 = "0z1fdcdl9chwia9kd5pa9572mc5pmy5bld72axkzg20r7v53sr7k"; + revision = "1"; + editedCabalFile = "08a95i3xwy2yz549hqfwd3j0j6gbsbc62jjmpxnk43yk5dl8dk63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -39593,8 +39577,8 @@ self: { ({ mkDerivation, base, bytestring, mtl, time }: mkDerivation { pname = "benchpress"; - version = "0.2.2.16"; - sha256 = "0p8wxd7liz7ihqlqhk1l8z3hn7hc24qlf69ykxixp69jx479dkan"; + version = "0.2.2.17"; + sha256 = "17bwjhy4rrlpk7ni16nh2f1yjrjyj392g4h2z3vxrnkjxfadxx3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl time ]; @@ -42166,8 +42150,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "birds-of-paradise"; - version = "0.2.1.0"; - sha256 = "0kjwylhya86zqsmc5q6iqrbq4kp3hqxgx3kwam2pv1ls01qdsvvy"; + version = "0.2.1.1"; + sha256 = "0gn1dkycqal2xvmprq6xqz19qnpxvhwck4h8fqc8gq30nzpq143r"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Birds of Paradise"; @@ -42462,18 +42446,18 @@ self: { }) {}; "bitcoin-compact-filters" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bitstream - , bytestring, cereal, haskoin-core, memory, tasty, tasty-hunit - , tasty-quickcheck, text, transformers + ({ mkDerivation, aeson, base, bitstream, bytestring, cereal + , haskoin-core, memory, tasty, tasty-hunit, tasty-quickcheck, text + , transformers }: mkDerivation { pname = "bitcoin-compact-filters"; - version = "0.1.0.1"; - sha256 = "1ifs7yi34x5nfhy0bs9w6arz7f6kwfxl0wgl6s0iwd1z94s5ysk1"; + version = "0.1.0.2"; + sha256 = "1cay53gbm9r5wrpk0sjq086n08lns20xsqb27hgw6a2hfcj7zai2"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base base16-bytestring bitstream bytestring cereal haskoin-core - memory text transformers + base bitstream bytestring cereal haskoin-core memory text + transformers ]; testHaskellDepends = [ aeson base bytestring cereal haskoin-core tasty tasty-hunit @@ -45197,6 +45181,8 @@ self: { pname = "bounded-array"; version = "0.1.0.0"; sha256 = "0zv5a82rm6hwikgls2hw9d18igvfgw655s5pw5h1xbwcv1d8d0ji"; + revision = "2"; + editedCabalFile = "1j04il1kw0r3sy1dv3b3lffkxvnka7ic25jx174wzd0myqbr9zpr"; libraryHaskellDepends = [ array base ]; description = "Arrays with a value for every index"; license = lib.licenses.bsd3; @@ -46506,8 +46492,8 @@ self: { }: mkDerivation { pname = "bugsnag-hs"; - version = "0.2.0.3"; - sha256 = "0jxanklslf0gjw4gb01yz03p2haxmnrmr5wry451lff17azxwlg5"; + version = "0.2.0.4"; + sha256 = "1g5390vmw979gd30jx6v370kb317mvw2x9sw1z7kv44j19vv4k39"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring http-client text time unordered-containers @@ -47952,6 +47938,8 @@ self: { pname = "bzlib"; version = "0.5.1.0"; sha256 = "1n599xwyxghf52kam30k1l2qh8cg91h55c2bgchnqyj103hb7nfy"; + revision = "1"; + editedCabalFile = "0r9b9y5qlz9k8wdzb23jif9wgvxi7r652i9apwzdaq7g1l08i6ky"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ bzip2 ]; description = "Compression and decompression in the bzip2 format"; @@ -48163,8 +48151,8 @@ self: { }: mkDerivation { pname = "c2hs"; - version = "0.28.7"; - sha256 = "0ib7ayfn37krsnm710x4gxd2i88xv3djnqa737gbw93b0206l571"; + version = "0.28.8"; + sha256 = "0k482wv94jbpwd96a2c2lc7qz9k8072slx7l7943472nzk7k41ir"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -50384,29 +50372,31 @@ self: { ({ mkDerivation, base, base32, bytestring, cereal, constraints , containers, crc, directory, dlist, doctest, filepath, hex-text , leb128-cereal, megaparsec, mtl, optparse-applicative - , prettyprinter, row-types, scientific, smallcheck, split, tasty - , tasty-hunit, tasty-rerun, tasty-smallcheck, template-haskell - , text, transformers, unordered-containers, vector + , parser-combinators, prettyprinter, row-types, scientific + , smallcheck, split, tasty, tasty-hunit, tasty-quickcheck + , tasty-rerun, tasty-smallcheck, template-haskell, text + , transformers, unordered-containers, vector }: mkDerivation { pname = "candid"; - version = "0.1"; - sha256 = "0mg7h936if93wdrhnri07530rnz7mnwlz5hpj1qp4bcwknsjs3b4"; + version = "0.2"; + sha256 = "0cif618n6m9cvlcvr7hk3gnypv2vxaz1qaa63jrxakmkcr1lm028"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base32 bytestring cereal constraints containers crc dlist - hex-text leb128-cereal megaparsec mtl prettyprinter row-types - scientific split template-haskell text transformers - unordered-containers vector + hex-text leb128-cereal megaparsec mtl parser-combinators + prettyprinter row-types scientific split template-haskell text + transformers unordered-containers vector ]; executableHaskellDepends = [ base bytestring hex-text optparse-applicative prettyprinter text ]; testHaskellDepends = [ base bytestring directory doctest filepath leb128-cereal - prettyprinter row-types smallcheck tasty tasty-hunit tasty-rerun - tasty-smallcheck template-haskell text unordered-containers vector + prettyprinter row-types smallcheck tasty tasty-hunit + tasty-quickcheck tasty-rerun tasty-smallcheck template-haskell text + unordered-containers vector ]; description = "Candid integration"; license = lib.licenses.asl20; @@ -53787,32 +53777,40 @@ self: { "chessIO" = callPackage ({ mkDerivation, attoparsec, base, binary, brick, bytestring - , containers, directory, extra, file-embed, filepath, haskeline - , megaparsec, microlens, microlens-th, MonadRandom, mtl, o-clock - , optparse-applicative, parallel, prettyprinter, process, random - , rosezipper, stm, text, time, unordered-containers, vector, vty + , containers, deepseq, directory, extra, file-embed, filepath + , hashable, haskeline, lens, megaparsec, MonadRandom + , mono-traversable, mtl, o-clock, optparse-applicative, parallel + , prettyprinter, process, random, rosezipper, stm, template-haskell + , text, th-lift-instances, time, unordered-containers, vector + , vector-binary-instances, vector-instances, vty }: mkDerivation { pname = "chessIO"; - version = "0.6.1.1"; - sha256 = "0fnbbxsnfb53pcmqs8bhszbd36d44gn9wz0j029yhfh3i1fy40yy"; + version = "0.7.0.0"; + sha256 = "1jb1c702c58g0pkk43g1mp7clm0wbkq993j880v3p7cxbyj5n9bh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base binary bytestring containers extra file-embed - megaparsec MonadRandom o-clock prettyprinter process random stm - text unordered-containers vector + attoparsec base binary bytestring containers deepseq extra + file-embed hashable lens megaparsec MonadRandom mono-traversable + o-clock prettyprinter process random stm template-haskell text + th-lift-instances unordered-containers vector + vector-binary-instances vector-instances ]; executableHaskellDepends = [ - attoparsec base binary brick bytestring containers extra file-embed - filepath haskeline megaparsec microlens microlens-th MonadRandom - mtl o-clock optparse-applicative prettyprinter process random - rosezipper stm text time unordered-containers vector vty + attoparsec base binary brick bytestring containers deepseq extra + file-embed filepath hashable haskeline lens megaparsec MonadRandom + mono-traversable mtl o-clock optparse-applicative prettyprinter + process random rosezipper stm template-haskell text + th-lift-instances time unordered-containers vector + vector-binary-instances vector-instances vty ]; testHaskellDepends = [ - attoparsec base binary bytestring containers directory extra - file-embed megaparsec MonadRandom o-clock parallel prettyprinter - process random stm text time unordered-containers vector + attoparsec base binary bytestring containers deepseq directory + extra file-embed hashable lens megaparsec MonadRandom + mono-traversable o-clock parallel prettyprinter process random stm + template-haskell text th-lift-instances time unordered-containers + vector vector-binary-instances vector-instances ]; description = "Basic chess library"; license = lib.licenses.bsd3; @@ -54835,25 +54833,6 @@ self: { }) {}; "circular" = callPackage - ({ mkDerivation, aeson, base, criterion, hspec, primitive - , QuickCheck, quickcheck-instances, vector - }: - mkDerivation { - pname = "circular"; - version = "0.3.1.1"; - sha256 = "0m3hw2w9hrxz7qi4vcqfbvqck6k7rzwv49r3il0i69xkxzr1dcgk"; - libraryHaskellDepends = [ aeson base primitive vector ]; - testHaskellDepends = [ - aeson base hspec primitive QuickCheck quickcheck-instances vector - ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Circular fixed-sized mutable vectors"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "circular_0_4_0_0" = callPackage ({ mkDerivation, aeson, base, criterion, hspec, primitive , QuickCheck, quickcheck-instances, vector }: @@ -54936,32 +54915,6 @@ self: { }) {}; "citeproc" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring - , case-insensitive, containers, data-default, Diff, directory - , file-embed, filepath, mtl, pandoc-types, pretty, rfc5051, safe - , scientific, text, timeit, transformers, uniplate, vector - , xml-conduit - }: - mkDerivation { - pname = "citeproc"; - version = "0.3.0.9"; - sha256 = "0ky4j6nbn6yp3mny1m045n40jfvbr1iiylcf51hsi228y4m5za9s"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring case-insensitive containers - data-default file-embed filepath pandoc-types rfc5051 safe - scientific text transformers uniplate vector xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring containers Diff directory filepath mtl pretty - text timeit transformers - ]; - description = "Generates citations and bibliography from CSL styles"; - license = lib.licenses.bsd2; - }) {}; - - "citeproc_0_4_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, containers, data-default, Diff, directory , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific @@ -54985,7 +54938,6 @@ self: { ]; description = "Generates citations and bibliography from CSL styles"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "citeproc-hs" = callPackage @@ -56497,19 +56449,6 @@ self: { }) {}; "clock" = callPackage - ({ mkDerivation, base, criterion, tasty, tasty-quickcheck }: - mkDerivation { - pname = "clock"; - version = "0.8"; - sha256 = "0539w9bjw6xbfv9v6aq9hijszxqdnqhilwpbwpql1400ji95r8q8"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base tasty tasty-quickcheck ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "High-resolution clock functions: monotonic, realtime, cputime"; - license = lib.licenses.bsd3; - }) {}; - - "clock_0_8_2" = callPackage ({ mkDerivation, base, criterion, tasty, tasty-quickcheck }: mkDerivation { pname = "clock"; @@ -56520,7 +56459,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "High-resolution clock functions: monotonic, realtime, cputime"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "clock-extras" = callPackage @@ -57406,6 +57344,27 @@ self: { license = lib.licenses.publicDomain; }) {}; + "co-feldspar" = callPackage + ({ mkDerivation, array, base, constraints, containers + , data-default-class, exception-transformers, hardware-edsl + , imperative-edsl, language-c-quote, language-vhdl, minisat, mtl + , operational-alacarte, signals, simple-smt, srcloc, syntactic + , template-haskell + }: + mkDerivation { + pname = "co-feldspar"; + version = "0.1.0.1"; + sha256 = "03dr7vq3bn4rbafyr2i8m72am98kv2a75963403n68xwc3ifmq3z"; + libraryHaskellDepends = [ + array base constraints containers data-default-class + exception-transformers hardware-edsl imperative-edsl + language-c-quote language-vhdl minisat mtl operational-alacarte + signals simple-smt srcloc syntactic template-haskell + ]; + description = "Hardware software co-design Feldspar"; + license = lib.licenses.bsd3; + }) {}; + "co-log" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos , co-log-core, containers, contravariant, directory, filepath @@ -57648,8 +57607,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.3.2"; - sha256 = "1mmsbs9n04vcrhaizxv6z6mkd0w5gvhvrffwyfxpfg995vf19gz9"; + version = "0.3.6"; + sha256 = "01qgxzh9gnajpaqwbvk027y8q8zalxk3d9axxyq6l30mxgjjacsk"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -57794,6 +57753,34 @@ self: { broken = true; }) {}; + "codeforces-cli" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring + , bytestring, containers, cryptohash-sha512, directory, extra + , http-client, http-conduit, http-types, open-browser + , optparse-applicative, random, text, time, transformers + }: + mkDerivation { + pname = "codeforces-cli"; + version = "0.1.0"; + sha256 = "11hkmjkp3pbqn1x72yp5zi892hcnh1bq1j3f6iqhf727fblcyrn4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base16-bytestring bytestring containers + cryptohash-sha512 directory extra http-client http-conduit + http-types open-browser optparse-applicative random text time + transformers + ]; + executableHaskellDepends = [ + aeson ansi-terminal base base16-bytestring bytestring containers + cryptohash-sha512 directory extra http-client http-conduit + http-types open-browser optparse-applicative random text time + transformers + ]; + description = "Command line interface to interact with Codeforces"; + license = lib.licenses.mit; + }) {}; + "codemonitor" = callPackage ({ mkDerivation, base, cairo, containers, directory, filepath, gtk , haskell98, hinotify, MissingH, process, regex-posix, time @@ -59043,28 +59030,6 @@ self: { }) {}; "commonmark" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, parsec - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text - , transformers - }: - mkDerivation { - pname = "commonmark"; - version = "0.1.1.4"; - sha256 = "0dpm110svgdf21lf5sfbzjcfryn0v6hhjcs8kkyf167kng2sclfn"; - libraryHaskellDepends = [ - base bytestring containers parsec text transformers - ]; - testHaskellDepends = [ - base parsec QuickCheck tasty tasty-hunit tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion text transformers - ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, parsec, tasty , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers , unicode-transforms @@ -59084,7 +59049,6 @@ self: { benchmarkHaskellDepends = [ base tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-cli" = callPackage @@ -59110,30 +59074,6 @@ self: { }) {}; "commonmark-extensions" = callPackage - ({ mkDerivation, base, bytestring, commonmark, containers - , criterion, emojis, parsec, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, text, transformers - }: - mkDerivation { - pname = "commonmark-extensions"; - version = "0.2.0.4"; - sha256 = "166ywkh6vyyrrwq7ww68pwzdkwmhi23hjvw28769m010ksimz2wh"; - libraryHaskellDepends = [ - base bytestring commonmark containers emojis parsec text - transformers - ]; - testHaskellDepends = [ - base commonmark parsec QuickCheck tasty tasty-hunit - tasty-quickcheck text - ]; - benchmarkHaskellDepends = [ - base bytestring commonmark containers criterion text transformers - ]; - description = "Pure Haskell commonmark parser"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark-extensions_0_2_1_2" = callPackage ({ mkDerivation, base, commonmark, containers, emojis, filepath , network-uri, parsec, tasty, tasty-bench, tasty-hunit, text , transformers @@ -59152,25 +59092,9 @@ self: { benchmarkHaskellDepends = [ base commonmark tasty-bench text ]; description = "Pure Haskell commonmark parser"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commonmark-pandoc" = callPackage - ({ mkDerivation, base, commonmark, commonmark-extensions - , containers, pandoc-types, text - }: - mkDerivation { - pname = "commonmark-pandoc"; - version = "0.2.0.1"; - sha256 = "12s20s64qad3varxr9bxpvdzx3ajdw58ssmssj9rqqq8k2nlnqh3"; - libraryHaskellDepends = [ - base commonmark commonmark-extensions containers pandoc-types text - ]; - description = "Bridge between commonmark and pandoc AST"; - license = lib.licenses.bsd3; - }) {}; - - "commonmark-pandoc_0_2_1" = callPackage ({ mkDerivation, base, commonmark, commonmark-extensions , pandoc-types, text }: @@ -59183,7 +59107,6 @@ self: { ]; description = "Bridge between commonmark and pandoc AST"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "commsec" = callPackage @@ -63151,13 +63074,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "contra-tracer"; - version = "0.1.0.0"; - sha256 = "146g43sqa23n1qg100jvz5m1jcjfxx4rxzmc8559b6apys9ys4br"; - revision = "1"; - editedCabalFile = "1r3rnxlbvfirj4n2vwysh7zkfdwlx3x4p9yjd32hpr3vdikgpvds"; + version = "0.2.0.0"; + sha256 = "1rb2fal2rn02qnp28dsvq3r94b72jkqrp2s1lryhmrdj23jc3swy"; libraryHaskellDepends = [ base ]; description = "Arrow and contravariant tracers"; - license = lib.licenses.bsd3; + license = lib.licenses.asl20; }) {}; "contracheck-applicative" = callPackage @@ -65869,8 +65790,8 @@ self: { pname = "crypto-enigma"; version = "0.1.1.6"; sha256 = "07qxrpwg9r2w2l0d2nrvn703vzsfhchznly93bnr2pfpbwj4iv2z"; - revision = "6"; - editedCabalFile = "1zp6mx1d0dbffc046770mzl1zmwvz4h54xznmmqzbijmnmsc0y3c"; + revision = "7"; + editedCabalFile = "1i5vlza8rl6a4wz4v3l61m6x7phbv1ly0di0cf3v3amz38x828qz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers split text ]; @@ -66250,8 +66171,8 @@ self: { pname = "cryptohash-md5"; version = "0.11.100.1"; sha256 = "1y8q7s2bn4gdknw1wjikdnar2b5pgz3nv3220lxrlgpsf23x82vi"; - revision = "5"; - editedCabalFile = "1dxakry5p9dv9p9h617c0295plrfy2n5k13lsgp4gxwb6yzji9d4"; + revision = "6"; + editedCabalFile = "191nvffcrlyvr5dq99bbdxxl2qx44bla9adkhklyknf7ipqdd4yj"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring pureMD5 tasty tasty-hunit @@ -66270,8 +66191,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.100.1"; sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w"; - revision = "5"; - editedCabalFile = "1qay4qlvmwpllsqn1yd8gyraifx5ydl4chgg3dj4gzgmi36i9n0l"; + revision = "6"; + editedCabalFile = "10rpxrmqgwihmplczglwxf5q3l13z9j3kvi065z884y4dymmnkgc"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -66290,6 +66211,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.102.0"; sha256 = "0685s4hfighzywvvn05cfff5bl2xz3wq0pfncv6zca4iba3ykmla"; + revision = "1"; + editedCabalFile = "0v5ppc7r2lxbk49h1kwj4b5vyb1dw2fnppykvp5m9rm0p3vhlykr"; configureFlags = [ "-fuse-cbits" ]; isLibrary = true; isExecutable = true; @@ -66315,8 +66238,8 @@ self: { pname = "cryptohash-sha512"; version = "0.11.100.1"; sha256 = "1abi23dr3vzslkh0cx24cdn2gy88jjm4qr6rcm543ajyaywqns8h"; - revision = "5"; - editedCabalFile = "0ccvr3sp7mnllbd430l91b5ij70gg3g05nm9n6qaxzx2vaqdlyc2"; + revision = "6"; + editedCabalFile = "0q9c08qd8ssl428ifa3g30r0lp81a8afcpyv7yzqjp88ihgcnfa6"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -66419,30 +66342,6 @@ self: { }) {}; "cryptonite" = callPackage - ({ mkDerivation, base, basement, bytestring, deepseq, gauge - , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit - , tasty-kat, tasty-quickcheck - }: - mkDerivation { - pname = "cryptonite"; - version = "0.28"; - sha256 = "1nx568qv25dxhbii7lzf1hbv0dyz95z715mmxjnnrkgpwdm8ibbl"; - revision = "1"; - editedCabalFile = "0hqbpdsj1b4fgisr11a9gmin5r7bqr3f83wc2xxc18dr01xhrw7d"; - libraryHaskellDepends = [ - base basement bytestring deepseq ghc-prim integer-gmp memory - ]; - testHaskellDepends = [ - base bytestring memory tasty tasty-hunit tasty-kat tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base bytestring deepseq gauge memory random - ]; - description = "Cryptography Primitives sink"; - license = lib.licenses.bsd3; - }) {}; - - "cryptonite_0_29" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, gauge , ghc-prim, integer-gmp, memory, random, tasty, tasty-hunit , tasty-kat, tasty-quickcheck @@ -66462,7 +66361,6 @@ self: { ]; description = "Cryptography Primitives sink"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "cryptonite-conduit" = callPackage @@ -66791,15 +66689,15 @@ self: { }) {}; "css-easings" = callPackage - ({ mkDerivation, aeson, base, blaze-markup, data-default + ({ mkDerivation, aeson, base, blaze-markup, data-default, deepseq , QuickCheck, scientific, shakespeare, text }: mkDerivation { pname = "css-easings"; - version = "0.2.1.0"; - sha256 = "0mn3h7fqp4bs7rqjzc05k29man8i77dg1avcajdyysf84azklyrw"; + version = "0.2.2.0"; + sha256 = "0ks42vnvj5qffs5zwnplsrqjd9c90xxlcfgcqdhl0iw5fxxnfipj"; libraryHaskellDepends = [ - aeson base blaze-markup data-default QuickCheck scientific + aeson base blaze-markup data-default deepseq QuickCheck scientific shakespeare text ]; description = "Defining and manipulating css easing strings"; @@ -74347,8 +74245,8 @@ self: { pname = "diagrams-cairo"; version = "1.4.1.1"; sha256 = "0vyd2yr55n7x71194i18lnbcshdjpnqw4qyq7vj5zx377rsz711k"; - revision = "1"; - editedCabalFile = "1jw499gd9kni1mk3h1hyaz5gz92ly5mi7sk8b9wabxcq5hdm9p94"; + revision = "2"; + editedCabalFile = "0ngbshqmb86sc9djmgkn3zc9l69bn3kdml7ld6qx36dsyq6mafq9"; libraryHaskellDepends = [ array base bytestring cairo colour containers data-default-class diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl @@ -74391,8 +74289,8 @@ self: { pname = "diagrams-contrib"; version = "1.4.4"; sha256 = "043jpr7lqg708lzmv6cqys7312lfdwnf8ijcnpl4jkbvcwl87c1m"; - revision = "1"; - editedCabalFile = "01m59vs4lagsyqcs3p4472i5b28n2jsr7naj30azrm8s197frbsl"; + revision = "2"; + editedCabalFile = "1mkpq356z7b2q6ifa4f1k7whsmhgn3hww8scacca0q2wnc8p4xjg"; libraryHaskellDepends = [ base circle-packing colour containers cubicbezier data-default data-default-class diagrams-core diagrams-lib diagrams-solve @@ -78184,8 +78082,8 @@ self: { }: mkDerivation { pname = "doctest"; - version = "0.16.3"; - sha256 = "1y1l7aa80qkib1z8lsizgg7fpfdmdwhxvi5m255a42jdkjgn5sfg"; + version = "0.17"; + sha256 = "0f0knggq6yjcznyri35fll619q5jr8vcsbiyvdiz4prkawhaa4pz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -78287,8 +78185,8 @@ self: { ({ mkDerivation, base, doctest }: mkDerivation { pname = "doctest-driver-gen"; - version = "0.3.0.3"; - sha256 = "0vb062mznjpksrbsf2v599slgnm5jr6dq1frbxii19mcqxjbnzrj"; + version = "0.3.0.4"; + sha256 = "1fbqi4s4ajxhyv4a7nbh3v98limla0z8rfqlh02pwc1a90qpwy1a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -80610,6 +80508,32 @@ self: { broken = true; }) {}; + "dynamic-pipeline" = callPackage + ({ mkDerivation, async, base, bytestring, HList, hspec + , hspec-discover, lens, optparse-applicative, QuickCheck, relude + , trifecta, unagi-chan + }: + mkDerivation { + pname = "dynamic-pipeline"; + version = "0.1.0.5"; + sha256 = "0smj2fk7dj0kxfgs00n52bpkvrb4yx0h2bkwabjkag96a867f9gr"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring HList lens relude unagi-chan + ]; + executableHaskellDepends = [ + async base bytestring HList lens optparse-applicative relude + trifecta unagi-chan + ]; + testHaskellDepends = [ + async base bytestring HList hspec lens QuickCheck relude unagi-chan + ]; + testToolDepends = [ hspec-discover ]; + description = "Library Type Safe implementation of Dynamic Pipeline Paradigm (DPP)"; + license = lib.licenses.bsd3; + }) {}; + "dynamic-plot" = callPackage ({ mkDerivation, base, colour, colour-space, constrained-categories , containers, data-default, deepseq, diagrams-cairo, diagrams-core @@ -81694,6 +81618,31 @@ self: { broken = true; }) {}; + "effectful" = callPackage + ({ mkDerivation, base, containers, exceptions, freer-simple + , fused-effects, ghc-prim, lifted-async, lifted-base, monad-control + , mtl, polysemy, primitive, resourcet, tasty, tasty-bench + , tasty-hunit, transformers, transformers-base, unliftio + , unliftio-core + }: + mkDerivation { + pname = "effectful"; + version = "0.0.0.0"; + sha256 = "1k0cfryskdgqldsf7pan42bq6zc7n5xmm2j00sizdlxd0ssd9axd"; + libraryHaskellDepends = [ + base containers exceptions ghc-prim monad-control primitive + resourcet transformers transformers-base unliftio-core + ]; + testHaskellDepends = [ + base exceptions lifted-async lifted-base tasty tasty-hunit unliftio + ]; + benchmarkHaskellDepends = [ + base freer-simple fused-effects mtl polysemy tasty-bench + ]; + description = "A simple, yet powerful extensible effects library"; + license = lib.licenses.bsd3; + }) {}; + "effective-aspects" = callPackage ({ mkDerivation, base, Cabal, ghc-prim, hashtables, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -83098,8 +83047,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.5.0.2"; - sha256 = "1hky4amw78ciblr6alcxp79dshsc5wqswp16hbqdry132xps9dw3"; + version = "0.5.1.1"; + sha256 = "1jh46yy7i45bym0cgvj4nik0a7yv82grncfmn3dk4rr70r9wvdwa"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83109,24 +83058,6 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "elynx_0_5_1_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, elynx-tools - , optparse-applicative, slynx, tlynx - }: - mkDerivation { - pname = "elynx"; - version = "0.5.1.0"; - sha256 = "05i3g1c7kdnji46y17215nv9vk21w3zi26z1ngqa8dnfswfx1d0i"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring elynx-tools optparse-applicative slynx tlynx - ]; - description = "Validate and (optionally) redo ELynx analyses"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - }) {}; - "elynx-markov" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, containers , elynx-seq, elynx-tools, hmatrix, hspec, integration @@ -83134,8 +83065,8 @@ self: { }: mkDerivation { pname = "elynx-markov"; - version = "0.5.0.2"; - sha256 = "0wlcq3q26lgwixhsq1afz9i3phr2sncwc0r6m4adminh9m1zdr5z"; + version = "0.5.1.1"; + sha256 = "0j2xg8iszkf3m1xlmrkm6mq3mqnfnc11pbar288r5alva7ssl1vb"; libraryHaskellDepends = [ async attoparsec base bytestring containers elynx-seq hmatrix integration math-functions mwc-random primitive statistics vector @@ -83148,53 +83079,18 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "elynx-markov_0_5_1_0" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring, containers - , elynx-seq, elynx-tools, hmatrix, hspec, integration - , math-functions, mwc-random, primitive, statistics, vector - }: - mkDerivation { - pname = "elynx-markov"; - version = "0.5.1.0"; - sha256 = "1wpq62in9zlap01an6swdf9n1x2pall1vfh4hw5r7zpn7vik1mfx"; - libraryHaskellDepends = [ - async attoparsec base bytestring containers elynx-seq hmatrix - integration math-functions mwc-random primitive statistics vector - ]; - testHaskellDepends = [ - base containers elynx-tools hmatrix hspec mwc-random vector - ]; - benchmarkHaskellDepends = [ base ]; - description = "Simulate molecular sequences along trees"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - }) {}; - "elynx-nexus" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.5.0.2"; - sha256 = "1y7ndj216w58s85bfgp4vg7zi1asj6br68k000hy4a8cchjprlp9"; + version = "0.5.1.1"; + sha256 = "1p5x2in4r63amb9ifrxdqb3b9bjrxy97gwij0p3hsh9h8p7wsijg"; libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; license = lib.licenses.gpl3Plus; }) {}; - "elynx-nexus_0_5_1_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hspec }: - mkDerivation { - pname = "elynx-nexus"; - version = "0.5.1.0"; - sha256 = "0inl9bw7793zbji42gasj4vckigzmr1l4yqf66f9ss958pmgh5n9"; - libraryHaskellDepends = [ attoparsec base bytestring ]; - testHaskellDepends = [ base hspec ]; - description = "Import and export Nexus files"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - }) {}; - "elynx-seq" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , elynx-tools, hspec, matrices, mwc-random, parallel, primitive @@ -83202,8 +83098,8 @@ self: { }: mkDerivation { pname = "elynx-seq"; - version = "0.5.0.2"; - sha256 = "11nl8gw05gvd6j7dflqzi21kixmm0jalpqv9x9f6bb7qwdv1xak2"; + version = "0.5.1.1"; + sha256 = "0cjm8i44i8zqkh7x5rwf0g45fji6k6mq6h47hiphybax6a16zaxb"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers matrices mwc-random parallel primitive vector vector-th-unbox word8 @@ -83215,50 +83111,7 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "elynx-seq_0_5_1_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, containers - , elynx-tools, hspec, matrices, mwc-random, parallel, primitive - , vector, vector-th-unbox, word8 - }: - mkDerivation { - pname = "elynx-seq"; - version = "0.5.1.0"; - sha256 = "069fj6ap0yj5bn2r3d5bk85dy02r3fr8prd5hvky6l5gxvpvzcm0"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring containers matrices mwc-random - parallel primitive vector vector-th-unbox word8 - ]; - testHaskellDepends = [ - base bytestring elynx-tools hspec matrices vector - ]; - description = "Handle molecular sequences"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - }) {}; - "elynx-tools" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, cryptohash-sha256, deepseq, directory, fast-logger - , hmatrix, monad-control, monad-logger, mwc-random - , optparse-applicative, primitive, template-haskell, text, time - , transformers, transformers-base, vector, zlib - }: - mkDerivation { - pname = "elynx-tools"; - version = "0.5.0.2"; - sha256 = "1q62f0b0fk6g2a4w5bbbpldv0awk7cn2q544xcxplanpr3fmaj8v"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring - cryptohash-sha256 deepseq directory fast-logger hmatrix - monad-control monad-logger mwc-random optparse-applicative - primitive template-haskell text time transformers transformers-base - vector zlib - ]; - description = "Tools for ELynx"; - license = lib.licenses.gpl3Plus; - }) {}; - - "elynx-tools_0_5_1_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, cryptohash-sha256, deepseq, directory, hmatrix , monad-control, monad-logger, mwc-random, optparse-applicative @@ -83267,8 +83120,8 @@ self: { }: mkDerivation { pname = "elynx-tools"; - version = "0.5.1.0"; - sha256 = "0djfxqxc5aivvljzi7c8xabi7k23y7gnk5wqmdvw4riqpsc7by0y"; + version = "0.5.1.1"; + sha256 = "16cw9afpnczwrqhgyzy3vc7c6b9zx88ja94h34k2gi3960rfxf53"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring cryptohash-sha256 deepseq directory hmatrix monad-control @@ -83278,7 +83131,6 @@ self: { ]; description = "Tools for ELynx"; license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; }) {}; "elynx-tree" = callPackage @@ -83289,8 +83141,8 @@ self: { }: mkDerivation { pname = "elynx-tree"; - version = "0.5.0.2"; - sha256 = "1ywqbc80hq4dprzrrq9gyi7h2624i2mgpd43pv045dldh7dqhygn"; + version = "0.5.1.1"; + sha256 = "0wjhj48jbyjvmydsa9wcppzlambm2r5pmd5wjfjn0k7s5sc3zf5k"; libraryHaskellDepends = [ aeson attoparsec base bytestring comonad containers deepseq double-conversion elynx-nexus math-functions mwc-random parallel @@ -83306,32 +83158,6 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "elynx-tree_0_5_1_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad - , containers, criterion, deepseq, double-conversion, elynx-nexus - , elynx-tools, hspec, math-functions, microlens, mwc-random - , parallel, primitive, QuickCheck, statistics - }: - mkDerivation { - pname = "elynx-tree"; - version = "0.5.1.0"; - sha256 = "117my1fv16yw51qf0aa7mi6311d98jfmpvpsivwxyayhwi55g2q6"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring comonad containers deepseq - double-conversion elynx-nexus math-functions mwc-random parallel - primitive statistics - ]; - testHaskellDepends = [ - attoparsec base bytestring containers elynx-tools hspec QuickCheck - ]; - benchmarkHaskellDepends = [ - base criterion elynx-tools microlens mwc-random parallel - ]; - description = "Handle phylogenetic trees"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - }) {}; - "ema" = callPackage ({ mkDerivation, aeson, async, base, blaze-html, blaze-markup , commonmark, commonmark-extensions, commonmark-pandoc, containers @@ -85394,6 +85220,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "esqueleto_3_5_1_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring + , conduit, containers, exceptions, hspec, hspec-core, monad-logger + , mtl, mysql, mysql-simple, persistent, persistent-mysql + , persistent-postgresql, persistent-sqlite, postgresql-simple + , QuickCheck, resourcet, tagged, text, time, transformers, unliftio + , unordered-containers + }: + mkDerivation { + pname = "esqueleto"; + version = "3.5.1.0"; + sha256 = "1r77lym11gh53059b3hg5wyzb4ymaynk5awrmzgnwfkmx041sqp8"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + monad-logger persistent resourcet tagged text time transformers + unliftio unordered-containers + ]; + testHaskellDepends = [ + aeson attoparsec base blaze-html bytestring conduit containers + exceptions hspec hspec-core monad-logger mtl mysql mysql-simple + persistent persistent-mysql persistent-postgresql persistent-sqlite + postgresql-simple QuickCheck resourcet tagged text time + transformers unliftio unordered-containers + ]; + description = "Type-safe EDSL for SQL queries on persistent backends"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ess" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -88165,8 +88020,8 @@ self: { }: mkDerivation { pname = "extrapolate"; - version = "0.4.4"; - sha256 = "0indkjjahlh1isnal93w3iliy59azgdmi9lmdqz4jkbpd421zava"; + version = "0.4.6"; + sha256 = "0452b377ar95jshb5qdjcyxx54r707rxyxq0xkha55zxffp0dxq4"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -88636,8 +88491,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.3.0"; - sha256 = "1igarcl4cvipndg9rhg4lpcrl09mbfkpqcp3prr14izclcldr47y"; + version = "1.0.3.1"; + sha256 = "0af9wsx3fl701an3bsp7daxa4hxv7pdj16y7cypj3cvdwav5wdsg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88656,7 +88511,7 @@ self: { broken = true; }) {}; - "faktory_1_0_3_1" = callPackage + "faktory_1_1_0_0" = callPackage ({ mkDerivation, aeson, aeson-casing, async, base, bytestring , connection, cryptonite, errors, hspec, markdown-unlit, megaparsec , memory, mtl, network, random, safe-exceptions, scanner @@ -88664,8 +88519,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.3.1"; - sha256 = "0af9wsx3fl701an3bsp7daxa4hxv7pdj16y7cypj3cvdwav5wdsg"; + version = "1.1.0.0"; + sha256 = "0bxwrrypkwhq7whaj79dkibad022bdxd8r5vh1dnd4aka3bdk8mj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88675,7 +88530,7 @@ self: { ]; executableHaskellDepends = [ aeson base safe-exceptions ]; testHaskellDepends = [ - aeson async base hspec markdown-unlit time + aeson async base hspec markdown-unlit mtl time ]; testToolDepends = [ markdown-unlit ]; description = "Faktory Worker for Haskell"; @@ -93986,8 +93841,8 @@ self: { pname = "force-layout"; version = "0.4.0.6"; sha256 = "17956k3mab2xhrmfy7fj5gh08h43yjlsryi5acjhnkmin5arhwpp"; - revision = "6"; - editedCabalFile = "0vhb3ysfi483zfp351ywjc6cg1ihz44wq137zbrkrkigxa3qhg8f"; + revision = "7"; + editedCabalFile = "07508rqcarhrw4i22sszr4mplxk8m61g0c3rm273ga89bajf9nja"; libraryHaskellDepends = [ base containers data-default-class lens linear ]; @@ -94282,24 +94137,6 @@ self: { }) {}; "formatting" = callPackage - ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec - , integer-gmp, old-locale, scientific, semigroups, text, time - , transformers - }: - mkDerivation { - pname = "formatting"; - version = "6.3.7"; - sha256 = "06jwb1pmh15f2b9dfplm64y9yszazg26m4h7rl4dn4inqg14znqc"; - libraryHaskellDepends = [ - array base bytestring clock ghc-prim integer-gmp old-locale - scientific semigroups text time transformers - ]; - testHaskellDepends = [ base hspec semigroups text ]; - description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; - license = lib.licenses.bsd3; - }) {}; - - "formatting_7_1_2" = callPackage ({ mkDerivation, base, clock, criterion, double-conversion , ghc-prim, hspec, old-locale, QuickCheck, scientific, text, time , transformers @@ -94318,7 +94155,6 @@ self: { ]; description = "Combinator-based type-safe formatting (like printf() or FORMAT)"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "forml" = callPackage @@ -97323,6 +97159,22 @@ self: { license = lib.licenses.isc; }) {}; + "futhark-server" = callPackage + ({ mkDerivation, base, binary, bytestring, directory, futhark-data + , mtl, process, temporary, text + }: + mkDerivation { + pname = "futhark-server"; + version = "1.0.0.0"; + sha256 = "00b0qblbx6sg6nk15zasbhbw9i63dmmpcsqdkqvxskr31qzj6vaa"; + libraryHaskellDepends = [ + base binary bytestring directory futhark-data mtl process temporary + text + ]; + description = "Client implementation of the Futhark server protocol"; + license = lib.licenses.isc; + }) {}; + "futhask" = callPackage ({ mkDerivation, base, directory, raw-strings-qq, split }: mkDerivation { @@ -98938,25 +98790,6 @@ self: { }) {}; "generic-deriving" = callPackage - ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover - , template-haskell, th-abstraction - }: - mkDerivation { - pname = "generic-deriving"; - version = "1.13.1"; - sha256 = "1glsl15dc40wn1r851bray6i450g82xa2n0q53p1i3p5x903mdg9"; - revision = "1"; - editedCabalFile = "1278ipm12h6xhz8mwam065kj62wiw11d3amc6iifx0qzyxiyg5cm"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell th-abstraction - ]; - testHaskellDepends = [ base hspec template-haskell ]; - testToolDepends = [ hspec-discover ]; - description = "Generic programming library for generalised deriving"; - license = lib.licenses.bsd3; - }) {}; - - "generic-deriving_1_14" = callPackage ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover , template-haskell, th-abstraction }: @@ -98973,7 +98806,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Generic programming library for generalised deriving"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "generic-enum" = callPackage @@ -99154,6 +98986,8 @@ self: { pname = "generic-monoid"; version = "0.1.0.1"; sha256 = "1pradfv1i2z73f3vxx78ahmfsdszcgi44kn29aww2hdgf2np5l6g"; + revision = "1"; + editedCabalFile = "17dfarnbv6si8rgajb3jqsbc4k1nxmvga2h1lhmpnq43n2fdkqkq"; libraryHaskellDepends = [ base ]; description = "Derive monoid instances for product types"; license = lib.licenses.bsd3; @@ -99611,6 +99445,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "geniplate-mirror_0_7_8" = callPackage + ({ mkDerivation, base, mtl, template-haskell }: + mkDerivation { + pname = "geniplate-mirror"; + version = "0.7.8"; + sha256 = "1kw4q7l556sfd82r2p0z3cv4sg8kcr45wb4s2sy996bs3ymn8fjb"; + libraryHaskellDepends = [ base mtl template-haskell ]; + description = "Use Template Haskell to generate Uniplate-like functions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "geniserver" = callPackage ({ mkDerivation, base, bytestring, cmdargs, GenI, http-types, json , snap-core, snap-server, text, transformers, utf8-string @@ -100475,6 +100321,21 @@ self: { broken = true; }) {}; + "geomancy" = callPackage + ({ mkDerivation, base, criterion, deepseq, hedgehog, linear }: + mkDerivation { + pname = "geomancy"; + version = "0.2.2.3"; + sha256 = "17xg6cxyl83dxlb1yv85cnavw8cgqj3mbr1v9sa46fawb4mlv9i8"; + revision = "1"; + editedCabalFile = "06cfw1jf1380cxqc5ywj768svym7nm0rmrglhjkfz6p29arc6hwr"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base deepseq hedgehog linear ]; + benchmarkHaskellDepends = [ base criterion deepseq linear ]; + description = "Geometry and matrix manipulation"; + license = lib.licenses.bsd3; + }) {}; + "geos" = callPackage ({ mkDerivation, base, bytestring, cassava, geos, hspec, mtl , transformers, vector @@ -100769,8 +100630,8 @@ self: { }: mkDerivation { pname = "ghc-check"; - version = "0.5.0.4"; - sha256 = "05yrj2xm3b44h2c5r5qxsfwm1v89zhv0l30wdcc6439hd94w1w8q"; + version = "0.5.0.5"; + sha256 = "0ml5v9r729i24dwj54fh8fqr55xbndc7wpbkzaids4r666hsjlsi"; libraryHaskellDepends = [ base containers directory filepath ghc ghc-paths process safe-exceptions template-haskell th-compat transformers @@ -100876,6 +100737,94 @@ self: { broken = true; }) {}; + "ghc-debug-brick" = callPackage + ({ mkDerivation, base, brick, containers, cursor, directory + , filepath, ghc-debug-client, ghc-debug-common + , ghc-debug-convention, microlens, microlens-platform, text, time + , unordered-containers, vty + }: + mkDerivation { + pname = "ghc-debug-brick"; + version = "0.1.0.0"; + sha256 = "1gndynk42ln3hp0lg1y4rjzz6kmgp68lw077dj4zbbsam9skfgs0"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base brick containers cursor directory filepath ghc-debug-client + ghc-debug-common ghc-debug-convention microlens microlens-platform + text time unordered-containers vty + ]; + description = "A simple TUI using ghc-debug"; + license = lib.licenses.bsd3; + }) {}; + + "ghc-debug-client" = callPackage + ({ mkDerivation, async, base, binary, bitwise, containers + , directory, dom-lt, eventlog2html, filepath, ghc-debug-common + , ghc-debug-convention, ghc-prim, hashable, haxl, language-dot + , monoidal-containers, mtl, network, process, psqueues, stm, text + , unordered-containers + }: + mkDerivation { + pname = "ghc-debug-client"; + version = "0.1.0.0"; + sha256 = "1sl0xa7dhgnqprmi6sfbxzxz9m0vkni262s1ks09dkqs52bv68sx"; + libraryHaskellDepends = [ + async base binary bitwise containers directory dom-lt eventlog2html + filepath ghc-debug-common ghc-debug-convention ghc-prim hashable + haxl language-dot monoidal-containers mtl network process psqueues + stm text unordered-containers + ]; + description = "Useful functions for writing heap analysis tools which use ghc-debug"; + license = lib.licenses.bsd3; + }) {}; + + "ghc-debug-common" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers, cpu + , deepseq, directory, dom-lt, filepath, ghc-debug-convention + , ghc-heap, hashable, transformers, unordered-containers + }: + mkDerivation { + pname = "ghc-debug-common"; + version = "0.1.0.0"; + sha256 = "088ir70k1ssyri4w76si0bn186lq08hzdfhdr09bmx80dmyp5vzy"; + libraryHaskellDepends = [ + array base binary bytestring containers cpu deepseq directory + dom-lt filepath ghc-debug-convention ghc-heap hashable transformers + unordered-containers + ]; + description = "Connect to a socket created by ghc-debug-stub and analyse the heap of the debuggee program"; + license = lib.licenses.bsd3; + }) {}; + + "ghc-debug-convention" = callPackage + ({ mkDerivation, base, directory, filepath }: + mkDerivation { + pname = "ghc-debug-convention"; + version = "0.1.0.0"; + sha256 = "1cgsilxnz4dmx3y27qysyhf3jhsvj402wb0f50l30kqmlr0cp1hj"; + libraryHaskellDepends = [ base directory filepath ]; + description = "Definitions needed by ghc-debug-stub and ghc-debug-common"; + license = lib.licenses.bsd3; + }) {}; + + "ghc-debug-stub" = callPackage + ({ mkDerivation, base, directory, filepath, ghc-debug-convention + , ghc-prim + }: + mkDerivation { + pname = "ghc-debug-stub"; + version = "0.1.0.0"; + sha256 = "1gwp2hq3pxp9d4m4l30iwxlkd5ha9wk9mlhnlppiha09vdccd04r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath ghc-debug-convention ghc-prim + ]; + description = "Functions for instrumenting your application so the heap can be analysed with ghc-debug-common"; + license = lib.licenses.bsd3; + }) {}; + "ghc-dump-core" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, ghc , serialise, text @@ -101856,6 +101805,18 @@ self: { license = lib.licenses.bsd2; }) {}; + "ghc-tcplugins-extra_0_4_2" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-tcplugins-extra"; + version = "0.4.2"; + sha256 = "1gddqcczb8ixmrlfbfb06dc470jsjhvsxx3q2nsd4mcx2x6jdk08"; + libraryHaskellDepends = [ base ghc ]; + description = "Utilities for writing GHC type-checker plugins"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-time-alloc-prof" = callPackage ({ mkDerivation, attoparsec, base, containers, directory, filepath , process, tasty, tasty-hunit, temporary, text, time @@ -101923,6 +101884,30 @@ self: { license = lib.licenses.bsd2; }) {}; + "ghc-typelits-extra_0_4_3" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-prim + , ghc-tcplugins-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit + , transformers + }: + mkDerivation { + pname = "ghc-typelits-extra"; + version = "0.4.3"; + sha256 = "06g40q0n2d10c2zksx5rrjkvm5ywi3rh41hbiwy4zs28x9idsv18"; + libraryHaskellDepends = [ + base containers ghc ghc-prim ghc-tcplugins-extra + ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp + transformers + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat ghc-typelits-natnormalise tasty + tasty-hunit + ]; + description = "Additional type-level operations on GHC.TypeLits.Nat"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-typelits-knownnat" = callPackage ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck @@ -101943,6 +101928,27 @@ self: { license = lib.licenses.bsd2; }) {}; + "ghc-typelits-knownnat_0_7_6" = callPackage + ({ mkDerivation, base, ghc, ghc-prim, ghc-tcplugins-extra + , ghc-typelits-natnormalise, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-knownnat"; + version = "0.7.6"; + sha256 = "10m4y0hf25w2i40464pz85lqs5dr8cznl191icnibc5fjynyzd9v"; + libraryHaskellDepends = [ + base ghc ghc-prim ghc-tcplugins-extra ghc-typelits-natnormalise + template-haskell transformers + ]; + testHaskellDepends = [ + base ghc-typelits-natnormalise tasty tasty-hunit tasty-quickcheck + ]; + description = "Derive KnownNat constraints from other KnownNat constraints"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra , integer-gmp, tasty, tasty-hunit, template-haskell, transformers @@ -101959,6 +101965,23 @@ self: { license = lib.licenses.bsd2; }) {}; + "ghc-typelits-natnormalise_0_7_5" = callPackage + ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra + , integer-gmp, tasty, tasty-hunit, template-haskell, transformers + }: + mkDerivation { + pname = "ghc-typelits-natnormalise"; + version = "0.7.5"; + sha256 = "00mngiaqdshc14l71p1xpv6cxqngh51snbpxmmvnv6h0p87hl9wg"; + libraryHaskellDepends = [ + base containers ghc ghc-tcplugins-extra integer-gmp transformers + ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; + description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-typelits-presburger" = callPackage ({ mkDerivation, base, containers, equational-reasoning, ghc , ghc-tcplugins-extra, mtl, pretty, reflection, syb, tasty @@ -102293,19 +102316,19 @@ self: { maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "ghcide_1_3_0_0" = callPackage + "ghcide_1_4_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, binary, bytestring, bytestring-encoding , case-insensitive, containers, cryptohash-sha1, data-default , deepseq, dependent-map, dependent-sum, Diff, directory, dlist - , extra, filepath, fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th - , ghc-check, ghc-exactprint, ghc-paths, ghc-trace-events - , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable - , heapsize, hie-bios, hie-compat, hiedb, hls-graph, hls-plugin-api - , hp2pretty, hslogger, implicit-hie, implicit-hie-cradle, lens, lsp - , lsp-test, lsp-types, mtl, network-uri, opentelemetry - , optparse-applicative, parallel, prettyprinter - , prettyprinter-ansi-terminal, process, QuickCheck + , extra, filepath, fingertree, fuzzy, ghc, ghc-api-compat, ghc-boot + , ghc-boot-th, ghc-check, ghc-exactprint, ghc-paths + , ghc-trace-events, ghc-typelits-knownnat, gitrev, Glob + , haddock-library, hashable, heapsize, hie-bios, hie-compat, hiedb + , hls-graph, hls-plugin-api, hp2pretty, hslogger, implicit-hie + , implicit-hie-cradle, lens, lsp, lsp-test, lsp-types, mtl + , network-uri, opentelemetry, optparse-applicative, parallel + , prettyprinter, prettyprinter-ansi-terminal, process, QuickCheck , quickcheck-instances, record-dot-preprocessor, record-hasfield , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions , shake, shake-bench, sorted-list, sqlite-simple, stm, syb, tasty @@ -102315,17 +102338,17 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "1.3.0.0"; - sha256 = "1rmgrf4is669k5h5hbc9ryp2fc26fcacikzccjyg47jsc967ls9i"; + version = "1.4.0.1"; + sha256 = "1km28k8mx12mhaq1v2aqd5iaygdh94sjjz9hhz3ksb91059y0m39"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson array async base base16-bytestring binary bytestring bytestring-encoding case-insensitive containers cryptohash-sha1 data-default deepseq dependent-map dependent-sum Diff directory - dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th - ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob - haddock-library hashable heapsize hie-bios hie-compat hiedb + dlist extra filepath fingertree fuzzy ghc ghc-api-compat ghc-boot + ghc-boot-th ghc-check ghc-exactprint ghc-paths ghc-trace-events + Glob haddock-library hashable heapsize hie-bios hie-compat hiedb hls-graph hls-plugin-api hslogger implicit-hie-cradle lens lsp lsp-types mtl network-uri opentelemetry optparse-applicative parallel prettyprinter prettyprinter-ansi-terminal regex-tdfa @@ -102750,25 +102773,6 @@ self: { }) {}; "gi-atk" = callPackage - ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers - }: - mkDerivation { - pname = "gi-atk"; - version = "2.0.22"; - sha256 = "1jx0wy3a0vzclqpysks3nllvm2163svll1iakh3ar7njba7ihq2x"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ atk ]; - description = "Atk bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) atk;}; - - "gi-atk_2_0_23" = callPackage ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , text, transformers @@ -102785,33 +102789,9 @@ self: { libraryPkgconfigDepends = [ atk ]; description = "Atk bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-cairo"; - version = "1.0.24"; - sha256 = "1g8dvfhsncigi4xrdydp8bxjrcajk1794xb24wpvqpnnbmmykpwk"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ cairo ]; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - description = "Cairo bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) cairo;}; - - "gi-cairo_1_0_25" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers @@ -102832,7 +102812,6 @@ self: { ''; description = "Cairo bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) cairo;}; "gi-cairo-again" = callPackage @@ -102884,28 +102863,6 @@ self: { }) {inherit (pkgs) cairo;}; "gi-dbusmenu" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , libdbusmenu, text, transformers - }: - mkDerivation { - pname = "gi-dbusmenu"; - version = "0.4.8"; - sha256 = "15nvfap39ayw34282br4rch1aias0m1sbapc0nkla8h5ip2naqi6"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libdbusmenu ]; - description = "Dbusmenu bindings"; - license = lib.licenses.lgpl21Only; - platforms = [ - "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" - ]; - }) {inherit (pkgs) libdbusmenu;}; - - "gi-dbusmenu_0_4_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , libdbusmenu, text, transformers @@ -102925,37 +102882,9 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenugtk3" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk - , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading - , libdbusmenu-gtk3, text, transformers - }: - mkDerivation { - pname = "gi-dbusmenugtk3"; - version = "0.4.9"; - sha256 = "1cni5368ldyblwh0jr6wva8fhi3574d258xzw49prwbjxngmjiv0"; - setupHaskellDepends = [ - base Cabal gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf gi-glib - gi-gobject gi-gtk haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf - gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; - description = "DbusmenuGtk bindings"; - license = lib.licenses.lgpl21Only; - platforms = [ - "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" - ]; - }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; - - "gi-dbusmenugtk3_0_4_10" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk , gtk3, haskell-gi, haskell-gi-base, haskell-gi-overloading @@ -102980,34 +102909,9 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-gdk"; - version = "3.0.23"; - sha256 = "18v3kb6kmryymmrz0d88nf25priwyh3yzh7raghc5ph2rv7n4w8m"; - setupHaskellDepends = [ - base Cabal gi-cairo gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango - haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib - gi-gobject gi-pango haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gtk3 ]; - description = "Gdk bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) gtk3;}; - - "gi-gdk_3_0_24" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -103029,7 +102933,6 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gdk bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk3;}; "gi-gdk_4_0_3" = callPackage @@ -103058,27 +102961,6 @@ self: { }) {inherit (pkgs) gtk4;}; "gi-gdkpixbuf" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf - , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gdkpixbuf"; - version = "2.0.24"; - sha256 = "00hgfyln0pqx4fmffc24mx818y1lladfc288qq0f03345p5dnbna"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gdk-pixbuf ]; - description = "GdkPixbuf bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) gdk-pixbuf;}; - - "gi-gdkpixbuf_2_0_26" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf , gi-gio, gi-glib, gi-gmodule, gi-gobject, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers @@ -103097,32 +102979,9 @@ self: { libraryPkgconfigDepends = [ gdk-pixbuf ]; description = "GdkPixbuf bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gdk-pixbuf;}; "gi-gdkx11" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo - , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gdkx11"; - version = "3.0.10"; - sha256 = "0kfn4l5jqhllz514zw5cxf7181ybb5c11r680nwhr99b97yy0q9f"; - setupHaskellDepends = [ - base Cabal gi-cairo gi-gdk gi-gio gi-gobject gi-xlib haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject - gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text - transformers - ]; - libraryPkgconfigDepends = [ gtk3 ]; - description = "GdkX11 bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) gtk3;}; - - "gi-gdkx11_3_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers @@ -103142,7 +103001,6 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "GdkX11 bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk3;}; "gi-gdkx11_4_0_3" = callPackage @@ -103193,25 +103051,6 @@ self: { }) {inherit (pkgs) libgit2-glib;}; "gi-gio" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, glib, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gio"; - version = "2.0.27"; - sha256 = "08qc0ahj0qmmibf92m48hv8q2x47q83c6j9a49h11dyc8l4nclx6"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "Gio bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib;}; - - "gi-gio_2_0_28" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, glib, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers @@ -103228,7 +103067,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Gio bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-girepository" = callPackage @@ -103251,25 +103089,6 @@ self: { }) {inherit (pkgs) gobject-introspection;}; "gi-glib" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, glib - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-glib"; - version = "2.0.24"; - sha256 = "0zrajclbjbq6d6pyvz3s0kjq997w7j8nghi3i89l8fjw16gbmjxn"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "GLib bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib;}; - - "gi-glib_2_0_25" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers @@ -103286,7 +103105,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "GLib bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-gmodule" = callPackage @@ -103309,25 +103127,6 @@ self: { }) {gmodule = null;}; "gi-gobject" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib - , haskell-gi, haskell-gi-base, haskell-gi-overloading, text - , transformers - }: - mkDerivation { - pname = "gi-gobject"; - version = "2.0.25"; - sha256 = "0yz80wcxhy1mm441507qsj2f7380l2iwh4s1miwpd8kb5m147n9w"; - setupHaskellDepends = [ base Cabal gi-glib haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ glib ]; - description = "GObject bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib;}; - - "gi-gobject_2_0_26" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text , transformers @@ -103344,31 +103143,9 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "GObject bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; "gi-graphene" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-graphene"; - version = "1.0.2"; - sha256 = "1mszvx58mdazy8202s0c05hp800b92n21g4rxwvp5k0ms7qz95nq"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ graphene-gobject ]; - description = "Graphene bindings"; - license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {graphene-gobject = null;}; - - "gi-graphene_1_0_3" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, graphene-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, text, transformers @@ -103545,30 +103322,6 @@ self: { }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject - , gi-pango, gtk3, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-gtk"; - version = "3.0.36"; - sha256 = "0bzb3xrax5k5r5fd6vv4by6hprmk77qrqr9mqn3dxqm6an8jwjn9"; - setupHaskellDepends = [ - base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib - gi-gobject gi-pango haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ gtk3 ]; - description = "Gtk bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) gtk3;}; - - "gi-gtk_3_0_37" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-pango, gtk3, haskell-gi, haskell-gi-base @@ -103590,7 +103343,6 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "Gtk bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) gtk3;}; "gi-gtk_4_0_4" = callPackage @@ -103664,23 +103416,6 @@ self: { }) {}; "gi-gtk-hs" = callPackage - ({ mkDerivation, base, base-compat, containers, gi-gdk - , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl - , text, transformers - }: - mkDerivation { - pname = "gi-gtk-hs"; - version = "0.3.9"; - sha256 = "1ql14ripivfh1w65wnr6mw64f2vlwi54gz70c8qql9f5szbnjky1"; - libraryHaskellDepends = [ - base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject - gi-gtk haskell-gi-base mtl text transformers - ]; - description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; - license = lib.licenses.lgpl21Only; - }) {}; - - "gi-gtk-hs_0_3_10" = callPackage ({ mkDerivation, base, base-compat, containers, gi-gdk , gi-gdkpixbuf, gi-glib, gi-gobject, gi-gtk, haskell-gi-base, mtl , text, transformers @@ -103695,7 +103430,6 @@ self: { ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {}; "gi-gtkosxapplication" = callPackage @@ -103798,25 +103532,6 @@ self: { }) {inherit (pkgs) libhandy;}; "gi-harfbuzz" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, harfbuzz, harfbuzz-gobject, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - }: - mkDerivation { - pname = "gi-harfbuzz"; - version = "0.0.3"; - sha256 = "1rapwaf8rz18rsai54lq9wcccf9j0ihcafvwhrzvgl17fjqcfqaz"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ]; - description = "HarfBuzz bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; - - "gi-harfbuzz_0_0_4" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, harfbuzz, harfbuzz-gobject, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers @@ -103833,7 +103548,6 @@ self: { libraryPkgconfigDepends = [ harfbuzz harfbuzz-gobject ]; description = "HarfBuzz bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) harfbuzz; harfbuzz-gobject = null;}; "gi-ibus" = callPackage @@ -103945,31 +103659,6 @@ self: { }) {inherit (pkgs) ostree;}; "gi-pango" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cairo, containers - , gi-glib, gi-gobject, gi-harfbuzz, haskell-gi, haskell-gi-base - , haskell-gi-overloading, pango, text, transformers - }: - mkDerivation { - pname = "gi-pango"; - version = "1.0.23"; - sha256 = "18pp83nzqdxzq15g3rm0xym4hdq3f851m6mshlb4f7liy168vpl9"; - setupHaskellDepends = [ - base Cabal gi-glib gi-gobject gi-harfbuzz haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject gi-harfbuzz - haskell-gi haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ cairo pango ]; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - description = "Pango bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; - - "gi-pango_1_0_24" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-glib, gi-gobject, gi-harfbuzz, haskell-gi, haskell-gi-base , haskell-gi-overloading, pango, text, transformers @@ -103992,7 +103681,6 @@ self: { ''; description = "Pango bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs) pango;}; "gi-pangocairo" = callPackage @@ -104276,25 +103964,6 @@ self: { }) {inherit (pkgs) libwnck;}; "gi-xlib" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi - , haskell-gi-base, haskell-gi-overloading, text, transformers - , xlibsWrapper - }: - mkDerivation { - pname = "gi-xlib"; - version = "2.0.9"; - sha256 = "02n2iz30dkkfqpsc3ngpx0zxrl6fbsafzrjf0im8an783jp3vm80"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base - haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ xlibsWrapper ]; - description = "xlib bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) xlibsWrapper;}; - - "gi-xlib_2_0_10" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi , haskell-gi-base, haskell-gi-overloading, text, transformers , xlibsWrapper @@ -104311,7 +103980,6 @@ self: { libraryPkgconfigDepends = [ xlibsWrapper ]; description = "xlib bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) xlibsWrapper;}; "giak" = callPackage @@ -104378,6 +104046,39 @@ self: { license = lib.licenses.mit; }) {}; + "ginger_0_10_2_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , data-default, filepath, http-types, mtl, optparse-applicative + , parsec, process, regex-tdfa, safe, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , utf8-string, vector, yaml + }: + mkDerivation { + pname = "ginger"; + version = "0.10.2.0"; + sha256 = "0mqwcd4l8h6gk2i1qgj99zlp0c46kvkzni14vl2k6m3iili12ir7"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers data-default filepath + http-types mtl parsec regex-tdfa safe scientific text time + transformers unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring data-default optparse-applicative process + text transformers unordered-containers utf8-string yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default mtl tasty tasty-hunit + tasty-quickcheck text time transformers unordered-containers + utf8-string + ]; + description = "An implementation of the Jinja2 template language in Haskell"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "gingersnap" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , http-types, microspec, postgresql-simple, resource-pool @@ -109479,8 +109180,8 @@ self: { }: mkDerivation { pname = "google-maps-geocoding"; - version = "0.5.0.1"; - sha256 = "0cc7hhw4bqls6bckpahck5ad2pv6fzw2qkp8iym7y4cylsxvnamq"; + version = "0.7.0.0"; + sha256 = "0p6b2xyfkw073anhwwk4sdpphj3j1h24k277yc131yvyjlw4kslx"; libraryHaskellDepends = [ aeson base google-static-maps http-client servant servant-client text @@ -114617,28 +114318,6 @@ self: { }) {}; "haddock-library" = callPackage - ({ mkDerivation, base, base-compat, bytestring, containers, deepseq - , directory, filepath, hspec, hspec-discover, optparse-applicative - , parsec, QuickCheck, text, transformers, tree-diff - }: - mkDerivation { - pname = "haddock-library"; - version = "1.9.0"; - sha256 = "0c37mhmvr4saw5m4snyj1nij786dwmk9kch7hafgd1xswb9k4c5c"; - libraryHaskellDepends = [ - base bytestring containers parsec text transformers - ]; - testHaskellDepends = [ - base base-compat bytestring containers deepseq directory filepath - hspec optparse-applicative parsec QuickCheck text transformers - tree-diff - ]; - testToolDepends = [ hspec-discover ]; - description = "Library exposing some functionality of Haddock"; - license = lib.licenses.bsd2; - }) {}; - - "haddock-library_1_10_0" = callPackage ({ mkDerivation, base, base-compat, bytestring, containers, deepseq , directory, filepath, hspec, hspec-discover, optparse-applicative , parsec, QuickCheck, text, transformers, tree-diff @@ -114658,7 +114337,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Library exposing some functionality of Haddock"; license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; }) {}; "haddock-test" = callPackage @@ -114710,8 +114388,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "2.4.1"; - sha256 = "166jpi6bzq2j6ss652225byn6pdz8ya71fxdndlmqgsram2hrlyn"; + version = "2.5.0"; + sha256 = "0snh5sp47xqncsb19jp29kc2mjln6gpbhwxmvsqy0z9wgch0ldgb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115924,6 +115602,8 @@ self: { pname = "halves"; version = "0.1.0.1"; sha256 = "0mjxi7aq58k5aydslsihp66kabh0mr5wp2nngbzkvzbs0z7rrwma"; + revision = "1"; + editedCabalFile = "1llsh3c5as0vby17mdwypgyzlvp2icmxqj52686zi6bfcs2b4p26"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base hedgehog lens ]; description = "Split or combine data structures to and from halves, quarters, eighths"; @@ -116431,38 +116111,6 @@ self: { }) {}; "hapistrano" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, base, directory - , filepath, formatting, gitrev, hspec, hspec-discover, mtl - , optparse-applicative, path, path-io, process, QuickCheck - , silently, stm, temporary, time, transformers, typed-process, yaml - }: - mkDerivation { - pname = "hapistrano"; - version = "0.4.1.4"; - sha256 = "1ci2q3vkjw51k5hbswmcajk7gl1zpmwx3npbkf3kng3j1kcv0bzw"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-terminal base filepath gitrev mtl path process stm time - transformers typed-process yaml - ]; - executableHaskellDepends = [ - aeson async base formatting gitrev optparse-applicative path - path-io stm yaml - ]; - testHaskellDepends = [ - base directory filepath hspec mtl path path-io process QuickCheck - silently temporary yaml - ]; - testToolDepends = [ hspec-discover ]; - description = "A deployment library for Haskell applications"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "hapistrano_0_4_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, directory , filepath, formatting, gitrev, hspec, hspec-discover, mtl , optparse-applicative, path, path-io, process, QuickCheck @@ -117435,8 +117083,8 @@ self: { }: mkDerivation { pname = "hardware-edsl"; - version = "0.1.5"; - sha256 = "112sw9z89s27fi2jmg3a61gsm3far5vd21f1vi9cx2awgfzpi3iw"; + version = "0.1.6"; + sha256 = "1n3wdzv1ag1svsnx83fcp7mk4rhs16c8gppxdc5imnknbx9kg26r"; libraryHaskellDepends = [ array base bytestring constraints containers deepseq language-vhdl mtl operational-alacarte pretty syntactic @@ -119055,28 +118703,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal - , cabal-doctest, containers, directory, doctest, filepath, glib - , gobject-introspection, haskell-gi-base, mtl, pretty-show, process - , regex-tdfa, safe, text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.24.7"; - sha256 = "10xp6z6whfx3iad09l83mcszzj99cc9wcnvk593ypx6zhjv0r555"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - ansi-terminal attoparsec base bytestring Cabal containers directory - filepath haskell-gi-base mtl pretty-show process regex-tdfa safe - text transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_25_0" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , cabal-doctest, containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -119096,22 +118722,9 @@ self: { testHaskellDepends = [ base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; - version = "0.24.5"; - sha256 = "0fd5bsf2bnjaq9j8zs9l5837z9x2iryivs57y96c7fx6vxxb9xai"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - description = "Foundation for libraries generated by haskell-gi"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) glib;}; - - "haskell-gi-base_0_25_0" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; @@ -119121,7 +118734,6 @@ self: { libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-gi-overloading" = callPackage @@ -119264,41 +118876,45 @@ self: { ({ mkDerivation, aeson, aeson-pretty, async, base , base16-bytestring, binary, bytestring, containers , cryptohash-sha1, data-default, deepseq, directory, extra - , filepath, floskell, fourmolu, fuzzy, ghc, ghc-boot-th, ghc-paths - , ghcide, gitrev, hashable, hie-bios, hiedb, hls-brittany-plugin + , filepath, ghc, ghc-api-compat, ghc-boot-th, ghc-paths, ghcide + , gitrev, hashable, hie-bios, hiedb, hls-brittany-plugin , hls-class-plugin, hls-eval-plugin, hls-explicit-imports-plugin - , hls-haddock-comments-plugin, hls-hlint-plugin, hls-plugin-api - , hls-retrie-plugin, hls-splice-plugin, hls-stylish-haskell-plugin - , hls-tactics-plugin, hls-test-utils, hslogger, hspec-expectations - , lens, lsp, lsp-test, lsp-types, mtl, optparse-applicative - , optparse-simple, ormolu, process, regex-tdfa, safe-exceptions - , shake, sqlite-simple, temporary, text, transformers - , unordered-containers + , hls-floskell-plugin, hls-fourmolu-plugin, hls-graph + , hls-haddock-comments-plugin, hls-hlint-plugin + , hls-module-name-plugin, hls-ormolu-plugin, hls-plugin-api + , hls-pragmas-plugin, hls-refine-imports-plugin, hls-retrie-plugin + , hls-splice-plugin, hls-stylish-haskell-plugin, hls-tactics-plugin + , hls-test-utils, hslogger, hspec-expectations, lens, lsp, lsp-test + , lsp-types, mtl, optparse-applicative, optparse-simple, process + , regex-tdfa, safe-exceptions, sqlite-simple, temporary, text + , transformers, unordered-containers }: mkDerivation { pname = "haskell-language-server"; - version = "1.1.0.0"; - sha256 = "0zbr8qr097mjcsbgdkm6a8ala1ifdajmllr8basvrndn28zgi5cg"; + version = "1.2.0.0"; + sha256 = "131l21r9ahnw54x5453j7pw728z6vp3gc2zmj6wrwzz51b9v64q8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson-pretty async base base16-bytestring bytestring containers cryptohash-sha1 data-default directory extra filepath ghc ghcide - gitrev hie-bios hiedb hls-plugin-api hslogger lsp - optparse-applicative optparse-simple process safe-exceptions shake + gitrev hie-bios hiedb hls-graph hls-plugin-api hslogger lsp + optparse-applicative optparse-simple process safe-exceptions sqlite-simple text unordered-containers ]; executableHaskellDepends = [ aeson async base base16-bytestring binary bytestring containers - cryptohash-sha1 data-default deepseq directory extra filepath - floskell fourmolu fuzzy ghc ghc-boot-th ghc-paths ghcide gitrev - hashable hie-bios hiedb hls-brittany-plugin hls-class-plugin - hls-eval-plugin hls-explicit-imports-plugin - hls-haddock-comments-plugin hls-hlint-plugin hls-plugin-api - hls-retrie-plugin hls-splice-plugin hls-stylish-haskell-plugin - hls-tactics-plugin hslogger lens lsp mtl optparse-applicative - optparse-simple ormolu process regex-tdfa safe-exceptions shake - sqlite-simple temporary text transformers unordered-containers + cryptohash-sha1 data-default deepseq directory extra filepath ghc + ghc-api-compat ghc-boot-th ghc-paths ghcide gitrev hashable + hie-bios hiedb hls-brittany-plugin hls-class-plugin hls-eval-plugin + hls-explicit-imports-plugin hls-floskell-plugin hls-fourmolu-plugin + hls-graph hls-haddock-comments-plugin hls-hlint-plugin + hls-module-name-plugin hls-ormolu-plugin hls-plugin-api + hls-pragmas-plugin hls-refine-imports-plugin hls-retrie-plugin + hls-splice-plugin hls-stylish-haskell-plugin hls-tactics-plugin + hslogger lens lsp mtl optparse-applicative optparse-simple process + regex-tdfa safe-exceptions sqlite-simple temporary text + transformers unordered-containers ]; testHaskellDepends = [ aeson base bytestring containers data-default directory extra @@ -125362,21 +124978,18 @@ self: { "heidi" = callPackage ({ mkDerivation, base, boxes, containers, criterion, exceptions - , generic-trie, generics-sop, hashable, microlens, microlens-th - , scientific, tasty, tasty-hspec, text, unordered-containers - , vector, weigh + , generics-sop, hashable, microlens, microlens-th, scientific + , tasty, tasty-hspec, text, unordered-containers, vector, weigh }: mkDerivation { pname = "heidi"; - version = "0.1.0"; - sha256 = "1l4am8pqk3xrmjmjv48jia60d2vydpj2wy0iyxqiidnc7b8p5j8m"; - revision = "1"; - editedCabalFile = "0fbx6hkxdbrhh30j2bs3zrxknrlr6z29r7srxnpsgd4n0rkdajar"; + version = "0.3.0"; + sha256 = "196v4y8ff64ivx2p1i9vxxgrpq67j0xyq1hpz5v47yq6k0fdm52n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base boxes containers exceptions generic-trie generics-sop hashable - microlens microlens-th scientific text unordered-containers vector + base boxes containers exceptions generics-sop hashable microlens + microlens-th scientific text unordered-containers vector ]; executableHaskellDepends = [ base exceptions hashable text unordered-containers @@ -126108,18 +125721,25 @@ self: { "hercules-ci-cnix-store" = callPackage ({ mkDerivation, base, boost, bytestring, conduit, containers - , inline-c, inline-c-cpp, nix, protolude, unliftio-core + , exceptions, hspec, hspec-discover, inline-c, inline-c-cpp, nix + , protolude, template-haskell, temporary, text, unliftio-core + , vector }: mkDerivation { pname = "hercules-ci-cnix-store"; - version = "0.1.1.0"; - sha256 = "1lvlilhfkyx3i4fp0azjx4gm2iwm6hkjrg6kc5faifw7knfivinj"; + version = "0.2.0.1"; + sha256 = "1vd7wy23glgxs823c8c1754miwpmrfscsfdn74nyx31gci4jhqgx"; libraryHaskellDepends = [ base bytestring conduit containers inline-c inline-c-cpp protolude - unliftio-core + template-haskell unliftio-core vector ]; librarySystemDepends = [ boost ]; libraryPkgconfigDepends = [ nix ]; + testHaskellDepends = [ + base bytestring containers exceptions hspec inline-c inline-c-cpp + protolude temporary text + ]; + testToolDepends = [ hspec-discover ]; description = "Haskell bindings for Nix's libstore"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ roberth ]; @@ -126157,8 +125777,8 @@ self: { }: mkDerivation { pname = "heredocs"; - version = "0.2.1.0"; - sha256 = "0wjj5sy4mpd4ahavdmi67j70xs1wrga8dnzr5jv8cjnqjj2p8f59"; + version = "0.2.1.1"; + sha256 = "10vxd4f77vj2q79nri2zvjrgp1h8q058zp4xanh18pwpwqz8pbv6"; libraryHaskellDepends = [ base bytestring doctest parsec template-haskell text ]; @@ -127928,8 +127548,8 @@ self: { }: mkDerivation { pname = "hie-compat"; - version = "0.1.0.0"; - sha256 = "00wnb7ylahglw167n2n1b2a6b0b75ay167zzrl10jsskivxwx3h3"; + version = "0.2.0.0"; + sha256 = "029h465wfknjdjk4yqq10b9krya9qplh8zzvmnwp9hf5rlr9awc3"; libraryHaskellDepends = [ array base bytestring containers directory filepath ghc ghc-boot transformers @@ -130115,6 +129735,8 @@ self: { pname = "hledger-web"; version = "1.21"; sha256 = "0ivszqcypw0j2wn4r7fv7dqm1pvr0b1y6rqpxagzyk8cxn3ic9g2"; + revision = "1"; + editedCabalFile = "1hnw10ibhbafbsfj5lzlxwjg4cjnqr5bb51n6mqbi30qqabgq78x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130224,7 +129846,7 @@ self: { license = lib.licenses.mit; }) {inherit (pkgs) libsass;}; - "hlint_3_2_7" = callPackage + "hlint" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, file-embed , filepath, filepattern, ghc, ghc-boot, ghc-boot-th @@ -130247,11 +129869,10 @@ self: { executableHaskellDepends = [ base ]; description = "Source code suggestions"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ maralorn ]; }) {}; - "hlint" = callPackage + "hlint_3_3_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, file-embed , filepath, filepattern, ghc-lib-parser, ghc-lib-parser-ex @@ -130274,6 +129895,7 @@ self: { executableHaskellDepends = [ base ]; description = "Source code suggestions"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ maralorn ]; }) {}; @@ -130418,6 +130040,8 @@ self: { pname = "hls-brittany-plugin"; version = "1.0.0.1"; sha256 = "1lfhgvxs0bvs67raxalvj8pr4qln1yvi7i7wlp33gpk2x89bwaqy"; + revision = "3"; + editedCabalFile = "0d7pn634gpksl49hp3bfds52zhc80943bb2l5cvlbaf3phlsfskc"; libraryHaskellDepends = [ base brittany filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp-types text transformers @@ -130428,22 +130052,20 @@ self: { }) {}; "hls-class-plugin" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, filepath, ghc - , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lens, lsp - , lsp-test, lsp-types, shake, text, transformers - , unordered-containers + ({ mkDerivation, aeson, base, containers, filepath, ghc + , ghc-api-compat, ghc-exactprint, ghcide, hls-plugin-api + , hls-test-utils, lens, lsp, lsp-types, text, transformers }: mkDerivation { pname = "hls-class-plugin"; - version = "1.0.0.1"; - sha256 = "0s9pkdcgvfb9qhj9qjy6bygdyshanczcn9apq3qcw8yznl1zqilc"; + version = "1.0.0.2"; + sha256 = "0z6774vmfafgr3z5h98ls5sssax15psa2dq5sf8bcqm29y3g3zvi"; libraryHaskellDepends = [ - aeson base containers ghc ghc-exactprint ghcide hls-plugin-api lens - lsp shake text transformers unordered-containers + aeson base containers ghc ghc-api-compat ghc-exactprint ghcide + hls-plugin-api lens lsp text transformers ]; testHaskellDepends = [ - base bytestring filepath hls-test-utils lens lsp-test lsp-types - text + base filepath hls-test-utils lens lsp-types ]; description = "Class/instance management plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -130451,26 +130073,25 @@ self: { "hls-eval-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory - , dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide - , hashable, hls-plugin-api, hls-test-utils, lens, lsp, lsp-test - , lsp-types, megaparsec, mtl, parser-combinators, pretty-simple - , QuickCheck, safe-exceptions, shake, temporary, text, time + , dlist, extra, filepath, ghc, ghc-api-compat, ghc-boot-th + , ghc-paths, ghcide, hashable, hls-plugin-api, hls-test-utils, lens + , lsp, lsp-types, megaparsec, mtl, parser-combinators + , pretty-simple, QuickCheck, safe-exceptions, temporary, text, time , transformers, unliftio, unordered-containers }: mkDerivation { pname = "hls-eval-plugin"; - version = "1.1.0.0"; - sha256 = "138l49a8y0g7yk29xdjs0jv0xmz3y8lvig45g944spj3xi8snpfx"; + version = "1.1.1.0"; + sha256 = "167vmz7jl09lkayjf6g0inn2q5i1h3gs5vl6xpdg4cbvd8srdvbs"; libraryHaskellDepends = [ aeson base containers deepseq Diff directory dlist extra filepath - ghc ghc-boot-th ghc-paths ghcide hashable hls-plugin-api lens lsp - lsp-types megaparsec mtl parser-combinators pretty-simple - QuickCheck safe-exceptions shake temporary text time transformers - unliftio unordered-containers + ghc ghc-api-compat ghc-boot-th ghc-paths ghcide hashable + hls-plugin-api lens lsp lsp-types megaparsec mtl parser-combinators + pretty-simple QuickCheck safe-exceptions temporary text time + transformers unliftio unordered-containers ]; testHaskellDepends = [ - aeson base directory extra filepath hls-test-utils lens lsp-test - lsp-types text + aeson base directory extra filepath hls-test-utils lens lsp-types ]; description = "Eval plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -130511,18 +130132,18 @@ self: { license = lib.licenses.asl20; }) {}; - "hls-explicit-imports-plugin_1_0_0_2" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide - , hls-graph, hls-plugin-api, lsp, lsp-types, text + "hls-explicit-imports-plugin_1_0_0_3" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, ghc + , ghc-api-compat, ghcide, hls-graph, hls-plugin-api, lsp, text , unordered-containers }: mkDerivation { pname = "hls-explicit-imports-plugin"; - version = "1.0.0.2"; - sha256 = "1ga7phiy7i6kmin0zi0dykbkv29vh46hzrn0bkvfqjkrb41mbi8q"; + version = "1.0.0.3"; + sha256 = "0sh4mimx76n6nzlz0nxa1z5q9ga8g268lkncqz4p0nbc54y070hh"; libraryHaskellDepends = [ - aeson base containers deepseq ghc ghcide hls-graph hls-plugin-api - lsp lsp-types text unordered-containers + aeson base containers deepseq ghc ghc-api-compat ghcide hls-graph + hls-plugin-api lsp text unordered-containers ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; @@ -130537,6 +130158,8 @@ self: { pname = "hls-floskell-plugin"; version = "1.0.0.0"; sha256 = "0wf4483a4xhvynqqgj6gf1qg5nv9rv4gv9rm2hwsbjq123bs0wy8"; + revision = "1"; + editedCabalFile = "120ai8hswj310sv098j1b8dzpkzmjyphyxqnc1gszqds3qx588fj"; libraryHaskellDepends = [ base floskell ghcide hls-plugin-api lsp-types text transformers ]; @@ -130548,24 +130171,18 @@ self: { }) {}; "hls-fourmolu-plugin" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , extra, filepath, fourmolu, ghc, ghc-boot-th, ghcide - , hls-plugin-api, hls-test-utils, hspec-expectations, lens, lsp - , lsp-test, lsp-types, text, unordered-containers + ({ mkDerivation, base, filepath, fourmolu, ghc, ghc-boot-th, ghcide + , hls-plugin-api, hls-test-utils, lens, lsp, lsp-test, text }: mkDerivation { pname = "hls-fourmolu-plugin"; - version = "1.0.0.0"; - sha256 = "1x1v9jjy80w05cg2yl0nzk3h97q16bymrqy59g1s0lzihg3wizs7"; + version = "1.0.0.1"; + sha256 = "039vvbzj583kxf04d9wjam6x7pjs7hv13ysa1rapsj5san0r73y7"; libraryHaskellDepends = [ - base extra filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api - lens lsp lsp-types text - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default filepath ghcide - hls-plugin-api hls-test-utils hspec-expectations lens lsp-test - lsp-types text unordered-containers + base filepath fourmolu ghc ghc-boot-th ghcide hls-plugin-api lens + lsp text ]; + testHaskellDepends = [ base filepath hls-test-utils lsp-test ]; description = "Integration with the Fourmolu code formatter"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; @@ -130576,8 +130193,8 @@ self: { ({ mkDerivation, base, bytestring, shake, unordered-containers }: mkDerivation { pname = "hls-graph"; - version = "1.3.0.0"; - sha256 = "0mz9443jljwgi2zd6gafixfp2k8gpnrn5269qb9bjd5p4ai0bbp7"; + version = "1.4.0.0"; + sha256 = "0x54lli368wncwb41klg7jpkbzm219b417aar50mgw8igwmbzqwf"; libraryHaskellDepends = [ base bytestring shake unordered-containers ]; @@ -130586,21 +130203,19 @@ self: { }) {}; "hls-haddock-comments-plugin" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, ghc - , ghc-exactprint, ghcide, hls-plugin-api, hls-test-utils, lsp-types - , text, unordered-containers + ({ mkDerivation, base, containers, filepath, ghc, ghc-exactprint + , ghcide, hls-plugin-api, hls-test-utils, lsp-types, text + , unordered-containers }: mkDerivation { pname = "hls-haddock-comments-plugin"; - version = "1.0.0.1"; - sha256 = "1qny8y52myd3ic893wxapbqhfdcdbil8acky91lfcylr9141154i"; + version = "1.0.0.2"; + sha256 = "09gfvzz56vz0qzn1md2p0i6rdzf7v9nwm78lcw66asblq485jac6"; libraryHaskellDepends = [ base containers ghc ghc-exactprint ghcide hls-plugin-api lsp-types text unordered-containers ]; - testHaskellDepends = [ - base bytestring filepath hls-test-utils text - ]; + testHaskellDepends = [ base filepath hls-test-utils text ]; description = "Haddock comments plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; @@ -130608,24 +130223,61 @@ self: { "hls-hlint-plugin" = callPackage ({ mkDerivation, aeson, apply-refact, base, binary, bytestring , containers, data-default, deepseq, Diff, directory, extra - , filepath, ghc, ghc-exactprint, ghcide, hashable, hlint - , hls-plugin-api, hslogger, lens, lsp, regex-tdfa, shake, temporary - , text, transformers, unordered-containers + , filepath, ghc, ghc-exactprint, ghc-lib, ghc-lib-parser-ex, ghcide + , hashable, hlint, hls-plugin-api, hslogger, lens, lsp, regex-tdfa + , temporary, text, transformers, unordered-containers }: mkDerivation { pname = "hls-hlint-plugin"; - version = "1.0.0.2"; - sha256 = "1qi654azf4l24sc7zaimbxm7z59xfvdvn33fsa5d8y7910w17d73"; + version = "1.0.1.0"; + sha256 = "0wy6mw3i5mssjg9bf0gn5411yvqzlxd63s0amrg0yci6nx78nb8p"; libraryHaskellDepends = [ aeson apply-refact base binary bytestring containers data-default - deepseq Diff directory extra filepath ghc ghc-exactprint ghcide - hashable hlint hls-plugin-api hslogger lens lsp regex-tdfa shake - temporary text transformers unordered-containers + deepseq Diff directory extra filepath ghc ghc-exactprint ghc-lib + ghc-lib-parser-ex ghcide hashable hlint hls-plugin-api hslogger + lens lsp regex-tdfa temporary text transformers + unordered-containers ]; description = "Hlint integration plugin with Haskell Language Server"; license = lib.licenses.asl20; }) {}; + "hls-module-name-plugin" = callPackage + ({ mkDerivation, aeson, base, directory, filepath, ghcide + , hls-plugin-api, hls-test-utils, lsp, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "hls-module-name-plugin"; + version = "1.0.0.0"; + sha256 = "1a41zn1k4xga9v8xqly2jbi2i11zy05cgs60b7j9fasmm991vkxb"; + libraryHaskellDepends = [ + aeson base directory filepath ghcide hls-plugin-api lsp text + transformers unordered-containers + ]; + testHaskellDepends = [ base filepath hls-test-utils ]; + description = "Module name plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + + "hls-ormolu-plugin" = callPackage + ({ mkDerivation, base, filepath, ghc, ghc-boot-th, ghcide + , hls-plugin-api, hls-test-utils, lens, lsp, lsp-types, ormolu + , text + }: + mkDerivation { + pname = "hls-ormolu-plugin"; + version = "1.0.0.0"; + sha256 = "1iiq1m69jqrv28nzcrp9j70qvi21gsl9v9kjx0nkcdlbqzybfrfr"; + libraryHaskellDepends = [ + base filepath ghc ghc-boot-th ghcide hls-plugin-api lens lsp ormolu + text + ]; + testHaskellDepends = [ base filepath hls-test-utils lsp-types ]; + description = "Integration with the Ormolu code formatter"; + license = lib.licenses.asl20; + }) {}; + "hls-plugin-api" = callPackage ({ mkDerivation, aeson, base, containers, data-default , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger @@ -130645,20 +130297,20 @@ self: { license = lib.licenses.asl20; }) {}; - "hls-plugin-api_1_1_0_1" = callPackage + "hls-plugin-api_1_1_0_2" = callPackage ({ mkDerivation, aeson, base, containers, data-default - , dependent-map, dependent-sum, Diff, dlist, hashable, hls-graph - , hslogger, lens, lsp, opentelemetry, process, regex-tdfa, text - , unix, unordered-containers + , dependent-map, dependent-sum, Diff, dlist, ghc, ghc-api-compat + , hashable, hls-graph, hslogger, lens, lsp, opentelemetry, process + , regex-tdfa, text, unix, unordered-containers }: mkDerivation { pname = "hls-plugin-api"; - version = "1.1.0.1"; - sha256 = "0xxkpaqnzm39blgaa2f9v35pwnp8rx3jbmgysnsnb9nchnjprg9z"; + version = "1.1.0.2"; + sha256 = "1x49h8087x3fynagm4na72lyqyy58bb33kcrzkfcpbr3lsb8k455"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff - dlist hashable hls-graph hslogger lens lsp opentelemetry process - regex-tdfa text unix unordered-containers + dlist ghc ghc-api-compat hashable hls-graph hslogger lens lsp + opentelemetry process regex-tdfa text unix unordered-containers ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; @@ -130674,6 +130326,8 @@ self: { pname = "hls-pragmas-plugin"; version = "1.0.0.0"; sha256 = "1zkq95dklc6sdhczgr6l2hdkkrbrjy3zwp0qfz3qvf55gpxspzzs"; + revision = "1"; + editedCabalFile = "0xkq857i68s58101x8dc8ynvnkhjp2f8lfddg2cjkycbwhfj42cc"; libraryHaskellDepends = [ base extra fuzzy ghcide hls-plugin-api lens lsp text transformers unordered-containers @@ -130687,62 +130341,78 @@ self: { broken = true; }) {}; + "hls-refine-imports-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, filepath, ghc + , ghcide, hls-explicit-imports-plugin, hls-graph, hls-plugin-api + , hls-test-utils, lsp, text, unordered-containers + }: + mkDerivation { + pname = "hls-refine-imports-plugin"; + version = "1.0.0.0"; + sha256 = "16dn7lnsam10rvazkslrw81qahn2i2yghdbi9pdjdzd3l3nrcyl9"; + libraryHaskellDepends = [ + aeson base containers deepseq ghc ghcide + hls-explicit-imports-plugin hls-graph hls-plugin-api lsp text + unordered-containers + ]; + testHaskellDepends = [ base filepath hls-test-utils text ]; + description = "Refine imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + "hls-retrie-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra - , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie - , safe-exceptions, shake, text, transformers, unordered-containers + , ghc, ghc-api-compat, ghcide, hashable, hls-plugin-api, lsp + , lsp-types, retrie, safe-exceptions, text, transformers + , unordered-containers }: mkDerivation { pname = "hls-retrie-plugin"; - version = "1.0.0.2"; - sha256 = "0jw1q0dk5jl80wbyvi1a6vszj9x3s7d2bnsbnyycbh4zgl33agwb"; - revision = "1"; - editedCabalFile = "03r3cb93493hr4rbd8n1ip63myssfycyijg2507kcmsly39i2qkz"; + version = "1.0.1.0"; + sha256 = "0kfip2fqjbr9qxg749ikdj42zgnchwjrp5ch84xr5z8k7hmlnw4z"; libraryHaskellDepends = [ - aeson base containers deepseq directory extra ghc ghcide hashable - hls-plugin-api lsp lsp-types retrie safe-exceptions shake text - transformers unordered-containers + aeson base containers deepseq directory extra ghc ghc-api-compat + ghcide hashable hls-plugin-api lsp lsp-types retrie safe-exceptions + text transformers unordered-containers ]; description = "Retrie integration plugin for Haskell Language Server"; license = lib.licenses.asl20; }) {}; "hls-splice-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, directory, dlist, extra - , filepath, foldl, ghc, ghc-exactprint, ghcide, hls-plugin-api - , hls-test-utils, lens, lsp, retrie, shake, syb, text, transformers + ({ mkDerivation, aeson, base, containers, dlist, extra, filepath + , foldl, ghc, ghc-exactprint, ghcide, hls-plugin-api + , hls-test-utils, lens, lsp, retrie, syb, text, transformers , unliftio-core, unordered-containers }: mkDerivation { pname = "hls-splice-plugin"; - version = "1.0.0.2"; - sha256 = "15vg5dmssd54dazipc82sgkbc399mnfydc8y8i2i6lhz3hsgvpg1"; + version = "1.0.0.3"; + sha256 = "0v5m6h4pb2piihjyldy0nm6zl8iaw34gp6yqicbqkryinz0mb4pg"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide - hls-plugin-api lens lsp retrie shake syb text transformers - unliftio-core unordered-containers - ]; - testHaskellDepends = [ - base directory extra filepath hls-test-utils text + hls-plugin-api lens lsp retrie syb text transformers unliftio-core + unordered-containers ]; + testHaskellDepends = [ base filepath hls-test-utils text ]; description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes"; license = lib.licenses.asl20; }) {}; "hls-stylish-haskell-plugin" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, ghc - , ghc-boot-th, ghcide, hls-plugin-api, hls-test-utils, lsp-types - , mtl, stylish-haskell, text + ({ mkDerivation, base, directory, filepath, ghc, ghc-boot-th + , ghcide, hls-plugin-api, hls-test-utils, lsp-types + , stylish-haskell, text }: mkDerivation { pname = "hls-stylish-haskell-plugin"; - version = "1.0.0.0"; - sha256 = "1f2banm7lbl2grqrm0d9dnhk5fimxqan3xlsl4hjyqgy42xqqai2"; + version = "1.0.0.1"; + sha256 = "1dkgvh169mf0s0vnyfgb965k393hm622cd2ssl6clgbaq2q20qlf"; libraryHaskellDepends = [ base directory filepath ghc ghc-boot-th ghcide hls-plugin-api - lsp-types mtl stylish-haskell text + lsp-types stylish-haskell text ]; - testHaskellDepends = [ base bytestring hls-test-utils text ]; + testHaskellDepends = [ base filepath hls-test-utils ]; description = "Integration with the Stylish Haskell code formatter"; license = lib.licenses.asl20; }) {}; @@ -130750,20 +130420,22 @@ self: { "hls-tactics-plugin" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, directory, extra , filepath, fingertree, generic-lens, ghc, ghc-boot-th - , ghc-exactprint, ghc-source-gen, ghcide, hls-plugin-api - , hls-test-utils, hspec, hspec-discover, hspec-expectations, lens - , lsp, lsp-types, mtl, QuickCheck, refinery, retrie, shake, syb - , tasty-hspec, tasty-hunit, text, transformers + , ghc-exactprint, ghc-source-gen, ghcide, hls-graph, hls-plugin-api + , hls-test-utils, hspec, hspec-discover, hspec-expectations + , hyphenation, lens, lsp, lsp-types, megaparsec, mtl + , parser-combinators, prettyprinter, QuickCheck, refinery, retrie + , syb, tasty-hspec, tasty-hunit, text, transformers , unordered-containers }: mkDerivation { pname = "hls-tactics-plugin"; - version = "1.1.0.0"; - sha256 = "13qysl6dwrn15kn310r04g1yv7jj9xhar659lrc8h230c4khn2qv"; + version = "1.2.0.0"; + sha256 = "0djyskzsv1hz92p6x62nf78j1f0x9nl55fl5mzc29lncqib8g8ak"; libraryHaskellDepends = [ aeson base containers deepseq directory extra filepath fingertree generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide - hls-plugin-api lens lsp mtl refinery retrie shake syb text + hls-graph hls-plugin-api hyphenation lens lsp megaparsec mtl + parser-combinators prettyprinter refinery retrie syb text transformers unordered-containers ]; testHaskellDepends = [ @@ -130779,20 +130451,18 @@ self: { "hls-test-utils" = callPackage ({ mkDerivation, aeson, async, base, blaze-markup, bytestring , containers, data-default, directory, extra, filepath, ghcide - , hls-plugin-api, hspec, hspec-core, lens, lsp, lsp-test, lsp-types - , shake, tasty, tasty-expected-failure, tasty-golden, tasty-hunit - , tasty-rerun, temporary, text, unordered-containers + , hls-graph, hls-plugin-api, hspec, hspec-core, lens, lsp, lsp-test + , lsp-types, tasty, tasty-expected-failure, tasty-golden + , tasty-hunit, tasty-rerun, temporary, text, unordered-containers }: mkDerivation { pname = "hls-test-utils"; - version = "1.0.0.0"; - sha256 = "18n7vb9fa39jkgr0gvsrjfc0nh09w2xlniifb25bn6z3qc3w0h6i"; - revision = "1"; - editedCabalFile = "048all6d50kyzln2nfp096ry5zwbair2srifhshnipg8qvs2cwpl"; + version = "1.0.1.0"; + sha256 = "0pqypxqwh8dm4xl7bpfqdvzaxw98v7bwbzkssgx5zgczhzs2y8mi"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default - directory extra filepath ghcide hls-plugin-api hspec hspec-core - lens lsp lsp-test lsp-types shake tasty tasty-expected-failure + directory extra filepath ghcide hls-graph hls-plugin-api hspec + hspec-core lens lsp lsp-test lsp-types tasty tasty-expected-failure tasty-golden tasty-hunit tasty-rerun temporary text unordered-containers ]; @@ -133168,6 +132838,24 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "hosc_0_19_1" = callPackage + ({ mkDerivation, base, binary, blaze-builder, bytestring + , data-binary-ieee754, network, time, transformers + }: + mkDerivation { + pname = "hosc"; + version = "0.19.1"; + sha256 = "08q218p1skqxwa7f55nsgmv9z8digf1c0f1wi6p562q6d4i044z7"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary blaze-builder bytestring data-binary-ieee754 network + time transformers + ]; + description = "Haskell Open Sound Control"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "hosc-json" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , hosc, json, text, transformers, unordered-containers, utf8-string @@ -135897,18 +135585,19 @@ self: { "hsc3" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers - , data-ordlist, directory, filepath, hosc, murmur-hash, network - , process, random, safe, split, transformers, vector + , data-binary-ieee754, data-ordlist, directory, filepath, hosc, mtl + , murmur-hash, network, process, random, safe, split, transformers + , vector }: mkDerivation { pname = "hsc3"; - version = "0.18"; - sha256 = "1j6jdgvvk3pxyky63khszv0cim4b7wbffpcpa098ii98fib0r47i"; + version = "0.19.1"; + sha256 = "0yz8h83hrnw28bwqqaa792w89y2pz1lkv3zwmwj9p2z8xv0hf14n"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base binary bytestring containers data-ordlist directory - filepath hosc murmur-hash network process random safe split - transformers vector + array base binary bytestring containers data-binary-ieee754 + data-ordlist directory filepath hosc mtl murmur-hash network + process random safe split transformers vector ]; description = "Haskell SuperCollider"; license = lib.licenses.gpl3Only; @@ -137167,8 +136856,8 @@ self: { pname = "hslogger"; version = "1.3.1.0"; sha256 = "0nyar9xcblx5jwks85y8f4jfy9k1h4ss6rvj4mdbiidrq3v688vz"; - revision = "2"; - editedCabalFile = "1bkv1rbbx0bhyvrmnsyspm30q48820a6rym0msxjdzp8r56rbm9w"; + revision = "3"; + editedCabalFile = "04mda3bwr2a00f5nbkqc84d46lmqfsk3gibzg3amdh74ngb451xq"; libraryHaskellDepends = [ base bytestring containers deepseq network network-bsd old-locale time unix @@ -138229,8 +137918,8 @@ self: { ({ mkDerivation, base, hspec, hspec-core, HUnit, leancheck }: mkDerivation { pname = "hspec-leancheck"; - version = "0.0.4"; - sha256 = "06amq8467wv2jkx9f4pif0z5rgvj35hdp1yffqkxyxh65148prcb"; + version = "0.0.6"; + sha256 = "1pbvbqjy3smplax626g6dwycqqn9w9i0pg30lqzzq0r32w53z7si"; libraryHaskellDepends = [ base hspec hspec-core HUnit leancheck ]; testHaskellDepends = [ base hspec leancheck ]; description = "LeanCheck support for the Hspec test framework"; @@ -143569,8 +143258,8 @@ self: { }: mkDerivation { pname = "hwk"; - version = "0.5"; - sha256 = "1nn8021nf7pwr8r0ffvsr3yjvjgv4f15l7j8s9pisi4n280lv8h0"; + version = "0.6"; + sha256 = "1xn3rn81ixx5mil8x1s26cxsdnpq2mhbfcs26969rk3k9lbzvc38"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -145286,8 +144975,8 @@ self: { pname = "identicon"; version = "0.2.2"; sha256 = "0qzj2063sh7phbqyxqxf96avz1zcwd1ry06jdqxwkg55q3yb8y9n"; - revision = "3"; - editedCabalFile = "0vya6zm3nnbdv3wmj3dwqwwjgsagql8q17078knhjddv2lm8m49q"; + revision = "4"; + editedCabalFile = "1mlmn7ccns2rnhgmnlq9m2rqc9mgj0262ckqbm01w1fiycw3nq7b"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring JuicyPixels ]; testHaskellDepends = [ @@ -146462,7 +146151,7 @@ self: { }) {}; "imperative-edsl" = callPackage - ({ mkDerivation, array, base, BoundedChan, containers + ({ mkDerivation, array, base, BoundedChan, constraints, containers , data-default-class, deepseq, directory, exception-transformers , filepath, ghc-prim, language-c-quote, mainland-pretty, microlens , microlens-mtl, microlens-th, mtl, operational-alacarte, process @@ -146470,11 +146159,11 @@ self: { }: mkDerivation { pname = "imperative-edsl"; - version = "0.8.1"; - sha256 = "1z1a7b7m69m9xagvfa6xx3l1j0s7lrlvp4n09lra1x3q7lpfgnra"; + version = "0.8.2"; + sha256 = "1m8ynjzi97ps9x9sf03zg7y2vq15kzch9fdnzmh9wsmmkfpqljzs"; libraryHaskellDepends = [ - array base BoundedChan containers data-default-class deepseq - directory exception-transformers ghc-prim language-c-quote + array base BoundedChan constraints containers data-default-class + deepseq directory exception-transformers ghc-prim language-c-quote mainland-pretty microlens microlens-mtl microlens-th mtl operational-alacarte process srcloc stm syntactic time ]; @@ -146583,8 +146272,8 @@ self: { }: mkDerivation { pname = "implicit-hie-cradle"; - version = "0.3.0.2"; - sha256 = "185pisgqp95zkpcksqiwiyghmg01cvfa7g6wzc31004mwwb114ih"; + version = "0.3.0.3"; + sha256 = "1rv6piiyy0f9l2pmwlc3j47g2lnz7sbipb5jdn1m76z4j66y05n9"; libraryHaskellDepends = [ base base16-bytestring bytestring containers directory extra filepath hie-bios hslogger implicit-hie process temporary text time @@ -146880,12 +146569,9 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "include-env"; - version = "0.1.1.0"; - sha256 = "0c65dn8r0rizmz71jv9vjf6l3cny31vi0d69jh9i72xwx14nlr77"; - isLibrary = true; - isExecutable = true; + version = "0.1.3.0"; + sha256 = "0yj7gbsxdjihf243c0xym5yxdkyr1s8qs8dvxhf7xf5pw77y03qg"; libraryHaskellDepends = [ base template-haskell ]; - executableHaskellDepends = [ base ]; description = "Include the value of an environment variable at compile time"; license = lib.licenses.bsd3; }) {}; @@ -149623,8 +149309,8 @@ self: { }: mkDerivation { pname = "ipa"; - version = "0.3.1"; - sha256 = "1l658qnqfs63dwarmiaw7vf6v2xl8hhvzlb95w168rpa7wfkrh5n"; + version = "0.3.1.1"; + sha256 = "08n47l0vjcyp0g3wlwww0cf8cyqfy6mj5480r94in7l3zr7vx6a4"; libraryHaskellDepends = [ attoparsec base template-haskell text unicode-transforms ]; @@ -149688,23 +149374,26 @@ self: { ({ mkDerivation, aeson, base, bytestring, directory, directory-tree , doctest, envy, flow, Glob, http-media, lens, lens-aeson , monad-logger, network-ip, QuickCheck, regex-compat, rio, servant - , servant-client, servant-multipart, servant-server, swagger2, text - , vector, yaml + , servant-client, servant-multipart, servant-multipart-api + , servant-multipart-client, servant-server, swagger2, text, vector + , yaml }: mkDerivation { pname = "ipfs"; - version = "1.3.0.3"; - sha256 = "08g1lvh7w46qsg80h5nm3r333zbhl2q4shnrm5jann4p3g5ii08x"; + version = "1.3.1"; + sha256 = "0jf5wragwcqhal860s1i26dk32dmnhsyl4n85mr8sc8v626bkj76"; libraryHaskellDepends = [ aeson base bytestring envy flow Glob http-media lens monad-logger network-ip regex-compat rio servant servant-client - servant-multipart servant-server swagger2 text vector + servant-multipart servant-multipart-api servant-multipart-client + servant-server swagger2 text vector ]; testHaskellDepends = [ aeson base bytestring directory directory-tree doctest envy flow Glob http-media lens lens-aeson monad-logger network-ip QuickCheck regex-compat rio servant servant-client servant-multipart - servant-server swagger2 text vector yaml + servant-multipart-api servant-multipart-client servant-server + swagger2 text vector yaml ]; description = "Access IPFS locally and remotely"; license = lib.licenses.asl20; @@ -151887,22 +151576,23 @@ self: { }) {}; "jenkinsPlugins2nix" = callPackage - ({ mkDerivation, ansi-wl-pprint, attoparsec, base, bimap - , bytestring, containers, cryptohash, hnix, http-conduit, mtl - , optparse-applicative, tasty-hspec, text, zip-archive + ({ mkDerivation, attoparsec, base, bimap, bytestring, containers + , cryptohash, hnix, http-conduit, mtl, optparse-applicative + , prettyprinter, prettyprinter-ansi-terminal, tasty-hspec, text + , zip-archive }: mkDerivation { pname = "jenkinsPlugins2nix"; - version = "0.2.0.2"; - sha256 = "04ddcri3rwszxjl65c5kha6lkrf3w89gfri2cdghdq0znl51hvf5"; + version = "0.3.0.1"; + sha256 = "0jqapzgq0z346af1626zl67dnnpr6i7bsqrhxhiz32w70kjhisa1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint attoparsec base bytestring containers cryptohash - hnix http-conduit mtl text zip-archive + attoparsec base bytestring containers cryptohash hnix http-conduit + mtl prettyprinter text zip-archive ]; executableHaskellDepends = [ - ansi-wl-pprint base bimap optparse-applicative text + base bimap optparse-applicative prettyprinter-ansi-terminal text ]; testHaskellDepends = [ base containers tasty-hspec text ]; description = "Generate nix for Jenkins plugins"; @@ -151967,21 +151657,6 @@ self: { }) {}; "jira-wiki-markup" = callPackage - ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: - mkDerivation { - pname = "jira-wiki-markup"; - version = "1.3.5"; - sha256 = "0k5z2lxj5xp9hpr3mmdbzkd0yn718477pqjvymyz361h938rqnz5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl parsec text ]; - executableHaskellDepends = [ base text ]; - testHaskellDepends = [ base parsec tasty tasty-hunit text ]; - description = "Handle Jira wiki markup"; - license = lib.licenses.mit; - }) {}; - - "jira-wiki-markup_1_4_0" = callPackage ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; @@ -151994,7 +151669,6 @@ self: { testHaskellDepends = [ base parsec tasty tasty-hunit text ]; description = "Handle Jira wiki markup"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "jmacro" = callPackage @@ -158103,25 +157777,6 @@ self: { }) {}; "language-c" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers, deepseq - , directory, filepath, happy, pretty, process, syb - }: - mkDerivation { - pname = "language-c"; - version = "0.8.3"; - sha256 = "0bi02jdirkys8v7flf39vrpla2a74z1z0sdhy9lb9v7cmcc6rmpk"; - libraryHaskellDepends = [ - array base bytestring containers deepseq directory filepath pretty - process syb - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ base directory filepath process ]; - description = "Analysis and generation of C code"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ expipiplus1 ]; - }) {}; - - "language-c_0_9_0_1" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers, deepseq , directory, filepath, happy, mtl, pretty, process }: @@ -158137,7 +157792,6 @@ self: { testHaskellDepends = [ base directory filepath process ]; description = "Analysis and generation of C code"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; @@ -159285,8 +158939,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "language-vhdl"; - version = "0.1.3"; - sha256 = "03n5cnr71zq3fl0ajjiyzjq2x2848lwd9gfp4kjkkjaxw0lb6bka"; + version = "0.1.4"; + sha256 = "19nz1qym3b3vfzfhiqaf2pg73am7l0c6dy1b7lxzjfbi7s0jfnva"; libraryHaskellDepends = [ base pretty ]; description = "VHDL AST and pretty printer in Haskell"; license = lib.licenses.bsd3; @@ -163071,14 +162725,15 @@ self: { "lifx-lan" = callPackage ({ mkDerivation, base, binary, bytestring, composition, containers , extra, monad-loops, mtl, network, random, safe, text, time + , transformers }: mkDerivation { pname = "lifx-lan"; - version = "0.1.0.2"; - sha256 = "0kk89h1jxz7djxcxz4scwk33r9y1raq8mskypcyx93hzs0f1b4y1"; + version = "0.3.0"; + sha256 = "051h65m47vnhakg37a8dj1mbisxc9pb5zk4yp41dvcr0as2x4ngl"; libraryHaskellDepends = [ base binary bytestring composition containers extra monad-loops mtl - network random safe text time + network random safe text time transformers ]; description = "LIFX LAN API"; license = lib.licenses.bsd3; @@ -169213,8 +168868,8 @@ self: { }: mkDerivation { pname = "magma"; - version = "0.6.0.0"; - sha256 = "054drdwpks29mf22imwng8k6i7701yl9hijb4wh2a8wa4axssn9w"; + version = "0.6.1.0"; + sha256 = "08jbc29w6gw82z6jwhqwd123dh7nbxn6gs5hqqzj3d84ik268hzx"; libraryHaskellDepends = [ base deepseq profunctors semigroups ]; testHaskellDepends = [ base ghc-prim ]; description = "magma is an algebraic structure"; @@ -171893,34 +171548,6 @@ self: { }) {}; "mcmc" = callPackage - ({ mkDerivation, aeson, base, bytestring, circular, containers - , criterion, data-default, deepseq, directory, dirichlet - , double-conversion, hspec, log-domain, microlens, monad-parallel - , mwc-random, pretty-show, primitive, statistics, time - , transformers, vector, zlib - }: - mkDerivation { - pname = "mcmc"; - version = "0.4.0.0"; - sha256 = "1wfp73qis73xmzxwbxx3r9z55x6ydk5c6j0daf81zyllkv4mw9v4"; - libraryHaskellDepends = [ - aeson base bytestring circular containers data-default deepseq - directory dirichlet double-conversion log-domain microlens - monad-parallel mwc-random pretty-show primitive statistics time - transformers vector zlib - ]; - testHaskellDepends = [ - base hspec log-domain mwc-random statistics - ]; - benchmarkHaskellDepends = [ - base criterion log-domain microlens mwc-random - ]; - description = "Sample from a posterior using Markov chain Monte Carlo"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - }) {}; - - "mcmc_0_5_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, circular, containers , criterion, data-default, deepseq, directory, dirichlet , double-conversion, hspec, log-domain, microlens, monad-parallel @@ -177976,8 +177603,8 @@ self: { }: mkDerivation { pname = "monadic-recursion-schemes"; - version = "0.1.13.0"; - sha256 = "04n81zx1h68w9v8fihwhfbkyv7lb84p3nzppqf7zc55znbn67lym"; + version = "0.1.13.1"; + sha256 = "1lhawvr2nywdha59ci142xk1ijqp11pgn582zgb897zrqc2wbv7s"; libraryHaskellDepends = [ base comonad containers free mtl recursion-schemes transformers ]; @@ -178244,8 +177871,8 @@ self: { }: mkDerivation { pname = "mongoDB"; - version = "2.7.0.0"; - sha256 = "1gj97hfznhmfdvwdgf6fkizla2d9cy31933qw5i8p7fmh7igzgvk"; + version = "2.7.1.1"; + sha256 = "186ck64vk4s9jligj6mq3qbpm1mb87m7zs8p3jbizpv0fcgnwq70"; libraryHaskellDepends = [ array base base16-bytestring base64-bytestring binary bson bytestring conduit conduit-extra containers cryptohash @@ -178528,25 +178155,6 @@ self: { }) {}; "monoid-subclasses" = callPackage - ({ mkDerivation, base, bytestring, containers, primes, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; - version = "1.0.1"; - sha256 = "16ypv15brywq8s403v0c586py3pw2gii8z2i91l71qjq95ii8b53"; - libraryHaskellDepends = [ - base bytestring containers primes text vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - description = "Subclasses of Monoid"; - license = lib.licenses.bsd3; - }) {}; - - "monoid-subclasses_1_1" = callPackage ({ mkDerivation, base, bytestring, containers, primes, QuickCheck , quickcheck-instances, tasty, tasty-quickcheck, text, vector }: @@ -178563,7 +178171,6 @@ self: { ]; description = "Subclasses of Monoid"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -182254,20 +181861,6 @@ self: { }) {}; "mwc-random" = callPackage - ({ mkDerivation, base, math-functions, primitive, time, vector }: - mkDerivation { - pname = "mwc-random"; - version = "0.14.0.0"; - sha256 = "18pg24sw3b79b32cwx8q01q4k0lm34mwr3l6cdkchl8alvd0wdq0"; - libraryHaskellDepends = [ - base math-functions primitive time vector - ]; - doCheck = false; - description = "Fast, high quality pseudo random number generation"; - license = lib.licenses.bsd3; - }) {}; - - "mwc-random_0_15_0_1" = callPackage ({ mkDerivation, base, bytestring, doctest, gauge, math-functions , mersenne-random, primitive, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, time, vector @@ -182291,7 +181884,6 @@ self: { doCheck = false; description = "Fast, high quality pseudo random number generation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "mwc-random-accelerate" = callPackage @@ -184259,8 +183851,8 @@ self: { }: mkDerivation { pname = "net-mqtt"; - version = "0.7.1.0"; - sha256 = "1l19hmc3623gsx1yv0wcbgcy22p549zyrvfv44khzd45fl3fxfb7"; + version = "0.7.1.1"; + sha256 = "0iy39a2rncaasf5psjnsgkmigggx9apk9xvq354idw69b1bjhvnv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -184911,16 +184503,14 @@ self: { license = lib.licenses.bsd3; }) {}; - "network_3_1_2_1" = callPackage + "network_3_1_2_2" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, hspec , hspec-discover, HUnit, QuickCheck, temporary }: mkDerivation { pname = "network"; - version = "3.1.2.1"; - sha256 = "0jlx8dls0h95znpcb66bd95k4mp3aaa733h89pq5ymyb8m29bapw"; - revision = "1"; - editedCabalFile = "12swsygnsnyvfjm3p9b6z8jh8vbw3q5akmggacsvr4fdm2p6v38q"; + version = "3.1.2.2"; + sha256 = "1dhflq7im3sjc6ascf12z73mhw7cqv1aqfvv3y5m9izr485jq0am"; libraryHaskellDepends = [ base bytestring deepseq directory ]; testHaskellDepends = [ base bytestring directory hspec HUnit QuickCheck temporary @@ -188347,6 +187937,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-http" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, http-client + , http-client-tls, http-types, mime-types, network-uri + , nri-observability, nri-prelude, safe-exceptions, text, wai, warp + }: + mkDerivation { + pname = "nri-http"; + version = "0.1.0.1"; + sha256 = "11zrqfljnq922frbsyiwap8ayp8faq7cwbrmk0npg4qgv4gv2pz2"; + libraryHaskellDepends = [ + aeson base bytestring conduit http-client http-client-tls + http-types mime-types network-uri nri-observability nri-prelude + safe-exceptions text + ]; + testHaskellDepends = [ + aeson base bytestring conduit http-client http-client-tls + http-types mime-types network-uri nri-observability nri-prelude + safe-exceptions text wai warp + ]; + description = "Make Elm style HTTP requests"; + license = lib.licenses.bsd3; + }) {}; + "nri-observability" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs , bytestring, directory, hostname, http-client, http-client-tls @@ -188355,8 +187968,8 @@ self: { }: mkDerivation { pname = "nri-observability"; - version = "0.1.0.2"; - sha256 = "19nil7vyjbvbjlapvrxky8fkxdl3f2xhqdi3a5m5i5lyawm74b6z"; + version = "0.1.0.3"; + sha256 = "0njpgc873rh09hkg7pnagkmmrd8nibdq4q1p44wa3n71xzwzy771"; libraryHaskellDepends = [ aeson aeson-pretty async base bugsnag-hs bytestring directory hostname http-client http-client-tls nri-env-parser nri-prelude @@ -188371,6 +187984,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "nri-observability_0_1_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, async, base, bugsnag-hs + , bytestring, directory, hostname, http-client, http-client-tls + , nri-env-parser, nri-prelude, random, safe-exceptions, stm, text + , time, unordered-containers, uuid + }: + mkDerivation { + pname = "nri-observability"; + version = "0.1.1.0"; + sha256 = "17zr60z6i07cnqs6x2r3lzd5hk0g8sh10hyckh84ynyjpdzksggd"; + libraryHaskellDepends = [ + aeson aeson-pretty async base bugsnag-hs bytestring directory + hostname http-client http-client-tls nri-env-parser nri-prelude + random safe-exceptions stm text time unordered-containers uuid + ]; + testHaskellDepends = [ + aeson aeson-pretty async base bugsnag-hs bytestring directory + hostname http-client http-client-tls nri-env-parser nri-prelude + random safe-exceptions stm text time unordered-containers uuid + ]; + description = "Report log spans collected by nri-prelude"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "nri-prelude" = callPackage ({ mkDerivation, aeson, aeson-pretty, async, auto-update, base , bytestring, containers, directory, exceptions, filepath, ghc @@ -188380,8 +188018,8 @@ self: { }: mkDerivation { pname = "nri-prelude"; - version = "0.6.0.1"; - sha256 = "10gfw6vs2vc1jll80lirzjplwx3p3l9yssddqjklnd67rnvm95r4"; + version = "0.6.0.2"; + sha256 = "002bq6qwaiw4v30b677hg8pv2sa9iaqdv90h02fbq4pkhqsqhpkw"; libraryHaskellDepends = [ aeson aeson-pretty async auto-update base bytestring containers directory exceptions filepath ghc hedgehog junit-xml pretty-diff @@ -189404,21 +189042,20 @@ self: { "o-clock" = callPackage ({ mkDerivation, base, doctest, ghc-prim, Glob, hedgehog - , markdown-unlit, tasty, tasty-hedgehog, tasty-hspec, type-spec + , hspec-expectations, markdown-unlit, tasty, tasty-hedgehog + , tasty-hunit-compat, type-spec }: mkDerivation { pname = "o-clock"; - version = "1.2.0.1"; - sha256 = "039p0jjpmlkbz21szfj4abnjyi0k34m6b8fqpsmyj94nbq1qldy4"; - revision = "1"; - editedCabalFile = "0fxgbi56x61sm84qwks1hk8maxn7zl4jfbhgxfwq6w0jg1xdqdhm"; + version = "1.2.1"; + sha256 = "17y44aajipysw1p268rq8a6lhv9cdhkvxjcpcdij93sqp818q96z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ghc-prim ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base doctest Glob hedgehog markdown-unlit tasty tasty-hedgehog - tasty-hspec type-spec + base doctest Glob hedgehog hspec-expectations markdown-unlit tasty + tasty-hedgehog tasty-hunit-compat type-spec ]; testToolDepends = [ doctest markdown-unlit ]; description = "Type-safe time library"; @@ -189711,8 +189348,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "observable-sharing"; - version = "0.2.4"; - sha256 = "1lqig0r4f7gqjdymsc4jpwspc3jr01xkmk5cgiqr5ngxvk6zw3j0"; + version = "0.2.5"; + sha256 = "06mz3snyqx7b67dl786mwsc75nfnq3a40p581rhaf1y4r7cr6iv6"; libraryHaskellDepends = [ base containers ]; description = "Simple observable sharing"; license = lib.licenses.bsd3; @@ -189894,20 +189531,21 @@ self: { inherit (pkgs) systemd;}; "odbc" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , formatting, hspec, optparse-applicative, parsec, QuickCheck - , semigroups, template-haskell, text, time, transformers, unixODBC - , unliftio-core, weigh + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , deepseq, formatting, hashable, hspec, optparse-applicative + , parsec, QuickCheck, semigroups, template-haskell, text, time + , transformers, unixODBC, unliftio-core, weigh }: mkDerivation { pname = "odbc"; - version = "0.2.2"; - sha256 = "0dkkkrv43kl3643i0j4hgj1mcsk1jhrl086dygd6hqb9hd4156k5"; + version = "0.2.5"; + sha256 = "157g6ys5j5kj4cc1jp2rmcpwrax4fh7bx1zvvicmrf88qaq56v2h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring containers deepseq formatting parsec - semigroups template-haskell text time transformers unliftio-core + async attoparsec base bytestring containers deepseq formatting + hashable parsec semigroups template-haskell text time transformers + unliftio-core ]; librarySystemDepends = [ unixODBC ]; executableHaskellDepends = [ @@ -194313,64 +193951,6 @@ self: { }) {}; "pandoc" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , case-insensitive, citeproc, commonmark, commonmark-extensions - , commonmark-pandoc, connection, containers, data-default, deepseq - , Diff, directory, doclayout, doctemplates, emojis, exceptions - , file-embed, filepath, Glob, haddock-library, hslua - , hslua-module-path, hslua-module-system, hslua-module-text, HsYAML - , HTTP, http-client, http-client-tls, http-types, ipynb - , jira-wiki-markup, JuicyPixels, mtl, network, network-uri - , pandoc-types, parsec, process, QuickCheck, random, safe - , scientific, SHA, skylighting, skylighting-core, split, syb - , tagsoup, tasty, tasty-bench, tasty-golden, tasty-hunit, tasty-lua - , tasty-quickcheck, temporary, texmath, text, text-conversions - , time, unicode-transforms, unix, unordered-containers, xml - , xml-conduit, zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; - version = "2.13"; - sha256 = "1f725bbazqw81gfw3wn8ii8pb4qj5z49jibl1l4l972gsgfbmgrh"; - configureFlags = [ "-fhttps" "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring binary - blaze-html blaze-markup bytestring case-insensitive citeproc - commonmark commonmark-extensions commonmark-pandoc connection - containers data-default deepseq directory doclayout doctemplates - emojis exceptions file-embed filepath Glob haddock-library hslua - hslua-module-path hslua-module-system hslua-module-text HsYAML HTTP - http-client http-client-tls http-types ipynb jira-wiki-markup - JuicyPixels mtl network network-uri pandoc-types parsec process - random safe scientific SHA skylighting skylighting-core split syb - tagsoup temporary texmath text text-conversions time - unicode-transforms unix unordered-containers xml xml-conduit - zip-archive zlib - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring containers Diff directory doctemplates exceptions - filepath Glob hslua mtl pandoc-types process QuickCheck tasty - tasty-golden tasty-hunit tasty-lua tasty-quickcheck text time xml - zip-archive - ]; - benchmarkHaskellDepends = [ - base bytestring containers deepseq mtl tasty-bench text time - ]; - postInstall = '' - mkdir -p $out/share/man/man1 - mv "man/"*.1 $out/share/man/man1/ - ''; - description = "Conversion between markup formats"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ peti ]; - }) {}; - - "pandoc_2_14_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -194389,8 +193969,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.14.0.1"; - sha256 = "0fyhmdd1qnf9z4k1m8mm4m1p4lvpirlxx78plglch5h4xqidibr3"; + version = "2.14.0.2"; + sha256 = "1jnckx29l6plg1zbkjdfj530djjl8zszwr54zsg0k0is4pcswa9f"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -194425,7 +194005,6 @@ self: { ''; description = "Conversion between markup formats"; license = lib.licenses.gpl2Plus; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ peti ]; }) {}; @@ -194521,33 +194100,32 @@ self: { license = lib.licenses.gpl2Only; }) {}; - "pandoc-crossref_0_3_11_0" = callPackage - ({ mkDerivation, base, containers, criterion, data-accessor - , data-accessor-template, data-accessor-transformers, data-default - , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser - , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb - , template-haskell, temporary, text, utility-ht + "pandoc-crossref_0_3_12_0" = callPackage + ({ mkDerivation, base, containers, criterion, data-default, deepseq + , directory, filepath, gitrev, hspec, microlens, microlens-mtl + , microlens-th, mtl, open-browser, optparse-applicative, pandoc + , pandoc-types, roman-numerals, syb, template-haskell, temporary + , text, utility-ht }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.11.0"; - sha256 = "1czz54px5pv5a5ijxllz3nrq5s5k4rb05xb8r29drrnz13j45chk"; + version = "0.3.12.0"; + sha256 = "0y991lp6bgjiz67b1w6jywhwzwq5kf385pzl91s4g22lfnhwc7sz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base containers data-accessor data-accessor-template - data-accessor-transformers data-default directory filepath mtl - pandoc pandoc-types roman-numerals syb template-haskell text - utility-ht + base containers data-default directory filepath microlens + microlens-mtl microlens-th mtl pandoc pandoc-types roman-numerals + syb template-haskell text utility-ht ]; executableHaskellDepends = [ base deepseq gitrev open-browser optparse-applicative pandoc pandoc-types template-haskell temporary text ]; testHaskellDepends = [ - base containers data-accessor data-default directory filepath hspec - mtl pandoc pandoc-types text + base containers data-default directory filepath hspec microlens mtl + pandoc pandoc-types text ]; benchmarkHaskellDepends = [ base criterion pandoc pandoc-types text @@ -197252,8 +196830,10 @@ self: { }: mkDerivation { pname = "path"; - version = "0.7.1"; - sha256 = "1z2gj4108827lb03f7cdqhijjgqjvv9glzrzfv96cxkwgi6y38jx"; + version = "0.8.0"; + sha256 = "0vzsa41q5sxs1ni72yv1vfpnc6r5mjdwnmdb6jrs6cszb2xlkjr4"; + revision = "1"; + editedCabalFile = "02vhx94mqapyigvayb6cj7p7snn354pb542n3qyvsm0gih52wlja"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath hashable template-haskell text @@ -197266,7 +196846,7 @@ self: { license = lib.licenses.bsd3; }) {}; - "path_0_8_0" = callPackage + "path_0_9_0" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions , filepath, genvalidity, genvalidity-hspec, genvalidity-property , hashable, hspec, mtl, QuickCheck, template-haskell, text @@ -197274,10 +196854,8 @@ self: { }: mkDerivation { pname = "path"; - version = "0.8.0"; - sha256 = "0vzsa41q5sxs1ni72yv1vfpnc6r5mjdwnmdb6jrs6cszb2xlkjr4"; - revision = "1"; - editedCabalFile = "02vhx94mqapyigvayb6cj7p7snn354pb542n3qyvsm0gih52wlja"; + version = "0.9.0"; + sha256 = "14h811rrydpiwi1rdi5wmcdlcq2qjld3iv92p4czqf08a7lxaz4g"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath hashable template-haskell text @@ -198708,8 +198286,8 @@ self: { ({ mkDerivation, base, leancheck }: mkDerivation { pname = "percent-format"; - version = "0.0.1"; - sha256 = "028c8rnv86mln9pdhb6w4i56n07hlslg69f3pmcjpb7ilr5scc3m"; + version = "0.0.2"; + sha256 = "0nlfva8ldvq169q76ng2f23bdnyzc6q8a7bq4lgwr9ypw96i503f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base leancheck ]; description = "simple printf-style string formatting"; @@ -198730,21 +198308,20 @@ self: { }) {}; "perceptual-hash" = callPackage - ({ mkDerivation, base, containers, cpphs, criterion, deepseq - , filepath, hip, hspec, optparse-applicative, par-traverse - , primitive, stm, vector, vector-algorithms + ({ mkDerivation, base, bytestring, containers, cpphs, criterion + , deepseq, filepath, hip, hspec, JuicyPixels, optparse-applicative + , par-traverse, primitive, stm, vector, vector-algorithms, webp }: mkDerivation { pname = "perceptual-hash"; - version = "0.1.3.5"; - sha256 = "0f36sy9ixwbx55m3634lr0hrhllj68wv5jilzq0xik2171g3rx2p"; - revision = "1"; - editedCabalFile = "0s67w3sc480vrmdjr67y6gjyhfik6v2lrh99abcgj6ikgiwx2lbf"; + version = "0.1.4.2"; + sha256 = "08zb8060ixk67jhr9h74zix9m1svpigz5l4ii97qi88l1xdxfx36"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base hip primitive vector vector-algorithms + base bytestring hip JuicyPixels primitive vector vector-algorithms + webp ]; executableHaskellDepends = [ base containers filepath optparse-applicative par-traverse stm @@ -199284,6 +198861,43 @@ self: { maintainers = with lib.maintainers; [ psibi ]; }) {}; + "persistent_2_13_0_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, bytestring, conduit, containers, criterion, deepseq + , fast-logger, file-embed, hspec, http-api-data, lift-type + , monad-logger, mtl, path-pieces, QuickCheck, quickcheck-instances + , resource-pool, resourcet, scientific, shakespeare, silently + , template-haskell, text, th-lift-instances, time, transformers + , unliftio, unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.13.0.3"; + sha256 = "0jlrkyy10cz6rq47r75q9l5ycyrdjwxs810x7v5ijrimdd9cv24d"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger http-api-data lift-type monad-logger + mtl path-pieces resource-pool resourcet scientific silently + template-haskell text th-lift-instances time transformers unliftio + unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger hspec http-api-data monad-logger mtl + path-pieces QuickCheck quickcheck-instances resource-pool resourcet + scientific shakespeare silently template-haskell text + th-lift-instances time transformers unliftio unliftio-core + unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq file-embed template-haskell text + ]; + description = "Type-safe, multi-backend data serialization"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -199714,6 +199328,40 @@ self: { license = lib.licenses.mit; }) {}; + "persistent-postgresql_2_13_0_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , conduit, containers, fast-logger, hspec, hspec-expectations + , hspec-expectations-lifted, http-api-data, HUnit, monad-logger + , mtl, path-pieces, persistent, persistent-qq, persistent-test + , postgresql-libpq, postgresql-simple, QuickCheck + , quickcheck-instances, resource-pool, resourcet + , string-conversions, text, time, transformers, unliftio + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.13.0.3"; + sha256 = "06f5yyv8bj3m4zpjwr1k66hkmh1gfy624rnq2g12sjrpz8nrax6j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring conduit containers + monad-logger mtl persistent postgresql-libpq postgresql-simple + resource-pool resourcet string-conversions text time transformers + unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec + hspec-expectations hspec-expectations-lifted http-api-data HUnit + monad-logger path-pieces persistent persistent-qq persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio unliftio-core unordered-containers vector + ]; + description = "Backend for the persistent library using postgresql"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -204789,8 +204437,8 @@ self: { }: mkDerivation { pname = "polysemy-chronos"; - version = "0.1.2.1"; - sha256 = "0b33an8swx97fg6196vvs0zic3zkhigxy6zi2r6pbrw9v8fgwkqa"; + version = "0.1.2.2"; + sha256 = "15vi5x099r38jk3lnynpi8my4fp06fkzwvrxgpvxdfp9ilg2al6h"; libraryHaskellDepends = [ aeson base chronos containers polysemy polysemy-plugin polysemy-time relude text @@ -205038,8 +204686,8 @@ self: { ({ mkDerivation, base, optics, polysemy, polysemy-zoo }: mkDerivation { pname = "polysemy-optics"; - version = "0.1.0.0"; - sha256 = "1ym2da08wy5pbdijrvn769w644dyma8hc010f8phqjnpkhq4j0z5"; + version = "0.1.0.1"; + sha256 = "1503qfi0kp8p4h723nkwidgxp46wmfxi93vsyvdp6i7zwvg09yy2"; libraryHaskellDepends = [ base optics polysemy polysemy-zoo ]; description = "Optics for Polysemy"; license = lib.licenses.bsd2; @@ -205109,8 +204757,8 @@ self: { }: mkDerivation { pname = "polysemy-test"; - version = "0.3.1.2"; - sha256 = "1gzngz8mspq0n6hwhvqah8szjrhf65wigadrh3l863j2iswsxq2r"; + version = "0.3.1.3"; + sha256 = "0m6zczyw4shgrpfyz23m9n3626mxcfqj0sdfcrnlkz7n0k0k0470"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers either hedgehog path path-io polysemy @@ -205134,8 +204782,8 @@ self: { }: mkDerivation { pname = "polysemy-time"; - version = "0.1.2.1"; - sha256 = "16b0wj6f9pcxq5in53yh2p52pj1w358f412rpvyhz376ak7z6h71"; + version = "0.1.2.2"; + sha256 = "1q08dwyp4v28s31gfq2ha8irfhczxzhg9c96wps6iz5xl7cir9va"; libraryHaskellDepends = [ aeson base composition containers data-default either polysemy relude string-interpolate template-haskell text time torsor @@ -212593,8 +212241,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "2.1.0.2"; - sha256 = "0xrmjdika7y2hkp67kzh7xqc3v9j6db1rq2ksih1j9yypa1iihka"; + version = "2.1.0.3"; + sha256 = "1v9mibzvj5qfx9b5wgg9ragqd54xqmxb20afnmnw5c5yiglzazxd"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite hashable http-client http-client-tls http-types memory text time @@ -215035,10 +214683,8 @@ self: { ({ mkDerivation, base, HUnit, lens, profunctors }: mkDerivation { pname = "radian"; - version = "0.1"; - sha256 = "150vb9wk73avh8rrsz92y1fcwlm30w4k23lbdncb8ivinqhdi4pv"; - revision = "1"; - editedCabalFile = "1mkk17rrg2z6s1qkzz7qcm6q6qvgmcmvii9rzjzgn73m1x1l5rim"; + version = "0.2"; + sha256 = "18kgxwlfrd70z43z8sg50hz3xhr2iaa1cnc3gc0dz9g8195w8w6q"; libraryHaskellDepends = [ base profunctors ]; testHaskellDepends = [ base HUnit lens ]; description = "Isomorphisms for measurements that use radians"; @@ -218685,6 +218331,8 @@ self: { pname = "reflex"; version = "0.8.1.0"; sha256 = "0p27dj7fckkvw9li69whcfrv1cd59kkp6qbvfmndzx8fbh44ggbp"; + revision = "1"; + editedCabalFile = "07bvrcfbnz1pv15cmk4f780aiw72gbhsji20kqyk8kk7d2jwpcab"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts @@ -219042,6 +218690,8 @@ self: { pname = "reflex-fsnotify"; version = "0.2.1.2"; sha256 = "1g5zm12ypqr0agrgmbyglhh5f9p933hba2dismbyywsgdmn1i9bl"; + revision = "1"; + editedCabalFile = "1hpi0wnvif72n3mfnrypa3psl82wfw60l36cn2j8fdp7lrvzxa88"; libraryHaskellDepends = [ base containers directory filepath fsnotify reflex ]; @@ -219290,6 +218940,8 @@ self: { pname = "reflex-process"; version = "0.3.1.0"; sha256 = "1z86h7wkzg69d6kw0y37pzr4ldpg9qkl8wx5mw7r1h82isb9wgbl"; + revision = "1"; + editedCabalFile = "16vwrz7amccy8j2wn9146j8lif35f7ycpssd0p649ha746s7hrf4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -219373,10 +219025,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.1.4.1"; - sha256 = "0hv2h1pzz808bg2bvignb3d2wma1aw96zdf545f9p01vjr1b656a"; - revision = "1"; - editedCabalFile = "0gpfbpzcg516kghsgwc4gnbp217p6phw9bh1qhlkzd0ji35gdibm"; + version = "0.1.4.2"; + sha256 = "07fjw95w8ahllbs1zp215apck01abcrv4sshid8z6972g7n7392r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220593,6 +220243,31 @@ self: { license = lib.licenses.mit; }) {}; + "rel8" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, contravariant, hasql, hedgehog, lifted-base + , monad-control, opaleye, profunctors, scientific, semialign + , semigroupoids, tasty, tasty-hedgehog, text, these, time + , tmp-postgres, transformers, uuid + }: + mkDerivation { + pname = "rel8"; + version = "1.0.0.0"; + sha256 = "1y9b6b56h0pmxbfvjbjxrn07g1apmvs1nb4agsw4h86w7h0qgaj4"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive contravariant hasql opaleye + profunctors scientific semialign semigroupoids text these time + transformers uuid + ]; + testHaskellDepends = [ + base bytestring case-insensitive containers hasql hedgehog + lifted-base monad-control scientific tasty tasty-hedgehog text time + tmp-postgres uuid + ]; + description = "Hey! Hey! Can u rel8?"; + license = lib.licenses.bsd3; + }) {}; + "relacion" = callPackage ({ mkDerivation, array, base, containers }: mkDerivation { @@ -223348,27 +223023,27 @@ self: { ({ mkDerivation, aeson, async, attoparsec, base, bifunctors, binary , blaze-builder, bytestring, containers, criterion , data-default-class, deepseq, enclosed-exceptions, exceptions - , hashable, HUnit, mersenne-random-pure64, monad-control, mtl - , network, process, protocol-buffers, pureMD5, QuickCheck, random + , hashable, HUnit, mersenne-random-pure64, microlens, monad-control + , mtl, network, process, proto-lens, pureMD5, QuickCheck, random , resource-pool, riak-protobuf, semigroups, stm, tasty, tasty-hunit , tasty-quickcheck, template-haskell, text, time, transformers , transformers-base, unordered-containers, vector, yaml }: mkDerivation { pname = "riak"; - version = "1.1.2.6"; - sha256 = "0dialr56k5406zav54hk4lx6dr9yisv8yq0hrjjga5my08ga5v4y"; + version = "1.2.0.0"; + sha256 = "0dbdw7jxs2sklj32m7qv8nf6g3dsax2pr8qbkm72iy32yryx6ji0"; libraryHaskellDepends = [ aeson async attoparsec base bifunctors binary blaze-builder bytestring containers data-default-class deepseq enclosed-exceptions exceptions hashable mersenne-random-pure64 - monad-control network protocol-buffers pureMD5 random resource-pool + monad-control network proto-lens pureMD5 random resource-pool riak-protobuf semigroups stm text time transformers transformers-base unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers data-default-class HUnit mtl - process QuickCheck riak-protobuf semigroups tasty tasty-hunit + aeson base bytestring containers data-default-class HUnit microlens + mtl process QuickCheck riak-protobuf semigroups tasty tasty-hunit tasty-quickcheck template-haskell text yaml ]; benchmarkHaskellDepends = [ base bytestring criterion semigroups ]; @@ -223378,16 +223053,12 @@ self: { }) {}; "riak-protobuf" = callPackage - ({ mkDerivation, array, base, parsec, protocol-buffers - , protocol-buffers-descriptor - }: + ({ mkDerivation, base, proto-lens, proto-lens-runtime }: mkDerivation { pname = "riak-protobuf"; - version = "0.24.0.0"; - sha256 = "175sww7s8r1brl3iz2m3vxx8ffk059ciyvzxqfn47cwf8yljw10s"; - libraryHaskellDepends = [ - array base parsec protocol-buffers protocol-buffers-descriptor - ]; + version = "0.25.0.0"; + sha256 = "1r4rhgdwr2pnr01szdci8l0nmf0fd1vbj8a323lj946rj472kxri"; + libraryHaskellDepends = [ base proto-lens proto-lens-runtime ]; description = "Haskell types for the Riak protocol buffer API"; license = "unknown"; hydraPlatforms = lib.platforms.none; @@ -223399,8 +223070,8 @@ self: { }: mkDerivation { pname = "riak-protobuf-lens"; - version = "0.24.0.0"; - sha256 = "1qmpa4vg5mxkx804c2bl6dnsgwrvv9hj62a208ns2smps6fnbndh"; + version = "0.25.0.0"; + sha256 = "1znqdz51aaripzz1qxkfpwcmrygg462kd1vf47v1gm6rwk55ianl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -223784,6 +223455,20 @@ self: { license = lib.licenses.mit; }) {}; + "rio-app" = callPackage + ({ mkDerivation, base, optparse-simple, resourcet, rio }: + mkDerivation { + pname = "rio-app"; + version = "0.1.0.0"; + sha256 = "0ra76ssnffykdjqy56zqf30nbj9y1bf01897kflj0y68ri7vzsva"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base resourcet rio ]; + executableHaskellDepends = [ base optparse-simple resourcet rio ]; + description = "Generic App type for rio"; + license = lib.licenses.bsd3; + }) {}; + "rio-orphans" = callPackage ({ mkDerivation, base, exceptions, fast-logger, hspec , monad-control, monad-logger, resourcet, rio, transformers-base @@ -225367,38 +225052,6 @@ self: { }) {}; "rp-tree" = callPackage - ({ mkDerivation, base, benchpress, boxes, bytestring, conduit - , containers, deepseq, hspec, microlens, microlens-th, mtl - , psqueues, QuickCheck, serialise, splitmix, splitmix-distributions - , text, transformers, vector, vector-algorithms - }: - mkDerivation { - pname = "rp-tree"; - version = "0.4"; - sha256 = "1pni4pmvk2cb3x98lma0isbn8vh651pyql0dmjmg4nvr8i471iqf"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base boxes bytestring conduit containers deepseq microlens - microlens-th mtl psqueues serialise splitmix splitmix-distributions - text transformers vector vector-algorithms - ]; - executableHaskellDepends = [ - base conduit containers splitmix splitmix-distributions - transformers vector - ]; - testHaskellDepends = [ - base conduit hspec QuickCheck splitmix-distributions - ]; - benchmarkHaskellDepends = [ - base benchpress conduit deepseq splitmix splitmix-distributions - transformers vector - ]; - description = "Random projection trees"; - license = lib.licenses.bsd3; - }) {}; - - "rp-tree_0_6" = callPackage ({ mkDerivation, base, benchpress, boxes, bytestring, conduit , containers, deepseq, heaps, hspec, mtl, QuickCheck, serialise , splitmix, splitmix-distributions, text, transformers, vector @@ -225428,7 +225081,6 @@ self: { ]; description = "Random projection trees"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "rpc" = callPackage @@ -225542,6 +225194,25 @@ self: { broken = true; }) {}; + "rrb-vector" = callPackage + ({ mkDerivation, base, deepseq, gauge, hspec, indexed-traversable + , primitive, QuickCheck + }: + mkDerivation { + pname = "rrb-vector"; + version = "0.1.0.0"; + sha256 = "1kn4ygi0jrx0a6s6cbfxx60r2vqgzrqflm5yaffjlwb55jf88m8i"; + revision = "1"; + editedCabalFile = "1ydx0mxkqfjdgq9rqg2bzn5rqc0jdn8f40d4pa9yg0l00kjl4kcz"; + libraryHaskellDepends = [ + base deepseq indexed-traversable primitive + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ base gauge primitive ]; + description = "Efficient RRB-Vectors"; + license = lib.licenses.bsd3; + }) {}; + "rrule" = callPackage ({ mkDerivation, base, hspec, megaparsec, parser-combinators, text , time @@ -227452,8 +227123,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.0.7"; - sha256 = "1ndw054vp2ygxd86whqbsdvrbv49khh1a6ia9zlqzx3gjbhqpxxi"; + version = "0.1.0.8"; + sha256 = "0b0k01r85wiaxn264ax3xva8a2gy7vv9qnig2fxyr42zdkm289jy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -231405,8 +231076,8 @@ self: { }: mkDerivation { pname = "sequenceTools"; - version = "1.4.0.5"; - sha256 = "06wi43di0bja83iympx8pvka4zfwc4yyaw7chrddvxasnxqi369q"; + version = "1.5.0"; + sha256 = "0w3pk38nr0c6z0a7zpnh0kcdm7wpx7jcr0lmml56hab40filsh6c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232721,6 +232392,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "servant-gdp" = callPackage + ({ mkDerivation, aeson, base, gdp, servant-server, text }: + mkDerivation { + pname = "servant-gdp"; + version = "0.0.1.2"; + sha256 = "1ihj1dz3cx56c4gc31ixichl9gr64llhfpw60a4p9jr5dcqk7qll"; + libraryHaskellDepends = [ aeson base gdp servant-server text ]; + description = "Use Servant and GDP together to create expressive web API types"; + license = lib.licenses.bsd3; + }) {}; + "servant-generate" = callPackage ({ mkDerivation, base, servant, servant-server }: mkDerivation { @@ -234209,6 +233891,84 @@ self: { license = lib.licenses.mit; }) {}; + "servant-util" = callPackage + ({ mkDerivation, aeson, autoexporter, base, containers + , data-default, fmt, hspec, hspec-discover, hspec-expectations + , http-client, http-types, insert-ordered-containers, lens + , megaparsec, mtl, pretty-terminal, QuickCheck, reflection + , regex-posix, safe-exceptions, servant, servant-client + , servant-client-core, servant-server, servant-swagger + , servant-swagger-ui, servant-swagger-ui-core, swagger2, text + , text-format, time, universum, wai, wai-extra, warp + }: + mkDerivation { + pname = "servant-util"; + version = "0.1.0.1"; + sha256 = "0idb3h2482hhrj9yvphdb74wxyr2y3rzfql2q2qn2a724b1bmax4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base containers data-default fmt http-types + insert-ordered-containers lens megaparsec mtl pretty-terminal + QuickCheck reflection regex-posix safe-exceptions servant + servant-client servant-client-core servant-server servant-swagger + servant-swagger-ui servant-swagger-ui-core swagger2 text + text-format time universum wai + ]; + libraryToolDepends = [ autoexporter ]; + executableHaskellDepends = [ + aeson base containers data-default fmt http-types + insert-ordered-containers lens megaparsec mtl pretty-terminal + QuickCheck reflection regex-posix safe-exceptions servant + servant-client servant-client-core servant-server servant-swagger + servant-swagger-ui servant-swagger-ui-core swagger2 text + text-format time universum wai wai-extra warp + ]; + testHaskellDepends = [ + aeson base containers data-default fmt hspec hspec-expectations + http-client http-types insert-ordered-containers lens megaparsec + mtl pretty-terminal QuickCheck reflection regex-posix + safe-exceptions servant servant-client servant-client-core + servant-server servant-swagger servant-swagger-ui + servant-swagger-ui-core swagger2 text text-format time universum + wai warp + ]; + testToolDepends = [ hspec-discover ]; + description = "Servant servers utilities"; + license = lib.licenses.mpl20; + }) {}; + + "servant-util-beam-pg" = callPackage + ({ mkDerivation, autoexporter, base, beam-core, beam-postgres + , containers, hspec, hspec-discover, QuickCheck, servant + , servant-client, servant-client-core, servant-server, servant-util + , text, universum + }: + mkDerivation { + pname = "servant-util-beam-pg"; + version = "0.1.0.1"; + sha256 = "1qhs2bvlka3qm4kv64m5p5ldcd9nfgzs0za9vqy2z9fmdhzihxz1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base beam-core beam-postgres containers servant servant-client + servant-client-core servant-server servant-util text universum + ]; + libraryToolDepends = [ autoexporter ]; + executableHaskellDepends = [ + base beam-core beam-postgres containers servant servant-client + servant-client-core servant-server servant-util text universum + ]; + testHaskellDepends = [ + base beam-core beam-postgres containers hspec QuickCheck servant + servant-client servant-client-core servant-server servant-util text + universum + ]; + testToolDepends = [ hspec-discover ]; + description = "Implementation of servant-util primitives for beam-postgres"; + license = lib.licenses.mpl20; + }) {}; + "servant-validate" = callPackage ({ mkDerivation, base, containers, hspec, servant , should-not-typecheck, text @@ -239917,8 +239677,8 @@ self: { }: mkDerivation { pname = "slynx"; - version = "0.5.0.2"; - sha256 = "0qpw3h1lbz299gb2jdcsj7svhxsi9icqaws8xpik58a3hb0r8icb"; + version = "0.5.1.1"; + sha256 = "1qj68fl98j0l83iny0wcdjmc80qnjc0dzkc5n1q3zl10wl10c8mc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -239931,29 +239691,6 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "slynx_0_5_1_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix - , monad-logger, mwc-random, optparse-applicative, statistics, text - , transformers, vector - }: - mkDerivation { - pname = "slynx"; - version = "0.5.1.0"; - sha256 = "14wg6ws065wz0h8nid3w0bpspanyfarc2c3gs93225ismmbjk1ng"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - attoparsec base bytestring containers elynx-markov elynx-seq - elynx-tools elynx-tree hmatrix monad-logger mwc-random - optparse-applicative statistics text transformers vector - ]; - executableHaskellDepends = [ base ]; - description = "Handle molecular sequences"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - }) {}; - "small-bytearray-builder" = callPackage ({ mkDerivation, base, bytebuild, byteslice }: mkDerivation { @@ -241366,22 +241103,21 @@ self: { "snaplet-customauth" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, binary - , binary-orphans, bytestring, configurator, containers, errors - , heist, hoauth2, http-client, http-client-tls, lens, map-syntax - , mtl, random, snap, snap-core, text, time, transformers - , unordered-containers, uri-bytestring, xmlhtml + , binary-instances, bytestring, bytestring-show, configurator + , containers, errors, heist, hoauth2, http-client, http-client-tls + , lens, map-syntax, mtl, random, snap, snap-core, text, time + , transformers, unordered-containers, uri-bytestring, xmlhtml }: mkDerivation { pname = "snaplet-customauth"; - version = "0.1.2"; - sha256 = "0y1a8c9j1q1pzby5v4ajnafm6dr9fvxvvkiynvscyjsf73gp2myb"; - revision = "2"; - editedCabalFile = "00wa07aqsyp1q8xrhi2xglwqwzm20qq0pxfb353idsja2qbvynfj"; + version = "0.2"; + sha256 = "10brxk6fpblbc58wjfhp3frx6r4d13iqz704v804r2hhsj35rkfz"; libraryHaskellDepends = [ - aeson base base64-bytestring binary binary-orphans bytestring - configurator containers errors heist hoauth2 http-client - http-client-tls lens map-syntax mtl random snap snap-core text time - transformers unordered-containers uri-bytestring xmlhtml + aeson base base64-bytestring binary binary-instances bytestring + bytestring-show configurator containers errors heist hoauth2 + http-client http-client-tls lens map-syntax mtl random snap + snap-core text time transformers unordered-containers + uri-bytestring xmlhtml ]; description = "Alternate authentication snaplet"; license = lib.licenses.bsd3; @@ -243868,8 +243604,8 @@ self: { ({ mkDerivation, base, cmdargs, containers, express, leancheck }: mkDerivation { pname = "speculate"; - version = "0.4.8"; - sha256 = "1xrrd1r4sbhvahdd3k9xnh8w9mmk4zh738q9blrjnvnd560wybp4"; + version = "0.4.10"; + sha256 = "05yypi40k5ijml8zbv195pfl5xa1l5cz4sx5mz721jr6dvag6jn8"; libraryHaskellDepends = [ base cmdargs containers express leancheck ]; @@ -245343,8 +245079,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "stable-marriage"; - version = "0.2.1.0"; - sha256 = "1dv4333an20mlhmsxhaldjcj54pnkjvp7zpiasd6shii5d4cn0z1"; + version = "0.2.1.1"; + sha256 = "1ddmd7xk8a8a2baahnrn7gaj3ckn27f3hlcrimgi7m03kp00am17"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim ]; description = "algorithms around stable marriage"; @@ -249075,6 +248811,8 @@ self: { pname = "streamly-fsnotify"; version = "1.1.1.0"; sha256 = "1xcw4rsrysh96d91wjmyzb5s7cls3rf0ilpv8dn525iqzv11fl3l"; + revision = "1"; + editedCabalFile = "0lcpps69dk4xr4wd1z5zpykvsfqrd0jlqx87rqbzjndgrw9xh685"; libraryHaskellDepends = [ base filepath fsnotify semirings streamly text time ]; @@ -251968,31 +251706,6 @@ self: { }) {}; "swish" = callPackage - ({ mkDerivation, base, containers, directory, filepath, hashable - , HUnit, intern, mtl, network-uri, old-locale, polyparse - , semigroups, test-framework, test-framework-hunit, text, time - }: - mkDerivation { - pname = "swish"; - version = "0.10.0.4"; - sha256 = "0rad5rx8hxh0ay4q0lfbn4jggvl3wf3chhjf34rpppzdd6b7r75m"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers directory filepath hashable intern mtl network-uri - old-locale polyparse text time - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers hashable HUnit network-uri old-locale semigroups - test-framework test-framework-hunit text time - ]; - description = "A semantic web toolkit"; - license = lib.licenses.lgpl21Only; - }) {}; - - "swish_0_10_0_5" = callPackage ({ mkDerivation, base, containers, directory, filepath, hashable , HUnit, intern, mtl, network-uri, old-locale, polyparse , semigroups, test-framework, test-framework-hunit, text, time @@ -252015,7 +251728,6 @@ self: { ]; description = "A semantic web toolkit"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {}; "swiss-ephemeris" = callPackage @@ -252195,6 +251907,33 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest_0_3_0_0" = callPackage + ({ mkDerivation, async, base, bytestring, containers, Diff, dlist + , envparse, filepath, MonadRandom, mtl, optparse-applicative, path + , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle + , safe, safe-coloured-text, safe-coloured-text-terminfo, split, stm + , sydtest-discover, text, yaml, yamlparse-applicative + }: + mkDerivation { + pname = "sydtest"; + version = "0.3.0.0"; + sha256 = "0swab5qfhp9r7rkqzfbvna0vhzbf7f6gabv266jdc5ghmimy1729"; + libraryHaskellDepends = [ + async base bytestring containers Diff dlist envparse filepath + MonadRandom mtl optparse-applicative path path-io pretty-show + QuickCheck quickcheck-io random-shuffle safe safe-coloured-text + safe-coloured-text-terminfo split text yaml yamlparse-applicative + ]; + testHaskellDepends = [ + base bytestring path path-io QuickCheck safe-coloured-text + safe-coloured-text-terminfo stm text + ]; + testToolDepends = [ sydtest-discover ]; + description = "A modern testing framework for Haskell with good defaults and advanced testing features"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, path , path-io, sydtest, sydtest-discover, text @@ -252310,18 +252049,39 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-persistent" = callPackage + ({ mkDerivation, base, monad-logger, mtl, persistent + , persistent-sqlite, persistent-template, sydtest, sydtest-discover + }: + mkDerivation { + pname = "sydtest-persistent"; + version = "0.0.0.0"; + sha256 = "1r9mzjrffncl39d9q4kcwjwyv7srf08qnq65l8lvncrjci9fdc0i"; + libraryHaskellDepends = [ + base monad-logger mtl persistent persistent-template sydtest + ]; + testHaskellDepends = [ + base monad-logger persistent persistent-sqlite persistent-template + sydtest + ]; + testToolDepends = [ sydtest-discover ]; + description = "A persistent companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-persistent-postgresql" = callPackage ({ mkDerivation, base, monad-logger, mtl, persistent , persistent-postgresql, persistent-template, sydtest - , sydtest-discover, tmp-postgres + , sydtest-discover, sydtest-persistent, tmp-postgres }: mkDerivation { pname = "sydtest-persistent-postgresql"; - version = "0.1.0.0"; - sha256 = "1g669w4rcjd7pnf6hrcc5lb6li30m9fdkrchm00bmg1350kxmnmp"; + version = "0.2.0.0"; + sha256 = "0c3f9m3d7nryb2xvfp7zrqqi9136mgf89ccwg8vlaapnx1bqap43"; libraryHaskellDepends = [ base monad-logger mtl persistent persistent-postgresql sydtest - tmp-postgres + sydtest-persistent tmp-postgres ]; testHaskellDepends = [ base persistent persistent-postgresql persistent-template sydtest @@ -252353,6 +252113,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-persistent-sqlite_0_2_0_0" = callPackage + ({ mkDerivation, base, monad-logger, mtl, persistent + , persistent-sqlite, persistent-template, sydtest, sydtest-discover + , sydtest-persistent + }: + mkDerivation { + pname = "sydtest-persistent-sqlite"; + version = "0.2.0.0"; + sha256 = "1l17n6hgc64ngjfdgg6c1zhnlg6ks9bvb7hbv5yf454bhbm6p83s"; + libraryHaskellDepends = [ + base monad-logger mtl persistent persistent-sqlite + persistent-template sydtest sydtest-persistent + ]; + testHaskellDepends = [ + base persistent persistent-sqlite persistent-template sydtest + ]; + testToolDepends = [ sydtest-discover ]; + description = "A persistent-sqlite companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-process" = callPackage ({ mkDerivation, base, bytestring, process, sydtest , sydtest-discover @@ -252410,6 +252192,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-servant_0_2_0_0" = callPackage + ({ mkDerivation, base, http-client, servant, servant-client + , servant-server, stm, sydtest, sydtest-discover, sydtest-wai + }: + mkDerivation { + pname = "sydtest-servant"; + version = "0.2.0.0"; + sha256 = "063bjik3yx7wbawdw1x4yw8ba8k83bq2xysczkl3mxqhj4c0ngx9"; + libraryHaskellDepends = [ + base http-client servant servant-client servant-server sydtest + sydtest-wai + ]; + testHaskellDepends = [ + base servant servant-client servant-server stm sydtest + ]; + testToolDepends = [ sydtest-discover ]; + description = "A servant companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-typed-process" = callPackage ({ mkDerivation, base, bytestring, sydtest, sydtest-discover , typed-process @@ -252448,6 +252251,28 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-wai_0_2_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, http-client + , http-types, mtl, network, pretty-show, stm, sydtest + , sydtest-discover, text, time, wai, warp + }: + mkDerivation { + pname = "sydtest-wai"; + version = "0.2.0.0"; + sha256 = "1zyhgwi8vhjg7mahp98fjgvkhqvh6zwfw3pmhwk57raavzsg2ksb"; + libraryHaskellDepends = [ + base bytestring case-insensitive http-client http-types mtl network + pretty-show sydtest text time wai warp + ]; + testHaskellDepends = [ + base http-client http-types stm sydtest wai + ]; + testToolDepends = [ sydtest-discover ]; + description = "A wai companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "sydtest-yesod" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , conduit, containers, cookie, exceptions, http-client, http-types @@ -255545,24 +255370,6 @@ self: { }) {}; "tasty-hedgehog" = callPackage - ({ mkDerivation, base, hedgehog, tagged, tasty - , tasty-expected-failure - }: - mkDerivation { - pname = "tasty-hedgehog"; - version = "1.0.1.0"; - sha256 = "0vkmhqfydyxbvjjbwvwn0q1f1a2dl9wmhz0s7020frpzwqcjwm5b"; - revision = "1"; - editedCabalFile = "1yhj5jpgsr1mflsadf1fgaj8hh7y3dnfsg95m6bni7xprdnw6nf9"; - libraryHaskellDepends = [ base hedgehog tagged tasty ]; - testHaskellDepends = [ - base hedgehog tasty tasty-expected-failure - ]; - description = "Integration for tasty and hedgehog"; - license = lib.licenses.bsd3; - }) {}; - - "tasty-hedgehog_1_1_0_0" = callPackage ({ mkDerivation, base, hedgehog, tagged, tasty , tasty-expected-failure }: @@ -255576,7 +255383,6 @@ self: { ]; description = "Integration for tasty and hedgehog"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "tasty-hedgehog-coverage" = callPackage @@ -255808,8 +255614,8 @@ self: { ({ mkDerivation, base, leancheck, tasty }: mkDerivation { pname = "tasty-leancheck"; - version = "0.0.1"; - sha256 = "06nki1l05hh5r0q2lkn4rmj0cl8hz7r7zc71r64fx2k9z65n5497"; + version = "0.0.2"; + sha256 = "1083xs3pvvwfindhkvd7g4bbiaa4g293vi7l2r25adbxz13snpdz"; libraryHaskellDepends = [ base leancheck tasty ]; testHaskellDepends = [ base leancheck tasty ]; description = "LeanCheck support for the Tasty test framework"; @@ -257759,35 +257565,37 @@ self: { }) {}; "termonad" = callPackage - ({ mkDerivation, adjunctions, base, Cabal, cabal-doctest + ({ mkDerivation, adjunctions, aeson, base, Cabal, cabal-doctest , classy-prelude, colour, constraints, containers, data-default - , directory, distributive, dyre, file-embed, filepath, focuslist - , genvalidity-containers, genvalidity-hspec, gi-gdk, gi-gio - , gi-glib, gi-gtk, gi-pango, gi-vte, gtk3, haskell-gi-base + , directory, distributive, doctest, dyre, file-embed, filepath + , focuslist, genvalidity-containers, genvalidity-hspec, gi-gdk + , gi-gio, gi-glib, gi-gtk, gi-pango, gi-vte, gtk3, haskell-gi-base , hedgehog, inline-c, lens, mono-traversable, pcre2, pretty-simple - , QuickCheck, tasty, tasty-hedgehog, tasty-hspec, text - , transformers, vte_291, xml-conduit, xml-html-qq, yaml + , QuickCheck, tasty, tasty-hedgehog, tasty-hspec, template-haskell + , text, transformers, unordered-containers, vte_291, xml-conduit + , xml-html-qq, yaml }: mkDerivation { pname = "termonad"; - version = "4.1.1.0"; - sha256 = "1v8w6wf5y3708pjya97zzq1w8vb3g8vqc46pbfy7rizg5jfbr2ba"; + version = "4.2.0.0"; + sha256 = "1g9zc1ddm47b8ry78crax8ry43sj1wv3272qv5r0y5jvz9y58r6r"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - adjunctions base classy-prelude colour constraints containers + adjunctions aeson base classy-prelude colour constraints containers data-default directory distributive dyre file-embed filepath focuslist gi-gdk gi-gio gi-glib gi-gtk gi-pango gi-vte haskell-gi-base inline-c lens mono-traversable pretty-simple - QuickCheck text transformers xml-conduit xml-html-qq yaml + QuickCheck text transformers unordered-containers xml-conduit + xml-html-qq yaml ]; libraryPkgconfigDepends = [ gtk3 pcre2 vte_291 ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base genvalidity-containers genvalidity-hspec hedgehog lens - QuickCheck tasty tasty-hedgehog tasty-hspec + base doctest genvalidity-containers genvalidity-hspec hedgehog lens + QuickCheck tasty tasty-hedgehog tasty-hspec template-haskell ]; description = "Terminal emulator configurable in Haskell"; license = lib.licenses.bsd3; @@ -258022,8 +257830,8 @@ self: { ({ mkDerivation, base, leancheck, test-framework }: mkDerivation { pname = "test-framework-leancheck"; - version = "0.0.1"; - sha256 = "0bwzc0vq28cmy5r966jxhacijd2hkna4magd9aw5wz34dcp4qv13"; + version = "0.0.4"; + sha256 = "0aa21r999jj59plzkn1px02k3a87znwhagdjmdsik2xvy5wrzgzv"; libraryHaskellDepends = [ base leancheck test-framework ]; testHaskellDepends = [ base leancheck test-framework ]; description = "LeanCheck support for test-framework"; @@ -258651,28 +258459,6 @@ self: { }) {}; "texmath" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.12.2"; - sha256 = "0lqib59cnvxvgj6k8wk74g5xbamf63q3z7wnwc8r2d56z05djvxy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb text xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process temporary text - utf8-string xml - ]; - description = "Conversion between formats used to represent mathematics"; - license = lib.licenses.gpl2Only; - }) {}; - - "texmath_0_12_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, split, syb, temporary, text , utf8-string, xml @@ -258692,7 +258478,6 @@ self: { ]; description = "Conversion between formats used to represent mathematics"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "texrunner" = callPackage @@ -261342,8 +261127,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "1.7.4"; - sha256 = "080zncw6gp0dzwm9vd82c789v1x00nfzz8r1ldb4hl67v04jf8hi"; + version = "1.7.5"; + sha256 = "0mcq1sll148qfwkyad6y9k64zrlbkflzba9wqcgqydgfm0jyr7z7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -261357,15 +261142,15 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "tidal_1_7_5" = callPackage + "tidal_1_7_7" = callPackage ({ mkDerivation, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, hosc, microspec, network, parsec , primitive, random, text, transformers, weigh }: mkDerivation { pname = "tidal"; - version = "1.7.5"; - sha256 = "0mcq1sll148qfwkyad6y9k64zrlbkflzba9wqcgqydgfm0jyr7z7"; + version = "1.7.7"; + sha256 = "19r9h45yd2xwmah81xqmwx5bi5gi0x2hqhq2nqa47jgb0nd12a25"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bifunctors bytestring clock colour containers deepseq hosc @@ -261590,14 +261375,14 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "time_1_11_1_2" = callPackage + "time_1_12" = callPackage ({ mkDerivation, base, criterion, deepseq, QuickCheck, random , tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "time"; - version = "1.11.1.2"; - sha256 = "0r33rxxrrpyzxpdihky93adlpdj0r8k6wh2i1sx0nb7zhvfnfj27"; + version = "1.12"; + sha256 = "0xavlg1lsq0fip6mwvphr4xz2iykys4wsn468hr8qdg6xqab0x0b"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -263054,8 +262839,8 @@ self: { }: mkDerivation { pname = "tlynx"; - version = "0.5.0.2"; - sha256 = "1d28xk346h92imp6lnmy0g9mql8nd1zna1mnfs6mqhf38l8sm0k4"; + version = "0.5.1.1"; + sha256 = "1hp2j5yiki2li7h3097vkyis0an8aai1ng8dc0zv4d4dp4kmfvyx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -263068,29 +262853,6 @@ self: { license = lib.licenses.gpl3Plus; }) {}; - "tlynx_0_5_1_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad - , containers, elynx-tools, elynx-tree, gnuplot, lifted-async - , monad-logger, mwc-random, optparse-applicative, parallel - , statistics, text, transformers, vector - }: - mkDerivation { - pname = "tlynx"; - version = "0.5.1.0"; - sha256 = "005382x1xsv6bsjfmjxirvcmh3nfyhigkkc08y2wz16b7dpwvk6k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring comonad containers elynx-tools - elynx-tree gnuplot lifted-async monad-logger mwc-random - optparse-applicative parallel statistics text transformers vector - ]; - executableHaskellDepends = [ base ]; - description = "Handle phylogenetic trees"; - license = lib.licenses.gpl3Plus; - hydraPlatforms = lib.platforms.none; - }) {}; - "tmapchan" = callPackage ({ mkDerivation, base, containers, hashable, stm , unordered-containers @@ -263965,8 +263727,8 @@ self: { ({ mkDerivation, base, filepath, hspec, profunctors, text }: mkDerivation { pname = "tophat"; - version = "1.0.0.0"; - sha256 = "0zwhik8x2z1kbyv873kvdbnzyyg4f6qky1gw03icarxan9553s7m"; + version = "1.0.1.0"; + sha256 = "0q00lrv02pmy5zgnqciwaj87hs7daraj6pvcz9hm93djk6cgs5fn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base profunctors text ]; @@ -264480,8 +264242,8 @@ self: { }: mkDerivation { pname = "tracing"; - version = "0.0.6.2"; - sha256 = "0fabwv87b9r8khyk8gr769j6k3wqddrgzh86inx0xjx9swgdrr6q"; + version = "0.0.7.0"; + sha256 = "0mm2s367n7zggnbgcvhffjin47pfyzr76ywg60vhfjcb1zzmkv4l"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive containers http-client mtl network random stm text time transformers unliftio @@ -270338,15 +270100,15 @@ self: { }) {}; "unicode-tricks" = callPackage - ({ mkDerivation, base, containers, data-default, hashable, hspec - , hspec-discover, QuickCheck, text + ({ mkDerivation, base, containers, data-default, deepseq, hashable + , hspec, hspec-discover, QuickCheck, text }: mkDerivation { pname = "unicode-tricks"; - version = "0.10.1.0"; - sha256 = "0f9giqhd4jjqdd0wcbrrd8f01bhqv25m13ss3f1jfaaacaiylpam"; + version = "0.11.0.0"; + sha256 = "0f1r8s69if5hjqy1p13b30f8wnbc52sya4zdcw3krwvmizwqq3dh"; libraryHaskellDepends = [ - base containers data-default hashable QuickCheck text + base containers data-default deepseq hashable QuickCheck text ]; testHaskellDepends = [ base hashable hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -270544,8 +270306,8 @@ self: { pname = "union"; version = "0.1.2"; sha256 = "1i4fvlwkw1wx64a6l8342aqfqsdq7fqa4p24g3i5gn5704lxrsb3"; - revision = "5"; - editedCabalFile = "1qxwx43ba4ixq6g78y6gs4zqq4v2ka0qi79gpvny9qw577gwbbd3"; + revision = "6"; + editedCabalFile = "1n1innjiqksancaazsczryyjfr7905q1iq9radwqq5ngl8xi83wz"; libraryHaskellDepends = [ base deepseq hashable profunctors tagged vinyl ]; @@ -275317,8 +275079,8 @@ self: { }: mkDerivation { pname = "verifiable-expressions"; - version = "0.6.1"; - sha256 = "0s3615m849xj0df6ia18kg4i54z87x3c6yxgv594dwf9mf9dw4x8"; + version = "0.6.2"; + sha256 = "1nrlcbimng6qf4g7h4hxg3j05kd0hlihkhp8hj5js44n29vg89qk"; libraryHaskellDepends = [ base containers lens mtl sbv transformers union vinyl ]; @@ -275441,26 +275203,6 @@ self: { }) {}; "versions" = callPackage - ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens - , parser-combinators, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, text - }: - mkDerivation { - pname = "versions"; - version = "4.0.3"; - sha256 = "0rp62aih4blpahymqlkrfzywdqb1mkhy6f021vp74ljknpch4scf"; - libraryHaskellDepends = [ - base deepseq hashable megaparsec parser-combinators text - ]; - testHaskellDepends = [ - base megaparsec microlens QuickCheck tasty tasty-hunit - tasty-quickcheck text - ]; - description = "Types and parsers for software version numbers"; - license = lib.licenses.bsd3; - }) {}; - - "versions_5_0_0" = callPackage ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens , parser-combinators, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, text @@ -275478,7 +275220,6 @@ self: { ]; description = "Types and parsers for software version numbers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "vflow-types" = callPackage @@ -276619,8 +276360,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.10.3"; - sha256 = "1ksx4klcj9g4s4mrxmcr47ydw3xzglb8vd0zmg7i5xa7hz0ksjw0"; + version = "3.10.4"; + sha256 = "1z6ckyglfmgsbkz41ymb5krcis3rhm30dkyayail6w484a2ay7ph"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -277492,8 +277233,8 @@ self: { }: mkDerivation { pname = "wai-middleware-auth"; - version = "0.2.4.1"; - sha256 = "1q8vj3ri5fvdhlwls7az4zcwk7iyc3fi4yf968086pkg92hpzcdl"; + version = "0.2.5.0"; + sha256 = "12yv8rcybd7saflfcyjy08p1m6il07nk831pkj0isxk8mwjq64l4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -280229,10 +279970,8 @@ self: { }: mkDerivation { pname = "webp"; - version = "0.1.0.0"; - sha256 = "153icv3911drnjkii2b0csdq3ksavmxpz26zm9xcp24kfbsr6gvk"; - revision = "2"; - editedCabalFile = "0ycp16b2fb4x3h6rs4j2wywy7la1b7ri3419p8mnpf1ipmq6d1vk"; + version = "0.1.0.1"; + sha256 = "12ryx87z36ra243vcira7jkpn6k3c5sqp5r4h7zvxxm64rajyxcd"; libraryHaskellDepends = [ base bytestring JuicyPixels vector ]; libraryPkgconfigDepends = [ libwebp ]; libraryToolDepends = [ c2hs ]; @@ -280682,19 +280421,20 @@ self: { "what4" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, bimap, bv-sized - , bytestring, config-value, containers, data-binary-ieee754 - , deepseq, deriving-compat, directory, exceptions, extra, filepath - , fingertree, ghc-prim, hashable, hashtables, hedgehog, io-streams - , lens, libBF, mtl, panic, parameterized-utils, prettyprinter - , process, QuickCheck, scientific, tasty, tasty-hedgehog - , tasty-hunit, tasty-quickcheck, template-haskell, temporary, text + , bytestring, config-value, containers, contravariant + , data-binary-ieee754, deepseq, deriving-compat, directory + , exceptions, extra, filepath, fingertree, ghc-prim, hashable + , hashtables, hedgehog, io-streams, lens, libBF, lumberjack, mtl + , panic, parameterized-utils, prettyprinter, process, QuickCheck + , scientific, tasty, tasty-checklist, tasty-hedgehog, tasty-hunit + , tasty-quickcheck, tasty-sugar, template-haskell, temporary, text , th-abstraction, th-lift, th-lift-instances, transformers , unordered-containers, utf8-string, vector, versions, zenc }: mkDerivation { pname = "what4"; - version = "1.1"; - sha256 = "1656h3865vzd96ggibm1wkhnpmjrx6crv87kgmwphfy8hgl5j8kq"; + version = "1.2.1"; + sha256 = "0cbvdiszqzhw50m51kfm0qsadq04dxwb8836hibv61sshgckpsf3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -280709,9 +280449,11 @@ self: { ]; executableHaskellDepends = [ base parameterized-utils ]; testHaskellDepends = [ - base bv-sized bytestring containers data-binary-ieee754 hedgehog - libBF parameterized-utils QuickCheck tasty tasty-hedgehog - tasty-hunit tasty-quickcheck text transformers versions + base bv-sized bytestring containers contravariant + data-binary-ieee754 exceptions hedgehog io-streams libBF lumberjack + parameterized-utils prettyprinter QuickCheck tasty tasty-checklist + tasty-hedgehog tasty-hunit tasty-quickcheck tasty-sugar text + transformers versions ]; description = "Solver-agnostic symbolic values support for issuing queries"; license = lib.licenses.bsd3; @@ -285105,10 +284847,8 @@ self: { ({ mkDerivation, base, magic, mtl, random, unix, xmonad }: mkDerivation { pname = "xmonad-wallpaper"; - version = "0.0.1.4"; - sha256 = "0f6214kqp86xnk1zginjiprnqlj2fzcvh3w5sv3yvqg98mwdd0cg"; - revision = "1"; - editedCabalFile = "1vxgv702wgr0k0kzd602v8xv11q5dap4mfhqifnr928bwf9scp28"; + version = "0.0.1.5"; + sha256 = "1habj1q0m98vnq24vsya5rzrvkhglkwa90fr85glmh9h6gcqywgq"; libraryHaskellDepends = [ base magic mtl random unix xmonad ]; description = "xmonad wallpaper extension"; license = lib.licenses.lgpl3Only; @@ -287839,28 +287579,6 @@ self: { }) {}; "yesod-form" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, containers, data-default - , email-validate, hspec, network-uri, persistent, resourcet - , semigroups, shakespeare, text, time, transformers, wai - , xss-sanitize, yesod-core, yesod-persistent - }: - mkDerivation { - pname = "yesod-form"; - version = "1.6.7"; - sha256 = "0mny71dyp6cp5akyp5wvmrhmip5rkqi8ibdn3lipvmajx9h58r5d"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html blaze-markup - byteable bytestring containers data-default email-validate - network-uri persistent resourcet semigroups shakespeare text time - transformers wai xss-sanitize yesod-core yesod-persistent - ]; - testHaskellDepends = [ base hspec text time ]; - description = "Form handling support for Yesod Web Framework"; - license = lib.licenses.mit; - }) {}; - - "yesod-form_1_7_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, containers, data-default , email-validate, hspec, network-uri, persistent, resourcet @@ -287880,7 +287598,6 @@ self: { testHaskellDepends = [ base hspec text time ]; description = "Form handling support for Yesod Web Framework"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-form-bootstrap4" = callPackage From 6f64adbf76994dfa5e4dd0f82a0f5168d9a9c9cd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 19 Jun 2021 19:37:07 +0200 Subject: [PATCH 04/43] haskell.packages.ghc901.cryptonite: remove unnecessary override Stackage LTS 18 has brought cryptonite 0.29, so this override breaks evaluation. --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index cfef0f14ea81..bc268f5f22c0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -101,9 +101,6 @@ self: super: { # 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0 memory = super.memory_0_16_0; - # 0.29 introduced support for GHC 9.0.x, stackage has 0.28 - cryptonite = super.cryptonite_0_29; - # GHC 9.0.x doesn't like `import Spec (main)` in Main.hs # https://github.com/snoyberg/mono-traversable/issues/192 mono-traversable = dontCheck super.mono-traversable; From 22af79ab45da54e70457a261156eabe34efb4969 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 19 Jun 2021 19:45:57 +0200 Subject: [PATCH 05/43] haskellPackages.composite-{base,aeson}: assert indicating removal Add assert which will fail when the overrides can be removed. Upstream has patched the bounds, but hasn't made a new release nor a hackage revision so far. --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0d9d65af01c1..99d6bc173a32 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1958,8 +1958,11 @@ EOT # Bounds on profunctors are too strict # https://github.com/ConferOpenSource/composite/issues/50 - composite-base = doJailbreak super.composite-base; - composite-aeson = doJailbreak super.composite-aeson; + # Remove overrides when assert fails. + composite-base = assert super.composite-base.version == "0.7.5.0"; + doJailbreak super.composite-base; + composite-aeson = assert super.composite-aeson.version == "0.7.5.0"; + doJailbreak super.composite-aeson; # Too strict bounds on profunctors # https://github.com/google/proto-lens/issues/413 From 1ff77ab23cd9ec09c909c73d1b53027ac492c72d Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 20 Jun 2021 13:37:12 +0200 Subject: [PATCH 06/43] haskellPackages: remove haskell-gi overrides obsolete due to lts stackage LTS 18 luckily updated haskell-gi and related libraries to 0.25, so we can remove a lot of overrides. I also unrestricted some of them in configuration-hackage2nix/main.yml and removed the overrides updating them in configuration-common.nix (I guess the person doing the upgrades thought those libraries were also in stackage). --- .../haskell-modules/configuration-common.nix | 23 +------ .../configuration-hackage2nix/main.yaml | 4 -- .../haskell-modules/hackage-packages.nix | 67 ------------------- 3 files changed, 1 insertion(+), 93 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 99d6bc173a32..4f5d28a0bc4e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1290,30 +1290,9 @@ self: super: { # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; - # nixpkgs has bumped gdkpixbuf C lib, so we need gi-gdkpixbuf_2_0_26 to link against that. - # This leads to all this bumps which can be removed once stackage has haskell-gi 0.25. - haskell-gi = self.haskell-gi_0_25_0; - haskell-gi-base = addBuildDepends super.haskell-gi-base_0_25_0 [ pkgs.gobject-introspection ]; - gi-glib = self.gi-glib_2_0_25; - gi-cairo = self.gi-cairo_1_0_25; - gi-gobject = self.gi-gobject_2_0_26; - gi-atk = self.gi-atk_2_0_23; - gi-gio = self.gi-gio_2_0_28; - gi-harfbuzz = self.gi-harfbuzz_0_0_4; - gi-javascriptcore = self.gi-javascriptcore_4_0_23; - gi-pango = self.gi-pango_1_0_24; - gi-soup = self.gi-soup_2_4_24; - gi-gdkpixbuf = self.gi-gdkpixbuf_2_0_26; - gi-gdk = self.gi-gdk_3_0_24; - gi-gtk = self.gi-gtk_3_0_37; - gi-webkit2 = self.gi-webkit2_4_0_27; + # Too strict version bounds on haskell-gi gi-cairo-render = doJailbreak super.gi-cairo-render; gi-cairo-connector = doJailbreak super.gi-cairo-connector; - gi-gtk-hs = self.gi-gtk-hs_0_3_10; - gi-dbusmenu = self.gi-dbusmenu_0_4_9; - gi-xlib = self.gi-xlib_2_0_10; - gi-gdkx11 = self.gi-gdkx11_3_0_11; - gi-dbusmenugtk3 = self.gi-dbusmenugtk3_0_4_10; # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) # https://github.com/lehins/massiv/pull/104 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 56bd4ac4ab8e..963cbcce3a80 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -73,10 +73,6 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # Needs Cabal 3.4 for Setup.hs - - gi-javascriptcore < 4.0.23 # - - gi-soup < 2.4.24 # - - gi-webkit2 < 4.0.27 # # 2021-05-11: not all diagrams libraries have adjusted to # monoid-extras 0.6 yet, keep them pinned to lower versions # until we can do a full migration, see diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a826fb1f550c..8ad068d9e9bd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -103575,25 +103575,6 @@ self: { }) {inherit (pkgs) ibus;}; "gi-javascriptcore" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading - , text, transformers, webkitgtk - }: - mkDerivation { - pname = "gi-javascriptcore"; - version = "4.0.22"; - sha256 = "191ipwjxn94dxz6saapidvjr8bbnl0y3p4f10s6mj6h6pkb5axjb"; - setupHaskellDepends = [ base Cabal gi-glib gi-gobject haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ webkitgtk ]; - description = "JavaScriptCore bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) webkitgtk;}; - - "gi-javascriptcore_4_0_23" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading , text, transformers, webkitgtk @@ -103610,7 +103591,6 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "JavaScriptCore bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; "gi-notify" = callPackage @@ -103752,27 +103732,6 @@ self: { }) {inherit (pkgs) libsecret;}; "gi-soup" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio - , gi-glib, gi-gobject, haskell-gi, haskell-gi-base - , haskell-gi-overloading, libsoup, text, transformers - }: - mkDerivation { - pname = "gi-soup"; - version = "2.4.23"; - sha256 = "109n57ff69xmwhm3lvf0ajid3zl0l9sr1qdnvis06bhcddw9i1ap"; - setupHaskellDepends = [ - base Cabal gi-gio gi-glib gi-gobject haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ libsoup ]; - description = "Libsoup bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) libsoup;}; - - "gi-soup_2_4_24" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base , haskell-gi-overloading, libsoup, text, transformers @@ -103791,7 +103750,6 @@ self: { libraryPkgconfigDepends = [ libsoup ]; description = "Libsoup bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) libsoup;}; "gi-vips" = callPackage @@ -103866,30 +103824,6 @@ self: { }) {inherit (pkgs) webkitgtk24x-gtk3;}; "gi-webkit2" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk - , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base - , haskell-gi-overloading, text, transformers, webkitgtk - }: - mkDerivation { - pname = "gi-webkit2"; - version = "4.0.26"; - sha256 = "0vbsc5zd1m1k47zpq620kzsiyg2g25ag6fvkwj0hdlq24xhyiavr"; - setupHaskellDepends = [ - base Cabal gi-atk gi-cairo gi-gdk gi-gio gi-glib gi-gobject gi-gtk - gi-javascriptcore gi-soup haskell-gi - ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib - gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi - haskell-gi-base haskell-gi-overloading text transformers - ]; - libraryPkgconfigDepends = [ webkitgtk ]; - description = "WebKit2 bindings"; - license = lib.licenses.lgpl21Only; - }) {inherit (pkgs) webkitgtk;}; - - "gi-webkit2_4_0_27" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gio, gi-glib, gi-gobject, gi-gtk , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base @@ -103911,7 +103845,6 @@ self: { libraryPkgconfigDepends = [ webkitgtk ]; description = "WebKit2 bindings"; license = lib.licenses.lgpl21Only; - hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) webkitgtk;}; "gi-webkit2webextension" = callPackage From 9c6048cf2d5de2c00b74ae8353e760bb5d20e91f Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 20 Jun 2021 21:53:25 +0200 Subject: [PATCH 07/43] haskellPackages: remove obsolete gi-gdk pins --- .../haskell-modules/configuration-hackage2nix/main.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 963cbcce3a80..7c2f668ea49b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -118,9 +118,6 @@ extra-packages: - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - sbv == 7.13 # required for pkgs.petrinizer - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - - gi-gdk == 3.0.24 # 2021-05-07: For haskell-gi 0.25 without gtk4 - - gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4 - - gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4 - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version - hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501 From a5052e1c6eac15370409f0bf7ba0641c1f43c487 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 20 Jun 2021 21:56:34 +0200 Subject: [PATCH 08/43] haskellPackages.haskell-language-server: Fix build for 1.2.0.0 --- .../haskell-modules/configuration-common.nix | 27 +--- .../configuration-ghc-9.0.x.nix | 7 ++ .../configuration-hackage2nix/broken.yaml | 4 - .../configuration-hackage2nix/main.yaml | 5 - .../haskell-modules/configuration-nix.nix | 37 ++++++ .../haskell-modules/hackage-packages.nix | 115 ------------------ 6 files changed, 46 insertions(+), 149 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4f5d28a0bc4e..89931d551a5d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1394,39 +1394,16 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/611 haskell-language-server = dontCheck super.haskell-language-server; - # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1808 - hls-splice-plugin = dontCheck super.hls-splice-plugin; - # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809 hls-eval-plugin = dontCheck super.hls-eval-plugin; - # 2021-03-19: Too restrictive upper bound on optparse-applicative - stylish-haskell = doJailbreak super.stylish-haskell; - - # 2021-03-19: https://github.com/facebookincubator/retrie/issues/24 - retrie = doJailbreak super.retrie; - - # Jailbreak because of restrictive upper bound on base16-bytestring - # 2021-03-19: https://github.com/Avi-D-coder/implicit-hie-cradle/pull/8 - implicit-hie-cradle = doJailbreak super.implicit-hie-cradle; + # 2021-06-20: Tests fail: https://github.com/haskell/haskell-language-server/issues/1949 + hls-refine-imports-plugin = dontCheck super.hls-refine-imports-plugin; # 2021-03-09: Golden tests seem to be missing in hackage release: # https://github.com/haskell/haskell-language-server/issues/1536 hls-tactics-plugin = dontCheck (super.hls-tactics-plugin.override { refinery = self.refinery_0_3_0_0; }); - # 2021-03-24: hlint 3.3 is for ghc 9 compat, but hls only supports ghc 8.10 - hls-hlint-plugin = super.hls-hlint-plugin.override { - hlint = super.hlint_3_2_7; - }; - - # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage - hlint = super.hlint.overrideScope (self: super: { - ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 { - doHaddock = false; - }; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4; - }); - # 2021-03-21 Test hangs # https://github.com/haskell/haskell-language-server/issues/1562 # Jailbreak because of: https://github.com/haskell/haskell-language-server/pull/1595 diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index bc268f5f22c0..5f41a8ce34b8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -109,4 +109,11 @@ self: super: { # https://github.com/Soostone/retry/issues/71 retry = dontCheck super.retry; + # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage + hlint = super.hlint_3_3_0.overrideScope (self: super: { + ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 { + doHaddock = false; + }; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4; + }); } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0f895e1f782e..8b23f1a87d2e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -2101,10 +2101,6 @@ broken-packages: - HLogger - hlongurl - hlrdb-core - - hls-exactprint-utils - - hls-floskell-plugin - - hls-fourmolu-plugin - - hls-pragmas-plugin - hlwm - hmarkup - hmatrix-banded diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 7c2f668ea49b..0c4c04336f31 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -81,10 +81,6 @@ default-package-overrides: - monoid-extras < 0.6 - diagrams-core < 1.5.0 - diagrams-lib < 1.4.4 - # 2021-05-11: Pin for hls 1.1.0 - - ghcide == 1.2.* - - hls-plugin-api == 1.1.0.0 - - hls-explicit-imports-plugin < 1.0.0.2 # 2021-05-12: remove once versions >= 5.0.0 is in stackage - futhark < 0.19.5 # 2021-06-05: remove once pandoc 2.14 is in stackage @@ -109,7 +105,6 @@ extra-packages: - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy == 1.19.9 # for purescript - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - - hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet. - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 161712d594b8..c0ca0d8a7ca1 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -790,6 +790,42 @@ self: super: builtins.intersectAttrs super { export HOME=$TMPDIR/home ''; }); + hls-ormolu-plugin = overrideCabal super.hls-ormolu-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + hls-fourmolu-plugin = overrideCabal super.hls-fourmolu-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + hls-module-name-plugin = overrideCabal super.hls-module-name-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + hls-splice-plugin = overrideCabal super.hls-splice-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + hls-floskell-plugin = overrideCabal super.hls-floskell-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); + hls-pragmas-plugin = overrideCabal super.hls-pragmas-plugin (drv: { + testToolDepends = [ pkgs.git ]; + preCheck = '' + export HOME=$TMPDIR/home + ''; + }); # Tests have file permissions expections that don‘t work with the nix store. hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; hls-haddock-comments-plugin = overrideCabal super.hls-haddock-comments-plugin (drv: { @@ -799,6 +835,7 @@ self: super: builtins.intersectAttrs super { ''; }); hls-eval-plugin = overrideCabal super.hls-eval-plugin (drv: { + testToolDepends = [ pkgs.git ]; preCheck = '' export HOME=$TMPDIR/home ''; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 8ad068d9e9bd..b35104da9089 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -102248,75 +102248,6 @@ self: { }) {}; "ghcide" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, async, base - , base16-bytestring, binary, bytestring, bytestring-encoding - , case-insensitive, containers, cryptohash-sha1, data-default - , deepseq, dependent-map, dependent-sum, Diff, directory, dlist - , extra, filepath, fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th - , ghc-check, ghc-exactprint, ghc-paths, ghc-trace-events - , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable - , heapsize, hie-bios, hie-compat, hiedb, hls-plugin-api, hp2pretty - , hslogger, implicit-hie, implicit-hie-cradle, lens, lsp, lsp-test - , lsp-types, mtl, network-uri, opentelemetry, optparse-applicative - , parallel, prettyprinter, prettyprinter-ansi-terminal, process - , QuickCheck, quickcheck-instances, record-dot-preprocessor - , record-hasfield, regex-tdfa, retrie, rope-utf16-splay, safe - , safe-exceptions, shake, shake-bench, sorted-list, sqlite-simple - , stm, syb, tasty, tasty-expected-failure, tasty-hunit - , tasty-quickcheck, tasty-rerun, text, time, transformers, unix - , unliftio, unliftio-core, unordered-containers, utf8-string - , vector, yaml - }: - mkDerivation { - pname = "ghcide"; - version = "1.2.0.2"; - sha256 = "0r3n23i4b51bb92q6pch9knj079a26jbz0q70qfpv66154d00wld"; - revision = "1"; - editedCabalFile = "1hv74yx0x6hh506kwg7ygkajkcczfn3l00f8rc4jnr3hkhkm5v85"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async base base16-bytestring binary bytestring - bytestring-encoding case-insensitive containers cryptohash-sha1 - data-default deepseq dependent-map dependent-sum Diff directory - dlist extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th - ghc-check ghc-exactprint ghc-paths ghc-trace-events Glob - haddock-library hashable heapsize hie-bios hie-compat hiedb - hls-plugin-api hslogger implicit-hie-cradle lens lsp lsp-types mtl - network-uri opentelemetry optparse-applicative parallel - prettyprinter prettyprinter-ansi-terminal regex-tdfa retrie - rope-utf16-splay safe safe-exceptions shake sorted-list - sqlite-simple stm syb text time transformers unix unliftio - unliftio-core unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring containers data-default - directory extra filepath ghc gitrev hashable heapsize hie-bios - hiedb hls-plugin-api lens lsp lsp-test lsp-types - optparse-applicative process safe-exceptions shake text - unordered-containers - ]; - testHaskellDepends = [ - aeson async base binary bytestring containers data-default - directory extra filepath ghc ghc-typelits-knownnat haddock-library - hls-plugin-api lens lsp lsp-test lsp-types network-uri - optparse-applicative process QuickCheck quickcheck-instances - record-dot-preprocessor record-hasfield regex-tdfa rope-utf16-splay - safe safe-exceptions shake tasty tasty-expected-failure tasty-hunit - tasty-quickcheck tasty-rerun text - ]; - testToolDepends = [ implicit-hie ]; - benchmarkHaskellDepends = [ - aeson base directory extra filepath optparse-applicative shake - shake-bench text yaml - ]; - benchmarkToolDepends = [ hp2pretty implicit-hie ]; - description = "The core of an IDE"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ maralorn ]; - }) {}; - - "ghcide_1_4_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, async, base , base16-bytestring, binary, bytestring, bytestring-encoding , case-insensitive, containers, cryptohash-sha1, data-default @@ -102380,7 +102311,6 @@ self: { benchmarkToolDepends = [ hp2pretty implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ maralorn ]; }) {}; @@ -130045,27 +129975,9 @@ self: { ]; description = "Common utilities to interaction between ghc-exactprint and HLS plugins"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-explicit-imports-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide - , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers - }: - mkDerivation { - pname = "hls-explicit-imports-plugin"; - version = "1.0.0.1"; - sha256 = "1ygs667pkc3zn66yqz6ssrxifhrc906sddmcgjnkprk7zappk2nc"; - libraryHaskellDepends = [ - aeson base containers deepseq ghc ghcide hls-plugin-api lsp - lsp-types shake text unordered-containers - ]; - description = "Explicit imports plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-explicit-imports-plugin_1_0_0_3" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, ghc , ghc-api-compat, ghcide, hls-graph, hls-plugin-api, lsp, text , unordered-containers @@ -130080,7 +129992,6 @@ self: { ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-floskell-plugin" = callPackage @@ -130099,8 +130010,6 @@ self: { testHaskellDepends = [ base hls-test-utils text ]; description = "Integration with the Floskell code formatter"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-fourmolu-plugin" = callPackage @@ -130118,8 +130027,6 @@ self: { testHaskellDepends = [ base filepath hls-test-utils lsp-test ]; description = "Integration with the Fourmolu code formatter"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-graph" = callPackage @@ -130212,25 +130119,6 @@ self: { }) {}; "hls-plugin-api" = callPackage - ({ mkDerivation, aeson, base, containers, data-default - , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger - , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix - , unordered-containers - }: - mkDerivation { - pname = "hls-plugin-api"; - version = "1.1.0.0"; - sha256 = "1i18a5gxa409882zpviy4paldaq43j4z1zmgr9mag2mn64vplrxy"; - libraryHaskellDepends = [ - aeson base containers data-default dependent-map dependent-sum Diff - dlist hashable hslogger lens lsp opentelemetry process regex-tdfa - shake text unix unordered-containers - ]; - description = "Haskell Language Server API for plugin communication"; - license = lib.licenses.asl20; - }) {}; - - "hls-plugin-api_1_1_0_2" = callPackage ({ mkDerivation, aeson, base, containers, data-default , dependent-map, dependent-sum, Diff, dlist, ghc, ghc-api-compat , hashable, hls-graph, hslogger, lens, lsp, opentelemetry, process @@ -130247,7 +130135,6 @@ self: { ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-pragmas-plugin" = callPackage @@ -130270,8 +130157,6 @@ self: { ]; description = "Pragmas plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "hls-refine-imports-plugin" = callPackage From 6a49456aef461a3b9e35b48365a38cd575bb7ad3 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 20 Jun 2021 22:12:10 +0200 Subject: [PATCH 09/43] haskellPackages.futhark: 0.19.4 -> 0.19.6 Now that stackage lts 18 has version 5.0.0, we can upgrade futhark. --- .../configuration-hackage2nix/main.yaml | 2 - .../haskell-modules/hackage-packages.nix | 42 ------------------- 2 files changed, 44 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 0c4c04336f31..7e799950a667 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -81,8 +81,6 @@ default-package-overrides: - monoid-extras < 0.6 - diagrams-core < 1.5.0 - diagrams-lib < 1.4.4 - # 2021-05-12: remove once versions >= 5.0.0 is in stackage - - futhark < 0.19.5 # 2021-06-05: remove once pandoc 2.14 is in stackage - pandoc-crossref < 0.3.11.0 # 2021-06-14: hnix still needs old versions https://github.com/haskell-nix/hnix/issues/952 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b35104da9089..7979ee486455 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -97058,47 +97058,6 @@ self: { }) {}; "futhark" = callPackage - ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary - , blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm - , containers, directory, directory-tree, dlist, file-embed - , filepath, free, gitrev, happy, hashable, haskeline - , language-c-quote, mainland-pretty, megaparsec, mtl - , neat-interpolation, parallel, parser-combinators, pcg-random - , process, process-extras, QuickCheck, regex-tdfa, srcloc, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, temporary - , terminal-size, text, time, transformers, unordered-containers - , utf8-string, vector, vector-binary-instances, versions - , zip-archive, zlib - }: - mkDerivation { - pname = "futhark"; - version = "0.19.4"; - sha256 = "1d4704pmknv39yw2bjxkp5n2wl9a14n3pn221m3src5z237lchq7"; - revision = "1"; - editedCabalFile = "1d8vwgdvj1dib7l4a3lhn03ri2mbnm57wnd3pki6m7y8sr3xk730"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-terminal array base binary blaze-html bmp bytestring - bytestring-to-vector cmark-gfm containers directory directory-tree - dlist file-embed filepath free gitrev hashable haskeline - language-c-quote mainland-pretty megaparsec mtl neat-interpolation - parallel pcg-random process process-extras regex-tdfa srcloc - template-haskell temporary terminal-size text time transformers - unordered-containers utf8-string vector vector-binary-instances - versions zip-archive zlib - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ base text ]; - testHaskellDepends = [ - base containers megaparsec mtl parser-combinators QuickCheck tasty - tasty-hunit tasty-quickcheck text - ]; - description = "An optimising compiler for a functional, array-oriented language"; - license = lib.licenses.isc; - }) {}; - - "futhark_0_19_6" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary , blaze-html, bmp, bytestring, bytestring-to-vector, cmark-gfm , containers, directory, directory-tree, dlist, file-embed @@ -97135,7 +97094,6 @@ self: { ]; description = "An optimising compiler for a functional, array-oriented language"; license = lib.licenses.isc; - hydraPlatforms = lib.platforms.none; }) {}; "futhark-data" = callPackage From 1f8ca5256a0336d64b1ce19a93a5cf13dd615f06 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 20 Jun 2021 22:41:27 +0200 Subject: [PATCH 10/43] haskellPackages.email-validate: Jailbreak --- 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 89931d551a5d..8236ff248b76 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1928,4 +1928,8 @@ EOT # https://github.com/jcranch/tophat/issues/1 tophat = doJailbreak super.tophat; + # 2021-06-20: Outdated upper bounds + # https://github.com/Porges/email-validate-hs/issues/58 + email-validate = doJailbreak super.email-validate; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From cc0558d2eee7e09cf79ba584de01e48514be4466 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 20 Jun 2021 23:17:15 +0200 Subject: [PATCH 11/43] haskellPackages.ghcup: Jailbreak to fix build --- 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 8236ff248b76..79a7f26f292f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1932,4 +1932,8 @@ EOT # https://github.com/Porges/email-validate-hs/issues/58 email-validate = doJailbreak super.email-validate; + # 2021-06-20: Outdated upper bounds + # https://github.com/Porges/email-validate-hs/issues/58 + ghcup = doJailbreak super.ghcup; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 69e8d6b92a8bb922001585994471bcad656a91ba Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 20 Jun 2021 23:22:32 +0200 Subject: [PATCH 12/43] haskellPackages.stylish-haskell: Fix on ghc 8.8.x --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 79a7f26f292f..013156b0e16c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1936,4 +1936,7 @@ EOT # https://github.com/Porges/email-validate-hs/issues/58 ghcup = doJailbreak super.ghcup; + # Break out of "Cabal < 3.2" constraint. + stylish-haskell = doJailbreak super.stylish-haskell; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 454b7338d66d..251a3d94bb20 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -84,9 +84,6 @@ self: super: { executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; })); - # Break out of "Cabal < 3.2" constraint. - stylish-haskell = doJailbreak super.stylish-haskell; - # hackage-db 2.1.1 is incompatible with Cabal < 3.4 # See https://github.com/NixOS/cabal2nix/issues/501 hackage-db = self.hackage-db_2_1_0; From feed0f725303a9b644aa1da8da0f88041bcfb029 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 20 Jun 2021 23:27:51 +0200 Subject: [PATCH 13/43] haskell.packages.ghc901.generic-deriving: remove unnecessary patch The stackage update seems to include a version with this commit. --- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 5f41a8ce34b8..7731c73f0f64 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -80,10 +80,6 @@ self: super: { sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4"; }); doctest = dontCheck (doJailbreak super.doctest_0_18_1); - generic-deriving = appendPatch (doJailbreak super.generic-deriving) (pkgs.fetchpatch { - url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/generic-deriving-1.13.1.patch"; - sha256 = "0z85kiwhi5p2wiqwyym0y8q8qrcifp125x5vm0n4482lz41kmqds"; - }); language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch { url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch"; sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; From dd728cd01710656cb5b64b01f54feb2dfac38cd1 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 20 Jun 2021 23:51:37 +0200 Subject: [PATCH 14/43] haskellPackages.tmp-postgres: fix test suite Was failing before when trying to create files in `$HOME` and marked as broken subsequently. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - pkgs/development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 013156b0e16c..7a4dc19d8bc9 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -787,6 +787,9 @@ self: super: { # Needs pginit to function and pgrep to verify. tmp-postgres = overrideCabal super.tmp-postgres (drv: { + preCheck = '' + export HOME="$TMPDIR" + '' + (drv.preCheck or ""); libraryToolDepends = drv.libraryToolDepends or [] ++ [pkgs.postgresql]; testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps]; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 8b23f1a87d2e..f7d0066ac3c3 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4755,7 +4755,6 @@ broken-packages: - Titim - tkhs - tkyprof - - tmp-postgres - todo - tofromxml - to-haskell diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7979ee486455..697239fb5849 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -262697,8 +262697,6 @@ self: { ]; description = "Start and stop a temporary postgres"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "tmpl" = callPackage From 0e9230fccec847098ff2c6c1903cdd36340f2562 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 20 Jun 2021 23:52:20 +0200 Subject: [PATCH 15/43] haskellPackages.rel8: make test suite work by providing postgres tools --- pkgs/development/haskell-modules/configuration-nix.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index c0ca0d8a7ca1..d01203e5ea36 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -900,4 +900,6 @@ self: super: builtins.intersectAttrs super { ''; })); + rel8 = addTestToolDepend super.rel8 pkgs.postgresql; + } From 17af0071b5cfbd7a1093165b42720ba9746f1b63 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 21 Jun 2021 01:38:58 +0200 Subject: [PATCH 16/43] haskellPackages.haskell-language-server: Fix darwin and aarch64 builds --- pkgs/development/haskell-modules/configuration-arm.nix | 1 + pkgs/development/haskell-modules/configuration-darwin.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index b9f868b04ca5..6c6017297c9f 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -87,6 +87,7 @@ self: super: { grammatical-parsers = dontCheck super.grammatical-parsers; construct = dontCheck super.construct; orbits = dontCheck super.orbits; + hls-splice-plugin = dontCheck super.hls-splice-plugin; # https://github.com/ekmett/half/issues/35 half = dontCheck super.half; diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 4a62ab5867d1..e9cc5bc837d9 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -171,5 +171,6 @@ self: super: { # 2021-05-25: Tests fail and I have no way to debug them. hls-class-plugin = dontCheck super.hls-class-plugin; hls-brittany-plugin = dontCheck super.hls-brittany-plugin; + hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; } From 184df121791e3997f2a249e89c01aeb30cfd12cf Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 21 Jun 2021 01:35:19 +0200 Subject: [PATCH 17/43] haskellPackages.hakyll: fix build for Pandoc 2.14 --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7a4dc19d8bc9..d9560a2c4003 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1171,6 +1171,11 @@ self: super: { url = "https://github.com/jaspervdj/hakyll/commit/af9e29b5456c105dc948bc46c93e989a650b5ed1.patch"; sha256 = "sha256-ghc0V5L9OybNHWKmM0vhjRBN2rIvDlp+ClcK/aQst44="; }) + # Remove when Hakyll > 4.14.0.0 + (pkgs.fetchpatch { + url = "https://github.com/jaspervdj/hakyll/commit/e0c63558a82ac4347181d5d77dce7f763a1db410.patch"; + sha256 = "sha256-wYlxJmq56YQ29vpVsQhO+JdL0GBezCAfkdhIdFnLYsc="; + }) ]; })); From 4329d39319e501b904b5a0956d89c1454fef0f57 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 21 Jun 2021 11:58:38 +0900 Subject: [PATCH 18/43] haskell-updates: sort list of dontCheck packages in configuration-arm.nix --- .../haskell-modules/configuration-arm.nix | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index 6c6017297c9f..8682c717dbfb 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -43,51 +43,51 @@ self: super: { # Doctests fail on aarch64 due to a GHCi linking bug # https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437 # TODO: figure out if needed on aarch32 as well - language-nix = dontCheck super.language-nix; - trifecta = dontCheck super.trifecta; - ad = dontCheck super.ad; - vinyl = dontCheck super.vinyl; BNFC = dontCheck super.BNFC; C-structs = dontCheck super.C-structs; accelerate = dontCheck super.accelerate; - focuslist = dontCheck super.focuslist; - flight-kml = dontCheck super.flight-kml; - exact-real = dontCheck super.exact-real; + ad = dontCheck super.ad; autoapply = dontCheck super.autoapply; - hint = dontCheck super.hint; - hgeometry = dontCheck super.hgeometry; - headroom = dontCheck super.headroom; + construct = dontCheck super.construct; + exact-real = dontCheck super.exact-real; + flight-kml = dontCheck super.flight-kml; + focuslist = dontCheck super.focuslist; + grammatical-parsers = dontCheck super.grammatical-parsers; + greskell = dontCheck super.greskell; + groupBy = dontCheck super.groupBy; haskell-time-range = dontCheck super.haskell-time-range; + headroom = dontCheck super.headroom; + hgeometry = dontCheck super.hgeometry; + hhp = dontCheck super.hhp; + hint = dontCheck super.hint; + hls-splice-plugin = dontCheck super.hls-splice-plugin; hsakamai = dontCheck super.hsakamai; hsemail-ns = dontCheck super.hsemail-ns; - openapi3 = dontCheck super.openapi3; - strict-writer = dontCheck super.strict-writer; - xml-html-qq = dontCheck super.xml-html-qq; - static = dontCheck super.static; - hhp = dontCheck super.hhp; - groupBy = dontCheck super.groupBy; - greskell = dontCheck super.greskell; html-validator-cli = dontCheck super.html-validator-cli; hw-fingertree-strict = dontCheck super.hw-fingertree-strict; - hw-prim = dontCheck super.hw-prim; hw-packed-vector = dontCheck super.hw-packed-vector; + hw-prim = dontCheck super.hw-prim; hw-xml = dontCheck super.hw-xml; + language-nix = dontCheck super.language-nix; lens-regex = dontCheck super.lens-regex; meep = dontCheck super.meep; + openapi3 = dontCheck super.openapi3; + orbits = dontCheck super.orbits; ranged-list = dontCheck super.ranged-list; rank2classes = dontCheck super.rank2classes; schedule = dontCheck super.schedule; + static = dontCheck super.static; + strict-writer = dontCheck super.strict-writer; + trifecta = dontCheck super.trifecta; twiml = dontCheck super.twiml; twitter-conduit = dontCheck super.twitter-conduit; validationt = dontCheck super.validationt; vgrep = dontCheck super.vgrep; + vinyl = dontCheck super.vinyl; vulkan-utils = dontCheck super.vulkan-utils; + xml-html-qq = dontCheck super.xml-html-qq; yaml-combinators = dontCheck super.yaml-combinators; yesod-paginator = dontCheck super.yesod-paginator; - grammatical-parsers = dontCheck super.grammatical-parsers; - construct = dontCheck super.construct; - orbits = dontCheck super.orbits; - hls-splice-plugin = dontCheck super.hls-splice-plugin; # https://github.com/ekmett/half/issues/35 half = dontCheck super.half; From 7bd01900a5d8713b8a433487d30803bed6c8151b Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 21 Jun 2021 11:59:52 +0900 Subject: [PATCH 19/43] haskellPackages.termonad: dontCheck on arm because of doctests --- pkgs/development/haskell-modules/configuration-arm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index 8682c717dbfb..550b976a5cf6 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -78,6 +78,7 @@ self: super: { schedule = dontCheck super.schedule; static = dontCheck super.static; strict-writer = dontCheck super.strict-writer; + termonad = dontCheck super.termonad; trifecta = dontCheck super.trifecta; twiml = dontCheck super.twiml; twitter-conduit = dontCheck super.twitter-conduit; From 8ec3faac522b9538dc7a1b339ec1156b92ddf43e Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Mon, 21 Jun 2021 13:33:24 +0900 Subject: [PATCH 20/43] spago: patch for newer versions library --- .../haskell-modules/configuration-nix.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d01203e5ea36..0e364a546faa 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -577,7 +577,17 @@ self: super: builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; - spagoWithOverrides = super.spago.override { + spagoWithPatches = appendPatch super.spago ( + # Spago needs a small patch to work with versions-5.0.0: + # https://github.com/purescript/spago/pull/798 + # This can probably be removed with >spago-0.20.3. + pkgs.fetchpatch { + url = "https://github.com/purescript/spago/commit/dd4bf4413d9675c1c8065d24d0ed7b345c7fa5dd.patch"; + sha256 = "1i1r3f4n9mlkckx15bfrdy5m7gjf0zx7ycwyqra6qn34zpcbzpmf"; + } + ); + + spagoWithOverrides = spagoWithPatches.override { # spago has not yet been updated for the latest dhall. dhall = self.dhall_1_38_1; }; From a117b4a33cf89cea67194e3fc0ebf8e8ee20df71 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 21 Jun 2021 12:34:55 +0200 Subject: [PATCH 21/43] haskellPackages.cachix{,-api}: add domen as a maintainer --- .../haskell-modules/configuration-hackage2nix/main.yaml | 3 +++ pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 7e799950a667..b10b8c699e30 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -129,6 +129,9 @@ package-maintainers: - pretty-simple - spago - termonad + domenkozar: + - cachix + - cachix-api expipiplus1: - VulkanMemoryAllocator - autoapply diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 697239fb5849..38b99c3192ac 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -49714,6 +49714,7 @@ self: { ]; description = "Command line client for Nix binary cache hosting https://cachix.org"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ domenkozar ]; }) {inherit (pkgs) boost; inherit (pkgs) nix;}; "cachix-api" = callPackage @@ -49745,6 +49746,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Servant HTTP API specification for https://cachix.org"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ domenkozar ]; }) {}; "cacophony" = callPackage From 29229016f92a23391f71d9f4c4dab82cfcb8ebac Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 21 Jun 2021 12:43:24 +0200 Subject: [PATCH 22/43] haskellPackages.blucontrol: 0.5.0.0 -> 0.5.1.1 Unbreaks build since X11 >= 1.10 is supported as well. --- .../haskell-modules/configuration-common.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d9560a2c4003..38f3e8b50c3c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1947,4 +1947,16 @@ EOT # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; + # Upgrade blucontrol ahead of hackage snapshot to 0.5.1.1 + # for relaxed bounds on X11 + blucontrol = let patchedVersion = "0.5.1.1"; in + assert pkgs.lib.versionOlder super.blucontrol.version patchedVersion; + overrideSrc super.blucontrol { + version = patchedVersion; + src = pkgs.fetchurl { + url = "https://hackage.haskell.org/package/blucontrol-${patchedVersion}/blucontrol-${patchedVersion}.tar.gz"; + sha256 = "0v3ifwxjbxm86ybn5daqqfdm4nmbfzlbkyc19d4nawnzjyf8v2p9"; + }; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 48941ef3427b3a42961893aa0eafea81ca1b3dfd Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 21 Jun 2021 19:55:09 +0200 Subject: [PATCH 23/43] haskellPackages.rel8: add myself as maintainer I want to babysit the test suites of tmp-postgres and rel8 as well as hopefully annoying upstream to stop this silliness. --- .../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 b10b8c699e30..18d19eefda20 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -302,6 +302,7 @@ package-maintainers: - large-hashable - haskell-ci - diagrams + - rel8 # owothia - irc-client - chatter diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 38b99c3192ac..bc8da99aa307 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -220044,6 +220044,7 @@ self: { ]; description = "Hey! Hey! Can u rel8?"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; "relacion" = callPackage From 83220ad7b933de8e4c5df52d00c4abc097670b74 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Mon, 21 Jun 2021 20:14:35 +0200 Subject: [PATCH 24/43] haskellPackages.cachix: move shell completion override to configuration-nix --- pkgs/development/haskell-modules/configuration-common.nix | 2 -- pkgs/development/haskell-modules/configuration-nix.nix | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 38f3e8b50c3c..3a63420f1218 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1473,8 +1473,6 @@ self: super: { # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219 snap = doJailbreak super.snap; - cachix = generateOptparseApplicativeCompletion "cachix" super.cachix; - # 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29 pipes-text = doJailbreak super.pipes-text; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 0e364a546faa..d997d1a8acb2 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -912,4 +912,6 @@ self: super: builtins.intersectAttrs super { rel8 = addTestToolDepend super.rel8 pkgs.postgresql; + cachix = generateOptparseApplicativeCompletion "cachix" super.cachix; + } From c0b69bcbb9fb1e2dee1181d9087e28a756875526 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 19 Jun 2021 21:40:11 +0200 Subject: [PATCH 25/43] haskellPackages.tasty-discover: simplify override If we are cross compiling we can't and don't run the tests since they wouldn't be able to be executed on the host platform. While native compiling, we need to avoid an infinite recursion. --- pkgs/development/haskell-modules/configuration-common.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3a63420f1218..8fe82094d54e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -478,10 +478,7 @@ self: super: { doctest-discover = dontCheck super.doctest-discover; # Depends on itself for testing - tasty-discover = addBuildTool super.tasty-discover - (if pkgs.buildPlatform != pkgs.hostPlatform - then self.buildHaskellPackages.tasty-discover - else dontCheck super.tasty-discover); + tasty-discover = dontCheck super.tasty-discover; # Known issue with nondeterministic test suite failure # https://github.com/nomeata/tasty-expected-failure/issues/21 From 0917e2ae279c5974f1a5028a48d2e8a808e0e7bb Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 19 Jun 2021 21:49:14 +0200 Subject: [PATCH 26/43] haskellPackages.tasty-discover: run test suite in native case For native compilation, we can just add the intermediary build directory to `PATH` which allows the test suite to be preprocessed by tasty-discover itself. When cross-compiling, `doCheck` will be false anyways and this won't matter (fingers crossed!). --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8fe82094d54e..2c32d81cf357 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -478,7 +478,11 @@ self: super: { doctest-discover = dontCheck super.doctest-discover; # Depends on itself for testing - tasty-discover = dontCheck super.tasty-discover; + tasty-discover = overrideCabal super.tasty-discover (drv: { + preBuild = '' + export PATH="$PWD/dist/build/tasty-discover:$PATH" + '' + (drv.preBuild or ""); + }); # Known issue with nondeterministic test suite failure # https://github.com/nomeata/tasty-expected-failure/issues/21 From 377924dd7b5020c202acbb816824252aef5420a9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 19 Jun 2021 22:12:32 +0200 Subject: [PATCH 27/43] haskellPackages: take (more) tool dependencies from buildPackages Fix instances of tool dependencies coming from `self` or `pkgs` instead of `self.buildHaskellPackages` or `pkgs.buildPackages` respectively. This makes sure cross-evaluation and -compilation will work although their may still be more kinks to work out (or cases I missed). This change was mostly created by searching for `[tTool]` and `\${` in the respective files. Note that this has intentionally not been for test tool dependencies: Like in `stdenv.mkDerivation` we need to view tests as being executed on the *host platform* which is why we can't run tests while cross compiling anyways. In practice this is not an important distinction, though: `pkgs.buildPackages` and `pkgs` are almost identical in the native case. Resolves #127232. --- .../haskell-modules/configuration-common.nix | 18 ++++++++--------- .../haskell-modules/configuration-nix.nix | 20 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2c32d81cf357..73acb6bbb294 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -564,7 +564,7 @@ self: super: { preCheck = "export HOME=$TMPDIR"; testToolDepends = drv.testToolDepends or [] ++ [self.cabal-install]; doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335 - executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs]; + executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.buildPackages.emacs]; postInstall = '' local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" ) make -C $lispdir @@ -765,7 +765,7 @@ self: super: { # $PATH. Also, cryptol needs a version of sbl that's newer than what we have # in LTS-13.x. cryptol = overrideCabal super.cryptol (drv: { - buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ]; + buildTools = drv.buildTools or [] ++ [ pkgs.buildPackages.makeWrapper ]; postInstall = drv.postInstall or "" + '' for b in $out/bin/cryptol $out/bin/cryptol-html; do wrapProgram $b --prefix 'PATH' ':' "${pkgs.lib.getBin pkgs.z3}/bin" @@ -791,7 +791,7 @@ self: super: { preCheck = '' export HOME="$TMPDIR" '' + (drv.preCheck or ""); - libraryToolDepends = drv.libraryToolDepends or [] ++ [pkgs.postgresql]; + libraryToolDepends = drv.libraryToolDepends or [] ++ [pkgs.buildPackages.postgresql]; testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps]; }); @@ -1205,7 +1205,7 @@ self: super: { EdisonAPI = appendPatch super.EdisonAPI (pkgs.fetchpatch { url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch"; postFetch = '' - ${pkgs.patchutils}/bin/filterdiff --include='a/edison-api/*' --strip=1 "$out" > "$tmpfile" + ${pkgs.buildPackages.patchutils}/bin/filterdiff --include='a/edison-api/*' --strip=1 "$out" > "$tmpfile" mv "$tmpfile" "$out" ''; sha256 = "0yi5pz039lcm4pl9xnl6krqxyqq5rgb5b6m09w0sfy06x0n4x213"; @@ -1214,7 +1214,7 @@ self: super: { EdisonCore = appendPatch super.EdisonCore (pkgs.fetchpatch { url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch"; postFetch = '' - ${pkgs.patchutils}/bin/filterdiff --include='a/edison-core/*' --strip=1 "$out" > "$tmpfile" + ${pkgs.buildPackages.patchutils}/bin/filterdiff --include='a/edison-core/*' --strip=1 "$out" > "$tmpfile" mv "$tmpfile" "$out" ''; sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp"; @@ -1293,7 +1293,7 @@ self: super: { # Fixed upstream but not released to Hackage yet: # https://github.com/k0001/hs-libsodium/issues/2 libsodium = overrideCabal super.libsodium (drv: { - libraryToolDepends = (drv.libraryToolDepends or []) ++ [self.c2hs]; + libraryToolDepends = (drv.libraryToolDepends or []) ++ [self.buildHaskellPackages.c2hs]; }); # https://github.com/kowainik/policeman/issues/57 @@ -1386,7 +1386,7 @@ self: super: { update-nix-fetchgit = let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ]; in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal (addTestToolDepends super.update-nix-fetchgit deps) (drv: { - buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ]; + buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ]; postInstall = drv.postInstall or "" + '' wrapProgram "$out/bin/update-nix-fetchgit" --prefix 'PATH' ':' "${ pkgs.lib.makeBinPath deps @@ -1612,7 +1612,7 @@ self: super: { feed = dontCheck super.feed; spacecookie = overrideCabal super.spacecookie (old: { - buildTools = (old.buildTools or []) ++ [ pkgs.installShellFiles ]; + buildTools = (old.buildTools or []) ++ [ pkgs.buildPackages.installShellFiles ]; # let testsuite discover the resulting binary preCheck = '' export SPACECOOKIE_TEST_BIN=./dist/build/spacecookie/spacecookie @@ -1884,7 +1884,7 @@ EOT ] ++ (drv.patches or []); # fix line endings preventing patch from applying prePatch = '' - ${pkgs.dos2unix}/bin/dos2unix hashable.cabal + ${pkgs.buildPackages.dos2unix}/bin/dos2unix hashable.cabal '' + (drv.prePatch or ""); }); diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d997d1a8acb2..facd3ec5a3d8 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -243,7 +243,7 @@ self: super: builtins.intersectAttrs super { llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; # Needs help finding LLVM. - spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; + spaceprobe = addBuildTool super.spaceprobe self.buildHaskellPackages.llvmPackages.llvm; # Tries to run GUI in tests leksah = dontCheck (overrideCabal super.leksah (drv: { @@ -336,7 +336,7 @@ self: super: builtins.intersectAttrs super { # https://github.com/deech/fltkhs/issues/16 fltkhs = overrideCabal super.fltkhs (drv: { - libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.autoconf]; + libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.buildPackages.autoconf]; librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.libGL pkgs.libjpeg]; }); @@ -495,8 +495,8 @@ self: super: builtins.intersectAttrs super { Frames-beam = dontCheck super.Frames-beam; # Compile manpages (which are in RST and are compiled with Sphinx). - futhark = with pkgs; - overrideCabal (addBuildTools super.futhark [makeWrapper python3Packages.sphinx]) + futhark = + overrideCabal (addBuildTools super.futhark (with pkgs.buildPackages; [makeWrapper python3Packages.sphinx])) (_drv: { postBuild = (_drv.postBuild or "") + '' make -C docs man @@ -511,7 +511,7 @@ self: super: builtins.intersectAttrs super { git-annex = with pkgs; if (!stdenv.isLinux) then let path = lib.makeBinPath [ coreutils ]; - in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: { + in overrideCabal (addBuildTool super.git-annex buildPackages.makeWrapper) (_drv: { # This is an instance of https://github.com/NixOS/nix/pull/1085 # Fails with: # gpg: can't connect to the agent: File name too long @@ -631,7 +631,7 @@ self: super: builtins.intersectAttrs super { # mplayer-spot uses mplayer at runtime. mplayer-spot = let path = pkgs.lib.makeBinPath [ pkgs.mplayer ]; - in overrideCabal (addBuildTool super.mplayer-spot pkgs.makeWrapper) (oldAttrs: { + in overrideCabal (addBuildTool super.mplayer-spot pkgs.buildPackages.makeWrapper) (oldAttrs: { postInstall = '' wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}" ''; @@ -643,7 +643,7 @@ self: super: builtins.intersectAttrs super { cut-the-crap = let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg pkgs.youtube-dl ]; - in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { + in overrideCabal (addBuildTool super.cut-the-crap pkgs.buildPackages.makeWrapper) (_drv: { postInstall = '' wrapProgram $out/bin/cut-the-crap \ --prefix PATH : "${path}" @@ -660,7 +660,7 @@ self: super: builtins.intersectAttrs super { neuron = overrideCabal (super.neuron) (drv: { # neuron expects the neuron-search script to be in PATH at built-time. - buildTools = [ pkgs.makeWrapper ]; + buildTools = [ pkgs.buildPackages.makeWrapper ]; preConfigure = '' mkdir -p $out/bin cp src-bash/neuron-search $out/bin/neuron-search @@ -879,7 +879,7 @@ self: super: builtins.intersectAttrs super { (justStaticExecutables super.cabal2nix-unstable) (drv: { buildTools = (drv.buildTools or []) ++ [ - pkgs.makeWrapper + pkgs.buildPackages.makeWrapper ]; postInstall = '' wrapProgram $out/bin/cabal2nix \ @@ -902,7 +902,7 @@ self: super: builtins.intersectAttrs super { # Runtime dependencies and CLI completion nvfetcher = generateOptparseApplicativeCompletion "nvfetcher" (overrideCabal super.nvfetcher (drv: { - buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ]; + buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ]; postInstall = drv.postInstall or "" + '' wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${ pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch-git ] From 208c19ef475e11eb78d4f2de9728f3b4cc85a49f Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 22 Jun 2021 00:50:29 +0200 Subject: [PATCH 28/43] all-cabal-hashes: 2021-06-19T11:58:52Z -> 2021-06-21T21:28:52Z 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 0a817a2e3317..374edc0d9f97 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "cdeee115727dc5beb9b502f510d7daa96373f275", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/cdeee115727dc5beb9b502f510d7daa96373f275.tar.gz", - "sha256": "1hfa2g1qa9dqzzhdwranpxxy16a35iq89lq3xrknc3b14mdg9xj3", - "msg": "Update from Hackage at 2021-06-19T11:58:52Z" + "commit": "ec4194ba6ed7589da64cb91db94144ce8688c464", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ec4194ba6ed7589da64cb91db94144ce8688c464.tar.gz", + "sha256": "0346zc3s9myh7c6ixm9gcxwarpjhfl5maygj690ysmgl8fdqrd6v", + "msg": "Update from Hackage at 2021-06-21T21:28:52Z" } From 9706e4bf08677a07ad3a68889bc8abd6c09b2870 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 22 Jun 2021 00:56:09 +0200 Subject: [PATCH 29/43] 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 | 572 ++++++++++++++++-- 1 file changed, 508 insertions(+), 64 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index bc8da99aa307..197c9d51e8b7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -8814,6 +8814,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "HMock" = callPackage + ({ mkDerivation, base, constraints, containers, data-default + , deepseq, directory, doctest-exitcode-stdio, doctest-lib + , exceptions, extra, hspec, monad-control, mono-traversable, mtl + , QuickCheck, regex-tdfa, syb, template-haskell, transformers-base + , unliftio + }: + mkDerivation { + pname = "HMock"; + version = "0.1.0.1"; + sha256 = "1viv8aggapxvk1akm1z3976h4b12wa8zwkr5qinfpvmsgvlkhhlz"; + libraryHaskellDepends = [ + base constraints containers data-default exceptions extra + monad-control mono-traversable mtl regex-tdfa syb template-haskell + transformers-base unliftio + ]; + testHaskellDepends = [ + base containers data-default deepseq directory + doctest-exitcode-stdio doctest-lib exceptions extra hspec mtl + QuickCheck syb template-haskell unliftio + ]; + description = "A flexible mock framework for testing effectful code"; + license = lib.licenses.bsd3; + }) {}; + "HNM" = callPackage ({ mkDerivation, base, containers, directory, glib, gtk, haskell98 , mtl, process, regex-posix, unix @@ -13460,6 +13485,8 @@ self: { pname = "MissingH"; version = "1.4.3.0"; sha256 = "196cniya5wzcv2d777nr0f7hinclpals4ia1mkzzv35870pqr6lw"; + revision = "1"; + editedCabalFile = "0f8x0vpwcbcvy3b421pahx1ff6l3lfaqvvfkyks1vllcr4p8ky9j"; libraryHaskellDepends = [ array base containers directory filepath hslogger mtl network network-bsd old-locale old-time parsec process random regex-compat @@ -20404,8 +20431,8 @@ self: { }: mkDerivation { pname = "Unixutils"; - version = "1.54.1"; - sha256 = "0i16fg24n6lwn3jlh09bxdv1ip06ympkfvwmcj1nbcjcfhlmaagr"; + version = "1.54.2"; + sha256 = "040wj8mr2k7spwns3vnadcgynqq4h7zy3lf62lvx7gasjmaj5m4w"; libraryHaskellDepends = [ base bytestring directory exceptions filepath mtl process process-extras pureMD5 regex-tdfa unix zlib @@ -35516,6 +35543,25 @@ self: { license = lib.licenses.bsd3; }) {}; + "authenticate-oauth_1_7" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring + , crypto-pubkey-types, data-default, http-client, http-types + , random, RSA, SHA, time, transformers, transformers-compat + }: + mkDerivation { + pname = "authenticate-oauth"; + version = "1.7"; + sha256 = "0y4v46rn0cvm0sr1v8qq1zgzllrlrr3ji5gij1xprgf1zsazcvvl"; + libraryHaskellDepends = [ + base base64-bytestring blaze-builder bytestring crypto-pubkey-types + data-default http-client http-types random RSA SHA time + transformers transformers-compat + ]; + description = "Library to authenticate with OAuth for Haskell web applications"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "authinfo-hs" = callPackage ({ mkDerivation, attoparsec, base, network, text }: mkDerivation { @@ -36026,6 +36072,44 @@ self: { license = lib.licenses.bsd3; }) {}; + "avro_0_5_2_1" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors + , binary, bytestring, containers, data-binary-ieee754, deepseq + , directory, doctest, doctest-discover, extra, fail, gauge + , generic-lens, HasBigDecimal, hashable, hedgehog, hspec + , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, mtl + , QuickCheck, random, raw-strings-qq, scientific, semigroups + , tagged, template-haskell, text, tf-random, time, transformers + , unordered-containers, uuid, vector, zlib + }: + mkDerivation { + pname = "avro"; + version = "0.5.2.1"; + sha256 = "0g10nbcxz5ff7rckbzwb4sxh1qqg6ay5zwakmlxrsfj9srg8dq2d"; + libraryHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary bytestring + containers data-binary-ieee754 deepseq fail HasBigDecimal hashable + mtl raw-strings-qq scientific semigroups tagged template-haskell + text tf-random time unordered-containers uuid vector zlib + ]; + testHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary bytestring + containers directory doctest doctest-discover extra fail + generic-lens HasBigDecimal hashable hedgehog hspec + hw-hspec-hedgehog lens lens-aeson mtl QuickCheck raw-strings-qq + scientific semigroups tagged text tf-random time transformers + unordered-containers uuid vector zlib + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base binary bytestring containers deepseq gauge hashable mtl + random raw-strings-qq text transformers unordered-containers vector + ]; + description = "Avro serialization support for Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "avro-piper" = callPackage ({ mkDerivation, aeson, avro, base, bytestring, conduit , conduit-combinators, conduit-extra, hedgehog, hspec @@ -38134,6 +38218,30 @@ self: { license = lib.licenses.bsd3; }) {}; + "base32_0_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq + , ghc-byteorder, memory, QuickCheck, random-bytestring, tasty + , tasty-hunit, tasty-quickcheck, text, text-short + }: + mkDerivation { + pname = "base32"; + version = "0.2.1.0"; + sha256 = "1c1qzbri6m8b2m1cr68vrjbny6wlvfyrbfyzd61s83a3y3w39plp"; + libraryHaskellDepends = [ + base bytestring deepseq ghc-byteorder text text-short + ]; + testHaskellDepends = [ + base bytestring memory QuickCheck random-bytestring tasty + tasty-hunit tasty-quickcheck text text-short + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq memory random-bytestring text + ]; + description = "Fast RFC 4648-compliant Base32 encoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "base32-bytestring" = callPackage ({ mkDerivation, base, bits-extras, bytestring, cpu, criterion , hspec, QuickCheck @@ -41368,8 +41476,8 @@ self: { ({ mkDerivation, base, bindings-DSL }: mkDerivation { pname = "bindings-libpci"; - version = "0.4.0.0"; - sha256 = "18vjsgvndmxbxvyapxkgkx36qgh2yrdg8dfaqpcd9zr3yl84kxnq"; + version = "0.4.0.1"; + sha256 = "01wsk8qr1wky0x5pmpw3nljrjbxyf3hd2kgd5vsmcn71gj436hl9"; libraryHaskellDepends = [ base bindings-DSL ]; description = "Low level bindings to libpci"; license = lib.licenses.bsd3; @@ -44143,8 +44251,8 @@ self: { }: mkDerivation { pname = "blucontrol"; - version = "0.5.0.0"; - sha256 = "1xqwhzxgjn7fza46whp8rdpvsglly577hxjxlaqb67174rq29zgi"; + version = "0.5.1.1"; + sha256 = "0v3ifwxjbxm86ybn5daqqfdm4nmbfzlbkyc19d4nawnzjyf8v2p9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46545,6 +46653,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "bugzilla-redhat_0_3_2" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection + , containers, hspec, http-conduit, http-types, iso8601-time + , resourcet, text, time, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "bugzilla-redhat"; + version = "0.3.2"; + sha256 = "1f2v2mqbyjlv6xj9vxdzbl1kba5smpkb38dxprp13d33jf2rxamm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring connection containers + http-conduit http-types iso8601-time resourcet text time + transformers unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec time ]; + description = "A Haskell interface to the Bugzilla native REST API"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "build" = callPackage ({ mkDerivation, algebraic-graphs, base, containers, extra , filepath, mtl, random, transformers @@ -47815,8 +47945,8 @@ self: { pname = "bytestring-trie"; version = "0.2.5.0"; sha256 = "1jpynpyarikxhlc4ifdswvkj0ph9fd5d0vcxhjv0lrv0zwqvv488"; - revision = "1"; - editedCabalFile = "1qpv52ywp8r30s3m9qyjiqiwa6clg3zp095yhs2d4533amprryly"; + revision = "2"; + editedCabalFile = "0z2d6k7w2bzjdjvhk5aa5a8j6x5m84xj03rgb4jb70psifmzkg9f"; libraryHaskellDepends = [ base binary bytestring ]; description = "An efficient finite map from (byte)strings to values"; license = lib.licenses.bsd3; @@ -48872,10 +49002,8 @@ self: { }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.4.1"; - sha256 = "1djw4l0z8nsaby2qcm08kvn2p1c35ynzdg25vc815dx2wpw38bh3"; - revision = "1"; - editedCabalFile = "1fhjz4hji57sg00nb8jchvm8b13wn9pknnycgcclvxa3s72rqsf5"; + version = "0.4.2"; + sha256 = "08ny95sryii4nzyy8b2zf15vk329y84gbvpy7302hnjxanc6awx5"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring Cabal containers cryptohash-sha256 deepseq directory filepath lukko @@ -49677,11 +49805,11 @@ self: { }) {}; "cachix" = callPackage - ({ mkDerivation, async, base, base64-bytestring, boost, bytestring + ({ mkDerivation, async, base, base64-bytestring, bytestring , cachix-api, concurrent-extra, conduit, conduit-extra, containers , cookie, cryptonite, dhall, directory, ed25519, filepath, fsnotify - , here, hspec, hspec-discover, http-client, http-client-tls - , http-conduit, http-types, inline-c, inline-c-cpp, lzma-conduit + , hercules-ci-cnix-store, here, hspec, hspec-discover, http-client + , http-client-tls, http-conduit, http-types, lzma-conduit , megaparsec, memory, mmorph, netrc, nix, optparse-applicative , process, protolude, resourcet, retry, safe-exceptions, servant , servant-auth, servant-auth-client, servant-client @@ -49690,21 +49818,20 @@ self: { }: mkDerivation { pname = "cachix"; - version = "0.6.0"; - sha256 = "1ay3k2npnplvgc44vn3zcyd5rgyfigvij4zil3nwrpdi0psd76nl"; + version = "0.6.1"; + sha256 = "0fgm7035ahlgl3vbk0lqf3l07wagsykmw9z0pkzqqcwh1wlv1np7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base base64-bytestring bytestring cachix-api concurrent-extra conduit conduit-extra containers cookie cryptonite dhall directory - ed25519 filepath fsnotify here http-client http-client-tls - http-conduit http-types inline-c inline-c-cpp lzma-conduit - megaparsec memory mmorph netrc optparse-applicative process - protolude resourcet retry safe-exceptions servant servant-auth + ed25519 filepath fsnotify hercules-ci-cnix-store here http-client + http-client-tls http-conduit http-types lzma-conduit megaparsec + memory mmorph netrc optparse-applicative process protolude + resourcet retry safe-exceptions servant servant-auth servant-auth-client servant-client servant-client-core servant-conduit stm text unix uri-bytestring vector versions ]; - librarySystemDepends = [ boost ]; libraryPkgconfigDepends = [ nix ]; executableHaskellDepends = [ base cachix-api ]; executableToolDepends = [ hspec-discover ]; @@ -49715,7 +49842,7 @@ self: { description = "Command line client for Nix binary cache hosting https://cachix.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ domenkozar ]; - }) {inherit (pkgs) boost; inherit (pkgs) nix;}; + }) {inherit (pkgs) nix;}; "cachix-api" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring @@ -59053,6 +59180,29 @@ self: { license = lib.licenses.bsd3; }) {}; + "commonmark_0_2_1" = callPackage + ({ mkDerivation, base, bytestring, containers, parsec, tasty + , tasty-bench, tasty-hunit, tasty-quickcheck, text, transformers + , unicode-transforms + }: + mkDerivation { + pname = "commonmark"; + version = "0.2.1"; + sha256 = "1vba7v1zaqh811v3j4x42g7mhwvxwgzm997kq1kzd0njby14fq5b"; + libraryHaskellDepends = [ + base bytestring containers parsec text transformers + unicode-transforms + ]; + testHaskellDepends = [ + base parsec tasty tasty-hunit tasty-quickcheck text + unicode-transforms + ]; + benchmarkHaskellDepends = [ base tasty-bench text ]; + description = "Pure Haskell commonmark parser"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "commonmark-cli" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, commonmark , commonmark-extensions, commonmark-pandoc, containers, mtl @@ -73012,6 +73162,21 @@ self: { license = lib.licenses.bsd3; }) {}; + "deriving-trans" = callPackage + ({ mkDerivation, base, lifted-base, monad-control, mtl + , transformers, transformers-base + }: + mkDerivation { + pname = "deriving-trans"; + version = "0.1.0.0"; + sha256 = "1yphl0wjp67b7hc3ys6snlvzk67by070p5vfmwcv7ic688vh1dw4"; + libraryHaskellDepends = [ + base lifted-base monad-control mtl transformers transformers-base + ]; + description = "Derive transformer type classes with DerivingVia"; + license = lib.licenses.bsd3; + }) {}; + "derp" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -74586,8 +74751,8 @@ self: { pname = "diagrams-postscript"; version = "1.5"; sha256 = "00j58mc84srjvrf21v6zjxxlbw6b8ahhn1jmbq697w8kw3cvygpa"; - revision = "1"; - editedCabalFile = "1cl7fmqiq9bng7va8kwlcxjmh76p1pm71c3p8242r552s10wqvb6"; + revision = "2"; + editedCabalFile = "0dyji1b8mcxaxwzgckkk3p3ji0prrp7rsin98f1hmyjlj3ih735b"; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core diagrams-lib hashable lens monoid-extras mtl semigroups split @@ -75628,8 +75793,8 @@ self: { }: mkDerivation { pname = "diohsc"; - version = "0.1.6.1"; - sha256 = "15shc82ii68dzpa0j9dqi6iyhqa6zbr9g2007c1na42rxhm8fg7j"; + version = "0.1.7"; + sha256 = "0xhpj1dhcppvxv8558aai1azx8i3awv4adwl0vffzwj2kas23gjm"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -86185,8 +86350,8 @@ self: { }: mkDerivation { pname = "eventlog2html"; - version = "0.9.0"; - sha256 = "1cjnkqdnk76839dl4dbpj3vzbkrjwgqryq2j3sgs9mmxfing7ahq"; + version = "0.9.1"; + sha256 = "17fp0q44lk3nkqzpilxlvzbr0b25girbh7j18yl6blcp5mcmq2cd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96088,8 +96253,8 @@ self: { }: mkDerivation { pname = "ftdi"; - version = "0.3.0.0"; - sha256 = "1yhcpd9jzhmvlmhidyv70s5mvakq6jn9lb3zh132lrqsrirbmpx8"; + version = "0.3.0.1"; + sha256 = "0xa1dld03ai3mxqywia3f9pvyz67slw7dai8m97iqg1xysd8ykzr"; libraryHaskellDepends = [ async base base-unicode-symbols bytestring transformers usb vector ]; @@ -99480,6 +99645,21 @@ self: { license = lib.licenses.mit; }) {}; + "genvalidity_0_11_0_2" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random + , validity + }: + mkDerivation { + pname = "genvalidity"; + version = "0.11.0.2"; + sha256 = "16bd5dx0ngc8z7mij23i2l3a8v3c112x8ksd623alik18zx7pi8j"; + libraryHaskellDepends = [ base QuickCheck random validity ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck ]; + description = "Testing utilities for the validity library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "genvalidity-aeson" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text @@ -101925,14 +102105,14 @@ self: { license = lib.licenses.bsd2; }) {}; - "ghc-typelits-natnormalise_0_7_5" = callPackage + "ghc-typelits-natnormalise_0_7_6" = callPackage ({ mkDerivation, base, containers, ghc, ghc-tcplugins-extra , integer-gmp, tasty, tasty-hunit, template-haskell, transformers }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.7.5"; - sha256 = "00mngiaqdshc14l71p1xpv6cxqngh51snbpxmmvnv6h0p87hl9wg"; + version = "0.7.6"; + sha256 = "09d70iw58m5g6yi8k2b52f1g0pfdqm5fzhs8rd7fgrgmi70np9bx"; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra integer-gmp transformers ]; @@ -102229,8 +102409,8 @@ self: { }: mkDerivation { pname = "ghcide"; - version = "1.4.0.1"; - sha256 = "1km28k8mx12mhaq1v2aqd5iaygdh94sjjz9hhz3ksb91059y0m39"; + version = "1.4.0.2"; + sha256 = "1xqvfby6yb734lfiyxmzs17zaz56v7fh9rrfz9p81mdgspsqc739"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104106,8 +104286,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20210428"; - sha256 = "0xpvhpnl600874sa392wjfd2yd9s6ps2cq2qfkzyxxf90p9fcwg8"; + version = "8.20210621"; + sha256 = "01i8mgxz4ca0c50g2w2qgr3m04l5zsw17r0cadn3kwyld662r98n"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -116550,6 +116730,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "happstack-server_7_7_1_1" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring + , containers, directory, exceptions, extensible-exceptions + , filepath, hslogger, html, HUnit, monad-control, mtl, network + , network-uri, old-locale, parsec, process, semigroups, sendfile + , syb, system-filepath, text, threads, time, transformers + , transformers-base, transformers-compat, unix, utf8-string, xhtml + , zlib + }: + mkDerivation { + pname = "happstack-server"; + version = "7.7.1.1"; + sha256 = "0nc5rnvrzl9m3pinmdq234m80qkf4jszbdqnd567f7lh09yiqw9n"; + libraryHaskellDepends = [ + base base64-bytestring blaze-html bytestring containers directory + exceptions extensible-exceptions filepath hslogger html + monad-control mtl network network-uri old-locale parsec process + semigroups sendfile syb system-filepath text threads time + transformers transformers-base transformers-compat unix utf8-string + xhtml zlib + ]; + testHaskellDepends = [ + base bytestring containers HUnit parsec zlib + ]; + description = "Web related tools and services"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "happstack-server-tls" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions , happstack-server, hslogger, HsOpenSSL, network, openssl, sendfile @@ -124765,6 +124974,28 @@ self: { license = lib.licenses.bsd3; }) {}; + "hedn_0_3_0_3" = callPackage + ({ mkDerivation, base, containers, deepseq, deriving-compat + , hedgehog, megaparsec, parser-combinators, prettyprinter + , scientific, template-haskell, text, time, uuid-types, vector + }: + mkDerivation { + pname = "hedn"; + version = "0.3.0.3"; + sha256 = "0amfsmnly9yxzv1j34ya8kq9fqd067kgklx7rswy5g7aflj3bpwl"; + libraryHaskellDepends = [ + base containers deepseq deriving-compat megaparsec + parser-combinators prettyprinter scientific template-haskell text + time uuid-types vector + ]; + testHaskellDepends = [ + base containers hedgehog megaparsec text time uuid-types vector + ]; + description = "EDN parsing and encoding"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hedn-functor" = callPackage ({ mkDerivation, base, containers, hedn, recursion-schemes, text , vector @@ -144069,6 +144300,35 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hypertypes" = callPackage + ({ mkDerivation, array, base, base-compat, binary, constraints + , containers, criterion, deepseq, generic-constraints, generic-data + , lattices, lens, monad-st, mtl, pretty, QuickCheck + , show-combinators, template-haskell, text, th-abstraction + , transformers + }: + mkDerivation { + pname = "hypertypes"; + version = "0.1.0.1"; + sha256 = "0b3cnjw07pryqslnx0k6lxdpwnihnk6pnhp6l9d09mqyxymd9nyx"; + libraryHaskellDepends = [ + array base base-compat binary constraints containers deepseq + generic-constraints generic-data lattices lens monad-st mtl pretty + QuickCheck show-combinators template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ + base constraints containers generic-constraints generic-data + lattices lens monad-st mtl pretty text transformers + ]; + benchmarkHaskellDepends = [ + base constraints containers criterion generic-constraints + generic-data lattices lens monad-st mtl pretty transformers + ]; + description = "Typed ASTs"; + license = lib.licenses.bsd3; + }) {}; + "hyphenate" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -155217,19 +155477,19 @@ self: { ({ mkDerivation, aeson, aeson-casing, base, base64-bytestring , bytestring, containers, exceptions, hashable, hslogger , http-api-data, http-client, http-types, jose, lens, lens-aeson - , mtl, safe, string-conversions, text, unordered-containers, word8 - , wreq + , monad-time, mtl, safe, string-conversions, text + , unordered-containers, word8, wreq }: mkDerivation { pname = "keycloak-hs"; - version = "2.1.0"; - sha256 = "0yki4fqbgirnvcaf5p00pskh91abspivgkkdi9m93andz56vl23v"; + version = "3.0.1"; + sha256 = "1311rzvib7cbb2j4bjqbd5y03frsqqn32grhypvk0fplrdr1hazn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing base base64-bytestring bytestring containers exceptions hashable hslogger http-api-data http-client http-types - jose lens lens-aeson mtl safe string-conversions text + jose lens lens-aeson monad-time mtl safe string-conversions text unordered-containers word8 wreq ]; executableHaskellDepends = [ base hslogger ]; @@ -159158,8 +159418,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "2.1.1"; - sha256 = "1gjiwj8x57z9qs9gxdgqyih38i8rkkvjak4va5cg44qp3rflmby1"; + version = "2.2.0"; + sha256 = "0hi6w7rb1qf3dzla5cjmhz25a4ynkc29mpnixgdx5i8p771zyg3z"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -184467,8 +184727,8 @@ self: { pname = "network-bsd"; version = "2.8.1.0"; sha256 = "0kid0811lv4x761fd5gv6lsc8p5j2bn41rfd366pjb642p562jfr"; - revision = "3"; - editedCabalFile = "1hc3jdbmpq2wxh82xfx452v2m2l97jbdaqqbmj5nz4lljxa2696r"; + revision = "4"; + editedCabalFile = "1gd9a8j7fwg0jz0s6il5fk9sl0hm19ja1w56ix51wa0qi2h5x56d"; libraryHaskellDepends = [ base deepseq network ]; description = "POSIX network database () API"; license = lib.licenses.bsd3; @@ -187127,8 +187387,8 @@ self: { pname = "nonce"; version = "1.0.7"; sha256 = "1q9ph0aq51mvdvydnriqd12sfin36pfb8f588zgac1ybn8r64ksb"; - revision = "1"; - editedCabalFile = "1i6f4nwp4xn31as6plqrf6wp6gn3ylwdi77h99572jy7p3985aw1"; + revision = "2"; + editedCabalFile = "09xvg4lpmb1hw153afhbjrdg9v3npfwpdfhpv5y8b0qvb4zi3n9q"; libraryHaskellDepends = [ base base64-bytestring bytestring entropy text transformers unliftio unliftio-core @@ -190159,6 +190419,35 @@ self: { license = lib.licenses.bsd3; }) {}; + "opaleye_0_7_2_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-locale-compat, transformers, uuid + , void + }: + mkDerivation { + pname = "opaleye"; + version = "0.7.2.0"; + sha256 = "1qz34isgb5hl2ab5vij3zw1h3xwvl3a0d1k02n156xszibnkcgf1"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time time-locale-compat + transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -192177,6 +192466,20 @@ self: { license = lib.licenses.bsd3; }) {}; + "opusfile" = callPackage + ({ mkDerivation, base, bytestring, opusfile }: + mkDerivation { + pname = "opusfile"; + version = "0.1.0.0"; + sha256 = "12mjkmsffnid48sjc6j1wrikw4pl1yz5jk6bgnarv86wcs30w54a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ opusfile ]; + description = "FFI bindings for libopusfile"; + license = lib.licenses.bsd3; + }) {inherit (pkgs) opusfile;}; + "orbits" = callPackage ({ mkDerivation, ad, base, Cabal, cabal-doctest, checkers, doctest , exact-real, lens, linear, QuickCheck, random, tagged, tasty @@ -196705,6 +197008,8 @@ self: { pname = "path-io"; version = "1.6.3"; sha256 = "1dnc48hf8x83p0jy05qi8j8gmfmsy50swnql9ssdv74lsryp615n"; + revision = "1"; + editedCabalFile = "0hzpwyxyj332mq09vgf06vfsga9b0q711fr52x3xswcmhvvsv60g"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -198913,10 +199218,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.12.0.0"; - sha256 = "1s49d4c4kiqcblkap96wcrp3nc0179vpzbqp4fdibljq9ylzxmzg"; - revision = "1"; - editedCabalFile = "047riy3grn68jw99095qgqxvfs5bvxmcvmnz170nrqflrlr4l4dd"; + version = "2.13.0.0"; + sha256 = "0096fjyzgl788ciws0vb5bn5in8946bd12qrg8wz8dyq1xvilg8m"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -203226,8 +203529,8 @@ self: { }: mkDerivation { pname = "ploterific"; - version = "0.2.1.1"; - sha256 = "1i5rgbnvi7s5rq13kj4fnanzmalzh53rim0r3nxxa82i25nb1sfq"; + version = "0.2.1.2"; + sha256 = "1ywg09amxngan23c5724c5s2s79yhynqha6c5xivg1ls58nc7yk5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -220030,8 +220333,8 @@ self: { }: mkDerivation { pname = "rel8"; - version = "1.0.0.0"; - sha256 = "1y9b6b56h0pmxbfvjbjxrn07g1apmvs1nb4agsw4h86w7h0qgaj4"; + version = "1.0.0.1"; + sha256 = "1kwvib3chqw5xrz6v7z0jy75mgyhqqb755xzn02zz2hvjwfcqc6v"; libraryHaskellDepends = [ aeson base bytestring case-insensitive contravariant hasql opaleye profunctors scientific semialign semigroupoids text these time @@ -238883,6 +239186,28 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "skylighting_0_10_5_2" = callPackage + ({ mkDerivation, base, binary, blaze-html, bytestring, containers + , pretty-show, skylighting-core, text + }: + mkDerivation { + pname = "skylighting"; + version = "0.10.5.2"; + sha256 = "152ywiy7h04xjy0fdl571jwahl6c9350isqbm4p0na4cjd9cczzh"; + configureFlags = [ "-fexecutable" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary containers skylighting-core + ]; + executableHaskellDepends = [ + base blaze-html bytestring containers pretty-show text + ]; + description = "syntax highlighting library"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -238914,6 +239239,38 @@ self: { license = lib.licenses.bsd3; }) {}; + "skylighting-core_0_10_5_2" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, mtl, pretty-show, QuickCheck, safe, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, text, transformers, utf8-string + , xml-conduit + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.10.5.2"; + sha256 = "0bskci0gng6nf324wna9ss4xbr1mwjkgk3mlfkr96r1m3wza5g3d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath mtl safe text transformers utf8-string xml-conduit + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath + pretty-show QuickCheck tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -251686,7 +252043,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "sydtest_0_3_0_0" = callPackage + "sydtest_0_3_0_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, Diff, dlist , envparse, filepath, MonadRandom, mtl, optparse-applicative, path , path-io, pretty-show, QuickCheck, quickcheck-io, random-shuffle @@ -251695,8 +252052,8 @@ self: { }: mkDerivation { pname = "sydtest"; - version = "0.3.0.0"; - sha256 = "0swab5qfhp9r7rkqzfbvna0vhzbf7f6gabv266jdc5ghmimy1729"; + version = "0.3.0.1"; + sha256 = "0ddbjs2p2vzmzadggyvdpknmcw935jmj2m9nxki2apc9ciq6skig"; libraryHaskellDepends = [ async base bytestring containers Diff dlist envparse filepath MonadRandom mtl optparse-applicative path path-io pretty-show @@ -252080,6 +252437,34 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "sydtest-yesod_0_2_0_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive + , conduit, containers, cookie, exceptions, http-client, http-types + , monad-logger, mtl, network, persistent, persistent-sqlite + , persistent-template, pretty-show, QuickCheck, resourcet, sydtest + , sydtest-discover, sydtest-persistent-sqlite, sydtest-wai, text + , time, wai, xml-conduit, yesod, yesod-core, yesod-form, yesod-test + }: + mkDerivation { + pname = "sydtest-yesod"; + version = "0.2.0.1"; + sha256 = "1h2gqwp968n1gyg9r7x82c6kdnnfs7m341j7w7wbx3rcvd57c2jf"; + libraryHaskellDepends = [ + base blaze-builder bytestring case-insensitive containers cookie + exceptions http-client http-types mtl network pretty-show sydtest + sydtest-wai text time wai xml-conduit yesod-core yesod-test + ]; + testHaskellDepends = [ + base bytestring conduit cookie http-client http-types monad-logger + mtl persistent persistent-sqlite persistent-template QuickCheck + resourcet sydtest sydtest-persistent-sqlite text yesod yesod-form + ]; + testToolDepends = [ sydtest-discover ]; + description = "A yesod companion library for sydtest"; + license = "unknown"; + hydraPlatforms = lib.platforms.none; + }) {}; + "syfco" = callPackage ({ mkDerivation, array, base, containers, convertible, directory , mtl, parsec, transformers @@ -264855,6 +265240,21 @@ self: { license = lib.licenses.mit; }) {}; + "traverse-with-class_1_0_1_1" = callPackage + ({ mkDerivation, base, tasty, tasty-hunit, template-haskell + , transformers + }: + mkDerivation { + pname = "traverse-with-class"; + version = "1.0.1.1"; + sha256 = "0c0h902hr3gnlmlvqjhz3k5abyg0ays2g2c1kwrhbz0nhgfwk656"; + libraryHaskellDepends = [ base template-haskell transformers ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "Generic applicative traversals"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "travis" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit , transformers @@ -270496,8 +270896,8 @@ self: { }: mkDerivation { pname = "units-parser"; - version = "0.1.1.3"; - sha256 = "0lyy8nh86b0nq2znkli8y1zcg87l6acaaxi8b1m6falb6xnfi0nw"; + version = "0.1.1.4"; + sha256 = "1sdf8jqq03x20gj91faqir9vrdjq7cxpnypx7bi953vjg8fh2jfm"; libraryHaskellDepends = [ base containers mtl multimap parsec ]; testHaskellDepends = [ base containers mtl multimap parsec syb tasty tasty-hunit @@ -273002,6 +273402,8 @@ self: { pname = "uuid-orphans"; version = "1.4.5"; sha256 = "14d7gyf3sa2874r0dhj3ydvmb1iz174kp4pxz7aq984zb4m6d87z"; + revision = "2"; + editedCabalFile = "1202zn5f70f1yvmaknm8l34igg9ihyqs8lhch4ihvx9vcqxs3c0v"; libraryHaskellDepends = [ base safecopy text th-lift uuid-types web-routes ]; @@ -273058,8 +273460,8 @@ self: { ({ mkDerivation, base, Cabal, directory, filepath, HUnit, text }: mkDerivation { pname = "uusi"; - version = "0.4.1.0"; - sha256 = "14g56ygqx8n24hvbb9bzi7yy5wjfsvw3m89lad0xy8knf6gnh6y3"; + version = "0.4.2.0"; + sha256 = "0c7zcx594cnfng9sszm70fcfi81n7j54vvk32mvp8j52d7f812cb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal text ]; @@ -273472,6 +273874,19 @@ self: { license = lib.licenses.mit; }) {}; + "validity_0_11_0_1" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "validity"; + version = "0.11.0.1"; + sha256 = "086nj5ymp4mxxfw9qjgjhd4j3z7gl2y9d89p0b7bkap5ampgdw2x"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Validity typeclass"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, hspec, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector @@ -283456,6 +283871,35 @@ self: { license = lib.licenses.mit; }) {}; + "xlsx_0_8_4" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search + , bytestring, conduit, containers, criterion, data-default, deepseq + , Diff, errors, extra, filepath, groom, lens, mtl, network-uri + , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text, time, transformers, vector, xeno + , xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "xlsx"; + version = "0.8.4"; + sha256 = "0xmz9qpqyz2gwlrjsy2m79s4xswb6lz7fbvybd4awg5vy0y6pl41"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary-search bytestring conduit + containers data-default deepseq errors extra filepath lens mtl + network-uri old-locale safe text time transformers vector xeno + xml-conduit zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff groom lens mtl raw-strings-qq + smallcheck tasty tasty-hunit tasty-smallcheck text time vector + xml-conduit + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Simple and incomplete Excel file parser/writer"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "xlsx-tabular" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx From cd32f53cb1c0a6ead3c228c08f73bc1e1ab95b7b Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 22 Jun 2021 00:59:19 +0200 Subject: [PATCH 30/43] haskellPackages.blucontrol: Remove obsolete override --- .../haskell-modules/configuration-common.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 73acb6bbb294..17817f17e45a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1946,16 +1946,4 @@ EOT # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; - # Upgrade blucontrol ahead of hackage snapshot to 0.5.1.1 - # for relaxed bounds on X11 - blucontrol = let patchedVersion = "0.5.1.1"; in - assert pkgs.lib.versionOlder super.blucontrol.version patchedVersion; - overrideSrc super.blucontrol { - version = patchedVersion; - src = pkgs.fetchurl { - url = "https://hackage.haskell.org/package/blucontrol-${patchedVersion}/blucontrol-${patchedVersion}.tar.gz"; - sha256 = "0v3ifwxjbxm86ybn5daqqfdm4nmbfzlbkyc19d4nawnzjyf8v2p9"; - }; - }; - } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 23019ba481158a47ddcf273a6dc69304c324ef0e Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 22 Jun 2021 04:21:41 +0200 Subject: [PATCH 31/43] haskellPackages.git-annex: Fix hash --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 17817f17e45a..0f4b58dbb854 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "1wig8nw2rxgq86y88m1f1qf93z5yckidf1cs33ribmhqa1hs300p"; + sha256 = "0s9md7bzblzxlpbpna1wa6pxaf44l4g7s0xqwj6rci7h7kp55qqv"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From 101c5857709a4483572a573475614eaf7739737a Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 22 Jun 2021 04:23:46 +0200 Subject: [PATCH 32/43] haskellPackages.hls-module-name-plugin: Disable checks on darwin --- pkgs/development/haskell-modules/configuration-darwin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index e9cc5bc837d9..47a5cf4e9bc1 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -172,5 +172,6 @@ self: super: { hls-class-plugin = dontCheck super.hls-class-plugin; hls-brittany-plugin = dontCheck super.hls-brittany-plugin; hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; + hls-module-name-plugin = dontCheck super.hls-module-name-plugin; } From 877c07f55699898c4c0e861bf2a7bb7a1d3bb804 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 22 Jun 2021 09:47:32 +0200 Subject: [PATCH 33/43] haskellPackages.hercules-ci-agent: Remove obsolete override --- .../haskell-modules/configuration-common.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0f4b58dbb854..49d5f995808e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1487,20 +1487,7 @@ self: super: { # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 servant-swagger = dontCheck super.servant-swagger; - hercules-ci-agent = super.hercules-ci-agent.override { - cachix = - # https://github.com/cachix/cachix/pull/361 - (appendPatch - (addBuildDepend super.cachix super.hercules-ci-cnix-store) - (pkgs.fetchpatch { - name = "cachix-361.patch"; - url = "https://patch-diff.githubusercontent.com/raw/cachix/cachix/pull/361.patch"; - sha256 = "0wwlcpmnqmvk1css5f723dzgjvg4jr7i58ifhni5zg9h5iwycdfr"; - stripLen = 1; - includes = ["*.cabal" "*.hs"]; - }) - ); - }; + hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent; hercules-ci-cli = generateOptparseApplicativeCompletion "hci" ( # See hercules-ci-optparse-applicative in non-hackage-packages.nix. From ea13609aae70b9e9b5f6e0f2ee7006b6a67f0630 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 22 Jun 2021 09:48:51 +0200 Subject: [PATCH 34/43] all-cabal-hashes: 2021-06-21T21:28:52Z -> 2021-06-22T07:13:30Z 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 374edc0d9f97..8a8cfa74d702 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "ec4194ba6ed7589da64cb91db94144ce8688c464", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ec4194ba6ed7589da64cb91db94144ce8688c464.tar.gz", - "sha256": "0346zc3s9myh7c6ixm9gcxwarpjhfl5maygj690ysmgl8fdqrd6v", - "msg": "Update from Hackage at 2021-06-21T21:28:52Z" + "commit": "8005ce7c7ba90fa92db65f86c544623353a96cf8", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8005ce7c7ba90fa92db65f86c544623353a96cf8.tar.gz", + "sha256": "1kzhh7h0csb0vh9avbjsm6hziaa3lbpmzp4pkij4s3bbl4l664aa", + "msg": "Update from Hackage at 2021-06-22T07:13:30Z" } From 35b0764e118e8de9b75b360938bd873456963cc9 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 22 Jun 2021 09:49:18 +0200 Subject: [PATCH 35/43] 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 | 143 +++++++++++++++--- 1 file changed, 120 insertions(+), 23 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 197c9d51e8b7..e8a628e081d1 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -20758,8 +20758,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.5.1"; - sha256 = "13savwlcdpvskir5v8yb019cxszrsjrkyisws0w8ddc94a3c9x2c"; + version = "0.6"; + sha256 = "15hmvswhwy7g0i5ybsjby8x4dwyg0j381rh425kjzv9qbjp4dw2r"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -88582,6 +88582,43 @@ self: { broken = true; }) {}; + "fakedata_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq + , directory, exceptions, fakedata-parser, filepath, gauge, hashable + , hspec, hspec-discover, QuickCheck, random, regex-tdfa + , string-random, template-haskell, text, time, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "fakedata"; + version = "1.0"; + sha256 = "1bbb90i6pm8ih1br81hwwz2bb2yvkx6fv44xkw0qv741n9a9rcz0"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + attoparsec base bytestring containers directory exceptions + fakedata-parser filepath hashable QuickCheck random regex-tdfa + string-random template-haskell text time transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + attoparsec base bytestring containers directory exceptions + fakedata-parser filepath hashable hspec QuickCheck random + regex-tdfa string-random template-haskell text time transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring containers deepseq directory exceptions + fakedata-parser filepath gauge hashable QuickCheck random + regex-tdfa string-random template-haskell text time transformers + unordered-containers vector yaml + ]; + description = "Library for producing fake data"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "fakedata-parser" = callPackage ({ mkDerivation, attoparsec, base, hspec, text }: mkDerivation { @@ -125588,8 +125625,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.8.1"; - sha256 = "0f18mz2chwipjac7dc918hn54frrxqk6bvyjvzqq25agi5zh8h12"; + version = "0.8.2"; + sha256 = "0zz0s9xpi5gdma1ljfbspfysn8vw05859k159nx8lxqbivpf6bxn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125622,7 +125659,7 @@ self: { conduit containers exceptions filepath hercules-ci-api-agent hercules-ci-api-core hercules-ci-cnix-store hspec katip lifted-async lifted-base monad-control process protolude - safe-exceptions text transformers-base unliftio-core + safe-exceptions temporary text transformers-base unliftio-core ]; description = "Runs Continuous Integration tasks on your machines"; license = lib.licenses.asl20; @@ -125638,8 +125675,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api"; - version = "0.6.0.1"; - sha256 = "1c9dvj9vv4rm0ndmgfm9s4qfpjbs2ly98r06bl0xv550anik7kqj"; + version = "0.7.0.0"; + sha256 = "0c8mhmhz89fw0s65a669cpcldqv0g01z9s2343ksv2ykaqz5whi9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125670,8 +125707,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api-agent"; - version = "0.3.1.0"; - sha256 = "0p1xlzwhaz6ycjzmadnlmr7fvz9iar9b7qzz867xxvix6p8w2nj6"; + version = "0.4.0.0"; + sha256 = "05jdxlr5afr9chayc6frbi9hhagb9qknfdnd2k25cimd7h2syi7r"; libraryHaskellDepends = [ aeson base base64-bytestring-type bytestring containers cookie deepseq exceptions hashable hercules-ci-api-core http-api-data @@ -125698,8 +125735,8 @@ self: { }: mkDerivation { pname = "hercules-ci-api-core"; - version = "0.1.2.0"; - sha256 = "1p2vv5dviac73qi42x7kf09wgc3qjdkpldn7yj5vhmxhcnj7yj6x"; + version = "0.1.3.0"; + sha256 = "1xs5als5fw0fj76rgmygndpw1vfs9bj4lyr8hfgkv4vfbdrmkj2y"; libraryHaskellDepends = [ aeson base bytestring containers cookie deepseq exceptions hashable http-api-data http-media katip lens lifted-base memory @@ -125726,8 +125763,8 @@ self: { }: mkDerivation { pname = "hercules-ci-cli"; - version = "0.2.0"; - sha256 = "0fxsx31b6m9hxcpymixmfpvj1k569kzbxd2jvm8kzda073hljsbm"; + version = "0.2.1"; + sha256 = "1lbvc2n1mjrnvnpnqvgjd1zbsa96zdpvjhbawfd8rw63ih8l451z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125756,15 +125793,16 @@ self: { "hercules-ci-cnix-expr" = callPackage ({ mkDerivation, aeson, base, bdw-gc, boost, bytestring, conduit , containers, exceptions, hercules-ci-cnix-store, inline-c - , inline-c-cpp, nix, protolude, text + , inline-c-cpp, nix, protolude, text, unliftio }: mkDerivation { pname = "hercules-ci-cnix-expr"; - version = "0.1.0.0"; - sha256 = "1f9pq6z5xvmq7hd136dshazybazydsmah5f5h8w82yi12ccyqlaz"; + version = "0.2.0.0"; + sha256 = "1z76ckxb629lbwa96axigan8xax6wd9w8p37isyisqwvk1a1gsc7"; libraryHaskellDepends = [ aeson base bytestring conduit containers exceptions hercules-ci-cnix-store inline-c inline-c-cpp protolude text + unliftio ]; librarySystemDepends = [ boost ]; libraryPkgconfigDepends = [ bdw-gc nix ]; @@ -255934,6 +255972,30 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-silver_3_2_2" = callPackage + ({ mkDerivation, ansi-terminal, async, base, bytestring, containers + , deepseq, directory, filepath, mtl, optparse-applicative, process + , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit + , temporary, text, transformers + }: + mkDerivation { + pname = "tasty-silver"; + version = "3.2.2"; + sha256 = "0zsl6nna8ir215qyxhyh2czx4i16hzw1n1m8jw8ym02j6sp6iz13"; + libraryHaskellDepends = [ + ansi-terminal async base bytestring containers deepseq directory + filepath mtl optparse-applicative process process-extras regex-tdfa + stm tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + transformers + ]; + description = "A fancy test runner, including support for golden tests"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-smallcheck" = callPackage ({ mkDerivation, base, optparse-applicative, smallcheck, tagged , tasty @@ -276552,8 +276614,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.10.4"; - sha256 = "1z6ckyglfmgsbkz41ymb5krcis3rhm30dkyayail6w484a2ay7ph"; + version = "3.11"; + sha256 = "0kpnchaidl555zr5k166kmxnb8kiablnwjhi2gb665v64shj3k2k"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -276581,8 +276643,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.0.1"; - sha256 = "0h904kz61ym7d0qaa59d52a4kw09iaz92q5qdlnmnyn2bdmqp3bl"; + version = "0.5.0.2"; + sha256 = "19jxd73li1ybdfzznlql2im8k0qad1yas75d5cdfvjazv7x4g3n1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -278790,6 +278852,40 @@ self: { license = lib.licenses.mit; }) {}; + "warp_3_3_17" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, gauge + , ghc-prim, hashable, hspec, http-client, http-date, http-types + , http2, HUnit, iproute, network, process, QuickCheck + , simple-sendfile, stm, streaming-commons, text, time, time-manager + , unix, unix-compat, unliftio, vault, wai, word8, x509 + }: + mkDerivation { + pname = "warp"; + version = "3.3.17"; + sha256 = "0v54ca3wpa79gdyiikwhbv9h8b5vr3d60piq3ndb2v7s7fi1qpm0"; + libraryHaskellDepends = [ + array auto-update base bsb-http-chunked bytestring case-insensitive + containers ghc-prim hashable http-date http-types http2 iproute + network simple-sendfile stm streaming-commons text time-manager + unix unix-compat unliftio vault wai word8 x509 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory ghc-prim hashable hspec + http-client http-date http-types http2 HUnit iproute network + process QuickCheck simple-sendfile stm streaming-commons text time + time-manager unix unix-compat unliftio vault wai word8 x509 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network time-manager unix unix-compat unliftio x509 + ]; + description = "A fast, light-weight web server for WAI applications"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -290052,12 +290148,13 @@ self: { }) {}; "zenc" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, hedgehog, hspec, hspec-hedgehog }: mkDerivation { pname = "zenc"; - version = "0.1.1"; - sha256 = "0p0h7vz14k9v8gsnpkb9ca61i1k67vvsjg0bzy0ag4m20k94zlb2"; + version = "0.1.2"; + sha256 = "0y1waianb7jcad5y3ilns1mvf6mdk58ml1iwxcx1cawr9basj5xr"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hedgehog hspec hspec-hedgehog ]; description = "GHC style name Z-encoding and Z-decoding"; license = lib.licenses.bsd3; }) {}; From 245b76099a90eea69220ffe41d659aa7b5228d70 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 22 Jun 2021 12:34:01 +0200 Subject: [PATCH 36/43] haskellPackages: clean up diagrams-related overrides MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit haskellPackages.dual-tree: downgrade to 0.2.2.1 Since the resolution of the following issues, we can remove a lot of jailbreaks: * https://github.com/diagrams/diagrams-core/issues/112 * https://github.com/diagrams/diagrams-cairo/issues/77 * https://github.com/diagrams/diagrams-rasterific/issues/63 Some we need to keep since the base 4.15 compatibility updates were sometimes bundled with adjustments for monoid-extras 0.6 / diagrams-* 1.5 which we can't yet update to. Downgrade dual-tree since 2.2.3.0 requires monoid-extras 0.6 (although it seemed to compile with 0.5…). --- .../haskell-modules/configuration-common.nix | 18 +++++------------- .../configuration-hackage2nix/main.yaml | 4 ++++ .../haskell-modules/hackage-packages.nix | 19 +++++++++++++++++++ 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 49d5f995808e..7f0c1fb2ceb8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -706,20 +706,14 @@ self: super: { # The tests spuriously fail libmpd = dontCheck super.libmpd; - # 2021-03-12: All of this libraries have to restrictive upper bounds - # https://github.com/diagrams/diagrams-core/issues/112 - # https://github.com/diagrams/diagrams-cairo/issues/77 - # https://github.com/diagrams/diagrams-rasterific/issues/63 - # https://github.com/diagrams/diagrams-cairo/issues/77 - active = doJailbreak super.active; - statestack = doJailbreak super.statestack; - force-layout = doJailbreak super.force-layout; + # Too strict bounds on template-haskell (doesn't allow 2.16) + # For 2.17 support: https://github.com/JonasDuregard/sized-functors/pull/10 size-based = doJailbreak super.size-based; + + # Remove as soon as we update to monoid-extras 0.6 and unpin these packages dual-tree = doJailbreak super.dual-tree; diagrams-core = doJailbreak super.diagrams-core; - diagrams-postscript = doJailbreak super.diagrams-postscript; - diagrams-svg = doJailbreak super.diagrams-svg; - diagrams-contrib = doJailbreak super.diagrams-contrib; + # Apply patch from master to add compat with optparse-applicative >= 0.16. # We unfortunately can't upgrade to 1.4.4 which includes this patch yet # since it would require monoid-extras 0.6 which breaks other diagrams libs. @@ -729,8 +723,6 @@ self: super: { sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa"; includes = [ "*/CmdLine.hs" ]; })); - diagrams-rasterific = doJailbreak super.diagrams-rasterific; - diagrams-cairo = doJailbreak super.diagrams-cairo; # https://github.com/diagrams/diagrams-solve/issues/4 diagrams-solve = dontCheck super.diagrams-solve; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 18d19eefda20..2bcee2b2774f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -78,7 +78,11 @@ default-package-overrides: # until we can do a full migration, see # https://github.com/diagrams/diagrams-core/issues/115 # We can keep this pin at most until base 4.15 + # Since the monoid-extras adjustment was combined with + # a major release in some cases, we need to wait for + # diagrams 1.5 to be released. - monoid-extras < 0.6 + - dual-tree < 0.2.3.0 - diagrams-core < 1.5.0 - diagrams-lib < 1.4.4 # 2021-06-05: remove once pandoc 2.14 is in stackage diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e8a628e081d1..cce66e24d4e7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -80001,6 +80001,24 @@ self: { }) {}; "dual-tree" = callPackage + ({ mkDerivation, base, monoid-extras, newtype-generics, QuickCheck + , semigroups, testing-feat + }: + mkDerivation { + pname = "dual-tree"; + version = "0.2.2.1"; + sha256 = "17kdfnf0df0z5pkiifxrlmyd1xd7hjjaazd2kzyajl0gd00vbszx"; + libraryHaskellDepends = [ + base monoid-extras newtype-generics semigroups + ]; + testHaskellDepends = [ + base monoid-extras QuickCheck semigroups testing-feat + ]; + description = "Rose trees with cached and accumulating monoidal annotations"; + license = lib.licenses.bsd3; + }) {}; + + "dual-tree_0_2_3_0" = callPackage ({ mkDerivation, base, monoid-extras, newtype-generics, QuickCheck , semigroups, testing-feat }: @@ -80016,6 +80034,7 @@ self: { ]; description = "Rose trees with cached and accumulating monoidal annotations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "dualizer" = callPackage From 79b9e837ddd10447ce476d5ce4e2c8147e189f1b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 22 Jun 2021 12:44:10 +0200 Subject: [PATCH 37/43] haskellPackages.pandoc-crossref: 0.3.10.0 -> 0.3.11.0 Compatibility with pandoc 2.14. --- .../configuration-hackage2nix/main.yaml | 2 - .../haskell-modules/hackage-packages.nix | 39 ------------------- 2 files changed, 41 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 2bcee2b2774f..fa4e798d1d3b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -85,8 +85,6 @@ default-package-overrides: - dual-tree < 0.2.3.0 - diagrams-core < 1.5.0 - diagrams-lib < 1.4.4 - # 2021-06-05: remove once pandoc 2.14 is in stackage - - pandoc-crossref < 0.3.11.0 # 2021-06-14: hnix still needs old versions https://github.com/haskell-nix/hnix/issues/952 - hnix-store-core < 0.5 - hnix-store-remote < 0.5 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cce66e24d4e7..cce8a60821b5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -194201,44 +194201,6 @@ self: { }) {}; "pandoc-crossref" = callPackage - ({ mkDerivation, base, containers, data-accessor - , data-accessor-template, data-accessor-transformers, data-default - , deepseq, directory, filepath, gitrev, hspec, mtl, open-browser - , optparse-applicative, pandoc, pandoc-types, roman-numerals, syb - , template-haskell, temporary, text, utility-ht - }: - mkDerivation { - pname = "pandoc-crossref"; - version = "0.3.10.0"; - sha256 = "1yymm8y9hzkbjff7cn63qsvpfks1f1n741vfdiiga66kml8v0zdm"; - revision = "1"; - editedCabalFile = "0grjcp8r5fh41qnn3miw6bms3ml9v6n1rjb2yvimf1v69w61nlgq"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base containers data-accessor data-accessor-template - data-accessor-transformers data-default directory filepath mtl - pandoc pandoc-types roman-numerals syb template-haskell text - utility-ht - ]; - executableHaskellDepends = [ - base containers data-accessor data-accessor-template - data-accessor-transformers data-default deepseq directory filepath - gitrev mtl open-browser optparse-applicative pandoc pandoc-types - roman-numerals syb template-haskell temporary text utility-ht - ]; - testHaskellDepends = [ - base containers data-accessor data-accessor-template - data-accessor-transformers data-default directory filepath hspec - mtl pandoc pandoc-types roman-numerals syb template-haskell text - utility-ht - ]; - description = "Pandoc filter for cross-references"; - license = lib.licenses.gpl2Only; - }) {}; - - "pandoc-crossref_0_3_12_0" = callPackage ({ mkDerivation, base, containers, criterion, data-default, deepseq , directory, filepath, gitrev, hspec, microlens, microlens-mtl , microlens-th, mtl, open-browser, optparse-applicative, pandoc @@ -194271,7 +194233,6 @@ self: { doHaddock = false; description = "Pandoc filter for cross-references"; license = lib.licenses.gpl2Only; - hydraPlatforms = lib.platforms.none; }) {}; "pandoc-csv2table" = callPackage From 25556077a5808b13acd861f5a53b8c9b85c6e618 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 22 Jun 2021 12:48:30 +0200 Subject: [PATCH 38/43] haskellPackages.zenc: Jailbreak to fix tests --- 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 7f0c1fb2ceb8..930e2513872a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1925,4 +1925,8 @@ EOT # Break out of "Cabal < 3.2" constraint. stylish-haskell = doJailbreak super.stylish-haskell; + # To strict bound on hspec + # https://github.com/dagit/zenc/issues/5 + zenc = doJailbreak super.zenc; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From d7d3eace879d3efc4578befa0fba146f9953b114 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 22 Jun 2021 16:00:19 +0200 Subject: [PATCH 39/43] haskellPackages.tmp-postgres: disable tests on darwin The tests use pgrep which is not packaged for darwin yet as we are lacking some private / non open source headers for it to compile. May be resolvable in the future. --- pkgs/development/haskell-modules/configuration-darwin.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 47a5cf4e9bc1..0c4b46360ba7 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -174,4 +174,7 @@ self: super: { hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; hls-module-name-plugin = dontCheck super.hls-module-name-plugin; + # We are lacking pure pgrep at the moment for tests to work + tmp-postgres = dontCheck super.tmp-postgres; + } From 5a1ff51ed3683e4b048ebc7152ec627bc900673a Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 22 Jun 2021 18:11:25 +0200 Subject: [PATCH 40/43] haskellPackages.git-annex: fix hash mismatch on darwin --- .../development/haskell-modules/configuration-common.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 930e2513872a..1c3cbbbbe31f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -64,7 +64,14 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "0s9md7bzblzxlpbpna1wa6pxaf44l4g7s0xqwj6rci7h7kp55qqv"; + sha256 = "1hf2i36ayscdg7fa81akx031chg8c3scbjphj4c1qawif41bynmm"; + # delete android and Android directories which cause issues on + # darwin (case insensitive directory). Since we don't need them + # during the build process, we can delete it to prevent a hash + # mismatch on darwin. + postFetch = '' + rm -r $out/doc/?ndroid* + ''; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From 8d9926fe655c282de28df7f2df7292bc6c1dc77e Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 22 Jun 2021 21:52:15 +0200 Subject: [PATCH 41/43] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 28 ++++++ .../transitive-broken.yaml | 34 ++++++-- .../haskell-modules/hackage-packages.nix | 86 +++++++++++++++++-- 3 files changed, 135 insertions(+), 13 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index f7d0066ac3c3..e561f515d237 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -60,6 +60,7 @@ broken-packages: - adaptive-containers - adaptive-tuple - adb + - addy - adjunction - adobe-swatch-exchange - ADPfusion @@ -196,6 +197,7 @@ broken-packages: - ascii-flatten - ascii-string - ascii-vector-avc + - asif - asil - asn - asn1-codec @@ -402,6 +404,7 @@ broken-packages: - bloomfilter-redis - blosum - blubber-server + - bludigon - Blueprint - bluetileutils - blunk-hask-tests @@ -540,6 +543,7 @@ broken-packages: - canteven-parsedate - cantor - Capabilities + - capataz - capnp - capped-list - capri @@ -651,6 +655,7 @@ broken-packages: - clipper - clisparkline - clit + - clock-extras - clogparse - clone-all - closure @@ -678,6 +683,7 @@ broken-packages: - codec-beam - codec-libevent - codecov-haskell + - codeforces-cli - codepad - codeworld-api - codex @@ -802,6 +808,7 @@ broken-packages: - CoreDump - CoreErlang - core-haskell + - corenlp-parser - Coroutine - coroutine-object - CouchDB @@ -856,6 +863,7 @@ broken-packages: - css - css-easings - css-selectors + - css-syntax - csv-nptools - ctemplate - ctkl @@ -1080,6 +1088,7 @@ broken-packages: - docusign-example - docvim - domplate + - do-spaces - dotfs - dot-linker - doublify-toolkit @@ -1488,6 +1497,7 @@ broken-packages: - funpat - funspection - fused-effects-exceptions + - fused-effects-mwc-random - fused-effects-resumable - fusion - futun @@ -1560,6 +1570,7 @@ broken-packages: - ghc-clippy-plugin - ghc-core-smallstep - ghc-datasize + - ghc-debug-convention - ghc-dump-tree - ghc-dup - ghc-events-analyze @@ -2044,6 +2055,7 @@ broken-packages: - hgrib - hharp - HHDL + - hhp - hhwloc - hi - hi3status @@ -2101,6 +2113,7 @@ broken-packages: - HLogger - hlongurl - hlrdb-core + - hls-exactprint-utils - hlwm - hmarkup - hmatrix-banded @@ -2359,6 +2372,7 @@ broken-packages: - hVOIDP - hwall-auth-iitk - hw-ci-assist + - hw-dump - hweblib - hwhile - hw-json-simd @@ -2732,6 +2746,7 @@ broken-packages: - limp-cbc - linda - linden + - linear-accelerate - linear-algebra-cblas - linear-base - linear-code @@ -3219,6 +3234,7 @@ broken-packages: - nix-freeze-tree - nixfromnpm - nixpkgs-update + - nix-thunk - nix-tools - nkjp - nlp-scores @@ -3608,6 +3624,7 @@ broken-packages: - poly-control - polydata-core - polynomial + - polysemy - polysemy-zoo - polytypeable - pomohoro @@ -3626,6 +3643,7 @@ broken-packages: - posix-api - posix-realtime - posix-waitpid + - posplyu - postcodes - postgres-embedded - postgresql-lo-stream @@ -4119,6 +4137,7 @@ broken-packages: - serokell-util - servant-aeson-specs - servant-auth-cookie + - servant-auth-docs - servant-auth-hmac - servant-auth-token-api - servant-avro @@ -4212,6 +4231,7 @@ broken-packages: - shivers-cfg - shoap - shopify + - shortcut-links - shorten-strings - show-prettyprint - Shpadoinkle-backend-snabbdom @@ -4373,6 +4393,7 @@ broken-packages: - sparse - sparsecheck - sparse-lin-alg + - spartacon - special-functors - special-keys - speculate @@ -4545,6 +4566,7 @@ broken-packages: - swift-lda - swiss-ephemeris - swisstable + - sws - syb-extras - SybWidget - syb-with-class-instances-text @@ -4614,6 +4636,7 @@ broken-packages: - tcod-haskell - tcp - tcp-streams-openssl + - tdigest-Chart - tds - teams - teeth @@ -4644,6 +4667,7 @@ broken-packages: - terntup - terraform-http-backend-pass - tersmu + - tesla - testCom - testcontainers - test-fixture @@ -4679,6 +4703,7 @@ broken-packages: - text-position - text-register-machine - text-replace + - text-time - textual - text-utf8 - text-xml-qq @@ -5098,6 +5123,7 @@ broken-packages: - weather-api - webapp - WebBits + - webby - webcloud - webcrank - webcrank-dispatch @@ -5274,6 +5300,7 @@ broken-packages: - yesod-form-richtext - yesod-gitrev - yesod-goodies + - yesod-ip - yesod-job-queue - yesod-links - yesod-lucid @@ -5341,3 +5368,4 @@ broken-packages: - ztar - Zwaluw - zxcvbn-dvorak + - zxcvbn-hs diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 59c2630a962c..270abb94d182 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -92,6 +92,7 @@ dont-distribute-packages: - ApplePush - approx-rand-test - arbor-monad-metric-datadog + - arch-hs - archlinux-web - arduino-copilot - arff @@ -120,7 +121,6 @@ dont-distribute-packages: - atuin - audiovisual - aura - - aura_3_2_5 - authoring - AutoForms - autonix-deps-kf5 @@ -321,6 +321,7 @@ dont-distribute-packages: - cakyrespa - cal3d-examples - cal3d-opengl + - calamity-commands - calc - calculator - caldims @@ -435,6 +436,7 @@ dont-distribute-packages: - code-conjure - codec-rpm - codemonitor + - co-feldspar - cognimeta-utils - coinbase-exchange - colada @@ -631,6 +633,7 @@ dont-distribute-packages: - dingo-widgets - diplomacy - diplomacy-server + - di-polysemy - dirfiles - discogs-haskell - discord-gateway @@ -695,6 +698,7 @@ dont-distribute-packages: - Dust-tools-pcap - dvda - dynamic-cabal + - dynamic-pipeline - dynamic-plot - dynobud - DysFRP-Cairo @@ -928,6 +932,10 @@ dont-distribute-packages: - geodetic - geolite-csv - getemx + - ghc-debug-brick + - ghc-debug-client + - ghc-debug-common + - ghc-debug-stub - ghc-imported-from - ghc-instances - ghci-pretty @@ -960,8 +968,10 @@ dont-distribute-packages: - global-config - glome-hs - GlomeView + - gloss-accelerate - gloss-devil - gloss-examples + - gloss-raster-accelerate - gloss-sodium - gmap - gmndl @@ -1205,7 +1215,6 @@ dont-distribute-packages: - hasql-cursor-query - hasql-postgres - hasql-postgres-options - - hasql-queue - hasql-th - hastache-aeson - haste-app @@ -1253,7 +1262,6 @@ dont-distribute-packages: - hedgehog-gen-json - Hedi - hedis-pile - - heidi - heist-aeson - helics - helics-wai @@ -1426,7 +1434,6 @@ dont-distribute-packages: - HSoundFile - HsParrot - hspec-expectations-pretty - - hspec-pg-transact - hspec-setup - hspec-shouldbe - hspec-test-sandbox @@ -1892,7 +1899,6 @@ dont-distribute-packages: - MaybeT-transformers - MC-Fold-DP - mcmc - - mcmc_0_5_0_0 - mcmc-samplers - mDNSResponder-client - mealy @@ -2183,7 +2189,6 @@ dont-distribute-packages: - peyotls - peyotls-codec - pgsql-simple - - pg-transact - phonetic-languages-examples - phonetic-languages-simplified-lists-examples - phooey @@ -2222,16 +2227,29 @@ dont-distribute-packages: - poke - polh-lexicon - polydata + - polysemy-chronos + - polysemy-conc - polysemy-extra + - polysemy-fs - polysemy-fskvstore + - polysemy-http - polysemy-kvstore-jsonfile + - polysemy-log - polysemy-log-co + - polysemy-log-di - polysemy-methodology - polysemy-methodology-composite + - polysemy-mocks - polysemy-optics - polysemy-path + - polysemy-plugin - polysemy-RandomFu + - polysemy-resume + - polysemy-test + - polysemy-time + - polysemy-video - polysemy-vinyl + - polysemy-webserver - polyseq - polytypeable-utils - pomodoro @@ -2244,7 +2262,6 @@ dont-distribute-packages: - poseidon - poseidon-postgis - postgresql-query - - postgresql-simple-queue - postgresql-simple-typed - postgresql-tx-query - postgresql-tx-squeal @@ -2607,6 +2624,7 @@ dont-distribute-packages: - servant-streaming-docs - servant-streaming-server - servant-swagger-tags + - servant-util-beam-pg - servant-waargonaut - servant-zeppelin-client - servant-zeppelin-server @@ -2805,6 +2823,7 @@ dont-distribute-packages: - structured-mongoDB - stunts - stutter + - stylist - subhask - substring-parser - summoner-tui @@ -2824,7 +2843,6 @@ dont-distribute-packages: - swearjure - sweet-egison - switch - - sydtest-persistent-postgresql - sylvia - symantic-atom - symantic-lib diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cce8a60821b5..850a3e1b9ce9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -24039,6 +24039,8 @@ self: { ]; description = "A full-featured library for parsing, validating, and rendering email addresses"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "adhoc-network" = callPackage @@ -32284,6 +32286,7 @@ self: { ]; description = "Distribute hackage packages to archlinux"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "arch-web" = callPackage @@ -33627,6 +33630,8 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Library for creating and querying segmented feeds"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "asil" = callPackage @@ -44293,6 +44298,8 @@ self: { ]; description = "Configurable blue light filter"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; "bluemix-sdk" = callPackage @@ -50210,6 +50217,7 @@ self: { ]; description = "A library for declaring, parsing, and invoking text-input based commands"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "calc" = callPackage @@ -50802,6 +50810,8 @@ self: { ]; description = "OTP-like supervision trees in Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "capnp" = callPackage @@ -56600,6 +56610,8 @@ self: { testHaskellDepends = [ base hspec ]; description = "A couple functions that probably should be in the 'clock' package"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "clocked" = callPackage @@ -57492,6 +57504,7 @@ self: { ]; description = "Hardware software co-design Feldspar"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "co-log" = callPackage @@ -57908,6 +57921,8 @@ self: { ]; description = "Command line interface to interact with Codeforces"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "codemonitor" = callPackage @@ -64142,6 +64157,8 @@ self: { librarySystemDepends = [ rocksdb ]; description = "Launches CoreNLP and parses the JSON output"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {inherit (pkgs) rocksdb;}; "cornea" = callPackage @@ -66902,6 +66919,8 @@ self: { ]; description = "High-performance CSS tokenizer and serializer"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "css-text" = callPackage @@ -74280,6 +74299,7 @@ self: { ]; description = "DI logger wrapped for Polysemy"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "dia-base" = callPackage @@ -77793,6 +77813,8 @@ self: { ]; description = "DigitalOcean Spaces API bindings"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "dobutok" = callPackage @@ -80718,6 +80740,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Library Type Safe implementation of Dynamic Pipeline Paradigm (DPP)"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "dynamic-plot" = callPackage @@ -97146,6 +97169,8 @@ self: { benchmarkHaskellDepends = [ base fused-effects-random gauge ]; description = "High-quality random number generation as an effect"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fused-effects-optics" = callPackage @@ -100952,6 +100977,7 @@ self: { ]; description = "A simple TUI using ghc-debug"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ghc-debug-client" = callPackage @@ -100973,6 +100999,7 @@ self: { ]; description = "Useful functions for writing heap analysis tools which use ghc-debug"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ghc-debug-common" = callPackage @@ -100991,6 +101018,7 @@ self: { ]; description = "Connect to a socket created by ghc-debug-stub and analyse the heap of the debuggee program"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ghc-debug-convention" = callPackage @@ -101002,6 +101030,8 @@ self: { libraryHaskellDepends = [ base directory filepath ]; description = "Definitions needed by ghc-debug-stub and ghc-debug-common"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghc-debug-stub" = callPackage @@ -101019,6 +101049,7 @@ self: { ]; description = "Functions for instrumenting your application so the heap can be analysed with ghc-debug-common"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ghc-dump-core" = callPackage @@ -106046,6 +106077,7 @@ self: { ]; description = "Extras to interface Gloss and Accelerate"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "gloss-algorithms" = callPackage @@ -122416,7 +122448,6 @@ self: { ]; description = "A PostgreSQL backed queue"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hasql-simple" = callPackage @@ -125108,7 +125139,6 @@ self: { benchmarkHaskellDepends = [ base criterion weigh ]; description = "Tidy data in Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "hein" = callPackage @@ -127416,6 +127446,8 @@ self: { ]; description = "Happy Haskell Programming"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hhwloc" = callPackage @@ -130223,6 +130255,8 @@ self: { ]; description = "Common utilities to interaction between ghc-exactprint and HLS plugins"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hls-explicit-imports-plugin" = callPackage @@ -138109,7 +138143,6 @@ self: { ]; description = "Helpers for creating database tests with hspec and pg-transact"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "hspec-server" = callPackage @@ -142345,6 +142378,8 @@ self: { ]; description = "File Dump"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hw-eliasfano" = callPackage @@ -163232,6 +163267,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "Lifting linear vector spaces into Accelerate"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "linear-algebra-cblas" = callPackage @@ -186748,6 +186785,8 @@ self: { ]; description = "Lightweight dependency management with Nix"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "nix-tools" = callPackage @@ -200019,7 +200058,6 @@ self: { ]; description = "A postgresql-simple transaction monad"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "pgdl" = callPackage @@ -204505,6 +204543,8 @@ self: { ]; description = "Higher-order, low-boilerplate free monads"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "polysemy-RandomFu" = callPackage @@ -204548,6 +204588,7 @@ self: { ]; description = "Polysemy effect for chronos"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-conc" = callPackage @@ -204571,6 +204612,7 @@ self: { ]; description = "Polysemy Effects for Concurrency"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-extra" = callPackage @@ -204602,6 +204644,7 @@ self: { ]; description = "Low level filesystem operations for polysemy"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-fskvstore" = callPackage @@ -204647,6 +204690,7 @@ self: { ]; description = "Polysemy effect for http-client"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-kvstore-jsonfile" = callPackage @@ -204687,6 +204731,7 @@ self: { ]; description = "Polysemy effects for logging"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-log-co" = callPackage @@ -204731,6 +204776,7 @@ self: { ]; description = "polysemy-log interpreter for di"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-methodology" = callPackage @@ -204779,6 +204825,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Mocking framework for polysemy effects"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-optics" = callPackage @@ -204830,6 +204877,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Disambiguate obvious uses of effects"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-resume" = callPackage @@ -204847,6 +204895,7 @@ self: { ]; description = "Polysemy error tracking"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-test" = callPackage @@ -204871,6 +204920,7 @@ self: { ]; description = "Polysemy effects for testing"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-time" = callPackage @@ -204894,6 +204944,7 @@ self: { ]; description = "Polysemy effect for time"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-video" = callPackage @@ -204908,6 +204959,7 @@ self: { base formatting path path-utils polysemy text turtle ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-vinyl" = callPackage @@ -204941,6 +204993,7 @@ self: { ]; description = "Start web servers from within a Polysemy effect stack"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "polysemy-zoo" = callPackage @@ -205887,6 +205940,8 @@ self: { ]; description = "Sleep tracker for X11, using XScreenSaver extension and manual input"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "possible" = callPackage @@ -206514,7 +206569,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A PostgreSQL backed queue"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "postgresql-simple-sop" = callPackage @@ -231642,6 +231696,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "servant-docs/servant-auth compatibility"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "servant-auth-hmac" = callPackage @@ -234067,6 +234123,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Implementation of servant-util primitives for beam-postgres"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; }) {}; "servant-validate" = callPackage @@ -236574,6 +236631,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "Link shortcuts for use in text markup"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "shorten-strings" = callPackage @@ -243531,6 +243590,8 @@ self: { ]; description = "A unix-style (read from stdin, write to stdout) global hotkey daemon"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "spata" = callPackage @@ -250428,6 +250489,7 @@ self: { ]; description = "Apply CSS styles to a document tree"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "stylized" = callPackage @@ -251963,6 +252025,8 @@ self: { ]; description = "A simple web server for serving directories"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sxml" = callPackage @@ -256411,6 +256475,8 @@ self: { ]; description = "Chart generation from tdigest"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "tdlib" = callPackage @@ -257934,6 +258000,8 @@ self: { ]; description = "Tesla API client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "test-fixture" = callPackage @@ -259481,6 +259549,8 @@ self: { ]; description = "Library for Time parsing from Text into UTCTime"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "text-trie" = callPackage @@ -279759,6 +279829,8 @@ self: { ]; description = "A super-simple web server framework"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "webcloud" = callPackage @@ -288052,6 +288124,8 @@ self: { ]; description = "Code for using the ip package with yesod"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "yesod-job-queue" = callPackage @@ -291521,6 +291595,8 @@ self: { ]; description = "Password strength estimation based on zxcvbn"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "zydiskell" = callPackage From f259654a7855cfb53a8cca6be315894599c4435a Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 22 Jun 2021 23:05:35 +0200 Subject: [PATCH 42/43] haskellPackages: mark builds failing on hydra as broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + .../configuration-hackage2nix/transitive-broken.yaml | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index e561f515d237..78601e87a668 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -3537,6 +3537,7 @@ broken-packages: - pg-recorder - pg-store - pgstream + - pg-transact - phasechange - phaser - phoityne diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 270abb94d182..5c38f0b040f8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -1434,6 +1434,7 @@ dont-distribute-packages: - HSoundFile - HsParrot - hspec-expectations-pretty + - hspec-pg-transact - hspec-setup - hspec-shouldbe - hspec-test-sandbox @@ -2262,6 +2263,7 @@ dont-distribute-packages: - poseidon - poseidon-postgis - postgresql-query + - postgresql-simple-queue - postgresql-simple-typed - postgresql-tx-query - postgresql-tx-squeal diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 850a3e1b9ce9..12bb26a00af6 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -138143,6 +138143,7 @@ self: { ]; description = "Helpers for creating database tests with hspec and pg-transact"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hspec-server" = callPackage @@ -200058,6 +200059,8 @@ self: { ]; description = "A postgresql-simple transaction monad"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pgdl" = callPackage @@ -206569,6 +206572,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "A PostgreSQL backed queue"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "postgresql-simple-sop" = callPackage From 37919f9f1edb97404493da158c8ed0edb2b39c5f Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 22 Jun 2021 23:24:48 +0200 Subject: [PATCH 43/43] haskellPackages.stripeapi: Mark broken because of consistent build timeout --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 78601e87a668..d960d4ed8f07 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -4519,6 +4519,7 @@ broken-packages: - string-quote - stringtable-atom - stripe + - stripeapi - stripe-hs - stripe-http-streams - stripe-signature diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 12bb26a00af6..87864a11e56a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -250082,6 +250082,8 @@ self: { ]; description = "Stripe-Library"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "strips" = callPackage