Skip to content

Commit 08e3034

Browse files
douglazdouglaz
committed
chore: added flake and upgraded stuff
1 parent e37fe3b commit 08e3034

File tree

5 files changed

+241
-35
lines changed

5 files changed

+241
-35
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ _cache
1414
_site/
1515
ehthumbs.db
1616
vendor
17+
.gem
1718

1819
# To prevent accidental push of translations from
1920
# Transifex.

‎Gemfile‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
22

33
source "https://rubygems.org"
44

5-
git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
5+
git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
66

7+
gem "jekyll", "~> 4.3"
78
gem "jekyll-paginate"
89
gem "jekyll-sitemap"
910
gem "jekyll-feed"
1011
gem "jekyll-seo-tag"
1112
gem "kramdown-parser-gfm"
1213
gem "webrick", "~> 1.7"
14+
15+
# Future-proofing: these were part of Ruby stdlib but will require gems starting in 3.4
16+
gem "csv"
17+
gem "base64"
18+
gem "bigdecimal"

‎Gemfile.lock‎

Lines changed: 127 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,167 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.7.0)
5-
public_suffix (>= 2.0.2, < 5.0)
4+
addressable (2.8.7)
5+
public_suffix (>= 2.0.2, < 7.0)
6+
base64 (0.2.0)
7+
bigdecimal (3.1.9)
68
colorator (1.1.0)
7-
concurrent-ruby (1.1.8)
8-
em-websocket (0.5.2)
9+
concurrent-ruby (1.3.5)
10+
csv (3.3.3)
11+
em-websocket (0.5.3)
912
eventmachine (>= 0.12.9)
10-
http_parser.rb (~> 0.6.0)
13+
http_parser.rb (~> 0)
1114
eventmachine (1.2.7)
12-
ffi (1.15.0)
15+
ffi (1.17.1)
16+
ffi (1.17.1-aarch64-linux-gnu)
17+
ffi (1.17.1-aarch64-linux-musl)
18+
ffi (1.17.1-arm-linux-gnu)
19+
ffi (1.17.1-arm-linux-musl)
20+
ffi (1.17.1-arm64-darwin)
21+
ffi (1.17.1-x86-linux-gnu)
22+
ffi (1.17.1-x86-linux-musl)
23+
ffi (1.17.1-x86_64-darwin)
24+
ffi (1.17.1-x86_64-linux-gnu)
25+
ffi (1.17.1-x86_64-linux-musl)
1326
forwardable-extended (2.6.0)
14-
http_parser.rb (0.6.0)
15-
i18n (1.8.10)
27+
google-protobuf (4.30.2)
28+
bigdecimal
29+
rake (>= 13)
30+
google-protobuf (4.30.2-aarch64-linux)
31+
bigdecimal
32+
rake (>= 13)
33+
google-protobuf (4.30.2-arm64-darwin)
34+
bigdecimal
35+
rake (>= 13)
36+
google-protobuf (4.30.2-x86-linux)
37+
bigdecimal
38+
rake (>= 13)
39+
google-protobuf (4.30.2-x86_64-darwin)
40+
bigdecimal
41+
rake (>= 13)
42+
google-protobuf (4.30.2-x86_64-linux)
43+
bigdecimal
44+
rake (>= 13)
45+
http_parser.rb (0.8.0)
46+
i18n (1.14.7)
1647
concurrent-ruby (~> 1.0)
17-
jekyll (4.2.0)
48+
jekyll (4.4.1)
1849
addressable (~> 2.4)
50+
base64 (~> 0.2)
1951
colorator (~> 1.0)
52+
csv (~> 3.0)
2053
em-websocket (~> 0.5)
2154
i18n (~> 1.0)
22-
jekyll-sass-converter (~> 2.0)
55+
jekyll-sass-converter (>= 2.0, < 4.0)
2356
jekyll-watch (~> 2.0)
24-
kramdown (~> 2.3)
57+
json (~> 2.6)
58+
kramdown (~> 2.3, >= 2.3.1)
2559
kramdown-parser-gfm (~> 1.0)
2660
liquid (~> 4.0)
27-
mercenary (~> 0.4.0)
61+
mercenary (~> 0.3, >= 0.3.6)
2862
pathutil (~> 0.9)
29-
rouge (~> 3.0)
63+
rouge (>= 3.0, < 5.0)
3064
safe_yaml (~> 1.0)
31-
terminal-table (~> 2.0)
32-
jekyll-feed (0.15.1)
65+
terminal-table (>= 1.8, < 4.0)
66+
webrick (~> 1.7)
67+
jekyll-feed (0.17.0)
3368
jekyll (>= 3.7, < 5.0)
3469
jekyll-paginate (1.1.0)
35-
jekyll-sass-converter (2.1.0)
36-
sassc (> 2.0.1, < 3.0)
37-
jekyll-seo-tag (2.7.1)
70+
jekyll-sass-converter (3.1.0)
71+
sass-embedded (~> 1.75)
72+
jekyll-seo-tag (2.8.0)
3873
jekyll (>= 3.8, < 5.0)
3974
jekyll-sitemap (1.4.0)
4075
jekyll (>= 3.7, < 5.0)
4176
jekyll-watch (2.2.1)
4277
listen (~> 3.0)
43-
kramdown (2.3.1)
44-
rexml
78+
json (2.10.2)
79+
kramdown (2.5.1)
80+
rexml (>= 3.3.9)
4581
kramdown-parser-gfm (1.1.0)
4682
kramdown (~> 2.0)
47-
liquid (4.0.3)
48-
listen (3.5.1)
83+
liquid (4.0.4)
84+
listen (3.9.0)
4985
rb-fsevent (~> 0.10, >= 0.10.3)
5086
rb-inotify (~> 0.9, >= 0.9.10)
5187
mercenary (0.4.0)
5288
pathutil (0.16.2)
5389
forwardable-extended (~> 2.6)
54-
public_suffix (4.0.6)
55-
rb-fsevent (0.10.4)
56-
rb-inotify (0.10.1)
90+
public_suffix (6.0.1)
91+
rake (13.2.1)
92+
rb-fsevent (0.11.2)
93+
rb-inotify (0.11.1)
5794
ffi (~> 1.0)
58-
rexml (3.2.5)
59-
rouge (3.26.0)
95+
rexml (3.4.1)
96+
rouge (4.5.1)
6097
safe_yaml (1.0.5)
61-
sassc (2.4.0)
62-
ffi (~> 1.9)
63-
terminal-table (2.0.0)
64-
unicode-display_width (~> 1.1, >= 1.1.1)
65-
unicode-display_width (1.7.0)
66-
webrick (1.7.0)
98+
sass-embedded (1.86.0)
99+
google-protobuf (~> 4.30)
100+
rake (>= 13)
101+
sass-embedded (1.86.0-aarch64-linux-android)
102+
google-protobuf (~> 4.30)
103+
sass-embedded (1.86.0-aarch64-linux-gnu)
104+
google-protobuf (~> 4.30)
105+
sass-embedded (1.86.0-aarch64-linux-musl)
106+
google-protobuf (~> 4.30)
107+
sass-embedded (1.86.0-aarch64-mingw-ucrt)
108+
google-protobuf (~> 4.30)
109+
sass-embedded (1.86.0-arm-linux-androideabi)
110+
google-protobuf (~> 4.30)
111+
sass-embedded (1.86.0-arm-linux-gnueabihf)
112+
google-protobuf (~> 4.30)
113+
sass-embedded (1.86.0-arm-linux-musleabihf)
114+
google-protobuf (~> 4.30)
115+
sass-embedded (1.86.0-arm64-darwin)
116+
google-protobuf (~> 4.30)
117+
sass-embedded (1.86.0-riscv64-linux-android)
118+
google-protobuf (~> 4.30)
119+
sass-embedded (1.86.0-riscv64-linux-gnu)
120+
google-protobuf (~> 4.30)
121+
sass-embedded (1.86.0-riscv64-linux-musl)
122+
google-protobuf (~> 4.30)
123+
sass-embedded (1.86.0-x86_64-darwin)
124+
google-protobuf (~> 4.30)
125+
sass-embedded (1.86.0-x86_64-linux-android)
126+
google-protobuf (~> 4.30)
127+
sass-embedded (1.86.0-x86_64-linux-gnu)
128+
google-protobuf (~> 4.30)
129+
sass-embedded (1.86.0-x86_64-linux-musl)
130+
google-protobuf (~> 4.30)
131+
terminal-table (3.0.2)
132+
unicode-display_width (>= 1.1.1, < 3)
133+
unicode-display_width (2.6.0)
134+
webrick (1.9.1)
67135

68136
PLATFORMS
137+
aarch64-linux
138+
aarch64-linux-android
139+
aarch64-linux-gnu
140+
aarch64-linux-musl
141+
aarch64-mingw-ucrt
142+
arm-linux-androideabi
143+
arm-linux-gnu
144+
arm-linux-gnueabihf
145+
arm-linux-musl
146+
arm-linux-musleabihf
147+
arm64-darwin
148+
riscv64-linux-android
149+
riscv64-linux-gnu
150+
riscv64-linux-musl
69151
ruby
152+
x86-linux
153+
x86-linux-gnu
154+
x86-linux-musl
155+
x86_64-darwin
156+
x86_64-linux-android
157+
x86_64-linux-gnu
158+
x86_64-linux-musl
70159

71160
DEPENDENCIES
161+
base64
162+
bigdecimal
163+
csv
164+
jekyll (~> 4.3)
72165
jekyll-feed
73166
jekyll-paginate
74167
jekyll-seo-tag
@@ -77,4 +170,4 @@ DEPENDENCIES
77170
webrick (~> 1.7)
78171

79172
BUNDLED WITH
80-
2.1.4
173+
2.5.22

‎flake.lock‎

Lines changed: 61 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
description = "Ruby Bundler dev environment with native extension support";
3+
4+
inputs = {
5+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
6+
flake-utils.url = "github:numtide/flake-utils";
7+
};
8+
9+
outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system:
10+
let
11+
pkgs = nixpkgs.legacyPackages.${system};
12+
bundlerVersion = "2.5.22";
13+
in {
14+
devShells.default = pkgs.mkShell {
15+
name = "ruby-dev";
16+
17+
buildInputs = [
18+
pkgs.ruby_3_3
19+
pkgs.pkg-config
20+
pkgs.openssl
21+
pkgs.zlib
22+
pkgs.libffi
23+
pkgs.makeWrapper
24+
];
25+
26+
shellHook = ''
27+
export GEM_HOME=$PWD/.gem
28+
export PATH=$GEM_HOME/bin:$PATH
29+
30+
if ! gem list -i bundler -v ${bundlerVersion} > /dev/null; then
31+
echo "Installing Bundler ${bundlerVersion} locally..."
32+
gem install bundler -v ${bundlerVersion}
33+
fi
34+
35+
echo "Using Bundler version:"
36+
bundler -v
37+
38+
echo "Running bundle install..."
39+
bundle _${bundlerVersion}_ install || echo "bundle install failed, check above"
40+
'';
41+
42+
};
43+
}
44+
);
45+
}

0 commit comments

Comments
 (0)