Shea Levy
06fe4d9904
Partial revert of b09f8110db
...
Didn't mean to commit this change
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-19 09:04:32 -05:00
Shea Levy
b09f8110db
nspr: Bump to 4.10.2
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-18 15:23:30 -05:00
Kim Simmons
49bf246491
Minifix: didn't use the name variable in the package.
2013-11-15 17:41:33 +01:00
Kim Simmons
a8e3167228
LuaJIT: New package
...
Just-in-time compiler for lua 5.1 with strong focus on performance.
Uses the same API as lua 5.1 which makes it extremely easy to integrate.
2013-11-15 17:20:29 +01:00
Domen Kožar
38185f8e51
pypy: 2.1 -> 2.2
2013-11-14 16:22:04 +01:00
Eelco Dolstra
847544d895
php: Update to 5.4.21
2013-11-13 17:33:58 +01:00
Moritz Ulrich
96552b683e
Erlang: Update to R16B02.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-12 20:06:46 +01:00
Vladimír Čunát
619a1f5614
changes proposed for 13-10 update
...
One feature change: polkit update 8d14c7ba
2013-11-09 18:41:42 +01:00
Jason "Don" O'Conal
62ebdd7a6a
rubyLibs.resque_web: add expression
2013-11-09 17:44:28 +01:00
Vladimír Čunát
8d14c7baa6
polkit: major update 0.105 -> 0.112
...
- It now uses JavaScript for configuration (only),
so I had to "convert" config for NetworkManager.
- I tested suspend/restart/(un)mount on KDE/Xfce,
Phreedom tested NetworkManager config conversion.
2013-11-09 16:29:18 +01:00
Peter Simons
29588edfe1
python-wrapper: split 'extraLibs' into 'stdLibs' and 'extraLibs', and add 'postBuild' step
...
The default setting for extraLibs used to be the set of modules that come with
python by default but aren't usually enabled in our standard python derivation
because they require additional libraries. This meant that users who want to
*add* libraries to that set had to use a fairly complicated override, to add
more entries without loosing the ones set by default.
After this patch, the "standard libraries" such as "curses' are listed in
stdLibs while the extraLibs argument remains empty by default. This allows
users to override extraLibs without overriding the standard libraries.
Furthermore, the wrapper environment can be messed around with in an
additional 'postBuild' step. One nice application of this build step is
to patch scripts and binaries to use the wrapped python interpreter
instead of the pristine one, thereby enabling them to pick up all
modules that have been configured. The following example shows how this
is done for the 'pylint' utility:
pkgs.python27Full.override {
extraLibs = [pkgs.pylint];
postBuild = ''
cd ${pkgs.pylint}/bin
for i in *; do
rm $out/bin/$i
sed -r -e "s|^exec |exec $out/bin/python -- |" <$i >$out/bin/$i
chmod +x $out/bin/$i
done;
'';
};
2013-11-07 15:13:02 +01:00
Peter Simons
46419ae454
python-wrapper: recursively include all dependencies of the specified 'extraLibs' in the generated environment
...
This patch means that adding 'matplotlib' to extraLibs will automatically
include 'numpy', too, because matplotlib depends on it.
2013-11-07 14:00:08 +01:00
Vladimír Čunát
0eeee298ef
perl: avoid --no-cpp-precomp on darwin, ( close #1160 )
...
Taken from https://trac.macports.org/ticket/38913
vcunat renamed the patch
Conflicts (trivial):
pkgs/development/interpreters/perl/5.16/default.nix
2013-11-07 10:39:28 +01:00
Vladimír Čunát
b035c33fe8
perl: avoid --no-cpp-precomp on darwin, ( close #1160 )
...
Taken from https://trac.macports.org/ticket/38913
vcunat renamed the patch
2013-11-02 11:53:04 +01:00
Mathijs Kwik
609f8dc04b
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
Domen Kožar
ebcdbbbdd2
Merge pull request #1132 from lovek323/php54-pcntl
...
php54: add pcntl option
2013-10-31 07:29:38 -07:00
Jason "Don" O'Conal
f79ae71748
php54: add pcntl option
2013-10-27 23:57:44 +00:00
Jason "Don" O'Conal
ab18b33f3e
sup: update to latest version
2013-10-27 21:57:09 +01:00
Peter Simons
6be8ad3392
Merge branch 'origin/master' into stdenv-updates.
...
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Michael Raskin
ebdec6418d
Reflect addition of curses_panel python module
2013-10-18 12:54:49 +04:00
Michael Raskin
fb2cb7bc0f
Adding Glances system monitoring tool
2013-10-18 11:11:47 +04:00
Eelco Dolstra
bb67be7739
php: Update to 5.4.20
2013-10-17 13:21:14 +02:00
Michael Raskin
dbc9d7f862
Add full linking-set to clisp 2.49
2013-10-13 10:34:22 +04:00
Karn Kallio
32ebe90fa1
pure: fix build with llvm 3.3
2013-10-09 21:23:37 +02:00
Bjørn Forsman
083d0890f5
More description fixes
...
* Remove package name
* Start with upper case letter
* Remove trailing period
Also reword some descriptions and move some long descriptions to
longDescription.
I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Bjørn Forsman
28ac782583
Some description fixes
...
There are many more packages to fix, this is just a start.
Rules:
* Don't repeat the package name (not always that easy...)
* Start with capital letter
* Don't end with full stop
* Don't start with "The ..." or "A ..."
I've also added descriptions to some packages and rewritten others.
2013-10-05 19:36:23 +02:00
Shea Levy
f6e835a2c3
Fix pythonWrapper when all of the binaries come from python
...
See discussion in #834
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-10-03 15:25:43 -04:00
Peter Simons
bee1d0716a
Merge pull request #834 from peti/new-python-wrapper
...
Re-implement python-wrapper with buildEnv.
2013-10-03 09:07:09 -07:00
Peter Simons
9c6e0e584c
lua-5.1: fix $prefix in installed pkgconfig file
2013-10-03 17:09:02 +02:00
Peter Simons
742d6597ca
Re-implement python-wrapper with buildEnv.
...
The new wrapper creates an environment that contains all files from
Python and the extra libraries that have been specified. All files are
found at run-time by means of the $PYTHONHOME variable; the wrapper no
longer uses $PYTHONPATH.
2013-10-02 22:47:19 +02:00
Peter Simons
ac5d5297dd
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-10-02 22:44:12 +02:00
Moritz Ulrich
36fca94805
Fix some issues in my packages reported by nixpkgs-lint.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-09-26 20:03:57 +00:00
Bjørn Forsman
4585253027
Add cucumber ruby gem
...
Homepage: http://cukes.info/
Generated with "gem nix", but I removed changes to unrelated gems.
2013-09-25 15:25:31 +02:00
Peter Simons
8e3df6a494
lua: fix issue #1009
2013-09-25 12:29:56 +02:00
Peter Simons
9407832de4
Merge remote-tracking branch 'origin/master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Peter Simons
b13188dff0
lua-5.2: install missing liblua.so.5.2.2 binary
2013-09-17 11:45:55 +02:00
Peter Simons
ad8a921f15
lua-5.1: install missing liblua.so.5.1.5 binary
2013-09-17 11:33:57 +02:00
Peter Simons
9c45b91002
lua-5: update default version from 5.1.4 to 5.1.5 and add version 5.2.2
2013-09-16 11:50:20 +02:00
Peter Simons
3d2caf1180
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-09-08 22:54:35 +02:00
Shea Levy
aed1cd3c17
Add patch to fix GET Bucket requests to fake-s3
...
See https://github.com/jubos/fake-s3/pull/37
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-09-04 16:42:20 -04:00
Aristid Breitkreuz
07e2763f00
add travis ruby gem
2013-08-31 18:39:58 +02:00
Peter Simons
71f191bdba
perl: revert "re-enable the postPatch hook on Darwin"
...
This reverts commit 1778200519
.
Apparently, the sed -i syntax is different from what I thought, because
now the build fails on Darwin, saying:
sed: -i.bak: No such file or directory
See http://hydra.nixos.org/build/5829944/nixlog/1/raw for more details.
2013-08-29 12:06:39 +02:00
Peter Simons
1778200519
perl: re-enable the postPatch hook on Darwin
...
The problem was that sed(1) variants other than GNU sed require a backup suffix
to the -i option.
2013-08-29 10:40:50 +02:00
Vladimír Čunát
2c217cc0b1
perl: disable tests on Darwin, refactor stdenv.lib usage
...
There was a mysterious error, which I don't have resources to investigate:
Removing test lib/Net/hostent.t
sed: -i: No such file or directory
2013-08-27 14:51:35 +02:00
Peter Simons
9ac8ea937c
Merge branch 'origin/master' into stdenv-updates.
2013-08-26 12:21:23 +02:00
Moritz Ulrich
e46fc8843c
Elixir: Fix impurity with Erlang.
...
The bash scripts of elixir contain some references to `erl'. This
patch wraps the scripts and extends PATH so `erl' is available.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-08-26 02:44:54 +02:00
Moritz Ulrich
45e975abff
Wrap Erlang scripts to provide missing 'sed' and 'awk'.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-08-26 02:43:12 +02:00
Domen Kožar
cbfe6c0e8d
pypy: patch ncurses name correctly
2013-08-23 17:05:50 +02:00
Domen Kožar
50c0290f51
pypy: 2.0 -> 2.1
2013-08-23 12:45:46 +02:00
Domen Kožar
a327b68164
pypy: add setuphook for PYTHONPATH
2013-08-23 12:41:48 +02:00
Eelco Dolstra
96365e9499
php: Update to 5.4.18
...
CVE-2013-4113, CVE-2013-4248.
2013-08-19 12:02:10 +02:00
Bjørn Forsman
e507a05ac7
Add taskjuggler ruby gem (2nd try)
...
This time I've verified that "gem nix" didn't produce any gems with
sha256 = "no hash". Hopefully nothing else breaks :-)
Thanks to phreedom and shlevy on IRC for the tip about removing
~/.gem/nix-sha256.cache to fix/workaround the "no hash" issue.
2013-08-18 22:45:29 +02:00
Peter Simons
76244ac2e2
Merge branch 'master' into stdenv-updates
...
Conflicts:
pkgs/development/compilers/ghc/with-packages.nix
2013-08-16 22:51:13 +02:00
Domen Kožar
b331056e75
python2.6: add crpyt module
2013-08-14 08:42:48 +02:00
Evgeny Egorochkin
2d056f9307
Merge pull request #811 from the-kenny/erlang-elixir
...
Update erlang to R16B1, add elixir and rebar
2013-08-13 21:56:04 -07:00
Domen Kožar
1974c55d91
add python application substanced and it's dependencies
2013-08-13 11:14:24 +02:00
Karn Kallio
1ce0c6d4e3
racket: advance version to 5.3.6.
2013-08-11 23:54:29 +02:00
Moritz Ulrich
31083cd226
Add myself as a maintainer to erlang R16B1 and elixir.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-08-09 16:33:51 +02:00
Moritz Ulrich
dbfcdc9066
Add meta for elixir & rebar.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-08-09 16:29:01 +02:00
Moritz Ulrich
ceb96b7312
Package elixir and rebar.
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-08-09 16:29:01 +02:00
Moritz Ulrich
e32b26c222
Add erlang R16B1
...
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-08-09 16:29:01 +02:00
Michael Raskin
97b8ac932d
Adding Lush: Lisp Universal SHell
2013-07-30 15:20:46 +04:00
Peter Simons
522acfd2f4
Merge remote-tracking branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/applications/version-management/git-and-tools/git/default.nix
pkgs/top-level/all-packages.nix
2013-07-30 11:29:30 +02:00
Domen Kozar
918e5efb99
recurse into python33 and pypy packages
2013-07-29 14:52:19 +02:00
Domen Kozar
5ec6cf3756
add python3 support to pythonPackages
2013-07-29 12:09:06 +02:00
Jason \"Don\" O'Conal
b4105cfaff
php53: fix build on darwin ( close #748 )
...
* add empty unix.h header
* build with kerberos
* ensure the binary has no extension
2013-07-28 09:41:58 +02:00
Domen Kozar
51a6bee012
pypy: multiprocessing tests are failing, try with internal module
2013-07-26 23:12:05 +02:00
Domen Kozar
ef540f3df7
properly use & when ignoring tests
2013-07-26 19:05:39 +02:00
Domen Kozar
dbdde8b231
pypy: currectly use bash
2013-07-26 14:36:53 +02:00
Domen Kozar
ef16799c9c
pypy: try to fix remaining 4 tests
2013-07-26 11:04:02 +02:00
Domen Kozar
b0a12396ef
fix ignore param for tests
2013-07-25 20:45:57 +02:00
Domen Kozar
eb0b6f8241
pypy: correctly skip tests
2013-07-25 16:25:55 +02:00
Rob Vermaas
a8f11fcba5
Update pypy build with sqlite and expat support. Fix the installPhase.
2013-07-25 13:42:20 +02:00
Domen Kozar
7a6b6799d9
pypy: fix some tests, add install phase
2013-07-25 12:38:08 +02:00
Domen Kozar
e52fc8f431
pypy: fix stdenv.lib removal
2013-07-23 23:24:51 +02:00
Domen Kozar
a0bed10ab5
WIP: pypy
2013-07-23 22:41:27 +02:00
Domen Kozar
e41fc2a677
add python32
2013-07-23 11:55:35 +02:00
Domen Kozar
e491997a6b
python3: 3.3.1 -> 3.3.2
2013-07-23 11:21:38 +02:00
Eelco Dolstra
20b4f0347e
php: Update to 5.3.27, 5.4.17
...
CVE-2013-2110
2013-07-16 22:54:05 +02:00
Shea Levy
3b274caaac
Fix tarball
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-07-13 15:54:39 -04:00
Evgeny Egorochkin
c1749e5fb4
Add Mechanize Gem. Update other gems as a side effect :/
2013-07-12 05:09:36 +03:00
Rickard Nilsson
eed2a02d86
php 5.4: Add mhash support
2013-07-10 12:27:47 +02:00
Rickard Nilsson
abd423621a
php 5.4: Add LDAP support
2013-07-10 08:49:53 +02:00
Vladimír Čunát
8ba92b8895
Merge master into stdenv-updates
...
Conflicts (simple):
pkgs/development/tools/misc/binutils/default.nix
pkgs/tools/package-management/disnix/default.nix
pkgs/top-level/all-packages.nix
2013-07-08 10:48:05 +02:00
Jason \"Don\" O'Conal
8938d57025
heroku gem: add expression
2013-07-05 11:25:19 +02:00
Peter Simons
d1c3c10d95
R: delete obsolete version 2.x from Nixpkgs
2013-07-04 21:30:59 +02:00
Vladimír Čunát
4a0952d2fa
fix bad "licence" names
...
Mostly what I merged from @lovek323.
Such errors can be easily checked by
nix-env -f . -qa \* --meta --xml --drv-path --show-trace >/dev/null
2013-07-04 18:16:34 +02:00
Jason \"Don\" O'Conal
1f9005a3f6
php53: add imap option
2013-07-04 13:12:13 +02:00
Jason \"Don\" O'Conal
9007e57f28
python27: compile with tkinterp on darwin
2013-07-04 13:11:25 +02:00
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
Vladimír Čunát
4251b70c7e
Merge master into stdenv-updates (contains new X stuff)
2013-06-27 16:24:57 +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
Eelco Dolstra
83ec7aa92f
python: Remove --with-wctype-functions flag
...
This causes functions like string.upper() to misbehave on non-ASCII
characters. Upstream also advises against it:
http://bugs.python.org/issue9210
http://bugs.python.org/issue11309
2013-06-21 14:05:46 +02: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
Vladimír Čunát
842420c3e1
Merge branch 'master' into stdenv-updates
...
Conflicts (relatively simple):
pkgs/development/interpreters/python/2.7/default.nix
pkgs/development/libraries/dbus/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/common.nix
2013-06-20 19:21:25 +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
Peter Simons
12b29fadcb
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-17 10:14: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
Peter Simons
6b1ebeccf2
Merge branch 'master' into stdenv-updates.
...
There were conflicts in pkgs/development/interpreters/ruby/ruby-19.nix,
which I resolved to the best of my knowledge. I'd appreciate if some of
the ruby gurus could have a look at the outcome of my merge, though.
2013-06-11 12:11:25 +02: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
Peter Simons
5718931dd3
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-06-01 11:48:21 +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
Peter Simons
728e305205
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-05-22 12:30:02 +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
Shea Levy
fde3526e7d
Merge branch 'master' into stdenv-updates
...
Conflict in kerberos, which was updated both in master and in
stdenv-updates. Kept the stdenv-updates version, except pulled in the
enableParallelBuilding change from master.
Signed-off-by: Shea Levy <shea@shealevy.com>
Conflicts:
pkgs/development/libraries/kerberos/krb5.nix
2013-05-04 18:28:48 -04: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
Moritz Ulrich
ff4d3d88d2
Fix clisp 2.44.1 (needed by stumpwm).
...
This fix applies the patch used for the newest clisp to the old,
fixing errors with new glibc.
Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-05-01 14:33:00 +02:00
Vladimír Čunát
bde20f3e88
Merge branch 'master' into x-updates
...
Conflicts (just taken x-updates):
pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Michael Raskin
b1ff6273d9
Merge pull request #468 from zefhemel/dartsdk
...
Added Google Dart M4
2013-04-22 22:34:18 -07:00
Michael Raskin
f328c45b25
Merge pull request #440 from bbenoist/master
...
php: add FTP support by default
2013-04-22 22:31:57 -07:00
Eelco Dolstra
4539668937
php: Add 5.4
...
We'll keep 5.3 around for a while.
2013-04-22 19:17:35 +02:00
Ludovic Courtès
6aa8c5761c
guile: fix non-GNU builds
2013-04-21 12:06:45 +02:00
Ludovic Courtès
7dd6b5f812
guile: update to 2.0.9
2013-04-21 11:44:40 +02:00
Peter Simons
4914e63a89
Merge changes from branch 'master' into stdenv-updates.
...
Conflicts:
pkgs/development/libraries/icu/default.nix
pkgs/tools/misc/coreutils/default.nix
2013-04-19 11:48:11 +02:00
Vladimír Čunát
ec736312d4
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/development/compilers/vala/default.nix (it's different version)
pkgs/development/libraries/cairo/default.nix (trivial)
2013-04-17 18:26:28 +02:00
Zef Hemel
237192ce6e
Adjusted to point to version URL (hosted by me -- had to).
2013-04-17 16:54:03 +02:00
Zef Hemel
6464f450d5
Added Dart SDK M4
2013-04-17 16:54:03 +02:00
Eelco Dolstra
7745357f0e
meta.license should be a (list of) string(s), not an attribute set
...
http://hydra.nixos.org/build/4744513
2013-04-14 20:10:58 +02:00
Vladimír Čunát
8249695b61
Merge branch 'master' into x-updates
...
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Eelco Dolstra
70b36815fc
php: Update to 5.3.24
...
CVE-2013-1635, CVE-2013-1643, CVE-2013-1824.
2013-04-11 16:47:08 +02:00
Vladimír Čunát
d7be1e84d0
ruby19: fix build via a patch-level update
2013-04-10 15:28:54 +02:00
Peter Simons
022f120a2c
Merge branch 'master' into stdenv-updates.
2013-04-07 23:37:12 +02:00
Vladimír Čunát
70f0d79d06
perl: remove one more unreliable test, fixes #454
2013-04-07 21:52:24 +02:00
Domen Kozar
b4ac9a4c9f
python: 2.7.3 -> 2.7.4
2013-04-07 12:22:40 +02:00
Domen Kozar
ec25d38261
python 3.3.1rc1 -> 3.3.1
2013-04-07 11:13:37 +02:00
Vladimír Čunát
eb2e46aab2
Merge branch 'master' into x-updates
...
Conflicts:
pkgs/applications/graphics/rawtherapee/default.nix
pkgs/applications/misc/blender/default.nix
pkgs/applications/networking/browsers/chromium/sources.nix
pkgs/os-specific/linux/kernel/linux-3.9.nix
pkgs/top-level/all-packages.nix
2013-04-04 21:43:40 +02:00
Eelco Dolstra
e12e62001b
perl: Update to 5.16.3, 5.14.4
...
CVE-2013-1667
2013-04-04 14:50:22 +02:00
Peter Simons
62e37492b9
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-04-04 00:51:30 +02:00
Vladimír Čunát
2660b9115f
perl: fix bad syntax in FreeBSD commit
2013-04-02 21:18:14 +02:00
Lluis Batlle
1aef67362f
guile: adding a patch to allow guile builds without chroots
...
Otherwise, the NSS troubles may make a test fail.
Patch suggested by ludo.
2013-04-02 18:03:08 +02:00
Baptist BENOIST
dba7f8b4fb
php: add FTP support by default
...
...as this does not requires any third party library.
2013-04-02 12:38:42 +02:00
Vladimír Čunát
322c2f36a3
perl: attempt to fix on FreeBSD by disabling two tests
2013-04-02 10:39:20 +02:00
Vladimír Čunát
5e202a2221
perl: fix bash syntax
...
I thought I could make a small syntax change without trying, I was being
foolish.
2013-04-02 09:20:58 +02:00
Rommel M. Martinez
e77b526e0c
racket: enable HTML docs
2013-04-02 11:39:36 +08:00
Vladimír Čunát
21cd5376b4
perl: disable one more test
...
It worked for me, but fails on hydra (probably not very pure).
2013-04-01 23:31:00 +02:00
Peter Simons
64f600a010
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-04-01 13:39:57 +02:00
Vladimír Čunát
ff92538aec
perl: enable doCheck, almost all tests work for me
2013-03-29 02:50:41 +01:00
Vladimír Čunát
73b0fa8720
perl: modify patch for better purity
...
This probably solves problems on some platforms that expose /usr and
/lib during build, see #386 .
2013-03-29 02:50:41 +01:00
Cillian de Róiste
0ad1f78760
Python3: fix the download URL
2013-03-28 22:57:37 +01:00
Shea Levy
f39310b525
Add right_aws gem
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-28 09:59:18 -04:00
Shea Levy
6cd1dc255e
Update rubygems
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-28 09:42:15 -04:00
Peter Simons
fdbe2878f0
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-03-28 14:02:56 +01:00
Cillian de Róiste
a5e48c0f20
Python 3.3 upgrade to 3.3.1rc1 to fix an important bug for Nix
...
http://bugs.python.org/issue15833
When Python 3.3.0 attempts to compile python bytecode in the system
directories it raises and exception and stops. Since Python 3.3 is
only required by the latest Blender, I hope it's OK to use the RC
until the final release.
2013-03-28 01:10:23 +01:00
Peter Simons
270a0009be
python3: update to version 3.3.0
2013-03-26 01:16:15 +01:00
Florian Friesdorf
870f4cca73
fix pythonWrapper for non-gnu ln
2013-03-25 15:13:08 +01:00
Peter Simons
a28ff44c76
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-03-21 16:26:34 +01:00
Sander van der Burg
1dbd3a55c4
libv8-rubygem: Implemented a very depressing workaround that allows scons to build libv8.a, it's ugly but it works
2013-03-21 13:56:33 +01:00
Peter Simons
22fb1ad99e
Merge remote-tracking branch 'origin/master' into stdenv-updates.
2013-03-21 09:23:54 +01:00
Lluís Batlle i Rossell
8c5eaf1840
octave: update to 3.6.4
2013-03-17 22:05:14 +01:00
Lluís Batlle i Rossell
e8ab3a7549
octave: removing texlive dependency
...
I saw I added it, but I can't remember why, and now I don't see what is
it for. It gets into octave closure, so it's a bit annoying for its size.
2013-03-17 21:18:00 +01:00
Danny Wilson
d007a78ccb
Merge remote-tracking branch 'origin/stdenv-updates' into illumos
...
Conflicts:
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/mpc/default.nix
pkgs/development/libraries/mpfr/default.nix
pkgs/development/libraries/ppl/default.nix
pkgs/tools/misc/coreutils/default.nix
2013-03-17 13:22:24 +01:00
Vladimír Čunát
b1eeae8cac
Merge branch 'master' into x-updates
...
Conflicts (easy):
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/pango/default.nix
2013-03-17 11:28:28 +01:00
Shea Levy
725e27fb58
Add papertrail-cli rubygem
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-15 09:25:06 -04:00
Shea Levy
bbf57c5a25
Add remote_syslog rubygem
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-15 09:24:52 -04:00
Shea Levy
cf20b47473
Update rubygems
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-15 09:22:52 -04:00
Shea Levy
101eba7bef
rubyLibs.libv8 needs python
...
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-03-15 08:55:48 -04:00
Florian Friesdorf
94f2013c0c
pythonDocs: recurseIntoAttrs does not recurse, bypass problem
2013-03-13 13:16:03 +01:00
Vladimír Čunát
86639d9bb9
Merge branch 'master' into x-updates
...
Conflicts (taken master versions):
pkgs/desktops/xfce-4.8/core/libxfcegui4.nix
pkgs/desktops/xfce/applications/gigolo.nix
pkgs/desktops/xfce/applications/mousepad.nix
pkgs/desktops/xfce/applications/ristretto.nix
pkgs/desktops/xfce/applications/terminal.nix
pkgs/desktops/xfce/applications/xfce4-mixer.nix
pkgs/desktops/xfce/applications/xfce4-notifyd.nix
pkgs/desktops/xfce/applications/xfce4-taskmanager.nix
pkgs/desktops/xfce/art/xfce4-icon-theme.nix
pkgs/desktops/xfce/core/exo.nix
pkgs/desktops/xfce/core/garcon.nix
pkgs/desktops/xfce/core/gtk-xfce-engine.nix
pkgs/desktops/xfce/core/libxfce4ui.nix
pkgs/desktops/xfce/core/libxfce4util.nix
pkgs/desktops/xfce/core/libxfcegui4.nix
pkgs/desktops/xfce/core/thunar-volman.nix
pkgs/desktops/xfce/core/thunar.nix
pkgs/desktops/xfce/core/tumbler.nix
pkgs/desktops/xfce/core/xfce4-appfinder.nix
pkgs/desktops/xfce/core/xfce4-panel.nix
pkgs/desktops/xfce/core/xfce4-power-manager.nix
pkgs/desktops/xfce/core/xfce4-session.nix
pkgs/desktops/xfce/core/xfce4-settings.nix
pkgs/desktops/xfce/core/xfconf.nix
pkgs/desktops/xfce/core/xfdesktop.nix
pkgs/desktops/xfce/core/xfwm4.nix
pkgs/desktops/xfce/panel-plugins/xfce4-cpufreq-plugin.nix
pkgs/development/libraries/webkit/default.nix
pkgs/top-level/all-packages.nix
2013-03-09 17:55:37 +01:00
Eelco Dolstra
674c51af3c
Merge remote-tracking branch 'origin/master' into stdenv-updates
2013-03-07 19:33:52 +01:00