diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-03 16:33:28 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2021-01-03 16:33:28 +1000 |
commit | fb2311d4307f9873ccd38c7f080fbf1df8f17daa (patch) | |
tree | 4df43f65ad5ba49f281d340c3012d63f5d37e8e9 /pkgs/applications/version-management/git-and-tools | |
parent | c2884c4011a9496b67ae2ccd8af126854628014b (diff) | |
parent | 279110cd86e9c969f8f2942675f7c73cfe4059d3 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/delta/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/hub/default.nix | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index f44987037aab6..e3862a81b4273 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage rec { description = "A syntax-highlighting pager for git"; changelog = "https://github.com/dandavison/delta/releases/tag/${version}"; license = licenses.mit; - maintainers = with maintainers; [ marsam ma27 zowoq ]; + maintainers = with maintainers; [ marsam zowoq ]; }; } diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index be81364279710..788512df85cda 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, util-linux }: +{ stdenv, buildGoPackage, fetchFromGitHub, git, groff, installShellFiles, util-linux, nixosTests }: buildGoPackage rec { pname = "hub"; @@ -20,6 +20,8 @@ buildGoPackage rec { postPatch = '' patchShebangs . + substituteInPlace git/git.go --replace "cmd.New(\"git\")" "cmd.New(\"${git}/bin/git\")" + substituteInPlace commands/args.go --replace "Executable: \"git\"" "Executable: \"${git}/bin/git\"" ''; postInstall = '' @@ -33,6 +35,8 @@ buildGoPackage rec { installManPage share/man/man[1-9]/*.[1-9] ''; + passthru.tests = { inherit (nixosTests) hub; }; + meta = with stdenv.lib; { description = "Command-line wrapper for git that makes you better at GitHub"; license = licenses.mit; |