1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-17 16:02:43 +01:00
nix/src/libcmd
Sergei Trofimovich bead70acc2 libcmd: update to support lowdown-1.4 API
Upstream change
bab1d75079
moved a few fields from `lowdown_opts` toa  new `lowdown_opts_term`
struct. As a result the build started failing as:

    nix-cmd> [2/17] Compiling C++ object libnixcmd.so.p/markdown.cc.o
    nix-cmd> FAILED: libnixcmd.so.p/markdown.cc.o
    nix-cmd> g++ -Ilibnixcmd.so.p -I. -I.. -I/nix/store/b0bnrk5lacxbpgxgnc28r8q3wcazrgxj-nix-util-2.26.0pre-dev/include/nix -I/nix/store/cxnynq9ykyj4xxv6wf6dw7r0aw5x6n9k-libarchive-3.7.7-dev/include -I/nix/store/bfgjwkcb8snkizx578rzdahi75m8zyh4-nlohmann_json-3.11.3/include -I/nix/store/3sx8bq3sip6j2nv1m5xx4gbdp33v7iy6-nix-store-2.26.0pre-dev/include/nix -I/nix/store/sih2dgqzvsbv7p510lkfmas7s7wbsl4j-nix-fetchers-2.26.0pre-dev/include/nix -I/nix/store/68p8s20fsiiakj7nys7grbaixfnhsdzs-nix-expr-2.26.0pre-dev/include/nix -I/nix/store/gw7wknhzhfzzj9zww2kyi5xrzgf1ndki-boehm-gc-8.2.8-dev/include -I/nix/store/3jwb9j4vnsk5saq3wfyyp9il3mhs41l9-nix-flake-2.26.0pre-dev/include/nix -I/nix/store/8nwjvmq7m48v8g646jrxkikv6x47bc3m-nix-main-2.26.0pre-dev/include/nix -I/nix/store/rb0hzsw5wc1a7daizhpj824mbxlvijrq-lowdown-1.4.0-dev/include -I/nix/store/m388ywpk53fsp8r98brfd7nf1f5sskv0-editline-1.17.1-dev/include -fdiagnostics-color=always -D_GLIBCXX_ASSERTIONS=1 -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -std=c++2a -include config-util.hh -include config-store.hh -include config-expr.hh -include config-main.hh -include config-cmd.hh -Wdeprecated-copy -Werror=suggest-override -Werror=switch -Werror=switch-enum -Werror=unused-result -Wignored-qualifiers -Wimplicit-fallthrough -Wno-deprecated-declarations -O3 -fPIC -pthread -std=c++2a -std=c++2a -std=c++2a -std=c++2a -std=c++2a -std=c++2a -MD -MQ libnixcmd.so.p/markdown.cc.o -MF libnixcmd.so.p/markdown.cc.o.d -o libnixcmd.so.p/markdown.cc.o -c ../markdown.cc
    nix-cmd> ../markdown.cc: In function 'std::string nix::doRenderMarkdownToTerminal(std::string_view)':
    nix-cmd> ../markdown.cc:28:5: error: 'lowdown_opts' has no non-static data member named 'cols'
    nix-cmd>    28 |     };
    nix-cmd>       |     ^

The change adds version-based conditional to support both pre-1.4 and
1.4 forms of the initialization.

Closes: https://github.com/NixOS/nix/issues/12113
(cherry picked from commit edbfe863ce)
2025-01-10 09:43:18 +00:00
..
.version Package libnixmain and libnixcmd with Meson 2024-07-05 16:40:55 -04:00
build-utils-meson Rename file to avoid reserved name 2024-07-02 09:26:22 -04:00
built-path.cc Remove comparator.hh and switch to <=> in a bunch of places 2024-07-12 14:54:18 -04:00
built-path.hh Remove comparator.hh and switch to <=> in a bunch of places 2024-07-12 14:54:18 -04:00
command-installable-value.cc Finish converting existing comments for internal API docs (#8146) 2023-04-07 13:55:28 +00:00
command-installable-value.hh Ensure all headers have #pragma once and are in API docs 2023-03-31 23:19:44 -04:00
command.cc chore: run formatters 2024-11-04 14:41:40 +01:00
command.hh chore: run formatters 2024-11-04 14:41:40 +01:00
common-eval-args.cc More support for std::filepath in libnixutil 2024-08-26 17:23:56 -04:00
common-eval-args.hh No global settings in libnixfetchers and libnixflake 2024-07-12 08:50:28 -04:00
compatibility-settings.hh Edit CompatibilitySettings 2024-07-11 13:59:49 +02:00
editor-for.cc Get rid of CanonPath::fromCwd 2024-02-08 11:01:41 -05:00
editor-for.hh Combine AbstractPos, PosAdapter, and Pos 2024-01-08 10:59:41 -08:00
installable-attr-path.cc Fix empty outputsToInstall for InstallableAttrPath 2024-06-02 14:26:18 +03:00
installable-attr-path.hh Split up util.{hh,cc} 2023-11-05 12:20:02 -05:00
installable-derived-path.cc Remove warning that interpretation of .drv has changed 2024-11-26 11:27:41 +00:00
installable-derived-path.hh Ensure all headers have #pragma once and are in API docs 2023-03-31 23:19:44 -04:00
installable-flake.cc language: cleanly ban integer overflows 2024-07-30 18:13:05 -07:00
installable-flake.hh fix(treewide): move arguments where needed 2024-11-08 20:10:38 +03:00
installable-value.cc fetchToStore(): Don't always respect settings.readOnlyMode 2024-02-20 11:46:49 +01:00
installable-value.hh fix(treewide): move arguments where needed 2024-11-08 20:10:38 +03:00
installables.cc refactor(treewide): reserve vector capacity when final size is known 2024-11-09 22:40:49 +03:00
installables.hh DerivationInfo -> PackageInfo 2024-01-16 15:28:03 +01:00
legacy.cc Move command plugin interface to libnixcmd 2021-01-26 06:22:24 -05:00
legacy.hh Ensure all headers have #pragma once and are in API docs 2023-03-31 23:19:44 -04:00
local.mk Revert "Merge pull request #11804 from obsidiansystems/remove-old-make" 2024-11-07 13:46:37 +01:00
markdown.cc libcmd: update to support lowdown-1.4 API 2025-01-10 09:43:18 +00:00
markdown.hh markdown.hh: Improve includes 2024-07-24 12:54:40 +02:00
meson.build libcmd: update to support lowdown-1.4 API 2025-01-10 09:43:18 +00:00
meson.options Package libnixmain and libnixcmd with Meson 2024-07-05 16:40:55 -04:00
misc-store-flags.cc Document store object content addressing & improve JSON format 2024-05-20 09:34:35 -04:00
misc-store-flags.hh nix hash path, and preperatory refactors 2024-02-21 12:11:25 -05:00
network-proxy.cc Fix format 2024-07-02 09:26:22 -04:00
network-proxy.hh Honor the same set of proxy environment variables (#10611) 2024-05-06 15:39:22 -04:00
nix-cmd.pc.in Revert "Merge pull request #11804 from obsidiansystems/remove-old-make" 2024-11-07 13:46:37 +01:00
package.nix packaging: Add mkMeson{Library,Executable} 2024-10-13 23:17:54 +02:00
repl-interacter.cc libcmd: do not compile editline helpers when building w/ readline 2024-07-28 11:40:16 +02:00
repl-interacter.hh refactor: repl prompts are now the job of the interacter 2024-03-12 18:25:35 -07:00
repl.cc Merge pull request #11682 from NaN-git/opt-str 2024-10-12 10:59:40 +02:00
repl.hh Move NIX_BIN_DIR and all logic using it to the Nix executable itself 2024-08-12 12:29:17 -04:00