From 7a1876a7ad696acfa616bc9f14cdd97c66367d08 Mon Sep 17 00:00:00 2001 From: GraysonTinker Date: Wed, 6 May 2026 21:37:36 -0700 Subject: [PATCH 1/4] twitch-chat-downloader: migrate to by-name --- .../tw/twitch-chat-downloader/package.nix} | 17 ++++++++--------- pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 8 insertions(+), 13 deletions(-) rename pkgs/{applications/misc/twitch-chat-downloader/default.nix => by-name/tw/twitch-chat-downloader/package.nix} (83%) diff --git a/pkgs/applications/misc/twitch-chat-downloader/default.nix b/pkgs/by-name/tw/twitch-chat-downloader/package.nix similarity index 83% rename from pkgs/applications/misc/twitch-chat-downloader/default.nix rename to pkgs/by-name/tw/twitch-chat-downloader/package.nix index 99c95666de44..edd59e0c56ca 100644 --- a/pkgs/applications/misc/twitch-chat-downloader/default.nix +++ b/pkgs/by-name/tw/twitch-chat-downloader/package.nix @@ -1,16 +1,13 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - iso8601, - progressbar2, - requests, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "twitch-chat-downloader"; version = "2.5.5"; - format = "setuptools"; + pyproject = true; # NOTE: Using maintained fork because upstream has stopped working, and it has # not been updated in a while. @@ -18,10 +15,12 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "TheDrHax"; repo = "twitch-chat-downloader"; - rev = version; + rev = finalAttrs.version; hash = "sha256-9wIp0uttVBOdexOMb8VvpUEEdZ97SGSlZcFQ4jM/tqM="; }; + build-system = [ python3Packages.setuptools ]; + postPatch = '' # Update client ID for Twitch changes # See: @@ -29,7 +28,7 @@ buildPythonApplication rec { --replace-fail jzkbprff40iqj646a697cyrvl0zt2m6 kd1unb4b3q4t58fwlpcbzcbnm76a8fp ''; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ iso8601 progressbar2 requests @@ -46,4 +45,4 @@ buildPythonApplication rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ assistant ]; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b9a43a312e0..7b38eb4b4920 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3276,10 +3276,6 @@ with pkgs; ttfautohint-nox = ttfautohint.override { enableGUI = false; }; - twitch-chat-downloader = - python3Packages.callPackage ../applications/misc/twitch-chat-downloader - { }; - uftraceFull = uftrace.override { withLuaJIT = true; withPython = true; From 429f7911570d52196fd8eee456e2793a500f033f Mon Sep 17 00:00:00 2001 From: GraysonTinker Date: Wed, 6 May 2026 21:49:14 -0700 Subject: [PATCH 2/4] evtest-qt: fix license --- pkgs/by-name/ev/evtest-qt/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ev/evtest-qt/package.nix b/pkgs/by-name/ev/evtest-qt/package.nix index dbf98a59b5ae..d6a84ff71472 100644 --- a/pkgs/by-name/ev/evtest-qt/package.nix +++ b/pkgs/by-name/ev/evtest-qt/package.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation { homepage = "https://github.com/Grumbel/evtest-qt"; maintainers = with lib.maintainers; [ alexarice ]; platforms = lib.platforms.linux; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; }; } From 55aab24f6c159b61c1cc7a8934ff979303f1265a Mon Sep 17 00:00:00 2001 From: GraysonTinker Date: Wed, 6 May 2026 22:13:38 -0700 Subject: [PATCH 3/4] ola: migrate to by-name --- .../ola/default.nix => by-name/ol/ola/package.nix} | 12 ++++++------ pkgs/top-level/all-packages.nix | 4 ---- 2 files changed, 6 insertions(+), 10 deletions(-) rename pkgs/{applications/misc/ola/default.nix => by-name/ol/ola/package.nix} (89%) diff --git a/pkgs/applications/misc/ola/default.nix b/pkgs/by-name/ol/ola/package.nix similarity index 89% rename from pkgs/applications/misc/ola/default.nix rename to pkgs/by-name/ol/ola/package.nix index 7bd852e245fe..3b82152305b5 100644 --- a/pkgs/applications/misc/ola/default.nix +++ b/pkgs/by-name/ol/ola/package.nix @@ -9,7 +9,7 @@ libftdi1, libuuid, cppunit, - protobuf, + protobuf_21, zlib, avahi, libmicrohttpd, @@ -18,14 +18,14 @@ fetchpatch, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ola"; version = "0.10.9"; src = fetchFromGitHub { owner = "OpenLightingProject"; repo = "ola"; - tag = version; + tag = finalAttrs.version; hash = "sha256-8w8ZT3D/+8Pxl9z2KTXeydVxE5xiPjxZevgmMFgrblU="; }; patches = [ @@ -47,14 +47,14 @@ stdenv.mkDerivation rec { libftdi1 libuuid cppunit - protobuf + protobuf_21 zlib avahi libmicrohttpd python3 ]; propagatedBuildInputs = [ - (python3.pkgs.protobuf4.override { protobuf = protobuf; }) + (python3.pkgs.protobuf4.override { protobuf = protobuf_21; }) python3.pkgs.numpy ]; @@ -73,4 +73,4 @@ stdenv.mkDerivation rec { ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b38eb4b4920..230711f36dd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2884,10 +2884,6 @@ with pkgs; nwdiag = with python3Packages; toPythonApplication nwdiag; - ola = callPackage ../applications/misc/ola { - protobuf = protobuf_21; - }; - ome_zarr = with python3Packages; toPythonApplication ome-zarr; ophcrack-cli = ophcrack.override { enableGui = false; }; From 895ab9310bf51ed6b37735695870b996464d3c12 Mon Sep 17 00:00:00 2001 From: GraysonTinker Date: Wed, 6 May 2026 22:51:56 -0700 Subject: [PATCH 4/4] cambrinary: migrate to by-name --- .../default.nix => by-name/ca/cambrinary/package.nix} | 11 ++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 4 insertions(+), 9 deletions(-) rename pkgs/{applications/misc/cambrinary/default.nix => by-name/ca/cambrinary/package.nix} (82%) diff --git a/pkgs/applications/misc/cambrinary/default.nix b/pkgs/by-name/ca/cambrinary/package.nix similarity index 82% rename from pkgs/applications/misc/cambrinary/default.nix rename to pkgs/by-name/ca/cambrinary/package.nix index d6cc80437598..ffc6ff3bdae4 100644 --- a/pkgs/applications/misc/cambrinary/default.nix +++ b/pkgs/by-name/ca/cambrinary/package.nix @@ -1,13 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - flit, - aiohttp, - beautifulsoup4, }: -buildPythonApplication { +python3Packages.buildPythonApplication { pname = "cambrinary"; version = "unstable-2023-07-16"; pyproject = true; @@ -19,11 +16,11 @@ buildPythonApplication { hash = "sha256-wDcvpKAY/6lBjO5h3qKH3+Y2G2gm7spcKCXFMt/bAtE="; }; - nativeBuildInputs = [ + build-system = with python3Packages; [ flit ]; - propagatedBuildInputs = [ + dependencies = with python3Packages; [ aiohttp beautifulsoup4 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 230711f36dd4..967f82d68e34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1642,8 +1642,6 @@ with pkgs; intelLlvmStdenv = intel-llvm.stdenv; - cambrinary = python3Packages.callPackage ../applications/misc/cambrinary { }; - cplex = callPackage ../applications/science/math/cplex (config.cplex or { }); cot = with python3Packages; toPythonApplication cot;