nixopsUnstable: init at 2016-11-23

domenkozar · domenkozar · commit e360c7205f84 · 2016-11-30T15:00:45.000+01:00
(cherry picked from commit ce6abb9) Signed-off-by: Domen Kožar <domen@dev.si>
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
@@ -1,28 +1,30 @@
-{ lib, pythonPackages, fetchurl, libxslt, docbook5_xsl, openssh
+{ lib, python2Packages, fetchurl, libxslt, docbook5_xsl, openssh
 # version args
 , src, version
 }:
 
-pythonPackages.buildPythonApplication {
+python2Packages.buildPythonApplication {
   name = "nixops-${version}";
   namePrefix = "";
 
   src = src;
 
   buildInputs = [ libxslt ];
 
-  pythonPath =
-    [ pythonPackages.prettytable
-      pythonPackages.boto
-      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
+  pythonPath = with python2Packages;
+    [ prettytable
+      boto
+      boto3
+      hetzner
+      libcloud
+      azure-storage
+      azure-mgmt-compute
+      azure-mgmt-network
+      azure-mgmt-resource
+      azure-mgmt-storage
+      adal
+      pysqlite  # Go back to builtin sqlite once Python 2.7.13 is released
+      datadog
     ];
 
   doCheck = false;
diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
@@ -1,9 +1,10 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.4";
+  version = "2016-11-23";
   src = fetchurl {
-    url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
-    sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd";
+    # Hydra doesn't serve production outputs anymore :(
+    url = "https://static.domenkozar.com/nixops-1.5pre0_abcdef.tar.bz2";
+    sha256 = "1a4cyd3zvkdjg9rf9ssr7p4i6r89zr483v5nlr5jzjdjjyi3j2bz";
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -17235,7 +17235,7 @@ in
 
   nixops = callPackage ../tools/package-management/nixops { };
 
-  nixopsUnstable = nixops;# callPackage ../tools/package-management/nixops/unstable.nix { };
+  nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { };
 
   nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
 
