diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-28 15:30:15 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-28 22:14:42 +0000 |
| commit | 80e4dc93ce4bb109cd00a98f0b39151f09de9d9b (patch) | |
| tree | 64aa611a6a199dc0f40fc56d050d99e125e5c830 /nixpkgs/pkgs/applications/version-management/git-lfs/default.nix | |
| parent | bfa679f5a8e9beff6008ea0e9d5eabfa68018e20 (diff) | |
| parent | 2436c27541b2f52deea3a4c1691216a02152e729 (diff) | |
| download | nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.gz nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.bz2 nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.lz nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.xz nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.tar.zst nixlib-80e4dc93ce4bb109cd00a98f0b39151f09de9d9b.zip | |
Merge commit '2436c27541b2f52deea3a4c1691216a02152e729'
Diffstat (limited to 'nixpkgs/pkgs/applications/version-management/git-lfs/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/applications/version-management/git-lfs/default.nix | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix index 261ae3317f2e..f2d87fd69dde 100644 --- a/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: +{ stdenv, buildGoPackage, fetchFromGitHub }: -buildGoModule rec { +buildGoPackage rec { pname = "git-lfs"; version = "2.8.0"; @@ -11,21 +11,12 @@ buildGoModule rec { 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"; - }) - ]; + goPackagePath = "github.com/git-lfs/git-lfs"; subPackages = [ "." ]; preBuild = '' + cd go/src/${goPackagePath} go generate ./commands ''; |