Merge pull request #68455 from rvolosatovs/update/git-lfs
git-lfs: 2.7.2 -> 2.8.0, ensure go 1.13 compatibility
This commit is contained in:
commit
2fe6173cc6
1 changed files with 19 additions and 13 deletions
|
@ -1,26 +1,32 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub }:
|
||||
{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "git-lfs";
|
||||
version = "2.7.2";
|
||||
|
||||
goPackagePath = "github.com/git-lfs/git-lfs";
|
||||
version = "2.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "git-lfs";
|
||||
repo = "git-lfs";
|
||||
sha256 = "1nf40rbdz901vsahg5cm09pznpina6wimmxl0lmh8pn0mi51yzvc";
|
||||
sha256 = "17x9q4g1acf51bxr9lfmd2ym7w740n4ghdi0ncmma77kwabw9d3x";
|
||||
};
|
||||
|
||||
preBuild = ''
|
||||
pushd go/src/github.com/git-lfs/git-lfs
|
||||
go generate ./commands
|
||||
popd
|
||||
'';
|
||||
modSha256 = "1rjscc52rh8kxa64canw3baljllp1c639nsn89hs5b86c8v1jav7";
|
||||
|
||||
postInstall = ''
|
||||
rm -v $bin/bin/{man,script,cmd}
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
# Build fails on v2.8.0 with go 1.13 due to invalid dependency version:
|
||||
# go: github.com/git-lfs/go-ntlm@v0.0.0-20190307203151-c5056e7fa066: invalid pseudo-version: does not match version-control timestamp (2019-04-01T17:57:52Z)
|
||||
# TODO: Remove once https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01 lands in a release.
|
||||
url = "https://github.com/git-lfs/git-lfs/commit/cd83f4224ce02398bdbf8b05830d92220d9b8e01.patch";
|
||||
sha256 = "17nmnlkknglqhzrky5caskbscrjp7kp9b5mfqznh1jx2hbxzlpbj";
|
||||
})
|
||||
];
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
preBuild = ''
|
||||
go generate ./commands
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
Loading…
Reference in a new issue