From eb668785b5e7cd435ea7770a4ea4a4fca0592e67 Mon Sep 17 00:00:00 2001 From: ArchercatNEO Date: Sun, 22 Jun 2025 09:26:34 +0100 Subject: [PATCH 1/5] maintainers: add archercatneo --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 55fda4abe90f..22bcdd37daf2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1941,6 +1941,13 @@ githubId = 76066109; name = "Mario Liguori"; }; + archercatneo = { + name = "ArchercatNEO"; + email = "tururu.pompella@gmail.com"; + matrix = "@archercatneo:matrix.org"; + github = "ArchercatNEO"; + githubId = 108980279; + }; archseer = { email = "blaz@mxxn.io"; github = "archseer"; From 2f7be1c414cbef3aaa24d4f826c2fbeccbc52524 Mon Sep 17 00:00:00 2001 From: ArchercatNEO Date: Mon, 23 Jun 2025 07:07:10 +0100 Subject: [PATCH 2/5] python3Packages.pyliblo3: init at 0.16.3 This is a fork of pyliblo which has been unmaintained for 1 years. It is reputable as Debian packages it and has support from at least raysession. --- .../python-modules/pyliblo3/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/pyliblo3/default.nix diff --git a/pkgs/development/python-modules/pyliblo3/default.nix b/pkgs/development/python-modules/pyliblo3/default.nix new file mode 100644 index 000000000000..0051339f6361 --- /dev/null +++ b/pkgs/development/python-modules/pyliblo3/default.nix @@ -0,0 +1,45 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + python, + liblo, + cython, +}: + +buildPythonPackage rec { + pname = "pyliblo3"; + version = "0.16.3"; + pyproject = true; + + src = fetchFromGitHub { + owner = "gesellkammer"; + repo = "pyliblo3"; + tag = "v${version}"; + hash = "sha256-QfwZXkUT4U2Gfbv3rk0F/bze9hwJGn7H8t0X1SWqIuc="; + }; + + build-system = [ + setuptools + cython + ]; + + buildInputs = [ liblo ]; + + pythonImportsCheck = [ "pyliblo3" ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} ./test/unit.py + runHook postCheck + ''; + + meta = { + homepage = "https://github.com/gesellkammer/pyliblo3/"; + description = "Python wrapper for the liblo OSC library"; + changelog = "https://github.com/gesellkammer/pyliblo3/blob/${src.tag}/NEWS"; + license = lib.licenses.lgpl21Plus; + maintainers = [ lib.maintainers.archercatneo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b091dda03be..a2328e0112d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12917,6 +12917,8 @@ self: super: with self; { pyliblo = callPackage ../development/python-modules/pyliblo { }; + pyliblo3 = callPackage ../development/python-modules/pyliblo3 { }; + pylibmc = callPackage ../development/python-modules/pylibmc { }; pylibrespot-java = callPackage ../development/python-modules/pylibrespot-java { }; From 0702aae2176088e419752fe618553bf5332474e7 Mon Sep 17 00:00:00 2001 From: ArchercatNEO Date: Mon, 23 Jun 2025 07:11:10 +0100 Subject: [PATCH 3/5] carla: use pyliblo3 --- pkgs/applications/audio/carla/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 7748d68206e7..eec155591d35 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, alsa-lib, file, fluidsynth, @@ -36,6 +37,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FM/6TtNhDml1V9C5VisjLcZ3CzXsuwCZrsoz4yP3kI8="; }; + patches = [ + (fetchpatch2 { + # https://github.com/falkTX/Carla/pull/1933 + name = "prefer-pyliblo3-over-pyliblo.patch"; + url = "https://github.com/falkTX/Carla/commit/a81a2a545d2529233a6e0faa776fbd2d851442fb.patch?full_index=1"; + hash = "sha256-CHK3Aq/W9PdfMGsJunLN/WAxOmWJHc0jr/3TdEaIcMM="; + }) + ]; + nativeBuildInputs = [ python3Packages.wrapPython pkg-config @@ -47,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { with python3Packages; [ rdflib - pyliblo + pyliblo3 ] ++ lib.optional withFrontend pyqt5; From 56157c3f8528351fa70616d971511e86231244e9 Mon Sep 17 00:00:00 2001 From: ArchercatNEO Date: Mon, 23 Jun 2025 07:11:27 +0100 Subject: [PATCH 4/5] raysession: use pyliblo3 --- pkgs/applications/audio/raysession/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/applications/audio/raysession/default.nix index 38c6b78d72d7..ad6ae6e03dd9 100644 --- a/pkgs/applications/audio/raysession/default.nix +++ b/pkgs/applications/audio/raysession/default.nix @@ -3,7 +3,7 @@ fetchurl, buildPythonApplication, libjack2, - pyliblo, + pyliblo3, pyqt5, which, bash, @@ -39,8 +39,8 @@ buildPythonApplication rec { libjack2 bash ]; - propagatedBuildInputs = [ - pyliblo + dependencies = [ + pyliblo3 pyqt5 ]; From 4276e92b4f450ebfc99eeb45e171e3f3e4fe0592 Mon Sep 17 00:00:00 2001 From: ArchercatNEO Date: Mon, 23 Jun 2025 07:15:33 +0100 Subject: [PATCH 5/5] python3Packages.pyliblo: drop Fixes #389149 Supersedes #418499 pyliblo has been unmaintained for 10 years and its required cpython version is incompatible with python 3.13. Rather than keeping and patching a package with build issues we are moving to a fork which builds under modern tooling. --- .../python-modules/pyliblo/default.nix | 42 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 pkgs/development/python-modules/pyliblo/default.nix diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix deleted file mode 100644 index d5756f745b27..000000000000 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchurl, - isPyPy, - liblo, - cython_0, -}: - -buildPythonPackage rec { - pname = "pyliblo"; - version = "0.10.0"; - format = "setuptools"; - disabled = isPyPy; - - src = fetchurl { - url = "http://das.nasophon.de/download/${pname}-${version}.tar.gz"; - sha256 = "13vry6xhxm7adnbyj28w1kpwrh0kf7nw83cz1yq74wl21faz2rzw"; - }; - - patches = [ - (fetchurl { - url = "https://git.alpinelinux.org/aports/plain/community/py3-pyliblo/py3.11.patch?id=a7e1eca5533657ddd7e37c43e67e8126e3447258"; - hash = "sha256-4yCWNQaE/9FHGTVuvNEimBNuViWZ9aSJMcpTOP0fnM0="; - }) - # Fix compile error due to incompatible pointer type 'lo_blob_dataptr' - (fetchurl { - url = "https://github.com/dsacre/pyliblo/commit/ebbb255d6a73384ec2560047eab236660d4589db.patch?full_index=1"; - hash = "sha256-ZBAmBxSUT2xgoDVqSjq8TxW2jz3xR/pdCf2O3wMKvls="; - }) - ]; - - build-system = [ cython_0 ]; - - buildInputs = [ liblo ]; - - meta = with lib; { - homepage = "https://das.nasophon.de/pyliblo/"; - description = "Python wrapper for the liblo OSC library"; - license = licenses.lgpl21Only; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0083ce7d6dcc..a1ea5f3187f7 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -558,6 +558,7 @@ mapAliases ({ pyhiveapi = pyhive-integration; # Added 2025-02-22 pyhs100 = throw "pyhs100 has been removed in favor of python-kasa."; # added 2024-01-05 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 + pyliblo = throw "pyliblo is unmaintained upstream and was removed from nixpkgs. Please use pyliblo3 instead"; # added 2025-06-23 PyLD = pyld; # added 2022-06-22 pylti = throw "pylti has been removed because it is unmaintained since 2019"; # added 2024-05-21 pymaging = throw "pymaging has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a2328e0112d9..1ecd2aece86a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12915,8 +12915,6 @@ self: super: with self; { pylibjpeg-openjpeg = callPackage ../development/python-modules/pylibjpeg-openjpeg { }; - pyliblo = callPackage ../development/python-modules/pyliblo { }; - pyliblo3 = callPackage ../development/python-modules/pyliblo3 { }; pylibmc = callPackage ../development/python-modules/pylibmc { };