about summary refs log tree commit diff
diff options
context:
space:
mode:
authorArtturi <Artturin@artturin.com>2022-05-05 04:01:29 +0300
committerGitHub <noreply@github.com>2022-05-05 04:01:29 +0300
commit5d4bdece1f2d20eb16e5ee8e634134bd41ba02b1 (patch)
tree8fa183d55bcdee381c0e1a3424050e1763352ab1
parent0b64a2d69ae54a6003e5af68ce02704834c2d5cd (diff)
parent1be5ae112f4d42c1dfecd9ab555e098edfe4c401 (diff)
Merge pull request #170427 from armeenm/remove-xpf
-rw-r--r--pkgs/tools/text/xml/xpf/default.nix21
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix4
3 files changed, 1 insertions, 25 deletions
diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix
deleted file mode 100644
index ce0813c2ef4a5..0000000000000
--- a/pkgs/tools/text/xml/xpf/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{lib, stdenv, fetchurl, python2, libxml2}:
-
-assert libxml2.pythonSupport == true;
-
-stdenv.mkDerivation rec {
-  pname = "xpf";
-  version = "0.2";
-
-  src = fetchurl {
-    url = "http://tarballs.nixos.org/xpf-${version}.tar.gz";
-    sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz";
-  };
-
-  buildInputs = [ python2 libxml2 ];
-
-  meta = {
-    description = "XML Pipes and Filters - command line tools for manipulating and querying XML data";
-    homepage = "http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters";
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f304e4ca4ebdb..2822ea4619af4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1394,6 +1394,7 @@ mapAliases ({
   xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22
   xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only";
   xp-pen-g430 = pentablet-driver; # Added 2020-05-03
+  xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26
   xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22
   xf86_input_mtrack = throw ''
     xf86_input_mtrack has been removed from nixpkgs as it is broken and
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c074c3a8edb8..4e4e37c9dc89d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11801,10 +11801,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) AppKit;
   };
 
-  xpf = callPackage ../tools/text/xml/xpf {
-    libxml2 = libxml2Python;
-  };
-
   xsecurelock = callPackage ../tools/X11/xsecurelock { };
 
   xsel = callPackage ../tools/misc/xsel { };