Vladimír Čunát
375bc8def7
Merge staging into closure-size
2015-05-05 11:49:03 +02:00
Thomas Tuegel
1fe28a1132
Merge remote-tracking branch 'upstream/master' into staging
2015-04-29 11:33:28 -05:00
Eelco Dolstra
182acabbae
Don't use camelCase in file names
2015-04-29 16:09:30 +02:00
Eelco Dolstra
552ea209d0
php: Update to 5.4.40
2015-04-29 16:07:36 +02:00
Charles Strahan
09602f7f39
ruby: fix gems that use mysql
2015-04-27 22:00:52 -04:00
lethalman
f134ba68e3
Merge pull request #7534 from berdario/jython
...
Add jython
2015-04-27 12:14:45 +02:00
William A. Kennington III
d8c949cc26
Make tcl and tk versions generic
2015-04-26 21:30:01 -07:00
William A. Kennington III
d7c0e3eaf8
tcl: Make generic and add 8.5
2015-04-26 21:15:25 -07:00
William A. Kennington III
55a64a5ddb
tcl/tk: Tie versioning together and propagate
2015-04-26 20:55:42 -07:00
Vladimír Čunát
30f31c9afc
Merge 'master' into staging
...
(relatively simple conflicts)
2015-04-26 22:52:08 +02:00
Dario Bertini
7c5dbbe23a
Add jython
2015-04-24 10:44:33 +01:00
Vladimír Čunát
2b5e7bd2ba
python2*: fix modules as well after 4101db0be
...
There was a typo that failed them.
Also, drop pkgconfig again, as it seems unused; and fix python26.
Now all python*.modules build, except for python26.tkinter
which fails on master as well.
2015-04-19 16:31:05 +02:00
Vladimír Čunát
4101db0bec
python2*: fix detecting C libs, no header references
2015-04-18 21:00:26 +02:00
Vladimír Čunát
d484c392aa
stdenv multiple-outputs: change propagation rules
...
Now development stuff is propagated from the first output,
and userEnvPkgs from the one with binaries.
Also don't move *.la files (yet). It causes problems, and they're small.
2015-04-18 19:30:28 +02:00
Robin Gloster
cb904510a6
consolidate php builds
2015-04-18 03:46:48 -07:00
Vladimír Čunát
bf414c9d4f
Merge 'staging' into closure-size
...
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
Charles Strahan
7fc3b002e6
bundlerEnv: better error handling
...
properly handle the case where a gemspec is missing
2015-04-15 19:24:30 -04:00
Charles Strahan
be3d3dd298
bundlerEnv: fix charlock_holmes config
2015-04-15 19:24:04 -04:00
Charles Strahan
bb7c9f71e1
bundix: 1.0.2 -> 1.0.3
2015-04-15 19:07:09 -04:00
Thomas Tuegel
88918e10e9
Merge branch 'master' into staging
2015-04-10 07:45:38 -05:00
Peter Simons
79fca7c3e4
Merge pull request #7267 from couchemar/erlang-r17.5
...
erlang/R17 update to 17.5
2015-04-10 11:12:40 +02:00
Andrey Pavlov
c3fd42ff64
Update elixir to 1.0.4
2015-04-09 10:10:35 +03:00
Pascal Wittmann
c50d47858f
groovy: update from 2.4.2 to 2.4.3
2015-04-08 16:25:13 +02:00
Andrey Pavlov
90b1507419
erlang/R17 update to 17.5
2015-04-08 15:18:39 +03:00
Eric Seidel
6ec373d776
Merge branch master into staging
2015-04-06 18:58:08 -07:00
Arseniy Seroka
c7a099d4aa
Merge pull request #7192 from KoviRobi/gnu-apl-update
...
Updated GNU APL to 1.5
2015-04-06 00:42:14 +03:00
Michael Raskin
b783b69326
Merge pull request #6044 from sjmackenzie/erlang-javac-hipe
...
Problem: erlang in nixpkgs doesn't support jinterface + no hipe
2015-04-05 21:07:11 +03:00
Michael Raskin
c6eafc4eef
Update lush
2015-04-05 20:27:25 +03:00
Nikolay Amiantov
250a39dc79
bundler: update
2015-04-05 16:04:54 +03:00
William A. Kennington III
43d114c74b
bundler-head: Fix hash
2015-04-03 23:18:23 -07:00
Austin Seipp
83a6da7377
rakudo: 2014.04 -> 2015.03
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-03 23:18:35 -05:00
William A. Kennington III
a604b42480
mysql: Use libs in place of the binary mysql
2015-04-01 16:46:53 -07:00
Eelco Dolstra
33dfdbd0df
php: Update to 5.4.39
...
CVE-2015-2787, CVE-2015-2348, CVE-2015-2305, CVE-2015-2331.
2015-04-01 16:22:12 +02:00
Karn Kallio
39a3fd1454
pure: advance to version 0.64; use llvm 3.5 as 3.6 breaks the build
2015-03-31 13:21:47 +02:00
=
c06b50339a
Updated GNU APL to 1.5
...
Plus also did a bit of meta nitpick
2015-03-30 14:06:26 +01:00
Jan Malakhovski
a3e00bf6c4
python 2.7: add x11Support option
2015-03-29 23:30:39 +00:00
William A. Kennington III
7ccccc15ba
Merge branch 'master' into staging
2015-03-27 16:03:03 -07:00
Arseniy Seroka
91eaf5495f
Merge pull request #7035 from joachifm/reimplement-kona
...
Reimplement kona
2015-03-27 23:13:25 +03:00
Joachim Fasting
933e6cc832
kona: bump to 3.21
...
Use release tarball rather than GIT checkout. Note: disregard the
platform and arch embedded in the release tarball name.
2015-03-27 19:33:59 +01:00
Joachim Fasting
52d77f2360
kona: reimplement using mkDerivation
...
Also set supported platforms to `all`, per upstream, and specify
license (ISC).
2015-03-27 18:10:32 +01:00
Eelco Dolstra
0e2257966f
Disable packages that depend on <nixpkgs>
...
Nothing in Nixpkgs should use <nixpkgs>, because it can cause Nixpkgs
evaluation to depend in part on a different version of Nixpkgs,
leading to unpredictable results (including evaluation errors).
2015-03-27 16:17:48 +01:00
William A. Kennington III
8286f6cef3
tcl: 8.5.15 -> 8.6.4
2015-03-26 15:39:20 -07:00
William A. Kennington III
5f50b087f8
perl: 5.20.1 -> 5.20.2
2015-03-26 00:24:17 -07:00
Michael Raskin
7c8410b196
Merge pull request #6965 from joachifm/reimplement-j
...
j: re-implement using mkDerivation
2015-03-24 17:02:48 +03:00
Joachim Fasting
62a6499243
j: re-implement using mkDerivation
2015-03-24 14:05:25 +01:00
Pascal Wittmann
5e3a99e7d6
groovy: update from 2.4.1 to 2.4.2
2015-03-23 15:29:36 +01:00
William A. Kennington III
935938f262
Merge pull request #6924 from joachifm/picolisp-update
...
picolisp: bump to 3.1.9
2015-03-21 20:46:41 -07:00
Joachim Fasting
262a3ac3c4
picolisp: bump to 3.1.9
2015-03-21 23:49:57 +01:00
Michael Raskin
0d2a00fdee
update lush
2015-03-21 21:29:38 +03:00
Eelco Dolstra
2ed5c2bd6b
Set some meta.platforms
...
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
