nixops: 1.2 -> 1.3.

(cherry picked from commit fcaf96b8d40e0c9559523674da03ab47edcfc8fb)
This commit is contained in:
Rob Vermaas 2015-09-28 11:33:26 +00:00
parent 3dec100104
commit 43dee76b4b
2 changed files with 7 additions and 9 deletions

View File

@ -1,30 +1,28 @@
{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh }: { lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh }:
pythonPackages.buildPythonPackage rec { pythonPackages.buildPythonPackage rec {
name = "nixops-1.2"; name = "nixops-1.3";
namePrefix = ""; namePrefix = "";
src = fetchurl { src = fetchurl {
url = "http://nixos.org/releases/nixops/${name}/${name}.tar.bz2"; 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.prettytable
pythonPackages.boto pythonPackages.boto
pythonPackages.sqlite3
pythonPackages.hetzner pythonPackages.hetzner
pythonPackages.libcloud
pythonPackages.sqlite3
]; ];
doCheck = false; doCheck = false;
postInstall = postInstall =
'' ''
# Backward compatibility symlink.
ln -s nixops $out/bin/charon
make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \ make -C doc/manual install nixops.1 docbookxsl=${docbook5_xsl}/xml/xsl/docbook \
docdir=$out/share/doc/nixops mandir=$out/share/man docdir=$out/share/doc/nixops mandir=$out/share/man

View File

@ -14746,7 +14746,7 @@ let
nixops = callPackage ../tools/package-management/nixops { }; 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; }; nixui = callPackage ../tools/package-management/nixui { node_webkit = node_webkit_0_11; };