From de65ce18194c6643835506c9eb88068e158b85d9 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 23 Dec 2023 11:47:55 -0300 Subject: [PATCH 1/3] roxterm: migrate to by-name --- .../roxterm/default.nix => by-name/ro/roxterm/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/terminal-emulators/roxterm/default.nix => by-name/ro/roxterm/package.nix} (100%) diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/by-name/ro/roxterm/package.nix similarity index 100% rename from pkgs/applications/terminal-emulators/roxterm/default.nix rename to pkgs/by-name/ro/roxterm/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 863e7e076bda..bdc22b3b2eca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3100,8 +3100,6 @@ with pkgs; mrxvt = callPackage ../applications/terminal-emulators/mrxvt { }; - roxterm = callPackage ../applications/terminal-emulators/roxterm { }; - rxvt = callPackage ../applications/terminal-emulators/rxvt { }; rxvt-unicode = callPackage ../applications/terminal-emulators/rxvt-unicode/wrapper.nix { }; From e15034c5f1277d561546d945d30e55e7d00c0dae Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 23 Dec 2023 05:41:01 +0000 Subject: [PATCH 2/3] roxterm: 3.14.2 -> 3.14.3 --- pkgs/by-name/ro/roxterm/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix index e39b61499e19..6b34c779ba2e 100644 --- a/pkgs/by-name/ro/roxterm/package.nix +++ b/pkgs/by-name/ro/roxterm/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "roxterm"; - version = "3.14.2"; + version = "3.14.3"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = version; - sha256 = "sha256-LBxVZ5Az0vGalbQd437of5a3aoZH51v6OKTfndHkkiM="; + sha256 = "sha256-NSOGq3rN+9X4WA8Q0gMbZ9spO/dbZkzeo4zEno/Kgcs="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; From c78d30f97f809ef0e5c32fa67eb8c3c6f8ccd373 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 23 Dec 2023 11:43:09 -0300 Subject: [PATCH 3/3] roxterm: refactor - Input list elements separated once per line - finalAttrs design pattern - meta updates: - changelog - description - longDescription - mainProgram - adopted by AndersonTorres --- pkgs/by-name/ro/roxterm/package.nix | 101 ++++++++++++++++++++++------ 1 file changed, 80 insertions(+), 21 deletions(-) diff --git a/pkgs/by-name/ro/roxterm/package.nix b/pkgs/by-name/ro/roxterm/package.nix index 6b34c779ba2e..8b4f2e79c2be 100644 --- a/pkgs/by-name/ro/roxterm/package.nix +++ b/pkgs/by-name/ro/roxterm/package.nix @@ -1,39 +1,98 @@ -{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, libepoxy, fetchFromGitHub -, glib, gtk3, harfbuzz, libXdmcp, libXtst, libpthreadstubs -, libselinux, libsepol, libtasn1, libxkbcommon, libxslt, p11-kit, pcre2 -, pkg-config, lib, stdenv, util-linuxMinimal, vte, wrapGAppsHook, xmlto, nixosTests +{ + at-spi2-core +, cmake +, dbus +, dbus-glib +, docbook_xsl +, fetchFromGitHub +, glib +, gtk3 +, harfbuzz +, lib +, libXdmcp +, libXtst +, libepoxy +, libpthreadstubs +, libselinux +, libsepol +, libtasn1 +, libxkbcommon +, libxslt +, nixosTests +, p11-kit +, pcre2 +, pkg-config +, stdenv +, util-linuxMinimal +, vte +, wrapGAppsHook +, xmlto }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "roxterm"; version = "3.14.3"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; - rev = version; - sha256 = "sha256-NSOGq3rN+9X4WA8Q0gMbZ9spO/dbZkzeo4zEno/Kgcs="; + rev = finalAttrs.version; + hash = "sha256-NSOGq3rN+9X4WA8Q0gMbZ9spO/dbZkzeo4zEno/Kgcs="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; + nativeBuildInputs = [ + cmake + libxslt + pkg-config + wrapGAppsHook + ]; - buildInputs = - [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp - util-linuxMinimal glib docbook_xsl xmlto libselinux - libsepol libxkbcommon libepoxy at-spi2-core libXtst libtasn1 p11-kit - ]; + buildInputs = [ + at-spi2-core + dbus + dbus-glib + docbook_xsl + glib + gtk3 + harfbuzz + libXdmcp + libXtst + libepoxy + libpthreadstubs + libselinux + libsepol + libtasn1 + libxkbcommon + p11-kit + pcre2 + util-linuxMinimal + vte + xmlto + ]; passthru.tests.test = nixosTests.terminal-emulators.roxterm; - meta = with lib; { + meta = { homepage = "https://github.com/realh/roxterm"; - license = licenses.gpl3; - description = "Tabbed, VTE-based terminal emulator"; + description = " A highly configurable terminal emulator"; longDescription = '' - Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without - the dependencies on Gnome. + ROXTerm is a terminal emulator intended to provide similar features to + gnome-terminal, based on the same VTE library. It was originally designed + to have a smaller footprint and quicker start-up time by not using the + Gnome libraries and by using a separate applet to provide the + configuration GUI, but thanks to all the features it's acquired over the + years ROXTerm can probably now be accused of bloat. However, it is more + configurable than gnome-terminal and aimed more at "power" users who make + heavy use of terminals. + + It still supports the ROX desktop application layout it was named after, + but can also be installed in a more conventional manner for use in other + desktop environments. ''; - maintainers = with maintainers; [ ]; - platforms = platforms.linux; + changelog = "https://github.com/realh/roxterm/blob/${finalAttrs.src.rev}/debian/changelog"; + license = with lib.licenses; [ gpl2Plus gpl3Plus lgpl3Plus ]; + mainProgram = "roxterm"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +})