diff options
author | Will Dietz <w@wdtz.org> | 2018-01-17 13:25:18 -0600 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2018-01-17 14:50:59 -0600 |
commit | fca39a3814f27674770cc11b202763e85f843576 (patch) | |
tree | 454282ba6103bcb21cd1a5683db150f6492a5138 | |
parent | ea51cd255d5e144d881f26a005027587bd5fb38d (diff) | |
download | nixlib-fca39a3814f27674770cc11b202763e85f843576.tar nixlib-fca39a3814f27674770cc11b202763e85f843576.tar.gz nixlib-fca39a3814f27674770cc11b202763e85f843576.tar.bz2 nixlib-fca39a3814f27674770cc11b202763e85f843576.tar.lz nixlib-fca39a3814f27674770cc11b202763e85f843576.tar.xz nixlib-fca39a3814f27674770cc11b202763e85f843576.tar.zst nixlib-fca39a3814f27674770cc11b202763e85f843576.zip |
plotutils: regenerate debian patch url's, apply few more
don't include the format-security patch, because it breaks a test: https://bugs.gentoo.org/618708
-rw-r--r-- | pkgs/tools/graphics/plotutils/debian-patches.nix | 30 | ||||
-rw-r--r-- | pkgs/tools/graphics/plotutils/debian-patches.txt | 9 | ||||
-rw-r--r-- | pkgs/tools/graphics/plotutils/default.nix | 12 |
3 files changed, 41 insertions, 10 deletions
diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/pkgs/tools/graphics/plotutils/debian-patches.nix index 0615d1f52e1a..d7c60a11eb67 100644 --- a/pkgs/tools/graphics/plotutils/debian-patches.nix +++ b/pkgs/tools/graphics/plotutils/debian-patches.nix @@ -1,14 +1,42 @@ # Generated by debian-patches.sh from debian-patches.txt let - prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-3"; + prefix = "https://sources.debian.org/data/main/p/plotutils/2.6-9/debian/patches"; in [ { + url = "${prefix}/01_AC_PROG_CXX.diff"; + sha256 = "0r7xgwbk2yqs7b29gwhr8pnbqvy3a3x698j17s4yg501ragw1gqv"; + } + { url = "${prefix}/10_repair_postscript"; sha256 = "01v4a8mdhgsjxbf9a2xppx2lb05lp818v8afp5x2njv64wpgla8p"; } { + url = "${prefix}/11_manpages_sb_macro"; + sha256 = "01vvhznw5z7lb7afwgw53cwg8w676s4v30kychlrl8kn5yks94qs"; + } + { + url = "${prefix}/14_manpage_spline"; + sha256 = "1xp3cx9y9njp5wp40dkp7rwd2flkiik2gb08nh4516vkm73avfrd"; + } + { + url = "${prefix}/20_svg_attribute_syntax"; + sha256 = "0vy089w00x2zh87igv3dcqq7kggqxpc4javb694pa5xl5bvddnqk"; + } + { + url = "${prefix}/21_plot2svg_test.diff"; + sha256 = "0lv8hj9fiqj6z72pnaw3imk3164n1kcy5ym0j9jl2pn3a19p1jmb"; + } + { url = "${prefix}/25_libpng15"; sha256 = "0l640rcsgc2mwpk7iqm0cf3b0gfcdgcn9wg4x88gaqxzx9rriph0"; } + { + url = "${prefix}/30_hershey_glyphs"; + sha256 = "0n7rn6ln9ikzq2dialif58ag5pch7q7zqd5zcsxxdyyasx4s5gm2"; + } + { + url = "${prefix}/35_spline.test.error.diff"; + sha256 = "1kqj1n8myk8xmglj6qcybj34zm4kpn6aw320jbpqhblkgp7m0fb1"; + } ] diff --git a/pkgs/tools/graphics/plotutils/debian-patches.txt b/pkgs/tools/graphics/plotutils/debian-patches.txt index 8694be8edd79..c28d96fdd5bc 100644 --- a/pkgs/tools/graphics/plotutils/debian-patches.txt +++ b/pkgs/tools/graphics/plotutils/debian-patches.txt @@ -1,3 +1,10 @@ -plotutils/2.6-2 +plotutils/2.6-9 +01_AC_PROG_CXX.diff 10_repair_postscript +11_manpages_sb_macro +14_manpage_spline +20_svg_attribute_syntax +21_plot2svg_test.diff 25_libpng15 +30_hershey_glyphs +35_spline.test.error.diff diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 219bfdf8c14d..85685e0b0482 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libpng }: +{ fetchurl, stdenv, libpng, autoreconfHook }: # debian splits this package into plotutils and libplot2c2 @@ -13,14 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg"; }; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libpng ]; - - # disable failing test on i686 - # https://lists.gnu.org/archive/html/bug-plotutils/2016-04/msg00002.html - prePatch = stdenv.lib.optionalString stdenv.isi686 '' - substituteInPlace test/Makefile.in --replace 'spline.test' ' ' - ''; - patches = map fetchurl (import ./debian-patches.nix); configureFlags = "--enable-libplotter"; # required for pstoedit @@ -29,6 +23,8 @@ stdenv.mkDerivation rec { doCheck = true; + enableParallelBuilding = true; + meta = { description = "Powerful C/C++ library for exporting 2D vector graphics"; |