Commit graph

38187 commits

Author SHA1 Message Date
Peter Simons fa8f2ca300 hscolour-bootstrap: allow setting RTS options for the hscolour binary we use to generate our documentation
Other tools like hsc2hs or haddock allows this, too, and some tools explicitly
set memory limits on these tools during the build (i.e. llvm-general-pure) by
exposing a GHCRTS environment variable. See [1] for a concrete example of this
issue.

[1] https://github.com/NixOS/nixpkgs/issues/2939
2014-06-16 15:38:38 +02:00
Peter Simons a83aa733c3 Merge pull request #2967 from sol/master
Update haskell-http-kit and haskell-aeson-qq
2014-06-16 15:15:09 +02:00
Simon Hengel 78c0b2fca6 Update haskell-aeson-qq to version 0.7.2 2014-06-16 20:12:05 +08:00
Simon Hengel 5434317aac Update haskell-http-kit to version 0.5.0 2014-06-16 19:18:08 +08:00
Vladimír Čunát 1b78ca58bc Merge #2798: stdenv and a few other big updates
Stdenv-changing things:
    - gcc 4.8.2 -> 4.8.3
    - long-running grsecurity branch
Others:
    - pkgconfig update
    - CVE for libtasn1, dbus

Conflicts (simple):
    pkgs/development/compilers/ghc/7.6.3.nix
2014-06-16 10:23:36 +02:00
vi fd08da1116 New derivation: hxt-tagsoup #haskell 2014-06-16 13:32:24 +08:00
Austin Seipp 5f960cc893 Merge pull request #2934 from CodeBlock/spawn-fcgi-update
update spawn-fcgi to 1.6.4
2014-06-15 19:02:25 -05:00
Mateusz Kowalczyk 8ae9d533b7 rtorrent: update to 0.9.4 2014-06-16 01:05:22 +02:00
Mateusz Kowalczyk d97d34398c libtorrent: update to 0.13.4 2014-06-16 01:05:11 +02:00
ambrop7@gmail.com 576fa310b2 Warzone2100: Update to 3.1.1.
Changed to use openal-soft, which makes sound work,
in combination with https://github.com/NixOS/nixpkgs/pull/2947 .

Added optional installation of campaign videos, not enabled by default.
2014-06-15 23:38:01 +02:00
Mateusz Kowalczyk b5ca04f4a8 nitrogen: patchShebangs instead of patchfile + /usr/bin/env
This hopefully fixes the build on Hydra.
2014-06-15 23:34:20 +02:00
Anders Claesson 05402bc7c8 tree: update to version 1.7.0 2014-06-15 23:31:39 +02:00
ambrop7@gmail.com bf0bacdbf8 openal-soft: Add PulseAudio backend, make non-OSS backends work.
* Added PulseAudio backend support.
* Made ALSA and PulseAudio backends optional.
* Made ALSA and PulseAudio backends actually work by adding to
  NIX_LDFLAGS (because package uses dlopen).

TEST: Tested all 3 backends (OSS, ALSA, PulseAudio) using openal-info
and my upcoming Warzone 2100 update, by selecting the backend in
.alsoftrc. It also works without .alsoftrc (I think it first tries pulse
then alsa then oss).
2014-06-15 23:28:54 +02:00
vi 82cbbb1759 Added CPAN's Crypt::OpenSSL::Bignum. 2014-06-15 23:23:26 +02:00
vi 174f1dac9e Added CPAN's Crypt::DH, and its dependencies. 2014-06-15 23:23:26 +02:00
vi f6b2155ef4 Added CPAN's Crypt::Blowfish. 2014-06-15 23:23:25 +02:00
Vladimír Čunát 9757785295 Merge recent master 2014-06-15 17:55:35 +02:00
cillianderoiste 43a77448f8 Merge pull request #2940 from deepfire/xtrace
xtrace:  fix build and update to 1.3.1
2014-06-15 17:45:32 +02:00
Peter Simons 132309de52 scala: cosmetic fix for syntax highlighting in Emacs 2014-06-15 17:12:14 +02:00
Shea Levy 7a0c66c829 Merge branch 'master' of git://github.com/soenkehahn/nixpkgs
packaging hp2any-manager and dependencies
2014-06-15 11:00:40 -04:00
Domen Kožar 0d71d2b631 fixes #2926 2014-06-15 16:05:18 +02:00
Bjørn Forsman 7911072947 sweethome3d: remove '.' at end of description 2014-06-15 13:49:55 +02:00
Edward Tjörnhammar 97f45b1e11 Adding SweetHome3D, TexturesLibraryEditor, FurnitureLibraryEditor 2014-06-15 13:04:59 +02:00
Kosyrev Serge eda6fd83a8 xtrace: fix build and update to 1.3.1
Alioth now requires a login before you can download tarballs.
2014-06-15 14:10:35 +04:00
cillianderoiste 658d1f656a Merge pull request #2945 from deepfire/e17-terminology
e17.terminology:  0.4.0 -> 0.5.1
2014-06-15 11:53:32 +02:00
Kosyrev Serge c022486b5f e17.terminology: 0.4.0 -> 0.5.1 2014-06-15 09:26:01 +04:00
Simon Hengel d2eaca9c80 Update haskell-hspec2 to version 0.3.4 2014-06-15 08:47:14 +08:00
Bjørn Forsman 06af50ff42 liboping: new package
liboping is a C library to generate ICMP echo requests, better known as
"ping packets". It is intended for use in network monitoring
applications or applications that would otherwise need to fork ping(1)
frequently.

http://verplant.org/liboping/
2014-06-15 00:42:40 +02:00
Bjørn Forsman cb64b3d758 libmodbus: new package
libmodbus is a library to send/receive data according to the Modbus
protocol.

http://libmodbus.org/
2014-06-14 21:50:57 +02:00
Shea Levy 564c4515b1 Merge pull request #2936 from sol/master
Add haskell-hspec-wai
2014-06-14 11:43:26 -04:00
Bjørn Forsman dcfdab62c9 pyrtlsdr: new package
pyrtlsdr is a python wrapper for librtlsdr (a driver for Realtek
RTL2832U based SDR's).
2014-06-14 14:15:32 +02:00
Michael Raskin a076a60735 Allow specifying allowUnfreePredicate instead of allowUnfree. The predicate will have access to the arguments of mkDerivation call. Should be an improvement for #2188 2014-06-14 13:01:12 +04:00
Michael Raskin 18023bc0e8 Update Sauerbraten to a fresh revision 5000. Apparently fixes the build. Probably fixes #995. 2014-06-14 11:50:08 +04:00
Simon Hengel 8a396ee56a Add haskell-hspec-wai 2014-06-14 15:13:40 +08:00
Simon Hengel 315016197a Update haskell-aeson-qq to version 0.7.1 2014-06-14 14:55:34 +08:00
Ricky Elrod 379c2731b2 update spawn-fcgi to 1.6.4
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-06-13 23:01:47 -04:00
Robert M. Mather 2d6d52bb2a Ur/Web compiler: new release, 20140426 -> 20140531 2014-06-13 18:22:34 -07:00
Michael Raskin 213312b667 Update GlusterFS to 3.4.3 2014-06-14 00:23:12 +04:00
Michael Raskin 6bbd163df4 Update Wine unstable version 2014-06-14 00:23:11 +04:00
Michael Raskin ed20f939f5 Update CL-Launch 2014-06-14 00:23:11 +04:00
Jonathan Glines 43432b9fca Added a long description. Added the patch file. 2014-06-13 12:08:44 -06:00
Jonathan Glines 2784866ffd Merge branch 'master' into nitrogen. Added maintainer and license.
Conflicts:
	pkgs/tools/X11/nitrogen/default.nix
2014-06-13 11:54:19 -06:00
Jonathan Glines c977673bb5 Merge branch 'nitrogen' of github.com:/auntieNeo/nixpkgs into nitrogen
Conflicts:
	pkgs/tools/X11/nitrogen/default.nix
2014-06-13 11:41:40 -06:00
Jonathan Glines c55be95e6e Nitrogen build working. Missing custom icons in GUI. 2014-06-13 11:37:05 -06:00
Jonathan Glines 57450acaca Oops, typespeed branch got merged somehow. Removed. 2014-06-13 11:37:05 -06:00
Jonathan Glines 93ea13874c Working on a package for nitrogen. 2014-06-13 11:37:05 -06:00
Jonathan Glines 3d24aa0dbd Added typespeed package. 2014-06-13 11:37:05 -06:00
Eelco Dolstra 27c72f337b linux: Update to 3.12.22
Fixes CVE-2014-3153 (local privilege escalation via futex()).
2014-06-13 17:44:02 +02:00
Peter Simons fd61a8fce2 Merge pull request #2929 from pSub/org-mode
Update org-mode from 8.2.6 to 8.2.7 and add myself as a maintainer.
2014-06-13 15:47:41 +02:00
Peter Simons 40ca1149c9 haskell-io-memoize: update to version 1.1.0.0 2014-06-13 15:41:26 +02:00