Author: viric
Date: Fri Nov 26 14:40:39 2010
New Revision: 24876
URL: https://svn.nixos.org/websvn/nix/?rev=24876&sc=1
Log:
Updating from trunk - I hope I fixed the conflict around gettext - I left it as
it was before merging.
Added:
nixpkgs/branches/stdenv-updates/pkgs/applications/science/electronics/verilog/
- copied from r24875,
nixpkgs/trunk/pkgs/applications/science/electronics/verilog/
nixpkgs/branches/stdenv-updates/pkgs/data/fonts/anonymous-pro/
- copied from r24875, nixpkgs/trunk/pkgs/data/fonts/anonymous-pro/
nixpkgs/branches/stdenv-updates/pkgs/data/fonts/inconsolata/
- copied from r24875, nixpkgs/trunk/pkgs/data/fonts/inconsolata/
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch
- copied unchanged from r24875,
nixpkgs/trunk/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/php/5.2.nix
- copied unchanged from r24875,
nixpkgs/trunk/pkgs/development/interpreters/php/5.2.nix
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/php/5.3.nix
- copied unchanged from r24875,
nixpkgs/trunk/pkgs/development/interpreters/php/5.3.nix
Replaced:
nixpkgs/branches/stdenv-updates/pkgs/applications/science/electronics/verilog/default.nix
- copied unchanged from r24875,
nixpkgs/trunk/pkgs/applications/science/electronics/verilog/default.nix
nixpkgs/branches/stdenv-updates/pkgs/data/fonts/anonymous-pro/default.nix
- copied unchanged from r24875,
nixpkgs/trunk/pkgs/data/fonts/anonymous-pro/default.nix
nixpkgs/branches/stdenv-updates/pkgs/data/fonts/inconsolata/default.nix
- copied unchanged from r24875,
nixpkgs/trunk/pkgs/data/fonts/inconsolata/default.nix
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/php/default.nix
Modified:
nixpkgs/branches/stdenv-updates/ (props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/graphics/xscreensaver/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/misc/xneur/0.8.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-10/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/instant-messengers/pidgin/default.nix
nixpkgs/branches/stdenv-updates/pkgs/applications/virtualization/qemu/0.13.nix
nixpkgs/branches/stdenv-updates/pkgs/build-support/gcc-wrapper/ (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/debian-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/nix-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/rpm-build.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/build-support/release/source-tarball.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/bindings/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.1.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.10.2.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.2.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/compilers/ghc/6.8.3.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/aterm/2.8.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/fltk/fltk11.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.12/ignore-origin.patch
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.9/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/goocanvas/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/pcre/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/readline/readline6.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/sqlite/3.6.x.nix
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/pyqt/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/python-sip/default.nix
nixpkgs/branches/stdenv-updates/pkgs/development/tools/documentation/haddock/haddock-2.1.0.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/autoconf/2.13.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/development/tools/misc/gnum4/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/lib/maintainers.nix
nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/1.x.nix (props changed)
nixpkgs/branches/stdenv-updates/pkgs/misc/tex/pgf/2.x.nix (props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/atheros/r3867.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.28.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel-headers/2.6.32.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/generic.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.25.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.27.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.28.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.29.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32-xen.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.32.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kernel/linux-2.6.33.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/kqemu/1.4.0pre1.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nfs-utils/default.nix
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/qemu-kvm/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/util-linux-ng/
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/servers/mail/dovecot/1.1.1.nix (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/shells/bash/default.nix (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/stdenv/generic/setup.sh (props
changed)
nixpkgs/branches/stdenv-updates/pkgs/stdenv/linux/make-bootstrap-tools.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/tools/networking/wget/default.nix
(props changed)
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/instant-messengers/pidgin/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/instant-messengers/pidgin/default.nix
Fri Nov 26 14:34:58 2010 (r24875)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/networking/instant-messengers/pidgin/default.nix
Fri Nov 26 14:40:39 2010 (r24876)
@@ -21,10 +21,10 @@
} :
stdenv.mkDerivation {
- name = "pidgin-2.7.5";
+ name = "pidgin-2.7.7";
src = fetchurl {
- url = mirror://sourceforge/pidgin/pidgin-2.7.5.tar.bz2;
- sha256 = "0y6qzgx907k9p8bi8fvjnn4ri7qzmqch1i5lfh45k2lngxxfxxgk";
+ url = mirror://sourceforge/pidgin/pidgin-2.7.7.tar.bz2;
+ sha256 = "079gyxszrmzh4lhn1qk7s3v95amx78dv0yy5z3hpfd8fa4jdrvkc";
};
inherit nss ncurses;
Copied:
nixpkgs/branches/stdenv-updates/pkgs/applications/science/electronics/verilog/default.nix
(from r24875,
nixpkgs/trunk/pkgs/applications/science/electronics/verilog/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/science/electronics/verilog/default.nix
Fri Nov 26 14:40:39 2010 (r24876, copy of r24875,
nixpkgs/trunk/pkgs/applications/science/electronics/verilog/default.nix)
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, gperf, flex, bison}:
+
+stdenv.mkDerivation rec {
+ name = "verilog-0.9.3";
+
+ src = fetchurl {
+ url = "mirror://sourceforce/${name}.tar.gz";
+ sha256 =
"dd68c8ab874a93805d1e93fa76ee1e91fc0c7b20822ded3e57b6536cd8c0d1ba";
+ };
+
+ buildInputs = [ gperf flex bison ];
+
+ meta = {
+ description = "Icarus Verilog compiler";
+ homepage = http://www.icarus.com;
+ license = "GPLv2+";
+ maintainers = with stdenv.lib.maintainers; [winden];
+ platforms = with stdenv.lib.platforms; linux;
+ };
+}
Modified:
nixpkgs/branches/stdenv-updates/pkgs/applications/virtualization/qemu/0.13.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/applications/virtualization/qemu/0.13.nix
Fri Nov 26 14:34:58 2010 (r24875)
+++
nixpkgs/branches/stdenv-updates/pkgs/applications/virtualization/qemu/0.13.nix
Fri Nov 26 14:40:39 2010 (r24876)
@@ -12,5 +12,8 @@
meta = {
description = "QEmu processor emulator";
+ license = "GPLv2+";
+ maintainers = with stdenv.lib.maintainers; [viric];
+ platforms = with stdenv.lib.platforms; linux;
};
}
Copied:
nixpkgs/branches/stdenv-updates/pkgs/data/fonts/anonymous-pro/default.nix (from
r24875, nixpkgs/trunk/pkgs/data/fonts/anonymous-pro/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/stdenv-updates/pkgs/data/fonts/anonymous-pro/default.nix
Fri Nov 26 14:40:39 2010 (r24876, copy of r24875,
nixpkgs/trunk/pkgs/data/fonts/anonymous-pro/default.nix)
@@ -0,0 +1,50 @@
+...@{builderdefspackage
+ , unzip
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ version="1.002";
+ name="anonymousPro";
+ url="http://www.ms-studio.com/FontSales/AnonymousPro-${version}.zip";;
+ hash="86665847a51cdfb58a1e1dfd8b1ba33f183485affe50b53e3304f63d3d3552ab";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name version;
+ inherit buildInputs;
+
+ phaseNames = ["doUnpack" "installFonts"];
+
+ doUnpack = a.fullDepEntry (''
+ unzip ${src}
+ cd AnonymousPro*/
+ '') ["addInputs"];
+
+ meta = {
+ description = "A TrueType font set intended for source code";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ all;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://www.ms-studio.com/FontSales/anonymouspro.html";;
+ };
+ };
+}) x
+
Copied: nixpkgs/branches/stdenv-updates/pkgs/data/fonts/inconsolata/default.nix
(from r24875, nixpkgs/trunk/pkgs/data/fonts/inconsolata/default.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/stdenv-updates/pkgs/data/fonts/inconsolata/default.nix
Fri Nov 26 14:40:39 2010 (r24876, copy of r24875,
nixpkgs/trunk/pkgs/data/fonts/inconsolata/default.nix)
@@ -0,0 +1,51 @@
+...@{builderdefspackage
+ , fontforge
+ , ...}:
+builderDefsPackage
+(a :
+let
+ helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
+ [];
+
+ buildInputs = map (n: builtins.getAttr n x)
+ (builtins.attrNames (builtins.removeAttrs x helperArgNames));
+ sourceInfo = rec {
+ name="inconsolata";
+ url="http://www.levien.com/type/myfonts/Inconsolata.sfd";;
+ hash="1cd29c8396adb18bfeddb1abf5bdb98b677649bb9b09f126d1335b123a4cfddb";
+ };
+in
+rec {
+ src = a.fetchurl {
+ url = sourceInfo.url;
+ sha256 = sourceInfo.hash;
+ };
+
+ inherit (sourceInfo) name;
+ inherit buildInputs;
+
+ /* doConfigure should be removed if not needed */
+ phaseNames = ["copySrc" "generateFontsFromSFD" "installFonts"];
+
+ copySrc = a.fullDepEntry (''
+ cp ${src} inconsolata.sfd
+ '') ["minInit"];
+
+ generateFontsFromSFD = a.generateFontsFromSFD // {deps=["addInputs"];};
+
+ meta = {
+ description = "A monospace font for both screen and print";
+ maintainers = with a.lib.maintainers;
+ [
+ raskin
+ ];
+ platforms = with a.lib.platforms;
+ all;
+ };
+ passthru = {
+ updateInfo = {
+ downloadPage = "http://www.levien.com/type/myfonts/inconsolata.html";;
+ };
+ };
+}) x
+
Modified:
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/bindings/default.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/bindings/default.nix
Fri Nov 26 14:34:58 2010 (r24875)
+++ nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/bindings/default.nix
Fri Nov 26 14:40:39 2010 (r24876)
@@ -6,7 +6,7 @@
# some bindings are even broken.
kde.package rec {
- patches = [ ./python-site-packages-install-dir.diff ];
+ patches = [ ./python-site-packages-install-dir.diff ./sip-4.11.patch ];
preConfigure = ''
CUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -r rbconfig -e "print
Config::CONFIG['sitearchdir']" | sed -e "s...@${ruby}@$out@")
Copied:
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch
(from r24875, nixpkgs/trunk/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/branches/stdenv-updates/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch
Fri Nov 26 14:40:39 2010 (r24876, copy of r24875,
nixpkgs/trunk/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch)
@@ -0,0 +1,67 @@
+Make kdebindings compile against sip-4.11, from KDE svn
+Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip
+===================================================================
+--- kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170601)
++++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170602)
+@@ -733,61 +733,6 @@
+ };
+
+
+-%MappedType QList<uint>
+-{
+-%TypeHeaderCode
+-#include <qlist.h>
+-%End
+-
+-%ConvertFromTypeCode
+- // Create the list.
+- PyObject *l;
+-
+- if ((l = PyList_New(sipCpp->size())) == NULL)
+- return NULL;
+-
+- // Set the list elements.
+- for (int i = 0; i < sipCpp->size(); ++i) {
+- PyObject *pobj;
+-
+-#if PY_MAJOR_VERSION >= 3
+- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
+-#else
+- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
+-#endif
+- Py_DECREF(l);
+-
+- return NULL;
+- }
+-
+- PyList_SET_ITEM(l, i, pobj);
+- }
+-
+- return l;
+-%End
+-
+-%ConvertToTypeCode
+- // Check the type if that is all that is required.
+- if (sipIsErr == NULL)
+- return PyList_Check(sipPy);
+-
+- QList<uint> *ql = new QList<uint>;
+-
+- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
+-#if PY_MAJOR_VERSION >= 3
+- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
+-#else
+- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
+-#endif
+- }
+-
+- *sipCppPtr = ql;
+-
+- return sipGetState(sipTransferObj);
+-%End
+-};
+-
+-
+ template <TYPE*>
+ %MappedType QStack<TYPE*>
+ {
Copied:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/php/5.2.nix (from
r24875, nixpkgs/trunk/pkgs/development/interpreters/php/5.2.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/php/5.2.nix
Fri Nov 26 14:40:39 2010 (r24876, copy of r24875,
nixpkgs/trunk/pkgs/development/interpreters/php/5.2.nix)
@@ -0,0 +1,166 @@
+args: with args;
+
+let
+
+ inherit (args.composableDerivation) composableDerivation edf wwf;
+
+in
+
+composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
+
+ version = "5.2.14";
+
+ name = "php_configurable-${version}";
+
+ buildInputs = ["flex" "bison" "pkgconfig"];
+
+ flags = {
+
+# much left to do here...
+
+ # SAPI modules:
+
+ apxs2 = {
+ configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
+ buildInputs = [apacheHttpd];
+ };
+
+ # Extensions
+
+ curl = {
+ configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"];
+ buildInputs = [curl openssl];
+ };
+
+ zlib = {
+ configureFlags = ["--with-zlib=${args.zlib}"];
+ buildInputs = [zlib];
+ };
+
+ libxml2 = {
+ configureFlags = [
+ "--with-libxml-dir=${libxml2}"
+ "--with-iconv-dir=${libiconv}"
+ ];
+ buildInputs = [ libxml2 ];
+ };
+
+ sqlite = {
+ configureFlags = ["--with-pdo-sqlite=${sqlite}"];
+ buildInputs = [ sqlite ];
+ };
+
+ postgresql = {
+ configureFlags = ["--with-pgsql=${postgresql}"];
+ buildInputs = [ postgresql ];
+ };
+
+ mysql = {
+ configureFlags = ["--with-mysql=${mysql}"];
+ buildInputs = [ mysql ];
+ };
+
+ mysqli = {
+ configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
+ buildInputs = [ mysql];
+ };
+
+ mysqli_embedded = {
+ configureFlags = ["--enable-embedded-mysqli"];
+ depends = "mysqli";
+ assertion = fixed.mysqliSupport;
+ };
+
+ pdo_mysql = {
+ configureFlags = ["--with-pdo-mysql=${mysql}"];
+ buildInputs = [ mysql ];
+ };
+
+ bcmath = {
+ configureFlags = ["--enable-bcmath"];
+ };
+
+ gd = {
+ configureFlags = ["--with-gd=${args.gd}"];
+ buildInputs = [gd libpng libjpeg ];
+ };
+
+ soap = {
+ configureFlags = ["--enable-soap"];
+ };
+
+ sockets = {
+ configureFlags = ["--enable-sockets"];
+ };
+
+ openssl = {
+ configureFlags = ["--with-openssl=${args.openssl}"];
+ buildInputs = ["openssl"];
+ };
+
+ mbstring = {
+ configureFlags = ["--enable-mbstring"];
+ };
+
+ /*
+ php is build within this derivation in order to add the xdebug lines
to the php.ini.
+ So both Apache and command line php both use xdebug without having to
configure anything.
+ Xdebug could be put in its own derivation.
+ * /
+ meta = {
+ description = "debugging support for PHP";
+ homepage = http://xdebug.org;
+ license = "based on the PHP license - as is";
+ };
+ */
+ };
+
+ cfg = {
+ mysqlSupport = getConfig ["php" "mysql"] true;
+ mysqliSupport = getConfig ["php" "mysqli"] true;
+ pdo_mysqlSupport = getConfig ["php" "pdo_mysql"] true;
+ libxml2Support = getConfig ["php" "libxml2"] true;
+ apxs2Support = getConfig ["php" "apxs2"] true;
+ bcmathSupport = getConfig ["php" "bcmath"] true;
+ socketsSupport = getConfig ["php" "sockets"] true;
+ curlSupport = getConfig ["php" "curl"] true;
+ gettextSupport = getConfig ["php" "gettext"] true;
+ postgresqlSupport = getConfig ["php" "postgresql"] true;
+ sqliteSupport = getConfig ["php" "sqlite"] true;
+ soapSupport = getConfig ["php" "soap"] true;
+ zlibSupport = getConfig ["php" "zlib"] true;
+ opensslSupport = getConfig ["php" "openssl"] true;
+ mbstringSupport = getConfig ["php" "mbstring"] true;
+ gdSupport = getConfig ["php" "gd"] true;
+ };
+
+ configurePhase = ''
+ iniFile=$out/etc/php-recommended.ini
+ [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
+ ./configure --with-config-file-scan-dir=/etc
--with-config-file-path=$out/etc --prefix=$out $configureFlags
+ echo configurePhase end
+ '';
+
+ installPhase = ''
+ unset installPhase; installPhase;
+ cp php.ini-${ if builtins.lessThan (builtins.compareVersions version
"5.3") 0
+ then "recommended" /* < PHP 5.3 */
+ else "production" /* >= PHP 5.3 */
+ } $iniFile
+ '';
+
+ src = args.fetchurl {
+ url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";;
+ sha256 = "1l9b7iv0f6ds9x2ayclcfgjh62xbabbv11ixp5cqsyaq2ba5ynsi";
+ name = "php-${version}.tar.bz2";
+ };
+
+ meta = {
+ description = "The PHP language runtime engine";
+ homepage = http://www.php.net/;
+ license = "PHP-3";
+ };
+
+ patches = [./fix.patch];
+
+})
Copied:
nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/php/5.3.nix (from
r24875, nixpkgs/trunk/pkgs/development/interpreters/php/5.3.nix)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/interpreters/php/5.3.nix
Fri Nov 26 14:40:39 2010 (r24876, copy of r24875,
nixpkgs/trunk/pkgs/development/interpreters/php/5.3.nix)
@@ -0,0 +1,166 @@
+args: with args;
+
+let
+
+ inherit (args.composableDerivation) composableDerivation edf wwf;
+
+in
+
+composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in {
+
+ version = "5.3.3";
+
+ name = "php_configurable-${version}";
+
+ buildInputs = ["flex" "bison" "pkgconfig"];
+
+ flags = {
+
+# much left to do here...
+
+ # SAPI modules:
+
+ apxs2 = {
+ configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
+ buildInputs = [apacheHttpd];
+ };
+
+ # Extensions
+
+ curl = {
+ configureFlags = ["--with-curl=${args.curl}" "--with-curlwrappers"];
+ buildInputs = [curl openssl];
+ };
+
+ zlib = {
+ configureFlags = ["--with-zlib=${args.zlib}"];
+ buildInputs = [zlib];
+ };
+
+ libxml2 = {
+ configureFlags = [
+ "--with-libxml-dir=${libxml2}"
+ "--with-iconv-dir=${libiconv}"
+ ];
+ buildInputs = [ libxml2 ];
+ };
+
+ sqlite = {
+ configureFlags = ["--with-pdo-sqlite=${sqlite}"];
+ buildInputs = [ sqlite ];
+ };
+
+ postgresql = {
+ configureFlags = ["--with-pgsql=${postgresql}"];
+ buildInputs = [ postgresql ];
+ };
+
+ mysql = {
+ configureFlags = ["--with-mysql=${mysql}"];
+ buildInputs = [ mysql ];
+ };
+
+ mysqli = {
+ configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"];
+ buildInputs = [ mysql];
+ };
+
+ mysqli_embedded = {
+ configureFlags = ["--enable-embedded-mysqli"];
+ depends = "mysqli";
+ assertion = fixed.mysqliSupport;
+ };
+
+ pdo_mysql = {
+ configureFlags = ["--with-pdo-mysql=${mysql}"];
+ buildInputs = [ mysql ];
+ };
+
+ bcmath = {
+ configureFlags = ["--enable-bcmath"];
+ };
+
+ gd = {
+ configureFlags = ["--with-gd=${args.gd}"];
+ buildInputs = [gd libpng libjpeg ];
+ };
+
+ soap = {
+ configureFlags = ["--enable-soap"];
+ };
+
+ sockets = {
+ configureFlags = ["--enable-sockets"];
+ };
+
+ openssl = {
+ configureFlags = ["--with-openssl=${args.openssl}"];
+ buildInputs = ["openssl"];
+ };
+
+ mbstring = {
+ configureFlags = ["--enable-mbstring"];
+ };
+
+ /*
+ php is build within this derivation in order to add the xdebug lines
to the php.ini.
+ So both Apache and command line php both use xdebug without having to
configure anything.
+ Xdebug could be put in its own derivation.
+ * /
+ meta = {
+ description = "debugging support for PHP";
+ homepage = http://xdebug.org;
+ license = "based on the PHP license - as is";
+ };
+ */
+ };
+
+ cfg = {
+ mysqlSupport = getConfig ["php" "mysql"] true;
+ mysqliSupport = getConfig ["php" "mysqli"] true;
+ pdo_mysqlSupport = getConfig ["php" "pdo_mysql"] true;
+ libxml2Support = getConfig ["php" "libxml2"] true;
+ apxs2Support = getConfig ["php" "apxs2"] true;
+ bcmathSupport = getConfig ["php" "bcmath"] true;
+ socketsSupport = getConfig ["php" "sockets"] true;
+ curlSupport = getConfig ["php" "curl"] true;
+ gettextSupport = getConfig ["php" "gettext"] true;
+ postgresqlSupport = getConfig ["php" "postgresql"] true;
+ sqliteSupport = getConfig ["php" "sqlite"] true;
+ soapSupport = getConfig ["php" "soap"] true;
+ zlibSupport = getConfig ["php" "zlib"] true;
+ opensslSupport = getConfig ["php" "openssl"] true;
+ mbstringSupport = getConfig ["php" "mbstring"] true;
+ gdSupport = getConfig ["php" "gd"] true;
+ };
+
+ configurePhase = ''
+ iniFile=$out/etc/php-recommended.ini
+ [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin
+ ./configure --with-config-file-scan-dir=/etc
--with-config-file-path=$out/etc --prefix=$out $configureFlags
+ echo configurePhase end
+ '';
+
+ installPhase = ''
+ unset installPhase; installPhase;
+ cp php.ini-${ if builtins.lessThan (builtins.compareVersions version
"5.3") 0
+ then "recommended" /* < PHP 5.3 */
+ else "production" /* >= PHP 5.3 */
+ } $iniFile
+ '';
+
+ src = args.fetchurl {
+ url = "http://nl.php.net/get/php-${version}.tar.bz2/from/this/mirror";;
+ sha256 = "16iz1cprpjw60nf6n5z6isdziyzj56i3r8161si58j65yd86g1zj";
+ name = "php-${version}.tar.bz2";
+ };
+
+ meta = {
+ description = "The PHP language runtime engine";
+ homepage = http://www.php.net/;
+ license = "PHP-3";
+ };
+
+ patches = [./fix.patch];
+
+})
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/sqlite/3.6.x.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/development/libraries/sqlite/3.6.x.nix
Fri Nov 26 14:34:58 2010 (r24875)
+++ nixpkgs/branches/stdenv-updates/pkgs/development/libraries/sqlite/3.6.x.nix
Fri Nov 26 14:40:39 2010 (r24876)
@@ -3,11 +3,11 @@
assert readline != null -> ncurses != null;
stdenv.mkDerivation {
- name = "sqlite-3.6.23";
+ name = "sqlite-3.6.23.1";
src = fetchurl {
- url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.tar.gz";;
- sha256 =
"a5de9ec9273acabc6cb18235df802549c476410b09d58a206e02862b4dc303ae";
+ url = "http://www.sqlite.org/sqlite-amalgamation-3.6.23.1.tar.gz";;
+ sha256 = "0n1maahlqxk7p6kmsv0v2afy6qbv15n85mgkr4ylbf3ghcjdg06h";
};
buildInputs = [readline ncurses];
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/pyqt/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/pyqt/default.nix
Fri Nov 26 14:34:58 2010 (r24875)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/pyqt/default.nix
Fri Nov 26 14:40:39 2010 (r24876)
@@ -1,11 +1,11 @@
{stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper
}:
-stdenv.mkDerivation {
- name = "pyqt-x11-gpl-4.7.4";
+stdenv.mkDerivation rec {
+ name = "PyQt-x11-gpl-4.8.1";
src = fetchurl {
- url =
http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.7.4.tar.gz;
- sha256 = "0a7iqzp75hd29rvwhyqfmaj5ymd49wq8scysjkivhc5qkx5rh00r";
+ url =
"http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/${name}.tar.gz";;
+ sha256 = "0w7k1jz7wcfwqq77hiwgds5s6py7kkg1rszd6c94bk9dr06vishz";
};
preConfigure = ''
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/python-sip/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/python-sip/default.nix
Fri Nov 26 14:34:58 2010 (r24875)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/python-modules/python-sip/default.nix
Fri Nov 26 14:40:39 2010 (r24876)
@@ -1,11 +1,11 @@
{ stdenv, fetchurl, python }:
stdenv.mkDerivation rec {
- name = "sip-4.10.5";
+ name = "sip-4.11.2";
src = fetchurl {
url =
"http://www.riverbankcomputing.co.uk/static/Downloads/sip4/${name}.tar.gz";;
- sha256 = "1hkn2n5hvfcfz0xprwyy5dzjzndgmvlf7abjsd868pv3hxdx1rs8";
+ sha256 = "0g1pj203m491rhy111ayr4k4lsbcqd8sa1np503xv94a90b05l6f";
};
configurePhase = "python ./configure.py -d
$out/lib/${python.libPrefix}/site-packages -b $out/bin -e $out/include";
Modified: nixpkgs/branches/stdenv-updates/pkgs/lib/maintainers.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/lib/maintainers.nix Fri Nov 26
14:34:58 2010 (r24875)
+++ nixpkgs/branches/stdenv-updates/pkgs/lib/maintainers.nix Fri Nov 26
14:40:39 2010 (r24876)
@@ -21,5 +21,6 @@
simons = "Peter Simons <[email protected]>";
urkud = "Yury G. Kudryashov <[email protected]>";
viric = "Lluís Batlle i Rossell <[email protected]>";
+ winden = "Antonio Vargas Gonzalez <[email protected]>";
z77z = "Marco Maggesi <[email protected]>";
}
Modified:
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nfs-utils/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nfs-utils/default.nix
Fri Nov 26 14:34:58 2010 (r24875)
+++
nixpkgs/branches/stdenv-updates/pkgs/os-specific/linux/nfs-utils/default.nix
Fri Nov 26 14:40:39 2010 (r24876)
@@ -1,11 +1,11 @@
{ fetchurl, stdenv, tcpWrapper, utillinuxng, libcap }:
stdenv.mkDerivation rec {
- name = "nfs-utils-1.2.2";
+ name = "nfs-utils-1.2.3";
src = fetchurl {
url = "mirror://sourceforge/nfs/${name}.tar.bz2";
- sha256 = "07nhr7ds5ic4x81l9qphrlmi4ifxl28xzr1zpzvg334ncrv2fizx";
+ sha256 = "06gzb4idg6rkr4wpj7lrdmg3zdqiz86j43dygykbyz0987lyqxam";
};
# Needs `libblkid' and `libcomerr' from `e2fsprogs' or `util-linux-ng'.
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Nov
26 14:34:58 2010 (r24875)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Fri Nov
26 14:40:39 2010 (r24876)
@@ -1269,6 +1269,8 @@
inherit pciutils libx86 zlib;
};
+ verilog = callPackage ../applications/science/electronics/verilog {};
+
viking = callPackage ../applications/misc/viking { };
vncrec = builderDefsPackage ../tools/video/vncrec {
@@ -2132,7 +2134,16 @@
perl = if system != "i686-cygwin" then perl510 else sysPerl;
- php = makeOverridable (import ../development/interpreters/php) {
+ php = php5_3;
+
+ php5_2 = makeOverridable (import ../development/interpreters/php/5.2.nix) {
+ inherit
+ stdenv fetchurl lib composableDerivation autoconf automake
+ flex bison apacheHttpd mysql libxml2
+ zlib curl gd postgresql openssl pkgconfig sqlite getConfig libiconv
libjpeg libpng;
+ };
+
+ php5_3 = makeOverridable (import ../development/interpreters/php/5.3.nix) {
inherit
stdenv fetchurl lib composableDerivation autoconf automake
flex bison apacheHttpd mysql libxml2
@@ -5199,6 +5210,8 @@
andagii = callPackage ../data/fonts/andagii {};
+ anonymousPro = callPackage ../data/fonts/anonymous-pro {};
+
arkpandora_ttf = builderDefsPackage (import ../data/fonts/arkpandora) {
};
@@ -5243,6 +5256,8 @@
hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { };
+ inconsolata = callPackage ../data/fonts/inconsolata {};
+
junicode = callPackage ../data/fonts/junicode { };
liberation_ttf = callPackage ../data/fonts/redhat-liberation-fonts { };
@@ -6657,8 +6672,8 @@
crack_attack = callPackage ../games/crack-attack { };
- dwarf_fortress = callPackage ../games/dwarf-fortress {
- gnomegtk = gnome.gtk;
+ dwarf_fortress = callPackage_i686 ../games/dwarf-fortress {
+ gnomegtk = pkgsi686Linux.gnome.gtk;
};
eduke32 = callPackage ../games/eduke32 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
