diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools')
30 files changed, 239 insertions, 67 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix index 69b44625f95a..eb44f6d412b5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/bump2version/default.nix @@ -7,7 +7,7 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "c4urself"; - repo = "${pname}"; + repo = pname; rev = "refs/tags/v${version}"; sha256 = "10p7rg569rk3qvzs5kjj17894bqlsg3ihhbln6ciwwfhkfq1kpja"; }; @@ -16,12 +16,12 @@ buildPythonApplication rec { # X's in pytest are git tests which won't run in sandbox checkPhase = '' pytest tests/ -k 'not usage_string_fork' - ''; + ''; meta = with stdenv.lib; { description = "Version-bump your software with a single command"; longDescription = '' - A small command line tool to simplify releasing software by updating + A small command line tool to simplify releasing software by updating all version strings in your source code by the correct increment. ''; homepage = "https://github.com/c4urself/bump2version"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix index 8debc642b457..79c118a200c1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -69,6 +69,8 @@ stdenv.mkDerivation rec { done ''; + stripDebugList = [ "cgit" ]; + meta = { homepage = "https://git.zx2c4.com/cgit/about/"; repositories.git = "git://git.zx2c4.com/cgit"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix index 130ace63b4bb..bf6591a8cb9c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix @@ -34,6 +34,8 @@ let gh = callPackage ./gh { }; + ghorg = callPackage ./ghorg { }; + ghq = callPackage ./ghq { }; git = appendToName "minimal" gitBase; @@ -72,6 +74,8 @@ let # support for bugzilla git-bz = callPackage ./git-bz { }; + git-chglog = callPackage ./git-chglog { }; + git-cinnabar = callPackage ./git-cinnabar { }; git-codeowners = callPackage ./git-codeowners { }; @@ -82,6 +86,8 @@ let git-crypt = callPackage ./git-crypt { }; + git-delete-merged-branches = callPackage ./git-delete-merged-branches { }; + git-dit = callPackage ./git-dit { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; @@ -129,7 +135,7 @@ let git-radar = callPackage ./git-radar { }; git-recent = callPackage ./git-recent { - utillinux = if stdenv.isLinux then utillinuxMinimal else utillinux; + util-linux = if stdenv.isLinux then util-linuxMinimal else util-linux; }; git-remote-codecommit = python3Packages.callPackage ./git-remote-codecommit { }; @@ -194,9 +200,11 @@ let gitstatus = callPackage ./gitstatus { }; gitui = callPackage ./gitui { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) Security AppKit; }; + glab = callPackage ./glab { }; + grv = callPackage ./grv { }; hub = callPackage ./hub { }; @@ -239,6 +247,8 @@ let transcrypt = callPackage ./transcrypt { }; + git-vanity-hash = callPackage ./git-vanity-hash { }; + ydiff = pkgs.python3.pkgs.toPythonApplication pkgs.python3.pkgs.ydiff; } // lib.optionalAttrs (config.allowAliases or true) (with self; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix index e59ca6ac8999..830d189665c6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "1.1.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "1jf1y6135p30dlr42fnl0w7782fczizq8yya4bsd6xf66bcq0zzn"; + sha256 = "1j1nyx4ly87g0hk3hfw3qbykb64hrg3vg4r52z1w146v6ln7lm7h"; }; - vendorSha256 = "12ka5x5m4h8dfpcdhfjc5lz6bm8pzfqkbhs9j3a8w08xsi93dvdz"; + vendorSha256 = "19gv7ggbry46h40d9sc5cqba95vjfknzdd1cn3xa5409qaczg9lg"; nativeBuildInputs = [ installShellFiles ]; @@ -30,9 +30,8 @@ buildGoModule rec { done ''; - checkPhase = '' - make test - ''; + # fails with `unable to find git executable in PATH` + doCheck = false; meta = with lib; { description = "GitHub CLI tool"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix new file mode 100644 index 000000000000..30049e845877 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -0,0 +1,37 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ghorg"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "gabrie30"; + repo = "ghorg"; + rev = version; + sha256 = "0diwndkckv6fga45j9zngizycn5m71r67cziv0zrx6c66ssbj49w"; + }; + + doCheck = false; + vendorSha256 = null; + + subPackages = [ "." ]; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + + meta = with stdenv.lib; { + description = "Quickly clone an entire org/users repositories into one directory"; + longDescription = '' + ghorg allows you to quickly clone all of an orgs, or users repos into a + single directory. This can be useful in many situations including + - Searching an orgs/users codebase with ack, silver searcher, grep etc.. + - Bash scripting + - Creating backups + - Onboarding + - Performing Audits + ''; + homepage = "https://github.com/gabrie30/ghorg"; + license = licenses.asl20; + maintainers = with maintainers; [ vidbina ]; + platforms = platforms.all; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 187034031383..d8e34f570058 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -2,23 +2,27 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.4"; + version = "0.6.6"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "01hf9hbrigqn4qcz6jmprp7by9nh55k1r2d11g7sil5fpw6m2j9k"; + sha256 = "04v10bn24acify34vh5ayymsr1flcyb05f3az9k1s2m6nlxy5gb9"; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "04dkfjb6pxqaalw2y6yli9q58g8x8ppfmibivpvqifk8r8dhkdqp"; + cargoSha256 = "0h0vlz4qd8i9bf1mgjr618zbdwfp6bmy7ql9a1xzjmfdpkl3cgk9"; postInstall = '' installManPage Documentation/git-absorb.1 + for shell in bash zsh fish; do + $out/bin/git-absorb --gen-completions $shell > git-absorb.$shell + installShellCompletion git-absorb.$shell + done ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index 44eba8c4b39c..7c345639e9f8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ''; postInstall = '' - install -D -m 0644 misc/bash_completion/git-bug "$out/etc/bash_completion.d/git-bug" + install -D -m 0644 misc/bash_completion/git-bug "$out/share/bash-completion/completions/git-bug" install -D -m 0644 misc/zsh_completion/git-bug "$out/share/zsh/site-functions/git-bug" install -D -m 0644 -t "$out/share/man/man1" doc/man/* ''; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix new file mode 100644 index 000000000000..05d5dfe96056 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "git-chglog"; + version = "0.9.1"; + + goPackagePath = "github.com/git-chglog/git-chglog"; + + src = fetchFromGitHub { + owner = "git-chglog"; + repo = "git-chglog"; + rev = version; + sha256 = "08x7w1jlvxxvwnz6pvkjmfd3nqayd8n15r9jbqi2amrp31z0gq0p"; + }; + + meta = with lib; { + description = "CHANGELOG generator implemented in Go (Golang)"; + license = licenses.mit; + maintainers = with maintainers; [ ldenefle ]; + }; +} + diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix index 858383f96641..fa77b5307a37 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-cola/default.nix @@ -5,13 +5,13 @@ let in buildPythonApplication rec { pname = "git-cola"; - version = "3.5"; + version = "3.8"; src = fetchFromGitHub { owner = "git-cola"; repo = "git-cola"; rev = "v${version}"; - sha256 = "09b60jbpdr4czx7h4vqahqmmi7m9vn77jlkpjfhys7crrdnxjp9i"; + sha256 = "1qxv2k8lxcxpqx46ka7f042xk90xns5w9lc4009cxmsqvcdba03a"; }; buildInputs = [ git gettext ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix new file mode 100644 index 000000000000..d5abd0a59761 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, fetchFromGitHub, git }: + +python3Packages.buildPythonApplication rec { + pname = "git-delete-merged-branches"; + version = "6.0.5"; + + src = fetchFromGitHub { + owner = "hartwork"; + repo = pname; + rev = version; + sha256 = "1mlmikcpm94nymid35v9rx9dyprhwidgwbdfd5zhsw502d40v0xp"; + }; + + propagatedBuildInputs = with python3Packages; [ + colorama + clintermission + ]; + + checkInputs = [ git ] + ++ (with python3Packages; [ parameterized ]); + + meta = with lib; { + description = "Command-line tool to delete merged Git branches"; + homepage = "https://pypi.org/project/git-delete-merged-branches/"; + license = licenses.gpl3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index ed9e1cd4bdfa..d322a141cd94 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-extras"; - version = "6.0.0"; + version = "6.1.0"; src = fetchzip { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "0mxb3c5lb5n7c76bp10bw7bid564vjxi5f7cvzaj2ss93v5rr11g"; + sha256 = "12ff9rhgqd71xm72r385hx0h8g75hz0ag0adzqcwfa54k0lhrrrz"; }; nativeBuildInputs = [ unixtools.column which ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix index 5a7e5bd32afb..c642f062c7b6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-filter-repo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "git-filter-repo"; - version = "2.28.0"; + version = "2.29.0"; src = fetchurl { url = "https://github.com/newren/git-filter-repo/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "0sa6h6k1mnhx8p8w5d88gx7cqbnxaazfj1dv47c107fk70hqvvpx"; + sha256 = "00nn7k9jqrybb762486fmigsnbcn9lbvimgpfvvarz4ikdp9y9pb"; }; buildInputs = [ pythonPackages.python ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index 46decaf3cc12..13411ed4c41b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "v${version}"; - sha256 = "0wpmabd5lshsga3dhv1hix7i99f1f82rpl6kjmpi315whg11kki3"; + sha256 = "0hhy1yazda9r4n753a5m9jf31fbzmm4v8wvl3pksspj2syglmll8"; }; - cargoSha256 = "0ayqsrhy6hpi20gfryhnwl2c1na4nnmzxkp7him104cc07vsdllq"; + cargoSha256 = "1g2jijx8y34lid9qwa26v4svab5v9ki6gn9vcfiy61dqa964c3l9"; nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index cbb69403531e..dac3c54a16a6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.15.6"; + version = "2.15.7"; src = fetchPypi { inherit pname version; - sha256 = "0ajb3m3i3pfc5v3gshglk7qphk1rpniwx8q8isgx1a6cyarzr9bd"; + sha256 = "0djbl4s9i7bs7kkldr7453yayi38s8mx0i41mkd0j2cvv5r9himr"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix index 99b64e012eae..a01b84a948ad 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-recent/default.nix @@ -1,6 +1,6 @@ {stdenv, git, less, fetchFromGitHub, makeWrapper -# utillinuxMinimal is included because we need the column command -, utillinux +# util-linuxMinimal is included because we need the column command +, util-linux }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp git-recent $out/bin wrapProgram $out/bin/git-recent \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git less utillinux ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ git less util-linux ]}" ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix index 140c2647be22..fe67aca55d14 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-secret/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, git, gnupg, gawk }: let - version = "0.3.2"; + version = "0.3.3"; repo = "git-secret"; in stdenv.mkDerivation { @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit repo; owner = "sobolevn"; rev = "v${version}"; - sha256 = "0n268xlsd9p5f083sqwzpvsqg99fdk876mf8gihkydakrismc45b"; + sha256 = "0hc7yavcp8jmn6b7wngjqhy8kl7f4191sfpik8ycvqghkvvimxj4"; }; buildInputs = [ makeWrapper ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix index dc636571acc0..aa53529933ff 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-stree/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation { }; installPhase = '' - mkdir -p $out/bin $out/etc/bash_completion.d + mkdir -p $out/bin $out/share/bash-completion/completions install -m 0755 git-stree $out/bin/ - install -m 0644 git-stree-completion.bash $out/etc/bash_completion.d/ + install -m 0644 git-stree-completion.bash $out/share/bash-completion/completions/ ''; meta = with lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-trim/default.nix index 137e6eb71589..33534334bea7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-trim"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "foriequal0"; repo = pname; rev = "v${version}"; - sha256 = "0w6qrr53wal4p4jvz35f9mpqwz1vfcymj17sz418n9p9lw45f24n"; + sha256 = "1rb9dhj7b7mjrhsvm9vw5gzjfxj10idnzv488jkfdz7sfhd3fcvz"; }; - cargoSha256 = "1mlvkvgcln59bi249z87v8i0ixq1a7walkzsjml6d219rmy5550h"; + cargoSha256 = "1q62gqqhf78ljcvzp7yrnr0vk65rif2f7axzjq0b87prbcsr7ij4"; nativeBuildInputs = [ pkg-config ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix new file mode 100644 index 000000000000..839acc5cca59 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git-vanity-hash/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "git-vanity-hash"; + version = "2020-02-26-unstable"; + + src = fetchFromGitHub { + owner = "prasmussen"; + repo = "git-vanity-hash"; + rev = "000004122124005af8d118a3f379bfc6ecc1e7c7"; + sha256 = "1wf342zawbphlzvji0yba0qg4f6v67h81nhxqcsir132jv397ma7"; + }; + + cargoSha256 = "0mbdis1kxmgj3wlgznr9bqf5yv0jwlj2f63gr5c99ja0ijccp99h"; + + postInstall = '' + mkdir -p $out/share/doc/git-vanity-hash + cp README.md $out/share/doc/git-vanity-hash + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/prasmussen/git-vanity-hash"; + description = "Tool for creating commit hashes with a specific prefix"; + license = [ licenses.mit ]; + maintainers = [ maintainers.kaction ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 7e40366142a9..57f6703762d1 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -1,8 +1,9 @@ { fetchurl, stdenv, buildPackages +, fetchpatch , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc , openssh, pcre2 -, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 +, asciidoctor, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xsl_ns, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv , svnSupport, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? true @@ -22,7 +23,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.28.0"; + version = "2.29.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -34,7 +35,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "17a311vzimqn1glc9d7x82rhb1mb81m5rr4g8xji8idaafid39fz"; + sha256 = "1h87yv117ypnc0yi86941089c14n91gixk8b6shj2y35prp47z7j"; }; outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; @@ -51,6 +52,12 @@ stdenv.mkDerivation { ./ssh-path.patch ./git-send-email-honor-PATH.patch ./installCheck-path.patch + (fetchpatch { + # https://github.com/git/git/pull/925 + name = "make-manual-reproducible.patch"; + url = "https://github.com/git/git/commit/7a68e9e0b8eda91eb576bbbc5ed66298f3ab761c.patch"; + sha256 = "02naws82pd3vvwrrgqn91kid8qkjihyjaz1ahgjz8qlmnn2avf5n"; + }) ]; postPatch = '' @@ -65,8 +72,8 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ gettext perlPackages.perl ] - ++ stdenv.lib.optionals withManual [ asciidoc texinfo xmlto docbook2x - docbook_xsl docbook_xml_dtd_45 libxslt ]; + ++ stdenv.lib.optionals withManual [ asciidoctor texinfo xmlto docbook2x + docbook_xsl docbook_xsl_ns docbook_xml_dtd_45 libxslt ]; buildInputs = [curl openssl zlib expat cpio makeWrapper libiconv] ++ stdenv.lib.optionals perlSupport [ perlPackages.perl ] ++ stdenv.lib.optionals guiSupport [tcl tk] @@ -145,7 +152,7 @@ stdenv.mkDerivation { } # Install git-subtree. - make -C contrib/subtree install ${stdenv.lib.optionalString withManual "install-doc"} + make -C contrib/subtree install ${stdenv.lib.optionalString withManual "USE_ASCIIDOCTOR=1 install-doc"} rm -rf contrib/subtree # Install contrib stuff. @@ -153,8 +160,8 @@ stdenv.mkDerivation { cp -a contrib $out/share/git/ mkdir -p $out/share/bash-completion/completions ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/git - mkdir -p $out/etc/bash_completion.d - ln -s $out/share/git/contrib/completion/git-prompt.sh $out/etc/bash_completion.d/ + mkdir -p $out/share/bash-completion/completions + ln -s $out/share/git/contrib/completion/git-prompt.sh $out/share/bash-completion/completions/ # grep is a runtime dependency, need to patch so that it's found substituteInPlace $out/libexec/git-core/git-sh-setup \ @@ -229,8 +236,8 @@ stdenv.mkDerivation { notSupported $out/libexec/git-core/git-send-email '') - + stdenv.lib.optionalString withManual ''# Install man pages and Info manual - make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html install-info \ + + stdenv.lib.optionalString withManual ''# Install man pages + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES USE_ASCIIDOCTOR=1 PERL_PATH="${buildPackages.perl}/bin/perl" cmd-list.made install install-html \ -C Documentation '' + (if guiSupport then '' @@ -249,6 +256,7 @@ stdenv.mkDerivation { '') + stdenv.lib.optionalString stdenv.isDarwin '' # enable git-credential-osxkeychain by default if darwin + mkdir -p $out/etc cat > $out/etc/gitconfig << EOF [credential] helper = osxkeychain diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 5b7dbc521f6a..a99ff3c2e08c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gitstatus"; - version = "1.3.0"; + version = "1.4.3"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; rev = "v${version}"; - sha256 = "0zan1sa8c24hpqwj66y9srd4n15f4nk64fc5jrd4smgfgn22wph8"; + sha256 = "0skpi22plzb9r9cgqfnjzpaz856q9f4n0gd5i97nv8bfny8hl30z"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix index 2f99c88a37bc..9c74fa35752f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix @@ -16,7 +16,7 @@ libgit2.overrideAttrs (oldAttrs: { src = fetchFromGitHub { owner = "romkatv"; repo = "libgit2"; - rev = "tag-005f77dca6dbe8788e55139fa1199fc94cc04f9a"; - sha256 = "1h5bnisk4ljdpfzlv8g41m8js9841xyjhfywc5cn8pmyv58c50il"; + rev = "tag-82cefe2b42300224ad3c148f8b1a569757cc617a"; + sha256 = "1vhnqynqyxizzkq1h5dfjm75f0jm5637jh0gypwqqz2yjqrscza0"; }; }) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 6aad5b78fb69..21e382a44bc8 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security }: +{ stdenv, rustPlatform, fetchFromGitHub, libiconv, xorg, python3, Security, AppKit }: rustPlatform.buildRustPackage rec { pname = "gitui"; version = "0.10.1"; @@ -15,12 +15,12 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ python3 ]; buildInputs = [ ] ++ stdenv.lib.optional stdenv.isLinux xorg.libxcb - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security AppKit ]; meta = with stdenv.lib; { description = "Blazing fast terminal-ui for git written in rust"; homepage = "https://github.com/extrawurst/gitui"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 yanganto ]; + maintainers = with maintainers; [ Br1ght0ne yanganto ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix new file mode 100644 index 000000000000..9c2e4f00ca7a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/glab/default.nix @@ -0,0 +1,28 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "glab"; + version = "1.11.1"; + + src = fetchFromGitHub { + owner = "profclems"; + repo = pname; + rev = "v${version}"; + sha256 = "mmrTuldU2WDe9t2nC3DYfqwb28uh6qjAaaveR221mjw="; + }; + + vendorSha256 = "B4RKcKUTdGkonsKhL7NIKzVpZq6XD6cMMWed4wr/Moc="; + runVend = true; + + # Tests are trying to access /homeless-shelter + doCheck = false; + + subPackages = [ "cmd/glab" ]; + + meta = with lib; { + description = "An open-source GitLab command line tool"; + license = licenses.mit; + homepage = "https://glab.readthedocs.io/"; + maintainers = with maintainers; [ freezeboy ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix index 22ffd442fdc9..be8136427971 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, utillinux }: +{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, util-linux }: buildGoPackage rec { pname = "hub"; @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh"; }; - nativeBuildInputs = [ groff installShellFiles utillinux ]; + nativeBuildInputs = [ groff installShellFiles util-linux ]; postPatch = '' patchShebangs . diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix index 2413019ebc7b..3459f5099c97 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg_utils }: buildGoModule rec { pname = "lab"; @@ -17,6 +17,8 @@ buildGoModule rec { doCheck = false; + buildInputs = [ makeWrapper ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' @@ -24,9 +26,10 @@ buildGoModule rec { export LAB_CORE_HOST=a LAB_CORE_USER=b LAB_CORE_TOKEN=c $out/bin/lab completion bash > $out/share/bash-completion/completions/lab $out/bin/lab completion zsh > $out/share/zsh/site-functions/_lab + wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ xdg_utils ]}"; ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"; homepage = "https://zaquestion.github.io/lab"; license = licenses.cc0; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix index 5c4ece7c9e51..5914378f5b35 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/pass-git-helper/default.nix @@ -1,17 +1,21 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pyxdg }: +{ stdenv, buildPythonApplication, fetchFromGitHub, pyxdg, pytest }: buildPythonApplication rec { pname = "pass-git-helper"; - version = "0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "languitar"; repo = "pass-git-helper"; - rev = version; - sha256 = "1zccbmq5l6asl9qm1f90vg9467y3spmv3ayrw07qizrj43yfd9ap"; + rev = "v${version}"; + sha256 = "18nvwlp0w4aqj268wly60rnjzqw2d8jl0hbs6bkwp3hpzzz5g6yd"; }; propagatedBuildInputs = [ pyxdg ]; + checkInputs = [ pytest ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; meta = with stdenv.lib; { homepage = "https://github.com/languitar/pass-git-helper"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 4a02baa465c6..3abfd3a31392 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -29,6 +29,6 @@ in crystal.buildCrystalPackage rec { description = "A better one-line git log"; homepage = "https://github.com/taylorthurlow/thicket"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix index 0da0cfa02b63..9577b56b6c73 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/topgit/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl git ]; postInstall = '' - install -Dm644 README -t"$out/share/doc/${pname}-${version}/" - install -Dm755 contrib/tg-completion.bash -t "$out/etc/bash_completion.d/" + install -Dm644 README -t "$out/share/doc/${pname}-${version}/" + install -Dm755 contrib/tg-completion.bash -t "$out/share/bash-completion/completions/" ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix index 589d53b3cfaa..c99c70379df4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, utillinux, gnugrep, gnused, gawk }: +{ stdenv, fetchFromGitHub, git, makeWrapper, openssl, coreutils, util-linux, gnugrep, gnused, gawk }: stdenv.mkDerivation rec { pname = "transcrypt"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1dkr69plk16wllk5bzlkchrzw63pk239dgbjhrb3mb61i065jdam"; }; - buildInputs = [ makeWrapper git openssl coreutils utillinux gnugrep gnused gawk ]; + buildInputs = [ makeWrapper git openssl coreutils util-linux gnugrep gnused gawk ]; patches = [ ./helper-scripts_depspathprefix.patch ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt wrapProgram $out/bin/transcrypt \ - --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils utillinux gnugrep gnused gawk ]}" + --prefix PATH : "${stdenv.lib.makeBinPath [ git openssl coreutils util-linux gnugrep gnused gawk ]}" cat > $out/bin/transcrypt-depspathprefix << EOF #!${stdenv.shell} |