X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fdefault.nix;h=5b347be537d49ddc0f3100cc59488d5df3408e96;hb=a1a2455f53bde1235b221a842d3c888c51fcecac;hp=b02c63ec2c7d3e0837ad873f4a5044125bd40a0b;hpb=ea3b46ee264fc1c01d62a7f3ee538b14cb6e3dca;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/default.nix b/pkgs/default.nix
index b02c63e..5b347be 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -8,6 +8,7 @@ rec {
   myEnvironments = callPackage ../environments {};
   boinctui = callPackage ./boinctui {};
   cnagios = callPackage ./cnagios { inherit mylibs; };
+  commento = callPackage ./commento {};
   duply = callPackage ./duply {};
   flrn = callPackage ./flrn { inherit mylibs; slang = callPackage ./slang_1 {}; };
   genius = callPackage ./genius {};
@@ -16,12 +17,13 @@ rec {
   mutt-ics = callPackage ./mutt-ics { inherit mylibs; };
   nagios-cli = callPackage ./nagios-cli { inherit mylibs; };
   nagnu = callPackage ./nagnu { inherit mylibs; };
+  nb = callPackage ./nb {};
   note = callPackage ./note {};
   notmuch-python2 = callPackage ./notmuch/notmuch-python { pythonPackages = python2Packages; };
   notmuch-python3 = callPackage ./notmuch/notmuch-python { pythonPackages = python3Packages; };
   notmuch-vim = callPackage ./notmuch/notmuch-vim {};
-  openarc = callPackage ./openarc { inherit mylibs; };
-  opendmarc = callPackage ./opendmarc { libspf2 = callPackage ./opendmarc/libspf2.nix {}; };
+  openarc = (mylibs.flakeCompat ../flakes/openarc).default;
+  opendmarc = (mylibs.flakeCompat ../flakes/opendmarc).default;
   pg_activity = callPackage ./pg_activity { inherit mylibs; };
   pgloader = callPackage ./pgloader {};
   predixy = callPackage ./predixy { inherit mylibs; };
@@ -45,18 +47,17 @@ rec {
   bitlbee-mastodon = callPackage ./bitlbee-mastodon {};
 
   composerEnv = callPackage ./composer-env {};
-  webapps = callPackage ./webapps { inherit mylibs composerEnv private; };
+  webapps = callPackage ./webapps { inherit mylibs composerEnv; };
 
   monitoring-plugins = callPackage ./monitoring-plugins {};
   naemon = callPackage ./naemon { inherit mylibs monitoring-plugins; };
   naemon-livestatus = callPackage ./naemon-livestatus { inherit mylibs naemon; };
-
-  simp_le_0_17 = callPackage ./simp_le {};
-  certbot = callPackage ./certbot {};
-
-  private = if builtins.pathExists (./. + "/private")
-    then import ./private { inherit pkgs; }
-    else { webapps = {}; };
+  gearmand = callPackage ./gearmand {};
+  status_engine = {
+    module = callPackage ./status_engine/module.nix { inherit mylibs; };
+    worker = callPackage ./status_engine/worker.nix { inherit mylibs composerEnv; };
+    interface = callPackage ./status_engine/interface.nix { inherit composerEnv; };
+  };
 
   python3PackagesPlus = callPackage ./python-packages {
     python = python3;
@@ -68,13 +69,7 @@ rec {
   dovecot_fts-xapian = callPackage ./dovecot/plugins/fts_xapian {
     inherit mylibs;
   };
-  monero_0_15_0_0 = (import (builtins.fetchTarball {
-    name = "nixos-19.09";
-    url = "https://releases.nixos.org/nixos/19.09/nixos-19.09.2145.c2c5dcc00b0/nixexprs.tar.xz";
-    sha256 = "0dh8qc3lzrba5mxxxh57i1374wc7ha3c30h7wsmj5zr7bhc5zm4p";
-  }) {}).monero;
-
-  niv = (import sources.niv {}).niv;
 
   fiche = callPackage ./fiche { inherit mylibs; };
+  zrepl = callPackage ./zrepl {};
 }