X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=pkgs%2Fdefault.nix;h=74f9d184b2703cee2d97f7f069dbe669ad567eee;hp=8a991eb30f9d9cff1e8f5a59e371f6929fe98a86;hb=411af8e3f754278c5b54dfef7e1bd144a6007c39;hpb=1017ce8ed4eb5eef826bf7a55a132923439cd978

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 8a991eb..74f9d18 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,8 +1,9 @@
 { pkgs }:
 with pkgs;
-let mylibs = import ../libs.nix { inherit pkgs; };
+let
+  mylibs = import ../lib { inherit pkgs; };
 in
-{
+rec {
   boinctui = callPackage ../pkgs/boinctui {};
   cnagios = callPackage ../pkgs/cnagios { inherit mylibs; };
   duply = callPackage ../pkgs/duply {};
@@ -17,8 +18,10 @@ in
   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 {}; };
@@ -37,5 +40,14 @@ in
   bitlbee-mastodon = callPackage ./bitlbee-mastodon {};
 
   composerEnv = callPackage ./composer-env {};
-  webapps = callPackage ./webapps { inherit mylibs; };
+  webapps = callPackage ./webapps { inherit mylibs composerEnv private; };
+
+  private = if builtins.pathExists (./. + "/private")
+    then import ./private { inherit pkgs; }
+    else { webapps = {}; };
+
+  python3PackagesPlus = callPackage ./python-packages {
+    python = python3;
+    inherit mylibs;
+  };
 }