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: 839263d55890
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e9687df24a62
Choose a head ref
  • 16 commits
  • 18 files changed
  • 10 contributors

Commits on Apr 17, 2020

  1. LTS Haskell 15.8

    @peti
    peti committed Apr 17, 2020
    Copy the full SHA
    572e8f6 View commit details

  2. hackage2nix: unbreak hasql-pool

    @peti
    Remo authored and peti committed Apr 17, 2020
    Copy the full SHA
    629af9f View commit details

  3. hackage2nix: unbreak postgrest

    @peti
    Remo authored and peti committed Apr 17, 2020
    Copy the full SHA
    83d84e6 View commit details

  4. hackage2nix: update list of broken builds to fix evaluation errors

    @peti
    peti committed Apr 17, 2020
    Copy the full SHA
    fd63776 View commit details

  5. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@fcda256.
    @peti
    peti committed Apr 17, 2020
    Copy the full SHA
    fd11032 View commit details

  6. ghcHEAD: bump to 8.11.20200403 (#84217) 

    * ghcHEAD: bump to 8.11.20200403

* ghcHead: reduce diff vs. 8.10.1

dontAddExtraLibs was removed by accident (IMO) in ea19a8e

* ghcHEAD: add ability to use system libffi

- enable nixpkgs' libffi
- minimise diffs against 8.10.1
- remove patching

* remove configure warning about --with-curses-includes

configure: WARNING: unrecognized options: --with-curses-includes
    @ggreif @peti
    ggreif authored and peti committed Apr 17, 2020
    Copy the full SHA
    7932fb2 View commit details

  7. spago: 0.14.0 -> 0.15.1

    @cdepillabout @peti
    cdepillabout authored and peti committed Apr 17, 2020
    Copy the full SHA
    a0612c2 View commit details

  8. futhark: stop wrapping the executable

    @athas @peti
    athas authored and peti committed Apr 17, 2020
    Copy the full SHA
    802dfc8 View commit details

  9. haskell simple-affine-space: Disable test suite

    @turion @peti
    turion authored and peti committed Apr 17, 2020
    Copy the full SHA
    a762316 View commit details

  10. cut-the-crap: init at 1.0.0

    @jappeace @peti
    jappeace authored and peti committed Apr 17, 2020
    Copy the full SHA
    b95534a View commit details

  11. cabal-install-parsers: update Cabal dependency 

    This also unbreaks `haskell-ci`.
    @mdorman @peti
    mdorman authored and peti committed Apr 17, 2020
    Copy the full SHA
    d59d157 View commit details

  12. haskell-tensorflow: unbreak 

    - get the current Git head of haskell-tensorflow
- adjust dependencies
    @mikesperber @peti
    mikesperber authored and peti committed Apr 17, 2020
    Copy the full SHA
    53cfd1d View commit details

  13. 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.
    @guibou @peti
    guibou authored and peti committed Apr 17, 2020
    3
    Copy the full SHA
    abc4f96 View commit details

  14. haskell-ghc-lib-parser-ex: fix build with GHC versions prior to 8.8.x

    @peti
    peti committed Apr 17, 2020
    Copy the full SHA
    d6aedf7 View commit details

  15. all-cabal-hashes: update to Hackage at 2020-04-17T17:47:53Z

    @peti
    peti committed Apr 17, 2020
    Copy the full SHA
    783af05 View commit details

  16. Merge pull request #85178 from NixOS/haskell-updates 

    Update Haskell package set to LTS 15.8 (plus other fixes)
    @peti
    peti authored Apr 17, 2020
    Copy the full SHA
    e9687df View commit details
Loading