From 91a9c5a9beb0028d2d556c2f3cd39f17d8bc8c2f Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 16 May 2022 19:20:59 -0700 Subject: [PATCH 1/2] git-ignore: 1.1.1 -> 1.2.0 --- .../git-and-tools/git-ignore/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 5ff6d6b1f84..0cbda8733d3 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { pname = "git-ignore"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "sondr3"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bKIBPqGKiS3ey8vH2F4EoleV1H2PTOp+71d/YW3jkT0="; + sha256 = "sha256-Bfr+4zDi6QqirlqccW1jU95eb4q82ZFG9LtT2mCPYLc="; }; - cargoSha256 = "sha256-7jPNVBf5DYtE8nsh7LIywMCjU7ODZ3qFsmBie2mZ3h8="; + cargoSha256 = "sha256-ehEUI4M2IxqS6QhyqOncwP+w6IGbIlSFNIP/FEVH/JI="; nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ openssl ] @@ -21,9 +21,8 @@ buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - outputs = [ "out" "man" ]; - preFixup = '' - installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1 + postInstall = '' + installManPage assets/git-ignore.1 ''; meta = with lib; { From c1436e20bfbd8d3dd62d8ee591cbd25c99d02db7 Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Mon, 16 May 2022 19:51:42 -0700 Subject: [PATCH 2/2] git-ignore: install shell completions --- .../version-management/git-and-tools/git-ignore/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 0cbda8733d3..98da70a274e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -23,6 +23,8 @@ buildRustPackage rec { postInstall = '' installManPage assets/git-ignore.1 + # There's also .elv and .ps1 completion files but I don't know where to install those + installShellCompletion assets/git-ignore.{bash,fish} --zsh assets/_git-ignore ''; meta = with lib; {