diff options
author | Domen Kožar <domen@dev.si> | 2015-09-19 16:36:59 +0200 |
---|---|---|
committer | Domen Kožar <domen@dev.si> | 2015-09-19 16:37:33 +0200 |
commit | 6b7c2a47c2023a5645c918827b6ea7f79c305497 (patch) | |
tree | 728187b323a00c63bcdb1f1dbdc2857f2e55367f /pkgs/tools/package-management | |
parent | 2939cc31a557b65937235f7f7a18aa878ed1218f (diff) | |
download | nixlib-6b7c2a47c2023a5645c918827b6ea7f79c305497.tar nixlib-6b7c2a47c2023a5645c918827b6ea7f79c305497.tar.gz nixlib-6b7c2a47c2023a5645c918827b6ea7f79c305497.tar.bz2 nixlib-6b7c2a47c2023a5645c918827b6ea7f79c305497.tar.lz nixlib-6b7c2a47c2023a5645c918827b6ea7f79c305497.tar.xz nixlib-6b7c2a47c2023a5645c918827b6ea7f79c305497.tar.zst nixlib-6b7c2a47c2023a5645c918827b6ea7f79c305497.zip |
nixopsUnstable: bump
(cherry picked from commit 9a401ca40430028310b4bcfa18f5c5b268b54014) Signed-off-by: Domen Kožar <domen@dev.si>
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/nixops/unstable.nix | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix index c8b5131bf75d..011ebf7198e6 100644 --- a/pkgs/tools/package-management/nixops/unstable.nix +++ b/pkgs/tools/package-management/nixops/unstable.nix @@ -1,29 +1,13 @@ { lib, pythonPackages, fetchgit, libxslt, docbook5_xsl, openssh }: -let - - # Use this until the patches are upstreamed. - # Warning: will be rebased at will - libcloud = lib.overrideDerivation pythonPackages.libcloud ( args: { - src = fetchgit { - url = https://github.com/Phreedom/libcloud.git; - rev = "784427f549829a00d551e3468184a708420ad1ec"; - sha256 = "fd0e092b39fa1fde6a8847e6dc69855d30c2dad9e95ee0373297658ff53edf8a"; - }; - - preConfigure = "cp libcloud/test/secrets.py-dist libcloud/test/secrets.py"; - }); - -in - pythonPackages.buildPythonPackage rec { name = "nixops-1.3pre-cefcd9ba"; namePrefix = ""; src = fetchgit { url = https://github.com/NixOS/nixops; - rev = "cefcd9bae9a4d3bac83f188460619d18972321a8"; - sha256 = "1jwkbnfwics2j0m6mr75rz914vg0z46d2xv0z1717c1ac5rki0l2"; + rev = "9a05ebc332701247fa99fbf6d1215d48e08f3edd"; + sha256 = "17vxr51wpdd5dnasiaafga3a6ddhxyrwgr0yllczxj6bq0n5skp2"; }; buildInputs = [ /* libxslt */ pythonPackages.nose pythonPackages.coverage ]; @@ -32,7 +16,7 @@ pythonPackages.buildPythonPackage rec { [ pythonPackages.prettytable pythonPackages.boto pythonPackages.hetzner - libcloud + pythonPackages.libcloud pythonPackages.sqlite3 ]; |