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
base: 41aa2272feb2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 02203c195495
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 6, 2020

  1. haskellPackages.ghcWithPackages: fix for GHC 8.10 

    This closes #79441.

ghcWithPackages is using `ghc-pkg recache` to build its package
database. By doing so, it overrides the `package.cache[.lock]` files.

Details are unclear, but GHC 8.10 changed a bit the behavior.
Previously, it was unconditionally replacing the files by new ones. Now
it tries to open (for modification) the files. These files are symlinks
to another nix derivation, which is hence read-only.

This commit removes the files before running `ghc-pkg recache`, hence it
will just write the new files.

Tested with `haskellPackages.ghcWithPackages` (i.e. GHC 8.8) and
`haskell.packages.ghc8101.ghcWithPackages` (i.e GHC 8.10) with the
following nix file, at the root of the nixpkgs repository:

```
with import ./. {
  overlays = [
    (
      self: super: {
        haskellPackages = super.haskell.packages.ghc8101.override {
          overrides = selfh: superh: {
             th-lift-instances = super.haskell.lib.doJailbreak superh.th-lift-instances;
             th-expand-syns    = super.haskell.lib.doJailbreak superh.th-expand-syns;
             th-reify-many     = super.haskell.lib.doJailbreak superh.th-reify-many;
             th-orphans        = super.haskell.lib.doJailbreak superh.th-orphans;
             haskell-src-meta  = super.haskell.lib.doJailbreak superh.haskell-src-meta;
          };
        };
      }
  )
  ];
};
haskellPackages.ghcWithPackages(p:[p.PyF])
```

This will test with GHC 8.10. Comment out the `overlays` to test with
GHC 8.8.

(cherry picked from commit abc4f96)
    @guibou @ocharles
    guibou authored and ocharles committed Jul 6, 2020
    Copy the full SHA
    a078182 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #91999 from circuithub/support-ghc-8.10-on-nixos-2… 

    …0.03

haskellPackages.ghcWithPackages: fix for GHC 8.10
    @cdepillabout
    cdepillabout committed Jul 6, 2020
    Copy the full SHA
    02203c1 View commit details
    Browse the repository at this point in the history