talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

meerk40t: migrate to by-name

Browse Source 
meerk40t: refactor package definitions and meta
This commit is contained in:
Guy Chronister 2025-08-07 13:01:35 +00:00
parent d00a33c9df
commit 190f6932af
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/misc/meerk40t/camera.nix → pkgs/by-name/me/meerk40t-camera/package.nix
View File

@ -1,13 +1,10 @@
{ {
lib, lib,
python3, python3Packages,
fetchPypi, fetchPypi,
}: }:
let python3Packages.buildPythonPackage rec {
inherit (python3.pkgs) buildPythonPackage;
in
buildPythonPackage rec {
pname = "meerk40t-camera"; pname = "meerk40t-camera";
version = "0.1.9"; version = "0.1.9";
format = "setuptools"; format = "setuptools";
@ -21,7 +18,7 @@ buildPythonPackage rec {
sed -i '/meerk40t/d' setup.py sed -i '/meerk40t/d' setup.py
''; '';
propagatedBuildInputs = with python3.pkgs; [ dependencies = with python3Packages; [
opencv4 opencv4
]; ];
@ -31,10 +28,10 @@ buildPythonPackage rec {
doCheck = false; doCheck = false;
meta = with lib; { meta = {
description = "MeerK40t camera plugin"; description = "MeerK40t camera plugin";
license = licenses.mit; license = lib.licenses.mit;
homepage = "https://github.com/meerk40t/meerk40t-camera"; homepage = "https://github.com/meerk40t/meerk40t-camera";
maintainers = with maintainers; [ hexa ]; maintainers = with lib.maintainers; [ hexa ];
}; };
} }

12
pkgs/applications/misc/meerk40t/default.nix → pkgs/by-name/me/meerk40t/package.nix
View File

@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "meerk40t"; owner = "meerk40t";
repo = pname; repo = "MeerK40t";
tag = version; tag = version;
hash = "sha256-7igY6qEHDUAyyKK+T0WFNfGPYy8VnMLYaWHyBE8EMSs="; hash = "sha256-7igY6qEHDUAyyKK+T0WFNfGPYy8VnMLYaWHyBE8EMSs=";
}; };
@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec {
dontWrapGApps = true; dontWrapGApps = true;
# https://github.com/meerk40t/meerk40t/blob/main/setup.py # https://github.com/meerk40t/meerk40t/blob/main/setup.py
propagatedBuildInputs = dependencies =
with python3Packages; with python3Packages;
[ [
meerk40t-camera meerk40t-camera
@ -75,12 +75,12 @@ python3Packages.buildPythonApplication rec {
export HOME=$TMPDIR export HOME=$TMPDIR
''; '';
meta = with lib; { meta = {
changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${src.tag}"; changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${version}";
description = "MeerK40t LaserCutter Software"; description = "MeerK40t LaserCutter Software";
mainProgram = "meerk40t"; mainProgram = "meerk40t";
homepage = "https://github.com/meerk40t/meerk40t"; homepage = "https://github.com/meerk40t/meerk40t";
license = licenses.mit; license = lib.licenses.mit;
maintainers = with maintainers; [ hexa ]; maintainers = with lib.maintainers; [ hexa ];
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -12306,10 +12306,6 @@ with pkgs;
ocamlPackages = ocaml-ng.ocamlPackages_4_14; ocamlPackages = ocaml-ng.ocamlPackages_4_14;
}; };
meerk40t = callPackage ../applications/misc/meerk40t { };
meerk40t-camera = callPackage ../applications/misc/meerk40t/camera.nix { };
libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { }; libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { };
mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { }; mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { };