Merge pull request #9431 from philandstuff/fix-html-xml-utils

html-xml-utils: fix and bump to 6.9

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/;

pkgs/tools/text/xml/html-xml-utils/no-Boolean-type.patch

@@ -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;