From c0d4cdce07f0676a319e83c7aeb3e8a9059700c9 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sat, 28 Feb 2015 19:25:19 +0000
Subject: [PATCH 1/2] add sipcalc

---
 pkgs/tools/networking/sipcalc/default.nix | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/tools/networking/sipcalc/default.nix

diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/tools/networking/sipcalc/default.nix
new file mode 100644
index 00000000000..4ff383b1cf1
--- /dev/null
+++ b/pkgs/tools/networking/sipcalc/default.nix
@@ -0,0 +1,15 @@
+{stdenv, fetchurl}:
+stdenv.mkDerivation rec {
+  name = "sipcalc-${version}";
+  version = "1.1.6";
+  src = fetchurl {
+    url = "http://www.routemeister.net/projects/sipcalc/files/${name}.tar.gz";
+    sha256 = "cfd476c667f7a119e49eb5fe8adcfb9d2339bc2e0d4d01a1d64b7c229be56357";
+  };
+  meta = {
+    description = "Advanced console ip subnet calculator";
+    homepage = "http://www.routemeister.net/projects/sipcalc/";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cf9fed11ae..02d984875c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2850,6 +2850,8 @@ let
 
   skydns = callPackage ../servers/dns/skydns { };
 
+  sipcalc = callPackage ../tools/networking/sipcalc { };
+
   sleuthkit = callPackage ../tools/system/sleuthkit {};
 
   slimrat = callPackage ../tools/networking/slimrat {

From aef2a813a80fb332f956b12ae8090239f1f7a8f5 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Thu, 5 Feb 2015 15:46:50 +0000
Subject: [PATCH 2/2] add ipcalc

---
 pkgs/tools/networking/ipcalc/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/networking/ipcalc/default.nix

diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix
new file mode 100644
index 00000000000..10b1e93bde2
--- /dev/null
+++ b/pkgs/tools/networking/ipcalc/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, perl}:
+stdenv.mkDerivation rec {
+  name = "ipcalc-${version}";
+  version = "0.41";
+  src = fetchurl {
+    url = "http://jodies.de/ipcalc-archive/${name}.tar.gz";
+    sha256 = "dda9c571ce3369e5b6b06e92790434b54bec1f2b03f1c9df054c0988aa4e2e8a";
+  };
+  buildInputs = [perl];
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ipcalc $out/bin
+  '';
+  meta = {
+    description = "Simple IP network calculator";
+    homepage = "http://jodies.de/ipcalc";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02d984875c1..41335382e87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1840,6 +1840,8 @@ let
 
   ipmiutil = callPackage ../tools/system/ipmiutil {};
 
+  ipcalc = callPackage ../tools/networking/ipcalc {};
+
   ipv6calc = callPackage ../tools/networking/ipv6calc {};
 
   ipxe = callPackage ../tools/misc/ipxe { };