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
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
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
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
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
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