Move more packages to separate files

diff --git a/default.nix b/default.nix
index 38d7e0beb9fb3cf740db6876216bb004c3173336..7b2ca98f333a1ff52e5b70ab874d654352c1e4bf 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -74,55 +74,20 @@ let
     };
   };
 
+  mypkgs.cnagios = callPackage ./pkgs/cnagios { inherit fetchedGithub; };
   mypkgs.mtop = callPackage ./pkgs/mtop {};
+  mypkgs.muttprint = callPackage ./pkgs/muttprint {};
+  mypkgs.mutt-ics = callPackage ./pkgs/mutt-ics { inherit fetchedGithub; };
+  mypkgs.nagios-cli = callPackage ./pkgs/nagios-cli { inherit fetchedGithub; };
+  #mypkgs.nagnu = callPackage ./pkgs/nagnu { inherit fetchedGithub; };
   mypkgs.note = callPackage ./pkgs/note {};
+  mypkgs.pg_activity = callPackage ./pkgs/pg_activity { inherit fetchedGithub; };
+  mypkgs.pgloader = callPackage ./pkgs/pgloader { inherit fetchedGithub; };
+  mypkgs.telegram-cli = callPackage ./pkgs/telegram-cli { inherit fetchedGithub; };
+  mypkgs.telegram-history-dump = callPackage ./pkgs/telegram-history-dump { inherit fetchedGithub; };
   mypkgs.terminal-velocity = callPackage ./pkgs/terminal-velocity {};
   mypkgs.tiv = callPackage ./pkgs/tiv {};
 
-  mypkgs.cnagios = stdenv.mkDerivation (fetchedGithub ./fetched/cnagios.json // rec {
-    configureFlags = [
-      "--with-etc-dir=/etc/cnagios"
-      "--with-var-dir=/var/lib/naemon"
-      "--with-status-file=/var/lib/naemon/status.dat"
-      "--with-nagios-data=4"
-    ];
-
-    prePatch = ''
-      sed -i -e "s/-lcurses/-lncurses/" Makefile.in
-    '';
-    installPhase = ''
-      install -dm755 $out/share/doc/cnagios
-      install -Dm644 cnagiosrc $out/share/doc/cnagios/
-      install -Dm644 cnagios.help $out/share/doc/cnagios/
-      install -Dm644 cnagios.pl $out/share/doc/cnagios/
-      install -dm755 $out/bin
-      install -Dm755 cnagios $out/bin/
-    '';
-    propagatedBuildInputs = [ perl ncurses ];
-  });
-
-  mypkgs.nagios-cli = python2Packages.buildPythonApplication (fetchedGithub ./fetched/nagios-cli.json);
-
-  mypkgs.pg_activity = with python2Packages; buildPythonApplication (fetchedGithub ./fetched/pg_activity.json // rec {
-    propagatedBuildInputs = [ psycopg2 psutil ];
-  });
-
-  mypkgs.pgloader = stdenv.mkDerivation (fetchedGithub ./fetched/pgloader.json // rec {
-    buildInputs = [ sbcl cacert sqlite freetds libzip curl git openssl makeWrapper ];
-    LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ];
-    buildPhase = ''
-      export PATH=$PATH:$out/bin
-      export HOME=$TMPDIR
-      make pgloader
-    '';
-    dontStrip = true;
-    enableParallelBuilding = false;
-    installPhase = ''
-      install -Dm755 build/bin/pgloader "$out/bin/pgloader"
-      wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}"
-    '';
-  });
-
   mypkgs.pelican = python3Packages.pelican.overrideAttrs(old: fetchedGithub ./fetched/pelican.json // rec {
     propagatedBuildInputs = old.propagatedBuildInputs ++ [ python3Packages.pyyaml ];
   });
@@ -147,18 +112,6 @@ let
     }
   );
 
-  # mypkgs.nagnu = stdenv.mkDerivation (fetchedGithub ./fetched/nagnu.json // rec {
-  #   buildInputs = [ ncurses curl ];
-  #   installPhase = ''
-  #     mkdir -p $out/bin
-  #     cp nagnu $out/bin
-  #     mkdir -p $out/share/doc/nagnu
-  #     cp nagnu.conf.sample $out/share/doc/nagnu
-  #     mkdir -p $out/share/man/man8
-  #     cp docs/nagnu.8 $out/share/man/man8
-  #     '';
-  # });
-
   mypkgs.goaccess = goaccess.overrideAttrs(old: rec {
     name = "goaccess-${version}";
     version = "1.3";
@@ -170,79 +123,6 @@ let
     buildInputs = old.buildInputs ++ [ tokyocabinet bzip2 ];
   });
 
-  mypkgs.mutt-ics = with python3Packages; buildPythonApplication (fetchedGithub ./fetched/mutt-ics.json // rec {
-    propagatedBuildInputs = [ icalendar ];
-  });
-
-  mypkgs.telegram-cli = stdenv.mkDerivation (fetchedGithub ./fetched/telegram-cli.json // rec {
-    patches = [
-      ./patches/telegram-cli.patch
-      ];
-    buildInputs = [ pkgconfig libevent lua jansson openssl readline zlib libconfig ];
-    preBuild = ''
-      sed -i -e 's@"/etc/" PROG_NAME "/server.pub"@"'$out'/etc/server.pub"@' main.c
-      '';
-    installPhase = ''
-      mkdir -p $out
-      install -Dm755 bin/telegram-cli $out/bin/telegram-cli
-      install -Dm644 tg-server.pub $out/etc/server.pub
-      install -Dm644 debian/telegram-cli.8 $out/man/man8/telegram-cli.8
-      '';
-  });
-
-  mypkgs.telegram-history-dump = stdenv.mkDerivation (fetchedGithub ./fetched/telegram-history-dump.json // rec {
-    installPhase = ''
-      mkdir -p $out/lib $out/bin
-      cp -a $src $out/lib/telegram-history-dump
-      ln -s $out/lib/telegram-history-dump/telegram-history-dump.rb $out/bin/telegram-history-dump
-      '';
-    buildInputs = [ ruby ];
-  });
-
-  mypkgs.muttprint = stdenv.mkDerivation rec {
-    name = "muttprint-${version}";
-    version = "0.73";
-    src = fetchurl {
-      url = "http://downloads.sf.net/muttprint/${name}.tar.gz";
-      sha256 = "1dny4niyibfgazwlzfcnb37jy6k140rs6baaj629z12rmahfdavw";
-    };
-    patches = [
-      ./patches/muttprint_0.73-4.diff.gz
-      ./patches/muttprint_regex.patch
-      ./patches/muttprint_two_edge.patch
-      ];
-    preConfigure = ''
-      aclocal
-      automake --add-missing --copy
-      autoconf
-      '';
-    preBuild = ''
-      cd pics
-      convert -flop BabyTuX.eps BabyTuX.eps
-      for i in BabyTuX_color.eps BabyTuX.eps Debian_color.eps \
-          Debian.eps Gentoo.eps Gentoo_color.eps ; do
-        convert $i $(basename $i .eps).png
-      done
-      convert penguin.eps penguin.jpg
-      cd ..
-      '';
-    postInstall = ''
-      perlFlags=
-      for i in $(IFS=:; echo $PERL5LIB); do
-          perlFlags="$perlFlags -I$i"
-      done
-
-      sed -i "$out/bin/muttprint" -e "s|^#\!\(.*[ /]perl.*\)$|#\!\1$perlFlags|"
-      sed -i "$out/bin/muttprint" -e "s|ENV{HOME}/.muttprintrc|ENV{XDG_CONFIG_HOME}/muttprint/muttprintrc|"
-
-      wrapProgram $out/bin/muttprint \
-        --prefix PATH : ${lib.makeBinPath [ psutils dialog
-        (texlive.combine { inherit (texlive) scheme-basic utopia fancyvrb lastpage marvosym ucs cm-super; }) ]}
-      '';
-    buildInputs = [ makeWrapper automake autoconf imagemagick ghostscript perl ] ++
-      (with perlPackages; [ TimeDate FileWhich TextIconv ]);
-  };
-
   mypkgs.yarn2nix = yarn2nixPackage.yarn2nix;
 
   mypkgs.cardano = let

diff --git a/fetched/cnagios.json b/pkgs/cnagios/cnagios.json
similarity index 100%
rename from fetched/cnagios.json
rename to pkgs/cnagios/cnagios.json

diff --git a/pkgs/cnagios/default.nix b/pkgs/cnagios/default.nix
new file mode 100644 (file)
index 0000000..2e6c799
--- /dev/null
+++ b/pkgs/cnagios/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchedGithub, perl, ncurses }:
+stdenv.mkDerivation (fetchedGithub ./cnagios.json // {
+  configureFlags = [
+    "--with-etc-dir=/etc/cnagios"
+    "--with-var-dir=/var/lib/naemon"
+    "--with-status-file=/var/lib/naemon/status.dat"
+    "--with-nagios-data=4"
+  ];
+
+  prePatch = ''
+    sed -i -e "s/-lcurses/-lncurses/" Makefile.in
+  '';
+  installPhase = ''
+    install -dm755 $out/share/doc/cnagios
+    install -Dm644 cnagiosrc $out/share/doc/cnagios/
+    install -Dm644 cnagios.help $out/share/doc/cnagios/
+    install -Dm644 cnagios.pl $out/share/doc/cnagios/
+    install -dm755 $out/bin
+    install -Dm755 cnagios $out/bin/
+  '';
+  buildInputs = [ perl ncurses ];
+})

diff --git a/pkgs/mutt-ics/default.nix b/pkgs/mutt-ics/default.nix
new file mode 100644 (file)
index 0000000..26f95eb
--- /dev/null
+++ b/pkgs/mutt-ics/default.nix
@@ -0,0 +1,5 @@
+{ python3Packages, fetchedGithub }:
+with python3Packages;
+buildPythonApplication (fetchedGithub ./mutt-ics.json // {
+  propagatedBuildInputs = [ icalendar ];
+})

diff --git a/fetched/mutt-ics.json b/pkgs/mutt-ics/mutt-ics.json
similarity index 100%
rename from fetched/mutt-ics.json
rename to pkgs/mutt-ics/mutt-ics.json

diff --git a/patches/muttprint_0.73-4.diff.gz b/pkgs/muttprint/0.73-4.diff.gz
similarity index 100%
rename from patches/muttprint_0.73-4.diff.gz
rename to pkgs/muttprint/0.73-4.diff.gz

diff --git a/pkgs/muttprint/default.nix b/pkgs/muttprint/default.nix
new file mode 100644 (file)
index 0000000..0863a7b
--- /dev/null
+++ b/pkgs/muttprint/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, lib, psutils, dialog, texlive, makeWrapper, automake, autoconf, imagemagick, ghostscript, perl, perlPackages }:
+stdenv.mkDerivation rec {
+  name = "muttprint-${version}";
+  version = "0.73";
+  src = fetchurl {
+    url = "http://downloads.sf.net/muttprint/${name}.tar.gz";
+    sha256 = "1dny4niyibfgazwlzfcnb37jy6k140rs6baaj629z12rmahfdavw";
+  };
+  patches = [
+    ./0.73-4.diff.gz
+    ./regex.patch
+    ./two_edge.patch
+    ];
+  preConfigure = ''
+    aclocal
+    automake --add-missing --copy
+    autoconf
+    '';
+  preBuild = ''
+    cd pics
+    convert -flop BabyTuX.eps BabyTuX.eps
+    for i in BabyTuX_color.eps BabyTuX.eps Debian_color.eps \
+        Debian.eps Gentoo.eps Gentoo_color.eps ; do
+      convert $i $(basename $i .eps).png
+    done
+    convert penguin.eps penguin.jpg
+    cd ..
+    '';
+  postInstall = ''
+    perlFlags=
+    for i in $(IFS=:; echo $PERL5LIB); do
+        perlFlags="$perlFlags -I$i"
+    done
+
+    sed -i "$out/bin/muttprint" -e "s|^#\!\(.*[ /]perl.*\)$|#\!\1$perlFlags|"
+    sed -i "$out/bin/muttprint" -e "s|ENV{HOME}/.muttprintrc|ENV{XDG_CONFIG_HOME}/muttprint/muttprintrc|"
+
+    wrapProgram $out/bin/muttprint \
+      --prefix PATH : ${lib.makeBinPath [ psutils dialog
+      (texlive.combine { inherit (texlive) scheme-basic utopia fancyvrb lastpage marvosym ucs cm-super; }) ]}
+    '';
+  buildInputs = [ makeWrapper automake autoconf imagemagick ghostscript perl ] ++
+    (with perlPackages; [ TimeDate FileWhich TextIconv ]);
+}

diff --git a/patches/muttprint_regex.patch b/pkgs/muttprint/regex.patch
similarity index 100%
rename from patches/muttprint_regex.patch
rename to pkgs/muttprint/regex.patch

diff --git a/patches/muttprint_two_edge.patch b/pkgs/muttprint/two_edge.patch
similarity index 100%
rename from patches/muttprint_two_edge.patch
rename to pkgs/muttprint/two_edge.patch

diff --git a/pkgs/nagios-cli/default.nix b/pkgs/nagios-cli/default.nix
new file mode 100644 (file)
index 0000000..35e3790
--- /dev/null
+++ b/pkgs/nagios-cli/default.nix
@@ -0,0 +1,2 @@
+{ python2Packages, fetchedGithub }:
+python2Packages.buildPythonApplication (fetchedGithub ./nagios-cli.json)

diff --git a/fetched/nagios-cli.json b/pkgs/nagios-cli/nagios-cli.json
similarity index 100%
rename from fetched/nagios-cli.json
rename to pkgs/nagios-cli/nagios-cli.json

diff --git a/pkgs/nagnu/default.nix b/pkgs/nagnu/default.nix
new file mode 100644 (file)
index 0000000..0056393
--- /dev/null
+++ b/pkgs/nagnu/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchedGithub, ncurses, curl }:
+stdenv.mkDerivation (fetchedGithub ./nagnu.json // rec {
+  buildInputs = [ ncurses curl ];
+  installPhase = ''
+    mkdir -p $out/bin
+    cp nagnu $out/bin
+    mkdir -p $out/share/doc/nagnu
+    cp nagnu.conf.sample $out/share/doc/nagnu
+    mkdir -p $out/share/man/man8
+    cp docs/nagnu.8 $out/share/man/man8
+    '';
+})

diff --git a/fetched/nagnu.json b/pkgs/nagnu/nagnu.json
similarity index 100%
rename from fetched/nagnu.json
rename to pkgs/nagnu/nagnu.json

diff --git a/pkgs/pg_activity/default.nix b/pkgs/pg_activity/default.nix
new file mode 100644 (file)
index 0000000..f47884a
--- /dev/null
+++ b/pkgs/pg_activity/default.nix
@@ -0,0 +1,5 @@
+{ python2Packages, fetchedGithub }:
+with python2Packages;
+buildPythonApplication (fetchedGithub ./pg_activity.json // {
+  propagatedBuildInputs = [ psycopg2 psutil ];
+})

diff --git a/fetched/pg_activity.json b/pkgs/pg_activity/pg_activity.json
similarity index 100%
rename from fetched/pg_activity.json
rename to pkgs/pg_activity/pg_activity.json

diff --git a/pkgs/pgloader/default.nix b/pkgs/pgloader/default.nix
new file mode 100644 (file)
index 0000000..e4f24ea
--- /dev/null
+++ b/pkgs/pgloader/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchedGithub, sbcl, cacert, sqlite, freetds, libzip, curl, git, openssl, makeWrapper }:
+stdenv.mkDerivation (fetchedGithub ./pgloader.json // {
+  buildInputs = [ sbcl cacert sqlite freetds libzip curl git openssl makeWrapper ];
+  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ];
+  buildPhase = ''
+    export PATH=$PATH:$out/bin
+    export HOME=$TMPDIR
+    make pgloader
+  '';
+  dontStrip = true;
+  enableParallelBuilding = false;
+  installPhase = ''
+    install -Dm755 build/bin/pgloader "$out/bin/pgloader"
+    wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH"
+  '';
+})

diff --git a/fetched/pgloader.json b/pkgs/pgloader/pgloader.json
similarity index 100%
rename from fetched/pgloader.json
rename to pkgs/pgloader/pgloader.json

diff --git a/pkgs/telegram-cli/default.nix b/pkgs/telegram-cli/default.nix
new file mode 100644 (file)
index 0000000..4b82b35
--- /dev/null
+++ b/pkgs/telegram-cli/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchedGithub, pkgconfig, libevent, lua, jansson, openssl, readline, zlib, libconfig }:
+stdenv.mkDerivation (fetchedGithub ./telegram-cli.json // {
+  patches = [
+    ./telegram-cli.patch
+    ];
+  buildInputs = [ pkgconfig libevent lua jansson openssl readline zlib libconfig ];
+  preBuild = ''
+    sed -i -e 's@"/etc/" PROG_NAME "/server.pub"@"'$out'/etc/server.pub"@' main.c
+    '';
+  installPhase = ''
+    mkdir -p $out
+    install -Dm755 bin/telegram-cli $out/bin/telegram-cli
+    install -Dm644 tg-server.pub $out/etc/server.pub
+    install -Dm644 debian/telegram-cli.8 $out/man/man8/telegram-cli.8
+    '';
+})

diff --git a/fetched/telegram-cli.json b/pkgs/telegram-cli/telegram-cli.json
similarity index 100%
rename from fetched/telegram-cli.json
rename to pkgs/telegram-cli/telegram-cli.json

diff --git a/patches/telegram-cli.patch b/pkgs/telegram-cli/telegram-cli.patch
similarity index 100%
rename from patches/telegram-cli.patch
rename to pkgs/telegram-cli/telegram-cli.patch

diff --git a/pkgs/telegram-history-dump/default.nix b/pkgs/telegram-history-dump/default.nix
new file mode 100644 (file)
index 0000000..9215d5b
--- /dev/null
+++ b/pkgs/telegram-history-dump/default.nix
@@ -0,0 +1,9 @@
+{ stdenv, ruby, fetchedGithub }:
+stdenv.mkDerivation (fetchedGithub ./telegram-history-dump.json // {
+  installPhase = ''
+    mkdir -p $out/lib $out/bin
+    cp -a $src $out/lib/telegram-history-dump
+    ln -s $out/lib/telegram-history-dump/telegram-history-dump.rb $out/bin/telegram-history-dump
+    '';
+  buildInputs = [ ruby ];
+})

diff --git a/fetched/telegram-history-dump.json b/pkgs/telegram-history-dump/telegram-history-dump.json
similarity index 100%
rename from fetched/telegram-history-dump.json
rename to pkgs/telegram-history-dump/telegram-history-dump.json