X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fdefault.nix;h=e13a9a5f3648e9342b535ed72b1ea8e135a70b59;hb=7800f4d01853bccd8cb17138b21f190419b5230f;hp=26b32e1ba3e72d33d16cd41ca7401d1301585134;hpb=b798cf6d60baf5aad5438ba5936259c64d87299c;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 26b32e1..e13a9a5 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,7 +1,7 @@
 { pkgs }:
 with pkgs;
 let
-  mylibs = import ../libs.nix { inherit pkgs; };
+  mylibs = import ../lib { inherit pkgs; };
 in
 rec {
   boinctui = callPackage ../pkgs/boinctui {};
@@ -9,6 +9,7 @@ rec {
   duply = callPackage ../pkgs/duply {};
   flrn = callPackage ../pkgs/flrn { inherit mylibs; slang = callPackage ../pkgs/slang_1 {}; };
   genius = callPackage ../pkgs/genius {};
+  mates = callPackage ./mates {};
   mtop = callPackage ../pkgs/mtop {};
   muttprint = callPackage ../pkgs/muttprint {};
   mutt-ics = callPackage ../pkgs/mutt-ics { inherit mylibs; };
@@ -18,8 +19,10 @@ rec {
   notmuch-python2 = callPackage ../pkgs/notmuch/notmuch-python { pythonPackages = python2Packages; };
   notmuch-python3 = callPackage ../pkgs/notmuch/notmuch-python { pythonPackages = python3Packages; };
   notmuch-vim = callPackage ../pkgs/notmuch/notmuch-vim {};
+  openarc = callPackage ../pkgs/openarc { inherit mylibs; };
+  opendmarc = callPackage ../pkgs/opendmarc { libspf2 = callPackage ../pkgs/opendmarc/libspf2.nix {}; };
   pg_activity = callPackage ../pkgs/pg_activity { inherit mylibs; };
-  pgloader = callPackage ../pkgs/pgloader { inherit mylibs; };
+  pgloader = callPackage ../pkgs/pgloader {};
   telegram-cli = callPackage ../pkgs/telegram-cli { inherit mylibs; };
   telegram-history-dump = callPackage ../pkgs/telegram-history-dump { inherit mylibs; };
   telegramircd = callPackage ../pkgs/telegramircd { inherit mylibs; telethon = callPackage ../pkgs/telethon_sync {}; };
@@ -38,7 +41,7 @@ rec {
   bitlbee-mastodon = callPackage ./bitlbee-mastodon {};
 
   composerEnv = callPackage ./composer-env {};
-  webapps = callPackage ./webapps { inherit mylibs composerEnv; };
+  webapps = callPackage ./webapps { inherit mylibs composerEnv private; };
 
   private = if builtins.pathExists (./. + "/private")
     then import ./private { inherit pkgs; }
@@ -48,4 +51,10 @@ rec {
     python = python3;
     inherit mylibs;
   };
+  dovecot_deleted-to-trash = callPackage ./dovecot/plugins/deleted_to_trash {
+    inherit mylibs;
+  };
+  dovecot_fts-xapian = callPackage ./dovecot/plugins/fts_xapian {
+    inherit mylibs;
+  };
 }