Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ea81107b7800
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: de3b94b24e0c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 17, 2017

  1. Copy the full SHA
    90f0c3b View commit details
  2. Merge pull request #27454 from yegortimoshenko/patch-5

    html-xml-utils: 6.9 → 7.1, macOS support
    Mic92 authored Jul 17, 2017
    Copy the full SHA
    de3b94b View commit details
Showing with 9 additions and 7 deletions.
  1. +9 −7 pkgs/tools/text/xml/html-xml-utils/default.nix
16 changes: 9 additions & 7 deletions pkgs/tools/text/xml/html-xml-utils/default.nix
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
{ stdenv, fetchurl }:
{ stdenv, fetchurl, curl, libiconv }:

stdenv.mkDerivation rec {
name = "html-xml-utils-6.9";
name = "html-xml-utils-${version}";
version = "7.1";

src = fetchurl {
url = "http://www.w3.org/Tools/HTML-XML-utils/${name}.tar.gz";

sha256 = "1cpshwz60h7xsw1rvv84jl4bn9zjqii9hb8zvwm7a0fahkf03x4w";
sha256 = "0vnmcrbnc7irrszx5h71s3mqlp9wqh19zig519zbnr5qccigs3pc";
};

meta = {
buildInputs = [curl libiconv];

meta = with stdenv.lib; {
description = "Utilities for manipulating HTML and XML files";
homepage = http://www.w3.org/Tools/HTML-XML-utils/;
license = stdenv.lib.licenses.w3c;
platforms = stdenv.lib.platforms.linux;
license = licenses.w3c;
platforms = platforms.all;
};
}