nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-01 22:50:59 +01:00
Code Activity

Rename the "markdown" Meson flag to "lowdown"

Browse source 
This is because we are about to use `cmark`. (Mored details in the next
commit.) We don't need this flag, or any other, to control the `cmark`
dependency --- it can just be unconditional. The name "lowdown" makes
clear that the original flag is just about lowdown, and no longer about
markdown in general.
This commit is contained in:
John Ericson 2025-11-10 19:46:15 -05:00
parent 533db37ebc
commit 83f92a8cba
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packaging/hydra.nix
View file

@ -176,14 +176,14 @@ rec {
# Toggles some settings for better coverage. Windows needs these # Toggles some settings for better coverage. Windows needs these
# library combinations, and Debian build Nix with GNU readline too. # library combinations, and Debian build Nix with GNU readline too.
buildReadlineNoMarkdown = buildReadlineNoLowdown =
let let
components = forAllSystems ( components = forAllSystems (
system: system:
nixpkgsFor.${system}.native.nixComponents2.overrideScope ( nixpkgsFor.${system}.native.nixComponents2.overrideScope (
self: super: { self: super: {
nix-cmd = super.nix-cmd.override { nix-cmd = super.nix-cmd.override {
enableMarkdown = false; enableLowdown = false;
readlineFlavor = "readline"; readlineFlavor = "readline";
}; };
} }

2
src/libcmd/meson.build
View file

@ -35,7 +35,7 @@ deps_public += nlohmann_json
lowdown = dependency( lowdown = dependency(
'lowdown', 'lowdown',
version : '>= 0.9.0', version : '>= 0.9.0',
required : get_option('markdown'), required : get_option('lowdown'),
) )
deps_private += lowdown deps_private += lowdown
configdata.set('HAVE_LOWDOWN', lowdown.found().to_int()) configdata.set('HAVE_LOWDOWN', lowdown.found().to_int())

4
src/libcmd/meson.options
View file

@ -1,9 +1,9 @@
# vim: filetype=meson # vim: filetype=meson
option( option(
'markdown', 'lowdown',
type : 'feature', type : 'feature',
description : 'Enable Markdown rendering in the Nix binary (requires lowdown)', description : 'Use the \'lowdown\' library to display colored Markdown in the terminal',
) )
option( option(

6
src/libcmd/package.nix
View file

@ -19,7 +19,7 @@
version, version,
# Whether to enable Markdown rendering in the Nix binary. # Whether to enable Markdown rendering in the Nix binary.
enableMarkdown ? !stdenv.hostPlatform.isWindows, enableLowdown ? !stdenv.hostPlatform.isWindows,
# Which interactive line editor library to use for Nix's repl. # Which interactive line editor library to use for Nix's repl.
# #
@ -54,7 +54,7 @@ mkMesonLibrary (finalAttrs: {
buildInputs = [ buildInputs = [
({ inherit editline readline; }.${readlineFlavor}) ({ inherit editline readline; }.${readlineFlavor})
] ]
++ lib.optional enableMarkdown lowdown; ++ lib.optional enableLowdown lowdown;
propagatedBuildInputs = [ propagatedBuildInputs = [
nix-util nix-util
@ -67,7 +67,7 @@ mkMesonLibrary (finalAttrs: {
]; ];
mesonFlags = [ mesonFlags = [
(lib.mesonEnable "markdown" enableMarkdown) (lib.mesonEnable "lowdown" enableLowdown)
(lib.mesonOption "readline-flavor" readlineFlavor) (lib.mesonOption "readline-flavor" readlineFlavor)
]; ];