summary refs log tree commit diff
path: root/pkgs/tools/compression
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2015-05-27 21:56:04 +0200
committerTobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>2015-05-27 22:00:06 +0200
commitb2d7f4b1ba937951fefdd026314512ab0be91508 (patch)
treed1f7fc189bac34f376069294d67abfa3c8551693 /pkgs/tools/compression
parent87fd373aac3a1aaa84ddb328d43074aeebc1b133 (diff)
downloadnixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.tar
nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.tar.gz
nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.tar.bz2
nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.tar.lz
nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.tar.xz
nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.tar.zst
nixpkgs-b2d7f4b1ba937951fefdd026314512ab0be91508.zip
Use common licence attributes from lib/licenses.nix
Many (less easily automatically converted) old-style strings
remain.

Where there was any possible ambiguity about the exact version or
variant intended, nothing was changed. IANAL, nor a search robot.

Use `with stdenv.lib` wherever it makes sense.
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r--pkgs/tools/compression/xz/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 69c14023701..6a9d4582dff 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   postInstall = "rm -rf $out/share/doc";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://tukaani.org/xz/;
     description = "XZ, general-purpose data compression software, successor of LZMA";
 
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
          bzip2.
       '';
 
-    license = [ "GPLv2+" "LGPLv2.1+" ];
-    maintainers = with stdenv.lib.maintainers; [ sander ];
-    platforms = stdenv.lib.platforms.all;
+    license = with licenses; [ gpl2Plus lgpl21Plus ];
+    maintainers = with maintainers; [ sander ];
+    platforms = platforms.all;
   };
 }