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: 0a351c3f6513
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: bf4169178ec8
Choose a head ref
  • 14 commits
  • 6 files changed
  • 4 contributors

Commits on Jan 31, 2020

  1. LTS Haskell 14.22

    @peti
    peti committed Jan 31, 2020
    Copy the full SHA
    3b5f3d1 View commit details
    Browse the repository at this point in the history

  2. hackage2nix: update list of broken packages

    @peti
    peti committed Jan 31, 2020
    Copy the full SHA
    78d58f6 View commit details
    Browse the repository at this point in the history

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

    This update was generated by hackage2nix v2.15.0-14-gb942b6a from Hackage revision
commercialhaskell/all-cabal-hashes@5556d14.
    @peti
    peti committed Jan 31, 2020
    Copy the full SHA
    8e8b8a5 View commit details
    Browse the repository at this point in the history

  4. haskellPackages.bustle: clean up with lib.pipe

    @jtojnar @peti
    jtojnar authored and peti committed Jan 31, 2020
    Copy the full SHA
    3430ded View commit details
    Browse the repository at this point in the history

  5. haskellPackages.bustle: fix building on Hydra 

    Bustle is proclaiming OtherLicense even though the code is licensed under LGPL 2.1+. This causes cabal2nix to set hydraPlatforms = stdenv.lib.platforms.none in hackage-packages.nix for the package.

Lets let's unset the attribute and fix the license.
    @jtojnar @peti
    jtojnar authored and peti committed Jan 31, 2020
    Copy the full SHA
    4141619 View commit details
    Browse the repository at this point in the history

  6. haskell-cabal-plan: update overrides for new version of base-compat

    @peti
    peti committed Jan 31, 2020
    Copy the full SHA
    135cc0c View commit details
    Browse the repository at this point in the history

  7. ghc: update 8.10.1 pre-release to announced rc1 

    https://mail.haskell.org/pipermail/ghc-devs/2020-January/018530.html

The version previously fetched was `8.10.0.20200108`.
    @ggreif @peti
    ggreif authored and peti committed Jan 31, 2020
    Copy the full SHA
    6bedece View commit details
    Browse the repository at this point in the history

  8. ghc-8.8.x: update version overrides for microlens packages

    @peti
    peti committed Jan 31, 2020
    Copy the full SHA
    2b10aed View commit details
    Browse the repository at this point in the history

  9. haskell generic-builder: Fix package conf handling 

    Previously the package conf files were handled without paying attention
to the fact that it's pretty-printed output. One problem was discovered
with GHC 8.8.1 on Darwin, where the dynamic-library-dirs first field
seems to have increased in length, meaning while before it was

    dynamic-library-dirs: some-small-directory-name
                          some-more-directories

Now it is

    dynamic-library-dirs:
        some-larger-directory-name
        some-more-directories

Which breaks the code installed for #25537,
because that assumed the former format, resulting in the reoccurence of
the bug in #22810, see
infinisil/all-hies#43

This commit fixes this by "unprettyfying" the package conf files before
processing them.

Closes #78738.
    @infinisil @peti
    infinisil authored and peti committed Jan 31, 2020
    Copy the full SHA
    8d4509e View commit details
    Browse the repository at this point in the history

  10. haskell-policeman: add overrides to provide newer versions of depende… 

    …ncies
    @peti
    peti committed Jan 31, 2020
    Copy the full SHA
    6516c12 View commit details
    Browse the repository at this point in the history

  11. haskell-relude-6.0.0.0 does not pass its doctest suite

    @peti
    peti committed Jan 31, 2020
    Copy the full SHA
    6d06899 View commit details
    Browse the repository at this point in the history

  12. haskell-bustle: simplify the override now that those changes are in c… 

    …abal2nix

Might be of interest to @jtojnar.
    @peti
    peti committed Jan 31, 2020
    Copy the full SHA
    5e90d04 View commit details
    Browse the repository at this point in the history

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

    This update was generated by hackage2nix v2.15.0-16-g2971916 from Hackage revision
commercialhaskell/all-cabal-hashes@d77d0f7.
    @peti
    peti committed Jan 31, 2020
    Copy the full SHA
    a7712a1 View commit details
    Browse the repository at this point in the history

  14. Merge pull request #78906 from NixOS/haskell-updates 

    Update Haskell package set to LTS 14.22 (plus other fixes)
    @peti
    peti committed Jan 31, 2020
    Copy the full SHA
    bf41691 View commit details
    Browse the repository at this point in the history