From eb7404d97a7e46df1f598a74982ca06e08033a45 Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Mon, 14 Sep 2015 22:27:19 -0600 Subject: all-packages: Use callPackage where possible --- pkgs/tools/admin/webdruid/default.nix | 6 +++--- pkgs/tools/graphics/cuneiform/default.nix | 6 +++--- pkgs/tools/misc/gnokii/default.nix | 6 +++--- pkgs/tools/networking/gvpe/default.nix | 6 +++--- pkgs/tools/networking/rp-pppoe/default.nix | 6 +++--- pkgs/tools/security/bmrsa/11.nix | 4 ++-- pkgs/tools/security/metasploit/3.1.nix | 4 ++-- pkgs/tools/system/setserial/default.nix | 8 ++++---- pkgs/tools/system/vbetool/default.nix | 8 ++++---- pkgs/tools/typesetting/tex/texlive/aggregate.nix | 2 +- pkgs/tools/typesetting/tex/texlive/beamer.nix | 2 +- pkgs/tools/typesetting/tex/texlive/cm-super.nix | 4 ++-- pkgs/tools/typesetting/tex/texlive/context.nix | 4 ++-- pkgs/tools/typesetting/tex/texlive/default.nix | 9 ++++++++- pkgs/tools/typesetting/tex/texlive/extra.nix | 2 +- pkgs/tools/typesetting/tex/texlive/moderncv.nix | 2 +- pkgs/tools/typesetting/tex/texlive/moderntimeline.nix | 2 +- pkgs/tools/typesetting/tex/texlive/xcolor.nix | 2 +- pkgs/tools/video/vncrec/default.nix | 10 ++++++---- 19 files changed, 51 insertions(+), 42 deletions(-) (limited to 'pkgs/tools') diff --git a/pkgs/tools/admin/webdruid/default.nix b/pkgs/tools/admin/webdruid/default.nix index ee81b0c053d9..ee4dabf78e78 100644 --- a/pkgs/tools/admin/webdruid/default.nix +++ b/pkgs/tools/admin/webdruid/default.nix @@ -1,5 +1,5 @@ -a : -let +a @ { zlib, libpng, freetype, gd, which, libxml2, geoip, ... } : +let s = import ./src-for-default.nix; buildInputs = with a; [ zlib libpng freetype gd which libxml2 @@ -15,7 +15,7 @@ rec { /* doConfigure should be removed if not needed */ phaseNames = ["doConfigure" "doMakeInstall" "doLinks"]; - + doLinks = a.fullDepEntry ('' ln -s shared_en.xsl $out/share/webdruid/classic/shared.xsl '') ["minInit"]; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index c5d9475850e3..138ae58da064 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -1,5 +1,5 @@ -a : -let +a @ { cmake, patchelf, imagemagick, ... } : +let fetchurl = a.fetchurl; version = "1.1.0"; @@ -27,7 +27,7 @@ rec { export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib" cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"]; - + needLib64 = a.stdenv.system == "x86_64-linux"; postInstall = a.fullDepEntry('' diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index d0354a7bb6ed..c0593e5c0177 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -1,8 +1,8 @@ -a : -let +a @ { intltool, perl, gettext, libusb, pkgconfig, bluez, readline, pcsclite, libical, gtk, glib, libXpm, ... } : +let fetchurl = a.fetchurl; - s = import ./src-for-default.nix; + s = import ./src-for-default.nix; buildInputs = with a; [ perl intltool gettext libusb glib gtk pkgconfig bluez readline diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index 952771318be6..1c83e08fc3e0 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -1,5 +1,5 @@ -a : -let +a @ { openssl, gmp, nettools, iproute, zlib, ... } : +let s = import ./src-for-default.nix; buildInputs = with a; [ openssl gmp zlib @@ -22,7 +22,7 @@ rec { sed -e 's@"/sbin/ifconfig.*"@"${a.iproute}/sbin/ip link set $IFNAME address $MAC mtu $MTU"@' -i src/device-linux.C sed -e 's@/sbin/ifconfig@${a.nettools}/sbin/ifconfig@g' -i src/device-*.C '') ["minInit" "doUnpack"]; - + meta = { description = "A proteted multinode virtual network"; maintainers = [ diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index fe7f98100262..fcbb5f63d825 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -1,10 +1,10 @@ -a : -let +a @ {ppp, ...} : +let fetchurl = a.fetchurl; version = a.lib.attrByPath ["version"] "3.11" a; buildInputs = with a; [ - ppp + ppp ]; in rec { diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 5d6eaf551734..745f2a04cd37 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -1,5 +1,5 @@ -args : -let +args @ {unzip, ... } : +let lib = args.lib; fetchurl = args.fetchurl; fullDepEntry = args.fullDepEntry; diff --git a/pkgs/tools/security/metasploit/3.1.nix b/pkgs/tools/security/metasploit/3.1.nix index e02ce1316ba9..c3aab9b709e3 100644 --- a/pkgs/tools/security/metasploit/3.1.nix +++ b/pkgs/tools/security/metasploit/3.1.nix @@ -1,4 +1,4 @@ -args : with args; +args @ { makeWrapper, ... }: with args; rec { src = fetchurl { url = http://www.packetstormsecurity.nl/UNIX/utilities/framework-3.1.tar.gz; @@ -21,7 +21,7 @@ rec { /* doConfigure should be specified separately */ phaseNames = ["doInstall" (doPatchShebangs "$out/share/msf")]; - + name = "metasploit-framework-3.1"; meta = { description = "Metasploit Framework - a collection of exploits"; diff --git a/pkgs/tools/system/setserial/default.nix b/pkgs/tools/system/setserial/default.nix index 76bc24c27562..a35c0d249185 100644 --- a/pkgs/tools/system/setserial/default.nix +++ b/pkgs/tools/system/setserial/default.nix @@ -1,8 +1,8 @@ -a : -let +a @ { groff, ... } : +let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "2.17" a; + version = a.lib.attrByPath ["version"] "2.17" a; buildInputs = with a; [ groff ]; @@ -26,7 +26,7 @@ rec { '') ["minInit" "doUnpack" "doConfigure"]; neededDirs = ["$out/bin" "$out/share/man/man8"]; - + name = "setserial-" + version; meta = { description = "Serial port configuration utility"; diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix index c625f1b7813a..402f93ec8fba 100644 --- a/pkgs/tools/system/vbetool/default.nix +++ b/pkgs/tools/system/vbetool/default.nix @@ -1,5 +1,5 @@ -a : -let +a @ {pciutils, libx86, zlib, ...} : +let s = import ./src-for-default.nix; buildInputs = with a; [ libx86 pciutils zlib @@ -19,13 +19,13 @@ rec { sed -e 's@$(libdir)/libpci.a@${a.pciutils}/lib/libpci.so@' -i Makefile.in export NIX_LDFLAGS="$NIX_LDFLAGS -lpci" '') ["doUnpack" "minInit"]; - + meta = { description = "Video BIOS execution tool"; maintainers = [ a.lib.maintainers.raskin ]; - platforms = with a.lib.platforms; + platforms = with a.lib.platforms; linux; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix index 0846970662ff..56b093f921d1 100644 --- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix +++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix @@ -1,4 +1,4 @@ -args : with args; +args @ {poppler, perl, makeWrapper, ... }: with args; rec { name = "TeXLive-linkdir"; diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix index f19d185572d3..7acecd66543e 100644 --- a/pkgs/tools/typesetting/tex/texlive/beamer.nix +++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix @@ -1,4 +1,4 @@ -args: with args; +args @ {texLiveLatexXColor, texLivePGF, texLive, ...}: with args; rec { name = "texlive-beamer-2013"; src = fetchurl { diff --git a/pkgs/tools/typesetting/tex/texlive/cm-super.nix b/pkgs/tools/typesetting/tex/texlive/cm-super.nix index 066796ed39c9..5c442fad27f4 100644 --- a/pkgs/tools/typesetting/tex/texlive/cm-super.nix +++ b/pkgs/tools/typesetting/tex/texlive/cm-super.nix @@ -1,4 +1,4 @@ -args: with args; +args @ {texLive, ...}: with args; rec { name = "texlive-cm-super-2009"; src = fetchurl { @@ -29,7 +29,7 @@ rec { description = "Extra components for TeXLive: CM-Super fonts"; maintainers = [ args.lib.maintainers.raskin ]; - # Actually, arch-independent.. + # Actually, arch-independent.. hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/context.nix b/pkgs/tools/typesetting/tex/texlive/context.nix index 22e0991b5cc1..2cc62c334094 100644 --- a/pkgs/tools/typesetting/tex/texlive/context.nix +++ b/pkgs/tools/typesetting/tex/texlive/context.nix @@ -1,4 +1,4 @@ -args: with args; +args @ { texLive, ... }: with args; rec { name = "context-2014.05.21"; src = fetchurl { @@ -22,4 +22,4 @@ rec { }; } - + diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index d676acd2f286..74b3829cf89f 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -1,4 +1,11 @@ -args : with args; +args @ { +builderDefs, zlib, bzip2, ncurses, libpng, ed, lesstif, ruby, potrace +, gd, t1lib, freetype, icu, perl, expat, curl, xz, pkgconfig, zziplib, texinfo +, libjpeg, bison, python, fontconfig, flex, poppler, libpaper, graphite2 +, makeWrapper, gmp, mpfr, xpdf, config +, libXaw, libX11, xproto, libXt, libXpm +, libXmu, libXext, xextproto, libSM, libICE +, ... }: with args; rec { src = assert config.allowTexliveBuilds or true; fetchurl { diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 59c3389d750b..7f7ffbee7c29 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,4 +1,4 @@ -args: with args; +args @ { texLive, xz, ... }: with args; rec { name = "texlive-extra-2014"; version = "2014.20141024"; diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index f4db43f21f2b..9ec623a0f119 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -1,4 +1,4 @@ -args: with args; +args @ {texLive, unzip, ...}: with args; rec { version = "1.5.1"; name = "moderncv-${version}"; diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index e80e53f91284..6d57a659b63b 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -1,4 +1,4 @@ -args: with args; +args @ {texLive, unzip, ...}: with args; rec { version = "0.9"; name = "moderntimeline-${version}"; diff --git a/pkgs/tools/typesetting/tex/texlive/xcolor.nix b/pkgs/tools/typesetting/tex/texlive/xcolor.nix index f02bf351c3f6..57351e069928 100644 --- a/pkgs/tools/typesetting/tex/texlive/xcolor.nix +++ b/pkgs/tools/typesetting/tex/texlive/xcolor.nix @@ -1,4 +1,4 @@ -args: with args; +args @ {texLive, ... }: with args; rec { name = "texlive-latex-xcolor-2007"; src = fetchurl { diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 5732d4c9baf3..e37d1c6f11ff 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -1,10 +1,12 @@ -a : -let +a @ {imake, libX11, xproto, gccmakedep, libXt +, libXmu, libXaw, libXext, xextproto, libSM, libICE, libXpm +, libXp, ...} : +let fetchurl = a.fetchurl; buildInputs = with a; [ libX11 xproto imake gccmakedep libXt libXmu libXaw - libXext xextproto libSM libICE libXpm libXp + libXext xextproto libSM libICE libXpm libXp ]; in rec { @@ -29,7 +31,7 @@ rec { doXMKMF = a.fullDepEntry ('' xmkmf '') ["doUnpack" "minInit" "addInputs"]; - + name = "vncrec-0.2"; # version taken from Arch AUR meta = { description = "VNC recorder"; -- cgit 1.4.1