about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2023-07-05 05:25:15 +0200
committerGitHub <noreply@github.com>2023-07-05 05:25:15 +0200
commita8c9073e7e1b4a0a2b50d6878921d76f554cf2b2 (patch)
tree90d4d0d6c77645437f592821f9a41c2166a458c7
parentcc928b17f0e925633553204b6b5a7a5a3c0010a4 (diff)
parent6be4122dd53324079074b7b929c0dbff119a8b9b (diff)
Merge pull request #241577 from jtojnar/drop-rarian
-rw-r--r--pkgs/desktops/gnome-2/default.nix2
-rw-r--r--pkgs/development/libraries/rarian/default.nix25
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix2
4 files changed, 2 insertions, 28 deletions
diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index b360924dc9ef3..2adc897d085d6 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -47,7 +47,7 @@ lib.makeScope pkgs.newScope (self: with self; {
     glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2
 
     # Included for backwards compatibility
-    libsoup libwnck2 gtk-doc gnome-doc-utils rarian
+    libsoup libwnck2 gtk-doc gnome-doc-utils
 
     gvfs # added 2019-09-03
   ;
diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix
deleted file mode 100644
index b8995e6a2c484..0000000000000
--- a/pkgs/development/libraries/rarian/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome}:
-let
-  pname = "rarian";
-  version = "0.8.1";
-in stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.gz";
-    sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libxml2 libxslt ]
-    ++ (with perlPackages; [ perl XMLParser ]);
-  configureFlags = [ "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat" ];
-
-  meta = with lib; {
-    description = "Documentation metadata library based on the proposed Freedesktop.org spec";
-    homepage = "https://rarian.freedesktop.org/";
-    license = licenses.lgpl21Plus;
-    maintainers = teams.gnome.members;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c55a5b20448f6..420a85403fe24 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1538,6 +1538,7 @@ mapAliases ({
   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
+  rarian = throw "rarian has been removed as unused"; # Added 2023-07-05
   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
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79eec276e0fa8..a8687892e8cec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12028,8 +12028,6 @@ with pkgs;
 
   rare-regex = callPackage ../tools/text/rare-regex { };
 
-  rarian = callPackage ../development/libraries/rarian { };
-
   ratman = callPackage ../tools/networking/ratman { };
 
   ratools = callPackage ../tools/networking/ratools { };