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: 25ee8e0f70d5
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 5c80983e75a7
Choose a head ref
  • 6 commits
  • 4 files changed
  • 1 contributor

Commits on Jun 22, 2018

  1. LTS Haskell 11.14

    @peti
    peti committed Jun 22, 2018
    Copy the full SHA
    2bd8148 View commit details
    Browse the repository at this point in the history

  2. hackage2nix: boolector has an unfree license

    @peti
    peti committed Jun 22, 2018
    Copy the full SHA
    503e5c3 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.9.2-23-g7ccbd66 from Hackage revision
commercialhaskell/all-cabal-hashes@c9934e6.
    @peti
    peti committed Jun 22, 2018
    Copy the full SHA
    d94d27c View commit details
    Browse the repository at this point in the history

  4. haskell-streaming-commons: disable randomly failing test suite

    @peti
    peti committed Jun 22, 2018
    Copy the full SHA
    e0d34cf View commit details
    Browse the repository at this point in the history

  5. haskell-Cabal: drop obsolete override to fix Setup dependencies 

    This is now handled by cabal2nix:

 - NixOS/cabal2nix@7ccbd66.
 - #41939
    @peti
    peti committed Jun 22, 2018
    Copy the full SHA
    1486fee View commit details
    Browse the repository at this point in the history

  6. haskell-generic-builder: bake the package name and version into --docdir 

    If we use a --docdir that's not specific to the package, then different builds
will install their license files into the same location, which leads to file
collisions if those are ever joined into the same environment.

Fixes #35024.
    @peti
    peti committed Jun 22, 2018
    Copy the full SHA
    5c80983 View commit details
    Browse the repository at this point in the history