diff options
| author | Philip Potter <philip.g.potter@gmail.com> | 2015-08-24 22:38:01 +0100 |
|---|---|---|
| committer | Philip Potter <philip.g.potter@gmail.com> | 2015-08-24 22:38:01 +0100 |
| commit | 44048385bdaa15e4c64e7206cc4ef9357de2cb6e (patch) | |
| tree | 489d3838b8fb0e0b3338a387882e86abd721fe7a /pkgs/tools/text/xml | |
| parent | ce6daa507a4e110aa33447f70bd4764df9ea10c8 (diff) | |
html-xml-utils: fix and bump to 6.9
6.4 had a compile error: ``` scan.l:136:7: error: expected identifier or ‘(’ before ‘__extension__’ char *strndup(const char *s, size_t n); ^ ``` This is caused by the standard library strndup() now living in string.h and conflicting with another strndup() declared in scan.l. Version 6.9 fixes this. This also removes the need for the boolean patch that we previously had.
Diffstat (limited to 'pkgs/tools/text/xml')
| -rw-r--r-- | pkgs/tools/text/xml/html-xml-utils/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch | 20 |
2 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index cabb931c44708..944b4221844a4 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -1,16 +1,14 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "html-xml-utils-6.4"; + name = "html-xml-utils-6.9"; src = fetchurl { url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz"; - sha256 = "0dqa8vjk5my728hmb7dhl6nbg7946fh905j0yzlwx7p7rg2zrxcp"; + sha256 = "1cpshwz60h7xsw1rvv84jl4bn9zjqii9hb8zvwm7a0fahkf03x4w"; }; - patches = [ ./no-Boolean-type.patch ]; - meta = { description = "Utilities for manipulating HTML and XML files"; homepage = http://www.w3.org/Tools/HTML-XML-utils/; diff --git a/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch b/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch deleted file mode 100644 index f675c4280e783..0000000000000 --- a/pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur html-xml-utils-6.4-orig/openurl.c html-xml-utils-6.4/openurl.c ---- html-xml-utils-6.4-orig/openurl.c 2012-10-23 09:55:12.000000000 -0400 -+++ html-xml-utils-6.4/openurl.c 2013-10-17 14:05:11.424077842 -0400 -@@ -66,6 +66,7 @@ - #include <stdlib.h> - #include <stdarg.h> - #include <assert.h> -+#include <stdbool.h> - #include "export.h" - #if HAVE_LIBCURL && !HAVE_FOPENCOOKIE - # include "fopencookie.e" /* Use our own fopencookie() */ -@@ -505,7 +506,7 @@ - const conststring path, Dictionary request, - Dictionary response, int maxredirs, int *status) - { -- Boolean delete_response = !response; -+ bool delete_response = !response; - conststring h, v; - char buf[BUFLEN]; - int fd, n, i; |