nixops: 1.2 -> 1.3

(cherry picked from commit a91d4f8a243933181c119ceff434e59eae09be10)
This commit is contained in:
Rob Vermaas 2015-09-29 19:53:19 +00:00
parent 41007653db
commit 92e98c2b03
2 changed files with 4 additions and 6 deletions

View File

@ -1,12 +1,12 @@
{ 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 = "d80b0fe3bb31bb84a8545f9ea804ec8137172c8df44f03326ed7639e5a4bad55";
}; };
buildInputs = [ libxslt ]; buildInputs = [ libxslt ];
@ -16,15 +16,13 @@ pythonPackages.buildPythonPackage rec {
pythonPackages.boto pythonPackages.boto
pythonPackages.sqlite3 pythonPackages.sqlite3
pythonPackages.hetzner pythonPackages.hetzner
pythonPackages.libcloud
]; ];
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

@ -14735,7 +14735,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; };