Commit graph

48210 commits

Author SHA1 Message Date
Rob Vermaas ea8910652f Revert "Merge pull request #3182 from wkennington/master.ipv6"
This reverts commit b23fd65854, reversing
changes made to 43654cba2c.
2014-08-31 10:58:54 +02:00
Rob Vermaas 2f697bf693 Revert "Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c"
This reverts commit 704e91bab0.
2014-08-31 10:58:50 +02:00
Michael Raskin 94205f5f21 Revert "Merge pull request #2449 from wkennington/master.grub"
This reverts commit 469f22d717, reversing
changes made to 0078bc5d8f.

Conflicts:
	nixos/modules/installer/tools/nixos-generate-config.pl
	nixos/modules/system/boot/loader/grub/install-grub.pl
	nixos/release.nix
	nixos/tests/installer.nix

I tried to keep apparently-safe code in conflicts.
2014-08-31 12:58:37 +04:00
Michael Raskin 347dd52019 Fix K3D build 2014-08-31 12:53:13 +04:00
lethalman b3f09699ee Merge pull request #3885 from suvash/feature/add-configuration-options-for-slim
Add `extraConfig` option for SLiM
2014-08-31 10:00:56 +02:00
Suvash Thapaliya 9073a30cee Add extraConfig option for SLiM
so that various configuration options can be set without having to
expose every single configurable parameter
2014-08-31 03:21:37 +02:00
Luca Bruno efdb6ecb0c lirc: add missing semicolon 2014-08-31 02:17:19 +02:00
Luca Bruno 2bee211fc9 mcabber: fix mispelled stdenv 2014-08-31 02:09:21 +02:00
Oliver Charles 786ec693ce Merge pull request #3883 from dmalikov/haskell-tagged-transformer
Add haskell-tagged-transformer 0.7.1
2014-08-31 00:03:19 +01:00
Dmitry Malikov b88c4796ea Add haskell-tagged-transformer 0.7.1 2014-08-31 00:44:13 +02:00
Pascal Wittmann 907845127e mcabber: update from 0.10.1 to 0.10.3, add meta-information and adopt it 2014-08-31 00:41:40 +02:00
Pascal Wittmann 5c3c7574e2 lirc: update from 0.9.0 to 0.9.1, add meta information and adopt it 2014-08-31 00:32:37 +02:00
Pascal Wittmann 408832ac67 help2man: update from 1.44.1 to 1.46.1 and add myself as a maintainer 2014-08-30 23:59:35 +02:00
Daniel Peebles 3182cf00ff Add xar 2014-08-30 22:52:46 +01:00
Eelco Dolstra 6437e2541a Remove numerous failing kernel packages from Hydra
http://hydra.nixos.org/eval/1149989?filter=linuxPackages
2014-08-30 23:20:57 +02:00
Eelco Dolstra 4b7f1a9be3 lttng-modules: Mark as broken
These do not build for any kernel:

  http://hydra.nixos.org/eval/1149989?filter=lttng&compare=1149981
2014-08-30 23:14:17 +02:00
Eelco Dolstra cafeb8e4f5 Disable Xen kernel builds
Xen itself is currently broken in Nixpkgs, so building kernels for it
is kind of pointless.
2014-08-30 23:11:30 +02:00
Domen Kožar df98dda81d pypy: compile also curses 2014-08-30 23:01:09 +02:00
Domen Kožar 188f0796b9 mesos: fix build 2014-08-30 23:01:09 +02:00
Domen Kožar b746a1644f fix eval 2014-08-30 23:01:09 +02:00
Domen Kožar e9e5ff8776 pypyPackages.random2: disable tests 2014-08-30 23:01:09 +02:00
Damien Cassou c59ef6af6f backintime: a simple backup tool 2014-08-30 21:52:01 +01:00
Michael Raskin 64a18d70e5 Julia 0.3.0 seems to have no more problems than 0.2.1, so make it default 2014-08-31 00:37:01 +04:00
Michael Raskin dcb38fc8aa Add missing libXmu dependency 2014-08-31 00:26:03 +04:00
Michael Raskin a539ec889c Merge pull request #2453 from pmahoney/mariadb-osx
MariaDB on OS X
2014-08-30 23:49:53 +04:00
Michael Raskin d593d3ac88 Fix K3D patching and cmake-configuration phases 2014-08-30 23:49:11 +04:00
Patrick Mahoney 1e06594c0c mariadb: Patch to compile on OS X.
* perl is required at build time on darwin. Copied from the
  mysql/5.5.x.nix

* CMake on darwin creates shared libraries with relative 'install_name'
  paths which are made absolute by fixDarwinDylibNames.

  See http://answers.opencv.org/question/4134/cmake-install_name_tool-absolute-path-for-library/

* The asm patch was needed to compile on darwin, though I do not
  understand what is going on. Error before the patch:

  [ 15%] Building C object mysys/CMakeFiles/mysys.dir/my_context.c.o
  .../nix-build-mariadb-10.0.13.drv-1/mariadb-10.0.13/mysys/my_context.c:207:Unknown pseudo-op: .cfi_escape
  .../nix-build-mariadb-10.0.13.drv-1/mariadb-10.0.13/mysys/my_context.c:207:Rest of line ignored. 1st junk character valued 48 (0).
  make[2]: *** [mysys/CMakeFiles/mysys.dir/my_context.c.o] Error 1
2014-08-30 14:41:51 -05:00
Domen Kožar b8fca7b38c koji: factor python module into an standalone app 2014-08-30 21:08:49 +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
Cillian de Róiste 4fe89ae412 lilv: update from 0.18.0 to 0.20.0 2014-08-30 20:02:16 +02:00
Cillian de Róiste 6aa23db35d python27Packages.rope: update from 0.9.4 to 0.10.2 2014-08-30 20:01:40 +02:00
Cillian de Róiste b96574ff15 python34Packages.zope_browser: update from 1.3 to 2.0.2 2014-08-30 20:01:28 +02:00
Cillian de Róiste c701503a4b python34Packages.zope_component: update from 4.0.2 to 4.2.1 2014-08-30 20:01:19 +02:00
Cillian de Róiste 65ef87293a python34Packages.zope_configuration: update from 4.0.2 to 4.0.3 2014-08-30 20:01:11 +02:00
Cillian de Róiste 7acf9a0c1c python34Packages.zope_event: update from 4.0.2 to 4.0.3 2014-08-30 20:01:02 +02:00
Cillian de Róiste 45d9d2a8b5 python34Packages.zope_i18n: update from 3.7.4 to 3.8.0 2014-08-30 20:00:54 +02:00
Cillian de Róiste 0b6613e1b6 python34Packages.zope_i18nmessageid: update from 4.0.2 to 4.0.3 2014-08-30 20:00:45 +02:00
Cillian de Róiste 297e9a0e52 python34Packages.zope_lifecycleevent: update from 3.6.2 to 3.7.0 2014-08-30 20:00:16 +02:00
Cillian de Róiste 8c290a64a7 python34Packages.zope_location: update from 4.0.0 to 4.0.3 2014-08-30 20:00:02 +02:00
Cillian de Róiste f6a529aa51 python34Packages.zope_schema: update from 4.2.2 to 4.4.1 2014-08-30 19:59:28 +02:00
Cillian de Róiste 465e5fa21a python34Packages.zope_size: update from 3.4.1 to 3.5.0 2014-08-30 19:59:14 +02:00
Cillian de Róiste 9f1abe6b59 python34Packages.zope_testrunner: update from 4.4.1 to 4.4.3 2014-08-30 19:58:59 +02:00
Cillian de Róiste 455e0e0673 serd: update from 0.18.2 to 0.20.0 2014-08-30 19:58:37 +02:00
Cillian de Róiste 8eee0eaef4 sord: update from 0.12.0 to 0.12.2 2014-08-30 19:58:24 +02:00
Cillian de Róiste d0fbe1e8bd suil: update from 0.8.0 to 0.8.2 2014-08-30 19:58:12 +02:00
Rickard Nilsson 704e91bab0 Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c 2014-08-30 19:54:37 +02:00
Cillian de Róiste ef9c1d612d processing: add license 2014-08-30 19:54:03 +02:00
Aristid Breitkreuz b63cd192fe Merge pull request #3879 from robberer/pkgs/textlive
texlive: Updated to latest release 2014.20140821
2014-08-30 19:38:35 +02:00
Cillian de Róiste c40a256548 Add processing: A language and IDE for electronic arts
(cherry picked from commit 0db6387d1c3a8a8f7a9a1e111532d8acd1f794d6)
2014-08-30 19:20:13 +02:00
Longrin Wischnewski a111e7ff08 texlive: Updated to latest release 2014.20140821 2014-08-30 19:14:35 +02:00