diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:45:39 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-05-12 14:56:01 +0000 |
commit | eb7dadee9c0f903f1152f8dd4165453bfa48ccf4 (patch) | |
tree | a6bd66dcbec895aae167465672af08a1ca70f089 /nixpkgs/pkgs/applications/version-management/git-lfs | |
parent | 3879b925f5dae3a0eb5c98b10c1ac5a0e4d729a3 (diff) | |
parent | 683c68232e91f76386db979c461d8fbe2a018782 (diff) | |
download | nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.gz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.bz2 nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.lz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.xz nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.tar.zst nixlib-eb7dadee9c0f903f1152f8dd4165453bfa48ccf4.zip |
Merge commit '683c68232e91f76386db979c461d8fbe2a018782'
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management/git-lfs')
-rw-r--r-- | nixpkgs/pkgs/applications/version-management/git-lfs/1.nix | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/version-management/git-lfs/default.nix | 24 |
2 files changed, 20 insertions, 12 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix b/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix index 0e0d75b0919c..5b2a9906a4f8 100644 --- a/nixpkgs/pkgs/applications/version-management/git-lfs/1.nix +++ b/nixpkgs/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/"; diff --git a/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix index eca841350deb..80f236559f9e 100644 --- a/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix @@ -1,24 +1,36 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: -buildGoModule rec { +buildGoPackage rec { pname = "git-lfs"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1y5ryk0iz5g5sqaw79ml6fr5kvjgzcah481pk5qmnb2ipb1xlng9"; + sha256 = "05qd96bn2cl7gn5qarbcv6scdpj28qiwdfzalamqk5jjiidpmng5"; }; - modSha256 = "1rvvgyg4gqbli4pwfnmyz59gf14k7925mdqj6ykp542gwnsjgjp2"; + goPackagePath = "github.com/git-lfs/git-lfs"; + + nativeBuildInputs = [ ronn installShellFiles ]; + + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/config.Vendor=${version} -X ${goPackagePath}/config.GitCommit=${src.rev}" ]; subPackages = [ "." ]; + postBuild = '' + make -C go/src/${goPackagePath} man + ''; + + postInstall = '' + installManPage go/src/${goPackagePath}/man/*.{1,5} + ''; + meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; license = [ licenses.mit ]; - maintainers = [ maintainers.twey ]; + maintainers = [ maintainers.twey maintainers.marsam ]; }; } |