From 289ec3b5aaf3fd00b4450290de50f5499a896bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 6 Dec 2014 16:23:30 +0100
Subject: [PATCH] html-tidy: align attrname with pkgname

htmlTidy => html-tidy. Keep copy of old attribute for backward
compatibility.
---
 pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix | 4 ++--
 pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix     | 4 ++--
 pkgs/servers/prayer/default.nix                      | 4 ++--
 pkgs/top-level/all-packages.nix                      | 3 ++-
 pkgs/top-level/release.nix                           | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
index a65f33e13de1..31245413f158 100644
--- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
+++ b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
@@ -1,8 +1,8 @@
-{ stdenv, kde, kdelibs, htmlTidy, kactivities
+{ stdenv, kde, kdelibs, html-tidy, kactivities
 , nepomuk_core, nepomuk_widgets, libXt }:
 
 kde {
-  buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ];
+  buildInputs = [ kdelibs nepomuk_core nepomuk_widgets html-tidy kactivities libXt ];
 
   meta = {
     description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
diff --git a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
index 918512e2b2de..b0138ecb48b0 100644
--- a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
+++ b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
@@ -1,10 +1,10 @@
-{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }:
+{ kde, kdelibs, libxml2, libxslt, kdepimlibs, html-tidy, boost }:
 
 kde {
 
 # todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
 
-  buildInputs = [ kdelibs kdepimlibs htmlTidy boost ];
+  buildInputs = [ kdelibs kdepimlibs html-tidy boost ];
 
   meta = {
     description = "A KDE link checker";
diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix
index 781fca1c33d2..1e476cb2301a 100644
--- a/pkgs/servers/prayer/default.nix
+++ b/pkgs/servers/prayer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, htmlTidy, pam}:
+{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, html-tidy, pam}:
 
 let
   ssl = stdenv.lib.optionals uwimap.withSSL
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda";
   };
 
-  buildInputs = [ openssl db zlib uwimap htmlTidy pam ];
+  buildInputs = [ openssl db zlib uwimap html-tidy pam ];
   nativeBuildInputs = [ perl ];
 
   NIX_LDFLAGS = "-lpam";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c5d00007477..d2abf72001d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2642,7 +2642,7 @@ let
 
   html2text = callPackage ../tools/text/html2text { };
 
-  htmlTidy = callPackage ../tools/text/html-tidy { };
+  html-tidy = callPackage ../tools/text/html-tidy { };
 
   html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { };
 
@@ -12907,6 +12907,7 @@ let
   jquery_ui = jquery-ui;  # added 2014-09-07
   youtubeDL = youtube-dl;  # added 2014-10-26
   rdiff_backup = rdiff-backup;  # added 2014-11-23
+  htmlTidy = html-tidy;  # added 2014-12-06
 
   opentsdb = callPackage ../tools/misc/opentsdb {};
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 90a82be0e05e..946228cf8893 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -121,7 +121,7 @@ let
       gzip = all;
       hddtemp = linux;
       host = linux;
-      htmlTidy = all;
+      html-tidy = all;
       iana_etc = linux;
       icewm = linux;
       ifplugd = linux;