From c5e963f36c34fc697e53b95e84d48c7f3eac270a Mon Sep 17 00:00:00 2001
From: Sondre Nilsen <nilsen.sondre@gmail.com>
Date: Fri, 19 Apr 2019 16:34:40 +0200
Subject: [PATCH 1/2] git-ignore: 0.2.0 -> 1.0.0

---
 .../git-and-tools/git-ignore/default.nix        | 17 +++++++++++------
 1 file changed, 11 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 9edcf4c3ac4..7d5b779e34e 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
@@ -3,24 +3,29 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "git-ignore-${version}";
-  version = "0.2.0";
-
-  cargoSha256 = "1fqfy8lnvpn5sd3l73x2p359zq4303vsrdgw3aphvy6580yjb84d";
+  pname = "git-ignore";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "sondr3";
-    repo = "git-ignore";
+    repo = pname;
     rev = "v${version}";
-    sha256 = "1nihh5inh46r8jg9z7d6g9gqfyhrznmkn15nmzpbnzf0653dl629";
+    sha256 = "0krz50pw9bkyzl78bvppk6skbpjp8ga7bd34jya4ha1xfmd8p89c";
   };
 
+  cargoSha256 = "0r6whz8vghhjyc5vrr0n172nghmi61zj96lk26qm0bgxqyzll1kj";
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl ]
   ++ stdenv.lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
   ];
 
+  preFixup = ''
+    mkdir -p "$out/man/man1"
+    cp target/release/build/git-ignore-*/out/git-ignore.1 "$out/man/man1/"
+  '';
+
   meta = with stdenv.lib; {
     description = "Quickly and easily fetch .gitignore templates from gitignore.io";
     homepage = https://github.com/sondr3/git-ignore;

From dd5ac26e785bb2ce1fc9ad60d64c4eb9d738f0dd Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 20 Apr 2019 08:00:24 +0200
Subject: [PATCH 2/2] git-ignore: split outputs

Use a separate `man` output[1]. All outputs will be installed when using
the package i.e. with `nix-env -f . -iA gitAndTools.git-ignore`.

[1] https://nixos.org/nix/manual/#ssec-derivation
---
 .../version-management/git-and-tools/git-ignore/default.nix  | 5 +++--
 1 file changed, 3 insertions(+), 2 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 7d5b779e34e..df1f007faa7 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
@@ -21,9 +21,10 @@ buildRustPackage rec {
     darwin.apple_sdk.frameworks.Security
   ];
 
+  outputs = [ "out" "man" ];
   preFixup = ''
-    mkdir -p "$out/man/man1"
-    cp target/release/build/git-ignore-*/out/git-ignore.1 "$out/man/man1/"
+    mkdir -p "$man/man/man1"
+    cp target/release/build/git-ignore-*/out/git-ignore.1 "$man/man/man1/"
   '';
 
   meta = with stdenv.lib; {