Merge pull request #109474 from NixOS/haskell-updates
Update Haskell package set to Stackage Nightly 2021-01-20 (plus other fixes)
This commit is contained in:
commit
7cb633be79
|
@ -223,7 +223,7 @@ self: super: {
|
|||
# https://github.com/haskell-nix/hnix-store/issues/104
|
||||
# Until unpin, which may hold off in time due to Stackage maintenence bottleneck
|
||||
# the 0_4_0_0 is used
|
||||
hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7
|
||||
hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7
|
||||
|
||||
});
|
||||
|
||||
|
@ -232,9 +232,11 @@ self: super: {
|
|||
# Until unpin, which may hold off in time due to Stackage maintenence bottleneck
|
||||
# the 0_4_0_0 is used
|
||||
hnix-store-remote = (super.hnix-store-remote.override {
|
||||
hnix-store-core = self.hnix-store-core_0_4_0_0; # at least 1.7
|
||||
hnix-store-core = self.hnix-store-core_0_4_1_0; # at least 1.7
|
||||
});
|
||||
|
||||
# https://github.com/haskell-nix/hnix-store/issues/127
|
||||
hnix-store-core_0_4_1_0 = addTestToolDepend super.hnix-store-core_0_4_1_0 self.tasty-discover;
|
||||
|
||||
# Fails for non-obvious reasons while attempting to use doctest.
|
||||
search = dontCheck super.search;
|
||||
|
@ -1375,6 +1377,11 @@ self: super: {
|
|||
# jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc
|
||||
pandoc-citeproc = doJailbreak super.pandoc-citeproc;
|
||||
|
||||
# 2021-01-17: Tests are broken because of a version mismatch.
|
||||
# See here: https://github.com/jgm/pandoc/issues/7035
|
||||
# This problem is fixed on master. Remove override when this assert fails.
|
||||
pandoc = assert super.pandoc.version == "2.11.3.2"; dontCheck super.pandoc;
|
||||
|
||||
# The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox.
|
||||
domain-auth = dontCheck super.domain-auth;
|
||||
|
||||
|
@ -1413,6 +1420,10 @@ self: super: {
|
|||
lsp-test = dontCheck self.lsp-test_0_11_0_7;
|
||||
fourmolu = self.fourmolu_0_3_0_0;
|
||||
});
|
||||
# 2021-01-20
|
||||
# apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0
|
||||
# https://github.com/haskell/haskell-language-server/issues/1240
|
||||
apply-refact = super.apply-refact_0_8_2_1;
|
||||
|
||||
fourmolu = dontCheck super.fourmolu;
|
||||
# 1. test requires internet
|
||||
|
|
|
@ -76,7 +76,7 @@ default-package-overrides:
|
|||
# haskell-language-server 0.5.0.0 doesn't accept newer versions
|
||||
- fourmolu ==0.2.*
|
||||
- refinery ==0.2.*
|
||||
# Stackage Nightly 2021-01-14
|
||||
# Stackage Nightly 2021-01-20
|
||||
- abstract-deque ==0.3
|
||||
- abstract-par ==0.3.3
|
||||
- AC-Angle ==1.0
|
||||
|
@ -209,7 +209,7 @@ default-package-overrides:
|
|||
- amazonka-waf ==1.6.1
|
||||
- amazonka-workspaces ==1.6.1
|
||||
- amazonka-xray ==1.6.1
|
||||
- amqp ==0.20.0
|
||||
- amqp ==0.20.0.1
|
||||
- amqp-utils ==0.4.4.1
|
||||
- annotated-wl-pprint ==0.7.0
|
||||
- ansi-terminal ==0.10.3
|
||||
|
@ -223,7 +223,7 @@ default-package-overrides:
|
|||
- ap-normalize ==0.1.0.0
|
||||
- appar ==0.1.8
|
||||
- appendmap ==0.1.5
|
||||
- apply-refact ==0.8.2.1
|
||||
- apply-refact ==0.9.0.0
|
||||
- apportionment ==0.0.0.3
|
||||
- approximate ==0.3.2
|
||||
- approximate-equality ==1.1.0.2
|
||||
|
@ -340,7 +340,7 @@ default-package-overrides:
|
|||
- blas-comfort-array ==0.0.0.2
|
||||
- blas-ffi ==0.1
|
||||
- blaze-bootstrap ==0.1.0.1
|
||||
- blaze-builder ==0.4.1.0
|
||||
- blaze-builder ==0.4.2.1
|
||||
- blaze-html ==0.9.1.2
|
||||
- blaze-markup ==0.8.2.7
|
||||
- blaze-svg ==0.3.6.1
|
||||
|
@ -519,7 +519,7 @@ default-package-overrides:
|
|||
- conduit-extra ==1.3.5
|
||||
- conduit-parse ==0.2.1.0
|
||||
- conduit-zstd ==0.0.2.0
|
||||
- conferer ==1.0.0.0
|
||||
- conferer ==1.0.0.1
|
||||
- conferer-aeson ==1.0.0.0
|
||||
- conferer-hspec ==1.0.0.0
|
||||
- conferer-warp ==1.0.0.0
|
||||
|
@ -635,6 +635,7 @@ default-package-overrides:
|
|||
- DBFunctor ==0.1.1.1
|
||||
- dbus ==1.2.17
|
||||
- dbus-hslogger ==0.1.0.1
|
||||
- debian ==4.0.2
|
||||
- debian-build ==0.10.2.0
|
||||
- debug-trace-var ==0.2.0
|
||||
- dec ==0.0.3
|
||||
|
@ -706,6 +707,7 @@ default-package-overrides:
|
|||
- dyre ==0.8.12
|
||||
- eap ==0.9.0.2
|
||||
- earcut ==0.1.0.4
|
||||
- Earley ==0.13.0.1
|
||||
- easy-file ==0.2.2
|
||||
- Ebnf2ps ==1.0.15
|
||||
- echo ==0.1.3
|
||||
|
@ -751,7 +753,7 @@ default-package-overrides:
|
|||
- epub-metadata ==4.5
|
||||
- eq ==4.2.1
|
||||
- equal-files ==0.0.5.3
|
||||
- equational-reasoning ==0.6.0.3
|
||||
- equational-reasoning ==0.6.0.4
|
||||
- equivalence ==0.3.5
|
||||
- erf ==2.0.0.0
|
||||
- error-or ==0.1.2.0
|
||||
|
@ -946,7 +948,7 @@ default-package-overrides:
|
|||
- ghc-typelits-extra ==0.4.2
|
||||
- ghc-typelits-knownnat ==0.7.4
|
||||
- ghc-typelits-natnormalise ==0.7.3
|
||||
- ghc-typelits-presburger ==0.3.0.1
|
||||
- ghc-typelits-presburger ==0.5.0.0
|
||||
- ghost-buster ==0.1.1.0
|
||||
- gi-atk ==2.0.22
|
||||
- gi-cairo ==1.0.24
|
||||
|
@ -973,7 +975,7 @@ default-package-overrides:
|
|||
- github-rest ==1.0.3
|
||||
- github-types ==0.2.1
|
||||
- github-webhooks ==0.15.0
|
||||
- gitlab-haskell ==0.2.4
|
||||
- gitlab-haskell ==0.2.5
|
||||
- gitrev ==1.3.1
|
||||
- gi-xlib ==2.0.9
|
||||
- gl ==0.9
|
||||
|
@ -983,7 +985,7 @@ default-package-overrides:
|
|||
- gloss ==1.13.2.1
|
||||
- gloss-rendering ==1.13.1.1
|
||||
- GLURaw ==2.0.0.4
|
||||
- GLUT ==2.7.0.15
|
||||
- GLUT ==2.7.0.16
|
||||
- gluturtle ==0.0.58.1
|
||||
- gnuplot ==0.5.6.1
|
||||
- google-isbn ==1.0.3
|
||||
|
@ -1138,12 +1140,12 @@ default-package-overrides:
|
|||
- HsOpenSSL ==0.11.5.1
|
||||
- HsOpenSSL-x509-system ==0.1.0.4
|
||||
- hsp ==0.10.0
|
||||
- hspec ==2.7.6
|
||||
- hspec ==2.7.8
|
||||
- hspec-attoparsec ==0.1.0.2
|
||||
- hspec-checkers ==0.1.0.2
|
||||
- hspec-contrib ==0.5.1
|
||||
- hspec-core ==2.7.6
|
||||
- hspec-discover ==2.7.6
|
||||
- hspec-core ==2.7.8
|
||||
- hspec-discover ==2.7.8
|
||||
- hspec-expectations ==0.8.2
|
||||
- hspec-expectations-lifted ==0.10.0
|
||||
- hspec-expectations-pretty-diff ==0.7.2.5
|
||||
|
@ -1268,7 +1270,7 @@ default-package-overrides:
|
|||
- ini ==0.4.1
|
||||
- inj ==1.0
|
||||
- inline-c ==0.9.1.4
|
||||
- inline-c-cpp ==0.4.0.2
|
||||
- inline-c-cpp ==0.4.0.3
|
||||
- inline-r ==0.10.4
|
||||
- inliterate ==0.1.0
|
||||
- input-parsers ==0.1.0.1
|
||||
|
@ -1420,6 +1422,7 @@ default-package-overrides:
|
|||
- linux-namespaces ==0.1.3.0
|
||||
- liquid-fixpoint ==0.8.10.2
|
||||
- List ==0.6.2
|
||||
- ListLike ==4.7.4
|
||||
- list-predicate ==0.1.0.1
|
||||
- listsafe ==0.1.0.1
|
||||
- list-singleton ==1.0.0.4
|
||||
|
@ -1440,7 +1443,7 @@ default-package-overrides:
|
|||
- logging ==3.0.5
|
||||
- logging-facade ==0.3.0
|
||||
- logging-facade-syslog ==1
|
||||
- logict ==0.7.0.3
|
||||
- logict ==0.7.1.0
|
||||
- logstash ==0.1.0.1
|
||||
- loop ==0.3.0
|
||||
- lrucache ==1.2.0.1
|
||||
|
@ -1750,6 +1753,7 @@ default-package-overrides:
|
|||
- pcre-heavy ==1.0.0.2
|
||||
- pcre-light ==0.4.1.0
|
||||
- pcre-utils ==0.1.8.1.1
|
||||
- pdfinfo ==1.5.4
|
||||
- peano ==0.1.0.1
|
||||
- pem ==0.2.4
|
||||
- percent-format ==0.0.1
|
||||
|
@ -1848,6 +1852,7 @@ default-package-overrides:
|
|||
- primitive-unlifted ==0.1.3.0
|
||||
- print-console-colors ==0.1.0.0
|
||||
- probability ==0.2.7
|
||||
- process-extras ==0.7.4
|
||||
- product-isomorphic ==0.0.3.3
|
||||
- product-profunctors ==0.11.0.1
|
||||
- profiterole ==0.1
|
||||
|
@ -1939,7 +1944,7 @@ default-package-overrides:
|
|||
- readable ==0.3.1
|
||||
- read-editor ==0.1.0.2
|
||||
- read-env-var ==1.0.0.0
|
||||
- reanimate ==1.1.3.1
|
||||
- reanimate ==1.1.3.2
|
||||
- reanimate-svg ==0.13.0.0
|
||||
- rebase ==1.6.1
|
||||
- record-dot-preprocessor ==0.2.7
|
||||
|
@ -2026,7 +2031,7 @@ default-package-overrides:
|
|||
- safe-tensor ==0.2.1.0
|
||||
- salak ==0.3.6
|
||||
- salak-yaml ==0.3.5.3
|
||||
- saltine ==0.1.1.0
|
||||
- saltine ==0.1.1.1
|
||||
- salve ==1.0.10
|
||||
- sample-frame ==0.0.3
|
||||
- sample-frame-np ==0.0.4.1
|
||||
|
@ -2132,10 +2137,10 @@ default-package-overrides:
|
|||
- singleton-bool ==0.1.5
|
||||
- singleton-nats ==0.4.5
|
||||
- singletons ==2.7
|
||||
- singletons-presburger ==0.3.0.1
|
||||
- singletons-presburger ==0.5.0.0
|
||||
- siphash ==1.0.3
|
||||
- sitemap-gen ==0.1.0.0
|
||||
- sized ==0.8.0.0
|
||||
- sized ==1.0.0.0
|
||||
- skein ==1.0.9.4
|
||||
- skews ==0.1.0.3
|
||||
- skip-var ==0.1.1.0
|
||||
|
@ -2145,7 +2150,7 @@ default-package-overrides:
|
|||
- slack-progressbar ==0.1.0.1
|
||||
- slist ==0.1.1.0
|
||||
- slynx ==0.5.0.1
|
||||
- smallcheck ==1.2.0
|
||||
- smallcheck ==1.2.1
|
||||
- smash ==0.1.1.0
|
||||
- smash-aeson ==0.1.0.0
|
||||
- smash-lens ==0.1.0.1
|
||||
|
@ -2436,7 +2441,7 @@ default-package-overrides:
|
|||
- type-level-natural-number ==2.0
|
||||
- type-level-numbers ==0.1.1.1
|
||||
- type-map ==0.1.6.0
|
||||
- type-natural ==0.9.0.0
|
||||
- type-natural ==1.0.0.0
|
||||
- type-of-html ==1.6.1.2
|
||||
- type-of-html-static ==0.1.0.2
|
||||
- type-operators ==0.2.0.0
|
||||
|
@ -2458,7 +2463,6 @@ default-package-overrides:
|
|||
- unicode ==0.0.1.1
|
||||
- unicode-show ==0.1.0.4
|
||||
- unicode-transforms ==0.3.7.1
|
||||
- unification-fd ==0.10.0.1
|
||||
- union-find ==0.2
|
||||
- unipatterns ==0.0.0.0
|
||||
- uniplate ==1.6.13
|
||||
|
@ -2537,13 +2541,13 @@ default-package-overrides:
|
|||
- vinyl ==0.13.0
|
||||
- void ==0.7.3
|
||||
- vty ==5.32
|
||||
- wai ==3.2.2.1
|
||||
- wai ==3.2.3
|
||||
- wai-app-static ==3.1.7.2
|
||||
- wai-conduit ==3.0.0.4
|
||||
- wai-cors ==0.2.7
|
||||
- wai-enforce-https ==0.0.2.1
|
||||
- wai-eventsource ==3.0.0
|
||||
- wai-extra ==3.1.5
|
||||
- wai-extra ==3.1.6
|
||||
- wai-feature-flags ==0.1.0.1
|
||||
- wai-handler-launch ==3.0.3.1
|
||||
- wai-logger ==2.3.6
|
||||
|
@ -2666,7 +2670,7 @@ default-package-overrides:
|
|||
- zeromq4-patterns ==0.3.1.0
|
||||
- zim-parser ==0.2.1.0
|
||||
- zio ==0.1.0.2
|
||||
- zip ==1.6.0
|
||||
- zip ==1.7.0
|
||||
- zip-archive ==0.4.1
|
||||
- zipper-extra ==0.1.3.2
|
||||
- zippers ==0.3
|
||||
|
@ -2696,6 +2700,7 @@ extra-packages:
|
|||
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
|
||||
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
|
||||
- ghcide == 0.7.0.0 # Needed for hls 0.8.0
|
||||
- apply-refact == 0.8.2.1 # Needed for hls 0.8.0
|
||||
|
||||
package-maintainers:
|
||||
peti:
|
||||
|
@ -3914,6 +3919,7 @@ broken-packages:
|
|||
- cgi-utils
|
||||
- cgrep
|
||||
- chainweb-mining-client
|
||||
- chakra
|
||||
- chalkboard
|
||||
- chalkboard-viewer
|
||||
- character-cases
|
||||
|
@ -5611,7 +5617,6 @@ broken-packages:
|
|||
- GLFW-OGL
|
||||
- GLFW-task
|
||||
- gli
|
||||
- glicko
|
||||
- glider-nlp
|
||||
- GLMatrix
|
||||
- glob-posix
|
||||
|
@ -11009,13 +11014,10 @@ broken-packages:
|
|||
- unitym-yesod
|
||||
- universal-binary
|
||||
- universe
|
||||
- universe-base
|
||||
- universe-dependent-sum
|
||||
- universe-instances-base
|
||||
- universe-instances-extended
|
||||
- universe-instances-trans
|
||||
- universe-reverse-instances
|
||||
- universe-some
|
||||
- universe-th
|
||||
- unix-fcntl
|
||||
- unix-handle
|
||||
|
|
49467
pkgs/development/haskell-modules/hackage-packages.nix
generated
49467
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
@ -1,2 +1,2 @@
|
|||
args@{ pkgs, stdenv, callPackage }: self:
|
||||
args@{ pkgs, lib, callPackage }: self:
|
||||
(import ./hackage-packages.nix args self)
|
||||
|
|
|
@ -11,9 +11,13 @@
|
|||
, # package-set used for non-haskell dependencies (all of nixpkgs)
|
||||
pkgs
|
||||
|
||||
, # stdenv to use for building haskell packages
|
||||
, # stdenv provides our build and host platforms
|
||||
stdenv
|
||||
|
||||
, # this module provides the list of known licenses and maintainers
|
||||
lib
|
||||
|
||||
# needed for overrideCabal & packageSourceOverrides
|
||||
, haskellLib
|
||||
|
||||
, # hashes for downloading Hackage packages
|
||||
|
@ -22,7 +26,7 @@
|
|||
, # compiler to use
|
||||
ghc
|
||||
|
||||
, # A function that takes `{ pkgs, stdenv, callPackage }` as the first arg and
|
||||
, # A function that takes `{ pkgs, lib, callPackage }` as the first arg and
|
||||
# `self` as second, and returns a set of haskell packages
|
||||
package-set
|
||||
|
||||
|
@ -169,7 +173,7 @@ let
|
|||
};
|
||||
});
|
||||
|
||||
in package-set { inherit pkgs stdenv callPackage; } self // {
|
||||
in package-set { inherit pkgs lib callPackage; } self // {
|
||||
|
||||
inherit mkDerivation callPackage haskellSrc2nix hackage2nix buildHaskellPackages;
|
||||
|
||||
|
|
Loading…
Reference in a new issue