From cba00cb44b6ff0178d4876c3c618d9adeb005922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= <twey@twey.co.uk>
Date: Tue, 18 Apr 2017 18:53:51 +0100
Subject: [PATCH] git-lfs: 1.3.1 -> 2.0.2

fixes #25004
---
 .../version-management/git-lfs/default.nix    | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
index c33ffb5cefb..6543f40c4da 100644
--- a/pkgs/applications/version-management/git-lfs/default.nix
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -1,30 +1,33 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "git-lfs-${version}";
-  # NOTE: use versions after 1.2.1
-  version = "1.3.1";
-  rev = "9c9dffb1b5baddfa06f280ef1b5fbf68ecbc90b1";
-  
-  goPackagePath = "github.com/github/git-lfs";
+  version = "2.0.2";
+  rev = "85e2aec4d949517b4a7a53e4f745689331952b6c";
+
+  goPackagePath = "github.com/git-lfs/git-lfs";
 
   src = fetchFromGitHub {
     inherit rev;
-    owner = "github";
+    owner = "git-lfs";
     repo = "git-lfs";
-    sha256 = "0fg48jxh0gmd0w5yy3avascaasxk85019qayaikzfkym8bdqplb2";
+    sha256 = "0cvs17rd4qgaqj9vz6pwx9y3ni8c99gzykc3as92x37962nmq5cy";
   };
 
-  # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'
-  excludedPackages = [ "test" ];
-
   preBuild = ''
-    pushd go/src/github.com/github/git-lfs
-      go generate ./commands
+    pushd go/src/github.com/git-lfs/git-lfs
+    go generate ./commands
     popd
   '';
 
   postInstall = ''
-    rm -v $bin/bin/{man,script}
+    rm -v $bin/bin/{man,script,genmakefile}
   '';
+
+  meta = with stdenv.lib; {
+    description = "Git extension for versioning large files";
+    homepage    = https://git-lfs.github.com/;
+    license     = [ licenses.mit ];
+    maintainers = [ maintainers.twey ];
+  };
 }