diff options
author | WilliButz <WilliButz@users.noreply.github.com> | 2018-12-19 00:24:51 +0100 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2018-12-19 00:24:51 +0100 |
commit | 9b2e8ddebef23d8e3ffda4e6b6a3cf890298f039 (patch) | |
tree | 48e9848ab8d0ad8e1539a722f54addd99e7fbe1f /pkgs/tools/admin | |
parent | 0594eb6fd22b93aa172e0d4f0c030d6dfc2a8379 (diff) | |
download | nixlib-9b2e8ddebef23d8e3ffda4e6b6a3cf890298f039.tar nixlib-9b2e8ddebef23d8e3ffda4e6b6a3cf890298f039.tar.gz nixlib-9b2e8ddebef23d8e3ffda4e6b6a3cf890298f039.tar.bz2 nixlib-9b2e8ddebef23d8e3ffda4e6b6a3cf890298f039.tar.lz nixlib-9b2e8ddebef23d8e3ffda4e6b6a3cf890298f039.tar.xz nixlib-9b2e8ddebef23d8e3ffda4e6b6a3cf890298f039.tar.zst nixlib-9b2e8ddebef23d8e3ffda4e6b6a3cf890298f039.zip |
oxidized: 0.21.0 -> 0.25.0, drop obsolete patch (#52492)
This removes the patch for support of Dell X-series because oxidized now includes a model for these switches.
Diffstat (limited to 'pkgs/tools/admin')
-rw-r--r-- | pkgs/tools/admin/oxidized/Gemfile | 6 | ||||
-rw-r--r-- | pkgs/tools/admin/oxidized/Gemfile.lock | 51 | ||||
-rw-r--r-- | pkgs/tools/admin/oxidized/gemset.nix | 142 | ||||
-rw-r--r-- | pkgs/tools/admin/oxidized/temporary-x-series.patch | 22 |
4 files changed, 148 insertions, 73 deletions
diff --git a/pkgs/tools/admin/oxidized/Gemfile b/pkgs/tools/admin/oxidized/Gemfile index 6a9a4254b11b..dd41b89ad437 100644 --- a/pkgs/tools/admin/oxidized/Gemfile +++ b/pkgs/tools/admin/oxidized/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'oxidized' -gem 'oxidized-web' -gem 'oxidized-script' +gem 'oxidized', '0.25.0' +gem 'oxidized-web', '0.12.0' +gem 'oxidized-script', '0.6.0' diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/tools/admin/oxidized/Gemfile.lock index e4bdf5ccf394..d0c808fd2cdb 100644 --- a/pkgs/tools/admin/oxidized/Gemfile.lock +++ b/pkgs/tools/admin/oxidized/Gemfile.lock @@ -2,43 +2,51 @@ GEM remote: https://rubygems.org/ specs: asetus (0.3.0) - backports (3.11.2) + backports (3.11.4) + charlock_holmes (0.7.6) emk-sinatra-url-for (0.2.1) sinatra (>= 0.9.1.1) - ffi (1.9.23) - haml (4.0.7) + ffi (1.9.25) + haml (5.0.4) + temple (>= 0.8.0) tilt htmlentities (4.3.4) + json (2.1.0) multi_json (1.13.1) net-ssh (4.1.0) - oxidized (0.21.0) + net-telnet (0.1.1) + oxidized (0.25.0) asetus (~> 0.1) net-ssh (~> 4.1.0) + net-telnet (~> 0.1.1) rugged (~> 0.21, >= 0.21.4) slop (~> 3.5) - oxidized-script (0.5.0) - oxidized (~> 0.21.0) + oxidized-script (0.6.0) + oxidized (~> 0.25) slop (~> 3.5) - oxidized-web (0.9.3) + oxidized-web (0.12.0) + charlock_holmes (~> 0.7.5) emk-sinatra-url-for (~> 0.2) - haml (~> 4.0) + haml (~> 5.0) htmlentities (~> 4.3) - oxidized (~> 0.21.0) - puma (~> 3) + json (>= 1.7.0) + oxidized (~> 0.25) + puma (~> 3.11.4) + rack-test (~> 0.7.0) sass (~> 3.3) sinatra (~> 1.4, >= 1.4.6) sinatra-contrib (~> 1.4, >= 1.4.6) - puma (3.11.3) + puma (3.11.4) rack (1.6.11) rack-protection (1.5.5) rack - rack-test (1.0.0) + rack-test (0.7.0) rack (>= 1.0, < 3) rb-fsevent (0.10.3) - rb-inotify (0.9.10) - ffi (>= 0.5.0, < 2) - rugged (0.27.0) - sass (3.5.6) + rb-inotify (0.10.0) + ffi (~> 1.0) + rugged (0.27.7) + sass (3.7.2) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) @@ -55,15 +63,16 @@ GEM sinatra (~> 1.4.0) tilt (>= 1.3, < 3) slop (3.6.0) - tilt (2.0.8) + temple (0.8.0) + tilt (2.0.9) PLATFORMS ruby DEPENDENCIES - oxidized - oxidized-script - oxidized-web + oxidized (= 0.25.0) + oxidized-script (= 0.6.0) + oxidized-web (= 0.12.0) BUNDLED WITH - 1.16.4 + 1.17.1 diff --git a/pkgs/tools/admin/oxidized/gemset.nix b/pkgs/tools/admin/oxidized/gemset.nix index 5a8b2ecefdcb..e965e40530b0 100644 --- a/pkgs/tools/admin/oxidized/gemset.nix +++ b/pkgs/tools/admin/oxidized/gemset.nix @@ -1,5 +1,7 @@ { asetus = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1zkr8cbp8klanqmhzz7qmimzlxh6zmsy98zb3s75af34l7znq790"; @@ -8,15 +10,29 @@ version = "0.3.0"; }; backports = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sw58rsz1hl821ia1jj3nnl3jr7xwfkcljgs56kpq3fakzcljcdz"; + sha256 = "1hshjxww2h7s0dk57njrygq4zpp0nlqrjfya7zwm27iq3rhc3y8g"; type = "gem"; }; - version = "3.11.2"; + version = "3.11.4"; + }; + charlock_holmes = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nf1l31n10yaark2rrg5qzyzcx9w80681449s3j09qmnipsl8rl5"; + type = "gem"; + }; + version = "0.7.6"; }; emk-sinatra-url-for = { dependencies = ["sinatra"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0rd5b1lraklv0hblzdnmw2z3dragfg0qqk7wxbpn58f8y7jxzjgj"; @@ -25,23 +41,29 @@ version = "0.2.1"; }; ffi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zw6pbyvmj8wafdc7l5h7w20zkp1vbr2805ql5d941g2b20pk4zr"; + sha256 = "0jpm2dis1j7zvvy3lg7axz9jml316zrn7s0j59vyq3qr127z0m7q"; type = "gem"; }; - version = "1.9.23"; + version = "1.9.25"; }; haml = { - dependencies = ["tilt"]; + dependencies = ["temple" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p"; + sha256 = "1q0a9fvqh8kn6wm97fcks6qzbjd400bv8bx748w8v87m7p4klhac"; type = "gem"; }; - version = "4.0.7"; + version = "5.0.4"; }; htmlentities = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; @@ -49,7 +71,19 @@ }; version = "4.3.4"; }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + type = "gem"; + }; + version = "2.1.0"; + }; multi_json = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv"; @@ -58,6 +92,8 @@ version = "1.13.1"; }; net-ssh = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q"; @@ -65,42 +101,62 @@ }; version = "4.1.0"; }; + net-telnet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; + type = "gem"; + }; + version = "0.1.1"; + }; oxidized = { - dependencies = ["asetus" "net-ssh" "rugged" "slop"]; + dependencies = ["asetus" "net-ssh" "net-telnet" "rugged" "slop"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xqx0iawj2cm6083a61y43d6a76xaypiw0nkyirx02lhynq07yz0"; + sha256 = "0i8lbzjay60jpk6g86rpk59j4r0kyd1nnm79qdh64qvx6hy02ylq"; type = "gem"; }; - version = "0.21.0"; + version = "0.25.0"; }; oxidized-script = { dependencies = ["oxidized" "slop"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12c15gksrrar9kradcv6mx2d4a8ixa4lykszb4pcapiw5mi35mxp"; + sha256 = "15cxsyaz2mwd7jj63gfv3lzyqkvb3gz29wxfy7xyjdzkc19c7vk6"; type = "gem"; }; - version = "0.5.0"; + version = "0.6.0"; }; oxidized-web = { - dependencies = ["emk-sinatra-url-for" "haml" "htmlentities" "oxidized" "puma" "sass" "sinatra" "sinatra-contrib"]; + dependencies = ["charlock_holmes" "emk-sinatra-url-for" "haml" "htmlentities" "json" "oxidized" "puma" "rack-test" "sass" "sinatra" "sinatra-contrib"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14s10pr8qaq6g19zi753igngp02li46k3nm5ap537r3743v1l4f9"; + sha256 = "12ib7380sh9ca7qirw1yhs8di2vv38l09imqaamibdzgmk0rvs1r"; type = "gem"; }; - version = "0.9.3"; + version = "0.12.0"; }; puma = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03313mnx8n6g9qs9l5zafqq90grrhq2nqrmjs8lsffi28mgd3cfd"; + sha256 = "06qiqx1pcfwq4gi9pdrrq8r6hgh3rwl7nl51r67zpm5xmqlp0g10"; type = "gem"; }; - version = "3.11.3"; + version = "3.11.4"; }; rack = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; @@ -110,6 +166,8 @@ }; rack-protection = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; @@ -119,14 +177,18 @@ }; rack-test = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l799s5qr2qrshvrggq5ch3v235y491zfww07b39w4pj4vpa65l1"; + sha256 = "0f50ljlbg38g21q242him0n12r0fz7r3rs9n6p8ppahzh7k22x11"; type = "gem"; }; - version = "1.0.0"; + version = "0.7.0"; }; rb-fsevent = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; @@ -136,32 +198,40 @@ }; rb-inotify = { dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yfsgw5n7pkpyky6a9wkf1g9jafxb0ja7gz0qw0y14fd2jnzfh71"; + sha256 = "1fs7hxm9g6ywv2yih83b879klhc4fs8i0p9166z795qmd77dk0a4"; type = "gem"; }; - version = "0.9.10"; + version = "0.10.0"; }; rugged = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q1krxgd0ql03x8m9m05x5sxizw5sc7lms7rkp44qf45grpdk3v3"; + sha256 = "0znb9n1grdsqf22jqzwin58kyq7x7ml57h6pf48j219f8by21sj6"; type = "gem"; }; - version = "0.27.0"; + version = "0.27.7"; }; sass = { dependencies = ["sass-listen"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19wyzp9qsg8hdkkxlsv713w0qmy66qrdp0shj42587ssx4qhrlag"; + sha256 = "1phs6hnd8b95m7n5wbh5bsclmwaajd1sqlgw9fmj72bfqldbmcqa"; type = "gem"; }; - version = "3.5.6"; + version = "3.7.2"; }; sass-listen = { dependencies = ["rb-fsevent" "rb-inotify"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; @@ -171,6 +241,8 @@ }; sinatra = { dependencies = ["rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; @@ -180,6 +252,8 @@ }; sinatra-contrib = { dependencies = ["backports" "multi_json" "rack-protection" "rack-test" "sinatra" "tilt"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0vi3i0icbi2figiayxpvxbqpbn1syma7w4p4zw5mav1ln4c7jnfr"; @@ -188,6 +262,8 @@ version = "1.4.7"; }; slop = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n"; @@ -195,12 +271,24 @@ }; version = "3.6.0"; }; + temple = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00nxf610nzi4n1i2lkby43nrnarvl89fcl6lg19406msr0k3ycmq"; + type = "gem"; + }; + version = "0.8.0"; + }; tilt = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0020mrgdf11q23hm1ddd6fv691l51vi10af00f137ilcdb2ycfra"; + sha256 = "0ca4k0clwf0rkvy7726x4nxpjxkpv67w043i39saxgldxd97zmwz"; type = "gem"; }; - version = "2.0.8"; + version = "2.0.9"; }; } \ No newline at end of file diff --git a/pkgs/tools/admin/oxidized/temporary-x-series.patch b/pkgs/tools/admin/oxidized/temporary-x-series.patch deleted file mode 100644 index bf7ee992db18..000000000000 --- a/pkgs/tools/admin/oxidized/temporary-x-series.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb -index f602a36..3bac2d1 100644 ---- a/lib/oxidized/model/powerconnect.rb -+++ b/lib/oxidized/model/powerconnect.rb -@@ -4,7 +4,7 @@ class PowerConnect < Oxidized::Model - - comment '! ' - -- expect /^\s*--More--\s+.*$/ do |data, re| -+ expect /^([[:cntrl:]]...More:|\s*--More--\s+).*$/ do |data, re| - send ' ' - data.sub re, '' - end -@@ -60,7 +60,7 @@ class PowerConnect < Oxidized::Model - skip_blocks = 0 - cfg.each_line do |line| - # If this is a stackable switch we should skip this block of information -- if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i and @stackable == true) -+ if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i) - skip_blocks = 1 - # Some switches have another empty line. This is identified by this line having a colon - skip_blocks = 2 if line.match /:/ |