diff options
Diffstat (limited to 'pkgs/applications/terminal-emulators')
18 files changed, 50 insertions, 416 deletions
diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index ffa1780b5e7..3427852669c 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -49,16 +49,16 @@ let in rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.12.2"; + version = "0.12.3"; src = fetchFromGitHub { owner = "alacritty"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-X3Z+f5r8surBW9FSsmWKZ/fr82ThXBUkS8fr/sTYR50="; + hash = "sha256-SUEI7DTgs6NYT4oiqaMBNCQ8gP1XoZjPFIKhob7tfsk="; }; - cargoHash = "sha256-JOmDmJl/y4WNsBnCixJykl4PgYgb5cSyo6MCdYmQAzQ="; + cargoHash = "sha256-iLhctiCDNpcTxoMrWwUWHBRc6X5rxSH9Jl2EDuktWmw="; nativeBuildInputs = [ cmake diff --git a/pkgs/applications/terminal-emulators/contour/default.nix b/pkgs/applications/terminal-emulators/contour/default.nix index 9c44946f382..1a036106c6d 100644 --- a/pkgs/applications/terminal-emulators/contour/default.nix +++ b/pkgs/applications/terminal-emulators/contour/default.nix @@ -103,7 +103,7 @@ mkDerivation rec { homepage = "https://github.com/contour-terminal/contour"; changelog = "https://github.com/contour-terminal/contour/raw/v${version}/Changelog.md"; license = licenses.asl20; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ moni ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix index 0e7c6a27e29..528c82fe819 100644 --- a/pkgs/applications/terminal-emulators/cool-retro-term/default.nix +++ b/pkgs/applications/terminal-emulators/cool-retro-term/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , mkDerivation , qtbase -, qtquick1 , qmltermwidget , qtquickcontrols2 , qtgraphicaleffects @@ -28,7 +27,6 @@ mkDerivation rec { buildInputs = [ qtbase - qtquick1 qmltermwidget qtquickcontrols2 qtgraphicaleffects @@ -58,6 +56,6 @@ mkDerivation rec { homepage = "https://github.com/Swordfish90/cool-retro-term"; license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux ++ darwin; - maintainers = with lib.maintainers; [ skeidel ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/applications/terminal-emulators/ctx/0001-Make-arch-detection-optional-and-fix-targets.patch b/pkgs/applications/terminal-emulators/ctx/0001-Make-arch-detection-optional-and-fix-targets.patch deleted file mode 100644 index 5e4297ea704..00000000000 --- a/pkgs/applications/terminal-emulators/ctx/0001-Make-arch-detection-optional-and-fix-targets.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 5c41e49b79ef85e7e23748fbeeaf65df8b769263 Mon Sep 17 00:00:00 2001 -From: Tobias Mayer <tobim@fastmail.fm> -Date: Sat, 10 Jun 2023 14:17:16 +0200 -Subject: [PATCH] Make arch detection optional and fix targets - ---- - Makefile | 6 +++--- - configure.sh | 22 +++++++++++++--------- - 2 files changed, 16 insertions(+), 12 deletions(-) - -diff --git a/Makefile b/Makefile -index d21c53bf..fe982b24 100644 ---- a/Makefile -+++ b/Makefile -@@ -205,8 +205,8 @@ stuff/%.o: stuff/%.c ctx.h stuff/*.h stuff/*.inc Makefile build.conf - libctx.a: itk.o deps.o $(CTX_OBJS) build.conf Makefile - $(AR) rcs $@ $(CTX_OBJS) deps.o itk.o - libctx.so: $(CTX_OBJS) deps.o itk.o build.conf Makefile -- $(LD) -shared $(LIBS) $(CTX_OBJS) deps.o itk.o $(CTX_LIBS) -o $@ -- #$(LD) --retain-symbols-file=symbols -shared $(LIBS) $? $(CTX_LIBS) -o $@ -+ $(CCC) -shared $(LIBS) $(CTX_OBJS) deps.o itk.o $(CTX_LIBS) -o $@ -+ #$(CCC) --retain-symbols-file=symbols -shared $(LIBS) $? $(CTX_LIBS) -o $@ - - ctx: main.c ctx.h build.conf Makefile $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) libctx.a - $(CCC) main.c $(TERMINAL_OBJS) $(MEDIA_HANDLERS_OBJS) -o $@ $(CFLAGS) libctx.a $(LIBS) $(CTX_CFLAGS) $(OFLAGS_LIGHT) -lpthread $(CTX_LIBS) -@@ -276,5 +276,5 @@ itk/w3c-constants.h: itk/css.h Makefile squoze/squoze - for a in `cat itk/css.h | tr ';' ' ' | tr ',' ' ' | tr ')' ' '|tr ':' ' ' | tr '{' ' ' | tr ' ' '\n' | grep 'SQZ_[a-z][0-9a-zA-Z_]*'| sort | uniq`;do b=`echo $$a|tail -c+5|tr '_' '-'`;echo "#define $$a `./squoze/squoze -33 $$b`u // \"$$b\"";done \ - >> $@ - echo '#endif' >> $@ --static.inc: static/* static/*/* tools/gen_fs.sh -+static.inc: static/* tools/gen_fs.sh - ./tools/gen_fs.sh static > $@ -diff --git a/configure.sh b/configure.sh -index ad388a5d..fd9d3b96 100755 ---- a/configure.sh -+++ b/configure.sh -@@ -43,16 +43,20 @@ ENABLE_FAST_FILL_RECT=1 - ENABLE_SWITCH_DISPATCH=1 - - pkg-config sdl2 && HAVE_SDL=1 --pkg-config babl && HAVE_BABL=1 --pkg-config cairo && HAVE_CAIRO=1 --pkg-config libcurl && HAVE_LIBCURL=1 --pkg-config alsa && HAVE_ALSA=1 --pkg-config libdrm && HAVE_KMS=1 -+# https://github.com/GNOME/gimp/blob/828a8a7fe7ecd1825387f37a42922bc50fa32be9/meson.build#L349 -+pkg-config babl-0.1 && { HAVE_BABL=1; BABL_NAME=babl-0.1; } -+if [ $HAVE_BABL != 1 ];then -+ pkg-config babl && { HAVE_BABL=1; BABL_NAME=babl; } -+fi -+pkg-config cairo && HAVE_CAIRO=1 -+pkg-config libcurl && HAVE_LIBCURL=1 -+pkg-config alsa && HAVE_ALSA=1 -+pkg-config libdrm && HAVE_KMS=1 - #pkg-config harfbuzz && HAVE_HARFBUZZ=1 - - - --ARCH=`uname -m` -+: "${ARCH:="$(uname -m)"}" - - case "$ARCH" in - "x86_64") HAVE_SIMD=1 ;; -@@ -229,8 +233,8 @@ echo >> build.conf - if [ $HAVE_BABL = 1 ];then - echo "#define CTX_BABL 1 " >> local.conf - echo "#define CTX_ENABLE_CM 1 " >> local.conf -- echo "CTX_CFLAGS+= `pkg-config babl --cflags`" >> build.conf -- echo "CTX_LIBS+= `pkg-config babl --libs` " >> build.conf -+ echo "CTX_CFLAGS+= `pkg-config "$BABL_NAME" --cflags`" >> build.conf -+ echo "CTX_LIBS+= `pkg-config "$BABL_NAME" --libs` " >> build.conf - else - echo "#define CTX_BABL 0 " >> local.conf - echo "#define CTX_ENABLE_CM 0 " >> local.conf -@@ -348,7 +352,7 @@ echo "LIBS=$LIBS" >> build.conf - #echo "Generating build.deps" - #make build.deps 2>/dev/null - --echo -n "configuration summary, architecture $(arch)" -+echo -n "configuration summary, architecture $ARCH" - [ $HAVE_SIMD = 1 ] && echo " SIMD multi-pass" - echo "" - echo "Backends:" --- -2.40.1 - diff --git a/pkgs/applications/terminal-emulators/ctx/default.nix b/pkgs/applications/terminal-emulators/ctx/default.nix deleted file mode 100644 index 47f0fd702fa..00000000000 --- a/pkgs/applications/terminal-emulators/ctx/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ lib -, stdenv -, fetchgit -, pkg-config -, xxd -, SDL2 -, alsa-lib -, babl -, bash -, cairo -, curl -, libdrm # Not documented -, enableFb ? false -, nixosTests -}: - -stdenv.mkDerivation { - pname = "ctx"; - version = "unstable-2023-06-05"; - - src = fetchgit { - name = "ctx-source"; # because of a dash starting the directory - url = "https://ctx.graphics/.git/"; - rev = "2eb3886919d0a0b8c305e4f9e18428dad5e73ca0"; - sha256 = "sha256-PLUyGArxLU742IKIgpzxdBdc94mWWSkHNFoXGW8L/Zo="; - }; - - patches = [ - ./0001-Make-arch-detection-optional-and-fix-targets.patch - ]; - - postPatch = '' - patchShebangs ./tools/gen_fs.sh - ''; - - strictDeps = true; - - env.ARCH = stdenv.hostPlatform.parsed.cpu.arch; - - nativeBuildInputs = [ - pkg-config - xxd - ]; - - buildInputs = [ - SDL2 - alsa-lib - babl - bash # for ctx-audioplayer - cairo - curl - libdrm - ]; - - configureScript = "./configure.sh"; - configureFlags = lib.optional enableFb "--enable-fb"; - configurePlatforms = []; - dontAddPrefix = true; - dontDisableStatic = true; - - installFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - passthru.tests.test = nixosTests.terminal-emulators.ctx; - - meta = with lib; { - homepage = "https://ctx.graphics/"; - description = "Vector graphics terminal"; - longDescription= '' - ctx is an interactive 2D vector graphics, audio, text- canvas and - terminal, with escape sequences that enable a 2D vector drawing API using - a vector graphics protocol. - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ AndersonTorres]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/applications/terminal-emulators/foot/default.nix b/pkgs/applications/terminal-emulators/foot/default.nix index 3b6561758e3..1792b587c1b 100644 --- a/pkgs/applications/terminal-emulators/foot/default.nix +++ b/pkgs/applications/terminal-emulators/foot/default.nix @@ -27,7 +27,7 @@ }: let - version = "1.15.3"; + version = "1.16.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 { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256-jn/S0xjxZPnkGYpTRIpL3dKxGe7+Z+EmOGHiE0UkQqg="; + hash = "sha256-hT+btlfqfwGBDWTssYl8KN6SbR9/Y2ors4ipECliigM="; }; separateDebugInfo = true; @@ -210,7 +210,7 @@ stdenv.mkDerivation { changelog = "https://codeberg.org/dnkl/foot/releases/tag/${version}"; description = "A fast, lightweight and minimalistic Wayland terminal emulator"; license = licenses.mit; - maintainers = [ maintainers.sternenseemann ]; + maintainers = [ maintainers.sternenseemann maintainers.abbe ]; platforms = platforms.linux; # From (presumably) ncurses version 6.3, it will ship a foot # terminfo file. This however won't include some non-standard diff --git a/pkgs/applications/terminal-emulators/germinal/default.nix b/pkgs/applications/terminal-emulators/germinal/default.nix deleted file mode 100644 index aef24f675b1..00000000000 --- a/pkgs/applications/terminal-emulators/germinal/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, appstream-glib -, dbus -, pango -, pcre2 -, tmux -, vte -, wrapGAppsHook -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "germinal"; - version = "26"; - - src = fetchFromGitHub { - owner = "Keruspe"; - repo = "Germinal"; - rev = "v${version}"; - sha256 = "sha256-HUi+skF4bJj5CY2cNTOC4tl7jhvpXYKqBx2rqKzjlo0="; - }; - - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; - buildInputs = [ - appstream-glib - dbus - pango - pcre2 - vte - ]; - - configureFlags = [ - "--with-dbusservicesdir=${placeholder "out"}/etc/dbus-1/system-services/" - ]; - - dontWrapGApps = true; - - fixupPhase = '' - runHook preFixup - wrapProgram $out/bin/germinal \ - --prefix PATH ":" "${lib.makeBinPath [ tmux ]}" \ - "''${gappsWrapperArgs[@]}" - runHook postFixup - ''; - - passthru.tests.test = nixosTests.terminal-emulators.germinal; - - meta = with lib; { - description = "A minimal terminal emulator"; - homepage = "https://github.com/Keruspe/Germinal"; - license = with licenses; gpl3Plus; - platforms = with platforms; unix; - maintainers = with maintainers; [ AndersonTorres ]; - }; -} diff --git a/pkgs/applications/terminal-emulators/havoc/default.nix b/pkgs/applications/terminal-emulators/havoc/default.nix deleted file mode 100644 index fa161a81474..00000000000 --- a/pkgs/applications/terminal-emulators/havoc/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, libxkbcommon -, pkg-config -, wayland-protocols -, wayland-scanner -, wayland -}: - -stdenv.mkDerivation rec { - pname = "havoc"; - version = "0.5.0"; - - src = fetchFromGitHub { - owner = "ii8"; - repo = pname; - rev = version; - hash = "sha256-jvGm2gFdMS61otETF7gOEpYn6IuLfqI95IpEVfIv+C4="; - }; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - wayland-protocols - wayland-scanner - ]; - - buildInputs = [ - libxkbcommon - wayland - ]; - - dontConfigure = true; - - installFlags = [ "PREFIX=$$out" ]; - - postInstall = '' - install -D -m 644 havoc.cfg -t $out/etc/${pname}/ - install -D -m 644 README.md -t $out/share/doc/${pname}-${version}/ - ''; - - enableParallelBuilding = true; - - meta = with lib; { - homepage = "https://github.com/ii8/havoc"; - description = "A minimal terminal emulator for Wayland"; - license = with licenses; [ mit publicDomain ]; - platforms = with platforms; unix; - maintainers = with maintainers; [ AndersonTorres ]; - # fatal error: 'sys/epoll.h' file not found - broken = stdenv.isDarwin; - }; -} diff --git a/pkgs/applications/terminal-emulators/iterm2/default.nix b/pkgs/applications/terminal-emulators/iterm2/default.nix index 4b62044ba2a..230a08dd70f 100644 --- a/pkgs/applications/terminal-emulators/iterm2/default.nix +++ b/pkgs/applications/terminal-emulators/iterm2/default.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation rec { pname = "iterm2"; - version = "3.4.20"; + version = "3.4.22"; src = fetchzip { url = "https://iterm2.com/downloads/stable/iTerm2-${lib.replaceStrings ["."] ["_"] version}.zip"; - hash = "sha256-RXBv3RXd2Kq8k7rbOE3HPEf6vI64VZCo1IX03gDy7l0="; + hash = "sha256-bHHAA9H6oUS0cXkGEaY/A0TLWrshgno3UN5xJA6+8lU="; }; dontFixup = true; diff --git a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix b/pkgs/applications/terminal-emulators/kermit-terminal/default.nix deleted file mode 100644 index 4bcd3191af7..00000000000 --- a/pkgs/applications/terminal-emulators/kermit-terminal/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, gtk3 -, pcre -, pkg-config -, vte -, nixosTests -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "kermit"; - version = "3.8"; - - src = fetchFromGitHub { - owner = "orhun"; - repo = finalAttrs.pname; - rev = finalAttrs.version; - hash = "sha256-XPHF33Nu+H8OcQFwsuUOhDBDWKm8sh5B36sfROeSWPg="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - - buildInputs = [ - gtk3 - pcre - vte - ]; - - passthru.tests.test = nixosTests.terminal-emulators.kermit; - - meta = with lib; { - homepage = "https://github.com/orhun/kermit"; - description = "A VTE-based, simple and froggy terminal emulator"; - changelog = "https://github.com/orhun/kermit/releases/tag/${finalAttrs.version}"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = with platforms; unix; - }; -}) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 1c1f87e1a40..f7ab3c8acbf 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -7,6 +7,7 @@ , openssl , installShellFiles , dbus +, sudo , Libsystem , Cocoa , Kernel @@ -29,20 +30,20 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.30.0"; + version = "0.31.0"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "refs/tags/v${version}"; - hash = "sha256-M6qFkeUp2rBudO2PiLN2VSrmut68c9mjjUr07WEX9VY="; + hash = "sha256-VWWuC4T0pyTgqPNm0gNL1j3FShU5b8S157C1dKLon1g="; }; goModules = (buildGoModule { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-53Y2S/P2fWT9STZFTdlkESxHNpoAggifZJ0+WXCzbkU="; + vendorHash = "sha256-OyZAWefSIiLQO0icxMIHWH3BKgNas8HIxLcse/qWKcU="; }).goModules; buildInputs = [ @@ -128,17 +129,17 @@ buildPythonApplication rec { runHook preBuild ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" } ${if stdenv.isDarwin then '' - ${python.pythonForBuild.interpreter} setup.py build ${darwinOptions} + ${python.pythonOnBuildForHost.interpreter} setup.py build ${darwinOptions} make docs - ${python.pythonForBuild.interpreter} setup.py kitty.app ${darwinOptions} + ${python.pythonOnBuildForHost.interpreter} setup.py kitty.app ${darwinOptions} '' else '' - ${python.pythonForBuild.interpreter} setup.py linux-package \ + ${python.pythonOnBuildForHost.interpreter} setup.py linux-package \ --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' \ --fontconfig-library='${fontconfig.lib}/lib/libfontconfig.so' \ ${commonOptions} - ${python.pythonForBuild.interpreter} setup.py build-launcher + ${python.pythonOnBuildForHost.interpreter} setup.py build-launcher ''} runHook postBuild ''; @@ -150,6 +151,9 @@ buildPythonApplication rec { bashInteractive zsh fish + ] ++ lib.optionals (!stdenv.isDarwin) [ + # integration tests need sudo + sudo ]; # skip failing tests due to darwin sandbox diff --git a/pkgs/applications/terminal-emulators/kitty/themes.nix b/pkgs/applications/terminal-emulators/kitty/themes.nix index 07563345bd1..6ca522e4090 100644 --- a/pkgs/applications/terminal-emulators/kitty/themes.nix +++ b/pkgs/applications/terminal-emulators/kitty/themes.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "kitty-themes"; - version = "unstable-2023-06-01"; + version = "unstable-2023-09-15"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty-themes"; - rev = "f765eb1715d79c6cb3ad3d571342d612f21b810e"; - hash = "sha256-Y3N8cyqEsY/kB2xMIlPYnbuYUs8grzepPx/11maG4bo="; + rev = "c9c12d20f83b9536febb21e4b53e176c0ccccb51"; + hash = "sha256-dhzYTHaaTrbE5k+xEC01Y9jGb+ZmEyvWMb4a2WWKGCw="; }; 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; [ AndersonTorres nelsonjeppesen ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index f6f4ea91919..950d2f8f401 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -1,4 +1,6 @@ { lib +, stdenv +, darwin , fetchFromGitHub , rustPlatform , nixosTests @@ -14,18 +16,21 @@ , vulkan-loader , libxkbcommon -, withX11 ? true +, withX11 ? !stdenv.isDarwin , libX11 , libXcursor , libXi , libXrandr , libxcb -, withWayland ? true +, withWayland ? !stdenv.isDarwin , wayland }: let - rlinkLibs = [ + rlinkLibs = if stdenv.isDarwin then [ + darwin.libobjc + darwin.apple_sdk.frameworks.AppKit + ] else [ (lib.getLib gcc-unwrapped) fontconfig libGL @@ -55,9 +60,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-XD+/DaaJEJ9jHZITTUma/wfsbduPUTc/SralPOx46Yo="; nativeBuildInputs = [ - autoPatchelfHook ncurses + ] ++ lib.optionals stdenv.isLinux [ pkg-config + autoPatchelfHook ]; runtimeDependencies = rlinkLibs; @@ -67,10 +73,9 @@ rustPlatform.buildRustPackage rec { outputs = [ "out" "terminfo" ]; buildNoDefaultFeatures = true; - buildFeatures = [ - (lib.optionalString withX11 "x11") - (lib.optionalString withWayland "wayland") - ]; + buildFeatures = [ ] + ++ lib.optional withX11 "x11" + ++ lib.optional withWayland "wayland"; checkFlags = [ # Fail to run in sandbox environment. @@ -86,6 +91,11 @@ rustPlatform.buildRustPackage rec { tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo mkdir -p $out/nix-support echo "$terminfo" >> $out/nix-support/propagated-user-env-packages + '' + lib.optionalString stdenv.isDarwin '' + mkdir $out/Applications/ + mv misc/osx/Rio.app/ $out/Applications/ + mkdir $out/Applications/Rio.app/Contents/MacOS/ + ln -s $out/bin/rio $out/Applications/Rio.app/Contents/MacOS/ ''; passthru = { @@ -103,5 +113,6 @@ rustPlatform.buildRustPackage rec { maintainers = with lib.maintainers; [ otavio oluceps ]; platforms = lib.platforms.unix; changelog = "https://github.com/raphamorim/rio/blob/v${version}/CHANGELOG.md"; + mainProgram = "rio"; }; } diff --git a/pkgs/applications/terminal-emulators/roxterm/default.nix b/pkgs/applications/terminal-emulators/roxterm/default.nix index 72b40c8cd2d..e39b61499e1 100644 --- a/pkgs/applications/terminal-emulators/roxterm/default.nix +++ b/pkgs/applications/terminal-emulators/roxterm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "roxterm"; - version = "3.12.1"; + version = "3.14.2"; src = fetchFromGitHub { owner = "realh"; repo = "roxterm"; rev = version; - sha256 = "sha256-jVcf/nrEq8dM8rw40ZhXGJjt3DQLroCePtIAdAsVIfs="; + sha256 = "sha256-LBxVZ5Az0vGalbQd437of5a3aoZH51v6OKTfndHkkiM="; }; nativeBuildInputs = [ cmake pkg-config wrapGAppsHook libxslt ]; diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix index 7824fa2a814..ac2a5f09fb0 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Change the urxvt font size on the fly"; homepage = "https://github.com/majutsushi/urxvt-font-size"; license = licenses.mit; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix index 9ecaffb185c..f30507483fa 100644 --- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { description = "Perl extensions for the rxvt-unicode terminal emulator"; homepage = "https://github.com/effigies/urxvt-perl"; license = licenses.gpl3; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ ]; platforms = with platforms; unix; }; } diff --git a/pkgs/applications/terminal-emulators/tilda/default.nix b/pkgs/applications/terminal-emulators/tilda/default.nix deleted file mode 100644 index 01cc4f527a9..00000000000 --- a/pkgs/applications/terminal-emulators/tilda/default.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ lib, stdenv -, fetchFromGitHub -, autoreconfHook -, pkg-config -, expat -, gettext -, gtk -, libconfuse -, pcre2 -, vte -, makeWrapper -, nixosTests -}: - -stdenv.mkDerivation rec { - pname = "tilda"; - version = "1.5.4"; - - src = fetchFromGitHub { - owner = "lanoxx"; - repo = "tilda"; - rev = "${pname}-${version}"; - sha256 = "sha256-uDx28jmjNUyzJbgTJiHbjI9U5mYb9bnfl/9AjbxNUWA="; - }; - - nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; - buildInputs = [ - gettext - gtk - libconfuse - pcre2 - vte - ]; - - LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build - - # The config locking scheme relies on the binary being called "tilda", - # (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice: - postInstall = '' - mkdir $out/bin/wrapped - mv "$out/bin/tilda" "$out/bin/wrapped/tilda" - makeWrapper "$out/bin/wrapped/tilda" "$out/bin/tilda" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" - ''; - - passthru.tests.test = nixosTests.terminal-emulators.tilda; - - meta = with lib; { - description = "A Gtk based drop down terminal for Linux and Unix"; - homepage = "https://github.com/lanoxx/tilda/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.AndersonTorres ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/applications/terminal-emulators/xterm/default.nix b/pkgs/applications/terminal-emulators/xterm/default.nix index 6179c1719d3..b0d8dd7a4b3 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 = "384"; + version = "388"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz" ]; - hash = "sha256-Me+HB0DOrgIMPEtKlgHH9Hv9RmcsGq8tITpWXWTLw3M="; + hash = "sha256-rEKTReb5N6WUWonUJaJl/ubCFfxmnb3GoDJuIfTF9nQ="; }; strictDeps = true; |