Merge staging-next into staging

pkgs/applications/version-management/git-and-tools/default.nix

@@ -132,6 +132,8 @@ let
     utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux;
   };
 
+  git-remote-codecommit = python3Packages.callPackage ./git-remote-codecommit { };
+
   git-remote-gcrypt = callPackage ./git-remote-gcrypt { };
 
   git-remote-hg = callPackage ./git-remote-hg { };

pkgs/applications/version-management/git-and-tools/git-absorb/default.nix

@@ -2,20 +2,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "git-absorb";
-  version = "0.6.3";
+  version = "0.6.4";
 
   src = fetchFromGitHub {
     owner  = "tummychow";
     repo   = pname;
     rev    = "refs/tags/${version}";
-    sha256 = "0kvb9nzjlxhnrd2ir3zjd99v7zcq4bch1i9nqsn3505j5m0wv0hh";
+    sha256 = "01hf9hbrigqn4qcz6jmprp7by9nh55k1r2d11g7sil5fpw6m2j9k";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
   buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ];
 
-  cargoSha256 = "0bppb1ng77ynhlxnhgz9qx4x5j0lyzcxw3zshfpgjc03fxcwl6cz";
+  cargoSha256 = "04dkfjb6pxqaalw2y6yli9q58g8x8ppfmibivpvqifk8r8dhkdqp";
 
   postInstall = ''
     installManPage Documentation/git-absorb.1

pkgs/applications/version-management/git-and-tools/git-interactive-rebase-tool/default.nix

@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
     description = "Native cross platform full feature terminal based sequence editor for git interactive rebase";
     changelog = "https://github.com/MitMaro/git-interactive-rebase-tool/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ masaeedu ];
+    maintainers = with maintainers; [ masaeedu zowoq ];
   };
 }

pkgs/applications/version-management/git-and-tools/git-remote-codecommit/default.nix

@@ -0,0 +1,31 @@
+{ lib, buildPythonApplication, fetchFromGitHub, isPy3k, botocore, pytest, mock
+, flake8, tox, awscli }:
+
+buildPythonApplication rec {
+  pname = "git-remote-codecommit";
+  version = "1.15.1";
+  disabled = !isPy3k;
+
+  src = fetchFromGitHub {
+    owner = "aws";
+    repo = pname;
+    rev = version;
+    sha256 = "1vvp7i8ghmq72v57f6smh441h35xnr5ar628q2mr40bzvcifwymw";
+  };
+
+  propagatedBuildInputs = [ botocore ];
+
+  checkInputs = [ pytest mock flake8 tox awscli ];
+
+  checkPhase = ''
+    pytest
+  '';
+
+  meta = {
+    description =
+      "Git remote prefix to simplify pushing to and pulling from CodeCommit";
+    maintainers = [ lib.maintainers.zaninime ];
+    homepage = "https://github.com/awslabs/git-remote-codecommit";
+    license = lib.licenses.asl20;
+  };
+}

pkgs/applications/version-management/git-and-tools/gitstatus/default.nix

@@ -13,11 +13,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ];
   patchPhase = ''
+    sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.sh
     sed -i '1i GITSTATUS_AUTO_INSTALL=''${GITSTATUS_AUTO_INSTALL-0}' gitstatus.plugin.zsh
     sed -i "1a GITSTATUS_DAEMON=$out/bin/gitstatusd" install
   '';
   installPhase = ''
     install -Dm755 usrbin/gitstatusd $out/bin/gitstatusd
+    install -Dm444 gitstatus.plugin.sh $out
     install -Dm444 gitstatus.plugin.zsh $out
     install -Dm555 install $out
     install -Dm444 build.info $out
@@ -26,6 +28,7 @@ stdenv.mkDerivation rec {
   # should not need to worry about.
   pathsToLink = [
     "/bin/gitstatusd"
+    "/gitstatus.plugin.sh"
     "/gitstatus.plugin.zsh"
   ];