Merge pull request #178022 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
main
Dennis Gosnell 2 years ago committed by GitHub
commit 2a1e62999f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      pkgs/data/misc/hackage/pin.json
  2. 3
      pkgs/development/compilers/ghc/8.10.7.nix
  3. 3
      pkgs/development/compilers/ghc/9.0.2.nix
  4. 3
      pkgs/development/compilers/ghc/9.2.3.nix
  5. 6
      pkgs/development/haskell-modules/cabal2nix-unstable.nix
  6. 43
      pkgs/development/haskell-modules/configuration-common.nix
  7. 9
      pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
  8. 260
      pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
  9. 34
      pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
  10. 8
      pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
  11. 54
      pkgs/development/haskell-modules/configuration-nix.nix
  12. 6173
      pkgs/development/haskell-modules/hackage-packages.nix
  13. 3
      pkgs/development/haskell-modules/lib/compose.nix
  14. 4
      pkgs/development/haskell-modules/non-hackage-packages.nix
  15. 3
      pkgs/top-level/release-lib.nix

@ -1,6 +1,6 @@
{
"commit": "e55c7aa130b33bcfe416a246d9e8a108c63022f9",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e55c7aa130b33bcfe416a246d9e8a108c63022f9.tar.gz",
"sha256": "1nmqxlj9c76xpyz1js47bk7m05mr229c8y5k7gnnjwh4gspr0p0r",
"msg": "Update from Hackage at 2022-06-07T15:13:17Z"
"commit": "3871a68d11673db568acc232f35f8ffd28b63832",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3871a68d11673db568acc232f35f8ffd28b63832.tar.gz",
"sha256": "0fbj5353ni22b7vbfn5b9k5lq78i3aanx2njj6kac7qyiazrdck2",
"msg": "Update from Hackage at 2022-06-17T13:13:15Z"
}

@ -96,6 +96,9 @@ let
# build the haddock program (removing the `enableHaddockProgram` option).
''
HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"}
# Build haddocks for boot packages with hyperlinking
EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
'' + lib.optionalString (targetPlatform != hostPlatform) ''

@ -99,6 +99,9 @@ let
# build the haddock program (removing the `enableHaddockProgram` option).
''
HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"}
# Build haddocks for boot packages with hyperlinking
EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"}
'' + lib.optionalString (targetPlatform != hostPlatform) ''

@ -101,6 +101,9 @@ let
# build the haddock program (removing the `enableHaddockProgram` option).
''
HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"}
# Build haddocks for boot packages with hyperlinking
EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"}
'' + lib.optionalString (targetPlatform != hostPlatform) ''

@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2022-04-27";
version = "unstable-2022-06-20";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/40823c793b4b8588fcfedc8fb147c1a92cfa577d.tar.gz";
sha256 = "0gr8hafa282m4qw5y5wrqiwm1a3fl3b7xicnzixss6nlmxmi2skp";
url = "https://github.com/NixOS/cabal2nix/archive/9d18320d76e3f29f1787a8377125812150c59021.tar.gz";
sha256 = "1gykznb1fl9d9cqksbxc4qsyspp9xazamv57hmv3jpljzl8lq2aq";
};
isLibrary = true;
isExecutable = true;

@ -678,9 +678,6 @@ self: super: {
# https://github.com/pxqr/base32-bytestring/issues/4
base32-bytestring = dontCheck super.base32-bytestring;
# 2022-03-24: Strict aeson bound:
arch-web = throwIfNot (super.arch-web.version == "0.1.0") "arch-web: remove jailbreak after update" doJailbreak super.arch-web;
# Djinn's last release was 2014, incompatible with Semigroup-Monoid Proposal
# https://github.com/augustss/djinn/pull/8
djinn = appendPatch (fetchpatch {
@ -1164,17 +1161,6 @@ self: super: {
# https://github.com/elliottt/hsopenid/issues/15
openid = markBroken super.openid;
# Version constraints on test dependency tasty-golden need to be relaxed:
# https://github.com/nomeata/arbtt/pull/146
arbtt = doJailbreak (overrideCabal (drv: {
# The test suite needs the packages's executables in $PATH to succeed.
preCheck = ''
for i in $PWD/dist/build/*; do
export PATH="$i:$PATH"
done
'';
}) super.arbtt);
# https://github.com/erikd/hjsmin/issues/32
hjsmin = dontCheck super.hjsmin;
@ -1328,19 +1314,6 @@ self: super: {
x509-validation = dontCheck super.x509-validation;
tls = dontCheck super.tls;
patch = appendPatches [
# 2022-02-27: https://github.com/reflex-frp/patch/pull/40 for bump bounds
(fetchpatch {
url = "https://github.com/reflex-frp/patch/commit/15ea4956e04264b9be2fe4644119a709b196708f.patch";
sha256 = "sha256-la97DCjeVu82AaQv2my+UhmB/jBmMyxxpRAwhEB1RGc=";
})
# 2022-03-13: https://github.com/reflex-frp/patch/pull/41 for ghc 9.0 compat
(fetchpatch {
url = "https://github.com/reflex-frp/patch/commit/fee3addcfc982c7b70489a8a64f208ab2360bdb7.patch";
sha256 = "sha256-/CTiHSs+Z4dyL5EJx949XD0zzSAy5s4hzchmNkb0YOk=";
})
] super.patch;
# 2022-03-16: lens bound can be loosened https://github.com/ghcjs/jsaddle-dom/issues/19
jsaddle-dom = overrideCabal (old: {
postPatch = old.postPatch or "" + ''
@ -1640,20 +1613,8 @@ self: super: {
reflex-dom-pandoc = super.reflex-dom-pandoc.override { clay = dontCheck self.clay_0_13_3; };
# 2022-03-16: Pull request for ghc 9 compat: https://github.com/reflex-frp/reflex/pull/467
reflex = overrideCabal (drv: {
patches = drv.patches or [] ++ [
(fetchpatch {
url = "https://github.com/reflex-frp/reflex/compare/469b4ab4a755cad76b8d4d6c9ad482d02686b4ae.patch";
sha256 = "04sxzxpx7xhr6p4n76rg1ci8zjfzs19lr21ziwsfig8zmdg22i7q";
})
];
doCheck = false;
# hackage revision seems to have DOS newlines
prePatch = drv.prePatch or "" + ''
${pkgs.buildPackages.dos2unix}/bin/dos2unix reflex.cabal
'';
}) super.reflex;
# 2022-06-19: Disable checks because of https://github.com/reflex-frp/reflex/issues/475
reflex = dontCheck super.reflex;
# 2020-11-19: jailbreaking because of pretty-simple bound out of date
# https://github.com/kowainik/stan/issues/408

@ -493,6 +493,7 @@ broken-packages:
- buster
- Buster
- butter
- buttplug-hs-core
- bv-little
- byline
- bytearray-parsing
@ -2065,6 +2066,7 @@ broken-packages:
- hasql-explain-tests
- hasql-generic
- hasql-implicits
- hasql-resource-pool
- hasql-simple
- hasql-streams-example
- hasql-url
@ -2556,6 +2558,7 @@ broken-packages:
- hweblib
- hw-fingertree-strict
- hwhile
- hw-lazy
- hw-mquery
- hworker
- hw-playground-linear
@ -2664,6 +2667,7 @@ broken-packages:
- interruptible
- interval
- interval-algebra
- interval-patterns
- IntFormats
- int-multimap
- intricacy
@ -2816,6 +2820,7 @@ broken-packages:
- kawaii
- Kawaii-Parser
- kawhi
- kazura-queue
- kdesrc-build-extra
- kdt
- kd-tree
@ -3951,6 +3956,7 @@ broken-packages:
- polynom
- polynomial-algebra
- polysemy-check
- polysemy-http
- polysemy-keyed-state
- polysemy-kvstore-jsonfile
- polysemy-managed
@ -4230,6 +4236,7 @@ broken-packages:
- reason-export
- record
- record-encode
- record-impl
- records
- record-wrangler
- recursion-schemes-ext
@ -5625,6 +5632,7 @@ broken-packages:
- winery
- wires
- wiring
- witness
- witty
- wkt
- wkt-geom
@ -5733,6 +5741,7 @@ broken-packages:
- YamlReference
- yaml-rpc
- yaml-union
- yaml-unscrambler
- yampa2048
- yampa-glfw
- yampa-gloss

@ -406,151 +406,159 @@ package-maintainers:
- nix-tree
unsupported-platforms:
Allure: [ x86_64-darwin, aarch64-darwin ]
alsa-mixer: [ x86_64-darwin, aarch64-darwin ]
alsa-pcm: [ x86_64-darwin, aarch64-darwin ]
alsa-seq: [ x86_64-darwin, aarch64-darwin ]
AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
bdcs-api: [ x86_64-darwin, aarch64-darwin ]
bindings-directfb: [ x86_64-darwin, aarch64-darwin ]
bindings-parport: [ x86_64-darwin, aarch64-darwin ] # parport is a linux kernel component
bindings-sane: [ x86_64-darwin, aarch64-darwin ]
btrfs: [ x86_64-darwin, aarch64-darwin ] # depends on linux
bustle: [ x86_64-darwin, aarch64-darwin ] # uses glibc-specific ptsname_r
Allure: [ platforms.darwin ]
bdcs-api: [ platforms.darwin ]
bindings-directfb: [ platforms.darwin ]
bindings-sane: [ platforms.darwin ]
bustle: [ platforms.darwin ] # uses glibc-specific ptsname_r
camfort: [ aarch64-linux ]
charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3
cut-the-crap: [ x86_64-darwin, aarch64-darwin ]
d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
dx9base: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Euterpea: [ x86_64-darwin, aarch64-darwin ]
essence-of-live-coding-PortMidi: [ x86_64-darwin, aarch64-darwin ]
follow-file: [ x86_64-darwin, aarch64-darwin ]
freenect: [ x86_64-darwin, aarch64-darwin ]
FTGL: [ x86_64-darwin, aarch64-darwin ]
fuzzytime: [ x86_64-darwin, aarch64-darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2
ghcjs-dom-hello: [ x86_64-darwin, aarch64-darwin ]
gi-adwaita: [ x86_64-darwin, aarch64-darwin ]
gi-dbusmenugtk3: [ x86_64-darwin, aarch64-darwin ]
gi-dbusmenu: [ x86_64-darwin, aarch64-darwin ]
gi-ggit: [ x86_64-darwin, aarch64-darwin ]
gi-gtkosxapplication: [ x86_64-linux, aarch64-linux ]
gi-ibus: [ x86_64-darwin, aarch64-darwin ]
gi-javascriptcore: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin
gi-ostree: [ x86_64-darwin, aarch64-darwin ]
gi-vte: [ x86_64-darwin, aarch64-darwin ]
gi-webkit2webextension: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin
gi-webkit2: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin
gi-wnck: [ x86_64-darwin, aarch64-darwin ]
gnome-keyring: [ x86_64-darwin, aarch64-darwin ]
grid-proto: [ x86_64-darwin, aarch64-darwin ]
gtk3-mac-integration: [ x86_64-linux, aarch64-linux ]
gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
gtk-sni-tray: [ x86_64-darwin, aarch64-darwin ]
haskell-snake: [ x86_64-darwin, aarch64-darwin ]
hbro-contrib: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin
hbro: [ x86_64-darwin, aarch64-darwin ] # webkitgtk marked broken on darwin
hcwiid: [ x86_64-darwin, aarch64-darwin ]
HDRUtils: [ x86_64-darwin, aarch64-darwin ]
HFuse: [ x86_64-darwin, aarch64-darwin ]
hidapi: [ x86_64-darwin, aarch64-darwin ]
hinotify-bytestring: [ x86_64-darwin, aarch64-darwin ]
hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
honk: [ x86_64-darwin, aarch64-darwin ]
hpapi: [ x86_64-darwin, aarch64-darwin ]
cut-the-crap: [ platforms.darwin ]
essence-of-live-coding-PortMidi: [ platforms.darwin ]
Euterpea: [ platforms.darwin ]
follow-file: [ platforms.darwin ]
freenect: [ platforms.darwin ]
FTGL: [ platforms.darwin ]
fuzzytime: [ platforms.darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2
ghcjs-dom-hello: [ platforms.darwin ]
gi-adwaita: [ platforms.darwin ]
gi-dbusmenugtk3: [ platforms.darwin ]
gi-dbusmenu: [ platforms.darwin ]
gi-ggit: [ platforms.darwin ]
gi-ibus: [ platforms.darwin ]
gi-javascriptcore: [ platforms.darwin ] # webkitgtk marked broken on darwin
gi-ostree: [ platforms.darwin ]
gi-vte: [ platforms.darwin ]
gi-webkit2webextension: [ platforms.darwin ] # webkitgtk marked broken on darwin
gi-webkit2: [ platforms.darwin ] # webkitgtk marked broken on darwin
gi-wnck: [ platforms.darwin ]
gnome-keyring: [ platforms.darwin ]
grid-proto: [ platforms.darwin ]
gtk-sni-tray: [ platforms.darwin ]
haskell-snake: [ platforms.darwin ]
hcwiid: [ platforms.darwin ]
HDRUtils: [ platforms.darwin ]
hidapi: [ platforms.darwin ]
hinotify-bytestring: [ platforms.darwin ]
honk: [ platforms.darwin ]
HQu: [ aarch64-linux, armv7l-linux ] # unsupported by vendored C++ library, TODO: explicitly list supported platforms
HSoM: [ x86_64-darwin, aarch64-darwin ]
iwlib: [ x86_64-darwin, aarch64-darwin ]
Jazzkell: [ x86_64-darwin, aarch64-darwin ] # depends on Euterpea
jsaddle-hello: [ x86_64-darwin, aarch64-darwin ] # depends on jsaddle-webkit2gtk
jsaddle-webkit2gtk: [ x86_64-darwin, aarch64-darwin ]
HSoM: [ platforms.darwin ]
iwlib: [ platforms.darwin ]
Jazzkell: [ platforms.darwin ] # depends on Euterpea
jsaddle-hello: [ platforms.darwin ] # depends on jsaddle-webkit2gtk
jsaddle-webkit2gtk: [ platforms.darwin ]
keid-core: [ aarch64-linux ]
keid-geometry: [ aarch64-linux ]
keid-render-basic: [ aarch64-linux ]
keid-sound-openal: [ aarch64-linux ]
keid-ui-dearimgui: [ aarch64-linux ]
kqueue: [ x86_64-linux, aarch64-linux, i686-linux, armv7l-linux ] # BSD / Darwin only API
Kulitta: [ x86_64-darwin, aarch64-darwin ] # depends on Euterpea
LambdaHack: [ x86_64-darwin, aarch64-darwin ]
Kulitta: [ platforms.darwin ] # depends on Euterpea
LambdaHack: [ platforms.darwin ]
large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17
libmodbus: [ x86_64-darwin, aarch64-darwin ]
libsystemd-journal: [ x86_64-darwin, aarch64-darwin ]
libtelnet: [ x86_64-darwin, aarch64-darwin ]
libvirt-hs: [ x86_64-darwin ] # spidermonkey is not supported on darwin
libzfs: [ x86_64-darwin, aarch64-darwin ]
libmodbus: [ platforms.darwin ]
libsystemd-journal: [ platforms.darwin ]
libtelnet: [ platforms.darwin ]
libvirt-hs: [ platforms.darwin ] # spidermonkey is not supported on darwin
libzfs: [ platforms.darwin ]
linearEqSolver: [ aarch64-linux ]
linux-evdev: [ x86_64-darwin, aarch64-darwin ]
linux-file-extents: [ x86_64-darwin, aarch64-darwin ]
linux-inotify: [ x86_64-darwin, aarch64-darwin ]
linux-mount: [ x86_64-darwin, aarch64-darwin ]
linux-namespaces: [ x86_64-darwin, aarch64-darwin ]
lio-fs: [ x86_64-darwin, aarch64-darwin ]
logging-facade-journald: [ x86_64-darwin, aarch64-darwin ]
lio-fs: [ platforms.darwin ]
logging-facade-journald: [ platforms.darwin ]
longshot: [ aarch64-linux ]
lxc: [ x86_64-darwin, aarch64-darwin ]
midi-alsa: [ x86_64-darwin, aarch64-darwin ]
mpi-hs: [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
mpi-hs-binary: [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
mpi-hs-cereal: [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
mpi-hs-store: [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
mpi-hs: [ aarch64-linux, platforms.darwin ]
mpi-hs-binary: [ aarch64-linux, platforms.darwin ]
mpi-hs-cereal: [ aarch64-linux, platforms.darwin ]
mpi-hs-store: [ aarch64-linux, platforms.darwin ]
mplayer-spot: [ aarch64-linux ]
mptcp-pm: [ x86_64-darwin, aarch64-darwin ]
netlink: [ x86_64-darwin, aarch64-darwin ]
notifications-tray-icon: [ x86_64-darwin, aarch64-darwin ] # depends on gi-dbusmenu
oculus: [ x86_64-darwin, aarch64-darwin ]
pam: [ x86_64-darwin, aarch64-darwin ]
parport: [ x86_64-darwin, aarch64-darwin ]
mptcp-pm: [ platforms.darwin ]
netlink: [ platforms.darwin ]
notifications-tray-icon: [ platforms.darwin ] # depends on gi-dbusmenu
oculus: [ platforms.darwin ]
pam: [ platforms.darwin ]
parport: [ platforms.darwin ]
password: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
password-instances: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
persist-state: [ aarch64-linux, armv7l-linux ] # https://github.com/minad/persist-state/blob/6fd68c0b8b93dec78218f6d5a1f4fa06ced4e896/src/Data/PersistState.hs#L122-L128
piyo: [ x86_64-darwin, aarch64-darwin ]
PortMidi-simple: [ x86_64-darwin, aarch64-darwin ]
PortMidi: [ x86_64-darwin, aarch64-darwin ]
posix-api: [ x86_64-darwin, aarch64-darwin ]
Raincat: [ x86_64-darwin, aarch64-darwin ]
reactive-balsa: [ x86_64-darwin, aarch64-darwin ] # depends on alsa-core
reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
reflex-dom-fragment-shader-canvas: [ x86_64-darwin, aarch64-darwin, aarch64-linux ]
reflex-dom: [ x86_64-darwin, aarch64-darwin, aarch64-linux ]
reflex-localize-dom: [ x86_64-darwin, aarch64-darwin, aarch64-linux ]
rtlsdr: [ x86_64-darwin, aarch64-darwin ]
rubberband: [ x86_64-darwin, aarch64-darwin ]
piyo: [ platforms.darwin ]
PortMidi-simple: [ platforms.darwin ]
PortMidi: [ platforms.darwin ]
posix-api: [ platforms.darwin ]
Raincat: [ platforms.darwin ]
reactive-balsa: [ platforms.darwin ] # depends on alsa-core
reflex-dom-fragment-shader-canvas: [ platforms.darwin, aarch64-linux ]
reflex-dom: [ platforms.darwin, aarch64-linux ]
reflex-localize-dom: [ platforms.darwin, aarch64-linux ]
rtlsdr: [ platforms.darwin ]
rubberband: [ platforms.darwin ]
scat: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
scrypt: [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8
sdl2-mixer: [ x86_64-darwin, aarch64-darwin ]
sdl2-ttf: [ x86_64-darwin, aarch64-darwin ]
sensei: [ x86_64-darwin ]
synthesizer-alsa: [ x86_64-darwin, aarch64-darwin ]
taffybar: [ x86_64-darwin, aarch64-darwin ]
termonad: [ x86_64-darwin, aarch64-darwin ]
tokyotyrant-haskell: [ x86_64-darwin, aarch64-darwin ]
udev: [ x86_64-darwin, aarch64-darwin ]
Unixutils-shadow: [ x86_64-darwin, aarch64-darwin ]
sdl2-mixer: [ platforms.darwin ]
sdl2-ttf: [ platforms.darwin ]
sensei: [ platforms.darwin ]
synthesizer-alsa: [ platforms.darwin ]
taffybar: [ platforms.darwin ]
termonad: [ platforms.darwin ]
tokyotyrant-haskell: [ platforms.darwin ]
Unixutils-shadow: [ platforms.darwin ]
verifiable-expressions: [ aarch64-linux ]
vrpn: [ x86_64-darwin, aarch64-darwin ]
vulkan: [ i686-linux, armv7l-linux, x86_64-darwin, aarch64-darwin ]
VulkanMemoryAllocator: [ i686-linux, armv7l-linux, x86_64-darwin, aarch64-darwin ]
vulkan-utils: [ x86_64-darwin, aarch64-darwin ]
webkit2gtk3-javascriptcore: [ x86_64-darwin, aarch64-darwin ]
Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
xattr: [ x86_64-darwin, aarch64-darwin ]
vrpn: [ platforms.darwin ]
vulkan: [ i686-linux, armv7l-linux, platforms.darwin ]
VulkanMemoryAllocator: [ i686-linux, armv7l-linux, platforms.darwin ]
vulkan-utils: [ platforms.darwin ]
webkit2gtk3-javascriptcore: [ platforms.darwin ]
xattr: [ platforms.darwin ]
xgboost-haskell: [ aarch64-linux, armv7l-linux ]
XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
xmobar: [ x86_64-darwin, aarch64-darwin ]
xmonad-extras: [ x86_64-darwin, aarch64-darwin ]
xmonad-volume: [ x86_64-darwin, aarch64-darwin ]
xmobar: [ platforms.darwin ]
xmonad-extras: [ platforms.darwin ]
xmonad-volume: [ platforms.darwin ]
supported-platforms:
AWin32Console: [ platforms.windows ]
alsa-mixer: [ platforms.linux ]
alsa-pcm: [ platforms.linux ]
alsa-seq: [ platforms.linux ]
barbly: [ platforms.darwin ]
bindings-parport: [ platforms.linux ] # parport is a linux kernel component
blake3: [ platforms.x86 ] # uses x86 intrinsics
btrfs: [ platforms.linux ] # depends on linux
cpuid: [ platforms.x86 ] # needs to be i386 compatible (IA-32)
crc32c: [ platforms.x86 ] # uses x86 intrinsics
d3d11binding: [ platforms.windows ]
DirectSound: [ platforms.windows ]
dx9base: [ platforms.windows ]
dx9d3d: [ platforms.windows ]
dx9d3dx: [ platforms.windows ]
geomancy: [ platforms.x86 ] # x86 intrinsics
gi-gtkosxapplication: [ platforms.darwin ]
gtk-mac-integration: [ platforms.darwin ]
gtk3-mac-integration: [ platforms.darwin ]
hommage-ds: [ platforms.windows ]
hpapi: [ platforms.linux ] # limited by pkgs.papi
hsignal: [ platforms.x86 ] # -msse2
HFuse: [ platforms.linux ]
hw-prim-bits: [ platforms.x86 ] # x86 assembler
inline-asm: [ platforms.x86 ] # x86 assembler
kqueue: [ platforms.netbsd, platforms.freebsd, platforms.openbsd, platforms.darwin ]
linux-evdev: [ platforms.linux ]
linux-file-extents: [ platforms.linux ]
linux-inotify: [ platforms.linux ]
linux-mount: [ platforms.linux ]
linux-namespaces: [ platforms.linux ]
lxc: [ platforms.linux ]
midi-alsa: [ platforms.linux ]
reactivity: [ platforms.windows ]
seqalign: [ platforms.x86 ] # x86 intrinsics
udev: [ platforms.linux ]
Win32-console: [ platforms.windows ]
Win32-dhcp-server: [ platforms.windows ]
Win32-errors: [ platforms.windows ]
Win32-extras: [ platforms.windows ]
Win32-junction-point: [ platforms.windows ]
Win32-notify: [ platforms.windows ]
Win32: [ platforms.windows ]
Win32-security: [ platforms.windows ]
Win32-services: [ platforms.windows ]
Win32-services-wrapper: [ platforms.windows ]
XInput: [ platforms.windows ]
dont-distribute-packages:
# Depends on shine, which is a ghcjs project.

@ -1,4 +1,4 @@
# Stackage LTS 19.10
# Stackage LTS 19.11
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -231,7 +231,7 @@ default-package-overrides:
- brick ==0.68.1
- brittany ==0.14.0.2
- broadcast-chan ==0.2.1.2
- brotli ==0.0.0.0
- brotli ==0.0.0.1
- brotli-streams ==0.0.0.0
- bsb-http-chunked ==0.0.0.4
- bson ==0.4.0.1
@ -241,7 +241,7 @@ default-package-overrides:
- bugsnag-haskell ==0.0.4.4
- bugsnag-hs ==0.2.0.8
- bugzilla-redhat ==1.0.0
- burrito ==2.0.1.0
- burrito ==2.0.1.1
- butcher ==1.3.3.2
- buttplug-hs-core ==0.1.0.1
- bv ==0.5
@ -279,7 +279,7 @@ default-package-overrides:
- cached-json-file ==0.1.1
- cacophony ==0.10.1
- calendar-recycling ==0.0.0.1
- call-alloy ==0.3
- call-alloy ==0.3.0.1
- call-stack ==0.4.0
- can-i-haz ==0.3.1.0
- capability ==0.5.0.1
@ -429,9 +429,9 @@ default-package-overrides:
- convertible ==1.1.1.1
- cookie ==0.4.5
- copr-api ==0.1.0
- core-data ==0.3.2.2
- core-data ==0.3.3.1
- core-program ==0.4.6.4
- core-text ==0.3.7.1
- core-text ==0.3.7.2
- countable ==1.0
- covariance ==0.1.0.6
- cpphs ==1.20.9.1
@ -645,6 +645,7 @@ default-package-overrides:
- either ==5.0.2
- either-both ==0.1.1.1
- either-unwrap ==1.1
- ekg-core ==0.1.1.7
- elerea ==2.9.0
- elf ==0.31
- eliminators ==0.8
@ -1325,7 +1326,7 @@ default-package-overrides:
- js-flot ==0.8.3
- js-jquery ==3.3.1
- json ==0.10
- json-feed ==2.0.0.1
- json-feed ==2.0.0.2
- jsonifier ==0.2.1.1
- jsonpath ==0.2.1.0
- json-stream ==0.4.4.1
@ -1340,7 +1341,7 @@ default-package-overrides:
- kanji ==3.5.0
- katip ==0.8.7.2
- katip-logstash ==0.1.0.2
- katip-wai ==0.1.1.0
- katip-wai ==0.1.2.0
- kazura-queue ==0.1.0.4
- keep-alive ==0.2.0.0
- keycode ==0.2.2
@ -1355,7 +1356,7 @@ default-package-overrides:
- krank ==0.2.3
- l10n ==0.1.0.1
- labels ==0.3.3
- lackey ==2.0.0.1
- lackey ==2.0.0.2
- LambdaHack ==0.11.0.0
- lame ==0.2.0
- language-bash ==0.9.2
@ -1512,6 +1513,7 @@ default-package-overrides:
- messagepack ==0.5.5
- metrics ==0.4.1.1
- mfsolve ==0.3.2.1
- microaeson ==0.1.0.1
- microlens ==0.4.12.0
- microlens-aeson ==2.4.1
- microlens-contra ==0.1.0.2
@ -1531,6 +1533,7 @@ default-package-overrides:
- mime-types ==0.1.0.9
- minimal-configuration ==0.1.4
- minimorph ==0.3.0.0
- minio-hs ==1.6.0
- miniutter ==0.5.1.1
- min-max-pqueue ==0.1.0.2
- mintty ==0.1.3
@ -1689,7 +1692,7 @@ default-package-overrides:
- NumInstances ==1.4
- numtype-dk ==0.5.0.3
- nuxeo ==0.3.2
- nvim-hs ==2.2.0.1
- nvim-hs ==2.2.0.2
- ObjectName ==1.1.0.2
- ochintin-daicho ==0.3.4.2
- o-clock ==1.2.1.1
@ -1746,7 +1749,7 @@ default-package-overrides:
- pandoc ==2.17.1.1
- pandoc-csv2table ==1.0.9
- pandoc-dhall-decoder ==0.1.0.1
- pandoc-lua-marshal ==0.1.6
- pandoc-lua-marshal ==0.1.6.1
- pandoc-plot ==1.4.1
- pandoc-throw ==0.1.0.0
- pandoc-types ==1.22.2
@ -1979,7 +1982,7 @@ default-package-overrides:
- rainbow ==0.34.2.2
- rainbox ==0.26.0.0
- ral ==0.2.1
- rampart ==2.0.0.0
- rampart ==2.0.0.1
- ramus ==0.1.2
- rando ==0.0.0.4
- random ==1.2.1.1
@ -1995,7 +1998,7 @@ default-package-overrides:
- rank2classes ==1.4.4
- Rasterific ==0.7.5.4
- rasterific-svg ==0.3.3.2
- ratel ==2.0.0.0
- ratel ==2.0.0.2
- rate-limit ==1.4.2
- ratel-wai ==2.0.0.0
- rattle ==0.2
@ -2444,7 +2447,7 @@ default-package-overrides:
- tdigest ==0.2.1.1
- teardown ==0.5.0.1
- telegram-bot-simple ==0.4.5
- template-haskell-compat-v0208 ==0.1.7
- template-haskell-compat-v0208 ==0.1.9
- temporary ==1.3
- temporary-rc ==1.2.0.3
- temporary-resourcet ==0.1.0.1
@ -2544,7 +2547,7 @@ default-package-overrides:
- topograph ==1.0.0.1
- torsor ==0.1
- tostring ==0.2.1.1
- tracing ==0.0.7.2
- tracing ==0.0.7.3
- tracing-control ==0.0.7.3
- transaction ==0.1.1.3
- transformers-base ==0.4.6
@ -2765,6 +2768,7 @@ default-package-overrides:
- windns ==0.1.0.1
- wire-streams ==0.1.1.0
- witch ==1.0.0.2
with-compiler: ghc-9.0.2
- withdependencies ==0.3.0
- witherable ==0.4.2
- within ==0.2.0.1

@ -1275,6 +1275,9 @@ dont-distribute-packages:
- dobutokO4
- doc-review
- dom-parser
- domain
- domain-aeson
- domain-cereal
- dormouse-client
- dotparse
- doublezip
@ -1939,6 +1942,8 @@ dont-distribute-packages:
- haskades
- haskdeep
- haskeem
- haskell-admin
- haskell-admin-managed-functions
- haskell-aliyun
- haskell-bitmex-client
- haskell-docs
@ -2169,6 +2174,7 @@ dont-distribute-packages:
- hranker
- hreq-client
- hreq-conduit
- hriemann
- hs
- hs-blake2
- hs-ffmpeg
@ -2490,7 +2496,6 @@ dont-distribute-packages:
- labyrinth
- labyrinth-server
- laika
- lambda-calculator
- lambda-devs
- lambda-options
- lambdaFeed
@ -3316,6 +3321,7 @@ dont-distribute-packages:
- regions-monadsfd
- regions-monadstf
- regions-mtl
- registry-aeson
- registry-hedgehog
- registry-hedgehog-aeson
- registry-messagepack

@ -99,6 +99,19 @@ self: super: builtins.intersectAttrs super {
ormolu = enableSeparateBinOutput super.ormolu;
ghcid = enableSeparateBinOutput super.ghcid;
arbtt = overrideCabal (drv: {
# The test suite needs the packages's executables in $PATH to succeed.
preCheck = ''
for i in $PWD/dist/build/*; do
export PATH="$i:$PATH"
done
'';
# One test uses timezone data
testToolDepends = drv.testToolDepends or [] ++ [
pkgs.tzdata
];
}) super.arbtt;
hzk = overrideCabal (drv: {
preConfigure = "sed -i -e /include-dirs/d hzk.cabal";
configureFlags = [ "--extra-include-dirs=${pkgs.zookeeper_mt}/include/zookeeper" ];
@ -759,40 +772,9 @@ self: super: builtins.intersectAttrs super {
})
(generateOptparseApplicativeCompletion "pnbackup" super.pinboard-notes-backup);
# set more accurate set of platforms instead of maintaining
# an ever growing list of platforms to exclude via unsupported-platforms
cpuid = overrideCabal {
platforms = pkgs.lib.platforms.x86;
} super.cpuid;
# Pass the correct libarchive into the package.
streamly-archive = super.streamly-archive.override { archive = pkgs.libarchive; };
# passes the -msse2 flag which only works on x86 platforms
hsignal = overrideCabal {
platforms = pkgs.lib.platforms.x86;
} super.hsignal;
# uses x86 intrinsics
blake3 = overrideCabal {
platforms = pkgs.lib.platforms.x86;
} super.blake3;
# uses x86 intrinsics, see also https://github.com/NixOS/nixpkgs/issues/122014
crc32c = overrideCabal {
platforms = pkgs.lib.platforms.x86;
} super.crc32c;
# uses x86 intrinsics
seqalign = overrideCabal {
platforms = pkgs.lib.platforms.x86;
} super.seqalign;
# uses x86 intrinsics
geomancy = overrideCabal {
platforms = pkgs.lib.platforms.x86;
} super.geomancy;
hlint = overrideCabal (drv: {
postInstall = ''
install -Dm644 data/hlint.1 -t "$out/share/man/man1"
@ -811,16 +793,6 @@ self: super: builtins.intersectAttrs super {
] ++ (drv.librarySystemDepends or []);
}) super.taglib;
# uses x86 assembler
inline-asm = overrideCabal {
platforms = pkgs.lib.platforms.x86;
} super.inline-asm;
# uses x86 assembler in C bits
hw-prim-bits = overrideCabal {
platforms = pkgs.lib.platforms.x86;
} super.hw-prim-bits;
# random 1.2.0 has tests that indirectly depend on
# itself causing an infinite recursion at evaluation
# time

File diff suppressed because it is too large Load Diff

@ -123,7 +123,8 @@ rec {
*/
doDistribute = overrideCabal (drv: {
# lib.platforms.all is the default value for platforms (since GHC can cross-compile)
hydraPlatforms = drv.platforms or lib.platforms.all;
hydraPlatforms = lib.subtractLists (drv.badPlatforms or [])
(drv.platforms or lib.platforms.all);
});
/* dontDistribute disables the distribution of binaries for the package
via hydra.

@ -13,7 +13,9 @@ self: super: {
# Used by maintainers/scripts/regenerate-hackage-packages.sh, and generated
# from the latest master instead of the current version on Hackage.
cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix { };
cabal2nix-unstable = self.callPackage ./cabal2nix-unstable.nix {
distribution-nixpkgs = self.distribution-nixpkgs_1_7_0;
};
# https://github.com/channable/vaultenv/issues/1
vaultenv = self.callPackage ../tools/haskell/vaultenv { };

@ -146,7 +146,8 @@ rec {
packagePlatforms = mapAttrs (name: value:
if isDerivation value then
value.meta.hydraPlatforms
or (value.meta.platforms or [ "x86_64-linux" ])
or (lib.subtractLists (value.meta.badPlatforms or [])
(value.meta.platforms or [ "x86_64-linux" ]))
else if value.recurseForDerivations or false || value.recurseForRelease or false then
packagePlatforms value
else

Loading…
Cancel
Save