From 12261bc8d5efbf8f3aa2dbf61ba9c98c40e4cccb Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Fri, 21 Feb 2025 23:18:28 -0500 Subject: [PATCH] oci-cli: 3.14.0 -> 3.51.8 https://github.com/oracle/oci-cli/releases/tag/v3.51.8 --- pkgs/by-name/oc/oci-cli/package.nix | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix index 7048069871a1..1799ffe36e1e 100644 --- a/pkgs/by-name/oc/oci-cli/package.nix +++ b/pkgs/by-name/oc/oci-cli/package.nix @@ -1,27 +1,15 @@ { lib, fetchFromGitHub, - fetchPypi, python3, installShellFiles, + nix-update-script, }: let py = python3.override { self = py; packageOverrides = self: super: { - - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "7.1.2"; - - src = fetchPypi { - pname = "click"; - inherit version; - hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; - }; - disabledTests = [ "test_bytes_args" ]; # https://github.com/pallets/click/commit/6e05e1fa1c2804 - }); - jmespath = super.jmespath.overridePythonAttrs (oldAttrs: rec { version = "0.10.0"; src = oldAttrs.src.override { @@ -31,21 +19,20 @@ let }; doCheck = false; }); - }; }; in py.pkgs.buildPythonApplication rec { pname = "oci-cli"; - version = "3.14.0"; + version = "3.51.8"; format = "setuptools"; src = fetchFromGitHub { owner = "oracle"; repo = pname; - rev = "v${version}"; - hash = "sha256-yooEZuSIw2EMJVyT/Z/x4hJi8a1F674CtsMMGkMAYLg="; + tag = "v${version}"; + hash = "sha256-p+X6kJDjuDaOLgZ9KwrZJgAqORKLxPrXwQ4X+JZb1W4="; }; nativeBuildInputs = [ installShellFiles ]; @@ -97,9 +84,11 @@ py.pkgs.buildPythonApplication rec { doCheck = true; pythonImportsCheck = [ - " oci_cli " + "oci_cli" ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Command Line Interface for Oracle Cloud Infrastructure"; homepage = "https://docs.cloud.oracle.com/iaas/Content/API/Concepts/cliconcepts.htm";