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

Merge pull request #69087 from NixOS/haskell-updates

Browse Source 
Merge haskell-updates into master.
This commit is contained in:
Peter Simons 2019-09-19 13:33:50 +02:00 committed by GitHub
commit 90effb5c70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 2168 additions and 901 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "1795sad0jr2da2pn28nbqsvpld6zw8gf9yscywixkbabf7ls66fn";
sha256 = "1ackqjkwkfm3kazlyy4nwdjf6wwjlajql1hrznaki5138nw4gxs4";
};
}).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -1197,8 +1197,8 @@ self: super: {
temporary-resourcet = doJailbreak super.temporary-resourcet;
# Requires dhall >= 1.23.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_25_0; };
ats-pkg = super.ats-pkg.override { dhall = self.dhall_1_26_0; };
dhall-to-cabal = super.dhall-to-cabal.override { dhall = self.dhall_1_26_0; };
# Test suite doesn't work with current QuickCheck
# https://github.com/pruvisto/heap/issues/11

36
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@ -70,11 +70,10 @@ self: super: {
sha256 = "1p1pinca33vd10iy7hl20c1fc99vharcgcai6z3ngqbq50k2pd3q";
};
};
vector-th-unbox = appendPatch super.vector-th-unbox (pkgs.fetchpatch {
vector-th-unbox = appendPatch (doJailbreak super.vector-th-unbox) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/vector-th-unbox-0.2.1.6.patch";
sha256 = "0169yf9ms1g5mmkc5l6hpffzm34zdrqdng4df02nbdmfgba45h19";
});
cabal-doctest = super.cabal-doctest_1_0_7;
regex-base = overrideCabal (appendPatch super.regex-base (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-base-0.93.2.patch";
sha256 = "01d1plrdx6hcspwn2h6y9pyi5366qk926vb5cl5qcl6x4m23l6y1";
@ -85,10 +84,6 @@ self: super: {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-posix-0.95.2.patch";
sha256 = "006yli58jpqp786zm1xlncjsilc38iv3a09r4pv94l587sdzasd2";
});
haskell-src-exts = appendPatch super.haskell-src-exts (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/haskell-src-exts-1.21.0.patch";
sha256 = "0alb28hcsp774c9s73dgrajcb44vgv1xqfg2n5a9y2bpyngqscs3";
});
optparse-applicative = appendPatch (doJailbreak super.optparse-applicative) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/optparse-applicative-0.14.3.0.patch";
sha256 = "068sjj98jqiq3h8h03mg4w2pa11q8lxkx2i4lmxivq77xyhlwq3y";
@ -97,23 +92,15 @@ self: super: {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch";
sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4";
});
happy = appendPatch super.happy (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/happy-1.19.11.patch";
sha256 = "16m659kxbq0s87ak2y1pqggfy67yfvcwc0zi3hcphf3v8735xhkk";
});
hedgehog = appendPatch super.hedgehog (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hedgehog-0.6.1.patch";
sha256 = "04xwznd3lfgracfz68ls6vfm19rhq8fb74r6ii0grpv6cx4rr21i";
hedgehog = appendPatch (doJailbreak super.hedgehog) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/hedgehog-1.0.patch";
sha256 = "16gadh1hb74jqvzc9c893sffb1y2vjglblyrqjwp7xfhccq7g8yw";
});
easytest = self.easytest_0_3;
regex-tdfa = appendPatch super.regex-tdfa (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/regex-tdfa-1.2.3.1.patch";
sha256 = "1lhas4s2ms666prb475gaw2bqw1v4y8cxi66sy20j727sx7ppjs7";
});
attoparsec = appendPatch (doJailbreak super.attoparsec) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/attoparsec-0.13.2.2.patch";
sha256 = "13i1p5g0xzxnv966nlyb77mfmxvg9jzbym1d36h1ajn045yf4igl";
});
cassava = appendPatch super.cassava (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/cassava-0.5.1.0.patch";
sha256 = "11scwwjp94si90vb8v5yr291g9qwv5l223z8y0g0lc63932bp63g";
@ -122,7 +109,7 @@ self: super: {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/shakespeare-2.0.20.patch";
sha256 = "1dgx41ylahj4wk8r422aik0d7qdpawdga4gqz905nvlnhqjla58y";
});
socks = appendPatch super.socks (pkgs.fetchpatch {
socks = appendPatch (doJailbreak super.socks) (pkgs.fetchpatch {
url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/socks-0.6.0.patch";
sha256 = "1dsqmx0sw62x4glh43c0sbizd2y00v5xybiqadn96v6pmfrap5cp";
});
@ -159,14 +146,21 @@ self: super: {
'';
});
system-fileio = doJailbreak super.system-fileio;
yaml = self.yaml_0_11_1_2;
tasty-hedgehog = doJailbreak super.tasty-hedgehog;
haskell-src-meta = appendPatch (dontCheck (doJailbreak super.haskell-src-meta)) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.2.patch";
sha256 = "146im1amywyl29kcldvgrxpwj22lrpzxysl7vc8rmn3hrq130dyc";
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/haskell-src-meta-0.8.3.patch";
sha256 = "1asl932mibr5y057xx8v1a7n3qy87lcnclsfh8pbxq1m3iwjkxy8";
});
asn1-encoding = appendPatch (dontCheck (doJailbreak super.asn1-encoding)) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/raw/master/patches/asn1-encoding-0.9.5.patch";
sha256 = "0a3159rnaw6shjzdm46799crd4pxh33s23qy51xa7z6nv5q8wsb5";
});
tls = self.tls_1_5_1;
vault = dontHaddock super.vault;
# TODO dont fetch patch if https://github.com/simonmar/alex/issues/140 is resolved
alex = appendPatch super.alex (pkgs.fetchpatch {
url = "https://github.com/simonmar/alex/commit/deaae6eddef5186bfd0e42e2c3ced39e26afa4d6.patch";
sha256 = "1v40gmnw4lqyk271wngdwz8whpfdhmza58srbkka8icwwwrck3l5";
});
}

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

@ -43,7 +43,7 @@ core-packages:
- ghcjs-base-0
default-package-overrides:
# LTS Haskell 14.5
# LTS Haskell 14.6
- abstract-deque ==0.3
- abstract-deque-tests ==0.3
- abstract-par ==0.3.3
@ -55,7 +55,7 @@ default-package-overrides:
- adjunctions ==4.4
- adler32 ==0.1.2.0
- advent-of-code-api ==0.1.2.3
- aeson ==1.4.4.0
- aeson ==1.4.5.0
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.0
- aeson-casing ==0.2.0.0
@ -98,7 +98,7 @@ default-package-overrides:
- appendmap ==0.1.5
- apply-refact ==0.6.0.0
- apportionment ==0.0.0.3
- approximate ==0.3.1
- approximate ==0.3.2
- app-settings ==0.2.0.12
- arbor-lru-cache ==0.1.1.0
- arithmoi ==0.9.0.0
@ -356,7 +356,7 @@ default-package-overrides:
- comonad ==5.0.5
- compact ==0.1.0.1
- compactmap ==0.1.4.2.1
- compensated ==0.7.2
- compensated ==0.7.3
- compiler-warnings ==0.1.0
- composable-associations ==0.1.0.0
- composable-associations-aeson ==0.1.0.0
@ -509,7 +509,7 @@ default-package-overrides:
- dependent-map ==0.2.4.0
- dependent-sum ==0.4
- dependent-sum-template ==0.0.0.6
- deque ==0.4.2.3
- deque ==0.4.3
- deriveJsonNoPrefix ==0.1.0.1
- deriving-compat ==0.5.7
- derulo ==1.0.5
@ -623,7 +623,7 @@ default-package-overrides:
- eventful-sqlite ==0.2.0
- eventful-test-helpers ==0.2.0
- event-list ==0.1.2
- eventstore ==1.3.0
- eventstore ==1.3.1
- every ==0.0.1
- exact-combinatorics ==0.2.0.9
- exact-pi ==0.5.0.1
@ -775,7 +775,7 @@ default-package-overrides:
- ghc-lib-parser ==8.8.0.20190424
- ghc-parser ==0.2.0.3
- ghc-paths ==0.1.0.12
- ghc-prof ==1.4.1.5
- ghc-prof ==1.4.1.6
- ghc-syntax-highlighter ==0.0.4.0
- ghc-tcplugins-extra ==0.3
- ghc-typelits-extra ==0.3.1
@ -806,7 +806,7 @@ default-package-overrides:
- glabrous ==2.0.0
- glaze ==0.3.0.1
- glazier ==1.0.0.0
- GLFW-b ==3.2.1.0
- GLFW-b ==3.2.1.1
- Glob ==0.10.0
- gloss ==1.13.0.1
- gloss-algorithms ==1.13.0.1
@ -863,8 +863,8 @@ default-package-overrides:
- haskell-gi-base ==0.23.0
- haskell-gi-overloading ==1.0
- haskell-lexer ==1.0.2
- haskell-lsp ==0.15.0.1
- haskell-lsp-types ==0.15.0.1
- haskell-lsp ==0.15.0.0
- haskell-lsp-types ==0.15.0.0
- haskell-names ==0.9.6
- haskell-spacegoo ==0.2.0.1
- haskell-src ==1.0.3.0
@ -967,7 +967,7 @@ default-package-overrides:
- hslua-aeson ==1.0.0
- hslua-module-system ==0.2.1
- hslua-module-text ==0.2.1
- HsOpenSSL ==0.11.4.16
- HsOpenSSL ==0.11.4.17
- HsOpenSSL-x509-system ==0.1.0.3
- hsp ==0.10.0
- hspec ==2.7.1
@ -1063,7 +1063,7 @@ default-package-overrides:
- hxt-unicode ==9.0.2.4
- hybrid-vectors ==0.2.2
- hyper ==0.1.0.3
- hyperloglog ==0.4.2
- hyperloglog ==0.4.3
- hyphenation ==0.8
- hyraxAbif ==0.2.3.15
- iconv ==0.4.1.3
@ -1086,7 +1086,7 @@ default-package-overrides:
- indexed-list-literals ==0.2.1.2
- infer-license ==0.2.0
- inflections ==0.4.0.4
- influxdb ==1.7.1
- influxdb ==1.7.1.1
- ini ==0.4.1
- inj ==1.0
- inline-c ==0.7.0.1
@ -1201,7 +1201,7 @@ default-package-overrides:
- leapseconds-announced ==2017.1.0.1
- learn-physics ==0.6.4
- lens ==4.17.1
- lens-action ==0.2.3
- lens-action ==0.2.4
- lens-aeson ==1.0.2
- lens-datetime ==0.3
- lens-family ==1.2.3
@ -1277,10 +1277,10 @@ default-package-overrides:
- markdown-unlit ==0.5.0
- markov-chain ==0.0.3.4
- massiv ==0.4.1.0
- massiv-io ==0.1.6.0
- massiv-io ==0.1.7.0
- massiv-test ==0.1.0
- mathexpr ==0.3.0.0
- math-functions ==0.3.2.0
- math-functions ==0.3.2.1
- matplotlib ==0.7.4
- matrices ==0.5.0
- matrix ==0.3.6.1
@ -1329,7 +1329,6 @@ default-package-overrides:
- missing-foreign ==0.1.1
- MissingH ==1.4.1.0
- mixed-types-num ==0.4.0.1
- mixpanel-client ==0.2.1
- mltool ==0.2.0.1
- mmap ==0.5.9
- mmark ==0.0.7.1
@ -1425,7 +1424,7 @@ default-package-overrides:
- network-anonymous-i2p ==0.10.0
- network-attoparsec ==0.12.2
- network-bsd ==2.8.0.0
- network-byte-order ==0.1.1.0
- network-byte-order ==0.1.1.1
- network-conduit-tls ==1.3.2
- network-house ==0.1.0.2
- network-info ==0.2.0.10
@ -1437,8 +1436,8 @@ default-package-overrides:
- network-transport ==0.5.4
- network-transport-composed ==0.2.1
- network-uri ==2.6.1.0
- newtype ==0.2.1.0
- newtype-generics ==0.5.3
- newtype ==0.2.2.0
- newtype-generics ==0.5.4
- nicify-lib ==1.0.1
- NineP ==0.0.2.1
- nix-paths ==1.0.1
@ -1480,7 +1479,7 @@ default-package-overrides:
- OneTuple ==0.2.2
- Only ==0.1
- oo-prototypes ==0.1.0.0
- opaleye ==0.6.7004.0
- opaleye ==0.6.7004.1
- OpenAL ==1.7.0.5
- open-browser ==0.2.1.0
- openexr-write ==0.1.0.2
@ -1663,7 +1662,7 @@ default-package-overrides:
- protocol-buffers ==2.4.12
- protocol-buffers-descriptor ==2.4.12
- protocol-radius ==0.0.1.1
- protocol-radius-test ==0.1.0.0
- protocol-radius-test ==0.1.0.1
- proto-lens ==0.5.1.0
- proto-lens-arbitrary ==0.1.2.7
- proto-lens-optparse ==0.1.1.5
@ -1679,8 +1678,7 @@ default-package-overrides:
- purescript-bridge ==0.13.0.0
- pure-zlib ==0.6.6
- pushbullet-types ==0.4.1.0
- pusher-http-haskell ==1.5.1.9
- PyF ==0.8.1.0
- pusher-http-haskell ==1.5.1.10
- qchas ==1.1.0.1
- qm-interpolated-string ==0.3.0.0
- qnap-decrypt ==0.3.5
@ -1733,7 +1731,7 @@ default-package-overrides:
- read-editor ==0.1.0.2
- read-env-var ==1.0.0.0
- reanimate ==0.1.5.0
- reanimate-svg ==0.9.1.0
- reanimate-svg ==0.9.1.1
- rebase ==1.3.1.1
- record-dot-preprocessor ==0.2
- record-hasfield ==1.0
@ -1769,6 +1767,8 @@ default-package-overrides:
- repa ==3.4.1.4
- repa-algorithms ==3.4.1.3
- repa-io ==3.4.1.1
- replace-attoparsec ==1.0.1.0
- replace-megaparsec ==1.1.3.0
- repline ==0.2.1.0
- req ==2.1.0
- req-conduit ==1.0.0
@ -1883,7 +1883,7 @@ default-package-overrides:
- servant-pipes ==0.15
- servant-ruby ==0.9.0.0
- servant-server ==0.16.2
- servant-static-th ==0.2.2.0
- servant-static-th ==0.2.2.1
- servant-swagger ==1.1.7.1
- servant-swagger-ui ==0.3.4.3.22.2
- servant-swagger-ui-core ==0.3.3
@ -1921,7 +1921,7 @@ default-package-overrides:
- simple ==0.11.3
- simple-cabal ==0.0.0.1
- simple-cmd ==0.2.0.1
- simple-cmd-args ==0.1.2
- simple-cmd-args ==0.1.3
- simple-log ==0.9.12
- simple-reflect ==0.3.3
- simple-sendfile ==0.2.28
@ -2011,7 +2011,7 @@ default-package-overrides:
- strict ==0.3.2
- strict-base-types ==0.6.1
- strict-concurrency ==0.2.4.3
- strict-list ==0.1.4
- strict-list ==0.1.5
- stringbuilder ==0.5.1
- string-class ==0.1.7.0
- string-combinators ==0.6.0.5
@ -2180,7 +2180,7 @@ default-package-overrides:
- tonatona-servant ==0.1.0.2
- torsor ==0.1
- tostring ==0.2.1.1
- TotalMap ==0.1.0.0
- TotalMap ==0.1.1.1
- tracing ==0.0.4.0
- transaction ==0.1.1.3
- transformers-base ==0.4.5.2
@ -2245,11 +2245,11 @@ default-package-overrides:
- unique-logic ==0.4
- unique-logic-tf ==0.5.1
- unit-constraint ==0.0.0
- universe ==1.1
- universe ==1.1.1
- universe-base ==1.1.1
- universe-dependent-sum ==1.1.0.1
- universe-instances-base ==1.1
- universe-instances-extended ==1.1
- universe-instances-extended ==1.1.1
- universe-instances-trans ==1.1
- universe-reverse-instances ==1.1
- universum ==1.5.0
@ -2309,7 +2309,7 @@ default-package-overrides:
- verbosity ==0.3.0.0
- versions ==3.5.1.1
- ViennaRNAParser ==1.3.3
- viewprof ==0.0.0.29
- viewprof ==0.0.0.30
- vinyl ==0.11.0
- vivid ==0.4.2.3
- vivid-osc ==0.5.0.0
@ -2339,7 +2339,7 @@ default-package-overrides:
- wai-transformers ==0.1.0
- wai-websockets ==3.0.1.2
- warp ==3.2.28
- warp-tls ==3.2.7
- warp-tls ==3.2.8
- warp-tls-uid ==0.2.0.6
- wave ==0.2.0
- wcwidth ==0.0.2
@ -2435,7 +2435,7 @@ default-package-overrides:
- yesod-csp ==0.2.5.0
- yesod-eventsource ==1.6.0
- yesod-fb ==0.5.0
- yesod-form ==1.6.6
- yesod-form ==1.6.7
- yesod-form-bootstrap4 ==2.1.2
- yesod-gitrepo ==0.3.0
- yesod-gitrev ==0.2.1
@ -3116,6 +3116,7 @@ broken-packages:
- armor
- arpa
- arpack
- array-builder
- array-chunks
- array-forth
- array-primops
@ -4741,6 +4742,11 @@ broken-packages:
- feed-translator
- feed2lj
- feed2twitter
- fei-base
- fei-cocoapi
- fei-dataiter
- fei-examples
- fei-nn
- feldspar-compiler
- feldspar-language
- fenfire
@ -4786,6 +4792,7 @@ broken-packages:
- findhttp
- fingertree-psqueue
- fingertree-tf
- finitary-derive
- FiniteMap
- firefly-example
- first-and-last
@ -5087,6 +5094,7 @@ broken-packages:
- ghci-history-parser
- ghci-lib
- ghci-ng
- ghcide
- ghcjs-base-stub
- ghcjs-dom-jsffi
- ghcjs-fetch
@ -5709,6 +5717,7 @@ broken-packages:
- hdbi-tests
- hdf
- hDFA
- hdiff
- hdigest
- hdirect
- hdis86
@ -6376,6 +6385,7 @@ broken-packages:
- ide-backend-server
- ideas
- ideas-math
- ideas-math-types
- idempotent
- identifiers
- idiii
@ -7150,9 +7160,6 @@ broken-packages:
- marxup
- masakazu-bot
- MASMGen
- massiv
- massiv-io
- massiv-test
- master-plan
- matchable-th
- matchers
@ -8691,7 +8698,6 @@ broken-packages:
- scenegraph
- schedevr
- schedule-planner
- scheduler
- schedyield
- schematic
- scholdoc
@ -9565,6 +9571,7 @@ broken-packages:
- through-text
- throwable-exceptions
- thumbnail-plus
- thumbnail-polish
- tic-tac-toe
- tickle
- TicTacToe

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

@ -589,7 +589,7 @@ self: super: builtins.intersectAttrs super {
snap-server = dontCheck super.snap-server;
# Tests require internet
dhall_1_25_0 = dontCheck super.dhall_1_25_0;
dhall_1_26_0 = dontCheck super.dhall_1_26_0;
http-download = dontCheck super.http-download;
pantry = dontCheck super.pantry;

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

File diff suppressed because it is too large Load Diff