From 085101b00fb01f5de398fa7a4c441630674816a3 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Tue, 8 Nov 2022 02:11:28 +0300 Subject: [PATCH 1/2] gnome2.scrollkeeper: remove --- pkgs/desktops/gnome-2/default.nix | 3 --- .../gnome-2/desktop/scrollkeeper/default.nix | 22 ------------------- pkgs/top-level/aliases.nix | 1 + 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 29dbbdd2f12d..2082caf7f9d1 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -55,9 +55,6 @@ lib.makeScope pkgs.newScope (self: with self; { #### DESKTOP - # Removed from recent GNOME releases, but still required - scrollkeeper = callPackage ./desktop/scrollkeeper { }; - gtksourceview = callPackage ./desktop/gtksourceview { autoreconfHook = pkgs.autoreconfHook269; }; diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix deleted file mode 100644 index 521800b4aa07..000000000000 --- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, automake, gettext }: - -stdenv.mkDerivation rec { - pname = "scrollkeeper"; - version = "0.3.14"; - - src = fetchurl { - url = "mirror://gnome/sources/scrollkeeper/${lib.versions.majorMinor version}/scrollkeeper-${version}.tar.bz2"; - sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc"; - }; - - # The fuloong2f is not supported by scrollkeeper-0.3.14 config.guess - preConfigure = " - substituteInPlace extract/dtds/Makefile.am --replace /usr/bin/xmlcatalog xmlcatalog - cp ${automake}/share/automake*/config.{sub,guess} . - "; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libxml2 libxslt gettext ] - ++ (with perlPackages; [ perl XMLParser ]); - configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/catalog.xml" ]; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 0783e9bba8da..eb07a7d59fc5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1328,6 +1328,7 @@ mapAliases ({ scim = throw "'scim' has been renamed to/replaced by 'sc-im'"; # Converted to throw 2022-02-22 scollector = throw "'scollector' has been renamed to/replaced by 'bosun'"; # Converted to throw 2022-02-22 scribusUnstable = throw "'scribusUnstable' has been renamed to 'scribus'"; # Added 2022-05-13 + scrollkeeper = throw "'scrollkeeper' has been removed due to deprecated LibXML2 headers"; # Added 2022-11-08 scyther = throw "scyther has been removed since it currently only supports Python 2, see https://github.com/cascremers/scyther/issues/20"; # Added 2021-10-07 sdlmame = mame; # Added 2019-10-30 seeks = throw "seeks has been removed from nixpkgs, as it was unmaintained"; # Added 2020-06-21 From c0615ec21ac51960368b9b4379f16f4300a41060 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Tue, 8 Nov 2022 02:11:44 +0300 Subject: [PATCH 2/2] xvidcap: remove --- pkgs/applications/video/xvidcap/default.nix | 52 --------------------- pkgs/applications/video/xvidcap/xlib.patch | 15 ------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 4 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 pkgs/applications/video/xvidcap/default.nix delete mode 100644 pkgs/applications/video/xvidcap/xlib.patch diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix deleted file mode 100644 index 06dc6bb465cc..000000000000 --- a/pkgs/applications/video/xvidcap/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchurl -, perlPackages -, pkg-config -, gtk2 -, scrollkeeper -, libglade -, libXmu -, libX11 -, libXext -, gettext -, lame -, libXfixes -, libXdamage -}: - -stdenv.mkDerivation rec { - pname = "xvidcap"; - version = "1.1.7"; - - src = fetchurl { - url = "mirror://sourceforge/xvidcap/xvidcap-${version}.tar.gz"; - sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm"; - }; - - patches = [ ./xlib.patch ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - gtk2 - scrollkeeper - libglade - libXmu - gettext - lame - libXdamage - libXfixes - libXext - libX11 - ] ++ (with perlPackages; [ perl XMLParser ]); - - # !!! don't know why this is necessary - NIX_LDFLAGS = "-lXext -lX11 -lz -lgcc_s"; - - meta = with lib; { - description = "Screencast video catpuring tool"; - homepage = "http://xvidcap.sourceforge.net/"; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/video/xvidcap/xlib.patch b/pkgs/applications/video/xvidcap/xlib.patch deleted file mode 100644 index eb97854386b2..000000000000 --- a/pkgs/applications/video/xvidcap/xlib.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/app_data.c b/src/app_data.c -index 5a44363..482b115 100644 ---- a/src/app_data.c -+++ b/src/app_data.c -@@ -52,9 +52,9 @@ - #include - #include - -+#include - #ifdef HAVE_LIBXFIXES - #include --#include - #include - #include - #include diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index eb07a7d59fc5..e60db410dc02 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1596,6 +1596,7 @@ mapAliases ({ ); # Added 2022-08-02 xpraGtk3 = throw "'xpraGtk3' has been renamed to/replaced by 'xpra'"; # Converted to throw 2022-02-22 xv = xxv; # Added 2020-02-22 + xvidcap = throw "'xvidcap' has been removed because of a broken dependency"; # Added 2022-11-08 xvfb_run = xvfb-run; # Added 2021-05-07 ### Y ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60997a7ee6ba..b6cdaeb1844f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33233,10 +33233,6 @@ with pkgs; xnotify = callPackage ../tools/X11/xnotify { }; - xvidcap = callPackage ../applications/video/xvidcap { - inherit (gnome2) scrollkeeper libglade; - }; - xygrib = libsForQt514.callPackage ../applications/misc/xygrib {}; xzgv = callPackage ../applications/graphics/xzgv { };