Merge pull request #180702 from SuperSandro2000/fix-bash-completion

3 files changed, 31 insertions, 3 deletions

diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
index f0932fde2d5e2..6e2377bbec4bb 100644
--- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix
@@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, unixtools, which }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, fetchpatch
+, unixtools
+, which
+}:
 
 stdenv.mkDerivation rec {
   pname = "git-extras";
@@ -11,6 +17,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-Cn7IXMzgg0QIsNIHz+X14Gkmop0UbsSBlGlGkmg71ek=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/tj/git-extras/commit/66961ad4911cd0f1a908530f2b725bacc7d198e1.patch";
+      sha256 = "sha256-iC1lUf/NmuAPADxDWZ2JScHIMgYjIaR0edlGpq0qCOc=";
+    })
+  ];
+
   postPatch = ''
     patchShebangs check_dependencies.sh
   '';
diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix
index 357ba701d18fe..bf0149e9e17e7 100644
--- a/pkgs/development/python-modules/python-swiftclient/default.nix
+++ b/pkgs/development/python-modules/python-swiftclient/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonApplication
 , fetchPypi
+, installShellFiles
 , mock
 , openstacksdk
 , pbr
@@ -21,6 +22,10 @@ buildPythonApplication rec {
     hash = "sha256-V7bx/yO0ZoQ4AqaBb0trvGiWtq0F1ld6/udiK+OilTg=";
   };
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
   propagatedBuildInputs = [
     pbr
     python-keystoneclient
@@ -33,7 +38,9 @@ buildPythonApplication rec {
   ];
 
   postInstall = ''
-    install -Dm644 tools/swift.bash_completion $out/share/bash_completion.d/swift
+    installShellCompletion --cmd swift \
+      --bash tools/swift.bash_completion
+    installManPage doc/manpages/*
   '';
 
   checkPhase = ''
diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix
index e06e7917be18a..6457a4521a406 100644
--- a/pkgs/development/python-modules/swift/default.nix
+++ b/pkgs/development/python-modules/swift/default.nix
@@ -6,6 +6,7 @@
 , eventlet
 , greenlet
 , iana-etc
+, installShellFiles
 , libredirect
 , lxml
 , mock
@@ -35,7 +36,10 @@ buildPythonPackage rec {
     rm test/functional/s3api/{__init__.py,s3_test_client.py}
   '';
 
-  nativeBuildInputs = [ pbr ];
+  nativeBuildInputs = [
+    installShellFiles
+    pbr
+  ];
 
   propagatedBuildInputs = [
     cryptography
@@ -51,6 +55,10 @@ buildPythonPackage rec {
     xattr
   ];
 
+  postInstall = ''
+    installManPage doc/manpages/*
+  '';
+
   checkInputs = [
     boto3
     mock