summary refs log tree commit diff
diff options
context:
space:
mode:
authorHerwig Hochleitner <herwig@bendlas.net>2019-03-03 11:16:13 +0100
committerHerwig Hochleitner <herwig@bendlas.net>2019-03-03 11:18:50 +0100
commit77edcf88dca0de15a2bcf34f8d94f02d1fbd4eab (patch)
treea66e561ce821d41e4683d5199c3e9944072b7b54
parent0379e97193d6311e0bfb248937257c0025c9a0fc (diff)
downloadnixpkgs-77edcf88dca0de15a2bcf34f8d94f02d1fbd4eab.tar
nixpkgs-77edcf88dca0de15a2bcf34f8d94f02d1fbd4eab.tar.gz
nixpkgs-77edcf88dca0de15a2bcf34f8d94f02d1fbd4eab.tar.bz2
nixpkgs-77edcf88dca0de15a2bcf34f8d94f02d1fbd4eab.tar.lz
nixpkgs-77edcf88dca0de15a2bcf34f8d94f02d1fbd4eab.tar.xz
nixpkgs-77edcf88dca0de15a2bcf34f8d94f02d1fbd4eab.tar.zst
nixpkgs-77edcf88dca0de15a2bcf34f8d94f02d1fbd4eab.zip
nixopsUnstable: mark as broken
Unstable should probably be working towards updating to the most
recent version, so marking as broken, instead of using the pinned
version, like stable does.

see https://github.com/NixOS/nixpkgs/pull/52550
see https://github.com/NixOS/nixops/issues/1065
see https://github.com/NixOS/nixpkgs/issues/52547
-rw-r--r--pkgs/tools/package-management/nixops/generic.nix3
-rw-r--r--pkgs/tools/package-management/nixops/unstable.nix17
2 files changed, 19 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index 2ce7f9858a5..813ae64bef5 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -1,6 +1,7 @@
 { lib, python2Packages, libxslt, docbook_xsl_ns, openssh, cacert
 # version args
 , src, version
+, meta ? {}
 }:
 
 python2Packages.buildPythonApplication {
@@ -55,5 +56,5 @@ python2Packages.buildPythonApplication {
     maintainers = with lib.maintainers; [ eelco rob domenkozar ];
     platforms = lib.platforms.unix;
     license = lib.licenses.lgpl3;
-  };
+  } // meta;
 }
diff --git a/pkgs/tools/package-management/nixops/unstable.nix b/pkgs/tools/package-management/nixops/unstable.nix
index dc71914f087..88d9d0c94be 100644
--- a/pkgs/tools/package-management/nixops/unstable.nix
+++ b/pkgs/tools/package-management/nixops/unstable.nix
@@ -10,4 +10,21 @@ callPackage ./generic.nix (rec {
     url = "https://hydra.nixos.org/build/88329589/download/2/nixops-${version}.tar.bz2";
     sha256 = "1ppnhqmsbiijm6r77h86abv3fjny5iq35yvj207s520kjwzaj7kc";
   };
+  # # 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;
 })