Squash changes containing private information

There were a lot of changes since the previous commit, but a lot of them
contained personnal information about users. All thos changes got
stashed into a single commit (history is kept in a different place) and
private information was moved in a separate private repository

2 files changed, 0 insertions, 50 deletions

diff --git a/pkgs/naemon/default.nix b/pkgs/naemon/default.nix
deleted file mode 100644
index 0341296..0000000
--- a/pkgs/naemon/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, mylibs, help2man, monitoring-plugins, autoconf, automake,
-  libtool, glib, pkg-config, gperf,
-  varDir ? "/var/lib/naemon",
-  etcDir ? "/etc/naemon",
-  cacheDir ? "/var/cache/naemon",
-  logDir ? "/var/log/naemon",
-  runDir ? "/run/naemon",
-  user   ? "naemon",
-  group  ? "naemon"
-}:
-stdenv.mkDerivation (mylibs.fetchedGithub ./naemon.json // {
-  passthru.status_engine_version = "1-1-0";
-  preConfigure = ''
-    ./autogen.sh || true
-    '';
-
-  configureFlags = [
-    "--localstatedir=${varDir}"
-    "--sysconfdir=${etcDir}"
-    "--with-pkgconfdir=${etcDir}"
-    "--with-pluginsdir=${monitoring-plugins}/libexec"
-    "--with-tempdir=${cacheDir}"
-    "--with-checkresultdir=${cacheDir}/checkresults"
-    "--with-logdir=${logDir}"
-    "--with-naemon-user=${user}"
-    "--with-naemon-group=${group}"
-    "--with-lockfile=${runDir}/naemon.pid"
-  ];
-
-  preInstall = ''
-    substituteInPlace Makefile --replace '$(MAKE) $(AM_MAKEFLAGS) install-exec-hook' ""
-  '';
-
-  buildInputs = [ autoconf automake help2man libtool glib pkg-config gperf ];
-})
diff --git a/pkgs/naemon/naemon.json b/pkgs/naemon/naemon.json
deleted file mode 100644
index 2dc9809..0000000
--- a/pkgs/naemon/naemon.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "tag": "d7ac1c8-master",
-  "meta": {
-    "name": "naemon",
-    "url": "https://github.com/naemon/naemon-core",
-    "branch": "master"
-  },
-  "github": {
-    "owner": "naemon",
-    "repo": "naemon-core",
-    "rev": "d7ac1c824e01dbb1c4a6bd0550b324e7cf165d54",
-    "sha256": "003grwciplnqfn9jh2km2pm6xxp8fxvmwihg3vmch8f0vfwcmv1m",
-    "fetchSubmodules": true
-  }
-}