oci-cli: 3.14.0 -> 3.51.8 (#384148)

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,27 +19,25 @@ let
         };
         doCheck = false;
       });
-
     };
   };
 in
-with py.pkgs;
 
-buildPythonApplication rec {
+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 ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with py.pkgs; [
     arrow
     certifi
     click
@@ -68,14 +54,19 @@ buildPythonApplication rec {
     terminaltables
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "cryptography>=3.2.1,<=37.0.2" "cryptography" \
-      --replace "pyOpenSSL>=17.5.0,<=22.0.0" "pyOpenSSL" \
-      --replace "PyYAML>=5.4,<6" "PyYAML" \
-      --replace "prompt-toolkit==3.0.29" "prompt-toolkit" \
-      --replace "terminaltables==3.1.0" "terminaltables" \
-      --replace "oci==2.78.0" "oci"
+  pythonRelaxDeps = [
+    "PyYAML"
+    "cryptography"
+    "oci"
+    "prompt-toolkit"
+    "pyOpenSSL"
+    "terminaltables"
+  ];
+
+  # Propagating dependencies leaks them through $PYTHONPATH which causes issues
+  # when used in nix-shell.
+  postFixup = ''
+    rm $out/nix-support/propagated-build-inputs
   '';
 
   postInstall = ''
@@ -96,13 +87,14 @@ buildPythonApplication rec {
       --zsh oci.zsh
   '';
 
-  # https://github.com/oracle/oci-cli/issues/187
-  doCheck = false;
+  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";
@@ -110,6 +102,9 @@ buildPythonApplication rec {
       asl20 # or
       upl
     ];
-    maintainers = with maintainers; [ ilian ];
+    maintainers = with maintainers; [
+      adamcstephens
+      ilian
+    ];
   };
 }

pkgs/development/python-modules/oci/default.nix

@@ -52,6 +52,9 @@ buildPythonPackage rec {
       asl20 # or
       upl
     ];
-    maintainers = with lib.maintainers; [ ilian ];
+    maintainers = with lib.maintainers; [
+      adamcstephens
+      ilian
+    ];
   };
 }