Use mylibs explicitly in pkgs

diff --git a/default.nix b/default.nix
index 1bac63e08df807b70927dca0a71aaf97044ef8e2..5d9e138620d10d44a2864688a5fc38f3c2d4f600 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -1,39 +1,32 @@
 with import <nixpkgs> { overlays = builtins.attrValues (import ./overlays); };
 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 {};
   # 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 {};
     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 {};
     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 {};
     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 {};
 
     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;
     sia = callPackage ./pkgs/crypto/sia {};
   } // { # overlays
     inherit weboob;

diff --git a/pkgs/cnagios/default.nix b/pkgs/cnagios/default.nix
index 2e6c799b31f50ad044f0286cc5ef24cd8d49f1f3..d5b52f3f6e8ba983246cee4a098995ced09ae668 100644 (file)
--- a/pkgs/cnagios/default.nix
+++ b/pkgs/cnagios/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchedGithub, perl, ncurses }:
-stdenv.mkDerivation (fetchedGithub ./cnagios.json // {
+{ stdenv, mylibs, perl, ncurses }:
+stdenv.mkDerivation (mylibs.fetchedGithub ./cnagios.json // {

   configureFlags = [
     "--with-etc-dir=/etc/cnagios"
     "--with-var-dir=/var/lib/naemon"
   configureFlags = [
     "--with-etc-dir=/etc/cnagios"
     "--with-var-dir=/var/lib/naemon"

diff --git a/pkgs/crypto/cardano/default.nix b/pkgs/crypto/cardano/default.nix
index b7cfb9f3d13c467af0c97e206f209ea1ff90ff6e..881928dc2a4ae9b1474188d04c1044eac23a11e4 100644 (file)
--- a/pkgs/crypto/cardano/default.nix
+++ b/pkgs/crypto/cardano/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchedGithub }:
+{ stdenv, mylibs }:

 let
 let

-  daedalusOrig = (import (fetchedGithub ./daedalus.json).src {}).daedalus;
+  daedalusOrig = (import (mylibs.fetchedGithub ./daedalus.json).src {}).daedalus;

   cfg = stdenv.mkDerivation rec {
     name = "launcher-config-custom";
     src = daedalusOrig.cfg;
   cfg = stdenv.mkDerivation rec {
     name = "launcher-config-custom";
     src = daedalusOrig.cfg;

diff --git a/pkgs/crypto/iota-cli-app/default.nix b/pkgs/crypto/iota-cli-app/default.nix
index a027098305482e36f566b3bdebd912c0901f5eec..b945fd901a3e283dd4648c1a42ea6b786eff7cc6 100644 (file)
--- a/pkgs/crypto/iota-cli-app/default.nix
+++ b/pkgs/crypto/iota-cli-app/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchedGithub, fetchurl, fetchgit, callPackage, nodePackages, nodejs-8_x }:
+{ stdenv, mylibs, fetchurl, fetchgit, callPackage, nodePackages, nodejs-8_x }:

 let
   nodeEnv = callPackage "${nodePackages.node2nix}/lib/node_modules/node2nix/nix/node-env.nix" {
     nodejs = nodejs-8_x;
 let
   nodeEnv = callPackage "${nodePackages.node2nix}/lib/node_modules/node2nix/nix/node-env.nix" {
     nodejs = nodejs-8_x;


@@ -6,7 +6,7 @@ let
   # built using node2nix -8 -l package-lock.json
   # and changing "./." to "src"
   packageEnv = import ./iota-cli-app-node-packages.nix {
   # built using node2nix -8 -l package-lock.json
   # and changing "./." to "src"
   packageEnv = import ./iota-cli-app-node-packages.nix {

-    src = stdenv.mkDerivation (fetchedGithub ./iota-cli-app.json // {
+    src = stdenv.mkDerivation (mylibs.fetchedGithub ./iota-cli-app.json // {

       phases = "installPhase";
       installPhase = ''
         cp -a $src $out
       phases = "installPhase";
       installPhase = ''
         cp -a $src $out

diff --git a/pkgs/flrn/default.nix b/pkgs/flrn/default.nix
index 4240c5723a58c413b5c20996441ae2a5ee739ec2..f288615a0948cd690c129fe485a16695645f713f 100644 (file)
--- a/pkgs/flrn/default.nix
+++ b/pkgs/flrn/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchedGithub, libetpan, openssl, autoconf, groff, slang, yacc }:
-stdenv.mkDerivation (fetchedGithub ./flrn.json // {
+{ stdenv, mylibs, libetpan, openssl, autoconf, groff, slang, yacc }:
+stdenv.mkDerivation (mylibs.fetchedGithub ./flrn.json // {

   buildInputs = [ libetpan openssl autoconf groff slang yacc ];
   preConfigure = ''
     sed -i -e "s/test -e configure/false/" configure.in
   buildInputs = [ libetpan openssl autoconf groff slang yacc ];
   preConfigure = ''
     sed -i -e "s/test -e configure/false/" configure.in

diff --git a/pkgs/mutt-ics/default.nix b/pkgs/mutt-ics/default.nix
index 26f95eb602d0970f0b512b72790ac13730f7ba79..a8a529b93ca16b075300c8ff586fbff871f9e664 100644 (file)
--- a/pkgs/mutt-ics/default.nix
+++ b/pkgs/mutt-ics/default.nix
@@ -1,5 +1,5 @@
-{ python3Packages, fetchedGithub }:
+{ python3Packages, mylibs }:

 with python3Packages;
 with python3Packages;

-buildPythonApplication (fetchedGithub ./mutt-ics.json // {
+buildPythonApplication (mylibs.fetchedGithub ./mutt-ics.json // {

   propagatedBuildInputs = [ icalendar ];
 })
   propagatedBuildInputs = [ icalendar ];
 })

diff --git a/pkgs/nagios-cli/default.nix b/pkgs/nagios-cli/default.nix
index 35e3790ef823852ffdb7569fdfdcc4b74b9b6c72..7d7e7cc2c6c53ee32efaff87f2a161c464b2d6cd 100644 (file)
--- a/pkgs/nagios-cli/default.nix
+++ b/pkgs/nagios-cli/default.nix
@@ -1,2 +1,2 @@
-{ python2Packages, fetchedGithub }:
-python2Packages.buildPythonApplication (fetchedGithub ./nagios-cli.json)
+{ python2Packages, mylibs }:
+python2Packages.buildPythonApplication (mylibs.fetchedGithub ./nagios-cli.json)

diff --git a/pkgs/nagnu/default.nix b/pkgs/nagnu/default.nix
index 00563937841d9768d759f47fbfa6bb6b89c9c90b..2b9c0ecc6ccaa67051b8412202e718d0ed788524 100644 (file)
--- a/pkgs/nagnu/default.nix
+++ b/pkgs/nagnu/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchedGithub, ncurses, curl }:
-stdenv.mkDerivation (fetchedGithub ./nagnu.json // rec {
+{ stdenv, mylibs, ncurses, curl }:
+stdenv.mkDerivation (mylibs.fetchedGithub ./nagnu.json // rec {

   buildInputs = [ ncurses curl ];
   installPhase = ''
     mkdir -p $out/bin
   buildInputs = [ ncurses curl ];
   installPhase = ''
     mkdir -p $out/bin

diff --git a/pkgs/pg_activity/default.nix b/pkgs/pg_activity/default.nix
index f47884a2b972d8783c72df38f79277822fcec084..a20ee8a4a0ff548a5642036d01ac57323cfe7a0a 100644 (file)
--- a/pkgs/pg_activity/default.nix
+++ b/pkgs/pg_activity/default.nix
@@ -1,5 +1,5 @@
-{ python2Packages, fetchedGithub }:
+{ python2Packages, mylibs }:

 with python2Packages;
 with python2Packages;

-buildPythonApplication (fetchedGithub ./pg_activity.json // {
+buildPythonApplication (mylibs.fetchedGithub ./pg_activity.json // {

   propagatedBuildInputs = [ psycopg2 psutil ];
 })
   propagatedBuildInputs = [ psycopg2 psutil ];
 })

diff --git a/pkgs/pgloader/default.nix b/pkgs/pgloader/default.nix
index e4f24eafe656201d77cbf9238adc75577201ea0d..c2c03e7e228da581c64f4d971d5bb0d1c7986b30 100644 (file)
--- a/pkgs/pgloader/default.nix
+++ b/pkgs/pgloader/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchedGithub, sbcl, cacert, sqlite, freetds, libzip, curl, git, openssl, makeWrapper }:
-stdenv.mkDerivation (fetchedGithub ./pgloader.json // {
+{ stdenv, mylibs, sbcl, cacert, sqlite, freetds, libzip, curl, git, openssl, makeWrapper }:
+stdenv.mkDerivation (mylibs.fetchedGithub ./pgloader.json // {

   buildInputs = [ sbcl cacert sqlite freetds libzip curl git openssl makeWrapper ];
   LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ];
   buildPhase = ''
   buildInputs = [ sbcl cacert sqlite freetds libzip curl git openssl makeWrapper ];
   LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ];
   buildPhase = ''

diff --git a/pkgs/telegram-cli/default.nix b/pkgs/telegram-cli/default.nix
index 4b82b352d8f94d874e0e08eb0fdd4ea4ba189ac4..6987748d9cad2cc6f22ec10472cdd2ad0ce3fa0c 100644 (file)
--- a/pkgs/telegram-cli/default.nix
+++ b/pkgs/telegram-cli/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchedGithub, pkgconfig, libevent, lua, jansson, openssl, readline, zlib, libconfig }:
-stdenv.mkDerivation (fetchedGithub ./telegram-cli.json // {
+{ stdenv, mylibs, pkgconfig, libevent, lua, jansson, openssl, readline, zlib, libconfig }:
+stdenv.mkDerivation (mylibs.fetchedGithub ./telegram-cli.json // {

   patches = [
     ./telegram-cli.patch
     ];
   patches = [
     ./telegram-cli.patch
     ];

diff --git a/pkgs/telegram-history-dump/default.nix b/pkgs/telegram-history-dump/default.nix
index 9215d5b6a81f12b6cc3afeddd0236c1cf84c1577..050b3511599c78d0959b2105a8a31454dc51cb4e 100644 (file)
--- a/pkgs/telegram-history-dump/default.nix
+++ b/pkgs/telegram-history-dump/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, ruby, fetchedGithub }:
-stdenv.mkDerivation (fetchedGithub ./telegram-history-dump.json // {
+{ stdenv, ruby, mylibs }:
+stdenv.mkDerivation (mylibs.fetchedGithub ./telegram-history-dump.json // {

   installPhase = ''
     mkdir -p $out/lib $out/bin
     cp -a $src $out/lib/telegram-history-dump
   installPhase = ''
     mkdir -p $out/lib $out/bin
     cp -a $src $out/lib/telegram-history-dump

diff --git a/pkgs/telegramircd/default.nix b/pkgs/telegramircd/default.nix
index 8c8bddc60effb57006cdb027b92329211afb12de..2f1d7ca57a57e133202b3138609999fafcf95c2e 100644 (file)
--- a/pkgs/telegramircd/default.nix
+++ b/pkgs/telegramircd/default.nix
@@ -1,11 +1,11 @@
-{ openssl, telethon, python3Packages, fetchedGithub }:
+{ openssl, telethon, python3Packages, mylibs }:

 with python3Packages;
 buildPythonApplication rec {
   format = "other";
   pname = "telegramircd";
   version = "master";
   propagatedBuildInputs = [ telethon aiohttp ConfigArgParse openssl ];
 with python3Packages;
 buildPythonApplication rec {
   format = "other";
   pname = "telegramircd";
   version = "master";
   propagatedBuildInputs = [ telethon aiohttp ConfigArgParse openssl ];

-  src = (fetchedGithub ./telegramircd.json).src;
+  src = (mylibs.fetchedGithub ./telegramircd.json).src;

   LD_LIBRARY_PATH = "${openssl.out}/lib";
   installPhase = ''
     install -D $src/telegramircd.py $out/bin/telegramircd
   LD_LIBRARY_PATH = "${openssl.out}/lib";
   installPhase = ''
     install -D $src/telegramircd.py $out/bin/telegramircd