Commit graph

747 commits

Author SHA1 Message Date
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
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
Eelco Dolstra 674c51af3c Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-03-07 19:33:52 +01:00
Florian Friesdorf b345bca3af pythonDocs: group in subfolders pythonXY/TYPE
I got it now - promised.
2013-03-05 12:41:30 +01:00
Florian Friesdorf 2e21e4fadc fix pythondocs (missing lib, doc instead of docs) 2013-03-05 12:28:48 +01:00
Shea Levy ae2b08aeb3 Add some fixes for gem nix.
Ideally these would be picked up upstream. Pull request at https://gitorious.org/ruby-nix/ruby-nix/merge_requests/1
2013-03-04 10:43:20 -05:00
Shea Levy cddc4c6f63 Update rubygems 2013-03-04 10:23:05 -05:00
Florian Friesdorf 930e4d5391 pythonDocs: add meta.maintainers, subgroup attrset by doctype 2013-03-03 06:48:05 +01:00
Florian Friesdorf 06e4059f80 fix pythonDocs install path 2013-03-02 16:01:42 +01:00
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
Danny Wilson 9baf9e98d1 Fix Perl builds on Illumos. 2013-02-28 20:04:04 +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
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
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