alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

html-tidy: align attrname with pkgname

Browse source 
htmlTidy => html-tidy. Keep copy of old attribute for backward
compatibility.
This commit is contained in:
Bjørn Forsman 2014-12-06 16:23:30 +01:00
parent 4687494b7c
commit 289ec3b5aa
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
View file

@ -1,8 +1,8 @@
{ stdenv, kde, kdelibs, htmlTidy, kactivities { stdenv, kde, kdelibs, html-tidy, kactivities
, nepomuk_core, nepomuk_widgets, libXt }: , nepomuk_core, nepomuk_widgets, libXt }:
kde { kde {
buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ]; buildInputs = [ kdelibs nepomuk_core nepomuk_widgets html-tidy kactivities libXt ];
meta = { meta = {
description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";

4
pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix
View file

@ -1,10 +1,10 @@
{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }: { kde, kdelibs, libxml2, libxslt, kdepimlibs, html-tidy, boost }:
kde { kde {
# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old # 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 = { meta = {
description = "A KDE link checker"; description = "A KDE link checker";

4
pkgs/servers/prayer/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, htmlTidy, pam}: { stdenv, fetchurl, perl, openssl, db, zlib, uwimap, html-tidy, pam}:
let let
ssl = stdenv.lib.optionals uwimap.withSSL ssl = stdenv.lib.optionals uwimap.withSSL
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda"; sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda";
}; };
buildInputs = [ openssl db zlib uwimap htmlTidy pam ]; buildInputs = [ openssl db zlib uwimap html-tidy pam ];
nativeBuildInputs = [ perl ]; nativeBuildInputs = [ perl ];
NIX_LDFLAGS = "-lpam"; NIX_LDFLAGS = "-lpam";

3
pkgs/top-level/all-packages.nix
View file

@ -2642,7 +2642,7 @@ let
html2text = callPackage ../tools/text/html2text { }; 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 { }; html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { };
@ -12907,6 +12907,7 @@ let
jquery_ui = jquery-ui; # added 2014-09-07 jquery_ui = jquery-ui; # added 2014-09-07
youtubeDL = youtube-dl; # added 2014-10-26 youtubeDL = youtube-dl; # added 2014-10-26
rdiff_backup = rdiff-backup; # added 2014-11-23 rdiff_backup = rdiff-backup; # added 2014-11-23
htmlTidy = html-tidy; # added 2014-12-06
opentsdb = callPackage ../tools/misc/opentsdb {}; opentsdb = callPackage ../tools/misc/opentsdb {};

2
pkgs/top-level/release.nix
View file

@ -121,7 +121,7 @@ let
gzip = all; gzip = all;
hddtemp = linux; hddtemp = linux;
host = linux; host = linux;
htmlTidy = all; html-tidy = all;
iana_etc = linux; iana_etc = linux;
icewm = linux; icewm = linux;
ifplugd = linux; ifplugd = linux;