From 71d6e2167088c53bcf5f29b09d639ffacf0ddb5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 19 Feb 2023 19:41:23 +0000 Subject: [PATCH] python310Packages.theano: Normalize attribute, pname, dirname Also normalizes the overrides `theanoWithCuda` and `theanoWithoutCuda`. --- .../python-modules/{Theano => theano}/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 3 +++ pkgs/top-level/python-packages.nix | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) rename pkgs/development/python-modules/{Theano => theano}/default.nix (99%) diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/theano/default.nix similarity index 99% rename from pkgs/development/python-modules/Theano/default.nix rename to pkgs/development/python-modules/theano/default.nix index e931875605bc..627941e6bc4a 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/theano/default.nix @@ -48,7 +48,7 @@ let libgpuarray_ = libgpuarray.override { inherit cudaSupport cudaPackages; }; in buildPythonPackage rec { - pname = "Theano"; + pname = "theano"; version = "1.0.5"; disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fdd5218529b2..e9241fe9d8f0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -258,6 +258,9 @@ mapAliases ({ tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25 tensorflow-tensorboard = tensorboard; # added 2022-03-06 tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25 + Theano = theano; # added 2023-02-19 + TheanoWithCuda = theanoWithCuda; # added 2023-02-19 + TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19 tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ed7ae60dd9d8..204a4b33a5eb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11443,17 +11443,17 @@ self: super: with self; { theano-pymc = callPackage ../development/python-modules/theano-pymc { }; - Theano = callPackage ../development/python-modules/Theano rec { + theano = callPackage ../development/python-modules/theano rec { cudaSupport = pkgs.config.cudaSupport or false; cudnnSupport = cudaSupport; }; - TheanoWithCuda = self.Theano.override { + theanoWithCuda = self.theano.override { cudaSupport = true; cudnnSupport = true; }; - TheanoWithoutCuda = self.Theano.override { + theanoWithoutCuda = self.theano.override { cudaSupport = false; cudnnSupport = false; };