diff options
| author | ajs124 <git@ajs124.de> | 2022-04-13 13:49:32 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2022-05-22 13:47:13 +0000 |
| commit | d07070507c76d766535fa1059e2dcc86051d4edd (patch) | |
| tree | a20c6c7dde24132f38dc32589989df1ec2dfd028 /pkgs/tools/misc/yajsv | |
| parent | ceebedb1dbf3f52c0c932cf7bb907d47455cf4dd (diff) | |
| download | nixpkgs-d07070507c76d766535fa1059e2dcc86051d4edd.tar nixpkgs-d07070507c76d766535fa1059e2dcc86051d4edd.tar.gz nixpkgs-d07070507c76d766535fa1059e2dcc86051d4edd.tar.bz2 nixpkgs-d07070507c76d766535fa1059e2dcc86051d4edd.tar.lz nixpkgs-d07070507c76d766535fa1059e2dcc86051d4edd.tar.xz nixpkgs-d07070507c76d766535fa1059e2dcc86051d4edd.tar.zst nixpkgs-d07070507c76d766535fa1059e2dcc86051d4edd.zip | |
yajsv: fix build with newer go
Diffstat (limited to 'pkgs/tools/misc/yajsv')
| -rw-r--r-- | pkgs/tools/misc/yajsv/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/yajsv/go.mod.patch | 30 |
2 files changed, 35 insertions, 1 deletions
diff --git a/pkgs/tools/misc/yajsv/default.nix b/pkgs/tools/misc/yajsv/default.nix index 6e5f20bfbd2..cae0b9042c8 100644 --- a/pkgs/tools/misc/yajsv/default.nix +++ b/pkgs/tools/misc/yajsv/default.nix @@ -12,7 +12,11 @@ in buildGoModule { sha256 = "0smaij3905fqgcjmnfs58r6silhp3hyv7ccshk7n13fmllmsm7v7"; }; - vendorSha256 = "0rmc31i5jra2qcqhw1azflmhawxasrq0d6qwd6qp250sj1jr6ahq"; + patches = [ + ./go.mod.patch + ]; + + vendorSha256 = "0jcm789las02prgl89va8xvvz98sjcyvzd9zqk3mwal656b5r3kz"; doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/tools/misc/yajsv/go.mod.patch b/pkgs/tools/misc/yajsv/go.mod.patch new file mode 100644 index 00000000000..3b1c09f8188 --- /dev/null +++ b/pkgs/tools/misc/yajsv/go.mod.patch @@ -0,0 +1,30 @@ +diff --git a/go.mod b/go.mod +index 9f96eaf..360ab47 100644 +--- a/go.mod ++++ b/go.mod +@@ -7,5 +7,6 @@ require ( + github.com/ghodss/yaml v1.0.0 + github.com/mitchellh/go-homedir v1.1.0 + github.com/xeipuuv/gojsonschema v1.2.0 ++ golang.org/x/text v0.3.7 + gopkg.in/yaml.v2 v2.2.8 // indirect + ) +diff --git a/go.sum b/go.sum +index 5b7e5c4..4b002ef 100644 +--- a/go.sum ++++ b/go.sum +@@ -1,4 +1,3 @@ +-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= + github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= + github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= + github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +@@ -17,6 +16,9 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= + github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= + github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= ++golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= ++golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= ++golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= + gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= + gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= |