diff options
| author | Aaron Jheng <wentworth@outlook.com> | 2022-11-10 14:39:46 +0000 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2022-11-11 13:30:43 +0100 |
| commit | 7ea7637cb23a54ffbefffe55c90ac2d431ae0926 (patch) | |
| tree | c4fcb52bff9df568e86eba96aa894fa60a6cf084 /pkgs/tools/misc/yajsv | |
| parent | f7d11c70b49c8155e9ed9d7e5a9b3b0c86507849 (diff) | |
| download | nixpkgs-7ea7637cb23a54ffbefffe55c90ac2d431ae0926.tar nixpkgs-7ea7637cb23a54ffbefffe55c90ac2d431ae0926.tar.gz nixpkgs-7ea7637cb23a54ffbefffe55c90ac2d431ae0926.tar.bz2 nixpkgs-7ea7637cb23a54ffbefffe55c90ac2d431ae0926.tar.lz nixpkgs-7ea7637cb23a54ffbefffe55c90ac2d431ae0926.tar.xz nixpkgs-7ea7637cb23a54ffbefffe55c90ac2d431ae0926.tar.zst nixpkgs-7ea7637cb23a54ffbefffe55c90ac2d431ae0926.zip | |
yajsv: 1.4.0 -> 1.4.1
Diffstat (limited to 'pkgs/tools/misc/yajsv')
| -rw-r--r-- | pkgs/tools/misc/yajsv/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/tools/misc/yajsv/go.mod.patch | 30 |
2 files changed, 8 insertions, 37 deletions
diff --git a/pkgs/tools/misc/yajsv/default.nix b/pkgs/tools/misc/yajsv/default.nix index cae0b9042c8..aaeba02ae35 100644 --- a/pkgs/tools/misc/yajsv/default.nix +++ b/pkgs/tools/misc/yajsv/default.nix @@ -1,7 +1,9 @@ { buildGoModule, fetchFromGitHub, lib }: -let version = "1.4.0"; -in buildGoModule { +let + version = "1.4.1"; +in +buildGoModule { pname = "yajsv"; version = version; @@ -9,16 +11,15 @@ in buildGoModule { owner = "neilpa"; repo = "yajsv"; rev = "v${version}"; - sha256 = "0smaij3905fqgcjmnfs58r6silhp3hyv7ccshk7n13fmllmsm7v7"; + hash = "sha256-dp7PBN8yR+gPPUWA+ug11dUN7slU6CJAojuxt5eNTxA="; }; - patches = [ - ./go.mod.patch - ]; + vendorHash = "sha256-f45climGKl7HxD+1vz2TGqW/d0dqJ0RfvgJoRRM6lUk="; - vendorSha256 = "0jcm789las02prgl89va8xvvz98sjcyvzd9zqk3mwal656b5r3kz"; + ldflags = [ "-s" "-w" ]; doInstallCheck = true; + installCheckPhase = '' $out/bin/yajsv -v > /dev/null ''; diff --git a/pkgs/tools/misc/yajsv/go.mod.patch b/pkgs/tools/misc/yajsv/go.mod.patch deleted file mode 100644 index 3b1c09f8188..00000000000 --- a/pkgs/tools/misc/yajsv/go.mod.patch +++ /dev/null @@ -1,30 +0,0 @@ -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= |