diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/tools/text/xml | |
parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/tools/text/xml')
-rw-r--r-- | nixpkgs/pkgs/tools/text/xml/basex/default.nix | 3 | ||||
-rw-r--r-- | nixpkgs/pkgs/tools/text/xml/xmldiff/default.nix | 41 |
2 files changed, 43 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/tools/text/xml/basex/default.nix b/nixpkgs/pkgs/tools/text/xml/basex/default.nix index 9256abf3cbdb..30482196322f 100644 --- a/nixpkgs/pkgs/tools/text/xml/basex/default.nix +++ b/nixpkgs/pkgs/tools/text/xml/basex/default.nix @@ -9,7 +9,8 @@ stdenv.mkDerivation rec { hash = "sha256-IZhRg2JcYQXQKU/lYZpLLcsSdjZZO+toY5yvk+RKUCY="; }; - buildInputs = [ unzip jre ]; + nativeBuildInputs = [ unzip ]; + buildInputs = [ jre ]; desktopItem = makeDesktopItem { name = "basex"; diff --git a/nixpkgs/pkgs/tools/text/xml/xmldiff/default.nix b/nixpkgs/pkgs/tools/text/xml/xmldiff/default.nix new file mode 100644 index 000000000000..5814435e111b --- /dev/null +++ b/nixpkgs/pkgs/tools/text/xml/xmldiff/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonApplication +, fetchFromGitHub +, lxml +, six +}: + +buildPythonApplication rec { + pname = "xmldiff"; + version = "2.4"; + + src = fetchFromGitHub { + owner = "Shoobx"; + repo = pname; + rev = version; + hash = "sha256-xqudHYfwOce2C0pcFzId0JDIIC6R5bllmVKsH+CvTdE="; + }; + + buildInputs = [ + lxml + six + ]; + + meta = with lib; { + homepage = "https://xmldiff.readthedocs.io/en/stable/"; + description = "A library and command line utility for diffing xml"; + longDescription = '' + xmldiff is a library and a command-line utility for making diffs out of + XML. This may seem like something that doesn't need a dedicated utility, + but change detection in hierarchical data is very different from change + detection in flat data. XML type formats are also not only used for + computer readable data, it is also often used as a format for hierarchical + data that can be rendered into human readable formats. A traditional diff + on such a format would tell you line by line the differences, but this + would not be be readable by a human. xmldiff provides tools to make human + readable diffs in those situations. + ''; + license = licenses.mit; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} |