Use mylibs explicitly in pkgs

1 files changed, 12 insertions, 19 deletions

diff --git a/default.nix b/default.nix
index 1bac63e..5d9e138 100644
--- a/default.nix
+++ b/default.nix
@@ -1,39 +1,32 @@
 with import <nixpkgs> { overlays = builtins.attrValues (import ./overlays); };
-with mylibs;
   # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh
   # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks
   {
     boinctui = callPackage ./pkgs/boinctui {};
-    cnagios = callPackage ./pkgs/cnagios { inherit fetchedGithub; };
+    cnagios = callPackage ./pkgs/cnagios {};
     duply = callPackage ./pkgs/duply {};
-    flrn = callPackage ./pkgs/flrn {
-      slang = callPackage ./pkgs/slang_1 {};
-      inherit fetchedGithub;
-    };
+    flrn = callPackage ./pkgs/flrn { slang = callPackage ./pkgs/slang_1 {}; };
     genius = callPackage ./pkgs/genius {};
     mtop = callPackage ./pkgs/mtop {};
     muttprint = callPackage ./pkgs/muttprint {};
-    mutt-ics = callPackage ./pkgs/mutt-ics { inherit fetchedGithub; };
-    nagios-cli = callPackage ./pkgs/nagios-cli { inherit fetchedGithub; };
-    #nagnu = callPackage ./pkgs/nagnu { inherit fetchedGithub; };
+    mutt-ics = callPackage ./pkgs/mutt-ics {};
+    nagios-cli = callPackage ./pkgs/nagios-cli {};
+    #nagnu = callPackage ./pkgs/nagnu {};
     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 { inherit fetchedGithub; };
-    pgloader = callPackage ./pkgs/pgloader { inherit fetchedGithub; };
-    telegram-cli = callPackage ./pkgs/telegram-cli { inherit fetchedGithub; };
-    telegram-history-dump = callPackage ./pkgs/telegram-history-dump { inherit fetchedGithub; };
-    telegramircd = callPackage ./pkgs/telegramircd {
-      telethon = callPackage ./pkgs/telethon_sync {};
-      inherit fetchedGithub;
-    };
+    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 {}; };
     terminal-velocity = callPackage ./pkgs/terminal-velocity {};
     tiv = callPackage ./pkgs/tiv {};
     unicode = callPackage ./pkgs/unicode {};
 
-    cardano = callPackage ./pkgs/crypto/cardano { inherit fetchedGithub; };
-    iota-cli-app = callPackage ./pkgs/crypto/iota-cli-app { inherit fetchedGithub; };
+    cardano = callPackage ./pkgs/crypto/cardano {};
+    iota-cli-app = callPackage ./pkgs/crypto/iota-cli-app {};
     sia = callPackage ./pkgs/crypto/sia {};
   } // { # overlays
     inherit weboob;