public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta.function -> passthru.function, not killing other contents of passthru

Browse Source 
svn path=/nixpkgs/trunk/; revision=13190
This commit is contained in:
Michael Raskin 2008-11-04 21:24:10 +00:00
parent 8b06e2e228
commit c5363217ad
68 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/audacity/default.nix
View File

@ -1,5 +1,5 @@
args: with args; args: with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = src =
fetchurl { fetchurl {
url = mirror://sourceforge/audacity/audacity-src-1.3.3.tar.gz; url = mirror://sourceforge/audacity/audacity-src-1.3.3.tar.gz;

2
pkgs/applications/audio/ladspa-plugins/default.nix
View File

@ -1,5 +1,5 @@
args: with args; args: with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = src =
fetchurl { fetchurl {
url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz; url = http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz;

2
pkgs/applications/audio/ladspa-plugins/ladspah.nix
View File

@ -6,7 +6,7 @@ let
sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67"; sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
}; };
in in
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
buildInputs = []; buildInputs = [];
inherit src; inherit src;
}; };

2
pkgs/applications/graphics/gocr/0.44.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz; url = http://prdownloads.sourceforge.net/jocr/gocr-0.44.tar.gz;

2
pkgs/applications/graphics/xscreensaver/default.nix
View File

@ -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; version = lib.getAttr ["version"] "5.07" args;
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {

2
pkgs/applications/networking/p2p/ldcpp/1.0.1.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function ((rec { let localDefs = builderDefs.passthru.function ((rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://download2.berlios.de/linuxdcpp/linuxdcpp-1.0.1.tar.bz2; url = http://download2.berlios.de/linuxdcpp/linuxdcpp-1.0.1.tar.bz2;

2
pkgs/applications/virtualization/qemu/linux-img/0.2.nix
View File

@ -1,6 +1,6 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = [ http://fabrice.bellard.free.fr/qemu/linux-0.2.img.bz2 http://bellard.org/qemu/linux-0.2.img.bz2]; url = [ http://fabrice.bellard.free.fr/qemu/linux-0.2.img.bz2 http://bellard.org/qemu/linux-0.2.img.bz2];

2
pkgs/applications/window-managers/compiz-fusion/bcop/0.7.4.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.4/compiz-bcop-0.7.4.tar.bz2; url = http://releases.compiz-fusion.org/0.7.4/compiz-bcop-0.7.4.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/bcop/0.7.8.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/compiz-bcop-0.7.8.tar.bz2; url = http://releases.compiz-fusion.org/0.7.8/compiz-bcop-0.7.8.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.4.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.4/simple-ccsm-0.7.4.tar.bz2; url = http://releases.compiz-fusion.org/0.7.4/simple-ccsm-0.7.4.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/ccsm-simple/0.7.8.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/simple-ccsm-0.7.8.tar.bz2; url = http://releases.compiz-fusion.org/0.7.8/simple-ccsm-0.7.8.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.4.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.4/ccsm-0.7.4.tar.bz2; url = http://releases.compiz-fusion.org/0.7.4/ccsm-0.7.4.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/ccsm/0.7.8.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/ccsm-0.7.8.tar.bz2; url = http://releases.compiz-fusion.org/0.7.8/ccsm-0.7.8.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.4.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.4/compizconfig-python-0.7.4.tar.bz2; url = http://releases.compiz-fusion.org/0.7.4/compizconfig-python-0.7.4.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.7.8.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/compizconfig-python-0.7.8.tar.bz2; url = http://releases.compiz-fusion.org/0.7.8/compizconfig-python-0.7.8.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.4.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.4/compizconfig-backend-gconf-0.7.4.tar.bz2; url = http://releases.compiz-fusion.org/0.7.4/compizconfig-backend-gconf-0.7.4.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/config-backend/0.7.8.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/compizconfig-backend-gconf-0.7.8.tar.bz2; url = http://releases.compiz-fusion.org/0.7.8/compizconfig-backend-gconf-0.7.8.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/extra/0.7.4.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.4/compiz-fusion-plugins-extra-0.7.4.tar.bz2; url = http://releases.compiz-fusion.org/0.7.4/compiz-fusion-plugins-extra-0.7.4.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/extra/0.7.8.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-extra-0.7.8.tar.bz2; url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-extra-0.7.8.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.4.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.4/libcompizconfig-0.7.4.tar.bz2; url = http://releases.compiz-fusion.org/0.7.4/libcompizconfig-0.7.4.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.7.8.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/libcompizconfig-0.7.8.tar.bz2; url = http://releases.compiz-fusion.org/0.7.8/libcompizconfig-0.7.8.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/main/0.7.4.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.4/compiz-fusion-plugins-main-0.7.4.tar.bz2; url = http://releases.compiz-fusion.org/0.7.4/compiz-fusion-plugins-main-0.7.4.tar.bz2;

2
pkgs/applications/window-managers/compiz-fusion/main/0.7.8.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-main-0.7.8.tar.bz2; url = http://releases.compiz-fusion.org/0.7.8/compiz-fusion-plugins-main-0.7.8.tar.bz2;

2
pkgs/applications/window-managers/compiz/0.6.2.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/compiz/0.6.2/compiz-0.6.2.tar.bz2; url = http://releases.compiz-fusion.org/compiz/0.6.2/compiz-0.6.2.tar.bz2;

2
pkgs/applications/window-managers/compiz/0.7.8.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.7.8.tar.gz; url = http://xorg.freedesktop.org/archive/individual/app/compiz-0.7.8.tar.gz;

2
pkgs/applications/window-managers/fbpanel/4.12.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://garr.dl.sourceforge.net/sourceforge/fbpanel/fbpanel-4.12.tgz; url = http://garr.dl.sourceforge.net/sourceforge/fbpanel/fbpanel-4.12.tgz;

4
pkgs/build-support/deb-package/default.nix
View File

@ -1,10 +1,10 @@
args : with args; args : with args;
let let
localDefs = with (builderDefs.meta.function {src="";}); localDefs = with (builderDefs.passthru.function {src="";});
let let
checkFlag = flag : lib.getAttr [flag] false args; checkFlag = flag : lib.getAttr [flag] false args;
in in
builderDefs.meta.function ({ builderDefs.passthru.function ({
inherit src; inherit src;
inherit checkFlag; inherit checkFlag;
buildInputs = []; buildInputs = [];

2
pkgs/data/fonts/clearlyU/1.9.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec { let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://crl.nmsu.edu/~mleisher/cu/cu12-1.9.tar.gz; url = http://crl.nmsu.edu/~mleisher/cu/cu12-1.9.tar.gz;

2
pkgs/data/fonts/fontWrap/default.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src =""; /* put a fetchurl here */ src =""; /* put a fetchurl here */
buildInputs = [mkfontdir mkfontscale ttmkfdir]; buildInputs = [mkfontdir mkfontscale ttmkfdir];
configureFlags = []; configureFlags = [];

2
pkgs/data/fonts/junicode/0.6.15.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec { let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip; url = http://prdownloads.sourceforge.net/junicode/junicode-0.6.15.zip;

2
pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec { let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz; url = http://prdownloads.sourceforge.net/wqy/wqy-zenhei-0.4.23-1.tar.gz;

2
pkgs/development/compilers/qi/9.1.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://www.lambdassociates.org/Download/Qi9.1.zip; url = http://www.lambdassociates.org/Download/Qi9.1.zip;

2
pkgs/development/interpreters/pyrex/0.9.5.nix
View File

@ -2,7 +2,7 @@ args: with args;
let let
localDefs = builderDefs.meta.function { localDefs = builderDefs.passthru.function {
src = fetchurl { src = fetchurl {
url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.5.1.1.tar.gz; url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.5.1.1.tar.gz;

2
pkgs/development/interpreters/pyrex/0.9.6.nix
View File

@ -2,7 +2,7 @@ args: with args;
let let
localDefs = builderDefs.meta.function { localDefs = builderDefs.passthru.function {
src = fetchurl { src = fetchurl {
url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.4.tar.gz; url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.4.tar.gz;

2
pkgs/development/libraries/fftw/default.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = src =
fetchurl { fetchurl {
url = ftp://ftp.fftw.org/pub/fftw/fftw-3.1.2.tar.gz; url = ftp://ftp.fftw.org/pub/fftw/fftw-3.1.2.tar.gz;

2
pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.2-1.tar.gz; url = mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.2-1.tar.gz;

2
pkgs/development/libraries/libdbi/0.8.2.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = mirror://sourceforge/libdbi/libdbi-0.8.2.tar.gz; url = mirror://sourceforge/libdbi/libdbi-0.8.2.tar.gz;

2
pkgs/development/libraries/libextractor/0.5.18.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://gnunet.org/libextractor/download/libextractor-0.5.18.tar.gz; url = http://gnunet.org/libextractor/download/libextractor-0.5.18.tar.gz;

2
pkgs/development/tools/misc/indent/2.2.9.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = ftp://ftp.gnu.org/gnu/indent/indent-2.2.9.tar.gz; url = ftp://ftp.gnu.org/gnu/indent/indent-2.2.9.tar.gz;

2
pkgs/development/tools/misc/intltool/0.36.2.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.bz2; url = http://ftp.gnome.org/pub/gnome/sources/intltool/0.36/intltool-0.36.2.tar.bz2;

2
pkgs/development/tools/misc/ltrace/0.5-3deb.nix
View File

@ -1,7 +1,7 @@
args : with args; let args : with args; let
patch = ./ltrace_0.5-3.diff.gz; patch = ./ltrace_0.5-3.diff.gz;
localDefs = with builderDefs; localDefs = with builderDefs;
builderDefs.meta.function { builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.orig.tar.gz; url = ftp://ftp.debian.org/debian/pool/main/l/ltrace/ltrace_0.5.orig.tar.gz;

2
pkgs/games/construo/0.2.2.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://savannah.nongnu.org/download/construo/construo-0.2.2.tar.gz; url = http://savannah.nongnu.org/download/construo/construo-0.2.2.tar.gz;

2
pkgs/games/fsg/alt-builder.nix
View File

@ -1,5 +1,5 @@
args: with args; args: with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
buildInputs =[(wxGTK null)]; buildInputs =[(wxGTK null)];
src = src =
fetchurl { fetchurl {

2
pkgs/games/orbit/1.01.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec { let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
sha256 = "1kx69f9jqnfzwjh47cl1df8p8hn3bnp6bznxnb6c4wx32ijn5gri"; sha256 = "1kx69f9jqnfzwjh47cl1df8p8hn3bnp6bznxnb6c4wx32ijn5gri";

2
pkgs/lib/default.nix
View File

@ -42,7 +42,7 @@ rec {
foldArgs = merger: f: init: x: foldArgs = merger: f: init: x:
let arg=(merger init (defaultMergeArg init x)); in let arg=(merger init (defaultMergeArg init x)); in
(f arg) // { (f arg) // {
meta = { passthru = (getAttr ["passthru"] {} arg) // {
function = foldArgs merger f arg; function = foldArgs merger f arg;
}; };
}; };

2
pkgs/os-specific/linux/atheros/0.9.4.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.4.tar.gz; url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.4.tar.gz;

2
pkgs/os-specific/linux/atheros/r3693.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = fetchurl { src = fetchurl {
url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3693-20080602.tar.gz; url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3693-20080602.tar.gz;
sha256 = "0r9nnxcq50rgwcm9y93rpk3mqknl3ixkxkd72437b55qlz1f9vs3"; sha256 = "0r9nnxcq50rgwcm9y93rpk3mqknl3ixkxkd72437b55qlz1f9vs3";

2
pkgs/os-specific/linux/atheros/r3837.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = fetchurl { src = fetchurl {
url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3837-20080802.tar.gz; url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3837-20080802.tar.gz;
sha256 = "0yj6jxlygb5bdnysmn47dn4wi220ma310vd885a1pl7hp3ky216m"; sha256 = "0yj6jxlygb5bdnysmn47dn4wi220ma310vd885a1pl7hp3ky216m";

2
pkgs/os-specific/linux/atheros/r3867.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = fetchurl { src = fetchurl {
url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3867-20080924.tar.gz; url = http://snapshots.madwifi.org/madwifi-trunk/madwifi-trunk-r3867-20080924.tar.gz;
sha256 = "0m48p5mqx1d3aimjjiy251fii7x7y15ch5n74hvq4hygc6bcjf79"; sha256 = "0m48p5mqx1d3aimjjiy251fii7x7y15ch5n74hvq4hygc6bcjf79";

2
pkgs/os-specific/linux/dmidecode/2.9.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://download.savannah.gnu.org/releases/dmidecode/dmidecode-2.9.tar.bz2; url = http://download.savannah.gnu.org/releases/dmidecode/dmidecode-2.9.tar.bz2;

2
pkgs/os-specific/linux/sdparm/1.02.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://sg.torque.net/sg/p/sdparm-1.02.tgz; url = http://sg.torque.net/sg/p/sdparm-1.02.tgz;

2
pkgs/servers/dict/1.9.15.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function ((rec { let localDefs = builderDefs.passthru.function ((rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = ftp://ftp.dict.org/pub/dict/dictd-1.9.15.tar.gz; url = ftp://ftp.dict.org/pub/dict/dictd-1.9.15.tar.gz;

2
pkgs/servers/dict/dictd-db.nix
View File

@ -2,7 +2,7 @@
let makeDictdDB = _src: _name: _subdir: _locale: let makeDictdDB = _src: _name: _subdir: _locale:
with builderDefs; with builderDefs;
let localDefs = builderDefs.meta.function (rec { let localDefs = builderDefs.passthru.function (rec {
src=_src; src=_src;
doInstall = FullDepEntry ('' doInstall = FullDepEntry (''
ensureDir $out/share/dictd ensureDir $out/share/dictd

2
pkgs/servers/xmpp/openfire/3.4.5.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec { let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_4_5.tar.gz; url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_4_5.tar.gz;

2
pkgs/servers/xmpp/openfire/3.5.2.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec { let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_5_2.tar.gz; url = http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_3_5_2.tar.gz;

2
pkgs/tools/X11/x11vnc/0.9.3.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec { let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = mirror://sourceforge/libvncserver/x11vnc-0.9.3.tar.gz; url = mirror://sourceforge/libvncserver/x11vnc-0.9.3.tar.gz;

4
pkgs/tools/X11/x2vnc/1.7.2.nix
View File

@ -1,6 +1,6 @@
args : with args; with builderDefs.meta.function {src="";}; args : with args; with builderDefs.passthru.function {src="";};
let localDefs = builderDefs.meta.function ((rec { let localDefs = builderDefs.passthru.function ((rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz; url = http://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz;

2
pkgs/tools/misc/dosfstools/2.11deb.nix
View File

@ -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; url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11-2.3.diff.gz;
sha256 = "0bzjhpgg4ih6c76ax8byis9vxgkr2c7bbbshqrkfq8j7ar48n5ld"; sha256 = "0bzjhpgg4ih6c76ax8byis9vxgkr2c7bbbshqrkfq8j7ar48n5ld";
}; };
localDefs = builderDefs.meta.function (rec { localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11.orig.tar.gz; url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11.orig.tar.gz;

2
pkgs/tools/misc/relfs/cvs.2008.03.05.nix
View File

@ -1,6 +1,6 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
if args ? src then args.src else fetchcvs { if args ? src then args.src else fetchcvs {
cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs"; cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";

2
pkgs/tools/misc/rlwrap/0.28.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = ftp://ftp.chg.ru/mirrors/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/rlwrap-0.28.tar.gz; url = ftp://ftp.chg.ru/mirrors/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/rlwrap-0.28.tar.gz;

2
pkgs/tools/networking/nc6/1.0.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec { let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2; url = ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/nc6-1.0.tar.bz2;

2
pkgs/tools/networking/smbfs-fuse/0.8.7.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-0.8.7.tar.gz; url = http://www.ricardis.tudelft.nl/~vincent/fusesmb/download/fusesmb-0.8.7.tar.gz;

2
pkgs/tools/security/bmrsa/11.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec { let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa11.zip; url = http://prdownloads.sourceforge.net/sourceforge/bmrsa/bmrsa11.zip;

2
pkgs/tools/security/seccure/0.3.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function ((rec { let localDefs = builderDefs.passthru.function ((rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://freshmeat.net/redir/seccure/65485/url_tgz/seccure-0.3.tar.gz; url = http://freshmeat.net/redir/seccure/65485/url_tgz/seccure-0.3.tar.gz;

2
pkgs/tools/security/ssss/0.5.nix
View File

@ -1,5 +1,5 @@
args : with args; with builderDefs; args : with args; with builderDefs;
let localDefs = builderDefs.meta.function (rec { let localDefs = builderDefs.passthru.function (rec {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz; url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz;

2
pkgs/tools/system/gdmap/0.8.1.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
let localDefs = builderDefs.meta.function { let localDefs = builderDefs.passthru.function {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz; url = http://downloads.sourceforge.net/gdmap/gdmap-0.8.1.tar.gz;

22
pkgs/top-level/all-packages.nix
View File

@ -1131,7 +1131,7 @@ let
# seccure will override it (it is root-only, but # seccure will override it (it is root-only, but
# more secure because of memory locking), but this # more secure because of memory locking), but this
# can be added to default system # can be added to default system
seccureUser = lowPrio (seccure.meta.function { seccureUser = lowPrio (seccure.passthru.function {
makeFlags = [" CFLAGS+=-DNOMEMLOCK "]; makeFlags = [" CFLAGS+=-DNOMEMLOCK "];
}); });
@ -2037,7 +2037,7 @@ let
inherit fetchurl stdenv zlib bzip2 gdbm; inherit fetchurl stdenv zlib bzip2 gdbm;
}; };
python25Full = python25Base.meta.function { python25Full = python25Base.passthru.function {
db4 = if getConfig ["python" "db4Support"] true then db4 else null; db4 = if getConfig ["python" "db4Support"] true then db4 else null;
sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null; sqlite = if getConfig ["python" "sqliteSupport"] true then sqlite else null;
readline = if getConfig ["python" "readlineSupport"] true then readline 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") { ltrace = composedArgsAndFun (selectVersion ../development/tools/misc/ltrace "0.5-3deb") {
inherit fetchurl stdenv builderDefs stringsWithDeps lib; 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 { mk = import ../development/tools/build-managers/mk {
@ -3132,7 +3132,7 @@ let
inherit stdenv fetchurl builderDefs libdbi; inherit stdenv fetchurl builderDefs libdbi;
}; };
libdbiDrivers = libdbiDriversBase.meta.function { libdbiDrivers = libdbiDriversBase.passthru.function {
inherit sqlite mysql; inherit sqlite mysql;
}; };
@ -5451,7 +5451,7 @@ let
(let python=python25; in (let python=python25; in
{ {
inherit python; inherit python;
setuptools = setuptools.meta.function {inherit python;}; setuptools = setuptools.passthru.function {inherit python;};
}); });
numeric = import ../development/python-modules/numeric { numeric = import ../development/python-modules/numeric {
@ -5760,7 +5760,7 @@ let
inherit perl; inherit perl;
}; };
blcrCurrent = kernel : (blcr.meta.function { blcrCurrent = kernel : (blcr.passthru.function {
inherit kernel; inherit kernel;
}); });
@ -6915,7 +6915,7 @@ let
inherit librsvg fuse; inherit librsvg fuse;
}; };
compiz_062 = compiz.meta.function { compiz_062 = compiz.passthru.function {
version = "0.6.2"; version = "0.6.2";
}; };
@ -6937,7 +6937,7 @@ let
inherit dbus dbus_glib; inherit dbus dbus_glib;
}; };
compiz = compizBase.meta.function { compiz = compizBase.passthru.function {
extraConfigureFlags = getConfig ["compiz" "extraConfigureFlags"] []; extraConfigureFlags = getConfig ["compiz" "extraConfigureFlags"] [];
}; };
@ -7735,7 +7735,7 @@ let
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
}; };
snd = sndBase.meta.function { snd = sndBase.passthru.function {
inherit guile mesa libtool jackaudio alsaLib; inherit guile mesa libtool jackaudio alsaLib;
}; };
@ -8082,7 +8082,7 @@ let
inherit (xlibs) libX11 libXmu; inherit (xlibs) libX11 libXmu;
}; };
xscreensaver = xscreensaverBase.meta.function { xscreensaver = xscreensaverBase.passthru.function {
flags = ["GL" "gdkpixbuf" "DPMS" "gui" "jpeg"]; flags = ["GL" "gdkpixbuf" "DPMS" "gui" "jpeg"];
inherit mesa libxml2 libjpeg; inherit mesa libxml2 libjpeg;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
@ -8170,7 +8170,7 @@ let
inherit (xlibs) libX11 xproto; inherit (xlibs) libX11 xproto;
}; };
construo = construoBase.meta.function { construo = construoBase.passthru.function {
inherit mesa freeglut; inherit mesa freeglut;
}; };

2
pkgs/top-level/builder-defs.nix
View File

@ -404,7 +404,7 @@ args: with args; with stringsWithDeps; with lib;
builderDefsArgs = args; builderDefsArgs = args;
innerBuilderDefsPackage = bd: args: ( innerBuilderDefsPackage = bd: args: (
let localDefs = bd.meta.function args; in let localDefs = bd.passthru.function args; in
stdenv.mkDerivation ((rec { stdenv.mkDerivation ((rec {
inherit (localDefs) name; inherit (localDefs) name;