From ea490bab62043401941fcd95459e7a5cf8ce9d32 Mon Sep 17 00:00:00 2001 From: shhht Date: Wed, 8 Mar 2023 12:17:41 +0100 Subject: [PATCH 1/2] maintainers: add shhht --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index eb640d2474b1..14920be8924e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13667,6 +13667,12 @@ githubId = 251028; name = "Shell Turner"; }; + shhht = { + name = "shhht"; + email = "stp.tjeerd@gmail.com"; + github = "shhht"; + githubId = 118352823; + }; shikanime = { name = "William Phetsinorath"; email = "deva.shikanime@protonmail.com"; From d3b4a6ee385c2d4aa332855a7dda7f3073932f19 Mon Sep 17 00:00:00 2001 From: shhht Date: Wed, 8 Mar 2023 13:45:25 +0100 Subject: [PATCH 2/2] mainsail: init at 2.4.1 --- pkgs/applications/misc/mainsail/default.nix | 36 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/misc/mainsail/default.nix diff --git a/pkgs/applications/misc/mainsail/default.nix b/pkgs/applications/misc/mainsail/default.nix new file mode 100644 index 000000000000..1866dd5a3da2 --- /dev/null +++ b/pkgs/applications/misc/mainsail/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenvNoCC +, fetchzip +}: + +stdenvNoCC.mkDerivation rec { + pname = "mainsail"; + version = "2.4.1"; + + src = fetchzip { + url = "https://github.com/mainsail-crew/mainsail/releases/download/v${version}/mainsail.zip"; + sha256 = "sha256-WgTzRVycrZcJ5JVXJQHLvQGg8FLm4y020/eULAqDpmA="; + stripRoot = false; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/mainsail + cp -r ./* $out/share/mainsail + + runHook postInstall + ''; + + meta = with lib; { + description = "Web interface for managing and controlling 3D printers with Klipper"; + homepage = "https://docs.mainsail.xyz"; + changelog = "https://github.com/mainsail-crew/mainsail/releases/tag/v${version}"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ shhht ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d4d7a4ff91b..89ce33fe5f38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2187,6 +2187,8 @@ with pkgs; maiko = callPackage ../applications/emulators/maiko { }; + mainsail = callPackage ../applications/misc/mainsail { }; + mame = libsForQt5.callPackage ../applications/emulators/mame { }; mame-tools = lib.addMetaAttrs {