diff options
| author | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-04 08:40:17 +0200 |
|---|---|---|
| committer | Kamil Chmielewski <kamil.chm@gmail.com> | 2016-06-09 11:21:30 +0200 |
| commit | 144ea787530fbabbbef1dbdd5f5e0e6eed5155bb (patch) | |
| tree | c030e03283e2a2041c6b2e002d9ca3c755bb745e /pkgs | |
| parent | 6909d0e45688b132600021f90f725e82ad144d98 (diff) | |
| download | nixpkgs-144ea787530fbabbbef1dbdd5f5e0e6eed5155bb.tar nixpkgs-144ea787530fbabbbef1dbdd5f5e0e6eed5155bb.tar.gz nixpkgs-144ea787530fbabbbef1dbdd5f5e0e6eed5155bb.tar.bz2 nixpkgs-144ea787530fbabbbef1dbdd5f5e0e6eed5155bb.tar.lz nixpkgs-144ea787530fbabbbef1dbdd5f5e0e6eed5155bb.tar.xz nixpkgs-144ea787530fbabbbef1dbdd5f5e0e6eed5155bb.tar.zst nixpkgs-144ea787530fbabbbef1dbdd5f5e0e6eed5155bb.zip | |
etcd: extracted from goPackages
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/etcd/default.nix | 22 | ||||
| -rw-r--r-- | pkgs/servers/etcd/deps.json | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 8 |
4 files changed, 32 insertions, 9 deletions
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix new file mode 100644 index 00000000000..05bb6104969 --- /dev/null +++ b/pkgs/servers/etcd/default.nix @@ -0,0 +1,22 @@ +# This file was generated by go2nix. +{ stdenv, lib, libpcap, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +with goPackages; + +buildGoPackage rec { + name = "etcd-${version}"; + version = "2.3.0"; + rev = "v${version}"; + + goPackagePath = "github.com/coreos/etcd"; + + src = fetchgit { + inherit rev; + url = "https://github.com/coreos/etcd"; + sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7"; + }; + + goDeps = ./deps.json; + + buildInputs = [ libpcap ]; +} diff --git a/pkgs/servers/etcd/deps.json b/pkgs/servers/etcd/deps.json new file mode 100644 index 00000000000..b5977a85551 --- /dev/null +++ b/pkgs/servers/etcd/deps.json @@ -0,0 +1,9 @@ +[ + { + "include": "../../libs.json", + "packages": [ + "github.com/olekukonko/tablewriter", + "github.com/mattn/go-runewidth" + ] + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09842b4c232..6082f524c7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9903,7 +9903,7 @@ in inherit (perlPackages) NetSMTP; }; - etcd = goPackages.etcd.bin // { outputs = [ "bin" ]; }; + etcd = callPackage ../servers/etcd { }; ejabberd = callPackage ../servers/xmpp/ejabberd { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 3adaf33f892..df2d9db6796 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -827,14 +827,6 @@ let sha256 = "0kmv0p605di6jc8i1778qzass18m0mv9ks9vxxrfsiwcp4la82jf"; }; - etcd = buildFromGitHub { - rev = "v2.3.0"; - owner = "coreos"; - repo = "etcd"; - sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7"; - buildInputs = [ pkgs.libpcap tablewriter ]; - }; - fsnotify.v0 = buildGoPackage rec { rev = "v0.9.3"; name = "fsnotify.v0-${rev}"; |