From 085101b00fb01f5de398fa7a4c441630674816a3 Mon Sep 17 00:00:00 2001 From: Azat Bahawi Date: Tue, 8 Nov 2022 02:11:28 +0300 Subject: [PATCH] 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