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
 , aspell
 , pkg-config
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
    "--enable-relocatable" # needed for tests
  ];

-  meta = with stdenv.lib; {
+  meta = with lib; {
    description = "Generic spell checking library";
    homepage = "https://abiword.github.io/enchant/";
    license = licenses.lgpl21Plus; # with extra provision for non-free checkers