9 files changed, 98 insertions, 81 deletions

diff --git a/default.nix b/default.nix
index 51ebcc2..38d7e0b 100644
--- a/default.nix
+++ b/default.nix
@@ -74,87 +74,10 @@ let
     };
   };
 
-  buildPerlPackage = perlPackages.buildPerlPackage;
-  mypkgs.note = buildPerlPackage rec {
-    name = "note-1.3.26";
-    src = fetchurl {
-      url = "mirror://cpan/authors/id/T/TL/TLINDEN/${name}.tar.gz";
-      sha256 = "1h645rnb5vpms48fcyzvp7cwwcbf9k5xq49w2bpniyzzgk2brjrq";
-    };
-    outputs = ["out" "man"];
-    propagatedBuildInputs = [ perlPackages.YAML ];
-    meta = with stdenv.lib; {
-      description = "A perl script for maintaining notes";
-      homepage    = http://www.daemon.de/NOTE;
-      license     = licenses.gpl3;
-      maintainers = with maintainers; [ { name  = "T.v.Dein"; email = "tlinden@cpan.org"; } ];
-      platforms   = platforms.unix;
-    };
-  };
-
-  mypkgs.terminal-velocity = with python36Packages; buildPythonApplication rec {
-    pname = "terminal-velocity-git";
-    version = "0.2.0";
-
-    patches = [
-      ./patches/terminal_velocity_sort_found_notes.patch
-      ./patches/terminal_velocity_python3_support.patch
-      # FIXME: update this patch when version changes
-      ./patches/terminal_velocity_fix_build.patch
-    ];
-
-    propagatedBuildInputs = [ chardet urwid (sh.overridePythonAttrs { doCheck = false; }) pyyaml ];
-    buildInputs = [ m2r (restructuredtext_lint.overridePythonAttrs { doCheck = false; }) pygments ];
-
-    postInstall = ''
-      rm $out/bin/terminal_velocity
-      '';
-    src = fetchPypi {
-      inherit pname version;
-      sha256 = "13yrkcmvh5h5fwnai61sbmqkrjyisz08n62pq0ada2lyyqf7g6b9";
-    };
-  };
-
-  mypkgs.mtop = buildPerlPackage rec {
-    name = "mtop-${version}";
-    version = "0.6.6";
-    src = fetchurl {
-      url = "http://downloads.sourceforge.net/project/mtop/mtop/v${version}/mtop-${version}.tar.gz";
-      sha256 = "0x0x5300b1j9i0xxk8rsrki0pspyzj2vylhzv8qg3l6j26aw0zrf";
-    };
-    outputs = ["out"];
-    buildInputs = [ perlPackages.DBI perlPackages.DBDmysql perlPackages.Curses ];
-
-    postInstall = ''
-      cd "$out"
-      preConfigure || true
-    '';
-    meta = with stdenv.lib; {
-      description = "MySQL top (monitor and examine slow queries)";
-      homepage    = http://mtop.sourceforge.net/;
-      license     = licenses.gpl3;
-      maintainers = with maintainers; [ { name  = "Marc Prewitt"; email = "mprewitt@chelsea.net"; } ];
-      platforms   = platforms.unix;
-    };
-  };
-
-  mypkgs.tiv = buildPerlPackage rec {
-    name = "tiv-${version}";
-    version = "2015";
-    src = fetchurl {
-      url = "http://xyne.archlinux.ca/projects/tiv/src/tiv-${version}.tar.xz";
-      sha256 = "1vq073v7z7vmcd57lhs4rf4jasji69cpjgkz4dykp94a77p1qq90";
-    };
-    outputs = ["out"];
-    buildInputs = [ perlPackages.PerlMagick ];
-    perlPreHookScript = ./hooks/tiv_builder.sh;
-    perlPreHook = ''
-      source ${perlPreHookScript}
-    '';
-    installPhase = ''
-      install -Dm755 tiv "$out/bin/tiv"
-    '';
-  };
+  mypkgs.mtop = callPackage ./pkgs/mtop {};
+  mypkgs.note = callPackage ./pkgs/note {};
+  mypkgs.terminal-velocity = callPackage ./pkgs/terminal-velocity {};
+  mypkgs.tiv = callPackage ./pkgs/tiv {};
 
   mypkgs.cnagios = stdenv.mkDerivation (fetchedGithub ./fetched/cnagios.json // rec {
     configureFlags = [
diff --git a/pkgs/mtop/default.nix b/pkgs/mtop/default.nix
new file mode 100644
index 0000000..4a89430
--- /dev/null
+++ b/pkgs/mtop/default.nix
@@ -0,0 +1,24 @@
+{ buildPerlPackage, fetchurl, perlPackages, lib }:
+buildPerlPackage rec {
+  name = "mtop-${version}";
+  version = "0.6.6";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/mtop/mtop/v${version}/mtop-${version}.tar.gz";
+    sha256 = "0x0x5300b1j9i0xxk8rsrki0pspyzj2vylhzv8qg3l6j26aw0zrf";
+  };
+  outputs = ["out"];
+  buildInputs = with perlPackages; [ DBI DBDmysql Curses ];
+
+  postInstall = ''
+    cd "$out"
+    preConfigure || true
+  '';
+
+  meta = with lib; {
+    description = "MySQL top (monitor and examine slow queries)";
+    homepage    = http://mtop.sourceforge.net/;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ { name  = "Marc Prewitt"; email = "mprewitt@chelsea.net"; } ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/note/default.nix b/pkgs/note/default.nix
new file mode 100644
index 0000000..0c422bc
--- /dev/null
+++ b/pkgs/note/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildPerlPackage, fetchurl, perlPackages }:
+buildPerlPackage rec {
+  name = "note-1.3.26";
+  src = fetchurl {
+    url = "mirror://cpan/authors/id/T/TL/TLINDEN/${name}.tar.gz";
+    sha256 = "1h645rnb5vpms48fcyzvp7cwwcbf9k5xq49w2bpniyzzgk2brjrq";
+  };
+  outputs = ["out" "man"];
+  propagatedBuildInputs = with perlPackages; [ YAML ];
+
+  meta = with lib; {
+    description = "A perl script for maintaining notes";
+    homepage    = http://www.daemon.de/NOTE;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ { name  = "T.v.Dein"; email = "tlinden@cpan.org"; } ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/terminal-velocity/default.nix b/pkgs/terminal-velocity/default.nix
new file mode 100644
index 0000000..9e79dee
--- /dev/null
+++ b/pkgs/terminal-velocity/default.nix
@@ -0,0 +1,33 @@
+{ python36Packages }:
+with python36Packages;
+buildPythonApplication rec {
+  pname = "terminal-velocity-git";
+  version = "0.2.0";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "13yrkcmvh5h5fwnai61sbmqkrjyisz08n62pq0ada2lyyqf7g6b9";
+  };
+
+  patches = [
+    ./sort_found_notes.patch
+    ./python3_support.patch
+    # FIXME: update this patch when version changes
+    ./fix_build.patch
+  ];
+
+  propagatedBuildInputs = [
+    chardet
+    urwid
+    (sh.overridePythonAttrs { doCheck = false; })
+    pyyaml
+  ];
+  buildInputs = [
+    m2r
+    (restructuredtext_lint.overridePythonAttrs { doCheck = false; })
+    pygments
+  ];
+
+  postInstall = ''
+    rm $out/bin/terminal_velocity
+    '';
+}
diff --git a/patches/terminal_velocity_fix_build.patch b/pkgs/terminal-velocity/fix_build.patch
index b08e0c4..b08e0c4 100644
--- a/patches/terminal_velocity_fix_build.patch
+++ b/pkgs/terminal-velocity/fix_build.patch
diff --git a/patches/terminal_velocity_python3_support.patch b/pkgs/terminal-velocity/python3_support.patch
index bd4aec7..bd4aec7 100644
--- a/patches/terminal_velocity_python3_support.patch
+++ b/pkgs/terminal-velocity/python3_support.patch
diff --git a/patches/terminal_velocity_sort_found_notes.patch b/pkgs/terminal-velocity/sort_found_notes.patch
index 2bc563c..2bc563c 100644
--- a/patches/terminal_velocity_sort_found_notes.patch
+++ b/pkgs/terminal-velocity/sort_found_notes.patch
diff --git a/pkgs/tiv/default.nix b/pkgs/tiv/default.nix
new file mode 100644
index 0000000..c03aabe
--- /dev/null
+++ b/pkgs/tiv/default.nix
@@ -0,0 +1,19 @@
+{ buildPerlPackage, fetchurl, perlPackages }:
+buildPerlPackage rec {
+  name = "tiv-${version}";
+  version = "2015";
+  src = fetchurl {
+    url = "http://xyne.archlinux.ca/projects/tiv/src/tiv-${version}.tar.xz";
+    sha256 = "1vq073v7z7vmcd57lhs4rf4jasji69cpjgkz4dykp94a77p1qq90";
+  };
+
+  outputs = ["out"];
+  buildInputs = with perlPackages; [ PerlMagick ];
+  perlPreHookScript = ./tiv_builder.sh;
+  perlPreHook = ''
+    source $perlPreHookScript
+  '';
+  installPhase = ''
+    install -Dm755 tiv "$out/bin/tiv"
+  '';
+}
diff --git a/hooks/tiv_builder.sh b/pkgs/tiv/tiv_builder.sh
index ea16682..ea16682 100644
--- a/hooks/tiv_builder.sh
+++ b/pkgs/tiv/tiv_builder.sh