mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

Merge pull request #141755 from NixOS/haskell-updates

Browse source 
haskellPackages: update stackage and hackage
This commit is contained in:
Ellie Hermaszewska 2021-10-18 22:53:16 +08:00 committed by GitHub
parent 632b024611 7c0dcba282
commit 880e844975
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 733 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -2443,6 +2443,12 @@
githubId = 4331004;
name = "Naoya Hatta";
};
dalpd = {
email = "denizalpd@ogr.iu.edu.tr";
github = "dalpd";
githubId = 16895361;
name = "Deniz Alp Durmaz";
};
DamienCassou = {
email = "damien@cassou.me";
github = "DamienCassou";

8
pkgs/data/misc/hackage/pin.json
View file

@ -1,6 +1,6 @@
{
"commit": "67f421ee170f4f161832c146be8ef87499ff0d37",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/67f421ee170f4f161832c146be8ef87499ff0d37.tar.gz",
"sha256": "0rzwh0iff4xn499vvzv960gmrd85z6amjbbsyhb5qcldcap5jpjs",
"msg": "Update from Hackage at 2021-10-11T20:00:11Z"
"commit": "73463ac080cd55650580d58fe80e5b2dcdfe5a7e",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/73463ac080cd55650580d58fe80e5b2dcdfe5a7e.tar.gz",
"sha256": "1vwlpkrpfj6wdzlv4lwargyakyci81gri70z2jhkpvv3l6adc0gk",
"msg": "Update from Hackage at 2021-10-15T10:42:20Z"
}

23
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1272,10 +1272,21 @@ self: super: {
gi-cairo-render = doJailbreak super.gi-cairo-render;
gi-cairo-connector = doJailbreak super.gi-cairo-connector;
# Remove when https://github.com/gtk2hs/svgcairo/pull/10 gets merged.
svgcairo = appendPatch super.svgcairo (pkgs.fetchpatch {
url = "https://github.com/gtk2hs/svgcairo/commit/df6c6172b52ecbd32007529d86ba9913ba001306.patch";
sha256 = "128qrns56y139vfzg1rbyqfi2xn8gxsmpnxv3zqf4v5spsnprxwh";
svgcairo = overrideCabal super.svgcairo (drv: {
patches = [
# Remove when https://github.com/gtk2hs/svgcairo/pull/10 gets merged.
(pkgs.fetchpatch {
url = "https://github.com/gtk2hs/svgcairo/commit/df6c6172b52ecbd32007529d86ba9913ba001306.patch";
sha256 = "128qrns56y139vfzg1rbyqfi2xn8gxsmpnxv3zqf4v5spsnprxwh";
})
# The update here breaks svgcairo:
# https://github.com/NixOS/nixpkgs/commit/08fcd73d9dc9a28aa901210b259d9bfb3c228018
# and updating the call to the header with the correct name fixes it.
(pkgs.fetchpatch {
url = "https://github.com/dalpd/svgcairo/commit/4dc6d8d3a6c24be0b8c1fd73b282ff247e7b1e6f.patch";
sha256 = "1pq9ld9z67zsxj8vqjf82qwckcp69lvvnrjb7wsyb5jc6jaj3q0a";
})
];
});
# Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
@ -2039,4 +2050,8 @@ EOT
network = self.network_3_1_2_5;
});
# Fixes https://github.com/NixOS/nixpkgs/issues/140613
# https://github.com/recursion-schemes/recursion-schemes/issues/128
recursion-schemes = appendPatch super.recursion-schemes ./patches/recursion-schemes-128.patch;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

2
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View file

@ -166,7 +166,7 @@ self: super: {
# 2021-09-18: Need path >= 0.9.0 for ghc 9 compat
path = self.path_0_9_0;
# 2021-09-18: Need ormolu >= 0.3.0.0 for ghc 9 compat
ormolu = doDistribute self.ormolu_0_3_0_1;
ormolu = doDistribute self.ormolu_0_3_1_0;
# 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2206
# Restrictive upper bound on ormolu
hls-ormolu-plugin = doJailbreak super.hls-ormolu-plugin;

64
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View file

@ -67,13 +67,18 @@ self: super: {
postPatch = "sed -i -e 's,<4.16,<4.17,' basement.cabal";
});
base16-bytestring = appendPatch super.base16-bytestring (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/base16-bytestring-1.0.1.0.patch";
sha256 = "19ajai9y04981zfpcdj1nlz44b12gjj4m1ncciijv43mnz82plji";
});
# Duplicate Show instances in tests and library cause compiling tests to fail
blaze-builder = appendPatch (dontCheck super.blaze-builder) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/blaze-builder-0.4.2.1.patch";
sha256 = "1h5ny3mlng69vwaabl3af8hlv4qi24wfw8s14lw2ksw1yjbgi0j8";
});
cereal = appendPatch super.cereal (pkgs.fetchpatch {
cereal = appendPatch (doJailbreak super.cereal) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/cereal-0.5.8.1.patch";
sha256 = "03v4nxwz9y6viaa8anxcmp4zdf2clczv4pf9fqq6lnpplpz5i128";
});
@ -91,9 +96,9 @@ self: super: {
sha256 = "1g48lrmqgd88hqvfq3klz7lsrpwrir2v1931myrhh6dy0d9pqj09";
});
# cabal-install needs more recent versions of Cabal and base16-bytestring.
# cabal-install needs more recent versions of Cabal
cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
Cabal = null;
Cabal = self.Cabal_3_6_2_0;
});
doctest = appendPatch (dontCheck (doJailbreak super.doctest_0_18_1)) (pkgs.fetchpatch {
@ -145,8 +150,50 @@ self: super: {
type-equality = doJailbreak super.type-equality;
vector = doJailbreak (dontCheck super.vector);
vector-binary-instances = doJailbreak super.vector-binary-instances;
vector-th-unbox = doJailbreak super.vector-th-unbox;
zlib = doJailbreak super.zlib;
indexed-traversable-instances = doJailbreak super.indexed-traversable-instances;
hpack = overrideCabal (doJailbreak super.hpack) (drv: {
# Cabal 3.6 seems to preserve comments when reading, which makes this test fail
# 2021-10-10: 9.2.1 is not yet supported (also no issue)
testFlags = [
"--skip=/Hpack/renderCabalFile/is inverse to readCabalFile/"
] ++ drv.testFlags or [];
});
# Patch for TH code from head.hackage
vector-th-unbox = appendPatch (doJailbreak super.vector-th-unbox) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/vector-th-unbox-0.2.1.9.patch";
sha256 = "02bvvy3hx3cf4y4dr64zl5pjvq8giwk4286j5g1n6k8ikyn2403p";
});
# Patch for TH code from head.hackage
invariant = appendPatch (doJailbreak super.invariant) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/invariant-0.5.4.patch";
sha256 = "17gg8ck4r6qmlbcbpbnqzksgf5q7i891zs6axfzhas6ajncylxvc";
});
# base 4.15 support from head.hackage
lens = appendPatch (doJailbreak super.lens_5_0_1) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/lens-5.0.1.patch";
sha256 = "1s8qqg7ymvv94dnfnr1ragx91chh9y7ydc4jx25zn361wbn00pv7";
});
semigroupoids = overrideCabal super.semigroupoids (drv: {
# Patch from head.hackage for base 4.15 compat
patches = drv.patches or [] ++ [
(pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/semigroupoids-5.3.5.patch";
sha256 = "0xrn1gv6b2n76522pk2nfp4z69kvp14l2zpif2f8zzz6cwcrx9w8";
})
];
# acrobatics to make the patch apply
prePatch = ''
find . -type f | xargs -L 1 ${pkgs.buildPackages.dos2unix}/bin/dos2unix
'';
editedCabalFile = null;
revision = null;
});
# Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760
alex = dontCheck super.alex;
@ -171,9 +218,6 @@ self: super: {
# The test suite indirectly depends on random, which leads to infinite recursion
random = dontCheck super.random_1_2_1;
# 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
lens = super.lens_5_0_1;
# 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0
memory = appendPatch super.memory_0_16_0 (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/memory-0.16.0.patch";
@ -195,10 +239,12 @@ self: super: {
# https://github.com/Soostone/retry/issues/71
retry = dontCheck super.retry;
streaming-commons = appendPatch super.streaming-commons (pkgs.fetchpatch {
# Disable tests pending resolution of
# https://github.com/haskell/text/issues/380 or https://github.com/fpco/streaming-commons/issues/60
streaming-commons = dontCheck (appendPatch super.streaming-commons (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/dfd024c9a336c752288ec35879017a43bd7e85a0/patches/streaming-commons-0.2.2.1.patch";
sha256 = "04wi1jskr3j8ayh88kkx4irvhhgz0i7aj6fblzijy0fygikvidpy";
});
}));
# hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
hlint = super.hlint_3_3_4.overrideScope (self: super: {

5
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file

@ -742,7 +742,6 @@ broken-packages:
- commodities
- commonmark-cli
- commsec
- compactable
- Compactable
- compact-list
- compact-map
@ -1435,6 +1434,7 @@ broken-packages:
- flamethrower
- flamingra
- flat-maybe
- flatparse
- flay
- flexible-time
- flickr
@ -2404,6 +2404,7 @@ broken-packages:
- htssets
- http2-client
- http2-grpc-proto-lens
- http3
- http-attoparsec
- http-client-lens
- http-client-request-modifiers
@ -2846,6 +2847,7 @@ broken-packages:
- linear-algebra-cblas
- linear-base
- linear-code
- linear-generics
- linear-maps
- linear-opengl
- linearscan
@ -4717,7 +4719,6 @@ broken-packages:
- SVD2HS
- svfactor
- svg-builder-fork
- svgcairo
- svgutils
- svm-light-utils
- svm-simple

2
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -149,6 +149,8 @@ package-maintainers:
- pretty-simple
- spago
- termonad
dalpd:
- svgcairo
domenkozar:
- cachix
- cachix-api

14
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View file

@ -331,15 +331,9 @@ dont-distribute-packages:
- Shellac-haskeline
- Shellac-readline
- ShortestPathProblems
- Shpadoinkle-backend-pardiff
- Shpadoinkle-backend-static
- Shpadoinkle-developer-tools
- Shpadoinkle-disembodied
- Shpadoinkle-examples
- Shpadoinkle-html
- Shpadoinkle-router
- Shpadoinkle-template
- Shpadoinkle-widgets
- SimpleGL
- SimpleLog
- SimpleServer
@ -733,9 +727,9 @@ dont-distribute-packages:
- claferwiki
- clash
- clash-ghc
- clash-ghc_1_4_4
- clash-ghc_1_4_5
- clash-lib
- clash-lib_1_4_4
- clash-lib_1_4_5
- clash-multisignal
- clash-prelude-quickcheck
- clash-shake
@ -1075,6 +1069,7 @@ dont-distribute-packages:
- every-bit-counts
- exception-monads-fd
- exference
- exon
- expand
- expat-enumerator
- expiring-containers
@ -2313,6 +2308,7 @@ dont-distribute-packages:
- mkbndl
- mlist
- mmark-cli
- mmark-cli_0_0_5_1
- mmark-ext
- mmtl-base
- moan
@ -2631,7 +2627,6 @@ dont-distribute-packages:
- proto3-suite
- protobuf-native
- protocol-buffers-descriptor-fork
- proton
- psc-ide
- puffytools
- pugs-compat
@ -3443,6 +3438,7 @@ dont-distribute-packages:
- xml-push
- xml-query-xml-conduit
- xml-query-xml-types
- xml-syntax
- xml-tydom-conduit
- xml2x
- xmltv

736
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff

24
pkgs/development/haskell-modules/patches/recursion-schemes-128.patch Normal file
View file

@ -0,0 +1,24 @@
diff --git a/recursion-schemes.cabal b/recursion-schemes.cabal
index c35f2c6..e692ade 100644
--- a/recursion-schemes.cabal
+++ b/recursion-schemes.cabal
@@ -93,6 +93,7 @@ library
Paths_recursion_schemes
ghc-options: -Wall
+ ghc-prof-options: -DPROFILING_ENABLED
if impl(ghc >= 8.6)
ghc-options: -Wno-star-is-type
default-language: Haskell2010
diff --git a/src/Data/Functor/Foldable/TH.hs b/src/Data/Functor/Foldable/TH.hs
index b3d5ac8..d4ef0e4 100644
--- a/src/Data/Functor/Foldable/TH.hs
+++ b/src/Data/Functor/Foldable/TH.hs
@@ -1,4 +1,7 @@
{-# LANGUAGE CPP, PatternGuards, Rank2Types #-}
+#if defined(PROFILING_ENABLED)
+{-# OPTIONS_GHC -O0 #-}
+#endif
module Data.Functor.Foldable.TH
( MakeBaseFunctor(..)
, BaseRules

27
pkgs/top-level/release-haskell.nix
View file

@ -48,7 +48,7 @@ let
compilerNames = lib.mapAttrs (name: _: name) pkgs.haskell.packages;
# list of all compilers to test specific packages on
all = with compilerNames; [
released = with compilerNames; [
ghc884
ghc8107
ghc901
@ -304,18 +304,19 @@ let
# and to confirm that critical packages for the
# package sets (like Cabal, jailbreak-cabal) are
# working as expected.
cabal-install = all;
Cabal_3_6_2_0 = with compilerNames; [ ghc884 ghc8107 ghc901 ghc921 ];
cabal2nix-unstable = all;
funcmp = all;
haskell-language-server = all;
hoogle = all;
hsdns = all;
jailbreak-cabal = all;
language-nix = all;
nix-paths = all;
titlecase = all;
ghc-api-compat = all;
cabal-install = released ++ [ compilerNames.ghc921 ];
Cabal_3_6_2_0 = released ++ [ compilerNames.ghc921 ];
cabal2nix = released ++ [ compilerNames.ghc921 ];
cabal2nix-unstable = released ++ [ compilerNames.ghc921 ];
funcmp = released ++ [ compilerNames.ghc921 ];
haskell-language-server = released;
hoogle = released;
hsdns = released ++ [ compilerNames.ghc921 ];
jailbreak-cabal = released ++ [ compilerNames.ghc921 ];
language-nix = released ++ [ compilerNames.ghc921 ];
nix-paths = released ++ [ compilerNames.ghc921 ];
titlecase = released ++ [ compilerNames.ghc921 ];
ghc-api-compat = released;
})
{
mergeable = pkgs.releaseTools.aggregate {