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: 7e542f7f3304
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3784373ad0e
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on May 7, 2018

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

    This update was generated by hackage2nix v2.9.2-11-ga2d666d from Hackage revision
commercialhaskell/all-cabal-hashes@f60ac8c.
    @peti
    peti committed May 7, 2018
    Copy the full SHA
    253ea95 View commit details

  2. haskell-gi-gdkx11: drop obsolete override 

    Closes #37724.
    @peti
    peti committed May 7, 2018
    Copy the full SHA
    394d0f2 View commit details

  3. github-backup: jailbreak to fix the build

    @peti
    peti committed May 7, 2018
    Copy the full SHA
    8b11e30 View commit details

  4. haskell-dbus-hslogger & status-notifier-item: use latest dbus despite… 

    … lts-11.x
    @peti
    peti committed May 7, 2018
    Copy the full SHA
    d378437 View commit details
Showing with 188 additions and 54 deletions.
  1. +7 −1 pkgs/development/haskell-modules/configuration-common.nix
  2. +181 −53 pkgs/development/haskell-modules/hackage-packages.nix
8 changes: 7 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -422,8 +422,9 @@ self: super: {
# https://github.com/evanrinehart/mikmod/issues/1
mikmod = addExtraLibrary super.mikmod pkgs.libmikmod;

# The doctest phase fails because it does not have a proper environment in
# which to run the commands it's ought to test.
haskell-gi = dontCheck super.haskell-gi;
gi-gdkx11 = super.gi-gdkx11.override { gdk-x11 = pkgs.gtk3; };

# https://github.com/basvandijk/threads/issues/10
threads = dontCheck super.threads;
@@ -637,6 +638,8 @@ self: super: {

# Need newer versions of their dependencies than the ones we have in LTS-11.x.
cabal2nix = super.cabal2nix.overrideScope (self: super: { hpack = self.hpack_0_28_2; hackage-db = self.hackage-db_2_0_1; });
dbus-hslogger = super.dbus-hslogger.overrideScope (self: super: { dbus = self.dbus_1_0_1; });
status-notifier-item = super.status-notifier-item.overrideScope (self: super: { dbus = self.dbus_1_0_1; });

# https://github.com/bos/configurator/issues/22
configurator = dontCheck super.configurator;
@@ -1025,6 +1028,9 @@ self: super: {
# https://github.com/dmwit/encoding/pull/3
encoding = appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch;

# Work around overspecified constraint on github ==0.18.
github-backup = doJailbreak super.github-backup;

}

//
234 changes: 181 additions & 53 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.