Merge pull request #8395 from mbakke/ipcalcs

add ipcalc and sipcalc

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;
+  };
+}

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;
+  };
+}

pkgs/top-level/all-packages.nix

@@ -1861,6 +1861,8 @@ let
 
   ipmiutil = callPackage ../tools/system/ipmiutil {};
 
+  ipcalc = callPackage ../tools/networking/ipcalc {};
+
   ipv6calc = callPackage ../tools/networking/ipv6calc {};
 
   ipxe = callPackage ../tools/misc/ipxe { };
@@ -2883,6 +2885,8 @@ let
 
   skydns = callPackage ../servers/dns/skydns { };
 
+  sipcalc = callPackage ../tools/networking/sipcalc { };
+
   sleuthkit = callPackage ../tools/system/sleuthkit {};
 
   slimrat = callPackage ../tools/networking/slimrat {