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

Merge pull request #118923 from NixOS/haskell-updates

Browse Source 
Update Haskell package set to Stackage Nightly 2021-04-06 (plus other fixes)
This commit is contained in:
Peter Simons 2021-04-16 20:25:16 +02:00 committed by GitHub
commit a09a5943b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1576 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1242,13 +1242,7 @@ self: super: {
patch = doJailbreak super.patch; patch = doJailbreak super.patch;
# Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
reflex-dom-core = doDistribute (unmarkBroken (dontCheck (appendPatch (doJailbreak super.reflex-dom-core) (pkgs.fetchpatch { reflex-dom-core = doDistribute (unmarkBroken (dontCheck (doJailbreak super.reflex-dom-core)));
url = https://github.com/reflex-frp/reflex-dom/commit/6aed7b7ebb70372778f1a29a724fcb4de815ba04.patch;
sha256 = "1g7lgwj7rpziilif2gian412iy05gqbzwx9w0m6ajq3clxs5zs7l";
stripLen = 2;
extraPrefix = "";
includes = ["reflex-dom-core.cabal" ];
}))));
# Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
reflex-dom = appendPatch super.reflex-dom (pkgs.fetchpatch { reflex-dom = appendPatch super.reflex-dom (pkgs.fetchpatch {
@ -1475,14 +1469,6 @@ self: super: {
# https://github.com/obsidiansystems/dependent-sum/issues/55 # https://github.com/obsidiansystems/dependent-sum/issues/55
dependent-sum = doJailbreak super.dependent-sum; dependent-sum = doJailbreak super.dependent-sum;
# Overspecified constraint on 'constraints'. Kinda funny, huh?
dependent-sum-aeson-orphans = appendPatch (doJailbreak super.dependent-sum-aeson-orphans) (pkgs.fetchpatch {
# 2020-11-18: https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/9
# Bump version bounds for ghc 8.10
url = https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/e1f5898116222a1bc557d41f3395066f83736093.patch;
sha256 = "01fj29xdblxpz4drasaygf9875fipylpj8w164lb0cszd1vmqwnb";
});
# 2020-11-18: https://github.com/srid/rib/issues/169 # 2020-11-18: https://github.com/srid/rib/issues/169
# aeson bound out of sync # aeson bound out of sync
rib-core = doJailbreak super.rib-core; rib-core = doJailbreak super.rib-core;
@ -1491,20 +1477,8 @@ self: super: {
# base upper bound is incompatible with ghc 8.10 # base upper bound is incompatible with ghc 8.10
neuron = doJailbreak super.neuron; neuron = doJailbreak super.neuron;
reflex = dontCheck (doJailbreak (appendPatches super.reflex [ # 2020-04-16: https://github.com/reflex-frp/reflex/issues/449
# https://github.com/reflex-frp/reflex/pull/444 reflex = dontCheck (doJailbreak super.reflex);
# Fixes for ghc 8.10
(pkgs.fetchpatch {
url = https://github.com/reflex-frp/reflex/commit/d230632427fc1b7031163567c97f20050610c122.patch;
sha256 = "0gafqqi6q16m5y4mrc2f7lhahmazvcbiadn2v84y9p3zvx2v26xy";
})
# https://github.com/reflex-frp/reflex/pull/444
# Bound bumps for ghc 8.10
(pkgs.fetchpatch {
url = https://patch-diff.githubusercontent.com/raw/reflex-frp/reflex/pull/448.patch;
sha256 = "0a8gcq9g8dyyafkvs54mi3fnisff20r0x0qzmhxcp9md61nkf7gq";
})
]));
# 2020-11-19: jailbreaking because of pretty-simple bound out of date # 2020-11-19: jailbreaking because of pretty-simple bound out of date
# https://github.com/kowainik/stan/issues/408 # https://github.com/kowainik/stan/issues/408
@ -1563,9 +1537,9 @@ self: super: {
); );
# 2020-12-05: http-client is fixed on too old version # 2020-12-05: http-client is fixed on too old version
essence-of-live-coding-warp = super.essence-of-live-coding-warp.override { essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override {
http-client = self.http-client_0_7_6; http-client = self.http-client_0_7_7;
}; });
# 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27) # 2020-12-06: Restrictive upper bounds w.r.t. pandoc-types (https://github.com/owickstrom/pandoc-include-code/issues/27)
pandoc-include-code = doJailbreak super.pandoc-include-code; pandoc-include-code = doJailbreak super.pandoc-include-code;
@ -1811,4 +1785,8 @@ self: super: {
# PR pending https://github.com/zohl/cereal-time/pull/2 # PR pending https://github.com/zohl/cereal-time/pull/2
cereal-time = doJailbreak super.cereal-time; cereal-time = doJailbreak super.cereal-time;
# 2021-04-16: too strict bounds on QuickCheck and tasty
# https://github.com/hasufell/lzma-static/issues/1
lzma-static = doJailbreak super.lzma-static;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

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

@ -82,6 +82,8 @@ default-package-overrides:
- hls-retrie-plugin < 1.0.0.1 - hls-retrie-plugin < 1.0.0.1
- lsp < 1.2 - lsp < 1.2
- lsp-types < 1.2 - lsp-types < 1.2
- hls-plugin-api < 1.1.0.0
- hls-explicit-imports-plugin < 1.0.0.1
# 2021-04-02: Stackage Nighlty has haskell-gi* < 0.25, # 2021-04-02: Stackage Nighlty has haskell-gi* < 0.25,
# so we need to restrict these to compatible versions # so we need to restrict these to compatible versions
# Remove these as soon as haskell-gi{,-base} are 0.25.* # Remove these as soon as haskell-gi{,-base} are 0.25.*
@ -99,7 +101,7 @@ default-package-overrides:
- gi-secret < 0.0.13 - gi-secret < 0.0.13
- gi-vte < 2.91.28 - gi-vte < 2.91.28
# Stackage Nightly 2021-04-02 # Stackage Nightly 2021-04-06
- abstract-deque ==0.3 - abstract-deque ==0.3
- abstract-par ==0.3.3 - abstract-par ==0.3.3
- AC-Angle ==1.0 - AC-Angle ==1.0
@ -330,7 +332,7 @@ default-package-overrides:
- bech32 ==1.1.0 - bech32 ==1.1.0
- bech32-th ==1.0.2 - bech32-th ==1.0.2
- bench ==1.0.12 - bench ==1.0.12
- benchpress ==0.2.2.15 - benchpress ==0.2.2.16
- between ==0.11.0.0 - between ==0.11.0.0
- bibtex ==0.1.0.6 - bibtex ==0.1.0.6
- bifunctors ==5.5.10 - bifunctors ==5.5.10
@ -381,7 +383,7 @@ default-package-overrides:
- boolsimplifier ==0.1.8 - boolsimplifier ==0.1.8
- boots ==0.2.0.1 - boots ==0.2.0.1
- bordacount ==0.1.0.0 - bordacount ==0.1.0.0
- boring ==0.1.3 - boring ==0.2
- both ==0.1.1.1 - both ==0.1.1.1
- bound ==2.0.3 - bound ==2.0.3
- BoundedChan ==1.0.3.0 - BoundedChan ==1.0.3.0
@ -535,7 +537,7 @@ default-package-overrides:
- composite-hashable ==0.7.4.0 - composite-hashable ==0.7.4.0
- composite-tuple ==0.1.2.0 - composite-tuple ==0.1.2.0
- composite-xstep ==0.1.0.0 - composite-xstep ==0.1.0.0
- composition ==1.0.2.1 - composition ==1.0.2.2
- composition-extra ==2.0.0 - composition-extra ==2.0.0
- concise ==0.1.0.1 - concise ==0.1.0.1
- concurrency ==1.11.0.1 - concurrency ==1.11.0.1
@ -661,7 +663,7 @@ default-package-overrides:
- data-ordlist ==0.4.7.0 - data-ordlist ==0.4.7.0
- data-ref ==0.0.2 - data-ref ==0.0.2
- data-reify ==0.6.3 - data-reify ==0.6.3
- data-serializer ==0.3.4.1 - data-serializer ==0.3.5
- data-textual ==0.3.0.3 - data-textual ==0.3.0.3
- dataurl ==0.1.0.0 - dataurl ==0.1.0.0
- DAV ==1.3.4 - DAV ==1.3.4
@ -708,7 +710,7 @@ default-package-overrides:
- distributed-closure ==0.4.2.0 - distributed-closure ==0.4.2.0
- distribution-opensuse ==1.1.1 - distribution-opensuse ==1.1.1
- distributive ==0.6.2.1 - distributive ==0.6.2.1
- dl-fedora ==0.7.6 - dl-fedora ==0.7.7
- dlist ==0.8.0.8 - dlist ==0.8.0.8
- dlist-instances ==0.1.1.1 - dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1 - dlist-nonempty ==0.1.1
@ -873,7 +875,7 @@ default-package-overrides:
- fix-whitespace ==0.0.5 - fix-whitespace ==0.0.5
- flac ==0.2.0 - flac ==0.2.0
- flac-picture ==0.1.2 - flac-picture ==0.1.2
- flags-applicative ==0.1.0.2 - flags-applicative ==0.1.0.3
- flat ==0.4.4 - flat ==0.4.4
- flat-mcmc ==1.5.2 - flat-mcmc ==1.5.2
- flexible-defaults ==0.0.3 - flexible-defaults ==0.0.3
@ -1043,7 +1045,7 @@ default-package-overrides:
- graphite ==0.10.0.1 - graphite ==0.10.0.1
- graphql-client ==1.1.1 - graphql-client ==1.1.1
- graphs ==0.7.1 - graphs ==0.7.1
- graphula ==2.0.0.3 - graphula ==2.0.0.4
- graphviz ==2999.20.1.0 - graphviz ==2999.20.1.0
- graph-wrapper ==0.2.6.0 - graph-wrapper ==0.2.6.0
- gravatar ==0.8.0 - gravatar ==0.8.0
@ -1126,7 +1128,7 @@ default-package-overrides:
- hformat ==0.3.3.1 - hformat ==0.3.3.1
- hfsevents ==0.1.6 - hfsevents ==0.1.6
- hgrev ==0.2.6 - hgrev ==0.2.6
- hidapi ==0.1.6 - hidapi ==0.1.7
- hie-bios ==0.7.5 - hie-bios ==0.7.5
- hi-file-parser ==0.1.1.0 - hi-file-parser ==0.1.1.0
- higher-leveldb ==0.6.0.0 - higher-leveldb ==0.6.0.0
@ -1162,7 +1164,7 @@ default-package-overrides:
- hp2pretty ==0.10 - hp2pretty ==0.10
- hpack ==0.34.4 - hpack ==0.34.4
- hpack-dhall ==0.5.2 - hpack-dhall ==0.5.2
- hpc-codecov ==0.2.0.2 - hpc-codecov ==0.3.0.0
- hpc-lcov ==1.0.1 - hpc-lcov ==1.0.1
- hprotoc ==2.4.17 - hprotoc ==2.4.17
- hruby ==0.3.8.1 - hruby ==0.3.8.1
@ -1185,7 +1187,7 @@ default-package-overrides:
- hslua-module-path ==0.1.0.1 - hslua-module-path ==0.1.0.1
- hslua-module-system ==0.2.2.1 - hslua-module-system ==0.2.2.1
- hslua-module-text ==0.3.0.1 - hslua-module-text ==0.3.0.1
- HsOpenSSL ==0.11.6 - HsOpenSSL ==0.11.6.1
- HsOpenSSL-x509-system ==0.1.0.4 - HsOpenSSL-x509-system ==0.1.0.4
- hsp ==0.10.0 - hsp ==0.10.0
- hspec ==2.7.9 - hspec ==2.7.9
@ -1465,7 +1467,7 @@ default-package-overrides:
- liboath-hs ==0.0.1.2 - liboath-hs ==0.0.1.2
- libyaml ==0.1.2 - libyaml ==0.1.2
- LibZip ==1.0.1 - LibZip ==1.0.1
- lifted-async ==0.10.1.3 - lifted-async ==0.10.2
- lifted-base ==0.2.3.12 - lifted-base ==0.2.3.12
- lift-generics ==0.2 - lift-generics ==0.2
- line ==4.0.1 - line ==4.0.1
@ -1629,7 +1631,7 @@ default-package-overrides:
- mono-traversable ==1.0.15.1 - mono-traversable ==1.0.15.1
- mono-traversable-instances ==0.1.1.0 - mono-traversable-instances ==0.1.1.0
- mono-traversable-keys ==0.1.0 - mono-traversable-keys ==0.1.0
- more-containers ==0.2.2.0 - more-containers ==0.2.2.2
- morpheus-graphql ==0.17.0 - morpheus-graphql ==0.17.0
- morpheus-graphql-app ==0.17.0 - morpheus-graphql-app ==0.17.0
- morpheus-graphql-client ==0.17.0 - morpheus-graphql-client ==0.17.0
@ -2069,7 +2071,7 @@ default-package-overrides:
- rhine-gloss ==0.7.0 - rhine-gloss ==0.7.0
- rigel-viz ==0.2.0.0 - rigel-viz ==0.2.0.0
- rio ==0.1.20.0 - rio ==0.1.20.0
- rio-orphans ==0.1.1.0 - rio-orphans ==0.1.2.0
- rio-prettyprint ==0.1.1.0 - rio-prettyprint ==0.1.1.0
- roc-id ==0.1.0.0 - roc-id ==0.1.0.0
- rocksdb-haskell ==1.0.1 - rocksdb-haskell ==1.0.1
@ -2163,7 +2165,7 @@ default-package-overrides:
- servant-swagger ==1.1.10 - servant-swagger ==1.1.10
- servant-swagger-ui ==0.3.4.3.37.2 - servant-swagger-ui ==0.3.4.3.37.2
- servant-swagger-ui-core ==0.3.4 - servant-swagger-ui-core ==0.3.4
- serverless-haskell ==0.12.5 - serverless-haskell ==0.12.6
- serversession ==1.0.2 - serversession ==1.0.2
- serversession-frontend-wai ==1.0 - serversession-frontend-wai ==1.0
- ses-html ==0.4.0.0 - ses-html ==0.4.0.0
@ -2234,7 +2236,7 @@ default-package-overrides:
- soap-tls ==0.1.1.4 - soap-tls ==0.1.1.4
- socket ==0.8.3.0 - socket ==0.8.3.0
- socks ==0.6.1 - socks ==0.6.1
- some ==1.0.2 - some ==1.0.3
- sop-core ==0.5.0.1 - sop-core ==0.5.0.1
- sort ==1.0.0.0 - sort ==1.0.0.0
- sorted-list ==0.2.1.0 - sorted-list ==0.2.1.0
@ -2309,7 +2311,7 @@ default-package-overrides:
- string-conversions ==0.4.0.1 - string-conversions ==0.4.0.1
- string-interpolate ==0.3.1.0 - string-interpolate ==0.3.1.0
- string-qq ==0.0.4 - string-qq ==0.0.4
- string-random ==0.1.4.0 - string-random ==0.1.4.1
- stringsearch ==0.3.6.6 - stringsearch ==0.3.6.6
- string-transform ==1.1.1 - string-transform ==1.1.1
- stripe-concepts ==1.0.2.6 - stripe-concepts ==1.0.2.6
@ -2362,7 +2364,7 @@ default-package-overrides:
- tardis ==0.4.3.0 - tardis ==0.4.3.0
- tasty ==1.4.1 - tasty ==1.4.1
- tasty-ant-xml ==1.1.8 - tasty-ant-xml ==1.1.8
- tasty-bench ==0.2.4 - tasty-bench ==0.2.5
- tasty-dejafu ==2.0.0.7 - tasty-dejafu ==2.0.0.7
- tasty-discover ==4.2.2 - tasty-discover ==4.2.2
- tasty-expected-failure ==0.12.3 - tasty-expected-failure ==0.12.3
@ -2741,7 +2743,7 @@ default-package-overrides:
- yesod-sitemap ==1.6.0 - yesod-sitemap ==1.6.0
- yesod-static ==1.6.1.0 - yesod-static ==1.6.1.0
- yesod-test ==1.6.12 - yesod-test ==1.6.12
- yesod-websockets ==0.3.0.2 - yesod-websockets ==0.3.0.3
- yes-precure5-command ==5.5.3 - yes-precure5-command ==5.5.3
- yi-rope ==0.11 - yi-rope ==0.11
- yjsvg ==0.2.0.1 - yjsvg ==0.2.0.1
@ -5694,6 +5696,7 @@ broken-packages:
- ghcjs-xhr - ghcjs-xhr
- ghclive - ghclive
- ghcprofview - ghcprofview
- ghcup
- ght - ght
- gi-cairo-again - gi-cairo-again
- gi-graphene - gi-graphene
@ -7490,7 +7493,6 @@ broken-packages:
- kparams - kparams
- kqueue - kqueue
- kraken - kraken
- krank
- krapsh - krapsh
- Kriens - Kriens
- krpc - krpc
@ -9330,7 +9332,6 @@ broken-packages:
- puzzle-draw - puzzle-draw
- puzzle-draw-cmdline - puzzle-draw-cmdline
- pvd - pvd
- PyF
- pyffi - pyffi
- pyfi - pyfi
- python-pickle - python-pickle
@ -10379,6 +10380,7 @@ broken-packages:
- sorted - sorted
- sorting - sorting
- sorty - sorty
- souffle-dsl
- souffle-haskell - souffle-haskell
- sound-collage - sound-collage
- sounddelay - sounddelay
@ -11454,6 +11456,7 @@ broken-packages:
- wai-graceful - wai-graceful
- wai-handler-devel - wai-handler-devel
- wai-handler-fastcgi - wai-handler-fastcgi
- wai-handler-hal
- wai-handler-scgi - wai-handler-scgi
- wai-handler-snap - wai-handler-snap
- wai-handler-webkit - wai-handler-webkit

2
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -51,6 +51,7 @@ in
, license , license
, enableParallelBuilding ? true , enableParallelBuilding ? true
, maintainers ? null , maintainers ? null
, changelog ? null
, doCoverage ? false , doCoverage ? false
, doHaddock ? !(ghc.isHaLVM or false) , doHaddock ? !(ghc.isHaLVM or false)
, passthru ? {} , passthru ? {}
@ -642,6 +643,7 @@ stdenv.mkDerivation ({
// optionalAttrs (args ? description) { inherit description; } // optionalAttrs (args ? description) { inherit description; }
// optionalAttrs (args ? maintainers) { inherit maintainers; } // optionalAttrs (args ? maintainers) { inherit maintainers; }
// optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; } // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; }
// optionalAttrs (args ? changelog) { inherit changelog; }
; ;
} }

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

File diff suppressed because it is too large Load Diff

2
pkgs/development/tools/purescript/spago/default.nix
View File

@ -17,6 +17,8 @@ let
maintainers = (oldAttrs.maintainers or []) ++ [ maintainers = (oldAttrs.maintainers or []) ++ [
lib.maintainers.cdepillabout lib.maintainers.cdepillabout
]; ];
changelog =
"https://github.com/purescript/spago/releases/tag/${oldAttrs.version}";
})); }));
in in