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: a74f98051b46
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 12fd773ff058
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 22, 2019

  1. bash-completion: 2.8 -> 2.9

    @FRidh
    Jonathan Ringer authored and FRidh committed Oct 22, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    12fd773 View commit details
Showing with 26 additions and 5 deletions.
  1. +26 −5 pkgs/shells/bash/bash-completion/default.nix
31 changes: 26 additions & 5 deletions pkgs/shells/bash/bash-completion/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,36 @@
{ stdenv, fetchurl }:
{ stdenv, fetchFromGitHub
, autoreconfHook
, python3Packages
, bashInteractive
}:

stdenv.mkDerivation rec {
pname = "bash-completion";
version = "2.8";
version = "2.9";

src = fetchurl {
url = "https://github.com/scop/bash-completion/releases/download/${version}/${pname}-${version}.tar.xz";
sha256 = "0kgmflrr1ga9wfk770vmakna3nj46ylb5ky9ipd0v2k9ymq5a7y0";
src = fetchFromGitHub {
owner = "scop";
repo = "bash-completion";
rev = version;
sha256 = "1813r4jxfa2zgzm2ppjhrq62flfmxai8433pklxcrl4fp5wwx9yv";
};

nativeBuildInputs = [ autoreconfHook ];

doCheck = true;
checkInputs = [
python3Packages.pexpect
python3Packages.pytest
bashInteractive
];

# ignore ip_addresses because it tries to touch network
# ignore test_ls because impure logic
checkPhase = ''
pytest . \
--ignore=test/t/unit/test_unit_ip_addresses.py \
--ignore=test/t/test_ls.py
'';

prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
sed -i -e 's/readlink -f/readlink/g' bash_completion completions/*