diff options
| author | Peter Simons <simons@cryp.to> | 2014-09-02 12:31:03 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-09-02 12:31:03 +0200 |
| commit | 1c0d15b90ef67363f798d67d12dd31ed5fccb411 (patch) | |
| tree | 3693dd49b591dbbba261e95fc4b78650f1675578 /pkgs/applications/networking/cluster/mesos/default.nix | |
| parent | bb61b45d92bad2435e80dcac855a78bda57ec7e8 (diff) | |
| parent | 2fc76ea05417671306d27f9ba83ef1b8d4049f3d (diff) | |
| download | nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.gz nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.bz2 nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.lz nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.xz nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.tar.zst nixpkgs-1c0d15b90ef67363f798d67d12dd31ed5fccb411.zip | |
Merge branch 'origin/master' into staging.
Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix
Diffstat (limited to 'pkgs/applications/networking/cluster/mesos/default.nix')
| -rw-r--r-- | pkgs/applications/networking/cluster/mesos/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 4329308ba04..fe93a072b2c 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { buildInputs = [ makeWrapper autoconf automake libtool curl sasl jdk maven - python wrapPython boto distutils-cfg + python wrapPython boto distutils-cfg setuptools ]; propagatedBuildInputs = [ |