From c5363217ad6a5557525b72aa8210acce845a5d79 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 4 Nov 2008 21:24:10 +0000 Subject: meta.function -> passthru.function, not killing other contents of passthru svn path=/nixpkgs/trunk/; revision=13190 --- pkgs/applications/audio/audacity/default.nix | 2 +- pkgs/applications/audio/ladspa-plugins/default.nix | 2 +- pkgs/applications/audio/ladspa-plugins/ladspah.nix | 2 +- pkgs/applications/graphics/gocr/0.44.nix | 2 +- .../applications/graphics/xscreensaver/default.nix | 2 +- pkgs/applications/networking/p2p/ldcpp/1.0.1.nix | 2 +- .../virtualization/qemu/linux-img/0.2.nix | 2 +- .../window-managers/compiz-fusion/bcop/0.7.4.nix | 2 +- .../window-managers/compiz-fusion/bcop/0.7.8.nix | 2 +- .../compiz-fusion/ccsm-simple/0.7.4.nix | 2 +- .../compiz-fusion/ccsm-simple/0.7.8.nix | 2 +- .../window-managers/compiz-fusion/ccsm/0.7.4.nix | 2 +- .../window-managers/compiz-fusion/ccsm/0.7.8.nix | 2 +- .../compiz-fusion/compizconfig-python/0.7.4.nix | 2 +- .../compiz-fusion/compizconfig-python/0.7.8.nix | 2 +- .../compiz-fusion/config-backend/0.7.4.nix | 2 +- .../compiz-fusion/config-backend/0.7.8.nix | 2 +- .../window-managers/compiz-fusion/extra/0.7.4.nix | 2 +- .../window-managers/compiz-fusion/extra/0.7.8.nix | 2 +- .../compiz-fusion/libcompizconfig/0.7.4.nix | 2 +- .../compiz-fusion/libcompizconfig/0.7.8.nix | 2 +- .../window-managers/compiz-fusion/main/0.7.4.nix | 2 +- .../window-managers/compiz-fusion/main/0.7.8.nix | 2 +- pkgs/applications/window-managers/compiz/0.6.2.nix | 2 +- pkgs/applications/window-managers/compiz/0.7.8.nix | 2 +- pkgs/applications/window-managers/fbpanel/4.12.nix | 2 +- pkgs/build-support/deb-package/default.nix | 4 ++-- pkgs/data/fonts/clearlyU/1.9.nix | 2 +- pkgs/data/fonts/fontWrap/default.nix | 2 +- pkgs/data/fonts/junicode/0.6.15.nix | 2 +- pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix | 2 +- pkgs/development/compilers/qi/9.1.nix | 2 +- pkgs/development/interpreters/pyrex/0.9.5.nix | 2 +- pkgs/development/interpreters/pyrex/0.9.6.nix | 2 +- pkgs/development/libraries/fftw/default.nix | 2 +- .../libraries/libdbi-drivers/0.8.2-1.nix | 2 +- pkgs/development/libraries/libdbi/0.8.2.nix | 2 +- pkgs/development/libraries/libextractor/0.5.18.nix | 2 +- pkgs/development/tools/misc/indent/2.2.9.nix | 2 +- pkgs/development/tools/misc/intltool/0.36.2.nix | 2 +- pkgs/development/tools/misc/ltrace/0.5-3deb.nix | 2 +- pkgs/games/construo/0.2.2.nix | 2 +- pkgs/games/fsg/alt-builder.nix | 2 +- pkgs/games/orbit/1.01.nix | 2 +- pkgs/lib/default.nix | 2 +- pkgs/os-specific/linux/atheros/0.9.4.nix | 2 +- pkgs/os-specific/linux/atheros/r3693.nix | 2 +- pkgs/os-specific/linux/atheros/r3837.nix | 2 +- pkgs/os-specific/linux/atheros/r3867.nix | 2 +- pkgs/os-specific/linux/dmidecode/2.9.nix | 2 +- pkgs/os-specific/linux/sdparm/1.02.nix | 2 +- pkgs/servers/dict/1.9.15.nix | 2 +- pkgs/servers/dict/dictd-db.nix | 2 +- pkgs/servers/xmpp/openfire/3.4.5.nix | 2 +- pkgs/servers/xmpp/openfire/3.5.2.nix | 2 +- pkgs/tools/X11/x11vnc/0.9.3.nix | 2 +- pkgs/tools/X11/x2vnc/1.7.2.nix | 4 ++-- pkgs/tools/misc/dosfstools/2.11deb.nix | 2 +- pkgs/tools/misc/relfs/cvs.2008.03.05.nix | 2 +- pkgs/tools/misc/rlwrap/0.28.nix | 2 +- pkgs/tools/networking/nc6/1.0.nix | 2 +- pkgs/tools/networking/smbfs-fuse/0.8.7.nix | 2 +- pkgs/tools/security/bmrsa/11.nix | 2 +- pkgs/tools/security/seccure/0.3.nix | 2 +- pkgs/tools/security/ssss/0.5.nix | 2 +- pkgs/tools/system/gdmap/0.8.1.nix | 2 +- pkgs/top-level/all-packages.nix | 22 +++++++++++----------- pkgs/top-level/builder-defs.nix | 2 +- 68 files changed, 80 insertions(+), 80 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 644996065cd6..adb8e170feb1 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,5 +1,5 @@ args: with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = fetchurl { url = mirror://sourceforge/audacity/audacity-src-1.3.3.tar.gz; diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 230ee1d7de26..8dd783a2d1af 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -1,5 +1,5 @@ args: with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = fetchurl { url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz; diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix index 60ee6fbf4571..dd3286081555 100644 --- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix +++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix @@ -6,7 +6,7 @@ let sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67"; }; in - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { buildInputs = []; inherit src; }; diff --git a/pkgs/applications/graphics/gocr/0.44.nix b/pkgs/applications/graphics/gocr/0.44.nix index 0a3c3869a1c7..7273c5d98c31 100644 --- a/pkgs/applications/graphics/gocr/0.44.nix +++ b/pkgs/applications/graphics/gocr/0.44.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz; diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix index b5981fa6dd05..5c779e5e1b66 100644 --- a/pkgs/applications/graphics/xscreensaver/default.nix +++ b/pkgs/applications/graphics/xscreensaver/default.nix @@ -1,4 +1,4 @@ -args : with args; let localDefs = builderDefs.meta.function (args // rec { +args : with args; let localDefs = builderDefs.passthru.function (args // rec { version = lib.getAttr ["version"] "5.07" args; src = /* put a fetchurl here */ fetchurl { diff --git a/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix b/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix index 00626377e7c4..07e4a305060c 100644 --- a/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix +++ b/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function ((rec { + let localDefs = builderDefs.passthru.function ((rec { src = /* put a fetchurl here */ fetchurl { url = http://download2.berlios.de/linuxdcpp/linuxdcpp-1.0.1.tar.bz2; diff --git a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix index 87e2e114becd..e8532caddd2e 100644 --- a/pkgs/applications/virtualization/qemu/linux-img/0.2.nix +++ b/pkgs/applications/virtualization/qemu/linux-img/0.2.nix @@ -1,6 +1,6 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = [ http://fabrice.bellard.free.fr/qemu/linux-0.2.img.bz2 http://bellard.org/qemu/linux-0.2.img.bz2]; diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix index 227489652288..9f516398b453 100644 --- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/compiz-bcop-0.7.4.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix index d2920c6a789a..e9bede0a2877 100644 --- a/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.8/compiz-bcop-0.7.8.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix index 768dc7fca864..6ec5257cc2d2 100644 --- a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/simple-ccsm-0.7.4.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix index 3222572b6898..d739b54a5341 100644 --- a/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.8/simple-ccsm-0.7.8.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix index 609ed4d39ece..a6761ad9ae5f 100644 --- a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/ccsm-0.7.4.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix index 236b605ab0f8..385819afd4c3 100644 --- a/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.8/ccsm-0.7.8.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix index 47aac2d0bbad..39cf12d31dac 100644 --- a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/compizconfig-python-0.7.4.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix index 5d7311896f18..d92349e238b2 100644 --- a/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.8/compizconfig-python-0.7.8.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix index cc9746efaaae..91a811e72cb7 100644 --- a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/compizconfig-backend-gconf-0.7.4.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix index f900dbb48a1f..f6f1f1545b03 100644 --- a/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.8/compizconfig-backend-gconf-0.7.8.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix index 4334b787e354..efaec0c8731f 100644 --- a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/compiz-fusion-plugins-extra-0.7.4.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix index 17c580eb743f..39108fab2042 100644 --- a/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-extra-0.7.8.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix index 12c83210ce6a..dd631b79b660 100644 --- a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/libcompizconfig-0.7.4.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix index 86ea28c098e5..0ea38bd45202 100644 --- a/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.8/libcompizconfig-0.7.8.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix b/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix index 08e2c96eb6c5..a50a4e03c3fd 100644 --- a/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix +++ b/pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.4/compiz-fusion-plugins-main-0.7.4.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix b/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix index abff605d166b..5fae889fd3e3 100644 --- a/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-main-0.7.8.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz/0.6.2.nix b/pkgs/applications/window-managers/compiz/0.6.2.nix index 213fc810ddf5..9531fdc3f6d8 100644 --- a/pkgs/applications/window-managers/compiz/0.6.2.nix +++ b/pkgs/applications/window-managers/compiz/0.6.2.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://releases.compiz-fusion.org/compiz/0.6.2/compiz-0.6.2.tar.bz2; diff --git a/pkgs/applications/window-managers/compiz/0.7.8.nix b/pkgs/applications/window-managers/compiz/0.7.8.nix index a7e700af4ea9..e6447b68bdba 100644 --- a/pkgs/applications/window-managers/compiz/0.7.8.nix +++ b/pkgs/applications/window-managers/compiz/0.7.8.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.7.8.tar.gz; diff --git a/pkgs/applications/window-managers/fbpanel/4.12.nix b/pkgs/applications/window-managers/fbpanel/4.12.nix index cf09e347a5dd..b4d83d9d1d01 100644 --- a/pkgs/applications/window-managers/fbpanel/4.12.nix +++ b/pkgs/applications/window-managers/fbpanel/4.12.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://garr.dl.sourceforge.net/sourceforge/fbpanel/fbpanel-4.12.tgz; diff --git a/pkgs/build-support/deb-package/default.nix b/pkgs/build-support/deb-package/default.nix index 78bdeb07d187..96b1a9aac452 100644 --- a/pkgs/build-support/deb-package/default.nix +++ b/pkgs/build-support/deb-package/default.nix @@ -1,10 +1,10 @@ args : with args; let - localDefs = with (builderDefs.meta.function {src="";}); + localDefs = with (builderDefs.passthru.function {src="";}); let checkFlag = flag : lib.getAttr [flag] false args; in - builderDefs.meta.function ({ + builderDefs.passthru.function ({ inherit src; inherit checkFlag; buildInputs = []; diff --git a/pkgs/data/fonts/clearlyU/1.9.nix b/pkgs/data/fonts/clearlyU/1.9.nix index e447dd3e0650..db5709bf0359 100644 --- a/pkgs/data/fonts/clearlyU/1.9.nix +++ b/pkgs/data/fonts/clearlyU/1.9.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://crl.nmsu.edu/~mleisher/cu/cu12-1.9.tar.gz; diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix index 875c65108ced..2c749ea609e0 100644 --- a/pkgs/data/fonts/fontWrap/default.nix +++ b/pkgs/data/fonts/fontWrap/default.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src =""; /* put a fetchurl here */ buildInputs = [mkfontdir mkfontscale ttmkfdir]; configureFlags = []; diff --git a/pkgs/data/fonts/junicode/0.6.15.nix b/pkgs/data/fonts/junicode/0.6.15.nix index f6fcc1917b32..601b6671e95c 100644 --- a/pkgs/data/fonts/junicode/0.6.15.nix +++ b/pkgs/data/fonts/junicode/0.6.15.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip; diff --git a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix index 15a7edd6535a..da520e968321 100644 --- a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix +++ b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz; diff --git a/pkgs/development/compilers/qi/9.1.nix b/pkgs/development/compilers/qi/9.1.nix index 73aaabf9227d..da21abef29e9 100644 --- a/pkgs/development/compilers/qi/9.1.nix +++ b/pkgs/development/compilers/qi/9.1.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://www.lambdassociates.org/Download/Qi9.1.zip; diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 0b57d690e01f..415ed78f117b 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -2,7 +2,7 @@ args: with args; let - localDefs = builderDefs.meta.function { + localDefs = builderDefs.passthru.function { src = fetchurl { url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.5.1.1.tar.gz; diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 7125a2aff20e..471532be2feb 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -2,7 +2,7 @@ args: with args; let - localDefs = builderDefs.meta.function { + localDefs = builderDefs.passthru.function { src = fetchurl { url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.4.tar.gz; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index b5b0a84777e4..270d12ac6ab4 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = fetchurl { url = ftp://ftp.fftw.org/pub/fftw/fftw-3.1.2.tar.gz; diff --git a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix index 2dd008c73488..575d141fcf5c 100644 --- a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix +++ b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.2-1.tar.gz; diff --git a/pkgs/development/libraries/libdbi/0.8.2.nix b/pkgs/development/libraries/libdbi/0.8.2.nix index 06c764386049..fd7b950c3ce6 100644 --- a/pkgs/development/libraries/libdbi/0.8.2.nix +++ b/pkgs/development/libraries/libdbi/0.8.2.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = mirror://sourceforge/libdbi/libdbi-0.8.2.tar.gz; diff --git a/pkgs/development/libraries/libextractor/0.5.18.nix b/pkgs/development/libraries/libextractor/0.5.18.nix index 5d854115b041..da3bafd915b9 100644 --- a/pkgs/development/libraries/libextractor/0.5.18.nix +++ b/pkgs/development/libraries/libextractor/0.5.18.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://gnunet.org/libextractor/download/libextractor-0.5.18.tar.gz; diff --git a/pkgs/development/tools/misc/indent/2.2.9.nix b/pkgs/development/tools/misc/indent/2.2.9.nix index 6dc28ea0c30d..3fefc259b39f 100644 --- a/pkgs/development/tools/misc/indent/2.2.9.nix +++ b/pkgs/development/tools/misc/indent/2.2.9.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = ftp://ftp.gnu.org/gnu/indent/indent-2.2.9.tar.gz; diff --git a/pkgs/development/tools/misc/intltool/0.36.2.nix b/pkgs/development/tools/misc/intltool/0.36.2.nix index 14e62bbc7d7d..741bc35909fe 100644 --- a/pkgs/development/tools/misc/intltool/0.36.2.nix +++ b/pkgs/development/tools/misc/intltool/0.36.2.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.bz2; diff --git a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix index 2c9349bf6a3c..8dde78d516bc 100644 --- a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix +++ b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix @@ -1,7 +1,7 @@ args : with args; let patch = ./ltrace_0.5-3.diff.gz; localDefs = with builderDefs; - builderDefs.meta.function { + builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.orig.tar.gz; diff --git a/pkgs/games/construo/0.2.2.nix b/pkgs/games/construo/0.2.2.nix index 3d9da7f531ad..e0447382e56f 100644 --- a/pkgs/games/construo/0.2.2.nix +++ b/pkgs/games/construo/0.2.2.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://savannah.nongnu.org/download/construo/construo-0.2.2.tar.gz; diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix index c48041fe5e92..70a342e32269 100644 --- a/pkgs/games/fsg/alt-builder.nix +++ b/pkgs/games/fsg/alt-builder.nix @@ -1,5 +1,5 @@ args: with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { buildInputs =[(wxGTK null)]; src = fetchurl { diff --git a/pkgs/games/orbit/1.01.nix b/pkgs/games/orbit/1.01.nix index b60b617fc2c3..f128c7b90c2a 100644 --- a/pkgs/games/orbit/1.01.nix +++ b/pkgs/games/orbit/1.01.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { sha256 = "1kx69f9jqnfzwjh47cl1df8p8hn3bnp6bznxnb6c4wx32ijn5gri"; diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix index 3747f144dbaf..838f7d9eb422 100644 --- a/pkgs/lib/default.nix +++ b/pkgs/lib/default.nix @@ -42,7 +42,7 @@ rec { foldArgs = merger: f: init: x: let arg=(merger init (defaultMergeArg init x)); in (f arg) // { - meta = { + passthru = (getAttr ["passthru"] {} arg) // { function = foldArgs merger f arg; }; }; diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix index f187dbe234d8..86a2a0eaf4f3 100644 --- a/pkgs/os-specific/linux/atheros/0.9.4.nix +++ b/pkgs/os-specific/linux/atheros/0.9.4.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.4.tar.gz; diff --git a/pkgs/os-specific/linux/atheros/r3693.nix b/pkgs/os-specific/linux/atheros/r3693.nix index e4544608c249..7561e07609a5 100644 --- a/pkgs/os-specific/linux/atheros/r3693.nix +++ b/pkgs/os-specific/linux/atheros/r3693.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = fetchurl { url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3693-20080602.tar.gz; sha256 = "0r9nnxcq50rgwcm9y93rpk3mqknl3ixkxkd72437b55qlz1f9vs3"; diff --git a/pkgs/os-specific/linux/atheros/r3837.nix b/pkgs/os-specific/linux/atheros/r3837.nix index 080fdb430881..ca475bfc3e1e 100644 --- a/pkgs/os-specific/linux/atheros/r3837.nix +++ b/pkgs/os-specific/linux/atheros/r3837.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = fetchurl { url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3837-20080802.tar.gz; sha256 = "0yj6jxlygb5bdnysmn47dn4wi220ma310vd885a1pl7hp3ky216m"; diff --git a/pkgs/os-specific/linux/atheros/r3867.nix b/pkgs/os-specific/linux/atheros/r3867.nix index ee2c57c8bc0a..aaa708c2c5d5 100644 --- a/pkgs/os-specific/linux/atheros/r3867.nix +++ b/pkgs/os-specific/linux/atheros/r3867.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = fetchurl { url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3867-20080924.tar.gz; sha256 = "0m48p5mqx1d3aimjjiy251fii7x7y15ch5n74hvq4hygc6bcjf79"; diff --git a/pkgs/os-specific/linux/dmidecode/2.9.nix b/pkgs/os-specific/linux/dmidecode/2.9.nix index 2ee868af4863..65081d9f82e7 100644 --- a/pkgs/os-specific/linux/dmidecode/2.9.nix +++ b/pkgs/os-specific/linux/dmidecode/2.9.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://download.savannah.gnu.org/releases/dmidecode/dmidecode-2.9.tar.bz2; diff --git a/pkgs/os-specific/linux/sdparm/1.02.nix b/pkgs/os-specific/linux/sdparm/1.02.nix index 1f12222c4b47..068da9830d38 100644 --- a/pkgs/os-specific/linux/sdparm/1.02.nix +++ b/pkgs/os-specific/linux/sdparm/1.02.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://sg.torque.net/sg/p/sdparm-1.02.tgz; diff --git a/pkgs/servers/dict/1.9.15.nix b/pkgs/servers/dict/1.9.15.nix index e31a2769be62..b3d104b39011 100644 --- a/pkgs/servers/dict/1.9.15.nix +++ b/pkgs/servers/dict/1.9.15.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function ((rec { + let localDefs = builderDefs.passthru.function ((rec { src = /* put a fetchurl here */ fetchurl { url = ftp://ftp.dict.org/pub/dict/dictd-1.9.15.tar.gz; diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index a7129b94d8e1..9eb89361c356 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -2,7 +2,7 @@ let makeDictdDB = _src: _name: _subdir: _locale: with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src=_src; doInstall = FullDepEntry ('' ensureDir $out/share/dictd diff --git a/pkgs/servers/xmpp/openfire/3.4.5.nix b/pkgs/servers/xmpp/openfire/3.4.5.nix index 26c2aa6f813e..3bb69b373419 100644 --- a/pkgs/servers/xmpp/openfire/3.4.5.nix +++ b/pkgs/servers/xmpp/openfire/3.4.5.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_4_5.tar.gz; diff --git a/pkgs/servers/xmpp/openfire/3.5.2.nix b/pkgs/servers/xmpp/openfire/3.5.2.nix index 7d66071df0a5..23f6f348a11b 100644 --- a/pkgs/servers/xmpp/openfire/3.5.2.nix +++ b/pkgs/servers/xmpp/openfire/3.5.2.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_5_2.tar.gz; diff --git a/pkgs/tools/X11/x11vnc/0.9.3.nix b/pkgs/tools/X11/x11vnc/0.9.3.nix index 72c0997cc6a5..3452d3f893ba 100644 --- a/pkgs/tools/X11/x11vnc/0.9.3.nix +++ b/pkgs/tools/X11/x11vnc/0.9.3.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = mirror://sourceforge/libvncserver/x11vnc-0.9.3.tar.gz; diff --git a/pkgs/tools/X11/x2vnc/1.7.2.nix b/pkgs/tools/X11/x2vnc/1.7.2.nix index 3966b852adce..917995b719d4 100644 --- a/pkgs/tools/X11/x2vnc/1.7.2.nix +++ b/pkgs/tools/X11/x2vnc/1.7.2.nix @@ -1,6 +1,6 @@ -args : with args; with builderDefs.meta.function {src="";}; - let localDefs = builderDefs.meta.function ((rec { +args : with args; with builderDefs.passthru.function {src="";}; + let localDefs = builderDefs.passthru.function ((rec { src = /* put a fetchurl here */ fetchurl { url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz; diff --git a/pkgs/tools/misc/dosfstools/2.11deb.nix b/pkgs/tools/misc/dosfstools/2.11deb.nix index 8878ee383257..2c5d8554655b 100644 --- a/pkgs/tools/misc/dosfstools/2.11deb.nix +++ b/pkgs/tools/misc/dosfstools/2.11deb.nix @@ -4,7 +4,7 @@ args : with args; with builderDefs; url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11-2.3.diff.gz; sha256 = "0bzjhpgg4ih6c76ax8byis9vxgkr2c7bbbshqrkfq8j7ar48n5ld"; }; - localDefs = builderDefs.meta.function (rec { + localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11.orig.tar.gz; diff --git a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix index a02df67fd584..90275c1b32f1 100644 --- a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix +++ b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix @@ -1,6 +1,6 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ if args ? src then args.src else fetchcvs { cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs"; diff --git a/pkgs/tools/misc/rlwrap/0.28.nix b/pkgs/tools/misc/rlwrap/0.28.nix index b6db8638601b..c694109c2e85 100644 --- a/pkgs/tools/misc/rlwrap/0.28.nix +++ b/pkgs/tools/misc/rlwrap/0.28.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = ftp://ftp.chg.ru/mirrors/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/rlwrap-0.28.tar.gz; diff --git a/pkgs/tools/networking/nc6/1.0.nix b/pkgs/tools/networking/nc6/1.0.nix index 130b128149b8..4ea5578abed4 100644 --- a/pkgs/tools/networking/nc6/1.0.nix +++ b/pkgs/tools/networking/nc6/1.0.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; -let localDefs = builderDefs.meta.function (rec { +let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2; diff --git a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix index fa98d3d0ac6a..c5ef3ebeae0e 100644 --- a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix +++ b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-0.8.7.tar.gz; diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 9a5468e8cc5f..69febaa6d2a7 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa11.zip; diff --git a/pkgs/tools/security/seccure/0.3.nix b/pkgs/tools/security/seccure/0.3.nix index 36109524831c..1725d7ab903a 100644 --- a/pkgs/tools/security/seccure/0.3.nix +++ b/pkgs/tools/security/seccure/0.3.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function ((rec { + let localDefs = builderDefs.passthru.function ((rec { src = /* put a fetchurl here */ fetchurl { url = http://freshmeat.net/redir/seccure/65485/url_tgz/seccure-0.3.tar.gz; diff --git a/pkgs/tools/security/ssss/0.5.nix b/pkgs/tools/security/ssss/0.5.nix index e35165be32b0..28c591850699 100644 --- a/pkgs/tools/security/ssss/0.5.nix +++ b/pkgs/tools/security/ssss/0.5.nix @@ -1,5 +1,5 @@ args : with args; with builderDefs; - let localDefs = builderDefs.meta.function (rec { + let localDefs = builderDefs.passthru.function (rec { src = /* put a fetchurl here */ fetchurl { url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz; diff --git a/pkgs/tools/system/gdmap/0.8.1.nix b/pkgs/tools/system/gdmap/0.8.1.nix index c8ba4ac2418f..ee2bd707fff7 100644 --- a/pkgs/tools/system/gdmap/0.8.1.nix +++ b/pkgs/tools/system/gdmap/0.8.1.nix @@ -1,5 +1,5 @@ args : with args; - let localDefs = builderDefs.meta.function { + let localDefs = builderDefs.passthru.function { src = /* put a fetchurl here */ fetchurl { url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93c0d43024cc..d35a551ef764 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1131,7 +1131,7 @@ let # seccure will override it (it is root-only, but # more secure because of memory locking), but this # can be added to default system - seccureUser = lowPrio (seccure.meta.function { + seccureUser = lowPrio (seccure.passthru.function { makeFlags = [" CFLAGS+=-DNOMEMLOCK "]; }); @@ -2037,7 +2037,7 @@ let inherit fetchurl stdenv zlib bzip2 gdbm; }; - python25Full = python25Base.meta.function { + python25Full = python25Base.passthru.function { db4 = if getConfig ["python" "db4Support"] true then db4 else null; sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null; readline = if getConfig ["python" "readlineSupport"] true then readline else null; @@ -2405,7 +2405,7 @@ let ltrace = composedArgsAndFun (selectVersion ../development/tools/misc/ltrace "0.5-3deb") { inherit fetchurl stdenv builderDefs stringsWithDeps lib; - elfutils = elfutils.meta.function {version = "0.127";}; + elfutils = elfutils.passthru.function {version = "0.127";}; }; mk = import ../development/tools/build-managers/mk { @@ -3132,7 +3132,7 @@ let inherit stdenv fetchurl builderDefs libdbi; }; - libdbiDrivers = libdbiDriversBase.meta.function { + libdbiDrivers = libdbiDriversBase.passthru.function { inherit sqlite mysql; }; @@ -5451,7 +5451,7 @@ let (let python=python25; in { inherit python; - setuptools = setuptools.meta.function {inherit python;}; + setuptools = setuptools.passthru.function {inherit python;}; }); numeric = import ../development/python-modules/numeric { @@ -5760,7 +5760,7 @@ let inherit perl; }; - blcrCurrent = kernel : (blcr.meta.function { + blcrCurrent = kernel : (blcr.passthru.function { inherit kernel; }); @@ -6915,7 +6915,7 @@ let inherit librsvg fuse; }; - compiz_062 = compiz.meta.function { + compiz_062 = compiz.passthru.function { version = "0.6.2"; }; @@ -6937,7 +6937,7 @@ let inherit dbus dbus_glib; }; - compiz = compizBase.meta.function { + compiz = compizBase.passthru.function { extraConfigureFlags = getConfig ["compiz" "extraConfigureFlags"] []; }; @@ -7735,7 +7735,7 @@ let inherit (gtkLibs) gtk glib; }; - snd = sndBase.meta.function { + snd = sndBase.passthru.function { inherit guile mesa libtool jackaudio alsaLib; }; @@ -8082,7 +8082,7 @@ let inherit (xlibs) libX11 libXmu; }; - xscreensaver = xscreensaverBase.meta.function { + xscreensaver = xscreensaverBase.passthru.function { flags = ["GL" "gdkpixbuf" "DPMS" "gui" "jpeg"]; inherit mesa libxml2 libjpeg; inherit (gtkLibs) gtk; @@ -8170,7 +8170,7 @@ let inherit (xlibs) libX11 xproto; }; - construo = construoBase.meta.function { + construo = construoBase.passthru.function { inherit mesa freeglut; }; diff --git a/pkgs/top-level/builder-defs.nix b/pkgs/top-level/builder-defs.nix index ac02476c0f99..367f018a1949 100644 --- a/pkgs/top-level/builder-defs.nix +++ b/pkgs/top-level/builder-defs.nix @@ -404,7 +404,7 @@ args: with args; with stringsWithDeps; with lib; builderDefsArgs = args; innerBuilderDefsPackage = bd: args: ( - let localDefs = bd.meta.function args; in + let localDefs = bd.passthru.function args; in stdenv.mkDerivation ((rec { inherit (localDefs) name; -- cgit 1.4.1