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, 18 insertions, 0 deletions

diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix
new file mode 100644
index 000000000000..590f6ea55ca7
--- /dev/null
+++ b/pkgs/tools/admin/oxidized/default.nix
@@ -0,0 +1,18 @@
+{ lib, fetchFromGitHub, ruby, git, bundlerApp }:
+
+bundlerApp rec {
+  pname = "oxidized";
+  gemdir = ./.;
+
+  inherit ruby;
+
+  exes = [ "oxidized" "oxidized-web" "oxidized-script" ];
+
+  meta = with lib; {
+    description = "Oxidized is a network device configuration backup tool. It's a RANCID replacement!";
+    homepage    = https://github.com/ytti/oxidized;
+    license     = licenses.asl20;
+    maintainers = [ maintainers.willibutz ];
+    platforms   = platforms.linux;
+  };
+}