Merge staging-next into staging

2021-01-22 16:56:40 +10:00
parent afc2edc3ee d40c5e1c8f
commit 153ad8bc1e
1772 changed files with 4918 additions and 4917 deletions
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , fetchurl

 , pkg-config
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
  doInstallCheck = true;
  installCheckTarget = "test";

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Library and utilities for working with the TIFF image file format";
    homepage = "http://download.osgeo.org/libtiff";
    license = licenses.libtiff;