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

Commits on Jun 25, 2017

  1. git-annex: replacing optparse-applicative needs a deep override 

     | Warning: This package indirectly depends on multiple versions of the same
 | package. This is highly likely to cause a compile failure.
 | package wai-app-static-3.1.6.1 requires optparse-applicative-0.13.2.0
 | package tasty-rerun-1.1.6 requires optparse-applicative-0.13.2.0
 | package tasty-0.11.2.1 requires optparse-applicative-0.13.2.0
 | package git-annex-6.20170520 requires optparse-applicative-0.14.0.0
    @peti
    peti committed Jun 25, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9721c54 View commit details

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

    This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
commercialhaskell/all-cabal-hashes@ec9f3d3.
    @peti
    peti committed Jun 25, 2017
    Copy the full SHA
    b4973a5 View commit details
Showing with 348 additions and 81 deletions.
  1. +3 −2 pkgs/development/haskell-modules/configuration-common.nix
  2. +345 −79 pkgs/development/haskell-modules/hackage-packages.nix
5 changes: 3 additions & 2 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -63,7 +63,7 @@ self: super: {

# The Hackage tarball is purposefully broken, because it's not intended to be, like, useful.
# https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
git-annex = ((overrideCabal super.git-annex (drv: {
git-annex = (((overrideCabal super.git-annex (drv: {
src = pkgs.fetchgit {
name = "git-annex-${drv.version}-src";
url = "git://git-annex.branchable.com/";
@@ -74,8 +74,9 @@ self: super: {
dbus = if pkgs.stdenv.isLinux then self.dbus else null;
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null;
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
}).overrideScope (self: super: {
optparse-applicative = self.optparse-applicative_0_14_0_0;
};
});

# https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia;
Loading