Merge pull request #86961 from NixOS/haskell-updates

Update Haskell package set to LTS 15.11 (plus other fixes)
This commit is contained in:
Peter Simons 2020-05-08 21:13:36 +02:00 committed by GitHub
commit effa3742b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 1841 additions and 713 deletions

View File

@ -103,8 +103,8 @@ command displays the complete list of available compilers:
$ nix-env -f "<nixpkgs>" -qaP -A haskell.compiler $ nix-env -f "<nixpkgs>" -qaP -A haskell.compiler
haskell.compiler.ghc8101 ghc-8.10.1 haskell.compiler.ghc8101 ghc-8.10.1
haskell.compiler.integer-simple.ghc8101 ghc-8.10.1 haskell.compiler.integer-simple.ghc8101 ghc-8.10.1
haskell.compiler.ghcHEAD ghc-8.11.20200403 haskell.compiler.ghcHEAD ghc-8.11.20200505
haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200403 haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200505
haskell.compiler.ghc822Binary ghc-8.2.2-binary haskell.compiler.ghc822Binary ghc-8.2.2-binary
haskell.compiler.ghc844 ghc-8.4.4 haskell.compiler.ghc844 ghc-8.4.4
haskell.compiler.ghc863Binary ghc-8.6.3-binary haskell.compiler.ghc863Binary ghc-8.6.3-binary

View File

@ -1,6 +1,6 @@
{ fetchurl }: { fetchurl }:
fetchurl { fetchurl {
url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9d50cd974714cdcfdaabd089923b571a66bae55a.tar.gz"; url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/a734b1438c8379ed3945412538ff4ec49823564c.tar.gz";
sha256 = "1hv4pxp47850l36ci2ywmc75c95fvdqr3swz9qymy25gd6rbfs9f"; sha256 = "0y1y818n10fh0qq7cg67p9l293js78fyahk5f6s9w3c21xn9wn8r";
} }

View File

@ -27,7 +27,7 @@
# platform). Static libs are always built. # platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo. , # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows enableTerminfo ? !stdenv.targetPlatform.isWindows
, # What flavour to build. An empty string indicates no , # What flavour to build. An empty string indicates no

View File

@ -24,7 +24,7 @@
# platform). Static libs are always built. # platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo. , # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows enableTerminfo ? !stdenv.targetPlatform.isWindows
, # What flavour to build. An empty string indicates no , # What flavour to build. An empty string indicates no

View File

@ -27,7 +27,7 @@
# platform). Static libs are always built. # platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo. , # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows enableTerminfo ? !stdenv.targetPlatform.isWindows
, # What flavour to build. An empty string indicates no , # What flavour to build. An empty string indicates no

View File

@ -27,7 +27,7 @@
# platform). Static libs are always built. # platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo. , # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows enableTerminfo ? !stdenv.targetPlatform.isWindows
, # What flavour to build. An empty string indicates no , # What flavour to build. An empty string indicates no

View File

@ -27,7 +27,7 @@
# platform). Static libs are always built. # platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo. , # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows enableTerminfo ? !stdenv.targetPlatform.isWindows
, # What flavour to build. An empty string indicates no , # What flavour to build. An empty string indicates no

View File

@ -32,10 +32,10 @@
# platform). Static libs are always built. # platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whetherto build terminfo. , # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows enableTerminfo ? !stdenv.targetPlatform.isWindows
, version ? "8.11.20200403" , version ? "8.11.20200505"
, # What flavour to build. An empty string indicates no , # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values. # specific flavour and falls back to ghc default values.
ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
@ -103,8 +103,8 @@ stdenv.mkDerivation (rec {
src = fetchgit { src = fetchgit {
url = "https://gitlab.haskell.org/ghc/ghc.git/"; url = "https://gitlab.haskell.org/ghc/ghc.git/";
rev = "4291bddaea3148908c55f235ee8978e1d9aa6f20"; rev = "40c71c2cf38b4e134d81b7184a4d5e02949ae70c";
sha256 = "1gs3mxmsdpsgsp7vnawx8mys0qwg4x2zhfrbciy3wv8nv13ar1af"; sha256 = "04h9rcyzm9w3an1z00hjs062dp7dl19b8pkyxjsypr7a2i9dmvkb";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

View File

@ -71,7 +71,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src"; name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/"; url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version; rev = "refs/tags/" + super.git-annex.version;
sha256 = "1jjw6ar8ddcncwzksyx2xky50sm2jg1zjr7iiqk0vn8qq0fn2gwy"; sha256 = "0adw72lw3ygls87w6i7hirf26gz991dkm992jb5f0h5nvy6d44pl";
}; };
}).override { }).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null; dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -1489,4 +1489,30 @@ self: super: {
selective = self.selective_0_4_1; selective = self.selective_0_4_1;
}; };
# Needed for ghcide
haskell-lsp_0_19_0_0 = super.haskell-lsp_0_19_0_0.override {
haskell-lsp-types = self.haskell-lsp-types_0_19_0_0;
};
# this will probably need to get updated with every ghcide update,
# we need an override because ghcide is tracking haskell-lsp closely.
ghcide = dontCheck (super.ghcide.override rec {
haskell-lsp-types = self.haskell-lsp-types_0_19_0_0;
haskell-lsp = self.haskell-lsp_0_19_0_0;
});
# stackage right now is not new enough for hlint-3.0
ghc-lib-parser-ex_8_10_0_6 = super.ghc-lib-parser-ex_8_10_0_6.override {
ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200412;
};
hlint = super.hlint.override {
ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200412;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_6;
extra = self.extra_1_7_1;
filepattern = self.filepattern.override {
extra = self.extra_1_7_1;
};
};
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View File

@ -132,11 +132,13 @@ self: super: {
url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch"; url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch";
sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8"; sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8";
}); });
dbus = appendPatch super.dbus ./patches/fix-dbus-for-ghc-8.10.x.patch;
# https://github.com/ndmitchell/hlint/issues/959 # https://github.com/commercialhaskell/pantry/issues/21
hlint = super.hlint.override { pantry = appendPatch super.pantry (pkgs.fetchpatch {
ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex super.ghc-lib-parser; name = "add-cabal-3.2.x-support.patch";
}; url = "https://patch-diff.githubusercontent.com/raw/commercialhaskell/pantry/pull/22.patch";
sha256 = "198hsfjsy83s7rp71llf05cwa3vkm74g73djg5p4sk4awm9s6vf2";
excludes = ["package.yaml"];
});
} }

View File

@ -72,7 +72,7 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs # not yet available in Nixpkgs
- gi-gdkx11 < 4 - gi-gdkx11 < 4
# LTS Haskell 15.10 # LTS Haskell 15.11
- abstract-deque ==0.3 - abstract-deque ==0.3
- abstract-par ==0.3.3 - abstract-par ==0.3.3
- AC-Angle ==1.0 - AC-Angle ==1.0
@ -378,6 +378,8 @@ default-package-overrides:
- can-i-haz ==0.3.1.0 - can-i-haz ==0.3.1.0
- ca-province-codes ==1.0.0.0 - ca-province-codes ==1.0.0.0
- carray ==0.1.6.8 - carray ==0.1.6.8
- casa-client ==0.0.1
- casa-types ==0.0.1
- cased ==0.1.0.0 - cased ==0.1.0.0
- case-insensitive ==1.2.1.0 - case-insensitive ==1.2.1.0
- cases ==0.1.3.2 - cases ==0.1.3.2
@ -574,7 +576,7 @@ default-package-overrides:
- data-tree-print ==0.1.0.2 - data-tree-print ==0.1.0.2
- dataurl ==0.1.0.0 - dataurl ==0.1.0.0
- DAV ==1.3.4 - DAV ==1.3.4
- dbus ==1.2.13 - dbus ==1.2.14
- debian-build ==0.10.2.0 - debian-build ==0.10.2.0
- debug-trace-var ==0.2.0 - debug-trace-var ==0.2.0
- dec ==0.0.3 - dec ==0.0.3
@ -664,7 +666,7 @@ default-package-overrides:
- elm-core-sources ==1.0.0 - elm-core-sources ==1.0.0
- elm-export ==0.6.0.1 - elm-export ==0.6.0.1
- emacs-module ==0.1.1 - emacs-module ==0.1.1
- email-validate ==2.3.2.12 - email-validate ==2.3.2.13
- emojis ==0.1 - emojis ==0.1
- enclosed-exceptions ==1.0.3 - enclosed-exceptions ==1.0.3
- ENIG ==0.0.1.0 - ENIG ==0.0.1.0
@ -897,6 +899,7 @@ default-package-overrides:
- groups ==0.4.1.0 - groups ==0.4.1.0
- guarded-allocation ==0.0.1 - guarded-allocation ==0.0.1
- hackage-db ==2.1.0 - hackage-db ==2.1.0
- hackage-security ==0.6.0.1
- haddock-library ==1.8.0 - haddock-library ==1.8.0
- half ==0.3 - half ==0.3
- hamtsolo ==1.0.3 - hamtsolo ==1.0.3
@ -1073,7 +1076,7 @@ default-package-overrides:
- hw-fingertree-strict ==0.1.2.0 - hw-fingertree-strict ==0.1.2.0
- hw-hedgehog ==0.1.1.0 - hw-hedgehog ==0.1.1.0
- hw-hspec-hedgehog ==0.1.1.0 - hw-hspec-hedgehog ==0.1.1.0
- hw-int ==0.0.1.0 - hw-int ==0.0.2.0
- hw-ip ==2.4.2.0 - hw-ip ==2.4.2.0
- hw-json ==1.3.2.0 - hw-json ==1.3.2.0
- hw-json-simd ==0.1.1.0 - hw-json-simd ==0.1.1.0
@ -1116,7 +1119,7 @@ default-package-overrides:
- incremental-parser ==0.4.0.1 - incremental-parser ==0.4.0.1
- indents ==0.5.0.1 - indents ==0.5.0.1
- indexed ==0.1.3 - indexed ==0.1.3
- indexed-list-literals ==0.2.1.2 - indexed-list-literals ==0.2.1.3
- indexed-profunctors ==0.1 - indexed-profunctors ==0.1
- infer-license ==0.2.0 - infer-license ==0.2.0
- inflections ==0.4.0.5 - inflections ==0.4.0.5
@ -1153,7 +1156,7 @@ default-package-overrides:
- ip6addr ==1.0.1 - ip6addr ==1.0.1
- iproute ==1.7.9 - iproute ==1.7.9
- IPv6Addr ==1.1.3 - IPv6Addr ==1.1.3
- ipynb ==0.1 - ipynb ==0.1.0.1
- ipython-kernel ==0.10.1.0 - ipython-kernel ==0.10.1.0
- irc ==0.6.1.0 - irc ==0.6.1.0
- irc-client ==1.1.1.1 - irc-client ==1.1.1.1
@ -1167,7 +1170,7 @@ default-package-overrides:
- ix-shapable ==0.1.0 - ix-shapable ==0.1.0
- jack ==0.7.1.4 - jack ==0.7.1.4
- jira-wiki-markup ==1.0.0 - jira-wiki-markup ==1.0.0
- jose ==0.8.2.0 - jose ==0.8.2.1
- jose-jwt ==0.8.0 - jose-jwt ==0.8.0
- js-dgtable ==0.5.2 - js-dgtable ==0.5.2
- js-flot ==0.8.3 - js-flot ==0.8.3
@ -1196,7 +1199,7 @@ default-package-overrides:
- kind-generics-th ==0.2.1.0 - kind-generics-th ==0.2.1.0
- kmeans ==0.1.3 - kmeans ==0.1.3
- koofr-client ==1.0.0.3 - koofr-client ==1.0.0.3
- kubernetes-webhook-haskell ==0.2.0.0 - kubernetes-webhook-haskell ==0.2.0.1
- l10n ==0.1.0.1 - l10n ==0.1.0.1
- labels ==0.3.3 - labels ==0.3.3
- lackey ==1.0.12 - lackey ==1.0.12
@ -1209,7 +1212,7 @@ default-package-overrides:
- language-java ==0.2.9 - language-java ==0.2.9
- language-javascript ==0.7.1.0 - language-javascript ==0.7.1.0
- language-protobuf ==1.0.1 - language-protobuf ==1.0.1
- language-puppet ==1.4.6.2 - language-puppet ==1.4.6.3
- lapack-carray ==0.0.3 - lapack-carray ==0.0.3
- lapack-comfort-array ==0.0.0.1 - lapack-comfort-array ==0.0.0.1
- lapack-ffi ==0.0.2 - lapack-ffi ==0.0.2
@ -1276,6 +1279,7 @@ default-package-overrides:
- lsp-test ==0.10.2.0 - lsp-test ==0.10.2.0
- lucid ==2.9.12 - lucid ==2.9.12
- lucid-extras ==0.2.2 - lucid-extras ==0.2.2
- lukko ==0.1.1.2
- lzma ==0.0.0.3 - lzma ==0.0.0.3
- lzma-conduit ==1.2.1 - lzma-conduit ==1.2.1
- machines ==0.7 - machines ==0.7
@ -1508,6 +1512,7 @@ default-package-overrides:
- pandoc-plot ==0.2.2.0 - pandoc-plot ==0.2.2.0
- pandoc-pyplot ==2.3.0.1 - pandoc-pyplot ==2.3.0.1
- pandoc-types ==1.20 - pandoc-types ==1.20
- pantry ==0.4.0.1
- papillon ==0.1.1.1 - papillon ==0.1.1.1
- parallel ==3.2.2.0 - parallel ==3.2.2.0
- parallel-io ==0.3.3 - parallel-io ==0.3.3
@ -1659,8 +1664,8 @@ default-package-overrides:
- PyF ==0.9.0.1 - PyF ==0.9.0.1
- qchas ==1.1.0.1 - qchas ==1.1.0.1
- qm-interpolated-string ==0.3.0.0 - qm-interpolated-string ==0.3.0.0
- qrcode-core ==0.9.2 - qrcode-core ==0.9.3
- qrcode-juicypixels ==0.8.0 - qrcode-juicypixels ==0.8.1
- quadratic-irrational ==0.1.1 - quadratic-irrational ==0.1.1
- QuasiText ==0.1.2.6 - QuasiText ==0.1.2.6
- QuickCheck ==2.13.2 - QuickCheck ==2.13.2
@ -1718,6 +1723,7 @@ default-package-overrides:
- RefSerialize ==0.4.0 - RefSerialize ==0.4.0
- regex ==1.1.0.0 - regex ==1.1.0.0
- regex-applicative ==0.3.3.1 - regex-applicative ==0.3.3.1
- regex-applicative-text ==0.1.0.1
- regex-base ==0.94.0.0 - regex-base ==0.94.0.0
- regex-compat ==0.95.2.0 - regex-compat ==0.95.2.0
- regex-compat-tdfa ==0.95.1.4 - regex-compat-tdfa ==0.95.1.4
@ -1751,7 +1757,7 @@ default-package-overrides:
- rfc1751 ==0.1.2 - rfc1751 ==0.1.2
- rfc5051 ==0.1.0.4 - rfc5051 ==0.1.0.4
- rigel-viz ==0.2.0.0 - rigel-viz ==0.2.0.0
- rio ==0.1.15.0 - rio ==0.1.15.1
- rio-orphans ==0.1.1.0 - rio-orphans ==0.1.1.0
- rio-prettyprint ==0.1.0.0 - rio-prettyprint ==0.1.0.0
- roc-id ==0.1.0.0 - roc-id ==0.1.0.0
@ -1870,7 +1876,7 @@ default-package-overrides:
- siggy-chardust ==1.0.0 - siggy-chardust ==1.0.0
- signal ==0.1.0.4 - signal ==0.1.0.4
- silently ==1.2.5.1 - silently ==1.2.5.1
- simple-affine-space ==0.1 - simple-affine-space ==0.1.1
- simple-cabal ==0.1.1 - simple-cabal ==0.1.1
- simple-cmd ==0.2.1 - simple-cmd ==0.2.1
- simple-cmd-args ==0.1.6 - simple-cmd-args ==0.1.6
@ -1962,6 +1968,7 @@ default-package-overrides:
- string-combinators ==0.6.0.5 - string-combinators ==0.6.0.5
- string-conv ==0.1.2 - string-conv ==0.1.2
- string-conversions ==0.4.0.1 - string-conversions ==0.4.0.1
- string-interpolate ==0.2.0.3
- string-qq ==0.0.4 - string-qq ==0.0.4
- stringsearch ==0.3.6.6 - stringsearch ==0.3.6.6
- string-transform ==1.1.1 - string-transform ==1.1.1
@ -2006,7 +2013,7 @@ default-package-overrides:
- tasty-dejafu ==2.0.0.1 - tasty-dejafu ==2.0.0.1
- tasty-discover ==4.2.1 - tasty-discover ==4.2.1
- tasty-expected-failure ==0.11.1.2 - tasty-expected-failure ==0.11.1.2
- tasty-golden ==2.3.3.1 - tasty-golden ==2.3.3.2
- tasty-hedgehog ==1.0.0.2 - tasty-hedgehog ==1.0.0.2
- tasty-hspec ==1.1.5.1 - tasty-hspec ==1.1.5.1
- tasty-hunit ==0.10.0.2 - tasty-hunit ==0.10.0.2
@ -2390,6 +2397,8 @@ extra-packages:
- happy <1.19.6 # newer versions break Agda - happy <1.19.6 # newer versions break Agda
- happy == 1.19.9 # for purescript - happy == 1.19.9 # for purescript
- haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support - haskell-gi-overloading == 0.0 # gi-* packages use this dependency to disable overloading support
- haskell-lsp == 0.19.* # required for ghcide 0.1.0
- haskell-lsp-types == 0.19.* # required for ghcide 0.1.0
- haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
- hoogle == 5.0.14 # required by hie-hoogle - hoogle == 5.0.14 # required by hie-hoogle
@ -2693,6 +2702,7 @@ broken-packages:
- activitypub - activitypub
- activitystreams-aeson - activitystreams-aeson
- actor - actor
- acts
- Adaptive - Adaptive
- Adaptive-Blaisorblade - Adaptive-Blaisorblade
- adaptive-containers - adaptive-containers
@ -2784,6 +2794,7 @@ broken-packages:
- amazon-emailer - amazon-emailer
- amazon-emailer-client-snap - amazon-emailer-client-snap
- amazon-products - amazon-products
- amazonka-dynamodb
- amby - amby
- AMI - AMI
- ampersand - ampersand
@ -2815,10 +2826,12 @@ broken-packages:
- anticiv - anticiv
- antigate - antigate
- antimirov - antimirov
- antiope-dynamodb
- antisplice - antisplice
- antlr-haskell - antlr-haskell
- antlrc - antlrc
- anydbm - anydbm
- aop-prelude
- aosd - aosd
- apart - apart
- apecs-stm - apecs-stm
@ -2877,6 +2890,7 @@ broken-packages:
- arguedit - arguedit
- ariadne - ariadne
- arion - arion
- arithmetic-circuits
- armada - armada
- armor - armor
- arpa - arpa
@ -2963,6 +2977,7 @@ broken-packages:
- authenticate-ldap - authenticate-ldap
- authinfo-hs - authinfo-hs
- authoring - authoring
- autoapply
- AutoForms - AutoForms
- autom - autom
- automata - automata
@ -2976,6 +2991,7 @@ broken-packages:
- avl-static - avl-static
- AvlTree - AvlTree
- avr-shake - avr-shake
- avro-piper
- avwx - avwx
- awesome-prelude - awesome-prelude
- awesomium - awesomium
@ -3040,6 +3056,7 @@ broken-packages:
- barrie - barrie
- barrier - barrier
- barrier-monad - barrier-monad
- base-encoding
- base-feature-macros - base-feature-macros
- base-generics - base-generics
- base-io-access - base-io-access
@ -3144,6 +3161,7 @@ broken-packages:
- bindings-libg15 - bindings-libg15
- bindings-librrd - bindings-librrd
- bindings-libstemmer - bindings-libstemmer
- bindings-libusb
- bindings-libv4l2 - bindings-libv4l2
- bindings-linux-videodev2 - bindings-linux-videodev2
- bindings-monetdb-mapi - bindings-monetdb-mapi
@ -3370,6 +3388,7 @@ broken-packages:
- cabal-dependency-licenses - cabal-dependency-licenses
- cabal-dev - cabal-dev
- cabal-dir - cabal-dir
- cabal-fmt
- cabal-ghc-dynflags - cabal-ghc-dynflags
- cabal-ghci - cabal-ghci
- cabal-graphdeps - cabal-graphdeps
@ -3403,6 +3422,7 @@ broken-packages:
- cabin - cabin
- cabocha - cabocha
- cached - cached
- cacophony
- cafeteria-prelude - cafeteria-prelude
- caffegraph - caffegraph
- cairo-core - cairo-core
@ -3503,6 +3523,7 @@ broken-packages:
- cereal-time - cereal-time
- certificate - certificate
- cf - cf
- cfenv
- cfipu - cfipu
- cflp - cflp
- cfopu - cfopu
@ -3676,6 +3697,7 @@ broken-packages:
- collections-api - collections-api
- collections-base-instances - collections-base-instances
- colonnade - colonnade
- Color
- color-counter - color-counter
- colorless - colorless
- colorless-http-client - colorless-http-client
@ -3936,6 +3958,7 @@ broken-packages:
- cspmchecker - cspmchecker
- cspretty - cspretty
- css - css
- css-selectors
- css-syntax - css-syntax
- csv-enumerator - csv-enumerator
- csv-nptools - csv-nptools
@ -3956,6 +3979,7 @@ broken-packages:
- curves - curves
- custom-prelude - custom-prelude
- CV - CV
- cv-combinators
- cypher - cypher
- d-bus - d-bus
- d10 - d10
@ -4124,6 +4148,7 @@ broken-packages:
- demarcate - demarcate
- denominate - denominate
- dense-int-set - dense-int-set
- dependent-hashmap
- dependent-monoidal-map - dependent-monoidal-map
- dependent-state - dependent-state
- dependent-sum-aeson-orphans - dependent-sum-aeson-orphans
@ -4163,6 +4188,7 @@ broken-packages:
- dhall-yaml - dhall-yaml
- dhcp-lease-parser - dhcp-lease-parser
- dhrun - dhrun
- di-polysemy
- dia-base - dia-base
- dia-functions - dia-functions
- diagrams-boolean - diagrams-boolean
@ -4200,6 +4226,7 @@ broken-packages:
- DigitalOcean - DigitalOcean
- digitalocean-kzs - digitalocean-kzs
- digits - digits
- digraph
- dimensional-codata - dimensional-codata
- dimensional-tf - dimensional-tf
- DimensionalHash - DimensionalHash
@ -4404,6 +4431,7 @@ broken-packages:
- effect-stack - effect-stack
- effin - effin
- egison-quote - egison-quote
- egison-tutorial
- ehaskell - ehaskell
- ehs - ehs
- eibd-client-simple - eibd-client-simple
@ -4411,6 +4439,7 @@ broken-packages:
- Eight-Ball-Pool-Hack-Cheats - Eight-Ball-Pool-Hack-Cheats
- either-unwrap - either-unwrap
- EitherT - EitherT
- ejdb2-binding
- ekg-bosun - ekg-bosun
- ekg-carbon - ekg-carbon
- ekg-elastic - ekg-elastic
@ -4581,6 +4610,7 @@ broken-packages:
- extensible-data - extensible-data
- extensible-effects-concurrent - extensible-effects-concurrent
- extensible-skeleton - extensible-skeleton
- extensions
- external-sort - external-sort
- Extra - Extra
- extract-dependencies - extract-dependencies
@ -4637,6 +4667,7 @@ broken-packages:
- fca - fca
- fcache - fcache
- fcd - fcd
- fcf-containers
- fcg - fcg
- fckeditor - fckeditor
- fclabels-monadlib - fclabels-monadlib
@ -4708,6 +4739,7 @@ broken-packages:
- findhttp - findhttp
- fingertree-psqueue - fingertree-psqueue
- fingertree-tf - fingertree-tf
- finitary
- finitary-derive - finitary-derive
- FiniteMap - FiniteMap
- firefly-example - firefly-example
@ -4822,6 +4854,7 @@ broken-packages:
- fraction - fraction
- frag - frag
- Frames-beam - Frames-beam
- Frames-dsv
- franchise - franchise
- Frank - Frank
- fraxl - fraxl
@ -4905,6 +4938,7 @@ broken-packages:
- funpat - funpat
- funsat - funsat
- funspection - funspection
- fused-effects-readline
- fused-effects-squeal - fused-effects-squeal
- fusion - fusion
- fusion-plugin - fusion-plugin
@ -5013,6 +5047,7 @@ broken-packages:
- ghc-dump-tree - ghc-dump-tree
- ghc-dump-util - ghc-dump-util
- ghc-dup - ghc-dup
- ghc-events-analyze
- ghc-events-parallel - ghc-events-parallel
- ghc-generic-instances - ghc-generic-instances
- ghc-imported-from - ghc-imported-from
@ -5039,7 +5074,6 @@ broken-packages:
- ghci-lib - ghci-lib
- ghci-ng - ghci-ng
- ghci-pretty - ghci-pretty
- ghcide
- ghcjs-dom-jsffi - ghcjs-dom-jsffi
- ghcjs-fetch - ghcjs-fetch
- ghcjs-hplay - ghcjs-hplay
@ -5081,6 +5115,7 @@ broken-packages:
- git-remote-ipfs - git-remote-ipfs
- git-repair - git-repair
- git-sanity - git-sanity
- git-vogue
- gitdo - gitdo
- github-backup - github-backup
- github-data - github-data
@ -5368,6 +5403,7 @@ broken-packages:
- hakyll-R - hakyll-R
- hakyll-series - hakyll-series
- hakyll-shortcode - hakyll-shortcode
- hakyll-shortcut-links
- hakyll-typescript - hakyll-typescript
- hal - hal
- halberd - halberd
@ -5384,6 +5420,7 @@ broken-packages:
- hamsql - hamsql
- hamtmap - hamtmap
- hamusic - hamusic
- hanabi-dealer
- handa-gdata - handa-gdata
- handle-like - handle-like
- HandlerSocketClient - HandlerSocketClient
@ -5835,7 +5872,6 @@ broken-packages:
- hichi - hichi
- hid-examples - hid-examples
- hidden-char - hidden-char
- hie-bios
- hie-core - hie-core
- hieraclus - hieraclus
- hierarchical-exceptions - hierarchical-exceptions
@ -6001,6 +6037,7 @@ broken-packages:
- hoovie - hoovie
- hopencc - hopencc
- hopencl - hopencl
- HOpenCV
- hOpenPGP - hOpenPGP
- hopenpgp-tools - hopenpgp-tools
- hopfield - hopfield
@ -6097,6 +6134,7 @@ broken-packages:
- hs-rs-notify - hs-rs-notify
- hs-scrape - hs-scrape
- hs-snowtify - hs-snowtify
- hs-speedscope
- hs-twitter - hs-twitter
- hs-twitterarchiver - hs-twitterarchiver
- hs-vcard - hs-vcard
@ -6331,7 +6369,16 @@ broken-packages:
- huzzy - huzzy
- hvega-theme - hvega-theme
- hVOIDP - hVOIDP
- hw-all
- hw-ci-assist - hw-ci-assist
- hw-dsv
- hw-json
- hw-json-lens
- hw-json-simd
- hw-json-simple-cursor
- hw-json-standard-cursor
- hw-kafka-avro
- hw-simd
- hwall-auth-iitk - hwall-auth-iitk
- hweblib - hweblib
- hwhile - hwhile
@ -6415,9 +6462,20 @@ broken-packages:
- ignore - ignore
- igraph - igraph
- igrf - igrf
- ihaskell
- ihaskell-aeson
- ihaskell-basic - ihaskell-basic
- ihaskell-blaze
- ihaskell-charts
- ihaskell-diagrams
- ihaskell-display - ihaskell-display
- ihaskell-gnuplot
- ihaskell-graphviz
- ihaskell-hatex
- ihaskell-hvega
- ihaskell-inline-r - ihaskell-inline-r
- ihaskell-juicypixels
- ihaskell-magic
- ihaskell-parsec - ihaskell-parsec
- ihaskell-plot - ihaskell-plot
- ihaskell-rlangqq - ihaskell-rlangqq
@ -6655,6 +6713,7 @@ broken-packages:
- json-rpc-client - json-rpc-client
- json-schema - json-schema
- json-sop - json-sop
- json-syntax
- json-togo - json-togo
- json-tokens - json-tokens
- json-tracer - json-tracer
@ -6874,6 +6933,9 @@ broken-packages:
- language-vhdl - language-vhdl
- language-webidl - language-webidl
- lapack - lapack
- lapack-carray
- lapack-comfort-array
- lapack-ffi
- large-hashable - large-hashable
- Lastik - Lastik
- lat - lat
@ -6902,6 +6964,7 @@ broken-packages:
- lda - lda
- ldap-client - ldap-client
- ldapply - ldapply
- LDAPv3
- ldif - ldif
- leaf - leaf
- leaky - leaky
@ -6976,6 +7039,7 @@ broken-packages:
- libxslt - libxslt
- licensor - licensor
- lie - lie
- life-sync
- lifted-base-tf - lifted-base-tf
- lifted-protolude - lifted-protolude
- lifted-stm - lifted-stm
@ -7048,6 +7112,8 @@ broken-packages:
- liszt - liszt
- lit - lit
- literals - literals
- LiterateMarkdown
- little-logger
- live-sequencer - live-sequencer
- ll-picosat - ll-picosat
- llsd - llsd
@ -7141,6 +7207,7 @@ broken-packages:
- lsystem - lsystem
- ltext - ltext
- ltk - ltk
- LTS
- lua-bc - lua-bc
- luachunk - luachunk
- luautils - luautils
@ -7164,6 +7231,7 @@ broken-packages:
- lz4-conduit - lz4-conduit
- lzma-enumerator - lzma-enumerator
- lzma-streams - lzma-streams
- lzo
- maam - maam
- mac - mac
- macaroon-shop - macaroon-shop
@ -7242,6 +7310,9 @@ broken-packages:
- marxup - marxup
- masakazu-bot - masakazu-bot
- MASMGen - MASMGen
- massiv
- massiv-io
- massiv-test
- master-plan - master-plan
- matchable - matchable
- matchable-th - matchable-th
@ -7254,6 +7325,7 @@ broken-packages:
- mathlink - mathlink
- matrix-as-xyz - matrix-as-xyz
- matrix-market - matrix-market
- matrix-sized
- matsuri - matsuri
- maude - maude
- maxent - maxent
@ -7335,6 +7407,7 @@ broken-packages:
- miconix-test - miconix-test
- micro-recursion-schemes - micro-recursion-schemes
- microaeson - microaeson
- microbase
- microformats2-parser - microformats2-parser
- microformats2-types - microformats2-types
- microgroove - microgroove
@ -7516,8 +7589,10 @@ broken-packages:
- ms - ms
- msgpack - msgpack
- msgpack-aeson - msgpack-aeson
- msgpack-binary
- msgpack-idl - msgpack-idl
- msgpack-rpc - msgpack-rpc
- msgpack-rpc-conduit
- msh - msh
- msi-kb-backlit - msi-kb-backlit
- MSQueue - MSQueue
@ -7529,9 +7604,11 @@ broken-packages:
- mtl-tf - mtl-tf
- mtlx - mtlx
- mtp - mtp
- mu-avro
- mu-grpc-client - mu-grpc-client
- mu-grpc-common - mu-grpc-common
- mu-grpc-server - mu-grpc-server
- mu-kafka
- mu-protobuf - mu-protobuf
- MuCheck - MuCheck
- MuCheck-Hspec - MuCheck-Hspec
@ -7749,6 +7826,7 @@ broken-packages:
- nix-deploy - nix-deploy
- nix-eval - nix-eval
- nix-freeze-tree - nix-freeze-tree
- nix-narinfo
- nix-tools - nix-tools
- nixfromnpm - nixfromnpm
- nixpkgs-update - nixpkgs-update
@ -7823,12 +7901,14 @@ broken-packages:
- ObjectIO - ObjectIO
- objective - objective
- ocaml-export - ocaml-export
- ochan
- octane - octane
- octohat - octohat
- octopus - octopus
- Octree - Octree
- oculus - oculus
- odbc - odbc
- odd-jobs
- OddWord - OddWord
- oden-go-packages - oden-go-packages
- oeis2 - oeis2
@ -7868,6 +7948,7 @@ broken-packages:
- OpenAFP - OpenAFP
- OpenAFP-Utils - OpenAFP-Utils
- openapi-petstore - openapi-petstore
- openapi-typed
- opench-meteo - opench-meteo
- OpenCL - OpenCL
- OpenCLRaw - OpenCLRaw
@ -7876,10 +7957,12 @@ broken-packages:
- opendatatable - opendatatable
- OpenGLCheck - OpenGLCheck
- opengles - opengles
- openid-connect
- OpenSCAD - OpenSCAD
- opensoundcontrol-ht - opensoundcontrol-ht
- openssh-github-keys - openssh-github-keys
- openssh-protocol - openssh-protocol
- opentelemetry-extra
- opentelemetry-http-client - opentelemetry-http-client
- opentelemetry-lightstep - opentelemetry-lightstep
- opentelemetry-wai - opentelemetry-wai
@ -7914,6 +7997,7 @@ broken-packages:
- orders - orders
- Ordinary - Ordinary
- ordrea - ordrea
- oref
- organize-imports - organize-imports
- orgmode - orgmode
- origami - origami
@ -7933,6 +8017,7 @@ broken-packages:
- otp-authenticator - otp-authenticator
- ottparse-pretty - ottparse-pretty
- overload - overload
- overloaded
- overloaded-records - overloaded-records
- overture - overture
- pack - pack
@ -8231,6 +8316,7 @@ broken-packages:
- plugins-multistage - plugins-multistage
- plur - plur
- plural - plural
- plzwrk
- png-file - png-file
- pngload - pngload
- pngload-fixed - pngload-fixed
@ -8333,6 +8419,7 @@ broken-packages:
- prelude-plus - prelude-plus
- preprocess-haskell - preprocess-haskell
- preprocessor - preprocessor
- preql
- presburger - presburger
- present - present
- press - press
@ -8344,6 +8431,7 @@ broken-packages:
- prettyprinter-graphviz - prettyprinter-graphviz
- prettyprinter-vty - prettyprinter-vty
- preview - preview
- prim
- prim-array - prim-array
- prim-ref - prim-ref
- primes-type - primes-type
@ -8721,7 +8809,6 @@ broken-packages:
- relation - relation
- relational-postgresql8 - relational-postgresql8
- relative-date - relative-date
- releaser
- relevant-time - relevant-time
- reload - reload
- remark - remark
@ -8845,6 +8932,8 @@ broken-packages:
- robots-txt - robots-txt
- roc-cluster - roc-cluster
- roc-cluster-demo - roc-cluster-demo
- rock
- rocksdb-query
- roku-api - roku-api
- rollbar - rollbar
- rollbar-hs - rollbar-hs
@ -8965,7 +9054,10 @@ broken-packages:
- scgi - scgi
- schedevr - schedevr
- schedule-planner - schedule-planner
- scheduler
- schedyield - schedyield
- schema
- schemas
- schematic - schematic
- scholdoc - scholdoc
- scholdoc-citeproc - scholdoc-citeproc
@ -8974,6 +9066,7 @@ broken-packages:
- sci-ratio - sci-ratio
- SciBaseTypes - SciBaseTypes
- scidb-hquery - scidb-hquery
- scientific-notation
- SciFlow - SciFlow
- SciFlow-drmaa - SciFlow-drmaa
- scion - scion
@ -9184,6 +9277,7 @@ broken-packages:
- shivers-cfg - shivers-cfg
- shoap - shoap
- shopify - shopify
- shortcut-links
- shorten-strings - shorten-strings
- ShortestPathProblems - ShortestPathProblems
- show-prettyprint - show-prettyprint
@ -9302,9 +9396,11 @@ broken-packages:
- smsaero - smsaero
- smt-lib - smt-lib
- SmtLib - SmtLib
- smtlib2
- smtlib2-debug - smtlib2-debug
- smtlib2-pipe - smtlib2-pipe
- smtlib2-quickcheck - smtlib2-quickcheck
- smtlib2-timing
- smtp-mail-ng - smtp-mail-ng
- SMTPClient - SMTPClient
- smtps-gmail - smtps-gmail
@ -9552,12 +9648,14 @@ broken-packages:
- stern-brocot - stern-brocot
- stgi - stgi
- STL - STL
- STLinkUSB
- stm-chunked-queues - stm-chunked-queues
- stm-containers - stm-containers
- stm-firehose - stm-firehose
- stm-hamt - stm-hamt
- stm-promise - stm-promise
- stm-stats - stm-stats
- STM32-Zombie
- stmcontrol - stmcontrol
- stochastic - stochastic
- StockholmAlignment - StockholmAlignment
@ -9785,9 +9883,12 @@ broken-packages:
- telegram-api - telegram-api
- telegram-bot - telegram-bot
- telegram-bot-simple - telegram-bot-simple
- telegram-raw-api
- telegram-types
- teleport - teleport
- teleshell - teleshell
- tellbot - tellbot
- tempi
- template-default - template-default
- template-haskell-util - template-haskell-util
- template-hsml - template-hsml
@ -9799,6 +9900,10 @@ broken-packages:
- tempus - tempus
- tensor - tensor
- tensor-safe - tensor-safe
- tensorflow
- tensorflow-core-ops
- tensorflow-logging
- tensorflow-ops
- termbox - termbox
- termbox-banana - termbox-banana
- termbox-bindings - termbox-bindings
@ -10078,6 +10183,7 @@ broken-packages:
- turingMachine - turingMachine
- turtle-options - turtle-options
- tweak - tweak
- tweet-hs
- twentefp-eventloop-graphics - twentefp-eventloop-graphics
- twentefp-eventloop-trees - twentefp-eventloop-trees
- twentefp-graphs - twentefp-graphs
@ -10130,6 +10236,7 @@ broken-packages:
- type-tree - type-tree
- typeable-th - typeable-th
- TypeClass - TypeClass
- typed-encoding
- typed-streams - typed-streams
- typed-wire - typed-wire
- typedflow - typedflow
@ -10242,6 +10349,7 @@ broken-packages:
- urn - urn
- urn-random - urn-random
- urxml - urxml
- usb
- usb-enumerator - usb-enumerator
- usb-hid - usb-hid
- usb-id-database - usb-id-database
@ -10360,6 +10468,7 @@ broken-packages:
- visual-graphrewrite - visual-graphrewrite
- visual-prof - visual-prof
- visualize-cbn - visualize-cbn
- vitrea
- vivid - vivid
- vivid-osc - vivid-osc
- vivid-supercollider - vivid-supercollider
@ -10542,6 +10651,7 @@ broken-packages:
- wraxml - wraxml
- wrecker - wrecker
- wrecker-ui - wrecker-ui
- wreq-patchable
- wreq-sb - wreq-sb
- wright - wright
- writer-cps-full - writer-cps-full
@ -10552,6 +10662,7 @@ broken-packages:
- wsdl - wsdl
- wsedit - wsedit
- wshterm - wshterm
- wstunnel
- wtk - wtk
- wtk-gtk - wtk-gtk
- wu-wei - wu-wei
@ -10852,3 +10963,5 @@ broken-packages:
- ztar - ztar
- zuramaru - zuramaru
- Zwaluw - Zwaluw
- zxcvbn-dvorak
- zxcvbn-hs

View File

@ -727,4 +727,7 @@ self: super: builtins.intersectAttrs super {
--prefix PATH : "${path}" --prefix PATH : "${path}"
''; '';
}); });
# Tests access homeless-shelter.
hie-bios = dontCheck super.hie-bios;
} }

View File

@ -48,12 +48,8 @@ in
, isExecutable ? false, isLibrary ? !isExecutable , isExecutable ? false, isLibrary ? !isExecutable
, jailbreak ? false , jailbreak ? false
, license , license
# We cannot enable -j<n> parallelism for libraries because GHC is far more # aarch64 sometimes crashes for -jn with n>1: https://ghc.haskell.org/trac/ghc/ticket/15449
# likely to generate a non-determistic library ID in that case. Further , enableParallelBuilding ? !stdenv.buildPlatform.isAarch64
# details are at <https://github.com/peti/ghc-library-id-bug>.
#
# Currently disabled for aarch64. See https://ghc.haskell.org/trac/ghc/ticket/15449.
, enableParallelBuilding ? ((stdenv.lib.versionOlder "7.8" ghc.version && !isLibrary) || stdenv.lib.versionOlder "8.0.1" ghc.version) && !(stdenv.buildPlatform.isAarch64)
, maintainers ? [] , maintainers ? []
, doCoverage ? false , doCoverage ? false
, doHaddock ? !(ghc.isHaLVM or false) , doHaddock ? !(ghc.isHaLVM or false)
@ -82,7 +78,7 @@ in
# same package in the (recursive) dependencies of the package being # same package in the (recursive) dependencies of the package being
# built. Will delay failures, if any, to compile time. # built. Will delay failures, if any, to compile time.
allowInconsistentDependencies ? false allowInconsistentDependencies ? false
, maxBuildCores ? 4 # GHC usually suffers beyond -j4. https://ghc.haskell.org/trac/ghc/ticket/9221 , maxBuildCores ? 16 # more cores usually don't improve performance: https://ghc.haskell.org/trac/ghc/ticket/9221
, # If set to true, this builds a pre-linked .o file for this Haskell library. , # If set to true, this builds a pre-linked .o file for this Haskell library.
# This can make it slightly faster to load this library into GHCi, but takes # This can make it slightly faster to load this library into GHCi, but takes
# extra disk space and compile time. # extra disk space and compile time.
@ -181,6 +177,8 @@ let
(optionalString enableHsc2hsViaAsm "--hsc2hs-option=--via-asm") (optionalString enableHsc2hsViaAsm "--hsc2hs-option=--via-asm")
]; ];
parallelBuildingFlags = "-j$NIX_BUILD_CORES" + optionalString stdenv.isLinux " +RTS -A64M -RTS";
crossCabalFlagsString = crossCabalFlagsString =
stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags); stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);
@ -199,7 +197,7 @@ let
"--package-db=$packageConfDir" "--package-db=$packageConfDir"
(optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}") (optionalString (enableSharedExecutables && stdenv.isLinux) "--ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.name}/${pname}-${version}")
(optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names")
(optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString enableParallelBuilding "--ghc-options=${parallelBuildingFlags}")
(optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp")
(enableFeature (enableDeadCodeElimination && !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature (enableDeadCodeElimination && !stdenv.hostPlatform.isAarch32 && !stdenv.hostPlatform.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs")
(enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableLibraryProfiling "library-profiling")
@ -227,9 +225,9 @@ let
setupCompileFlags = [ setupCompileFlags = [
(optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir") (optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir")
(optionalString (isGhcjs || isHaLVM || versionOlder "7.8" ghc.version) "-j$NIX_BUILD_CORES") (optionalString enableParallelBuilding (parallelBuildingFlags))
# https://github.com/haskell/cabal/issues/2398 "-threaded" # https://github.com/haskell/cabal/issues/2398
(optionalString (versionOlder "7.10" ghc.version && !isHaLVM) "-threaded") "-rtsopts" # allow us to pass RTS flags to the generated Setup executable
]; ];
isHaskellPkg = x: x ? isHaskellLibrary; isHaskellPkg = x: x ? isHaskellLibrary;

File diff suppressed because it is too large Load Diff

View File

@ -77,8 +77,8 @@ in {
ghcHEAD = callPackage ../development/compilers/ghc/head.nix { ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc883; # no binary yet bootPkgs = packages.ghc883; # no binary yet
inherit (buildPackages.python3Packages) sphinx; inherit (buildPackages.python3Packages) sphinx;
buildLlvmPackages = buildPackages.llvmPackages_9; buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_9; llvmPackages = pkgs.llvmPackages_10;
libffi = pkgs.libffi; libffi = pkgs.libffi;
}; };
ghcjs = compiler.ghcjs86; ghcjs = compiler.ghcjs86;