Michael Raskin
ef22c53905
Update ACL2
2014-09-01 09:11:32 +04:00
Michael Fellinger
57b667fe65
ruby: add version 2.1.2
2014-08-31 13:24:10 +01:00
Vladimír Čunát
8da52a642a
Merge branch 'staging' into v/modular
...
Conflicts (easy):
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Domen Kožar
df98dda81d
pypy: compile also curses
2014-08-30 23:01:09 +02:00
Domen Kožar
33949a413c
python34: include a patch to fix http://bugs.python.org/issue21121
2014-08-30 20:43:31 +02:00
Vladimír Čunát
e51f73652d
Merge recent master into staging
...
Hydra: ?compare=1149952
Conflicts:
nixos/doc/manual/configuration.xml (changed split file)
nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Vladimír Čunát
a70180ba73
mutiout: make it builtin
2014-08-30 08:27:43 +02:00
Rüdiger Sonderfeld
05b83fe6a2
octave: Update to 3.8.2.
...
Also change "," placement to be consistent and remove unnecessary let.
2014-08-29 16:44:18 +02:00
Domen Kožar
17b88f1b09
pypy: wrap to provide sqlite3 at runtime
2014-08-29 13:49:12 +02:00
Michael Raskin
c7bb162710
Factor out the maintainer
2014-08-29 01:19:24 +04:00
Michael Raskin
ef974b1c24
Merge pull request #3175 from doublec/self
...
Add Self programming language
2014-08-29 01:09:47 +04:00
Domen Kožar
7b7fb63314
pypy: disable test_sqlite again...
2014-08-27 19:04:38 +02:00
Domen Kožar
df30066790
pypy: test sqlite3 and verify the module
2014-08-27 11:20:24 +02:00
Domen Kožar
4f2781019e
pypy: properly hint sqlite3 headers
2014-08-26 19:51:39 +02:00
Domen Kožar
0ba31c1e6d
pypy: give hints about sqlite3
2014-08-26 12:26:09 +02:00
Domen Kožar
276220262e
pypy: hint about tcl/tk headers/libs paths
2014-08-26 09:57:38 +02:00
Dmitry Belyaev
93697e85ca
Support odbc in erlang R16 and R17
2014-08-26 13:11:24 +10:00
Domen Kožar
db47d51592
pypy: add X libs to build tkinter
2014-08-25 19:00:37 +02:00
Vladimír Čunát
3ec413cece
WIP
2014-08-25 15:30:46 +02:00
Vladimír Čunát
77da5efc78
merge the rest of multiple-outputs
...
Conflicts:
pkgs/development/libraries/glibc/2.19/builder.sh (previous merge taken)
pkgs/development/tools/misc/patchelf/default.nix (easy)
pkgs/stdenv/generic/setup.sh (previous merge taken)
2014-08-25 10:41:49 +02:00
Bjørn Forsman
c9baba9212
Fix many package descriptions
...
(My OCD kicked in today...)
Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.
I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.
I've tried to stay away from generated expressions (and I think I
succeeded).
Some specifics worth mentioning:
* cron, has "Vixie Cron" in its description. The "Vixie" part is not
mentioned anywhere else. I kept it in a parenthesis at the end of the
description.
* ctags description started with "Exuberant Ctags ...", and the
"exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
at the end of description.
* nix has the description "The Nix Deployment System". Since that
doesn't really say much what it is/does (especially after removing
the package name!), I changed that to "Powerful package manager that
makes package management reliable and reproducible" (borrowed from
nixos.org).
* Tons of "GNU Foo, Foo is a [the important bits]" descriptions
is changed to just [the important bits]. If the package name doesn't
contain GNU I don't think it's needed to say it in the description
either.
2014-08-24 22:31:37 +02:00
Domen Kožar
bce42c282a
rubyLibs.nokogiri: fix build
2014-08-24 18:33:47 +02:00
Domen Kožar
3df019067d
pypy: add tcl support
2014-08-24 17:33:27 +02:00
Michael Raskin
ede8be9281
Fix tarball evaluation; had to regenerate Ruby gem list
2014-08-24 12:55:08 +04:00
Vladimír Čunát
694fa543af
Merge 'staging'
...
Conflicts:
pkgs/servers/x11/xorg/default.nix
2014-08-24 10:50:22 +02:00
Domen Kožar
4ac4440e2f
pypy: verify tkinter module
2014-08-24 10:16:54 +02:00
Domen Kožar
3194d5cc32
zope.testing: 4.1.2 -> 4.1.3 (also, fix pypy build)
2014-08-23 17:38:28 +02:00
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Rickard Nilsson
52b53dc370
ruby gems: Add riemann-dash
2014-08-23 12:41:49 +02:00
Michael Raskin
a2f96adb3d
Merge pull request #3549 from pmahoney/php-pdo-pgsql
...
php: Compile pdo_pgsql support
2014-08-23 12:48:30 +04:00
Eelco Dolstra
2c62a36b77
Merge remote-tracking branch 'origin/staging' into modular-stdenv
...
Conflicts:
pkgs/stdenv/generic/default.nix
2014-08-22 00:07:05 +02:00
Eelco Dolstra
0c781b3d8f
perl-5.8: Remove
2014-08-21 16:54:29 +02:00
Eelco Dolstra
36a00a0f93
perl-5.10: Remove
2014-08-21 16:54:29 +02:00
Vladimír Čunát
d4e9fd2a90
Merge recent master into staging
...
Hydra: ?compare=1148749
Conflicts (easy):
nixos/modules/virtualisation/containers.nix
2014-08-21 15:09:31 +02:00
Eelco Dolstra
315e58762d
perl: Disable tests
...
It appears that these got re-enabled accidentally in
d1ed0f44cd154926e761cedee1cee72e55345807.
http://hydra.nixos.org/build/13369824
2014-08-17 16:04:47 +02:00
Tino Breddin
655db00a78
elixir: bump to 0.15.1
2014-08-17 14:10:51 +02:00
Luca Bruno
b83aceaecb
Merge branch 'master' into staging
2014-08-14 23:09:59 +02:00
Vladimír Čunát
d1ed0f44cd
Merge #2823 : better cygwin support, also add x86_64
...
Conflicts (easy):
pkgs/development/interpreters/perl/5.16/default.nix
2014-08-14 20:38:09 +02:00
Moritz Ulrich
79c835212b
Erlang R17: Bump to 17.1.
2014-08-12 13:47:38 +02:00
Florian Friesdorf
53490bd17e
include ssl with python2.6 as is the case with 2.7
...
Signed-off-by: Domen Kožar <domen@dev.si>
2014-08-12 13:33:23 +02:00
Patrick Mahoney
5ec563707c
php: Compile pdo_pgsql support
2014-08-11 22:02:24 -05:00
Peter Simons
8e7442b3ed
lua-5: don't restrict the platforms which can build this package
...
Hydra builds run only on Linux, but all other platforms can build LUA,
too, if necessary.
2014-08-09 15:04:44 +02:00
Eelco Dolstra
e3f7dbbac8
Cleanup: Use += to append to envHooks
2014-08-09 12:47:05 +02:00
Vladimír Čunát
52d9c93abe
Merge 'staging' into master
2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618
Mark a bunch of packages as broken or not supported on Darwin
2014-08-08 17:59:02 +02:00
Peter Simons
9226fbf56a
Merge remote-tracking branch 'origin/master' into staging.
2014-08-08 09:51:01 +02:00
Pascal Wittmann
b18d0eee05
groovy: update from 1.7.1 to 2.3.6 and adopt it
2014-08-07 23:41:04 +02:00
Eelco Dolstra
69b426a1eb
php: Update to 5.4.31
2014-08-05 11:47:16 +02:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Michael Raskin
399c5285ec
Update Angelscript
2014-08-03 22:29:41 +04:00