diff options
Diffstat (limited to 'pkgs/applications/terminal-emulators')
8 files changed, 75 insertions, 123 deletions
diff --git a/pkgs/applications/terminal-emulators/evilvte/default.nix b/pkgs/applications/terminal-emulators/evilvte/default.nix deleted file mode 100644 index 5d5ce5d772e..00000000000 --- a/pkgs/applications/terminal-emulators/evilvte/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchgit, makeWrapper, pkg-config, - gnome2, gtk2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg, - configH ? "" -}: - -stdenv.mkDerivation { - pname = "evilvte"; - version = "0.5.2-20140827"; - - src = fetchgit { - url = "https://github.com/caleb-/evilvte.git"; - rev = "8dfa41e26bc640dd8d8c7317ff7d04e3c01ded8a"; - sha256 = "70f1d4234d077121e2223a735d749d1b53f0b84393507b635b8a37c3716e94d3"; - }; - - buildInputs = [ - gnome2.vte glib pango gtk2 cairo gdk-pixbuf atk freetype xorg.libX11 - xorg.xorgproto xorg.libXext makeWrapper pkg-config - ]; - - buildPhase = '' - cat >src/config.h <<EOF - ${configH} - EOF - make - ''; - - meta = with lib; { - description = "VTE based, highly customizable terminal emulator"; - homepage = "http://www.calno.com/evilvte"; - license = licenses.gpl2; - maintainers = [ maintainers.bodil ]; - platforms = platforms.linux; - knownVulnerabilities = [ - "https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854585" - ]; - }; -} diff --git a/pkgs/applications/terminal-emulators/hyper/default.nix b/pkgs/applications/terminal-emulators/hyper/default.nix index 423c31fd05b..0b8ca7f40d7 100644 --- a/pkgs/applications/terminal-emulators/hyper/default.nix +++ b/pkgs/applications/terminal-emulators/hyper/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "hyper"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { url = "https://github.com/vercel/hyper/releases/download/v${version}/hyper_${version}_amd64.deb"; - sha256 = "sha256-4C0vx4m/ojOJl5ownsbasSFiIrJ9kfJJWh0y4j/DGIQ="; + sha256 = "sha256-Pgu09QvP1PnZ13omQlQLVHr3NayhFaQndmsQdLM+W90="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 4cd8f72b790..d79ce43bdff 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -3,8 +3,10 @@ libstartup_notification, libGL, libX11, libXrandr, libXinerama, libXcursor, libxkbcommon, libXi, libXext, wayland-protocols, wayland, lcms2, + librsync, installShellFiles, dbus, + darwin, Cocoa, CoreGraphics, Foundation, @@ -21,20 +23,21 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.23.1"; + version = "0.24.1"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "sha256-2RwDU6EOJWF0u2ikJFg9U2yqSXergDkJH3h2i+QJ7G4="; + sha256 = "sha256-WPkyub7CwNXRksUmqiZeznnSqEPFpyHTeFLQ+D4Fb5c="; }; buildInputs = [ harfbuzz ncurses lcms2 + librsync ] ++ lib.optionals stdenv.isDarwin [ Cocoa CoreGraphics @@ -45,6 +48,8 @@ buildPythonApplication rec { libpng python3 zlib + ] ++ lib.optionals (stdenv.isDarwin && (builtins.hasAttr "UserNotifications" darwin.apple_sdk.frameworks)) [ + darwin.apple_sdk.frameworks.UserNotifications ] ++ lib.optionals stdenv.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext @@ -67,26 +72,31 @@ buildPythonApplication rec { propagatedBuildInputs = lib.optional stdenv.isLinux libGL; - outputs = [ "out" "terminfo" ]; + outputs = [ "out" "terminfo" "shell_integration" ]; # Causes build failure due to warning hardeningDisable = lib.optional stdenv.cc.isClang "strictoverflow"; dontConfigure = true; - buildPhase = '' + buildPhase = let + commonOptions = '' + --update-check-interval=0 \ + --shell-integration=enabled\ no-rc + ''; + in '' runHook preBuild ${if stdenv.isDarwin then '' ${python.interpreter} setup.py kitty.app \ - --update-check-interval=0 \ - --disable-link-time-optimization + --disable-link-time-optimization \ + ${commonOptions} make man '' else '' ${python.interpreter} setup.py linux-package \ - --update-check-interval=0 \ --egl-library='${lib.getLib libGL}/lib/libEGL.so.1' \ --startup-notification-library='${libstartup_notification}/lib/libstartup-notification-1.so' \ - --canberra-library='${libcanberra}/lib/libcanberra.so' + --canberra-library='${libcanberra}/lib/libcanberra.so' \ + ${commonOptions} ''} runHook postBuild ''; @@ -125,10 +135,7 @@ buildPythonApplication rec { --bash <("$out/bin/kitty" + complete setup bash) \ --fish <("$out/bin/kitty" + complete setup fish) \ --zsh <("$out/bin/kitty" + complete setup zsh) - runHook postInstall - ''; - postInstall = '' terminfo_src=${if stdenv.isDarwin then ''"$out/Applications/kitty.app/Contents/Resources/terminfo"'' else @@ -139,6 +146,10 @@ buildPythonApplication rec { mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + + cp -r 'shell-integration' "$shell_integration" + + runHook postInstall ''; meta = with lib; { diff --git a/pkgs/applications/terminal-emulators/lilyterm/default.nix b/pkgs/applications/terminal-emulators/lilyterm/default.nix deleted file mode 100644 index 9e2d2a67b44..00000000000 --- a/pkgs/applications/terminal-emulators/lilyterm/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, lib, fetchurl, fetchFromGitHub -, pkg-config -, autoconf, automake, intltool, gettext -, gtk, vte -, flavour ? "stable" -}: - -assert lib.assertOneOf "flavour" flavour [ "stable" "git" ]; - -let - pname = "lilyterm"; - stuff = - if flavour == "stable" - then rec { - version = "0.9.9.4"; - src = fetchurl { - url = "https://lilyterm.luna.com.tw/file/${pname}-${version}.tar.gz"; - sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp"; - }; - } - else { - version = "2019-07-25"; - src = fetchFromGitHub { - owner = "Tetralet"; - repo = pname; - rev = "faf1254f46049edfb1fd6e9191e78b1b23b9c51d"; - sha256 = "054450gk237c62b677365bcwrijr63gd9xm8pv68br371wdzylz7"; - }; - }; - -in -with lib; -stdenv.mkDerivation rec { - inherit pname; - - inherit (stuff) src version; - - nativeBuildInputs = [ pkg-config autoconf automake intltool gettext ]; - buildInputs = [ gtk vte ]; - - preConfigure = "sh autogen.sh"; - - configureFlags = [ - "--enable-nls" - "--enable-safe-mode" - ]; - - meta = with lib; { - description = "A fast, lightweight terminal emulator"; - longDescription = '' - LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. - ''; - homepage = "https://lilyterm.luna.com.tw/"; - license = licenses.gpl3; - maintainers = with maintainers; [ AndersonTorres Profpatsch ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index b9f7d4ef677..48c4f6f2c4d 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "mlterm"; - version = "3.9.1"; + version = "3.9.2"; src = fetchFromGitHub { owner = "arakiken"; repo = pname; rev = "rel-${lib.replaceStrings [ "." ] [ "_" ] version}"; # 3.9.1 -> rel-3_9_1 - sha256 = "1hh196kz2n3asv8r8r2bdk5b2w93zq7rw4880ciiq1554h0ib7fj"; + sha256 = "sha256-DvGR3rDegInpnLp3H+rXNXktCGhpjsBBPTRMwodeTro="; }; nativeBuildInputs = [ pkg-config autoconf wrapGAppsHook ]; diff --git a/pkgs/applications/terminal-emulators/st/default.nix b/pkgs/applications/terminal-emulators/st/default.nix index 3a2180ce8d8..35baec9d0e4 100644 --- a/pkgs/applications/terminal-emulators/st/default.nix +++ b/pkgs/applications/terminal-emulators/st/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "st"; - version = "0.8.4"; + version = "0.8.5"; src = fetchurl { url = "https://dl.suckless.org/st/${pname}-${version}.tar.gz"; - hash = "sha256-1C087OtNamXjLpClM249RG22EsP72evBeAvGyaAzRqY="; + hash = "sha256-6mgyID7QL/dBgry4raqexFTI+YnnkjLLhZZl4vVEqzc="; }; inherit patches; @@ -49,19 +49,17 @@ stdenv.mkDerivation rec { libXft ] ++ extraLibs; - installPhase = '' - runHook preInstall - - TERMINFO=$out/share/terminfo make install PREFIX=$out - - runHook postInstall + preInstall = '' + export TERMINFO=$out/share/terminfo ''; + installFlags = [ "PREFIX=$(out)" ]; + meta = with lib; { homepage = "https://st.suckless.org/"; description = "Simple Terminal for X from Suckless.org Community"; license = licenses.mit; maintainers = with maintainers; [ andsild ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/terminal-emulators/syncterm/default.nix b/pkgs/applications/terminal-emulators/syncterm/default.nix new file mode 100644 index 00000000000..d1f0ab5e8cf --- /dev/null +++ b/pkgs/applications/terminal-emulators/syncterm/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, pkg-config, perl, unzip, autoPatchelfHook, ncurses, SDL2, alsa-lib }: + +stdenv.mkDerivation rec { + pname = "syncterm"; + version = "1.1"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}-src.tgz"; + sha256 = "19m76bisipp1h3bc8mbq83b851rx3lbysxb0azpbr5nbqr2f8xyi"; + }; + sourceRoot = "${pname}-${version}/src/syncterm"; + + CFLAGS = [ + "-DHAS_INTTYPES_H" + "-DXPDEV_DONT_DEFINE_INTTYPES" + + "-Wno-unused-result" + "-Wformat-overflow=0" + ] ++ (lib.optionals stdenv.isLinux [ + "-DUSE_ALSA_SOUND" # Don't use OSS for beeps. + ]); + makeFlags = [ + "PREFIX=$(out)" + "RELEASE=1" + "USE_SDL_AUDIO=1" + ]; + + nativeBuildInputs = [ autoPatchelfHook pkg-config SDL2 perl unzip ]; # SDL2 for `sdl2-config`. + buildInputs = [ ncurses SDL2 ] + ++ (lib.optional stdenv.isLinux alsa-lib); + runtimeDependencies = [ ncurses SDL2 ]; # Both of these are dlopen()'ed at runtime. + + meta = with lib; { + homepage = "https://syncterm.bbsdev.net/"; + description = "BBS terminal emulator"; + maintainers = with maintainers; [ embr ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/terminal-emulators/wezterm/default.nix b/pkgs/applications/terminal-emulators/wezterm/default.nix index 6688b6041e0..fc12b1addf6 100644 --- a/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { pname = "wezterm"; - version = "20211204-082213-a66c61ee9"; + version = "20220101-133340-7edc5b5a"; outputs = [ "out" "terminfo" ]; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-QKtnOpAW4exDQEFSN0b04hA6TYuC+/C5nIYHCNzfuso="; + sha256 = "sha256-UZCvKbZdZ7K4RtvVLmr44M612tqd4rkrjF2tys0JHNM="; }; postPatch = '' @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec { rm -r wezterm-ssh/tests ''; - cargoSha256 = "sha256-qSThjV6oBD6joDM0Eppo7z0SL8GHV5SaCaAwXmUIT3I="; + cargoSha256 = "1imil15n9mf1r71qdp4cb4q7kzrrc2cspml0d54825yqaq8vjhsc"; nativeBuildInputs = [ pkg-config |