Commit Graph

12935 Commits

Author SHA1 Message Date
Bjørn Forsman
fdba7f35fe lttng-modules: fix bad attribute reference
Fixup error introduced in commit
410f2a9dab ("lttng: align attribute name
with package name"). lttng-modules is not a top-level attribute.
2014-07-31 17:04:45 +02:00
Vladimír Čunát
dac1791fb5 thunderbird: major update 17.* -> 31.0
- To fix build problems, I refactored the build process
  according to Mozilla recommendations.
- 31.0 should become the next ESR branch (31 released today).

CC @nbp @edolstra

(cherry picked from commit adc2edd5cf)
2014-07-31 16:30:04 +02:00
Bjørn Forsman
410f2a9dab lttng: align attribute name with package name
lttngModules => lttng-modules
lttngTools => lttng-tools
lttngUst => lttng-ust

But keep the old attributes around for backward compatibility.
2014-07-31 16:00:04 +02:00
Peter Simons
84cf3f3de7 Agda: drop obsolete version 2.3.2.2 2014-07-31 13:58:36 +02:00
Peter Simons
7387244094 haskell-vty: update to version 5.1.4 2014-07-31 13:57:45 +02:00
Peter Simons
5f2ad413b7 haskell-xml-html-conduit-lens: add version 0.3.2.0 2014-07-31 13:57:45 +02:00
Peter Simons
689b322e10 Agda: update to version 2.4.0.2 2014-07-31 13:57:45 +02:00
Pascal Wittmann
ba273e41c2 Merge pull request #3405 from wavewave/cadaver
added cadaver: a command-line WebDAV client for Unix
2014-07-31 13:57:10 +02:00
Domen Kožar
e07c2c2cfd add uTox 2014-07-31 12:59:03 +02:00
Bjørn Forsman
62d0a320b3 Revert "Remove obsolete jackaudio version 1."
This reverts commit bdb77826d9.

Jack1 is not obsolete and neither jack1 nor jack2 is called 'jackaudio'.

Q: What's the difference between Jack1 and Jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-31 12:52:29 +02:00
Lluís Batlle i Rossell
10d4f1fac7 Setting retroshare 0.6 as lowPrio, it's unstable. 2014-07-31 10:13:20 +02:00
John Wiegley
7d90959d73 idris: 0.9.14 -> 0.9.14.1 2014-07-30 18:11:18 -05:00
John Wiegley
11dc22e3ee Agda needs an older version of haskell-equivalence 2014-07-30 18:10:59 -05:00
Ian-Woo Kim
ea43305368 added cadaver: a command-line WebDAV client for Unix 2014-07-30 16:55:44 +02:00
taku0
4ed2acc148 add source-han-sans-japanese, source-han-sans-korean, source-han-sans-simplified-chinese, source-han-sans-traditional-chinese: An open source Pan-CJK typeface 2014-07-30 16:27:20 +02:00
John Wiegley
b90e56a53c Merge pull request #3357 from fignuts/df2014
Add dwarf fortress 2014 (unstable) version
2014-07-29 13:20:35 -05:00
John Wiegley
867d3fbf47 Merge pull request #3372 from FlorentBecker/crawl
Add dungeon crawl stone soup 0.14
2014-07-29 13:20:18 -05:00
Peter Simons
d711c60c3d haskell-base-prelude: add version 0.1.3 2014-07-29 18:39:34 +02:00
Peter Simons
9d56d25673 haskell-vty: update to version 5.1.3 2014-07-28 20:32:59 +02:00
Peter Simons
0aa0b7680c haskell-parsers: update to version 0.12.1 2014-07-28 20:32:52 +02:00
Peter Simons
41ff906084 haskell-easy-file: add version 0.2.0 2014-07-28 20:32:52 +02:00
Peter Simons
c526312445 haskell-free-game: update to version 1.1.78 2014-07-28 20:32:52 +02:00
Peter Simons
bdb77826d9 Remove obsolete jackaudio version 1. 2014-07-28 20:32:52 +02:00
Peter Simons
eec522e69a haskell-nixpkgs.nix: update Cabal to version 1.20.0.2 2014-07-28 20:32:52 +02:00
Petr Rockai
bde992bbbc pkgsi686Linux: Use 32b kernels (x86_64 kernels can't be built with 32b gcc). 2014-07-28 20:26:13 +02:00
Rickard Nilsson
ccc22bb662 New package: mopidy-moped, a web client for the mopidy music player daemon 2014-07-28 19:51:08 +02:00
Peter Simons
4895ace127 perl-packages.nix: partially revert 7a45996233
The commit referred to non-existent license "stdenv.lib.licenses.perl5".
2014-07-28 13:20:54 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Joachim Schiele
d46c61b863 Merge pull request #3321 from qknight/snes9x-gtk
added snes9x-gtk with pulseaudio support
2014-07-27 21:38:25 +02:00
Cillian de Róiste
3447b018c2 Add SDL variant with pulseaudio enabled, this fixes choppy sound in Kdenlive
I would rather enable pulseaudio by default for SDL as it will
probably fix issues for other programs too.
2014-07-27 19:35:09 +02:00
Cillian de Róiste
d2193736db Remove linux_3_10_tuxonice, standard hibernate now works for me 2014-07-27 18:33:30 +02:00
Charles Strahan
5668ac61e9 bud: new package
This adds `bud`, a TLS terminating proxy.
2014-07-27 14:23:43 +02:00
Cillian de Róiste
077d989ad1 Merge branch 'shotcut'
Add Shotcut (video editor), update Kdenlive and MLT, add frei0r and movit plugins
2014-07-27 13:03:08 +02:00
Cillian de Róiste
ab7349711b Add Shotcut: A free, open source, cross-platform video editor
Includes a patch which has already been applied upstream:
mltframework/shotcut#31
2014-07-27 12:53:57 +02:00
Cillian de Róiste
1f9334cab3 MLT: 0.9.0 -> 0.9.2, add movit and frei0r plugins, add qt4 and qt5 variants
Shotcut segfaults on startup when compiled against an MLT which was
built with qt4. Kdenlive seqfaults when compiled against an MLT which
was built with qt5. Hence the need for the two variants.

Also, I'm adopting MLT as a maintainer.
2014-07-27 12:53:56 +02:00
Cillian de Róiste
0fec3f82fc Add frei0r: Minimalist, cross-platform, shared video plugins 2014-07-27 12:53:56 +02:00
Cillian de Róiste
ae16e892bb Add movit: High-performance, high-quality video filters for the GPU
NOTE: movit expected to be able to read source files from gtest, so I
also made them available.

squash
2014-07-27 12:53:39 +02:00
Cillian de Róiste
e7bb85e448 Add epoxy: A library for handling OpenGL function pointer management 2014-07-27 12:14:38 +02:00
Moritz Ulrich
e4f978d09f bbdb3: New package. 2014-07-27 10:55:43 +02:00
Matej Cotman
dbc829f5d4 new package: zed 0.12.0 (installer) 2014-07-26 14:41:20 +02:00
Evgeny Egorochkin
a7207cf389 RabbitMQ Java client library: package 2014-07-26 14:33:53 +03:00
Joachim Schiele
4f83b890db Merge pull request #3371 from qknight/qt53
qt-5.3: added attrPath="qt53Full" and "attrPath="qt53"; qt-5.2 still default
2014-07-26 13:10:31 +02:00
Jaka Hudoklin
b035be7b44 Merge pull request #3292 from offlinehacker/elasticsearch_plugins
elasticsearch: add support for plugins
2014-07-26 02:23:46 +02:00
Jaka Hudoklin
7f467aeeb2 Merge pull request #3315 from fignuts/master
Add SpiderOak secure backup service.
2014-07-26 02:19:51 +02:00
Jaka Hudoklin
598d0460cd Merge pull request #3355 from ttuegel/gnuplot
Update gnuplot and add optional Qt dependency
2014-07-26 02:14:56 +02:00
Jaka Hudoklin
7eb4d306fb elasticsearch: add support for plugins 2014-07-25 17:28:59 +02:00
Sebastian Korten
620100a406 vimpc: initial install script 2014-07-25 15:32:04 +02:00
Florent Becker
826e96af0e Add dungeon crawl stone soup 0.14 2014-07-25 15:00:28 +02:00
Joachim Schiele
9d724820c3 added attrPath="qt53Full" and "attrPath="qt53"; qt-5.2 still default 2014-07-25 13:38:56 +02:00
lethalman
9188444027 Merge pull request #3367 from FlashKorten/emv
Emv
2014-07-25 10:32:49 +02:00
Sebastian Korten
8da1291928 emv: Initial install script 2014-07-25 09:20:17 +02:00
lethalman
4e0653737c Merge pull request #3365 from geerds/virtualenvwrapper
Fix runtime dependencies for virtualenvwrapper
2014-07-25 00:20:10 +02:00
Jascha Geerds
6ab564cf64 Fix runtime dependencies for virtualenvwrapper 2014-07-24 23:24:56 +02:00
Andrew Morsillo
7c84e3b785 Add dwarf fortress 2014 (unstable) version 2014-07-23 22:41:30 -04:00
Thomas Tuegel
ac01b79c73 gnuplot: add optional Qt terminal 2014-07-23 18:01:31 -05:00
Bjørn Forsman
a1a2851409 Fix tarball job
gcc42 was removed in commit 5add082ab8
("gcc-4.2: Remove") but there are still some references to it. Remove
those references to fix Hydra tarball job.
2014-07-23 23:00:18 +02:00
Bjørn Forsman
49c9ba81a5 kalibrate-rtl: new package
kalibrate-rtl calculates the local oscillator frequency offset in
RTL-SDR devices.

kalibrate-rtl has no tags/releases, so I'm using the latest commit from
git master (dated 2013-12-14). I made an upstream issue about making a
release back in May[1], but I've gotten no response yet.

[1] https://github.com/steve-m/kalibrate-rtl/issues/7
2014-07-23 22:47:41 +02:00
William A. Kennington III
9e767db818 lrzsz: Add derivation
[Bjørn Forsman: remove "a unix" from beginning of meta.description and
capitalize first word]
2014-07-23 20:27:12 +02:00
Bjørn Forsman
f6f2f38a6e jack: change package and attr names to 'jack1' and 'jack2'
Currently, we have a 'jack' package with attrname 'jack1d' and a
'jackdbus' package with attrname 'jackaudio'. Make it consistent 'jack1'
and 'jack2' in both package name and attrname.

This aligns the naming with what can be found on the JACK homepage.

Q: what's the difference between jack1 and jack2?
A: http://trac.jackaudio.org/wiki/Q_differenc_jack1_jack2
2014-07-23 20:22:14 +02:00
Eelco Dolstra
5c5f115603 firefox: Build without xulrunner
Fixes #2950.
2014-07-23 17:28:36 +02:00
Eelco Dolstra
ee3db692e6 Remove unused function 2014-07-23 13:00:20 +02:00
Eelco Dolstra
97ced6f718 firefox-3.6: Remove
This version is ancient.
2014-07-23 12:56:53 +02:00
Eelco Dolstra
eb6c0826c5 libsamplerate: Use default gcc 2014-07-23 11:45:44 +02:00
Eelco Dolstra
b52da47cf1 audiofile: Use default gcc 2014-07-23 11:28:26 +02:00
Eelco Dolstra
4c2c0499f3 enscript: Build with the default GCC 2014-07-23 11:25:38 +02:00
Eelco Dolstra
922af7f158 libsndfile: Fix build on Darwin
Fixes #3347.
2014-07-23 11:00:41 +02:00
lethalman
6ca5313922 Merge pull request #3314 from geerds/virtualenvwrapper
Add virtualenvwrapper and its dependencies
2014-07-22 23:58:33 +02:00
Andrew Morsillo
0f8df0b6f2 Add evemu tool to emulate and record input device event data
[Bjørn Forsman:
 * wrap some long lines
 * tweak meta attrs (don't repeat package name, s/meta.maintainer/meta.maintainers/)
 * provide a version number (v2.0) for 'evemu' (for nix-env)
]
2014-07-22 23:35:38 +02:00
Jascha Geerds
d3aba9b866 Patch shell scripts 2014-07-22 23:34:38 +02:00
Vladimír Čunát
b9045a7d96 Merge branch 'x-updates' into staging
...in preparation for a merge to master
2014-07-22 22:28:39 +02:00
Vladimír Čunát
adc2edd5cf thunderbird: major update 17.* -> 31.0
- To fix build problems, I refactored the build process
  according to Mozilla recommendations.
- 31.0 should become the next ESR branch (31 released today).

CC @nbp @edolstra
2014-07-22 22:18:24 +02:00
aszlig
0da8390338
python-packages/nbxmpp: Fix wrong sha256.
Using the sha256 from v0.4 obviously won't work very well for v0.5.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-22 19:35:42 +02:00
aszlig
4fc46efac2
python-packages: Add nbxmpp version 0.5.
This is going to be a dependency of the upcoming Gojim version 0.16, so
let's package it so it's easy to run release canidate versions using
overrideDerivation without much cruft.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-07-22 19:25:54 +02:00
Vladimír Čunát
644c9eb6f7 Revert "Merge #3054: add kde 4.13.2"
This is due to breaking evaluation; see the PR discussion.

This reverts commit 6a77d5fd3e, reversing
changes made to 07a09fbe63.

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
2014-07-22 17:48:14 +02:00
Eelco Dolstra
e7295597d8 Revert "all-packages.nix: Provide a shorter way to specify packages"
This reverts commit ece61b7cc8.
2014-07-22 17:40:24 +02:00
Eelco Dolstra
ece61b7cc8 all-packages.nix: Provide a shorter way to specify packages
There are zillions of lines of the form

  foo = callPackage ../bla/foo { };

in all-packages.nix. To get rid of this verbosity, you can now list
such packages in pkgs/auto-packages.nix. This is just a list of
package file names, e.g.

  development/libraries/libogg
  development/libraries/libvorbis
  tools/archivers/gnutar

If the package needs non-default function arguments, or if its
intended attribute name is different from its file name, then you
cannot put it in auto-packages.nix and instead need to specify it in
all-packages.nix.

If Nix had a glob function (https://github.com/NixOS/nix/pull/235), we
could even get rid of auto-packages.nix and have package expressions
be discovered automatically. However, that might not be desirable
because of the need to traverse the file system to find packages we
may not even use.
2014-07-22 15:58:18 +02:00
Eelco Dolstra
beb47fa3b6 opensans-ttf: Fix attribute name 2014-07-22 15:13:09 +02:00
Eelco Dolstra
3a9542455e Remove unused gcc builds 2014-07-22 15:12:22 +02:00
Eelco Dolstra
5add082ab8 gcc-4.2: Remove 2014-07-22 15:12:21 +02:00
Eelco Dolstra
9c53065b61 exult: Update to 1.4.9rc1 2014-07-22 15:12:21 +02:00
Eelco Dolstra
ee39b4e82e opencxx: Remove
It's unused and unmaintained.
2014-07-22 15:12:21 +02:00
Rob Vermaas
2851d81d76 Merge pull request #3287 from NixOS/opensans
Package for Open Sans fonts.
2014-07-22 14:38:20 +02:00
Peter Simons
02c99b7cd1 haskell-haste-perch: drop unsupported package
This package requires a special build process that's not based on Cabal (see
<https://github.com/agocorona/haste-perch/issues/5>). Someone needs to figure
out how to compile and install this stuff in the context of Nix.
2014-07-22 14:20:59 +02:00
Peter Simons
5e3f52243d haskell-HUnit-approx: add version 1.0 2014-07-22 14:20:57 +02:00
Peter Simons
1add807fdf haskell-parsers: switch to version 0.12 2014-07-22 14:20:57 +02:00
Eelco Dolstra
e0c43e8d04 llvm: Removed unused versions 3.1 and 3.2 2014-07-22 13:56:26 +02:00
Eelco Dolstra
9edf4631ce emacs24Macport: Mark as lowPrio 2014-07-22 13:50:53 +02:00
Eelco Dolstra
3ef40e5004 emacs: Remove 23.x 2014-07-22 13:50:52 +02:00
Eelco Dolstra
7f410ef923 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/misc/vim-plugins/default.nix
2014-07-22 11:00:00 +02:00
Charles Strahan
1c77030fee mesos: Add package
Apache Mesos is a cluster manager that simplifies the complexity of running
applications on a shared pool of servers.
2014-07-22 00:35:59 -04:00
Sven Keidel
ee9ffde1cb added metainformation for gpodder and mygpoclient 2014-07-21 21:41:27 +02:00
Pascal Wittmann
5156b5d11d Merge pull request #3260 from linquize/gbdfed
gbdfed: add package 1.6
2014-07-21 19:49:26 +02:00
Bjørn Forsman
f8778ed82c openopc: new package
"OPC (OLE for Process Control) toolkit designed for use with Python"

This package contains a python module (OpenOPC) and a command line
client (opc). The OpenOPC Gateway Service for Windows is also copied to
$out, for reference.

It only works with python2.7 (not python3.x), so I'm not adding it to
python-packages.nix.

Also add needed dependency, python-pyro3, a distributed object
middleware for Python (IPC/RPC).

http://openopc.sourceforge.net/
2014-07-21 18:43:33 +02:00
lethalman
5cde295b1d Merge pull request #3327 from svenkeidel/gpodder
added gpodder package
2014-07-21 18:37:28 +02:00
Shea Levy
430bf4719e Add plugins haskell package 2014-07-21 09:44:39 -04:00
Vladimír Čunát
9b02635faa Merge recent master into x-updates
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
Vladimír Čunát
34cade2c9c mplayer2: switch to libav to fix build
CC @viric. If someone has a better suggestion, do it.
IMHO the main problem is the lack of maintenance
from the side of mplayer2, e.g. latest release >3 years ago.
2014-07-21 09:57:48 +02:00
Sven Keidel
eeeed00950 added gpodder package 2014-07-20 21:14:00 +02:00
Pascal Wittmann
52cf78ef22 added cv: Tool that shows the progress of coreutils programs 2014-07-20 15:45:19 +02:00
Pascal Wittmann
c7add6c270 Merge pull request #3317 from Mathnerd314/prelink
Add prelink package
2014-07-20 14:03:12 +02:00
Joachim Schiele
9d8a804047 added snes9x-gtk with pulseaudio support 2014-07-20 10:39:42 +02:00
Aycan iRiCAN
de155d13da Merge pull request #3227 from hrdinka/haskell-stm-containers
haskell-stm-containers: add package version 0.1.2 and its dependencies
2014-07-19 11:47:42 +03:00
Aycan iRiCAN
bfe2e05925 Merge pull request #3319 from luke-clifton/master
Added cgrep utility.
2014-07-19 11:43:06 +03:00
Aycan iRiCAN
f057f06136 resolved conflicts 2014-07-19 11:25:30 +03:00
Aycan iRiCAN
9489105aca Merge branch 'haskellPackages.rest' 2014-07-19 11:18:18 +03:00
Luke Clifton
2fbd9e07f2 Added cgrep utility. 2014-07-19 12:21:15 +08:00
Mathnerd314
dd325fa30c Add prelink package 2014-07-19 02:16:41 +02:00
John Wiegley
ad31933ec4 haskell-agda: 2.4.0.1 needs QuickCheck 2.7.5 specifically 2014-07-18 18:02:09 -05:00
Eelco Dolstra
3282de17fd Revert "titanium: Bump to 3.3.0"
This reverts commit 4426b8a3a1. It
causes an infinite recursion during Nixpkgs evaluation:

http://hydra.nixos.org/build/12608698

(@svanderburg)
2014-07-18 23:49:33 +02:00
Andrew Morsillo
7f96fff12b Add SpiderOak secure backup service. 2014-07-18 16:21:48 -04:00
Peter Simons
489923be2a parsers-0.12: don't use this version yet because it breaks trifecta 2014-07-18 17:30:49 +02:00
Peter Simons
ebed71f440 aeson: don't use version 0.8 yet because it breaks too many packages at the moment 2014-07-18 17:30:49 +02:00
Peter Simons
8a2aa3ccac haskell-parsers: add version 0.12 2014-07-18 17:30:49 +02:00
Peter Simons
2603db86d3 haskell-aeson: add version 0.8.0.0 2014-07-18 17:30:48 +02:00
Peter Simons
91c17543f2 haskell-QuickCheck: add version 2.7.6 2014-07-18 17:30:48 +02:00
Peter Simons
125aeed5a0 haddock: update to version 2.14.3 2014-07-18 17:30:48 +02:00
Sander van der Burg
4426b8a3a1 titanium: Bump to 3.3.0 2014-07-18 16:48:38 +02:00
Jascha Geerds
00fb5ea150 Add virtualenvwrapper and its dependencies 2014-07-18 15:02:44 +02:00
lethalman
5ef6745be3 Merge pull request #3278 from sztupi/vagrant
vagrant: upgrade to 1.6.3
2014-07-18 14:35:55 +02:00
Peter Simons
33b3afca91 Merge pull request #3312 from bennofs/haskell-applicative-quoters
haskell-applicative-quoters: new expression
2014-07-18 11:40:22 +02:00
Matej Cotman
1afb26fb17 e18: enlightenment desktop manager version 18 2014-07-17 23:00:38 +02:00
Benno Fünfstück
5fa3754813 haskell-applicative-quoters: new expression 2014-07-17 21:48:06 +02:00
Vladimír Čunát
16e35532e4 Merge recent master into x-updates 2014-07-17 19:30:56 +02:00
Eugene Akentyev
08ca4e2d59 Add Light Table editor. 2014-07-17 12:25:22 +02:00
William A. Kennington III
830f3b6b55 efivar: Add derivation 2014-07-17 11:40:37 +02:00
Daniel Austin
62f01119f3 Enable expressions for 'important' parts of the rest framework from Silk.co 2014-07-17 07:36:46 +02:00
Shea Levy
b969e9340b Separate fetchgitPrivate into a separate file 2014-07-16 18:05:56 -04:00
Russell O'Connor
2faad96991 Consistently use the package name opensans-ttf everywhere. 2014-07-16 16:22:47 -04:00
Eelco Dolstra
94db68d283 Move jdk -> oraclejdk 2014-07-16 18:35:35 +02:00
Peter Simons
9d457ec228 Merge pull request #3282 from aycanirican/jmacro
Added haskelPackages.jmacro-*
2014-07-16 12:10:51 +02:00
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
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
Rok Garbas
dd6f29f88c Revert "Update titanium node package and others"
This reverts commit 7dce55d0fd.
2014-07-16 10:46:04 +01: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
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
Eelco Dolstra
2d8e880c82 blender: Update to 2.71 2014-07-15 23:31:55 +02:00
Russell O'Connor
c4affbb17c Package for Open Sans fonts. 2014-07-15 13:35:22 -04:00
Sander van der Burg
7dce55d0fd Update titanium node package and others 2014-07-15 15:59:57 +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
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
9ff20ca43f libcredis: new package
libcredis is a client library for Redis (key-value database).

(libcredis is an optional dependency of collectd.)

Homepage: https://code.google.com/p/credis/
2014-07-15 14:07:28 +02:00
Eelco Dolstra
b9d19af3e6 Merge remote-tracking branch 'origin/master' into staging 2014-07-15 12:14:35 +02:00
Eelco Dolstra
ad477c77ff Revert "Set default kernel to 3.14"
Go back to 3.12 pending resolution of #3214.

This reverts commit 8f33899dd2.
2014-07-15 12:14:02 +02:00
Aycan iRiCAN
b46fb708b7 Added jmacro-* 2014-07-15 13:08:39 +03:00
Oliver Charles
b4a6e873f6 Add expressions for Haskell engine-io, engine-io-snap and socket-io 2014-07-15 10:47:00 +01:00