From ec4dc7e3465e1645b43cf5533924a35846734448 Mon Sep 17 00:00:00 2001 From: Henry Mortimer Date: Thu, 15 Apr 2021 01:41:17 +0100 Subject: [PATCH 01/78] passExtensions.pass-import: install extension script and completion The changes added in 40b9f4e meant that running the extension from within pass, i.e. running `pass import` no longer worked because the extension script didn't get installed and the completion scripts for pimport don't get installed. This commit fixes that by manually copying and wrapping the extension script and completion scripts --- pkgs/tools/security/pass/extensions/import.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index be2492112c3f..28a9e8f57756 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -4,6 +4,7 @@ , python3Packages , gnupg , pass +, makeWrapper }: python3Packages.buildPythonApplication rec { @@ -50,6 +51,16 @@ python3Packages.buildPythonApplication rec { $out/bin/pimport --list-exporters --list-importers ''; + postInstall = '' + mkdir -p $out/lib/password-store/extensions + cp ${src}/scripts/import.bash $out/lib/password-store/extensions/import.bash + wrapProgram $out/lib/password-store/extensions/import.bash \ + --prefix PATH : "${python3Packages.python.withPackages(_: propagatedBuildInputs)}/bin" \ + --prefix PYTHONPATH : "$out/${python3Packages.python.sitePackages}" \ + --run "export PREFIX" + cp -r ${src}/share $out/ + ''; + meta = with lib; { description = "Pass extension for importing data from existing password managers"; homepage = "https://github.com/roddhjav/pass-import"; From 3e84cfad8ecc78b4a0b2849a07a52c7894123e29 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 12 May 2021 22:39:50 +0900 Subject: [PATCH 02/78] haskell-updates: add documentation for workflow --- pkgs/development/haskell-modules/HACKING.md | 90 +++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 pkgs/development/haskell-modules/HACKING.md diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md new file mode 100644 index 000000000000..669be5394e20 --- /dev/null +++ b/pkgs/development/haskell-modules/HACKING.md @@ -0,0 +1,90 @@ + +## Maintainer Workflow + +This is the documentation for periodically merging the `haskell-updates` branch +into the `master` branch. This workflow is performed by members in the +[@NixOS/haskell](https://github.com/orgs/NixOS/teams/haskell) team. +Each member of the team takes a two week period where they much merge the +`haskell-updates` branch into `master`. + +The goal of this workflow is to regularly merge the `haskell-updates` branch +into the `master` branch, while making sure there are no evaluation errors or +build errors that get into `master`. + +The workflow generally proceeds in three main steps: + +1. create the initial `haskell-updates` PR +1. wait for contributors to fix newly broken Haskell packages +1. merge `haskell-updates` into `master` + +We describe each of these steps in a separate section. + +### Initial `haskell-updates` PR + +In this section we create the PR for merging `haskell-updates` into `master`. + +1. Make sure the `haskell-updates` branch is up-to-date with `master`. + +1. Update the Stackage Nightly resolver used by Nixpkgs and create a commit: + + ```console + $ maintainers/scripts/haskell/update-stackage.sh --do-commit + ``` + +1. Update the Hackage package set used by Nixpkgs and create a commit: + + ```console + $ maintainers/scripts/haskell/update-hackage.sh --do-commit + ``` + +1. Regenerate the Haskell package set used in Nixpkgs and create a commit: + + ```console + $ maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit + ``` + +1. Push these commits to the Nixpkgs repo. + +1. Open a PR on Nixpkgs merging `haskell-updates` into `master`. + +Use the following message body: + +```markdown +### This Merge + +This PR is the regularly merge of the `haskell-updates` branch into `master`. + +This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. + +I will aim to merge this PR **by 2021-TODO-TODO**. If I can merge it earlier, there might be successor PRs in that time window. As part of our rotation @TODO will continue these merges from 2021-TODO-TODO to 2021-TODO-TODO. + +### haskellPackages Workflow Summary + +Our workflow is currently described at `pkgs/development/haskell-modules/HACKING.md`. + +The short version is this: +* We regularly update the stackage and hackage pins on `haskell-updates` (normally at the beginning of a merge window). +* The community fixes builds of Haskell packages on that branch. +* We aim at at least one merge of `haskell-updates` into `master` every two weeks. +* We only do the merge if the `mergeable` job is succeeding on hydra. +* If a maintained package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!) + +--- + +This is the follow-up to #TODO. +``` + +Make sure to replace all TODO with the actual values. + +### Fix Broken Packages + +(TODO) + +### Merge `haskell-updates` into `master` + +(TODO) + +## Contributor Workflow + +(TODO: this section is to describe the type of workflow for non-comitters to +contribute to `haskell-updates`) From f56b6e1f62c4d73e59af6696c25baf5bf2a71fef Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 15 May 2021 18:10:35 +0900 Subject: [PATCH 03/78] haskell-updates: more documentation --- pkgs/development/haskell-modules/HACKING.md | 54 ++++++++++++++++++++- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 669be5394e20..805f6bc98f41 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -76,14 +76,64 @@ This is the follow-up to #TODO. Make sure to replace all TODO with the actual values. -### Fix Broken Packages +### Notify Maintainers and Fix Broken Packages -(TODO) +After you've done the previous steps, Hydra will start building the new and +updated Haskell packages. You can see the progress Hydra is making at +https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. This Hydra jobset is +defined in the file [release-haskell.nix](../../top-level/release-haskell.nix). + +#### Notify Maintainers + +When Hydra finishes building all the packages, you should generate a build +report to notify maintainers of their broken packages. You can do that with the +following commands: + +```console +$ maintainers/scripts/haskell/hydra-report.hs get-report +$ maintainers/scripts/haskell/hydra-report.hs ping-maintainers +``` + +The `hyda-report.hs ping-maintainers` command generates a Markdown document +that you can paste in a GitHub comment on the PR opened above. This +comment describes which Haskell packages are now failing to build. It also +pings the maintainers so that they know to fix up their packages. + +This build report can be fetched and re-generated for new Hydra evaluations. +It may help contributors to try to keep the GitHub comment updated with the +most recent build report. + +#### Fix Broken Packages + +After getting the build report, you can see which packages and Hydra jobs are +failing to build. The most important jobs are the `maintained` and `mergeable` +jobs. These are both defined in +[`release-haskell.nix](../../top-level/release-haskell.nix). + +`mergeable` is a set of the most important Haskell packages, including things +like Pandoc and XMonad. These packages are widely used. We would like to +always keep these building. + +`maintained` is a set of Haskell packages that have maintainers in Nixpkgs. +We should be proactive in working with maintainers to keep their packages +building. + +Steps to fix Haskell packages that are failing to build is out of scope for +this document, but it usually requires fixing up dependencies that now +out-of-bounds. ### Merge `haskell-updates` into `master` (TODO) +- mark broken packages with `mark-broken.sh` + +### Additional Info + +(TODO) + +- you can restart a Hydra evaluation by logging in with github. + ## Contributor Workflow (TODO: this section is to describe the type of workflow for non-comitters to From c40e194de250e9a6776081066124a915525ae06c Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 16 May 2021 15:48:35 +0900 Subject: [PATCH 04/78] haskell-updates: more documentation --- pkgs/development/haskell-modules/HACKING.md | 42 ++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 805f6bc98f41..acf7dc92db26 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -99,10 +99,17 @@ that you can paste in a GitHub comment on the PR opened above. This comment describes which Haskell packages are now failing to build. It also pings the maintainers so that they know to fix up their packages. +It may be helpful to pipe `hydra-report.hs ping-maintainers` into `xclip` +(XOrg) or `wl-clip` (Wayland) in order to post on GitHub. + This build report can be fetched and re-generated for new Hydra evaluations. It may help contributors to try to keep the GitHub comment updated with the most recent build report. +Maintainers should be given at least 7 days to fix up their packages when they +break. If maintainers don't fix up their packages with 7 days, then they +may be marked broken before merging `haskell-updates` into `master`. + #### Fix Broken Packages After getting the build report, you can see which packages and Hydra jobs are @@ -119,9 +126,42 @@ We should be proactive in working with maintainers to keep their packages building. Steps to fix Haskell packages that are failing to build is out of scope for -this document, but it usually requires fixing up dependencies that now +this document, but it usually requires fixing up dependencies that are now out-of-bounds. +#### Mark Broken Packages + +Packages that do not get fixed can be marked broken with the following +commands. First check which packages are broken: + +```console +$ maintainers/scripts/haskell/hydra-report.hs get-report +$ maintainers/scripts/haskell/hydra-report.hs mark-broken-list +``` + +This shows a list of packages that are thought to be broken. + +Next, run the following command. + +```console +$ maintainers/scripts/haskell/mark-broken.sh --do-commit +``` + +This first opens up an editor with the broken package list. Some of these +packages may have a maintainer in Nixpkgs. If these maintainers have not been +given 7 days to fix up their package, then make sure to remove those packages +from the list. After saving and exiting the editor, the following will +happen: + +- packages from the list will be added to + [`configuration-hackage2nix/broken.yaml`](configuration-hackage2nix/broken.yaml) +- `hackage-packages.nix` will be regenerated +- the + [`configuration-hackage2nix/transitive-broken.yaml`](configuration-hackage2nix/transitive-broken.yaml) + file will be regenerated +- `hackage-packages.nix` will be regenerated again +- everything will be committed + ### Merge `haskell-updates` into `master` (TODO) From ffb24a47f8ff3bb211eb5f6db5384fee51d553e4 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 19 May 2021 21:28:03 +0900 Subject: [PATCH 05/78] Stackage Nightly: 2021-05-10 -> 2021-05-19 This commit has been generated by maintainers/scripts/haskell/update-stackage.sh --- .../configuration-hackage2nix/stackage.yaml | 160 ++++++++++-------- 1 file changed, 86 insertions(+), 74 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index bb66df5b1552..a8c353cd6a7c 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-05-10 +# Stackage Nightly 2021-05-19 # This file is auto-generated by # maintainers/scripts/haskell/update-stackage.sh default-package-overrides: @@ -27,6 +27,7 @@ default-package-overrides: - aeson-pretty ==0.8.8 - aeson-qq ==0.8.3 - aeson-schemas ==1.3.3 + - aeson-typescript ==0.3.0.0 - aeson-with ==0.1.2.0 - aeson-yak ==0.1.1.3 - aeson-yaml ==1.1.0.0 @@ -137,7 +138,7 @@ default-package-overrides: - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - amqp ==0.22.0 - - amqp-utils ==0.6.1.0 + - amqp-utils ==0.6.1.1 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.11 - ansi-wl-pprint ==0.6.9 @@ -159,6 +160,7 @@ default-package-overrides: - arithmoi ==0.11.0.1 - array-memoize ==0.6.0 - arrow-extras ==0.1.0.1 + - arrows ==0.4.4.2 - ascii ==1.0.1.4 - ascii-case ==1.0.0.4 - ascii-char ==1.0.0.8 @@ -194,7 +196,6 @@ default-package-overrides: - aura ==3.2.4 - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - - auto ==0.4.3.1 - autoexporter ==1.1.20 - auto-update ==0.1.6 - avers ==0.0.17.1 @@ -226,8 +227,8 @@ default-package-overrides: - basic-prelude ==0.7.0 - bazel-runfiles ==0.12 - bbdb ==0.8 - - bcp47 ==0.2.0.3 - - bcp47-orphans ==0.1.0.3 + - bcp47 ==0.2.0.4 + - bcp47-orphans ==0.1.0.4 - bcrypt ==0.0.11 - bech32 ==1.1.0 - bech32-th ==1.0.2 @@ -301,13 +302,13 @@ default-package-overrides: - bugsnag-haskell ==0.0.4.1 - bugsnag-hs ==0.2.0.3 - bugzilla-redhat ==0.3.1 - - burrito ==1.2.0.1 + - burrito ==1.2.0.2 - butcher ==1.3.3.2 - buttplug-hs-core ==0.1.0.0 - bv ==0.5 - bv-little ==1.1.1 - byteable ==0.1.1 - - byte-count-reader ==0.10.1.2 + - byte-count-reader ==0.10.1.3 - bytedump ==1.0 - byte-order ==0.1.2.0 - byteorder ==1.0.4 @@ -356,6 +357,7 @@ default-package-overrides: - cborg ==0.2.5.0 - cborg-json ==0.2.2.0 - cdar-mBound ==0.1.0.1 + - c-enum ==0.1.0.1 - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 - cereal-text ==0.1.0.2 @@ -389,9 +391,9 @@ default-package-overrides: - circle-packing ==0.1.0.6 - circular ==0.3.1.1 - citeproc ==0.3.0.9 - - clash-ghc ==1.2.5 - - clash-lib ==1.2.5 - - clash-prelude ==1.2.5 + - clash-ghc ==1.4.1 + - clash-lib ==1.4.1 + - clash-prelude ==1.4.1 - classy-prelude ==1.5.0 - classy-prelude-conduit ==1.5.0 - clay ==0.13.3 @@ -409,7 +411,7 @@ default-package-overrides: - cmdargs ==0.10.21 - codec-beam ==0.2.0 - code-page ==0.2.1 - - collect-errors ==0.1.1.0 + - collect-errors ==0.1.5.0 - co-log-concurrent ==0.5.0.0 - co-log-core ==0.2.1.1 - Color ==0.3.1 @@ -450,6 +452,7 @@ default-package-overrides: - concurrent-split ==0.0.1.1 - concurrent-supply ==0.1.8 - cond ==0.4.1.1 + - conduino ==0.2.2.0 - conduit ==1.3.4.1 - conduit-algorithms ==0.0.11.0 - conduit-combinators ==1.3.0 @@ -461,7 +464,6 @@ default-package-overrides: - conferer-aeson ==1.1.0.1 - conferer-hspec ==1.1.0.0 - conferer-warp ==1.1.0.0 - - ConfigFile ==1.1.4 - config-ini ==0.2.4.0 - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 @@ -471,6 +473,7 @@ default-package-overrides: - console-style ==0.0.2.1 - constraint ==0.1.4.0 - constraints ==0.13 + - constraints-extras ==0.3.1.0 - constraint-tuples ==0.1.2 - construct ==0.3.0.2 - contravariant ==1.5.3 @@ -490,7 +493,7 @@ default-package-overrides: - cprng-aes ==0.6.1 - cpu ==0.1.2 - cpuinfo ==0.1.0.2 - - crackNum ==2.4 + - crackNum ==3.1 - crc32c ==0.0.0 - credential-store ==0.1.2 - criterion ==1.5.9.0 @@ -498,7 +501,6 @@ default-package-overrides: - cron ==0.7.0 - crypto-api ==0.13.3 - crypto-cipher-types ==0.0.9 - - cryptocompare ==0.1.2 - crypto-enigma ==0.1.1.6 - cryptohash ==0.11.9 - cryptohash-cryptoapi ==0.1.4 @@ -571,7 +573,6 @@ default-package-overrides: - data-textual ==0.3.0.3 - dataurl ==0.1.0.0 - DAV ==1.3.4 - - DBFunctor ==0.1.1.1 - dbus ==1.2.17 - dbus-hslogger ==0.1.0.1 - debian ==4.0.2 @@ -585,6 +586,9 @@ default-package-overrides: - deferred-folds ==0.9.17 - dejafu ==2.4.0.2 - dense-linear-algebra ==0.1.0.0 + - dependent-map ==0.4.0.0 + - dependent-sum ==0.7.1.0 + - dependent-sum-template ==0.1.0.3 - depq ==0.4.2 - deque ==0.4.3 - deriveJsonNoPrefix ==0.1.0.1 @@ -598,7 +602,7 @@ default-package-overrides: - dhall-lsp-server ==1.0.14 - dhall-yaml ==1.2.6 - diagrams-solve ==0.1.3 - - dialogflow-fulfillment ==0.1.1.3 + - dialogflow-fulfillment ==0.1.1.4 - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 - Diff ==0.4.0 @@ -608,7 +612,7 @@ default-package-overrides: - di-monad ==1.3.1 - directory-tree ==0.12.1 - direct-sqlite ==2.3.26 - - dirichlet ==0.1.0.2 + - dirichlet ==0.1.0.4 - discount ==0.1.1 - disk-free-space ==0.1.0.1 - distributed-closure ==0.4.2.0 @@ -646,7 +650,7 @@ default-package-overrides: - duration ==0.2.0.0 - dvorak ==0.1.0.0 - dynamic-state ==0.3.1 - - dyre ==0.8.12 + - dyre ==0.9.1 - eap ==0.9.0.2 - earcut ==0.1.0.4 - Earley ==0.13.0.1 @@ -682,6 +686,7 @@ default-package-overrides: - elynx-tools ==0.5.0.2 - elynx-tree ==0.5.0.2 - email-validate ==2.3.2.13 + - emd ==0.2.0.0 - emojis ==0.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 @@ -729,7 +734,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - exp-pairs ==0.2.1.0 - - express ==0.1.8 + - express ==0.1.10 - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 @@ -742,7 +747,7 @@ default-package-overrides: - fakedata-parser ==0.1.0.0 - fakefs ==0.3.0.2 - fakepull ==0.3.0.2 - - faktory ==1.0.2.1 + - faktory ==1.0.2.3 - fast-digits ==0.3.0.0 - fast-logger ==3.0.5 - fast-math ==1.0.2 @@ -755,11 +760,10 @@ default-package-overrides: - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - fgl ==5.7.0.3 - - file-embed ==0.0.13.0 + - file-embed ==0.0.14.0 - file-embed-lzma ==0 - filelock ==0.1.1.5 - filemanip ==0.3.6.3 - - file-modules ==0.1.2.4 - filepath-bytestring ==1.4.2.1.7 - file-path-th ==0.1.0.0 - filepattern ==0.1.2 @@ -823,12 +827,13 @@ default-package-overrides: - funcmp ==1.9 - function-builder ==0.3.0.1 - functor-classes-compat ==1.0.1 + - functor-combinators ==0.3.6.0 - fusion-plugin ==0.2.2 - fusion-plugin-types ==0.1.0 - fuzzcheck ==0.1.1 - fuzzy ==0.1.0.0 - fuzzy-dates ==0.1.1.2 - - fuzzyset ==0.2.0 + - fuzzyset ==0.2.1 - fuzzy-time ==0.1.0.0 - gauge ==0.2.5 - gd ==3000.7.3 @@ -846,7 +851,7 @@ default-package-overrides: - generic-monoid ==0.1.0.1 - generic-optics ==2.1.0.0 - GenericPretty ==1.2.2 - - generic-random ==1.3.0.1 + - generic-random ==1.4.0.0 - generics-eot ==0.4.0.1 - generics-sop ==0.5.1.1 - generics-sop-lens ==0.2.0.1 @@ -950,7 +955,7 @@ default-package-overrides: - graphite ==0.10.0.1 - graphql-client ==1.1.1 - graphs ==0.7.1 - - graphula ==2.0.0.4 + - graphula ==2.0.0.5 - graphviz ==2999.20.1.0 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 @@ -959,12 +964,12 @@ default-package-overrides: - greskell-websocket ==0.1.2.5 - groom ==0.1.2.1 - group-by-date ==0.1.0.4 - - groups ==0.5.2 - - gtk-sni-tray ==0.1.6.0 + - 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.0 + - hackage-db ==2.1.1 - hackage-security ==0.6.0.1 - haddock-library ==1.9.0 - hadoop-streaming ==0.2.0.3 @@ -992,8 +997,8 @@ default-package-overrides: - haskell-gi-overloading ==1.0 - haskell-import-graph ==1.0.4 - haskell-lexer ==1.1 - - haskell-lsp ==0.22.0.0 - - haskell-lsp-types ==0.22.0.0 + - haskell-lsp ==0.24.0.0 + - haskell-lsp-types ==0.24.0.0 - haskell-names ==0.9.9 - HaskellNet ==0.6 - haskell-src ==1.0.3.1 @@ -1024,7 +1029,7 @@ default-package-overrides: - hedgehog-fakedata ==0.0.1.4 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - - hedis ==0.14.2 + - hedis ==0.14.4 - hedn ==0.3.0.2 - here ==1.2.13 - heredoc ==0.2.0.0 @@ -1059,7 +1064,6 @@ default-package-overrides: - hmpfr ==0.4.4 - hnock ==0.4.0 - hoauth2 ==1.16.0 - - hocon ==0.1.0.4 - hOpenPGP ==2.9.5 - hopenpgp-tools ==0.23.6 - hopfli ==0.2.2.1 @@ -1104,17 +1108,17 @@ default-package-overrides: - hspec-core ==2.7.10 - hspec-discover ==2.7.10 - hspec-expectations ==0.8.2 - - hspec-expectations-json ==1.0.0.3 + - hspec-expectations-json ==1.0.0.4 - hspec-expectations-lifted ==0.10.0 - hspec-expectations-pretty-diff ==0.7.2.5 - hspec-golden ==0.1.0.3 - hspec-golden-aeson ==0.7.0.0 - hspec-hedgehog ==0.0.1.2 - - hspec-junit-formatter ==1.0.0.2 + - hspec-junit-formatter ==1.0.0.4 - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.2.0 - hspec-meta ==2.7.8 - - hspec-need-env ==0.1.0.6 + - hspec-need-env ==0.1.0.7 - hspec-parsec ==0 - hspec-smallcheck ==0.5.2 - hspec-tables ==0.0.1 @@ -1260,7 +1264,7 @@ default-package-overrides: - io-memoize ==1.1.1.0 - io-region ==0.1.1 - io-storage ==0.3 - - io-streams ==1.5.2.0 + - io-streams ==1.5.2.1 - io-streams-haproxy ==1.0.1.0 - ip6addr ==1.0.2 - ipa ==0.3.1 @@ -1292,13 +1296,13 @@ default-package-overrides: - js-dgtable ==0.5.2 - js-flot ==0.8.3 - js-jquery ==3.3.1 - - json-feed ==1.0.12 + - json-feed ==1.0.13 - jsonpath ==0.2.0.0 - json-rpc ==1.0.3 - json-rpc-generic ==0.2.1.5 - JuicyPixels ==3.3.5 - JuicyPixels-blurhash ==0.1.0.3 - - JuicyPixels-extra ==0.4.1 + - JuicyPixels-extra ==0.5.0 - JuicyPixels-scale-dct ==0.1.2 - junit-xml ==0.1.0.2 - justified-containers ==0.3.0.0 @@ -1324,14 +1328,15 @@ default-package-overrides: - kubernetes-webhook-haskell ==0.2.0.3 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==1.0.14 + - lackey ==1.0.15 + - lambdabot-core ==5.3.0.1 - LambdaHack ==0.10.2.0 - lame ==0.2.0 - language-avro ==0.1.3.1 - language-bash ==0.9.2 - language-c ==0.8.3 - language-c-quote ==0.13 - - language-docker ==10.0.0 + - language-docker ==10.0.1 - language-java ==0.2.9 - language-javascript ==0.7.1.0 - language-protobuf ==1.0.1 @@ -1348,6 +1353,7 @@ default-package-overrides: - lawful ==0.1.0.0 - lazy-csv ==0.5.1 - lazyio ==0.1.0.4 + - lazysmallcheck ==0.6 - lca ==0.4 - leancheck ==0.9.4 - leancheck-instances ==0.0.4 @@ -1368,6 +1374,7 @@ default-package-overrides: - lens-regex-pcre ==1.1.0.0 - lenz ==0.4.2.0 - leveldb-haskell ==0.6.5 + - libBF ==0.6.2 - libffi ==0.1 - libgit ==0.3.1 - libgraph ==1.14 @@ -1393,6 +1400,7 @@ default-package-overrides: - listsafe ==0.1.0.1 - list-singleton ==1.0.0.5 - list-t ==1.0.4 + - list-transformer ==1.0.7 - ListTree ==0.2.3 - little-rio ==0.2.2 - llvm-hs ==9.0.1 @@ -1413,7 +1421,9 @@ default-package-overrides: - loop ==0.3.0 - lrucache ==1.2.0.1 - lrucaching ==0.3.3 - - lsp-test ==0.11.0.5 + - lsp ==1.2.0.0 + - lsp-test ==0.14.0.0 + - lsp-types ==1.2.0.0 - lucid ==2.9.12.1 - lucid-cdn ==0.2.2.0 - lucid-extras ==0.2.2 @@ -1474,7 +1484,7 @@ default-package-overrides: - microlens-mtl ==0.2.0.1 - microlens-platform ==0.4.2 - microlens-process ==0.2.0.2 - - microlens-th ==0.4.3.9 + - microlens-th ==0.4.3.10 - microspec ==0.2.1.3 - microstache ==1.0.1.2 - midair ==0.2.0.1 @@ -1491,8 +1501,7 @@ default-package-overrides: - min-max-pqueue ==0.1.0.2 - mintty ==0.1.2 - missing-foreign ==0.1.1 - - MissingH ==1.4.3.0 - - mixed-types-num ==0.5.0.3 + - mixed-types-num ==0.5.3.1 - mltool ==0.2.0.1 - mmap ==0.5.9 - mmark ==0.0.7.2 @@ -1500,6 +1509,7 @@ default-package-overrides: - mmark-ext ==0.2.1.3 - mmorph ==1.1.5 - mnist-idx ==0.1.2.8 + - mnist-idx-conduit ==0.4.0.0 - mockery ==0.3.5 - mock-time ==0.1.0 - mod ==0.1.2.2 @@ -1632,7 +1642,7 @@ default-package-overrides: - numbers ==3000.2.0.2 - numeric-extras ==0.1 - numeric-prelude ==0.4.3.3 - - numhask ==0.6.0.2 + - numhask ==0.7.1.0 - NumInstances ==1.4 - numtype-dk ==0.5.0.2 - nuxeo ==0.3.2 @@ -1649,7 +1659,6 @@ default-package-overrides: - old-time ==1.1.0.3 - once ==0.4 - one-liner ==1.0 - - one-liner-instances ==0.1.2.1 - OneTuple ==0.2.2.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 @@ -1690,12 +1699,11 @@ default-package-overrides: - pagure-cli ==0.2 - pandoc ==2.13 - pandoc-dhall-decoder ==0.1.0.1 - - pandoc-plot ==1.2.0 + - pandoc-plot ==1.2.1 - pandoc-throw ==0.1.0.0 - pandoc-types ==1.22 - - pantry ==0.5.1.5 + - pantry ==0.5.2.1 - parallel ==3.2.2.0 - - parallel-io ==0.3.3 - parameterized ==0.5.0.0 - paripari ==0.7.0.0 - parseargs ==0.2.0.9 @@ -1712,7 +1720,7 @@ default-package-overrides: - password ==3.0.0.0 - password-instances ==3.0.0.0 - password-types ==1.0.0.0 - - path ==0.7.0 + - path ==0.7.1 - path-binary-instance ==0.1.0.1 - path-extensions ==0.1.1.0 - path-extra ==0.2.0 @@ -1792,7 +1800,7 @@ default-package-overrides: - polysemy-plugin ==0.3.0.0 - pooled-io ==0.0.2.2 - port-utils ==0.2.1.0 - - posix-paths ==0.2.1.6 + - posix-paths ==0.3.0.0 - possibly ==1.0.0.0 - postgres-options ==0.2.0.0 - postgresql-binary ==0.12.4 @@ -1830,6 +1838,7 @@ default-package-overrides: - primitive-extras ==0.10.1 - primitive-unaligned ==0.1.1.1 - primitive-unlifted ==0.1.3.0 + - prim-uniq ==0.2 - print-console-colors ==0.1.0.0 - probability ==0.2.7 - process-extras ==0.7.4 @@ -1845,7 +1854,7 @@ default-package-overrides: - promises ==0.3 - prompt ==0.1.1.2 - prospect ==0.1.0.0 - - proto3-wire ==1.2.1 + - proto3-wire ==1.2.2 - protobuf ==0.2.1.3 - protobuf-simple ==0.1.1.0 - protocol-buffers ==2.4.17 @@ -1893,14 +1902,14 @@ default-package-overrides: - rainbow ==0.34.2.2 - rainbox ==0.26.0.0 - ral ==0.2 - - rampart ==1.1.0.2 + - rampart ==1.1.0.3 - ramus ==0.1.2 - rando ==0.0.0.4 - - random ==1.1 + - random ==1.2.0 - random-bytestring ==0.1.4 - - random-fu ==0.2.7.4 + - random-fu ==0.2.7.7 - random-shuffle ==0.0.4 - - random-source ==0.3.0.8 + - random-source ==0.3.0.11 - random-tree ==0.6.0.5 - range ==0.3.0.2 - ranged-list ==0.1.0.0 @@ -1910,7 +1919,7 @@ default-package-overrides: - rank2classes ==1.4.1 - Rasterific ==0.7.5.3 - rasterific-svg ==0.3.3.2 - - ratel ==1.0.14 + - ratel ==1.0.15 - rate-limit ==1.4.2 - ratel-wai ==1.1.5 - rattle ==0.2 @@ -1996,7 +2005,8 @@ default-package-overrides: - rope-utf16-splay ==0.3.2.0 - rosezipper ==0.2 - rot13 ==0.2.0.1 - - rpmbuild-order ==0.4.3.2 + - rpmbuild-order ==0.4.4 + - rp-tree ==0.3.5 - RSA ==2.4.1 - runmemo ==1.0.0.1 - rvar ==0.2.0.6 @@ -2018,12 +2028,13 @@ default-package-overrides: - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - sampling ==0.3.5 - - sandwich ==0.1.0.5 + - sandwich ==0.1.0.6 - sandwich-quickcheck ==0.1.0.5 - sandwich-slack ==0.1.0.4 - sandwich-webdriver ==0.1.0.4 - say ==0.1.0.1 - sbp ==2.6.3 + - sbv ==8.14 - scalpel ==0.6.2 - scalpel-core ==0.6.2 - scanf ==0.1.0.0 @@ -2161,7 +2172,7 @@ default-package-overrides: - soap-tls ==0.1.1.4 - socket ==0.8.3.0 - socks ==0.6.1 - - some ==1.0.3 + - some ==1.0.2 - sop-core ==0.5.0.1 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 @@ -2219,6 +2230,7 @@ default-package-overrides: - store-core ==0.4.4.4 - store-streaming ==0.2.0.3 - stratosphere ==0.59.1 + - Stream ==0.4.7.2 - streaming ==0.2.3.0 - streaming-attoparsec ==1.0.0.1 - streaming-bytestring ==0.2.0 @@ -2244,7 +2256,6 @@ default-package-overrides: - stripe-core ==2.6.2 - stripe-haskell ==2.6.2 - stripe-http-client ==2.6.2 - - stripe-tests ==2.6.2 - strive ==5.0.14 - structs ==0.1.6 - structured ==0.1.0.1 @@ -2275,7 +2286,6 @@ default-package-overrides: - system-filepath ==0.4.14 - system-info ==0.5.2 - tabular ==0.2.2.8 - - taffybar ==3.2.3 - tagchup ==0.4.1.1 - tagged ==0.8.6.1 - tagged-binary ==0.2.0.1 @@ -2300,6 +2310,7 @@ default-package-overrides: - 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-lua ==0.2.3.2 @@ -2375,7 +2386,7 @@ default-package-overrides: - thread-local-storage ==0.2 - threads ==0.5.1.6 - thread-supervisor ==0.2.0.0 - - threepenny-gui ==0.9.0.0 + - threepenny-gui ==0.9.1.0 - th-reify-compat ==0.0.1.5 - th-reify-many ==0.1.9 - throttle-io-stream ==0.2.0.1 @@ -2426,6 +2437,7 @@ default-package-overrides: - tree-view ==0.5.1 - trifecta ==2.1.1 - triplesec ==0.2.2.1 + - trivial-constraint ==0.7.0.0 - tsv2csv ==0.1.0.2 - ttc ==0.4.0.0 - ttl-hashtables ==1.4.1.0 @@ -2438,7 +2450,7 @@ default-package-overrides: - typecheck-plugin-nat-simple ==0.1.0.2 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 - - typed-uuid ==0.0.0.2 + - typed-uuid ==0.1.0.0 - type-equality ==1 - type-errors ==0.2.0.0 - type-errors-pretty ==0.0.1.1 @@ -2447,6 +2459,7 @@ default-package-overrides: - type-level-kv-list ==1.1.0 - type-level-natural-number ==2.0 - type-level-numbers ==0.1.1.1 + - typelits-witnesses ==0.4.0.0 - type-map ==0.1.6.0 - type-natural ==1.1.0.0 - typenums ==0.1.4 @@ -2458,7 +2471,6 @@ default-package-overrides: - tzdata ==0.2.20201021.0 - ua-parser ==0.7.6.0 - uglymemo ==0.1.0.1 - - ulid ==0.3.0.0 - unagi-chan ==0.4.1.3 - unbounded-delays ==0.1.1.1 - unboxed-ref ==0.4.0.0 @@ -2483,6 +2495,7 @@ default-package-overrides: - unit-constraint ==0.0.0 - universe ==1.2.1 - universe-base ==1.1.2 + - universe-dependent-sum ==1.3 - universe-instances-base ==1.1 - universe-instances-extended ==1.1.2 - universe-instances-trans ==1.1 @@ -2492,7 +2505,7 @@ default-package-overrides: - unix-bytestring ==0.3.7.3 - unix-compat ==0.5.3 - unix-time ==0.4.7 - - unliftio ==0.2.15 + - unliftio ==0.2.16 - unliftio-core ==0.2.0.1 - unliftio-pool ==0.2.1.1 - unliftio-streams ==0.1.1.1 @@ -2550,7 +2563,7 @@ default-package-overrides: - vformat-aeson ==0.1.0.1 - vformat-time ==0.1.0.0 - ViennaRNAParser ==1.3.3 - - vinyl ==0.13.1 + - vinyl ==0.13.2 - void ==0.7.3 - vty ==5.33 - wai ==3.2.3 @@ -2571,7 +2584,7 @@ default-package-overrides: - wai-rate-limit-redis ==0.1.0.0 - wai-saml2 ==0.2.1.2 - wai-session ==0.3.3 - - wai-session-redis ==0.1.0.1 + - wai-session-redis ==0.1.0.2 - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - wakame ==0.1.0.0 @@ -2597,7 +2610,7 @@ default-package-overrides: - Win32 ==2.6.1.0 - Win32-notify ==0.3.0.3 - windns ==0.1.0.1 - - witch ==0.2.1.1 + - witch ==0.3.1.0 - witherable ==0.4.1 - within ==0.2.0.1 - with-location ==0.1.0 @@ -2627,7 +2640,6 @@ default-package-overrides: - x509-validation ==1.6.11 - Xauth ==0.1 - xdg-basedir ==0.2.2 - - xdg-desktop-entry ==0.1.1.1 - xdg-userdirs ==0.1.0.2 - xeno ==0.4.2 - xlsx ==0.8.3 @@ -2656,15 +2668,15 @@ default-package-overrides: - yesod ==1.6.1.1 - yesod-auth ==1.6.10.3 - yesod-auth-hashdb ==1.7.1.6 - - yesod-auth-oauth2 ==0.6.3.0 + - yesod-auth-oauth2 ==0.6.3.4 - yesod-bin ==1.6.1 - - yesod-core ==1.6.19.0 + - yesod-core ==1.6.20 - yesod-fb ==0.6.1 - yesod-form ==1.6.7 - yesod-gitrev ==0.2.1 - - yesod-markdown ==0.12.6.9 + - yesod-markdown ==0.12.6.11 - yesod-newsfeed ==1.7.0.0 - - yesod-page-cursor ==2.0.0.6 + - yesod-page-cursor ==2.0.0.7 - yesod-paginator ==1.1.1.0 - yesod-persistent ==1.6.0.7 - yesod-sitemap ==1.6.0 From 22cefb04451d6e7182b4e6a1b16338c373cdc5b6 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 19 May 2021 21:29:21 +0900 Subject: [PATCH 06/78] all-cabal-hashes: 2021-05-12T11:46:04Z -> 2021-05-19T07:17:55Z 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 43c45c95cd6b..f53ef94c47d4 100644 --- a/pkgs/data/misc/hackage/pin.json +++ b/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "2295bd36e0d36af6e862dfdb7b0694fba2e7cb58", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2295bd36e0d36af6e862dfdb7b0694fba2e7cb58.tar.gz", - "sha256": "1bzqy6kbw0i1ryg3ia5spg6m62zkc46xhhn0h76pfq7mfmm3fqf8", - "msg": "Update from Hackage at 2021-05-12T11:46:04Z" + "commit": "0fb7f9edea05a2b464b5667debe1e3ece585c185", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/0fb7f9edea05a2b464b5667debe1e3ece585c185.tar.gz", + "sha256": "01rzbda8g62gj2x3if46lglis9gqw3qfpqyiv2lrnm7alsg36ld9", + "msg": "Update from Hackage at 2021-05-19T07:17:55Z" } From 0a1c857489853d3c1c71e7584e63cea5ba3a2600 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 19 May 2021 21:31:19 +0900 Subject: [PATCH 07/78] hackage-packages.nix: Regenerate based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 1725 ++++++++--------- 1 file changed, 783 insertions(+), 942 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c04898da5280..e89da1c5c1e3 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -3421,21 +3421,21 @@ self: { "ConClusion" = callPackage ({ mkDerivation, aeson, attoparsec, base, cmdargs, containers - , formatting, hmatrix, massiv, optics, PSQueue, rio, text + , formatting, hmatrix, massiv, optics, psqueues, rio, text }: mkDerivation { pname = "ConClusion"; - version = "0.0.1"; - sha256 = "1qdwirr2gp5aq8dl5ibj1gb9mg2qd1jhpg610wy4yx2ymy4msg1p"; + version = "0.0.2"; + sha256 = "1n2wyvcyh950v67z4szvnr19vdh0fg2zvhxqyfqblpb1njayy92l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base containers formatting hmatrix massiv PSQueue + aeson attoparsec base containers formatting hmatrix massiv psqueues rio ]; executableHaskellDepends = [ aeson attoparsec base cmdargs containers formatting hmatrix massiv - optics PSQueue rio text + optics psqueues rio text ]; description = "Cluster algorithms, PCA, and chemical conformere analysis"; license = lib.licenses.agpl3Only; @@ -11648,8 +11648,8 @@ self: { }: mkDerivation { pname = "JuicyPixels-extra"; - version = "0.4.1"; - sha256 = "0k2bz2xn15qg400xl6xs52j2abcc3js42rd9p9sy4dwlkcdmblbj"; + version = "0.5.0"; + sha256 = "1r6rpasakl4s7x53y6wz34rkg4xxjhh8zfm9aqdjnxc7b8ir0nbb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base JuicyPixels ]; testHaskellDepends = [ base hspec JuicyPixels ]; @@ -13385,6 +13385,29 @@ self: { }) {}; "MissingH" = callPackage + ({ mkDerivation, array, base, containers, directory + , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network + , network-bsd, old-locale, old-time, parsec, process, random + , regex-compat, time, unix + }: + mkDerivation { + pname = "MissingH"; + version = "1.4.2.0"; + sha256 = "1wfhpb351nrqjryf9si9j13nkvrqybhkkyc9643wqq8ywkdd59b9"; + libraryHaskellDepends = [ + array base containers directory filepath hslogger mtl network + network-bsd old-locale old-time parsec process random regex-compat + time unix + ]; + testHaskellDepends = [ + base containers directory errorcall-eq-instance filepath HUnit + old-time parsec regex-compat time unix + ]; + description = "Large utility library"; + license = lib.licenses.bsd3; + }) {}; + + "MissingH_1_4_3_0" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network , network-bsd, old-locale, old-time, parsec, process, random @@ -13405,6 +13428,7 @@ self: { ]; description = "Large utility library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "MissingK" = callPackage @@ -19646,10 +19670,8 @@ self: { }: mkDerivation { pname = "TeX-my-math"; - version = "0.202.1.0"; - sha256 = "1cp3spzlssnnzvnxvkg59h4nnv2icvld9mdkhn97b043kvmbp4hl"; - revision = "2"; - editedCabalFile = "1j3nbbljj89mhhcld7dzgmixilfikwng05zcndsisnz75r1kp1gv"; + version = "0.202.2.0"; + sha256 = "1w074jr2qr603hjh644cvlc0n1miaz10r8mhkskq39jn184kriyl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21759,8 +21781,8 @@ self: { }: mkDerivation { pname = "Z-Botan"; - version = "0.2.0.0"; - sha256 = "0xxi19gfzglp93jxxq7sq9z1ijxa5jys917a156gd4hrcqqhwi63"; + version = "0.3.1.0"; + sha256 = "0920pzs9q105h32d7yp83bblhq0id5vzzw3d2pysg4dd127933xc"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ @@ -24125,19 +24147,22 @@ self: { }) {}; "aern2-mp" = callPackage - ({ mkDerivation, base, convertible, hspec, integer-logarithms, lens - , mixed-types-num, QuickCheck, regex-tdfa, rounded - , template-haskell + ({ mkDerivation, base, cdar-mBound, collect-errors, deepseq, hspec + , integer-logarithms, mixed-types-num, QuickCheck, reflection + , regex-tdfa, template-haskell }: mkDerivation { pname = "aern2-mp"; - version = "0.1.4"; - sha256 = "1q4ygvpxndvj0lsxb7aqw754nkxj1r2037f263g79vpjczkzzfwf"; + version = "0.2.1.1"; + sha256 = "1fsdvjancc2mi9i7l1gaqqvhnafchvw37hrn9ksd20djy43gzwyw"; libraryHaskellDepends = [ - base convertible hspec integer-logarithms lens mixed-types-num - QuickCheck regex-tdfa rounded template-haskell + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell + ]; + testHaskellDepends = [ + base cdar-mBound collect-errors deepseq hspec integer-logarithms + mixed-types-num QuickCheck reflection regex-tdfa template-haskell ]; - testHaskellDepends = [ base hspec QuickCheck ]; description = "Multi-precision ball (interval) arithmetic"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -24145,25 +24170,18 @@ self: { }) {}; "aern2-real" = callPackage - ({ mkDerivation, aern2-mp, aeson, base, bytestring, containers - , convertible, hspec, lens, mixed-types-num, QuickCheck, random - , stm, transformers + ({ mkDerivation, aern2-mp, base, collect-errors, hspec + , integer-logarithms, mixed-types-num, QuickCheck }: mkDerivation { pname = "aern2-real"; - version = "0.1.2"; - sha256 = "1br2glj89xcm3iyb32yi1xwgzkva9mmvl9gih38kgg4ldidflvn8"; - isLibrary = true; - isExecutable = true; + version = "0.2.1.0"; + sha256 = "06nz820p5gillvyjnx7bhmadpc0mrkvg8wiz9zmpcj6d23f28vzg"; libraryHaskellDepends = [ - aern2-mp aeson base bytestring containers convertible hspec lens - mixed-types-num QuickCheck stm transformers + aern2-mp base collect-errors hspec integer-logarithms + mixed-types-num QuickCheck ]; - executableHaskellDepends = [ - aern2-mp base mixed-types-num QuickCheck random - ]; - testHaskellDepends = [ base hspec QuickCheck ]; - description = "Exact real numbers via Cauchy sequences and MPFR"; + description = "Real numbers as sequences of MPBalls"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; }) {}; @@ -25034,8 +25052,8 @@ self: { }: mkDerivation { pname = "aeson-typescript"; - version = "0.2.0.0"; - sha256 = "15w28x2b8h402fic5agq96g51ssryvd7q3zs22n5mz9aa43qlphw"; + version = "0.3.0.0"; + sha256 = "054mhzsywbprccvp5pqscj9f92dvkrxgzpxz16bfadxn98wa1j7h"; libraryHaskellDepends = [ aeson base containers interpolate mtl template-haskell text th-abstraction unordered-containers @@ -29526,26 +29544,6 @@ self: { }) {}; "amqp-utils" = callPackage - ({ mkDerivation, amqp, base, bytestring, connection, containers - , data-default-class, directory, hinotify, magic, network, process - , text, time, tls, unix, utf8-string, x509-system - }: - mkDerivation { - pname = "amqp-utils"; - version = "0.6.1.0"; - sha256 = "0h0mjgaiyhhx8y6zd3zxm1jzd0vgc6crq3980l5cal0zv6vs9zc1"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - amqp base bytestring connection containers data-default-class - directory hinotify magic network process text time tls unix - utf8-string x509-system - ]; - description = "AMQP toolset for the command line"; - license = lib.licenses.gpl3Only; - }) {}; - - "amqp-utils_0_6_1_1" = callPackage ({ mkDerivation, amqp, base, bytestring, connection, containers , data-default-class, directory, hinotify, magic, network, process , text, time, tls, unix, utf8-string, x509-system @@ -29563,7 +29561,6 @@ self: { ]; description = "AMQP toolset for the command line"; license = lib.licenses.gpl3Only; - hydraPlatforms = lib.platforms.none; }) {}; "amqp-worker" = callPackage @@ -32358,8 +32355,8 @@ self: { }: mkDerivation { pname = "arduino-copilot"; - version = "1.5.3"; - sha256 = "18aa6qqgk1cd5adydyby7xm3imrg739hhmdl0m67b61gf7f3ch3x"; + version = "1.5.4"; + sha256 = "15z3ndcg1ycnfzvqbbfalx1gfa61pyi5n2fy1dj8qm0gqkhz23lh"; libraryHaskellDepends = [ base containers copilot copilot-c99 copilot-language directory filepath mtl optparse-applicative temporary @@ -36746,6 +36743,61 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "aws-xray-client" = callPackage + ({ mkDerivation, aeson, aeson-qq, async, base, bytestring + , criterion, deepseq, generic-arbitrary, hspec, http-types, lens + , network, QuickCheck, random, text, time + }: + mkDerivation { + pname = "aws-xray-client"; + version = "0.1.0.0"; + sha256 = "0rb46hz2y9mz0prgyb5m2v31j05cx18j6yl01pawhrb6v8pb7z00"; + libraryHaskellDepends = [ + aeson base bytestring deepseq http-types lens network random text + time + ]; + testHaskellDepends = [ + aeson aeson-qq base generic-arbitrary hspec lens QuickCheck random + text + ]; + benchmarkHaskellDepends = [ async base criterion random time ]; + description = "A client for AWS X-Ray"; + license = lib.licenses.mit; + }) {}; + + "aws-xray-client-persistent" = callPackage + ({ mkDerivation, aws-xray-client, base, conduit, containers, lens + , persistent, random, resourcet, text, time + }: + mkDerivation { + pname = "aws-xray-client-persistent"; + version = "0.1.0.0"; + sha256 = "02aig9j9asbkxni7bmyay1vhs7flf0gz401yldcq4n824c9q8h6f"; + libraryHaskellDepends = [ + aws-xray-client base conduit containers lens persistent random + resourcet text time + ]; + description = "A client for AWS X-Ray integration with Persistent"; + license = lib.licenses.mit; + }) {}; + + "aws-xray-client-wai" = callPackage + ({ mkDerivation, aws-xray-client, base, bytestring, containers + , http-types, lens, random, text, time, unliftio, unliftio-core + , vault, wai + }: + mkDerivation { + pname = "aws-xray-client-wai"; + version = "0.1.0.0"; + sha256 = "1vrgx2l3f08bd73z0an15zh3fla0d5sxqvwbsk1jxkrjfy2c43rd"; + libraryHaskellDepends = [ + aws-xray-client base bytestring containers http-types lens random + text time unliftio unliftio-core vault wai + ]; + description = "A client for AWS X-Ray integration with WAI"; + license = lib.licenses.mit; + }) {}; + "axel" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , directory, extra, filepath, freer-simple, ghcid, hashable @@ -38306,6 +38358,8 @@ self: { pname = "basement"; version = "0.0.12"; sha256 = "12zsnxkgv86im2prslk6ddhy0zwpawwjc1h4ff63kpxp2xdl7i2k"; + revision = "1"; + editedCabalFile = "1gr3zqf9xl3wlr2ajc03h9iya3jpx2h4jyjv2vhqxdvm6myiiffb"; libraryHaskellDepends = [ base ghc-prim ]; description = "Foundation scrap box of array & string"; license = lib.licenses.bsd3; @@ -38756,8 +38810,8 @@ self: { }: mkDerivation { pname = "bcp47"; - version = "0.2.0.3"; - sha256 = "07gz8bflc3klw0370albaff8v9vlgyqgrc5lifl35vs2ia891fhn"; + version = "0.2.0.4"; + sha256 = "1a3z0kg88061sffawq19girs7q640jv6yn24mailz7c89ajcawj7"; libraryHaskellDepends = [ aeson base containers country generic-arbitrary iso639 megaparsec QuickCheck text @@ -38775,8 +38829,8 @@ self: { }: mkDerivation { pname = "bcp47-orphans"; - version = "0.1.0.3"; - sha256 = "1dm65nq49zqbc6kxkh2kmsracc9a7vlbq4mpq60jh2wxgvzcfghm"; + version = "0.1.0.4"; + sha256 = "08kx00dxmwj0vxazcd2s88q069swnzjfnj61kla5pczaz0aqh11w"; libraryHaskellDepends = [ base bcp47 cassava errors esqueleto hashable http-api-data path-pieces persistent text @@ -45582,8 +45636,8 @@ self: { }: mkDerivation { pname = "brittany"; - version = "0.13.1.1"; - sha256 = "1z47kzmff9vdnkg4xihpdvccfy5080i05mg4j8sy3nv4mwja0ki1"; + version = "0.13.1.2"; + sha256 = "1pa8qgsild3zl56sdmbsllka64k05jk2p16ij3bdla4rbfw96z5g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46605,8 +46659,8 @@ self: { }: mkDerivation { pname = "burrito"; - version = "1.2.0.1"; - sha256 = "0swxc78vz1rj3q994cdnadgkanzcpm8rshvs2q49534rc2s6gq4g"; + version = "1.2.0.2"; + sha256 = "0d6qnajyh5v6hw89lw0d3lcan9l20zxkp8r3hq1imzbvb1mcasn5"; libraryHaskellDepends = [ base bytestring containers parsec template-haskell text transformers @@ -46956,8 +47010,8 @@ self: { }: mkDerivation { pname = "byte-count-reader"; - version = "0.10.1.2"; - sha256 = "11mzz8ahjlqq910s27wggk0vz9bjqxkyqs7lk8kr20cpx0by26s1"; + version = "0.10.1.3"; + sha256 = "1z02g8mkjwxdrbyxncbvrwg18knyiqa3w9n0x01y2xmbr279rsh0"; libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; testHaskellDepends = [ base extra hspec parsec parsec-numbers text @@ -49567,8 +49621,8 @@ self: { }: mkDerivation { pname = "caerbannog"; - version = "0.6.0.4"; - sha256 = "0zm6vdbsb947nd3wcniyk8mjs52r6hwyyp64w1abnazajraqask8"; + version = "0.6.0.5"; + sha256 = "048d46g7xnqbkb061hs3ix8rzpp1mwww9iznpgrrkvimafb0r0m0"; libraryHaskellDepends = [ base binary bytestring ]; testHaskellDepends = [ base binary bytestring hspec QuickCheck random @@ -49818,29 +49872,31 @@ self: { }) {}; "calamity" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, colour - , concurrent-extra, connection, containers, data-default-class - , data-flags, deepseq, deque, df1, di-core, di-polysemy, exceptions - , fmt, focus, generic-lens, hashable, http-api-data, http-client - , http-date, http-types, lens, lens-aeson, megaparsec, mime-types - , mtl, polysemy, polysemy-plugin, reflection, req, safe-exceptions - , scientific, stm, stm-chans, stm-containers, text, text-show, time - , tls, typerep-map, unagi-chan, unboxing-vector - , unordered-containers, vector, websockets, x509-system + ({ mkDerivation, aeson, async, base, bytestring, calamity-commands + , colour, concurrent-extra, connection, containers + , data-default-class, data-flags, deepseq, deque, df1, di-core + , di-polysemy, exceptions, fmt, focus, generic-lens, hashable + , http-api-data, http-client, http-date, http-types, lens + , lens-aeson, megaparsec, mime-types, mtl, polysemy + , polysemy-plugin, reflection, req, safe-exceptions, scientific + , stm, stm-chans, stm-containers, text, text-show, time, tls + , typerep-map, unagi-chan, unboxing-vector, unordered-containers + , vector, websockets, x509-system }: mkDerivation { pname = "calamity"; - version = "0.1.29.0"; - sha256 = "05i8364x6d5kh4vimg8xp5cwskbzayk71kb6r4gg95xdi6vhgnjx"; + version = "0.1.30.1"; + sha256 = "1qxag4vdxn2s3ijkr9lz5djafnwi7c6vj4q9b5z5p41ldvsil3l7"; libraryHaskellDepends = [ - aeson async base bytestring colour concurrent-extra connection - containers data-default-class data-flags deepseq deque df1 di-core - di-polysemy exceptions fmt focus generic-lens hashable - http-api-data http-client http-date http-types lens lens-aeson - megaparsec mime-types mtl polysemy polysemy-plugin reflection req - safe-exceptions scientific stm stm-chans stm-containers text - text-show time tls typerep-map unagi-chan unboxing-vector - unordered-containers vector websockets x509-system + aeson async base bytestring calamity-commands colour + concurrent-extra connection containers data-default-class + data-flags deepseq deque df1 di-core di-polysemy exceptions fmt + focus generic-lens hashable http-api-data http-client http-date + http-types lens lens-aeson megaparsec mime-types mtl polysemy + polysemy-plugin reflection req safe-exceptions scientific stm + stm-chans stm-containers text text-show time tls typerep-map + unagi-chan unboxing-vector unordered-containers vector websockets + x509-system ]; description = "A library for writing discord bots in haskell"; license = lib.licenses.mit; @@ -49854,8 +49910,8 @@ self: { }: mkDerivation { pname = "calamity-commands"; - version = "0.1.1.0"; - sha256 = "0sx0pcxh9f7r4nlhii5i3vwxpbhngzprp4h3yvp2xvkr8mp6pyk2"; + version = "0.1.2.0"; + sha256 = "1qm55aikpc1645bzks90r88f317rz5mzwv7grrs9dr37hmy3sl65"; libraryHaskellDepends = [ base generic-lens lens megaparsec polysemy polysemy-plugin text text-show unordered-containers @@ -50053,6 +50109,19 @@ self: { license = lib.licenses.mit; }) {}; + "call-stack_0_4_0" = callPackage + ({ mkDerivation, base, filepath, nanospec }: + mkDerivation { + pname = "call-stack"; + version = "0.4.0"; + sha256 = "0yxq6v37kcmgv6rrna4g1ipr8mhkgf00ng2p359ybxq46j5cy2s3"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base filepath nanospec ]; + description = "Use GHC call-stacks in a backward compatible way"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "camfort" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, fgl, filepath, flint, fortran-src @@ -53539,8 +53608,8 @@ self: { }: mkDerivation { pname = "chessIO"; - version = "0.6.1.0"; - sha256 = "0agrj7k2kfyfdh23m7nciywl9sgi4vy82h83p76jlclbcakdqy1c"; + version = "0.6.1.1"; + sha256 = "0fnbbxsnfb53pcmqs8bhszbd36d44gn9wz0j029yhfh3i1fy40yy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54685,6 +54754,33 @@ self: { license = lib.licenses.bsd2; }) {}; + "citeproc_0_4" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring + , case-insensitive, containers, data-default, Diff, directory + , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific + , text, timeit, transformers, unicode-collation, uniplate, vector + , xml-conduit + }: + mkDerivation { + pname = "citeproc"; + version = "0.4"; + sha256 = "0ca6xyv0pa0w10pzn7zmpvg6583xjs8ffj16ykkrw9gjd4nlginh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers + data-default file-embed filepath pandoc-types safe scientific text + transformers unicode-collation 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; + hydraPlatforms = lib.platforms.none; + }) {}; + "citeproc-hs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , hexpat, hs-bibutils, HTTP, json, mtl, network, network-uri @@ -55023,36 +55119,6 @@ self: { }) {}; "clash-ghc" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, Cabal - , clash-lib, clash-prelude, concurrent-supply, containers, deepseq - , directory, exceptions, filepath, ghc, ghc-boot, ghc-prim - , ghc-typelits-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp - , lens, mtl, primitive, process, reflection, split - , template-haskell, text, time, transformers, uniplate, unix - , unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "clash-ghc"; - version = "1.2.5"; - sha256 = "1wxlhcpwq0m7k4f12x16ybvp4s5m45p9qk27wjkgk133fw35y3pz"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bifunctors bytestring Cabal clash-lib clash-prelude - concurrent-supply containers deepseq directory exceptions filepath - ghc ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat - ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens - mtl primitive process reflection split template-haskell text time - transformers uniplate unix unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ base ]; - description = "CAES Language for Synchronous Hardware"; - license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - }) {}; - - "clash-ghc_1_4_1" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, Cabal , clash-lib, clash-prelude, concurrent-supply, containers, deepseq , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim @@ -55083,47 +55149,38 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "clash-lib" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary - , bytestring, clash-prelude, concurrent-supply, containers - , data-binary-ieee754, data-default, deepseq, directory, dlist - , errors, exceptions, extra, filepath, ghc, ghc-boot-th - , ghc-typelits-knownnat, hashable, haskell-src-exts - , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl - , ordered-containers, parsers, prettyprinter, primitive, process - , reducers, tasty, tasty-hunit, template-haskell, temporary - , terminal-size, text, text-show, time, transformers, trifecta + "clash-ghc_1_4_2" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, Cabal + , clash-lib, clash-prelude, concurrent-supply, containers, deepseq + , directory, exceptions, extra, filepath, ghc, ghc-boot, ghc-prim + , ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, ghci, hashable, haskeline, integer-gmp + , lens, mtl, primitive, process, reflection, split + , template-haskell, text, time, transformers, uniplate, unix , unordered-containers, utf8-string, vector - , vector-binary-instances }: mkDerivation { - pname = "clash-lib"; - version = "1.2.5"; - sha256 = "14xi0llzm6f3ymlcfwq67d16ggdkqxrxkvr6rwmykxrca3j1b6r3"; - revision = "1"; - editedCabalFile = "15pvhd19yq2m1c2n33iawxngmpc6d0jfsh02038j8fbpzx68p7bw"; - enableSeparateDataOutput = true; + pname = "clash-ghc"; + version = "1.4.2"; + sha256 = "04sj88mcxszgbr8rxnrwa48r2pkf7h612507gcyk131f5kf6mkss"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base binary bytestring clash-prelude - concurrent-supply containers data-binary-ieee754 data-default - deepseq directory dlist errors exceptions extra filepath ghc - ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate - lens mtl ordered-containers parsers prettyprinter primitive process - reducers template-haskell temporary terminal-size text text-show - time transformers trifecta unordered-containers utf8-string vector - vector-binary-instances + array base bifunctors bytestring Cabal clash-lib clash-prelude + concurrent-supply containers deepseq directory exceptions extra + filepath ghc ghc-boot ghc-prim ghc-typelits-extra + ghc-typelits-knownnat ghc-typelits-natnormalise ghci hashable + haskeline integer-gmp lens mtl primitive process reflection split + template-haskell text time transformers uniplate unix + unordered-containers utf8-string vector ]; - testHaskellDepends = [ - base clash-prelude concurrent-supply containers data-default - deepseq ghc ghc-typelits-knownnat haskell-src-exts lens tasty - tasty-hunit template-haskell text transformers unordered-containers - ]; - description = "CAES Language for Synchronous Hardware - As a Library"; + executableHaskellDepends = [ base ]; + description = "Clash: a functional hardware description language - GHC frontend"; license = lib.licenses.bsd2; hydraPlatforms = lib.platforms.none; }) {}; - "clash-lib_1_4_1" = callPackage + "clash-lib" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array , attoparsec, base, base16-bytestring, binary, bytestring , clash-prelude, concurrent-supply, containers, cryptohash-sha256 @@ -55166,6 +55223,49 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-lib_1_4_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array + , attoparsec, base, base16-bytestring, binary, bytestring + , clash-prelude, concurrent-supply, containers, cryptohash-sha256 + , data-binary-ieee754, data-default, deepseq, directory, dlist + , errors, exceptions, extra, filepath, ghc, ghc-boot-th + , ghc-typelits-knownnat, hashable, haskell-src-exts + , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl + , ordered-containers, parsers, pretty-show, prettyprinter + , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, terminal-size + , text, text-show, time, transformers, trifecta + , unordered-containers, utf8-string, vector + , vector-binary-instances + }: + mkDerivation { + pname = "clash-lib"; + version = "1.4.2"; + sha256 = "1gismfz0pahhgfgra8kn34i3g82ip5nfy9aj38ym3rcnpg4aw10m"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array attoparsec base + base16-bytestring binary bytestring clash-prelude concurrent-supply + containers cryptohash-sha256 data-binary-ieee754 data-default + deepseq directory dlist errors exceptions extra filepath ghc + ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate + lens mtl ordered-containers parsers pretty-show prettyprinter + primitive process reducers template-haskell temporary terminal-size + text text-show time transformers trifecta unordered-containers + utf8-string vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson aeson-pretty base base16-bytestring bytestring clash-prelude + concurrent-supply containers data-default deepseq ghc + ghc-typelits-knownnat haskell-src-exts lens pretty-show + quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell + text transformers unordered-containers + ]; + description = "Clash: a functional hardware description language - As a library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-multisignal" = callPackage ({ mkDerivation, base, clash-prelude, deepseq , ghc-typelits-knownnat, QuickCheck @@ -55182,46 +55282,6 @@ self: { }) {}; "clash-prelude" = callPackage - ({ mkDerivation, array, base, bifunctors, binary, bytestring, Cabal - , cabal-doctest, constraints, containers, criterion - , data-binary-ieee754, data-default-class, deepseq, doctest - , ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, half, hashable, hedgehog, hint - , integer-gmp, interpolate, lens, QuickCheck - , quickcheck-classes-base, recursion-schemes, reflection - , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck - , template-haskell, text, text-show, th-abstraction, th-lift - , th-orphans, time, transformers, type-errors, uniplate, vector - }: - mkDerivation { - pname = "clash-prelude"; - version = "1.2.5"; - sha256 = "0q97ap4a6cbf6s06934639pws9z1yyzmmaw6gj05p8jv7r4is239"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array base bifunctors binary bytestring constraints containers - data-binary-ieee754 data-default-class deepseq ghc-prim - ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise - half hashable integer-gmp interpolate lens QuickCheck - recursion-schemes reflection singletons template-haskell text - text-show th-abstraction th-lift th-orphans time transformers - type-errors uniplate vector - ]; - testHaskellDepends = [ - base doctest ghc-typelits-extra ghc-typelits-knownnat - ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base - tasty tasty-hedgehog tasty-hunit tasty-quickcheck template-haskell - ]; - benchmarkHaskellDepends = [ - base criterion deepseq template-haskell - ]; - description = "CAES Language for Synchronous Hardware - Prelude library"; - license = lib.licenses.bsd2; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "clash-prelude_1_4_1" = callPackage ({ mkDerivation, array, arrows, base, bifunctors, binary , bytestring, Cabal, cabal-doctest, constraints, containers , criterion, data-binary-ieee754, data-default-class, deepseq @@ -55263,6 +55323,48 @@ self: { broken = true; }) {}; + "clash-prelude_1_4_2" = callPackage + ({ mkDerivation, array, arrows, base, bifunctors, binary + , bytestring, Cabal, cabal-doctest, constraints, containers + , criterion, data-binary-ieee754, data-default-class, deepseq + , doctest, ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat + , ghc-typelits-natnormalise, half, hashable, hedgehog, hint + , integer-gmp, interpolate, lens, QuickCheck + , quickcheck-classes-base, recursion-schemes, reflection + , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell, text, text-show, th-abstraction + , th-lift, th-orphans, time, transformers, type-errors, uniplate + , vector + }: + mkDerivation { + pname = "clash-prelude"; + version = "1.4.2"; + sha256 = "04hshjdddd9sk697zvbwlq6cdvyvdfrw670ksfdxxgssyrcsid95"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array arrows base bifunctors binary bytestring constraints + containers data-binary-ieee754 data-default-class deepseq ghc-prim + ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise + half hashable integer-gmp interpolate lens QuickCheck + recursion-schemes reflection singletons template-haskell text + text-show th-abstraction th-lift th-orphans time transformers + type-errors uniplate vector + ]; + testHaskellDepends = [ + base deepseq doctest ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base + tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th + template-haskell + ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Clash: a functional hardware description language - Prelude library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -57455,8 +57557,8 @@ self: { }: mkDerivation { pname = "code-conjure"; - version = "0.2.4"; - sha256 = "1xb8c791zcbfywz4pcqx5n5iq6a2fh0fl2mzwl6cxapj2y700dbp"; + version = "0.2.6"; + sha256 = "1nvzyxmgn2wwa3j3rf38jz1nhhldv9jgbb91r7v2m822rxhr5pwp"; libraryHaskellDepends = [ base express leancheck speculate template-haskell ]; @@ -58093,26 +58195,14 @@ self: { }) {}; "collect-errors" = callPackage - ({ mkDerivation, base, containers, QuickCheck }: - mkDerivation { - pname = "collect-errors"; - version = "0.1.1.0"; - sha256 = "0zk7iw1fx50dzm55rcxpd8rwqm7jsb057q8hrf7c8b0jjbrx5b9v"; - libraryHaskellDepends = [ base containers QuickCheck ]; - description = "Error monad with a Float instance"; - license = lib.licenses.bsd3; - }) {}; - - "collect-errors_0_1_3_0" = callPackage ({ mkDerivation, base, containers, deepseq, QuickCheck }: mkDerivation { pname = "collect-errors"; - version = "0.1.3.0"; - sha256 = "03gzaqlgivlzlsqrzr8g1ijvi825p9kxzihhrrd06vib34bqswv8"; + version = "0.1.5.0"; + sha256 = "1hljcnmwpk47rivlds9901129hgkm7j8h3yhz2j1j2pga5w43ck9"; libraryHaskellDepends = [ base containers deepseq QuickCheck ]; description = "Error monad with a Float instance"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "collection-json" = callPackage @@ -62357,6 +62447,8 @@ self: { pname = "constraints-extras"; version = "0.3.1.0"; sha256 = "0hr1xaxypkmd2a856ha8v3jhkh4hr6g8kar0lr4vj3jsj2h6cmks"; + revision = "1"; + editedCabalFile = "1hcaj1yk4f64v388zq2pd34ljkm68zds3vd8a3yhqr0xgr1wy3y7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base constraints template-haskell ]; @@ -63459,8 +63551,8 @@ self: { }: mkDerivation { pname = "copilot"; - version = "3.2.1"; - sha256 = "1gxa2sc6n7hswkzqrr9dzzgwynw7sdvccyigfhm7gcy1l79gl3iq"; + version = "3.3"; + sha256 = "166nin0861i2ak06gdhj6sv6zv7cc60wmqgv4mly9hjf0qp3w6j1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63480,8 +63572,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.2.1"; - sha256 = "0wi4bd0hmh05z6m7mjl69z1arhnw08v75hnwzxl6dibkrymmq286"; + version = "3.3"; + sha256 = "09qjfhf0dkccbi4kycwqavv7bxdpfj2j50vkljmzrxh59xq00jnz"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -63516,8 +63608,8 @@ self: { ({ mkDerivation, base, dlist, mtl, pretty }: mkDerivation { pname = "copilot-core"; - version = "3.2.1"; - sha256 = "1h9wqv75s49vvqagcdkxx8n5vwn0fsh271v2jm60msssdd7ljwp6"; + version = "3.3"; + sha256 = "19k206hsqd3lw2k40cjpjhnwfjsfraagw622bxn97rk4195jqhy6"; libraryHaskellDepends = [ base dlist mtl pretty ]; description = "An intermediate representation for Copilot"; license = lib.licenses.bsd3; @@ -63529,8 +63621,8 @@ self: { }: mkDerivation { pname = "copilot-language"; - version = "3.2.1"; - sha256 = "03r50k3i24rzjkc1maklq7351flzjv3cc2i6d1shib3dklzjsw8l"; + version = "3.3"; + sha256 = "1x39jyn82j9mydsbi8n24a2nx8j00gcxw2rsxqagjpwqx10igyr2"; libraryHaskellDepends = [ array base containers copilot-core copilot-theorem data-reify ghc-prim mtl @@ -63546,8 +63638,8 @@ self: { }: mkDerivation { pname = "copilot-libraries"; - version = "3.2.1"; - sha256 = "1grcpc9lmqvsi3cb9j45w6hvqdljv7z0yylxf3i2i5y931gj6gpv"; + version = "3.3"; + sha256 = "0f8g67j26g1k5xph6zg5crypj0ys8mf0i5pazn04sy02lslsdmd9"; libraryHaskellDepends = [ array base containers copilot-language data-reify mtl parsec ]; @@ -63575,17 +63667,17 @@ self: { "copilot-theorem" = callPackage ({ mkDerivation, ansi-terminal, base, bimap, bv-sized, containers - , copilot-core, data-default, directory, filepath, mtl, panic - , parameterized-utils, parsec, pretty, process, random + , copilot-core, data-default, directory, filepath, libBF, mtl + , panic, parameterized-utils, parsec, pretty, process, random , transformers, what4, xml }: mkDerivation { pname = "copilot-theorem"; - version = "3.2.1"; - sha256 = "1vns5bavlm95hc57qwwjpzaq0xj5pv3dk2n1ac0rbjdbpsa3dl4l"; + version = "3.3"; + sha256 = "1js4j9alfnlxi6zsvcdj8zf2r04lm9rp22r6zq6qkhams6pmmxly"; libraryHaskellDepends = [ ansi-terminal base bimap bv-sized containers copilot-core - data-default directory filepath mtl panic parameterized-utils + data-default directory filepath libBF mtl panic parameterized-utils parsec pretty process random transformers what4 xml ]; description = "k-induction for Copilot"; @@ -64663,20 +64755,6 @@ self: { }) {crack = null;}; "crackNum" = callPackage - ({ mkDerivation, array, base, FloatingHex }: - mkDerivation { - pname = "crackNum"; - version = "2.4"; - sha256 = "1fa9rlknmilc8rnm7yvmjrbc9jydpvk30gj7lq79nqbifig6229a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ array base FloatingHex ]; - executableHaskellDepends = [ array base FloatingHex ]; - description = "Crack various integer, floating-point data formats"; - license = lib.licenses.bsd3; - }) {}; - - "crackNum_3_1" = callPackage ({ mkDerivation, base, directory, filepath, libBF, process, sbv , tasty, tasty-golden }: @@ -64691,7 +64769,6 @@ self: { ]; description = "Crack various integer and floating-point data formats"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "craft" = callPackage @@ -73355,8 +73432,8 @@ self: { pname = "dhall"; version = "1.38.1"; sha256 = "0g70x2crdrkwf41gvwr718am25dmbn9bg4cml9f9va7i1vx5rsgk"; - revision = "1"; - editedCabalFile = "1830jbh5q7g7r4i5n1vhs1h8fj8zzig3l6qr9kbkk00dhhgywv8b"; + revision = "2"; + editedCabalFile = "02z0jmzzp20yj46iz6i384xwc6k2anxb33smvc4yhpmhqjs0aq8a"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -73587,8 +73664,8 @@ self: { pname = "dhall-nix"; version = "1.1.20"; sha256 = "14d9icvgmrphnbjjwlskh88p7vgphgb0xqd91p217bf2xhl9k2xd"; - revision = "1"; - editedCabalFile = "16hz1i0vkp1qsqf9dm0d9pc1kap02nzdalzjpiw2r8p3qbykaann"; + revision = "2"; + editedCabalFile = "1w90jrkzmbv5nasafkkv0kyfmnqkngldx2lr891113h2mqbbr3wx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73613,6 +73690,8 @@ self: { pname = "dhall-nixpkgs"; version = "1.0.4"; sha256 = "0yr7z17dvmr1zipk29fmzm46myxxsz514587n6a7h00c56dyvnc3"; + revision = "1"; + editedCabalFile = "1y08jxg51sbxx0i7ra45ii2v81plzf4hssmwlrw35l8n5gib1vcg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -74093,10 +74172,8 @@ self: { }: mkDerivation { pname = "diagrams-core"; - version = "1.4.2"; - sha256 = "0qgb43vy23g4fxh3nmxfq6jyp34imqvkhgflaa6rz0iq6d60gl43"; - revision = "1"; - editedCabalFile = "0w8mpy0z8kmx4l7cg8sgc1hyixysjfqffdgmnxy5p04airjlbpj7"; + version = "1.5.0"; + sha256 = "0y3smp3hiyfdirdak3j4048cgqv7a5q9p2jb6z8na2llys5mrmdn"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -74491,8 +74568,8 @@ self: { }: mkDerivation { pname = "dialogflow-fulfillment"; - version = "0.1.1.3"; - sha256 = "10n91mfgvn3pi0rvw92ys8f4bcra4v24j0cjykrax3jdmk1wfmym"; + version = "0.1.1.4"; + sha256 = "0yy4h8pariapyi7pr1b237i73y4k8icjk862i9jxh9g9lilkpyzq"; libraryHaskellDepends = [ aeson base bytestring containers text unordered-containers ]; @@ -75357,8 +75434,8 @@ self: { }: mkDerivation { pname = "diohsc"; - version = "0.1.6"; - sha256 = "0hzixid47jv5jwv5rs91baa8bpfkq4hn3y8ndra34w5qvmg3nlii"; + version = "0.1.6.1"; + sha256 = "15shc82ii68dzpa0j9dqi6iyhqa6zbr9g2007c1na42rxhm8fg7j"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -75707,8 +75784,8 @@ self: { }: mkDerivation { pname = "dirichlet"; - version = "0.1.0.2"; - sha256 = "1xppfdz3s31md41848awahfipv5g6yhglkw2l5l3q0jc5wsc1vvw"; + version = "0.1.0.4"; + sha256 = "1qhkqcdzdryzds5zb9y55ckd35wij39yk2k58s7fdacnash9l3fg"; libraryHaskellDepends = [ base log-domain math-functions mwc-random primitive vector ]; @@ -79137,6 +79214,18 @@ self: { license = lib.licenses.bsd3; }) {}; + "driving-classes-plugin" = callPackage + ({ mkDerivation, base, containers, ghc }: + mkDerivation { + pname = "driving-classes-plugin"; + version = "0.1.2.0"; + sha256 = "013c4qs919yp8nm2ammzr55rqzcai4ybsszilg9g48bd913hzrzl"; + libraryHaskellDepends = [ base containers ghc ]; + testHaskellDepends = [ base ]; + description = "Deriving without spelling out \"deriving\""; + license = lib.licenses.mit; + }) {}; + "drmaa" = callPackage ({ mkDerivation, base, c2hs, directory, drmaa, exceptions }: mkDerivation { @@ -80382,22 +80471,6 @@ self: { }) {}; "dyre" = callPackage - ({ mkDerivation, base, binary, directory, executable-path, filepath - , ghc-paths, io-storage, process, time, unix, xdg-basedir - }: - mkDerivation { - pname = "dyre"; - version = "0.8.12"; - sha256 = "10hnlysy4bjvvznk8v902mlk4jx95qf972clyi1l32xkqrf30972"; - libraryHaskellDepends = [ - base binary directory executable-path filepath ghc-paths io-storage - process time unix xdg-basedir - ]; - description = "Dynamic reconfiguration in Haskell"; - license = lib.licenses.bsd3; - }) {}; - - "dyre_0_9_1" = callPackage ({ mkDerivation, base, binary, directory, executable-path, filepath , io-storage, process, time, unix, xdg-basedir }: @@ -80412,7 +80485,6 @@ self: { testHaskellDepends = [ base directory process ]; description = "Dynamic reconfiguration in Haskell"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "dywapitchtrack" = callPackage @@ -87245,8 +87317,8 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.8"; - sha256 = "1g586cv6j79w40bmagqi156rjv09k1whhvpg67p0f707hbq1ph0a"; + version = "0.1.10"; + sha256 = "09ajf8ibcwxqbyrrz7yb84fpzfb7g54b1mz5q8w3dvk8rrdxaak1"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -88184,36 +88256,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.2.1"; - sha256 = "0n1pcchzb5bxhykdjdri84g0hnbrzd76brpqqx8f6yhwll5vaxsq"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-casing base bytestring connection cryptonite megaparsec - memory mtl network random safe-exceptions scanner semigroups text - time unix unordered-containers - ]; - executableHaskellDepends = [ aeson base safe-exceptions ]; - testHaskellDepends = [ - aeson async base hspec markdown-unlit time - ]; - testToolDepends = [ markdown-unlit ]; - description = "Faktory Worker for Haskell"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {}; - - "faktory_1_0_2_2" = callPackage - ({ mkDerivation, aeson, aeson-casing, async, base, bytestring - , connection, cryptonite, hspec, markdown-unlit, megaparsec, memory - , mtl, network, random, safe-exceptions, scanner, semigroups, text - , time, unix, unordered-containers - }: - mkDerivation { - pname = "faktory"; - version = "1.0.2.2"; - sha256 = "0w1wk40c7drdpm6wzm3hxhbgpznq8275fajb5c3z4pl8cav6hc61"; + version = "1.0.2.3"; + sha256 = "1ppyj7avp7y5n0qgql1j73yc62szykhxm1j8nxv93hsijzi6p4a5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90250,22 +90294,6 @@ self: { }) {}; "file-embed" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath - , template-haskell - }: - mkDerivation { - pname = "file-embed"; - version = "0.0.13.0"; - sha256 = "1sp1qq1ph2gr5a8ismn7n9vijnfwjyh38iqn338wa8mxn2mnhc6i"; - libraryHaskellDepends = [ - base bytestring directory filepath template-haskell - ]; - testHaskellDepends = [ base filepath ]; - description = "Use Template Haskell to embed file contents directly"; - license = lib.licenses.bsd3; - }) {}; - - "file-embed_0_0_14_0" = callPackage ({ mkDerivation, base, bytestring, directory, filepath , template-haskell }: @@ -90279,7 +90307,6 @@ self: { testHaskellDepends = [ base bytestring filepath ]; description = "Use Template Haskell to embed file contents directly"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "file-embed-lzma" = callPackage @@ -94212,8 +94239,8 @@ self: { pname = "fourmolu"; version = "0.3.0.0"; sha256 = "0v89dvcr8l0swj23kkakc39q6lyxjz90rqgwy7m6a5p6iv3h2wms"; - revision = "1"; - editedCabalFile = "1n3avdmjqkd2910lhb5spxvjgzb7icln82pcrz3cmkfmjwxnirsc"; + revision = "2"; + editedCabalFile = "16ky7wzmnwhzkk18r63ynq78vlrg065z6mp3hqgs92khpjr33g1l"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -97092,8 +97119,8 @@ self: { }: mkDerivation { pname = "fuzzyset"; - version = "0.2.0"; - sha256 = "0wx8bccfr1k5ax97x5w01mzrpjfwns27xgcr12xf6vbyi7q14mfg"; + version = "0.2.1"; + sha256 = "13hzy1qkxd7d7qirxhixi1qyrcjjvx6y3qmbggw5c0mkgckw7gpi"; libraryHaskellDepends = [ base data-default text text-metrics unordered-containers vector ]; @@ -98797,15 +98824,13 @@ self: { }) {}; "generic-random" = callPackage - ({ mkDerivation, base, deepseq, inspection-testing, QuickCheck }: + ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "generic-random"; - version = "1.3.0.1"; - sha256 = "0d9w7xcmsb31b95fr9d5jwbsajcl1yi4347dlbw4bybil2vjwd7k"; + version = "1.4.0.0"; + sha256 = "12rvb1dzrfjc46n9vdcw3yv773iih8vwhrac3hpzq70yp2z77jdw"; libraryHaskellDepends = [ base QuickCheck ]; - testHaskellDepends = [ - base deepseq inspection-testing QuickCheck - ]; + testHaskellDepends = [ base deepseq QuickCheck ]; description = "Generic random generators for QuickCheck"; license = lib.licenses.mit; }) {}; @@ -101296,6 +101321,27 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-tags" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, deepseq, directory, filepath, ghc-lib, ghc-paths + , optparse-applicative, process, stm, temporary, text, time + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "ghc-tags"; + version = "1.1"; + sha256 = "0dk80lss2iq2yi7cnx78nk7pfnc3khwm3xincj3ybaiy60c94x8x"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async attoparsec base bytestring containers deepseq directory + filepath ghc-lib ghc-paths optparse-applicative process stm + temporary text time unordered-containers vector yaml + ]; + description = "Utility for generating ctags and etags with GHC API"; + license = lib.licenses.mpl20; + }) {}; + "ghc-tags-core" = callPackage ({ mkDerivation, attoparsec, base, bytestring, cpphs, criterion , deepseq, directory, filepath, filepath-bytestring, ghc, lattices @@ -104170,8 +104216,8 @@ self: { }: mkDerivation { pname = "git-brunch"; - version = "1.4.4.0"; - sha256 = "0kj22hx2ibidrnx19wb8kh6vyv4v0b5im616bywwhjqzspjqppmi"; + version = "1.5.1.0"; + sha256 = "057xsm5jzzrmivfxd40abph63lyy0q7pmfs2wvadlkhyhcb8nvgv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -110426,6 +110472,8 @@ self: { pname = "graphql-client"; version = "1.1.1"; sha256 = "1d00ib9c8ps8vv1qgrkjfzrjbgbsdnp1jiz7779bwm76j88vggb4"; + revision = "3"; + editedCabalFile = "0pnkq0wxjmfk67ji6wr7b42lsr2gp026cx91ryq146gh4c9gwacv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110533,8 +110581,8 @@ self: { }: mkDerivation { pname = "graphula"; - version = "2.0.0.4"; - sha256 = "1jqli2ws2n67cha6qd460h1y5iz688dwi5dn6h0a6jmc03yzgxni"; + version = "2.0.0.5"; + sha256 = "1ajpp5c3y93pl7i4b1bkfg8w6075xvbhdx6c4mj1cnz7mq6763a7"; libraryHaskellDepends = [ base containers directory generics-eot HUnit mtl persistent QuickCheck random semigroups temporary text transformers unliftio @@ -111306,8 +111354,8 @@ self: { ({ mkDerivation, base, containers, groups }: mkDerivation { pname = "group-theory"; - version = "0.2.1.0"; - sha256 = "11cm59l3g831pz0h5qr94rf1g7km4bn0gqrb8ikssf4xwnjxib46"; + version = "0.2.2"; + sha256 = "0lbmfsycc8znbzc5vxz2a3kxq2r74xamm6bwr6bpdvka6c8bfzn8"; libraryHaskellDepends = [ base containers groups ]; description = "The theory of groups"; license = lib.licenses.bsd3; @@ -111394,8 +111442,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "groups"; - version = "0.5.2"; - sha256 = "0ghabk9r3pqccwfshy80p460awv0niyfi3nirg5bqnxm923c4njn"; + version = "0.5.3"; + sha256 = "0f5c8dg9b74glfw2sdvdcl9c8igs6knz1bayk4gvvzvypsl547nf"; libraryHaskellDepends = [ base ]; description = "Groups"; license = lib.licenses.bsd3; @@ -111523,8 +111571,8 @@ self: { }: mkDerivation { pname = "grpc-haskell-core"; - version = "0.0.0.0"; - sha256 = "1pvcdr1jrn94nwhni5992l8mv401150wl8yi519hncs173n2fx88"; + version = "0.1.0"; + sha256 = "1djyjlbqsdk64b3ymli4hlh6w0rkl481f9r5m0q56gwpbp5h1zp6"; libraryHaskellDepends = [ base bytestring clock containers managed sorted-list stm transformers @@ -111907,8 +111955,8 @@ self: { }: mkDerivation { pname = "gtk-sni-tray"; - version = "0.1.6.0"; - sha256 = "0i8k6jk6jq97cahlgbj8acqdqw4zkh0cyy8i6clznbknl02qqp2i"; + version = "0.1.6.2"; + sha256 = "1rcw57d5f0298y40ajmb2664ryrqsmcwbr2y1pk0sl2ggwr1zzsl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -113530,27 +113578,6 @@ self: { }) {}; "hackage-db" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , directory, exceptions, filepath, tar, time, utf8-string - }: - mkDerivation { - pname = "hackage-db"; - version = "2.1.0"; - sha256 = "1vsc0lrbrb525frycqq0c5z846whymgcjl888gnlqd16nknbsn3l"; - revision = "1"; - editedCabalFile = "1h3x5a8xmqkkcd3h1m7z0il1vbsh2c77685y68zmyp21zb1y88hy"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring Cabal containers directory exceptions - filepath tar time utf8-string - ]; - description = "Access cabal-install's Hackage database via Data.Map"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ peti ]; - }) {}; - - "hackage-db_2_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , directory, exceptions, filepath, tar, time, utf8-string }: @@ -113566,7 +113593,6 @@ self: { ]; description = "Access cabal-install's Hackage database via Data.Map"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; maintainers = with lib.maintainers; [ peti ]; }) {}; @@ -114242,8 +114268,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "2.4.0"; - sha256 = "1b24hc695v18gpj276wmzpbns6bfn0qjhj30nq6yiqbiq04md1h5"; + version = "2.4.1"; + sha256 = "166jpi6bzq2j6ss652225byn6pdz8ya71fxdndlmqgsram2hrlyn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -118803,35 +118829,6 @@ self: { }) {}; "haskell-lsp" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hashable - , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl - , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay - , sorted-list, stm, temporary, text, time, unordered-containers - }: - mkDerivation { - pname = "haskell-lsp"; - version = "0.22.0.0"; - sha256 = "0mh2b3dza633plxp370zhvml50kfx4szk4hrzmcfm6aij2di2l0w"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson async attoparsec base bytestring containers data-default - directory filepath hashable haskell-lsp-types hslogger lens mtl - network-uri rope-utf16-splay sorted-list stm temporary text time - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hashable hspec lens network-uri QuickCheck quickcheck-instances - rope-utf16-splay sorted-list stm text unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskell library for the Microsoft Language Server Protocol"; - license = lib.licenses.mit; - }) {}; - - "haskell-lsp_0_24_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl @@ -118858,7 +118855,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "haskell-lsp-client" = callPackage @@ -118884,23 +118880,6 @@ self: { }) {}; "haskell-lsp-types" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, data-default - , deepseq, filepath, hashable, lens, network-uri, scientific, text - , unordered-containers - }: - mkDerivation { - pname = "haskell-lsp-types"; - version = "0.22.0.0"; - sha256 = "05475d5rwkmsh50q18lans7zzd34jhfdpg80m7aijg829dkphskm"; - libraryHaskellDepends = [ - aeson base binary bytestring data-default deepseq filepath hashable - lens network-uri scientific text unordered-containers - ]; - description = "Haskell library for the Microsoft Language Server Protocol, data types"; - license = lib.licenses.mit; - }) {}; - - "haskell-lsp-types_0_24_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, data-default , deepseq, filepath, hashable, lens, network-uri, scientific, text , unordered-containers @@ -118915,7 +118894,6 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "haskell-menu" = callPackage @@ -120860,8 +120838,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.20.0"; - sha256 = "10pdpg75r2gch32p3mkiz82qip9rwkc5lrq0zxy13pqrmxdy162k"; + version = "0.20.3"; + sha256 = "0g5d6w6vwkbxf4iqx998q2c5cnhq1bav0ikksdbj98w8b7ga6v0z"; libraryHaskellDepends = [ aeson array base base16 binary bytes bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec memory mtl @@ -120915,8 +120893,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.17.2"; - sha256 = "04i8016qrrwzbz8yxnppfzlrba1d86zp2j71dqd0p7lc3341caa8"; + version = "0.17.12"; + sha256 = "0jb1ypscy5hgvbw5jrd5qjl7mdi2qgc7h3amyi50zh2m3lhmgjnv"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -120998,8 +120976,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.52.9"; - sha256 = "12zpjb42j048afaz1ay8ay8j35dhpgiv58cfnm69j8lndcb71q4g"; + version = "0.52.13"; + sha256 = "1ms07ka51j20xb86b3i4gca9svh2wxa4i0wb6qxbwq7n2138ck0h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -121044,8 +121022,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.52.9"; - sha256 = "1hh3yxxnwxqvjjcl45k7cpr25imnl9sghzv85i4l1n1vgs10p0nd"; + version = "0.52.13"; + sha256 = "08c95grxg11kf96di27z7d72c2l7h2qzb8p5446fd91pidzgz3zb"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -124653,8 +124631,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.14.2"; - sha256 = "1zm8llpbbvr5f5s0i4qsn025734s1mamfvm1dgxw4p87m9zhprlm"; + version = "0.14.4"; + sha256 = "0h6s3x3pylyidjbzjqyrmc2cm5ls67m9iij35fn48rvq4l41w9h9"; libraryHaskellDepends = [ async base bytestring bytestring-lexing containers deepseq errors exceptions HTTP mtl network network-uri resource-pool scanner stm @@ -127530,8 +127508,8 @@ self: { }: mkDerivation { pname = "hierarchical-env"; - version = "0.2.0.1"; - sha256 = "162d54hxsflhns09d35nz4wyy3im45z8rsra8fjypxdr9z3j38hf"; + version = "0.2.0.2"; + sha256 = "08la6kwszxgziri6yhiy9blx1fqlbjpj2jggplrn6pjl2swa0np0"; libraryHaskellDepends = [ base method microlens microlens-mtl microlens-th rio template-haskell th-abstraction @@ -127736,8 +127714,8 @@ self: { }: mkDerivation { pname = "highjson"; - version = "0.4.0.0"; - sha256 = "0qk9l84arc1qhagjmvna7l69s196ndhbs8ndxngdb7dx3bnhbsy3"; + version = "0.5.0.0"; + sha256 = "0phf4dsfsvcgrf465xf7jqxnvjfvypsqfpg1p92dqp7m7iqa2hwd"; libraryHaskellDepends = [ aeson base hvect lens text ]; testHaskellDepends = [ aeson base hspec lens QuickCheck text ]; benchmarkHaskellDepends = [ @@ -127755,8 +127733,8 @@ self: { }: mkDerivation { pname = "highjson-swagger"; - version = "0.4.0.0"; - sha256 = "07vyp16gvzk9k1fr1hkxv0mibfhl2cc9xrad16357zb4swpjvw1d"; + version = "0.5.0.0"; + sha256 = "1nc1fknag944fzjfg0fshbqzv47awrxz5yv6gdj2nz9gmfshcjg9"; libraryHaskellDepends = [ base highjson hvect insert-ordered-containers lens swagger2 text ]; @@ -127775,8 +127753,8 @@ self: { }: mkDerivation { pname = "highjson-th"; - version = "0.4.0.0"; - sha256 = "1i826b3z730vd2c0fqisbrsb9wsshmvfzvxrm37b2vnvm4vlj37k"; + version = "0.5.0.0"; + sha256 = "0ama2kks0z7cg7kmrs6gl6mf23dg1bkzhvmp5myjgn01y4sb9w91"; libraryHaskellDepends = [ aeson base highjson highjson-swagger swagger2 template-haskell text ]; @@ -129973,6 +129951,45 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hls-floskell-plugin" = callPackage + ({ mkDerivation, base, floskell, ghcide, hls-plugin-api + , hls-test-utils, lsp-types, text, transformers + }: + mkDerivation { + pname = "hls-floskell-plugin"; + version = "1.0.0.0"; + sha256 = "0wf4483a4xhvynqqgj6gf1qg5nv9rv4gv9rm2hwsbjq123bs0wy8"; + libraryHaskellDepends = [ + base floskell ghcide hls-plugin-api lsp-types text transformers + ]; + testHaskellDepends = [ base hls-test-utils text ]; + description = "Integration with the Floskell code formatter"; + license = lib.licenses.asl20; + }) {}; + + "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 { + pname = "hls-fourmolu-plugin"; + version = "1.0.0.0"; + sha256 = "1x1v9jjy80w05cg2yl0nzk3h97q16bymrqy59g1s0lzihg3wizs7"; + 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 + ]; + description = "Integration with the Fourmolu code formatter"; + license = lib.licenses.asl20; + }) {}; + "hls-graph" = callPackage ({ mkDerivation, base, bytestring, shake, unordered-containers }: mkDerivation { @@ -130066,6 +130083,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "hls-pragmas-plugin" = callPackage + ({ mkDerivation, base, extra, filepath, fuzzy, ghcide + , hls-plugin-api, hls-test-utils, lens, lsp, lsp-test, lsp-types + , text, transformers, unordered-containers + }: + mkDerivation { + pname = "hls-pragmas-plugin"; + version = "1.0.0.0"; + sha256 = "1zkq95dklc6sdhczgr6l2hdkkrbrjy3zwp0qfz3qvf55gpxspzzs"; + libraryHaskellDepends = [ + base extra fuzzy ghcide hls-plugin-api lens lsp text transformers + unordered-containers + ]; + testHaskellDepends = [ + base filepath hls-test-utils lens lsp-test lsp-types text + ]; + description = "Pragmas 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 @@ -130094,8 +130131,8 @@ self: { }: mkDerivation { pname = "hls-splice-plugin"; - version = "1.0.0.1"; - sha256 = "0fyc2z1bh64plqf831f19nqkgkhryklgrrql2cn25jhfg55gf95q"; + version = "1.0.0.2"; + sha256 = "15vg5dmssd54dazipc82sgkbc399mnfydc8y8i2i6lhz3hsgvpg1"; libraryHaskellDepends = [ aeson base containers dlist extra foldl ghc ghc-exactprint ghcide hls-plugin-api lens lsp retrie shake syb text transformers @@ -130166,6 +130203,8 @@ self: { pname = "hls-test-utils"; version = "1.0.0.0"; sha256 = "18n7vb9fa39jkgr0gvsrjfc0nh09w2xlniifb25bn6z3qc3w0h6i"; + revision = "1"; + editedCabalFile = "048all6d50kyzln2nfp096ry5zwbair2srifhshnipg8qvs2cwpl"; libraryHaskellDepends = [ aeson async base blaze-markup bytestring containers data-default directory extra filepath ghcide hls-plugin-api hspec hspec-core @@ -130920,6 +130959,8 @@ self: { pname = "hnix"; version = "0.13.0.1"; sha256 = "1c01ns9h7va6ri568c0hzcdkmr0jdiay5z1vwwva7cv7dlvn6wl7"; + revision = "2"; + editedCabalFile = "148w8jbn4hrhp8zk90vr5grc4fsnsq4him6ii21imikril4ib7ya"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -133182,8 +133223,8 @@ self: { pname = "hpc-lcov"; version = "1.0.1"; sha256 = "01ws5y2vavgm7151dcabw3jwny1prrnzn5b04q76m5gc6a36wivl"; - revision = "1"; - editedCabalFile = "1jv81ywwzvr37zki8hjylj6gfhamq7fi7rpjyk1g0d06ac9ix0zp"; + revision = "2"; + editedCabalFile = "1sbd4wk977hh7jvy2ingmavkqx7fzicfa70figipa7lzdq3lg0ls"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers hpc ]; @@ -137040,14 +137081,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_8_1" = callPackage + "hspec_2_8_2" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.8.1"; - sha256 = "1lk7xylld960wld755j1f81zaydxgxq3840np4h6xcp729cf0cq5"; + version = "2.8.2"; + sha256 = "1s03c1928ndl8bqi3n9fb8a5adr0lycl9qs3x1i6aprzr851myh5"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -137138,7 +137179,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_8_1" = callPackage + "hspec-core_2_8_2" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -137146,8 +137187,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.8.1"; - sha256 = "1yha64zfc226pc4952zqwv229kbl8p5grhl7c6wxn2y948rb688a"; + version = "2.8.2"; + sha256 = "0id4c70hq46y2s623y4zsj9pycqp90a3ig991shrhxxd6836c4cx"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -137203,13 +137244,13 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-discover_2_8_1" = callPackage + "hspec-discover_2_8_2" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.8.1"; - sha256 = "05xzxsxpxf7hyg6zdf7mxx6xb79rxrhd3pz3pwj32a0phbjkicdn"; + version = "2.8.2"; + sha256 = "0bmdph9q4rg5rgr6s65h7si2l5rxyyqv80j5rri6zb4d1n9ih6hs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -137241,8 +137282,8 @@ self: { }: mkDerivation { pname = "hspec-expectations-json"; - version = "1.0.0.3"; - sha256 = "06k2gk289v6xxzj5mp5nsz6ixqlh2z3zx8z1jlxza35pkzkv34x7"; + version = "1.0.0.4"; + sha256 = "1m244ypfr4cg2jll3ackn9khm8zwdp1yp7hf4b24bfzws0qmb1b7"; libraryHaskellDepends = [ aeson aeson-pretty base Diff HUnit scientific text unordered-containers vector @@ -137475,8 +137516,8 @@ self: { }: mkDerivation { pname = "hspec-junit-formatter"; - version = "1.0.0.2"; - sha256 = "19mmzzjg041sqv22w66cls0mcypdamsqx43n00hnn2gqk0jkhhll"; + version = "1.0.0.4"; + sha256 = "1fyxx847d37ib0dhdn4n7y6sk7d0xw1zcind39m3hmbvxvx3j648"; libraryHaskellDepends = [ base conduit directory exceptions hashable hspec hspec-core resourcet temporary text xml-conduit xml-types @@ -137485,6 +137526,24 @@ self: { license = lib.licenses.mit; }) {}; + "hspec-junit-formatter_1_0_1_0" = callPackage + ({ mkDerivation, base, conduit, containers, directory, exceptions + , filepath, hspec, hspec-core, text, time, xml-conduit, xml-types + }: + mkDerivation { + pname = "hspec-junit-formatter"; + version = "1.0.1.0"; + sha256 = "1n0hv2xhplpg6fhy8dxzp63k4b7mfzm1g92wglrsqc2lsvnx09ky"; + libraryHaskellDepends = [ + base conduit containers directory exceptions filepath hspec-core + text time xml-conduit xml-types + ]; + testHaskellDepends = [ base hspec ]; + description = "A JUnit XML runner/formatter for hspec"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-laws" = callPackage ({ mkDerivation, base, hspec, markdown-unlit, QuickCheck }: mkDerivation { @@ -137590,8 +137649,8 @@ self: { }: mkDerivation { pname = "hspec-need-env"; - version = "0.1.0.6"; - sha256 = "0drbjdm6wld2bnfmv2jqhw4ija9v85pa4p5aq9qgh1gs6c5d50bq"; + version = "0.1.0.7"; + sha256 = "068cv4n3j5x0zdjrhrk2acc17gr2rvr9n5d4znzmmfbmcrpqhwkp"; libraryHaskellDepends = [ base hspec-core hspec-expectations ]; testHaskellDepends = [ base hspec hspec-core setenv transformers ]; testToolDepends = [ hspec-discover ]; @@ -138005,6 +138064,27 @@ self: { broken = true; }) {}; + "hspretty" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, directory + , doctest, optparse-applicative, ormolu, path, path-io, process + , streamly, text, text-short, unliftio, void + }: + mkDerivation { + pname = "hspretty"; + version = "0.1.0.0"; + sha256 = "11mbrr785j6pa02zil705sy67cdvjhwq9l927mm74barf9ph776r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring directory optparse-applicative ormolu + path path-io process streamly text text-short unliftio void + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest ]; + description = "My opinionated Haskell project formatter"; + license = lib.licenses.bsd3; + }) {}; + "hsprocess" = callPackage ({ mkDerivation, base, bytestring, containers, directory, easy-file , filepath, hint, hspec, HUnit, MonadCatchIO-mtl, process @@ -147256,18 +147336,18 @@ self: { }) {}; "instana-haskell-trace-sdk" = callPackage - ({ mkDerivation, aeson, aeson-extra, base, binary, bytestring - , case-insensitive, containers, directory, ekg-core, exceptions - , hslogger, http-client, http-client-tls, http-types, HUnit - , network, process, random, regex-base, regex-compat, regex-pcre - , regex-tdfa, retry, scientific, servant, servant-server, stm - , sysinfo, text, time, transformers, unix, unordered-containers - , wai, warp + ({ mkDerivation, aeson, aeson-extra, array, base, binary + , bytestring, case-insensitive, containers, directory, ekg-core + , exceptions, hslogger, http-client, http-client-tls, http-types + , HUnit, network, process, random, regex-base, regex-compat + , regex-pcre, regex-tdfa, retry, scientific, servant + , servant-server, stm, sysinfo, text, time, transformers, unix + , unordered-containers, vector, wai, warp }: mkDerivation { pname = "instana-haskell-trace-sdk"; - version = "0.6.2.0"; - sha256 = "1yvxsz1b9qrhyw6zamqs5254mpba3vijhach1n424mqa6aq1935s"; + version = "0.7.0.0"; + sha256 = "0y76rmz8m2fqw00hzyzalqrhv2rzkg2vvx7qaph3mfrq23ynrgaf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147282,10 +147362,10 @@ self: { transformers unix unordered-containers wai warp ]; testHaskellDepends = [ - aeson aeson-extra base bytestring directory ekg-core exceptions - hslogger http-client http-types HUnit process random regex-base - regex-compat regex-pcre regex-tdfa retry scientific text unix - unordered-containers + aeson aeson-extra array base bytestring case-insensitive directory + ekg-core exceptions hslogger http-client http-types HUnit process + random regex-base regex-compat regex-pcre regex-tdfa retry + scientific text unix unordered-containers vector wai ]; description = "SDK for adding custom Instana tracing support to Haskell applications"; license = lib.licenses.mit; @@ -148115,8 +148195,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "0.6.3"; - sha256 = "10nrba4q2pyfa028ih079fzyc4l2gp5kfvbmh43lw739mh8kp5aa"; + version = "0.8.0"; + sha256 = "1mayv7rqpbx09y82vyzdvbdjrqgk4vpsbz7qx9cy2h09q355zs7d"; libraryHaskellDepends = [ base containers QuickCheck safe time witherable ]; @@ -148590,34 +148670,6 @@ self: { }) {}; "io-streams" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder - , deepseq, directory, filepath, HUnit, mtl, network, primitive - , process, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers, vector - , zlib, zlib-bindings - }: - mkDerivation { - pname = "io-streams"; - version = "1.5.2.0"; - sha256 = "1hbabrk5145d77qi23688piaf1wc93n8vaj846n0s3zk953z1lk3"; - revision = "2"; - editedCabalFile = "1mr0y8m6xdkgvvk76n7pn1airqzgdp8kd8x6jd9w97iy5wjp14q7"; - configureFlags = [ "-fnointeractivetests" ]; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-builder network primitive - process text time transformers vector zlib-bindings - ]; - testHaskellDepends = [ - attoparsec base bytestring bytestring-builder deepseq directory - filepath HUnit mtl network primitive process QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - time transformers vector zlib zlib-bindings - ]; - description = "Simple, composable, and easy-to-use stream I/O"; - license = lib.licenses.bsd3; - }) {}; - - "io-streams_1_5_2_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, deepseq, directory , filepath, HUnit, mtl, network, primitive, process, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -148640,7 +148692,6 @@ self: { ]; description = "Simple, composable, and easy-to-use stream I/O"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "io-streams-haproxy" = callPackage @@ -152194,8 +152245,8 @@ self: { }: mkDerivation { pname = "json-feed"; - version = "1.0.12"; - sha256 = "0baav0mvprja5jdmndan6psxqm37173yvrjrr04kfxs9568dvzyf"; + version = "1.0.13"; + sha256 = "14wqv8qk7xax6kvj96wsx2sarxardbkddm8hkllkkf8b9jz04si5"; libraryHaskellDepends = [ aeson base bytestring mime-types network-uri tagsoup text time ]; @@ -152937,8 +152988,8 @@ self: { }: mkDerivation { pname = "jsonrpc-conduit"; - version = "0.3.3"; - sha256 = "16dcj85ycjsm82pb32abc3wb05gh87mrkyaij89imvbqsv5k0sy1"; + version = "0.3.4"; + sha256 = "18lqkcq69k3hjbqzxycdgrfrd2a5m3ahxwja0yw8xi9x6mw33cxi"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit conduit-extra mtl text transformers unordered-containers @@ -156296,8 +156347,8 @@ self: { ({ mkDerivation, base, hspec, servant, servant-foreign, text }: mkDerivation { pname = "lackey"; - version = "1.0.14"; - sha256 = "01yi2si0gakmjk66jmm93hz50nl7xa1zhmhcrhqn8ip0mkpncnqk"; + version = "1.0.15"; + sha256 = "144wlp75gaz7yjb3rb1f1l79qmh2mms3vrrn5v4a13wjmqsd7brw"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base hspec servant servant-foreign text ]; description = "Generate Ruby clients from Servant APIs"; @@ -157599,8 +157650,8 @@ self: { }: mkDerivation { pname = "language-docker"; - version = "10.0.0"; - sha256 = "0h2jq15niz77h2vpqyq7gblgbsrrvsr3qjw1cmjvr474zgzxmrv7"; + version = "10.0.1"; + sha256 = "19pyms0ik37wpzjnlplj2vwikbjdjaw78llpfjp0a0467wlk7na6"; libraryHaskellDepends = [ base bytestring containers data-default-class megaparsec prettyprinter split text time @@ -159767,6 +159818,8 @@ self: { pname = "leb128"; version = "0.1.0.0"; sha256 = "097xzdj1q17whnzwlpwnfapppgc4lqwmmfcv2694gzlil84rqwk7"; + revision = "1"; + editedCabalFile = "02vn6ffdfvrvcnil22hx4v85ykdxj1j0bsnv111rkxi17j2s76sp"; libraryHaskellDepends = [ base bytestring ghc-prim transformers ]; testHaskellDepends = [ base bytestring QuickCheck test-framework @@ -160023,8 +160076,8 @@ self: { pname = "lens"; version = "4.19.2"; sha256 = "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j"; - revision = "5"; - editedCabalFile = "1r9rhblsw1g2y2lyf8vhps05hvx6jxs5r6y1rf868hxz0z242i7q"; + revision = "6"; + editedCabalFile = "1k08my9rh1il3ibiyhljxkgndfgk143pn5a6nyzjnckw3la09myl"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -160065,6 +160118,8 @@ self: { pname = "lens"; version = "5.0.1"; sha256 = "0gzwx4b758phm51hz5i4bbkbvjw1ka7qj04zd9l9sh9n6s9ksm7c"; + revision = "1"; + editedCabalFile = "0lk83zwnl91yyhzkq6zx18plkk85pdvdf8x0y5rivqkgmr1vwzy9"; libraryHaskellDepends = [ array assoc base base-orphans bifunctors bytestring call-stack comonad containers contravariant distributive exceptions filepath @@ -161762,8 +161817,8 @@ self: { }: mkDerivation { pname = "libssh2"; - version = "0.2.0.7"; - sha256 = "05h0awwhqlswjjybw6y1p8byyvfggnx63n0cbqvknrkq338qfnyw"; + version = "0.2.0.8"; + sha256 = "01dc3przjwhh2aws74ypm19wqrp98mjjpsarhp69r1asq9dv0h0k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring network syb time unix ]; @@ -166770,33 +166825,6 @@ self: { }) {}; "lsp-test" = callPackage - ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base - , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl - , parser-combinators, process, text, transformers, unix - , unordered-containers - }: - mkDerivation { - pname = "lsp-test"; - version = "0.11.0.5"; - sha256 = "0r038x65lc0ij6hs8klgj8v8f0fqqrn12dyxc0k8zf9pan9bwnph"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty ansi-terminal async base bytestring conduit - conduit-parse containers data-default Diff directory filepath Glob - haskell-lsp lens mtl parser-combinators process text transformers - unix unordered-containers - ]; - testHaskellDepends = [ - aeson base data-default directory filepath haskell-lsp hspec lens - text unordered-containers - ]; - description = "Functional test framework for LSP servers"; - license = lib.licenses.bsd3; - }) {}; - - "lsp-test_0_14_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, extra, filepath, Glob, hspec, lens, lsp @@ -166821,7 +166849,6 @@ self: { benchmarkHaskellDepends = [ base extra lsp process ]; description = "Functional test framework for LSP servers"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "lsp-types" = callPackage @@ -171373,8 +171400,8 @@ self: { pname = "medea"; version = "1.2.0"; sha256 = "019jfz29gz3d06b5yi7fygqa79lp6c6vbzxcb5ka7d8w0zv7w60v"; - revision = "1"; - editedCabalFile = "1zkwy3p9q3rd4qcnmgr67xi3fv9frw35rsqpwh5l1mfvv772qap9"; + revision = "2"; + editedCabalFile = "18yzwhmvxafxn0zq7pv8dna28qkpr87q35q0sw9907y1iqcixxfh"; libraryHaskellDepends = [ aeson algebraic-graphs base bytestring containers deepseq free hashable megaparsec microlens-ghc mtl nonempty-containers @@ -173175,23 +173202,6 @@ self: { }) {}; "microlens-th" = callPackage - ({ mkDerivation, base, containers, microlens, tagged - , template-haskell, th-abstraction, transformers - }: - mkDerivation { - pname = "microlens-th"; - version = "0.4.3.9"; - sha256 = "08gfqf24r95dcnw4jlnhh8ijmfwiyr9zaiiz4lbzp72hrkarlbiw"; - libraryHaskellDepends = [ - base containers microlens template-haskell th-abstraction - transformers - ]; - testHaskellDepends = [ base microlens tagged ]; - description = "Automatic generation of record lenses for microlens"; - license = lib.licenses.bsd3; - }) {}; - - "microlens-th_0_4_3_10" = callPackage ({ mkDerivation, base, containers, microlens, tagged , template-haskell, th-abstraction, transformers }: @@ -173206,7 +173216,6 @@ self: { testHaskellDepends = [ base microlens tagged ]; description = "Automatic generation of record lenses for microlens"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "micrologger" = callPackage @@ -174720,8 +174729,8 @@ self: { }: mkDerivation { pname = "mixed-types-num"; - version = "0.5.0.3"; - sha256 = "0pi91nwnqm2mb2dhyl1l0nq81dlaw9ar538d4n948k2r9lwf56cd"; + version = "0.5.3.1"; + sha256 = "1g19y0kkksx87i8azqndikpwans7061fj7z255vssl1x46vh843h"; libraryHaskellDepends = [ base collect-errors hspec hspec-smallcheck mtl QuickCheck smallcheck template-haskell @@ -174733,26 +174742,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "mixed-types-num_0_5_1_0" = callPackage - ({ mkDerivation, base, collect-errors, hspec, hspec-smallcheck, mtl - , QuickCheck, smallcheck, template-haskell - }: - mkDerivation { - pname = "mixed-types-num"; - version = "0.5.1.0"; - sha256 = "09dkrx05mlbdvy1334q6zg3ay6k0ydl87naxhg4zr5p51i9p8lsg"; - libraryHaskellDepends = [ - base collect-errors hspec hspec-smallcheck mtl QuickCheck - smallcheck template-haskell - ]; - testHaskellDepends = [ - base collect-errors hspec hspec-smallcheck QuickCheck smallcheck - ]; - description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "mixpanel-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec , hspec-discover, http-client, http-client-tls, markdown-unlit @@ -175287,8 +175276,8 @@ self: { }: mkDerivation { pname = "mnist-idx-conduit"; - version = "0.3.0.0"; - sha256 = "0vqb4yhb51lykcd66kgh9dn14nf4xfr74hamg72s35aa22lhw932"; + version = "0.4.0.0"; + sha256 = "0319icnnw38fivjwz9m142wyp059hn5rydr6cdjq73d5d9c77xhx"; libraryHaskellDepends = [ base binary bytestring conduit containers exceptions hspec resourcet vector @@ -178935,25 +178924,30 @@ self: { "mptcp-pm" = callPackage ({ mkDerivation, aeson, aeson-extra, aeson-pretty, base, bytestring - , bytestring-conversion, c2hs, c2hsc, cereal, containers - , fast-logger, filepath, hslogger, ip, netlink - , optparse-applicative, process, temporary, text + , bytestring-conversion, c2hs, cereal, containers, enumset + , filepath, hslogger, HUnit, ip, katip, mtl, netlink + , optparse-applicative, process, temporary, text, transformers , unordered-containers }: mkDerivation { pname = "mptcp-pm"; - version = "0.0.2"; - sha256 = "0l55734pa31znn9k0pxvixhh6abcmfkhgx162krn622l4lij3h8m"; - isLibrary = false; + version = "0.0.3"; + sha256 = "0h7r9i9izflsbgb8kimsz0hmglbd4s9pjycjsm0h64lg8b1sy4gs"; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ aeson aeson-extra aeson-pretty base bytestring - bytestring-conversion c2hsc cereal containers fast-logger filepath - hslogger ip netlink optparse-applicative process temporary text - unordered-containers + bytestring-conversion cereal containers enumset ip katip mtl + netlink process text transformers unordered-containers ]; - executableToolDepends = [ c2hs ]; - description = "A work in progress Multipath TCP path manager"; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + aeson aeson-extra aeson-pretty base bytestring cereal containers + filepath hslogger ip mtl netlink optparse-applicative process + temporary text transformers + ]; + testHaskellDepends = [ base HUnit ip text ]; + description = "A Multipath TCP path manager"; license = lib.licenses.gpl3Only; hydraPlatforms = lib.platforms.none; }) {}; @@ -180037,14 +180031,12 @@ self: { }) {}; "multi-except" = callPackage - ({ mkDerivation, base, dlist }: + ({ mkDerivation, base, dlist, semigroupoids }: mkDerivation { pname = "multi-except"; - version = "0.1.0.0"; - sha256 = "0gqmj28anzl596akgkqpgk5cd4b1ic2m6dxzv3hhnvifyxxflli8"; - revision = "1"; - editedCabalFile = "1w1zzsd87qzzad8yqq28hf5amg17i94x9snxvya4pn5raibn24sm"; - libraryHaskellDepends = [ base dlist ]; + version = "0.1.1.0"; + sha256 = "18zs66sn31wjngi7iibf1wc3jz15c6rz6sx424n6j88nzwd3wzq7"; + libraryHaskellDepends = [ base dlist semigroupoids ]; description = "Multiple Exceptions"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; @@ -188037,21 +188029,6 @@ self: { }) {}; "numhask" = callPackage - ({ mkDerivation, base, bifunctors, mmorph, protolude, text - , transformers - }: - mkDerivation { - pname = "numhask"; - version = "0.6.0.2"; - sha256 = "1x8p92plblqz5kykqci86wjfvb79gsi00l0a5i2r1frs6imjvkjf"; - libraryHaskellDepends = [ - base bifunctors mmorph protolude text transformers - ]; - description = "numeric classes"; - license = lib.licenses.bsd3; - }) {}; - - "numhask_0_7_1_0" = callPackage ({ mkDerivation, base, bifunctors, doctest, mmorph, protolude , QuickCheck, random, text, transformers }: @@ -188065,7 +188042,6 @@ self: { testHaskellDepends = [ base doctest QuickCheck ]; description = "A numeric class hierarchy"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "numhask-array" = callPackage @@ -190172,6 +190148,8 @@ self: { pname = "openapi3"; version = "3.1.0"; sha256 = "011754qyxxw5mn06hdmxalvsiff7a4x4k2yb2r6ylzr6zhyz818z"; + revision = "1"; + editedCabalFile = "1rbsfjwraizp0b6j2zaimz63b46k7d8abfxw7jyb7j1cv6jkcll1"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -190232,6 +190210,18 @@ self: { broken = true; }) {}; + "opencc" = callPackage + ({ mkDerivation, base, bytestring, mtl, text, transformers }: + mkDerivation { + pname = "opencc"; + version = "0.1.0.0"; + sha256 = "09gsd816xh0237m94bnysdpjzqngsva3rl29f171rvhdpashcjx2"; + libraryHaskellDepends = [ base bytestring mtl text transformers ]; + testHaskellDepends = [ base bytestring mtl text transformers ]; + description = "OpenCC bindings"; + license = lib.licenses.mit; + }) {}; + "opench-meteo" = callPackage ({ mkDerivation, aeson, base, data-default, text, time }: mkDerivation { @@ -193811,8 +193801,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "1.2.0"; - sha256 = "091283hcp3rin1rpg6b4lkh32svqr1gjxsa15id3qic7a7knx2r0"; + version = "1.2.1"; + sha256 = "1jz8q3qv9m837zwl2lhrcqfjmfs08gcv7qfxiw3w21nfl8gxbgqx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193988,8 +193978,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.4.0"; - sha256 = "0jy41qiqn6xj6ib20klv85jyr8vn633xqhxbx38zxs5dsq885laq"; + version = "0.4.1"; + sha256 = "0gn47zw0rzvdj1d1gwqy49di6f8lpvy53wfcs2g163nz9vil8xka"; description = "A box of patterns and paradigms"; license = lib.licenses.mit; }) {}; @@ -194154,8 +194144,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.1.5"; - sha256 = "18pnihbybgnaa1hs9pcz8vvvzlfn3wv8p2rnnf1p2w6m63n8vf9a"; + version = "0.5.2.1"; + sha256 = "0g1v78mgxa6mn0vm6yii3nzfdwpn4hgrlcld1h3mbwaxn6c8116k"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -194181,48 +194171,6 @@ self: { license = lib.licenses.bsd3; }) {}; - "pantry_0_5_2" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal - , casa-client, casa-types, conduit, conduit-extra, containers - , cryptonite, cryptonite-conduit, digest, exceptions, filelock - , generic-deriving, hackage-security, hedgehog, hpack, hspec - , http-client, http-client-tls, http-conduit, http-download - , http-types, memory, mtl, network-uri, path, path-io, persistent - , persistent-sqlite, persistent-template, primitive, QuickCheck - , raw-strings-qq, resourcet, rio, rio-orphans, rio-prettyprint - , tar-conduit, text, text-metrics, time, transformers, unix-compat - , unliftio, unordered-containers, vector, yaml, zip-archive - }: - mkDerivation { - pname = "pantry"; - version = "0.5.2"; - sha256 = "0gg4fzqsh4c41vydrwr12kb8ahj0xy0vy7axwpd9j39dzxwcksnv"; - libraryHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal casa-client casa-types - conduit conduit-extra containers cryptonite cryptonite-conduit - digest filelock generic-deriving hackage-security hpack http-client - http-client-tls http-conduit http-download http-types memory mtl - network-uri path path-io persistent persistent-sqlite - persistent-template primitive resourcet rio rio-orphans - rio-prettyprint tar-conduit text text-metrics time transformers - unix-compat unliftio unordered-containers vector yaml zip-archive - ]; - testHaskellDepends = [ - aeson ansi-terminal base bytestring Cabal casa-client casa-types - conduit conduit-extra containers cryptonite cryptonite-conduit - digest exceptions filelock generic-deriving hackage-security - hedgehog hpack hspec http-client http-client-tls http-conduit - http-download http-types memory mtl network-uri path path-io - persistent persistent-sqlite persistent-template primitive - QuickCheck raw-strings-qq resourcet rio rio-orphans rio-prettyprint - tar-conduit text text-metrics time transformers unix-compat - unliftio unordered-containers vector yaml zip-archive - ]; - description = "Content addressable Haskell package management"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "pantry-tmp" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base, base-orphans , base64-bytestring, bytestring, Cabal, conduit, conduit-extra @@ -195878,8 +195826,8 @@ self: { }: mkDerivation { pname = "passman"; - version = "0.3.0.2"; - sha256 = "0iy5x8v3liclzh3qczkzmql9l6sq5mvplk4xhpnqqhwx3bkik47w"; + version = "0.3.1"; + sha256 = "1k5d06blwq5aiidmbpm2iya24yvxdhl2aq0v7z04ppshjv9gi5qf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -196198,17 +196146,15 @@ self: { }: mkDerivation { pname = "path"; - version = "0.7.0"; - sha256 = "1dl7yjmkcdm3wlbj1s5qvkl31apl3dnwz5jc8h3hdq0w722x4a5k"; - revision = "1"; - editedCabalFile = "0ph5qs50lm8ac58v8df0mmivqfilb1wz14568q06aws6gwj9qqpi"; + version = "0.7.1"; + sha256 = "1z2gj4108827lb03f7cdqhijjgqjvv9glzrzfv96cxkwgi6y38jx"; libraryHaskellDepends = [ aeson base deepseq exceptions filepath hashable template-haskell text ]; testHaskellDepends = [ aeson base bytestring filepath genvalidity genvalidity-hspec - genvalidity-property hspec mtl QuickCheck validity + genvalidity-property hspec mtl QuickCheck template-haskell validity ]; description = "Support for well-typed paths"; license = lib.licenses.bsd3; @@ -198331,8 +198277,8 @@ self: { }: mkDerivation { pname = "persistent-discover"; - version = "0.1.0.0"; - sha256 = "1cpjbks5cmh2w3370xnmm29rk8j3xdxmry04fyi0aqyg5f91hrdi"; + version = "0.1.0.1"; + sha256 = "1vncymwn132x3mf468r94r6wa6890zgmvjhq64gr5bhzh3mnah6c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200885,16 +200831,17 @@ self: { }) {}; "pinned-warnings" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, ghc, time - , transformers + ({ mkDerivation, base, bytestring, containers, directory, ghc + , tasty, tasty-hunit, time, transformers }: mkDerivation { pname = "pinned-warnings"; - version = "0.1.0.2"; - sha256 = "0mm7d185syrbksl751hx0541qdin064ixm7bbqq3ji8jcgbg42x5"; + version = "0.1.0.6"; + sha256 = "1n0h2v71x3j0wn0g2f3zq3xw681s16hl7ffywi83z50hacd8x6kx"; libraryHaskellDepends = [ base bytestring containers directory ghc time transformers ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; description = "Preserve warnings in a GHCi session"; license = lib.licenses.bsd3; }) {}; @@ -202966,18 +202913,18 @@ self: { }) {}; "ploterific" = callPackage - ({ mkDerivation, base, bytestring, cassava, containers, hvega - , hvega-theme, lens, mtl, optparse-generic, text + ({ mkDerivation, base, bytestring, cassava, colour, containers + , hvega, hvega-theme, lens, mtl, optparse-generic, palette, text }: mkDerivation { pname = "ploterific"; - version = "0.1.0.1"; - sha256 = "03m0zi7izlv8n5jsisym595sn7cfl2p1mhch086ajyd2g6zlxya7"; + version = "0.2.0.0"; + sha256 = "1x49b7js161bhdr8v631qr1r4cjnxg9kdvnlc55b5g5kajwf714w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring cassava containers hvega hvega-theme lens mtl - optparse-generic text + base bytestring cassava colour containers hvega hvega-theme lens + mtl optparse-generic palette text ]; executableHaskellDepends = [ base mtl optparse-generic text ]; description = "Basic plotting of tabular data for the command line"; @@ -205210,13 +205157,13 @@ self: { "posix-paths" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, doctest - , filepath, HUnit, process, QuickCheck, unix + , filepath, HUnit, process, QuickCheck, unix, unliftio }: mkDerivation { pname = "posix-paths"; - version = "0.2.1.6"; - sha256 = "0ibycc7z3gm6jr83cgsqwa7hkky2ldfqqd30ickgq6vn2rkp8fbj"; - libraryHaskellDepends = [ base bytestring unix ]; + version = "0.3.0.0"; + sha256 = "1ljphynpaaibs9zjxwk1b774q66s3biinfx2sgdzxyzssbl9va42"; + libraryHaskellDepends = [ base bytestring unix unliftio ]; testHaskellDepends = [ base bytestring doctest HUnit QuickCheck unix ]; @@ -207993,8 +207940,8 @@ self: { pname = "primitive"; version = "0.7.1.0"; sha256 = "1w53i4mk248g58xrffmksznr4nmn2bbbycajzpcqfxx5ybyyrsvb"; - revision = "2"; - editedCabalFile = "1m08slj8m596z4pqsw3ag25ijhzlv9ki809ydh4nbin141bpsdgn"; + revision = "3"; + editedCabalFile = "03vgkhib8w3g0m0zwpz74hsixrf0pvgh6ql0xcy05fpq1kynppi9"; libraryHaskellDepends = [ base deepseq transformers ]; testHaskellDepends = [ base base-orphans ghc-prim QuickCheck quickcheck-classes-base @@ -210157,12 +210104,13 @@ self: { , optparse-applicative, optparse-generic, parsec, parsers, pretty , pretty-show, proto3-wire, QuickCheck, quickcheck-instances , range-set-list, safe, swagger2, system-filepath, tasty - , tasty-hunit, tasty-quickcheck, text, transformers, turtle, vector + , tasty-hunit, tasty-quickcheck, text, time, transformers, turtle + , vector }: mkDerivation { pname = "proto3-suite"; - version = "0.4.1"; - sha256 = "1zzw3kgxa875g0bpqi1zblw3q8h7lw53gcz4c8qjgkr2v1cr5nf3"; + version = "0.4.2"; + sha256 = "015cg6brf6v0h2h2d36hqqr9i69vr30bhc35av55v0d65ya0sczz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -210172,7 +210120,7 @@ self: { hashable haskell-src insert-ordered-containers lens mtl neat-interpolation parsec parsers pretty pretty-show proto3-wire QuickCheck quickcheck-instances safe swagger2 system-filepath text - transformers turtle vector + time transformers turtle vector ]; executableHaskellDepends = [ base containers mtl optparse-applicative optparse-generic @@ -210190,29 +210138,6 @@ self: { }) {}; "proto3-wire" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, deepseq - , doctest, ghc-prim, hashable, parameterized, primitive, QuickCheck - , safe, tasty, tasty-hunit, tasty-quickcheck, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "proto3-wire"; - version = "1.2.1"; - sha256 = "0i706y9j5iq5zyi86vkiybznp3b4h2x0flvq3jmr8mgpgahvh94r"; - libraryHaskellDepends = [ - base bytestring cereal containers deepseq ghc-prim hashable - parameterized primitive QuickCheck safe text transformers - unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring cereal doctest QuickCheck tasty tasty-hunit - tasty-quickcheck text transformers vector - ]; - description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; - license = lib.licenses.asl20; - }) {}; - - "proto3-wire_1_2_2" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, deepseq , doctest, ghc-prim, hashable, parameterized, primitive, QuickCheck , safe, tasty, tasty-hunit, tasty-quickcheck, text, transformers @@ -210233,7 +210158,6 @@ self: { ]; description = "A low-level implementation of the Protocol Buffers (version 3) wire format"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "protobuf" = callPackage @@ -214658,8 +214582,8 @@ self: { ({ mkDerivation, base, criterion, hspec }: mkDerivation { pname = "rampart"; - version = "1.1.0.2"; - sha256 = "1lvzgdagjzvkxcdbc43n144vbva5vlvsjziz80rjzm7kg3mslg1r"; + version = "1.1.0.3"; + sha256 = "090n80qkfcp219lq3dqjpvvvr8dpnc8srzldch4f4vfazw289b0y"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; @@ -214731,20 +214655,6 @@ self: { }) {}; "random" = callPackage - ({ mkDerivation, base, time }: - mkDerivation { - pname = "random"; - version = "1.1"; - sha256 = "0nis3lbkp8vfx8pkr6v7b7kr5m334bzb0fk9vxqklnp2aw8a865p"; - revision = "1"; - editedCabalFile = "1pv5d7bm2rgap7llp5vjsplrg048gvf0226y0v19gpvdsx7n4rvv"; - libraryHaskellDepends = [ base time ]; - testHaskellDepends = [ base ]; - description = "random number library"; - license = lib.licenses.bsd3; - }) {}; - - "random_1_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, mtl, mwc-random, primitive, rdtsc, smallcheck, split , splitmix, tasty, tasty-expected-failure, tasty-hunit @@ -214767,7 +214677,6 @@ self: { ]; description = "Pseudo-random number generation"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "random-access-file" = callPackage @@ -214888,23 +214797,6 @@ self: { }) {}; "random-fu" = callPackage - ({ mkDerivation, base, erf, math-functions, monad-loops, mtl - , random-shuffle, random-source, rvar, syb, template-haskell - , transformers, vector - }: - mkDerivation { - pname = "random-fu"; - version = "0.2.7.4"; - sha256 = "13dgx069lvdfxm7l2q2l6d7q0gd3wp41b8l4l6wmhlfbl5xici3m"; - libraryHaskellDepends = [ - base erf math-functions monad-loops mtl random-shuffle - random-source rvar syb template-haskell transformers vector - ]; - description = "Random number generation"; - license = lib.licenses.publicDomain; - }) {}; - - "random-fu_0_2_7_7" = callPackage ({ mkDerivation, base, erf, math-functions, monad-loops, mtl , random, random-shuffle, random-source, rvar, syb , template-haskell, transformers, vector @@ -214919,7 +214811,6 @@ self: { ]; description = "Random number generation"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "random-fu-multivariate" = callPackage @@ -214975,23 +214866,6 @@ self: { }) {}; "random-source" = callPackage - ({ mkDerivation, base, flexible-defaults, mersenne-random-pure64 - , mtl, mwc-random, primitive, random, stateref, syb - , template-haskell, th-extras - }: - mkDerivation { - pname = "random-source"; - version = "0.3.0.8"; - sha256 = "0kjvpmxhff6id99hhgjp3vvb4vlhs3shkrh1n5cbfm7450lpmmn2"; - libraryHaskellDepends = [ - base flexible-defaults mersenne-random-pure64 mtl mwc-random - primitive random stateref syb template-haskell th-extras - ]; - description = "Generic basis for random number generators"; - license = lib.licenses.publicDomain; - }) {}; - - "random-source_0_3_0_11" = callPackage ({ mkDerivation, base, flexible-defaults, mersenne-random-pure64 , mtl, mwc-random, primitive, random, stateref, syb , template-haskell, th-extras @@ -215006,7 +214880,6 @@ self: { ]; description = "Generic basis for random number generators"; license = lib.licenses.publicDomain; - hydraPlatforms = lib.platforms.none; }) {}; "random-stream" = callPackage @@ -215587,8 +215460,8 @@ self: { }: mkDerivation { pname = "ratel"; - version = "1.0.14"; - sha256 = "0yjr8hj5c5i2l4p9zinwvzf33vhn6s9lipndqwx0km4ry0rylwwx"; + version = "1.0.15"; + sha256 = "14g39xsfm60iywcddi7glxvk4b92vd7nk7yd5zhvjhxi3zqz50i2"; libraryHaskellDepends = [ aeson base bytestring case-insensitive containers http-client http-client-tls http-types text uuid @@ -218355,6 +218228,8 @@ self: { pname = "reflex-gi-gtk"; version = "0.2.0.0"; sha256 = "0dx9g5v5i0fhxn1kn6fsj8hpwnax8wq89drsv8q2fwk9pxd8i384"; + revision = "2"; + editedCabalFile = "0k0bnmwpss3j6zgrh4l576qx81khzv18g0n9hmzajfwjwp9ifwmz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224583,28 +224458,30 @@ self: { }) {}; "rp-tree" = callPackage - ({ mkDerivation, base, boxes, bytestring, conduit, containers - , deepseq, exceptions, hspec, microlens, microlens-th, mtl - , QuickCheck, serialise, splitmix-distributions, transformers - , vector, vector-algorithms + ({ mkDerivation, base, benchpress, boxes, bytestring, conduit + , containers, deepseq, hspec, QuickCheck, serialise, splitmix + , splitmix-distributions, transformers, vector, vector-algorithms }: mkDerivation { pname = "rp-tree"; - version = "0.1.0.0"; - sha256 = "02ws7i6qgixpfr0pw623sz99wr7q605n1hacpdw1il8h8fdzy0r5"; + version = "0.3.5"; + sha256 = "06av43wbyy68flcfdbz20dd3vmh4na44mh041z7h7rh6hzilzr1j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base boxes bytestring conduit containers deepseq exceptions hspec - microlens microlens-th mtl serialise splitmix-distributions - transformers vector vector-algorithms + base boxes bytestring conduit containers deepseq serialise splitmix + splitmix-distributions transformers vector vector-algorithms ]; executableHaskellDepends = [ - base conduit containers exceptions splitmix-distributions + base conduit containers splitmix splitmix-distributions transformers vector ]; testHaskellDepends = [ - base hspec QuickCheck splitmix-distributions + base conduit hspec QuickCheck splitmix-distributions + ]; + benchmarkHaskellDepends = [ + base benchpress conduit deepseq splitmix splitmix-distributions + transformers vector ]; description = "Random projection trees"; license = lib.licenses.bsd3; @@ -224684,18 +224561,18 @@ self: { "rpmbuild-order" = callPackage ({ mkDerivation, base, case-insensitive, containers, directory - , extra, fgl, filepath, hspec, optparse-applicative, process - , simple-cmd, simple-cmd-args, unix + , extra, fgl, filepath, graphviz, hspec, optparse-applicative + , process, simple-cmd, simple-cmd-args, unix }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.3.2"; - sha256 = "1510v4gbylzpdh7l23r4z6xhqmjalay3crxg2216lz8j0mb4sbq9"; + version = "0.4.4"; + sha256 = "17zqnjn6zib0rvzj8gzpaj87b79v8fx5qlc6ifidi6rmykjqnx42"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base case-insensitive containers directory extra fgl filepath - process + graphviz process ]; executableHaskellDepends = [ base directory extra fgl optparse-applicative simple-cmd-args @@ -226510,8 +226387,8 @@ self: { }: mkDerivation { pname = "sandwich"; - version = "0.1.0.5"; - sha256 = "1np5c81jbv2k6sszrg7wwf2ymbnpn2pak8fji1phk79sdr04qmfh"; + version = "0.1.0.6"; + sha256 = "18fl6zdz7q5cm9ypnlgxyk5gh9r0yq481k04q0z740j2h1m5vgj8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228005,8 +227882,8 @@ self: { pname = "scotty"; version = "0.12"; sha256 = "1lpggpdzgjk23mq7aa64yylds5dbm4ynhcvbarqihjxabvh7xmz1"; - revision = "2"; - editedCabalFile = "1a5xv44fkjxw6ggp415543zbb1mrkdi05kprf5y8rv3wc8avnssd"; + revision = "3"; + editedCabalFile = "0lvvfbjf4w73y43ax80h9yb2nvf3n2kc859j9advcmfnmdn33x5v"; libraryHaskellDepends = [ aeson base base-compat-batteries blaze-builder bytestring case-insensitive data-default-class exceptions fail http-types @@ -230766,6 +230643,8 @@ self: { pname = "servant"; version = "0.18.2"; sha256 = "18mfjj9za8g9rgj7a6j0ly6lf1ykfwrlpy3cf53lv1gxvb19gmk5"; + revision = "1"; + editedCabalFile = "0f783bj89vb7j5cj5hk6hdmplhk3ay1z6swsinlr7a7f9h59x6vh"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive deepseq http-api-data http-media http-types mmorph @@ -231312,6 +231191,8 @@ self: { pname = "servant-client"; version = "0.18.2"; sha256 = "0acwpjmi5r62jgmpw508jq942kq5dhdy5602w9v7g318inxzwwi1"; + revision = "1"; + editedCabalFile = "1phjfsqzmwc5m45f9zbpp76f7f9z96v0in7ngxz6pj8r90bcv8ga"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -231339,8 +231220,8 @@ self: { pname = "servant-client-core"; version = "0.18.2"; sha256 = "0b449c28z20sx98pc2d4p65jr3m9glsa47jjc2w4gf90jisl173r"; - revision = "1"; - editedCabalFile = "0vwj97h6x7zwvyx3ra09yhpi37mnn2kw5m27wnkzwwvk487swqxd"; + revision = "2"; + editedCabalFile = "0clbchlla9r0scz0giqmy3pwsnlfcf19hwkqj3yl1y77qx7kv4lr"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring containers deepseq exceptions free http-media http-types network-uri safe @@ -231756,6 +231637,8 @@ self: { pname = "servant-foreign"; version = "0.15.3"; sha256 = "1bz2ry5pd8cx5pmsvg7q29r9gd5kqjjv9nd97f7abwjqi8as2413"; + revision = "1"; + editedCabalFile = "0d9h941g7ja73g10az13pad9rjlp126b662f71q7c8yd6kh4jl9r"; libraryHaskellDepends = [ base base-compat http-types lens servant text ]; @@ -231916,6 +231799,8 @@ self: { pname = "servant-http-streams"; version = "0.18.2"; sha256 = "1kyiv8qamw9dxv2ax7hx9n7w9507vjvwn89x4nvlsc87nq91hvg0"; + revision = "1"; + editedCabalFile = "0hkcyz93px5x6l5nyh9ymswhwpfidbji2kmlhrw7ksg4zsxkl2p9"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -232201,8 +232086,8 @@ self: { pname = "servant-multipart"; version = "0.12"; sha256 = "1hs1h66zjhknfnz1bdi5c0d2sfb20fc7x9adbc87gq168k8riqvl"; - revision = "1"; - editedCabalFile = "0pc254b458v4k5xw729fvw3q3klwpkai2mmp455dw2i7g02dv0da"; + revision = "2"; + editedCabalFile = "019zk4vlm9gv8n85qv6819i6qn0ddiz56birlmabz2n95l715m7y"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232289,6 +232174,8 @@ self: { pname = "servant-openapi3"; version = "2.0.1.2"; sha256 = "1lqvycbv49x0i3adbsdlcl49n65wxfjzhiz9pj11hg4k0j952q5p"; + revision = "1"; + editedCabalFile = "19mag4xbiswaxpdxjn5yj3jbascbwza0y89zppgzb342prqdryjr"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -232784,6 +232671,8 @@ self: { pname = "servant-server"; version = "0.18.2"; sha256 = "05ricb3w1app6c094zwaq2jnqv53jpf4n89ffynm31dvf6h9qdih"; + revision = "1"; + editedCabalFile = "0xhq2rpc4ry1xgwz835bcm8qdnsifpc8wck9wa5r510ff21dqw4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -238905,8 +238794,8 @@ self: { }: mkDerivation { pname = "slugify"; - version = "0.1.0.0"; - sha256 = "1bsb9jhd85zpa27wfv365axg9qx973wqi1nlnjds262i0ywdc45s"; + version = "0.1.0.1"; + sha256 = "1h5lbp33hd10lr2d5cplac7515aphyd56jyj3wlzw5pg3sih8qvv"; libraryHaskellDepends = [ base text unicode-transforms ]; testHaskellDepends = [ base hspec QuickCheck text ]; testToolDepends = [ hspec-discover ]; @@ -241830,6 +241719,18 @@ self: { }) {}; "some" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "some"; + version = "1.0.2"; + sha256 = "12mv5gzcvl4n5rz685r2nmmiykvnkvrvx7k4cvwscdjjgnqa9y6c"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base ]; + description = "Existential type: Some"; + license = lib.licenses.bsd3; + }) {}; + + "some_1_0_3" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { pname = "some"; @@ -241839,6 +241740,7 @@ self: { testHaskellDepends = [ base ]; description = "Existential type: Some"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "sonic-visualiser" = callPackage @@ -246061,15 +245963,15 @@ self: { "staversion" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal , containers, directory, filepath, hashable, heredoc, hspec - , http-client, http-client-tls, http-types, megaparsec - , optparse-applicative, pretty, process, QuickCheck, semigroups - , text, transformers, transformers-compat, unordered-containers - , yaml + , hspec-discover, http-client, http-client-tls, http-types + , megaparsec, optparse-applicative, pretty, process, QuickCheck + , semigroups, text, transformers, transformers-compat + , unordered-containers, yaml }: mkDerivation { pname = "staversion"; - version = "0.2.4.0"; - sha256 = "1n6f7ka4ncadp4svd3bc81qxdgiff85mws5apx7wdhcwfn8wbsib"; + version = "0.2.4.1"; + sha256 = "0i6z6dm9bksvhnfc1jj5gmf7nimz9hg7vvc6aj1vla7v5m0bkwrr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -246083,6 +245985,7 @@ self: { base bytestring Cabal filepath heredoc hspec QuickCheck semigroups text unordered-containers ]; + testToolDepends = [ hspec-discover ]; description = "What version is the package X in stackage lts-Y.ZZ?"; license = lib.licenses.bsd3; }) {}; @@ -252963,8 +252866,8 @@ self: { }: mkDerivation { pname = "taffybar"; - version = "3.2.3"; - sha256 = "0c5w030b289qy05pzs1bx3sd23sxxdm44605hs4ibzffaf0pr7b0"; + version = "3.2.4"; + sha256 = "1hv0s9kp0ixha9qjgrp1l52w48z68ngk17a0c6364qc95qsd2ycp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -253989,8 +253892,8 @@ self: { pname = "taskwarrior"; version = "0.3.0.0"; sha256 = "1h24d799q1s6b36hd40bxa4c9m1izkgh6j7p2jv1p6cxngz28ni0"; - revision = "4"; - editedCabalFile = "1rwlyw01i07xryhja4h7jadlj5rdznmb1jwl74qllkrhrvqjfmrg"; + revision = "5"; + editedCabalFile = "1h7ybnxx5f0w1h13wzbx30ycf578dnv12wx4pqn3pfxqz1jz3gjg"; libraryHaskellDepends = [ aeson base bytestring containers process random text time unordered-containers uuid @@ -254346,6 +254249,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "tasty-hspec_1_1_7" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty + , tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-hspec"; + version = "1.1.7"; + sha256 = "05738x9hvnwqlp91x2da3b3fpn84hbsha7850xphnh2bpbx3lbx1"; + libraryHaskellDepends = [ + base hspec hspec-core QuickCheck tasty tasty-quickcheck + tasty-smallcheck + ]; + description = "Hspec support for the Tasty test framework"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-html" = callPackage ({ mkDerivation, base, blaze-html, bytestring, containers, filepath , generic-deriving, mtl, semigroups, stm, tagged, tasty, text @@ -256440,6 +256360,8 @@ self: { pname = "terminfo"; version = "0.4.1.4"; sha256 = "170pnql6ycpk6gwy9v28mppm0w2n89l0n6fhnzph2za9kwrs9fqh"; + revision = "1"; + editedCabalFile = "0f82h8mj3swx7c2cxls76nzqx0qnibvsncmvqcbc7v5db4mkfmm1"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ ncurses ]; description = "Haskell bindings to the terminfo library"; @@ -257377,6 +257299,29 @@ self: { 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 + }: + mkDerivation { + pname = "texmath"; + version = "0.12.3"; + sha256 = "0lhbgnswhss56lrp25i70hvmn6zg6xcfwdigfmwjggmhz0h5q88x"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec split 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; + hydraPlatforms = lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -259642,10 +259587,8 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.9.0.0"; - sha256 = "0mvx661xk3nzvvxcda4vdk2ka7mff8jbpib1x59n230w80bc5sja"; - revision = "1"; - editedCabalFile = "0g07sdc3r1cg16m5nbhwaa95zr7kbzag60f8han5pnp67c79n67i"; + version = "0.9.1.0"; + sha256 = "00sjkfa9qfnnwqfdw68yb8hq6nm1y5qv9896rzn5aachr7mlfpx2"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -262839,8 +262782,8 @@ self: { pname = "toysolver"; version = "0.7.0"; sha256 = "1r8z8fg3iyz5cc7cmwv29i7gwdcb789s7p6yklfgmz8w314m83gj"; - revision = "1"; - editedCabalFile = "1gnpyqjrcpsc2qjnnajr77j5x0xnyxpsmcxqa2qfbahw0r9qvmfw"; + revision = "2"; + editedCabalFile = "0ccdmmckw9gkqxvr8f8h84m4mybcpbmrv1yv0kvbl1qhrb01ihli"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -267200,22 +267143,6 @@ self: { }) {}; "typed-uuid" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, deepseq, hashable - , http-api-data, random, text, uuid, validity, validity-uuid - }: - mkDerivation { - pname = "typed-uuid"; - version = "0.0.0.2"; - sha256 = "01gh95cxymimjyvhpba0w5bzw6vnx9jzgc6a5jj7vqxi421cc7ss"; - libraryHaskellDepends = [ - aeson base binary bytestring deepseq hashable http-api-data random - text uuid validity validity-uuid - ]; - description = "Phantom-Typed version of UUID"; - license = lib.licenses.mit; - }) {}; - - "typed-uuid_0_1_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, deepseq, hashable , http-api-data, random, text, uuid, validity, validity-uuid , yamlparse-applicative @@ -267230,7 +267157,6 @@ self: { ]; description = "Phantom-Typed version of UUID"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "typed-wire" = callPackage @@ -270068,31 +269994,6 @@ self: { }) {}; "unliftio" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, gauge, hspec, process, QuickCheck, stm, time - , transformers, unix, unliftio-core - }: - mkDerivation { - pname = "unliftio"; - version = "0.2.15"; - sha256 = "08yclgvk6slaisqc08b8bblh4fl77qicj0w90l46q419ya3drixd"; - libraryHaskellDepends = [ - async base bytestring deepseq directory filepath process stm time - transformers unix unliftio-core - ]; - testHaskellDepends = [ - async base bytestring containers deepseq directory filepath hspec - process QuickCheck stm time transformers unix unliftio-core - ]; - benchmarkHaskellDepends = [ - async base bytestring deepseq directory filepath gauge process stm - time transformers unix unliftio-core - ]; - description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; - license = lib.licenses.mit; - }) {}; - - "unliftio_0_2_16" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, gauge, hspec, process, QuickCheck, stm, time , transformers, unix, unliftio-core @@ -270115,7 +270016,6 @@ self: { ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "unliftio-core" = callPackage @@ -274420,19 +274320,19 @@ self: { }) {}; "vinyl" = callPackage - ({ mkDerivation, aeson, array, base, criterion, deepseq, doctest - , ghc-prim, hspec, lens, lens-aeson, linear, microlens, mtl - , mwc-random, primitive, should-not-typecheck, singletons, tagged - , text, unordered-containers, vector + ({ mkDerivation, aeson, array, base, criterion, deepseq, ghc-prim + , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random + , primitive, should-not-typecheck, tagged, text + , unordered-containers, vector }: mkDerivation { pname = "vinyl"; - version = "0.13.1"; - sha256 = "1aip3v1jnxmx44bkshxkmd1iixml65987b4sbh4gncm6q7brkn0k"; + version = "0.13.2"; + sha256 = "1ymrh8ra54a2x3kmw87gfcrv413rbr4msy0ppppi6lh2lvq5zk09"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ - aeson base doctest hspec lens lens-aeson microlens mtl - should-not-typecheck singletons text unordered-containers vector + aeson base hspec lens lens-aeson microlens mtl should-not-typecheck + text unordered-containers vector ]; benchmarkHaskellDepends = [ base criterion linear microlens mwc-random primitive tagged vector @@ -275779,6 +275679,8 @@ self: { pname = "wai-handler-hal"; version = "0.1.0.0"; sha256 = "0sjw01k5dyhdi33ld1pd4mf9plpij0spzxf2b228cjyc8x5zx7rj"; + revision = "1"; + editedCabalFile = "0gnl0xfsx1ahm0w0xykdzm96h3riz497wz9gxdmvzv0aflcg6jw9"; libraryHaskellDepends = [ base base64-bytestring bytestring case-insensitive hal http-types network text unordered-containers vault wai @@ -277071,8 +276973,8 @@ self: { }: mkDerivation { pname = "wai-session-redis"; - version = "0.1.0.1"; - sha256 = "14n5996y8fpq19jfn5ahfliq4gk2ydi5l8zcq8agqqpg875hzzcw"; + version = "0.1.0.2"; + sha256 = "15l0sq5y9lalprn3k7fcw37fnmzphhd00qkpwna3wxpr0vrlihzs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -279868,18 +279770,18 @@ self: { }) {}; "witch" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, QuickCheck - , template-haskell, text + ({ mkDerivation, base, bytestring, containers, hspec + , template-haskell, text, time }: mkDerivation { pname = "witch"; - version = "0.2.1.1"; - sha256 = "0z3c7ni1sd4mqv2v35sj2qls9bdkkk3sclpclxll420b7qbicf1r"; + version = "0.3.1.0"; + sha256 = "1jk0p1w5a3nr12nn6afwagpgkv1i6pyn83idkbps6kq3kb3l15w4"; libraryHaskellDepends = [ - base bytestring containers template-haskell text + base bytestring containers template-haskell text time ]; testHaskellDepends = [ - base bytestring containers hspec QuickCheck text + base bytestring containers hspec text time ]; description = "Convert values from one type into another"; license = lib.licenses.isc; @@ -283401,8 +283303,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.37"; - sha256 = "0bjjja73ip7c1s8r3j3dimzm2j17sx38nsh51nl3axf4z5pbif74"; + version = "0.38"; + sha256 = "1h7y5bnrsxc9k92zn5pfyimpdvm9245b93rxf0ff1avssnp1i31s"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -285913,8 +285815,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth2"; - version = "0.6.3.0"; - sha256 = "0h2rvq0fb4alwz595a2rzmfv2a370shy58ga9n18vp4xg0pw6i28"; + version = "0.6.3.4"; + sha256 = "1hy90iz3f52kg7vs5k27mqpzhfncvag9sb9vs8gl7v89caa1pdjz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -285927,29 +285829,6 @@ self: { license = lib.licenses.mit; }) {}; - "yesod-auth-oauth2_0_6_3_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, cryptonite, errors - , hoauth2, hspec, http-client, http-conduit, http-types, memory - , microlens, mtl, safe-exceptions, text, unliftio, uri-bytestring - , yesod-auth, yesod-core - }: - mkDerivation { - pname = "yesod-auth-oauth2"; - version = "0.6.3.1"; - sha256 = "1q49a99n2h1b06zm0smqqxr9jr487b14cf8xmayvkqr0q1q5xrwa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring cryptonite errors hoauth2 http-client - http-conduit http-types memory microlens mtl safe-exceptions text - unliftio uri-bytestring yesod-auth yesod-core - ]; - testHaskellDepends = [ base hspec uri-bytestring ]; - description = "OAuth 2.0 authentication plugins"; - license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - }) {}; - "yesod-auth-pam" = callPackage ({ mkDerivation, base, hamlet, pam, text, yesod-auth, yesod-core , yesod-form @@ -286132,43 +286011,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-html - , blaze-markup, bytestring, case-insensitive, cereal, clientsession - , conduit, conduit-extra, containers, cookie, deepseq, fast-logger - , gauge, hspec, hspec-expectations, http-types, HUnit, memory - , monad-logger, mtl, network, parsec, path-pieces, primitive - , random, resourcet, shakespeare, streaming-commons - , template-haskell, text, time, transformers, unix-compat, unliftio - , unordered-containers, vector, wai, wai-extra, wai-logger, warp - , word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.6.19.0"; - sha256 = "00mqvq47jf4ljqwj20jn5326hrap5gbm5bqq2xkijfs4ymmyw6vd"; - libraryHaskellDepends = [ - aeson auto-update base blaze-html blaze-markup bytestring - case-insensitive cereal clientsession conduit conduit-extra - containers cookie deepseq fast-logger http-types memory - monad-logger mtl parsec path-pieces primitive random resourcet - shakespeare template-haskell text time transformers unix-compat - unliftio unordered-containers vector wai wai-extra wai-logger warp - word8 - ]; - testHaskellDepends = [ - async base bytestring clientsession conduit conduit-extra - containers cookie hspec hspec-expectations http-types HUnit network - path-pieces random resourcet shakespeare streaming-commons - template-haskell text transformers unliftio wai wai-extra warp - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring gauge shakespeare text - ]; - description = "Creation of type-safe, RESTful web applications"; - license = lib.licenses.mit; - }) {}; - - "yesod-core_1_6_20" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-html , blaze-markup, bytestring, case-insensitive, cereal, clientsession , conduit, conduit-extra, containers, cookie, deepseq, entropy @@ -286203,7 +286045,6 @@ self: { ]; description = "Creation of type-safe, RESTful web applications"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -286773,8 +286614,8 @@ self: { }: mkDerivation { pname = "yesod-markdown"; - version = "0.12.6.9"; - sha256 = "05s63nx27f823b47yy70p9kqxi1cvfk226zgb0qhs5a2q70nxj7z"; + version = "0.12.6.11"; + sha256 = "044m6a949yifvyxbbc15ms11sdxvljvb68187h5v6xk0qw0p33i9"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare text xss-sanitize yesod-core yesod-form @@ -286825,8 +286666,8 @@ self: { }: mkDerivation { pname = "yesod-page-cursor"; - version = "2.0.0.6"; - sha256 = "0if4pwpzpr48cz1vixk234fdl4lj3895ma9ak8x917sc3cgp2kv1"; + version = "2.0.0.7"; + sha256 = "1jkisnlbg5p5fd28r37xp844mjdpdz13s9dfpzbr30pxbyy57kf8"; libraryHaskellDepends = [ aeson base bytestring containers http-link-header network-uri text unliftio yesod-core From 20dd4577c73877df1fb36c10502479c34cc89dbc Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 19 May 2021 14:51:41 +0200 Subject: [PATCH 08/78] haskellPackages: fix infinite recursion by disabling random's tests random 1.2.0 has a new test suite with a lot of dependencies. Among other packages it depends on doctest which depends on syb which depends on tasty which depends on optparse-applicative which depends on QuickCheck which depends on -- you guessed it -- random! The cycle could be broken at any point of course, I've disabled the tests on random here because it has seen the change that causes all of this. However, we may also want to consider doing this for optparse-applicative instead, since random seems like a more critical package to run the tests for possibly? Not sure, looking for feedback. --- pkgs/development/haskell-modules/configuration-nix.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 52f9e94401f1..8f54a9260e35 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -803,4 +803,9 @@ self: super: builtins.intersectAttrs super { hw-prim-bits = overrideCabal super.hw-prim-bits { platforms = pkgs.lib.platforms.x86; }; + + # random 1.2.0 has tests that indirectly depend on + # itself causing an infinite recursion at evaluation + # time + random = dontCheck super.random; } From 89ca3346f0013cfcb74ea2fde8bf46b7d51ca50f Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 19 May 2021 15:24:09 +0200 Subject: [PATCH 09/78] haskellPackages.lsp-test: remove unnecessary override We arrived at 0.14.0.0 naturally via stackage. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 693a5b61fbc4..93891cc6e977 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1461,9 +1461,6 @@ self: super: { ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4; }); - # 2021-03-09: Overrides because nightly is to old for hls 1.0.0 - lsp-test = doDistribute (dontCheck self.lsp-test_0_14_0_0); - # 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 From e467c282ba6e88305de00f2a60078beeb1da153e Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 19 May 2021 15:25:17 +0200 Subject: [PATCH 10/78] haskellPackages.hashable: make test suite work with random 1.2.0 hashable's test suite pins random to < 1.2 even in the latest release on hackage, but lifting the bound fixes the build without any issues. Using a patch so we are reminded to remove it when it's unnecessary. --- .../haskell-modules/configuration-common.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 93891cc6e977..2e9d43466731 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1937,4 +1937,19 @@ EOT # https://github.com/kcsongor/generic-lens/issues/133 generic-optics = dontCheck super.generic-optics; + # 2021-05-19: Allow random 1.2.0 + # Remove at (presumably next release) which is > 1.3.1.0 + hashable = overrideCabal super.hashable (drv: { + patches = [ + (pkgs.fetchpatch { + url = "https://github.com/haskell-unordered-containers/hashable/commit/78fa8fdb4f8bec5d221f34110d6afa0d0a00b5f9.patch"; + sha256 = "0bzgp9qf53zk4rzk73x5cf2kfqncvlmihcallpplaibpslzalyi4"; + }) + ] ++ (drv.patches or []); + # fix line endings preventing patch from applying + prePatch = '' + ${pkgs.dos2unix}/bin/dos2unix hashable.cabal + '' + (drv.prePatch or ""); + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From f3119f03ac1e90fc93bca89e33a7d623b925dbff Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 19 May 2021 15:28:27 +0200 Subject: [PATCH 11/78] haskell.packages.*.cabal-install: remove random, hashable overrides These are not necessary anymore as stackage naturally contains random 1.2.0 and we apply the hashable fix globally as well. --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 -- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 2 -- 3 files changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index c4bab1f0785e..01a867221a6c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -47,8 +47,6 @@ self: super: { cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_4_0_0; base16-bytestring = self.base16-bytestring_0_1_1_7; - random = dontCheck super.random_1_2_0; # break infinite recursion - hashable = doJailbreak super.hashable; # allow random 1.2.x }); # cabal-install-parsers is written for Cabal 3.4 diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 00797c0c86f1..8fb10d8b05f5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -60,8 +60,6 @@ self: super: { cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_4_0_0; base16-bytestring = self.base16-bytestring_0_1_1_7; - random = dontCheck super.random_1_2_0; # break infinite recursion - hashable = doJailbreak super.hashable; # allow random 1.2.x }); # Ignore overly restrictive upper version bounds. 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 c55d720033ee..4bc3fd779db9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -48,8 +48,6 @@ self: super: { cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; base16-bytestring = self.base16-bytestring_0_1_1_7; - random = dontCheck super.random_1_2_0; # break infinite recursion - hashable = doJailbreak super.hashable; # allow random 1.2.x }); # Jailbreaks & Version Updates From e4c634d687748aa1458030a94f642dba2ac3c49f Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 19 May 2021 15:31:23 +0200 Subject: [PATCH 12/78] haskellPackages.glirc: remove unnecessary random override random 1.2.0 is our default version now. --- 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 2e9d43466731..7e4fb5af4f16 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -267,7 +267,7 @@ self: super: { GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 #next release supports random 1.1; jailbroken because i didn't know about vty when glguy was updating the bounds #should be fixed soon. maybe even before this is merged. currently glirc is 2.37 - glirc = doJailbreak (super.glirc.override { random = self.random_1_2_0; }); + glirc = doJailbreak super.glirc; hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; From dcaa389959cc531d8cd68821f48e7fbd8585f8af Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 19 May 2021 15:47:09 +0200 Subject: [PATCH 13/78] haskellPackages.glirc: remove jailbreak --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7e4fb5af4f16..b7d079a99b3e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -265,9 +265,6 @@ self: super: { github-rest = dontCheck super.github-rest; # test suite needs the network gitlib-cmdline = dontCheck super.gitlib-cmdline; GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 - #next release supports random 1.1; jailbroken because i didn't know about vty when glguy was updating the bounds - #should be fixed soon. maybe even before this is merged. currently glirc is 2.37 - glirc = doJailbreak super.glirc; hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; From 9c6c587e7a10a5096f4d2372b3cb792d2f836fae Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Wed, 19 May 2021 17:17:02 +0200 Subject: [PATCH 14/78] haskell.packages.ghc{8104,901}: correct cabal-install override comment --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +-- pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 01a867221a6c..9866364e34a0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -42,8 +42,7 @@ self: super: { unix = null; xhtml = null; - # cabal-install needs more recent versions of Cabal and random, but an older - # version of base16-bytestring. + # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_4_0_0; base16-bytestring = self.base16-bytestring_0_1_1_7; 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 4bc3fd779db9..ff82fc8c199c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -43,8 +43,7 @@ self: super: { unix = null; xhtml = null; - # cabal-install needs more recent versions of random, but an older - # version of base16-bytestring. + # cabal-install needs more recent versions of Cabal and base16-bytestring. cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: { Cabal = null; base16-bytestring = self.base16-bytestring_0_1_1_7; From 9b79de383c5f130657166f869e2ccd2f39c1bed6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 20 May 2021 00:21:55 +0200 Subject: [PATCH 15/78] haskellPackages.hnix: make sure patches apply Cabal revisions can break the patches we apply, so we'll need to make any necessary changes to the cabal file with patches ourselves. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b7d079a99b3e..59d0248df9af 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -204,6 +204,9 @@ self: super: { revert = true; }) ] ++ (drv.patches or []); + # make sure patches are not broken by cabal file revisions + revision = null; + editedCabalFile = null; })); # Fails for non-obvious reasons while attempting to use doctest. From 8014f4fe29a7fa7223716bd297dc041b4eaa5e0f Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 20 May 2021 00:37:23 +0200 Subject: [PATCH 16/78] haskellPackages.dhall-nix{,pkgs}: remove cabal revision pins We got these cabal file revisions with our hackage update, so we can remove it from the common configuration file. --- .../haskell-modules/configuration-common.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 59d0248df9af..36993bc1dfc7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -943,16 +943,7 @@ self: super: { # https://github.com/commercialhaskell/stackage/issues/5795 # This issue can be mitigated with 'dontCheck' which skips the tests and their compilation. dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] (dontCheck super.dhall-json); - # dhall-nix, dhall-nixpkgs: pull updated cabal files with updated bounds. - # Remove at next hackage update. - dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (overrideCabal super.dhall-nix { - revision = "2"; - editedCabalFile = "1w90jrkzmbv5nasafkkv0kyfmnqkngldx2lr891113h2mqbbr3wx"; - }); - dhall-nixpkgs = overrideCabal super.dhall-nixpkgs { - revision = "1"; - editedCabalFile = "1y08jxg51sbxx0i7ra45ii2v81plzf4hssmwlrw35l8n5gib1vcg"; - }; + dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" super.dhall-nix; dhall-yaml = generateOptparseApplicativeCompletions ["dhall-to-yaml-ng" "yaml-to-dhall"] super.dhall-yaml; # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 From 99acf0863b77e1cb52d8f36206a46b7d092705a9 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 20 May 2021 00:44:40 +0200 Subject: [PATCH 17/78] haskellPackages.MissingH: jailbreak too strict bound on random --- 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 36993bc1dfc7..dcc59f3f4510 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1943,4 +1943,8 @@ EOT '' + (drv.prePatch or ""); }); + # Too strict bound on random + # https://github.com/haskell-hvr/missingh/issues/56 + MissingH = doJailbreak super.MissingH; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 81cfe88222ffbc20b01b7573dab533172b17e5c8 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 20 May 2021 00:47:37 +0200 Subject: [PATCH 18/78] haskellPackages.parallel-io: jailbreak too strict bound on random --- 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 dcc59f3f4510..0b451dd98432 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1947,4 +1947,8 @@ EOT # https://github.com/haskell-hvr/missingh/issues/56 MissingH = doJailbreak super.MissingH; + # Too strict bound on random + # https://github.com/batterseapower/parallel-io/issues/14 + parallel-io = doJailbreak super.parallel-io; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 0eb2dc5d7b987499e75cdea61693bb91358c63e6 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Thu, 20 May 2021 10:03:48 +0900 Subject: [PATCH 19/78] hackage-packages.nix: mark broken packages and regenerate based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + .../configuration-hackage2nix/transitive-broken.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index e4760fa54a23..f94393f7748c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -307,6 +307,7 @@ unsupported-platforms: bindings-directfb: [ x86_64-darwin ] bindings-sane: [ x86_64-darwin ] charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3 + crackNum: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux cut-the-crap: [ x86_64-darwin ] d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ] diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 8acd56668d3a..3157b77dee7a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -2243,6 +2243,7 @@ dont-distribute-packages: - planet-mitchell - plocketed - Plot-ho-matic + - ploterific - PlslTools - png-file - pngload diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e89da1c5c1e3..43ebaad69789 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -64769,6 +64769,9 @@ self: { ]; description = "Crack various integer and floating-point data formats"; license = lib.licenses.bsd3; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; }) {}; "craft" = callPackage @@ -202929,6 +202932,7 @@ self: { executableHaskellDepends = [ base mtl optparse-generic text ]; description = "Basic plotting of tabular data for the command line"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "plotfont" = callPackage From 8f9f70446e90e335ad49e03a72b43a44d447db31 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Thu, 20 May 2021 16:14:45 +0900 Subject: [PATCH 20/78] haskellPackages.dyre: fix build by removing out-dated patch and pulling from upstream --- .../haskell-modules/configuration-nix.nix | 14 +++++++++-- .../haskell-modules/patches/dyre-nix.patch | 25 ------------------- 2 files changed, 12 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/dyre-nix.patch diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 8f54a9260e35..d18f22c3e62d 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -259,8 +259,18 @@ self: super: builtins.intersectAttrs super { ''; })); - # Patch to consider NIX_GHC just like xmonad does - dyre = appendPatch super.dyre ./patches/dyre-nix.patch; + dyre = + appendPatch + # dyre's tests appear to be trying to directly call GHC. + (dontCheck super.dyre) + # Dyre needs special support for reading the NIX_GHC env var. This is + # available upstream in https://github.com/willdonnelly/dyre/pull/43, but + # hasn't been released to Hackage as of dyre-0.9.1. Likely included in + # next version. + (pkgs.fetchpatch { + url = "https://github.com/willdonnelly/dyre/commit/c7f29d321aae343d6b314f058812dffcba9d7133.patch"; + sha256 = "10m22k35bi6cci798vjpy4c2l08lq5nmmj24iwp0aflvmjdgscdb"; + }); # https://github.com/edwinb/EpiVM/issues/13 # https://github.com/edwinb/EpiVM/issues/14 diff --git a/pkgs/development/haskell-modules/patches/dyre-nix.patch b/pkgs/development/haskell-modules/patches/dyre-nix.patch deleted file mode 100644 index 458e540e0c4a..000000000000 --- a/pkgs/development/haskell-modules/patches/dyre-nix.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- dyre-0.8.12/Config/Dyre/Compile.hs 2015-04-13 11:00:20.794278350 +0100 -+++ dyre-0.8.12-patched/Config/Dyre/Compile.hs 2015-04-13 11:07:26.938893502 +0100 -@@ -10,11 +10,13 @@ - import System.FilePath ( () ) - import System.Directory ( getCurrentDirectory, doesFileExist - , createDirectoryIfMissing ) -+import System.Environment ( lookupEnv ) -+import Control.Applicative ((<$>)) - import Control.Exception ( bracket ) --import GHC.Paths ( ghc ) - - import Config.Dyre.Paths ( getPaths ) - import Config.Dyre.Params ( Params(..) ) -+import Data.Maybe ( fromMaybe ) - - -- | Return the path to the error file. - getErrorPath :: Params cfgType -> IO FilePath -@@ -47,6 +49,7 @@ - errFile <- getErrorPath params - result <- bracket (openFile errFile WriteMode) hClose $ \errHandle -> do - ghcOpts <- makeFlags params configFile tempBinary cacheDir libsDir -+ ghc <- fromMaybe "ghc" <$> lookupEnv "NIX_GHC" - ghcProc <- runProcess ghc ghcOpts (Just cacheDir) Nothing - Nothing Nothing (Just errHandle) - waitForProcess ghcProc From fa700b55d1282e90f23b36134476b0796abf33d5 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 20 May 2021 09:48:35 +0200 Subject: [PATCH 21/78] haskellPackages.language-docker: use sdist The upstream issue has been resolved and the current hackage sdist does include everything necessary for running its test suite. --- .../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 0b451dd98432..09a1af083fb1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1869,18 +1869,6 @@ self: super: { gi-gtk-declarative = doJailbreak super.gi-gtk-declarative; gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple; - # Test assets missing from sdist - # https://github.com/hadolint/language-docker/issues/63 - language-docker = overrideSrc super.language-docker { - src = pkgs.fetchFromGitHub { - owner = "hadolint"; - repo = "language-docker"; - rev = "refs/tags/${super.language-docker.version}"; - sha256 = "06263jy538ni31vms5pzggmh64fyk62cv3lxnvkc6gylb94kljb8"; - name = "language-docker-${super.language-docker.version}-source"; - }; - }; - # 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions. tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland; From a16119c325ec385d54349d42759e38ee522c678b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 20 May 2021 09:56:42 +0200 Subject: [PATCH 22/78] haskellPackages.Euterpea: jailbreak Compiles with random 1.2.0, but bounds are too strict. Just fully jailbreak instead of patching the bounds like before (upstream maintenance seems poor at this point, so this is futile work unfortunately). --- 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 09a1af083fb1..af5711bc199a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -541,10 +541,7 @@ self: super: { elm-yesod = markBroken super.elm-yesod; # https://github.com/Euterpea/Euterpea2/issues/40 - Euterpea = appendPatch super.Euterpea (pkgs.fetchpatch { - url = "https://github.com/Euterpea/Euterpea2/pull/38.patch"; - sha256 = "13g462qmj8c7if797gnyvf8h0cddmm3xy0pjldw48w8f8sr4qsj0"; - }); + Euterpea = doJailbreak super.Euterpea; # Install icons, metadata and cli program. bustle = overrideCabal super.bustle (drv: { From 88ad7c8ef621069774a3f0b5ec887137ec29ce08 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 20 May 2021 10:28:21 +0200 Subject: [PATCH 23/78] haskellPackages.alpaca-netcode: disable flaky test --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index af5711bc199a..959409531a13 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1936,4 +1936,12 @@ EOT # https://github.com/batterseapower/parallel-io/issues/14 parallel-io = doJailbreak super.parallel-io; + # Disable flaky tests + # https://github.com/DavidEichmann/alpaca-netcode/issues/2 + alpaca-netcode = overrideCabal super.alpaca-netcode { + # use testTarget to also pass some flags to the test suite. + # TODO: We should add proper support for this to the builder. + testTarget = "test --test-options='-p \"!/[NOCI]/\"'"; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 154ff7ecc152d899671d91e637e13627eab96e55 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 20 May 2021 12:15:12 +0200 Subject: [PATCH 24/78] haskellPackages.diagrams-core: restrict to < 1.5.0 diagrams-core has adjusted to the Optional deprecation and monoid-extras 0.6, but the rest of the diagrams-* libraries haven't yet. Until that happens we also need to pin it to an older version. --- .../configuration-hackage2nix/main.yaml | 9 ++++++--- .../haskell-modules/hackage-packages.nix | 20 +++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index f94393f7748c..c4676a5c3b68 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -77,10 +77,13 @@ default-package-overrides: - gi-javascriptcore < 4.0.23 # - gi-soup < 2.4.24 # - gi-webkit2 < 4.0.27 # - # 2021-05-11: the diagrams libraries still depends on pre 0.6, - # e. g. https://github.com/diagrams/diagrams-core/issues/115 - # We can keep this pin presumably until base 4.15 + # 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 + # https://github.com/diagrams/diagrams-core/issues/115 + # We can keep this pin at most until base 4.15 - monoid-extras < 0.6 + - diagrams-core < 1.5.0 # 2021-05-11: Pin for hls 1.1.0 - ghcide == 1.2.* - hls-plugin-api == 1.1.0.0 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 43ebaad69789..faa5443afd4b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -74169,6 +74169,25 @@ self: { }) {}; "diagrams-core" = callPackage + ({ mkDerivation, adjunctions, base, containers, distributive + , dual-tree, lens, linear, monoid-extras, mtl, profunctors + , semigroups, unordered-containers + }: + mkDerivation { + pname = "diagrams-core"; + version = "1.4.2"; + sha256 = "0qgb43vy23g4fxh3nmxfq6jyp34imqvkhgflaa6rz0iq6d60gl43"; + revision = "1"; + editedCabalFile = "0w8mpy0z8kmx4l7cg8sgc1hyixysjfqffdgmnxy5p04airjlbpj7"; + libraryHaskellDepends = [ + adjunctions base containers distributive dual-tree lens linear + monoid-extras mtl profunctors semigroups unordered-containers + ]; + description = "Core libraries for diagrams EDSL"; + license = lib.licenses.bsd3; + }) {}; + + "diagrams-core_1_5_0" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors , semigroups, unordered-containers @@ -74183,6 +74202,7 @@ self: { ]; description = "Core libraries for diagrams EDSL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "diagrams-graphviz" = callPackage From eb196dea43b1771b8452e242b4f8cdfccf4f64ad Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Thu, 20 May 2021 12:30:12 +0200 Subject: [PATCH 25/78] haskellPackages.lsp-test: disable test suite again I removed the `dontCheck` override accidentally when cleaning up eval errors. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 959409531a13..71ffe167fb42 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1944,4 +1944,7 @@ EOT testTarget = "test --test-options='-p \"!/[NOCI]/\"'"; }; + # Tests require to run a binary which isn't built + lsp-test = dontCheck super.lsp-test; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 00cca094c4d1db147080ff59c807dd3b5a264742 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 20 May 2021 14:26:55 +0200 Subject: [PATCH 26/78] haskellPackages: Remove obsoletes patches for gtk-sni-tray and taffybar --- .../haskell-modules/configuration-common.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 71ffe167fb42..545273bd2d0d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1289,20 +1289,6 @@ self: super: { # Created upstream PR @ https://github.com/ghcjs/jsaddle/pull/119 jsaddle-webkit2gtk = appendPatch super.jsaddle-webkit2gtk ./patches/jsaddle-webkit2gtk.patch; - # 2021-05-12: gi-gdkpixbuf_2_0_26 fix - # https://github.com/taffybar/gtk-sni-tray/pull/25 - gtk-sni-tray = appendPatch super.gtk-sni-tray (pkgs.fetchpatch { - url = "https://github.com/taffybar/gtk-sni-tray/pull/25/commits/4afd84654cb3f2bd2bb7d39451706c5914fd3cdf.patch"; - sha256 = "1xjxlh58vnykqsjq4qw8mliq3gk17mwxi4h9z8dvjyav8zqg05rn"; - }); - - # 2021-05-12: gi-gdkpixbuf_2_0_26 fix - # https://github.com/taffybar/taffybar/pull/507 - taffybar = appendPatch super.taffybar (pkgs.fetchpatch { - url = "https://github.com/taffybar/taffybar/pull/507/commits/14a650d0954000cbd2cb1018a2f3bcd40ecb564f.patch"; - sha256 = "01rm8zida5858j5r0mw7bpmv24b03mb3rw34lbkaw3i7g62bx3a0"; - }); - # 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 massiv = dontCheck super.massiv; From 2ce6cdb88feabe48cfb4c16787caa3670c7d4640 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 22 May 2021 00:15:39 +0200 Subject: [PATCH 27/78] haskellPackages.sbv_7_13: pin dependency crackNum to < 3.0 3.0 for some removed its library, so we need to retain a version prior to that for building sbv_7_13 (which we need for petrinizer). --- .../haskell-modules/configuration-common.nix | 16 +++++++++------- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 18 ++++++++++++++++++ 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 545273bd2d0d..fdc9bebf4382 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1831,13 +1831,15 @@ self: super: { doCheck = pkgs.stdenv.targetPlatform.system == "x86_64-linux"; }; - # Fix build failure by picking patch from 8.5, - # we need this version of sbv for petrinizer - sbv_7_13 = appendPatch super.sbv_7_13 - (pkgs.fetchpatch { - url = "https://github.com/LeventErkok/sbv/commit/57014b9c7c67dd9b63619a996e2c66e32c33c958.patch"; - sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm"; - }); + # * Fix build failure by picking patch from 8.5, we need + # this version of sbv for petrinizer + # * Pin version of crackNum that still exposes its library + sbv_7_13 = appendPatch (super.sbv_7_13.override { + crackNum = self.crackNum_2_4; + }) (pkgs.fetchpatch { + url = "https://github.com/LeventErkok/sbv/commit/57014b9c7c67dd9b63619a996e2c66e32c33c958.patch"; + sha256 = "10npa8nh2413n6p6qld795qfkbld08icm02bspmk93y0kabpgmgm"; + }); # Too strict bounds on dimensional # https://github.com/enomsg/science-constants-dimensional/pull/1 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index c4676a5c3b68..ab7648a5acb8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -114,6 +114,7 @@ extra-packages: - refinery == 0.3.* # required by hls-tactics-plugin-1.0.0.0 - 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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index faa5443afd4b..3b241ebb4117 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -64754,6 +64754,24 @@ self: { broken = true; }) {crack = null;}; + "crackNum_2_4" = callPackage + ({ mkDerivation, array, base, FloatingHex }: + mkDerivation { + pname = "crackNum"; + version = "2.4"; + sha256 = "1fa9rlknmilc8rnm7yvmjrbc9jydpvk30gj7lq79nqbifig6229a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ array base FloatingHex ]; + executableHaskellDepends = [ array base FloatingHex ]; + description = "Crack various integer, floating-point data formats"; + license = lib.licenses.bsd3; + platforms = [ + "armv7l-linux" "i686-linux" "x86_64-darwin" "x86_64-linux" + ]; + hydraPlatforms = lib.platforms.none; + }) {}; + "crackNum" = callPackage ({ mkDerivation, base, directory, filepath, libBF, process, sbv , tasty, tasty-golden From 830ef6422f643d5c639fd79bca834c726787ec51 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 25 Mar 2021 14:44:10 +0100 Subject: [PATCH 28/78] haskell-generic-builder: disable static PIE --- .../haskell-modules/generic-builder.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 2f9127e30f3b..a9c8f11223f7 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -72,7 +72,7 @@ in , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false -, hardeningDisable ? lib.optional (ghc.isHaLVM or false) "all" +, hardeningDisable ? null , enableSeparateBinOutput ? false , enableSeparateDataOutput ? false , enableSeparateDocOutput ? doHaddock @@ -417,6 +417,17 @@ stdenv.mkDerivation ({ configurePlatforms = []; inherit configureFlags; + # Note: the options here must be always added, regardless of whether the + # package specifies `hardeningDisable`. + hardeningDisable = lib.optionals (args ? hardeningDisable) hardeningDisable + ++ lib.optional (ghc.isHaLVM or false) "all" + # Static libraries (ie. all of pkgsStatic.haskellPackages) fail to build + # because by default Nix adds `-pie` to the linker flags: this + # conflicts with the `-r` and `-no-pie` flags added by GHC (see + # https://gitlab.haskell.org/ghc/ghc/-/issues/19580). hardeningDisable + # changes the default Nix behavior regarding adding "hardening" flags. + ++ lib.optional enableStaticLibraries "pie"; + configurePhase = '' runHook preConfigure @@ -674,7 +685,6 @@ stdenv.mkDerivation ({ // optionalAttrs (args ? preFixup) { inherit preFixup; } // optionalAttrs (args ? postFixup) { inherit postFixup; } // optionalAttrs (args ? dontStrip) { inherit dontStrip; } -// optionalAttrs (args ? hardeningDisable) { inherit hardeningDisable; } // optionalAttrs (stdenv.buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) ) From 60aa19c761656d2eeed116e5ca622f802e543362 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 22 May 2021 13:49:49 +0800 Subject: [PATCH 29/78] haskellPackages: Add maintainer expipiplus1 Me and my packages. Some already have maintainers which I have left as is. --- .../configuration-hackage2nix/main.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index ab7648a5acb8..178a4375d54d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -131,6 +131,16 @@ package-maintainers: - pretty-simple - spago - termonad + expipiplus1: + - VulkanMemoryAllocator + - autoapply + - exact-real + - language-c + - orbits + - update-nix-fetchgit + - vector-sized + - vulkan + - vulkan-utils Gabriel439: - annah - bench From d45bcb549ec7146148ea498a93178f48b9a1cfd6 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sat, 22 May 2021 16:07:48 +0900 Subject: [PATCH 30/78] hackage-packages.nix: Regenerate based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3b241ebb4117..97523cad29a0 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -20651,6 +20651,7 @@ self: { description = "Bindings to the VulkanMemoryAllocator library"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "x86_64-linux" ]; + maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; "WAVE" = callPackage @@ -35494,6 +35495,7 @@ self: { testHaskellDepends = [ base doctest ]; description = "Template Haskell to automatically pass values to functions"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; "autoexporter" = callPackage @@ -41611,7 +41613,7 @@ self: { license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {wlc = null;}; + }) {inherit (pkgs) wlc;}; "bindings-yices" = callPackage ({ mkDerivation, base, gmp, yices }: @@ -86334,6 +86336,7 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Exact real arithmetic"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; "exact-real-positional" = callPackage @@ -157455,6 +157458,7 @@ self: { 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 @@ -157474,6 +157478,7 @@ self: { description = "Analysis and generation of C code"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; "language-c-comments" = callPackage @@ -191888,6 +191893,7 @@ self: { ]; description = "Types and functions for Kepler orbits"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; "orc" = callPackage @@ -270657,7 +270663,7 @@ self: { testToolDepends = [ tasty-discover ]; description = "A program to update fetchgit values in Nix expressions"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ sorki ]; + maintainers = with lib.maintainers; [ expipiplus1 sorki ]; }) {}; "update-repos" = callPackage @@ -273581,6 +273587,7 @@ self: { ]; description = "Size tagged vectors"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; "vector-space" = callPackage @@ -275161,6 +275168,7 @@ self: { description = "Bindings to the Vulkan graphics API"; license = lib.licenses.bsd3; platforms = [ "aarch64-linux" "x86_64-linux" ]; + maintainers = with lib.maintainers; [ expipiplus1 ]; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -275196,6 +275204,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + maintainers = with lib.maintainers; [ expipiplus1 ]; }) {}; "waargonaut" = callPackage @@ -280170,7 +280179,7 @@ self: { description = "Haskell bindings for the wlc library"; license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; - }) {wlc = null;}; + }) {inherit (pkgs) wlc;}; "wobsurv" = callPackage ({ mkDerivation, aeson, attoparsec, base-prelude, bytestring From 4d9f73595f98854107496706cfbd33c4fae7a2d3 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Sat, 22 May 2021 16:14:27 +0800 Subject: [PATCH 31/78] haskellPackages.hnix: Patch to fix broken location annotations Also reenable tests for update-nix-fetchgit --- .../haskell-modules/configuration-common.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fdc9bebf4382..b295873ac199 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -203,6 +203,13 @@ self: super: { sha256 = "0pqmijfkysjixg3gb4kmrqdif7s2saz8qi6k337jf15i0npzln8d"; revert = true; }) + # fix broken location annotations (necessary for update-nix-fetchgit). + # Can be removed on the next hnix release after + # https://github.com/haskell-nix/hnix/pull/936 is merged. + (pkgs.fetchpatch { + url = "https://github.com/expipiplus1/hnix/commit/7cd998426ab7d930d288a1d6e266dc4e85cece3d.patch"; + sha256 = "19ay6vxa90ykgdd0fis2djvki2kpgfsq7z55iyqg965m583vsfr6"; + }) ] ++ (drv.patches or []); # make sure patches are not broken by cabal file revisions revision = null; @@ -1379,10 +1386,7 @@ self: super: { }" ''; - # 2021-04-09: test failure - # PR pending https://github.com/expipiplus1/update-nix-fetchgit/pull/60 - doCheck = false; - + # These can both be removed upon the release of update-nix-fetchgit-0.2.7 patches = [ # 2021-05-17 compile with hnix >= 0.13 # https://github.com/expipiplus1/update-nix-fetchgit/pull/64 @@ -1390,6 +1394,12 @@ self: super: { url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/bc28c8b26c38093aa950574802012c0cd8447ce8.patch"; sha256 = "1dwd1jdsrx3ss6ql1bk2ch7ln74mkq6jy9ms8vi8kmf3gbg8l9fg"; }) + # Fix test failure + # https://github.com/expipiplus1/update-nix-fetchgit/pull/60 + (pkgs.fetchpatch { + url = "https://github.com/expipiplus1/update-nix-fetchgit/commit/4a43e1ea4e7e1c18de81e3f9fe0b86faa70865f5.patch"; + sha256 = "1z74c1blgwr4q37m1rhlj7534qbnp3nnxf63m8j2b7iz0ljgm0m9"; + }) ] ++ (drv.patches or []); })); From 0fddf5bd5a3e32a64957e8a9ba1d2fb176b2baa1 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 22 May 2021 15:05:10 +0200 Subject: [PATCH 32/78] top-level/release-haskell.nix: test static linking as well This way we can keep track of any new regressions to this as well as have some binary cache, so using this infrastructure doesn't require compiling GHC all the time. --- pkgs/top-level/release-haskell.nix | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 38f5e2a41565..12f7ce6900f1 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -81,6 +81,9 @@ let recursiveUpdateMany = builtins.foldl' lib.recursiveUpdate {}; + staticHaskellPackagesPlatforms = + packagePlatforms pkgs.pkgsStatic.haskellPackages; + jobs = recursiveUpdateMany [ (mapTestOn { haskellPackages = packagePlatforms pkgs.haskellPackages; @@ -93,6 +96,16 @@ let writers = testPlatforms.writers; }; + # test some statically linked packages to catch regressions + # and get some cache going for static compilation with GHC + pkgsStatic.haskellPackages = { + inherit (staticHaskellPackagesPlatforms) + hello + random + lens + ; + }; + # top-level packages that depend on haskellPackages inherit (pkgsPlatforms) agda @@ -273,6 +286,17 @@ let (name: jobs.haskellPackages."${name}") (maintainedPkgNames pkgs.haskellPackages)); }; + staticHaskellPackages = pkgs.releaseTools.aggregate { + name = "static-haskell-packages"; + meta = { + description = "Static haskell builds using the pkgsStatic infrastructure"; + maintainers = [ + lib.maintainers.sternenseemann + lib.maintainers.rnhmjoj + ]; + }; + constituents = accumulateDerivations [ jobs.pkgsStatic ]; + }; } ]; From 7559b35d90414b8e8eebc3b11ba150113775746b Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sat, 22 May 2021 17:48:06 +0200 Subject: [PATCH 33/78] haskellPackages.libarchive: don't parallelize test suite hspec is invoked with -j1 in the hopes that this migitates the issue of the current failures on Hydra: https://github.com/vmchale/libarchive/issues/20 --- .../development/haskell-modules/configuration-common.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b295873ac199..9b25b1767880 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1945,4 +1945,13 @@ EOT # Tests require to run a binary which isn't built lsp-test = dontCheck super.lsp-test; + # 2021-05-22: Tests fail sometimes (even consistently on hydra) + # when running a fs-related test with >= 12 jobs. To work around + # this, run tests with only a single job. + # https://github.com/vmchale/libarchive/issues/20 + libarchive = overrideCabal super.libarchive { + # TODO: We should add proper support for this to the builder. + testTarget = "libarchive-test --test-options='-j1'"; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From aa34feebd84e5833547f5225334a4540eb0701e7 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sun, 23 May 2021 14:02:16 +1000 Subject: [PATCH 34/78] haskellPackages.taffybar: override src until next Hackage update Taffybar 3.2.5 fixes dyre compatibility, but is not in Hackage as of 2021-05-19T07:17:55Z. --- .../haskell-modules/configuration-common.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9b25b1767880..c09448e77391 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1954,4 +1954,19 @@ EOT testTarget = "libarchive-test --test-options='-j1'"; }; + # 2021-05-23: Override for a quite recent Hackage release. + taffybar = + if pkgs.lib.versionAtLeast super.taffybar.version "3.2.5" + then throw "Drop src override for taffybar >= 3.2.5" + else overrideCabal super.taffybar (drv: { + src = pkgs.fetchFromGitHub { + owner = "taffybar"; + repo = "taffybar"; + rev = "91c83e01e131d560e704b12f0d798905e4289a3d"; + sha256 = "1kkpkjdyd1yv8z1qlzr3jrzyk9lxac5m4f9py8igyars2nwnhhzr"; + }; + version = "3.2.5"; + editedCabalFile = null; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From a9a4eb18b192189281681978664aab1f04f80628 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Sun, 23 May 2021 13:41:50 +0200 Subject: [PATCH 35/78] haskell: Add maintained packages for maralorn --- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ pkgs/development/haskell-modules/hackage-packages.nix | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 178a4375d54d..2ea177510a1f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -205,8 +205,10 @@ package-maintainers: - cabal-fmt - generic-optics - ghcup + - ghcide - haskell-language-server - hedgehog + - hlint - hmatrix - iCalendar - neuron diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 97523cad29a0..83d0072fbf23 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -101896,6 +101896,7 @@ self: { benchmarkToolDepends = [ hp2pretty implicit-hie ]; description = "The core of an IDE"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "ghcide_1_3_0_0" = callPackage @@ -101963,6 +101964,7 @@ self: { description = "The core of an IDE"; license = lib.licenses.asl20; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "ghcjs-ajax" = callPackage @@ -129719,6 +129721,7 @@ self: { description = "Source code suggestions"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "hlint" = callPackage @@ -129744,6 +129747,7 @@ self: { executableHaskellDepends = [ base ]; description = "Source code suggestions"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ maralorn ]; }) {}; "hlint-test" = callPackage From 34de748dbf645df52595ffa576179db87a7a5bc0 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Sun, 23 May 2021 17:25:18 +0200 Subject: [PATCH 36/78] haskellPackages.orbits: disable doctest on aarch64 aarch64 doctests fail in general due to a GHC bug --- 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 57e71f0e00e9..b9f868b04ca5 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -86,6 +86,7 @@ self: super: { yesod-paginator = dontCheck super.yesod-paginator; grammatical-parsers = dontCheck super.grammatical-parsers; construct = dontCheck super.construct; + orbits = dontCheck super.orbits; # https://github.com/ekmett/half/issues/35 half = dontCheck super.half; From 66722bc2f1407a000be98b448f199dbfed38c816 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 May 2021 12:38:30 +0200 Subject: [PATCH 37/78] top-level/release-haskell.nix: no darwin in static aggregate job Since libiconv doesn't build in pkgsStatic on darwin, having these builds in our aggregate jobset are just gonna make it fail due to reason not really in scope for our jobset here. --- pkgs/top-level/release-haskell.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 12f7ce6900f1..7a3eb608389d 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -295,7 +295,15 @@ let lib.maintainers.rnhmjoj ]; }; - constituents = accumulateDerivations [ jobs.pkgsStatic ]; + constituents = [ + # TODO: reenable darwin builds if static libiconv works + jobs.pkgsStatic.haskellPackages.hello.x86_64-linux + jobs.pkgsStatic.haskellPackages.hello.aarch64-linux + jobs.pkgsStatic.haskellPackages.lens.x86_64-linux + jobs.pkgsStatic.haskellPackages.lens.aarch64-linux + jobs.pkgsStatic.haskellPackages.random.x86_64-linux + jobs.pkgsStatic.haskellPackages.random.aarch64-linux + ]; }; } ]; From a1b16d9782bb7e114d587f48111ca217aca78a95 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 25 May 2021 13:00:46 +0200 Subject: [PATCH 38/78] haskellPackages.hls-class-plugin: Disable tests on darwin --- 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 4f7a6a131d7e..7e02a6653c77 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -168,4 +168,7 @@ self: super: { '' + (drv.postPatch or ""); }); + # 2021-05-25: Tests fail and I have no way to debug them. + hls-class-plugin = dontCheck super.hls-class-plugin; + } From d1f97a0dfb208ec20f982860c5740cd08dd35ef2 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 May 2021 17:30:16 +0200 Subject: [PATCH 39/78] haskellPackages.ap-normalize: 0.1.0.0 -> 0.1.0.1 Manually upgrade for darwin build fix. --- .../haskell-modules/configuration-common.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c09448e77391..08372141b7a4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1969,4 +1969,15 @@ EOT editedCabalFile = null; }); + # 2021-05-25: Fixes darwin build: https://gitlab.com/lysxia/ap-normalize/-/issues/1 + ap-normalize = + assert pkgs.lib.versionOlder super.ap-normalize.version "0.1.0.1"; + overrideSrc super.ap-normalize rec { + version = "0.1.0.1"; + src = pkgs.fetchurl { + url = "https://hackage.haskell.org/package/ap-normalize-${version}/ap-normalize-${version}.tar.gz"; + sha256 = "1212zxc4qn6msk0w13yhrza2qjs79h78misllb4chng75jqi61l2"; + }; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super From 7144de747bacb91acb995bcde61244c0288b0d64 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 25 May 2021 18:11:35 +0200 Subject: [PATCH 40/78] bustle: remove darwin from platforms The build fails due to the usage of unportable glibc functions. Since there is probably little interest in bustle on darwin, there is no real value in attempting to patch this. --- .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 2ea177510a1f..4769ac5fb123 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -322,6 +322,7 @@ unsupported-platforms: bdcs-api: [ x86_64-darwin ] bindings-directfb: [ x86_64-darwin ] bindings-sane: [ x86_64-darwin ] + bustle: [ x86_64-darwin ] # uses glibc-specific ptsname_r charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3 crackNum: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux cut-the-crap: [ x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 83d0072fbf23..060a2f345236 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -46786,6 +46786,9 @@ self: { testPkgconfigDepends = [ gio-unix ]; description = "Draw sequence diagrams of D-Bus traffic"; license = lib.licenses.lgpl21Plus; + platforms = [ + "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" + ]; }) {gio-unix = null; inherit (pkgs) libpcap; system-glib = pkgs.glib;}; From 2c9b564bd200ab3850fbf53970b4024bd58453cb Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 26 May 2021 10:39:08 +0900 Subject: [PATCH 41/78] hackage2nix: Mark failing builds broken This commit has been generated by maintainers/scripts/haskell/mark-broken.sh --- .../configuration-hackage2nix/broken.yaml | 43 ++++++++ .../transitive-broken.yaml | 17 +++- .../haskell-modules/hackage-packages.nix | 97 +++++++++++++++++++ 3 files changed, 154 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0aade87acbf2..58121aee4706 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1,5 +1,6 @@ broken-packages: # These packages don't compile. + - 3d-graphics-examples - 3dmodels - AAI - abcnotation @@ -33,6 +34,7 @@ broken-packages: - acme-inator - acme-kitchen-sink - acme-left-pad + - acme-memorandom - acme-miscorder - acme-mutable-package - acme-now @@ -42,6 +44,7 @@ broken-packages: - acme-strfry - acme-stringly-typed - acme-this + - acme-zalgo - acme-zero - AC-MiniTest - AC-Terminal @@ -236,6 +239,7 @@ broken-packages: - Aurochs - authenticate-ldap - authinfo-hs + - auto - autom - automata - autonix-deps @@ -439,6 +443,7 @@ broken-packages: - BufferedSocket - buffet - buffon + - buffon-machines - bugsnag-haskell - bugzilla - build @@ -452,6 +457,7 @@ broken-packages: - buster - Buster - butter + - buttplug-hs-core - bv-sized - bytable - bytearray-parsing @@ -513,6 +519,7 @@ broken-packages: - cache-polysemy - caching - cacophony + - caerbannog - cafeteria-prelude - caffegraph - cairo-core @@ -582,6 +589,7 @@ broken-packages: - cgen - cgi-utils - chalkboard + - chalmers-lava2000 - character-cases - charter - chart-histogram @@ -592,6 +600,7 @@ broken-packages: - Checked - checkmate - chell-quickcheck + - chiasma - Chitra - choose - chorale @@ -1251,6 +1260,7 @@ broken-packages: - exinst-hashable - exists - exitcode + - exp-cache - exp-extended - explain - explicit-constraint-lens @@ -1275,6 +1285,7 @@ broken-packages: - facts - failable-list - failure-detector + - fakedata - fake-type - faktory - f-algebra-gen @@ -1344,6 +1355,7 @@ broken-packages: - fitsio - fits-parse - fixed-point + - fixedprec - fixed-precision - fixed-storable-array - fixed-timestep @@ -1475,6 +1487,7 @@ broken-packages: - fusion - futun - future + - fuzzy-time-gen - fuzzy-timings - fwgl - g4ip @@ -1528,6 +1541,7 @@ broken-packages: - gentlemark - genvalidity-persistent - GeocoderOpenCage + - geodetics - geodetic-types - geojson-types - geom2d @@ -1569,6 +1583,7 @@ broken-packages: - ghc-srcspan-plugin - ghc-syb - ghc-syb-utils + - ghc-tags - ghc-tags-core - ghc-time-alloc-prof - ghc-usage @@ -1766,6 +1781,7 @@ broken-packages: - hans - hanspell - haphviz + - hapistrano - happindicator - happindicator3 - happlets @@ -1855,6 +1871,7 @@ broken-packages: - haskell-rules - haskellscrabble - haskellscript + - haskell-snake - haskell-spacegoo - haskell-src-exts-prisms - haskell-src-exts-qq @@ -2049,12 +2066,14 @@ broken-packages: - hjs - hjsonpointer - hjson-query + - hjugement-protocol - HJVM - hkd-delta - hkd-lens - hkt - hlbfgsb - hledger-chart + - hledger-flow - hledger-irr - hledger-vty - hlibBladeRF @@ -2066,6 +2085,9 @@ broken-packages: - HLogger - hlongurl - hls-exactprint-utils + - hls-floskell-plugin + - hls-fourmolu-plugin + - hls-pragmas-plugin - hlwm - hmarkup - hmatrix-banded @@ -2086,6 +2108,7 @@ broken-packages: - Hmpf - hmumps - hnetcdf + - hnn - hoauth - hobbes - hocilib @@ -2230,6 +2253,7 @@ broken-packages: - hs-pkg-config - hspread - hspresent + - hspretty - hsql - hs-re - hsrelp @@ -2398,6 +2422,7 @@ broken-packages: - ini-qq - initialize - inject-function + - inline-asm - inserts - instana-haskell-trace-sdk - instance-map @@ -2775,6 +2800,7 @@ broken-packages: - L-seed - lsfrom - ltext + - ltiv1p1 - ltk - LTS - lua-bc @@ -2828,6 +2854,7 @@ broken-packages: - mappy - markdown-kate - marked-pretty + - markov-realization - mars - marvin-interpolate - MASMGen @@ -2878,6 +2905,7 @@ broken-packages: - memis - memoization-utils - memo-ptr + - memorable-bits - memorypool - menoh - menshen @@ -2930,6 +2958,7 @@ broken-packages: - mit-3qvpPyAi6mH - mix-arrows - mixpanel-client + - mltool - ml-w - mm2 - mmark @@ -3138,6 +3167,7 @@ broken-packages: - network-socket-options - network-transport-amqp - network-transport-inmemory + - network-transport-tests - network-uri-json - network-voicetext - network-wai-router @@ -3201,6 +3231,7 @@ broken-packages: - numerals-base - numeric-qq - numeric-ranges + - numhask - numhask-array - numhask-free - numhask-prelude @@ -3241,6 +3272,7 @@ broken-packages: - onama - ONC-RPC - on-demand-ssh-tunnel + - one-liner-instances - oneormore - onpartitions - onu-course @@ -3253,6 +3285,7 @@ broken-packages: - openapi3-code-generator - openapi-petstore - openapi-typed + - opencc - opench-meteo - OpenCL - OpenCLRaw @@ -3361,6 +3394,7 @@ broken-packages: - parcom-lib - par-dual - pareto + - parochial - Parry - parseargs - parsec2 @@ -3403,6 +3437,7 @@ broken-packages: - pb-next - pcd-loader - pcf-font + - pcgen - PCLT - pcre-light-extra - pdfname @@ -3570,6 +3605,7 @@ broken-packages: - postgresql-simple-named - postgresql-simple-sop - postgresql-simple-url + - postgresql-syntax - postgresql-typed-lifted - postgres-tmp - postgrest-ws @@ -4428,6 +4464,7 @@ broken-packages: - stripe-hs - stripe-http-streams - stripe-signature + - stripe-tests - strongswan-sql - structural-traversal - structures @@ -4490,6 +4527,7 @@ broken-packages: - syntax-trees - syntax-trees-fork-bairyn - synthesizer + - synthesizer-alsa - Sysmon - sys-process - system-canonicalpath @@ -4725,6 +4763,7 @@ broken-packages: - transformers-lift - transformers-runnable - TransformersStepByStep + - transient - transient-universe - translatable-intset - translate @@ -4817,12 +4856,14 @@ broken-packages: - uhexdump - uhttpc - ui-command + - ulid - unamb-custom - unbounded-delays-units - unboxed-containers - unboxed-references - unbreak - unfix-binders + - unfoldable - unicode-prelude - unicode-show - unicode-symbols @@ -4934,6 +4975,7 @@ broken-packages: - verilog - verismith - versioning + - vformat - vhd - vhdl - vicinity @@ -5127,6 +5169,7 @@ broken-packages: - xmonad-dbus - xmonad-eval - xmonad-vanessa + - xmonad-wallpaper - xmonad-windownames - xor - Xorshift128Plus diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 3157b77dee7a..20d6617d3c78 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -399,9 +399,9 @@ dont-distribute-packages: - claferwiki - clash - clash-ghc - - clash-ghc_1_4_1 + - clash-ghc_1_4_2 - clash-lib - - clash-lib_1_4_1 + - clash-lib_1_4_2 - clash-multisignal - clash-prelude-quickcheck - clash-systemverilog @@ -546,6 +546,7 @@ dont-distribute-packages: - ctpl - cube - cursedcsv + - cursor-fuzzy-time-gen - cv-combinators - cypher - Dangerous @@ -785,6 +786,7 @@ dont-distribute-packages: - factual-api - fadno-braids - FailureT + - fakedata-quickcheck - fallingblocks - falling-turnip - family-tree @@ -1234,6 +1236,7 @@ dont-distribute-packages: - hasql-postgres - hasql-postgres-options - hasql-queue + - hasql-th - hastache-aeson - haste-app - haste-gapi @@ -1276,6 +1279,7 @@ dont-distribute-packages: - heavy-log-shortcuts - hecc - hedgehog-checkers-lens + - hedgehog-fakedata - hedgehog-gen-json - Hedi - hedis-pile @@ -2093,6 +2097,7 @@ dont-distribute-packages: - network-topic-models - network-websocket - newsletter-mailgun + - newsynth - ngrams-loader - ngx-export-tools-extra - nikepub @@ -2242,8 +2247,8 @@ dont-distribute-packages: - pkgtreediff - planet-mitchell - plocketed - - Plot-ho-matic - ploterific + - Plot-ho-matic - PlslTools - png-file - pngload @@ -2355,6 +2360,7 @@ dont-distribute-packages: - questioner - queuelike - quickbench + - quickcheck-combinators - quickcheck-poly - quickcheck-regex - quickcheck-relaxng @@ -2843,6 +2849,8 @@ dont-distribute-packages: - strelka - strict-data - string-typelits + - stripe-haskell + - stripe-http-client - stripe-scotty - structural-induction - structured-mongoDB @@ -3047,6 +3055,7 @@ dont-distribute-packages: - UMM - unagi-bloomfilter - unbound + - unfoldable-restricted - unicode-normalization - uni-events - uniformBase @@ -3110,6 +3119,8 @@ dont-distribute-packages: - verdict-json - versioning-servant - vflow-types + - vformat-aeson + - vformat-time - vfr-waypoints - ViennaRNA-extras - vigilance diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 060a2f345236..ec2605638483 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -15,6 +15,8 @@ self: { executableHaskellDepends = [ base GLUT OpenGL random ]; description = "Examples of 3D graphics programming with OpenGL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "3dmodels" = callPackage @@ -23338,6 +23340,8 @@ self: { libraryHaskellDepends = [ base MemoTrie random ]; description = "Memoized random number generation"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "acme-microwave" = callPackage @@ -23619,6 +23623,8 @@ self: { libraryHaskellDepends = [ array base random ]; description = "A somewhat flexible Zalgo̐ te̳͜x̥̖̉̓͞t̍̌̔ ̀̃t̴̢̞̜͓̝r̶̬̆̂̒͟á̧̡͎͔̯̰̕n̹̾̓ͬͦ̍͘ṡ̢͓͉ͮ͆l̠̖̹̗̳̖̽̌ͤ͞a͚̭͙̹̲ͭͩt͈͐o̢̭͇͍̟͐ͬ̾ͪ͜r͇.̸̅ͭ̐̀̊ͨ͛"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "acme-zero" = callPackage @@ -35465,6 +35471,8 @@ self: { ]; description = "Denotative, locally stateful programming DSL & platform"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "auto-update" = callPackage @@ -46304,6 +46312,8 @@ self: { ]; description = "Perfect simulation of discrete random variables"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bug" = callPackage @@ -46886,6 +46896,8 @@ self: { ]; description = "Client library for buttplug.io"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bv" = callPackage @@ -49634,6 +49646,8 @@ self: { ]; description = "That rabbit's got a vicious streak a mile wide!"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "caf" = callPackage @@ -52885,6 +52899,8 @@ self: { libraryHaskellDepends = [ array base process random ]; description = "Hardware description EDSL"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "chan" = callPackage @@ -53701,6 +53717,8 @@ self: { ]; description = "tmux api"; license = "BSD-2-Clause-Patent"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "chimera" = callPackage @@ -67478,6 +67496,7 @@ self: { base criterion cursor-fuzzy-time genvalidity-criterion QuickCheck ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "cursor-gen" = callPackage @@ -87049,6 +87068,8 @@ self: { base HUnit QuickCheck random tasty tasty-hunit tasty-quickcheck ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "exp-extended" = callPackage @@ -88226,6 +88247,8 @@ self: { ]; description = "Library for producing fake data"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fakedata-parser" = callPackage @@ -88253,6 +88276,7 @@ self: { ]; description = "Fake a -> Gen a"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "fakefs" = callPackage @@ -91683,6 +91707,8 @@ self: { libraryHaskellDepends = [ base random ]; description = "A fixed-precision real number type"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fixedwidth-hs" = callPackage @@ -97119,6 +97145,8 @@ self: { base criterion fuzzy-time genvalidity-criterion ]; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "fuzzy-timings" = callPackage @@ -100009,6 +100037,8 @@ self: { ]; description = "Terrestrial coordinate systems and geodetic calculations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "geohash" = callPackage @@ -101387,6 +101417,8 @@ self: { ]; description = "Utility for generating ctags and etags with GHC API"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ghc-tags-core" = callPackage @@ -116062,6 +116094,8 @@ self: { testToolDepends = [ hspec-discover ]; description = "A deployment library for Haskell applications"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "happindicator" = callPackage @@ -119379,6 +119413,8 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "haskell-spacegoo" = callPackage @@ -122276,6 +122312,7 @@ self: { ]; description = "Template Haskell utilities for Hasql"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "hasql-transaction" = callPackage @@ -124546,6 +124583,7 @@ self: { testHaskellDepends = [ base containers fakedata hedgehog ]; description = "Use 'fakedata' with 'hedgehog'"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "hedgehog-fn" = callPackage @@ -129071,6 +129109,8 @@ self: { ]; description = "A cryptographic protocol for the Majority Judgment"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hkd" = callPackage @@ -129381,6 +129421,8 @@ self: { ]; description = "An hledger workflow focusing on automated statement import and classification"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hledger-iadd" = callPackage @@ -130016,6 +130058,8 @@ 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 @@ -130039,6 +130083,8 @@ self: { ]; description = "Integration with the Fourmolu code formatter"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hls-graph" = callPackage @@ -130152,6 +130198,8 @@ self: { ]; description = "Pragmas plugin for Haskell Language Server"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hls-retrie-plugin" = callPackage @@ -131110,6 +131158,8 @@ self: { ]; description = "A reasonably fast and simple neural network library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hnock" = callPackage @@ -138134,6 +138184,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "My opinionated Haskell project formatter"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsprocess" = callPackage @@ -147120,6 +147172,8 @@ self: { ]; description = "Inline some Assembly in ur Haskell!"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "inline-c" = callPackage @@ -167034,6 +167088,8 @@ self: { ]; description = "Partial implementation of a service provider for LTI 1.1."; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ltk" = callPackage @@ -169778,6 +169834,8 @@ self: { testHaskellDepends = [ base HTF MonadRandom ]; description = "Realizations of Markov chains"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "markup" = callPackage @@ -172137,6 +172195,8 @@ self: { benchmarkHaskellDepends = [ base bytestring criterion random ]; description = "Generate human memorable strings from binary data"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "memory" = callPackage @@ -174903,6 +174963,8 @@ self: { ]; description = "Machine Learning Toolbox"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "mm2" = callPackage @@ -185102,6 +185164,8 @@ self: { ]; description = "Unit tests for Network.Transport implementations"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "network-transport-zeromq" = callPackage @@ -185548,6 +185612,7 @@ self: { executableHaskellDepends = [ base random time ]; description = "Exact and approximate synthesis of quantum circuits"; license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; }) {}; "newt" = callPackage @@ -188095,6 +188160,8 @@ self: { testHaskellDepends = [ base doctest QuickCheck ]; description = "A numeric class hierarchy"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "numhask-array" = callPackage @@ -189689,6 +189756,8 @@ self: { libraryHaskellDepends = [ base one-liner random ]; description = "Generics-based implementations for common typeclasses"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "one-time-password" = callPackage @@ -190273,6 +190342,8 @@ self: { testHaskellDepends = [ base bytestring mtl text transformers ]; description = "OpenCC bindings"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "opench-meteo" = callPackage @@ -195074,6 +195145,8 @@ self: { ]; description = "Help Manage project specific documentation"; license = lib.licenses.agpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "parport" = callPackage @@ -196888,6 +196961,8 @@ self: { benchmarkHaskellDepends = [ base criterion deepseq random ]; description = "A fast, pseudorandom number generator"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pcre-heavy" = callPackage @@ -206016,6 +206091,8 @@ self: { ]; description = "PostgreSQL AST parsing and rendering"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "postgresql-transactional" = callPackage @@ -213091,6 +213168,7 @@ self: { sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd"; libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ]; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "quickcheck-enum-instances" = callPackage @@ -248861,6 +248939,7 @@ self: { libraryHaskellDepends = [ base stripe-core stripe-http-client ]; description = "Stripe API for Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "stripe-hs" = callPackage @@ -248907,6 +248986,7 @@ self: { ]; description = "Stripe API for Haskell - http-client backend"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "stripe-http-streams" = callPackage @@ -248998,6 +249078,8 @@ self: { ]; description = "Tests for Stripe API bindings for Haskell"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "stripe-wreq" = callPackage @@ -252062,6 +252144,8 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "synthesizer-core" = callPackage @@ -263651,6 +263735,8 @@ self: { ]; description = "composing programs with multithreading, events and distributed computing"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "transient-universe" = callPackage @@ -268203,6 +268289,8 @@ self: { ]; description = "Implementation of ULID - Universally Unique Lexicographically Sortable Identifier"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "una" = callPackage @@ -268609,6 +268697,8 @@ self: { ]; description = "Class of data structures that can be unfolded"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "unfoldable-restricted" = callPackage @@ -268625,6 +268715,7 @@ self: { ]; description = "An alternative to the Unfoldable typeclass"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ungadtagger" = callPackage @@ -274074,6 +274165,8 @@ self: { ]; description = "A Python str.format() like formatter"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "vformat-aeson" = callPackage @@ -274096,6 +274189,7 @@ self: { ]; description = "Extend vformat to Aeson datatypes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "vformat-time" = callPackage @@ -274110,6 +274204,7 @@ self: { testHaskellDepends = [ base time vformat ]; description = "Extend vformat to time datatypes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "vfr-waypoints" = callPackage @@ -283662,6 +283757,8 @@ self: { libraryHaskellDepends = [ base magic mtl random unix xmonad ]; description = "xmonad wallpaper extension"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "xmonad-windownames" = callPackage From 3640440ed83e4c662752368c896dd416d4c3df3a Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Thu, 27 May 2021 21:36:13 +0900 Subject: [PATCH 42/78] haskell-updates: more documentation --- pkgs/development/haskell-modules/HACKING.md | 86 ++++++++++++++++----- 1 file changed, 67 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index acf7dc92db26..2c1f13763284 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -4,8 +4,8 @@ This is the documentation for periodically merging the `haskell-updates` branch into the `master` branch. This workflow is performed by members in the [@NixOS/haskell](https://github.com/orgs/NixOS/teams/haskell) team. -Each member of the team takes a two week period where they much merge the -`haskell-updates` branch into `master`. +Each member of the team takes a two week period where they are in charge of +merging the `haskell-updates` branch into `master`. The goal of this workflow is to regularly merge the `haskell-updates` branch into the `master` branch, while making sure there are no evaluation errors or @@ -13,7 +13,7 @@ build errors that get into `master`. The workflow generally proceeds in three main steps: -1. create the initial `haskell-updates` PR +1. create the initial `haskell-updates` PR, and update Stackage and Hackage snapshots 1. wait for contributors to fix newly broken Haskell packages 1. merge `haskell-updates` into `master` @@ -43,7 +43,7 @@ In this section we create the PR for merging `haskell-updates` into `master`. $ maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit ``` -1. Push these commits to the Nixpkgs repo. +1. Push these commits to the Nixpkgs repository. 1. Open a PR on Nixpkgs merging `haskell-updates` into `master`. @@ -52,7 +52,7 @@ Use the following message body: ```markdown ### This Merge -This PR is the regularly merge of the `haskell-updates` branch into `master`. +This PR is the regular merge of the `haskell-updates` branch into `master`. This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. @@ -85,9 +85,9 @@ defined in the file [release-haskell.nix](../../top-level/release-haskell.nix). #### Notify Maintainers -When Hydra finishes building all the packages, you should generate a build -report to notify maintainers of their broken packages. You can do that with the -following commands: +When Hydra finishes building all the updated packages for the `haskell-updates` +jobset, you should generate a build report to notify maintainers of their +newly broken packages. You can do that with the following commands: ```console $ maintainers/scripts/haskell/hydra-report.hs get-report @@ -115,7 +115,7 @@ may be marked broken before merging `haskell-updates` into `master`. After getting the build report, you can see which packages and Hydra jobs are failing to build. The most important jobs are the `maintained` and `mergeable` jobs. These are both defined in -[`release-haskell.nix](../../top-level/release-haskell.nix). +[`release-haskell.nix`](../../top-level/release-haskell.nix). `mergeable` is a set of the most important Haskell packages, including things like Pandoc and XMonad. These packages are widely used. We would like to @@ -139,9 +139,9 @@ $ maintainers/scripts/haskell/hydra-report.hs get-report $ maintainers/scripts/haskell/hydra-report.hs mark-broken-list ``` -This shows a list of packages that are thought to be broken. +This shows a list of packages that reported broken on `x86_64-linux` on Hydra. -Next, run the following command. +Next, run the following command: ```console $ maintainers/scripts/haskell/mark-broken.sh --do-commit @@ -150,31 +150,79 @@ $ maintainers/scripts/haskell/mark-broken.sh --do-commit This first opens up an editor with the broken package list. Some of these packages may have a maintainer in Nixpkgs. If these maintainers have not been given 7 days to fix up their package, then make sure to remove those packages -from the list. After saving and exiting the editor, the following will -happen: +from the list before continuing. After saving and exiting the editor, the +following will happen: - packages from the list will be added to [`configuration-hackage2nix/broken.yaml`](configuration-hackage2nix/broken.yaml) - `hackage-packages.nix` will be regenerated - the [`configuration-hackage2nix/transitive-broken.yaml`](configuration-hackage2nix/transitive-broken.yaml) - file will be regenerated + file will be updated - `hackage-packages.nix` will be regenerated again - everything will be committed ### Merge `haskell-updates` into `master` -(TODO) +Now it is time to merge the `haskell-updates` PR you opened above. -- mark broken packages with `mark-broken.sh` +Before doing this, make sure of the following: + +- All Haskell packages that fail to build are correctly marked broken or + transitively broken. +- The `maintained` and `mergeable` jobs are passing on Hydra. +- The maintainers for any maintained Haskell packages that are newly broken + have been pinged on GitHub and given at least a week to fix their packages. + This is especially important for widely-used packages like `cachix`. + +When you've double-checked these points, go ahead and merge the `haskell-updates` PR. +After merging, **make sure not to delete the `haskell-updates` branch**, since it +causes all currently open Haskell-related pull-requests to be automatically closed on GitHub. ### Additional Info -(TODO) +Here are some additional tips that didn't fit in above. -- you can restart a Hydra evaluation by logging in with github. +- It is possible to start a new Hydra evaluation by logging into Hydra with + your GitHub or Google account. + +- You should occasionally merge the `master` branch into the + `haskell-updates` branch. + + In an ideal world, when we merge `haskell-updates` into `master`, it would + cause few Hydra rebuilds on `master`. Ideally, the `nixos-unstable` + channel would never be prevented from progressing because of needing to + wait for rebuilding Haskell packages. + + In order to make sure that there are a minimal number of rebuilds after + merging `haskell-updates` into `master`, `master` should occasionally be + merged into the `haskell-updates` branch. + + This is especially important after `staging` is merged into `master`, since + there is a high chance that this will cause all the Haskell packages to + rebuild. + + However, as we are working on cleaning up `haskell-updates`, `master` will + continually progress. It may not always be possible to keep the + `haskell-updates` branch fully up-to-date with `master` without causing + mass-rebuilds on the `haskell-updates` jobset. + +- Make sure never to update the Hackage package hashes in + `pkgs/data/misc/hackage/`, or the pinned Stackage Nightly versions on the + release branches (like `release-21.05`). + + This means that the + [`update-hackage.sh`](../../../maintainers/scripts/haskell/update-hackage.sh) + and + [`update-stackage.sh`](../../../maintainers/scripts/haskell/update-stackage.sh) + scripts should never be used on the release branches. + + However, changing other files in `./.` and regenerating the package set is encouraged. + This can be done with + [`regenerated-hackage-packages.sh`](../../../maintainers/scripts/haskell/regenerated-hackage-packages.sh) + as described above. ## Contributor Workflow -(TODO: this section is to describe the type of workflow for non-comitters to +(TODO: this section is to describe the type of workflow for non-committers to contribute to `haskell-updates`) From efd291080d09150c3c13e1cec2643f63043c1b2e Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Thu, 27 May 2021 21:58:52 +0900 Subject: [PATCH 43/78] haskell-updates: small fixes --- pkgs/development/haskell-modules/HACKING.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 2c1f13763284..3f1baa7a4346 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -63,7 +63,7 @@ I will aim to merge this PR **by 2021-TODO-TODO**. If I can merge it earlier, th Our workflow is currently described at `pkgs/development/haskell-modules/HACKING.md`. The short version is this: -* We regularly update the stackage and hackage pins on `haskell-updates` (normally at the beginning of a merge window). +* We regularly update the Stackage and Hackage pins on `haskell-updates` (normally at the beginning of a merge window). * The community fixes builds of Haskell packages on that branch. * We aim at at least one merge of `haskell-updates` into `master` every two weeks. * We only do the merge if the `mergeable` job is succeeding on hydra. @@ -208,8 +208,9 @@ Here are some additional tips that didn't fit in above. mass-rebuilds on the `haskell-updates` jobset. - Make sure never to update the Hackage package hashes in - `pkgs/data/misc/hackage/`, or the pinned Stackage Nightly versions on the - release branches (like `release-21.05`). + [`pkgs/data/misc/hackage/`](../../../pkgs/data/misc/hackage/), or the + pinned Stackage Nightly versions on the release branches (like + `release-21.05`). This means that the [`update-hackage.sh`](../../../maintainers/scripts/haskell/update-hackage.sh) @@ -219,7 +220,7 @@ Here are some additional tips that didn't fit in above. However, changing other files in `./.` and regenerating the package set is encouraged. This can be done with - [`regenerated-hackage-packages.sh`](../../../maintainers/scripts/haskell/regenerated-hackage-packages.sh) + [`regenerate-hackage-packages.sh`](../../../maintainers/scripts/haskell/regenerate-hackage-packages.sh) as described above. ## Contributor Workflow From 259177f1097be0f8de5969242e98f8e026df8037 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Fri, 28 May 2021 10:47:40 +0900 Subject: [PATCH 44/78] haskellPackages.cabal2nix-unstable: update to latest version from github --- pkgs/development/haskell-modules/cabal2nix-unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/pkgs/development/haskell-modules/cabal2nix-unstable.nix index 1ec16eaf5eb4..00bd9061f01a 100644 --- a/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2021-05-06"; + version = "unstable-2021-05-28"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/b598bc4682b0827554b5780acdd6f948d320283b.tar.gz"; - sha256 = "04afm56cyhj2l41cvq4z11k92jjchr21a8vg9pjaz438pma7jgw1"; + url = "https://github.com/NixOS/cabal2nix/archive/5fb325e094af91328e02cc2ecfd211feaeb135a7.tar.gz"; + sha256 = "1zbd336s99rgk24yjqlp012d0f66s5nf190sjmsl7mfhqx9j2y4l"; }; isLibrary = true; isExecutable = true; From cd36dc4d98c6438312e9f6f4c0bdeb0ff216d5c8 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Fri, 28 May 2021 10:50:12 +0900 Subject: [PATCH 45/78] haskellPackages.greenclip: unmark broken --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 58121aee4706..dcce42760a70 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1690,7 +1690,6 @@ broken-packages: - grasp - gray-code - greencard - - greenclip - greg-client - gremlin-haskell - Grempa From 99e97c88f0e76f2481009da0877089e8e00f9008 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Fri, 28 May 2021 10:53:56 +0900 Subject: [PATCH 46/78] hackage-packages.nix: Regenerate based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- .../haskell-modules/hackage-packages.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ec2605638483..ec09f462298e 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -110881,9 +110881,9 @@ self: { "greenclip" = callPackage ({ mkDerivation, base, binary, bytestring, directory, exceptions - , hashable, libXau, microlens, microlens-mtl, protolude, text - , tomland, unix, vector, wordexp, X11, xcb, xdmcp, xlibsWrapper - , xscrnsaver + , hashable, libXau, libXScrnSaver, microlens, microlens-mtl + , protolude, text, tomland, unix, vector, wordexp, X11, xcb, xdmcp + , xlibsWrapper }: mkDerivation { pname = "greenclip"; @@ -110896,14 +110896,12 @@ self: { microlens-mtl protolude text tomland unix vector wordexp X11 ]; executablePkgconfigDepends = [ - libXau xcb xdmcp xlibsWrapper xscrnsaver + libXau libXScrnSaver xcb xdmcp xlibsWrapper ]; description = "Simple clipboard manager to be integrated with rofi"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; - }) {inherit (pkgs.xorg) libXau; xcb = null; xdmcp = null; - inherit (pkgs) xlibsWrapper; xscrnsaver = null;}; + }) {inherit (pkgs.xorg) libXScrnSaver; inherit (pkgs.xorg) libXau; + xcb = null; xdmcp = null; inherit (pkgs) xlibsWrapper;}; "greg-client" = callPackage ({ mkDerivation, base, binary, bytestring, clock, hostname, network From b29dc5253dcc405554dbeb861ad72f2ef2fc25a5 Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Fri, 28 May 2021 10:56:52 +0800 Subject: [PATCH 47/78] haskellPackages.nvfetcher: add to top-level --- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ pkgs/top-level/all-packages.nix | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 4769ac5fb123..39304ce1e56a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -123,6 +123,8 @@ extra-packages: package-maintainers: abbradar: - Agda + berberman: + - nvfetcher bdesham: - pinboard-notes-backup cdepillabout: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 459617a3aa5e..d2c56a142657 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7138,6 +7138,14 @@ in nvchecker = with python3Packages; toPythonApplication nvchecker; + nvfetcher = with haskell.lib; overrideCabal (justStaticExecutables haskellPackages.nvfetcher) (drv: { + executableToolDepends = [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/nvfetcher \ + --prefix PATH ":" "${nvchecker}/bin:${nix-prefetch-git}/bin" + ''; + }); + miller = callPackage ../tools/text/miller { }; milu = callPackage ../applications/misc/milu { }; From 532ce05a4e8e131bedb9bfd7145b717bb3066923 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Sun, 30 May 2021 10:49:58 +0900 Subject: [PATCH 48/78] haskell-updates: more fixes for workflow documentation Co-authored-by: sterni --- pkgs/development/haskell-modules/HACKING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 3f1baa7a4346..d1779c88fd20 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -28,7 +28,7 @@ In this section we create the PR for merging `haskell-updates` into `master`. 1. Update the Stackage Nightly resolver used by Nixpkgs and create a commit: ```console - $ maintainers/scripts/haskell/update-stackage.sh --do-commit + $ ./maintainers/scripts/haskell/update-stackage.sh --do-commit ``` 1. Update the Hackage package set used by Nixpkgs and create a commit: @@ -100,7 +100,7 @@ comment describes which Haskell packages are now failing to build. It also pings the maintainers so that they know to fix up their packages. It may be helpful to pipe `hydra-report.hs ping-maintainers` into `xclip` -(XOrg) or `wl-clip` (Wayland) in order to post on GitHub. +(XOrg) or `wl-copy` (Wayland) in order to post on GitHub. This build report can be fetched and re-generated for new Hydra evaluations. It may help contributors to try to keep the GitHub comment updated with the @@ -139,7 +139,7 @@ $ maintainers/scripts/haskell/hydra-report.hs get-report $ maintainers/scripts/haskell/hydra-report.hs mark-broken-list ``` -This shows a list of packages that reported broken on `x86_64-linux` on Hydra. +This shows a list of packages that reported a build failure on `x86_64-linux` on Hydra. Next, run the following command: @@ -198,7 +198,7 @@ Here are some additional tips that didn't fit in above. merging `haskell-updates` into `master`, `master` should occasionally be merged into the `haskell-updates` branch. - This is especially important after `staging` is merged into `master`, since + This is especially important after `staging-next` is merged into `master`, since there is a high chance that this will cause all the Haskell packages to rebuild. From dcc4f8ee24b1441e9cc011a57b5b2e0a80c853e0 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 30 May 2021 10:51:33 +0900 Subject: [PATCH 49/78] haskell-updates: add dot slash to commands in maintainer docs --- pkgs/development/haskell-modules/HACKING.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index d1779c88fd20..433865dbd6ca 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -34,13 +34,13 @@ In this section we create the PR for merging `haskell-updates` into `master`. 1. Update the Hackage package set used by Nixpkgs and create a commit: ```console - $ maintainers/scripts/haskell/update-hackage.sh --do-commit + $ ./maintainers/scripts/haskell/update-hackage.sh --do-commit ``` 1. Regenerate the Haskell package set used in Nixpkgs and create a commit: ```console - $ maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit + $ ./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit ``` 1. Push these commits to the Nixpkgs repository. @@ -90,8 +90,8 @@ jobset, you should generate a build report to notify maintainers of their newly broken packages. You can do that with the following commands: ```console -$ maintainers/scripts/haskell/hydra-report.hs get-report -$ maintainers/scripts/haskell/hydra-report.hs ping-maintainers +$ ./maintainers/scripts/haskell/hydra-report.hs get-report +$ ./maintainers/scripts/haskell/hydra-report.hs ping-maintainers ``` The `hyda-report.hs ping-maintainers` command generates a Markdown document @@ -135,8 +135,8 @@ Packages that do not get fixed can be marked broken with the following commands. First check which packages are broken: ```console -$ maintainers/scripts/haskell/hydra-report.hs get-report -$ maintainers/scripts/haskell/hydra-report.hs mark-broken-list +$ ./maintainers/scripts/haskell/hydra-report.hs get-report +$ ./maintainers/scripts/haskell/hydra-report.hs mark-broken-list ``` This shows a list of packages that reported a build failure on `x86_64-linux` on Hydra. @@ -144,7 +144,7 @@ This shows a list of packages that reported a build failure on `x86_64-linux` on Next, run the following command: ```console -$ maintainers/scripts/haskell/mark-broken.sh --do-commit +$ ./maintainers/scripts/haskell/mark-broken.sh --do-commit ``` This first opens up an editor with the broken package list. Some of these From 197dae2b6359518b48424f7ac9e137ec62958f19 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 30 May 2021 10:58:07 +0900 Subject: [PATCH 50/78] haskell-updates: add link for HACKING.md --- pkgs/development/haskell-modules/HACKING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 433865dbd6ca..c8a74e2f5a02 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -60,7 +60,8 @@ I will aim to merge this PR **by 2021-TODO-TODO**. If I can merge it earlier, th ### haskellPackages Workflow Summary -Our workflow is currently described at `pkgs/development/haskell-modules/HACKING.md`. +Our workflow is currently described in +[`pkgs/development/haskell-modules/HACKING.md`](https://github.com/NixOS/nixpkgs/blob/haskell-updates/pkgs/development/haskell-modules/HACKING.md). The short version is this: * We regularly update the Stackage and Hackage pins on `haskell-updates` (normally at the beginning of a merge window). From bd6a1e163cac33e6b583000fd22de0c69f2bd09d Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 30 May 2021 11:51:42 +0900 Subject: [PATCH 51/78] haskell-updates: update workflow documentation to put goal first --- pkgs/development/haskell-modules/HACKING.md | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index c8a74e2f5a02..96b9e3393528 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -1,15 +1,16 @@ ## Maintainer Workflow -This is the documentation for periodically merging the `haskell-updates` branch -into the `master` branch. This workflow is performed by members in the -[@NixOS/haskell](https://github.com/orgs/NixOS/teams/haskell) team. -Each member of the team takes a two week period where they are in charge of -merging the `haskell-updates` branch into `master`. +The goal of the [@NixOS/haskell](https://github.com/orgs/NixOS/teams/haskell) +team is to keep the Haskell packages in Nixpkgs up-to-date, while making sure +there are no Haskell-related evaluation errors or build errors that get into +the Nixpkgs `master` branch. -The goal of this workflow is to regularly merge the `haskell-updates` branch -into the `master` branch, while making sure there are no evaluation errors or -build errors that get into `master`. +We do this by periodically merging an updated set of Haskell packages on the +`haskell-updates` branch into the `master` branch. Each member of the team +takes a two week period where they are in charge of merging the +`haskell-updates` branch into `master`. This is the documentation for this +workflow. The workflow generally proceeds in three main steps: @@ -17,7 +18,7 @@ The workflow generally proceeds in three main steps: 1. wait for contributors to fix newly broken Haskell packages 1. merge `haskell-updates` into `master` -We describe each of these steps in a separate section. +Each of these steps is described in a separate section. ### Initial `haskell-updates` PR From 6b80742d4da3b4272a781de647dc3fb90d0b645e Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 30 May 2021 13:19:56 +0900 Subject: [PATCH 52/78] haskell-updates: update workflow documentation to explain transitive broken package list --- pkgs/development/haskell-modules/HACKING.md | 28 +++++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 96b9e3393528..83aab30a302e 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -155,14 +155,26 @@ given 7 days to fix up their package, then make sure to remove those packages from the list before continuing. After saving and exiting the editor, the following will happen: -- packages from the list will be added to - [`configuration-hackage2nix/broken.yaml`](configuration-hackage2nix/broken.yaml) -- `hackage-packages.nix` will be regenerated -- the - [`configuration-hackage2nix/transitive-broken.yaml`](configuration-hackage2nix/transitive-broken.yaml) - file will be updated -- `hackage-packages.nix` will be regenerated again -- everything will be committed +- Packages from the list will be added to + [`configuration-hackage2nix/broken.yaml`](configuration-hackage2nix/broken.yaml). + This is a list of Haskell packages that are known to be broken. + +- [`hackage-packages.nix`](hackage-packages.nix) will be regenerated. This + will mark all Haskell pacakges in `configuration-hackage2nix/broken.yaml` + as `broken`. + +- The + [`configuration-hackage2nix/transitive-broken.yaml`](configuration-hackage2nix/transitive-broken.yaml) + file will be updated. This is a list of Haskell packages that + depend on a package in `configuration-hackage2nix/broken.yaml` or + `configuration-hackage2nix/transitive-broken.yaml` + +- `hackage-packages.nix` will be regenerated again. This will set + `hydraPlatforms = none` for all the packages in + `configuration-hackage2nix/transitive-broken.yaml`. This makes + sure that Hydra does not try to build any of these packages. + +- All updated files will be committed. ### Merge `haskell-updates` into `master` From adfec8b5e043dec328a4aaea9f5a43cc3ea0029f Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 30 May 2021 13:31:29 +0900 Subject: [PATCH 53/78] haskell-updates: update workflow documentation to expand section on merging master into haskell-updates --- pkgs/development/haskell-modules/HACKING.md | 57 +++++++++++---------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 83aab30a302e..02085bdd8061 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -176,18 +176,42 @@ following will happen: - All updated files will be committed. +#### Merge `master` into `haskell-updates` + +You should occasionally merge the `master` branch into the `haskell-updates` +branch. + +In an ideal world, when we merge `haskell-updates` into `master`, it would +cause few Hydra rebuilds on `master`. Ideally, the `nixos-unstable` channel +would never be prevented from progressing because of needing to wait for +rebuilding Haskell packages. + +In order to make sure that there are a minimal number of rebuilds after merging +`haskell-updates` into `master`, `master` should occasionally be merged into +the `haskell-updates` branch. + +This is especially important after `staging-next` is merged into `master`, +since there is a high chance that this will cause all the Haskell packages to +rebuild. + ### Merge `haskell-updates` into `master` Now it is time to merge the `haskell-updates` PR you opened above. Before doing this, make sure of the following: -- All Haskell packages that fail to build are correctly marked broken or - transitively broken. -- The `maintained` and `mergeable` jobs are passing on Hydra. -- The maintainers for any maintained Haskell packages that are newly broken - have been pinged on GitHub and given at least a week to fix their packages. - This is especially important for widely-used packages like `cachix`. +- All Haskell packages that fail to build are correctly marked broken or + transitively broken. + +- The `maintained` and `mergeable` jobs are passing on Hydra. + +- The maintainers for any maintained Haskell packages that are newly broken + have been pinged on GitHub and given at least a week to fix their packages. + This is especially important for widely-used packages like `cachix`. + +- Make sure you first merge the `master` branch into `haskell-updates`. Wait + for Hydra to evaluate the new `haskell-updates` jobset. Make sure you only + merge `haskell-updates` into `master` when there are no evaluation errors. When you've double-checked these points, go ahead and merge the `haskell-updates` PR. After merging, **make sure not to delete the `haskell-updates` branch**, since it @@ -200,27 +224,6 @@ Here are some additional tips that didn't fit in above. - It is possible to start a new Hydra evaluation by logging into Hydra with your GitHub or Google account. -- You should occasionally merge the `master` branch into the - `haskell-updates` branch. - - In an ideal world, when we merge `haskell-updates` into `master`, it would - cause few Hydra rebuilds on `master`. Ideally, the `nixos-unstable` - channel would never be prevented from progressing because of needing to - wait for rebuilding Haskell packages. - - In order to make sure that there are a minimal number of rebuilds after - merging `haskell-updates` into `master`, `master` should occasionally be - merged into the `haskell-updates` branch. - - This is especially important after `staging-next` is merged into `master`, since - there is a high chance that this will cause all the Haskell packages to - rebuild. - - However, as we are working on cleaning up `haskell-updates`, `master` will - continually progress. It may not always be possible to keep the - `haskell-updates` branch fully up-to-date with `master` without causing - mass-rebuilds on the `haskell-updates` jobset. - - Make sure never to update the Hackage package hashes in [`pkgs/data/misc/hackage/`](../../../pkgs/data/misc/hackage/), or the pinned Stackage Nightly versions on the release branches (like From 95e7f26425430ef4c9f176a84807cf4d0a4bd4ae Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 30 May 2021 14:16:03 +0900 Subject: [PATCH 54/78] haskell-updates: update workflow documentation with a few small fixes --- pkgs/development/haskell-modules/HACKING.md | 28 +++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 02085bdd8061..8032614a408d 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -221,8 +221,29 @@ causes all currently open Haskell-related pull-requests to be automatically clos Here are some additional tips that didn't fit in above. -- It is possible to start a new Hydra evaluation by logging into Hydra with - your GitHub or Google account. +- Hydra tries to evalute the `haskell-updates` branch (in the + [`nixpkgs:haskell-updates`](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates) + jobset) every 4 hours. It is possible to force a new Hydra evaluation without + waiting 4 hours by the following steps: + + 1. Log into Hydra with your GitHub or Google account. + 1. Go to the [nixpkgs:haskell-updates](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates) jobset. + 1. Click the `Actions` button. + 1. Select `Evaluate this jobset`. + 1. If you refresh the page, there should be a new `Evaluation running since:` line. + 1. Evaluations take about 10 minutes to finish. + +- It is sometimes helpful to update the version of + [`cabal2nix` / `hackage2nix`](https://github.com/NixOS/cabal2nix) that our + maintainer scripts use. This can be done with the + [`maintainers/scripts/haskell/update-cabal2nix-unstable.sh`](../../../maintainers/scripts/haskell/update-cabal2nix-unstable.sh) + script. + + You might want to do this if a user contributes a fix to `cabal2nix` that + will immediately fix a Haskell package in Nixpkgs. First, merge in + the PR to `cabal2nix`, then run `update-cabal2nix-upstable.sh`. Finally, run + [`regenerate-hackage-packages.sh`](../../../maintainers/scripts/haskell/regenerate-hackage-packages.sh) + to regenerate the Hackage package set with the updated version of `hackage2nix`. - Make sure never to update the Hackage package hashes in [`pkgs/data/misc/hackage/`](../../../pkgs/data/misc/hackage/), or the @@ -240,6 +261,9 @@ Here are some additional tips that didn't fit in above. [`regenerate-hackage-packages.sh`](../../../maintainers/scripts/haskell/regenerate-hackage-packages.sh) as described above. +- The Haskell team members generally hang out in the Matrix room + [#haskell-space:matrix.org](https://matrix.to/#/#haskell-space:matrix.org). + ## Contributor Workflow (TODO: this section is to describe the type of workflow for non-committers to From 2451208b1bf3f0bd1b24068db72b4d81c5da63a7 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Sun, 30 May 2021 21:55:55 +0900 Subject: [PATCH 55/78] haskell-updates: team workflow update link to matrix space --- pkgs/development/haskell-modules/HACKING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md index 8032614a408d..7c46e1560fd3 100644 --- a/pkgs/development/haskell-modules/HACKING.md +++ b/pkgs/development/haskell-modules/HACKING.md @@ -262,7 +262,7 @@ Here are some additional tips that didn't fit in above. as described above. - The Haskell team members generally hang out in the Matrix room - [#haskell-space:matrix.org](https://matrix.to/#/#haskell-space:matrix.org). + [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org). ## Contributor Workflow From 8f33bb975daf526d916035413b67fcc939f09c5c Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 24 May 2021 00:19:09 +0200 Subject: [PATCH 56/78] haskellPackages.hakyll: unbreak, jailbreak, patch for pandoc version --- .../haskell-modules/configuration-common.nix | 17 +++++++++++++++++ .../configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 08372141b7a4..446e30481d79 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1144,6 +1144,23 @@ self: super: { # Therefore we jailbreak it. hakyll-contrib-hyphenation = doJailbreak super.hakyll-contrib-hyphenation; + # Jailbreak due to bounds on multiple dependencies, + # bound on pandoc needs to be patched since it is conditional + hakyll = doJailbreak (overrideCabal super.hakyll (drv: { + patches = [ + # Remove when Hakyll > 4.14.0.0 + (pkgs.fetchpatch { + url = "https://github.com/jaspervdj/hakyll/commit/0dc6127d81ff688e27c36ce469230320eee60246.patch"; + sha256 = "sha256-YyRz3bAmIBODTEeS5kGl2J2x31SjiPoLzUZUlo3nHvQ="; + }) + # Remove when Hakyll > 4.14.0.0 + (pkgs.fetchpatch { + url = "https://github.com/jaspervdj/hakyll/commit/af9e29b5456c105dc948bc46c93e989a650b5ed1.patch"; + sha256 = "sha256-ghc0V5L9OybNHWKmM0vhjRBN2rIvDlp+ClcK/aQst44="; + }) + ]; + })); + # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index dcce42760a70..0ac31d1f4b13 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -1759,7 +1759,6 @@ broken-packages: - hakismet - hakka - hako - - hakyll - hakyll-shortcode - HaLeX - halfs diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ec09f462298e..7f318f5cb162 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -114880,8 +114880,6 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage From d68632f5fd42a94330b7770899c1a2c70484ef5f Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 1 Jun 2021 12:36:18 +0200 Subject: [PATCH 57/78] haskell.packages: regenerate package set --- pkgs/development/haskell-modules/hackage-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 7f318f5cb162..6b8be688ed7c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -188408,6 +188408,7 @@ self: { ]; description = "Generate nix sources expr for the latest version of packages"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ berberman ]; }) {}; "nvim-hs" = callPackage From b401b432099d174dadd26a4c00f5afb62d7c2e01 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Mon, 24 May 2021 00:25:55 +0200 Subject: [PATCH 58/78] haskellPackages.webify: unbreak, jailbreak, as patches are not upstreamable atm --- .../haskell-modules/configuration-common.nix | 12 ++++-------- .../configuration-hackage2nix/broken.yaml | 1 - .../development/haskell-modules/hackage-packages.nix | 2 -- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 446e30481d79..5cc0a3e79cd5 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1212,14 +1212,10 @@ self: super: { hasql-notifications = dontCheck super.hasql-notifications; hasql-pool = dontCheck super.hasql-pool; - # This bumps optparse-applicative to <0.16 in the cabal file, as otherwise - # the version bounds are not satisfied. This can be removed if the PR at - # https://github.com/ananthakumaran/webify/pull/27 is merged and a new - # release of webify is published. - webify = appendPatch super.webify (pkgs.fetchpatch { - url = "https://github.com/ananthakumaran/webify/pull/27/commits/6d653e7bdc1ffda75ead46851b5db45e87cb2aa0.patch"; - sha256 = "0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2"; - }); + # We jailbreak webify, as optparse-applicative evolved past the version bound + # and the corresponding (and outdated) PR was not merged for a year. + # https://github.com/ananthakumaran/webify/pull/27 + webify = doJailbreak super.webify; # hasn‘t bumped upper bounds # upstream: https://github.com/obsidiansystems/which/pull/6 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0ac31d1f4b13..0356b46d0a96 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -5066,7 +5066,6 @@ broken-packages: - web-encodings - WeberLogic - webfinger-client - - webify - webkit-javascriptcore - webmention - web-output diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6b8be688ed7c..0357b4049523 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -278751,8 +278751,6 @@ self: { ]; description = "webfont generator"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "webkit" = callPackage From 81c8d158a86631cd6de7b73889730ed375dfb463 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Mon, 31 May 2021 00:26:03 +0200 Subject: [PATCH 59/78] ghc: add missing meta data `haskellCompilerName` in cabal2nix and hence ghc 8.10.2 and 8.6.5 "-binary" were not working correctly in this context. --- pkgs/development/compilers/ghc/8.10.2-binary.nix | 3 +++ pkgs/development/compilers/ghc/8.6.5-binary.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/compilers/ghc/8.10.2-binary.nix b/pkgs/development/compilers/ghc/8.10.2-binary.nix index 13eba00fae6b..ad1a47e5cc9f 100644 --- a/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -212,6 +212,9 @@ stdenv.mkDerivation rec { passthru = { targetPrefix = ""; enableShared = true; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; }; meta = rec { diff --git a/pkgs/development/compilers/ghc/8.6.5-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index 092511ba6d78..8a0994b8b6a5 100644 --- a/pkgs/development/compilers/ghc/8.6.5-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -171,6 +171,9 @@ stdenv.mkDerivation rec { passthru = { targetPrefix = ""; enableShared = true; + + # Our Cabal compiler name + haskellCompilerName = "ghc-${version}"; }; meta = rec { From 8f218b3a8cbfee5f3cd86bdf71a84c8fcac9ec27 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 1 Jun 2021 14:29:44 +0200 Subject: [PATCH 60/78] haskell: add erictapen as maintainer for some packages --- .../haskell-modules/configuration-hackage2nix/main.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 39304ce1e56a..742ab42fd73a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -143,6 +143,10 @@ package-maintainers: - vector-sized - vulkan - vulkan-utils + erictapen: + - hakyll + - hakyll-contrib-hyphenation + - webify Gabriel439: - annah - bench From e342bd59870854ef699ecd3346459a4441710667 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 1 Jun 2021 14:35:58 +0200 Subject: [PATCH 61/78] hackage-packages.nix: Regenerate based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- pkgs/development/haskell-modules/hackage-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 0357b4049523..e30930a40cb9 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -114880,6 +114880,7 @@ self: { testToolDepends = [ utillinux ]; description = "A static website compiler library"; license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ erictapen ]; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -115005,6 +115006,7 @@ self: { description = "automatic hyphenation for Hakyll"; license = lib.licenses.mit; hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ erictapen ]; }) {}; "hakyll-contrib-i18n" = callPackage @@ -278751,6 +278753,7 @@ self: { ]; description = "webfont generator"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ erictapen ]; }) {}; "webkit" = callPackage From ff55c41facaa6812f9cc879a49f6929321881d4f Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 1 Jun 2021 14:42:21 +0200 Subject: [PATCH 62/78] dockerTools: Fix passthru image tag It should match the actual image tag. This fixes the problem introduced in 00996b5e03f33bebafc2b17c41a175d3726a9bde https://github.com/NixOS/nixpkgs/pull/115491#pullrequestreview-672789901 --- pkgs/build-support/docker/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 5bbf1b63f2b0..89510cd6330c 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -536,7 +536,7 @@ rec { passthru.layer = layer; passthru.imageTag = if tag != null - then lib.toLower tag + then tag else lib.head (lib.strings.splitString "-" (baseNameOf result.outPath)); # Docker can't be made to run darwin binaries From 0b32978596d24542e6561a31b5f134ddcc6b811c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eduardo=20S=C3=A1nchez=20Mu=C3=B1oz?= Date: Tue, 1 Jun 2021 17:27:24 +0200 Subject: [PATCH 63/78] dr14_tmeter: use ffmpeg 4 migrate away from ffmpeg_3 (https://github.com/NixOS/nixpkgs/issues/120705) --- pkgs/applications/audio/dr14_tmeter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix index 80b2cff3ce03..649c0f39097f 100644 --- a/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/pkgs/applications/audio/dr14_tmeter/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { }; propagatedBuildInputs = with pkgs; [ - python3Packages.numpy flac vorbis-tools ffmpeg_3 faad2 lame + python3Packages.numpy flac vorbis-tools ffmpeg faad2 lame ]; # There are no tests From b4daf5c91035cdac3f8a1aa0d9df2a0b69f5c530 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 1 Jun 2021 09:18:17 -0700 Subject: [PATCH 64/78] openrgb: 0.5 -> 0.6 --- pkgs/applications/misc/openrgb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/openrgb/default.nix b/pkgs/applications/misc/openrgb/default.nix index df9e149d9a7c..728a2048bc3d 100644 --- a/pkgs/applications/misc/openrgb/default.nix +++ b/pkgs/applications/misc/openrgb/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openrgb"; - version = "0.5"; + version = "0.6"; src = fetchFromGitLab { owner = "CalcProgrammer1"; repo = "OpenRGB"; rev = "release_${version}"; - sha256 = "001x2ycfmlb9s21sp91aw5gxizcn6kzm8x7bvkps4b1iq0ap5fzv"; + sha256 = "sha256-x/wGD39Jm/kmcTEZP3BnLXxyv/jkPOJd6mLCO0dp5wM="; }; nativeBuildInputs = [ qmake pkg-config ]; From 8d41f2c92b64fbcecc65b6b9a4aef7d2d78c8ac1 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Wed, 2 Jun 2021 01:33:24 +0000 Subject: [PATCH 65/78] procs: 0.11.4 -> 0.11.8 Signed-off-by: Arthur Gautier --- pkgs/tools/admin/procs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index c8d11474d5b6..e86bfb31101a 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.11.4"; + version = "0.11.8"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jqcI0ne6fZkgr4bWJ0ysVNvB7q9ErYbsmZoXI38XUng="; + sha256 = "sha256-ZeCTUoi2HAMUeyze7LdxH0mi1Dd6q8Sw6+xPAVf3HTs="; }; - cargoSha256 = "sha256-JTjkMXwLLh/kjqAFmi2c59F8POAqn5t/kTJfJkR2BL4="; + cargoSha256 = "sha256-8myay5y4PGb/8s0vPLeg9xt6xqAQxGFXJz/GiV0ABlA="; nativeBuildInputs = [ installShellFiles ]; From 471399b7729c0a0f7b1bf0af484b70ca5153731d Mon Sep 17 00:00:00 2001 From: Potato Hatsue <1793913507@qq.com> Date: Wed, 2 Jun 2021 11:28:42 +0800 Subject: [PATCH 66/78] haskellPackages.arch-web: unbreak --- .../haskell-modules/configuration-hackage2nix/broken.yaml | 1 - .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + pkgs/development/haskell-modules/configuration-nix.nix | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index 0356b46d0a96..da10af5b53d6 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -171,7 +171,6 @@ broken-packages: - archiver - archlinux - archnews - - arch-web - arena - argon2 - argparser diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 742ab42fd73a..86edacf144ba 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -125,6 +125,7 @@ package-maintainers: - Agda berberman: - nvfetcher + - arch-web bdesham: - pinboard-notes-backup cdepillabout: diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d18f22c3e62d..a9f6263ab5dd 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -196,6 +196,7 @@ self: super: builtins.intersectAttrs super { tcp-streams = dontCheck super.tcp-streams; holy-project = dontCheck super.holy-project; mustache = dontCheck super.mustache; + arch-web = dontCheck super.arch-web; # Tries to mess with extended POSIX attributes, but can't in our chroot environment. xattr = dontCheck super.xattr; From 7191381b24b511017207205e2c8625a91ccea5cf Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 2 Jun 2021 13:17:10 +0900 Subject: [PATCH 67/78] hackage-packages.nix: Regenerate based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- pkgs/development/haskell-modules/hackage-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e30930a40cb9..9ec6640f3d90 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -32186,8 +32186,7 @@ self: { ]; description = "Arch Linux official and AUR web interface binding"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; + maintainers = with lib.maintainers; [ berberman ]; }) {}; "archive" = callPackage From f42a1d9df5a413cd80b36081922aaf3b7c33f8e6 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 2 Jun 2021 08:38:39 +0200 Subject: [PATCH 68/78] pantalaimon: install manuals --- .../instant-messengers/pantalaimon/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index dd46b64e4f64..214675349936 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, prompt_toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, - setuptools, fetchpatch, + setuptools, fetchpatch, installShellFiles, pytest, faker, pytest-aiohttp, aioresponses, @@ -56,6 +56,10 @@ buildPythonApplication rec { aioresponses ]; + nativeBuildInputs = [ + installShellFiles + ]; + # darwin has difficulty communicating with server, fails some integration tests doCheck = !stdenv.isDarwin; @@ -63,6 +67,10 @@ buildPythonApplication rec { pytest ''; + postInstall = '' + installManPage docs/man/*.[1-9] + ''; + meta = with lib; { description = "An end-to-end encryption aware Matrix reverse proxy daemon"; homepage = "https://github.com/matrix-org/pantalaimon"; From c57b309d32d74e4f1e60d32d32c53a76aac89577 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 30 May 2021 22:06:45 +0200 Subject: [PATCH 69/78] android-tools: init at 31.0.0p1 lowPrio is used to avoid collisions with the simg2img package. Licensing information is in share/licenses/android-tools/AOSP_LICENSE. --- lib/licenses.nix | 5 +++ pkgs/tools/misc/android-tools/default.nix | 46 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 55 insertions(+) create mode 100644 pkgs/tools/misc/android-tools/default.nix diff --git a/lib/licenses.nix b/lib/licenses.nix index 88d598d92079..d79ac9004396 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -760,6 +760,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) ({ # channel and NixOS images. }; + unicode-dfs-2015 = spdx { + spdxId = "Unicode-DFS-2015"; + fullName = "Unicode License Agreement - Data Files and Software (2015)"; + }; + unicode-dfs-2016 = spdx { spdxId = "Unicode-DFS-2016"; fullName = "Unicode License Agreement - Data Files and Software (2016)"; diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix new file mode 100644 index 000000000000..69a74e465c91 --- /dev/null +++ b/pkgs/tools/misc/android-tools/default.nix @@ -0,0 +1,46 @@ +{ lib, stdenv, fetchurl +, cmake, perl, go +, protobuf, zlib, gtest, brotli, lz4, zstd, libusb1, pcre2 +}: + +stdenv.mkDerivation rec { + pname = "android-tools"; + version = "31.0.0p1"; + + src = fetchurl { + url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; + sha256 = "1dn7v10gdx1pi0pkddznd5sdz941qz0x4jww8h2mk50nbyxc792i"; + }; + + nativeBuildInputs = [ cmake perl go ]; + buildInputs = [ protobuf zlib gtest brotli lz4 zstd libusb1 pcre2 ]; + + # Don't try to fetch any Go modules via the network: + GOFLAGS = [ "-mod=vendor" ]; + + preConfigure = '' + export GOCACHE=$TMPDIR/go-cache + ''; + + meta = with lib; { + description = "Android SDK platform tools"; + longDescription = '' + Android SDK Platform-Tools is a component for the Android SDK. It + includes tools that interface with the Android platform, such as adb and + fastboot. These tools are required for Android app development. They're + also needed if you want to unlock your device bootloader and flash it + with a new system image. + Currently the following tools are supported: + - adb + - fastboot + - mke2fs.android (required by fastboot) + - simg2img, img2simg, append2simg + ''; + # https://developer.android.com/studio/command-line#tools-platform + # https://developer.android.com/studio/releases/platform-tools + homepage = "https://github.com/nmeum/android-tools"; + license = with licenses; [ asl20 unicode-dfs-2015 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85af183b8bcd..86fb75f6bb7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1039,6 +1039,10 @@ in analog = callPackage ../tools/admin/analog {}; + android-tools = lowPrio (callPackage ../tools/misc/android-tools { + stdenv = if stdenv.targetPlatform.isAarch64 then gcc10Stdenv else stdenv; + }); + angle-grinder = callPackage ../tools/text/angle-grinder {}; ansifilter = callPackage ../tools/text/ansifilter {}; From a26fcc1816894d0e5d548191381d7bce721ded41 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Jun 2021 11:01:06 +0000 Subject: [PATCH 70/78] bash_unit: 1.7.1 -> 1.7.2 --- pkgs/tools/misc/bash_unit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/tools/misc/bash_unit/default.nix index 7541281eeb67..9f574da85a51 100644 --- a/pkgs/tools/misc/bash_unit/default.nix +++ b/pkgs/tools/misc/bash_unit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bash_unit"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "pgrange"; repo = pname; rev = "v${version}"; - sha256 = "02cam5gkhnlwhb9aqcqmkl8kskgikih0bmyx09ybi3gpaf4z82f7"; + sha256 = "sha256-+hEgag5H7PaBwZSBp3D17q3TZRO2SVBe5M1Ep/jeg1w="; }; installPhase = '' From 16a47f259713cc34518fe9df0a62f18022e9011d Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 2 Jun 2021 14:12:36 +0200 Subject: [PATCH 71/78] terraform-providers.aws: 3.39.0 -> 3.43.0 --- .../networking/cluster/terraform-providers/providers.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b4171aa4da2a..929c3a27c67f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -70,10 +70,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v3.39.0", - "sha256": "05clqnrgh8ydwnsb1bacg9is7pzwqz5ncr806xgvryxybp8lz2jg", - "vendorSha256": "104cmwlzrcggb6fd1h7igy30g8542mzzzb6i54ldn5s1dahhprmb", - "version": "3.39.0" + "rev": "v3.43.0", + "sha256": "05rv93y9hf0l869q6i581748rw4bahvsgggj0h7cwjnf7xap0sxj", + "vendorSha256": "1m6pkrpknslqnv60cz5739gp5nxc7xhga402wkl37gdagmadkmrk", + "version": "3.43.0" }, "azuread": { "owner": "hashicorp", From c0693eae1e9cb28ad148ebb49f8200d340432079 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Jun 2021 15:31:31 +0000 Subject: [PATCH 72/78] hwi: 2.0.1 -> 2.0.2 --- pkgs/development/python-modules/hwi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index 5da15fa3e233..7b6daf1fad05 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "hwi"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "bitcoin-core"; repo = "HWI"; rev = version; - sha256 = "148m0vgwm6l8drcx6j3fjs2zpdzvslk4w2nkb8nm0g8qdlm6gjlw"; + sha256 = "sha256-s0pKYqesZjHE6YndqsMwCuqLK7eE82oRiSXxBdUtEX4="; }; propagatedBuildInputs = [ From 60f5a3c18d1b2f0b649531a836754dc73f52ecbf Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 2 Jun 2021 12:48:35 -0300 Subject: [PATCH 73/78] ocamlPackages.junit: init 2.0.2 ocamlPackages.junit_ounit: init 2.0.2 ocamlPackages.junit_alcotest: init 2.0.2 --- .../ocaml-modules/junit/alcotest.nix | 14 ++++++++++ .../ocaml-modules/junit/default.nix | 26 +++++++++++++++++++ .../development/ocaml-modules/junit/ounit.nix | 14 ++++++++++ pkgs/top-level/ocaml-packages.nix | 4 +++ 4 files changed, 58 insertions(+) create mode 100644 pkgs/development/ocaml-modules/junit/alcotest.nix create mode 100644 pkgs/development/ocaml-modules/junit/default.nix create mode 100644 pkgs/development/ocaml-modules/junit/ounit.nix diff --git a/pkgs/development/ocaml-modules/junit/alcotest.nix b/pkgs/development/ocaml-modules/junit/alcotest.nix new file mode 100644 index 000000000000..85abaf7f872b --- /dev/null +++ b/pkgs/development/ocaml-modules/junit/alcotest.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, junit, alcotest }: + +buildDunePackage ({ + pname = "junit_alcotest"; + + inherit (junit) src version meta useDune2; + + propagatedBuildInputs = [ + junit + alcotest + ]; + + doCheck = false; # 2 tests fail: 1) "Test with unexpected exception"; 2) "with wrong result"; +}) diff --git a/pkgs/development/ocaml-modules/junit/default.nix b/pkgs/development/ocaml-modules/junit/default.nix new file mode 100644 index 000000000000..c91625e823b0 --- /dev/null +++ b/pkgs/development/ocaml-modules/junit/default.nix @@ -0,0 +1,26 @@ +{ lib, fetchurl, buildDunePackage, ptime, tyxml }: + +buildDunePackage (rec { + pname = "junit"; + version = "2.0.2"; + + src = fetchurl { + url = "https://github.com/Khady/ocaml-junit/releases/download/${version}/junit-${version}.tbz"; + sha256 = "00bbx5j8vsy9fqbc04xa3lsalaxicirmbczr65bllfk1afv43agx"; + }; + + propagatedBuildInputs = [ + ptime + tyxml + ]; + + useDune2 = true; + doCheck = true; + + meta = with lib; { + description = "ocaml-junit is an OCaml package for the creation of JUnit XML reports, proving a typed API to produce valid reports acceptable to Jenkins, comes with packages supporting OUnit and Alcotest."; + license = licenses.gpl3; + maintainers = with maintainers; [ superherointj ]; + homepage = "https://github.com/Khady/ocaml-junit"; + }; +}) diff --git a/pkgs/development/ocaml-modules/junit/ounit.nix b/pkgs/development/ocaml-modules/junit/ounit.nix new file mode 100644 index 000000000000..5f261b07236f --- /dev/null +++ b/pkgs/development/ocaml-modules/junit/ounit.nix @@ -0,0 +1,14 @@ +{ buildDunePackage, junit, ounit }: + +buildDunePackage ({ + pname = "junit_ounit"; + + inherit (junit) src version meta useDune2; + + propagatedBuildInputs = [ + junit + ounit + ]; + + doCheck = true; +}) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b58fe1f4294e..11d511c9c949 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -543,6 +543,10 @@ let jsonm = callPackage ../development/ocaml-modules/jsonm { }; + junit = callPackage ../development/ocaml-modules/junit { }; + junit_ounit = callPackage ../development/ocaml-modules/junit/ounit.nix { }; + junit_alcotest = callPackage ../development/ocaml-modules/junit/alcotest.nix { }; + jwto = callPackage ../development/ocaml-modules/jwto { }; kafka = callPackage ../development/ocaml-modules/kafka { }; From 2565e3bba62d8d2f57a975c7ecce97d7c557dfa6 Mon Sep 17 00:00:00 2001 From: Anbang Wen Date: Sun, 30 May 2021 21:48:04 -0700 Subject: [PATCH 74/78] nixos/apple-sdk: 11.0 -> 11.1 The previous URL is a dead link. This commit updates it and bump the SDK version to 11.1. --- pkgs/os-specific/darwin/apple-sdk-11.0/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix index 03a6650d9d98..44b119e1a23e 100644 --- a/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix +++ b/pkgs/os-specific/darwin/apple-sdk-11.0/default.nix @@ -6,10 +6,10 @@ let pname = "MacOSX-SDK"; version = "11.0.0"; - # https://swscan.apple.com/content/catalogs/others/index-10.16.merged-1.sucatalog + # https://swscan.apple.com/content/catalogs/others/index-11-10.15-10.14-10.13-10.12-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog src = fetchurl { - url = "http://swcdn.apple.com/content/downloads/58/37/001-75138-A_59RXKDS8YM/12ksm19hgzscfc7cau3yhecz4vpkps7wbq/CLTools_macOSNMOS_SDK.pkg"; - sha256 = "0n51ba926ckwm62w5c8lk3w5hj4ihk0p5j02321qi75wh824hl8m"; + url = "http://swcdn.apple.com/content/downloads/46/21/001-89745-A_56FM390IW5/v1um2qppgfdnam2e9cdqcqu2r6k8aa3lis/CLTools_macOSNMOS_SDK.pkg"; + sha256 = "0n425smj4q1vxbza8fzwnk323fyzbbq866q32w288c44hl5yhwsf"; }; dontBuild = true; @@ -24,7 +24,7 @@ let ''; installPhase = '' - cd Library/Developer/CommandLineTools/SDKs/MacOSX11.0.sdk + cd Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk mkdir $out cp -r System usr $out/ From 41f507b1ef4175ec6a26b5e19c1118dbda983a42 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 2 Jun 2021 17:06:15 +0000 Subject: [PATCH 75/78] ansible: 2.11.0 -> 2.11.1 --- pkgs/development/python-modules/ansible/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix index 690d5a1725d4..b300771b346a 100644 --- a/pkgs/development/python-modules/ansible/core.nix +++ b/pkgs/development/python-modules/ansible/core.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "ansible-core"; - version = "2.11.0"; + version = "2.11.1"; src = fetchPypi { inherit pname version; - sha256 = "1if9cybdicjhrfzi6nndqakb4sh3mw1fijhvbzbsq7ki22vwww4l"; + sha256 = "sha256-fnWCepTUfRw+GTDXCPDvY3o6uaIfdXqvVd6rbp9HxoI="; }; # ansible_connection is already wrapped, so don't pass it through From c10391366135b842d70b3d1a9dbc0eab9a1e346a Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Wed, 2 Jun 2021 10:06:54 -0700 Subject: [PATCH 76/78] ptags: Add `ctags` to the PATH Signed-off-by: Pamplemousse --- pkgs/development/tools/misc/ptags/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/ptags/default.nix b/pkgs/development/tools/misc/ptags/default.nix index c17bfd67358a..b8be0ee3dc6d 100644 --- a/pkgs/development/tools/misc/ptags/default.nix +++ b/pkgs/development/tools/misc/ptags/default.nix @@ -1,8 +1,9 @@ { fetchFromGitHub , cargo +, ctags , lib +, makeWrapper , rustPlatform - }: rustPlatform.buildRustPackage rec { @@ -18,6 +19,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1pz5hvn1iq26i8c2cmqavhnri8h0sn40khrxvcdkj9q47nsj5wcx"; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + # `ctags` must be accessible in `PATH` for `ptags` to work. + wrapProgram "$out/bin/ptags" \ + --prefix PATH : "${lib.makeBinPath [ ctags ]}" + ''; + # Sanity check. checkPhase = '' $releaseDir/ptags --help > /dev/null From cbfd8831a1082f6bea819f92c8bfd6ec688c9fc4 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 2 Jun 2021 17:17:39 +0200 Subject: [PATCH 77/78] pdns-recursor: disable on i686-linux Support for 32-bit platforms with no 64-bit time_t has ended. See https://mailman.powerdns.com/pipermail/pdns-users/2021-May/027220.html --- pkgs/servers/dns/pdns-recursor/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index fa8723ea9658..ee3d8aafa1c6 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { description = "A recursive DNS server"; homepage = "https://www.powerdns.com/"; platforms = platforms.linux; + badPlatforms = [ + "i686-linux" # a 64-bit time_t is needed + ]; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; }; From 0520141db0c60b7ac42f21b401c79b87b78f0c9c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Jun 2021 11:52:02 -0700 Subject: [PATCH 78/78] nixos/release-notes: Improve 21.11 stub --- .../from_md/release-notes/rl-2111.section.xml | 17 ++++++++++++++++- .../doc/manual/release-notes/rl-2111.section.md | 8 +++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index dc5a30d19bc3..e861b4fe7e28 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -12,8 +12,18 @@ +
+ Highlights + + +
+
+ New Services + + +
- Backward incompatibilities + Backward Incompatibilities @@ -23,4 +33,9 @@
+
+ Other Notable Changes + + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index 6bd552c873ac..9a6da7f22bd0 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -4,6 +4,12 @@ In addition to numerous new and upgraded packages, this release has the followin * Support is planned until the end of April 2022, handing over to 22.05. -## Backward incompatibilities +## Highlights + +## New Services + +## Backward Incompatibilities * The `staticjinja` package has been upgraded from 1.0.4 to 2.0.0 + +## Other Notable Changes