From 0acec7e984ff38b7a296a459ba4b539a3b719c1b Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 24 Feb 2018 15:12:44 +0200
Subject: treewide: transition mesa to libGLU_combined

---
 pkgs/tools/text/mpage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools/text')

diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix
index 4ebe62ef9a5f..47e6766d21fa 100644
--- a/pkgs/tools/text/mpage/default.nix
+++ b/pkgs/tools/text/mpage/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "mpage-2.5.6";
   src = fetchurl {
-    url = "http://www.mesa.nl/pub/mpage/${name}.tgz";
+    url = "http://www.libGLU_combined.nl/pub/mpage/${name}.tgz";
     sha256 = "016w9sm06sn1d2lim4p8fzl6wbmad3wigxhflsybzi7p4zy6vrjg";
   };
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
 
     license = "liberal";  # a non-copyleft license, see `Copyright' file
-    homepage = http://www.mesa.nl/pub/mpage/;
+    homepage = http://www.libGLU_combined.nl/pub/mpage/;
     platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
cgit 1.4.1


From c64a239ccf21bd52316cde255009f3d609d93c8b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 26 Feb 2018 18:41:59 -0800
Subject: html-tidy: 5.4.0 -> 5.6.0

Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy -h` got 0 exit code
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy --help` got 0 exit code
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy help` got 0 exit code
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy -V` and found version 5.6.0
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy -v` and found version 5.6.0
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy --version` and found version 5.6.0
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy -h` and found version 5.6.0
- ran `/nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0/bin/tidy --help` and found version 5.6.0
- found 5.6.0 with grep in /nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0
- found 5.6.0 in filename of file in /nix/store/9idavy2wphjqap2sw87ivczwq8wy7vjf-html-tidy-5.6.0

cc "@edwtjo"
---
 pkgs/tools/text/html-tidy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools/text')

diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index 571dd41244b2..ccd927002464 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "html-tidy-${version}";
-  version = "5.4.0";
+  version = "5.6.0";
 
   src = fetchFromGitHub {
     owner = "htacg";
     repo = "tidy-html5";
     rev = version;
-    sha256 = "1q9ag2dh2j636fw9vyz6gg0kiss8p6lvj22h25nqsw0daan57c32";
+    sha256 = "0w175c5d1babq0w1zzdzw9gl6iqbgyq58v8587s7srp05y3hwy9k";
   };
 
   nativeBuildInputs = [ cmake libxslt/*manpage*/ ];
-- 
cgit 1.4.1