From e77888cca5a1aa5ad409ca284c45fc309087a2b8 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 21 Feb 2025 23:11:19 -0500
Subject: [PATCH] oci-cli: drop toplevel with, use relaxDeps

---
 pkgs/by-name/oc/oci-cli/package.nix | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix
index fca8f519d0be..7048069871a1 100644
--- a/pkgs/by-name/oc/oci-cli/package.nix
+++ b/pkgs/by-name/oc/oci-cli/package.nix
@@ -35,9 +35,8 @@ let
     };
   };
 in
-with py.pkgs;
 
-buildPythonApplication rec {
+py.pkgs.buildPythonApplication rec {
   pname = "oci-cli";
   version = "3.14.0";
   format = "setuptools";
@@ -51,7 +50,7 @@ buildPythonApplication rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with py.pkgs; [
     arrow
     certifi
     click
@@ -68,15 +67,14 @@ 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"
+  ];
 
   postInstall = ''
     cat >oci.zsh <<EOF
@@ -96,8 +94,7 @@ buildPythonApplication rec {
       --zsh oci.zsh
   '';
 
-  # https://github.com/oracle/oci-cli/issues/187
-  doCheck = false;
+  doCheck = true;
 
   pythonImportsCheck = [
     " oci_cli "