From 77edcf88dca0de15a2bcf34f8d94f02d1fbd4eab Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 3 Mar 2019 11:16:13 +0100 Subject: [PATCH] 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 --- .../tools/package-management/nixops/generic.nix | 3 ++- .../package-management/nixops/unstable.nix | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 2ce7f9858a5b..813ae64bef55 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 dc71914f087b..88d9d0c94bef 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; })