diff options
Diffstat (limited to 'pkgs/applications/version-management')
3 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index ed207a1e7d9..1a5ce6e369e 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, makeWrapper, flex, bison, - asciidoc, docbook_xml_dtd_45, docbook_xml_xslt, + asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt, python27, rcs, cvs, git, coreutils, rsync}: @@ -21,7 +21,7 @@ mkDerivation rec { }; buildInputs = [ - flex bison asciidoc docbook_xml_dtd_45 docbook_xml_xslt libxml2 libxslt + flex bison asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt python27 rcs cvs git makeWrapper ]; @@ -29,7 +29,7 @@ mkDerivation rec { preBuild = '' makeFlagsArray=( - XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" + XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml" LIBS="" prefix="$out" ) diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix index a6efb8d339e..284a1cc649a 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, openssl, zlib, asciidoc, libxml2, libxslt -, docbook_xml_xslt, pkgconfig, luajit +, docbook_xsl, pkgconfig, luajit , gzip, bzip2, xz , python, wrapPython, pygments, markdown }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ] ++ [ python wrapPython ]; buildInputs = [ - openssl zlib asciidoc libxml2 libxslt docbook_xml_xslt luajit + openssl zlib asciidoc libxml2 libxslt docbook_xsl luajit ]; pythonPath = [ pygments markdown ]; diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 238d527ce38..84b6633b883 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, python27Packages, git -, docbook_xml_dtd_412, docbook_xml_xslt, asciidoc, xmlto +, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto , bazaar ? null, cvs ? null, darcs ? null, fossil ? null , mercurial ? null, monotone ? null, rcs ? null, src ? null , subversion ? null, cvs_fast_export ? null }: @@ -24,16 +24,16 @@ in mkDerivation rec { }; # See https://gitlab.com/esr/reposurgeon/issues/17 - patches = [ ./fix-preserve-type.patch ]; + patches = [ ./fix-preserve-type.patch ]; buildInputs = - [ docbook_xml_dtd_412 docbook_xml_xslt asciidoc xmlto makeWrapper ] ++ + [ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper ] ++ optional (cython != null) cython ; preBuild = '' makeFlagsArray=( - XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" + XML_CATALOG_FILES="${docbook_xml_dtd_412}/xml/dtd/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml" prefix="$out" pyinclude="-I${python}/include/python2.7" pylib="-L${python}/lib -lpython2.7" @@ -64,5 +64,5 @@ in mkDerivation rec { --prefix PYTHONPATH : "${pythonpath}" done '' - ; + ; } |