From f3fabeca1ef0736bca2d299fd9a1ada35a5ebf66 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 9 Sep 2023 22:11:24 -0300 Subject: [PATCH] germinal: migrate to by-name --- .../ge/germinal/package.nix} | 31 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 19 insertions(+), 14 deletions(-) rename pkgs/{applications/terminal-emulators/germinal/default.nix => by-name/ge/germinal/package.nix} (66%) diff --git a/pkgs/applications/terminal-emulators/germinal/default.nix b/pkgs/by-name/ge/germinal/package.nix similarity index 66% rename from pkgs/applications/terminal-emulators/germinal/default.nix rename to pkgs/by-name/ge/germinal/package.nix index aef24f675b1a..4d7409bf4a43 100644 --- a/pkgs/applications/terminal-emulators/germinal/default.nix +++ b/pkgs/by-name/ge/germinal/package.nix @@ -1,29 +1,35 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub -, autoreconfHook -, pkg-config , appstream-glib +, autoreconfHook , dbus , pango , pcre2 +, pkg-config , tmux , vte , wrapGAppsHook , nixosTests }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "germinal"; version = "26"; src = fetchFromGitHub { owner = "Keruspe"; repo = "Germinal"; - rev = "v${version}"; - sha256 = "sha256-HUi+skF4bJj5CY2cNTOC4tl7jhvpXYKqBx2rqKzjlo0="; + rev = "v${finalAttrs.version}"; + hash = "sha256-HUi+skF4bJj5CY2cNTOC4tl7jhvpXYKqBx2rqKzjlo0="; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + wrapGAppsHook + ]; + buildInputs = [ appstream-glib dbus @@ -48,11 +54,12 @@ stdenv.mkDerivation rec { passthru.tests.test = nixosTests.terminal-emulators.germinal; - meta = with lib; { + meta = { description = "A minimal terminal emulator"; homepage = "https://github.com/Keruspe/Germinal"; - license = with licenses; gpl3Plus; - platforms = with platforms; unix; - maintainers = with maintainers; [ AndersonTorres ]; + license = lib.licenses.gpl3Plus; + mainProgram = "germinal"; + 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 b05e6813e1dc..679f4590038a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3009,8 +3009,6 @@ with pkgs; foot = callPackage ../applications/terminal-emulators/foot { }; - germinal = callPackage ../applications/terminal-emulators/germinal { }; - guake = callPackage ../applications/terminal-emulators/guake { }; havoc = callPackage ../applications/terminal-emulators/havoc { };