diff options
author | Roman Volosatovs <rvolosatovs@riseup.net> | 2019-09-10 22:54:37 +0200 |
---|---|---|
committer | Roman Volosatovs <rvolosatovs@riseup.net> | 2019-09-10 22:55:30 +0200 |
commit | 9630cb4b8dbeaa11a94f2a88a529e9ff1666f304 (patch) | |
tree | 26f4fc788ff4fe353093cb39caa439a1f8033f85 /pkgs/applications/version-management/git-lfs | |
parent | d9b290000e94e35e40c55a717ec1ccbd749e7f31 (diff) | |
download | nixpkgs-9630cb4b8dbeaa11a94f2a88a529e9ff1666f304.tar nixpkgs-9630cb4b8dbeaa11a94f2a88a529e9ff1666f304.tar.gz nixpkgs-9630cb4b8dbeaa11a94f2a88a529e9ff1666f304.tar.bz2 nixpkgs-9630cb4b8dbeaa11a94f2a88a529e9ff1666f304.tar.lz nixpkgs-9630cb4b8dbeaa11a94f2a88a529e9ff1666f304.tar.xz nixpkgs-9630cb4b8dbeaa11a94f2a88a529e9ff1666f304.tar.zst nixpkgs-9630cb4b8dbeaa11a94f2a88a529e9ff1666f304.zip |
git-lfs: 2.7.2 -> 2.8.0, ensure go 1.13 compatibility
Diffstat (limited to 'pkgs/applications/version-management/git-lfs')
-rw-r--r-- | pkgs/applications/version-management/git-lfs/default.nix | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index d9b5e170497..261ae3317f2 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -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"; }; + modSha256 = "1rjscc52rh8kxa64canw3baljllp1c639nsn89hs5b86c8v1jav7"; + + 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 = '' - pushd go/src/github.com/git-lfs/git-lfs go generate ./commands - popd - ''; - - postInstall = '' - rm -v $bin/bin/{man,script,cmd} ''; meta = with stdenv.lib; { |