git.iko.soy/haskell.nix
on iko/ghcjs-patch-master help sign in
Fixes to help building of all packages in stackage (#1503)

These are the less controversial changes from #1251

commitd3ba497b5fa374c70e0a02a741c8a511a5e624ab authorHamish Mackenzie <Hamish.K.Mackenzie@gmail.com> dateThu 2 Jun 2022, 22:45 (4 years ago) parent9103614
6 files changed+54−3
compare with iko/ghcjs-patch-master
unifiedsplit
builder/make-config-files.nix+2−1 lib/pkgconf-nixpkgs-map.nix+3 lib/system-nixpkgs-map.nix+12−1 modules/configuration-nix.nix+28 modules/package.nix+1−1 overlays/hackage-quirks.nix+8
builder/make-config-files.nix+2−1
@@ -91,7 +91,8 @@ let
9191 (map (p: "${lib.getBin p}/bin")
9292 (lib.flatten component.libs ++ lib.concatLists component.pkgconfig));
9393 "extra-include-dirs" = map (p: "${lib.getDev p}/include") (lib.flatten component.libs);
94− "extra-framework-dirs" = map (p: "${p}/Library/Frameworks") component.frameworks;
94+ "extra-framework-dirs" = lib.optionals (stdenv.hostPlatform.isDarwin)
95+ (map (p: "${p}/Library/Frameworks") component.frameworks);
9596 })}
9697
9798 ghc=${ghc}
lib/pkgconf-nixpkgs-map.nix+3
@@ -47,6 +47,7 @@ pkgs:
4747 "gobject-2.0" = [ pkgs."glib" ];
4848 "gmodule-2.0" = [ pkgs."glib" ];
4949 "gobject-introspection-1.0" = [ pkgs."gobject-introspection" ];
50+ "graphene-gobject-1.0" = [ pkgs."graphene" ];
5051 "gstreamer-audio-0.10" = [ pkgs."gst-plugins-base" ];
5152 "gstreamer-audio-1.0" = [ pkgs."gst-plugins-base" ];
5253 "gstreamer-base-0.10" = [ pkgs."gst-plugins-base" ];
@@ -83,7 +84,9 @@ pkgs:
8384 "ldap" = [ pkgs."openldap" ];
8485 "libavutil" = [ pkgs."ffmpeg" ];
8586 "libcrypto" = [ pkgs."openssl".dev ];
87+ "libfreenect" = [ pkgs."freenect" ];
8688 "libgsasl" = [ pkgs."gsasl" ];
89+ "liboath" = [ pkgs."liboauth" ];
8790 "libpcre" = [ pkgs."pcre" ];
8891 "libqrencode" = [ pkgs."qrencode" ];
8992 "libR" = [ pkgs."R" ];
lib/system-nixpkgs-map.nix+12−1
@@ -27,7 +27,7 @@ in
2727 gcc = gcclibs;
2828 ssl = [ openssl ];
2929 z = [ zlib ];
30− m = null;
30+ m = []; # Included with ghc
3131 pcap = [ libpcap ];
3232 pthread = null; # available by default
3333 GL = [ libGL ];
@@ -50,6 +50,7 @@ in
5050 util = [ utillinux ];
5151 magic = [ file ];
5252 pq = [ postgresql ];
53+ libpq = [ postgresql ];
5354 iconv = [ libiconv ];
5455 lapack = [ liblapack ];
5556 boost_atomic = [ boost ];
@@ -102,6 +103,16 @@ in
102103 gfortran = [ gfortran.cc.lib ];
103104 ssh2 = [ libssh2 ];
104105 gpiod = [ libgpiod ];
106+ png = [ libpng ];
107+ jpeg = [ libjpeg ];
108+ freenect_sync = [ freenect ];
109+ FLAC = [ flac ];
110+ mp3lame = [ lame ];
111+ tag_c = [ taglib ];
112+ jwt = [ libjwt ];
113+ GeoIP = [ geoip ];
114+ pulse-simple = [ libpulseaudio ];
115+ oath = [ liboauth ];
105116}
106117# -- windows
107118// { advapi32 = null; gdi32 = null; imm32 = null; msimg32 = null;
modules/configuration-nix.nix+28
@@ -84,4 +84,32 @@ in {
8484 # this adds support for __int128_t and __uint128_t to language-c
8585 (fromUntil "0.9.1" "0.9.2" ../patches/languge-c-int128.patch)
8686 ];
87+
88+ packages.discount.components.library.libs = pkgs.lib.mkForce [ pkgs.discount ];
89+
90+ packages.llvm-hs.components.library.build-tools = pkgs.lib.mkForce [ pkgs.llvm ];
91+
92+ packages.BNFC.components.tests.doctests.build-tools = [
93+ config.hsPkgs.buildPackages.alex
94+ config.hsPkgs.buildPackages.happy
95+ ];
96+
97+ packages.Sit.components.library.build-tools = [
98+ # These may not be in `config.hsPkgs.buildPackages` are not even included
99+ # as dependencies of the Sit package at all.
100+ (pkgs.buildPackages.haskell-nix.tool config.compiler.nix-name "alex" {})
101+ (pkgs.buildPackages.haskell-nix.tool config.compiler.nix-name "happy" {})
102+ ];
103+
104+ packages.bindings-GLFW.components.library.libs = [
105+ pkgs.xorg.libXext
106+ ];
107+
108+ packages.GLFW-b.components.library.libs = [
109+ pkgs.xorg.libXi
110+ ];
111+
112+ packages.closed.components.tests.readme.build-tools = [
113+ config.hsPkgs.buildPackages.markdown-unlit
114+ ];
87115}
modules/package.nix+1−1
@@ -351,7 +351,7 @@ in {
351351 # (a common use case for `all` is in `shellFor` and it only has an
352352 # install phase).
353353 builtins.removeAttrs c ["preCheck" "postCheck" "keepSource"]
354− ) allComps
354+ ) (lib.filter (c: c.buildable && c.planned) allComps)
355355 ) // {
356356 # If any one of the components needs us to keep the source
357357 # then keep it for the `all` component
overlays/hackage-quirks.nix+8
@@ -25,6 +25,14 @@ in { haskell-nix = prev.haskell-nix // {
2525 ];
2626 };
2727
28+ lsp-test = {
29+ cabalProject = ''
30+ packages: .
31+ package lsp
32+ flags: +demo
33+ '';
34+ };
35+
2836 pandoc = {
2937 # Function that returns a sha256 string by looking up the location
3038 # and tag in a nested attrset