Merge staging-next into staging

2021-01-27 18:28:34 +00:00
parent d72ebead34 bef2fbcd27
commit 06efb52369
62 changed files with 4992 additions and 5007 deletions
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, makeWrapper, flex, bison,
+{lib, stdenv, fetchurl, makeWrapper, flex, bison,
 asciidoc, docbook_xml_dtd_45, docbook_xsl,
 libxml2, libxslt,
 python3, rcs, cvs, git,
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, python27Packages, git
+{ lib, stdenv, fetchurl, makeWrapper, python27Packages, git
 , docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy
 , breezy ? null, cvs ? null, darcs ? null, fossil ? null
 , mercurial ? null, monotone ? null, rcs ? null