Start working on converting to Nix flakes.

blog/builder.sh

@@ -1,12 +1,20 @@
 source $stdenv/setup
 
-# Build site with Hugo
+# Copy files to a mutable directory.
 cp -r $src/* .
-hugo --baseUrl="http://localhost:5000"
 
-# Render math in HTML and XML files.
-find public/ -regex "public/.*\.html" | xargs ruby $converter
+# Hugo can't set baseUrl via CLI for multi-lingual hosts.
+# We have to manually edit the configuration.
+sed -i "$urlSub" config.toml
+
+# Build site with Hugo
+hugo $extraFlags
 
 # Output result
 mkdir $out
-cp -r public/* $out/
+cp -r public/$publicPath/* $out/
+
+# Render math in HTML and XML files.
+node $server &
+sleep 1
+find $out/ -regex "$out/.*\.html" | xargs ruby $converter

blog/change_blog_nix.sh

@@ -0,0 +1,3 @@
+echo "New rev: $1"
+echo "New SHA256: $2"
+sed -i "s/rev = \".*\"/rev = \"$1\"/;s/sha256 = \".*\"/sha256 = \"$2\"/" default.nix

blog/convert.rb

@@ -1,33 +1,36 @@
 require "open3"
 require "nokogiri"
+require "net/http"
+require "json"
 
-def perform_katex_sub(content)
+def render_cached(cache, display, string, render_comment = nil)
+  cache.fetch(string) do |new|
+    puts "  Rendering #{render_comment || new}"
+    res = Net::HTTP.post URI("http://localhost:8000/render"),
+      { :equations => [ { :str => string, :display => display } ] }.to_json,
+       "Content-Type" => "application/json"
+    cache[string] = JSON.parse(res.body)[0]
+  end
+end
+
+def perform_katex_sub(inline_cache, display_cache, content)
   rendered = content.gsub /\\\(((?:[^\\]|\\[^\)])*)\\\)/ do |match|
-    puts "  Rendering #{$~[1]}"
-    Open3.popen3("$(npm bin)/katex") do |i, o, e, t|
-      i.write $~[1]
-      i.close
-      o.read.force_encoding(Encoding::UTF_8).strip
-    end
+    render_cached(inline_cache, false, $~[1])
   end
   rendered = rendered.gsub /\$\$((?:[^\$]|$[^\$])*)\$\$/ do |match|
-    puts "  Rendering display."
-    Open3.popen3("$(npm bin)/katex -d") do |i, o, e, t|
-      i.write $~[1]
-      i.close
-      o.read.force_encoding(Encoding::UTF_8).strip
-    end
+    render_cached(display_cache, true, $~[1], "display")
   end
   return rendered
 end
 
 files = ARGV[0..-1]
+inline_cache, display_cache = {}, {}
 
 files.each do |file|
   puts "Rendering file: #{file}"
   document = Nokogiri::HTML.parse(File.open(file))
-  document.search('//text()').each do |t|
-    t.replace(perform_katex_sub(t.content))
+  document.search('//*[not(ancestor-or-self::code)]/text()').each do |t|
+    t.replace(perform_katex_sub(inline_cache, display_cache, t.content))
   end
-  File.write(file, document.to_html)
+  File.write(file, document.to_html(encoding: 'UTF-8'))
 end

blog/default.nix

@@ -1,17 +1,59 @@
-{ stdenv, hugo, fetchgit, katex, ruby }:
+{ blog-source, blog-source-localized, stdenv, lib, hugo, fetchgit, pkgs, nodejs, ruby }:
 
 let
-    url = "https://dev.danilafe.com/Web-Projects/blog-static.git";
-    rev = "7f3883fb3994f8ae1a64446a88b729662c9244dc";
-    sha256 = "065by3rjg7a43dqdl5ib07c0xi86balb5x2l54jqnlh1hz00bd85";
+  url = "https://dev.danilafe.com/Web-Projects/blog-static.git";
+  requiredPackages = import ./required-packages.nix { inherit pkgs nodejs; };
+  website = settings: stdenv.mkDerivation {
+    name = "blog-static";
+    version = settings.source.rev;
+    src = settings.source;
+    urlSub =
+      let
+        regexEscape = lib.escape [ "/" "(" ")" "[" "]" "+" "*" "\\" ];
+      in
+        if (settings ? replaceUrl)
+        then (with settings.replaceUrl; "s/${regexEscape from}/${regexEscape to}/g")
+        else "";
+    publicPath = settings.path;
+    extraFlags = if settings.drafts then " -D " else "";
+    builder = ./builder.sh;
+    converter = ./convert.rb;
+    server = ./katexserver.js;
+    buildInputs = [
+      hugo nodejs
+      requiredPackages."katex-0.11.1" requiredPackages.express requiredPackages.body-parser
+      (ruby.withPackages (ps: [ ps.nokogiri ]))
+    ];
+  };
+  rev = "60eb50737d535e8ec506b877250d0e4bbfbf1bda";
+  sha256 = "1xyppzim3kvawr1bkizwmkbgvb4pxhgnc7gxwjv8sdfcyvbfgz8p";
+  localizationRev = "0b5748cc5a19b5d1d78bfcfa58d4027cc10524dd";
+  localizationSha256 = "12pqh534z3ppvgzy0a77s9j1qzzmiyxwvlmh5y76pccf32wvi9wz";
 in
-    stdenv.mkDerivation {
-        name = "blog-static";
-        version = rev;
-        src = fetchgit {
-            inherit url rev sha256;
-        };
-        builder = ./builder.sh;
-        converter = ./convert.rb;
-        buildInputs = [ hugo katex (ruby.withPackages (ps: [ ps.nokogiri ])) ];
-    }
+  {
+    english = website {
+      source = blog-source;
+      path = ".";
+      drafts = false;
+    };
+    drafts = {
+      english = website {
+	source = blog-source;
+        path = ".";
+        drafts = true;
+        replaceUrl = {
+          from = "https://danilafe.com";
+          to = "http://drafts.danilafe.com";
+        }; 
+      };
+      russian = website {
+        source = blog-source-localized;
+        path = "ru";
+        drafts = true;
+        replaceUrl = {
+          from = "https://ru.danilafe.com";
+          to = "http://drafts.ru.danilafe.com";
+        }; 
+      };
+    };
+  }

blog/katexserver.js

@@ -0,0 +1,11 @@
+const katex = require('katex');
+const express = require('express');
+const bodyParser = require('body-parser');
+
+app = express();
+app.use(bodyParser.json());
+app.post('/render', (req, res) => {
+    res.send(req.body.equations.map(eq =>
+        katex.renderToString(eq.str, { throwOnError: false, displayMode: eq.display })));
+});
+app.listen(8000);

blog/node-packages.nix

@@ -4,6 +4,42 @@
 
 let
   sources = {
+    "accepts-1.3.7" = {
+      name = "accepts";
+      packageName = "accepts";
+      version = "1.3.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz";
+        sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
+      };
+    };
+    "array-flatten-1.1.1" = {
+      name = "array-flatten";
+      packageName = "array-flatten";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz";
+        sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
+      };
+    };
+    "body-parser-1.19.0" = {
+      name = "body-parser";
+      packageName = "body-parser";
+      version = "1.19.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz";
+        sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==";
+      };
+    };
+    "bytes-3.1.0" = {
+      name = "bytes";
+      packageName = "bytes";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz";
+        sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==";
+      };
+    };
     "commander-2.20.3" = {
       name = "commander";
       packageName = "commander";
@@ -13,10 +49,415 @@ let
         sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
+    "content-disposition-0.5.3" = {
+      name = "content-disposition";
+      packageName = "content-disposition";
+      version = "0.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz";
+        sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==";
+      };
+    };
+    "content-type-1.0.4" = {
+      name = "content-type";
+      packageName = "content-type";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz";
+        sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==";
+      };
+    };
+    "cookie-0.4.0" = {
+      name = "cookie";
+      packageName = "cookie";
+      version = "0.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz";
+        sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==";
+      };
+    };
+    "cookie-signature-1.0.6" = {
+      name = "cookie-signature";
+      packageName = "cookie-signature";
+      version = "1.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
+        sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
+      };
+    };
+    "debug-2.6.9" = {
+      name = "debug";
+      packageName = "debug";
+      version = "2.6.9";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz";
+        sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==";
+      };
+    };
+    "depd-1.1.2" = {
+      name = "depd";
+      packageName = "depd";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz";
+        sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9";
+      };
+    };
+    "destroy-1.0.4" = {
+      name = "destroy";
+      packageName = "destroy";
+      version = "1.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz";
+        sha1 = "978857442c44749e4206613e37946205826abd80";
+      };
+    };
+    "ee-first-1.1.1" = {
+      name = "ee-first";
+      packageName = "ee-first";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
+        sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
+      };
+    };
+    "encodeurl-1.0.2" = {
+      name = "encodeurl";
+      packageName = "encodeurl";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz";
+        sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
+      };
+    };
+    "escape-html-1.0.3" = {
+      name = "escape-html";
+      packageName = "escape-html";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz";
+        sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
+      };
+    };
+    "etag-1.8.1" = {
+      name = "etag";
+      packageName = "etag";
+      version = "1.8.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz";
+        sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887";
+      };
+    };
+    "finalhandler-1.1.2" = {
+      name = "finalhandler";
+      packageName = "finalhandler";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz";
+        sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==";
+      };
+    };
+    "forwarded-0.1.2" = {
+      name = "forwarded";
+      packageName = "forwarded";
+      version = "0.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz";
+        sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84";
+      };
+    };
+    "fresh-0.5.2" = {
+      name = "fresh";
+      packageName = "fresh";
+      version = "0.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz";
+        sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7";
+      };
+    };
+    "http-errors-1.7.2" = {
+      name = "http-errors";
+      packageName = "http-errors";
+      version = "1.7.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz";
+        sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==";
+      };
+    };
+    "iconv-lite-0.4.24" = {
+      name = "iconv-lite";
+      packageName = "iconv-lite";
+      version = "0.4.24";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz";
+        sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==";
+      };
+    };
+    "inherits-2.0.3" = {
+      name = "inherits";
+      packageName = "inherits";
+      version = "2.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz";
+        sha1 = "633c2c83e3da42a502f52466022480f4208261de";
+      };
+    };
+    "ipaddr.js-1.9.1" = {
+      name = "ipaddr.js";
+      packageName = "ipaddr.js";
+      version = "1.9.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz";
+        sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==";
+      };
+    };
+    "media-typer-0.3.0" = {
+      name = "media-typer";
+      packageName = "media-typer";
+      version = "0.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
+        sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
+      };
+    };
+    "merge-descriptors-1.0.1" = {
+      name = "merge-descriptors";
+      packageName = "merge-descriptors";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz";
+        sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
+      };
+    };
+    "methods-1.1.2" = {
+      name = "methods";
+      packageName = "methods";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
+        sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
+      };
+    };
+    "mime-1.6.0" = {
+      name = "mime";
+      packageName = "mime";
+      version = "1.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz";
+        sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==";
+      };
+    };
+    "mime-db-1.44.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.44.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz";
+        sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==";
+      };
+    };
+    "mime-types-2.1.27" = {
+      name = "mime-types";
+      packageName = "mime-types";
+      version = "2.1.27";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz";
+        sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==";
+      };
+    };
+    "ms-2.0.0" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
+        sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
+      };
+    };
+    "ms-2.1.1" = {
+      name = "ms";
+      packageName = "ms";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";
+        sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
+      };
+    };
+    "negotiator-0.6.2" = {
+      name = "negotiator";
+      packageName = "negotiator";
+      version = "0.6.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz";
+        sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
+      };
+    };
+    "on-finished-2.3.0" = {
+      name = "on-finished";
+      packageName = "on-finished";
+      version = "2.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
+        sha1 = "20f1336481b083cd75337992a16971aa2d906947";
+      };
+    };
+    "parseurl-1.3.3" = {
+      name = "parseurl";
+      packageName = "parseurl";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz";
+        sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==";
+      };
+    };
+    "path-to-regexp-0.1.7" = {
+      name = "path-to-regexp";
+      packageName = "path-to-regexp";
+      version = "0.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz";
+        sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
+      };
+    };
+    "proxy-addr-2.0.6" = {
+      name = "proxy-addr";
+      packageName = "proxy-addr";
+      version = "2.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz";
+        sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==";
+      };
+    };
+    "qs-6.7.0" = {
+      name = "qs";
+      packageName = "qs";
+      version = "6.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz";
+        sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==";
+      };
+    };
+    "range-parser-1.2.1" = {
+      name = "range-parser";
+      packageName = "range-parser";
+      version = "1.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz";
+        sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";
+      };
+    };
+    "raw-body-2.4.0" = {
+      name = "raw-body";
+      packageName = "raw-body";
+      version = "2.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz";
+        sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==";
+      };
+    };
+    "safe-buffer-5.1.2" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";
+        sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
+      };
+    };
+    "safer-buffer-2.1.2" = {
+      name = "safer-buffer";
+      packageName = "safer-buffer";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";
+        sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==";
+      };
+    };
+    "send-0.17.1" = {
+      name = "send";
+      packageName = "send";
+      version = "0.17.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz";
+        sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==";
+      };
+    };
+    "serve-static-1.14.1" = {
+      name = "serve-static";
+      packageName = "serve-static";
+      version = "1.14.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz";
+        sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==";
+      };
+    };
+    "setprototypeof-1.1.1" = {
+      name = "setprototypeof";
+      packageName = "setprototypeof";
+      version = "1.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz";
+        sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==";
+      };
+    };
+    "statuses-1.5.0" = {
+      name = "statuses";
+      packageName = "statuses";
+      version = "1.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz";
+        sha1 = "161c7dac177659fd9811f43771fa99381478628c";
+      };
+    };
+    "toidentifier-1.0.0" = {
+      name = "toidentifier";
+      packageName = "toidentifier";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz";
+        sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==";
+      };
+    };
+    "type-is-1.6.18" = {
+      name = "type-is";
+      packageName = "type-is";
+      version = "1.6.18";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz";
+        sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
+      };
+    };
+    "unpipe-1.0.0" = {
+      name = "unpipe";
+      packageName = "unpipe";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
+        sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
+      };
+    };
+    "utils-merge-1.0.1" = {
+      name = "utils-merge";
+      packageName = "utils-merge";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz";
+        sha1 = "9f95710f50a267947b2ccc124741c1028427e713";
+      };
+    };
+    "vary-1.1.2" = {
+      name = "vary";
+      packageName = "vary";
+      version = "1.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz";
+        sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
+      };
+    };
   };
 in
 {
-  katex = nodeEnv.buildNodePackage {
+  "katex-0.11.1" = nodeEnv.buildNodePackage {
     name = "katex";
     packageName = "katex";
     version = "0.11.1";
@@ -37,4 +478,117 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  express = nodeEnv.buildNodePackage {
+    name = "express";
+    packageName = "express";
+    version = "4.17.1";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz";
+      sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==";
+    };
+    dependencies = [
+      sources."accepts-1.3.7"
+      sources."array-flatten-1.1.1"
+      sources."body-parser-1.19.0"
+      sources."bytes-3.1.0"
+      sources."content-disposition-0.5.3"
+      sources."content-type-1.0.4"
+      sources."cookie-0.4.0"
+      sources."cookie-signature-1.0.6"
+      sources."debug-2.6.9"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
+      sources."ee-first-1.1.1"
+      sources."encodeurl-1.0.2"
+      sources."escape-html-1.0.3"
+      sources."etag-1.8.1"
+      sources."finalhandler-1.1.2"
+      sources."forwarded-0.1.2"
+      sources."fresh-0.5.2"
+      sources."http-errors-1.7.2"
+      sources."iconv-lite-0.4.24"
+      sources."inherits-2.0.3"
+      sources."ipaddr.js-1.9.1"
+      sources."media-typer-0.3.0"
+      sources."merge-descriptors-1.0.1"
+      sources."methods-1.1.2"
+      sources."mime-1.6.0"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
+      sources."ms-2.0.0"
+      sources."negotiator-0.6.2"
+      sources."on-finished-2.3.0"
+      sources."parseurl-1.3.3"
+      sources."path-to-regexp-0.1.7"
+      sources."proxy-addr-2.0.6"
+      sources."qs-6.7.0"
+      sources."range-parser-1.2.1"
+      sources."raw-body-2.4.0"
+      sources."safe-buffer-5.1.2"
+      sources."safer-buffer-2.1.2"
+      (sources."send-0.17.1" // {
+        dependencies = [
+          sources."ms-2.1.1"
+        ];
+      })
+      sources."serve-static-1.14.1"
+      sources."setprototypeof-1.1.1"
+      sources."statuses-1.5.0"
+      sources."toidentifier-1.0.0"
+      sources."type-is-1.6.18"
+      sources."unpipe-1.0.0"
+      sources."utils-merge-1.0.1"
+      sources."vary-1.1.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Fast, unopinionated, minimalist web framework";
+      homepage = http://expressjs.com/;
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
+  body-parser = nodeEnv.buildNodePackage {
+    name = "body-parser";
+    packageName = "body-parser";
+    version = "1.19.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz";
+      sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==";
+    };
+    dependencies = [
+      sources."bytes-3.1.0"
+      sources."content-type-1.0.4"
+      sources."debug-2.6.9"
+      sources."depd-1.1.2"
+      sources."ee-first-1.1.1"
+      sources."http-errors-1.7.2"
+      sources."iconv-lite-0.4.24"
+      sources."inherits-2.0.3"
+      sources."media-typer-0.3.0"
+      sources."mime-db-1.44.0"
+      sources."mime-types-2.1.27"
+      sources."ms-2.0.0"
+      sources."on-finished-2.3.0"
+      sources."qs-6.7.0"
+      sources."raw-body-2.4.0"
+      sources."safer-buffer-2.1.2"
+      sources."setprototypeof-1.1.1"
+      sources."statuses-1.5.0"
+      sources."toidentifier-1.0.0"
+      sources."type-is-1.6.18"
+      sources."unpipe-1.0.0"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "Node.js body parsing middleware";
+      homepage = "https://github.com/expressjs/body-parser#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
 }

blog/packages.json

@@ -1,3 +1,3 @@
 [
-    "katex"
+	{"katex": "0.11.1"}, "express", "body-parser"
 ]

blog/update_blog.sh

@@ -0,0 +1 @@
+nix-prefetch-git --rev refs/heads/master https://dev.danilafe.com/Web-Projects/blog-static.git --quiet | jq '.rev,.sha256' | xargs ./change_blog_nix.sh

custom-crystal/default.nix

@@ -0,0 +1,25 @@
+{ stdenv, lib, linkFarm, fetchgit, fetchFromGitHub }:
+
+{ crystal,
+  gitShardsFile ? null,
+  lockFile ? null,
+  shardsFile ? null, ...}@args:
+
+let
+    buildArgs = builtins.removeAttrs args [ "crystal" ];
+    githubLinks = lib.mapAttrsToList (name: value: {
+        inherit name;
+        path = fetchFromGitHub value;
+    }) (import shardsFile);
+    gitLinks = lib.mapAttrsToList (name: value: {
+        inherit name;
+	path = fetchgit { inherit (value) url rev sha256; };
+    }) (import gitShardsFile);
+    crystalLib = linkFarm "crystal-lib" (githubLinks ++ gitLinks);
+    configurePhase = args.configurePhase or lib.concatStringsSep "\n" ([
+        "runHook preConfigure"
+    ] ++ lib.optional (lockFile != null)   "ln -s ${lockFile} ./shard.lock"
+        ++ lib.optional (shardsFile != null) "ln -s ${crystalLib} lib"
+	++ [ "runHook postConfigure "]);
+in
+    crystal.buildCrystalPackage (buildArgs // { inherit configurePhase; })

flake.nix

@@ -0,0 +1,49 @@
+{
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs";
+    flake-utils.url = "github:numtide/flake-utils";
+    blog-source = {
+      flake = false;
+      url = "https://dev.danilafe.com/Web-Projects/blog-static.git";
+      type = "git";
+      submodules = true;
+    };
+    blog-source-localized = {
+      flake = false;
+      url = "https://dev.danilafe.com/Web-Projects/blog-static.git";
+      ref = "localization";
+      type = "git";
+      submodules = true;
+    };
+    pegasus-source = {
+      url = "github:DanilaFe/pegasus";
+      flake = false;
+    };
+    pupper-bot-source = {
+      url = "git+https://dev.danilafe.com/Crystal-Bots/joann-pupper-bot";
+      flake = false;
+    };
+  };
+
+  outputs = { self, pupper-bot-source, pegasus-source, blog-source, blog-source-localized, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem
+      (system:
+        let
+          pkgs = import nixpkgs { inherit system; };
+            pegasus = pkgs.callPackage ./pegasus/default.nix {
+            inherit pegasus-source;
+          };
+          blog = pkgs.callPackage ./blog/default.nix {
+            inherit blog-source blog-source-localized;
+          };
+        in
+          {
+            packages = {
+              inherit pegasus;
+              blogEnglish = blog.english;
+              blogEnglishDrafts = blog.drafts.english;
+              blogRussianDrafts = blog.drafts.russian;
+            };
+          }
+      );
+}

joann-pupper-bot/default.nix

@@ -0,0 +1,16 @@
+{ stdenv, fetchgit, crystal, customCrystal, sqlite, openssl, pkg-config }:
+let
+    url = "https://dev.danilafe.com/Crystal-Bots/joann-pupper-bot";
+    rev = "8d90b052a001a6101dc691a907a16de4fb0a26ee";
+    sha256 = "0r2xyfqj9v73y9il90f2mp2x5h79nbv4yhfsh79kn1w0li6nlx3s";
+in
+    customCrystal {
+	inherit crystal;
+        pname = "joann-pupper-bot";
+	version = rev;
+	src = fetchgit { inherit url rev sha256; };
+	shardsFile = ./shards.nix;
+	gitShardsFile = ./git-shards.nix;
+	crystalBinaries.joann-pupper-bot.src = "src/joann-pupper-bot.cr";
+	buildInputs = [ sqlite openssl pkg-config ];
+    }

joann-pupper-bot/git-shards.nix

@@ -0,0 +1,7 @@
+{
+    telepathy = {
+        url = "https://dev.danilafe.com/Crystal-Bots/telepathy";
+	rev = "v0.1.2";
+	sha256 = "1vis5ncfdjapxqm2q39bd0iwqrkim2wbn84xi3fydshhpkznqh88";
+    };
+}

joann-pupper-bot/shards.nix

@@ -0,0 +1,26 @@
+{
+  cron_parser = {
+    owner = "kostya";
+    repo = "cron_parser";
+    rev = "v0.3.0";
+    sha256 = "0ss5zhlvq8kcmc8j2msigpayrx0nys44j66d6smdnql06bncrm13";
+  };
+  cron_scheduler = {
+    owner = "kostya";
+    repo = "cron_scheduler";
+    rev = "v0.3.0";
+    sha256 = "15lk8x7p5nq388ll7g5al9mflr1723kj6akrj9fadqf9535i6rqc";
+  };
+  db = {
+    owner = "crystal-lang";
+    repo = "crystal-db";
+    rev = "v0.9.0";
+    sha256 = "0am5njx9g0m7lqmzs4qpgrnqq2pl9yb9h6jfrwgarx15c4jdrrzd";
+  };
+  sqlite3 = {
+    owner = "crystal-lang";
+    repo = "crystal-sqlite3";
+    rev = "v0.16.0";
+    sha256 = "1kqbp642gskffwpa98l08s3chx0d49wngjsh0ax7pbjn9kgf7sq5";
+  };
+}

overlay.nix

@@ -1,6 +1,7 @@
 self: super:
 
 {
-    pegasus = super.callPackage ./pegasus/default.nix {};
+    pegasus = super.callPackage ./pegasus/default.nix { crystal = super.crystal_0_31; };
     blog = super.callPackage ./blog/default.nix {};
+    customCrystal = super.callPackage ./custom-crystal/default.nix {};
 }

pegasus/default.nix

@@ -1,18 +1,12 @@
-{ stdenv, crystal, fetchFromGitHub }:
-
-let
-    version = "0489d47b191ecf8501787355b948801506e7c70f";
-    src = fetchFromGitHub {
-        owner = "DanilaFe";
-        repo = "pegasus";
-        rev = version;
-        sha256 = "097m7l16byis07xlg97wn5hdsz9k6c3h1ybzd2i7xhkj24kx230s";
-    };
-in
+{ pegasus-source, stdenv, crystal, fetchFromGitHub }:
     crystal.buildCrystalPackage {
         pname = "pegasus";
-        inherit version;
-        inherit src;
+	src = pegasus-source;
+	version = pegasus-source.rev;
+	format = "crystal";
+
+        # Programs don't do so well when running --help
+	installCheckPhase = "";
 
         crystalBinaries.pegasus.src = "src/pegasus.cr";
         crystalBinaries.pegasus-dot.src = "src/tools/dot/pegasus_dot.cr";