public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #65852 from NixOS/haskell-updates

Browse Source 
LTS Haskell 13.30
This commit is contained in:
Peter Simons 2019-08-03 19:40:33 +02:00 committed by GitHub
commit 020685de85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3092 additions and 863 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -72,7 +72,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src"; name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/"; url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version; rev = "refs/tags/" + super.git-annex.version;
sha256 = "11d4qyhmc774h2xyrpyn9rxx99x3vjs0fcxsg49gj5ayzmykafap"; sha256 = "1pz12l0awshdq5xyac5awjd902sy9l65z6ihya4pzapik4gqfdcd";
}; };
}).override { }).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null; dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -1111,7 +1111,7 @@ self: super: {
''; '';
}); });
hsdev_0_3_3_1 = super.hsdev_0_3_3_1.overrideScope (self: super: { hsdev_0_3_3_2 = super.hsdev_0_3_3_2.overrideScope (self: super: {
haskell-names = self.haskell-names_0_9_6; haskell-names = self.haskell-names_0_9_6;
network = self.network_3_0_1_1; network = self.network_3_0_1_1;
}); });
@ -1129,9 +1129,10 @@ self: super: {
concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version concurrent-output = self.concurrent-output_1_10_10; # needed for new ansi-terminal version
hi-file-parser = dontCheck (unmarkBroken super.hi-file-parser); # Avoid depending on newer hspec versions. hi-file-parser = dontCheck (unmarkBroken super.hi-file-parser); # Avoid depending on newer hspec versions.
http-download = dontCheck (unmarkBroken super.http-download); http-download = dontCheck (unmarkBroken super.http-download);
pantry-tmp = dontCheck (unmarkBroken super.pantry-tmp); pantry = dontCheck (unmarkBroken super.pantry);
rio = self.rio_0_1_10_0; rio = self.rio_0_1_11_0;
rio-prettyprint = unmarkBroken super.rio-prettyprint; rio-prettyprint = unmarkBroken super.rio-prettyprint;
unliftio = self.unliftio_0_2_12;
})); }));
# musl fixes # musl fixes
@ -1253,8 +1254,8 @@ self: super: {
cmark-gfm = self.cmark-gfm_0_2_0; cmark-gfm = self.cmark-gfm_0_2_0;
pandoc = dontCheck (doDistribute super.pandoc_2_7_3); # test suite failure: https://github.com/jgm/pandoc/issues/5582 pandoc = dontCheck (doDistribute super.pandoc_2_7_3); # test suite failure: https://github.com/jgm/pandoc/issues/5582
pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2; pandoc-citeproc = doDistribute super.pandoc-citeproc_0_16_2;
skylighting = self.skylighting_0_8_1_1; skylighting = self.skylighting_0_8_2;
skylighting-core = self.skylighting-core_0_8_1_1; skylighting-core = self.skylighting-core_0_8_2;
# Current versions of tasty-hedgehog need hedgehog 1.x, which # Current versions of tasty-hedgehog need hedgehog 1.x, which
# we don't have in LTS-13.x. # we don't have in LTS-13.x.
@ -1299,8 +1300,8 @@ self: super: {
temporary-resourcet = doJailbreak super.temporary-resourcet; temporary-resourcet = doJailbreak super.temporary-resourcet;
# Requires dhall >= 1.23.0 # Requires dhall >= 1.23.0
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_24_0; }; ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_25_0; };
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_24_0; }; dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_25_0; };
# Test suite doesn't work with current QuickCheck # Test suite doesn't work with current QuickCheck
# https://github.com/pruvisto/heap/issues/11 # https://github.com/pruvisto/heap/issues/11
@ -1313,7 +1314,7 @@ self: super: {
constraints-deriving = dontCheck super.constraints-deriving; constraints-deriving = dontCheck super.constraints-deriving;
# The old LTS-13.x version does not compile. # The old LTS-13.x version does not compile.
ip = self.ip_1_5_0; ip = self.ip_1_5_1;
# Needs deque >= 0.3, but latest version on stackage is 2.7 # Needs deque >= 0.3, but latest version on stackage is 2.7
butcher = super.butcher.override { deque = self.deque_0_4_2_3; }; butcher = super.butcher.override { deque = self.deque_0_4_2_3; };

72
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -43,7 +43,7 @@ core-packages:
- ghcjs-base-0 - ghcjs-base-0
default-package-overrides: default-package-overrides:
# LTS Haskell 13.27 # LTS Haskell 13.30
- abstract-deque ==0.3 - abstract-deque ==0.3
- abstract-deque-tests ==0.3 - abstract-deque-tests ==0.3
- abstract-par ==0.3.3 - abstract-par ==0.3.3
@ -345,6 +345,7 @@ default-package-overrides:
- bzlib ==0.5.0.5 - bzlib ==0.5.0.5
- bzlib-conduit ==0.3.0.1 - bzlib-conduit ==0.3.0.1
- c2hs ==0.28.6 - c2hs ==0.28.6
- Cabal ==2.4.1.0
- cabal2spec ==2.2.2.1 - cabal2spec ==2.2.2.1
- cabal-doctest ==1.0.6 - cabal-doctest ==1.0.6
- cabal-rpm ==0.12.6 - cabal-rpm ==0.12.6
@ -901,6 +902,7 @@ default-package-overrides:
- hashids ==1.0.2.4 - hashids ==1.0.2.4
- hashmap ==1.3.3 - hashmap ==1.3.3
- hashtables ==1.2.3.3 - hashtables ==1.2.3.3
- haskeline ==0.7.5.0
- haskell-gi ==0.21.5 - haskell-gi ==0.21.5
- haskell-gi-base ==0.21.5 - haskell-gi-base ==0.21.5
- haskell-gi-overloading ==1.0 - haskell-gi-overloading ==1.0
@ -1375,6 +1377,7 @@ default-package-overrides:
- mono-traversable ==1.0.11.0 - mono-traversable ==1.0.11.0
- mono-traversable-instances ==0.1.0.0 - mono-traversable-instances ==0.1.0.0
- mountpoints ==1.0.2 - mountpoints ==1.0.2
- mtl ==2.2.2
- mtl-compat ==0.2.2 - mtl-compat ==0.2.2
- mtl-prelude ==2.0.3.1 - mtl-prelude ==2.0.3.1
- multiarg ==0.30.0.10 - multiarg ==0.30.0.10
@ -1500,6 +1503,7 @@ default-package-overrides:
- parallel-io ==0.3.3 - parallel-io ==0.3.3
- paripari ==0.6.0.0 - paripari ==0.6.0.0
- parseargs ==0.2.0.9 - parseargs ==0.2.0.9
- parsec ==3.1.13.0
- parsec-class ==1.0.0.0 - parsec-class ==1.0.0.0
- parsec-numbers ==0.1.0 - parsec-numbers ==0.1.0
- parsec-numeric ==0.1.0.0 - parsec-numeric ==0.1.0.0
@ -1913,6 +1917,7 @@ default-package-overrides:
- statistics ==0.15.0.0 - statistics ==0.15.0.0
- stb-image-redux ==0.2.1.2 - stb-image-redux ==0.2.1.2
- step-function ==0.2 - step-function ==0.2
- stm ==2.5.0.0
- stm-chans ==3.0.0.4 - stm-chans ==3.0.0.4
- stm-conduit ==4.0.1 - stm-conduit ==4.0.1
- stm-delay ==0.1.1.1 - stm-delay ==0.1.1.1
@ -2021,6 +2026,7 @@ default-package-overrides:
- testing-feat ==1.1.0.0 - testing-feat ==1.1.0.0
- testing-type-modifiers ==0.1.0.1 - testing-type-modifiers ==0.1.0.1
- texmath ==0.11.2.2 - texmath ==0.11.2.2
- text ==1.2.3.1
- text-binary ==0.2.1.1 - text-binary ==0.2.1.1
- text-builder ==0.6.5.1 - text-builder ==0.6.5.1
- text-conversions ==0.3.0 - text-conversions ==0.3.0
@ -2277,6 +2283,7 @@ default-package-overrides:
- xdg-basedir ==0.2.2 - xdg-basedir ==0.2.2
- xeno ==0.3.5.1 - xeno ==0.3.5.1
- xenstore ==0.1.1 - xenstore ==0.1.1
- xhtml ==3000.2.2.1
- xls ==0.1.2 - xls ==0.1.2
- xlsx ==0.7.2 - xlsx ==0.7.2
- xlsx-tabular ==0.2.2.1 - xlsx-tabular ==0.2.2.1
@ -2427,6 +2434,7 @@ package-maintainers:
- funcmp - funcmp
- git-annex - git-annex
- hackage-db - hackage-db
- haskell-ci
- hledger - hledger
- hledger-interest - hledger-interest
- hledger-ui - hledger-ui
@ -2791,6 +2799,7 @@ broken-packages:
- apelsin - apelsin
- api-builder - api-builder
- api-tools - api-tools
- api-yoti
- apiary - apiary
- apiary-authenticate - apiary-authenticate
- apiary-clientsession - apiary-clientsession
@ -2887,6 +2896,7 @@ broken-packages:
- atomic-primops-vector - atomic-primops-vector
- atomo - atomo
- ats-format - ats-format
- ats-pkg
- ats-setup - ats-setup
- ats-storable - ats-storable
- attic-schedule - attic-schedule
@ -2956,7 +2966,9 @@ broken-packages:
- azurify - azurify
- b9 - b9
- babylon - babylon
- backblaze-b2-hs
- backdropper - backdropper
- backstop
- backtracking-exceptions - backtracking-exceptions
- backward-state - backward-state
- bag - bag
@ -3003,6 +3015,7 @@ broken-packages:
- bdcs-api - bdcs-api
- beam - beam
- beam-newtype-field - beam-newtype-field
- beam-postgres
- beam-th - beam-th
- beamable - beamable
- beautifHOL - beautifHOL
@ -3171,6 +3184,7 @@ broken-packages:
- blunt - blunt
- BNFC-meta - BNFC-meta
- bno055-haskell - bno055-haskell
- board-games
- bogre-banana - bogre-banana
- bolt - bolt
- boltzmann-brain - boltzmann-brain
@ -3183,11 +3197,13 @@ broken-packages:
- boolexpr - boolexpr
- boombox - boombox
- boomslang - boomslang
- boots
- borel - borel
- boring-window-switcher - boring-window-switcher
- bot - bot
- bounded-array - bounded-array
- bowntz - bowntz
- box
- braid - braid
- brain-bleep - brain-bleep
- Bravo - Bravo
@ -3319,6 +3335,7 @@ broken-packages:
- call-haskell-from-anything - call-haskell-from-anything
- camfort - camfort
- campfire - campfire
- canon
- canonical-filepath - canonical-filepath
- canonical-json - canonical-json
- canteven-http - canteven-http
@ -3413,6 +3430,9 @@ broken-packages:
- checked - checked
- Checked - Checked
- checkmate - checkmate
- chell
- chell-hunit
- chell-quickcheck
- chessIO - chessIO
- chevalier-common - chevalier-common
- chiasma - chiasma
@ -3743,6 +3763,7 @@ broken-packages:
- crf-chain2-generic - crf-chain2-generic
- crf-chain2-tiers - crf-chain2-tiers
- critbit - critbit
- criterion-compare
- criterion-plus - criterion-plus
- criterion-to-html - criterion-to-html
- criu-rpc - criu-rpc
@ -3863,6 +3884,7 @@ broken-packages:
- data-type - data-type
- data-util - data-util
- data-variant - data-variant
- database-id-groundhog
- database-study - database-study
- datadog - datadog
- datadog-tracing - datadog-tracing
@ -3974,8 +3996,11 @@ broken-packages:
- dgim - dgim
- dgs - dgs
- dhall-check - dhall-check
- dhall-lsp-server
- dhall-nix - dhall-nix
- dhall-to-cabal
- dhcp-lease-parser - dhcp-lease-parser
- dhrun
- dia-base - dia-base
- dia-functions - dia-functions
- diagrams-boolean - diagrams-boolean
@ -4029,7 +4054,6 @@ broken-packages:
- dirtree - dirtree
- discogs-haskell - discogs-haskell
- discord-gateway - discord-gateway
- discord-haskell
- discord-hs - discord-hs
- discord-rest - discord-rest
- discord-types - discord-types
@ -4192,6 +4216,7 @@ broken-packages:
- effect-handlers - effect-handlers
- effect-stack - effect-stack
- effin - effin
- egison
- egison-quote - egison-quote
- egison-tutorial - egison-tutorial
- ehaskell - ehaskell
@ -4232,6 +4257,7 @@ broken-packages:
- entangle - entangle
- EntrezHTTP - EntrezHTTP
- entwine - entwine
- enum-text-rio
- EnumContainers - EnumContainers
- enumerate - enumerate
- enumerate-function - enumerate-function
@ -4500,6 +4526,7 @@ broken-packages:
- FM-SBLEX - FM-SBLEX
- fmark - fmark
- FModExRaw - FModExRaw
- fmt-for-rio
- fn-extra - fn-extra
- foldl-incremental - foldl-incremental
- foldl-statistics - foldl-statistics
@ -4629,6 +4656,7 @@ broken-packages:
- gact - gact
- game-probability - game-probability
- gameclock - gameclock
- gamgee
- Gamgine - Gamgine
- gamma - gamma
- Ganymede - Ganymede
@ -4743,6 +4771,7 @@ broken-packages:
- ghcjs-promise - ghcjs-promise
- ghcjs-xhr - ghcjs-xhr
- ghclive - ghclive
- ghcprofview
- ght - ght
- gi-cairo-again - gi-cairo-again
- gi-dbusmenu - gi-dbusmenu
@ -4756,7 +4785,12 @@ broken-packages:
- gi-gstpbutils - gi-gstpbutils
- gi-gsttag - gi-gsttag
- gi-gstvideo - gi-gstvideo
- gi-gtk
- gi-gtk-declarative
- gi-gtk-declarative-app-simple
- gi-gtk-hs
- gi-gtkosxapplication - gi-gtkosxapplication
- gi-gtksource
- gi-handy - gi-handy
- gi-notify - gi-notify
- gi-ostree - gi-ostree
@ -4764,6 +4798,7 @@ broken-packages:
- gi-poppler - gi-poppler
- gi-secret - gi-secret
- gi-soup - gi-soup
- gi-vte
- gi-wnck - gi-wnck
- gi-xlib - gi-xlib
- giak - giak
@ -4945,6 +4980,7 @@ broken-packages:
- gtfs - gtfs
- gtk-serialized-event - gtk-serialized-event
- gtk-sni-tray - gtk-sni-tray
- gtk-strut
- gtk-toy - gtk-toy
- gtk2hs-hello - gtk2hs-hello
- gtk2hs-rpn - gtk2hs-rpn
@ -5109,6 +5145,7 @@ broken-packages:
- hArduino - hArduino
- hardware-edsl - hardware-edsl
- HaRe - HaRe
- harg
- hark - hark
- harmony - harmony
- HarmTrace - HarmTrace
@ -5512,6 +5549,7 @@ broken-packages:
- hjson-query - hjson-query
- hjsonpointer - hjsonpointer
- hjsonschema - hjsonschema
- hjugement-cli
- HJVM - HJVM
- hkgr - hkgr
- hlatex - hlatex
@ -5999,8 +6037,10 @@ broken-packages:
- identifiers - identifiers
- idiii - idiii
- idna2008 - idna2008
- idris
- IDynamic - IDynamic
- ieee-utils - ieee-utils
- iexcloud
- ifcxt - ifcxt
- IFS - IFS
- ig - ig
@ -6323,6 +6363,8 @@ broken-packages:
- ks-test - ks-test
- KSP - KSP
- ktx - ktx
- kubernetes-client
- kubernetes-client-core
- kure - kure
- kure-your-boilerplate - kure-your-boilerplate
- KyotoCabinet - KyotoCabinet
@ -6339,6 +6381,7 @@ broken-packages:
- lambda-calculator - lambda-calculator
- lambda-canvas - lambda-canvas
- lambda-devs - lambda-devs
- lambda-options
- lambda-toolbox - lambda-toolbox
- lambda2js - lambda2js
- lambdaBase - lambdaBase
@ -6740,6 +6783,7 @@ broken-packages:
- marxup - marxup
- masakazu-bot - masakazu-bot
- MASMGen - MASMGen
- massiv-test
- master-plan - master-plan
- matchers - matchers
- math-grads - math-grads
@ -6791,6 +6835,7 @@ broken-packages:
- mellon-gpio - mellon-gpio
- mellon-web - mellon-web
- melody - melody
- membrain
- memcache-conduit - memcache-conduit
- memcache-haskell - memcache-haskell
- memcached-binary - memcached-binary
@ -7140,6 +7185,7 @@ broken-packages:
- network-netpacket - network-netpacket
- network-protocol-xmpp - network-protocol-xmpp
- network-rpca - network-rpca
- network-run
- network-server - network-server
- network-service - network-service
- network-simple - network-simple
@ -7316,6 +7362,7 @@ broken-packages:
- optional - optional
- options-time - options-time
- optparse-applicative-simple - optparse-applicative-simple
- optparse-enum
- orc - orc
- orchestrate - orchestrate
- OrchestrateDB - OrchestrateDB
@ -7371,6 +7418,7 @@ broken-packages:
- pang-a-lambda - pang-a-lambda
- pangraph - pangraph
- panpipe - panpipe
- pantry
- pantry-tmp - pantry-tmp
- papa-export - papa-export
- papa-implement - papa-implement
@ -7419,6 +7467,7 @@ broken-packages:
- pasta - pasta
- pastis - pastis
- pasty - pasty
- patat
- patches-vector - patches-vector
- Pathfinder - Pathfinder
- pathfindingcore - pathfindingcore
@ -7653,6 +7702,7 @@ broken-packages:
- postgresql-named - postgresql-named
- postgresql-query - postgresql-query
- postgresql-simple-bind - postgresql-simple-bind
- postgresql-simple-named
- postgresql-simple-queue - postgresql-simple-queue
- postgresql-simple-sop - postgresql-simple-sop
- postgresql-simple-typed - postgresql-simple-typed
@ -7979,8 +8029,10 @@ broken-packages:
- Referees - Referees
- refh - refh
- reflection-extras - reflection-extras
- reflex
- reflex-animation - reflex-animation
- reflex-backend-wai - reflex-backend-wai
- reflex-basic-host
- reflex-dom-svg - reflex-dom-svg
- reflex-gloss - reflex-gloss
- reflex-gloss-scene - reflex-gloss-scene
@ -8104,6 +8156,8 @@ broken-packages:
- rfc1413-server - rfc1413-server
- rhythm-game-tutorial - rhythm-game-tutorial
- RichConditional - RichConditional
- ridley
- ridley-extras
- riemann - riemann
- riff - riff
- ring-buffer - ring-buffer
@ -8263,6 +8317,7 @@ broken-packages:
- scotty-binding-play - scotty-binding-play
- scotty-blaze - scotty-blaze
- scotty-fay - scotty-fay
- scotty-form
- scotty-format - scotty-format
- scotty-hastache - scotty-hastache
- scotty-resource - scotty-resource
@ -8773,6 +8828,7 @@ broken-packages:
- statsd-client - statsd-client
- statsdi - statsdi
- stb-image-redux - stb-image-redux
- stc-lang
- stdata - stdata
- stdf - stdf
- stdio - stdio
@ -8802,6 +8858,7 @@ broken-packages:
- StrappedTemplates - StrappedTemplates
- stratum-tool - stratum-tool
- stratux - stratux
- stratux-demo
- stratux-http - stratux-http
- stratux-types - stratux-types
- stratux-websockets - stratux-websockets
@ -8896,6 +8953,7 @@ broken-packages:
- symantic-cli - symantic-cli
- symantic-http-test - symantic-http-test
- symantic-lib - symantic-lib
- symantic-xml
- symengine - symengine
- symengine-hs - symengine-hs
- sync - sync
@ -9017,6 +9075,7 @@ broken-packages:
- terminal-punch - terminal-punch
- terminal-text - terminal-text
- termination-combinators - termination-combinators
- termonad
- termplot - termplot
- terntup - terntup
- terrahs - terrahs
@ -9187,6 +9246,7 @@ broken-packages:
- trace-function-call - trace-function-call
- traced - traced
- tracetree - tracetree
- tracing
- tracker - tracker
- traction - traction
- tracy - tracy
@ -9208,6 +9268,8 @@ broken-packages:
- translatable-intset - translatable-intset
- translate - translate
- translate-cli - translate-cli
- trasa-extra
- trasa-th
- travis - travis
- travis-meta-yaml - travis-meta-yaml
- trawl - trawl
@ -9386,6 +9448,7 @@ broken-packages:
- unsequential - unsequential
- unused - unused
- uom-plugin - uom-plugin
- up
- update-nix-fetchgit - update-nix-fetchgit
- Updater - Updater
- uploadcare - uploadcare
@ -9405,6 +9468,7 @@ broken-packages:
- urldecode - urldecode
- UrlDisp - UrlDisp
- urldisp-happstack - urldisp-happstack
- urlpath
- URLT - URLT
- urn - urn
- urn-random - urn-random
@ -9489,6 +9553,7 @@ broken-packages:
- verilog - verilog
- versioning - versioning
- versioning-servant - versioning-servant
- vflow-types
- vfr-waypoints - vfr-waypoints
- vgrep - vgrep
- vhd - vhd
@ -9682,6 +9747,7 @@ broken-packages:
- writer-cps-lens - writer-cps-lens
- writer-cps-monads-tf - writer-cps-monads-tf
- writer-cps-morph - writer-cps-morph
- ws
- wsdl - wsdl
- wsedit - wsedit
- wss-client - wss-client
@ -9702,6 +9768,7 @@ broken-packages:
- wxSimpleCanvas - wxSimpleCanvas
- wxturtle - wxturtle
- wyvern - wyvern
- X
- x-dsp - x-dsp
- X11-extras - X11-extras
- X11-rm - X11-rm
@ -9808,6 +9875,7 @@ broken-packages:
- yate - yate
- yavie - yavie
- yaya - yaya
- yaya-hedgehog
- yaya-unsafe - yaya-unsafe
- ycextra - ycextra
- yeller - yeller

2
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -584,6 +584,6 @@ self: super: builtins.intersectAttrs super {
snap-server = dontCheck super.snap-server; snap-server = dontCheck super.snap-server;
# Tests require internet # Tests require internet
dhall_1_24_0 = dontCheck super.dhall_1_24_0; dhall_1_25_0 = dontCheck super.dhall_1_25_0;
} }

3862
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff