Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9242acfbbc62
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 55ef84db00b1
Choose a head ref
  • 2 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 3, 2020

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

    The hackage-packages.nix change was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@ad4a70d.
    @chkno
    chkno committed Apr 3, 2020

    Unverified

    The committer email address is not verified.
    Learn about vigilant mode
    Copy the full SHA
    645e034 View commit details

Commits on Apr 4, 2020

  1. Merge pull request #84131 from chkno/idris 

    haskellPackages.idris: Fix build (new GHC 8.8 & old megaparsec 7)
    @cdepillabout
    cdepillabout authored Apr 4, 2020
    Copy the full SHA
    55ef84d View commit details
17 changes: 13 additions & 4 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
@@ -6391,7 +6392,6 @@ broken-packages:
- identifiers
- idiii
- idna2008
- idris
- IDynamic
- ieee-utils
- iexcloud
23 changes: 21 additions & 2 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.