cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #136948 from NixOS/haskell-updates

Browse source 
haskellPackages: update stackage and hackage
This commit is contained in:
Dennis Gosnell 2021-09-11 11:27:03 +09:00 committed by GitHub
commit 693ca813d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 913 additions and 715 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{
"commit": "182ca4558e20c333fb3f4c659b2af4267d4d9b46",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/182ca4558e20c333fb3f4c659b2af4267d4d9b46.tar.gz",
"sha256": "123dr3lza56nj7s53m37zm2qfvwl2qvrr2prwl0q32wzidfc12w9",
"msg": "Update from Hackage at 2021-09-03T13:28:39Z"
"commit": "332975af73ba6dc258ab7e103f00619e9bebeea2",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/332975af73ba6dc258ab7e103f00619e9bebeea2.tar.gz",
"sha256": "1fkc19vqylyjbhqa414mnz5ny235vp1f0wz70a2lbf5cwzg6185f",
"msg": "Update from Hackage at 2021-09-06T23:06:06Z"
}

15
pkgs/development/compilers/ghc/8.10.7.nix
View file

@ -106,6 +106,12 @@ let
GhcRtsHcOpts += -fPIC
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
EXTRA_CC_OPTS += -std=gnu99
''
# While split sections are now enabled by default in ghc 8.8 for windows,
# they seem to lead to `too many sections` errors when building base for
# profiling.
+ lib.optionalString targetPlatform.isWindows ''
SplitSections = NO
'';
# Splicer will pull out correct variations
@ -123,7 +129,7 @@ let
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl);
useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl && !targetPlatform.isWindows);
runtimeDeps = [
targetPackages.stdenv.cc.bintools
@ -156,6 +162,13 @@ stdenv.mkDerivation (rec {
# upstream patch. Don't forget to check backport status of the upstream patch
# when adding new GHC releases in nixpkgs.
./respect-ar-path.patch
# cabal passes incorrect --host= when cross-compiling
# https://github.com/haskell/cabal/issues/5887
(fetchpatch {
url = "https://raw.githubusercontent.com/input-output-hk/haskell.nix/122bd81150386867da07fdc9ad5096db6719545a/overlays/patches/ghc/cabal-host.patch";
sha256 = "sha256:0yd0sajgi24sc1w5m55lkg2lp6kfkgpp3lgija2c8y3cmkwfpdc1";
})
] ++ lib.optionals stdenv.isDarwin [
# Make Block.h compile with c++ compilers. Remove with the next release
(fetchpatch {

22
pkgs/development/compilers/ghc/8.8.4.nix
View file

@ -2,7 +2,7 @@
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
, bash
, libiconv ? null, ncurses
@ -114,6 +114,12 @@ let
GhcRtsHcOpts += -fPIC
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
EXTRA_CC_OPTS += -std=gnu99
''
# While split sections are now enabled by default in ghc 8.8 for windows,
# they seem to lead to `too many sections` errors when building base for
# profiling.
+ lib.optionalString targetPlatform.isWindows ''
SplitSections = NO
'';
# Splicer will pull out correct variations
@ -131,7 +137,7 @@ let
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl);
useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl && !targetPlatform.isWindows);
runtimeDeps = [
targetPackages.stdenv.cc.bintools
@ -167,6 +173,18 @@ stdenv.mkDerivation (rec {
# Fix documentation configuration which causes a syntax error with sphinx 4.*
# See also https://gitlab.haskell.org/ghc/ghc/-/issues/19962
./sphinx-4-configuration.patch
# cabal passes incorrect --host= when cross-compiling
# https://github.com/haskell/cabal/issues/5887
(fetchpatch {
url = "https://raw.githubusercontent.com/input-output-hk/haskell.nix/122bd81150386867da07fdc9ad5096db6719545a/overlays/patches/ghc/cabal-host.patch";
sha256 = "sha256:0yd0sajgi24sc1w5m55lkg2lp6kfkgpp3lgija2c8y3cmkwfpdc1";
})
# error: 'VirtualAllocExNuma' redeclared as different kind of symbol
# name conflict between rts/win32/OSMem.c and winbase.h from the mingw-w64 runtime package
# Renamed to match ghc8.8:
# https://gitlab.haskell.org/ghc/ghc/-/commit/4b431f334018eaef2cf36de3316025c68c922915#20d64c0bdc272817149d1d5cf20a73a8b5fd637f
./rename-numa-api-call.patch
];
postPatch = "patchShebangs .";

32
pkgs/development/compilers/ghc/rename-numa-api-call.patch Normal file
View file

@ -0,0 +1,32 @@
diff --git a/rts/win32/OSMem.c b/rts/win32/OSMem.c
--- a/rts/win32/OSMem.c
+++ b/rts/win32/OSMem.c
@@ -41,7 +41,7 @@ static block_rec* free_blocks = NULL;
typedef LPVOID(WINAPI *VirtualAllocExNumaProc)(HANDLE, LPVOID, SIZE_T, DWORD, DWORD, DWORD);
/* Cache NUMA API call. */
-VirtualAllocExNumaProc VirtualAllocExNuma;
+VirtualAllocExNumaProc _VirtualAllocExNuma;
void
osMemInit(void)
@@ -52,8 +52,8 @@ osMemInit(void)
/* Resolve and cache VirtualAllocExNuma. */
if (osNumaAvailable() && RtsFlags.GcFlags.numa)
{
- VirtualAllocExNuma = (VirtualAllocExNumaProc)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma");
- if (!VirtualAllocExNuma)
+ _VirtualAllocExNuma = (VirtualAllocExNumaProc)(void*)GetProcAddress(GetModuleHandleW(L"kernel32"), "VirtualAllocExNuma");
+ if (!_VirtualAllocExNuma)
{
sysErrorBelch(
"osBindMBlocksToNode: VirtualAllocExNuma does not exist. How did you get this far?");
@@ -569,7 +569,7 @@ void osBindMBlocksToNode(
On windows also -xb is broken, it does nothing so that can't
be used to tweak it (see #12577). So for now, just let the OS decide.
*/
- temp = VirtualAllocExNuma(
+ temp = _VirtualAllocExNuma(
GetCurrentProcess(),
NULL, // addr? See base memory
size,

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

@ -64,7 +64,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 = "0kcsb5kqyx256fp1bj3y0x6k3286j4cykrx0yr4k3vvb3maakf7k";
sha256 = "1022ff2x9jvi2a0820lbgmmh54cxh1vbn0qfdwr50w7ggvjp88i6";
# delete android and Android directories which cause issues on
# darwin (case insensitive directory). Since we don't need them
# during the build process, we can delete it to prevent a hash
@ -1926,9 +1926,6 @@ EOT
Cabal = self.Cabal_3_6_0_0;
};
# ghc-api-compat needlessly requires 8.10.5 exactly, but we have 8.10.6
ghc-api-compat = doJailbreak super.ghc-api-compat;
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
streamly-posix = doJailbreak super.streamly-posix;

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

@ -129,5 +129,5 @@ self: super: {
# vector 0.12.2 indroduced doctest checks that don‘t work on older compilers
vector = dontCheck super.vector;
ghc-api-compat = super.ghc-api-compat_8_6;
ghc-api-compat = doDistribute super.ghc-api-compat_8_6;
}

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

@ -106,10 +106,13 @@ self: super: {
retry = dontCheck super.retry;
# hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
hlint = super.hlint_3_3_1.overrideScope (self: super: {
hlint = super.hlint_3_3_4.overrideScope (self: super: {
ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 {
doHaddock = false;
};
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4;
});
# pick right version for compiler
ghc-api-compat = doDistribute super.ghc-api-compat_9_0_1;
}

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

@ -109,7 +109,7 @@ self: super: {
retry = dontCheck super.retry;
# hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
hlint = super.hlint_3_3_1.overrideScope (self: super: {
hlint = super.hlint_3_3_4.overrideScope (self: super: {
ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 {
doHaddock = false;
};

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

@ -1105,6 +1105,7 @@ broken-packages:
- docvim
- dominion
- domplate
- dormouse-uri
- do-spaces
- dotfs
- dot-linker
@ -4200,6 +4201,7 @@ broken-packages:
- servant-auth-hmac
- servant-auth-token-api
- servant-avro
- servant-benchmark
- servant-client-js
- servant-db
- servant-dhall
@ -5044,7 +5046,6 @@ broken-packages:
- urldecode
- url-decoders
- urldisp-happstack
- urlencoded
- url-generic
- urn
- urn-random

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

@ -94,6 +94,8 @@ default-package-overrides:
- dhall-nix < 1.1.22
# reflex-dom-pandoc is only used by neuron which needs a version < 1.0.0.0
- reflex-dom-pandoc < 1.0.0.0
# 2021-09-07: pin to our current GHC version
- ghc-api-compat == 8.10.7
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@ -122,7 +124,7 @@ extra-packages:
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
- cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6
- ghc-api-compat < 8.10.5 # 2021-08-18: ghc-api-compat 8.10.5 is only compatible with ghc 8.10.5
- ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4
package-maintainers:
abbradar:

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

@ -1,4 +1,4 @@
# Stackage LTS 18.8
# Stackage LTS 18.9
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -224,7 +224,7 @@ default-package-overrides:
- base-compat ==0.11.2
- base-compat-batteries ==0.11.2
- basement ==0.0.12
- base-orphans ==0.8.4
- base-orphans ==0.8.5
- base-prelude ==1.4
- base-unicode-symbols ==0.2.4.2
- basic-prelude ==0.7.0
@ -276,7 +276,7 @@ default-package-overrides:
- blaze-html ==0.9.1.2
- blaze-markup ==0.8.2.8
- blaze-svg ==0.3.6.1
- blaze-textual ==0.2.1.0
- blaze-textual ==0.2.2.1
- bmp ==1.2.6.3
- BNFC ==2.9.2
- BNFC-meta ==0.6.1
@ -480,8 +480,8 @@ default-package-overrides:
- convertible ==1.1.1.0
- cookie ==0.4.5
- core-data ==0.2.1.9
- core-program ==0.2.7.1
- core-text ==0.3.0.0
- core-program ==0.2.9.1
- core-text ==0.3.2.0
- countable ==1.0
- country ==0.2.1
- cpphs ==1.20.9.1
@ -615,7 +615,7 @@ default-package-overrides:
- distributed-closure ==0.4.2.0
- distribution-opensuse ==1.1.1
- distributive ==0.6.2.1
- dl-fedora ==0.9
- dl-fedora ==0.9.1
- dlist ==1.0
- dlist-instances ==0.1.1.1
- dlist-nonempty ==0.1.1
@ -705,7 +705,7 @@ default-package-overrides:
- errors ==2.3.0
- errors-ext ==0.4.2
- ersatz ==0.4.9
- esqueleto ==3.5.2.1
- esqueleto ==3.5.2.2
- essence-of-live-coding ==0.2.5
- essence-of-live-coding-gloss ==0.2.5
- essence-of-live-coding-pulse ==0.2.5
@ -757,7 +757,7 @@ default-package-overrides:
- FenwickTree ==0.1.2.1
- fft ==0.1.8.7
- fgl ==5.7.0.3
- file-embed ==0.0.14.0
- file-embed ==0.0.15.0
- file-embed-lzma ==0
- filelock ==0.1.1.5
- filemanip ==0.3.6.3
@ -841,7 +841,7 @@ default-package-overrides:
- generic-constraints ==1.1.1.1
- generic-data ==0.9.2.0
- generic-data-surgery ==0.3.0.0
- generic-deriving ==1.14
- generic-deriving ==1.14.1
- generic-functor ==0.2.0.0
- generic-lens ==2.1.0.0
- generic-lens-core ==2.1.0.0
@ -1040,7 +1040,7 @@ default-package-overrides:
- hgeometry-combinatorial ==0.12.0.3
- hgrev ==0.2.6
- hidapi ==0.1.7
- hie-bios ==0.7.5
- hie-bios ==0.7.6
- hi-file-parser ==0.1.2.0
- higher-leveldb ==0.6.0.0
- highlighting-kate ==0.6.4
@ -1071,7 +1071,7 @@ default-package-overrides:
- hmpfr ==0.4.4
- hnock ==0.4.0
- hoauth2 ==1.16.0
- hoogle ==5.0.18.1
- hoogle ==5.0.18.2
- hOpenPGP ==2.9.5
- hopenpgp-tools ==0.23.6
- hopenssl ==2.2.4
@ -1404,7 +1404,7 @@ default-package-overrides:
- linux-namespaces ==0.1.3.0
- liquid-fixpoint ==0.8.10.2
- List ==0.6.2
- ListLike ==4.7.4
- ListLike ==4.7.6
- list-predicate ==0.1.0.1
- listsafe ==0.1.0.1
- list-singleton ==1.0.0.5
@ -1701,7 +1701,7 @@ default-package-overrides:
- optional-args ==1.0.2
- options ==1.2.1.1
- optparse-applicative ==0.16.1.0
- optparse-generic ==1.4.4
- optparse-generic ==1.4.5
- optparse-simple ==0.1.1.4
- optparse-text ==0.1.1.0
- ordered-containers ==0.2.2
@ -1762,9 +1762,9 @@ default-package-overrides:
- persist ==0.1.1.5
- persistable-record ==0.6.0.5
- persistable-types-HDBC-pg ==0.0.3.5
- persistent ==2.13.1.1
- persistent ==2.13.1.2
- persistent-mtl ==0.2.2.0
- persistent-mysql ==2.13.0.1
- persistent-mysql ==2.13.0.2
- persistent-pagination ==0.1.1.2
- persistent-postgresql ==2.13.0.3
- persistent-qq ==2.12.0.1
@ -1950,7 +1950,7 @@ default-package-overrides:
- reanimate ==1.1.4.0
- reanimate-svg ==0.13.0.1
- rebase ==1.13.0.1
- record-dot-preprocessor ==0.2.11
- record-dot-preprocessor ==0.2.12
- record-hasfield ==1.0
- records-sop ==0.1.1.0
- record-wrangler ==0.1.1.0
@ -2077,7 +2077,7 @@ default-package-overrides:
- semialign-optics ==1.1
- semigroupoid-extras ==5
- semigroupoids ==5.3.5
- semigroups ==0.19.1
- semigroups ==0.19.2
- semirings ==0.6
- semiring-simple ==1.0.0.1
- semver ==0.4.0.1
@ -2379,14 +2379,14 @@ default-package-overrides:
- text-regex-replace ==0.1.1.4
- text-region ==0.3.1.0
- text-short ==0.1.3
- text-show ==3.9
- text-show ==3.9.2
- text-show-instances ==3.8.4
- text-zipper ==0.11
- tfp ==1.0.2
- tf-random ==0.5
- th-abstraction ==0.4.2.0
- th-abstraction ==0.4.3.0
- th-bang-compat ==0.0.1.0
- th-compat ==0.1.2
- th-compat ==0.1.3
- th-constraint-compat ==0.0.1.0
- th-data-compat ==0.1.0.0
- th-desugar ==1.11
@ -2400,7 +2400,7 @@ default-package-overrides:
- th-lift ==0.8.2
- th-lift-instances ==0.1.18
- th-nowq ==0.1.0.5
- th-orphans ==0.13.11
- th-orphans ==0.13.12
- th-printf ==0.7
- thread-hierarchy ==0.3.0.2
- thread-local-storage ==0.2
@ -2527,7 +2527,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.3
- unix-compat ==0.5.3
- unix-time ==0.4.7
- unliftio ==0.2.19
- unliftio ==0.2.20
- unliftio-core ==0.2.0.1
- unliftio-pool ==0.2.1.1
- unliftio-streams ==0.1.1.1
@ -2630,7 +2630,6 @@ default-package-overrides:
- wikicfp-scraper ==0.1.0.12
- wild-bind ==0.1.2.7
- wild-bind-x11 ==0.2.0.13
- Win32 ==2.6.1.0
- Win32-notify ==0.3.0.3
- windns ==0.1.0.1
- witch ==0.3.4.0

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

@ -962,15 +962,14 @@ dont-distribute-packages:
- distribution-plot
- dixi
- dl-fedora
- dl-fedora_0_9_1
- dmenu-pkill
- dmenu-pmount
- dmenu-search
- doc-review
- doi
- domain
- domain-core
- domain-optics
- dormouse-client
- dow
- download-media-content
- dph-examples
@ -1125,6 +1124,7 @@ dont-distribute-packages:
- formlets-hsp
- forth-hll
- fortran-src-extras
- fortran-vars
- foscam-directory
- foscam-sort
- fp-ieee
@ -1907,6 +1907,7 @@ dont-distribute-packages:
- layouting
- lazy-hash
- lazy-hash-cache
- ldap-scim-bridge
- ldapply
- leaky
- lean
@ -3196,7 +3197,6 @@ dont-distribute-packages:
- wheb-strapped
- whitespace
- wikipedia4epub
- windowslive
- winio
- wl-pprint-ansiterm
- wl-pprint-terminfo

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

File diff suppressed because it is too large Load diff

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

@ -312,6 +312,7 @@ let
language-nix = all;
nix-paths = all;
titlecase = all;
ghc-api-compat = all;
})
{
mergeable = pkgs.releaseTools.aggregate {