X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fdefault.nix;h=54868ba9aaa51b593baaa931b066bd6a90f92c41;hb=981fa80354fd6f00f49446777c38f77bd8a65f65;hp=409d028f044ce1683858b893465b76ddedf70d37;hpb=b924f67103dc0f861a86020288d78de335be1ee8;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 409d028..54868ba 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,11 @@ 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 {};
+  predixy = callPackage ../pkgs/predixy { inherit mylibs; };
   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 {}; };
@@ -27,10 +31,38 @@ in
   unicodeDoc = callPackage ../pkgs/unicode {};
 
   cardano = callPackage ../pkgs/crypto/cardano { inherit mylibs; };
+  cardano-cli = callPackage ../pkgs/crypto/cardano-cli {};
   iota-cli-app = callPackage ../pkgs/crypto/iota-cli-app { inherit mylibs; };
   sia = callPackage ../pkgs/crypto/sia {};
 
   pure-ftpd = callPackage ../pkgs/pure-ftpd {};
   mpd = (callPackage ../pkgs/mpd_0_21 {}).mpd;
   mpd-small = (callPackage ../pkgs/mpd_0_21 {}).mpd-small;
+
+  bitlbee-mastodon = callPackage ./bitlbee-mastodon {};
+
+  composerEnv = callPackage ./composer-env {};
+  webapps = callPackage ./webapps { inherit mylibs composerEnv private; };
+
+  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 = {}; };
+
+  python3PackagesPlus = callPackage ./python-packages {
+    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;
+  };
 }