Jason "Don" O'Conal
1ebaebbd93
php-xdebug: update to latest version
2013-06-30 02:51:20 +02:00
Domen Kožar
f33ebf88b9
Merge pull request #650 from lovek323/php53
...
php53: fix on darwin
2013-06-29 03:53:26 -07:00
Karn Kallio
b394ffc3ad
racket: fix build broken by new libpng version and advance version to 5.3.5
2013-06-28 07:29:51 +02:00
Evgeny Egorochkin
09e6ae577b
Python: add DETERMINISTIC_BUILD env var. If set, python doesn't write timestamps to pyc files. Tested by
...
building argparse, compiling from cli, compiling using py_compile.
2013-06-22 09:45:01 +03:00
Evgeny Egorochkin
76fbbb73c6
Make most of Ruby Gem builds repeatable
2013-06-21 18:22:07 +03:00
aszlig
e0ea957d64
php53: Don't use bundled version of libgd.
...
This fixes a copy & paste error I made in 486e918
, which resulted in PHP being
built with the bundled version of GD instead of the one we have in nixpkgs.
Thanks to @peti for noticing.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-21 12:17:54 +02:00
Peter Simons
513d717d47
Merge pull request #654 from lovek323/sup
...
sup: update to latest version
2013-06-20 03:09:46 -07:00
Jason "Don" O'Conal
a7746e3585
php53: restore nix gd version
2013-06-20 19:58:00 +10:00
Jason "Don" O'Conal
6ae1241934
php53: add optional pcntl flag
2013-06-20 17:42:09 +10:00
Jason "Don" O'Conal
cf2b5daa15
sup: update to latest version
2013-06-20 10:09:15 +10:00
Jason "Don" O'Conal
438034483a
guile: remove gcc_s dep, skip check on darwin
2013-06-20 09:11:04 +10:00
Jason "Don" O'Conal
ed3a63b5d7
php53: fix on darwin
...
* add libssh2 to build inputs (configure fails without this)
* link with stdc++
* add icu/lib directory to DYLD_LIBRARY_PATH (and wrap binaries with this
environment variable
* add libiconv to build inputs
* fix --with-iconv configure flag (was --with-iconv-dir which is not a valid
flag)
2013-06-19 14:15:55 +10:00
Sander van der Burg
aeaaa0a7e7
libv8 still broken in chroots, but this scons patch script fixes it
2013-06-18 17:14:17 +02:00
Sander van der Burg
1d4c7f50ec
libv8 ruby gem has hardcoded reference to /usr/bin/env, so that it won't build in a chroot -> fix this
2013-06-18 13:05:43 +02:00
Jason "Don" O'Conal
02eef5b0f4
ruby-1.9: disable tk when compiling on darwin
2013-06-18 13:59:00 +10:00
Vladimír Čunát
6bcf790d05
Merge branch 'master' into x-updates
2013-06-17 22:08:16 +02:00
Vladimír Čunát
0b875c8706
Merge pull request #635 from lovek323/ruby
...
ruby19: fix on darwin
2013-06-17 10:39:06 -07:00
Lluís Batlle i Rossell
2c71506929
nlopt: build octave plugins
2013-06-17 12:47:45 +02:00
Jason "Don" O'Conal
cfab5a8ecf
ruby19: fix on darwin
...
* seems to require readline even when cursesSupport is not enabled
2013-06-16 21:39:09 +10:00
Vladimír Čunát
c72ed04892
Merge 'master' and 'stdenv-fixes' into x-updates
...
Final stabilization phase before merging into master.
Conflicts (glibc-2.13):
pkgs/top-level/all-packages.nix
2013-06-16 10:13:51 +02:00
Michael Raskin
81b7f5fe63
Merge remote-tracking branch 'upstream/master' into x-updates
2013-06-15 17:15:32 +04:00
Peter Simons
fc165c0db9
Merge pull request #626 from lovek323/sup
...
sup: add required gems and separate dependencies
2013-06-15 03:26:10 -07:00
aszlig
486e918215
php: Fix support for JPEG and PNG over GD.
...
Set an explicit path to the location of libjpeg for version 5.4 and an explicit
path to libjpeg _and_ libpng for version 5.3.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-06-14 17:50:35 +02:00
Jason "Don" O'Conal
d0d9470519
sup: add required gems and separate dependencies
2013-06-14 18:06:14 +10:00
Michael Raskin
19530856ed
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/gtk+/2.x.nix
pkgs/misc/ghostscript/default.nix
pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Jason "Don" O'Conal
a5e65e66b1
sup: separate dependencies
...
create separate expressions for gems requiring native extensions to be
built:
* gpgme
* ncursesw_sup
* xapian_full_alaveteli
2013-06-13 10:45:51 +10:00
Michael Raskin
1a45886454
Merge branch 'master' into x-updates
2013-06-11 15:46:10 +04:00
Evgeny Egorochkin
dbcfef8c41
Ruby 1.9: update and reenable parallel build, since there's a chance it was fixed.
2013-06-11 00:59:26 +03:00
Evgeny Egorochkin
24b1c74b7c
Ruby 1.8: update
2013-06-11 00:10:34 +03:00
Evgeny Egorochkin
b93ac14bf6
Ruby 1.9 parallel build sometimes fails due to races.
2013-06-10 23:34:06 +03:00
Michael Raskin
8271de6727
Merge remote-tracking branch 'upstream/master' into x-updates
...
Conflicts:
pkgs/misc/emulators/wine/default.nix
2013-06-10 10:04:46 +04:00
Song Wenwu
d4c6b5924d
add Ren'Py 6.15.5
...
Ren'Py is a visual novel engine that helps you use words,
images, and sounds to tell stories with the computer.
This is just the minimal launcher.
2013-06-09 12:45:56 +08:00
Domen Kozar
1a1d8dfc69
Python: 2.7.4 -> 2.7.5
2013-06-05 21:07:46 +02:00
Vladimír Čunát
7af694700c
Merge branch 'master' into x-updates
...
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Eelco Dolstra
94dfd4bdf9
php: Get rid of unnecessary runtime dependencies like gettext
2013-06-04 14:57:37 +02:00
bbenoist
23fb448242
php-5.4: Reintroduce the ftpSupport build option
...
The ftpSupport build option I added on the 5.3 version of PHP was not
present in the version 5.4 because it was not yet merged when I wrote my
commit.
2013-06-01 01:16:36 +02:00
Vladimír Čunát
b770365574
ReRevert Merge x-updates into master
...
This reverts commit ec3965d8d0
.
Conflicts (taken x-updates):
pkgs/development/libraries/libgcrypt/default.nix
pkgs/development/libraries/libgpg-error/default.nix
pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Peter Simons
7ef3aea921
erlang: drop obsolete version R15B02
2013-05-25 11:11:37 +02:00
Eelco Dolstra
b976fc2b61
Merge branch 'master' into stdenv-fixes
2013-05-23 09:09:10 -04:00
Malcolm Matalka
33eb2832c3
Add R15B03-1
2013-05-23 11:27:49 +02:00
Domen Kozar
541f2ad531
Revert "python: first fix towards cross-compiling"
...
This reverts commit c89fe1c0ee
.
2013-05-20 12:03:58 +02:00
Domen Kozar
c89fe1c0ee
python: first fix towards cross-compiling
2013-05-20 11:15:32 +02:00
Eelco Dolstra
8b1bcb720a
php: Update to 5.3.25, 5.4.15
2013-05-17 14:06:29 +02:00
Michael Raskin
76d685d347
Update Racket: patch by Karn Kallio
2013-05-10 00:50:18 +04:00
Vladimír Čunát
ec3965d8d0
Revert Merge x-updates into master due to mesa bloat
...
See #490 discussion.
This reverts commit 1278859d31
, reversing
changes made to 0c020c98f9
.
Conflicts:
pkgs/desktops/xfce/core/xfce4-session.nix (take master)
pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Eelco Dolstra
5911c1f45a
perl: Update to 5.16.3, 5.14.4
...
CVE-2013-1667
Cherry-picked from stdenv-updates.
2013-05-09 13:37:53 +02:00
Vladimír Čunát
1278859d31
Merge branch 'master' into x-updates
...
Conflicts (just splitting version from name):
pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Eelco Dolstra
7480746a12
php-5.4: Don't build gd as a dynamically-loaded extension
...
We didn't do this in PHP 5.3 either, so it causes regressions if
php.ini isn't set up to load the gd extension.
2013-05-06 14:03:26 +02:00
Domen Kozar
b5241215b1
cython: set platforms
2013-05-04 22:20:27 +02:00
Domen Kozar
bf58711b2b
python: 2.7.3 -> 2.7.4
2013-05-03 09:06:06 +02:00