From 9f402912f38f6aa15c50a2f851bf7b6a7dbe3da6 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Wed, 3 Jan 2024 21:35:27 +0100 Subject: [PATCH] python311Packages.cx-oracle: rename from cx_oracle --- .../python-modules/{cx_oracle => cx-oracle}/default.nix | 5 +++-- pkgs/development/python-modules/patator/default.nix | 4 ++-- pkgs/development/python-modules/sqlalchemy/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) rename pkgs/development/python-modules/{cx_oracle => cx-oracle}/default.nix (89%) diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx-oracle/default.nix similarity index 89% rename from pkgs/development/python-modules/cx_oracle/default.nix rename to pkgs/development/python-modules/cx-oracle/default.nix index 3b7d701f1114a..040f762c9f21c 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx-oracle/default.nix @@ -1,13 +1,14 @@ { lib, buildPythonPackage, fetchPypi, odpic }: buildPythonPackage rec { - pname = "cx_Oracle"; + pname = "cx-oracle"; version = "8.3.0"; buildInputs = [ odpic ]; src = fetchPypi { - inherit pname version; + pname = "cx_Oracle"; + inherit version; sha256 = "3b2d215af4441463c97ea469b9cc307460739f89fdfa8ea222ea3518f1a424d9"; }; diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix index 62f75cf37cabc..016f93b41975f 100644 --- a/pkgs/development/python-modules/patator/default.nix +++ b/pkgs/development/python-modules/patator/default.nix @@ -1,7 +1,7 @@ { lib , ajpy , buildPythonPackage -, cx_oracle +, cx-oracle , dnspython , fetchPypi , impacket @@ -37,7 +37,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ajpy - cx_oracle + cx-oracle dnspython impacket ipy diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 95e357cabda94..ffa9c12755b05 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -17,7 +17,7 @@ , aiosqlite , asyncmy , asyncpg -, cx_oracle +, cx-oracle , mariadb , mypy , mysql-connector @@ -89,7 +89,7 @@ buildPythonPackage rec { mariadb ]; oracle = [ - cx_oracle + cx-oracle ]; oracle_oracledb = [ oracledb diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e816cfe2a9a78..e4221e60c7a69 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -89,6 +89,7 @@ mapAliases ({ cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 cx_Freeze = cx-freeze; # added 2023-08-02 + cx_oracle = cx-oracle; # added 2024-01-03 d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30 dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24 dateutil = python-dateutil; # added 2021-07-03 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 27cf855a52d55..af33cb13ae1e2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2522,7 +2522,7 @@ self: super: with self; { cx-freeze = callPackage ../development/python-modules/cx-freeze { }; - cx_oracle = callPackage ../development/python-modules/cx_oracle { }; + cx-oracle = callPackage ../development/python-modules/cx-oracle { }; cxxfilt = callPackage ../development/python-modules/cxxfilt { };