From ce3ff6bf4a3228b406cfe019979799a4fb4113f1 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 9 Sep 2023 22:21:59 -0300 Subject: kermit-terminal: update - multiple outputs - add meta.mainProgram - migrate to by-name --- .../terminal-emulators/kermit-terminal/default.nix | 44 -------------------- pkgs/by-name/ke/kermit-terminal/package.nix | 47 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 - 3 files changed, 47 insertions(+), 46 deletions(-) delete mode 100644 pkgs/applications/terminal-emulators/kermit-terminal/default.nix create mode 100644 pkgs/by-name/ke/kermit-terminal/package.nix diff --git a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix b/pkgs/applications/terminal-emulators/kermit-terminal/default.nix deleted file mode 100644 index 4bcd3191af7dc..0000000000000 --- a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gtk3 -, pcre -, pkg-config -, vte -, nixosTests -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "kermit"; - version = "3.8"; - - src = fetchFromGitHub { - owner = "orhun"; - repo = finalAttrs.pname; - rev = finalAttrs.version; - hash = "sha256-XPHF33Nu+H8OcQFwsuUOhDBDWKm8sh5B36sfROeSWPg="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - gtk3 - pcre - vte - ]; - - passthru.tests.test = nixosTests.terminal-emulators.kermit; - - meta = with lib; { - homepage = "https://github.com/orhun/kermit"; - description = "A VTE-based, simple and froggy terminal emulator"; - changelog = "https://github.com/orhun/kermit/releases/tag/${finalAttrs.version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - }; -}) diff --git a/pkgs/by-name/ke/kermit-terminal/package.nix b/pkgs/by-name/ke/kermit-terminal/package.nix new file mode 100644 index 0000000000000..a0c0008917a46 --- /dev/null +++ b/pkgs/by-name/ke/kermit-terminal/package.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, gtk3 +, pcre +, pkg-config +, vte +, nixosTests +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kermit"; + version = "3.8"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = "kermit"; + rev = finalAttrs.version; + hash = "sha256-XPHF33Nu+H8OcQFwsuUOhDBDWKm8sh5B36sfROeSWPg="; + }; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + gtk3 + pcre + vte + ]; + + passthru.tests.test = nixosTests.terminal-emulators.kermit; + + meta = { + homepage = "https://github.com/orhun/kermit"; + description = "A VTE-based, simple and froggy terminal emulator"; + changelog = "https://github.com/orhun/kermit/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + mainProgram = "kermit"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 679f4590038ab..4cc39436056d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3017,8 +3017,6 @@ with pkgs; iterm2 = callPackage ../applications/terminal-emulators/iterm2 { }; - kermit-terminal = callPackage ../applications/terminal-emulators/kermit-terminal { }; - kitty = darwin.apple_sdk_11_0.callPackage ../applications/terminal-emulators/kitty { go = go_1_21; harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; -- cgit 1.4.1