Commit Graph

924 Commits

Author SHA1 Message Date
Alexander Foremny
bd0903b90b Merge remote-tracking branch 'bbenoist/phpfix' into php
Conflicts:
	pkgs/development/interpreters/php/5.3.nix
2013-02-22 09:33:06 +01:00
Alexander Foremny
fec1d4b2f7 Remove misconfigured mcrypt support 2013-02-22 09:24:48 +01:00
Shea Levy
acd4299e75 Merge branch 'master' into stdenv-updates
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
2013-02-21 11:13:30 -05:00
Peter Simons
210126bbae love: fix typo in meta.maintainer attribute 2013-02-21 14:28:58 +01:00
Song Wenwu
e270a609eb love: update to 0.8.0 2013-02-21 14:23:39 +01:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Lluís Batlle i Rossell
bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Shea Levy
c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Vladimír Čunát
b2f8432ad3 pure: update and fix by patching 2013-02-17 11:01:20 +01:00
Vladimír Čunát
b3ce50d88a add python33 (needed by new blender) 2013-02-16 18:11:32 +01:00
Vladimír Čunát
dbcdc27e03 python3: fix libPrefix passthru 2013-02-16 18:10:43 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Florian Friesdorf
1a52c7659d python: fix linkme-wrapper 2013-02-15 06:14:58 +01:00
bbenoist
99934eb363 php: Add zip and optional bz2 support
Use the overload bz2 = true to enable bz2 support for php.
zip support is enabled by default as it doesn't require any library.
2013-02-12 21:23:24 +01:00
bbenoist
8fd5fcbda5 php: Add mcrypt optional support
Use an override with mcrypt = true to enable libmcrypt support in php.
The --disable-posix-threadsds mcrypt build option was required by php.
2013-02-12 19:52:37 +01:00
Baptist BENOIST
b42ba898e1 php: Add xsl optional support
Use an override with xsl = true to enable xsl support in php.
2013-02-12 19:52:34 +01:00
Shea Levy
b97aa0c4b1 Update rubygems.
More vulnerabilities:
https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58
https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/KtmwSbEpzrU
https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8
2013-02-11 14:31:12 -05:00
Shea Levy
831d72cede Update rubygems.
Particularly for rack-1.5.2, fixes CVE-2013-0263 and CVE-2013-0262.
2013-02-08 18:26:38 -05:00
Shea Levy
30658882e8 Rubygems: Fix deps.
Gem nix in nixpkgs is broken, will have to update it.
2013-02-05 20:24:42 -05:00
Shea Levy
6cc91771a8 Mark ruby gems as such 2013-02-05 19:08:04 -05:00
Florian Friesdorf
906be2ea98 python-linkme-wrapper: optimize some escaping 2013-02-05 20:12:28 +01:00
Vladimír Čunát
bb7f1f38c2 clisp: fix after glibc update 2013-02-05 15:23:09 +01:00
Shea Levy
76cc4e760b Add thin rubygem 2013-02-04 15:53:09 -05:00
Shea Levy
af847fd8ce Add aws-sdk gem 2013-02-04 15:52:40 -05:00
Shea Levy
064638b0fd Add uuid rubygem 2013-02-04 15:51:25 -05:00
Shea Levy
e08ab1ebe5 Add sinatra-1.3.2 rubygem 2013-02-04 15:50:36 -05:00
Shea Levy
ff95e66e96 Add foreman rubygem 2013-02-04 15:16:13 -05:00
Shea Levy
ebfc26b43d Update rubygems 2013-01-31 14:33:02 -05:00
Eelco Dolstra
35af62f998 gperftools: Update to 2.0 and fix build
http://hydra.nixos.org/build/3875478
2013-01-28 17:19:01 +01:00
Shea Levy
3b34b3610e Add clojureUnstable (clojure 1.5.0-RC1).
Patch thanks to Patrick Lee.
2013-01-27 20:43:38 -05:00
Alexander Foremny
18180858af Enable mcrypt, intl and exif support in PHP 2013-01-26 16:08:43 +01:00
Eelco Dolstra
0a47a28f1d Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-22 23:23:53 +01:00
Florian Friesdorf
a63bb419f2 remove pythonhome-wrapper, python-linkme-wrapper is more flexible 2013-01-22 15:28:30 +01:00
Florian Friesdorf
1fa2e7f9a9 python-linkme-wrapper 2013-01-22 15:28:30 +01:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Florian Friesdorf
212b4df91c recursivePthLoader included via wrapper, not propagated by modules 2013-01-11 09:53:28 +01:00
Florian Friesdorf
0f007baf70 Merge branch 'channel-nixos' into python 2013-01-09 10:44:45 +01:00
Florian Friesdorf
a37cabdbb7 fix python-2.6 build: purity for systems with stdenv.gcc.libc
On other systems python26 will continue to look for
/usr/include/netinet/in.h among others. I don't know whether/what to
do about that.
2013-01-09 08:45:03 +01:00
Florian Friesdorf
56517508d8 python-2.6.8: long overdue 2013-01-09 08:44:58 +01:00
Florian Friesdorf
ee0204d2c8 for some reason the python2.6 manpage is not gzipped 2013-01-09 08:27:39 +01:00
Florian Friesdorf
723d5a5581 fix python-2.6 build: purity for systems with stdenv.gcc.libc
On other systems python26 will continue to look for
/usr/include/netinet/in.h among others. I don't know whether/what to
do about that.
2013-01-09 08:26:15 +01:00
Florian Friesdorf
16e2a9133f python-2.6.8: long overdue 2013-01-09 08:06:46 +01:00
Lluís Batlle i Rossell
b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.
2012-12-28 23:28:16 +01:00
Eelco Dolstra
84779a6f7d Remove unnecessary parentheses around if conditions
Pet peeve...
2012-12-28 19:54:15 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Peter Simons
5bf938a635 lua-5.1: build liblua.so and install the pkgconfig file and the documentation 2012-12-25 11:25:56 +01:00
Florian Friesdorf
838761cad2 python manpages as python2.6, python2.7 and python
see #68
2012-12-22 03:26:26 +01:00
Eelco Dolstra
f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
cillianderoiste
5b0cd954f1 Merge pull request #206 from chaoflow/python-merge
python pureness, cleanup, and enable pth loaders (setuptoolsSite, recursivePthLoader)
2012-12-05 14:28:09 -08:00
Eelco Dolstra
5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Rob Vermaas
dd0ba5d093 Only build hiphopvm on x86_64-linux. 2012-12-02 20:49:59 +01:00
Rob Vermaas
8c5d9098fa Add hiphopvm 2012-12-02 15:24:28 +01:00
Rob Vermaas
86a5ad6d80 Add some PHP support for gettext and gd/freetype needed for zabbix 2.0 2012-12-01 21:19:19 +01:00
Ludovic Courtès
5b1cbc54b5 guile: update to 2.0.7 2012-11-30 22:34:01 +01:00
Florian Friesdorf
3438681d80 Merge branch 'channel-nixos' into python-merge 2012-11-29 21:40:33 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Eelco Dolstra
7774506201 perl: Update to 5.16.2 2012-11-23 17:29:06 +01:00
Florian Friesdorf
1b013ac1ea Merge branch 'py/pdb' into python-merge 2012-11-22 13:38:08 +01:00
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Michael Raskin
1d010bea6d Erlang: fix my typo, too 2012-11-12 23:51:45 +04:00
Michael Raskin
f3a64ff8f9 Erlang: fix a typo 2012-11-12 23:49:30 +04:00
Peter Simons
5ecec6f399 erlang: add meta section 2012-11-11 20:48:33 +01:00
Peter Simons
73533ce2a0 erlang: drop the leading 'R' from the Erlang version number so that nix-env recognizes it and allows "nix-env -i erlang" to work 2012-11-11 20:44:37 +01:00
Peter Simons
724d416fae erlang: drop obsolete R15B01 version 2012-11-11 20:41:50 +01:00
Malcolm
4fbd441418 Adding Erlang R15B02 2012-11-11 20:38:53 +01:00
Eelco Dolstra
620e3a1516 php: Update to 5.3.18 2012-10-26 16:23:30 +02:00
Eelco Dolstra
5af277bbd1 Merge remote-tracking branch 'origin/master' into x-updates 2012-10-15 12:16:58 -04:00
Eelco Dolstra
873595ee6d php: Update to 5.3.17
Also remove unsupported PHP 5.2 (which doesn't build anymore).

http://hydra.nixos.org/build/3131326
2012-10-15 11:14:26 -04:00
Michael Raskin
29980e0d54 Add threads support to CLisp 2012-10-14 22:28:49 +04:00
Peter Simons
a352796e0d lua: add version 5.1
The 5.1 build system doesn't seem to support building a shared object anymore?
2012-10-10 19:24:37 +02:00
Ludovic Courtès
d1279b6a0b guile: Explicitly link against libgcc_s. 2012-09-24 15:40:33 +02:00
Eelco Dolstra
1fffc94956 Fix evaluation on non-Linux platforms 2012-09-21 15:29:05 -04:00
Eelco Dolstra
e6077fbc46 Remove getConfig helper function
An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’
can be written more concisely as ‘config.cabal.libraryProfiling or false’.
2012-09-19 13:56:56 -04:00
Eelco Dolstra
8ed71a1ee5 perl: Add 5.16.1 2012-09-18 15:23:07 -04:00
aszlig
ae32dd91d4
tcl: Set license to licenses.tcltk.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-09 07:00:01 +02:00
Ludovic Courtès
cb76c03216 guile: fix Solaris builds 2012-08-11 21:53:43 +02:00
Ludovic Courtès
986f04c87e guile: disable thread support on Solaris 2012-08-10 23:16:02 +02:00
Ludovic Courtès
9b70bc6e34 guile: allow libunistring and Readline to be found on OpenSolaris 2012-08-10 16:30:28 +02:00
Ludovic Courtès
55cf142175 guile: allow GMP to be found on OpenSolaris 2012-08-09 18:39:30 +02:00
Lluís Batlle i Rossell
54146ea191 octave: updating to 3.6.2 (bugfix release)
I don't know what they fixed.
2012-07-27 16:11:31 +02:00
Eelco Dolstra
16d2d9acab php: Update to 5.3.15
Includes fixes for CVE-2012-2688 and CVE-2012-3365.
2012-07-23 13:46:50 -04:00
Florian Friesdorf
3665e02901 python: make pdb.py available as bin/pdb and bin/pdb${python.majorVersion} 2012-07-20 21:43:14 +02:00
Eelco Dolstra
5750566c2a Fix Pyrex build 2012-07-18 09:50:36 -04:00
Peter Simons
36265e9c66 Merge pull request #5 from aszlig/xpra
New version of Xpra from the fork
2012-07-16 02:32:02 -07:00
Eelco Dolstra
baf5e27aaf ruby: Fix URL and enable parallel building 2012-07-09 17:32:11 -04:00
Shea Levy
be48fe265a ruby: update to 1.9.3-p194 2012-07-09 17:29:57 -04:00
Eelco Dolstra
03964c1032 Add fakes3, an implementation of the S3 protocol for testing 2012-07-09 17:25:23 -04:00
Ludovic Courtès
ac1081fb48 guile: update to 2.0.6 2012-07-08 23:48:00 +02:00
Eelco Dolstra
4184e580a9 php: Update to 5.3.14 2012-07-06 15:14:16 -04:00
aszlig
af9924b929 Add Cython, because it's needed to build xpra. 2012-07-06 03:12:08 +02:00
Lluís Batlle i Rossell
40b91ced40 octave: disabling parallel building
The error http://hydra.nixos.org/build/2748254/log/tail-reload
makes me think there are concurrency problems in the octave build.
In my computer it builds fine.
2012-07-02 21:27:18 +02:00
Eelco Dolstra
4c868ec330 * PHP updated to 5.3.13.
svn path=/nixpkgs/trunk/; revision=34480
2012-06-12 17:39:59 +00:00
Cillian de Roiste
4b2c3d52de Adding optional wx (GUI) support for Erlang, which enables the graphical debugger although pman (the process manager) fails to start.
svn path=/nixpkgs/trunk/; revision=34372
2012-06-06 19:05:06 +00:00
Ludovic Courtès
801c82da55 GNU Guile 2.0: Provide a 2.0ish setup hook.
svn path=/nixpkgs/trunk/; revision=34215
2012-05-22 21:18:20 +00:00
Cillian de Roiste
e9548cc845 Upgrading default erlang to R15 and keeping R14 as an older option, removing extra random older versions. I assume they are not of interest.
svn path=/nixpkgs/trunk/; revision=34117
2012-05-15 17:57:50 +00:00
Cillian de Roiste
a5d77fcf2b Updating erlange to R14B04
svn path=/nixpkgs/trunk/; revision=34116
2012-05-15 17:54:05 +00:00
Eelco Dolstra
a78d2f55fb * Perl: set passthru.libPrefix to communicate the relative location of
Perl packages for $PERL5LIB.

svn path=/nixpkgs/trunk/; revision=34061
2012-05-11 13:41:24 +00:00
Eelco Dolstra
3bb2f92106 * Final sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34045
2012-05-10 14:41:16 +00:00
Ludovic Courtès
c1dd4327dc GNU Guile 2.0: Fix cross-GNU builds.
svn path=/nixpkgs/trunk/; revision=34029
2012-05-09 13:42:46 +00:00
Eelco Dolstra
24594b0fb3 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=34028
2012-05-09 11:49:52 +00:00
Eelco Dolstra
356ce12cd0 * Python 2.7.3 (including various security fixes).
svn path=/nixpkgs/branches/stdenv-updates/; revision=34008
2012-05-07 20:08:10 +00:00
Eelco Dolstra
08b6b9fa3a * Cygwin: provide a Perl setup hook so that Perl dependencies work
properly.

svn path=/nixpkgs/trunk/; revision=34002
2012-05-07 02:06:29 +00:00
Shea Levy
4a292d3bd6 gem nix missed a lot of hashes, strange...
svn path=/nixpkgs/trunk/; revision=33995
2012-05-05 20:25:42 +00:00
Shea Levy
c21ab61f9a gem nix failed to fill in the hash for bundler
svn path=/nixpkgs/trunk/; revision=33994
2012-05-05 20:12:54 +00:00
Shea Levy
5425b06ef6 Update rubygems
svn path=/nixpkgs/trunk/; revision=33993
2012-05-05 20:09:48 +00:00
Michael Raskin
6ed169c19d Update Clojure to 1.4.0
svn path=/nixpkgs/trunk/; revision=33963
2012-05-01 11:39:58 +00:00
Peter Simons
27de563164 Updated Python 3.x.
- updated to version 3.2.3
 - fixed version numbers in setup-hook.sh
 - sort input variable list alphabetically
 - tk support needs x11 support as well
 - deleted obsolete version 3.1

Furthermore, all CPPFLAGS and LDFLAGS required to find the build inputs are now
explicitly passed to ./configure. The python 3.x build systems tries to ignore
the environment as much as possible to provide deterministic builds. This means
that our magic environment variable stuff won't work, and previously built
python3 binaries lacked all kinds of extensions, such as zlib, etc.

svn path=/nixpkgs/trunk/; revision=33937
2012-04-27 08:20:46 +00:00
Ludovic Courtès
04600bbec1 Darwin: Add mig', lipo', etc. to `stdenvNative'.
Consequently, remove `darwinLipoUtility', `darwinArchUtility', etc.

svn path=/nixpkgs/trunk/; revision=33893
2012-04-23 15:47:31 +00:00
Eelco Dolstra
934ef8e3fc * Fix evaluation of pythonPackages.bugz.
svn path=/nixpkgs/trunk/; revision=33815
2012-04-17 15:31:44 +00:00
Nicolas Pierron
82b308bf11 Add armv7l support.
svn path=/nixpkgs/trunk/; revision=33798
2012-04-15 23:41:25 +00:00
Lluís Batlle i Rossell
163c7375a3 Adding a version of sqlite with more things, based on the upstream repository src.
svn path=/nixpkgs/trunk/; revision=33788
2012-04-14 21:40:55 +00:00
Lluís Batlle i Rossell
700bedb833 Adding me as a maintainer for octave.
svn path=/nixpkgs/trunk/; revision=33757
2012-04-12 10:00:18 +00:00
Michael Raskin
fa1ecfed54 Update Kona/fix its build
svn path=/nixpkgs/trunk/; revision=33753
2012-04-12 07:12:07 +00:00
Shea Levy
db28c68df0 mkDerivation handles propagatedUserEnvPkgs properly now
svn path=/nixpkgs/trunk/; revision=33444
2012-03-27 15:20:37 +00:00
Shea Levy
092487c1fb Update rubygems
svn path=/nixpkgs/trunk/; revision=33443
2012-03-27 15:14:13 +00:00
Shea Levy
26789f2e89 Update rubygems
svn path=/nixpkgs/trunk/; revision=33333
2012-03-21 14:07:29 +00:00
Lluís Batlle i Rossell
6b4810d310 Updating php 5.3 to 5.3.10
svn path=/nixpkgs/trunk/; revision=33170
2012-03-16 19:40:36 +00:00
Shea Levy
a09a78165c Update rubygems
svn path=/nixpkgs/trunk/; revision=33155
2012-03-16 13:28:35 +00:00
Lluís Batlle i Rossell
46b258acb4 Updating octave to the new major release 3.6.1
svn path=/nixpkgs/trunk/; revision=32904
2012-03-08 16:24:37 +00:00
Shea Levy
9eb1b81548 Update rubygems
svn path=/nixpkgs/trunk/; revision=32873
2012-03-08 05:45:23 +00:00
Yury G. Kudryashov
57fd764a39 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32792
2012-03-05 10:00:23 +00:00
Shea Levy
62a2b075e4 Update rubygems
svn path=/nixpkgs/trunk/; revision=32755
2012-03-03 17:32:11 +00:00
Yury G. Kudryashov
92f1b06907 This is sha256, not md5
svn path=/nixpkgs/branches/stdenv-updates/; revision=32715
2012-03-01 07:19:01 +00:00
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Lluís Batlle i Rossell
1ad3da0ca8 Taking back 32635. An older Rigs of Rods does not work better. Same throttle issues. Let's keep with 0.39.4.
svn path=/nixpkgs/trunk/; revision=32685
2012-02-28 23:01:25 +00:00
Eelco Dolstra
b14a737a4d * Since we're rebuilding everything that depends on Python anyway, we
may as well update Python to the latest stable version.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32675
2012-02-28 11:09:36 +00:00
Florian Friesdorf
ff37a57373 Revert "remove empty readonly site-packages"
This reverts commit 92b56e5686b06237c23ba41b6b8918ea643781dc.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32674
2012-02-28 10:31:28 +00:00
Florian Friesdorf
4956884de5 Revert "do not propagate makeWrapper via pythonXYFull"
This reverts commit 3ee2667e4c60c2ed850da8538cf135fe7f716f30.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32656
2012-02-28 00:07:33 +00:00
Florian Friesdorf
bf1fe3aa09 Revert "pysite support for pythonXYFull wrapper"
This reverts commit f77b9a16a9ef52951a601997593dc557a42660b9.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32653
2012-02-28 00:07:23 +00:00
Lluís Batlle i Rossell
11aceede25 Downgrading rigsofrods to a version that might work, where cars may run fast.
This rev should be very close to the stablest 0.38.

I had to bring an old angelscript in.


svn path=/nixpkgs/trunk/; revision=32635
2012-02-27 22:39:23 +00:00
Ludovic Courtès
5afbf9075e GNU Guile 1.8: Build without `-Werror'.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32631
2012-02-27 20:10:10 +00:00
Florian Friesdorf
1d2e06e068 pysite support for pythonXYFull wrapper
svn path=/nixpkgs/branches/stdenv-updates/; revision=32593
2012-02-26 17:23:42 +00:00
Florian Friesdorf
1c504b49b4 remove empty readonly site-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=32590
2012-02-26 17:23:31 +00:00
Florian Friesdorf
95f0b6119c do not propagate makeWrapper via pythonXYFull
svn path=/nixpkgs/branches/stdenv-updates/; revision=32589
2012-02-26 17:23:28 +00:00
Florian Friesdorf
fe9d9530ba symlink python manpage for pythonXYFull
svn path=/nixpkgs/branches/stdenv-updates/; revision=32588
2012-02-26 17:23:25 +00:00
Florian Friesdorf
09ae58fcd7 python wrapper comment
svn path=/nixpkgs/branches/stdenv-updates/; revision=32587
2012-02-26 17:23:22 +00:00
Florian Friesdorf
8e32380a79 add PSFL, update python meta (license, maintainers, unify description)
svn path=/nixpkgs/branches/stdenv-updates/; revision=32585
2012-02-26 17:23:16 +00:00
Eelco Dolstra
a488f53a54 * Many buildr Buildfiles rely on RUBYLIB containing the current directory
(as was the default in Ruby < 1.9.2).  So make sure that's the case
  when running buildr.

svn path=/nixpkgs/trunk/; revision=32573
2012-02-26 11:10:00 +00:00
Eelco Dolstra
91e3d54b8f * Remove the ruby/default.nix, it's not very useful.
svn path=/nixpkgs/trunk/; revision=32572
2012-02-26 11:07:56 +00:00
Shea Levy
ea195b2507 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32564
2012-02-25 19:57:34 +00:00
Lluís Batlle i Rossell
d6f6caea6b Updating angelscript to 2.22.1.
Adding mysocketw.

Adding ogre-paged.

Fixing the caelum licence.


svn path=/nixpkgs/trunk/; revision=32549
2012-02-24 21:13:14 +00:00
Yury G. Kudryashov
38e3d7bc86 svn merge ^/nixpkgs/trunk
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +00:00
Lluís Batlle i Rossell
371b34e49a Making octave build with qrupdate, and keep the big log of tests results of the
check phase in the out store path.


svn path=/nixpkgs/trunk/; revision=32496
2012-02-22 22:42:16 +00:00
Eelco Dolstra
f71dd91a43 * Apply r32435 from the trunk (always build Python with SSL support).
Remove .ssl references from some packages missed in that commit.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32469
2012-02-21 23:35:35 +00:00
Eelco Dolstra
e64443baf1 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=32468
2012-02-21 23:29:21 +00:00
Lluís Batlle i Rossell
bfe234644e Add make check to octave. Some tests fail, but the build works. We'll have the report this way.
svn path=/nixpkgs/trunk/; revision=32467
2012-02-21 23:02:36 +00:00
Lluís Batlle i Rossell
b5a904153b Building octave with mesa and fltk to have the new fltk graphics toolkit available.
I also add more libs octave appreciates for some functions.

I've not tested the graphics toolkit, but it builds.


svn path=/nixpkgs/trunk/; revision=32465
2012-02-21 22:09:48 +00:00
Lluís Batlle i Rossell
5e2de19cc1 Fixing octave, so plot(1) works.
Linking octave with clapack did not work.

I updated lapack, and additionally I build it with atlas, instead of blas. That should give
better performance. I don't know if atlas builds everywhere though.

On the other hand, maybe some programs linking with liblapack will fail. We'll have to check
the hydra reports.

I plan to remove clapack; liblapack provides a C interface too.


svn path=/nixpkgs/trunk/; revision=32464
2012-02-21 21:43:44 +00:00
Lluís Batlle i Rossell
47e9932cd2 I attempted to get octave 3.4.3 working with atlas, but it also builds and crashes at
plot(1), as 3.6.0 also did. I don't know what's wrong there.

Program received signal SIGSEGV, Segmentation fault.
0x00007ffff694e3ad in dtrtri_

Exact as 3.6.0. I'll revert to the old octave version that worked without any
blas or lapack implementation.

--This line, and those below, will be ignored-e-

M    pkgs/development/interpreters/octave/default.nix

svn path=/nixpkgs/trunk/; revision=32460
2012-02-21 15:45:22 +00:00
Lluís Batlle i Rossell
a81366984e Updating octave to 3.6.0
svn path=/nixpkgs/trunk/; revision=32451
2012-02-21 11:34:57 +00:00
Eelco Dolstra
45fed14272 * Revert r32435. We'll be doing a stdenv merge in a few days, so
let's put it in there rather than having the Nth near-complete
  rebuild of the trunk in a few days.

svn path=/nixpkgs/trunk/; revision=32436
2012-02-20 18:59:43 +00:00
Peter Simons
95cbf4ed55 Modified the Python 2.7 expression so that the interpreter has unconditional
OpenSSL support. Having OpenSSL available at the time the core interpreter is
built enables all kinds of important crypto features (i.e. additional hashlib
algorithms, etc.) that otherwise won't be available.

svn path=/nixpkgs/trunk/; revision=32435
2012-02-20 18:52:52 +00:00
Yury G. Kudryashov
313a029f16 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32396
2012-02-19 11:16:24 +00:00
Shea Levy
e45be4fcaf Remove coffee-script rubygem
A seeming bug the "nix" rubygem causes activesupport's dependencies to be set
incorrectly when execjs is one of the relevant gems. I'll try to fix it, but
until then IMO a working activesupport is more important than coffee-script

svn path=/nixpkgs/trunk/; revision=32377
2012-02-17 22:34:46 +00:00
Shea Levy
86710c1fe6 Ruby gems: Install all dependent gems in the user environment
svn path=/nixpkgs/trunk/; revision=32370
2012-02-17 21:40:14 +00:00
Shea Levy
2fb0d1c6c7 Update ruby/rubygems
svn path=/nixpkgs/trunk/; revision=32366
2012-02-17 20:33:15 +00:00
Eelco Dolstra
0e6c77befa * On Darwin, don't link Perl against /usr/lib/libutil.dylib. Libutil
uses /usr/lib/libstdc++.dylib, and so we get segfaults when using
  Perl modules that depend on another libstdc++.dylib (like Nix's Perl
  bindings).  It doesn't appear that libutil provides useful
  functionality for Perl on Darwin.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32364
2012-02-17 19:32:15 +00:00
Yury G. Kudryashov
e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Shea Levy
75d4746680 Update rubygems
svn path=/nixpkgs/trunk/; revision=32309
2012-02-16 02:07:23 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Shea Levy
f77fa09f56 v8: Get building on darwin
svn path=/nixpkgs/trunk/; revision=32168
2012-02-10 05:22:58 +00:00
Ludovic Courtès
452cdc59f1 GNU Guile: Use the right configure option name.
svn path=/nixpkgs/trunk/; revision=32154
2012-02-09 10:07:42 +00:00
Ludovic Courtès
1d44b332ed GNU Guile: Disable pthread support on FreeBSD.
svn path=/nixpkgs/trunk/; revision=32152
2012-02-09 09:16:17 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Shea Levy
b59eac3bfc Add autotest-rails gem
svn path=/nixpkgs/trunk/; revision=32033
2012-02-04 15:04:04 +00:00
Karn Kallio
cdf1a3a3c6 Racket version 5.2.1
svn path=/nixpkgs/trunk/; revision=31990
2012-02-02 22:41:21 +00:00
Ludovic Courtès
38391383f0 GNU Guile 2.0.5.
svn path=/nixpkgs/trunk/; revision=31946
2012-01-31 15:02:38 +00:00
Shea Levy
7fb6f58f99 Add the selenium-webdriver rubygem
svn path=/nixpkgs/trunk/; revision=31924
2012-01-29 20:40:32 +00:00
Shea Levy
32fcb78c1f Update rubygems
svn path=/nixpkgs/trunk/; revision=31923
2012-01-29 18:22:35 +00:00
Shea Levy
c277a6bc53 Update ruby 1.8
This contains a fix for http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2011-4815.
All users of ruby 1.8 for web-facing apps should upgrade

svn path=/nixpkgs/trunk/; revision=31922
2012-01-29 18:00:22 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Shea Levy
df587970ce rubygems: bump
svn path=/nixpkgs/trunk/; revision=31853
2012-01-26 13:39:31 +00:00
Shea Levy
e45f42bdf1 Update rubygems
svn path=/nixpkgs/trunk/; revision=31841
2012-01-26 01:35:43 +00:00
Eelco Dolstra
25e0ae0f39 * Fix building Perl on FreeBSD. Its configure script was looking for
libraries in /usr/local/lib, but the linker doesn't look there by
  default, so linking against libgdbm failed.  So don't look in 
  /usr/local/lib.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31741
2012-01-20 16:42:16 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Eelco Dolstra
d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Peter Simons
3eca1b395f jruby: upgraded to latest version, fixed java dependency
svn path=/nixpkgs/trunk/; revision=31648
2012-01-18 20:32:20 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
48ee2523da * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
2012-01-18 15:53:12 +00:00
Shea Levy
5c64d68344 Update ruby gems
svn path=/nixpkgs/trunk/; revision=31576
2012-01-16 02:05:41 +00:00
Yury G. Kudryashov
0c79434ccb svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31567
2012-01-14 21:34:37 +00:00
Eelco Dolstra
66da14b77c * Added buildr and its dependencies.
svn path=/nixpkgs/trunk/; revision=31477
2012-01-10 23:50:31 +00:00
Eelco Dolstra
acf6a9c5e4 * Cleanup.
svn path=/nixpkgs/trunk/; revision=31476
2012-01-10 23:49:24 +00:00
Eelco Dolstra
73fda38d0a * Enable libyaml support in Ruby by default. Libyaml is very small so
this shouldn't hurt much.

svn path=/nixpkgs/trunk/; revision=31474
2012-01-10 23:06:23 +00:00
Yury G. Kudryashov
3d61c49b42 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Lluís Batlle i Rossell
e43bd7c4ce Made lua and task warrior unstable crossbuild fine
svn path=/nixpkgs/trunk/; revision=31251
2012-01-03 19:12:06 +00:00
Yury G. Kudryashov
b077940b3b svn merge https://nixos.org/repos/nix/nixpkgs/trunk
No conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Cillian de Roiste
47765274e5 Adding SpiderMonkey 185
svn path=/nixpkgs/trunk/; revision=30904
2011-12-15 12:13:36 +00:00
Eelco Dolstra
eda3fd1730 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30852
2011-12-12 16:54:35 +00:00
Shea Levy
2585174c99 Add rb-fsevent gem
svn path=/nixpkgs/trunk/; revision=30845
2011-12-11 22:24:15 +00:00
Shea Levy
1c3b3d70bb Update rubygems, adding sass along the way
svn path=/nixpkgs/trunk/; revision=30844
2011-12-11 22:16:15 +00:00
Shea Levy
1f115a37a5 Ruby should work on all platforms
svn path=/nixpkgs/trunk/; revision=30842
2011-12-11 22:01:20 +00:00
Karn Kallio
72b7236428 pure 0.49 (compiles again with latest llvm)
svn path=/nixpkgs/trunk/; revision=30737
2011-12-05 09:38:59 +00:00
Shea Levy
80fb6938eb Update rubygems
svn path=/nixpkgs/trunk/; revision=30537
2011-11-23 06:41:03 +00:00
Shea Levy
58fbba200c Add optional yaml support to ruby
svn path=/nixpkgs/trunk/; revision=30536
2011-11-23 06:32:17 +00:00
Ludovic Courtès
c62c173944 GNU Guile: Disable GC-sensitive tests.
The "Unused modules are removed" test happens to fail sometimes on
i686-linux.

svn path=/nixpkgs/trunk/; revision=30416
2011-11-13 22:15:58 +00:00
Ludovic Courtès
e98264fe8f GNU Guile: Fix cross-compilation.
svn path=/nixpkgs/trunk/; revision=30415
2011-11-13 21:28:35 +00:00
Michael Raskin
2627cc77a7 Update Racket
svn path=/nixpkgs/trunk/; revision=30368
2011-11-10 11:51:51 +00:00
Peter Simons
368ac01473 synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=30316
2011-11-08 10:18:35 +00:00
Shea Levy
a6cb9725c0 Ruby 1.9.3-p0
svn path=/nixpkgs/trunk/; revision=30191
2011-11-02 15:42:29 +00:00
Eelco Dolstra
5649122458 * Added Perl 5.14.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30057
2011-10-27 15:58:25 +00:00
Eelco Dolstra
20ab6cfbf7 * Move perl-5.8 and perl-5.10 into perl/ per the coding conventions.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30055
2011-10-27 15:35:43 +00:00
Ludovic Courtès
2dcd1544dd GNU Guile 2.0.3!
svn path=/nixpkgs/trunk/; revision=29973
2011-10-22 16:21:07 +00:00
Marco Maggesi
17c7829893 Ooops.
svn path=/nixpkgs/trunk/; revision=29865
2011-10-17 12:59:44 +00:00
Marco Maggesi
e726f10554 Io does not depend anymore on e2fsprogs
svn path=/nixpkgs/trunk/; revision=29864
2011-10-17 12:57:15 +00:00
Marco Maggesi
8d424305f5 Update Io to version 2011.09.12.
svn path=/nixpkgs/trunk/; revision=29862
2011-10-17 08:36:07 +00:00
Ludovic Courtès
9188489caf Guile: Disable more GC-sensitive tests when using `-O0'.
svn path=/nixpkgs/trunk/; revision=29854
2011-10-15 16:34:26 +00:00
Shea Levy
e1a97996f7 Rails 3.1.1
svn path=/nixpkgs/trunk/; revision=29793
2011-10-12 18:01:28 +00:00
Eelco Dolstra
79ab307dd7 * Fix Chatzilla (it doesn't work with recent Xulrunners).
* Get rid of xulrunnerWrapper.

svn path=/nixpkgs/trunk/; revision=29706
2011-10-07 09:26:03 +00:00
Shea Levy
936c460abb Ruby: Separate 'install the current version of ruby' from 'install version x of ruby' when x is also the current version
svn path=/nixpkgs/trunk/; revision=29600
2011-10-03 15:35:50 +00:00
Shea Levy
a54473bc5d Use ruby 1.9 as the default
svn path=/nixpkgs/trunk/; revision=29543
2011-09-29 21:55:12 +00:00
Florian Friesdorf
0c32d209ca python wrapper that sets PYTHONHOME to the profile it is in
svn path=/nixpkgs/trunk/; revision=29462
2011-09-23 17:00:13 +00:00
Shea Levy
35d07a5c34 Bump rubygems
svn path=/nixpkgs/trunk/; revision=29455
2011-09-23 15:37:05 +00:00
Shea Levy
f5e5bc24be Get ruby-1.9.2-p290 to build
svn path=/nixpkgs/trunk/; revision=29453
2011-09-23 15:08:55 +00:00
Shea Levy
2cc9e52aec python-2.7: Attempt to fix the nixpkgs evaluation error
svn path=/nixpkgs/trunk/; revision=29327
2011-09-17 18:52:28 +00:00
Alexander Tsamutali
cca42b5cc0 development/interpreters/python/2.7: Fix building on Linux 3.x (iirc, that was the problem).
svn path=/nixpkgs/trunk/; revision=29325
2011-09-17 16:29:40 +00:00
Michael Raskin
7bb4bf3fe0 Adding LOVE Lua-based game framework/interpreter
svn path=/nixpkgs/trunk/; revision=29188
2011-09-11 17:05:48 +00:00
Marco Maggesi
3f94f217d1 Add clooj, IDE for clojure
svn path=/nixpkgs/trunk/; revision=29149
2011-09-09 21:15:20 +00:00
Shea Levy
14c11b349a ruby/generated.nix: Add rails and its dependencies (which automatically updated rake)
svn path=/nixpkgs/trunk/; revision=29055
2011-09-06 05:37:59 +00:00
Michael Raskin
32754d3c19 Adding Regina-REXX interpreter
svn path=/nixpkgs/trunk/; revision=28969
2011-09-02 08:05:51 +00:00
Marco Maggesi
a02960ae4e Add clojure.
(Install with command
   nix-env -i clojure-wrapper
 start REPL with command
   clojure)


svn path=/nixpkgs/trunk/; revision=28956
2011-09-01 13:38:59 +00:00
Karn Kallio
323f4a3464 Advance Racket to version 5.1.3
svn path=/nixpkgs/trunk/; revision=28617
2011-08-16 15:43:46 +00:00
Karn Kallio
b01cd125d4 Advance racket to version 5.1.2
svn path=/nixpkgs/trunk/; revision=28162
2011-08-05 04:22:03 +00:00
Lluís Batlle i Rossell
fbad200e88 Updating php 5.2
svn path=/nixpkgs/trunk/; revision=27844
2011-07-20 17:40:53 +00:00
Eelco Dolstra
5152d0148e * Drop the "_configurable" from the name of the PHP package, it's
ugly.

svn path=/nixpkgs/trunk/; revision=27830
2011-07-18 20:50:59 +00:00
Peter Simons
c9695f2d48 Added obsolete lua-5.0.3 version, which is required by gravit.
svn path=/nixpkgs/trunk/; revision=27692
2011-07-10 14:04:19 +00:00
Peter Simons
6b9ab942b5 pkgs/development/interpreters/lua-4/builder.sh: delete obsolete file
svn path=/nixpkgs/trunk/; revision=27690
2011-07-10 14:04:09 +00:00
Peter Simons
f92f3deed8 lua-4: fixed build
svn path=/nixpkgs/trunk/; revision=27678
2011-07-08 21:24:01 +00:00
Ludovic Courtès
a609897ae7 GNU Guile 2.0.2.
svn path=/nixpkgs/trunk/; revision=27582
2011-07-04 11:52:06 +00:00
Yury G. Kudryashov
bfffc57cc6 rubygems: bump nix-ruby, more nix magic
svn path=/nixpkgs/trunk/; revision=27179
2011-05-08 09:35:31 +00:00
Peter Simons
e4033547a3 python-2.7: fix sqlite3 impurity
The build expression for python contains code that patches all occurrences of
impure paths like "/usr" and "/opt" out of "setup.py". The same code must be
run when building a python module, too.

svn path=/nixpkgs/trunk/; revision=27164
2011-05-05 14:41:15 +00:00
Peter Simons
f0f900f41b pkgs/development/interpreters/python/2.7/default.nix: strip trailing whitespace
svn path=/nixpkgs/trunk/; revision=27163
2011-05-05 14:41:08 +00:00
Peter Simons
fa08bf65c4 python-2.7: Don't repeat the version number "2.7" in build instructions. Instead, use the variable ${majorVersion}.
svn path=/nixpkgs/trunk/; revision=27162
2011-05-05 14:41:02 +00:00
Lluís Batlle i Rossell
590bf722b4 Adding readline to php, so now 'php -a' works nicely with readline.
svn path=/nixpkgs/trunk/; revision=27110
2011-05-03 08:25:45 +00:00
Michael Raskin
26da7d3871 Adding Kona: a K interpreter
svn path=/nixpkgs/trunk/; revision=27098
2011-05-03 06:58:01 +00:00
Karn Kallio
b3a57308b5 Advance Racket to version 5.1.1 (latest release).
svn path=/nixpkgs/trunk/; revision=27062
2011-04-30 16:31:19 +00:00
Lluís Batlle i Rossell
5bd133b65c Updating php 5.3 and adding php-xcache.
svn path=/nixpkgs/trunk/; revision=27056
2011-04-29 21:01:09 +00:00
Ludovic Courtès
457a6eeef6 GNU Guile 2.0.1.
svn path=/nixpkgs/trunk/; revision=27038
2011-04-28 20:57:48 +00:00
Cillian de Roiste
47d86a8371 Adding Python 3.2
svn path=/nixpkgs/trunk/; revision=26893
2011-04-19 18:10:15 +00:00
Michael Raskin
945a329c91 Use readline in pure
svn path=/nixpkgs/trunk/; revision=26751
2011-04-08 08:24:28 +00:00
Michael Raskin
0aff57f299 Adding Pure programming language
svn path=/nixpkgs/trunk/; revision=26749
2011-04-08 08:00:55 +00:00
Michael Raskin
2b61f3f4e5 Adding AngelScript interpreter library
svn path=/nixpkgs/trunk/; revision=26748
2011-04-08 06:52:31 +00:00
Eelco Dolstra
cf00c432ae * By popular demand, restore Python 2.6.
svn path=/nixpkgs/trunk/; revision=26726
2011-04-06 21:57:30 +00:00
Eelco Dolstra
566d5ab26e * Hackery to get Python to build on Cygwin.
svn path=/nixpkgs/branches/modular-python/; revision=26694
2011-04-05 14:29:11 +00:00
Eelco Dolstra
b9293b6c20 * `patch' on FreeBSD doesn't like paths with // in them.
svn path=/nixpkgs/branches/modular-python/; revision=26682
2011-04-04 15:48:58 +00:00
Eelco Dolstra
4585c62aec * Erlang updated to R14B02.
svn path=/nixpkgs/branches/modular-python/; revision=26619
2011-03-31 08:44:11 +00:00
Eelco Dolstra
1439ae44be * Sync with the trunk.
svn path=/nixpkgs/branches/modular-python/; revision=26586
2011-03-28 20:22:30 +00:00
Eelco Dolstra
d449c4db98 * Remove Python 2.6, since the only remaining package that used it
(Calibre) also works with 2.7.

svn path=/nixpkgs/branches/modular-python/; revision=26561
2011-03-28 11:50:47 +00:00
Eelco Dolstra
8ca5d5d8b6 * Move python/2.7/modules.nix into python/2.7/default.nix. Also
remove the pythonModules attribute.  The built-in modules are now
  accessible as (e.g.) "python.modules.ssl" or "pythonPackages.ssl".

svn path=/nixpkgs/branches/modular-python/; revision=26559
2011-03-28 09:48:57 +00:00