summary refs log tree commit diff
path: root/pkgs/tools/package-management/nixops
diff options
context:
space:
mode:
authorRob Vermaas <rob.vermaas@gmail.com>2017-02-16 17:01:56 +0000
committerRob Vermaas <rob.vermaas@gmail.com>2017-02-16 17:03:12 +0000
commit1c366b4e0647abea0385395dcb2981a5b3161cf8 (patch)
treedd1f8f35e61aac4ebb546d71c4c71051af171132 /pkgs/tools/package-management/nixops
parent624cd8ae9eecc42d04559b8f1c36cb1bd4796fbf (diff)
downloadnixpkgs-1c366b4e0647abea0385395dcb2981a5b3161cf8.tar
nixpkgs-1c366b4e0647abea0385395dcb2981a5b3161cf8.tar.gz
nixpkgs-1c366b4e0647abea0385395dcb2981a5b3161cf8.tar.bz2
nixpkgs-1c366b4e0647abea0385395dcb2981a5b3161cf8.tar.lz
nixpkgs-1c366b4e0647abea0385395dcb2981a5b3161cf8.tar.xz
nixpkgs-1c366b4e0647abea0385395dcb2981a5b3161cf8.tar.zst
nixpkgs-1c366b4e0647abea0385395dcb2981a5b3161cf8.zip
nixops: update to 1.5
(cherry picked from commit 780a38c611162c34229c9d06b09dd4ec2f8466f4)
Diffstat (limited to 'pkgs/tools/package-management/nixops')
-rw-r--r--pkgs/tools/package-management/nixops/default.nix4
-rw-r--r--pkgs/tools/package-management/nixops/generic.nix4
-rw-r--r--pkgs/tools/package-management/nixops/unstable.nix7
3 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index bba392e30e7..820bcbb9a35 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.4";
+  version = "1.5";
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
-    sha256 = "1a6vkn8rh5lgalxh6cwr4894n3yp7f2qxcbcjv42nnmy5g4fy5fd";
+    sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd";
   };
 })
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index 87ed6295977..4d67e8a5d6f 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -23,8 +23,10 @@ python2Packages.buildPythonApplication {
       azure-mgmt-resource
       azure-mgmt-storage
       adal
-      pysqlite  # Go back to builtin sqlite once Python 2.7.13 is released
+      # Go back to sqlite once Python 2.7.13 is released
+      pysqlite
       datadog
+      digital-ocean
     ];
 
   doCheck = false;
diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index fb5791be239..820bcbb9a35 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -1,10 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "2016-11-23";
+  version = "1.5";
   src = fetchurl {
-    # Hydra doesn't serve production outputs anymore :(
-    url = "https://static.domenkozar.com/nixops-1.5pre0_abcdef.tar.bz2";
-    sha256 = "1a4cyd3zvkdjg9rf9ssr7p4i6r89zr483v5nlr5jzjdjjyi3j2bz";
+    url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
+    sha256 = "0z4pzc55wjab8v4bkrff94f8qp1g9ydgxxpl2dvy5130bg1s52wd";
   };
 })