diff --git a/pkgs/applications/misc/meerk40t/camera.nix b/pkgs/by-name/me/meerk40t-camera/package.nix similarity index 67% rename from pkgs/applications/misc/meerk40t/camera.nix rename to pkgs/by-name/me/meerk40t-camera/package.nix index 6e33c8077c66..befee442bf31 100644 --- a/pkgs/applications/misc/meerk40t/camera.nix +++ b/pkgs/by-name/me/meerk40t-camera/package.nix @@ -1,13 +1,10 @@ { lib, - python3, + python3Packages, fetchPypi, }: -let - inherit (python3.pkgs) buildPythonPackage; -in -buildPythonPackage rec { +python3Packages.buildPythonPackage rec { pname = "meerk40t-camera"; version = "0.1.9"; format = "setuptools"; @@ -21,7 +18,7 @@ buildPythonPackage rec { sed -i '/meerk40t/d' setup.py ''; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ opencv4 ]; @@ -31,10 +28,10 @@ buildPythonPackage rec { doCheck = false; - meta = with lib; { + meta = { description = "MeerK40t camera plugin"; - license = licenses.mit; + license = lib.licenses.mit; homepage = "https://github.com/meerk40t/meerk40t-camera"; - maintainers = with maintainers; [ hexa ]; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/applications/misc/meerk40t/default.nix b/pkgs/by-name/me/meerk40t/package.nix similarity index 90% rename from pkgs/applications/misc/meerk40t/default.nix rename to pkgs/by-name/me/meerk40t/package.nix index a7c9c9aa4b9f..810655eb1d47 100644 --- a/pkgs/applications/misc/meerk40t/default.nix +++ b/pkgs/by-name/me/meerk40t/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "meerk40t"; - repo = pname; + repo = "MeerK40t"; tag = version; hash = "sha256-7igY6qEHDUAyyKK+T0WFNfGPYy8VnMLYaWHyBE8EMSs="; }; @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { dontWrapGApps = true; # https://github.com/meerk40t/meerk40t/blob/main/setup.py - propagatedBuildInputs = + dependencies = with python3Packages; [ meerk40t-camera @@ -75,12 +75,12 @@ python3Packages.buildPythonApplication rec { export HOME=$TMPDIR ''; - meta = with lib; { - changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${src.tag}"; + meta = { + changelog = "https://github.com/meerk40t/meerk40t/releases/tag/${version}"; description = "MeerK40t LaserCutter Software"; mainProgram = "meerk40t"; homepage = "https://github.com/meerk40t/meerk40t"; - license = licenses.mit; - maintainers = with maintainers; [ hexa ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ hexa ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2187a7fa3929..240e00fda5e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12306,10 +12306,6 @@ with pkgs; 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 { }; mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { };