diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix index 374026b75977..463f592bb64c 100644 --- a/pkgs/tools/package-management/nixops/default.nix +++ b/pkgs/tools/package-management/nixops/default.nix @@ -1,30 +1,28 @@ { lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh }: pythonPackages.buildPythonPackage rec { - name = "nixops-1.2"; + name = "nixops-1.3"; namePrefix = ""; src = fetchurl { url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2"; - sha256 = "06cf54c62a810cac5013d57d31707f0a6381b409485503a94a57ce6d8a1ac12b"; + sha256 = "53a0ed75ceaa514dd46f670639df88390e79413ae015636d37e6cf430b40eaaf"; }; - buildInputs = [ libxslt ]; + buildInputs = [ pythonPackages.nose pythonPackages.coverage ]; - pythonPath = + propagatedBuildInputs = [ pythonPackages.prettytable pythonPackages.boto - pythonPackages.sqlite3 pythonPackages.hetzner + pythonPackages.libcloud + pythonPackages.sqlite3 ]; doCheck = false; postInstall = '' - # Backward compatibility symlink. - ln -s nixops $out/bin/charon - make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ docdir=$out/share/doc/nixops mandir=$out/share/man diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d342f64f857..bd2025d19be8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14746,7 +14746,7 @@ let nixops = callPackage ../tools/package-management/nixops { }; - nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { }; + nixopsUnstable = nixops; nixui = callPackage ../tools/package-management/nixui { node_webkit = node_webkit_0_11; };