Moritz Ulrich
79c835212b
Erlang R17: Bump to 17.1.
2014-08-12 13:47:38 +02:00
Florian Friesdorf
53490bd17e
include ssl with python2.6 as is the case with 2.7
...
Signed-off-by: Domen Kožar <domen@dev.si>
2014-08-12 13:33:23 +02:00
Peter Simons
8e7442b3ed
lua-5: don't restrict the platforms which can build this package
...
Hydra builds run only on Linux, but all other platforms can build LUA,
too, if necessary.
2014-08-09 15:04:44 +02:00
Vladimír Čunát
52d9c93abe
Merge 'staging' into master
2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618
Mark a bunch of packages as broken or not supported on Darwin
2014-08-08 17:59:02 +02:00
Peter Simons
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
Pascal Wittmann
b18d0eee05
groovy: update from 1.7.1 to 2.3.6 and adopt it
2014-08-07 23:41:04 +02:00
Eelco Dolstra
69b426a1eb
php: Update to 5.4.31
2014-08-05 11:47:16 +02:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Michael Raskin
399c5285ec
Update Angelscript
2014-08-03 22:29:41 +04:00
Vladimír Čunát
6295a3ca36
Merge recent master into x-updates
...
Hydra: ?compare=1142825
Conflicts (easy):
pkgs/applications/audio/lmms/default.nix
pkgs/desktops/e18/enlightenment.nix
pkgs/games/exult/default.nix
pkgs/os-specific/linux/alsa-plugins/default.nix
2014-08-02 05:08:07 +02:00
Bjørn Forsman
62d0a320b3
Revert "Remove obsolete jackaudio version 1."
...
This reverts commit bdb77826d9
.
Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.
Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Lluís Batlle i Rossell
43ed6b8f62
Updating octave to 3.8.1
2014-07-31 10:11:18 +02:00
Eelco Dolstra
95bbfc957f
erlang: Fix name attribute
...
Versions should not start with a letter.
2014-07-30 12:39:35 +02:00
Bjørn Forsman
559eaeb2d2
Revert "use wrapper to set LUA_PATH variable"
...
This reverts commit 807cd4b4d4
, as it
broke the 'awesome' package. It was also an incomplete change, only
modifying lua-5.1 and none of the other lua versions.
A better approach, if wanting lua to pick up external modules, would be
to loop over $NIX_PROFILES. $NIX_PROFILES is unset in build
environments, so it should be safe.
Conflicts:
pkgs/development/interpreters/lua-5/5.1.nix
2014-07-29 18:42:20 +02:00
aszlig
ec65a1e391
erlang: Add manpages to all release packages.
...
This puts manpages into "$out/lib/erlang/man" and also symlinks them
into "$out/share/man" with an "erl" suffix (similar to how Debian is
handling this) so those manpages are unlikely to collide with any other
manpages, like for example inet(3).
Closes #3396 .
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Acked-by: Moritz Ulrich <moritz@tarn-vedra.de>
2014-07-29 15:26:13 +02:00
Peter Simons
bdb77826d9
Remove obsolete jackaudio version 1.
2014-07-28 20:32:52 +02:00
Mateusz Kowalczyk
7a45996233
Turn some license strings into lib.licenses values
2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/applications/audio/espeak/edit.nix
pkgs/applications/audio/lmms/default.nix
pkgs/desktops/e18/enlightenment.nix
pkgs/games/exult/default.nix
pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Bjørn Forsman
f6f2f38a6e
jack: change package and attr names to 'jack1' and 'jack2'
...
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.
This aligns the naming with what can be found on the JACK homepage.
Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Eelco Dolstra
5c5f115603
firefox: Build without xulrunner
...
Fixes #2950 .
2014-07-23 17:28:36 +02:00
Vladimír Čunát
b9045a7d96
Merge branch 'x-updates' into staging
...
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát
16e35532e4
Merge recent master into x-updates
2014-07-17 19:30:56 +02:00
Eelco Dolstra
ff97b7dbe6
Merge remote-tracking branch 'origin/master' into staging
2014-07-14 17:04:55 +02:00
Philipp Gesang
df3c10caa3
lua-5.1, lua-5.2: fix typo / copy-n-paste mistake in configurePhase
...
s/LDLAGS/LDFLAGS/g in both packages
2014-07-11 07:17:11 +02:00
Florian Friesdorf
4fd6168e8a
python.isPyXY markers
2014-07-10 16:40:35 +02:00
Florian Friesdorf
7dde165353
pythonX.Y sitePackages passthru
...
Let python tell you the correct path for site-packages.
2014-07-10 16:34:45 +02:00
Charles Strahan
08f2ce1172
Fix Python 3.{2,3,4} on Darwin.
...
This removes the `-lcrypt` linker flag when compiling under Darwin.
2014-07-09 00:18:11 -04:00
Markus Kohlhase
1d109fc211
added lua-sec-0.5
2014-07-08 00:26:04 +02:00
Eelco Dolstra
95b828de42
Merge remote-tracking branch 'origin/master' into staging
2014-07-07 13:16:26 +02:00
Vladimír Čunát
5d2ff3b5c2
php-5.3: fix build with freetype-2.5 (by Gentoo patch)
2014-07-03 18:20:46 +02:00
Austin Seipp
d958fc4ea2
Merge pull request #3137 from flosse/lua5-prefix-fix
...
use wrapper to set LUA_PATH variable to fix #3036
2014-07-02 13:47:21 -05:00
Austin Seipp
002d33b6cc
Merge pull request #3151 from flosse/lua5-filesystem
...
added lua-filesystem-1.6.2
2014-07-02 13:46:11 -05:00
Domen Kožar
2e70c676ca
python: link gcc_s
...
Signed-off-by: Domen Kožar <domen@dev.si>
2014-07-02 19:57:16 +02:00
Domen Kožar
cfcbfb494e
python: 2.7.7 -> 2.7.8
2014-07-02 18:45:34 +02:00
Markus Kohlhase
0d30718357
include share directory
2014-07-01 19:16:24 +02:00
Markus Kohlhase
e0fc4e7734
added lua-filesystem-1.6.2
2014-07-01 13:34:08 +02:00
Eelco Dolstra
06fc1ec34d
Merge remote-tracking branch 'origin/master' into staging
...
Conflicts:
pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Michael Raskin
a7984cca3b
Update angelscript
2014-07-01 12:55:16 +04:00
Markus Kohlhase
807cd4b4d4
use wrapper to set LUA_PATH variable
2014-06-30 03:43:20 +02:00
Markus Kohlhase
7987cd2cc1
added luaexpat 1.3.0
2014-06-30 00:38:05 +02:00
Austin Seipp
593e938341
php: 5.4.29 -> 5.4.30
...
CVE-2014-3981, CVE-2014-0207, CVE-2014-3478, CVE-2014-3479,
CVE-2014-3480, CVE-2014-3487, CVE-2014-4049, CVE-2014-3515
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-27 00:24:45 -05:00
Eelco Dolstra
f56567ce74
perl: Add 5.20.0
2014-06-25 11:06:23 +02:00
Eelco Dolstra
da7a12b908
perl: Disable tests
...
They're on the critical path for stdenv rebuilds.
2014-06-24 13:24:12 +02:00
Vladimír Čunát
dc215c2988
php{53,54}: fetch from generic URL
...
I see no reason to download from a pre-specified mirror.
It didn't even work for me.
2014-06-22 15:02:41 +02:00
Austin Seipp
fc4adcd7af
php: 5.4.27 -> 5.4.29
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-22 00:46:58 -05:00
Austin Seipp
6b345e088b
php: Fix fallout from 1228caae9e
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-21 21:15:29 -05:00
John Wiegley
1228caae9e
php-5.4: Do not build with mssql support on Darwin
2014-06-21 16:29:28 -07:00
Domen Kožar
ad666c56ff
pypy: correctly bump the version
2014-06-19 18:16:43 +02:00
Austin Seipp
537dbfed78
Merge pull request #2898 from robberer/php/mssql
...
mssql support for php-5.4
2014-06-18 16:25:24 -05:00