mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-29 00:54:11 +00:00
Code Issues Wiki Activity
26550 commits 254 branches 124 tags 7.8 GiB
Commit graph

787 commits

Author SHA1 Message Date
Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates 
Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix
 2013-03-02 10:41:53 +01:00
Florian Friesdorf 0314b8b00f add python docs 2013-03-02 05:42:26 +01:00
Shea Levy 6fe8fc00cf Add bitbucket-backup rubygem 2013-02-25 12:49:37 -05:00
Shea Levy f5c334e1ab Update rubygems 2013-02-25 12:49:06 -05:00
Shea Levy f01c52e848 Merge pull request #276 from aforemny/php 
Enable intl and exif support in PHP
 2013-02-25 05:31:06 -08:00
Shea Levy d380c264c3 Add ruby-2.0.0-p0 2013-02-25 06:16:32 -05:00
Peter Simons 5f32207dfc Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-02-24 19:27:08 +01:00
Vladimír Čunát 07d26cea06 racket: fix by update 2013-02-24 10:59:54 +01:00
Vladimír Čunát b913af9fce pltScheme: remove -- didn't build and it's "racket" now 2013-02-24 10:32:47 +01:00
Vladimír Čunát 0415253eaf octave: fix via minor update 2013-02-24 09:22:50 +01:00
Shea Levy 07bd695e45 Add jsduck rubygem 2013-02-22 11:12:49 -05:00
Shea Levy 0202ddea63 Update rubygems 2013-02-22 11:08:50 -05:00
Alexander Foremny 0c01ceab78 Merge remote-tracking branch 'upstream/master' into php 2013-02-22 09:33:26 +01:00
Alexander Foremny bd0903b90b Merge remote-tracking branch 'bbenoist/phpfix' into php 
Conflicts:
	pkgs/development/interpreters/php/5.3.nix
 2013-02-22 09:33:06 +01:00
Alexander Foremny fec1d4b2f7 Remove misconfigured mcrypt support 2013-02-22 09:24:48 +01:00
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates 
Conflicts:
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/top-level/all-packages.nix

Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
 2013-02-21 11:13:30 -05:00
Peter Simons 210126bbae love: fix typo in meta.maintainer attribute 2013-02-21 14:28:58 +01:00
Song Wenwu e270a609eb love: update to 0.8.0 2013-02-21 14:23:39 +01:00
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates 
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
 2013-02-21 12:43:00 +01:00
Lluís Batlle i Rossell bcbf9472ea Merge remote-tracking branch 'central/master' into x-updates 2013-02-18 13:49:11 +01:00
Shea Levy c42d77aa35 Merge remote-tracking branch 'upstream/master' into stdenv-updates 2013-02-17 08:19:40 -05:00
Vladimír Čunát b2f8432ad3 pure: update and fix by patching 2013-02-17 11:01:20 +01:00
Vladimír Čunát b3ce50d88a add python33 (needed by new blender) 2013-02-16 18:11:32 +01:00
Vladimír Čunát dbcdc27e03 python3: fix libPrefix passthru 2013-02-16 18:10:43 +01:00
Eelco Dolstra 2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Florian Friesdorf 1a52c7659d python: fix linkme-wrapper 2013-02-15 06:14:58 +01:00
bbenoist 99934eb363 php: Add zip and optional bz2 support 
Use the overload bz2 = true to enable bz2 support for php.
zip support is enabled by default as it doesn't require any library.
 2013-02-12 21:23:24 +01:00
bbenoist 8fd5fcbda5 php: Add mcrypt optional support 
Use an override with mcrypt = true to enable libmcrypt support in php.
The --disable-posix-threadsds mcrypt build option was required by php.
 2013-02-12 19:52:37 +01:00
Baptist BENOIST b42ba898e1 php: Add xsl optional support 
Use an override with xsl = true to enable xsl support in php.
 2013-02-12 19:52:34 +01:00
Shea Levy b97aa0c4b1 Update rubygems. 
More vulnerabilities:
https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58
https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/KtmwSbEpzrU
https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8
 2013-02-11 14:31:12 -05:00
Shea Levy 831d72cede Update rubygems. 
Particularly for rack-1.5.2, fixes CVE-2013-0263 and CVE-2013-0262.
 2013-02-08 18:26:38 -05:00
Shea Levy 30658882e8 Rubygems: Fix deps. 
Gem nix in nixpkgs is broken, will have to update it.
 2013-02-05 20:24:42 -05:00
Shea Levy 6cc91771a8 Mark ruby gems as such 2013-02-05 19:08:04 -05:00
Florian Friesdorf 906be2ea98 python-linkme-wrapper: optimize some escaping 2013-02-05 20:12:28 +01:00
Vladimír Čunát bb7f1f38c2 clisp: fix after glibc update 2013-02-05 15:23:09 +01:00
Shea Levy 76cc4e760b Add thin rubygem 2013-02-04 15:53:09 -05:00
Shea Levy af847fd8ce Add aws-sdk gem 2013-02-04 15:52:40 -05:00
Shea Levy 064638b0fd Add uuid rubygem 2013-02-04 15:51:25 -05:00
Shea Levy e08ab1ebe5 Add sinatra-1.3.2 rubygem 2013-02-04 15:50:36 -05:00
Shea Levy ff95e66e96 Add foreman rubygem 2013-02-04 15:16:13 -05:00
Shea Levy ebfc26b43d Update rubygems 2013-01-31 14:33:02 -05:00
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
Shea Levy 3b34b3610e Add clojureUnstable (clojure 1.5.0-RC1). 
Patch thanks to Patrick Lee.
 2013-01-27 20:43:38 -05:00
Alexander Foremny 18180858af Enable mcrypt, intl and exif support in PHP 2013-01-26 16:08:43 +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
Lluís Batlle i Rossell 54146ea191 octave: updating to 3.6.2 (bugfix release) 
I don't know what they fixed.
 2012-07-27 16:11:31 +02:00
Eelco Dolstra 16d2d9acab php: Update to 5.3.15 
Includes fixes for CVE-2012-2688 and CVE-2012-3365.
 2012-07-23 13:46:50 -04:00
Florian Friesdorf 3665e02901 python: make pdb.py available as bin/pdb and bin/pdb${python.majorVersion} 2012-07-20 21:43:14 +02:00
Eelco Dolstra 5750566c2a Fix Pyrex build 2012-07-18 09:50:36 -04:00
Peter Simons 36265e9c66 Merge pull request #5 from aszlig/xpra 
New version of Xpra from the fork
 2012-07-16 02:32:02 -07:00
Eelco Dolstra baf5e27aaf ruby: Fix URL and enable parallel building 2012-07-09 17:32:11 -04:00
Shea Levy be48fe265a ruby: update to 1.9.3-p194 2012-07-09 17:29:57 -04:00