From dff8b5932bd45c9b3c21209e076b0c0d140bc2f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 26 Apr 2019 14:05:15 +0200 Subject: [PATCH] Use mylibs explicitly in pkgs --- default.nix | 31 ++++++++++---------------- pkgs/cnagios/default.nix | 4 ++-- pkgs/crypto/cardano/default.nix | 4 ++-- pkgs/crypto/iota-cli-app/default.nix | 4 ++-- pkgs/flrn/default.nix | 4 ++-- pkgs/mutt-ics/default.nix | 4 ++-- pkgs/nagios-cli/default.nix | 4 ++-- pkgs/nagnu/default.nix | 4 ++-- pkgs/pg_activity/default.nix | 4 ++-- pkgs/pgloader/default.nix | 4 ++-- pkgs/telegram-cli/default.nix | 4 ++-- pkgs/telegram-history-dump/default.nix | 4 ++-- pkgs/telegramircd/default.nix | 4 ++-- 13 files changed, 36 insertions(+), 43 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 { 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; diff --git a/pkgs/cnagios/default.nix b/pkgs/cnagios/default.nix index 2e6c799..d5b52f3 100644 --- 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" diff --git a/pkgs/crypto/cardano/default.nix b/pkgs/crypto/cardano/default.nix index b7cfb9f..881928d 100644 --- a/pkgs/crypto/cardano/default.nix +++ b/pkgs/crypto/cardano/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchedGithub }: +{ stdenv, mylibs }: 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; diff --git a/pkgs/crypto/iota-cli-app/default.nix b/pkgs/crypto/iota-cli-app/default.nix index a027098..b945fd9 100644 --- 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; @@ -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 { - src = stdenv.mkDerivation (fetchedGithub ./iota-cli-app.json // { + src = stdenv.mkDerivation (mylibs.fetchedGithub ./iota-cli-app.json // { phases = "installPhase"; installPhase = '' cp -a $src $out diff --git a/pkgs/flrn/default.nix b/pkgs/flrn/default.nix index 4240c57..f288615 100644 --- 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 diff --git a/pkgs/mutt-ics/default.nix b/pkgs/mutt-ics/default.nix index 26f95eb..a8a529b 100644 --- a/pkgs/mutt-ics/default.nix +++ b/pkgs/mutt-ics/default.nix @@ -1,5 +1,5 @@ -{ python3Packages, fetchedGithub }: +{ python3Packages, mylibs }: with python3Packages; -buildPythonApplication (fetchedGithub ./mutt-ics.json // { +buildPythonApplication (mylibs.fetchedGithub ./mutt-ics.json // { propagatedBuildInputs = [ icalendar ]; }) diff --git a/pkgs/nagios-cli/default.nix b/pkgs/nagios-cli/default.nix index 35e3790..7d7e7cc 100644 --- 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 0056393..2b9c0ec 100644 --- 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 diff --git a/pkgs/pg_activity/default.nix b/pkgs/pg_activity/default.nix index f47884a..a20ee8a 100644 --- a/pkgs/pg_activity/default.nix +++ b/pkgs/pg_activity/default.nix @@ -1,5 +1,5 @@ -{ python2Packages, fetchedGithub }: +{ python2Packages, mylibs }: with python2Packages; -buildPythonApplication (fetchedGithub ./pg_activity.json // { +buildPythonApplication (mylibs.fetchedGithub ./pg_activity.json // { propagatedBuildInputs = [ psycopg2 psutil ]; }) diff --git a/pkgs/pgloader/default.nix b/pkgs/pgloader/default.nix index e4f24ea..c2c03e7 100644 --- 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 = '' diff --git a/pkgs/telegram-cli/default.nix b/pkgs/telegram-cli/default.nix index 4b82b35..6987748 100644 --- 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 ]; diff --git a/pkgs/telegram-history-dump/default.nix b/pkgs/telegram-history-dump/default.nix index 9215d5b..050b351 100644 --- 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 diff --git a/pkgs/telegramircd/default.nix b/pkgs/telegramircd/default.nix index 8c8bddc..2f1d7ca 100644 --- 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 ]; - 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 -- 2.41.0