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: c270fcb10c61
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 62026b36b188
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Feb 21, 2019

  1. purescript: fix build compiling with ghc 8.4.4 

    Closes #53597.
    @jacereda
    jacereda committed Feb 21, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4bd060e View commit details

  2. Merge pull request #53748 from jacereda/fix-purescript-build 

    purescript: fix build compiling with ghc 8.4.4
    @peti
    peti authored Feb 21, 2019
    Copy the full SHA
    62026b3 View commit details
4 changes: 4 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View file
Original file line number Diff line number Diff line change
@@ -39,6 +39,10 @@ self: super: {
unix = null;
xhtml = null;

# Restricts aeson to <1.4
# https://github.com/purescript/purescript/pull/3537
purescript = doJailbreak super.purescript;

# https://github.com/jcristovao/enclosed-exceptions/issues/12
enclosed-exceptions = dontCheck super.enclosed-exceptions;

3 changes: 2 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7045,7 +7045,8 @@ in

all-cabal-hashes = callPackage ../data/misc/hackage { };

purescript = haskell.lib.justStaticExecutables haskellPackages.purescript;
# Build with ghc 8.4 due to https://github.com/NixOS/nixpkgs/issues/53597
purescript = haskell.lib.justStaticExecutables haskell.packages.ghc844.purescript;
psc-package = haskell.lib.justStaticExecutables
(haskellPackages.callPackage ../development/compilers/purescript/psc-package { });

4 changes: 2 additions & 2 deletions pkgs/top-level/haskell-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -49,13 +49,13 @@ in {

ghc822 = callPackage ../development/compilers/ghc/8.2.2.nix {
bootPkgs = packages.ghc822Binary;
inherit (buildPackages.python3Packages) sphinx;
sphinx = buildPackages.python3Packages.sphinx_1_7_9;
buildLlvmPackages = buildPackages.llvmPackages_39;
llvmPackages = pkgs.llvmPackages_39;
};
ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix {
bootPkgs = packages.ghc822Binary;
sphinx = null; # broken with sphinx 1.8.x
sphinx = buildPackages.python3Packages.sphinx_1_7_9;
buildLlvmPackages = buildPackages.llvmPackages_5;
llvmPackages = pkgs.llvmPackages_5;
};
11 changes: 11 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -4116,6 +4116,17 @@ in {

sphinx = callPackage ../development/python-modules/sphinx { };

# sphinx update to 1.8.x broke ghc versions < 8.6
sphinx_1_7_9 = self.sphinx.overridePythonAttrs
{
version = "1.7.9";
src = fetchPypi {
pname = "Sphinx";
inherit version;
sha256 = "217a7705adcb573da5bbe1e0f5cab4fa0bd89fd9342c9159121746f593c2d5a4";
};
};

sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { };

sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { };