b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

bash-completion: Fix tests with musl.

Browse source 
Fixes test error

    self = <test_iconv.TestIconv object at 0x7ffff52f3410>
    completion = <CompletionResult []>

        @pytest.mark.complete("iconv -")
        def test_1(self, completion):
    >       assert completion
    E       assert <CompletionResult []>

    ../t/test_iconv.py:7: AssertionError

by applying upstream commit not present in a newer release.
This commit is contained in:
Niklas Hambüchen 2019-12-02 04:12:17 +01:00
parent bb1013511e
commit 0a854379c4
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/shells/bash/bash-completion/default.nix
View file

@ -1,4 +1,6 @@
{ stdenv, fetchFromGitHub
, lib
, fetchpatch
, autoreconfHook
, python3Packages
, bashInteractive
@ -6,6 +8,7 @@
stdenv.mkDerivation rec {
pname = "bash-completion";
# TODO: Remove musl patch below upon next release!
version = "2.9";
src = fetchFromGitHub {
@ -26,6 +29,15 @@ stdenv.mkDerivation rec {
patches = [
./0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch
] ++ lib.optionals stdenv.hostPlatform.isMusl [
# TODO: Remove when https://github.com/scop/bash-completion/commit/2cdac1b9f24df62a1fa80c1824ee8524c9b02393
# is availabe in a release in nixpkgs. see https://github.com/scop/bash-completion/issues/312.
# Fixes a test failure with musl.
(fetchpatch {
url = "https://github.com/scop/bash-completion/commit/2cdac1b9f24df62a1fa80c1824ee8524c9b02393.patch";
name = "bash-completion-musl-test_iconv-skip-option-completion-if-help-fails";
sha256 = "1l53d62zf01k625nzw3vcrxky93h7bzdpchgk4argxalrn17ckvb";
})
];
# ignore ip_addresses because it tries to touch network