diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 13:46:04 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-26 13:46:04 -0400 |
commit | 9be40841ea4251a09ae7a1023abc1b6d191f61bb (patch) | |
tree | f45a3e2cc682740887b81517eca4bd4fecd6c1c2 /pkgs/tools/text | |
parent | 8ce4780eff33591ed54b2fb97ca96108e4e7a740 (diff) | |
parent | ac4c567c3603c5106862f144c21037f6ad76c0ad (diff) | |
download | nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.gz nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.bz2 nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.lz nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.xz nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.tar.zst nixlib-9be40841ea4251a09ae7a1023abc1b6d191f61bb.zip |
Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts: pkgs/build-support/cc-wrapper/default.nix pkgs/build-support/gcc-wrapper-old/builder.sh pkgs/build-support/trivial-builders.nix pkgs/desktops/kde-4.14/kde-package/default.nix pkgs/development/compilers/openjdk-darwin/8.nix pkgs/development/compilers/openjdk-darwin/default.nix pkgs/development/compilers/openjdk/7.nix pkgs/development/compilers/openjdk/8.nix pkgs/development/compilers/oraclejdk/jdk-linux-base.nix pkgs/development/compilers/zulu/default.nix pkgs/development/haskell-modules/generic-builder.nix pkgs/misc/misc.nix pkgs/stdenv/generic/builder.sh pkgs/stdenv/generic/setup.sh
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r-- | pkgs/tools/text/html-tidy/default.nix | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index cc3283cf8541..571dd41244b2 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.2.0"; + version = "5.4.0"; src = fetchFromGitHub { owner = "htacg"; repo = "tidy-html5"; rev = version; - sha256 = "1yxp3kjsxd5zwwn4r5rpyq5ndyylbcnb9pisdyf7dxjqd47z64bc"; + sha256 = "1q9ag2dh2j636fw9vyz6gg0kiss8p6lvj22h25nqsw0daan57c32"; }; nativeBuildInputs = [ cmake libxslt/*manpage*/ ]; @@ -33,4 +33,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ edwtjo ]; }; } - |