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

Merge pull request #132647 from NixOS/haskell-updates

Browse source 
haskellPackages: update stackage and hackage
This commit is contained in:
sterni 2021-08-07 16:15:18 +02:00 committed by GitHub
commit 70071c92d4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 1082 additions and 418 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": "7060a9c8a2b0e92be86d0338296697df3e9a713f",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7060a9c8a2b0e92be86d0338296697df3e9a713f.tar.gz",
"sha256": "1dzdylg00j1rm8s0rs23jv22cvv9wy3abizzhnryq1wkp13npsc7",
"msg": "Update from Hackage at 2021-07-29T16:00:40Z"
"commit": "7818431b8d25dc7951cd7f50369741e9966d2dc8",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7818431b8d25dc7951cd7f50369741e9966d2dc8.tar.gz",
"sha256": "1fssc5r0482i03rcyvagql06p41qmr8vnyw6501zhbprvz0y1sd4",
"msg": "Update from Hackage at 2021-08-04T07:53:53Z"
}

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

@ -45,6 +45,8 @@ self: super: {
# TODO: figure out if needed on aarch32 as well
BNFC = dontCheck super.BNFC;
C-structs = dontCheck super.C-structs;
Chart-tests = dontCheck super.Chart-tests;
Jikka = dontCheck super.Jikka;
accelerate = dontCheck super.accelerate;
ad = dontCheck super.ad;
autoapply = dontCheck super.autoapply;
@ -93,6 +95,9 @@ self: super: {
# https://github.com/ekmett/half/issues/35
half = dontCheck super.half;
# We disable profiling on aarch64, so tests naturally fail
ghc-prof = dontCheck super.ghc-prof;
} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 {
# AARCH32-SPECIFIC OVERRIDES

45
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 = "0jnxh12vkrssz0lj4fpkqw7nxwyc1kisvvpm85cd4zf525m5sgg3";
sha256 = "0kcsb5kqyx256fp1bj3y0x6k3286j4cykrx0yr4k3vvb3maakf7k";
# 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
@ -1011,10 +1011,14 @@ self: super: {
# https://github.com/mgajda/json-autotype/issues/25
json-autotype = dontCheck super.json-autotype;
# Requires dlist <0.9 but it works fine with dlist-1.0
# https://github.com/haskell-beam/beam/issues/581
beam-core = doJailbreak super.beam-core;
# Requires pg_ctl command during tests
beam-postgres = overrideCabal super.beam-postgres (drv: {
testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
});
});
# Fix for base >= 4.11
scat = overrideCabal super.scat (drv: {
@ -1040,12 +1044,6 @@ self: super: {
# Has tasty < 1.2 requirement, but works just fine with 1.2
temporary-resourcet = doJailbreak super.temporary-resourcet;
# fake a home dir and capture generated man page
ats-format = overrideCabal super.ats-format (old : {
preConfigure = "export HOME=$PWD";
postBuild = "mv .local/share $out";
});
# Test suite doesn't work with current QuickCheck
# https://github.com/pruvisto/heap/issues/11
heap = dontCheck super.heap;
@ -1281,8 +1279,10 @@ self: super: {
# https://github.com/jgm/commonmark-hs/issues/55
commonmark-extensions = dontCheck super.commonmark-extensions;
# Testsuite trying to run `which haskeline-examples-Test`
haskeline_0_8_1_2 = dontCheck super.haskeline_0_8_1_2;
# Fails with encoding problems, likely needs locale data.
# Test can be executed by adding which to testToolDepends and
# $PWD/dist/build/haskeline-examples-Test to $PATH.
haskeline_0_8_2 = dontCheck super.haskeline_0_8_2;
# Tests for list-t, superbuffer, and stm-containers
# depend on HTF and it is broken, 2020-08-23
@ -1433,7 +1433,7 @@ self: super: {
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
heist = doJailbreak super.heist;
hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_1_2; });
hinit = generateOptparseApplicativeCompletion "hi" (super.hinit.override { haskeline = self.haskeline_0_8_2; });
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
snap = doJailbreak super.snap;
@ -1914,4 +1914,27 @@ EOT
assert pkgs.lib.versionOlder self.hspec.version "2.8.2";
doJailbreak super.graphql;
# Test suite doesn't build with base16-bytestring >= 1.0.0.0
# https://github.com/emilypi/Base16/issues/9
base16 = dontCheck super.base16;
# gtk2hsC2hs fails to build on certain architectures (aarch64, ppc64(le), ...)
# with a linker error. As a workaround, we build gtk2hs-buildtools with -O0
# as suggested in the GHC thread below. An alternative to this could be to use
# -fllvm. I haven't been able to get this to work without linker errors, though.
# See also:
# * https://gitlab.haskell.org/ghc/ghc/-/issues/17203
# * https://github.com/gtk2hs/gtk2hs/issues/305
# * https://github.com/gtk2hs/gtk2hs/issues/279
gtk2hs-buildtools = appendConfigureFlags super.gtk2hs-buildtools
(pkgs.lib.optionals (with pkgs.stdenv.hostPlatform; isAarch64 || isPowerPC) [
"--ghc-option=-O0"
]);
# https://github.com/ajscholl/basic-cpuid/pull/1
basic-cpuid = appendPatch super.basic-cpuid (pkgs.fetchpatch {
url = "https://github.com/ajscholl/basic-cpuid/commit/2f2bd7a7b53103fb0cf26883f094db9d7659887c.patch";
sha256 = "0l15ccfdys100jf50s9rr4p0d0ikn53bkh7a9qlk9i0y0z5jc6x1";
});
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

71
pkgs/development/haskell-modules/configuration-darwin.nix
View file

@ -58,6 +58,12 @@ self: super: {
OpenAL = addExtraLibrary super.OpenAL darwin.apple_sdk.frameworks.OpenAL;
al = overrideCabal super.al (drv: {
libraryFrameworkDepends = [
darwin.apple_sdk.frameworks.OpenAL
] ++ (drv.libraryFrameworkDepends or []);
});
proteaaudio = addExtraLibrary super.proteaaudio darwin.apple_sdk.frameworks.AudioToolbox;
# the system-fileio tests use canonicalizePath, which fails in the sandbox
@ -100,6 +106,12 @@ self: super: {
hmatrix = addBuildDepend super.hmatrix darwin.apple_sdk.frameworks.Accelerate;
blas-hs = overrideCabal super.blas-hs (drv: {
libraryFrameworkDepends = [
darwin.apple_sdk.frameworks.Accelerate
] ++ (drv.libraryFrameworkDepends or []);
});
# Ensure the necessary frameworks are propagatedBuildInputs on darwin
OpenGLRaw = overrideCabal super.OpenGLRaw (drv: {
librarySystemDepends = [];
@ -168,6 +180,13 @@ self: super: {
'' + (drv.postPatch or "");
});
# conditional dependency via a cabal flag
cas-store = overrideCabal super.cas-store (drv: {
libraryHaskellDepends = [
self.kqueue
] ++ (drv.libraryHaskellDepends or []);
});
# 2021-05-25: Tests fail and I have no way to debug them.
hls-class-plugin = dontCheck super.hls-class-plugin;
hls-brittany-plugin = dontCheck super.hls-brittany-plugin;
@ -179,4 +198,56 @@ self: super: {
# We are lacking pure pgrep at the moment for tests to work
tmp-postgres = dontCheck super.tmp-postgres;
# On darwin librt doesn't exist and will fail to link against,
# however linking against it is also not necessary there
GLHUI = overrideCabal super.GLHUI (drv: {
postPatch = ''
substituteInPlace GLHUI.cabal --replace " rt" ""
'' + (drv.postPatch or "");
});
SDL-image = overrideCabal super.SDL-image (drv: {
# Prevent darwin-specific configuration code path being taken
# which doesn't work with nixpkgs' SDL libraries
postPatch = ''
substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
'' + (drv.postPatch or "");
patches = [
# Work around SDL_main.h redefining main to SDL_main
./patches/SDL-image-darwin-hsc.patch
];
});
# Prevent darwin-specific configuration code path being taken which
# doesn't work with nixpkgs' SDL libraries
SDL-mixer = overrideCabal super.SDL-mixer (drv: {
postPatch = ''
substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
'' + (drv.postPatch or "");
});
# Work around SDL_main.h redefining main to SDL_main
SDL-ttf = appendPatch super.SDL-ttf ./patches/SDL-ttf-darwin-hsc.patch;
# Disable a bunch of test suites that fail because of darwin's case insensitive
# file system: When a test suite has a test suite file that has the same name
# as a module in scope, but in different case (e. g. hedgehog.hs and Hedgehog
# in scope), GHC will complain that the file name and module name differ (in
# the example hedgehog.hs would be Main).
# These failures can easily be fixed by upstream by renaming files, so we
# should create issues for them.
# https://github.com/typeclasses/aws-cloudfront-signed-cookies/issues/2
aws-cloudfront-signed-cookies = dontCheck super.aws-cloudfront-signed-cookies;
# https://github.com/typeclasses/assoc-list/issues/2
assoc-list = dontCheck super.assoc-list;
assoc-listlike = dontCheck super.assoc-listlike;
# https://github.com/typeclasses/dsv/issues/1
dsv = dontCheck super.dsv;
# https://github.com/acid-state/acid-state/issues/133
acid-state = dontCheck super.acid-state;
# Otherwise impure gcc is used, which is Apple's weird wrapper
c2hsc = addTestToolDepends super.c2hsc [ pkgs.gcc ];
}

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

@ -286,7 +286,6 @@ broken-packages:
- barrie
- barrier
- barrier-monad
- base16
- base64-conduit
- base-compat-migrate
- base-encoding
@ -305,7 +304,9 @@ broken-packages:
- bdo
- beam
- beamable
- beam-core
- beam-mysql
- beam-newtype-field
- beam-sqlite
- bech32
- bed-and-breakfast
- beeminder-api
@ -1447,6 +1448,7 @@ broken-packages:
- fractals
- fraction
- frag
- Frames-beam
- Frames-map-reduce
- franchise
- fraxl
@ -1738,6 +1740,7 @@ broken-packages:
- gtk2hs-rpn
- gtk3-mac-integration
- gtkglext
- gtk-mac-integration
- gtksourceview2
- gtksourceview3
- gtk-toy
@ -2603,6 +2606,7 @@ broken-packages:
- kalman
- Kalman
- kangaroo
- karabiner-config
- karps
- katip-kafka
- katip-raven
@ -2630,7 +2634,6 @@ broken-packages:
- koellner-phonetic
- kontra-config
- kparams
- kqueue
- kraken
- krapsh
- Kriens
@ -2758,6 +2761,7 @@ broken-packages:
- life-sync
- lifted-protolude
- lifter
- lifx-lan
- ligature
- lilypond
- Limit
@ -3276,7 +3280,6 @@ broken-packages:
- no-role-annots
- notcpp
- not-gloss-examples
- notifications-tray-icon
- NoTrace
- now-haskell
- np-extras

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

@ -342,7 +342,9 @@ unsupported-platforms:
barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
bdcs-api: [ x86_64-darwin ]
bindings-directfb: [ x86_64-darwin ]
bindings-parport: [ x86_64-darwin ] # parport is a linux kernel component
bindings-sane: [ x86_64-darwin ]
btrfs: [ x86_64-darwin ] # depends on linux
bustle: [ x86_64-darwin ] # uses glibc-specific ptsname_r
charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3
crackNum: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux
@ -356,6 +358,7 @@ unsupported-platforms:
follow-file: [ x86_64-darwin ]
freenect: [ x86_64-darwin ]
FTGL: [ x86_64-darwin ]
fuzzytime: [ x86_64-darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2
ghcjs-dom-hello: [ x86_64-darwin ]
gi-dbusmenugtk3: [ x86_64-darwin ]
gi-dbusmenu: [ x86_64-darwin ]
@ -375,9 +378,11 @@ unsupported-platforms:
hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
honk: [ x86_64-darwin ]
hpapi: [ x86_64-darwin ]
HQu: [ aarch64-linux, armv7l-linux ] # unsupported by vendored C++ library, TODO: explicitly list supported platforms
HSoM: [ x86_64-darwin ]
iwlib: [ x86_64-darwin ]
jsaddle-webkit2gtk: [ x86_64-darwin ]
kqueue: [ x86_64-linux, aarch64-linux, i686-linux, armv7l-linux ] # BSD / Darwin only API
LambdaHack: [ x86_64-darwin ]
large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17
libmodbus: [ x86_64-darwin ]
@ -400,6 +405,7 @@ unsupported-platforms:
mplayer-spot: [ aarch64-linux ]
mptcp-pm: [ x86_64-darwin ]
netlink: [ x86_64-darwin ]
notifications-tray-icon: [ x86_64-darwin ] # depends on gi-dbusmenu
oculus: [ x86_64-darwin ]
pam: [ x86_64-darwin ]
parport: [ x86_64-darwin ]

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

@ -1,4 +1,4 @@
# Stackage LTS 18.4
# Stackage LTS 18.5
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -469,7 +469,7 @@ default-package-overrides:
- constraints-extras ==0.3.1.0
- constraint-tuples ==0.1.2
- construct ==0.3.0.2
- contravariant ==1.5.3
- contravariant ==1.5.5
- contravariant-extras ==0.3.5.2
- control-bool ==0.2.1
- control-dsl ==0.2.1.3
@ -549,7 +549,7 @@ default-package-overrides:
- datadog ==0.2.5.0
- data-dword ==0.3.2
- data-endian ==0.1.1
- data-fix ==0.3.1
- data-fix ==0.3.2
- data-forest ==0.1.0.8
- data-has ==0.4.0.0
- data-hash ==0.2.0.1
@ -720,7 +720,7 @@ default-package-overrides:
- exception-hierarchy ==0.1.0.4
- exception-mtl ==0.4.0.1
- exceptions ==0.10.4
- exception-transformers ==0.4.0.9
- exception-transformers ==0.4.0.10
- exception-via ==0.1.0.0
- executable-path ==0.0.3.1
- exit-codes ==1.0.0
@ -772,10 +772,10 @@ default-package-overrides:
- first-class-patterns ==0.3.2.5
- fitspec ==0.4.10
- fixed ==0.3
- fixed-length ==0.2.2.1
- fixed-length ==0.2.3
- fixed-vector ==1.2.0.0
- fixed-vector-hetero ==0.6.1.0
- fix-whitespace ==0.0.5
- fix-whitespace ==0.0.6
- flac ==0.2.0
- flac-picture ==0.1.2
- flags-applicative ==0.1.0.3
@ -787,7 +787,7 @@ default-package-overrides:
- flow ==1.0.22
- flush-queue ==1.0.0
- fmlist ==0.9.4
- fmt ==0.6.1.2
- fmt ==0.6.2.0
- fn ==0.3.0.2
- focus ==1.0.2
- focuslist ==0.1.0.2
@ -1105,7 +1105,7 @@ default-package-overrides:
- hslua-module-path ==0.1.0.1
- hslua-module-system ==0.2.2.1
- hslua-module-text ==0.3.0.1
- HsOpenSSL ==0.11.7
- HsOpenSSL ==0.11.7.1
- HsOpenSSL-x509-system ==0.1.0.4
- hsp ==0.10.0
- hspec ==2.7.10
@ -1313,7 +1313,7 @@ default-package-overrides:
- junit-xml ==0.1.0.2
- justified-containers ==0.3.0.0
- jwt ==0.10.0
- kan-extensions ==5.2.2
- kan-extensions ==5.2.3
- kanji ==3.4.1
- katip ==0.8.5.0
- katip-logstash ==0.1.0.0
@ -1526,7 +1526,7 @@ default-package-overrides:
- modern-uri ==0.3.4.1
- modular ==0.1.0.8
- monad-chronicle ==1.0.0.1
- monad-control ==1.0.2.3
- monad-control ==1.0.3
- monad-control-aligned ==0.0.1.1
- monad-coroutine ==0.9.1.2
- monad-extras ==0.6.0
@ -2220,7 +2220,7 @@ default-package-overrides:
- stackcollapse-ghc ==0.0.1.3
- stack-templatizer ==0.1.0.2
- stateref ==0.3
- StateVar ==1.2.1
- StateVar ==1.2.2
- static-text ==0.2.0.7
- statistics ==0.15.2.0
- status-notifier-item ==0.3.1.0

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

@ -113,7 +113,6 @@ dont-distribute-packages:
- Forestry
- FormalGrammars
- Foster
- Frames-beam
- Frames-dsv
- Frank
- GLFW-OGL
@ -394,6 +393,7 @@ dont-distribute-packages:
- adict
- adp-multi-monadiccp
- aern2-real
- aern2-real_0_2_8_0
- aeson-native
- afv
- agda-server
@ -515,7 +515,6 @@ dont-distribute-packages:
- bamboo-theme-mini-html5
- bamse
- bamstats
- base16-lens
- base32-bytestring
- base64-bytes
- baserock-schema
@ -527,11 +526,6 @@ dont-distribute-packages:
- bdcs
- bdcs-api
- beam-automigrate
- beam-migrate
- beam-mysql
- beam-newtype-field
- beam-postgres
- beam-sqlite
- beam-th
- beautifHOL
- bech32-th
@ -1588,6 +1582,7 @@ dont-distribute-packages:
- hs-ffmpeg
- hs-gen-iface
- hs-pkpass
- hs-sdl-term-emulator
- hs-swisstable-hashtables-class
- hs2dot
- hsautogui
@ -2718,7 +2713,6 @@ dont-distribute-packages:
- servant-streaming-docs
- servant-streaming-server
- servant-swagger-tags
- servant-util-beam-pg
- servant-waargonaut
- servant-zeppelin-client
- servant-zeppelin-server

30
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -788,6 +788,11 @@ self: super: builtins.intersectAttrs super {
platforms = pkgs.lib.platforms.x86;
};
# uses x86 intrinsics
geomancy = overrideCabal super.geomancy {
platforms = pkgs.lib.platforms.x86;
};
hls-brittany-plugin = overrideCabal super.hls-brittany-plugin (drv: {
testToolDepends = [ pkgs.git ];
preCheck = ''
@ -919,4 +924,29 @@ self: super: builtins.intersectAttrs super {
# Flag added in Agda 2.6.2
Agda = appendConfigureFlag super.Agda "-foptimise-heavily";
# ats-format uses cli-setup in Setup.hs which is quite happy to write
# to arbitrary files in $HOME. This doesn't either not achieve anything
# or even fail, so we prevent it and install everything necessary ourselves.
# See also: https://hackage.haskell.org/package/cli-setup-0.2.1.4/docs/src/Distribution.CommandLine.html#setManpathGeneric
ats-format = generateOptparseApplicativeCompletion "atsfmt" (
justStaticExecutables (
overrideCabal super.ats-format (drv: {
# use vanilla Setup.hs
preCompileBuildDriver = ''
cat > Setup.hs << EOF
module Main where
import Distribution.Simple
main = defaultMain
EOF
'' + (drv.preCompileBuildDriver or "");
# install man page
buildTools = [
pkgs.buildPackages.installShellFiles
] ++ (drv.buildTools or []);
postInstall = ''
installManPage man/atsfmt.1
'' + (drv.postInstall or "");
})
)
);
}

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

File diff suppressed because it is too large Load diff

9
pkgs/development/haskell-modules/patches/SDL-image-darwin-hsc.patch Normal file
View file

@ -0,0 +1,9 @@
--- SDL-image-0.6.2.0/Graphics/UI/SDL/Image/Version.hsc.orig 2021-08-06 01:21:05.000000000 +0200
+++ SDL-image-0.6.2.0/Graphics/UI/SDL/Image/Version.hsc 2021-08-06 01:21:56.000000000 +0200
@@ -1,4 +1,6 @@
#include "SDL_image.h"
+-- override SDL_main.h redefining main to SDL_main on darwin
+#define main main
module Graphics.UI.SDL.Image.Version
( compiledFor
, linkedWith

9
pkgs/development/haskell-modules/patches/SDL-ttf-darwin-hsc.patch Normal file
View file

@ -0,0 +1,9 @@
--- SDL-ttf-0.6.3.0/Graphics/UI/SDL/TTF/Version.hsc.orig 2021-08-06 01:31:39.000000000 +0200
+++ SDL-ttf-0.6.3.0/Graphics/UI/SDL/TTF/Version.hsc 2021-08-06 01:32:03.000000000 +0200
@@ -1,4 +1,6 @@
#include "SDL_ttf.h"
+-- override SDL_main.h redefining main to SDL_main on darwin
+#define main main
module Graphics.UI.SDL.TTF.Version
( compiledFor
, linkedWith