Author: eelco
Date: Fri Jul 30 14:47:23 2010
New Revision: 22828
URL: https://svn.nixos.org/websvn/nix/?rev=22828&sc=1
Log:
* Fix some more "args: with args".
Added:
nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
- copied, changed from r22818,
nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/1.0.14.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/1.0.14.nix
Modified:
nixpkgs/trunk/pkgs/applications/audio/beast/default.nix
nixpkgs/trunk/pkgs/applications/misc/audio/sox/default.nix
nixpkgs/trunk/pkgs/applications/networking/kphone/default.nix
nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
nixpkgs/trunk/pkgs/development/compilers/roadsend/default.nix
nixpkgs/trunk/pkgs/development/libraries/facile/default.nix
nixpkgs/trunk/pkgs/development/libraries/gegl/default.nix
nixpkgs/trunk/pkgs/development/libraries/snack/default.nix
nixpkgs/trunk/pkgs/misc/freestyle/default.nix
nixpkgs/trunk/pkgs/tools/networking/dnsmasq/default.nix
nixpkgs/trunk/pkgs/tools/system/fcron/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/audio/beast/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/audio/beast/default.nix Fri Jul 30
14:03:51 2010 (r22827)
+++ nixpkgs/trunk/pkgs/applications/audio/beast/default.nix Fri Jul 30
14:47:23 2010 (r22828)
@@ -1,36 +1,37 @@
-args: with args;
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool
+, gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }:
+
+stdenv.mkDerivation {
name = "beast-0.7.1";
- src = args.fetchurl {
+ src = fetchurl {
url = ftp://beast.gtk.org/pub/beast/v0.7/beast-0.7.1.tar.bz2;
sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l";
};
- buildInputs =[zlib guile libart_lgpl pkgconfig intltool gtk glib
+ buildInputs =
+ [ zlib guile libart_lgpl pkgconfig intltool gtk glib
libogg libvorbis libgnomecanvas gettext
- ];
-
- inherit bash perl;
+ ];
patchPhase = ''
unset patchPhase; patchPhase
sed 's=-DG_DISABLE_DEPRECATED==g' -i `find -type f` # the patches didn't
remove all occurences
- sed 's=/bin/bash=/$bash/bin/bash=g' -i `find -type f`
- sed 's=/usr/bin/perl=/$perl/bin/bash=g' -i `find -type f`
+ sed 's=/bin/bash=/${stdenv.shell}=g' -i `find -type f`
+ sed 's=/usr/bin/perl=/${perl}/bin/perl=g' -i `find -type f`
'';
- patches = [
- (fetchurl {
- url = mirror://gentoo/distfiles/beast-0.7.1-guile-1.8.diff.bz2;
- sha256 =
"dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e";
- })
- ./patch.patch # patches taken from gentoo
- ];
+ patches =
+ [ (fetchurl {
+ url = mirror://gentoo/distfiles/beast-0.7.1-guile-1.8.diff.bz2;
+ sha256 =
"dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e";
+ })
+ ./patch.patch # patches taken from gentoo
+ ];
meta = {
- description = "BEAST - the Bedevilled Sound Engine";
- homepage = http://beast.gtk.org;
- license = ["GPL-2" "LGPL-2.1"];
+ description = "BEAST - the Bedevilled Sound Engine";
+ homepage = http://beast.gtk.org;
+ license = ["GPL-2" "LGPL-2.1"];
};
}
Modified: nixpkgs/trunk/pkgs/applications/misc/audio/sox/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/misc/audio/sox/default.nix Fri Jul 30
14:03:51 2010 (r22827)
+++ nixpkgs/trunk/pkgs/applications/misc/audio/sox/default.nix Fri Jul 30
14:47:23 2010 (r22828)
@@ -1,15 +1,16 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
-
- name = "sox-14.3.0";
-
- src = args.fetchurl {
- url = mirror://sourceforge/sox/sox-14.3.0.tar.gz;
- sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws";
- };
+{ composableDerivation, lib, fetchurl, alsaLib, libao, lame, libmad }:
- flags =
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
+ name = "sox-14.3.0";
+
+ src = fetchurl {
+ url = mirror://sourceforge/sox/sox-14.3.0.tar.gz;
+ sha256 = "15r39dq9nlwrypm0vpxmbxyqqv0bd6284djbi1fdfrlkjhf43gws";
+ };
+
+ flags =
# are these options of interest? We'll see
#--disable-fftw disable usage of FFTW
#--enable-debug enable debugging
@@ -23,39 +24,21 @@
// edf { name = "dl-mad"; enable.buildInputs = [ libmad ]; } # use shared
library
// edf { name = "mad"; enable.buildInputs =[ libmad ]; }
;
- # These options should be autodetected by the configure script
- /*
- --without-sndfile Don't try to use libsndfile
- --without-ogg Don't try to use Ogg Vorbis
- --without-flac Don't try to use FLAC
- --without-ffmpeg Don't try to use ffmpeg
- --without-mad Don't try to use MAD (MP3 Audio Decoder)
- --without-lame Don't try to use LAME (LAME Ain't an MP3 Encoder)
- --without-amr-wb Don't try to use amr-wb
- --without-amr-nb Don't try to use amr-nb
- --without-samplerate Don't try to use libsamplerate (aka Secret Rabbit
- Code)
- --without-ladspa Don't try to use LADSPA
- --with-ladspa-path Default search path for LADSPA plugins
- */
-
cfg = {
ossSupport = false;
sun_audioSupport = false;
- } // lib.listToAttrs [
- { name = "dl-lameSupport"; value = true; }
+ } // lib.listToAttrs
+ [ { name = "dl-lameSupport"; value = true; }
{ name = "dl-madSupport"; value = true; }
- ];
+ ];
configureFlags = ["-enable-dl-lame"];
-
optionals = [ "libsndfile" "libogg" "flac" "ffmpeg" "libmad" "lame"
/* "amr-wb" "amr-nb" */
"libsamplerate" /* "ladspa" */ ];
-
meta = {
description = "Sample Rate Converter for audio";
homepage = http://www.mega-nerd.com/SRC/index.html;
Modified: nixpkgs/trunk/pkgs/applications/networking/kphone/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/kphone/default.nix Fri Jul
30 14:03:51 2010 (r22827)
+++ nixpkgs/trunk/pkgs/applications/networking/kphone/default.nix Fri Jul
30 14:47:23 2010 (r22828)
@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, autoconf, automake, libtool, qt, pkgconfig
+, openssl, libpng, alsaLib, libX11, libXext, libXt, libICE
+, libSM }:
stdenv.mkDerivation {
name = "kphone-1.2";
@@ -10,7 +12,7 @@
buildInputs =
[ autoconf automake libtool qt pkgconfig openssl libpng alsaLib
- libX11 libXext libXt libICE libSM libX11
+ libX11 libXext libXt libICE libSM
];
preConfigure = "autoconf";
@@ -19,7 +21,7 @@
description = "KPhone is a SIP UA for Linux";
homepage = http://sourceforge.net/projects/kphone/;
license = "GPL";
- maintainers = [args.lib.maintainers.marcweber];
- platforms = args.lib.platforms.linux;
+ maintainers = [ stdenv.lib.maintainers.marcweber ];
+ platforms = stdenv.lib.platforms.linux;
};
}
Modified:
nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
Fri Jul 30 14:03:51 2010 (r22827)
+++ nixpkgs/trunk/pkgs/applications/version-management/mercurial/default.nix
Fri Jul 30 14:47:23 2010 (r22828)
@@ -1,7 +1,9 @@
-args: with args;
+{ stdenv, fetchurl, python, makeWrapper
+, guiSupport ? false, tk ? null }:
stdenv.mkDerivation rec {
name = "mercurial-1.5.1";
+
src = fetchurl {
url = "http://www.selenic.com/mercurial/release/${name}.tar.gz";;
sha256 =
"5796dd27c884c0effb027c71925fe2c2506b08e0ac8c5f53db259d378ef96569";
@@ -10,8 +12,10 @@
inherit python; # pass it so that the same version can be used in hg2git
buildInputs = [ python makeWrapper ];
+
makeFlags = "PREFIX=$(out)";
- postInstall = (if args.guiSupport then
+
+ postInstall = (stdenv.lib.optionalString guiSupport
''
ensureDir $out/etc/mercurial
cp contrib/hgk $out/bin
@@ -23,9 +27,7 @@
WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\"
--set HG \"$out/bin/hg\"
--prefix PATH : \"${tk}/bin\" "
- ''
- else "")
- +
+ '') +
''
for i in $(cd $out/bin && ls); do
wrapProgram $out/bin/$i \
Modified: nixpkgs/trunk/pkgs/development/compilers/roadsend/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/roadsend/default.nix Fri Jul
30 14:03:51 2010 (r22827)
+++ nixpkgs/trunk/pkgs/development/compilers/roadsend/default.nix Fri Jul
30 14:47:23 2010 (r22828)
@@ -1,8 +1,12 @@
-args: with args;
+{ composableDerivation, fetchurl, bigloo, curl, fcgi ? null, libxml2 ? null,
mysql ? null }:
+
let edf = composableDerivation.edf; in
+
composableDerivation.composableDerivation {} {
name = "roadsend-2.9.3";
+
buildInputs = [bigloo curl];
+
flags = edf { name = "pcre"; }
// edf { name = "fcgi"; enable = { inherit fcgi; }; }
// edf { name = "xml"; enable = { buildInputs = [ libxml2 ]; }; }
@@ -10,24 +14,24 @@
// edf { name = "odbc"; };
# // edf { name = "gtk"} }
# // edf { name = "gtk2", enable = { buildInputs = [ mysql ]; } }
+
cfg = {
pcreSupport = true;
fcgiSupport = true;
xmlSupport = true;
mysqlSupport = true;
};
- src = args.fetchurl {
+
+ src = fetchurl {
url = "http://code.roadsend.com/snaps/roadsend-php-20081210.tar.bz2";;
sha256 = "0yhpiik0dyayd964wvn2k0cq7b1gihx1k3qx343r2l7lla4mapsx";
};
-# http://code.roadsend.com/snaps/roadsend-php-testsuite-2.9.7.tar.bz2";;
-# sha256 = "0rf0g9r0prla7daq3aif24d7dx0j01i35hcm8h5bbg3gvpfim463";
-
# tell pcc where to find the fastcgi library
postInstall = " sed -e \"s=(ldflags fastcgi.*=(ldflags -l fastcgi -L
\$fcgi)=\" -i \$out/etc/pcc.conf ";
+
meta = {
- description = "roadsend PHP -> C compiler";
+ description = "A PHP to C compiler";
homepage = http://www.roadsend.com;
# you can choose one of the following licenses:
# Runtime license is LPGL 2.1
Modified: nixpkgs/trunk/pkgs/development/libraries/facile/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/facile/default.nix Fri Jul 30
14:03:51 2010 (r22827)
+++ nixpkgs/trunk/pkgs/development/libraries/facile/default.nix Fri Jul 30
14:47:23 2010 (r22828)
@@ -1,19 +1,26 @@
-args: with args;
+{ stdenv, fetchurl, ocaml }:
+
stdenv.mkDerivation rec {
- name = "facile-1.1";
- src = fetchurl {
- url = "${meta.homepage}/distrib/${name}.tar.gz";
- sha256 = "1jp59ankjds8mh4vm0b5h4fd1lcbfn0rd6n151cgh14ihsknnym8";
- };
- dontAddPrefix = 1;
- patchPhase = "sed -e 's...@mkdir@mkdir -p@' -i Makefile";
- postConfigure = "make -C src .depend";
- makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile";
- buildInputs = [ocaml];
+ name = "facile-1.1";
+
+ src = fetchurl {
+ url = "${meta.homepage}/distrib/${name}.tar.gz";
+ sha256 = "1jp59ankjds8mh4vm0b5h4fd1lcbfn0rd6n151cgh14ihsknnym8";
+ };
+
+ dontAddPrefix = 1;
+
+ patchPhase = "sed -e 's...@mkdir@mkdir -p@' -i Makefile";
+
+ postConfigure = "make -C src .depend";
+
+ makeFlags = "FACILEDIR=\${out}/lib/ocaml/facile";
+
+ buildInputs = [ ocaml ];
- meta = {
- homepage = http://www.recherche.enac.fr/log/facile;
- license = "LGPL";
- description = "A Functional Constraint Library";
- };
+ meta = {
+ homepage = http://www.recherche.enac.fr/log/facile;
+ license = "LGPL";
+ description = "A Functional Constraint Library";
+ };
}
Modified: nixpkgs/trunk/pkgs/development/libraries/gegl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/gegl/default.nix Fri Jul 30
14:03:51 2010 (r22827)
+++ nixpkgs/trunk/pkgs/development/libraries/gegl/default.nix Fri Jul 30
14:47:23 2010 (r22828)
@@ -1,19 +1,21 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
+, librsvg, pango, gtk }:
+
+stdenv.mkDerivation {
name = "gegl-0.0.22";
- src = args.fetchurl {
+ src = fetchurl {
url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2;
sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5";
};
configureFlags = "--disable-docs"; # needs fonts otherwise don't know how
to pass them
- buildInputs =(with args; [pkgconfig glib babl libpng cairo libjpeg librsvg
pango gtk] );
+ buildInputs = [ pkgconfig glib babl libpng cairo libjpeg librsvg pango gtk ];
meta = {
- description = "graph based image processing framework";
- homepage = http://www.gegl.org;
- license = "GPL3";
+ description = "Graph-based image processing framework";
+ homepage = http://www.gegl.org;
+ license = "GPL3";
};
}
Modified: nixpkgs/trunk/pkgs/development/libraries/snack/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/snack/default.nix Fri Jul 30
14:03:51 2010 (r22827)
+++ nixpkgs/trunk/pkgs/development/libraries/snack/default.nix Fri Jul 30
14:47:23 2010 (r22828)
@@ -1,30 +1,31 @@
-# alsaLib vorbisTools python can be made optional
+# alsaLib vorbisTools python can be made optional
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, x11 }:
+
+stdenv.mkDerivation {
name = "snack-2.2.10";
- src = args.fetchurl {
+ src = fetchurl {
url = http://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz;
sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb";
};
- configureFlags = "--with-tcl=${args.tcl}/lib --with-tk=${args.tk}/lib";
+ configureFlags = "--with-tcl=${tcl}/lib --with-tk=${tk}/lib";
- postUnpack=''sourceRoot="$sourceRoot/unix"'';
+ postUnpack = ''sourceRoot="$sourceRoot/unix"'';
- buildInputs =(with args; [python tcl tk vorbisTools pkgconfig x11]);
+ buildInputs = [ python tcl tk vorbisTools pkgconfig x11 ];
- postInstall="aoeu";
+ postInstall = "aoeu";
- installPhase=''
+ installPhase = ''
ensureDir $out
make install DESTDIR="$out"
'';
meta = {
- description = "The Snack Sound Toolkit (Tcl)";
- homepage = "http://www.speech.kth.se/snack/";;
- license = "GPL-2";
+ description = "The Snack Sound Toolkit (Tcl)";
+ homepage = http://www.speech.kth.se/snack/;
+ license = "GPL-2";
};
}
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix (from
r22818, nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/1.0.14.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/1.0.14.nix Thu Jul
29 23:26:07 2010 (r22818, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/xapian/bindings/default.nix
Fri Jul 30 14:47:23 2010 (r22828)
@@ -1,19 +1,21 @@
-args: with args;
+{ composableDerivation, fetchurl, xapian, pkgconfig
+, python ? null, php ? null, ruby ? null }:
-let inherit (args.composableDerivation) composableDerivation wwf; in
-composableDerivation {} {
+let inherit (composableDerivation) wwf; in
- name = "xapian-bindings-1.0.14";
+composableDerivation.composableDerivation {} {
- src = fetchurl {
- url = http://oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz;
- sha256 = "060jjwddv6ws8iy3jkpl4zcrzzinkjvdblkl0gcja90qzl2j81q5";
- };
+ name = "xapian-bindings-1.0.14";
- buildInputs = [xapian pkgconfig];
+ src = fetchurl {
+ url = http://oligarchy.co.uk/xapian/1.0.14/xapian-bindings-1.0.14.tar.gz;
+ sha256 = "060jjwddv6ws8iy3jkpl4zcrzzinkjvdblkl0gcja90qzl2j81q5";
+ };
+
+ buildInputs = [ xapian pkgconfig ];
- # most interpreters aren't tested yet.. (see python for example how to do
it)
- flags =
+ # most interpreters aren't tested yet.. (see python for example how to do it)
+ flags =
wwf {
name = "python";
enable = {
@@ -64,9 +66,8 @@
};
meta = {
- description = "bindings for the xapian library";
- homepage = xapian.meta.homepage;
- license = "GPLv2";
+ description = "Bindings for the Xapian library";
+ homepage = xapian.meta.homepage;
+ license = "GPLv2";
};
-
}
Modified: nixpkgs/trunk/pkgs/misc/freestyle/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/freestyle/default.nix Fri Jul 30 14:03:51
2010 (r22827)
+++ nixpkgs/trunk/pkgs/misc/freestyle/default.nix Fri Jul 30 14:47:23
2010 (r22828)
@@ -1,14 +1,17 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, qt4, libpng, lib3ds, freeglut, libXi, libQGLViewer
+, swig, python }:
+
+stdenv.mkDerivation {
name = "freestyle-2.2.0";
- src = args.fetchurl {
+ src = fetchurl {
url = mirror://sourceforge/freestyle/freestyle.2.2.0-src.tar.bz2;
sha256 = "1h4880fijmfy0x6dbl9hfri071rpj3lnwfzkxi1qyqhy7zyxy7ga";
};
- buildInputs =(with args; [qt4 libpng lib3ds freeglut libXi libQGLViewer
swig]);
- inherit (args) python freeglut libQGLViewer lib3ds; # if you want to use
another adopt patch and Config.pri
+ buildInputs = [ qt4 libpng lib3ds freeglut libXi libQGLViewer swig ];
+
+ inherit python freeglut libQGLViewer lib3ds; # if you want to use another
adopt patch and Config.pri
buildPhase = ''
export PYTHON_VERSION=2.5
@@ -36,15 +39,15 @@
$hide/Freestyle
EOF
chmod +x $out/bin/Freestyle
- '';
+ '';
patches = ./patch;
installPhase = ":";
meta = {
- description = "Non-Photorealistic Line Drawing rendering from 3D scenes";
- homepage = http://freestyle.sourceforge.net;
- license = "GPL2";
+ description = "Non-Photorealistic Line Drawing rendering from 3D scenes";
+ homepage = http://freestyle.sourceforge.net;
+ license = "GPL2";
};
}
Modified: nixpkgs/trunk/pkgs/tools/networking/dnsmasq/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/dnsmasq/default.nix Fri Jul 30
14:03:51 2010 (r22827)
+++ nixpkgs/trunk/pkgs/tools/networking/dnsmasq/default.nix Fri Jul 30
14:47:23 2010 (r22828)
@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl }:
+
stdenv.mkDerivation {
name = "dnsmasq-2.40";
@@ -10,8 +11,8 @@
installPhase = "ensureDir \$out/bin; make DESTDIR= BINDIR=\$out/bin
MANDIR=\$out/man LOCALEDIR=\$out/share/locale install";
meta = {
- description = "DNS forwarder and DHCP server";
- homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html;
- license = "GPL";
- };
+ description = "DNS forwarder and DHCP server";
+ homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html;
+ license = "GPL";
+ };
}
Modified: nixpkgs/trunk/pkgs/tools/system/fcron/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/system/fcron/default.nix Fri Jul 30 14:03:51
2010 (r22827)
+++ nixpkgs/trunk/pkgs/tools/system/fcron/default.nix Fri Jul 30 14:47:23
2010 (r22828)
@@ -2,51 +2,55 @@
# restart using 'killall -TERM fcron; fcron -b
# use convert-fcrontab to update fcrontab files
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation {
name = "fcron-3.0.4";
- src = args.fetchurl {
+ src = fetchurl {
url = http://fcron.free.fr/archives/fcron-3.0.4.src.tar.gz;
sha256 = "15kgphsfa0nqgjd8yxyz947x2xyljj4iyh298kw4c8bz6iznqxn8";
};
- buildInputs =(with args; [perl]);
+ buildInputs = [ perl ];
- configureFlags = [ "--with-sendmail=/var/setuid-wrappers/sendmail"
- "--with-editor=/var/run/current-system/sw/bin/vi"
- "--with-bootinstall=no"
- "--sysconfdir=/etc"
- # fcron would have been default user/grp
- "--with-username=root"
- "--with-groupname=root"
- # fcron must not try to verify that sendmail has already
been installed int /var/setuid-wrappers/sendmail
- "--disable-checks"
- ];
+ configureFlags =
+ [ "--with-sendmail=/var/setuid-wrappers/sendmail"
+ "--with-editor=/var/run/current-system/sw/bin/vi"
+ "--with-bootinstall=no"
+ "--sysconfdir=/etc"
+ # fcron would have been default user/grp
+ "--with-username=root"
+ "--with-groupname=root"
+ # fcron must not try to verify that sendmail has already been installed
int /var/setuid-wrappers/sendmail
+ "--disable-checks"
+ ];
+
installTargets = "install-staged"; # install does also try to change
permissions of /etc/* files
- preConfigure = ''
- sed -i 's@/usr/bin/env p...@${args.perl}/bin/p...@g' configure script/*
- # Don't let fcron create the group fcron, nix(os) should do this
- sed -i '2...@.*@exit 0@' script/user-group
-
- # --with-bootinstall=no shoud do this, didn't work. So just exit the
script before doing anything
- sed -i '2...@.*@exit 0@' script/boot-install
-
- # also don't use chown or chgrp for documentation (or whatever) when
installing
- find -type f | xargs sed -i -e 's...@^\(\s\)*ch...@\1:@' -e
's...@^\(\s\)*ch...@\1:@'
-
- '';
-
- patchPhase = ''
- # don't try to create /etc/fcron.{allow,deny,conf}
-
- sed -i -e 's...@test -f $(DESTDIR)$(ETC)/fcron.conf @ # @' \
- -e 's...@if test ! -f $(DESTDIR)$(ETC)/fcron.allow@ # @' Makefile.in
- '';
+
+ preConfigure =
+ ''
+ sed -i 's@/usr/bin/env p...@${perl}/bin/p...@g' configure script/*
+ # Don't let fcron create the group fcron, nix(os) should do this
+ sed -i '2...@.*@exit 0@' script/user-group
+
+ # --with-bootinstall=no shoud do this, didn't work. So just exit the
script before doing anything
+ sed -i '2...@.*@exit 0@' script/boot-install
+
+ # also don't use chown or chgrp for documentation (or whatever) when
installing
+ find -type f | xargs sed -i -e 's...@^\(\s\)*ch...@\1:@' -e
's...@^\(\s\)*ch...@\1:@'
+ '';
+
+ patchPhase =
+ ''
+ # don't try to create /etc/fcron.{allow,deny,conf}
+ sed -i -e 's...@test -f $(DESTDIR)$(ETC)/fcron.conf @ # @' \
+ -e 's...@if test ! -f $(DESTDIR)$(ETC)/fcron.allow@ # @'
Makefile.in
+ '';
meta = {
- description="A command scheduler with extended capabilities over cron
and anacron";
- homepage = http://fcron.free.fr;
- license = "GPLv2";
+ description="A command scheduler with extended capabilities over cron and
anacron";
+ homepage = http://fcron.free.fr;
+ license = "GPLv2";
};
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 30 14:03:51
2010 (r22827)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 30 14:47:23
2010 (r22828)
@@ -2647,10 +2647,7 @@
};
roadsend = import ../development/compilers/roadsend {
- inherit fetchurl stdenv flex bison bigloo lib curl composableDerivation;
- # optional features
- # all features pcre, fcgi xml mysql, sqlite3, (not implemented: odbc gtk
gtk2)
- flags = ["pcre" "xml" "mysql"];
+ inherit fetchurl bigloo curl composableDerivation;
inherit mysql libxml2 fcgi;
};
@@ -2843,10 +2840,9 @@
# mercurial (hg) bleeding edge version
octaveHG = import ../development/interpreters/octave/hg.nix {
inherit fetchurl sourceFromHead readline ncurses perl flex atlas getConfig
glibc qhull gfortran;
- inherit automake autoconf bison gperf lib python gnuplot texinfo texLive;
# for dev Version
+ inherit automake autoconf bison gperf lib python gnuplot texinfo texLive;
inherit stdenv;
inherit (xlibs) libX11;
- #stdenv = overrideGCC stdenv gcc40;
};
perl58 = import ../development/interpreters/perl-5.8 {
@@ -3961,7 +3957,7 @@
};
gegl = import ../development/libraries/gegl {
- inherit fetchurl stdenv libpng pkgconfig babl openexr;
+ inherit fetchurl stdenv libpng pkgconfig babl;
# avocodec avformat librsvg
inherit cairo libjpeg librsvg;
inherit (gtkLibs) pango glib gtk;
@@ -5426,7 +5422,7 @@
snack = import ../development/libraries/snack {
inherit fetchurl stdenv tcl tk pkgconfig x11;
# optional
- inherit alsaLib vorbisTools python;
+ inherit vorbisTools python;
};
speex = import ../development/libraries/speex {
@@ -5562,9 +5558,9 @@
inherit fetchurl stdenv zlib;
};
- xapianBindings = (import
../development/libraries/xapian/bindings/1.0.14.nix) {
- inherit fetchurl stdenv xapian composableDerivation pkgconfig;
- inherit ruby perl php tcl python; # TODO perl php Java, tcl, C#, python
+ xapianBindings = (import ../development/libraries/xapian/bindings) {
+ inherit fetchurl xapian composableDerivation pkgconfig;
+ inherit ruby php python; # TODO perl php Java, tcl, C#, python
};
Xaw3d = import ../development/libraries/Xaw3d {
@@ -7458,11 +7454,10 @@
};
beast = import ../applications/audio/beast {
-# stdenv = overrideGCC stdenv gcc34;
- inherit stdenv fetchurl zlib guile pkgconfig intltool libogg libvorbis
python libxml2 bash perl gettext;
+ # stdenv = overrideGCC stdenv gcc34;
+ inherit stdenv fetchurl zlib guile pkgconfig intltool libogg libvorbis
perl gettext;
inherit (gtkLibs) gtk glib;
inherit (gnome) libgnomecanvas libart_lgpl;
- inherit automake autoconf;
};
bitlbee = import ../applications/networking/instant-messengers/bitlbee {
@@ -8398,7 +8393,7 @@
};
mercurial = import ../applications/version-management/mercurial {
- inherit fetchurl stdenv makeWrapper getConfig tk;
+ inherit fetchurl stdenv makeWrapper tk;
guiSupport = getConfig ["mercurial" "guiSupport"] false; # for hgk (gitk
gui for hg)
python = # allow cloning sources from https servers.
if getConfig ["mercurial" "httpsSupport"] true
@@ -8815,14 +8810,9 @@
};
sox = import ../applications/misc/audio/sox {
- inherit fetchurl stdenv lib composableDerivation;
- # optional features
- inherit alsaLib libao ffmpeg;
- inherit libsndfile libogg flac libmad lame libsamplerate;
- # Using the default nix ffmpeg I get this error when linking
- # .libs/libsox_la-ffmpeg.o: In function `audio_decode_frame':
- # /tmp/nix-7957-1/sox-14.0.0/src/ffmpeg.c:130: undefined reference to
`avcodec_decode_audio2
- # That's why I'v added ffmpeg_svn
+ inherit fetchurl lib composableDerivation;
+ inherit alsaLib libao;
+ inherit libmad lame;
};
stumpwm = builderDefsPackage (import
../applications/window-managers/stumpwm) {
@@ -9553,7 +9543,7 @@
};
kphone = import ../applications/networking/kphone {
- inherit fetchurl lib autoconf automake libtool pkgconfig openssl libpng
alsaLib;
+ inherit fetchurl autoconf automake libtool pkgconfig openssl libpng
alsaLib;
qt = qt3;
inherit (xlibs) libX11 libXext libXt libICE libSM;
stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
