DanilaFe/custom-nix
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix previous commit; add missing files.

Browse Source
This commit is contained in:
Danila Fedorin 2020-04-07 20:54:36 -07:00
parent 243376c2f2
commit c9adce3aad
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
blog/convert.rb
View File

@ -4,7 +4,7 @@ require "nokogiri"
def perform_katex_sub(content) def perform_katex_sub(content)
rendered = content.gsub /\\\(((?:[^\\]|\\[^\)])*)\\\)/ do |match| rendered = content.gsub /\\\(((?:[^\\]|\\[^\)])*)\\\)/ do |match|
puts " Rendering #{$~[1]}" puts " Rendering #{$~[1]}"
Open3.popen3("$(npm bin)/katex") do |i, o, e, t| Open3.popen3("katex") do |i, o, e, t|
i.write $~[1] i.write $~[1]
i.close i.close
o.read.force_encoding(Encoding::UTF_8).strip o.read.force_encoding(Encoding::UTF_8).strip
@ -12,7 +12,7 @@ def perform_katex_sub(content)
end end
rendered = rendered.gsub /\$\$((?:[^\$]|$[^\$])*)\$\$/ do |match| rendered = rendered.gsub /\$\$((?:[^\$]|$[^\$])*)\$\$/ do |match|
puts " Rendering display." puts " Rendering display."
Open3.popen3("$(npm bin)/katex -d") do |i, o, e, t| Open3.popen3("katex -d") do |i, o, e, t|
i.write $~[1] i.write $~[1]
i.close i.close
o.read.force_encoding(Encoding::UTF_8).strip o.read.force_encoding(Encoding::UTF_8).strip

5
blog/default.nix
View File

@ -1,9 +1,10 @@
{ stdenv, hugo, fetchgit, katex, ruby }: { stdenv, hugo, fetchgit, pkgs, nodejs, ruby }:
let let
url = "https://dev.danilafe.com/Web-Projects/blog-static.git"; url = "https://dev.danilafe.com/Web-Projects/blog-static.git";
rev = "7f3883fb3994f8ae1a64446a88b729662c9244dc"; rev = "7f3883fb3994f8ae1a64446a88b729662c9244dc";
sha256 = "065by3rjg7a43dqdl5ib07c0xi86balb5x2l54jqnlh1hz00bd85"; sha256 = "065by3rjg7a43dqdl5ib07c0xi86balb5x2l54jqnlh1hz00bd85";
requiredPackages = import ./required-packages.nix { inherit pkgs nodejs; };
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "blog-static"; name = "blog-static";
@ -13,5 +14,5 @@ in
}; };
builder = ./builder.sh; builder = ./builder.sh;
converter = ./convert.rb; converter = ./convert.rb;
buildInputs = [ hugo katex (ruby.withPackages (ps: [ ps.nokogiri ])) ]; buildInputs = [ hugo requiredPackages.katex (ruby.withPackages (ps: [ ps.nokogiri ])) ];
} }