Austin Seipp
91f1dda340
Merge pull request #2980 from bluescreen303/php-fpm
...
phpfpm: add option for setting php.ini file
2014-06-18 16:08:21 -05:00
John Wiegley
4643126d10
Merge pull request #2938 from pSub/org-mode
...
Org-mode 8.2.7 depends on texlive-cm-super.
2014-06-18 09:42:12 -07:00
Peter Simons
f7c7282964
Merge pull request #2979 from bluescreen303/idris
...
Idris: fix wrapper for llvm, upgrade emacs-idris-mode
2014-06-18 10:00:00 +02:00
Michael Raskin
8297a26746
Create an option to build 3.16-rc1 which carries a new Wireless driver; make USB_DEBUG optional as it seems to be planned to disappear in 3.16.
2014-06-18 00:23:48 +02:00
Austin Seipp
fd4c2d893f
duo-unix: upgrade, fix full name + version
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-17 17:06:31 -05:00
Austin Seipp
5cf3fb7cb6
arcanist: 20140606 -> 20140617
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-17 15:48:51 -05:00
Eelco Dolstra
e5d63646a0
Don't suggest using --arg config '{ allowUnfree = true; }'
...
This doesn't work when using the Nixpkgs/NixOS channel.
Issue #2998 .
2014-06-17 15:00:24 -05:00
Anders Claesson
97d65d8010
nixos manual: fix typo ( close #2997 )
2014-06-17 21:52:22 +02:00
Austin Seipp
7f800e8155
jd-gui: version 0.3.5
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-06-17 14:44:49 -05:00
William A. Kennington III
86711e4120
nixos-iso: Re-enable new kernel iso images ( close #2839 )
2014-06-17 21:23:52 +02:00
Wout Mertens
d619f0ef6d
sublime3: fix plugin_host ( close #2804 )
...
Also move the binaries in their own package, so it doesn't pollute the
profile.
2014-06-17 21:15:37 +02:00
Ricardo M. Correia
f8e108c865
nixos.tests.installer: Fix test failures due to network being disabled
2014-06-17 18:41:26 +02:00
Shea Levy
50287f2c02
Merge pull request #2991 from bluescreen303/kernel-3.15
...
linux-3.15: upgrade to 3.15.1
2014-06-17 09:59:23 -04:00
Shea Levy
fec288f404
Merge branch 's3cmd-git' of git://github.com/fmapfmapfmap/nixpkgs
2014-06-17 09:56:01 -04:00
lethalman
219e992519
Merge pull request #2976 from bluescreen303/nginx
...
nginx: fix group, statedir permissions, add echo module, fix aio
2014-06-17 14:23:15 +02:00
Mathijs Kwik
5bc69209b1
linux-3.15: upgrade to 3.15.1
2014-06-17 08:17:38 +02:00
John Wiegley
6025caa92b
Merge pull request #2972 from proger/rsync-patch-hash
...
rsync: sha256 for the patch was updated
2014-06-16 15:42:44 -07:00
John Wiegley
61e8fe50c2
Agda: add 2.4.0.1, 2.3.2.2 is still the default for now
2014-06-16 14:03:17 -07:00
John Wiegley
39dfef4af0
haskell-boxes: new expression
2014-06-16 14:03:17 -07:00
John Wiegley
20f31b66a2
haskell-free-operational: new expression
2014-06-16 14:03:17 -07:00
John Wiegley
7a45ef7e25
haskell-equivalence: new expression
2014-06-16 14:03:17 -07:00
John Wiegley
cd3798c266
haskell-STMonadTrans: new expression
2014-06-16 14:03:17 -07:00
Mateusz Kowalczyk
43c6bfc0c9
mpd: clean up some flags
...
Some changed, some are no longer used.
2014-06-16 22:50:14 +02:00
Mateusz Kowalczyk
8f5f9f6c6b
libid3tag: apply fixes before build
...
Amongst other things, this stops things like mpd spinning up to full
memory when updating the database.
2014-06-16 22:50:14 +02:00
Mathijs Kwik
35df71ac1d
phpfpm: add option for setting php.ini file
2014-06-16 22:44:18 +02:00
Mathijs Kwik
a97bef3e8c
nixos/nginx: fix group and stateDir permissions
...
furthermore, I don't think adding nginx to systemPackages is of any use.
2014-06-16 22:43:58 +02:00
Mathijs Kwik
76c2c0c499
nginx: add echo module, fix aio on linux&freebsd
2014-06-16 22:43:58 +02:00
Mathijs Kwik
ff995adb0d
emacs-idris-mode: upgrade to 0.9.13.1
2014-06-16 22:43:51 +02:00
Mathijs Kwik
8d708ba35a
idris: provide boehmgc to compile with llvm backend
2014-06-16 22:43:51 +02:00
Vladimir Kirillov
2dfb036a30
rsync: sha256 for the patch was updated
2014-06-16 23:20:24 +03:00
Austin Seipp
c585786c1f
Merge pull request #2970 from tailhook/nanomsg_and_zeromq
...
Upgrade zeromq and nanomsg
2014-06-16 15:03:25 -05:00
Pascal Wittmann
63ee29b808
Org-mode 8.2.7 depends on texlive-cm-super.
2014-06-16 21:58:59 +02:00
Paul Colomiets
6b27a2789e
Upgrade zeromq and nanomsg
2014-06-16 22:25:56 +03:00
Eelco Dolstra
9ae3654fd6
Fix generation of synergy-{client,server} when disabled
2014-06-16 10:45:09 -04:00
Shea Levy
52aa2afdcd
nixUnstable: bump
2014-06-16 10:44:02 -04:00
Peter Simons
0f9b3ef24a
hscolour-bootstrap: GHC 6.10.x and earlier don't support the -rtsopts option
2014-06-16 16:28:39 +02:00
Peter Simons
c5b7e2a2f2
haskell-git-annex: update to version 5.20140613
2014-06-16 16:12:36 +02:00
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
Shea Levy
5e16c9428b
Merge pull request #2962 from fmapfmapfmap/hxt-tagsoup
...
New derivation: hxt-tagsoup #haskell
2014-06-16 02:08:16 -04: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
Austin Seipp
f0fc62d6a6
Merge pull request #2956 from Fuuzetsu/rtorrent
...
rtorrent
2014-06-15 19:01:50 -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