From 3a8adb70143e77cca58b3bd934fab34be4a7b001 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 9 Sep 2013 13:03:39 +0200
Subject: [PATCH] Update nixops to 1.1

---
 pkgs/tools/package-management/nixops/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 7f2b533383e..3381e3644fe 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,12 +1,12 @@
-{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl }:
+{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "nixops-1.0.1";
+  name = "nixops-1.1";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2";
-    sha256 = "c6dda2597ba0ab2f60c984d4715163c02940f20803619668d6c16eba8570a394";
+    sha256 = "1i0v4v83s663izw6al63avhs0378rp3nxchy8nkb1zam5rj097z2";
   };
 
   buildInputs = [ libxslt ];
@@ -15,6 +15,7 @@ pythonPackages.buildPythonPackage rec {
     [ pythonPackages.prettytable
       pythonPackages.boto
       pythonPackages.sqlite3
+      pythonPackages.hetzner
     ];
 
   doCheck = false;
@@ -29,6 +30,10 @@ pythonPackages.buildPythonPackage rec {
 
       mkdir -p $out/share/nix/nixops
       cp -av nix/* $out/share/nix/nixops
+
+      # Add openssh to nixops' PATH. On some platforms, e.g. CentOS and RHEL
+      # the version of openssh is causing errors when have big networks (40+)
+      wrapProgram $out/bin/nixops --prefix PATH : "${openssh}/bin"
     '';
 
   meta = {