diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/terminal-emulators')
12 files changed, 110 insertions, 27 deletions
diff --git a/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix index 5b8e0078d75c..f71a9dce894f 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/blackbox-terminal/default.nix @@ -72,6 +72,9 @@ stdenv.mkDerivation rec { rev = "3c8f66be867aca6656e4109ce880b6ea7431b895"; hash = "sha256-vz9ircmPy2Q4fxNnjurkgJtuTSS49rBq/m61p1B43eU="; }; + postPatch = (old.postPatch or "") + '' + patchShebangs src/box_drawing_generate.sh + ''; } // lib.optionalAttrs sixelSupport { buildInputs = old.buildInputs ++ [ libsixel ]; mesonFlags = old.mesonFlags ++ [ "-Dsixel=true" ]; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix index 2141effcf015..5884f65c61ed 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/gnome-console/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "gnome-console"; - version = "45.0"; + version = "46.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "50YhKNLfIySh10gGLEBCnNBQSvCeQHBnsz86nQxZyOE="; + hash = "sha256-FhnOcBdzssDJA3GPVHaMGS6lB0UU1VoXdKkslyMdbD4="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix index 667da3ec229f..239d9a2fe048 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/guake/default.nix @@ -1,34 +1,60 @@ { lib , fetchFromGitHub +, fetchpatch , python3 , glibcLocales , gobject-introspection -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , keybinder3 , libnotify , libutempter , vte , libwnck +, dconf , nixosTests }: python3.pkgs.buildPythonApplication rec { pname = "guake"; - version = "3.9.0"; + version = "3.10"; - format = "other"; + pyproject = false; src = fetchFromGitHub { owner = "Guake"; repo = "guake"; rev = "refs/tags/${version}"; - sha256 = "sha256-BW13fBH26UqMPMjV8JC4QkpgzyoPfCpAfSkJD68uOZU="; + hash = "sha256-e6Bf4HDftHBxFPcw9z02CqgZhSIvt6wlLF6dnIh9fEc="; }; + patches = [ + # Avoid trying to recompile schema at runtime, + # the package should be responsible for ensuring it is up to date. + # Without this, the package will try to run glib-compile-schemas + # on every update, which is pointless and will crash + # unless user has it installed. + ./no-compile-schemas.patch + + # Avoid using pip since it fails on not being able to find setuptools. + # Note: This is not a long-term solution, setup.py is deprecated. + (fetchpatch { + url = "https://github.com/Guake/guake/commit/14abaa0c69cfab64fe3467fbbea211d830042de8.patch"; + hash = "sha256-RjGRFJDTQX2meAaw3UZi/3OxAtIHbRZVpXTbcJk/scY= "; + revert = true; + }) + + # Revert switch to FHS. + (fetchpatch { + url = "https://github.com/Guake/guake/commit/8c7a23ba62ee262c033dfa5b0b18d3df71361ff4.patch"; + hash = "sha256-0asXI08XITkFc73EUenV9qxY/Eak+TzygRRK7GvhQUc="; + revert = true; + }) + ]; + nativeBuildInputs = [ gobject-introspection - wrapGAppsHook + wrapGAppsHook3 python3.pkgs.pip ]; @@ -57,7 +83,11 @@ python3.pkgs.buildPythonApplication rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}") + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libutempter ]}" + # For settings migration. + --prefix PATH : "${lib.makeBinPath [ dconf ]}" + ) ''; passthru.tests.test = nixosTests.terminal-emulators.guake; @@ -65,7 +95,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Drop-down terminal for GNOME"; homepage = "http://guake-project.org"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.msteen ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch b/nixpkgs/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch new file mode 100644 index 000000000000..e73387e1fc09 --- /dev/null +++ b/nixpkgs/pkgs/applications/terminal-emulators/guake/no-compile-schemas.patch @@ -0,0 +1,34 @@ +diff --git a/guake/guake_app.py b/guake/guake_app.py +index 48074db..d7d1371 100644 +--- a/guake/guake_app.py ++++ b/guake/guake_app.py +@@ -109,12 +109,7 @@ class Guake(SimpleGladeApp): + SCHEMA_DIR, Gio.SettingsSchemaSource.get_default(), False + ) + +- try: +- schema_source = load_schema() +- except GLib.Error: # pylint: disable=catching-non-exception +- log.exception("Unable to load the GLib schema, try to compile it") +- try_to_compile_glib_schemas() +- schema_source = load_schema() ++ schema_source = load_schema() + self.settings = Settings(schema_source) + self.accel_group = None + +@@ -122,13 +117,8 @@ class Guake(SimpleGladeApp): + "schema-version" not in self.settings.general.keys() + or self.settings.general.get_string("schema-version") != guake_version() + ): +- log.exception("Schema from old guake version detected, regenerating schema") +- try: +- try_to_compile_glib_schemas() +- except subprocess.CalledProcessError: +- log.exception("Schema in non user-editable location, attempting to continue") +- schema_source = load_schema() +- self.settings = Settings(schema_source) ++ log.exception("Schema from old guake version detected") ++ # Kept for compatibility with other distros. + self.settings.general.set_string("schema-version", guake_version()) + + log.info("Language previously loaded from: %s", LOCALE_DIR) diff --git a/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix index 675e47e5f57a..5e31ac572cab 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/kitty/default.nix @@ -210,7 +210,10 @@ buildPythonApplication rec { cp -r linux-package/{bin,share,lib} "$out" cp linux-package/bin/kitten "$kitten/bin/kitten" ''} - wrapProgram "$out/bin/kitty" --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}" + + # dereference the `kitty` symlink to make sure the actual executable + # is wrapped on macOS as well (and not just the symlink) + wrapProgram $(realpath "$out/bin/kitty") --prefix PATH : "$out/bin:${lib.makeBinPath [ imagemagick ncurses.dev ]}" installShellCompletion --cmd kitty \ --bash <("$out/bin/kitty" +complete setup bash) \ diff --git a/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix b/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix index 1459642bc98a..facfa34cf140 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/kitty/themes.nix @@ -3,15 +3,15 @@ , fetchFromGitHub }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "kitty-themes"; - version = "unstable-2023-12-28"; + version = "unstable-2024-04-23"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty-themes"; - rev = "46d9dfe230f315a6a0c62f4687f6b3da20fd05e4"; - hash = "sha256-jlYim4YXByT6s6ce0TydZuhX0Y1ZDcAq2XKNONisSzE="; + rev = "8026ce6ec70a0a67fedd02319e6fa39d36bbc1d1"; + hash = "sha256-RN4YTcsVRg+3c+SEtKkJC8EvuNiiToduASMy/Rr+ZwA="; }; dontConfigure = true; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/kovidgoyal/kitty-themes"; description = "Themes for the kitty terminal emulator"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; platforms = lib.platforms.all; }; } diff --git a/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix index 90483efc89a5..76f375e43f62 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/lxterminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, automake, autoconf, intltool, pkg-config, gtk3, vte, wrapGAppsHook3 , libxslt, docbook_xml_dtd_412, docbook_xsl, libxml2, findXMLCatalogs, nixosTests , pcre2 }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - automake autoconf intltool pkg-config wrapGAppsHook + automake autoconf intltool pkg-config wrapGAppsHook3 libxslt docbook_xml_dtd_412 docbook_xsl libxml2 findXMLCatalogs ]; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix index f11c456d4376..28f027401bd7 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -14,7 +14,7 @@ , fcitx5-gtk , ibus , uim #IME -, wrapGAppsHook #color picker in mlconfig +, wrapGAppsHook3 #color picker in mlconfig , gdk-pixbuf , gtk3 , gtk ? gtk3 @@ -111,7 +111,7 @@ in stdenv.mkDerivation (finalAttrs: { pkg-config autoconf ] ++ lib.optionals enableTools.mlconfig [ - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gtk diff --git a/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix index ee77c4c3d457..a1f89f6a4e0a 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/rio/default.nix @@ -51,16 +51,16 @@ let in rustPlatform.buildRustPackage rec { pname = "rio"; - version = "0.0.36"; + version = "0.0.37"; src = fetchFromGitHub { owner = "raphamorim"; repo = "rio"; rev = "v${version}"; - hash = "sha256-QCQFFnlKD5olaGjRwDlj5/EBV6Qy/bFAZOQRtCSPamc="; + hash = "sha256-rY5nuZcMbK9PYxfGYdVheOOVIC4I/11EOWpNmG6gH9A="; }; - cargoHash = "sha256-Ea0scCbM9mfxC1YL3HCoBk93eVW20bj2mJyauyDSzT8="; + cargoHash = "sha256-tHcUMxe9HwTzm2oDwaTyuh+UZUwW64xPX/cftxqZoz8="; nativeBuildInputs = [ ncurses diff --git a/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix index 4dee206be28d..175d3766594b 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/terminator/default.nix @@ -7,7 +7,8 @@ , gtk3 , gobject-introspection , libnotify -, wrapGAppsHook +, makeBinaryWrapper +, wrapGAppsHook3 , vte , nixosTests }: @@ -27,7 +28,8 @@ python3.pkgs.buildPythonApplication rec { file intltool gobject-introspection - wrapGAppsHook + makeBinaryWrapper + wrapGAppsHook3 python3.pkgs.pytest-runner ]; @@ -55,8 +57,15 @@ python3.pkgs.buildPythonApplication rec { dontWrapGApps = true; + # HACK: 'wrapPythonPrograms' will add things to the $PATH in the wrapper. This bleeds into the + # terminal session produced by terminator. To avoid this, we force wrapPythonPrograms to only + # use gappsWrapperArgs by redefining wrapProgram to ignore its arguments and only apply the + # wrapper arguments we want it to use. + # TODO: Adjust wrapPythonPrograms to respect an argument that tells it to leave $PATH alone. preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + wrapProgram() { + wrapProgramBinary "$1" "''${gappsWrapperArgs[@]}" + } ''; passthru.tests.test = nixosTests.terminal-emulators.terminator; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix index ab854a2f9906..a47423390ba2 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/termite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook, nixosTests }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, vte, gtk3, ncurses, pcre2, wrapGAppsHook3, nixosTests }: let @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { buildInputs = [ vte-ng gtk3 ncurses pcre2 ]; - nativeBuildInputs = [ wrapGAppsHook pkg-config ]; + nativeBuildInputs = [ wrapGAppsHook3 pkg-config ]; outputs = [ "out" "terminfo" ]; diff --git a/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix index 010345aa03df..2e901e5af876 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/x3270/default.nix @@ -18,6 +18,8 @@ , fontbitstream100dpi , tcl , ncurses +, openssl +, readline }: let majorVersion = "4"; @@ -66,6 +68,8 @@ stdenv.mkDerivation rec { tcl ncurses expat + openssl + readline ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; meta = with lib; { |