summary refs log tree commit diff
diff options
context:
space:
mode:
authorAmineChikhaoui <amine.chikhaoui91@gmail.com>2019-04-17 10:32:15 -0400
committerAmineChikhaoui <amine.chikhaoui91@gmail.com>2019-04-17 11:10:40 -0400
commit5b5ca459d2a2adbcfb05e878200c8788a9acc829 (patch)
treeacac6f9edd0d47d90f6ff280798fd6aebfd77903
parent0db54f93fbb32ea859f9fd19eebfb25f079ad672 (diff)
downloadnixpkgs-5b5ca459d2a2adbcfb05e878200c8788a9acc829.tar
nixpkgs-5b5ca459d2a2adbcfb05e878200c8788a9acc829.tar.gz
nixpkgs-5b5ca459d2a2adbcfb05e878200c8788a9acc829.tar.bz2
nixpkgs-5b5ca459d2a2adbcfb05e878200c8788a9acc829.tar.lz
nixpkgs-5b5ca459d2a2adbcfb05e878200c8788a9acc829.tar.xz
nixpkgs-5b5ca459d2a2adbcfb05e878200c8788a9acc829.tar.zst
nixpkgs-5b5ca459d2a2adbcfb05e878200c8788a9acc829.zip
nixopsUnstable: 1.6.1pre2728_8ed39f9 -> 1.7pre2764_932bf43
-rw-r--r--pkgs/tools/package-management/nixops/default.nix2
-rw-r--r--pkgs/tools/package-management/nixops/unstable.nix23
2 files changed, 4 insertions, 21 deletions
diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index e22fd422239..7cd7935d155 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -3,7 +3,7 @@
 callPackage ./generic.nix (rec {
   version = "1.7";
   src = fetchurl {
-    url = "https://hydra.nixos.org/build/92372310/download/2/nixops-1.7.tar.bz2";
+    url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
     sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3";
   };
 })
diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index 88d9d0c94be..94975807dea 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -5,26 +5,9 @@
 # Then copy the URL to the tarball.
 
 callPackage ./generic.nix (rec {
-  version = "1.6.1pre2728_8ed39f9";
+  version = "1.7pre2764_932bf43";
   src = fetchurl {
-    url = "https://hydra.nixos.org/build/88329589/download/2/nixops-${version}.tar.bz2";
-    sha256 = "1ppnhqmsbiijm6r77h86abv3fjny5iq35yvj207s520kjwzaj7kc";
+    url = "https://hydra.nixos.org/build/92372343/download/2/nixops-${version}.tar.bz2";
+    sha256 = "f35bf81bf2805473ea54248d0ee92d163d00a1992f3f75d17e8cf430db1f9919";
   };
-  # # Marking unstable as broken, instead of using the pinned version,
-  # # like stable does You might be able to use the following code (as
-  # # in stable), to run unstable against the pinned packages
-  # python2Packages = pkgs.python2Packages.override {
-  #   overrides = (self: super: let callPackage = newScope self; in {
-  #     azure-mgmt-compute = callPackage ./azure-mgmt-compute { };
-  #     azure-mgmt-network = callPackage ./azure-mgmt-network { };
-  #     azure-mgmt-nspkg = callPackage ./azure-mgmt-nspkg { };
-  #     azure-mgmt-resource = callPackage ./azure-mgmt-resource { };
-  #     azure-mgmt-storage = callPackage ./azure-mgmt-storage { };
-  #   });
-  # };
-  # # otherwise
-  # # see https://github.com/NixOS/nixpkgs/pull/52550
-  # # see https://github.com/NixOS/nixops/issues/1065
-  # # see https://github.com/NixOS/nixpkgs/issues/52547
-  meta.broken = true;
 })