From 16c34f2f6f35f017aba02dd6da32f97e9c6de0f1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 23 Nov 2010 18:01:33 +0000 Subject: [PATCH 01/16] * SQLite 3.6.23.1. svn path=/nixpkgs/trunk/; revision=24825 --- pkgs/development/libraries/sqlite/3.6.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/3.6.x.nix b/pkgs/development/libraries/sqlite/3.6.x.nix index f700b862246..6a1c02dede1 100644 --- a/pkgs/development/libraries/sqlite/3.6.x.nix +++ b/pkgs/development/libraries/sqlite/3.6.x.nix @@ -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]; From e02f6ba5f3f52ddca70b32b5455bb835a403d65a Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 24 Nov 2010 10:47:48 +0000 Subject: [PATCH 02/16] Update python-sip svn path=/nixpkgs/trunk/; revision=24836 --- pkgs/development/python-modules/python-sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-sip/default.nix b/pkgs/development/python-modules/python-sip/default.nix index e2b5496aef8..7af20764fab 100644 --- a/pkgs/development/python-modules/python-sip/default.nix +++ b/pkgs/development/python-modules/python-sip/default.nix @@ -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"; From 8f07ddbdbbfdd7b3a227c54383f4ffa89d1f2443 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 24 Nov 2010 10:48:25 +0000 Subject: [PATCH 03/16] PyQt-4.8.1 svn path=/nixpkgs/trunk/; revision=24837 --- pkgs/development/python-modules/pyqt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/default.nix b/pkgs/development/python-modules/pyqt/default.nix index 94c5b99e4db..37eae0fe203 100644 --- a/pkgs/development/python-modules/pyqt/default.nix +++ b/pkgs/development/python-modules/pyqt/default.nix @@ -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 = '' From 0dcd86ef0fc11751166b460485a2fcc8c5298a11 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 24 Nov 2010 10:49:34 +0000 Subject: [PATCH 04/16] Make kdebindings compile with newer sip svn path=/nixpkgs/trunk/; revision=24838 --- pkgs/desktops/kde-4.5/bindings/default.nix | 2 +- pkgs/desktops/kde-4.5/bindings/sip-4.11.patch | 67 +++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/kde-4.5/bindings/sip-4.11.patch diff --git a/pkgs/desktops/kde-4.5/bindings/default.nix b/pkgs/desktops/kde-4.5/bindings/default.nix index 17dd970898b..03a2051321e 100644 --- a/pkgs/desktops/kde-4.5/bindings/default.nix +++ b/pkgs/desktops/kde-4.5/bindings/default.nix @@ -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@") diff --git a/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch b/pkgs/desktops/kde-4.5/bindings/sip-4.11.patch new file mode 100644 index 00000000000..15059e2526d --- /dev/null +++ b/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 +-{ +-%TypeHeaderCode +-#include +-%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 *ql = new QList; +- +- 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 + %MappedType QStack + { From a94fc3966dafef8298e01eda4b5a29bec88bd880 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 24 Nov 2010 11:19:38 +0000 Subject: [PATCH 05/16] Add inconsolata font svn path=/nixpkgs/trunk/; revision=24839 --- pkgs/data/fonts/inconsolata/default.nix | 51 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/data/fonts/inconsolata/default.nix diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix new file mode 100644 index 00000000000..953b677b080 --- /dev/null +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -0,0 +1,51 @@ +x@{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 version; + 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 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8ea857fb45..bbc9ed78575 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5180,6 +5180,8 @@ let 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 { }; From 823f34a0759a8ba57ebe737649a45c4015fc95df Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 24 Nov 2010 11:51:50 +0000 Subject: [PATCH 06/16] Adding Anonymous Pro font svn path=/nixpkgs/trunk/; revision=24840 --- pkgs/data/fonts/anonymous-pro/default.nix | 50 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/data/fonts/anonymous-pro/default.nix diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix new file mode 100644 index 00000000000..42f32f0ba71 --- /dev/null +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -0,0 +1,50 @@ +x@{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 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbc9ed78575..c2260c62050 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5136,6 +5136,8 @@ let andagii = callPackage ../data/fonts/andagii {}; + anonymousPro = callPackage ../data/fonts/anonymous-pro {}; + arkpandora_ttf = builderDefsPackage (import ../data/fonts/arkpandora) { }; From b2ea1f5e0d3c6c04fd10bb439057e5976454875a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 24 Nov 2010 13:53:11 +0000 Subject: [PATCH 07/16] Do not inherit missing version attribute svn path=/nixpkgs/trunk/; revision=24841 --- pkgs/data/fonts/inconsolata/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index 953b677b080..887f37c241b 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -21,7 +21,7 @@ rec { sha256 = sourceInfo.hash; }; - inherit (sourceInfo) name version; + inherit (sourceInfo) name; inherit buildInputs; /* doConfigure should be removed if not needed */ From 81fd05cdd337d24e309134faffd1a491bfe950e6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 24 Nov 2010 20:02:35 +0000 Subject: [PATCH 08/16] Dwarf fortress asserts the need for i686-linux; give it to it even on amd64 svn path=/nixpkgs/trunk/; revision=24842 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c2260c62050..20787d5d6fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6590,7 +6590,7 @@ let crack_attack = callPackage ../games/crack-attack { }; - dwarf_fortress = callPackage ../games/dwarf-fortress { + dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { gnomegtk = gnome.gtk; }; From 5af12418efa51fb6f0c1685ab98c65c16799e0ea Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 24 Nov 2010 20:05:43 +0000 Subject: [PATCH 09/16] Pass parameters with correct arch to DF svn path=/nixpkgs/trunk/; revision=24843 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20787d5d6fc..37f8540c91c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6591,7 +6591,7 @@ let crack_attack = callPackage ../games/crack-attack { }; dwarf_fortress = callPackage_i686 ../games/dwarf-fortress { - gnomegtk = gnome.gtk; + gnomegtk = pkgsi686Linux.gnome.gtk; }; eduke32 = callPackage ../games/eduke32 { }; From 2549fea1bb98b11f6cc335c5534592e0e4e86cde Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 24 Nov 2010 21:58:52 +0000 Subject: [PATCH 10/16] Upgraded pidgin to version 2.7.7 svn path=/nixpkgs/trunk/; revision=24844 --- .../networking/instant-messengers/pidgin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index d5ae3b5440f..033f239de44 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -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; From 5b89031ff54d266e0f66bbdd4fb97eaa2729775b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 25 Nov 2010 15:59:08 +0000 Subject: [PATCH 11/16] * nfs-utils updated to 1.2.3. svn path=/nixpkgs/trunk/; revision=24857 --- pkgs/os-specific/linux/nfs-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index b651d39b888..996965b9580 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -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'. From 4018d18e96baf7fff460f467ee3bfd5a7afc4c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 25 Nov 2010 22:01:14 +0000 Subject: [PATCH 12/16] Committing patch adding verilog from Antonio Vargas Gonzalez From his original, I adapted some spacing, and removed the release.nix reference (superfluous having set meta.platforms) svn path=/nixpkgs/trunk/; revision=24860 --- .../science/electronics/verilog/default.nix | 20 +++++++++++++++++++ pkgs/lib/maintainers.nix | 1 + pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 pkgs/applications/science/electronics/verilog/default.nix diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix new file mode 100644 index 00000000000..8f48879f76a --- /dev/null +++ b/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; + }; +} diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 8b664998d92..e795201755f 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -21,5 +21,6 @@ simons = "Peter Simons "; urkud = "Yury G. Kudryashov "; viric = "Lluís Batlle i Rossell "; + winden = "Antonio Vargas Gonzalez "; z77z = "Marco Maggesi "; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37f8540c91c..8e261b5f70d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1257,6 +1257,8 @@ let inherit pciutils libx86 zlib; }; + verilog = callPackage ../applications/science/electronics/verilog {}; + viking = callPackage ../applications/misc/viking { }; vncrec = builderDefsPackage ../tools/video/vncrec { From b44c4a88e8fd1ad7714215a3b2d774b2dfa12075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Thu, 25 Nov 2010 22:01:24 +0000 Subject: [PATCH 13/16] Setting me as maintainer of qemu, and telling hydra to build it (heavy package) svn path=/nixpkgs/trunk/; revision=24861 --- pkgs/applications/virtualization/qemu/0.13.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/qemu/0.13.nix b/pkgs/applications/virtualization/qemu/0.13.nix index 0c20884b0df..45961f950cf 100644 --- a/pkgs/applications/virtualization/qemu/0.13.nix +++ b/pkgs/applications/virtualization/qemu/0.13.nix @@ -12,5 +12,8 @@ stdenv.mkDerivation rec { meta = { description = "QEmu processor emulator"; + license = "GPLv2+"; + maintainers = with stdenv.lib.maintainers; [viric]; + platforms = with stdenv.lib.platforms; linux; }; } From 4db5a0b5a93b75fa642027bd7c5b12cc271bd717 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 26 Nov 2010 12:33:48 +0000 Subject: [PATCH 14/16] add gettext_0_17 alias to gettext, preparation for stdenv merge, concerning gnu hydra build configuration svn path=/nixpkgs/trunk/; revision=24866 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e261b5f70d..51b9967a440 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2830,7 +2830,7 @@ let gettext = callPackage ../development/libraries/gettext { }; - # XXX: Remove me when `stdenv-updates' is merged. + gettext_0_17 = gettext; gettext_0_18 = callPackage ../development/libraries/gettext/0.18.nix { }; gd = callPackage ../development/libraries/gd { }; From 0c455b53ac68342ab3ded557871000278dd4c437 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 26 Nov 2010 12:38:42 +0000 Subject: [PATCH 15/16] gettext, now properly svn path=/nixpkgs/trunk/; revision=24869 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51b9967a440..2a01ec25f37 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2828,9 +2828,9 @@ let geos = callPackage ../development/libraries/geos { }; - gettext = callPackage ../development/libraries/gettext { }; + gettext = gettext_0_17; - gettext_0_17 = gettext; + gettext_0_17 = callPackage ../development/libraries/gettext { }; gettext_0_18 = callPackage ../development/libraries/gettext/0.18.nix { }; gd = callPackage ../development/libraries/gd { }; From 5387036c50018fd32c5d37e3bf41d48aa7a1ed64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 26 Nov 2010 14:26:15 +0000 Subject: [PATCH 16/16] Adding php 5.2 (5.3 does not build on arm), although not the default in the attribute 'php'. svn path=/nixpkgs/trunk/; revision=24872 --- pkgs/development/interpreters/php/5.2.nix | 166 ++++++++++++++++++ .../interpreters/php/{default.nix => 5.3.nix} | 0 pkgs/top-level/all-packages.nix | 11 +- 3 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/php/5.2.nix rename pkgs/development/interpreters/php/{default.nix => 5.3.nix} (100%) diff --git a/pkgs/development/interpreters/php/5.2.nix b/pkgs/development/interpreters/php/5.2.nix new file mode 100644 index 00000000000..8063b1a5512 --- /dev/null +++ b/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]; + +}) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/5.3.nix similarity index 100% rename from pkgs/development/interpreters/php/default.nix rename to pkgs/development/interpreters/php/5.3.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a01ec25f37..eaeed3a2104 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2109,7 +2109,16 @@ let 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