diff options
author | Jonas Heinrich <onny@project-insanity.org> | 2023-01-25 10:41:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-25 10:41:06 +0100 |
commit | 53909654c0f2a1015146eb65c6e6ae727ab88636 (patch) | |
tree | da98d3b4de852d9f7d9c0847ce90065b9c38fa7e | |
parent | 612d1e9b3e8bc5fa78c18b6a734c64eca0c6207b (diff) | |
parent | 1d0d0a31ec7b96a6aad62b99694dcb9926da7854 (diff) |
Merge pull request #212341 from aaronjheng/json-plot
json-plot: use buildGoModule
-rw-r--r-- | pkgs/applications/graphics/json-plot/default.nix | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/json-plot/default.nix b/pkgs/applications/graphics/json-plot/default.nix index 9b43518a87d24..39c4b45cd1d6d 100644 --- a/pkgs/applications/graphics/json-plot/default.nix +++ b/pkgs/applications/graphics/json-plot/default.nix @@ -1,10 +1,9 @@ { lib , fetchFromGitHub -, buildGoPackage +, fetchpatch +, buildGoModule }: -# upstream is pretty stale, but it still works, so until they merge module -# support we have to use gopath: see sgreben/jp#29 -buildGoPackage rec { +buildGoModule rec { pname = "json-plot"; version = "1.1.12"; @@ -15,7 +14,17 @@ buildGoPackage rec { hash = "sha256-WWARAh/CF3lGli3VLRzAGaCA8xQyryPi8WcuwvdInjk="; }; - goPackagePath = "github.com/sgreben/jp"; + vendorHash = "sha256-EPrlaUHAGATNFv3qgWKGmJdu9EHsV/0DJKEvQck+fWc="; + + patches = [ + # Add Go Modules support + (fetchpatch { + url = "https://github.com/sgreben/jp/commit/9516fb4d7c5b011071b4063ea8e8e9667e57a777.patch"; + hash = "sha256-Vz5HnStrCpMN1L7dne7JDX5F57up3EBPPf/9hN9opRc="; + }) + ]; + + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Dead simple terminal plots from JSON (or CSV) data. Bar charts, line charts, scatter plots, histograms and heatmaps are supported."; |