Merge remote-tracking branch 'ni/master'

2 files changed, 31 insertions, 2 deletions

diff --git a/krebs/5pkgs/simple/cidr2glob.nix b/krebs/5pkgs/simple/cidr2glob.nix
index 9b0b3f86b..47a75ea41 100644
--- a/krebs/5pkgs/simple/cidr2glob.nix
+++ b/krebs/5pkgs/simple/cidr2glob.nix
@@ -1,6 +1,7 @@
-{ python, writeScriptBin, ... }:
+{ python3, writeScriptBin, ... }:
 
 let
+  python = python3;
   pythonEnv = python.withPackages (ps: [ ps.netaddr ]);
 in
   writeScriptBin "cidr2glob" ''
@@ -25,6 +26,6 @@ in
     if __name__ == "__main__":
         for cidr in sys.stdin:
             for glob in cidr2glob(cidr):
-                print glob
+                print(glob)
 
   ''
diff --git a/krebs/5pkgs/simple/veroroute.nix b/krebs/5pkgs/simple/veroroute.nix
new file mode 100644
index 000000000..e40c98e75
--- /dev/null
+++ b/krebs/5pkgs/simple/veroroute.nix
@@ -0,0 +1,28 @@
+{ pkgs }:
+
+pkgs.stdenv.mkDerivation rec {
+  pname = "veroroute";
+  version = "2.28";
+
+  src = pkgs.fetchurl {
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
+    sha256 = "04dig0g4v1rz50mjj1k6jk99rqbg24hdx8kzrlwv0dlxm567lvc7";
+  };
+
+  buildInputs = [
+    pkgs.qt5.qtbase
+  ];
+  nativeBuildInputs = [
+    pkgs.qt5.wrapQtAppsHook
+  ];
+
+  buildPhase = ''
+    qmake Src/veroroute.pro
+    make
+  '';
+
+  installPhase = ''
+    sed -i 's;/usr;;g' veroroute-install.sh
+    pkgdir=$out bash ./veroroute-install.sh
+  '';
+}