From 48c32dc0b77636036b2b2ff04aa25d9a3c40b0dc Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 19 Jul 2016 14:33:15 +0000
Subject: [PATCH] nixops: update to 1.4
(cherry picked from commit 9909d31602f6242259bcf7d31e88107fa5f1fb5f)
---
pkgs/tools/package-management/nixops/default.nix | 4 ++--
pkgs/tools/package-management/nixops/generic.nix | 6 ++++++
pkgs/tools/package-management/nixops/unstable.nix | 6 +++---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index b49491cf15f..bba392e30e7 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,9 +1,9 @@
{ callPackage, fetchurl }:
callPackage ./generic.nix (rec {
- version = "1.3.1";
+ version = "1.4";
src = fetchurl {
url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
- sha256 = "04j8s0gg1aj3wmj1bs7dwscfmlzk2xpwfw9rk4xzxwxw1y0j64nd";
+ sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd";
};
})
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index 023ec07dba1..7948ebc43fb 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -17,6 +17,12 @@ pythonPackages.buildPythonApplication {
pythonPackages.sqlite3
pythonPackages.hetzner
pythonPackages.libcloud
+ pythonPackages.azure-storage
+ pythonPackages.azure-mgmt-compute
+ pythonPackages.azure-mgmt-network
+ pythonPackages.azure-mgmt-resource
+ pythonPackages.azure-mgmt-storage
+ pythonPackages.adal
];
doCheck = false;
diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index 40d56518b3d..bba392e30e7 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -1,9 +1,9 @@
{ callPackage, fetchurl }:
callPackage ./generic.nix (rec {
- version = "2015-12-18";
+ version = "1.4";
src = fetchurl {
- url = "http://hydra.nixos.org/build/29118371/download/2/nixops-1.3.1pre1673_a0d5681.tar.bz2";
- sha256 = "177lnlfz32crcc0gjmh1gn5y2xs142kmb4b68k4raxcxxw118kw9";
+ url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
+ sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd";
};
})