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: e97d8fc0cbdf
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 127de7480e8d
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on May 6, 2018

  1. hackage2nix: disable failing Hydra builds 

    @gebner: hledger-diff no longer compiles
    @peti
    peti committed May 6, 2018
    Configuration menu
    Copy the full SHA
    11096b2 View commit details
    Browse the repository at this point in the history

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

    This update was generated by hackage2nix v2.9.2-9-g07ca643 from Hackage revision
commercialhaskell/all-cabal-hashes@d2c0010.
    @peti
    peti committed May 6, 2018
    Configuration menu
    Copy the full SHA
    fe95c5c View commit details
    Browse the repository at this point in the history

  3. haskell-gi, gi-gdkx11: fix builds 

    The `haskell-gi` build fails its doctests because of a missing
library; I'm not 100% convinced that setting it to `dontCheck` is the
right thing to do, but I don't have a better idea at the moment.

The `gi-gdkx11` build fails because, surprise, Gdk-X11 isn't found; by
looking around in my store, I found that that that library seems to
live in gtk3 these days; this override is just a stop-gap, though,
I've also submitted the change to cabal2nix that I believe will fix
the automatic generation of the package in the future.
    @mdorman @peti
    mdorman authored and peti committed May 6, 2018
    1 Configuration menu
    Copy the full SHA
    4764a6e View commit details
    Browse the repository at this point in the history

  4. haskell-attoparsec-varword: fix infinite recursion in test dependencies

    @peti
    peti committed May 6, 2018
    Configuration menu
    Copy the full SHA
    127de74 View commit details
    Browse the repository at this point in the history