about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2019-08-13 17:57:46 -0700
committerFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-10-22 10:23:22 +0200
commit12fd773ff058755237ebafe5f1c0bdd36f385eb6 (patch)
treec2ee890f629c0e5b7f46e35f4583f46344b9072a
parenta74f98051b461e83ebdd871f0023f28f38167e9d (diff)
downloadnixlib-12fd773ff058755237ebafe5f1c0bdd36f385eb6.tar
nixlib-12fd773ff058755237ebafe5f1c0bdd36f385eb6.tar.gz
nixlib-12fd773ff058755237ebafe5f1c0bdd36f385eb6.tar.bz2
nixlib-12fd773ff058755237ebafe5f1c0bdd36f385eb6.tar.lz
nixlib-12fd773ff058755237ebafe5f1c0bdd36f385eb6.tar.xz
nixlib-12fd773ff058755237ebafe5f1c0bdd36f385eb6.tar.zst
nixlib-12fd773ff058755237ebafe5f1c0bdd36f385eb6.zip
bash-completion: 2.8 -> 2.9
-rw-r--r--pkgs/shells/bash/bash-completion/default.nix31
1 files changed, 26 insertions, 5 deletions
diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix
index 0476cbd1f3f7..d544114d2103 100644
--- a/pkgs/shells/bash/bash-completion/default.nix
+++ b/pkgs/shells/bash/bash-completion/default.nix
@@ -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/*