From 9721c545927610b77a304011d4aee72e098352cb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 25 Jun 2017 12:07:51 +0200 Subject: [PATCH] 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 --- pkgs/development/haskell-modules/configuration-common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index fccde7426c6..3ee452e4845 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -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;