diff options
Diffstat (limited to 'pkgs/development')
21 files changed, 203 insertions, 66 deletions
diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index cc355c6e5d7..07cc42cfcdf 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -52,7 +52,7 @@ let fetchhg { inherit (goDep.fetch) url rev sha256; } - else {}; + else abort "Unrecognized package fetch type"; }; importGodeps = { depsFile, filterPackages ? [] }: diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json index 84a211e68e0..520c1fd8e5c 100644 --- a/pkgs/development/go-modules/libs.json +++ b/pkgs/development/go-modules/libs.json @@ -32,7 +32,7 @@ "type": "git", "url": "https://github.com/docopt/docopt-go", "rev": "784ddc588536785e7299f7272f39101f7faccc3f", - "sha256": "13x00cnady5znysfwca3x59dl04m8rvnk2yprgyqqpg2y4v0xmbf" + "sha256": "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj" } }, { @@ -1411,5 +1411,122 @@ "rev": "c8748311a7528d0ba7330d302adbc5a677ef9c9e", "sha256": "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac" } + }, + { + "goPackagePath": "github.com/hashicorp/raft", + "fetch": { + "type": "git", + "url": "https://github.com/hashicorp/raft", + "rev": "a8065f298505708bf60f518c09178149f3c06f21", + "sha256": "122mjijphas7ybbvssxv1r36sb8i907gdr9kvplnx6yg9w52j3mn" + } + }, + { + "goPackagePath": "github.com/hashicorp/raft-boltdb", + "fetch": { + "type": "git", + "url": "https://github.com/hashicorp/raft-boltdb", + "rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee", + "sha256": "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia" + } + }, + { + "goPackagePath": "github.com/rakyll/statik", + "fetch": { + "type": "git", + "url": "https://github.com/rakyll/statik", + "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465", + "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp" + } + }, + { + "goPackagePath": "gopkg.in/fatih/pool.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/fatih/pool.v2", + "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715", + "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0" + } + }, + { + "goPackagePath": "github.com/bmizerany/pat", + "fetch": { + "type": "git", + "url": "https://github.com/bmizerany/pat", + "rev": "b8a35001b773c267eb260a691f4e5499a3531600", + "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz" + } + }, + { + "goPackagePath": "github.com/kimor79/gollectd", + "fetch": { + "type": "git", + "url": "https://github.com/kimor79/gollectd", + "rev": "cf6dec97343244b5d8a5485463675d42f574aa2d", + "sha256": "1f3ml406cprzjc192csyr2af4wcadkc74kg8n4c0zdzglxxfsqxa" + } + }, + { + "goPackagePath": "github.com/monochromegane/conflag", + "fetch": { + "type": "git", + "url": "https://github.com/monochromegane/conflag", + "rev": "6d68c9aa4183844ddc1655481798fe4d90d483e9", + "sha256": "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa" + } + }, + { + "goPackagePath": "github.com/monochromegane/go-home", + "fetch": { + "type": "git", + "url": "https://github.com/monochromegane/go-home", + "rev": "25d9dda593924a11ea52e4ffbc8abdb0dbe96401", + "sha256": "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww" + } + }, + { + "goPackagePath": "github.com/monochromegane/terminal", + "fetch": { + "type": "git", + "url": "https://github.com/monochromegane/terminal", + "rev": "2da212063ce19aed90ee5bbb00ad1ad7393d7f48", + "sha256": "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh" + } + }, + { + "goPackagePath": "github.com/monochromegane/go-gitignore", + "fetch": { + "type": "git", + "url": "https://github.com/monochromegane/go-gitignore", + "rev": "38717d0a108ca0e5af632cd6845ca77d45b50729", + "sha256": "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7" + } + }, + { + "goPackagePath": "github.com/shiena/ansicolor", + "fetch": { + "type": "git", + "url": "https://github.com/shiena/ansicolor", + "rev": "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b", + "sha256": "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p" + } + }, + { + "goPackagePath": "github.com/pquerna/ffjson", + "fetch": { + "type": "git", + "url": "https://github.com/pquerna/ffjson", + "rev": "674bc015b5b3f50f9bb2561179778586b9af68c5", + "sha256": "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a" + } + }, + { + "goPackagePath": "gopkg.in/kothar/go-backblaze.v0", + "fetch": { + "type": "git", + "url": "https://gopkg.in/kothar/go-backblaze.v0", + "rev": "373819725fc560fa962c6cd883b533d2ebec4844", + "sha256": "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx" + } } ] diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 5336a14c5a1..449af618cb1 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "deis-${version}"; diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index cc63921976f..9489f5a7bac 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -1,9 +1,7 @@ # This file was generated by go2nix. -{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGo16Package, fetchgit, fetchhg, fetchbzr, fetchsvn }: -with go16Packages; - -buildGoPackage rec { +buildGo16Package rec { name = "glide-${version}"; version = "0.10.2"; rev = "${version}"; diff --git a/pkgs/development/tools/go-bindata/default.nix b/pkgs/development/tools/go-bindata/default.nix index cb9e51dfdfb..4b87e74a630 100644 --- a/pkgs/development/tools/go-bindata/default.nix +++ b/pkgs/development/tools/go-bindata/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "go-bindata-${version}"; diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index 15aa1504d93..d6ae032f078 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, gotools, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "go-repo-root-${version}"; @@ -16,5 +13,5 @@ buildGoPackage rec { sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; }; - buildInputs = [ tools ]; + buildInputs = [ gotools ]; } diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index bb0000d9e73..757dc8cb379 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -1,9 +1,6 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, go-bindata, goimports, nix-prefetch-git, git, makeWrapper, +{ stdenv, lib, buildGoPackage, go-bindata, goimports, nix-prefetch-git, git, makeWrapper, fetchgit, fetchhg, fetchbzr, fetchsvn }: -with goPackages; - buildGoPackage rec { name = "go2nix-${version}"; version = "20160307-${stdenv.lib.strings.substring 0 7 rev}"; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 0a2b908c9fd..8485a2c346b 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "gocode-${version}"; diff --git a/pkgs/development/tools/goimports/default.nix b/pkgs/development/tools/goimports/default.nix index bcc82e80cbf..5c69f34e28b 100644 --- a/pkgs/development/tools/goimports/default.nix +++ b/pkgs/development/tools/goimports/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "goimports-${version}"; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 1e63eb73449..29e5b28ad57 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "lint-${version}"; diff --git a/pkgs/development/tools/gotags/default.nix b/pkgs/development/tools/gotags/default.nix index 65d0d29e158..ad22d4ea407 100644 --- a/pkgs/development/tools/gotags/default.nix +++ b/pkgs/development/tools/gotags/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "gotags-${version}"; diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix new file mode 100644 index 00000000000..f00794a7eb0 --- /dev/null +++ b/pkgs/development/tools/gotools/default.nix @@ -0,0 +1,44 @@ +{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "gotools-${version}"; + version = "20160519-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + + goPackagePath = "golang.org/x/tools"; + goPackageAliases = [ "code.google.com/p/go.tools" ]; + + src = fetchgit { + inherit rev; + url = "https://go.googlesource.com/tools"; + sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + }; + + goDeps = ./deps.json; + + preConfigure = '' + # Make the builtin tools available here + mkdir -p $bin/bin + eval $(go env | grep GOTOOLDIR) + find $GOTOOLDIR -type f | while read x; do + ln -sv "$x" "$bin/bin" + done + export GOTOOLDIR=$bin/bin + ''; + + excludedPackages = "\\(" + + stdenv.lib.concatStringsSep "\\|" ([ "testdata" ] ++ stdenv.lib.optionals (stdenv.lib.versionAtLeast go.meta.branch "1.5") [ "vet" "cover" ]) + + "\\)"; + + # Do not copy this without a good reason for enabling + # In this case tools is heavily coupled with go itself and embeds paths. + allowGoReference = true; + + # Set GOTOOLDIR for derivations adding this to buildInputs + postInstall = '' + mkdir -p $bin/nix-support + substituteAll ${../../go-modules/tools/setup-hook.sh} $bin/nix-support/setup-hook.tmp + cat $bin/nix-support/setup-hook.tmp >> $bin/nix-support/setup-hook + rm $bin/nix-support/setup-hook.tmp + ''; +} diff --git a/pkgs/development/tools/gotools/deps.json b/pkgs/development/tools/gotools/deps.json new file mode 100644 index 00000000000..76e8fd93aa7 --- /dev/null +++ b/pkgs/development/tools/gotools/deps.json @@ -0,0 +1,8 @@ +[ + { + "include": "../../libs.json", + "packages": [ + "golang.org/x/net" + ] + } +] diff --git a/pkgs/development/tools/govers/default.nix b/pkgs/development/tools/govers/default.nix index b3e2b921bd2..bd4dd28f599 100644 --- a/pkgs/development/tools/govers/default.nix +++ b/pkgs/development/tools/govers/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "govers-${version}"; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 7b58bafcd62..030a59ed20c 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "gox-${version}"; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index fc8ef5ff964..7d566254633 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, gox, goPackages, fetchFromGitHub +{ stdenv, lib, go, gox, gotools, buildGoPackage, fetchFromGitHub , fetchgit, fetchhg, fetchbzr, fetchsvn }: stdenv.mkDerivation rec { @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { version = "0.10.1"; src = import ./deps.nix { - inherit stdenv lib go gox goPackages fetchgit fetchhg fetchbzr fetchsvn; + inherit stdenv lib go gox gotools buildGoPackage fetchgit fetchhg fetchbzr fetchsvn; }; - buildInputs = [ go gox goPackages.tools ]; + buildInputs = [ go gox gotools ]; configurePhase = '' export GOPATH=$PWD/share/go diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix index 2be1911cf91..5ed606ad6c6 100644 --- a/pkgs/development/tools/packer/deps.nix +++ b/pkgs/development/tools/packer/deps.nix @@ -1,14 +1,11 @@ -# This file was generated by go2nix. -{ stdenv, lib, go, gox, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, go, gox, gotools, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "packer-${version}"; version = "20160507-${stdenv.lib.strings.substring 0 7 rev}"; rev = "4e5f65131b5491ab44ff8aa0626abe4a85597ac0"; - buildInputs = [ go gox goPackages.tools ]; + buildInputs = [ go gox gotools ]; goPackagePath = "github.com/mitchellh/packer"; diff --git a/pkgs/development/tools/pup/default.nix b/pkgs/development/tools/pup/default.nix index 23ced868bd3..772178dd84c 100644 --- a/pkgs/development/tools/pup/default.nix +++ b/pkgs/development/tools/pup/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "pup-${version}"; diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 048604beab9..49de886654c 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -1,6 +1,6 @@ -{ lib, goPackages, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub }: -goPackages.buildGoPackage rec { +buildGoPackage rec { name = "remarshal-${rev}"; rev = "0.3.0"; goPackagePath = "github.com/dbohdan/remarshal"; @@ -12,7 +12,7 @@ goPackages.buildGoPackage rec { sha256 = "0lhsqca3lq3xvdwsmrngv4p6b7k2lkbfnxnk5qj6jdd5y7f4b496"; }; - buildInputs = with goPackages; [ toml yaml-v2 ]; + goDeps = ./deps.json; meta = with lib; { description = "Convert between TOML, YAML and JSON"; diff --git a/pkgs/development/tools/remarshal/deps.json b/pkgs/development/tools/remarshal/deps.json new file mode 100644 index 00000000000..3b43c0e5ff6 --- /dev/null +++ b/pkgs/development/tools/remarshal/deps.json @@ -0,0 +1,9 @@ +[ + { + "include": "../../libs.json", + "packages": [ + "github.com/BurntSushi/toml", + "gopkg.in/yaml.v2" + ] + } +] diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index abc9312c9e2..65fbbcb9e04 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,7 +1,4 @@ -# This file was generated by go2nix. -{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: - -with goPackages; +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { name = "textql-${version}"; |