diff options
author | Felix Buehler <account@buehler.rocks> | 2024-01-07 13:35:51 +0100 |
---|---|---|
committer | Martin Weinelt <mweinelt@users.noreply.github.com> | 2024-01-07 21:16:47 +0100 |
commit | 2adcc8846aa5244c4d87446e0267c9657a6f281b (patch) | |
tree | bef644e90889ec542a455d63af1d2b1607068750 /pkgs/applications | |
parent | e253a1d1746afa9b9a8ef8df68364d863d8897d7 (diff) |
python311Packages.wxpython: rename from wxPython_4_2
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/audio/easyabc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/gis/grass/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/displaycal/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/loxodo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/meerk40t/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/metamorphose2/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/playonlinux/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/printrun/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/office/timeline/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/radio/chirp/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/radio/quisk/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/electronics/kicad/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/robotics/mavproxy/default.nix | 4 |
14 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/applications/audio/easyabc/default.nix b/pkgs/applications/audio/easyabc/default.nix index 54b1f31d1c11d..edf6e3596aa2a 100644 --- a/pkgs/applications/audio/easyabc/default.nix +++ b/pkgs/applications/audio/easyabc/default.nix @@ -7,7 +7,7 @@ let packageOverrides = self: super: { # currently broken with 4.2.1 # https://github.com/jwdj/EasyABC/issues/75 - wxPython_4_2 = super.wxPython_4_2.overrideAttrs (args: rec { + wxpython = super.wxpython.overrideAttrs (args: rec { version = "4.2.0"; src = fetchPypi { inherit version; @@ -32,7 +32,7 @@ in python.pkgs.buildPythonApplication { propagatedBuildInputs = with python.pkgs; [ cx-freeze - wxPython_4_2 + wxpython pygame ]; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 9294c33c5863d..c42984a8d6ff5 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { libmysqlclient # for `mysql_config` netcdf # for `nc-config` pkg-config - ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]); + ] ++ (with python3Packages; [ python-dateutil numpy wxpython ]); buildInputs = [ blas diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index f54a1c1023015..0eef148398cb7 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ build certifi - wxPython_4_2 + wxpython dbus-python distro numpy diff --git a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix index 988b1ac3e9c8e..59693cece6203 100644 --- a/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/silhouette/default.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication rec { python3.pkgs.lxml python3.pkgs.inkex python3.pkgs.matplotlib - python3.pkgs.wxPython_4_2 + python3.pkgs.wxpython python3.pkgs.xmltodict ]; diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 53ea7730cb129..78d01af1f08b4 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication { patches = [ ./wxpython.patch ]; - propagatedBuildInputs = with python3.pkgs; [ six wxPython_4_2 ]; + propagatedBuildInputs = with python3.pkgs; [ six wxpython ]; postInstall = '' mv $out/bin/loxodo.py $out/bin/loxodo diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/applications/misc/meerk40t/default.nix index bb426beb0ca9c..125ca9750abca 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/applications/misc/meerk40t/default.nix @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { pyserial pyusb setuptools - wxPython_4_2 + wxpython ]; preFixup = '' diff --git a/pkgs/applications/misc/metamorphose2/default.nix b/pkgs/applications/misc/metamorphose2/default.nix index 69662f4f4958d..9b2b7bdde8815 100644 --- a/pkgs/applications/misc/metamorphose2/default.nix +++ b/pkgs/applications/misc/metamorphose2/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = with python3.pkgs; [ mutagen wxPython_4_2 pillow six ]; + propagatedBuildInputs = with python3.pkgs; [ mutagen wxpython pillow six ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index edeb7ceae9620..89fcdfe4f7119 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -61,7 +61,7 @@ let libs = pkgs: lib.makeLibraryPath [ xorg.libX11 libGL ]; python = python3.withPackages(ps: with ps; [ - wxPython_4_2 + wxpython setuptools natsort ]); diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index e436d0514a616..658e36cf88780 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ glib wrapGAppsHook ]; propagatedBuildInputs = with python3Packages; [ - appdirs cython dbus-python numpy six wxPython_4_2 psutil pyglet pyopengl pyserial cffi cairosvg lxml + appdirs cython dbus-python numpy six wxpython psutil pyglet pyopengl pyserial cffi cairosvg lxml ]; # pyglet.canvas.xlib.NoSuchDisplayException: Cannot connect to "None" diff --git a/pkgs/applications/office/timeline/default.nix b/pkgs/applications/office/timeline/default.nix index 70776bb391bfc..7953badbec4d8 100644 --- a/pkgs/applications/office/timeline/default.nix +++ b/pkgs/applications/office/timeline/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ python3.pkgs.wrapPython copyDesktopItems wrapGAppsHook ]; pythonPath = with python3.pkgs; [ - wxPython_4_2 + wxpython humblewx icalendar markdown diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 48e75048ba6ae..6b41c36550eff 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { pyserial requests six - wxPython_4_2 + wxpython yattag ]; diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix index 7129a18cd11f9..bda0f56caf6a5 100644 --- a/pkgs/applications/radio/quisk/default.nix +++ b/pkgs/applications/radio/quisk/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pyusb - wxPython_4_2 + wxpython ]; doCheck = false; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index c6c66839e4bc5..05498057aac61 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -118,7 +118,7 @@ let wxGTK = wxGTK32; python = python3; - wxPython = python.pkgs.wxPython_4_2; + wxPython = python.pkgs.wxpython; addonPath = "addon.zip"; addonsDrvs = map (pkg: pkg.override { inherit addonPath python3; }) addons; diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index b3337b7f55c8a..1252073fab187 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildPythonApplication, fetchPypi, lxml, matplotlib, numpy -, opencv4, pymavlink, pyserial, setuptools, wxPython_4_2, billiard +, opencv4, pymavlink, pyserial, setuptools, wxpython, billiard , gnureadline }: buildPythonApplication rec { @@ -24,7 +24,7 @@ buildPythonApplication rec { pymavlink pyserial setuptools - wxPython_4_2 + wxpython ] ++ lib.optionals stdenv.isDarwin [ billiard gnureadline ]; # No tests |