c8h4/aux-search
1
0
Fork 0
Code Issues Pull requests Packages Releases Activity

flake-info: update manpage filter (#597)

Browse source 
Update the nixpkgs input and use the new link-manpages filter to avoid
duplicated links.

Co-authored-by: Rok Garbas <rok@garbas.si>
This commit is contained in:
Naïm Favier 2023-01-27 18:50:29 +01:00 committed by GitHub
parent a7ac1d8e8c
commit 651ef6fc62
Failed to generate hash of commit
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
flake-info/default.nix
View file

@ -23,7 +23,8 @@ pkgs.rustPlatform.buildRustPackage rec {
checkInputs = with pkgs; [ pandoc ];
ROOTDIR = builtins.placeholder "out";
NIXPKGS_PANDOC_FILTERS_PATH = "${pkgs.path + "/doc/build-aux/pandoc-filters"}";
NIXPKGS_PANDOC_FILTERS_PATH = pkgs.path + "/doc/build-aux/pandoc-filters";
LINK_MANPAGES_PANDOC_FILTER = import (pkgs.path + "/doc/build-aux/pandoc-filters/link-manpages.nix") { inherit pkgs; };
checkFlags = [
"--skip elastic::tests"

3
flake-info/src/data/pandoc.rs
View file

@ -10,8 +10,7 @@ lazy_static! {
Path::new(FILTERS_PATH).join("docbook-reader/citerefentry-to-rst-role.lua");
static ref MARKDOWN_ROLES_FILTER: PathBuf =
Path::new(FILTERS_PATH).join("myst-reader/roles.lua");
static ref MANPAGE_LINK_FILTER: PathBuf =
Path::new(FILTERS_PATH).join("link-unix-man-references.lua");
static ref MANPAGE_LINK_FILTER: PathBuf = PathBuf::from(env!("LINK_MANPAGES_PANDOC_FILTER"));
static ref XREF_FILTER: PathBuf = crate::DATADIR.join("data/fix-xrefs.lua");
}

6
flake.lock
View file

@ -33,11 +33,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1667629849,
"narHash": "sha256-P+v+nDOFWicM4wziFK9S/ajF2lc0N2Rg9p6Y35uMoZI=",
"lastModified": 1673315479,
"narHash": "sha256-GNCFRtDHjTygXGJp/H+f2XQPMGxpYSmNiibIqYzihtM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3bacde6273b09a21a8ccfba15586fb165078fb62",
"rev": "c07552f6f7d4eead7806645ec03f7f1eb71ba6bd",
"type": "github"
},
"original": {

2
flake.nix
View file

@ -101,6 +101,7 @@
extraShellHook = ''
export RUST_SRC_PATH="${pkgs.rustPlatform.rustLibSrc}";
export NIXPKGS_PANDOC_FILTERS_PATH="${packages.flake-info.NIXPKGS_PANDOC_FILTERS_PATH}";
export LINK_MANPAGES_PANDOC_FILTER="${packages.flake-info.LINK_MANPAGES_PANDOC_FILTER}";
export PATH=$PWD/frontend/node_modules/.bin:$PATH
'';
};
@ -111,6 +112,7 @@
extraShellHook = ''
export RUST_SRC_PATH="${pkgs.rustPlatform.rustLibSrc}";
export NIXPKGS_PANDOC_FILTERS_PATH="${packages.flake-info.NIXPKGS_PANDOC_FILTERS_PATH}";
export LINK_MANPAGES_PANDOC_FILTER="${packages.flake-info.LINK_MANPAGES_PANDOC_FILTER}";
'';
};