diff options
author | Fabian Affolter <mail@fabian-affolter.ch> | 2022-01-10 10:29:45 +0100 |
---|---|---|
committer | Fabian Affolter <mail@fabian-affolter.ch> | 2022-01-10 10:48:43 +0100 |
commit | ff5e6707f0279c5edef140dd411ba625ec9fa56c (patch) | |
tree | 6071c341a042d91f089c5c49c009006a5b6df085 /pkgs/tools/admin/oci-cli | |
parent | 5a63df0c118656b9349ee60a944a2024b3efd6cd (diff) | |
download | nixpkgs-ff5e6707f0279c5edef140dd411ba625ec9fa56c.tar nixpkgs-ff5e6707f0279c5edef140dd411ba625ec9fa56c.tar.gz nixpkgs-ff5e6707f0279c5edef140dd411ba625ec9fa56c.tar.bz2 nixpkgs-ff5e6707f0279c5edef140dd411ba625ec9fa56c.tar.lz nixpkgs-ff5e6707f0279c5edef140dd411ba625ec9fa56c.tar.xz nixpkgs-ff5e6707f0279c5edef140dd411ba625ec9fa56c.tar.zst nixpkgs-ff5e6707f0279c5edef140dd411ba625ec9fa56c.zip |
oci-cli: 2.23.0 -> 3.4.1
Diffstat (limited to 'pkgs/tools/admin/oci-cli')
-rw-r--r-- | pkgs/tools/admin/oci-cli/default.nix | 79 |
1 files changed, 47 insertions, 32 deletions
diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index 729f0aa8fd9..7abea7ae925 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -1,59 +1,74 @@ -{ lib, fetchFromGitHub, python3Packages, locale }: +{ lib +, fetchFromGitHub +, python3 +}: let - # https://github.com/oracle/oci-cli/issues/189 - pinned_click = python3Packages.click.overridePythonAttrs (old: rec { - pname = "click"; - version = "6.7"; - src = python3Packages.fetchPypi { - inherit pname version; - hash = "sha256-8VUW30eNWlYYD7+A5o8gYBDm0WD8OfpQi2XgNf11Ews="; - }; + py = python3.override { + packageOverrides = self: super: { + + click = super.click.overridePythonAttrs (oldAttrs: rec { + version = "7.1.2"; - postPatch = '' - substituteInPlace click/_unicodefun.py \ - --replace "'locale'" "'${locale}/bin/locale'" - ''; + src = oldAttrs.src.override { + inherit version; + hash = "sha256-0rUlXHxjSbwb0eWeCM0SrLvWPOZJ8liHVXg6qU37axo="; + }; + }); - # Issue that wasn't resolved when this version was released: - # https://github.com/pallets/click/issues/823 - doCheck = false; - }); + }; + }; in +with py.pkgs; -python3Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "oci-cli"; - version = "2.23.0"; + version = "3.4.1"; + format = "setuptools"; src = fetchFromGitHub { owner = "oracle"; repo = "oci-cli"; rev = "v${version}"; - hash = "sha256-XRkycJrUSOZQAGiSyQZGA/SnlxnFumYL82kOkYd7s2o="; + hash = "sha256-ibk5WfNPa02D7UcP+4xg8Pi9P45yUPEm56l76IwNuRE="; }; - propagatedBuildInputs = with python3Packages; [ - oci arrow certifi pinned_click configparser cryptography jmespath python-dateutil - pytz retrying six terminaltables pyopenssl pyyaml + propagatedBuildInputs = [ + arrow + certifi + click + configparser + cryptography + jmespath + oci + pyopenssl + python-dateutil + pytz + pyyaml + retrying + six + terminaltables ]; - # https://github.com/oracle/oci-cli/issues/187 - doCheck = false; - postPatch = '' substituteInPlace setup.py \ - --replace "configparser==4.0.2" "configparser" \ - --replace "cryptography==3.2.1" "cryptography" \ + --replace "cryptography>=3.2.1,<=3.4.7" "cryptography" \ --replace "pyOpenSSL==19.1.0" "pyOpenSSL" \ - --replace "PyYAML==5.3.1" "PyYAML" \ - --replace "six==1.14.0" "six" \ - --replace "arrow==0.17.0" "arrow" + --replace "PyYAML>=5.4,<6" "PyYAML" \ + --replace "terminaltables==3.1.0" "terminaltables" ''; + # https://github.com/oracle/oci-cli/issues/187 + doCheck = false; + + pythonImportsCheck = [ + " oci_cli " + ]; + meta = with lib; { description = "Command Line Interface for Oracle Cloud Infrastructure"; homepage = "https://docs.cloud.oracle.com/iaas/Content/API/Concepts/cliconcepts.htm"; + license = with licenses; [ asl20 /* or */ upl ]; maintainers = with maintainers; [ ilian ]; - license = with licenses; [ asl20 upl ]; }; } |