diff options
author | K900 <me@0upti.me> | 2024-01-08 00:51:35 +0300 |
---|---|---|
committer | K900 <me@0upti.me> | 2024-01-08 00:51:35 +0300 |
commit | 9e0000be281b9aa98d57c5d1741fc1442922f1d0 (patch) | |
tree | 46331aefd0f8545532096aacb3d55fabc6eda4ce | |
parent | c1dce2f654efc915df00a308c30574e27dca78ef (diff) | |
parent | 8694fb4187be13dec82b75ccef37fc5509f12e43 (diff) |
Merge branch 'master' into staging-next
37 files changed, 140 insertions, 59 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/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index 3b20e5c815d5a..d42e6f6eb675d 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.14"; + version = "0.26.15"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "sha256-2bvspG3lecKlcN/+YPRmFKQCu/jhckafeSo272iE+9k="; + sha256 = "sha256-BTNQDvcGjBJG4hj1N69yboNth4/ydeOS7T2KiqbPfGM="; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; 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 diff --git a/pkgs/by-name/as/asn1editor/package.nix b/pkgs/by-name/as/asn1editor/package.nix index a85d8f53fe6d1..07941a7762c49 100644 --- a/pkgs/by-name/as/asn1editor/package.nix +++ b/pkgs/by-name/as/asn1editor/package.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ asn1tools coverage - wxPython_4_2 + wxpython ]; pythonImportsCheck = [ "asn1editor" ]; diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix index 886cca9738375..c32b89af37d08 100644 --- a/pkgs/by-name/ki/kikit/default.nix +++ b/pkgs/by-name/ki/kikit/default.nix @@ -12,7 +12,7 @@ , markdown2 , pytestCheckHook , commentjson -, wxPython_4_2 +, wxpython , pcbnew-transition , pybars3 , versioneer @@ -42,7 +42,7 @@ buildPythonApplication rec { markdown2 commentjson # https://github.com/yaqwsx/KiKit/issues/575 - wxPython_4_2 + wxpython pcbnew-transition pybars3 # https://github.com/yaqwsx/KiKit/issues/574 diff --git a/pkgs/by-name/la/labwc-menu-generator/package.nix b/pkgs/by-name/la/labwc-menu-generator/package.nix new file mode 100644 index 0000000000000..331936ea5373c --- /dev/null +++ b/pkgs/by-name/la/labwc-menu-generator/package.nix @@ -0,0 +1,53 @@ +{ lib +, stdenv +, fetchFromGitHub +, glib +, perl +, pkg-config +, unstableGitUpdater +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "labwc-menu-generator"; + version = "unstable-2023-10-31"; + + src = fetchFromGitHub { + owner = "labwc"; + repo = "labwc-menu-generator"; + rev = "d7c81071f8b121ef83da32ae3fa16155d1a2ced9"; + hash = "sha256-gZ0TuSVJwcKW4orawSmRQvoCfrpb8yLXlv81qCR86MU="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + glib + ]; + + nativeCheckInputs = [ + perl + ]; + + doCheck = true; + + strictDeps = true; + + installPhase = '' + runHook preInstall + install -Dm755 labwc-menu-generator -t $out/bin + runHook postInstall + ''; + + passthru.updateScript = unstableGitUpdater { }; + + meta = { + homepage = "https://github.com/labwc/labwc-menu-generator"; + description = "Menu generator for labwc"; + mainProgram = "labwc-menu-generator"; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ AndersonTorres romildo ]; + }; +}) diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix index 306950a51532f..79791ddb0ca29 100644 --- a/pkgs/by-name/qr/qrtool/package.nix +++ b/pkgs/by-name/qr/qrtool/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "qrtool"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "sorairolake"; repo = "qrtool"; rev = "v${version}"; - sha256 = "sha256-96k3VgxVGuKPLA4rD9B20AigFW03YvedT04UUzzmX38="; + sha256 = "sha256-caQoV0qAj2VXbEaYHsGOqCZCVyb4s1JJbBl7H0X5xEI="; }; - cargoHash = "sha256-nAfW66vasnR0JHhz7n1XGA+OpPavOnGB6D6TfK9cr9Y="; + cargoHash = "sha256-V9TopADUGBR0MdOTIq1Tiee3NEzLa76zRq5bjULoLVI="; nativeBuildInputs = [ asciidoctor installShellFiles ]; diff --git a/pkgs/development/python-modules/ax/default.nix b/pkgs/development/python-modules/ax/default.nix index 105adef1efe40..a0315a561fba7 100644 --- a/pkgs/development/python-modules/ax/default.nix +++ b/pkgs/development/python-modules/ax/default.nix @@ -15,18 +15,19 @@ , pyfakefs , pytestCheckHook , yappi +, pyre-extensions }: buildPythonPackage rec { pname = "ax"; - version = "0.3.5"; + version = "0.3.6"; format = "pyproject"; src = fetchFromGitHub { owner = "facebook"; repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-AMnE5bHBUyfMGBxfhkByHY0dC/ft1/QLZgRGk0TyN10="; + rev = version; + hash = "sha256-5f2VpOFDRz6YzxvxFYWMu8hljkMVbBsyULYVreUxYRU="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ buildPythonPackage rec { pandas plotly typeguard + pyre-extensions ]; checkInputs = [ diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix index 54300aaff04b6..c62fef2478aec 100644 --- a/pkgs/development/python-modules/botorch/default.nix +++ b/pkgs/development/python-modules/botorch/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , gpytorch -, linear_operator +, linear-operator , multipledispatch , pyro-ppl , setuptools @@ -33,7 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gpytorch - linear_operator + linear-operator multipledispatch pyro-ppl scipy diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index 65b49a74aa7ed..c4664bc04ee7a 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub -, linear_operator +, linear-operator , scikit-learn , setuptools , setuptools-scm @@ -29,7 +29,7 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - linear_operator + linear-operator scikit-learn torch ]; diff --git a/pkgs/development/python-modules/humblewx/default.nix b/pkgs/development/python-modules/humblewx/default.nix index 1cb4a7a1686ae..71b76fe8c73e3 100644 --- a/pkgs/development/python-modules/humblewx/default.nix +++ b/pkgs/development/python-modules/humblewx/default.nix @@ -1,7 +1,7 @@ { lib , fetchFromGitHub , buildPythonPackage -, wxPython_4_2 +, wxpython , python }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "0fv8gwlbcj000qq34inbwgxf0xgibs590dsyqnw0mmyb7f1iq210"; }; - propagatedBuildInputs = [ wxPython_4_2 ]; + propagatedBuildInputs = [ wxpython ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/linear_operator/default.nix b/pkgs/development/python-modules/linear-operator/default.nix index f2e9c0b84929e..907cb9c44d735 100644 --- a/pkgs/development/python-modules/linear_operator/default.nix +++ b/pkgs/development/python-modules/linear-operator/default.nix @@ -11,13 +11,13 @@ }: buildPythonPackage rec { - pname = "linear_operator"; + pname = "linear-operator"; version = "0.5.2"; format = "pyproject"; src = fetchFromGitHub { owner = "cornellius-gp"; - repo = pname; + repo = "linear_operator"; rev = "refs/tags/v${version}"; hash = "sha256-OuE6jx9Q4IU+b2a+mrglRdBOReN1tt/thetNXxwk1GI="; }; diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor-agent/default.nix index 0cece3cc0a98a..f0b72da158b70 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor-agent/default.nix @@ -14,12 +14,13 @@ }: buildPythonPackage rec { - pname = "trezor_agent"; + pname = "trezor-agent"; version = "0.12.0"; format = "setuptools"; src = fetchPypi { - inherit pname version; + pname = "trezor_agent"; + inherit version; hash = "sha256-4IylpUvXZYAXFkyFGNbN9iPTsHff3M/RL2Eq9f7wWFU="; }; diff --git a/pkgs/development/python-modules/wxPython/4.2-ctypes.patch b/pkgs/development/python-modules/wxpython/4.2-ctypes.patch index 17fd8a9a8490c..17fd8a9a8490c 100644 --- a/pkgs/development/python-modules/wxPython/4.2-ctypes.patch +++ b/pkgs/development/python-modules/wxpython/4.2-ctypes.patch diff --git a/pkgs/development/python-modules/wxPython/4.2.nix b/pkgs/development/python-modules/wxpython/4.2.nix index 5cbab3005120d..70175f58c4497 100644 --- a/pkgs/development/python-modules/wxPython/4.2.nix +++ b/pkgs/development/python-modules/wxpython/4.2.nix @@ -40,13 +40,14 @@ }: buildPythonPackage rec { - pname = "wxPython"; + pname = "wxpython"; version = "4.2.1"; format = "other"; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; + pname = "wxPython"; + inherit version; hash = "sha256-5I3iEaZga/By7D+neHcda3RsALf0uXDrWHKN31bRPVw="; }; diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/development/tools/symfony-cli/default.nix index 1f42222779c85..7dbf5f6397471 100644 --- a/pkgs/development/tools/symfony-cli/default.nix +++ b/pkgs/development/tools/symfony-cli/default.nix @@ -4,6 +4,8 @@ , nix-update-script , testers , symfony-cli +, nssTools +, makeBinaryWrapper }: buildGoModule rec { @@ -25,8 +27,14 @@ buildGoModule rec { "-X main.channel=stable" ]; + buildInputs = [ makeBinaryWrapper ]; + postInstall = '' - mv $out/bin/symfony-cli $out/bin/symfony + mkdir $out/libexec + mv $out/bin/symfony-cli $out/libexec/symfony + + makeBinaryWrapper $out/libexec/symfony $out/bin/symfony \ + --prefix PATH : ${lib.makeBinPath [ nssTools ]} ''; # Tests requires network access diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 9a3a2a60c341d..a8b13179c2f8f 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.1.69"; - hash = "sha256-/uk2sS7g4REPtR/LSc7djjoc//m6QvrXfHO4OemQcy8="; + version = "6.1.70"; + hash = "sha256-SXXg0fIfqtOwjRC0m963rbB5J42T+Q/1iB5ombtLn0s="; variant = "lts"; }; mainVariant = { - version = "6.6.8"; - hash = "sha256-TtWTYuT3GMnQy1shkF+HTgv4Z1OSOLh4RXfG+Xj0n3M="; + version = "6.6.9"; + hash = "sha256-ugcmPGnOHRfkNu15v0hX56TPt9LN4B73yzwByaKvLUQ="; variant = "main"; }; diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index a2652b1cb575e..7be36afc62911 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -2,6 +2,7 @@ , buildGoModule , fetchFromGitHub , fetchNpmDeps +, fetchpatch , cacert , go , git @@ -16,16 +17,25 @@ buildGoModule rec { pname = "evcc"; - version = "0.123.2"; + version = "0.123.7"; src = fetchFromGitHub { owner = "evcc-io"; - repo = pname; + repo = "evcc"; rev = version; - hash = "sha256-iGt3j8q8dpQLUIHHnGHCgraPETk9GL9t/ygBZtPG7yM="; + hash = "sha256-I8qcKrCuiUpDdsWDMiEZdo+PBkMELo5V6GW+nKFaD3Y="; }; - vendorHash = "sha256-rhGMN5v+JzNg1p2GptomDDtqS7M4EafROXXy185qtmU="; + patches = [ + (fetchpatch { + # https://github.com/evcc-io/evcc/pull/11547 + name = "evcc-mockgen.patch"; + url = "https://github.com/evcc-io/evcc/commit/5ec02a9dba79a733f71fc02a9552eb01e4e08f0b.patch"; + hash = "sha256-uxKdtwdhUcMFCMkG756OD9aSMP9rdOL4Tg0HBWwp3kw="; + }) + ]; + + vendorHash = "sha256-FKF6+64mjrKgzFAb+O0QCURieOoRB//QNbpMFMcNG8s="; npmDeps = fetchNpmDeps { inherit src; @@ -46,6 +56,8 @@ buildGoModule rec { mockgen ]; + inherit patches; + preBuild = '' make assets ''; diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index a4a788a0e5cfa..43ef277ffba38 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "zigbee2mqtt"; - version = "1.35.0"; + version = "1.35.1"; src = fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - hash = "sha256-0swbnT+iQqX1jQ1INJmG2zSgiu4pM7zu0ieBkpUE9zg="; + hash = "sha256-ZOIV7PLBnPbisIStC+MNMZgf+Hw/+n4lONpgomRkZEE="; }; - npmDepsHash = "sha256-VXdu5IKUao0mFO0Wzev99LmhZSaGn/04cSexa6EHSrg="; + npmDepsHash = "sha256-2WSuc9bmt5kK477c3AMOLFguvXZ2Nl+Qb67j5k7eL3o="; nodejs = nodejs_18; diff --git a/pkgs/tools/games/mymcplus/default.nix b/pkgs/tools/games/mymcplus/default.nix index 38908c5dd6f8c..0e5abb1e8994a 100644 --- a/pkgs/tools/games/mymcplus/default.nix +++ b/pkgs/tools/games/mymcplus/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ pyopengl - wxPython_4_2 + wxpython ]; meta = with lib; { diff --git a/pkgs/tools/misc/woeusb-ng/default.nix b/pkgs/tools/misc/woeusb-ng/default.nix index f8078c525541f..821eb73a4a896 100644 --- a/pkgs/tools/misc/woeusb-ng/default.nix +++ b/pkgs/tools/misc/woeusb-ng/default.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { parted grub2 termcolor - wxPython_4_2 + wxpython six ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ccbeaced8a6af..b062528eae432 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1016,6 +1016,7 @@ mapAliases ({ tokodon = plasma5Packages.tokodon; tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 transfig = fig2dev; # Added 2022-02-15 + trezor_agent = trezor-agent; # Added 2024-01-07 trustedGrub = throw "trustedGrub has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 trustedGrub-for-HP = throw "trustedGrub-for-HP has been removed, because it is not maintained upstream anymore"; # Added 2023-05-10 tvbrowser-bin = tvbrowser; # Added 2023-03-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09fd4a7f99095..ca472d5ae6792 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14054,7 +14054,7 @@ with pkgs; buildGoModule = buildGo120Module; }; - trezor_agent = with python3Packages; toPythonApplication trezor_agent; + trezor-agent = with python3Packages; toPythonApplication trezor-agent; trezor-suite = callPackage ../applications/blockchains/trezor-suite { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5a6be8b4b8f94..74a039855730d 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -245,6 +245,7 @@ mapAliases ({ ledger_agent = ledger-agent; # Added 2024-01-07 lektor = throw "lektor has been promoted to a top-level attribute"; # added 2023-08-01 line_profiler = line-profiler; # added 2023-11-04 + linear_operator = linear-operator; # added 2024-01-07 livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14 livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14 logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29 @@ -472,6 +473,7 @@ mapAliases ({ thumborPexif = throw "thumborPexif has been removed, because it was unused."; # added 2024-01-07 torrent_parser = torrent-parser; # added 2023-11-04 transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27 + trezor_agent = trezor-agent; # Added 2024-01-07 tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19 tvdb_api = tvdb-api; # added 2023-10-20 tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05 @@ -492,8 +494,9 @@ mapAliases ({ webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29 websocket_client = websocket-client; # added 2021-06-15 word2vec = throw "word2vec has been removed because it is abandoned"; # added 2023-05-22 - wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxPython_4_2 instead"; # added 2023-03-19 - wxPython_4_1 = throw "wxPython_4_1 has been removed, use wxPython_4_2 instead"; # added 2023-03-19 + wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxpython instead"; # added 2023-03-19 + wxPython_4_1 = throw "wxPython_4_1 has been removed, use wxpython instead"; # added 2023-03-19 + wxPython_4_2 = wxpython; # added 2024-01-07 WSME = wsme; # added 2023-02-19 x11_hash = x11-hash; # added 2023-11-05 xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4bd67bc7b97eb..f886ac2233eee 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6502,7 +6502,7 @@ self: super: with self; { limnoria = callPackage ../development/python-modules/limnoria { }; - linear_operator = callPackage ../development/python-modules/linear_operator { }; + linear-operator = callPackage ../development/python-modules/linear-operator { }; linecache2 = callPackage ../development/python-modules/linecache2 { }; @@ -14551,7 +14551,7 @@ self: super: with self; { treq = callPackage ../development/python-modules/treq { }; - trezor_agent = callPackage ../development/python-modules/trezor_agent { }; + trezor-agent = callPackage ../development/python-modules/trezor-agent { }; trezor = callPackage ../development/python-modules/trezor { }; @@ -16121,7 +16121,7 @@ self: super: with self; { wurlitzer = callPackage ../development/python-modules/wurlitzer { }; - wxPython_4_2 = callPackage ../development/python-modules/wxPython/4.2.nix { + wxpython = callPackage ../development/python-modules/wxpython/4.2.nix { wxGTK = pkgs.wxGTK32.override { withWebKit = true; }; |