jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #155048 from mweinelt/python2-must-die

Browse Source 
gnome2.vte: drop with all reverse dependencies
This commit is contained in:
Anderson Torres 2022-01-19 19:24:20 -03:00 committed by GitHub
commit a97ae545f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 4 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/misc/grip/default.nix
View File

@ -2,15 +2,10 @@
, stdenv
, fetchurl
, gtk2
, glib
, pkg-config
, libgnome
, libgnomeui
, vte
, curl
, cdparanoia
, libid3tag
, ncurses
, libtool
}:
@ -26,14 +21,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config libtool ];
buildInputs = [
gtk2
glib
libgnome
libgnomeui
vte
curl
cdparanoia
libid3tag
ncurses
];
enableParallelBuilding = true;

38
pkgs/applications/terminal-emulators/evilvte/default.nix
View File

@ -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"
];
};
}

58
pkgs/applications/terminal-emulators/lilyterm/default.nix
View File

@ -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;
};
}

2
pkgs/desktops/gnome-2/default.nix
View File

@ -62,8 +62,6 @@ lib.makeScope pkgs.newScope (self: with self; {
autoreconfHook = pkgs.autoreconfHook269;
};
vte = callPackage ./desktop/vte { };
#### BINDINGS
libglademm = callPackage ./bindings/libglademm { };

50
pkgs/desktops/gnome-2/desktop/vte/alt.patch
View File

@ -1,50 +0,0 @@
From a9d6a34708f846952f423d078397352858f7b1a4 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Sat, 12 May 2012 18:48:05 +0200
Subject: [PATCH] keymap: Treat ALT as META
https://bugzilla.gnome.org/show_bug.cgi?id=663779
---
src/vte.c | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/vte.c b/src/vte.c
index dd27e9a..0657921 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -5170,19 +5170,24 @@ static void
vte_terminal_read_modifiers (VteTerminal *terminal,
GdkEvent *event)
{
+ GdkKeymap *keymap;
GdkModifierType modifiers;
/* Read the modifiers. */
- if (gdk_event_get_state((GdkEvent*)event, &modifiers)) {
- GdkKeymap *keymap;
-#if GTK_CHECK_VERSION (2, 90, 8)
- keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
-#else
- keymap = gdk_keymap_get_for_display(gdk_drawable_get_display(((GdkEventAny*)event)->window));
+ if (!gdk_event_get_state((GdkEvent*)event, &modifiers))
+ return;
+
+ keymap = gdk_keymap_get_for_display(gdk_window_get_display(((GdkEventAny*)event)->window));
+
+ gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
+
+#if 1
+ /* HACK! Treat ALT as META; see bug #663779. */
+ if (modifiers & GDK_MOD1_MASK)
+ modifiers |= VTE_META_MASK;
#endif
- gdk_keymap_add_virtual_modifiers (keymap, &modifiers);
- terminal->pvt->modifiers = modifiers;
- }
+
+ terminal->pvt->modifiers = modifiers;
}
/* Read and handle a keypress event. */
--
1.7.5.1.217.g4e3aa.dirty

67
pkgs/desktops/gnome-2/desktop/vte/change-scroll-region.patch
View File

@ -1,67 +0,0 @@
Index: vte-0.26.0/src/vte.c
===================================================================
--- vte-0.26.0.orig/src/vte.c 2010-11-30 23:04:53.000000000 -0800
+++ vte-0.26.0/src/vte.c 2010-12-07 20:05:07.865548000 -0800
@@ -3862,6 +3862,7 @@ vte_terminal_process_incoming(VteTermina
long wcount, start, delta;
gboolean leftovers, modified, bottom, again;
gboolean invalidated_text;
+ gboolean in_scroll_region;
GArray *unichars;
struct _vte_incoming_chunk *chunk, *next_chunk, *achunk = NULL;
@@ -3881,6 +3882,10 @@ vte_terminal_process_incoming(VteTermina
cursor = screen->cursor_current;
cursor_visible = terminal->pvt->cursor_visible;
+ in_scroll_region = screen->scrolling_restricted
+ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
+ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
+
/* We should only be called when there's data to process. */
g_assert(terminal->pvt->incoming ||
(terminal->pvt->pending->len > 0));
@@ -3979,6 +3984,8 @@ skip_chunk:
* points to the first character which isn't part of this
* sequence. */
if ((match != NULL) && (match[0] != '\0')) {
+ gboolean new_in_scroll_region;
+
/* Call the right sequence handler for the requested
* behavior. */
_vte_terminal_handle_sequence(terminal,
@@ -3989,12 +3996,20 @@ skip_chunk:
start = (next - wbuf);
modified = TRUE;
- /* if we have moved during the sequence handler, restart the bbox */
+ new_in_scroll_region = screen->scrolling_restricted
+ && (screen->cursor_current.row >= (screen->insert_delta + screen->scrolling_region.start))
+ && (screen->cursor_current.row <= (screen->insert_delta + screen->scrolling_region.end));
+
+ delta = screen->scroll_delta; /* delta may have changed from sequence. */
+
+ /* if we have moved greatly during the sequence handler, or moved into a scroll_region
+ * from outside it, restart the bbox */
if (invalidated_text &&
- (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
- screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK ||
- screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
- screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK)) {
+ ((new_in_scroll_region && !in_scroll_region) ||
+ (screen->cursor_current.col > bbox_bottomright.x + VTE_CELL_BBOX_SLACK ||
+ screen->cursor_current.col < bbox_topleft.x - VTE_CELL_BBOX_SLACK ||
+ screen->cursor_current.row > bbox_bottomright.y + VTE_CELL_BBOX_SLACK ||
+ screen->cursor_current.row < bbox_topleft.y - VTE_CELL_BBOX_SLACK))) {
/* Clip off any part of the box which isn't already on-screen. */
bbox_topleft.x = MAX(bbox_topleft.x, 0);
bbox_topleft.y = MAX(bbox_topleft.y, delta);
@@ -4014,6 +4029,8 @@ skip_chunk:
bbox_bottomright.x = bbox_bottomright.y = -G_MAXINT;
bbox_topleft.x = bbox_topleft.y = G_MAXINT;
}
+
+ in_scroll_region = new_in_scroll_region;
} else
/* Second, we have a NULL match, and next points to the very
* next character in the buffer. Insert the character which

61
pkgs/desktops/gnome-2/desktop/vte/default.nix
View File

@ -1,61 +0,0 @@
{ lib, stdenv, fetchurl, fetchpatch, intltool, pkg-config, glib, gtk2, ncurses
, pythonSupport ? false, python27Packages}:
let
inherit (python27Packages) python pygtk;
in stdenv.mkDerivation rec {
name = "vte-0.28.2";
src = fetchurl {
url = "mirror://gnome/sources/vte/0.28/${name}.tar.bz2";
sha256 = "00zrip28issgmz2cqk5k824cbqpbixi5x7k88zxksdqpnq1f414d";
};
patches = [
./alt.patch
./change-scroll-region.patch
# CVE-2012-2738
# fixed in upstream version 0.32.2
(fetchpatch{
name = "CVE-2012-2738-1.patch";
url = "https://gitlab.gnome.org/GNOME/vte/commit/feeee4b5832b17641e505b7083e0d299fdae318e.patch";
sha256 = "1455i6zxcx4rj2cz639s8qdc04z2nshprwl7k00mcsw49gv3hk5n";
})
(fetchpatch{
name = "CVE-2012-2738-2.patch";
url = "https://gitlab.gnome.org/GNOME/vte/commit/98ce2f265f986fb88c38d508286bb5e3716b9e74.patch";
sha256 = "0n24vw49h89w085ggq23iwlnnb6ajllfh2dg4vsar21d82jxc0sn";
})
];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ intltool glib gtk2 ncurses ] ++
lib.optionals pythonSupport [python pygtk];
configureFlags = [
(lib.enableFeature pythonSupport "python")
];
postInstall = lib.optionalString pythonSupport ''
cd $(toPythonPath $out)/gtk-2.0
for n in *; do
ln -s "gtk-2.0/$n" "../$n"
done
'';
meta = {
homepage = "https://www.gnome.org/";
description = "A library implementing a terminal emulator widget for GTK";
longDescription = ''
VTE is a library (libvte) implementing a terminal emulator widget for
GTK, and a minimal sample application (vte) using that. Vte is
mainly used in gnome-terminal, but can also be used to embed a
console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
character set conversion, as well as emulating any terminal known to
the system's terminfo database.
'';
license = lib.licenses.lgpl2;
maintainers = with lib.maintainers; [ astsmtl ];
platforms = with lib.platforms; linux;
};
}

3
pkgs/top-level/aliases.nix
View File

@ -259,6 +259,7 @@ mapAliases ({
euca2tools = throw "euca2ools has been removed because it is unmaintained upstream and still uses python2."; # added 2022-01-01
evolution_data_server = evolution-data-server; # added 2018-02-25
etcdctl = etcd; # added 2018-04-25
evilvte = throw "evilvte has been removed from nixpkgs for being unmaintained with security issues and dependant on an old version of vte which was removed."; # added 2022-01-14
exfat-utils = exfat; # 2015-09-11
facette = throw "facette has been removed."; # added 2020-01-06
fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28
@ -506,6 +507,8 @@ mapAliases ({
libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09
libwnck3 = libwnck;
lilypond-unstable = lilypond; # added 2021-03-11
lilyterm = throw "lilyterm has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # added 2022-01-14
lilyterm-git = throw "lilyterm-git has been removed from nixpkgs, because it was relying on a vte version that depended on python2."; # added 2022-01-14
links = links2; # added 2016-01-31
linuxband = throw "linuxband has been removed from nixpkgs, as it's abandoned upstream."; # added 2021-12-09
linux_rpi0 = linuxKernel.kernels.linux_rpi1;

17
pkgs/top-level/all-packages.nix
View File

@ -1085,8 +1085,6 @@ with pkgs;
eterm = callPackage ../applications/terminal-emulators/eterm { };
evilvte = callPackage ../applications/terminal-emulators/evilvte (config.evilvte or {});
foot = callPackage ../applications/terminal-emulators/foot { };
germinal = callPackage ../applications/terminal-emulators/germinal { };
@ -1110,16 +1108,6 @@ with pkgs;
lilo = callPackage ../tools/misc/lilo { };
lilyterm = callPackage ../applications/terminal-emulators/lilyterm {
inherit (gnome2) vte;
gtk = gtk2;
flavour = "stable";
};
lilyterm-git = lilyterm.override {
flavour = "git";
};
logseq = callPackage ../applications/misc/logseq { };
lxterminal = callPackage ../applications/terminal-emulators/lxterminal { };
@ -15259,7 +15247,6 @@ with pkgs;
r10k = callPackage ../tools/system/r10k { };
radare2 = callPackage ../development/tools/analysis/radare2 ({
inherit (gnome2) vte;
lua = lua5;
} // (config.radare or {}));
@ -25493,9 +25480,7 @@ with pkgs;
grip-search = callPackage ../tools/text/grip-search { };
grip = callPackage ../applications/misc/grip {
inherit (gnome2) libgnome libgnomeui vte;
};
grip = callPackage ../applications/misc/grip { };
gsimplecal = callPackage ../applications/misc/gsimplecal { };