dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

haskellPackages.idris: Fix build (new GHC 8.8 & old megaparsec 7)

Browse Source 
The hackage-packages.nix change was generated by hackage2nix v2.15.1 from Hackage revision
ad4a70d448.
This commit is contained in:
Chuck 2020-04-02 12:36:37 -07:00 committed by Peter Simons
parent 7467d0a587
commit 5c7bf5123c
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -716,10 +716,19 @@ self: super: {
'';
});
# The standard libraries are compiled separately
idris = generateOptparseApplicativeCompletion "idris" (
doJailbreak (dontCheck super.idris)
);
# The standard libraries are compiled separately.
# The megaparsec-7 override is needed because https://github.com/idris-lang/Idris-dev/issues/4826 declares that
# idris1 has no plans to migrate to megaparsec-8.
# The idris-lang/Idris-dev#4808 patch is for GHC 8.8 compatibility, and can likely be removed with the next release.
idris = generateOptparseApplicativeCompletion "idris" (doJailbreak (dontCheck
(appendPatches
(super.idris.override { megaparsec = self.megaparsec_7_0_5; }) [
(pkgs.fetchpatch {
url = "https://github.com/idris-lang/Idris-dev/pull/4808.diff";
sha256 = "060ib1rczy34ip8xf3bv1pf28655f6s0bvvij19jhh5dpcr0pf71";
excludes = [ ".travis.yml" "Makefile" "appveyor.yml" ];
})
])));
# https://github.com/bos/math-functions/issues/25
math-functions = dontCheck super.math-functions;

2
pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View File

@ -2387,6 +2387,7 @@ extra-packages:
- inline-c-cpp < 0.2 # required on GHC 8.0.x
- lens-labels == 0.1.* # required for proto-lens-descriptors
- mainland-pretty == 0.6.2.* # required for tensorflow-opgen-0.1.0.0
- megaparsec >= 7.0.4 && < 8 # required for idris: https://github.com/idris-lang/Idris-dev/issues/4826
- mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
- mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms
- network == 2.6.3.1 # newer versions don't compile with GHC 7.4.x and below
@ -6393,7 +6394,6 @@ broken-packages:
- identifiers
- idiii
- idna2008
- idris
- IDynamic
- ieee-utils
- iexcloud

23
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

@ -137052,8 +137052,6 @@ self: {
];
description = "Functional Programming Language with Dependent Types";
license = stdenv.lib.licenses.bsd3;
hydraPlatforms = stdenv.lib.platforms.none;
broken = true;
}) {inherit (pkgs) gmp;};
"ieee" = callPackage
@ -162376,6 +162374,27 @@ self: {
broken = true;
}) {};
"megaparsec_7_0_5" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, criterion, deepseq, mtl, parser-combinators, scientific, text
, transformers, weigh
}:
mkDerivation {
pname = "megaparsec";
version = "7.0.5";
sha256 = "0bqx1icbmk8s7wmbcdzsgnlh607c7kzg8l80cp02dxr5valjxp7j";
libraryHaskellDepends = [
base bytestring case-insensitive containers deepseq mtl
parser-combinators scientific text transformers
];
benchmarkHaskellDepends = [
base containers criterion deepseq text weigh
];
description = "Monadic parser combinators";
license = stdenv.lib.licenses.bsd2;
hydraPlatforms = stdenv.lib.platforms.none;
}) {};
"megaparsec" = callPackage
({ mkDerivation, base, bytestring, case-insensitive, containers
, criterion, deepseq, mtl, parser-combinators, scientific, text