Merge pull request #100563 from hercules-ci/fix-optparse-applicative-compgen-error-haskell-updates

haskellPackages.optparse-applicative: Fix for compgen error
This commit is contained in:
Dennis Gosnell 2020-10-15 17:28:33 +09:00 committed by GitHub
commit b18f75c8a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -77,6 +77,15 @@ self: super: {
hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
};
# Backport fix for bash: compgen: command not found
# which happens in nix-shell when a non-interactive bash is on PATH
# PR to master: https://github.com/pcapriotti/optparse-applicative/pull/408
optparse-applicative = appendPatch super.optparse-applicative (pkgs.fetchpatch {
name = "optparse-applicative-0.15.1-hercules-ci-compgen.diff";
url = "https://github.com/hercules-ci/optparse-applicative/compare/0.15.1...hercules-ci:0.15.1-nixpkgs-compgen.diff";
sha256 = "1bcp6b7gvc8pqbn1n1ybhizkkl5if7hk9ipgl746vk08v0d3xxql";
});
# Fix test trying to access /home directory
shell-conduit = overrideCabal super.shell-conduit (drv: {
postPatch = "sed -i s/home/tmp/ test/Spec.hs";