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: 6e89b440d34c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7d30b4d1b57f
Choose a head ref
  • 18 commits
  • 19 files changed
  • 10 contributors

Commits on Apr 24, 2020

  1. compilers/ghc: fix a few typos

    @ggreif @peti
    ggreif authored and peti committed Apr 24, 2020
    Copy the full SHA
    0e82313 View commit details
    Browse the repository at this point in the history

  2. compilers/ghc: apply structuredAttrs patch to other ghcs 

    Ported from:

> [haskell-updates c8aa986] ghc883: fix structuredAttrs build
>  Author: Robin Gloster <mail@glob.in>
>  Date: Sat Apr 4 19:21:31 2020 +0200
>  1 file changed, 3 insertions(+), 3 deletions(-)
    @ggreif @peti
    ggreif authored and peti committed Apr 24, 2020
    Copy the full SHA
    daf79ea View commit details
    Browse the repository at this point in the history

  3. ghc: drop 8.8.1

    @ggreif @peti
    ggreif authored and peti committed Apr 24, 2020
    1
    Copy the full SHA
    a634bd0 View commit details
    Browse the repository at this point in the history

  4. LTS Haskell 15.9

    @peti
    peti committed Apr 24, 2020
    Copy the full SHA
    3186054 View commit details
    Browse the repository at this point in the history

  5. hackage2nix: update list of broken builds to fix evaluation

    @peti
    peti committed Apr 24, 2020
    Copy the full SHA
    ea1aa65 View commit details
    Browse the repository at this point in the history

  6. haskellPackages.tensorflow*: unmark newly unbroken packages

    @mikesperber @peti
    mikesperber authored and peti committed Apr 24, 2020
    Copy the full SHA
    b7f35fd View commit details
    Browse the repository at this point in the history

  7. haskellPackages.text-format: don't mark as broken

    @pbogdan @peti
    pbogdan authored and peti committed Apr 24, 2020
    Copy the full SHA
    f3ec558 View commit details
    Browse the repository at this point in the history

  8. haskellPackages.{binary-strict,webify}: fix build 

    webify needs a bump in the cabal file. As the last upstream commit is
two years ago, I think it makes sense to not wait for upstream to merge
the PR [0] and release a new version.

[0] ananthakumaran/webify#27
    @erictapen @peti
    erictapen authored and peti committed Apr 24, 2020
    Copy the full SHA
    86e2dd2 View commit details
    Browse the repository at this point in the history

  9. haskellPackages.Euterpea: fix build, unbreak 

    Build is failing due to too restrictive version constraints which were
the only thing needing fixing.
    @sternenseemann @peti
    sternenseemann authored and peti committed Apr 24, 2020
    Copy the full SHA
    3359dca View commit details
    Browse the repository at this point in the history

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

    This update was generated by hackage2nix v2.15.1 from Hackage revision
commercialhaskell/all-cabal-hashes@69af61c.
    @peti
    peti committed Apr 24, 2020
    Copy the full SHA
    7c1c9dc View commit details
    Browse the repository at this point in the history

  11. haskell-packages: made darcs compile with ghc 8.8

    @dguibert @peti
    dguibert authored and peti committed Apr 24, 2020
    Copy the full SHA
    8ab67c7 View commit details
    Browse the repository at this point in the history

  12. Additional docs for doJailbreak 

    Yesterday with @infinisil on #nixos, he pointed me to: NixOS/jailbreak-cabal#7 after a good deal of time wrangling through a package to make it work. 
The `nix-build -K` command, is very handy for debugging things like these, again I learnt from infinisil. 
And after much experimenting and looking through, it turned out that jailbreaking wasn't working as expected, and its documentation could point it out to avoid future confusion.
    @asheshambasta @peti
    asheshambasta authored and peti committed Apr 24, 2020
    Copy the full SHA
    32c8e79 View commit details
    Browse the repository at this point in the history

  13. Haskell: apply-refact version has to match ghc 

    This commit maps:

* GHC 8.6 to apply-refact 0.6
* GHC 8.8 to apply-refact 0.7
* GHC 8.10 to apply-refact 0.8

See:
<https://hackage.haskell.org/package/apply-refact/changelog>
<mpickering/apply-refact#56>
    @andys8 @peti
    andys8 authored and peti committed Apr 24, 2020
    Copy the full SHA
    28556cd View commit details
    Browse the repository at this point in the history

  14. Update pkgs/development/haskell-modules/configuration-hackage2nix.yaml

    @cdepillabout @peti
    cdepillabout authored and peti committed Apr 24, 2020
    Copy the full SHA
    5b3104a View commit details
    Browse the repository at this point in the history

  15. haskell-microlens-th: drop obsolete override

    @peti
    peti committed Apr 24, 2020
    Copy the full SHA
    da45fd9 View commit details
    Browse the repository at this point in the history

  16. haskell-haddock: fix build with our default compiler ghc-8.8.3 

    Fixes #85728.
    @peti
    peti committed Apr 24, 2020
    Copy the full SHA
    a1463ef View commit details
    Browse the repository at this point in the history

  17. haskell-haddock: fix build with for the latest compiler ghc-8.10.1

    @peti
    peti committed Apr 24, 2020
    Copy the full SHA
    e567a3b View commit details
    Browse the repository at this point in the history

  18. Merge pull request #85926 from NixOS/haskell-updates 

    Update Haskell package set to LTS 15.9 (plus other fixes)
    @peti
    peti committed Apr 24, 2020
    Copy the full SHA
    7d30b4d View commit details
    Browse the repository at this point in the history