Roll back submodule-related changes.

Merge branch 'master' of https://dev.danilafe.com/DanilaFe/custom-nix
Update blog URLs.
2021-01-11 04:22:50 +00:00 · 2021-01-11 03:58:51 +00:00 · 2021-01-11 03:58:45 +00:00 · 2021-01-11 03:58:22 +00:00 · 2021-01-10 19:57:22 -08:00 · 2021-01-02 05:41:56 +00:00
4 changed files with 8 additions and 3 deletions
--- a/blog/change_blog_nix.sh
+++ b/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
--- a/blog/convert.rb
+++ b/blog/convert.rb
@@ -32,5 +32,5 @@ files.each do |file|
  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(encoding: 'US-ASCII'))
+  File.write(file, document.to_html(encoding: 'UTF-8'))
 end
--- a/blog/default.nix
+++ b/blog/default.nix
@@ -9,6 +9,7 @@ let
    src = fetchgit {
      inherit url;
      inherit (settings) rev sha256;
+      fetchSubmodules = true;
    };
    urlSub =
      let
@@ -28,8 +29,8 @@ let
      (ruby.withPackages (ps: [ ps.nokogiri ]))
    ];
  };
-  rev = "565d4a695541de1d2c760270adf082e36809c464";
-  sha256 = "0sv23falf3dciapclhl25yf22qi6c26in9zqcl3dvad2v2j7bzbc";
+  rev = "b3ff2fe135fd57a646d5d3271db64886d745ff8c";
+  sha256 = "1nljx2wsc25fciwc5ixmwvf8sx4v9n9brx37dhlr4knsadcp89jy";
  localizationRev = "0b5748cc5a19b5d1d78bfcfa58d4027cc10524dd";
  localizationSha256 = "12pqh534z3ppvgzy0a77s9j1qzzmiyxwvlmh5y76pccf32wvi9wz";
 in
--- a/blog/update_blog.sh
+++ b/blog/update_blog.sh
@@ -0,0 +1 @@
+nix-prefetch-git --rev refs/heads/master https://dev.danilafe.com/Web-Projects/blog-static.git --quiet --fetch-submodules | jq '.rev,.sha256' | xargs ./change_blog_nix.sh
Author	SHA1	Message	Date
Danila Fedorin	b64227d1da	Roll back submodule-related changes.	2021-01-11 04:22:50 +00:00
Danila Fedorin	a8ee845721	Merge branch 'master' of https://dev.danilafe.com/DanilaFe/custom-nix	2021-01-11 03:58:51 +00:00
Danila Fedorin	6f060b01bc	Update blog URLs.	2021-01-11 03:58:45 +00:00
Danila Fedorin	1b5b09dbe1	Fetch git submodules when computing hash.	2021-01-11 03:58:22 +00:00
Danila Fedorin	7aeb03f813	Add code to properly link submodules.	2021-01-10 19:57:22 -08:00
Danila Fedorin	77059e3938	Make sure prefetch clones submodules.	2021-01-02 05:41:56 +00:00
Danila Fedorin	bfdc36dd4a	Add submodules support and update blog.	2021-01-02 05:39:08 +00:00
Danila Fedorin	28fcd6e254	Update blog again.	2021-01-01 05:52:25 +00:00
Danila Fedorin	4e4a894199	Add empty commit.	2020-12-31 02:41:43 +00:00
Danila Fedorin	14f6079c6f	Fix up blog updating script.	2020-12-31 02:35:08 +00:00
Danila Fedorin	93493fd2e9	Use UTF-8 instead of ASCII	2020-12-31 02:29:29 +00:00
Danila Fedorin	3a829d6da5	Add script for automatically updating main blog view.	2020-12-31 02:29:09 +00:00
Danila Fedorin	060674ed31	More blog updates.	2020-12-31 02:28:33 +00:00
				`@@ -0,0 +1 @@`
				`nix-prefetch-git --rev refs/heads/master https://dev.danilafe.com/Web-Projects/blog-static.git --quiet --fetch-submodules \| jq '.rev,.sha256' \| xargs ./change_blog_nix.sh`