MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge master into staging-next

Browse source
This commit is contained in:
github-actions[bot] 2021-06-19 06:05:05 +00:00 committed by GitHub
commit 011dae7f43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 977 additions and 1573 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/data/misc/hackage/pin.json
View file

@ -1,6 +1,6 @@
{
"commit": "d1a32be92531e75b1acae3126313cdc013951965",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d1a32be92531e75b1acae3126313cdc013951965.tar.gz",
"sha256": "190m9drzg7rgkjpimlgvl8hsv2g1jg0m0fdgy8xkrh7xr1vjxxgz",
"msg": "Update from Hackage at 2021-06-06T15:18:11Z"
"commit": "7708395682f798fe3649bd05387ab571fcf8890c",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7708395682f798fe3649bd05387ab571fcf8890c.tar.gz",
"sha256": "0pfv9nmccp9q6p77lmyh8jqkvq1ad392zyy72g8y6kdsgy71nir5",
"msg": "Update from Hackage at 2021-06-12T16:23:24Z"
}

59
pkgs/development/haskell-modules/HACKING.md
View file

@ -1,5 +1,5 @@
## Maintainer Workflow
# Maintainer Workflow
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
@ -20,7 +20,7 @@ The workflow generally proceeds in three main steps:
Each of these steps is described in a separate section.
### Initial `haskell-updates` PR
## Initial `haskell-updates` PR
In this section we create the PR for merging `haskell-updates` into `master`.
@ -44,11 +44,13 @@ 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 repository.
1. Push these commits to the `haskell-updates` branch of the NixOS/nixpkgs repository.
1. Open a PR on Nixpkgs merging `haskell-updates` into `master`.
Use the following message body:
Use the title `haskellPackages: update stackage and hackage` and the following message body:
```markdown
### This Merge
@ -68,8 +70,8 @@ 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!)
* We only do the merge if the [`mergeable`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra.
* If a [`maintained`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/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!)
---
@ -78,14 +80,14 @@ This is the follow-up to #TODO.
Make sure to replace all TODO with the actual values.
### Notify Maintainers and Fix Broken Packages
## Notify Maintainers and Fix Broken Packages
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
### Notify Maintainers
When Hydra finishes building all the updated packages for the `haskell-updates`
jobset, you should generate a build report to notify maintainers of their
@ -112,10 +114,12 @@ 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
### 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`
failing to build. The most important jobs are the
[`maintained`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) and
[`mergeable`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable)
jobs. These are both defined in
[`release-haskell.nix`](../../top-level/release-haskell.nix).
@ -131,7 +135,7 @@ 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 are now
out-of-bounds.
#### Mark Broken Packages
### Mark Broken Packages
Packages that do not get fixed can be marked broken with the following
commands. First check which packages are broken:
@ -176,7 +180,7 @@ following will happen:
- All updated files will be committed.
#### Merge `master` into `haskell-updates`
### Merge `master` into `haskell-updates`
You should occasionally merge the `master` branch into the `haskell-updates`
branch.
@ -194,7 +198,7 @@ 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`
## Merge `haskell-updates` into `master`
Now it is time to merge the `haskell-updates` PR you opened above.
@ -213,15 +217,35 @@ Before doing this, make sure of the following:
for Hydra to evaluate the new `haskell-updates` jobset. Make sure you only
merge `haskell-updates` into `master` when there are no evaluation errors.
- Due to Hydra having only a small number of Darwin build machines, the
`haskell-updates` jobset on Hydra often has many queued Darwin jobs.
In order to not have these queued Darwin jobs prevent the `haskell-updates`
branch from being merged to `master` in a timely manner, we have special
rules for Darwin jobs.
- It is alright to merge the `haskell-updates` branch to `master` if
there are remaining queued Darwin jobs on Hydra.
- We would like to keep GHC and the `mergeable` job building on Darwin.
Do not merge the `haskell-updates` branch to `master` if GHC is failing
to build, or the `mergeable` job has failing Darwin constituent jobs.
If GHC and the `mergeable` job are not failing, but merely queued,
it is alright to merge the `haskell-updates` branch to `master`.
- We do not need to keep the `maintained` job building on Darwin.
If `maintained` packages are failing on Darwin, it is helpful to
mark them as broken on that platform.
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
## Additional Info
Here are some additional tips that didn't fit in above.
- Hydra tries to evalute the `haskell-updates` branch (in the
- Hydra tries to evaluate 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:
@ -263,8 +287,3 @@ Here are some additional tips that didn't fit in above.
- The Haskell team members generally hang out in the Matrix room
[#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org).
## Contributor Workflow
(TODO: this section is to describe the type of workflow for non-committers to
contribute to `haskell-updates`)

4
pkgs/development/haskell-modules/configuration-arm.nix
View file

@ -37,10 +37,6 @@ self: super: {
# Similar to https://ghc.haskell.org/trac/ghc/ticket/13062
happy = dontCheck super.happy;
# Disable GClosure based signals implementation on aarch64 as it causes linker issues
# https://github.com/gtk2hs/gtk2hs/issues/305
gtk2hs-buildtools = appendConfigureFlag super.gtk2hs-buildtools "-f-ClosureSignals";
} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 {
# AARCH64-SPECIFIC OVERRIDES

32
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -698,6 +698,10 @@ self: super: {
uuid-types = doJailbreak super.uuid-types;
uuid = doJailbreak super.uuid;
# Bypass version check for random < 1.2 (1.2 works fine).
# https://github.com/yeyan/xmonad-wallpaper/issues/2
xmonad-wallpaper = doJailbreak super.xmonad-wallpaper;
# The tests spuriously fail
libmpd = dontCheck super.libmpd;
@ -1928,9 +1932,7 @@ EOT
# 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]/\"'";
testFlags = [ "--pattern" "!/[NOCI]/" ];
};
# Tests require to run a binary which isn't built
@ -1941,18 +1943,30 @@ EOT
# 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'";
testFlags = [ "-j1" ];
};
# unrestrict bounds for hashable and semigroups
# https://github.com/HeinrichApfelmus/reactive-banana/issues/215
reactive-banana = doJailbreak super.reactive-banana;
# Too strict version bounds on QuickCheck and semirings
# https://github.com/erikd/wide-word/issues/57
wide-word = doJailbreak super.wide-word;
hackage-db_2_1_0 = doDistribute super.hackage-db_2_1_0;
# Too strict bounds on QuickCheck
# https://github.com/muesli4/table-layout/issues/16
table-layout = doJailbreak super.table-layout;
# Bounds on profunctors are too strict
# https://github.com/ConferOpenSource/composite/issues/50
composite-base = doJailbreak super.composite-base;
composite-aeson = doJailbreak super.composite-aeson;
# Too strict bounds on profunctors
# https://github.com/google/proto-lens/issues/413
proto-lens = doJailbreak super.proto-lens;
# Too strict bounds on profunctors
# https://github.com/jcranch/tophat/issues/1
tophat = doJailbreak super.tophat;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

1
pkgs/development/haskell-modules/configuration-darwin.nix
View file

@ -170,5 +170,6 @@ self: super: {
# 2021-05-25: Tests fail and I have no way to debug them.
hls-class-plugin = dontCheck super.hls-class-plugin;
hls-brittany-plugin = dontCheck super.hls-brittany-plugin;
}

3
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View file

@ -95,9 +95,6 @@ self: super: {
# The test suite seems pretty broken.
base64-bytestring = dontCheck super.base64-bytestring;
# 5.6 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
profunctors = super.profunctors_5_6_2;
# 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
lens = super.lens_5_0_1;

16
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file

@ -118,6 +118,7 @@ broken-packages:
- alto
- alure
- amazon-emailer
- amazonka-s3-streaming
- amazon-products
- amby
- AMI
@ -834,6 +835,7 @@ broken-packages:
- criu-rpc-types
- crjdt-haskell
- crocodile
- cronus
- cruncher-types
- crunghc
- crypto-cipher-benchmarks
@ -1217,7 +1219,6 @@ broken-packages:
- erlang
- erlang-ffi
- eros
- errata
- error-context
- error-continuations
- error-list
@ -2365,6 +2366,7 @@ broken-packages:
- hweblib
- hwhile
- hw-json-simd
- hw-mquery
- hworker
- hw-simd
- hwsl2
@ -2609,6 +2611,7 @@ broken-packages:
- ktx
- ktx-codec
- kuifje
- kure
- kure-your-boilerplate
- KyotoCabinet
- labeled-graph
@ -2765,6 +2768,7 @@ broken-packages:
- list-remote-forwards
- ListT
- list-t-http-client
- list-tries
- list-t-text
- list-zip-def
- list-zipper
@ -2987,6 +2991,7 @@ broken-packages:
- mmtf
- mmtl
- Mobile-Legends-Hack-Cheats
- mock-time
- modelicaparser
- modular-prelude
- module-management
@ -3305,6 +3310,7 @@ broken-packages:
- open-adt
- OpenAFP
- openai-hs
- openai-servant
- openapi3-code-generator
- openapi-petstore
- openapi-typed
@ -3435,6 +3441,7 @@ broken-packages:
- parsers-megaparsec
- parsimony
- parsley
- parsley-core
- parsnip
- partage
- partial-records
@ -3731,7 +3738,6 @@ broken-packages:
- proxy-mapping
- pseudo-trie
- PTQ
- ptr-poker
- publicsuffixlistcreate
- publish
- pubnub
@ -4019,9 +4025,6 @@ broken-packages:
- SableCC2Hs
- safe-buffer-monad
- safe-coerce
- safe-coloured-text-gen
- safe-coloured-text-layout
- safe-coloured-text-terminfo
- safecopy-migrate
- safecopy-store
- safe-freeze
@ -4578,7 +4581,6 @@ broken-packages:
- t3-server
- table
- tableaux
- table-layout
- tables
- Tables
- tablestorage
@ -4621,6 +4623,7 @@ broken-packages:
- teeth
- telegram
- telegram-api
- telegram-bot-simple
- teleport
- teleshell
- tellbot
@ -5208,7 +5211,6 @@ broken-packages:
- xmonad-dbus
- xmonad-eval
- xmonad-vanessa
- xmonad-wallpaper
- xmonad-windownames
- xor
- Xorshift128Plus

7
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -93,9 +93,9 @@ default-package-overrides:
- futhark < 0.19.5
# 2021-06-05: remove once pandoc 2.14 is in stackage
- pandoc-crossref < 0.3.11.0
# 2021-06-07: stackage still has dhall < 1.39
- dhall-nix < 1.1.21
- dhall-openapi < 1.0.1
# 2021-06-14: hnix still needs old versions https://github.com/haskell-nix/hnix/issues/952
- hnix-store-core < 0.5
- hnix-store-remote < 0.5
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@ -105,6 +105,7 @@ extra-packages:
- dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
- dhall == 1.29.0 # required for ats-pkg
- dhall == 1.38.1 # required for spago
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
- ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0
- haddock == 2.23.* # required on GHC < 8.10.x

156
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
View file

@ -1,4 +1,4 @@
# Stackage Nightly 2021-06-01
# Stackage Nightly 2021-06-10
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -11,8 +11,8 @@ default-package-overrides:
- ad ==4.4.1
- adjunctions ==4.4
- adler32 ==0.1.2.0
- aern2-mp ==0.2.6.0
- aern2-real ==0.2.6.0
- aern2-mp ==0.2.7.0
- aern2-real ==0.2.7.0
- aeson ==1.5.6.0
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.0
@ -34,7 +34,7 @@ default-package-overrides:
- aeson-yak ==0.1.1.3
- aeson-yaml ==1.1.0.0
- Agda ==2.6.1.3
- agda2lagda ==0.2020.11.1
- agda2lagda ==0.2021.6.1
- al ==0.1.4.2
- alarmclock ==0.7.0.5
- alerts ==0.1.2.0
@ -159,7 +159,7 @@ default-package-overrides:
- approximate-equality ==1.1.0.2
- app-settings ==0.2.0.12
- arbor-lru-cache ==0.1.1.1
- arithmoi ==0.11.0.1
- arithmoi ==0.12.0.0
- array-memoize ==0.6.0
- arrow-extras ==0.1.0.1
- arrows ==0.4.4.2
@ -202,7 +202,7 @@ default-package-overrides:
- auto-update ==0.1.6
- avers ==0.0.17.1
- avro ==0.5.2.0
- aws-cloudfront-signed-cookies ==0.2.0.6
- aws-cloudfront-signed-cookies ==0.2.0.8
- aws-xray-client ==0.1.0.0
- aws-xray-client-wai ==0.1.0.0
- backprop ==0.2.6.4
@ -336,7 +336,7 @@ default-package-overrides:
- cabal-file ==0.1.1
- cabal-flatpak ==0.1.0.2
- cabal-plan ==0.7.2.0
- cabal-rpm ==2.0.8
- cabal-rpm ==2.0.9
- cache ==0.1.3.0
- cacophony ==0.10.1
- calendar-recycling ==0.0.0.1
@ -360,7 +360,7 @@ default-package-overrides:
- cayley-client ==0.4.15
- cborg ==0.2.5.0
- cborg-json ==0.2.2.0
- cdar-mBound ==0.1.0.2
- cdar-mBound ==0.1.0.4
- c-enum ==0.1.0.1
- cereal ==0.5.8.1
- cereal-conduit ==0.8.0
@ -418,7 +418,7 @@ default-package-overrides:
- collect-errors ==0.1.5.0
- co-log-concurrent ==0.5.0.0
- co-log-core ==0.2.1.1
- Color ==0.3.1
- Color ==0.3.2
- colorful-monoids ==0.2.1.3
- colorize-haskell ==1.0.1
- colour ==2.3.5
@ -437,16 +437,6 @@ default-package-overrides:
- compiler-warnings ==0.1.0
- composable-associations ==0.1.0.0
- composable-associations-aeson ==0.1.0.1
- composite-aeson ==0.7.5.0
- composite-aeson-path ==0.7.5.0
- composite-aeson-refined ==0.7.5.0
- composite-aeson-throw ==0.1.0.0
- composite-base ==0.7.5.0
- composite-binary ==0.7.5.0
- composite-ekg ==0.7.5.0
- composite-hashable ==0.7.5.0
- composite-tuple ==0.1.2.0
- composite-xstep ==0.1.0.0
- composition ==1.0.2.2
- composition-extra ==2.0.0
- concise ==0.1.0.1
@ -599,14 +589,14 @@ default-package-overrides:
- deque ==0.4.3
- deriveJsonNoPrefix ==0.1.0.1
- derive-topdown ==0.0.2.2
- deriving-aeson ==0.2.6.1
- deriving-aeson ==0.2.7
- deriving-compat ==0.5.10
- derulo ==1.0.10
- dhall ==1.38.1
- dhall-bash ==1.0.36
- dhall-json ==1.7.6
- dhall-lsp-server ==1.0.14
- dhall-yaml ==1.2.6
- dhall ==1.39.0
- dhall-bash ==1.0.37
- dhall-json ==1.7.7
- dhall-lsp-server ==1.0.15
- dhall-yaml ==1.2.7
- diagrams-solve ==0.1.3
- dialogflow-fulfillment ==0.1.1.4
- di-core ==1.0.4
@ -625,7 +615,7 @@ default-package-overrides:
- distribution-opensuse ==1.1.1
- distributive ==0.6.2.1
- dl-fedora ==0.9
- dlist ==0.8.0.8
- dlist ==1.0
- dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1
- dns ==4.0.1
@ -740,7 +730,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.12
- express ==0.1.14
- extended-reals ==0.2.4.0
- extensible-effects ==5.0.0.1
- extensible-exceptions ==0.1.1.4
@ -781,7 +771,7 @@ default-package-overrides:
- finite-typelits ==0.1.4.2
- first-class-families ==0.8.0.1
- first-class-patterns ==0.3.2.5
- fitspec ==0.4.8
- fitspec ==0.4.10
- fixed ==0.3
- fixed-length ==0.2.2.1
- fixed-vector ==1.2.0.0
@ -817,7 +807,7 @@ default-package-overrides:
- formatting ==6.3.7
- foundation ==0.0.26.1
- fourmolu ==0.3.0.0
- free ==5.1.5
- free ==5.1.7
- free-categories ==0.2.0.2
- freenect ==1.2.1
- freer-simple ==1.2.1.1
@ -834,7 +824,7 @@ default-package-overrides:
- 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 ==0.2.3
- fusion-plugin-types ==0.1.0
- fuzzcheck ==0.1.1
- fuzzy ==0.1.0.0
@ -901,9 +891,9 @@ default-package-overrides:
- ghcid ==0.8.7
- ghci-hexcalc ==0.1.1.0
- ghcjs-codemirror ==0.0.0.2
- ghc-lib ==8.10.4.20210206
- ghc-lib-parser ==8.10.4.20210206
- ghc-lib-parser-ex ==8.10.0.19
- ghc-lib ==8.10.5.20210606
- ghc-lib-parser ==8.10.5.20210606
- ghc-lib-parser-ex ==8.10.0.21
- ghc-parser ==0.2.3.0
- ghc-paths ==0.1.0.12
- ghc-prof ==1.4.1.8
@ -935,7 +925,7 @@ default-package-overrides:
- ginger ==0.10.1.0
- gingersnap ==0.3.1.0
- gi-pango ==1.0.23
- githash ==0.1.5.0
- githash ==0.1.6.0
- github-release ==1.3.7
- github-rest ==1.0.3
- github-types ==0.2.1
@ -986,7 +976,7 @@ default-package-overrides:
- hall-symbols ==0.1.0.6
- hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2
- hapistrano ==0.4.1.3
- hapistrano ==0.4.1.4
- happstack-server ==7.7.1
- happy ==1.20.0
- happy-meta ==0.2.0.11
@ -1147,7 +1137,7 @@ default-package-overrides:
- html-entities ==1.1.4.5
- html-entity-map ==0.1.0.0
- htoml ==1.0.0.3
- http2 ==3.0.1
- http2 ==3.0.2
- HTTP ==4000.3.16
- http-api-data ==0.4.2
- http-client ==0.6.4.1
@ -1187,12 +1177,10 @@ default-package-overrides:
- hw-hspec-hedgehog ==0.1.1.0
- hw-int ==0.0.2.0
- hw-ip ==2.4.2.0
- hw-json ==1.3.2.2
- hw-json-simd ==0.1.1.0
- hw-json-simple-cursor ==0.1.1.0
- hw-json-standard-cursor ==0.2.3.1
- hw-kafka-client ==4.0.3
- hw-mquery ==0.2.1.0
- hw-packed-vector ==0.2.1.0
- hw-parser ==0.1.1.0
- hw-prim ==0.6.3.0
@ -1305,12 +1293,13 @@ default-package-overrides:
- js-flot ==0.8.3
- js-jquery ==3.3.1
- json-feed ==1.0.13
- jsonifier ==0.1.1
- 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.5.0
- JuicyPixels-extra ==0.5.1
- JuicyPixels-scale-dct ==0.1.2
- junit-xml ==0.1.0.2
- justified-containers ==0.3.0.0
@ -1363,7 +1352,7 @@ default-package-overrides:
- lazyio ==0.1.0.4
- lazysmallcheck ==0.6
- lca ==0.4
- leancheck ==0.9.6
- leancheck ==0.9.10
- leancheck-instances ==0.0.4
- leapseconds-announced ==2017.1.0.1
- learn-physics ==0.6.5
@ -1410,7 +1399,7 @@ default-package-overrides:
- list-t ==1.0.4
- list-transformer ==1.0.7
- ListTree ==0.2.3
- literatex ==0.1.0.0
- literatex ==0.1.0.2
- little-rio ==0.2.2
- llvm-hs ==9.0.1
- llvm-hs-pure ==9.0.0
@ -1452,7 +1441,7 @@ default-package-overrides:
- markdown ==0.1.17.4
- markdown-unlit ==0.5.1
- markov-chain ==0.0.3.4
- massiv ==0.6.0.0
- massiv ==0.6.1.0
- massiv-io ==0.4.1.0
- massiv-persist ==0.1.0.0
- massiv-serialise ==0.1.0.0
@ -1510,7 +1499,7 @@ default-package-overrides:
- min-max-pqueue ==0.1.0.2
- mintty ==0.1.2
- missing-foreign ==0.1.1
- mixed-types-num ==0.5.7.0
- mixed-types-num ==0.5.8.0
- mltool ==0.2.0.1
- mmap ==0.5.9
- mmark ==0.0.7.2
@ -1648,14 +1637,15 @@ default-package-overrides:
- nqe ==0.6.3
- nri-env-parser ==0.1.0.7
- nri-observability ==0.1.0.2
- nri-prelude ==0.6.0.0
- nri-prelude ==0.6.0.1
- nsis ==0.3.3
- numbers ==3000.2.0.2
- numeric-extras ==0.1
- numeric-limits ==0.1.0.0
- numeric-prelude ==0.4.3.3
- numhask ==0.7.1.0
- NumInstances ==1.4
- numtype-dk ==0.5.0.2
- numtype-dk ==0.5.0.3
- nuxeo ==0.3.2
- nvim-hs ==2.1.0.4
- nvim-hs-contrib ==2.0.0.0
@ -1683,10 +1673,10 @@ default-package-overrides:
- openpgp-asciiarmor ==0.1.2
- opensource ==0.1.1.0
- openssl-streams ==1.2.3.0
- opentelemetry ==0.6.1
- opentelemetry-extra ==0.6.1
- opentelemetry-lightstep ==0.6.1
- opentelemetry-wai ==0.6.1
- opentelemetry ==0.7.0
- opentelemetry-extra ==0.7.0
- opentelemetry-lightstep ==0.7.0
- opentelemetry-wai ==0.7.0
- operational ==0.2.3.5
- operational-class ==0.3.0.0
- optics ==0.3
@ -1710,10 +1700,10 @@ default-package-overrides:
- pagure-cli ==0.2
- pandoc ==2.13
- pandoc-dhall-decoder ==0.1.0.1
- pandoc-plot ==1.2.2
- pandoc-plot ==1.2.3
- pandoc-throw ==0.1.0.0
- pandoc-types ==1.22
- pantry ==0.5.2.1
- pantry ==0.5.2.2
- parallel ==3.2.2.0
- parameterized ==0.5.0.0
- paripari ==0.7.0.0
@ -1735,10 +1725,10 @@ default-package-overrides:
- path-binary-instance ==0.1.0.1
- path-extensions ==0.1.1.0
- path-extra ==0.2.0
- path-io ==1.6.2
- path-io ==1.6.3
- path-like ==0.2.0.2
- path-pieces ==0.2.1
- path-text-utf8 ==0.0.1.6
- path-text-utf8 ==0.0.1.8
- pathtype ==0.8.1.1
- pathwalk ==0.3.1.2
- pattern-arrows ==0.0.2
@ -1759,10 +1749,10 @@ default-package-overrides:
- persistable-record ==0.6.0.5
- persistable-types-HDBC-pg ==0.0.3.5
- persistent ==2.13.0.2
- persistent-mtl ==0.2.1.0
- persistent-mtl ==0.2.2.0
- persistent-mysql ==2.13.0.1
- persistent-pagination ==0.1.1.2
- persistent-postgresql ==2.13.0.1
- persistent-postgresql ==2.13.0.2
- persistent-qq ==2.12.0.1
- persistent-sqlite ==2.13.0.3
- persistent-template ==2.12.0.0
@ -1855,11 +1845,12 @@ default-package-overrides:
- product-isomorphic ==0.0.3.3
- product-profunctors ==0.11.0.2
- profiterole ==0.1
- profunctors ==5.5.2
- profunctors ==5.6.2
- projectroot ==0.2.0.1
- project-template ==0.2.1.0
- prometheus ==2.2.2
- prometheus-client ==1.0.1
- prometheus-metrics-ghc ==1.0.1.1
- prometheus-wai-middleware ==1.0.1.0
- promises ==0.3
- prompt ==0.1.1.2
@ -1871,14 +1862,10 @@ default-package-overrides:
- protocol-buffers-descriptor ==2.4.17
- protocol-radius ==0.0.1.1
- protocol-radius-test ==0.1.0.1
- proto-lens ==0.7.0.0
- proto-lens-protobuf-types ==0.7.0.0
- proto-lens-protoc ==0.7.0.0
- proto-lens-runtime ==0.7.0.0
- proto-lens-setup ==0.4.0.4
- protolude ==0.3.0
- proxied ==0.3.1
- psqueues ==0.2.7.2
- ptr-poker ==0.1.1.4
- publicsuffix ==0.20200526
- pulse-simple ==0.1.14
- pureMD5 ==2.1.3
@ -1945,7 +1932,7 @@ default-package-overrides:
- readable ==0.3.1
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- rebase ==1.6.1
- rebase ==1.13.0.1
- record-dot-preprocessor ==0.2.11
- record-hasfield ==1.0
- records-sop ==0.1.1.0
@ -1971,7 +1958,7 @@ default-package-overrides:
- regex-pcre ==0.95.0.0
- regex-pcre-builtin ==0.95.2.3.8.43
- regex-posix ==0.96.0.0
- regex-tdfa ==1.3.1.0
- regex-tdfa ==1.3.1.1
- regex-with-pcre ==1.1.0.0
- registry ==0.2.0.3
- reinterpret-cast ==0.1.0
@ -1988,7 +1975,7 @@ default-package-overrides:
- repline ==0.4.0.0
- req ==3.9.0
- req-conduit ==1.0.0
- rerebase ==1.6.1
- rerebase ==1.13.0.1
- rescue ==0.4.2.1
- resistor-cube ==0.0.1.2
- resolv ==0.1.2.0
@ -2016,14 +2003,15 @@ default-package-overrides:
- rosezipper ==0.2
- rot13 ==0.2.0.1
- rpmbuild-order ==0.4.5
- rp-tree ==0.3.6
- rp-tree ==0.4
- RSA ==2.4.1
- runmemo ==1.0.0.1
- rvar ==0.2.0.6
- safe ==0.3.19
- safe-coloured-text ==0.0.0.0
- safe-coloured-text ==0.1.0.0
- safe-coloured-text-terminfo ==0.0.0.0
- safecopy ==0.10.4.2
- safe-decimal ==0.2.0.0
- safe-decimal ==0.2.1.0
- safe-exceptions ==0.1.7.1
- safe-foldable ==0.1.0.0
- safeio ==0.0.5.0
@ -2031,17 +2019,15 @@ default-package-overrides:
- safe-money ==0.9
- SafeSemaphore ==0.10.1
- safe-tensor ==0.2.1.1
- salak ==0.3.6
- salak-yaml ==0.3.5.3
- saltine ==0.1.1.1
- salve ==1.0.11
- sample-frame ==0.0.3
- sample-frame-np ==0.0.4.1
- sampling ==0.3.5
- sandwich ==0.1.0.6
- sandwich ==0.1.0.7
- sandwich-quickcheck ==0.1.0.5
- sandwich-slack ==0.1.0.4
- sandwich-webdriver ==0.1.0.4
- sandwich-webdriver ==0.1.0.5
- say ==0.1.0.1
- sbp ==2.6.3
- sbv ==8.15
@ -2104,7 +2090,8 @@ default-package-overrides:
- servant-foreign ==0.15.3
- servant-http-streams ==0.18.2
- servant-machines ==0.15.1
- servant-multipart ==0.12
- servant-multipart ==0.12.1
- servant-multipart-api ==0.12.1
- servant-openapi3 ==2.0.1.2
- servant-pipes ==0.15.2
- servant-rawm ==1.0.0.0
@ -2195,7 +2182,7 @@ default-package-overrides:
- sparse-tensor ==0.2.1.5
- spatial-math ==0.5.0.1
- special-values ==0.1.0.0
- speculate ==0.4.6
- speculate ==0.4.8
- speedy-slice ==0.3.2
- Spintax ==0.3.6
- splice ==0.6.1.1
@ -2264,7 +2251,7 @@ default-package-overrides:
- string-random ==0.1.4.1
- stringsearch ==0.3.6.6
- string-transform ==1.1.1
- stripe-concepts ==1.0.2.6
- stripe-concepts ==1.0.2.8
- stripe-core ==2.6.2
- stripe-haskell ==2.6.2
- stripe-http-client ==2.6.2
@ -2282,12 +2269,12 @@ default-package-overrides:
- sweet-egison ==0.1.1.3
- swish ==0.10.0.4
- syb ==0.7.2.1
- sydtest ==0.1.0.0
- sydtest ==0.2.0.0
- sydtest-discover ==0.0.0.0
- sydtest-persistent-sqlite ==0.0.0.0
- sydtest-servant ==0.0.0.0
- sydtest-wai ==0.0.0.0
- sydtest-yesod ==0.0.0.0
- sydtest-persistent-sqlite ==0.1.0.0
- sydtest-servant ==0.1.0.0
- sydtest-wai ==0.1.0.0
- sydtest-yesod ==0.1.0.0
- symbol ==0.2.4
- symengine ==0.1.2.0
- symmetry-operations-symbols ==0.0.2.1
@ -2451,7 +2438,7 @@ default-package-overrides:
- triplesec ==0.2.2.1
- trivial-constraint ==0.7.0.0
- tsv2csv ==0.1.0.2
- ttc ==0.4.0.0
- ttc ==1.1.0.0
- ttl-hashtables ==1.4.1.0
- ttrie ==0.1.2.1
- tuple ==0.3.0.2
@ -2517,7 +2504,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.3
- unix-time ==0.4.7
- unliftio ==0.2.17
- unliftio ==0.2.18
- unliftio-core ==0.2.0.1
- unliftio-pool ==0.2.1.1
- unliftio-streams ==0.1.1.1
@ -2592,6 +2579,7 @@ default-package-overrides:
- wai-middleware-auth ==0.2.4.1
- wai-middleware-caching ==0.1.0.2
- wai-middleware-clacks ==0.1.0.1
- wai-middleware-prometheus ==1.0.0
- wai-middleware-static ==0.9.0
- wai-rate-limit ==0.1.0.0
- wai-rate-limit-redis ==0.1.0.0
@ -2619,7 +2607,7 @@ default-package-overrides:
- wide-word ==0.1.1.2
- wikicfp-scraper ==0.1.0.12
- wild-bind ==0.1.2.7
- wild-bind-x11 ==0.2.0.12
- wild-bind-x11 ==0.2.0.13
- Win32 ==2.6.1.0
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
@ -2678,7 +2666,7 @@ default-package-overrides:
- xss-sanitize ==0.3.6
- xxhash-ffi ==0.2.0.0
- yaml ==0.11.5.0
- yamlparse-applicative ==0.1.0.4
- yamlparse-applicative ==0.2.0.0
- yesod ==1.6.1.1
- yesod-auth ==1.6.10.3
- yesod-auth-hashdb ==1.7.1.7
@ -2710,7 +2698,7 @@ default-package-overrides:
- zeromq4-patterns ==0.3.1.0
- zim-parser ==0.2.1.0
- zio ==0.1.0.2
- zip ==1.7.0
- zip ==1.7.1
- zip-archive ==0.4.1
- zipper-extra ==0.1.3.2
- zippers ==0.3.1

11
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View file

@ -28,7 +28,6 @@ dont-distribute-packages:
- Advgame
- Advise-me
- aern2-real
- aern2-real_0_2_7_0
- AERN-Net
- AERN-Real
- AERN-Real-Double
@ -121,6 +120,7 @@ dont-distribute-packages:
- atuin
- audiovisual
- aura
- aura_3_2_5
- authoring
- AutoForms
- autonix-deps-kf5
@ -1105,6 +1105,7 @@ dont-distribute-packages:
- happstack-jmacro
- happstack-plugins
- happstack-state
- happstack-static-routing
- happstack-yui
- happs-tutorial
- happybara-webkit
@ -1618,7 +1619,6 @@ dont-distribute-packages:
- JSON-Combinator-Examples
- json-enumerator
- JsonGrammar
- jsonifier
- json-incremental-decoder
- json-query
- jsons-to-schema
@ -1892,6 +1892,7 @@ dont-distribute-packages:
- MaybeT-transformers
- MC-Fold-DP
- mcmc
- mcmc_0_5_0_0
- mcmc-samplers
- mDNSResponder-client
- mealy
@ -2080,7 +2081,6 @@ dont-distribute-packages:
- NoSlow
- notmuch-haskell
- notmuch-web
- nri-prelude_0_6_0_1
- numerical
- numeric-ode
- numhask-hedgehog
@ -2115,7 +2115,6 @@ dont-distribute-packages:
- openpgp-crypto-api
- OpenSCAD
- openssh-github-keys
- opentelemetry-extra_0_7_0
- opentracing-jaeger
- opentracing-zipkin-v1
- open-union
@ -2150,6 +2149,7 @@ dont-distribute-packages:
- parquet-hs
- parse-help
- parsestar
- parsley-garnish
- partial-lens
- passman-cli
- patch-image
@ -2513,7 +2513,6 @@ dont-distribute-packages:
- ruler-core
- runtime-arbitrary
- S3
- safe-coloured-text-layout-gen
- safer-file-handles
- safer-file-handles-bytestring
- safer-file-handles-text
@ -2614,7 +2613,6 @@ dont-distribute-packages:
- servant-zeppelin-swagger
- serv-wai
- sessiontypes-distributed
- setdown
- s-expression
- SFML-control
- SFont
@ -2826,7 +2824,6 @@ dont-distribute-packages:
- swearjure
- sweet-egison
- switch
- sydtest_0_2_0_0
- sydtest-persistent-postgresql
- sylvia
- symantic-atom

24
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -577,7 +577,12 @@ self: super: builtins.intersectAttrs super {
sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6";
};
spagoDocs = overrideCabal super.spago (drv: {
spagoWithOverrides = super.spago.override {
# spago has not yet been updated for the latest dhall.
dhall = self.dhall_1_38_1;
};
spagoDocs = overrideCabal spagoWithOverrides (drv: {
postUnpack = (drv.postUnpack or "") + ''
# Spago includes the following two files directly into the binary
# with Template Haskell. They are fetched at build-time from the
@ -821,8 +826,21 @@ self: super: builtins.intersectAttrs super {
random = dontCheck super.random;
# Since this package is primarily used by nixpkgs maintainers and is probably
# not used to link against by anyone, we can make it’s closure smaller.
cabal2nix-unstable = justStaticExecutables super.cabal2nix-unstable;
# not used to link against by anyone, we can make it’s closure smaller and
# add its runtime dependencies in `haskellPackages` (as opposed to cabal2nix).
cabal2nix-unstable = overrideCabal
(justStaticExecutables super.cabal2nix-unstable)
(drv: {
buildTools = (drv.buildTools or []) ++ [
pkgs.makeWrapper
];
postInstall = ''
wrapProgram $out/bin/cabal2nix \
--prefix PATH ":" "${
pkgs.lib.makeBinPath [ pkgs.nix pkgs.nix-prefetch-scripts ]
}"
'';
});
# test suite needs local redis daemon
nri-redis = dontCheck super.nri-redis;

8
pkgs/development/haskell-modules/generic-builder.nix
View file

@ -58,7 +58,7 @@ in
, pkg-configDepends ? [], libraryPkgconfigDepends ? [], executablePkgconfigDepends ? [], testPkgconfigDepends ? [], benchmarkPkgconfigDepends ? []
, testDepends ? [], testHaskellDepends ? [], testSystemDepends ? [], testFrameworkDepends ? []
, benchmarkDepends ? [], benchmarkHaskellDepends ? [], benchmarkSystemDepends ? [], benchmarkFrameworkDepends ? []
, testTarget ? ""
, testTarget ? "", testFlags ? []
, broken ? false
, preCompileBuildDriver ? null, postCompileBuildDriver ? null
, preUnpack ? null, postUnpack ? null
@ -454,9 +454,13 @@ stdenv.mkDerivation ({
inherit doCheck;
# Run test suite(s) and pass `checkFlags` as well as `checkFlagsArray`.
# `testFlags` are added to `checkFlagsArray` each prefixed with
# `--test-option`, so Cabal passes it to the underlying test suite binary.
checkPhase = ''
runHook preCheck
${setupCommand} test ${testTarget}
checkFlagsArray+=(${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)})
${setupCommand} test ${testTarget} $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"}
runHook postCheck
'';

2183
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff

7
pkgs/development/haskell-modules/hoogle.nix
View file

@ -63,10 +63,13 @@ buildPackages.stdenv.mkDerivation {
passAsFile = ["buildCommand"];
buildCommand = ''
${lib.optionalString (packages != [] -> docPackages == [])
${let # Filter out nulls here to work around https://github.com/NixOS/nixpkgs/issues/82245
# If we don't then grabbing `p.name` here will fail.
packages' = lib.filter (p: p != null) packages;
in lib.optionalString (packages' != [] -> docPackages == [])
("echo WARNING: localHoogle package list empty, even though"
+ " the following were specified: "
+ lib.concatMapStringsSep ", " (p: p.name) packages)}
+ lib.concatMapStringsSep ", " (p: p.name) packages')}
mkdir -p $out/share/doc/hoogle
echo importing builtin packages

2
pkgs/development/haskell-modules/non-hackage-packages.nix
View file

@ -22,6 +22,8 @@ self: super: {
# https://github.com/spacchetti/spago/issues/512
spago = self.callPackage ../tools/purescript/spago/spago.nix { };
nix-linter = self.callPackage ../../development/tools/analysis/nix-linter { };
nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { };
# cabal2nix --revision <rev> https://github.com/hasura/ci-info-hs.git

4
pkgs/development/interpreters/erlang/R22.nix
View file

@ -3,6 +3,6 @@
# How to obtain `sha256`:
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
mkDerivation {
version = "22.3.4.19";
sha256 = "sha256-U3ks7pDIqS8HVJ+yBobhEbKvnd9svEcQd9BsJQwajDs=";
version = "22.3.4.20";
sha256 = "sha256-EUErOCW16eUb/p5dLpFV7sQ3mXlCF/OgOvGAAyYEvLo=";
}

4
pkgs/development/tools/analysis/flow/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "flow";
version = "0.152.0";
version = "0.153.0";
src = fetchFromGitHub {
owner = "facebook";
repo = "flow";
rev = "refs/tags/v${version}";
sha256 = "1af9z6xah3rk99pv984nikkpq8jzl5r0fccb1gdhmi7y5a6y6g1m";
sha256 = "sha256-KaDgrr1DY7DGxFvSOzbO04Y8Z3LkmvJcPwfFWa/UlMs=";
};
installPhase = ''

15
pkgs/development/tools/analysis/nix-linter/default.nix
View file

@ -17,18 +17,17 @@
, containers
, hnix
, bytestring
, fetchpatch
}:
mkDerivation rec {
pname = "nix-linter-unstable";
version = "2020-09-25";
version = "2021-06-16";
src = fetchFromGitHub {
owner = "Synthetica9";
repo = "nix-linter";
rev = "2516a8cda41f9bb553a1c3eca38e3dd94ebf53de";
sha256 = "07mn2c9v67wsm57jlxv9pqac9hahw4618vngmj2sfbgihx8997kb";
rev = "74707ed48dcc58dbfa27ae25ee0e044c072cc344";
sha256 = "17scghkinpx3pzlw3hw023ybnd8cy7bqfy8b48vwaq8a7bnm2rs3";
};
isLibrary = false;
@ -37,14 +36,6 @@ mkDerivation rec {
executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ];
testHaskellDepends = [ tasty tasty-hunit tasty-th ];
patches = [
# Fix compatibility with hnix≥0.13.0 https://github.com/Synthetica9/nix-linter/pull/51
(fetchpatch {
url = "https://github.com/Synthetica9/nix-linter/commit/f73acacd8623dc25c9a35f8e04e4ff33cc596af8.patch";
sha256 = "139fm21hdg3vcw8hv35kxj4awd52bjqbb76mpzx191hzi9plj8qc";
})
];
description = "Linter for Nix(pkgs), based on hnix";
homepage = "https://github.com/Synthetica9/nix-linter";
license = lib.licenses.bsd3;

4
pkgs/development/tools/go-toml/default.nix
View file

@ -2,13 +2,13 @@
buildGoPackage rec {
pname = "go-toml";
version = "1.9.2";
version = "1.9.3";
src = fetchFromGitHub {
owner = "pelletier";
repo = pname;
rev = "v${version}";
sha256 = "sha256-x740f6I+szhq4mEsed4bsXcC8PvzF6PKFJNJ9SKMGIE=";
sha256 = "sha256-Vu/PS01JeSeg1KHkpqL12rTjRJFoc9rla48H/ei2HDM=";
};
goPackagePath = "github.com/pelletier/go-toml";

2
pkgs/top-level/all-packages.nix
View file

@ -30918,7 +30918,7 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
nix-linter = haskell.lib.justStaticExecutables (haskellPackages.callPackage ../development/tools/analysis/nix-linter { });
nix-linter = haskell.lib.justStaticExecutables (haskellPackages.nix-linter);
nix-pin = callPackage ../tools/package-management/nix-pin { };