diff --git a/Gemfile.lock b/Gemfile.lock index ea119284..c7484df3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,6 +14,7 @@ GEM autoprefixer-rails (10.4.19.0) execjs (~> 2) base64 (0.2.0) + bigdecimal (3.1.8) builder (3.3.0) coderay (1.1.3) colored (1.2) @@ -26,11 +27,13 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - execjs (2.9.1) + execjs (2.10.0) ffi (1.17.0) formatador (1.1.0) - google-protobuf (3.25.5) - guard (2.18.1) + google-protobuf (4.28.3) + bigdecimal + rake (>= 13) + guard (2.19.0) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -57,7 +60,7 @@ GEM concurrent-ruby (~> 1.1) sorted_set (~> 1.0) io-console (0.7.2) - json (2.7.2) + json (2.8.2) json_schema (0.21.0) katex (0.10.0) execjs (~> 2.8) @@ -76,14 +79,14 @@ GEM mime-types (3.6.0) logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.1001) - mini_portile2 (2.8.7) - nanoc (4.12.21) + mime-types-data (3.2024.1105) + mini_portile2 (2.8.8) + nanoc (4.13.2) addressable (~> 2.5) colored (~> 1.2) nanoc-checking (~> 1.0, >= 1.0.2) - nanoc-cli (= 4.12.21) - nanoc-core (= 4.12.21) + nanoc-cli (= 4.13.2) + nanoc-core (= 4.13.2) nanoc-deploying (~> 1.0) parallel (~> 1.12) tty-command (~> 0.8) @@ -91,13 +94,13 @@ GEM nanoc-checking (1.0.5) nanoc-cli (~> 4.12, >= 4.12.5) nanoc-core (~> 4.12, >= 4.12.5) - nanoc-cli (4.12.21) + nanoc-cli (4.13.2) cri (~> 2.15) diff-lcs (~> 1.3) - nanoc-core (= 4.12.21) + nanoc-core (= 4.13.2) pry zeitwerk (~> 2.1) - nanoc-core (4.12.21) + nanoc-core (4.13.2) base64 (~> 0.2) concurrent-ruby (~> 1.1) ddmetrics (~> 1.0) @@ -105,7 +108,6 @@ GEM immutable-ruby (~> 0.1) json_schema (~> 0.19) memo_wise (~> 1.5) - psych (>= 4.0, < 6.0) slow_enumerator_tools (~> 1.0) tty-platform (~> 0.2) zeitwerk (~> 2.1) @@ -113,30 +115,28 @@ GEM nanoc-checking (~> 1.0) nanoc-cli (~> 4.11, >= 4.11.15) nanoc-core (~> 4.11, >= 4.11.15) - nanoc-live (1.0.0) + nanoc-live (1.1.0) adsf-live (~> 1.4) listen (~> 3.0) nanoc-cli (~> 4.11, >= 4.11.14) nanoc-core (~> 4.11, >= 4.11.14) nenv (0.3.0) - nio4r (2.7.3) + nio4r (2.7.4) nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) - ostruct (0.6.0) + ostruct (0.6.1) pandoc-ruby (2.1.10) parallel (1.26.3) pastel (0.8.0) tty-color (~> 0.5) - pry (0.14.2) + pry (0.15.0) coderay (~> 1.1) method_source (~> 1.0) pstore (0.1.3) - psych (5.1.2) - stringio public_suffix (6.0.1) puma (6.4.3) nio4r (~> 2.0) @@ -146,22 +146,21 @@ GEM websocket-driver (>= 0.6.0) racc (1.8.1) rack (3.1.8) - rackup (2.1.0) + rackup (2.2.1) rack (>= 3) - webrick (~> 1.8) rainpress (1.0.1) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) rbtree (0.4.6) - reline (0.5.10) + reline (0.5.11) io-console (~> 0.5) - rexml (3.3.8) + rexml (3.3.9) rubypants (0.7.1) - sass-embedded (1.69.5) - google-protobuf (~> 3.23) - rake (>= 13.0.0) + sass-embedded (1.81.0) + google-protobuf (~> 4.28) + rake (>= 13) sassc (2.4.0) ffi (~> 1.9) set (1.1.0) @@ -170,7 +169,6 @@ GEM sorted_set (1.0.3) rbtree set (~> 1.0) - stringio (3.1.1) terminal-notifier (2.0.0) terminal-notifier-guard (1.7.0) terser (1.2.4) @@ -193,13 +191,12 @@ GEM json (>= 1.8) nokogiri (~> 1.6) rexml (~> 3.2) - webrick (1.8.2) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) words_counted (1.0.3) yui-compressor (0.12.0) - zeitwerk (2.6.18) + zeitwerk (2.7.1) PLATFORMS ruby @@ -236,4 +233,4 @@ DEPENDENCIES yui-compressor BUNDLED WITH - 2.5.20 + 2.5.11 diff --git a/drive b/drive index baa7c173..181aefcc 160000 --- a/drive +++ b/drive @@ -1 +1 @@ -Subproject commit baa7c17361d9a39a1e48bedcec35a8020775bb7d +Subproject commit 181aefcc6c7bf2c9f627445bbb5627ddd9900513 diff --git a/gemset.nix b/gemset.nix index 70c32eda..bcb04822 100644 --- a/gemset.nix +++ b/gemset.nix @@ -16,21 +16,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02aq8802pipig9058abhscj4vgx90qvg22bwzvpvp69vhf8hypak"; + sha256 = "0xay0p2rlknw7ls4zqqbvcfvqylfd6jnjx338qqizymv93hk924n"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.2"; }; adsf-live = { - dependencies = ["adsf" "em-websocket" "eventmachine" "listen" "rack-livereload"]; + dependencies = ["adsf" "em-websocket" "eventmachine" "listen"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pjpc53qj0j0jlh9fp3jvj897pr9vh1885w4ajn19382nz9mrw7w"; + sha256 = "0zy12rl0qhj0cmm1q0bshanz260alrsf9zjplmm8l63ldq7lrryx"; type = "gem"; }; - version = "1.5.0"; + version = "1.5.2"; }; autoprefixer-rails = { dependencies = ["execjs"]; @@ -74,7 +74,7 @@ version = "3.3.0"; }; coderay = { - groups = ["default" "nanoc"]; + groups = ["default" "development" "nanoc"]; platforms = []; source = { remotes = ["https://rubygems.org"]; @@ -169,10 +169,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yywajqlpjhrj1m43s3lfg3i4lkb6pxwccmwps7qw37ndmphdzg8"; + sha256 = "03a590q16nhqvfms0lh42mp6a1i41w41qpdnf39zjbq5y3l8pjvb"; type = "gem"; }; - version = "2.9.1"; + version = "2.10.0"; }; ffi = { groups = ["default" "development" "nanoc"]; @@ -200,10 +200,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0acw51kaavvfkwp748azahlcb3rhv6zjipdlb4nzqcxwcr2vnhb8"; + sha256 = "1d99vyhmyp2n5zd0qmfymzwbcn71dbnwwvc0m4z14msjb7b8dvf0"; type = "gem"; }; - version = "4.28.2"; + version = "4.28.3"; }; guard = { dependencies = ["formatador" "listen" "lumberjack" "nenv" "notiffany" "pry" "shellany" "thor"]; @@ -211,10 +211,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02bwv3396cqsn980a3yzh6l3xm8f7rqjfnphssrajf6m4cxkv2d3"; + sha256 = "0rhnjyb0g2jmy7d8rkf10802f401ii37g2gf10y0vnz3ml0zsh7p"; type = "gem"; }; - version = "2.18.1"; + version = "2.19.0"; }; guard-compat = { groups = ["default" "nanoc"]; @@ -315,10 +315,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q"; + sha256 = "1kw68hs5jfii7p4pkhsd9nxzsmc9xmb6x8vfp1rczbhxr34sckyx"; type = "gem"; }; - version = "2.7.2"; + version = "2.8.2"; }; json_schema = { groups = ["default" "development" "nanoc"]; @@ -415,35 +415,35 @@ version = "1.1.0"; }; mime-types = { - dependencies = ["mime-types-data"]; + dependencies = ["logger" "mime-types-data"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1"; + sha256 = "0r34mc3n7sxsbm9mzyzy8m3dvq7pwbryyc8m452axkj0g2axnwbg"; type = "gem"; }; - version = "3.5.2"; + version = "3.6.0"; }; mime-types-data = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d5bmxcq87nj6h5rx6b1fkdzq8256yba97s2vlkszpwhc47m9rfs"; + sha256 = "1hf4hjldl0rjqxda6lgsg64d5d28nw3s5pacdpnc01a2fjqc2vqz"; type = "gem"; }; - version = "3.2024.0903"; + version = "3.2024.1105"; }; mini_portile2 = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q1f2sdw3y3y9mnym9dhjgsjr72sq975cfg5c4yx7gwv8nmzbvhk"; + sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf"; type = "gem"; }; - version = "2.8.7"; + version = "2.8.8"; }; nanoc = { dependencies = ["addressable" "colored" "nanoc-checking" "nanoc-cli" "nanoc-core" "nanoc-deploying" "parallel" "tty-command" "tty-which"]; @@ -451,10 +451,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jjjsn832d40v2pfkxi1hqqaj4f0zmxq05kf4bgkw20i2i19qpn5"; + sha256 = "14nqxqpx29zcxb48gz0fjpn0x5ssnarbpxnkbvfnxc9jp10xi1s8"; type = "gem"; }; - version = "4.13.0"; + version = "4.13.2"; }; nanoc-checking = { dependencies = ["nanoc-cli" "nanoc-core"]; @@ -473,21 +473,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f2pa16m6zyzrvs83yz4nymy94lj3lwx8wphmiysrwrmc36s2bkq"; + sha256 = "04n9xjs62bpq0440h4xspwbi57kz3kq0459gzsdddn16yan8m07q"; type = "gem"; }; - version = "4.13.0"; + version = "4.13.2"; }; nanoc-core = { - dependencies = ["base64" "concurrent-ruby" "ddmetrics" "ddplugin" "immutable-ruby" "json_schema" "memo_wise" "psych" "slow_enumerator_tools" "tty-platform" "zeitwerk"]; + dependencies = ["base64" "concurrent-ruby" "ddmetrics" "ddplugin" "immutable-ruby" "json_schema" "memo_wise" "slow_enumerator_tools" "tty-platform" "zeitwerk"]; groups = ["default" "development" "nanoc"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xv29mdk38i4ckxxbgvi4ppcpbh7v85nzba0cmpf3h59kdmlsr0v"; + sha256 = "02mg8sm4p01dv9ljp8xxp4nbwl68sr1kyi34xpnf4r8bb2lgn54z"; type = "gem"; }; - version = "4.13.0"; + version = "4.13.2"; }; nanoc-deploying = { dependencies = ["nanoc-checking" "nanoc-cli" "nanoc-core"]; @@ -526,10 +526,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "017nbw87dpr4wyk81cgj8kxkxqgsgblrkxnmmadc77cg9gflrfal"; + sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr"; type = "gem"; }; - version = "2.7.3"; + version = "2.7.4"; }; nokogiri = { dependencies = ["mini_portile2" "racc"]; @@ -558,10 +558,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11dsv71gfbhy92yzj3xkckjzdai2bsz5a4fydgimv62dkz4kc5rv"; + sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; type = "gem"; }; - version = "0.6.0"; + version = "0.6.1"; }; pandoc-ruby = { groups = ["production"]; @@ -596,14 +596,14 @@ }; pry = { dependencies = ["coderay" "method_source"]; - groups = ["default" "nanoc"]; + groups = ["default" "development" "nanoc"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; + sha256 = "0c0rxhgjlyq502q88w65bvg1d42jpcwsk8sqn1qyd24clmg95rwi"; type = "gem"; }; - version = "0.14.2"; + version = "0.15.0"; }; pstore = { groups = ["default"]; @@ -615,17 +615,6 @@ }; version = "0.1.3"; }; - psych = { - dependencies = ["stringio"]; - groups = ["default" "development" "nanoc"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk"; - type = "gem"; - }; - version = "5.1.2"; - }; public_suffix = { groups = ["default"]; platforms = []; @@ -673,32 +662,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12z55b90vvr4sh93az2yfr3fg91jivsag8lcg0k360d99vdq568f"; - type = "gem"; - }; - version = "3.1.7"; - }; - rack-livereload = { - dependencies = ["rack"]; - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gwc4w6n63hdjry4z1v3ws6s55bzh9lh6vb22631jv2dny96bhca"; + sha256 = "1cd13019gnnh2c0a3kj27ij5ibk72v0bmpypqv4l6ayw8g5cpyyk"; type = "gem"; }; - version = "0.5.1"; + version = "3.1.8"; }; rackup = { - dependencies = ["rack" "webrick"]; + dependencies = ["rack"]; groups = ["default" "development"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kbcka30g681cqasw47pq93fxjscq7yvs5zf8lp3740rb158ijvf"; + sha256 = "13brkq5xkj6lcdxj3f0k7v28hgrqhqxjlhd4y2vlicy5slgijdzp"; type = "gem"; }; - version = "2.1.0"; + version = "2.2.1"; }; rainpress = { groups = ["production"]; @@ -757,20 +735,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rl1jmxs7pay58l7lkxkrn6nkdpk52k8rvnfwqsd1swjlxlwjq0n"; + sha256 = "0rfblw8mnk8bwzcpqpan9vpblw4b4pxgdxw206kszjnrpx6mz3c6"; type = "gem"; }; - version = "0.5.10"; + version = "0.5.11"; }; rexml = { groups = ["default" "test"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09shc1dvg88c4yx83d4c9wf26z838nlapa3cmlq8iqdci39a98v2"; + sha256 = "1j9p66pmfgxnzp76ksssyfyqqrg7281dyi3xyknl3wwraaw7a66p"; type = "gem"; }; - version = "3.3.7"; + version = "3.3.9"; }; rubypants = { groups = ["default"]; @@ -788,10 +766,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1443j9q4qlwmvgh0kgwdzq570wf9dy263scsd3cfm4dyfj3wvzy0"; + sha256 = "1dr6kkfch4p2c5414r21ijzxnrs3iid8x0ywzclqxznq0vqlgpax"; type = "gem"; }; - version = "1.79.3"; + version = "1.81.0"; }; sassc = { dependencies = ["ffi"]; @@ -845,16 +823,6 @@ }; version = "1.0.3"; }; - stringio = { - groups = ["default" "development" "nanoc"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak"; - type = "gem"; - }; - version = "3.1.1"; - }; terminal-notifier = { groups = ["development"]; platforms = []; @@ -881,10 +849,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "176swgmwq0cc4z2134x12j9vjvx5y3nrlpbb8p6p0zhsn2wi2cf0"; + sha256 = "10ycg71xmrv64c3nn81ms18h3gsrngb6vfwwcd94mvyyzkh4cpy8"; type = "gem"; }; - version = "1.2.3"; + version = "1.2.4"; }; thor = { groups = ["default" "nanoc"]; @@ -992,16 +960,6 @@ }; version = "1.3.7"; }; - webrick = { - groups = ["default" "development"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "089gy5494j560b242vi173wnbj2913hwlwnjkpzld58r96ilc5s3"; - type = "gem"; - }; - version = "1.8.2"; - }; websocket-driver = { dependencies = ["websocket-extensions"]; groups = ["default"]; @@ -1048,9 +1006,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10cpfdswql21vildiin0q7drg5zfzf2sahnk9hv3nyzzjqwj2bdx"; + sha256 = "0mi7b90hvc6nqv37q27df4i2m27yy56yfy2ki5073474a1h9hi89"; type = "gem"; }; - version = "2.6.18"; + version = "2.7.1"; }; } diff --git a/packages.nix b/packages.nix index 5a487eea..2ab3a644 100644 --- a/packages.nix +++ b/packages.nix @@ -1,5 +1,5 @@ let - rev = "759537f06e6999e141588ff1c9be7f3a5c060106"; + rev = "5e4fbfb6b3de1aa2872b76d49fafc942626e2add"; nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz"; pkgs = import nixpkgs {}; ruby = pkgs.ruby_3_3; @@ -10,6 +10,6 @@ let }; in with pkgs; [ - gems libxml2 nodejs cacert git glibcLocales + gems (lowPrio gems.wrappedRuby) libxml2 nodejs cacert git glibcLocales pandoc (texlive.combine { inherit (texlive) scheme-basic xetex unicode-math enumitem booktabs ulem etoolbox; }) ] ++ (if stdenv.isDarwin then [terminal-notifier] else [chromium]) diff --git a/shell.nix b/shell.nix index b9939d3d..40253742 100644 --- a/shell.nix +++ b/shell.nix @@ -1,6 +1,6 @@ let build-deps = import ./packages.nix; - rev = "759537f06e6999e141588ff1c9be7f3a5c060106"; + rev = "5e4fbfb6b3de1aa2872b76d49fafc942626e2add"; nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz"; pkgs = import nixpkgs {}; in