Skip to content

Commit 2a9b003

Browse files
nightmarednightmared
committed
yj: 4.0.0 -> 5.0.0
Necessary to advance cargo2nix/cargo2nix#165 (older versions of yj didn't differenciate between integers and floats, which can break cargo manifests when converting from TOML to JSON and back).
1 parent 043683f commit 2a9b003

2 files changed

Lines changed: 12 additions & 45 deletions

File tree

‎pkgs/development/tools/yj/default.nix‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
# This file was generated by https://github.com/kamilchm/go2nix v1.3.0
2-
{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
1+
{ stdenv, buildGoModule, fetchFromGitHub }:
32

4-
buildGoPackage rec {
3+
buildGoModule rec {
54
pname = "yj";
6-
version = "4.0.0";
7-
rev = "d9a48607cc5c812e8cf4abccc8ad26f37ab51558";
5+
version = "5.0.0";
86

9-
goPackagePath = "github.com/sclevine/yj";
10-
11-
src = fetchgit {
12-
inherit rev;
13-
url = "https://github.com/sclevine/yj";
14-
sha256 = "04irphzs6hp9hvyski29ad29ga1kis3h8bw7jqvmy2c2rkrrsh7x";
7+
src = fetchFromGitHub {
8+
owner = "sclevine";
9+
repo = "yj";
10+
rev = "c4c13b7641389c76ea028b48091f851f3efb6376";
11+
sha256 = "0bnb88wfm2vagh4yb1h9xhp3045ga0b6a77n3j2z5b4mvwshx5dr";
1512
};
1613

17-
goDeps = ./deps.nix;
14+
vendorSha256 = "0y0n9fsb85qlpf9slwsxzarmfi98asa4x04qp2r8pagl28l0i8wv";
15+
16+
buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ];
1817

1918
meta = with stdenv.lib; {
2019
description = ''Convert YAML <=> TOML <=> JSON <=> HCL'';
2120
license = licenses.asl20;
2221
maintainers = with maintainers; [ Profpatsch ];
23-
downloadPage = "https://github.com/sclevine/yj";
24-
updateWalker = true;
25-
inherit version;
22+
homepage = "https://github.com/sclevine/yj";
2623
};
2724
}

‎pkgs/development/tools/yj/deps.nix‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)