forked from mirrors/nixpkgs
Merge pull request #133422 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
This commit is contained in:
maralorn
GitHub
commit
266adb3397
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"commit": "8977803787241e1474bdbb35cbc704c57cce6fcd",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8977803787241e1474bdbb35cbc704c57cce6fcd.tar.gz",
|
||||
"sha256": "1ivdqlmpdqpa5m5cdwdk6l258nmnz9a6466y8xs19x0wkdx4b738",
|
||||
"msg": "Update from Hackage at 2021-08-07T10:52:35Z"
|
||||
"commit": "dfb0b040033334d2e676906786c7a90805310e7d",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/dfb0b040033334d2e676906786c7a90805310e7d.tar.gz",
|
||||
"sha256": "0x53gkkpxlcm6qa38yksx8cws9phl2zxvdys5imjpg8dl1sal3pg",
|
||||
"msg": "Update from Hackage at 2021-08-10T19:15:27Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -311,6 +311,7 @@ stdenv.mkDerivation (rec {
|
|||
homepage = "http://haskell.org/ghc";
|
||||
description = "The Glasgow Haskell Compiler";
|
||||
maintainers = with lib.maintainers; [ marcweber andres peti ];
|
||||
timeout = 24 * 3600;
|
||||
inherit (ghc.meta) license platforms;
|
||||
# ghcHEAD times out on aarch64-linux on Hydra.
|
||||
hydraPlatforms = builtins.filter (p: p != "aarch64-linux") ghc.meta.platforms;
|
||||
|
|
|
|||
|
|
@ -1458,6 +1458,10 @@ self: super: {
|
|||
addBuildDepend (unmarkBroken super.hercules-ci-cli) super.hercules-ci-optparse-applicative
|
||||
);
|
||||
|
||||
# Readline uses Distribution.Simple from Cabal 2, in a way that is not
|
||||
# compatible with Cabal 3. No upstream repository found so far
|
||||
readline = appendPatch super.readline ./patches/readline-fix-for-cabal-3.patch;
|
||||
|
||||
# 2020-12-05: http-client is fixed on too old version
|
||||
essence-of-live-coding-warp = doJailbreak (super.essence-of-live-coding-warp.override {
|
||||
http-client = self.http-client_0_7_8;
|
||||
|
|
|
|||
|
|
@ -735,6 +735,7 @@ broken-packages:
|
|||
- compilation
|
||||
- complex-generic
|
||||
- compose-trans
|
||||
- composite-dhall
|
||||
- composite-opaleye
|
||||
- composition-tree
|
||||
- comprehensions-ghc
|
||||
|
|
@ -2558,6 +2559,7 @@ broken-packages:
|
|||
- jenga
|
||||
- jenkinsPlugins2nix
|
||||
- jespresso
|
||||
- jet-stream
|
||||
- jinquantities
|
||||
- jml-web-service
|
||||
- jni
|
||||
|
|
@ -3898,7 +3900,6 @@ broken-packages:
|
|||
- read-bounded
|
||||
- read-ctags
|
||||
- read-io
|
||||
- readline
|
||||
- readme-lhs
|
||||
- readshp
|
||||
- really-simple-xml-parser
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ dont-distribute-packages:
|
|||
- CC-delcont-alt
|
||||
- CMCompare
|
||||
- CPBrainfuck
|
||||
- CPL
|
||||
- CSPM-Interpreter
|
||||
- CSPM-ToProlog
|
||||
- CSPM-cspm
|
||||
|
|
@ -371,8 +370,6 @@ dont-distribute-packages:
|
|||
- XSaiga
|
||||
- YACPong
|
||||
- Yablog
|
||||
- Yogurt
|
||||
- Yogurt-Standalone
|
||||
- Z-Botan
|
||||
- Z-IO
|
||||
- Z-MessagePack
|
||||
|
|
@ -1559,7 +1556,6 @@ dont-distribute-packages:
|
|||
- hoodle-publish
|
||||
- hoodle-render
|
||||
- hoovie
|
||||
- hoq
|
||||
- hp2any-graph
|
||||
- hp2any-manager
|
||||
- hpaco
|
||||
|
|
@ -1613,7 +1609,6 @@ dont-distribute-packages:
|
|||
- hset
|
||||
- hsfacter
|
||||
- hslogstash
|
||||
- hsnock
|
||||
- hspec-expectations-pretty
|
||||
- hspec-pg-transact
|
||||
- hspec-setup
|
||||
|
|
@ -1655,7 +1650,6 @@ dont-distribute-packages:
|
|||
- hunt-searchengine
|
||||
- hunt-server
|
||||
- hurdle
|
||||
- husky
|
||||
- huzzy
|
||||
- hw-all
|
||||
- hw-dsv
|
||||
|
|
@ -1973,6 +1967,8 @@ dont-distribute-packages:
|
|||
- llvm-tools
|
||||
- lmonad-yesod
|
||||
- lnd-client
|
||||
- lnurl
|
||||
- lnurl-authenticator
|
||||
- local-search
|
||||
- localize
|
||||
- locked-poll
|
||||
|
|
@ -2078,7 +2074,6 @@ dont-distribute-packages:
|
|||
- minecraft-data
|
||||
- minesweeper
|
||||
- mini-egison
|
||||
- miniforth
|
||||
- minilight-lua
|
||||
- minimung
|
||||
- minioperational
|
||||
|
|
@ -2087,7 +2082,6 @@ dont-distribute-packages:
|
|||
- missing-py2
|
||||
- mixed-strategies
|
||||
- mkbndl
|
||||
- mkcabal
|
||||
- mlist
|
||||
- mmark-cli
|
||||
- mmark-ext
|
||||
|
|
@ -2107,6 +2101,7 @@ dont-distribute-packages:
|
|||
- monetdb-mapi
|
||||
- mongrel2-handler
|
||||
- monky
|
||||
- monomer
|
||||
- monte-carlo
|
||||
- moo
|
||||
- moo-nad
|
||||
|
|
@ -2385,6 +2380,7 @@ dont-distribute-packages:
|
|||
- postgresql-tx-query
|
||||
- postgresql-tx-squeal
|
||||
- postgresql-tx-squeal-compat-simple
|
||||
- postgrest_8_0_0
|
||||
- postmark
|
||||
- potoki
|
||||
- potoki-cereal
|
||||
|
|
@ -2449,7 +2445,6 @@ dont-distribute-packages:
|
|||
- queryparser-hive
|
||||
- queryparser-presto
|
||||
- queryparser-vertica
|
||||
- questioner
|
||||
- queuelike
|
||||
- quickbench
|
||||
- quickcheck-combinators
|
||||
|
|
@ -2513,7 +2508,6 @@ dont-distribute-packages:
|
|||
- reactive-fieldtrip
|
||||
- reactive-glut
|
||||
- reactor
|
||||
- readline-statevar
|
||||
- readpyc
|
||||
- reanimate
|
||||
- record-aeson
|
||||
|
|
@ -2899,7 +2893,6 @@ dont-distribute-packages:
|
|||
- svg2q
|
||||
- svgone
|
||||
- swapper
|
||||
- swearjure
|
||||
- sweet-egison
|
||||
- switch
|
||||
- sylvia
|
||||
|
|
@ -3041,7 +3034,6 @@ dont-distribute-packages:
|
|||
- twidge
|
||||
- twilight-stm
|
||||
- twill
|
||||
- twitter
|
||||
- twitter-enumerator
|
||||
- type-assertions
|
||||
- type-cache
|
||||
|
|
|
|||
675
pkgs/development/haskell-modules/hackage-packages.nix
generated
675
pkgs/development/haskell-modules/hackage-packages.nix
generated
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,8 @@
|
|||
--- a/Setup.hs 2021-02-04 14:01:09.557970245 +0100
|
||||
+++ b/Setup.hs 2021-02-04 14:07:45.047443753 +0100
|
||||
@@ -3,4 +3,4 @@
|
||||
import Distribution.Simple
|
||||
|
||||
main :: IO ()
|
||||
-main = defaultMainWithHooks defaultUserHooks
|
||||
+main = defaultMainWithHooks autoconfUserHooks
|
||||
Loading…
Reference in a new issue