diff options
author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-04 14:35:09 +0200 |
---|---|---|
committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-09 11:22:02 +0200 |
commit | 3cf803fca7cd5d9471edd0e9c4049097d32ecba2 (patch) | |
tree | b99b9f3ff0c7a19740046cf1ca0a3ed38ab27232 | |
parent | ec9edbe1726886c11c3bb2195b87bbda2206f523 (diff) | |
download | nixpkgs-3cf803fca7cd5d9471edd0e9c4049097d32ecba2.tar nixpkgs-3cf803fca7cd5d9471edd0e9c4049097d32ecba2.tar.gz nixpkgs-3cf803fca7cd5d9471edd0e9c4049097d32ecba2.tar.bz2 nixpkgs-3cf803fca7cd5d9471edd0e9c4049097d32ecba2.tar.lz nixpkgs-3cf803fca7cd5d9471edd0e9c4049097d32ecba2.tar.xz nixpkgs-3cf803fca7cd5d9471edd0e9c4049097d32ecba2.tar.zst nixpkgs-3cf803fca7cd5d9471edd0e9c4049097d32ecba2.zip |
golant: extracted from goPackages
-rw-r--r-- | pkgs/development/go-modules/libs.json | 11 | ||||
-rw-r--r-- | pkgs/development/tools/golint/default.nix | 21 | ||||
-rw-r--r-- | pkgs/development/tools/golint/deps.json | 8 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/go-packages.nix | 10 |
5 files changed, 40 insertions, 12 deletions
diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json index be7440fb733..5e6e29ec6b2 100644 --- a/pkgs/development/go-modules/libs.json +++ b/pkgs/development/go-modules/libs.json @@ -889,5 +889,14 @@ "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29", "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf" } + }, + { + "goPackagePath": "golang.org/x/tools", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/tools", + "rev": "9ae4729fba20b3533d829a9c6ba8195b068f2abc", + "sha256": "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1" + } } -] +] \ No newline at end of file diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix new file mode 100644 index 00000000000..1e63eb73449 --- /dev/null +++ b/pkgs/development/tools/golint/default.nix @@ -0,0 +1,21 @@ +# This file was generated by go2nix. +{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +with goPackages; + +buildGoPackage rec { + name = "lint-${version}"; + version = "20160428-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "c7bacac2b21ca01afa1dee0acf64df3ce047c28f"; + + goPackagePath = "github.com/golang/lint"; + excludedPackages = "testdata"; + + src = fetchgit { + inherit rev; + url = "https://github.com/golang/lint"; + sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg"; + }; + + goDeps = ./deps.json; +} diff --git a/pkgs/development/tools/golint/deps.json b/pkgs/development/tools/golint/deps.json new file mode 100644 index 00000000000..7a751431e81 --- /dev/null +++ b/pkgs/development/tools/golint/deps.json @@ -0,0 +1,8 @@ +[ + { + "include": "pkgs/development/go-modules/libs.json", + "packages": [ + "golang.org/x/tools" + ] + } +] \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf451a45ecb..a8fdf35ae07 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11159,7 +11159,7 @@ in gotags = callPackage ../development/tools/gotags { }; - golint = goPackages.lint.bin // { outputs = [ "bin" ]; }; + golint = callPackage ../development/tools/golint { }; godep = callPackage ../development/tools/godep { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 9c3043f74e1..2f34ea4d699 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1864,16 +1864,6 @@ let sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; }; - lint = buildFromGitHub { - rev = "7b7f4364ff76043e6c3610281525fabc0d90f0e4"; - version = "2015-06-23"; - owner = "golang"; - repo = "lint"; - sha256 = "1bj7zv534hyh87bp2vsbhp94qijc5nixb06li1dzfz9n0wcmlqw9"; - excludedPackages = "testdata"; - buildInputs = [ tools ]; - }; - goquery = buildGoPackage rec { rev = "f065786d418c9d22a33cad33decd59277af31471"; #tag v.0.3.2 name = "goquery-${stdenv.lib.strings.substring 0 7 rev}"; |