diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-21 00:56:43 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-21 00:56:43 +0000 |
| commit | 1f04b4a566d3c8f8de5354ed09dee46557c4abe3 (patch) | |
| tree | b8239cfc8cced160642aa698e18048844164ccc6 /pkgs/tools/package-management | |
| parent | cc540843fe88a5e490e07e861f8dbb8f4714ece7 (diff) | |
| parent | db7b4fb073d25832ecc4e216d410ad2dde153c43 (diff) | |
| download | nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.gz nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.bz2 nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.lz nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.xz nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.tar.zst nixlib-1f04b4a566d3c8f8de5354ed09dee46557c4abe3.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/nixops/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nixops/generic.nix | 6 | ||||
| -rw-r--r-- | 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 b49491cf15ff..bba392e30e76 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 023ec07dba16..7948ebc43fb4 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 40d56518b3dc..bba392e30e76 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"; }; }) |