public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-annex: the overrideScope must be applied first to avoid bug https://github.com/NixOS/nixpkgs/issues/26852

Browse Source
This commit is contained in:
Peter Simons 2017-06-25 21:23:28 +02:00
parent ea5330c0e2
commit c43a2d392f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -63,20 +63,20 @@ self: super: {
# The Hackage tarball is purposefully broken, because it's not intended to be, like, useful. # 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/ # 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.overrideScope (self: super: {
optparse-applicative = self.optparse-applicative_0_14_0_0;
})) (drv: {
src = pkgs.fetchgit { src = pkgs.fetchgit {
name = "git-annex-${drv.version}-src"; name = "git-annex-${drv.version}-src";
url = "git://git-annex.branchable.com/"; url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + drv.version; rev = "refs/tags/" + drv.version;
sha256 = "1psyklfyjf4zqh3qxjn11sp2jiwvp8mfxqvsi1wggqpidfmk39jx"; sha256 = "1psyklfyjf4zqh3qxjn11sp2jiwvp8mfxqvsi1wggqpidfmk39jx";
}; };
}))).override { })).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null; dbus = if pkgs.stdenv.isLinux then self.dbus else null;
fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify 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; 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 # https://github.com/froozen/kademlia/issues/2
kademlia = dontCheck super.kademlia; kademlia = dontCheck super.kademlia;