diff options
Diffstat (limited to 'pkgs/applications/terminal-emulators')
9 files changed, 48 insertions, 46 deletions
diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 837b2b45a391e..9290f8ce61440 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.9.2"; + version = "1.10.2"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { owner = "dnkl"; repo = pname; rev = version; - sha256 = "15h01ijx87i60bdgjjap1ymwlxggsxc6iziykh3bahj8432s1836"; + sha256 = "00096c2m8pn4gpafvmg9lhyprwgnsis62bq4qmagnbb49bj5kr9v"; }; depsBuildBuild = [ @@ -170,7 +170,13 @@ stdenv.mkDerivation rec { llvm-profdata merge default_*profraw --output=default.profdata ''; - outputs = [ "out" "terminfo" ]; + # Install example themes which can be added to foot.ini via the include + # directive to a separate output to save a bit of space + postInstall = '' + moveToOutput share/foot/themes "$themes" + ''; + + outputs = [ "out" "terminfo" "themes" ]; passthru.tests = { clang-default-compilation = foot.override { diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index 9f157a75f93e6..4c46bcc6c3fc3 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub }: +{ lib, stdenvNoCC, fetchFromGitHub }: /* This derivation is impure: it relies on an Xcode toolchain being installed @@ -8,15 +8,15 @@ option set to `relaxed` or `false`. */ -stdenv.mkDerivation rec { +stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.0"; + version = "3.4.14"; src = fetchFromGitHub { owner = "gnachman"; repo = "iTerm2"; rev = "v${version}"; - sha256 = "09nhrmi25zxw3vp0wlib9kjr3p1j6am2zpwimdzqn0c80fq1lwvi"; + sha256 = "sha256-sDCnBO7xDpecu2cSjpHwync2DVsj9EKUmgpqEVLtxRM="; }; patches = [ ./disable_updates.patch ]; diff --git a/pkgs/applications/terminal-emulators/mrxvt/default.nix b/pkgs/applications/terminal-emulators/mrxvt/default.nix index c9f68ffc6bd77..ba6c6ab87c152 100644 --- a/pkgs/applications/terminal-emulators/mrxvt/default.nix +++ b/pkgs/applications/terminal-emulators/mrxvt/default.nix @@ -16,8 +16,12 @@ stdenv.mkDerivation rec { pname = "mrxvt"; version = "0.5.4"; - buildInputs = - [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; + src = fetchurl { + url = "mirror://sourceforge/materm/mrxvt-${version}.tar.gz"; + sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; + }; + + buildInputs = [ libX11 libXft libXi xorgproto libSM libICE freetype pkg-config which ]; configureFlags = [ "--with-x" @@ -34,11 +38,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${freetype.dev}/include/freetype2"; ''; - src = fetchurl { - url = "mirror://sourceforge/materm/mrxvt-${version}.tar.gz"; - sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; - }; - meta = with lib; { description = "Lightweight multitabbed feature-rich X11 terminal emulator"; longDescription = " @@ -48,6 +47,7 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/materm"; license = licenses.gpl2; platforms = platforms.linux; + maintainers = with maintainers; [ ]; knownVulnerabilities = [ "Usage of ANSI escape sequences causes unexpected newline-termination, leading to unexpected command execution (https://www.openwall.com/lists/oss-security/2021/05/17/1)" ]; diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index fff534aaff1ae..da9bfac952b58 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -1,4 +1,4 @@ -{ at-spi2-core, cmake, dbus, dbus-glib, docbook_xsl, epoxy, fetchpatch, fetchFromGitHub +{ 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 @@ -6,31 +6,21 @@ stdenv.mkDerivation rec { pname = "roxterm"; - version = "3.7.5"; + version = "3.11.1"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = version; - sha256 = "042hchvgk9jzz035zsgnfhh8105zvspbzz6b78waylsdlgqn0pp1"; + sha256 = "1n7588bl83sp51jwjq97f526c7fkh0kq90idw3nayb4zmi530irx"; }; - patches = [ - # This is the commit directly after v3.7.5. It is needed to get roxterm to - # build correctly. It can be removed when v3.7.6 (or v3.8.0) has been - # released. - (fetchpatch { - url = "https://github.com/realh/roxterm/commit/f7c38fd48bd1810e16d82794bdfb61a9760a2fe1.patch"; - sha256 = "1v77b7ilgf8zy1npxxcyc06mq6lck6bi6lw4aksnq3mi61n5znmx"; - }) - ]; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; buildInputs = [ gtk3 dbus dbus-glib vte pcre2 harfbuzz libpthreadstubs libXdmcp util-linuxMinimal glib docbook_xsl xmlto libselinux - libsepol libxkbcommon epoxy at-spi2-core libXtst libtasn1 p11-kit + libsepol libxkbcommon libepoxy at-spi2-core libXtst libtasn1 p11-kit ]; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix index d4a3b9a742a40..c7510568e2641 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix @@ -1,16 +1,15 @@ { lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4"; pname = "urxvt-theme-switch"; - version = "unstable-2014-12-21_rev${builtins.substring 0 1 rev}"; + version = "unstable-2014-12-21"; dontPatchShebangs = true; src = fetchFromGitHub { owner = "felixr"; repo = "urxvt-theme-switch"; - inherit rev; + rev = "cfcbcc3dd5a5b09a3fec0f6a1fea95f4a36a48c4"; sha256 = "0x27m1vdqprn3lqpwgxvffill7prmaj6j9rhgvkvi13mzl5wmlli"; }; @@ -25,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/felixr/urxvt-theme-switch"; license = "CCBYNC"; maintainers = with maintainers; [ ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/terminal-emulators/sakura/default.nix b/pkgs/applications/terminal-emulators/sakura/default.nix index 44c34d76f4695..8434c233ad4b8 100644 --- a/pkgs/applications/terminal-emulators/sakura/default.nix +++ b/pkgs/applications/terminal-emulators/sakura/default.nix @@ -1,6 +1,6 @@ { lib , stdenv -, fetchurl +, fetchFromGitHub , cmake , glib , gtk3 @@ -13,11 +13,13 @@ stdenv.mkDerivation rec { pname = "sakura"; - version = "3.8.3"; + version = "3.8.4"; - src = fetchurl { - url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2"; - sha256 = "sha256-UEDc3TjoqjLNZtWGlIZB3VTVQC+31AP0ASQH0fu+U+Q="; + src = fetchFromGitHub { + owner = "dabisu"; + repo = pname; + rev = "SAKURA_${lib.replaceStrings [ "." ] [ "_" ] version}"; + hash = "sha256-Sqo1gyCvCMlEv1rYqw6P3Dmu10osi/KqB7/WlgTTNAc="; }; nativeBuildInputs = [ @@ -36,7 +38,7 @@ stdenv.mkDerivation rec { # Set path to gsettings-schemata so sakura knows where to find colorchooser, # fontchooser etc. - postInstall = '' + postFixup = '' wrapProgram $out/bin/sakura \ --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/ ''; diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index a5c4b4574df38..c217ae7f991de 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "gnunn1"; repo = "tilix"; - rev = "${version}"; + rev = version; sha256 = "sha256:020gr4q7kmqq8vnsh8rw97gf1p2n1yq4d7ncyjjh9l13zkaxqqv9"; }; diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 19e3a1c37e161..6688b6041e099 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -3,6 +3,7 @@ , lib , fetchFromGitHub , ncurses +, perl , pkg-config , python3 , fontconfig @@ -17,7 +18,6 @@ , xcbutilwm , wayland , zlib - # Apple frameworks , CoreGraphics , Cocoa , Foundation @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20210814-124438-54e29167"; + version = "20211204-082213-a66c61ee9"; outputs = [ "out" "terminfo" ]; @@ -35,20 +35,23 @@ rustPlatform.buildRustPackage rec { repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-6HXTftgAs6JMzOMCY+laN74in8xfjE8yJc5xSl9PQCE="; + sha256 = "sha256-QKtnOpAW4exDQEFSN0b04hA6TYuC+/C5nIYHCNzfuso="; }; postPatch = '' echo ${version} > .tag + + # tests are failing with: Unable to exchange encryption keys + rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-yjTrWoqIKoRV4oZQ0mfTGrIGmm89AaKJd16WL1Ozhnw="; + cargoSha256 = "sha256-qSThjV6oBD6joDM0Eppo7z0SL8GHV5SaCaAwXmUIT3I="; nativeBuildInputs = [ pkg-config python3 ncurses # tic for terminfo - ]; + ] ++ lib.optional stdenv.isDarwin perl; buildInputs = [ fontconfig @@ -102,5 +105,7 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ SuperSandro2000 ]; platforms = platforms.unix; + # Fails on missing UserNotifications framework while linking + broken = stdenv.isDarwin; }; } diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 4bb9386a112a9..738260646f20a 100644 --- a/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/pkgs/applications/terminal-emulators/xterm/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "xterm"; - version = "369"; + version = "370"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - sha256 = "ce1qSNBkiT0hSXQaACeBqXNJb9JNUtrdNk9jQ5p2TiY="; + sha256 = "ljxdhAoPD0wHf/KEWG6LH4Pz+YPcpvdPSzYZdbU4jII="; }; strictDeps = true; |