Skip to content

Commit 38a3e52

Browse files
thomasjmthomasjm
committed
Bump iruby to v0.8.0, closes #68 
1 parent 6e16d94 commit 38a3e52

File tree

6 files changed

+119
-31
lines changed

6 files changed

+119
-31
lines changed

‎modules/kernels/ruby/default.nix

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,15 @@ let
3232
++ lib.optionals settings.lsp.solargraph.enable [(callPackage ./solargraph.nix { rubyPackages = packageOptions; inherit kernelName; })]
3333
;
3434

35+
iruby = (callPackage ./iruby { inherit ruby; }).iruby;
36+
3537
in
3638

3739
symlinkJoin {
3840
name = "ruby";
3941
paths = [
4042
(callPackage ./kernel.nix {
41-
iruby = (callPackage ./iruby { inherit ruby; }).iruby;
43+
inherit iruby;
4244
inherit attrs extensions version;
4345
})
4446
ruby
@@ -57,6 +59,7 @@ symlinkJoin {
5759
versions = {
5860
ruby = builtins.toString ruby.version;
5961
solargraph = packageOptions.solargraph.version;
62+
iruby = iruby.version;
6063
};
6164
inherit packageOptions packageSearch;
6265
inherit settingsSchema settings;

‎modules/kernels/ruby/iruby/Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
source 'https://rubygems.org'
2-
gem 'iruby', "0.7.3"
2+
gem 'iruby', "0.8.0"

‎modules/kernels/ruby/iruby/Gemfile.lock

+21-11
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,42 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
data_uri (0.1.0)
5-
ffi (1.15.5)
5+
ffi (1.17.0)
66
ffi-rzmq (2.0.7)
77
ffi-rzmq-core (>= 1.0.7)
88
ffi-rzmq-core (1.0.7)
99
ffi
10-
io-console (0.5.11)
11-
irb (1.4.1)
12-
reline (>= 0.3.0)
13-
iruby (0.7.3)
10+
io-console (0.7.2)
11+
irb (1.14.1)
12+
rdoc (>= 4.0.0)
13+
reline (>= 0.4.2)
14+
iruby (0.8.0)
1415
data_uri (~> 0.1)
1516
ffi-rzmq
1617
irb
18+
logger
1719
mime-types (>= 3.3.1)
1820
multi_json (~> 1.11)
19-
mime-types (3.4.1)
21+
native-package-installer
22+
logger (1.6.1)
23+
mime-types (3.5.2)
2024
mime-types-data (~> 3.2015)
21-
mime-types-data (3.2022.0105)
25+
mime-types-data (3.2024.0903)
2226
multi_json (1.15.0)
23-
reline (0.3.1)
27+
native-package-installer (1.1.9)
28+
psych (5.1.2)
29+
stringio
30+
rdoc (6.7.0)
31+
psych (>= 4.0.0)
32+
reline (0.5.10)
2433
io-console (~> 0.5)
34+
stringio (3.1.1)
2535

2636
PLATFORMS
27-
x86_64-linux
37+
ruby
2838

2939
DEPENDENCIES
30-
iruby (= 0.7.3)
40+
iruby (= 0.8.0)
3141

3242
BUNDLED WITH
33-
2.2.24
43+
2.5.16

‎modules/kernels/ruby/iruby/default.nix

+6-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ let
1818
irubySrc = fetchFromGitHub {
1919
owner = "SciRuby";
2020
repo = "iruby";
21-
rev = "146ada216685d3eb9b35fe9c5e2b6c3f2cf707f9";
22-
sha256 = "0fc8slrfapvajnfnw76x31g5s5p9vxhbl85smfh8p39nqkh0cs6g";
21+
rev = "fe16c1b6de2463d5c5552dd64b0645bf930b5834";
22+
hash = "sha256-ukS1s419xggzu/wNJkk/0GOtTHLssizDZrgEMETpfeM=";
2323
};
2424

2525
iruby = (bundlerApp.override { inherit ruby; }) {
@@ -29,6 +29,10 @@ let
2929

3030
# buildInputs = [ zeromq libtool ];
3131

32+
passthru = {
33+
version = "v0.8.0";
34+
};
35+
3236
meta = with lib; {
3337
description = "Ruby kernel for Jupyter";
3438
homepage = "https://github.com/SciRuby/iruby";

‎modules/kernels/ruby/iruby/gemset.nix

+68-16
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
platforms = [];
1515
source = {
1616
remotes = ["https://rubygems.org"];
17-
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
17+
sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
1818
type = "gem";
1919
};
20-
version = "1.15.5";
20+
version = "1.17.0";
2121
};
2222
ffi-rzmq = {
2323
dependencies = ["ffi-rzmq-core"];
@@ -46,53 +46,63 @@
4646
platforms = [];
4747
source = {
4848
remotes = ["https://rubygems.org"];
49-
sha256 = "0r9kxrf9jccrr329pa3s37rf16vy426cbqmfwxkav1fidwvih93y";
49+
sha256 = "08d2lx42pa8jjav0lcjbzfzmw61b8imxr9041pva8xzqabrczp7h";
5050
type = "gem";
5151
};
52-
version = "0.5.11";
52+
version = "0.7.2";
5353
};
5454
irb = {
55-
dependencies = ["reline"];
55+
dependencies = ["rdoc" "reline"];
5656
groups = ["default"];
5757
platforms = [];
5858
source = {
5959
remotes = ["https://rubygems.org"];
60-
sha256 = "1a7hkcvnyfcmzxz36qnfk84grl7m4xrv2vzg5pyhzqwxmgcrhrja";
60+
sha256 = "1y40dv3caswr81dlsyln6vnmmpzf5jcal2rqjbsglvnkb0xh0xar";
6161
type = "gem";
6262
};
63-
version = "1.4.1";
63+
version = "1.14.1";
6464
};
6565
iruby = {
66-
dependencies = ["data_uri" "ffi-rzmq" "irb" "mime-types" "multi_json"];
66+
dependencies = ["data_uri" "ffi-rzmq" "irb" "logger" "mime-types" "multi_json" "native-package-installer"];
6767
groups = ["default"];
6868
platforms = [];
6969
source = {
7070
remotes = ["https://rubygems.org"];
71-
sha256 = "1hwgdsnzmv5qhnrfxrd14di7arz5wgm5h94sn9xbcs210b39vm04";
71+
sha256 = "1nvn52ailvk6cl100s9vryamhi7cj06bdfmadps4q57690bwp2rh";
7272
type = "gem";
7373
};
74-
version = "0.7.3";
74+
version = "0.8.0";
75+
};
76+
logger = {
77+
groups = ["default"];
78+
platforms = [];
79+
source = {
80+
remotes = ["https://rubygems.org"];
81+
sha256 = "0lwncq2rf8gm79g2rcnnyzs26ma1f4wnfjm6gs4zf2wlsdz5in9s";
82+
type = "gem";
83+
};
84+
version = "1.6.1";
7585
};
7686
mime-types = {
7787
dependencies = ["mime-types-data"];
7888
groups = ["default"];
7989
platforms = [];
8090
source = {
8191
remotes = ["https://rubygems.org"];
82-
sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
92+
sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1";
8393
type = "gem";
8494
};
85-
version = "3.4.1";
95+
version = "3.5.2";
8696
};
8797
mime-types-data = {
8898
groups = ["default"];
8999
platforms = [];
90100
source = {
91101
remotes = ["https://rubygems.org"];
92-
sha256 = "003gd7mcay800k2q4pb2zn8lwwgci4bhi42v2jvlidm8ksx03i6q";
102+
sha256 = "0d5bmxcq87nj6h5rx6b1fkdzq8256yba97s2vlkszpwhc47m9rfs";
93103
type = "gem";
94104
};
95-
version = "3.2022.0105";
105+
version = "3.2024.0903";
96106
};
97107
multi_json = {
98108
groups = ["default"];
@@ -104,15 +114,57 @@
104114
};
105115
version = "1.15.0";
106116
};
117+
native-package-installer = {
118+
groups = ["default"];
119+
platforms = [];
120+
source = {
121+
remotes = ["https://rubygems.org"];
122+
sha256 = "0bvr9q7qwbmg9jfg85r1i5l7d0yxlgp0l2jg62j921vm49mipd7v";
123+
type = "gem";
124+
};
125+
version = "1.1.9";
126+
};
127+
psych = {
128+
dependencies = ["stringio"];
129+
groups = ["default"];
130+
platforms = [];
131+
source = {
132+
remotes = ["https://rubygems.org"];
133+
sha256 = "0s5383m6004q76xm3lb732bp4sjzb6mxb6rbgn129gy2izsj4wrk";
134+
type = "gem";
135+
};
136+
version = "5.1.2";
137+
};
138+
rdoc = {
139+
dependencies = ["psych"];
140+
groups = ["default"];
141+
platforms = [];
142+
source = {
143+
remotes = ["https://rubygems.org"];
144+
sha256 = "0ygk2zk0ky3d88v3ll7qh6xqvbvw5jin0hqdi1xkv1dhaw7myzdi";
145+
type = "gem";
146+
};
147+
version = "6.7.0";
148+
};
107149
reline = {
108150
dependencies = ["io-console"];
109151
groups = ["default"];
110152
platforms = [];
111153
source = {
112154
remotes = ["https://rubygems.org"];
113-
sha256 = "1izlsziflj70kgwfy2d72jfr7bhrzamnhbq8gxjn8xdz0wvdj0di";
155+
sha256 = "0rl1jmxs7pay58l7lkxkrn6nkdpk52k8rvnfwqsd1swjlxlwjq0n";
156+
type = "gem";
157+
};
158+
version = "0.5.10";
159+
};
160+
stringio = {
161+
groups = ["default"];
162+
platforms = [];
163+
source = {
164+
remotes = ["https://rubygems.org"];
165+
sha256 = "07mfqb40b2wh53k33h91zva78f9zwcdnl85jiq74wnaw2wa6wiak";
114166
type = "gem";
115167
};
116-
version = "0.3.1";
168+
version = "3.1.1";
117169
};
118170
}

‎modules/kernels/ruby/iruby/update.sh

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#! /usr/bin/env nix-shell
2+
#! nix-shell -i bash -p curl jq bundler bundix ruby
3+
4+
set -eu -o pipefail
5+
6+
cd "$(dirname "$0")"
7+
8+
# Update Gemfile with the latest iruby version
9+
echo "source 'https://rubygems.org'" > Gemfile
10+
echo -n "gem 'iruby', " >> Gemfile
11+
curl https://rubygems.org/api/v1/gems/iruby.json | jq .version >> Gemfile
12+
13+
# Regenerate Gemfile.lock
14+
export BUNDLE_FORCE_RUBY_PLATFORM=1
15+
rm Gemfile.lock
16+
bundle lock
17+
18+
# Regenerate gemset.nix
19+
bundix -l

0 commit comments

Comments
 (0)