diff options
author | Profpatsch <mail@profpatsch.de> | 2021-01-11 08:54:33 +0100 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2021-01-11 10:38:22 +0100 |
commit | 4a7f99d55d299453a9c2397f90b33d1120669775 (patch) | |
tree | 9fca8e9c9970d0a00ce56dfe11b63ae76b00cf01 /pkgs/tools/text/xml | |
parent | e87aef06e00c42b26789321454d7bd609548cc12 (diff) |
treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938 meta = with stdenv.lib; is a widely used pattern. We want to slowly remove the `stdenv.lib` indirection and encourage people to use `lib` directly. Thus let’s start with the meta field. This used a rewriting script to mostly automatically replace all occurances of this pattern, and add the `lib` argument to the package header if it doesn’t exist yet. The script in its current form is available at https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
Diffstat (limited to 'pkgs/tools/text/xml')
-rw-r--r-- | pkgs/tools/text/xml/basex/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/xml/html-xml-utils/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/xml/jing-trang/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/xml/rnv/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/xml/xml2/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/text/xml/xmloscopy/default.nix | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 45c9eb4866cef..9256abf3cbdb6 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: +{ lib, stdenv, fetchurl, unzip, jre, coreutils, makeDesktopItem }: stdenv.mkDerivation rec { pname = "basex"; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "XML database and XPath/XQuery processor"; longDescription = '' BaseX is a very fast and light-weight, yet powerful XML database and diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index d4bd40a119931..5dab3d642a3bb 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, curl, libiconv }: +{ lib, stdenv, fetchurl, curl, libiconv }: stdenv.mkDerivation rec { pname = "html-xml-utils"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [curl libiconv]; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities for manipulating HTML and XML files"; homepage = "http://www.w3.org/Tools/HTML-XML-utils/"; license = licenses.w3c; diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index dcf83c736cc42..542a4709efebd 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: +{ lib, stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: stdenv.mkDerivation { pname = "jing-trang"; @@ -32,7 +32,7 @@ stdenv.mkDerivation { chmod +x "$out"/bin/* ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A RELAX NG validator in Java"; # The homepage is www.thaiopensource.com, but it links to googlecode.com # for downloads and call it the "project site". diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/tools/text/xml/rnv/default.nix index 2bc1b6ddddac4..1ee3355d10529 100644 --- a/pkgs/tools/text/xml/rnv/default.nix +++ b/pkgs/tools/text/xml/rnv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, expat }: +{ lib, stdenv, fetchurl, expat }: stdenv.mkDerivation rec { pname = "rnv"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Relax NG Compact Syntax validator"; homepage = "http://www.davidashen.net/rnv.html"; license = licenses.bsd3; diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix index 8c341855e6877..8ae8ea48bf3e8 100644 --- a/pkgs/tools/text/xml/xml2/default.nix +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2 }: +{ lib, stdenv, fetchurl, pkgconfig, libxml2 }: stdenv.mkDerivation { name = "xml2-0.5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libxml2 ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2"; description = "Tools for command line processing of XML, HTML, and CSV"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix index 2cd7a580ee344..c915e2c7fc5bc 100644 --- a/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { --set PATH "${spath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "wtf is my docbook broken?"; homepage = "https://github.com/grahamc/xmloscopy"; license = licenses.mit; |