diff options
| author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-09-10 12:04:13 +0200 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-09-16 00:04:55 +0100 |
| commit | 914e0e594ca2d0fa5d456be208bf703d79f04fa3 (patch) | |
| tree | 49cabb000804d24bb798de8afaacaa7fac8a41c8 /pkgs/development/tools/go2nix | |
| parent | 7a6b860e1c5c6e35719631ff3599521144990077 (diff) | |
| download | nixpkgs-914e0e594ca2d0fa5d456be208bf703d79f04fa3.tar nixpkgs-914e0e594ca2d0fa5d456be208bf703d79f04fa3.tar.gz nixpkgs-914e0e594ca2d0fa5d456be208bf703d79f04fa3.tar.bz2 nixpkgs-914e0e594ca2d0fa5d456be208bf703d79f04fa3.tar.lz nixpkgs-914e0e594ca2d0fa5d456be208bf703d79f04fa3.tar.xz nixpkgs-914e0e594ca2d0fa5d456be208bf703d79f04fa3.tar.zst nixpkgs-914e0e594ca2d0fa5d456be208bf703d79f04fa3.zip | |
buildGoPackage: deps.json -> deps.nix in NIXON
https://github.com/NixOS/nixpkgs/pull/17254#issuecomment-245295541 * update docs to describe `deps.nix` * include goDeps in nix-shell GOPATH * NixOS 16.09 rel notes about replacing goPackages
Diffstat (limited to 'pkgs/development/tools/go2nix')
| -rw-r--r-- | pkgs/development/tools/go2nix/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/tools/go2nix/deps.json | 20 | ||||
| -rw-r--r-- | pkgs/development/tools/go2nix/deps.nix | 20 |
3 files changed, 23 insertions, 23 deletions
diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index e0e9fe8c3fc..f12497eb78c 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "go2nix-${version}"; - version = "0.1.0"; + version = "1.1.0"; rev = "v${version}"; goPackagePath = "github.com/kamilchm/go2nix"; @@ -12,10 +12,10 @@ buildGoPackage rec { inherit rev; owner = "kamilchm"; repo = "go2nix"; - sha256 = "10nz7gva3n6wk01wphrjjb31sy33kf9ji03zr849x21a669fnmjf"; + sha256 = "0asbbcyf1hh8khakych0y09rjarjiywr8pyy1v8ghpr1vvg43a09"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ go-bindata goimports makeWrapper ]; preBuild = ''go generate ./...''; diff --git a/pkgs/development/tools/go2nix/deps.json b/pkgs/development/tools/go2nix/deps.json deleted file mode 100644 index ab9d0d39fce..00000000000 --- a/pkgs/development/tools/go2nix/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/Masterminds/vcs", - "fetch": { - "type": "git", - "url": "https://github.com/Masterminds/vcs", - "rev": "7af28b64c5ec41b1558f5514fd938379822c237c", - "sha256": "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6" - } - }, - { - "goPackagePath": "github.com/jawher/mow.cli", - "fetch": { - "type": "git", - "url": "https://github.com/jawher/mow.cli", - "rev": "772320464101e904cd51198160eb4d489be9cc49", - "sha256": "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j" - } - } -] diff --git a/pkgs/development/tools/go2nix/deps.nix b/pkgs/development/tools/go2nix/deps.nix new file mode 100644 index 00000000000..8fc784f4b7f --- /dev/null +++ b/pkgs/development/tools/go2nix/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/Masterminds/vcs"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/vcs"; + rev = "7af28b64c5ec41b1558f5514fd938379822c237c"; + sha256 = "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6"; + }; + } + { + goPackagePath = "github.com/jawher/mow.cli"; + fetch = { + type = "git"; + url = "https://github.com/jawher/mow.cli"; + rev = "772320464101e904cd51198160eb4d489be9cc49"; + sha256 = "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j"; + }; + } +] |