Peter Simons
93464d88b0
Merge pull request #3293 from codygman/blaze-from-html
...
blaze-from-html: add version 0.3.2.1
2014-07-16 12:07:42 +02:00
Peter Simons
5ae5d00d18
Merge pull request #3294 from nilcons/haskellfixes
...
Fix various Haskell packages for 7.8
2014-07-16 12:07:14 +02:00
Peter Simons
dde46a1445
Merge pull request #3297 from soenkehahn/master
...
update haskell-taggy-lens to version 0.1.2
2014-07-16 12:04:12 +02:00
Peter Simons
06e38776d4
Merge pull request #3298 from MP2E/hi_import
...
Import the cabal new project template creator, "hi"
2014-07-16 12:03:07 +02:00
Peter Simons
09af8c8afd
Re-generate Haskell expressions with cabal2nix.
2014-07-16 11:58:51 +02:00
Rok Garbas
dd6f29f88c
Revert "Update titanium node package and others"
...
This reverts commit 7dce55d0fd
.
2014-07-16 10:46:04 +01:00
Vladimír Čunát
18de3952b8
wpa_supplicant: update 2.1 -> 2.2, drop a patch
...
Fixes #3238 .
2014-07-16 10:30:38 +02:00
Cray Elliott
90392f6233
Import the haskell cabal template creator, "hi" from Hackage
...
note: depends on template
2014-07-16 01:13:09 -07:00
Cray Elliott
0e3f66d051
import Haskell template library from Hackage
2014-07-16 01:12:58 -07:00
Oliver Charles
952f3f6e8b
haskellPackages.ekgCarbon: New expression
2014-07-16 08:20:27 +01:00
Sönke Hahn
5d28cd9b18
update haskell-taggy-lens to version 0.1.2
2014-07-16 14:39:12 +08:00
John Wiegley
57e3fc341f
haskell-djinn: corrections for darwin
2014-07-16 01:27:39 -05:00
John Wiegley
d24df6e334
haskell-git-annex: corrections for darwin
2014-07-16 01:27:29 -05:00
Gergely Risko
51ef9caae5
Fix various Haskell packages for 7.8
2014-07-16 03:43:13 +02:00
Shea Levy
e33525a139
Update haskell-simple-conduit
2014-07-15 21:36:36 -04:00
Cody Goodman
5ba2e544d2
blaze-from-html: add version 0.3.2.1
2014-07-15 20:16:31 -05:00
Shea Levy
9087d03190
Add haskell-simple-conduit
2014-07-15 20:41:58 -04:00
Shea Levy
654c88cc6b
Fix virtualbox image building with new nix
2014-07-15 19:17:06 -04:00
Eelco Dolstra
327c2061d1
blender: Don't use system openjpeg
...
It was ignored anyway (instead using the internal openjpeg copy).
2014-07-15 23:34:34 +02:00
Eelco Dolstra
12fb52b08a
blender: Enable ocean modifier
2014-07-15 23:34:24 +02:00
Eelco Dolstra
457e539048
blender: Fix jackaudio dependency
2014-07-15 23:33:09 +02:00
Eelco Dolstra
ae129f0ff5
fftw: Update to 3.3.4
2014-07-15 23:32:00 +02:00
Eelco Dolstra
2d8e880c82
blender: Update to 2.71
2014-07-15 23:31:55 +02:00
Pascal Wittmann
889b3f5f83
Merge pull request #3286 from wjlroe/elasticsearch-1.2.2
...
elasticsearch: update to 1.2.2
2014-07-15 20:13:50 +02:00
Pascal Wittmann
0aa6a9876f
Merge pull request #3244 from ehmry/xscreensaver
...
xscreensaver: update from 5.26 to 5.29
2014-07-15 20:00:41 +02:00
Eelco Dolstra
6c0002ec8d
nvidia-x11: Update to 340.24
2014-07-15 19:53:39 +02:00
Pascal Wittmann
96f5affca9
bgs: update from 0.5 to 0.6
2014-07-15 19:50:29 +02:00
Russell O'Connor
c4affbb17c
Package for Open Sans fonts.
2014-07-15 13:35:22 -04:00
William Roe
3af919fb08
elasticsearch: update to 1.2.2
2014-07-15 16:57:16 +01:00
Bjørn Forsman
a4cf5e903b
nixos/redis: fix evaluation
...
Commit 89fee1006c
("nixos/redis: clean up
option types") broke nixos evaluation:
error: attempt to call something which is not a function but a set, at .../nixpkgs/nixos/modules/services/databases/redis.nix:111:28
Fix it.
Reported by Oliver Charles (thanks!).
2014-07-15 17:05:54 +02:00
Sander van der Burg
a8e4abaf6f
titaniumsdk: add version 3.3 SDK and update kitchensink example
2014-07-15 16:46:59 +02:00
Eelco Dolstra
1dc5e5fb8c
dhcpcd: Update to 6.4.2
2014-07-15 16:23:47 +02:00
Emery Hemingway
0d781369c0
polipo: update to 1.1.1
2014-07-15 10:10:28 -04:00
Sander van der Burg
bce5f2cf56
titaniumsdk: Bump to version 3.2.3
2014-07-15 16:05:25 +02:00
Sander van der Burg
7dce55d0fd
Update titanium node package and others
2014-07-15 15:59:57 +02:00
Oliver Charles
0ee223e786
haskellPackages.engineIO: Update to 1.0.1
2014-07-15 14:58:31 +01:00
Bjørn Forsman
89fee1006c
nixos/redis: clean up option types
...
Some options lack a type and some use the deprecated "string" type. Fix
it.
2014-07-15 15:45:52 +02:00
Ricardo M. Correia
85e444f4f8
linux: Enable NFSv4.1, v4.2 clients and swap on NFS
...
I'm only enabling for kernels >= 3.11 to be conservative, because clients and
servers automatically negotiate and use the highest mutually supported version
by default, but only in kernel 3.11 server NFSv4.1 support actually became RFC
compliant.
I'm also adding support for swap on NFS, which is enabled by default on
Ubuntu kernels.
2014-07-15 15:07:25 +02:00
Paul Colomiets
ab2c7cfff7
vim: Add syntax on
and set nocompatible
by default
...
Its what everybody wants in 2014. They are enabled by default both in
ubuntu and archlinux.
2014-07-15 14:59:16 +02:00
Paul Colomiets
e376e9731d
vim: Update vim to 7.4.335
2014-07-15 14:59:16 +02:00
Paul Colomiets
5e99b0553c
vim: Implement sourcing /etc/vimrc and /etc/vim/vimrc
2014-07-15 14:59:16 +02:00
Paul Colomiets
abf19df497
Remove wrapVim
...
I don't see a reason for having wrapVim function and vimWrapper and
vimHugeXWrapper packages. If you need a system vimrc, whats wrong with
``environment.etc."vimrc".text`` ?
Also strictly speaking ``vimHugeXWrapper`` didn't wrap, X-version
properly. I.e. running ``gvim`` have console vim version.
2014-07-15 14:59:16 +02:00
Paul Colomiets
8d9ff87c14
Add several vim plugins
...
Added are:
* ctrlp
* vim-a
* colorsamplerpack
* yankring
2014-07-15 14:59:15 +02:00
Paul Colomiets
496d12958e
Add automatic plugin activation for vim
2014-07-15 14:59:15 +02:00
Paul Colomiets
0ffcb718a2
Allow nix-env recurse into vimPlugins
2014-07-15 14:59:15 +02:00
Vladimír Čunát
0ef81572d8
Merge pull request #3263 from cstrahan/finalterm
...
finalterm: New package
2014-07-15 14:50:25 +02:00
Bjørn Forsman
4da81ca4f6
collectd: update meta attributes
...
Don't repeat package name in description, add maintainer, ...
2014-07-15 14:07:29 +02:00
Bjørn Forsman
3ba150db2f
collectd: enable a bunch of plugins (by adding more deps)
...
These are plugins that are internal to collectd; they are bundled in the
source archive. Without this, many of the collectd plugins advertised on
their homepage don't actually work, so I think we should add this.
This change increases the closure size from 129 MiB to 621 MiB. The size
of the collectd store path itself goes from 2 MiB to 2.9 MiB.
Users wanting a smaller closure size can set some (or all) of the
optional inputs to "null" using ".override".
List of new plugins:
amqp
apache
ascent
bind
curl
curl_json
curl_xml
dbi
dns
iptables
libvirt
lvm
memcachec
modbus
mysql
nginx
notify_desktop
pinba
ping
postgresql
redis
rrdcached
rrdtool
sensors
sigrok
varnish
write_http
write_redis
write_riemann
2014-07-15 14:07:29 +02:00
Bjørn Forsman
95636ec752
libmemcached: set meta.platforms
...
And a more precise license (BSD => 3-clause BSD).
2014-07-15 14:07:29 +02:00
Bjørn Forsman
7c951ede31
libmemcached: fix linking with libpthread
...
Add patch to fix linking against libpthread (from Fedora).
https://bugzilla.redhat.com/show_bug.cgi?id=1037707
https://bugs.launchpad.net/libmemcached/+bug/1281907
This fixes (upcoming) libmemcached use in collectd, which currently
doesn't work because of link failure caused by missing "pthread_once"
symbol.
2014-07-15 14:07:28 +02:00