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

Some review of builder-defs and dependent files. No rebuild needed. Now it should be possible to override elements in builderDefs

Browse Source 
svn path=/nixpkgs/trunk/; revision=10214
This commit is contained in:
Michael Raskin 2008-01-18 12:36:56 +00:00
parent a5e0e39cdb
commit bc46eaf404
45 changed files with 165 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
args: with args; args: with args;
with (builderDefs { let localDefs = builderDefs {
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;
@ -8,7 +8,8 @@ args: with args;
buildInputs =[(wxGTK null) libogg libvorbis libsndfile libmad pkgconfig gtk buildInputs =[(wxGTK null) libogg libvorbis libsndfile libmad pkgconfig gtk
gettext glib]; gettext glib];
} null); } null;
in with localDefs;
let let
postInstall = FullDepEntry (" postInstall = FullDepEntry ("
old_rpath=$(patchelf --print-rpath \$out/bin/audacity); old_rpath=$(patchelf --print-rpath \$out/bin/audacity);
@ -25,7 +26,7 @@ stdenv.mkDerivation {
name = "audacity-1.3.3"; name = "audacity-1.3.3";
builder = writeScript "audacity-1.3.3-builder" builder = writeScript "audacity-1.3.3-builder"
(textClosure [addInputs (doDump "0") (noDepEntry "echo \$PATH; ar --version") doConfigure preBuild doMakeInstall postInstall doForceShare]); (textClosure localDefs [addInputs (doDump "0") (noDepEntry "echo \$PATH; ar --version") doConfigure preBuild doMakeInstall postInstall doForceShare]);
meta = { meta = {
description = " description = "

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

@ -1,5 +1,5 @@
args: with args; args: with args;
with (builderDefs { let localDefs = builderDefs {
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;
@ -8,6 +8,7 @@ args: with args;
buildInputs = [fftw ladspaH pkgconfig]; buildInputs = [fftw ladspaH pkgconfig];
configureFlags = []; configureFlags = [];
} null); } null);
in with localDefs;
let let
postInstall = FullDepEntry (" postInstall = FullDepEntry ("
ensureDir \$out/share/ladspa/ ensureDir \$out/share/ladspa/
@ -17,7 +18,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "swh-plugins-0.4.15"; name = "swh-plugins-0.4.15";
builder = writeScript "swh-plugins-0.4.15-builder" builder = writeScript "swh-plugins-0.4.15-builder"
(textClosure [doConfigure doMakeInstall (textClosure localDefs [doConfigure doMakeInstall
postInstall doForceShare]); postInstall doForceShare]);
meta = { meta = {
description = " description = "

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

@ -6,10 +6,11 @@ let
sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67"; sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
}; };
in in
with builderDefs { let localDefs = builderDefs {
buildInputs = []; buildInputs = [];
inherit src; inherit src;
} null; } null;
in with localDefs;
let let
copyFile = FullDepEntry (" copyFile = FullDepEntry ("
ensureDir \$out/include ensureDir \$out/include
@ -19,7 +20,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ladspa.h"; name = "ladspa.h";
builder = writeScript "ladspa.h-builder" builder = writeScript "ladspa.h-builder"
(textClosure [copyFile]); (textClosure localDefs [copyFile]);
meta = { meta = {
description = " description = "
LADSPA format audio plugins. LADSPA format audio plugins.

5
pkgs/applications/audio/snd/default.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = src =
fetchurl { fetchurl {
url = ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-9.4.tar.gz; url = ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-9.4.tar.gz;
@ -20,6 +20,7 @@ args : with args;
++ (lib.optional (args ? sndlib) "--with-midi" ) ++ (lib.optional (args ? sndlib) "--with-midi" )
; ;
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let preBuild = FullDepEntry (" let preBuild = FullDepEntry ("
cp config.log /tmp/snd-config.log cp config.log /tmp/snd-config.log
") [minInit doUnpack]; ") [minInit doUnpack];
@ -27,7 +28,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "Snd-9.4"; name = "Snd-9.4";
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doConfigure preBuild doMakeInstall doForceShare]); (textClosure localDefs [doConfigure preBuild doMakeInstall doForceShare]);
meta = { meta = {
description = " description = "
Snd sound editor. Snd sound editor.

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -9,10 +9,11 @@ fetchurl {
buildInputs = []; buildInputs = [];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gocr"; name = "gocr";
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
GPL Optical Character Recognition GPL Optical Character Recognition

5
pkgs/applications/graphics/xscreensaver/5.04.nix
View File

@ -1,4 +1,4 @@
args : with args; with builderDefs (args // { args : with args; let localDefs = builderDefs (args // {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://www.jwz.org/xscreensaver/xscreensaver-5.04.tar.gz; url = http://www.jwz.org/xscreensaver/xscreensaver-5.04.tar.gz;
@ -20,6 +20,7 @@ args : with args; with builderDefs (args // {
" --with-hackdir=\$out/share/xscreensaver-hacks ") " --with-hackdir=\$out/share/xscreensaver-hacks ")
]; ];
}) null; /* null is a terminator for sumArgs */ }) null; /* null is a terminator for sumArgs */
in with localDefs;
let let
preConfigure = FullDepEntry (" preConfigure = FullDepEntry ("
sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' "+ sed -e 's%@GTK_DATADIR@%@datadir@% ; s%@PO_DATADIR@%@datadir@%' "+
@ -29,7 +30,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "xscreensaver-"+version; name = "xscreensaver-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [preConfigure doConfigure doMakeInstall doForceShare doPropagate]); (textClosure localDefs [preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
The X screensaver daemon. Run xscreensaver-demo to configure. The X screensaver daemon. Run xscreensaver-demo to configure.

5
pkgs/applications/virtualization/qemu/0.9.0.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://fabrice.bellard.free.fr/qemu/qemu-0.9.0.tar.gz; url = http://fabrice.bellard.free.fr/qemu/qemu-0.9.0.tar.gz;
@ -9,6 +9,7 @@ args : with args;
buildInputs = [ SDL zlib which ]; buildInputs = [ SDL zlib which ];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
preConfigure = FullDepEntry (" preConfigure = FullDepEntry ("
gcc --version gcc --version
@ -17,7 +18,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qemu-"+version; name = "qemu-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [ preConfigure doConfigure doMakeInstall doForceShare doPropagate]); (textClosure localDefs [ preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
QEmu processor emulator. QEmu processor emulator.

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

@ -1,6 +1,6 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://fabrice.bellard.free.fr/qemu/linux-0.2.img.bz2; url = http://fabrice.bellard.free.fr/qemu/linux-0.2.img.bz2;
@ -9,6 +9,7 @@ args : with args;
buildInputs = []; buildInputs = [];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
doCopy = FullDepEntry (" doCopy = FullDepEntry ("
ensureDir \$out/share/qemu-images ensureDir \$out/share/qemu-images
@ -18,7 +19,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "QEmu-Linux-Image-"+version; name = "QEmu-Linux-Image-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doCopy doForceShare doPropagate]); (textClosure localDefs [doCopy doForceShare doPropagate]);
meta = { meta = {
description = " description = "
${abort "Write a description"} ${abort "Write a description"}

5
pkgs/applications/virtualization/virtualbox/1.5.2.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://www.virtualbox.org/download/1.5.2/VirtualBox-1.5.2_OSE.tar.bz2; url = http://www.virtualbox.org/download/1.5.2/VirtualBox-1.5.2_OSE.tar.bz2;
@ -9,10 +9,11 @@ args : with args;
wine jre libxslt libIDL SDL qt3 openssl zlib]; wine jre libxslt libIDL SDL qt3 openssl zlib];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "VirtualBox-"+version; name = "VirtualBox-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Virtual Box is just software for running virtual machines. Virtual Box is just software for running virtual machines.

5
pkgs/applications/window-managers/compiz-fusion/bcop/0.6.0.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/compiz-bcop-0.6.0.tar.bz2; url = http://releases.compiz-fusion.org/0.6.0/compiz-bcop-0.6.0.tar.bz2;
@ -9,6 +9,7 @@ args : with args;
propagatedBuildInputs = [getopt libxslt]; propagatedBuildInputs = [getopt libxslt];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
fixPkgconfig = FullDepEntry (" fixPkgconfig = FullDepEntry ("
ensureDir \$out/lib ensureDir \$out/lib
@ -21,7 +22,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "compiz-bcop-"+version; name = "compiz-bcop-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doAutotools doConfigure doMakeInstall fixPkgconfig fixInterpreter doForceShare (textClosure localDefs [doAutotools doConfigure doMakeInstall fixPkgconfig fixInterpreter doForceShare
doPropagate]); doPropagate]);
inherit propagatedBuildInputs; inherit propagatedBuildInputs;
meta = { meta = {

5
pkgs/applications/window-managers/compiz-fusion/ccsm/0.6.0.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/ccsm-0.6.0.tar.bz2; url = http://releases.compiz-fusion.org/0.6.0/ccsm-0.6.0.tar.bz2;
@ -15,10 +15,11 @@ args : with args;
"PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0" "PYTHONPATH" "$(toPythonPath ${pygtk})/gtk-2.0"
]; ];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "compizconfig-settings-"+args.version; name = "compizconfig-settings-"+args.version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [installPythonPackage (doWrap "\$out/bin/ccsm")]); (textClosure localDefs [installPythonPackage (doWrap "\$out/bin/ccsm")]);
meta = { meta = {
description = " description = "
Compiz Settings Manager Compiz Settings Manager

5
pkgs/applications/window-managers/compiz-fusion/compiz-manager/0.6.0.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/compiz-manager-0.6.0.tar.bz2; url = http://releases.compiz-fusion.org/0.6.0/compiz-manager-0.6.0.tar.bz2;
@ -20,6 +20,7 @@ args : with args;
"XORG_DRIVER_PATH" "/nix/store/.*" "XORG_DRIVER_PATH" "/nix/store/.*"
]]; ]];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
install = FullDepEntry (" install = FullDepEntry ("
sed -e '/Checking for texture_from_pixmap:/areturn 0' -i compiz-manager sed -e '/Checking for texture_from_pixmap:/areturn 0' -i compiz-manager
@ -34,7 +35,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "compiz-manager-"+args.version; name = "compiz-manager-"+args.version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doUnpack doReplaceScripts install doPropagate doForceShare]); (textClosure localDefs [doUnpack doReplaceScripts install doPropagate doForceShare]);
meta = { meta = {
description = " description = "
Compiz Launch Manager Compiz Launch Manager

5
pkgs/applications/window-managers/compiz-fusion/compizconfig-python/0.6.0.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.6.0.1/compizconfig-python-0.6.0.1.tar.bz2; url = http://releases.compiz-fusion.org/0.6.0.1/compizconfig-python-0.6.0.1.tar.bz2;
@ -9,10 +9,11 @@ args : with args;
[libcompizconfig bcop python pyrex configBackendGConf]; [libcompizconfig bcop python pyrex configBackendGConf];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "compizconfig-python-"+args.version; name = "compizconfig-python-"+args.version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doAutotools doConfigure doMakeInstall doForceShare]); (textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare]);
meta = { meta = {
description = " description = "
Compiz configuration - Python part. Compiz configuration - Python part.

5
pkgs/applications/window-managers/compiz-fusion/config-backend/0.6.0.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/compizconfig-backend-gconf-0.6.0.tar.bz2; url = http://releases.compiz-fusion.org/0.6.0/compizconfig-backend-gconf-0.6.0.tar.bz2;
@ -10,10 +10,11 @@ args : with args;
configureFlags = []; configureFlags = [];
forceShare = ["man" "doc" "info" "lib/compizconfig"]; forceShare = ["man" "doc" "info" "lib/compizconfig"];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "compizconfig-backend-GConf-"+version; name = "compizconfig-backend-GConf-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doAutotools doConfigure doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Compiz configuration backend (GConf). Compiz configuration backend (GConf).

5
pkgs/applications/window-managers/compiz-fusion/extra/0.6.0.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/compiz-fusion-plugins-extra-0.6.0.tar.bz2; url = http://releases.compiz-fusion.org/0.6.0/compiz-fusion-plugins-extra-0.6.0.tar.bz2;
@ -9,6 +9,7 @@ args : with args;
[bcop libjpeg gettext pluginsMain]; [bcop libjpeg gettext pluginsMain];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
sharePlugins = FullDepEntry (" sharePlugins = FullDepEntry ("
ensureDir \$out/share/compiz-plugins ensureDir \$out/share/compiz-plugins
@ -22,7 +23,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "compiz-fusion-plugins-extra-"+version; name = "compiz-fusion-plugins-extra-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [fixIncludes doConfigure doMakeInstall sharePlugins doForceShare]); (textClosure localDefs [fixIncludes doConfigure doMakeInstall sharePlugins doForceShare]);
meta = { meta = {
description = " description = "
Extra Compiz Fusion plugins. Extra Compiz Fusion plugins.

5
pkgs/applications/window-managers/compiz-fusion/libcompizconfig/0.6.0.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/libcompizconfig-0.6.0.tar.bz2; url = http://releases.compiz-fusion.org/0.6.0/libcompizconfig-0.6.0.tar.bz2;
@ -9,10 +9,11 @@ args : with args;
[bcop]; [bcop];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libcompizconfig-"+version; name = "libcompizconfig-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doAutotools doConfigure doMakeInstall doForceShare]); (textClosure localDefs [doAutotools doConfigure doMakeInstall doForceShare]);
meta = { meta = {
description = " description = "
Compiz configuration backend library. Compiz configuration backend library.

5
pkgs/applications/window-managers/compiz-fusion/main/0.6.0.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://releases.compiz-fusion.org/0.6.0/compiz-fusion-plugins-main-0.6.0.tar.bz2; url = http://releases.compiz-fusion.org/0.6.0/compiz-fusion-plugins-main-0.6.0.tar.bz2;
@ -9,6 +9,7 @@ args : with args;
[bcop libjpeg gettext]; [bcop libjpeg gettext];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
sharePlugins = FullDepEntry (" sharePlugins = FullDepEntry ("
ensureDir \$out/share/compiz-plugins ensureDir \$out/share/compiz-plugins
@ -18,7 +19,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "compiz-fusion-plugins-main-"+version; name = "compiz-fusion-plugins-main-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall sharePlugins doForceShare]); (textClosure localDefs [doConfigure doMakeInstall sharePlugins doForceShare]);
meta = { meta = {
description = " description = "
Main Compiz Fusion plugins. Main Compiz Fusion plugins.

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -22,6 +22,7 @@ args : with args;
(if args ? extraConfigureFlags then args.extraConfigureFlags else []); (if args ? extraConfigureFlags then args.extraConfigureFlags else []);
patches = [ ./glx-patch-0.6.2.patch ]; patches = [ ./glx-patch-0.6.2.patch ];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
postAll = FullDepEntry (" postAll = FullDepEntry ("
for i in $out/bin/*; do for i in $out/bin/*; do
@ -36,7 +37,7 @@ stdenv.mkDerivation
rec { rec {
name = "compiz-0.6.2"; name = "compiz-0.6.2";
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doPatch doConfigure doMakeInstall doPropagate (textClosure localDefs [doPatch doConfigure doMakeInstall doPropagate
doForceShare postAll]); doForceShare postAll]);
inherit propagatedBuildInputs; inherit propagatedBuildInputs;
meta = { meta = {

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -10,10 +10,11 @@ args : with args;
libpng libjpeg libtiff librsvg]; libpng libjpeg libtiff librsvg];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "fbpanel"; name = "fbpanel";
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Just a desktop panel. Just a desktop panel.

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

@ -1,9 +1,10 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src =""; /* put a fetchurl here */ src =""; /* put a fetchurl here */
buildInputs = [mkfontdir mkfontscale]; buildInputs = [mkfontdir mkfontscale];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
doInstall = FullDepEntry (" doInstall = FullDepEntry ("
ensureDir \$out/share/fonts/ ensureDir \$out/share/fonts/
@ -18,10 +19,10 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wrapped-font-dir"; name = "wrapped-font-dir";
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [ doInstall doForceShare doPropagate]); (textClosure localDefs [ doInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Just a wrapper to create fots.dir and fonts.scale . Just a wrapper to create fonts.dir and fonts.scale .
"; ";
}; };
} }

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -8,6 +8,7 @@ args : with args;
buildInputs = [ unzip clisp]; buildInputs = [ unzip clisp];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
shell=stdenv.shell; shell=stdenv.shell;
in in
@ -28,7 +29,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "Qi-"+version; name = "Qi-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [allBuild doForceShare doPropagate]); (textClosure localDefs [allBuild doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Qi - next generation on top of Common Lisp. Qi - next generation on top of Common Lisp.

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.tar.gz; url = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-0.9.6.tar.gz;
@ -8,10 +8,11 @@ args : with args;
buildInputs = [python]; buildInputs = [python];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "Pyrex-"+version; name = "Pyrex-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [installPythonPackage doForceShare]); (textClosure localDefs [installPythonPackage doForceShare]);
meta = { meta = {
description = " description = "
Python package compiler or something like that. Python package compiler or something like that.

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -8,10 +8,11 @@ args : with args;
buildInputs = []; buildInputs = [];
configureFlags = ["--enable-float --enable-shared"]; configureFlags = ["--enable-float --enable-shared"];
} null; } null;
in with localDefs;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "fftw-3.1.2"; name = "fftw-3.1.2";
builder = writeScript "fftw-3.1.2-builder" builder = writeScript "fftw-3.1.2-builder"
(textClosure [doConfigure doMakeInstall doForceShare]); (textClosure localDefs [doConfigure doMakeInstall doForceShare]);
meta = { meta = {
description = " description = "
Fastest Fourier Transform in the West library. Fastest Fourier Transform in the West library.

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -27,10 +27,11 @@ args : with args;
] else []) ] else [])
; ;
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libdbi"+version; name = "libdbi"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
DB independent interface to DB; DB drivers (mysql only for now). DB independent interface to DB; DB drivers (mysql only for now).

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -9,10 +9,11 @@ args : with args;
buildInputs = []; buildInputs = [];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libdbi"+version; name = "libdbi"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
DB independent interface to DB. DB independent interface to DB.

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -9,10 +9,11 @@ args : with args;
buildInputs = [ zlib]; buildInputs = [ zlib];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libextractor"+version; name = "libextractor"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Libextractor - extracts metadata from files. Libextractor - extracts metadata from files.

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -9,6 +9,7 @@ args : with args;
buildInputs = []; buildInputs = [];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
preBuild = FullDepEntry (" preBuild = FullDepEntry ("
sed -e '/extern FILE [*]output/i#ifndef OUTPUT_DEFINED_ELSEWHERE' -i src/indent.h sed -e '/extern FILE [*]output/i#ifndef OUTPUT_DEFINED_ELSEWHERE' -i src/indent.h
@ -19,7 +20,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "indent"; name = "indent";
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doConfigure preBuild doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doConfigure preBuild doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
GNU Indent - a source text formatter. GNU Indent - a source text formatter.

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -9,10 +9,11 @@ args : with args;
propagatedBuildInputs = [perl perlXMLParser]; propagatedBuildInputs = [perl perlXMLParser];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "intltool-0.36.2"; name = "intltool-0.36.2";
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall doPropagate doForceShare]); (textClosure localDefs [doConfigure doMakeInstall doPropagate doForceShare]);
inherit propagatedBuildInputs; inherit propagatedBuildInputs;
meta = { meta = {
description = " description = "

5
pkgs/development/tools/misc/ltrace/default.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -12,6 +12,7 @@ args : with args;
cd ltrace-*; cd ltrace-*;
"; ";
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
preConfigure = FullDepEntry (" preConfigure = FullDepEntry ("
sed -e 's@-o root -g root@@' -i Makefile.in; sed -e 's@-o root -g root@@' -i Makefile.in;
@ -20,7 +21,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ltrace-0.5"; name = "ltrace-0.5";
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [preConfigure doConfigure doMakeInstall doForceShare]); (textClosure localDefs [preConfigure doConfigure doMakeInstall doForceShare]);
meta = { meta = {
description = " description = "
Library call tracer. Library call tracer.

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -11,6 +11,7 @@ args : with args;
; ;
configureFlags = [""]; configureFlags = [""];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
preConfigure = FullDepEntry (" preConfigure = FullDepEntry ("
sed -e 's/math[.]h/cmath/' -i vector.cxx sed -e 's/math[.]h/cmath/' -i vector.cxx
@ -20,7 +21,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "construo-"+version; name = "construo-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [preConfigure doConfigure doMakeInstall doForceShare doPropagate]); (textClosure localDefs [preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Construo masses and springs simulation. Construo masses and springs simulation.

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

@ -1,13 +1,13 @@
args: with args; args: with args;
with (builderDefs let localDefs = builderDefs {
{
buildInputs =[(wxGTK null)]; buildInputs =[(wxGTK null)];
src = src =
fetchurl { fetchurl {
url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz; url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;
sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c"; sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
}; };
} null); } null;
in with localDefs;
let let
preBuild = FullDepEntry " preBuild = FullDepEntry "
sed -e ' sed -e '
@ -25,7 +25,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "fsg-4.4"; name = "fsg-4.4";
builder = writeScript "fsg-4.4-builder" builder = writeScript "fsg-4.4-builder"
(textClosure [doUnpack addInputs preBuild doMake installPhase doForceShare]); (textClosure localDefs [doUnpack addInputs preBuild doMake installPhase doForceShare]);
meta = { meta = {
description = " description = "

21
pkgs/lib/strings-with-deps.nix
View File

@ -18,7 +18,7 @@ args:
with lib; with lib;
let let
inherit (builtins) inherit (builtins)
head tail isList; head tail isList isAttrs;
in in
rec { rec {
@ -52,12 +52,23 @@ rec {
(concatLists (map textClosureDupList arg.deps)) ++ [arg] (concatLists (map textClosureDupList arg.deps)) ++ [arg]
); );
textClosureList = arg: textClosureDupListOverridable = predefined: arg:
(
if isList arg then
textClosureDupListOverridable predefined {text = ""; deps = arg;}
else if isAttrs arg then
(concatLists (map (textClosureDupListOverridable predefined) arg.deps)) ++ [arg]
else
textClosureDupListOverridable predefined (getAttr [arg] [] predefined)
);
textClosureListOverridable = predefined: arg:
(map (x : x.text) (map (x : x.text)
(uniqList {inputList = textClosureDupList arg;})); (uniqList {inputList = textClosureDupListOverridable predefined arg;}));
textClosure = arg: concatStringsSep "\n" (textClosureList arg); textClosureOverridable = predefined: arg: concatStringsSep "\n" (textClosureListOverridable predefined arg);
textClosureMap = f: arg: concatStringsSep "\n" (map f (textClosureList arg)); textClosureMapOveridable = f: predefined: arg:
concatStringsSep "\n" (map f (textClosureListOverridable predefined arg));
noDepEntry = text : {inherit text;deps = [];}; noDepEntry = text : {inherit text;deps = [];};
FullDepEntry = text : deps: {inherit text deps;}; FullDepEntry = text : deps: {inherit text deps;};

5
pkgs/os-specific/linux/atheros/0.9.3.3.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.3.3.tar.bz2; url = http://downloads.sourceforge.net/madwifi/madwifi-0.9.3.3.tar.bz2;
@ -16,6 +16,7 @@ args : with args;
sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg"; sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg";
} else "")*/; } else "")*/;
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
doPatch = FullDepEntry (if patchAR2425x86 !="" then '' doPatch = FullDepEntry (if patchAR2425x86 !="" then ''
cd hal cd hal
@ -25,7 +26,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "atheros-"+version; name = "atheros-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doPatch doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doPatch doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Atheros WiFi driver. Atheros WiFi driver.

5
pkgs/os-specific/linux/atheros/r2756.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2756-20071018.tar.gz; url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r2756-20071018.tar.gz;
@ -16,6 +16,7 @@ args : with args;
sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg"; sha256 = "11xpx5g9w7ilagvj60prc3s8a3x0n5n4mr0b7nh0lxwrbjdgjjfg";
} else ""); } else "");
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
doPatch = FullDepEntry (if patchAR2425x86 !="" then '' doPatch = FullDepEntry (if patchAR2425x86 !="" then ''
cd hal cd hal
@ -26,7 +27,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "atheros-"+version; name = "atheros-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doPatch doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doPatch doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Atheros WiFi driver. Atheros WiFi driver.

5
pkgs/os-specific/linux/atheros/r3122.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r3122-20080109.tar.gz; url = http://snapshots.madwifi.org/madwifi-ng/madwifi-ng-r3122-20080109.tar.gz;
@ -10,10 +10,11 @@ args : with args;
configureFlags = []; configureFlags = [];
makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out'']; makeFlags = [''KERNELPATH=${kernel}/lib/modules/*/build'' ''DESTDIR=$out''];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "atheros-"+version; name = "atheros-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Atheros WiFi driver. Atheros WiFi driver.

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -10,10 +10,11 @@ args : with args;
configureFlags = []; configureFlags = [];
makeFlags = "prefix=\$out"; makeFlags = "prefix=\$out";
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dmidecode-"+version; name = "dmidecode-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [ doMakeInstall doForceShare doPropagate]); (textClosure localDefs [ doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Tool to decode Desktop Management Interface and SBIOS data. Tool to decode Desktop Management Interface and SBIOS data.

5
pkgs/os-specific/linux/dvd+rw-tools/7.0.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.0.tar.gz; url = http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.0.tar.gz;
@ -10,6 +10,7 @@ args : with args;
configureFlags = []; configureFlags = [];
makeFlags = [" prefix=\$out "]; makeFlags = [" prefix=\$out "];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
preBuild = FullDepEntry (" preBuild = FullDepEntry ("
sed -e 's@/usr/local@'\$out'@g' -i Makefile.m4 Makefile sed -e 's@/usr/local@'\$out'@g' -i Makefile.m4 Makefile
@ -18,7 +19,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dvd+rw-tools-"+version; name = "dvd+rw-tools-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [preBuild doMakeInstall doForceShare doPropagate]); (textClosure localDefs [preBuild doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
DVD+RW tools. DVD+RW tools.

5
pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://fabrice.bellard.free.fr/qemu/kqemu-1.3.0pre11.tar.gz; url = http://fabrice.bellard.free.fr/qemu/kqemu-1.3.0pre11.tar.gz;
@ -8,6 +8,7 @@ args : with args;
buildInputs = []; buildInputs = [];
configureFlags = [''--prefix=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)'']; configureFlags = [''--prefix=$out'' ''--kernel-path=$(ls -d ${kernel}/lib/modules/*/build)''];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
debugStep = FullDepEntry ('' debugStep = FullDepEntry (''
cat config-host.mak cat config-host.mak
@ -21,7 +22,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "kqemu-"+version; name = "kqemu-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [preConfigure doConfigure debugStep doMakeInstall doForceShare doPropagate]); (textClosure localDefs [preConfigure doConfigure debugStep doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Kernel module for Qemu acceleration Kernel module for Qemu acceleration

5
pkgs/os-specific/linux/module-init-tools/aggregator.nix
View File

@ -1,10 +1,11 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
addSbinPath = true; addSbinPath = true;
src = ""; src = "";
buildInputs = [module_init_tools]; buildInputs = [module_init_tools];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let let
doCollect = FullDepEntry ('' doCollect = FullDepEntry (''
@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
name = "kernel-modules"; name = "kernel-modules";
inherit moduleSources; inherit moduleSources;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doCollect doForceShare doPropagate]); (textClosure localDefs [doCollect doForceShare doPropagate]);
meta = { meta = {
description = " description = "
A directory to hold all the modules, including those A directory to hold all the modules, including those

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

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
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;
@ -9,10 +9,11 @@ args : with args;
buildInputs = []; buildInputs = [];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "sdparm-"+version; name = "sdparm-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
SCSI parameters utility. SCSI parameters utility.

5
pkgs/tools/misc/relfs/cvs.2007.12.01.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchcvs { fetchcvs {
url = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs"; url = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";
@ -12,6 +12,7 @@ args : with args;
e2fsprogs gnomevfs pkgconfig GConf]; e2fsprogs gnomevfs pkgconfig GConf];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
let build = FullDepEntry (" let build = FullDepEntry ("
cd deps cd deps
sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl
@ -41,7 +42,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "relfs-"+version; name = "relfs-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [build doMakeInstall doForceShare doPropagate]); (textClosure localDefs [build doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Relational FS over FUSE. Relational FS over FUSE.

5
pkgs/tools/system/gdmap/0.7.5.nix
View File

@ -1,5 +1,5 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
fetchurl { fetchurl {
url = http://dfn.dl.sourceforge.net/sourceforge/gdmap/gdmap-0.7.5.tar.gz; url = http://dfn.dl.sourceforge.net/sourceforge/gdmap/gdmap-0.7.5.tar.gz;
@ -9,10 +9,11 @@ args : with args;
buildInputs = [gtk pkgconfig libxml2 intltool]; buildInputs = [gtk pkgconfig libxml2 intltool];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gdmap"+version; name = "gdmap"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [doConfigure doMakeInstall doForceShare doPropagate]); (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
Recursive rectangle map of disk usage. Recursive rectangle map of disk usage.

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

@ -40,7 +40,7 @@ args: with args; with stringsWithDeps; with lib;
{ {
addToSearchPathWithCustomDelimiter \"\${PATH_DELIMITER}\" \"\$@\" addToSearchPathWithCustomDelimiter \"\${PATH_DELIMITER}\" \"\$@\"
} }
") [defNest]; ") ["defNest"];
defNest = noDepEntry (" defNest = noDepEntry ("
nestingLevel=0 nestingLevel=0
@ -95,7 +95,7 @@ args: with args; with stringsWithDeps; with lib;
prefix=${if args ? prefix then (toString args.prefix) else "\$out"} prefix=${if args ? prefix then (toString args.prefix) else "\$out"}
" "
else "")) [defNest defAddToSearchPath]; else "")) ["defNest" "defAddToSearchPath"];
addInputs = FullDepEntry (" addInputs = FullDepEntry ("
# Recursively find all build inputs. # Recursively find all build inputs.
@ -161,7 +161,7 @@ args: with args; with stringsWithDeps; with lib;
fi fi
PATH=\$_PATH\${_PATH:+:}\$PATH PATH=\$_PATH\${_PATH:+:}\$PATH
") [minInit]; ") ["minInit"];
defEnsureDir = FullDepEntry (" defEnsureDir = FullDepEntry ("
# Ensure that the given directories exists. # Ensure that the given directories exists.
@ -171,7 +171,7 @@ args: with args; with stringsWithDeps; with lib;
if ! test -x \"\$dir\"; then mkdir -p \"\$dir\"; fi if ! test -x \"\$dir\"; then mkdir -p \"\$dir\"; fi
done done
} }
") [minInit]; ") ["minInit"];
toSrcDir = s : FullDepEntry ((if (archiveType s) == "tar" then " toSrcDir = s : FullDepEntry ((if (archiveType s) == "tar" then "
tar xvf '${s}' tar xvf '${s}'
@ -200,11 +200,11 @@ args: with args; with stringsWithDeps; with lib;
cd \$(basename ${s} .bz2) cd \$(basename ${s} .bz2)
" else (abort "unknown archive type : ${s}"))+ " else (abort "unknown archive type : ${s}"))+
(if args ? goSrcDir then args.goSrcDir else "") (if args ? goSrcDir then args.goSrcDir else "")
) [minInit]; ) ["minInit"];
doConfigure = FullDepEntry (" doConfigure = FullDepEntry ("
./configure --prefix=\"\$prefix\" ${toString configureFlags} ./configure --prefix=\"\$prefix\" ${toString configureFlags}
") [minInit addInputs doUnpack]; ") ["minInit" "addInputs" "doUnpack"];
doAutotools = FullDepEntry (" doAutotools = FullDepEntry ("
mkdir -p config mkdir -p config
@ -214,21 +214,21 @@ args: with args; with stringsWithDeps; with lib;
autoheader || true; autoheader || true;
automake --add-missing --copy automake --add-missing --copy
autoconf autoconf
")[minInit addInputs doUnpack]; ")["minInit" "addInputs" "doUnpack"];
doMake = FullDepEntry (" doMake = FullDepEntry ("
make ${toString makeFlags} make ${toString makeFlags}
") [minInit addInputs doUnpack]; ") ["minInit" "addInputs" "doUnpack"];
doUnpack = toSrcDir (toString src); doUnpack = toSrcDir (toString src);
installPythonPackage = FullDepEntry (" installPythonPackage = FullDepEntry ("
python setup.py install --prefix=\"\$prefix\" python setup.py install --prefix=\"\$prefix\"
") [minInit addInputs doUnpack]; ") ["minInit" "addInputs" "doUnpack"];
doMakeInstall = FullDepEntry (" doMakeInstall = FullDepEntry ("
make ${toString (getAttr ["makeFlags"] "" args)} "+ make ${toString (getAttr ["makeFlags"] "" args)} "+
"${toString (getAttr ["installFlags"] "" args)} install") [doMake]; "${toString (getAttr ["installFlags"] "" args)} install") ["doMake"];
doForceShare = FullDepEntry (" doForceShare = FullDepEntry ("
ensureDir \"\$prefix/share\" ensureDir \"\$prefix/share\"
@ -238,7 +238,7 @@ args: with args; with stringsWithDeps; with lib;
ln -sv share/\$d \"\$prefix\" ln -sv share/\$d \"\$prefix\"
fi; fi;
done; done;
") [minInit defEnsureDir]; ") ["minInit" "defEnsureDir"];
doDump = n: noDepEntry "echo Dump number ${n}; set"; doDump = n: noDepEntry "echo Dump number ${n}; set";
@ -250,7 +250,7 @@ args: with args; with stringsWithDeps; with lib;
doPatch = FullDepEntry (concatStringsSep ";" doPatch = FullDepEntry (concatStringsSep ";"
(map toPatchCommand patches) (map toPatchCommand patches)
) [minInit doUnpack]; ) ["minInit" "doUnpack"];
envAdderInner = s: x: if x==null then s else y: envAdderInner = s: x: if x==null then s else y:
a: envAdderInner (s+"echo export ${x}='\"'\"\$${x}:${y}\";'\"'\n") a; a: envAdderInner (s+"echo export ${x}='\"'\"\$${x}:${y}\";'\"'\n") a;
@ -268,12 +268,12 @@ args: with args; with stringsWithDeps; with lib;
(${envAdderList env} (${envAdderList env}
echo '\"'\"${cmd}-orig\"'\"' '\"'\\\$@'\"' \n) > \"${cmd}\""; echo '\"'\"${cmd}-orig\"'\"' '\"'\\\$@'\"' \n) > \"${cmd}\"";
doWrap = cmd: FullDepEntry (wrapEnv cmd (getAttr ["wrappedEnv"] [] args)) [minInit]; doWrap = cmd: FullDepEntry (wrapEnv cmd (getAttr ["wrappedEnv"] [] args)) ["minInit"];
doPropagate = FullDepEntry (" doPropagate = FullDepEntry ("
ensureDir \$out/nix-support ensureDir \$out/nix-support
echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs
") [minInit defEnsureDir]; ") ["minInit" "defEnsureDir"];
/*debug = x:(__trace x x); /*debug = x:(__trace x x);
debugX = x:(__trace (__toXML x) x);*/ debugX = x:(__trace (__toXML x) x);*/
@ -283,7 +283,7 @@ args: with args; with stringsWithDeps; with lib;
replaceScripts = l:(concatStringsSep "\n" (pairMap replaceInScript l)); replaceScripts = l:(concatStringsSep "\n" (pairMap replaceInScript l));
doReplaceScripts = FullDepEntry (replaceScripts (getAttr ["shellReplacements"] [] args)) [minInit]; doReplaceScripts = FullDepEntry (replaceScripts (getAttr ["shellReplacements"] [] args)) [minInit];
makeNest = x:(if x==defNest.text then x else "startNest\n" + x + "\nstopNest\n"); makeNest = x:(if x==defNest.text then x else "startNest\n" + x + "\nstopNest\n");
textClosure = textClosureMap makeNest; textClosure = textClosureMapOveridable makeNest;
inherit noDepEntry FullDepEntry PackEntry; inherit noDepEntry FullDepEntry PackEntry;

5
pkgs/top-level/template-composing+config.nix
View File

@ -1,4 +1,4 @@
args : with args; with builderDefs (args // { args : with args; let localDefs = builderDefs (args // {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
(abort "Specify source"); (abort "Specify source");
useConfig = true; useConfig = true;
@ -10,10 +10,11 @@ args : with args; with builderDefs (args // {
configFlags = [ configFlags = [
]; ];
}) null; /* null is a terminator for sumArgs */ }) null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${(abort "Specify name")}"+version; name = "${(abort "Specify name")}"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [(abort "Check phases") doMakeInstall doForceShare doPropagate]); (textClosure localDefs [(abort "Check phases") doMakeInstall doForceShare doPropagate]);
meta = { meta = {
description = " description = "
${(abort "Specify description")} ${(abort "Specify description")}

8
pkgs/top-level/template-composing-builder.nix
View File

@ -1,14 +1,16 @@
args : with args; args : with args;
with builderDefs { let localDefs = builderDefs {
src = /* put a fetchurl here */ src = /* put a fetchurl here */
buildInputs = []; buildInputs = [];
configureFlags = []; configureFlags = [];
} null; /* null is a terminator for sumArgs */ } null; /* null is a terminator for sumArgs */
in with localDefs;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "${abort "Specify name"}"; name = "${abort "Specify name"}-"+version;
builder = writeScript (name + "-builder") builder = writeScript (name + "-builder")
(textClosure [(abort "Specify phases - defined here or in builderDefs") doForceShare doPropagate]); (textClosure localDefs
[(abort "Specify phases - defined here or in builderDefs") doForceShare doPropagate]);
meta = { meta = {
description = " description = "
${abort "Write a description"} ${abort "Write a description"}