pyrox.dev
oxidized: 0.26.3 -> 0.29.1 (#234001)
This commit updates oxidized, fixes the oxidized-script executable
and removes the non existing oxidized-web executable (oxidized-web is
just a library for oxidized and does not provide a executable).
+8
-2
pkgs/tools/admin/oxidized/Gemfile
+8
-2
pkgs/tools/admin/oxidized/Gemfile
···
1
1
source 'https://rubygems.org'
2
2
3
-
gem 'oxidized', '0.26.3'
3
+
gem 'oxidized', '0.29.1'
4
4
gem 'oxidized-web', '0.13.1'
5
-
gem 'oxidized-script', '0.6.0'
5
+
6
+
# The version on rubygems is not up2date
7
+
gem 'oxidized-script', git: 'https://github.com/ytti/oxidized-script.git', ref: '988cded5d89f52e274afb545bd3e011e19d5d22d'
8
+
9
+
# Fix for https://github.com/ytti/oxidized/issues/2769
10
+
gem 'psych', '~> 3.3.2'
11
+
+40
-30
pkgs/tools/admin/oxidized/Gemfile.lock
+40
-30
pkgs/tools/admin/oxidized/Gemfile.lock
···
1
+
GIT
2
+
remote: https://github.com/ytti/oxidized-script.git
3
+
revision: 988cded5d89f52e274afb545bd3e011e19d5d22d
4
+
ref: 988cded5d89f52e274afb545bd3e011e19d5d22d
5
+
specs:
6
+
oxidized-script (0.6.0)
7
+
oxidized (~> 0.28)
8
+
slop (~> 4.6)
9
+
1
10
GEM
2
11
remote: https://rubygems.org/
3
12
specs:
4
-
asetus (0.3.0)
5
-
backports (3.14.0)
6
-
charlock_holmes (0.7.6)
13
+
asetus (0.4.0)
14
+
backports (3.24.1)
15
+
bcrypt_pbkdf (1.1.0)
16
+
charlock_holmes (0.7.7)
17
+
ed25519 (1.3.0)
7
18
emk-sinatra-url-for (0.2.1)
8
19
sinatra (>= 0.9.1.1)
9
-
ffi (1.10.0)
10
-
git (1.5.0)
11
-
haml (5.0.4)
20
+
ffi (1.15.5)
21
+
haml (5.2.2)
12
22
temple (>= 0.8.0)
13
23
tilt
14
24
htmlentities (4.3.4)
15
-
json (2.2.0)
16
-
multi_json (1.13.1)
17
-
net-ssh (5.2.0)
18
-
net-telnet (0.1.1)
19
-
oxidized (0.26.3)
25
+
json (2.6.3)
26
+
multi_json (1.15.0)
27
+
net-ssh (7.1.0)
28
+
net-telnet (0.2.0)
29
+
oxidized (0.29.1)
20
30
asetus (~> 0.1)
21
-
git (~> 1)
22
-
net-ssh (~> 5)
23
-
net-telnet (~> 0.1.1)
24
-
rugged (~> 0.21, >= 0.21.4)
25
-
slop (~> 3.5)
26
-
oxidized-script (0.6.0)
27
-
oxidized (~> 0.25)
28
-
slop (~> 3.5)
31
+
bcrypt_pbkdf (~> 1.0)
32
+
ed25519 (~> 1.2)
33
+
net-ssh (~> 7.1)
34
+
net-telnet (~> 0.2)
35
+
rugged (~> 1.6)
36
+
slop (~> 4.6)
29
37
oxidized-web (0.13.1)
30
38
charlock_holmes (~> 0.7.5)
31
39
emk-sinatra-url-for (~> 0.2)
···
38
46
sass (~> 3.3)
39
47
sinatra (~> 1.4, >= 1.4.6)
40
48
sinatra-contrib (~> 1.4, >= 1.4.6)
49
+
psych (3.3.4)
41
50
puma (3.11.4)
42
-
rack (1.6.11)
51
+
rack (1.6.13)
43
52
rack-protection (1.5.5)
44
53
rack
45
54
rack-test (0.7.0)
46
55
rack (>= 1.0, < 3)
47
-
rb-fsevent (0.10.3)
48
-
rb-inotify (0.10.0)
56
+
rb-fsevent (0.11.2)
57
+
rb-inotify (0.10.1)
49
58
ffi (~> 1.0)
50
-
rugged (0.28.1)
59
+
rugged (1.6.3)
51
60
sass (3.7.4)
52
61
sass-listen (~> 4.0.0)
53
62
sass-listen (4.0.0)
···
64
73
rack-test
65
74
sinatra (~> 1.4.0)
66
75
tilt (>= 1.3, < 3)
67
-
slop (3.6.0)
68
-
temple (0.8.1)
69
-
tilt (2.0.9)
76
+
slop (4.10.1)
77
+
temple (0.10.1)
78
+
tilt (2.1.0)
70
79
71
80
PLATFORMS
72
-
ruby
81
+
x86_64-linux
73
82
74
83
DEPENDENCIES
75
-
oxidized (= 0.26.3)
76
-
oxidized-script (= 0.6.0)
84
+
oxidized (= 0.29.1)
85
+
oxidized-script!
77
86
oxidized-web (= 0.13.1)
87
+
psych (~> 3.3.2)
78
88
79
89
BUNDLED WITH
80
-
2.1.4
90
+
2.3.26
+2
-2
pkgs/tools/admin/oxidized/default.nix
+2
-2
pkgs/tools/admin/oxidized/default.nix
···
6
6
7
7
inherit ruby;
8
8
9
-
exes = [ "oxidized" "oxidized-web" "oxidized-script" ];
9
+
exes = [ "oxidized" "oxs" ];
10
10
11
11
passthru.updateScript = bundlerUpdateScript "oxidized";
12
12
···
14
14
description = "A network device configuration backup tool. It's a RANCID replacement!";
15
15
homepage = "https://github.com/ytti/oxidized";
16
16
license = licenses.asl20;
17
-
maintainers = with maintainers; [ willibutz nicknovitski ];
17
+
maintainers = with maintainers; [ willibutz nicknovitski netali ];
18
18
platforms = platforms.linux;
19
19
};
20
20
}
+68
-46
pkgs/tools/admin/oxidized/gemset.nix
+68
-46
pkgs/tools/admin/oxidized/gemset.nix
···
4
4
platforms = [];
5
5
source = {
6
6
remotes = ["https://rubygems.org"];
7
-
sha256 = "1zkr8cbp8klanqmhzz7qmimzlxh6zmsy98zb3s75af34l7znq790";
7
+
sha256 = "0li09rcpgc21ymfayvhnjwvfl10s75g8aj52973gk0gvygscrhah";
8
8
type = "gem";
9
9
};
10
-
version = "0.3.0";
10
+
version = "0.4.0";
11
11
};
12
12
backports = {
13
13
groups = ["default"];
14
14
platforms = [];
15
15
source = {
16
16
remotes = ["https://rubygems.org"];
17
-
sha256 = "17j5pf0b69bkn043wi4xd530ky53jbbnljr4bsjzlm4k8bzlknfn";
17
+
sha256 = "1f3zcy0q88rw3clk0r7bai7sp4r253lndf0qmdgczq1ykbm219w3";
18
+
type = "gem";
19
+
};
20
+
version = "3.24.1";
21
+
};
22
+
bcrypt_pbkdf = {
23
+
groups = ["default"];
24
+
platforms = [];
25
+
source = {
26
+
remotes = ["https://rubygems.org"];
27
+
sha256 = "0ndamfaivnkhc6hy0yqyk2gkwr6f3bz6216lh74hsiiyk3axz445";
18
28
type = "gem";
19
29
};
20
-
version = "3.14.0";
30
+
version = "1.1.0";
21
31
};
22
32
charlock_holmes = {
23
33
groups = ["default"];
24
34
platforms = [];
25
35
source = {
26
36
remotes = ["https://rubygems.org"];
27
-
sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5";
37
+
sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p";
28
38
type = "gem";
29
39
};
30
-
version = "0.7.6";
40
+
version = "0.7.7";
31
41
};
32
-
emk-sinatra-url-for = {
33
-
dependencies = ["sinatra"];
42
+
ed25519 = {
34
43
groups = ["default"];
35
44
platforms = [];
36
45
source = {
37
46
remotes = ["https://rubygems.org"];
38
-
sha256 = "0rd5b1lraklv0hblzdnmw2z3dragfg0qqk7wxbpn58f8y7jxzjgj";
47
+
sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji";
39
48
type = "gem";
40
49
};
41
-
version = "0.2.1";
50
+
version = "1.3.0";
42
51
};
43
-
ffi = {
52
+
emk-sinatra-url-for = {
53
+
dependencies = ["sinatra"];
44
54
groups = ["default"];
45
55
platforms = [];
46
56
source = {
47
57
remotes = ["https://rubygems.org"];
48
-
sha256 = "0j8pzj8raxbir5w5k6s7a042sb5k02pg0f8s4na1r5lan901j00p";
58
+
sha256 = "0rd5b1lraklv0hblzdnmw2z3dragfg0qqk7wxbpn58f8y7jxzjgj";
49
59
type = "gem";
50
60
};
51
-
version = "1.10.0";
61
+
version = "0.2.1";
52
62
};
53
-
git = {
63
+
ffi = {
54
64
groups = ["default"];
55
65
platforms = [];
56
66
source = {
57
67
remotes = ["https://rubygems.org"];
58
-
sha256 = "0bf83icwypi3p3pd97vlqbnp3hvf31ncd440m9kh9y7x6yk74wyh";
68
+
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
59
69
type = "gem";
60
70
};
61
-
version = "1.5.0";
71
+
version = "1.15.5";
62
72
};
63
73
haml = {
64
74
dependencies = ["temple" "tilt"];
···
66
76
platforms = [];
67
77
source = {
68
78
remotes = ["https://rubygems.org"];
69
-
sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac";
79
+
sha256 = "035fgbfr20m08w4603ls2lwqbggr0vy71mijz0p68ib1am394xbf";
70
80
type = "gem";
71
81
};
72
-
version = "5.0.4";
82
+
version = "5.2.2";
73
83
};
74
84
htmlentities = {
75
85
groups = ["default"];
···
86
96
platforms = [];
87
97
source = {
88
98
remotes = ["https://rubygems.org"];
89
-
sha256 = "0sx97bm9by389rbzv8r1f43h06xcz8vwi3h5jv074gvparql7lcx";
99
+
sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6";
90
100
type = "gem";
91
101
};
92
-
version = "2.2.0";
102
+
version = "2.6.3";
93
103
};
94
104
multi_json = {
95
105
groups = ["default"];
96
106
platforms = [];
97
107
source = {
98
108
remotes = ["https://rubygems.org"];
99
-
sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
109
+
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
100
110
type = "gem";
101
111
};
102
-
version = "1.13.1";
112
+
version = "1.15.0";
103
113
};
104
114
net-ssh = {
105
115
groups = ["default"];
106
116
platforms = [];
107
117
source = {
108
118
remotes = ["https://rubygems.org"];
109
-
sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40";
119
+
sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687";
110
120
type = "gem";
111
121
};
112
-
version = "5.2.0";
122
+
version = "7.1.0";
113
123
};
114
124
net-telnet = {
115
125
groups = ["default"];
116
126
platforms = [];
117
127
source = {
118
128
remotes = ["https://rubygems.org"];
119
-
sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx";
129
+
sha256 = "16nkxc79nqm7fd6w1fba4kb98vpgwnyfnlwxarpdcgywz300fc15";
120
130
type = "gem";
121
131
};
122
-
version = "0.1.1";
132
+
version = "0.2.0";
123
133
};
124
134
oxidized = {
125
-
dependencies = ["asetus" "git" "net-ssh" "net-telnet" "rugged" "slop"];
135
+
dependencies = ["asetus" "bcrypt_pbkdf" "ed25519" "net-ssh" "net-telnet" "rugged" "slop"];
126
136
groups = ["default"];
127
137
platforms = [];
128
138
source = {
129
139
remotes = ["https://rubygems.org"];
130
-
sha256 = "07hpxmdjkfpkc00ln3hhh5qkj0lyhcmgbi0jza2c8cnjyy9sc73x";
140
+
sha256 = "1ww8iv89zvklnvq9cv2lb6wyb5y73hinzm6xgd21za4204aanlps";
131
141
type = "gem";
132
142
};
133
-
version = "0.26.3";
143
+
version = "0.29.1";
134
144
};
135
145
oxidized-script = {
136
146
dependencies = ["oxidized" "slop"];
137
147
groups = ["default"];
138
148
platforms = [];
139
149
source = {
140
-
remotes = ["https://rubygems.org"];
141
-
sha256 = "15cxsyaz2mwd7jj63gfv3lzyqkvb3gz29wxfy7xyjdzkc19c7vk6";
142
-
type = "gem";
150
+
fetchSubmodules = false;
151
+
rev = "988cded5d89f52e274afb545bd3e011e19d5d22d";
152
+
sha256 = "13vglj6w37xd6dqfn98xdan3kqbs460akj1rdr4bm7lsrpa281gf";
153
+
type = "git";
154
+
url = "https://github.com/ytti/oxidized-script.git";
143
155
};
144
156
version = "0.6.0";
145
157
};
···
153
165
type = "gem";
154
166
};
155
167
version = "0.13.1";
168
+
};
169
+
psych = {
170
+
groups = ["default"];
171
+
platforms = [];
172
+
source = {
173
+
remotes = ["https://rubygems.org"];
174
+
sha256 = "186i2hc6sfvg4skhqf82kxaf4mb60g65fsif8w8vg1hc9mbyiaph";
175
+
type = "gem";
176
+
};
177
+
version = "3.3.4";
156
178
};
157
179
puma = {
158
180
groups = ["default"];
···
169
191
platforms = [];
170
192
source = {
171
193
remotes = ["https://rubygems.org"];
172
-
sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f";
194
+
sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0";
173
195
type = "gem";
174
196
};
175
-
version = "1.6.11";
197
+
version = "1.6.13";
176
198
};
177
199
rack-protection = {
178
200
dependencies = ["rack"];
···
201
223
platforms = [];
202
224
source = {
203
225
remotes = ["https://rubygems.org"];
204
-
sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
226
+
sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423";
205
227
type = "gem";
206
228
};
207
-
version = "0.10.3";
229
+
version = "0.11.2";
208
230
};
209
231
rb-inotify = {
210
232
dependencies = ["ffi"];
···
212
234
platforms = [];
213
235
source = {
214
236
remotes = ["https://rubygems.org"];
215
-
sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4";
237
+
sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005";
216
238
type = "gem";
217
239
};
218
-
version = "0.10.0";
240
+
version = "0.10.1";
219
241
};
220
242
rugged = {
221
243
groups = ["default"];
222
244
platforms = [];
223
245
source = {
224
246
remotes = ["https://rubygems.org"];
225
-
sha256 = "1yiszpz6y13vvgh3fss1l0ipp0zgsbbc8c28vynnpdyx1sy6krp6";
247
+
sha256 = "016bawsahkhxx7p8azxirpl7y2y7i8a027pj8910gwf6ipg329in";
226
248
type = "gem";
227
249
};
228
-
version = "0.28.1";
250
+
version = "1.6.3";
229
251
};
230
252
sass = {
231
253
dependencies = ["sass-listen"];
···
276
298
platforms = [];
277
299
source = {
278
300
remotes = ["https://rubygems.org"];
279
-
sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
301
+
sha256 = "1iyrjskgxyn8i1679qwkzns85p909aq77cgx2m4fs5ygzysj4hw4";
280
302
type = "gem";
281
303
};
282
-
version = "3.6.0";
304
+
version = "4.10.1";
283
305
};
284
306
temple = {
285
307
groups = ["default"];
286
308
platforms = [];
287
309
source = {
288
310
remotes = ["https://rubygems.org"];
289
-
sha256 = "158d7ygbwcifqnvrph219p7m78yjdjazhykv5darbkms7bxm5y09";
311
+
sha256 = "1jj8lny5hp8gm920k73r6xpb40j5mpiw1dcr8g5id4hxjggkw8by";
290
312
type = "gem";
291
313
};
292
-
version = "0.8.1";
314
+
version = "0.10.1";
293
315
};
294
316
tilt = {
295
317
groups = ["default"];
296
318
platforms = [];
297
319
source = {
298
320
remotes = ["https://rubygems.org"];
299
-
sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz";
321
+
sha256 = "1qmhi6d9przjzhsyk9g5pq2j75c656msh6xzprqd2mxgphf23jxs";
300
322
type = "gem";
301
323
};
302
-
version = "2.0.9";
324
+
version = "2.1.0";
303
325
};
304
326
}