From ecf05f1c15eb348bf3f72cb2bc2729f6f10974ec Mon Sep 17 00:00:00 2001 From: Samuel Ainsworth Date: Sun, 8 Jan 2023 04:17:59 +0000 Subject: [PATCH] python3Packages: virtual-display -> PyVirtualDisplay virtual-display is a quite old package, and it's not clear why it was named "virtual-display" as the PyPI name is (and was) "PyVirtualDisplay". In any case, this commit rectifies that inconsistency. --- .../{virtual-display => PyVirtualDisplay}/default.nix | 0 pkgs/development/python-modules/pytest-xvfb/default.nix | 4 ++-- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 6 ++++-- 4 files changed, 7 insertions(+), 4 deletions(-) rename pkgs/development/python-modules/{virtual-display => PyVirtualDisplay}/default.nix (100%) diff --git a/pkgs/development/python-modules/virtual-display/default.nix b/pkgs/development/python-modules/PyVirtualDisplay/default.nix similarity index 100% rename from pkgs/development/python-modules/virtual-display/default.nix rename to pkgs/development/python-modules/PyVirtualDisplay/default.nix diff --git a/pkgs/development/python-modules/pytest-xvfb/default.nix b/pkgs/development/python-modules/pytest-xvfb/default.nix index c3dabe7f6e3..f4038c55779 100644 --- a/pkgs/development/python-modules/pytest-xvfb/default.nix +++ b/pkgs/development/python-modules/pytest-xvfb/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , pytest -, virtual-display +, PyVirtualDisplay , isPy27 }: @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ pytest ]; propagatedBuildInputs = [ - virtual-display + PyVirtualDisplay ]; meta = with lib; { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 75f5cf537a2..e7bfd9fa016 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -223,6 +223,7 @@ mapAliases ({ unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01 uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13 uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13 + virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07 Wand = wand; # added 2022-11-13 WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29 weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e1a758e4d4..ed6f6319c9f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6285,6 +6285,8 @@ self: super: with self; { nocaselist = callPackage ../development/python-modules/nocaselist { }; + nocturne = callPackage ../development/python-modules/nocturne { }; + nodeenv = callPackage ../development/python-modules/nodeenv { }; nodepy-runtime = callPackage ../development/python-modules/nodepy-runtime { }; @@ -9454,6 +9456,8 @@ self: super: with self; { pyvicare = callPackage ../development/python-modules/pyvicare { }; + PyVirtualDisplay = callPackage ../development/python-modules/PyVirtualDisplay { }; + pyvis = callPackage ../development/python-modules/pyvis { }; pyvisa = callPackage ../development/python-modules/pyvisa { }; @@ -11848,8 +11852,6 @@ self: super: with self; { virtkey = callPackage ../development/python-modules/virtkey { }; - virtual-display = callPackage ../development/python-modules/virtual-display { }; - virtualenv = callPackage ../development/python-modules/virtualenv { }; virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { };