From 2a9b003ca7941ea85a6912ebba6c402f6bfe755c Mon Sep 17 00:00:00 2001 From: Simon THOBY Date: Wed, 23 Dec 2020 18:23:09 +0100 Subject: [PATCH] yj: 4.0.0 -> 5.0.0 Necessary to advance https://github.com/cargo2nix/cargo2nix/pull/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). --- pkgs/development/tools/yj/default.nix | 27 +++++++++++------------- pkgs/development/tools/yj/deps.nix | 30 --------------------------- 2 files changed, 12 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/tools/yj/deps.nix diff --git a/pkgs/development/tools/yj/default.nix b/pkgs/development/tools/yj/default.nix index 94237abf89b..43771e4b679 100644 --- a/pkgs/development/tools/yj/default.nix +++ b/pkgs/development/tools/yj/default.nix @@ -1,27 +1,24 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "yj"; - version = "4.0.0"; - rev = "d9a48607cc5c812e8cf4abccc8ad26f37ab51558"; + version = "5.0.0"; - goPackagePath = "github.com/sclevine/yj"; - - src = fetchgit { - inherit rev; - url = "https://github.com/sclevine/yj"; - sha256 = "04irphzs6hp9hvyski29ad29ga1kis3h8bw7jqvmy2c2rkrrsh7x"; + src = fetchFromGitHub { + owner = "sclevine"; + repo = "yj"; + rev = "c4c13b7641389c76ea028b48091f851f3efb6376"; + sha256 = "0bnb88wfm2vagh4yb1h9xhp3045ga0b6a77n3j2z5b4mvwshx5dr"; }; - goDeps = ./deps.nix; + vendorSha256 = "0y0n9fsb85qlpf9slwsxzarmfi98asa4x04qp2r8pagl28l0i8wv"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; meta = with stdenv.lib; { description = ''Convert YAML <=> TOML <=> JSON <=> HCL''; license = licenses.asl20; maintainers = with maintainers; [ Profpatsch ]; - downloadPage = "https://github.com/sclevine/yj"; - updateWalker = true; - inherit version; + homepage = "https://github.com/sclevine/yj"; }; } diff --git a/pkgs/development/tools/yj/deps.nix b/pkgs/development/tools/yj/deps.nix deleted file mode 100644 index 0bfe7f5f5da..00000000000 --- a/pkgs/development/tools/yj/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "cf7d376da96d9cecec7c7483cec2735efe54a410"; - sha256 = "0i1zhgpyvvgwkz74k8wd3sygsap1saqv37rw0j5vdpaazmpr1qkb"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -]