diff options
author | Greg Roodt <greg@canva.com> | 2019-11-30 15:15:24 +1100 |
---|---|---|
committer | Greg Roodt <greg@canva.com> | 2019-11-30 15:15:24 +1100 |
commit | 87aca2a39d899024fe97b2005b47dcae473c7166 (patch) | |
tree | a27fe736b45901f3d31f7923a6ec0bb367ca9d8a /pkgs/development | |
parent | 2126e37efdc8ba55f59a9bf30dfb9bd2dd4b40e9 (diff) |
go-jsonnet: 0.13.0 -> 0.14.0
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/compilers/go-jsonnet/default.nix | 35 | ||||
-rw-r--r-- | pkgs/development/compilers/go-jsonnet/deps.nix | 48 |
2 files changed, 13 insertions, 70 deletions
diff --git a/pkgs/development/compilers/go-jsonnet/default.nix b/pkgs/development/compilers/go-jsonnet/default.nix index e051d41993ccb..949190903673f 100644 --- a/pkgs/development/compilers/go-jsonnet/default.nix +++ b/pkgs/development/compilers/go-jsonnet/default.nix @@ -1,33 +1,24 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "go-jsonnet"; - version = "0.13.0"; - - goPackagePath = "github.com/google/go-jsonnet"; - - # regenerate deps.nix using following steps: - # - # go get -u github.com/google/go-jsonnet - # cd $GOPATH/src/github.com/google/go-jsonnet - # git checkout <version> - # dep init - # dep2nix - goDeps = ./deps.nix; + version = "0.14.0"; src = fetchFromGitHub { - rev = "v${version}"; owner = "google"; repo = "go-jsonnet"; - sha256 = "0x95sqhrw4pscxq0q8781wix0w881k9my5kn5nf6k0fg1d6qlgiy"; - fetchSubmodules = true; + rev = "v${version}"; + sha256 = "1q0mpydh8h0zrml605q9r259y8584kbwcr9g4sqcb1n13b4d1sgp"; }; - meta = { + modSha256 = "1b6hz5a66hhlzpcv1badxr1b4nmk4lw0507d5jks7lqzvvwd0sxq"; + + subPackages = [ "cmd/jsonnet" ]; + + meta = with lib; { description = "An implementation of Jsonnet in pure Go"; - maintainers = with lib.maintainers; [ nshalman ]; - license = lib.licenses.asl20; - homepage = https://github.com/google/go-jsonnet; - platforms = lib.platforms.unix; + homepage = "https://github.com/google/go-jsonnet"; + license = licenses.asl20; + maintainers = with maintainers; [ nshalman ]; }; } diff --git a/pkgs/development/compilers/go-jsonnet/deps.nix b/pkgs/development/compilers/go-jsonnet/deps.nix deleted file mode 100644 index 1f413a16d81d1..0000000000000 --- a/pkgs/development/compilers/go-jsonnet/deps.nix +++ /dev/null @@ -1,48 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "1311e847b0cb909da63b5fecfb5370aa66236465"; - sha256 = "0rqfh1rj6f5wm8p2ky7inm8g10152p7w6n2cli17kf9gad797i8h"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "1744e2970ca51c86172c8190fadad617561ed6e7"; - sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "4c4f7f33c9ed00de01c4c741d2177abfcfe19307"; - sha256 = "191001bxqyc3xfs46nnqmm7jdk0r73vk7a4zqngfl7zwjv9smwsq"; - }; - } -] \ No newline at end of file |