about summary refs log tree commit diff
path: root/pkgs/tools/text
diff options
context:
space:
mode:
authorMateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>2014-11-06 00:44:33 +0000
committerMateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>2014-11-06 00:48:16 +0000
commit007f80c1d0440b89970000b92f78ce76186d99a5 (patch)
tree4e1b441ae8f3d451ebecde034fd4bc8456286f0c /pkgs/tools/text
parentd91986c24f1abc34b9785d9e4cd6dbe0bf398853 (diff)
downloadnixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar
nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.gz
nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.bz2
nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.lz
nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.xz
nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.tar.zst
nixlib-007f80c1d0440b89970000b92f78ce76186d99a5.zip
Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
Diffstat (limited to 'pkgs/tools/text')
-rw-r--r--pkgs/tools/text/wgetpaste/default.nix2
-rw-r--r--pkgs/tools/text/xml/html-xml-utils/default.nix2
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
index 3c0af0157a52..235dcfe74586 100644
--- a/pkgs/tools/text/wgetpaste/default.nix
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Command-line interface to various pastebins";
     homepage = http://wgetpaste.zlin.dk/;
-    license = "publicDomain";
+    license = stdenv.lib.licenses.publicDomain;
     maintainers = with stdenv.lib.maintainers; [ qknight iElectric ];
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix
index fd5a5dc5f8e5..cabb931c4470 100644
--- a/pkgs/tools/text/xml/html-xml-utils/default.nix
+++ b/pkgs/tools/text/xml/html-xml-utils/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Utilities for manipulating HTML and XML files";
     homepage = http://www.w3.org/Tools/HTML-XML-utils/;
-    license = "free-non-copyleft"; #TODO W3C
+    license = stdenv.lib.licenses.w3c;
   };
 }