cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

asciidoc: get rid of ? null

Browse source
This commit is contained in:
Robert Schütz 2022-06-27 19:57:01 +00:00
parent 919e04f5d7
commit 601d9db27f
2 changed files with 29 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
pkgs/tools/typesetting/asciidoc/default.nix
View file

@ -2,38 +2,38 @@
, fetchFromGitHub, autoreconfHook , fetchFromGitHub, autoreconfHook
, installShellFiles , installShellFiles
, enableStandardFeatures ? false , enableStandardFeatures ? false
, sourceHighlight ? null , sourceHighlight
, highlight ? null , highlight
, pygments ? null , pygments
, graphviz ? null , graphviz
, texlive ? null , texlive
, dblatexFull ? null , dblatexFull
, libxslt ? null , libxslt
, w3m ? null , w3m
, lynx ? null , lynx
, imagemagick ? null , imagemagick
, lilypond ? null , lilypond
, libxml2 ? null , libxml2
, docbook_xml_dtd_45 ? null , docbook_xml_dtd_45
, docbook_xsl_ns ? null , docbook_xsl_ns
, docbook_xsl ? null , docbook_xsl
, fop ? null , fop
, epubcheck ? null , epubcheck
, gnused ? null , gnused
, coreutils ? null , coreutils
# if true, enable all the below filters and backends # if true, enable all the below filters and backends
, enableExtraPlugins ? false , enableExtraPlugins ? false
# unzip is needed to extract filter and backend plugins # unzip is needed to extract filter and backend plugins
, unzip ? null , unzip
# filters # filters
, enableDitaaFilter ? false, jre ? null , enableDitaaFilter ? false, jre
, enableMscgenFilter ? false, mscgen ? null , enableMscgenFilter ? false, mscgen
, enableDiagFilter ? false, blockdiag ? null, seqdiag ? null, actdiag ? null, nwdiag ? null , enableDiagFilter ? false, blockdiag, seqdiag, actdiag, nwdiag
, enableQrcodeFilter ? false, qrencode ? null , enableQrcodeFilter ? false, qrencode
, enableMatplotlibFilter ? false, matplotlib ? null, numpy ? null , enableMatplotlibFilter ? false, matplotlib, numpy
, enableAafigureFilter ? false, aafigure ? null, recursivePthLoader ? null , enableAafigureFilter ? false, aafigure, recursivePthLoader
# backends # backends
, enableDeckjsBackend ? false , enableDeckjsBackend ? false
, enableOdfBackend ? false , enableOdfBackend ? false
@ -44,37 +44,6 @@
, buildPackages , buildPackages
}: }:
assert enableStandardFeatures ->
sourceHighlight != null &&
highlight != null &&
pygments != null &&
graphviz != null &&
texlive != null &&
dblatexFull != null &&
libxslt != null &&
w3m != null &&
lynx != null &&
imagemagick != null &&
lilypond != null &&
libxml2 != null &&
docbook_xml_dtd_45 != null &&
docbook_xsl_ns != null &&
docbook_xsl != null &&
(fop != null || !enableJava) &&
epubcheck != null &&
gnused != null &&
coreutils != null;
# filters
assert enableExtraPlugins || enableDitaaFilter || enableMscgenFilter || enableDiagFilter || enableQrcodeFilter || enableAafigureFilter -> unzip != null;
assert (enableExtraPlugins && enableJava) || enableDitaaFilter -> jre != null;
assert enableExtraPlugins || enableMscgenFilter -> mscgen != null;
assert enableExtraPlugins || enableDiagFilter -> blockdiag != null && seqdiag != null && actdiag != null && nwdiag != null;
assert enableExtraPlugins || enableMatplotlibFilter -> matplotlib != null && numpy != null;
assert enableExtraPlugins || enableAafigureFilter -> aafigure != null && recursivePthLoader != null;
# backends
assert enableExtraPlugins || enableDeckjsBackend || enableOdfBackend -> unzip != null;
let let
_enableDitaaFilter = (enableExtraPlugins && enableJava) || enableDitaaFilter; _enableDitaaFilter = (enableExtraPlugins && enableJava) || enableDitaaFilter;

10
pkgs/top-level/all-packages.nix
View file

@ -4470,21 +4470,17 @@ with pkgs;
arpoison = callPackage ../tools/networking/arpoison { }; arpoison = callPackage ../tools/networking/arpoison { };
asciidoc = callPackage ../tools/typesetting/asciidoc { asciidoc = callPackage ../tools/typesetting/asciidoc {
inherit (python3.pkgs) matplotlib numpy aafigure recursivePthLoader; inherit (python3.pkgs) pygments matplotlib numpy aafigure recursivePthLoader;
texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; };
w3m = w3m-batch;
enableStandardFeatures = false; enableStandardFeatures = false;
}; };
asciidoc-full = asciidoc.override { asciidoc-full = asciidoc.override {
inherit (python3.pkgs) pygments;
texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; };
w3m = w3m-batch;
enableStandardFeatures = true; enableStandardFeatures = true;
}; };
asciidoc-full-with-plugins = asciidoc.override { asciidoc-full-with-plugins = asciidoc.override {
inherit (python3.pkgs) pygments;
texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; };
w3m = w3m-batch;
enableStandardFeatures = true; enableStandardFeatures = true;
enableExtraPlugins = true; enableExtraPlugins = true;
}; };