diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index f2d87fd69dd..eca841350de 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,28 +1,23 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "git-lfs"; - version = "2.8.0"; + version = "2.10.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "17x9q4g1acf51bxr9lfmd2ym7w740n4ghdi0ncmma77kwabw9d3x"; + sha256 = "1y5ryk0iz5g5sqaw79ml6fr5kvjgzcah481pk5qmnb2ipb1xlng9"; }; - goPackagePath = "github.com/git-lfs/git-lfs"; + modSha256 = "1rvvgyg4gqbli4pwfnmyz59gf14k7925mdqj6ykp542gwnsjgjp2"; subPackages = [ "." ]; - preBuild = '' - cd go/src/${goPackagePath} - go generate ./commands - ''; - meta = with stdenv.lib; { description = "Git extension for versioning large files"; - homepage = https://git-lfs.github.com/; + homepage = "https://git-lfs.github.com/"; license = [ licenses.mit ]; maintainers = [ maintainers.twey ]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf92cae7a6a..71f7659e650 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3640,11 +3640,7 @@ in git-crecord = callPackage ../applications/version-management/git-crecord { }; - git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { - # Version 2.8.0 fails with go1.13 - # go: github.com/alexbrainman/sspi@v0.0.0-20180125232955-4729b3d4d858: Get https://proxy.golang.org/github.com/alexbrainman/sspi/@v/v0.0.0-20180125232955-4729b3d4d858.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:32932->[::1]:53: read: connection refused - buildGoPackage = buildGo112Package; - }); + git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { };