From ece0626593674e4962a432ee685df54917adaa0b Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 3 Jun 2016 13:37:23 +0200
Subject: [PATCH] git-lfs: extracted from goPackages

---
 .../version-management/git-lfs/default.nix    | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/go-packages.nix                | 21 -------------
 3 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/applications/version-management/git-lfs/default.nix

diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix
new file mode 100644
index 000000000000..5186d2a5ba90
--- /dev/null
+++ b/pkgs/applications/version-management/git-lfs/default.nix
@@ -0,0 +1,31 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "git-lfs-${version}";
+  version = "1.2.0";
+  rev = "v${version}";
+  
+  goPackagePath = "github.com/github/git-lfs";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/github/git-lfs";
+    sha256 = "0z8giavcvfpzmhnxxsqvsgabjfq5gpka8jy4qvadf60yibxds9fp";
+  };
+
+  # 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
+    popd
+  '';
+
+  postInstall = ''
+    rm -v $bin/bin/{man,script}
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f473461b8b11..e0c02f58a5a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1690,7 +1690,7 @@ in
 
   gifsicle = callPackage ../tools/graphics/gifsicle { };
 
-  git-lfs = goPackages.git-lfs.bin // { outputs = [ "bin" ]; };
+  git-lfs = (callPackage ../applications/version-management/git-lfs {}).bin;
 
   gitfs = callPackage ../tools/filesystems/gitfs { };
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f056b5273a0e..dfc21301c05c 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -971,27 +971,6 @@ let
     sha256 = "124hci9whsvlcywsfz5y20kkj3nhy176a1d5s1lkvsga09yxq6wm";
   };
 
-  git-lfs = buildFromGitHub {
-    version = "1.1.1";
-    rev = "v1.1.1";
-    owner = "github";
-    repo = "git-lfs";
-    sha256 = "1m7kii57jrsb22m5x9v8xa3s1qmipfkpk6cscgxrbrj7g0a75fnc";
-
-    # 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
-      popd
-    '';
-
-    postInstall = ''
-      rm -v $bin/bin/{man,script}
-    '';
-  };
-
   glide = buildFromGitHub {
     rev    = "0.10.2";
     owner  = "Masterminds";