Merge branch 'master' into staging

Fixed conflicts:
- lib/systems/for-meta.nix: in favor of staging
- pkgs/os-specific/darwin/xcode/default.nix: in favor of master

1 files changed, 22 insertions, 0 deletions

diff --git a/pkgs/tools/admin/oxidized/temporary-x-series.patch b/pkgs/tools/admin/oxidized/temporary-x-series.patch
new file mode 100644
index 000000000000..bf7ee992db18
--- /dev/null
+++ b/pkgs/tools/admin/oxidized/temporary-x-series.patch
@@ -0,0 +1,22 @@
+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 /:/