diff options
author | Felix Buehler <account@buehler.rocks> | 2022-02-21 19:19:39 +0100 |
---|---|---|
committer | Bjørn Forsman <bjorn.forsman@gmail.com> | 2022-02-21 22:38:33 +0100 |
commit | b0834fa2b7ab7f7f7010e6e355840110aab0b9c0 (patch) | |
tree | 359e02a838df167685a092d19a15120a87486150 | |
parent | 25b712020f8fc25e61e79842cbc574625d6af8b7 (diff) | |
download | nixlib-b0834fa2b7ab7f7f7010e6e355840110aab0b9c0.tar nixlib-b0834fa2b7ab7f7f7010e6e355840110aab0b9c0.tar.gz nixlib-b0834fa2b7ab7f7f7010e6e355840110aab0b9c0.tar.bz2 nixlib-b0834fa2b7ab7f7f7010e6e355840110aab0b9c0.tar.lz nixlib-b0834fa2b7ab7f7f7010e6e355840110aab0b9c0.tar.xz nixlib-b0834fa2b7ab7f7f7010e6e355840110aab0b9c0.tar.zst nixlib-b0834fa2b7ab7f7f7010e6e355840110aab0b9c0.zip |
asciidoc-full{,-with-plugins}: remove appendToName to have a consistent package name for repology
-rw-r--r-- | pkgs/tools/typesetting/asciidoc/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 0618a55df441..be7f978a42aa 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -147,7 +147,9 @@ let in stdenv.mkDerivation rec { - pname = "asciidoc"; + pname = "asciidoc" + + lib.optionalString enableStandardFeatures "-full" + + lib.optionalString enableExtraPlugins "-with-plugins"; version = "9.1.0"; # Note: a substitution to improve reproducibility should be updated once 10.0.0 is diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15a354b4669d..22310660f1e4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3884,20 +3884,20 @@ with pkgs; enableStandardFeatures = false; }; - asciidoc-full = appendToName "full" (asciidoc.override { + asciidoc-full = asciidoc.override { inherit (python3.pkgs) pygments; texlive = texlive.combine { inherit (texlive) scheme-minimal dvipng; }; w3m = w3m-batch; enableStandardFeatures = true; - }); + }; - asciidoc-full-with-plugins = appendToName "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; enableExtraPlugins = true; - }); + }; asciidoctor = callPackage ../tools/typesetting/asciidoctor { }; |