diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 07:53:37 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 07:53:37 +0200 |
commit | bb10352242dceb863069797bb92131944b0ac62f (patch) | |
tree | d3f5ceea6723e3d6c901652146e41ffe45100c9b /pkgs/applications/version-management/git-and-tools | |
parent | 7fb1ff90031c59cbc9ef79224516a74bc138c7a6 (diff) | |
parent | 5c70040db2dd2123f7728f1bdcd40d5018de0ef9 (diff) | |
download | nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.gz nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.bz2 nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.lz nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.xz nixlib-bb10352242dceb863069797bb92131944b0ac62f.tar.zst nixlib-bb10352242dceb863069797bb92131944b0ac62f.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools')
3 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index ae064cb7b5ed..c073edaee7d8 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.2.7"; + version = "1.3.0"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "0y5cp236gi6h7llzai5d27086l4zz58mz1zs01r97xnnmjs9vw21"; + sha256 = "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl"; }; # Perl is needed here for patchShebangs diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index acd09f0d0c0d..597e0672073b 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gh"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0na8zfvcmdy968i47x6qd1jwfaphy5h18ff7ym5sxyia9a27yhf8"; + sha256 = "054mag8jgxkvx2f95ha10n45v4xv5lms69w76g95z18m62qhjcyl"; }; - modSha256 = "102v30wr9wmd6n20qdvgs5mp2s639pwbqqd71r8q52f42p694bi1"; + modSha256 = "0v33x9bnwjfg4425vralnsb4i22c0g1rcmaga9911v0i7d51k0fn"; buildFlagsArray = [ - "-ldflags=-X github.com/cli/cli/command.Version=${version}" + "-ldflags=-s -w -X github.com/cli/cli/command.Version=${version}" ]; subPackages = [ "cmd/gh" ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index aaf22c940cb1..32350fa538db 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "v${version}"; - sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh"; + sha256 = "0zc4cb1dg30np5yc4ymkr894qs2bk0r123i302md00niayk4njyd"; }; - cargoSha256 = "1scp9rzn59akxsf9p48j1zq6clbwdyasnyi4j28nj03ghvdv2i33"; + cargoSha256 = "1d892889ml7sqyxzmjipq5fvizb4abqhmmn450qm7yam9fn5q5wf"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + postInstall = '' + installManPage git-gone.1 + ''; + postFixup = '' wrapProgram $out/bin/git-gone --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" ''; |