diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:09:43 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-16 10:09:43 +0200 |
commit | 3d8e43691731037672c36129cbecb2fe43ffad7e (patch) | |
tree | c7f5fe5732dd22a66330d041ee7b0139f75b412d /pkgs/applications/version-management | |
parent | a04625379a9e842cb987197c4f273de1bea807b7 (diff) | |
parent | 342eaba9ebbc68923c1028a56be1c94e74862832 (diff) | |
download | nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.tar nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.tar.gz nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.tar.bz2 nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.tar.lz nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.tar.xz nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.tar.zst nixlib-3d8e43691731037672c36129cbecb2fe43ffad7e.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/version-management')
3 files changed, 13 insertions, 9 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix index ab558ec42d92..0a3360b33b0d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -2,23 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "git-trim"; - version = "0.2.4"; + version = "0.3.1"; src = fetchFromGitHub { owner = "foriequal0"; repo = pname; rev = "v${version}"; - sha256 = "0gfmv9bwhh6bv0s9kfbxq9wsvrk3zz3ibavbpp9l8cpqc3145pqy"; + sha256 = "06wni47s8yq274bh5f7bcy0sah23938kjiw5pdxnma5kwwnrccrr"; }; - cargoSha256 = "0xklczk4vbh2mqf76r3rsfyclyza9imf6yss7vbkm9w4ir3ar9f3"; + cargoSha256 = "06ndja8212xy4rybh1117wijsyj70w4z8h6km538a7598s49vzdk"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; postInstall = '' - install -Dm644 docs/git-trim.md.1 $out/share/man/man1/git-trim.1 + install -Dm644 -t $out/share/man/man1/ docs/git-trim.1 ''; # fails with sandbox diff --git a/pkgs/applications/version-management/git-and-tools/git/update.sh b/pkgs/applications/version-management/git-and-tools/git/update.sh index a9fa18be1558..d0bc413fb893 100755 --- a/pkgs/applications/version-management/git-and-tools/git/update.sh +++ b/pkgs/applications/version-management/git-and-tools/git/update.sh @@ -5,14 +5,15 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')" latestTag="$(git ls-remote --tags --sort="v:refname" git://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" +targetVersion="${1:-latestTag}" -if [ ! "${oldVersion}" = "${latestTag}" ]; then - update-source-version git "${latestTag}" +if [ ! "${oldVersion}" = "${targetVersion}" ]; then + update-source-version git "${targetVersion}" nixpkgs="$(git rev-parse --show-toplevel)" default_nix="$nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix" nix-build -A git git add "${default_nix}" - git commit -m "git: ${oldVersion} -> ${latestTag}" + git commit -m "git: ${oldVersion} -> ${targetVersion}" else echo "git is already up-to-date" fi diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix index 20d88b399c5a..cb03a9b42a25 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -31,10 +31,13 @@ stdenv.mkDerivation rec { make install make install-doc + # fixes tig-completion __git-complete dependency + sed -i '1s;^;source ${git}/share/bash-completion/completions/git\n;' contrib/tig-completion.bash + substituteInPlace contrib/tig-completion.zsh \ - --replace 'e=$(dirname ''${funcsourcetrace[1]%:*})/tig-completion.bash' "e=$out/etc/bash_completion.d/tig-completion.bash" + --replace 'e=$(dirname ''${funcsourcetrace[1]%:*})/tig-completion.bash' "e=$out/share/bash-completion/completions/tig" - install -D contrib/tig-completion.bash $out/etc/bash_completion.d/tig-completion.bash + install -D contrib/tig-completion.bash $out/share/bash-completion/completions/tig install -D contrib/tig-completion.zsh $out/share/zsh/site-functions/_tig cp contrib/vim.tigrc $out/etc/ |