From 842acd900024e575bbc44b04b35ee18473e89de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Wed, 24 Jun 2020 19:22:05 +0200 Subject: [PATCH] xara: remove Not updated since 2006: https://en.wikipedia.org/wiki/Xara_Xtreme_LX Marked broken in nixpkgs since 2016-02-27. --- maintainers/scripts/debian-patches.sh | 2 +- .../graphics/xara/debian-patches.nix | 30 ------------------- .../graphics/xara/debian-patches.txt | 7 ----- pkgs/applications/graphics/xara/default.nix | 22 -------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 6 files changed, 2 insertions(+), 62 deletions(-) delete mode 100644 pkgs/applications/graphics/xara/debian-patches.nix delete mode 100644 pkgs/applications/graphics/xara/debian-patches.txt delete mode 100644 pkgs/applications/graphics/xara/default.nix diff --git a/maintainers/scripts/debian-patches.sh b/maintainers/scripts/debian-patches.sh index b4923fb537e9..de6be136ca77 100755 --- a/maintainers/scripts/debian-patches.sh +++ b/maintainers/scripts/debian-patches.sh @@ -2,7 +2,7 @@ # Download patches from debian project # Usage $0 debian-patches.txt debian-patches.nix -# An example input and output files can be found in applications/graphics/xara/ +# An example input and output files can be found in tools/graphics/plotutils DEB_URL=https://sources.debian.org/data/main declare -a deb_patches diff --git a/pkgs/applications/graphics/xara/debian-patches.nix b/pkgs/applications/graphics/xara/debian-patches.nix deleted file mode 100644 index dd3061461868..000000000000 --- a/pkgs/applications/graphics/xara/debian-patches.nix +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by debian-patches.sh from debian-patches.txt -let - prefix = "http://patch-tracker.debian.org/patch/series/dl/xaralx/0.7r1785-5"; -in -[ - { - url = "${prefix}/30_gtk_wxwidgets_symbol_clash"; - sha256 = "1rc9dh9mnp93mad96dkp7idyhhcw7h6w0g5s92mqgzj79hqgaziz"; - } - { - url = "${prefix}/40_algorithm_include"; - sha256 = "03jhl1qnxj7nl8malf6v1y24aldfz87x1p2jxp04mrr35nzvyyc0"; - } - { - url = "${prefix}/50_update_imagemagick_version_parser"; - sha256 = "1nilsqghlr649sc14n1aqkhdx7f66rq91gqccdpi17jwijs27497"; - } - { - url = "${prefix}/remove-icon-suffix"; - sha256 = "160zmkgwlsanqivnip89558yvd9zvqp8ks2wbyr2aigl2rafin22"; - } - { - url = "${prefix}/45_fix_gcc4"; - sha256 = "06zsj0z9v5n557gj8337v6xd26clbvm4dc0qhvpvzbisq81l9jyi"; - } - { - url = "${prefix}/55_fix_contstuctor_call"; - sha256 = "0b14glrcwhv0ja960h56n5jm4f9563ladap2pgaywihq485ql1c1"; - } -] diff --git a/pkgs/applications/graphics/xara/debian-patches.txt b/pkgs/applications/graphics/xara/debian-patches.txt deleted file mode 100644 index 5c95d401a323..000000000000 --- a/pkgs/applications/graphics/xara/debian-patches.txt +++ /dev/null @@ -1,7 +0,0 @@ -xaralx/0.7r1785-5 -30_gtk_wxwidgets_symbol_clash -40_algorithm_include -50_update_imagemagick_version_parser -remove-icon-suffix -45_fix_gcc4 -55_fix_contstuctor_call diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix deleted file mode 100644 index 5e3c252435cd..000000000000 --- a/pkgs/applications/graphics/xara/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, fetchurl, automake, gettext, freetype, libxml2, pango, pkgconfig -, wxGTK, gtk2, perl, zip}: - -stdenv.mkDerivation { - name = "xaralx-0.7r1785"; - - src = fetchurl { - url = "http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2"; - sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh"; - }; - - nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; - buildInputs = [ wxGTK gtk2 libxml2 freetype pango ]; - - configureFlags = [ "--disable-svnversion" ]; - - patches = map fetchurl (import ./debian-patches.nix); - - prePatch = "patchShebangs Scripts"; - - meta.broken = true; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 64392f49a52e..f9487820bafd 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -626,6 +626,7 @@ mapAliases ({ xfce4-14 = xfce; xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 x11 = xlibsWrapper; # added 2015-09 + xara = throw "xara has been removed from nixpkgs. Unmaintained since 2006"; # added 2020-06-24 xbmc = kodi; # added 2018-04-25 xbmcPlain = kodiPlain; # added 2018-04-25 xbmcPlugins = kodiPlugins; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d21aa51ebf1e..fbbfedf068db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23120,8 +23120,6 @@ in libpng = libpng12; }; - xara = callPackage ../applications/graphics/xara { }; - xastir = callPackage ../applications/misc/xastir { rastermagick = imagemagick; inherit (xorg) libXt;