Commit graph

763 commits

Author SHA1 Message Date
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
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
Rommel M. Martinez
e77b526e0c racket: enable HTML docs 2013-04-02 11:39:36 +08: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
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
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
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
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
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
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