3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

694 commits

Author SHA1 Message Date
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
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