X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fdefault.nix;h=297f524d469f317d1f33fe8c8637eaaee7883afd;hb=dbcba2ea2b7301aaa7e6487c2589b09ef09ba066;hp=3c09e3076168938c40c04cfe648b8835c4a1e9c7;hpb=fdf6f74d3221e3dad853898f296149baea0aa476;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 3c09e30..297f524 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,34 +1,51 @@
 { pkgs }:
 with pkgs;
-{
+let
+  mylibs = import ../lib { inherit pkgs; };
+in
+rec {
   boinctui = callPackage ../pkgs/boinctui {};
-  cnagios = callPackage ../pkgs/cnagios {};
+  cnagios = callPackage ../pkgs/cnagios { inherit mylibs; };
   duply = callPackage ../pkgs/duply {};
-  flrn = callPackage ../pkgs/flrn { slang = callPackage ../pkgs/slang_1 {}; };
+  flrn = callPackage ../pkgs/flrn { inherit mylibs; slang = callPackage ../pkgs/slang_1 {}; };
   genius = callPackage ../pkgs/genius {};
   mtop = callPackage ../pkgs/mtop {};
   muttprint = callPackage ../pkgs/muttprint {};
-  mutt-ics = callPackage ../pkgs/mutt-ics {};
-  nagios-cli = callPackage ../pkgs/nagios-cli {};
-  nagnu = callPackage ../pkgs/nagnu {};
+  mutt-ics = callPackage ../pkgs/mutt-ics { inherit mylibs; };
+  nagios-cli = callPackage ../pkgs/nagios-cli { inherit mylibs; };
+  nagnu = callPackage ../pkgs/nagnu { inherit mylibs; };
   note = callPackage ../pkgs/note {};
   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 {};
-  pg_activity = callPackage ../pkgs/pg_activity {};
-  pgloader = callPackage ../pkgs/pgloader {};
-  telegram-cli = callPackage ../pkgs/telegram-cli {};
-  telegram-history-dump = callPackage ../pkgs/telegram-history-dump {};
-  telegramircd = callPackage ../pkgs/telegramircd { telethon = callPackage ../pkgs/telethon_sync {}; };
+  pg_activity = callPackage ../pkgs/pg_activity { inherit mylibs; };
+  pgloader = callPackage ../pkgs/pgloader { 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 {}; };
   terminal-velocity = callPackage ../pkgs/terminal-velocity {};
   tiv = callPackage ../pkgs/tiv {};
   unicodeDoc = callPackage ../pkgs/unicode {};
 
-  cardano = callPackage ../pkgs/crypto/cardano {};
-  iota-cli-app = callPackage ../pkgs/crypto/iota-cli-app {};
+  cardano = callPackage ../pkgs/crypto/cardano { inherit mylibs; };
+  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; };
+
+  private = if builtins.pathExists (./. + "/private")
+    then import ./private { inherit pkgs; }
+    else { webapps = {}; };
+
+  python3PackagesPlus = callPackage ./python-packages {
+    python = python3;
+    inherit mylibs;
+  };
 }