diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-09-27 11:10:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-27 11:10:05 +0200 |
| commit | 283e7da470796e9ec24782134cbfcded93f3612b (patch) | |
| tree | 7edc93368802e0c3ee1f2d8962c148d6a3aa4151 | |
| parent | a0bb5c4130268edbd368a4a07d4a30f1064e9c86 (diff) | |
| parent | 32669a6bc95e590c6b3421240b270fda99288a24 (diff) | |
Merge pull request #5292 from edolstra/update-lowdown
Update lowdown
| -rw-r--r-- | flake.lock | 7 | ||||
| -rw-r--r-- | flake.nix | 17 | ||||
| -rw-r--r-- | src/libcmd/markdown.cc | 4 |
3 files changed, 10 insertions, 18 deletions
diff --git a/flake.lock b/flake.lock index d562728e7..c477e7678 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,15 @@ "lowdown-src": { "flake": false, "locked": { - "lastModified": 1628247802, - "narHash": "sha256-4XSXGYvKqogR7bubyqYNwBHYCtrIn6XRGXj6+u+BXNs=", + "lastModified": 1632391204, + "narHash": "sha256-zjyNA4ZmaaIbbmz2JZDqMgY7+P/uGF0nLg28Nxfg5kI=", "owner": "kristapsdz", "repo": "lowdown", - "rev": "b4483d0ef85990f54b864158ab786b4a5b3904fa", + "rev": "0b85e777f3cdacf4210f0d624a0ceec8df612e05", "type": "github" }, "original": { "owner": "kristapsdz", - "ref": "VERSION_0_8_6", "repo": "lowdown", "type": "github" } @@ -2,7 +2,7 @@ description = "The purely functional package manager"; inputs.nixpkgs.url = "nixpkgs/nixos-21.05-small"; - inputs.lowdown-src = { url = "github:kristapsdz/lowdown/VERSION_0_8_6"; flake = false; }; + inputs.lowdown-src = { url = "github:kristapsdz/lowdown"; flake = false; }; outputs = { self, nixpkgs, lowdown-src }: @@ -70,7 +70,7 @@ [ buildPackages.bison buildPackages.flex - (lib.getBin buildPackages.lowdown) + (lib.getBin buildPackages.lowdown-nix) buildPackages.mdbook buildPackages.autoconf-archive buildPackages.autoreconfHook @@ -89,7 +89,7 @@ openssl sqlite libarchive boost - lowdown + lowdown-nix gmock ] ++ lib.optionals stdenv.isLinux [libseccomp] @@ -349,15 +349,8 @@ }; - lowdown = with final; stdenv.mkDerivation rec { - name = "lowdown-0.8.6"; - - /* - src = fetchurl { - url = "https://kristaps.bsd.lv/lowdown/snapshots/${name}.tar.gz"; - hash = "sha512-U9WeGoInT9vrawwa57t6u9dEdRge4/P+0wLxmQyOL9nhzOEUU2FRz2Be9H0dCjYE7p2v3vCXIYk40M+jjULATw=="; - }; - */ + lowdown-nix = with final; stdenv.mkDerivation rec { + name = "lowdown-0.9.0"; src = lowdown-src; diff --git a/src/libcmd/markdown.cc b/src/libcmd/markdown.cc index 737356284..29bb4d31e 100644 --- a/src/libcmd/markdown.cc +++ b/src/libcmd/markdown.cc @@ -25,7 +25,7 @@ std::string renderMarkdownToTerminal(std::string_view markdown) Finally freeDoc([&]() { lowdown_doc_free(doc); }); size_t maxn = 0; - auto node = lowdown_doc_parse(doc, &maxn, markdown.data(), markdown.size()); + auto node = lowdown_doc_parse(doc, &maxn, markdown.data(), markdown.size(), nullptr); if (!node) throw Error("cannot parse Markdown document"); Finally freeNode([&]() { lowdown_node_free(node); }); @@ -40,7 +40,7 @@ std::string renderMarkdownToTerminal(std::string_view markdown) throw Error("cannot allocate Markdown output buffer"); Finally freeBuffer([&]() { lowdown_buf_free(buf); }); - int rndr_res = lowdown_term_rndr(buf, nullptr, renderer, node); + int rndr_res = lowdown_term_rndr(buf, renderer, node); if (!rndr_res) throw Error("allocation error while rendering Markdown"); |