From 16b418177ced67fa7b9b50fa3fa76a7a77486246 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2020 20:06:45 +1000 Subject: [PATCH] git-lfs1: use subPackages --- pkgs/applications/version-management/git-lfs/1.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix index 0e0d75b0919c..5b2a9906a4f8 100644 --- a/pkgs/applications/version-management/git-lfs/1.nix +++ b/pkgs/applications/version-management/git-lfs/1.nix @@ -4,7 +4,7 @@ buildGoPackage rec { pname = "git-lfs"; version = "1.5.6"; rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0"; - + goPackagePath = "github.com/git-lfs/git-lfs"; src = fetchFromGitHub { @@ -14,8 +14,7 @@ buildGoPackage rec { sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d"; }; - # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block' - excludedPackages = [ "test" ]; + subPackages = [ "." ]; preBuild = '' pushd go/src/github.com/git-lfs/git-lfs @@ -23,9 +22,6 @@ buildGoPackage rec { popd ''; - postInstall = '' - rm -v $bin/bin/{man,script} - ''; meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/";