3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

14755 commits

Author SHA1 Message Date
Arseniy Seroka 0bb6efa314 Merge pull request #5023 from doublec/torbrowser
Update Tor Browser to 4.0.1
2014-11-18 18:11:47 +03:00
Chris Double 32d09e2699 Update Tor Browser to 4.0.1
Updates Tor Browser to 4.0.1. This requires the gcc 4.9 runtime.

Add myself to the maintainers.
2014-11-18 23:46:42 +13:00
cillianderoiste c1a0440bd3 Merge pull request #5022 from vbgl/roadsend
Removes roadsend (broken)
2014-11-18 10:17:45 +01:00
Mateusz Kowalczyk ef19a9a6e9 Merge pull request #5012 from jyp/hask-pkgs
Add haskell package: parsek
2014-11-18 07:55:45 +00:00
Vincent Laporte 1354bc0eba Updates (and fixes) opa 2014-11-18 07:26:16 +00:00
Vincent Laporte 15eec14f3a Removes roadsend (broken) 2014-11-17 22:42:21 +00:00
Aristid Breitkreuz 560d3d140e Merge pull request #4999 from drvirgilio/hayland
new package: hayland
2014-11-17 22:19:17 +01:00
James ‘Twey’ Kay bb999776f3 New package: stdman 2014-11-17 22:13:44 +01:00
aszlig d31b62d288
tomahawk: Add new package, version 0.8.1.
Although I've not tested the Tomahawk build on Mac OS X, it *should*
work on it, so I'm using platforms.all here.

Telepathy and KDE support are disabled by default in order to not get in
the way of users who want to use a more minimalistic window-manager-only
setup. But I'm not sure whether it matters in reality, we'll see once
more people are using Tomahawk.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-17 17:04:16 +01:00
Luca Bruno 24ad1612b4 Revert "clutter: update 1.18 -> 1.20. Shouldn't break anything"
This reverts commit 5e14c86b80.

Overlooked an experimental API that breaks mutter in GNOME 3.12.
2014-11-17 15:10:56 +01:00
Luca Bruno 5e14c86b80 clutter: update 1.18 -> 1.20. Shouldn't break anything 2014-11-17 15:05:50 +01:00
Luca Bruno 9631274f77 Add vala 0.26. Will be needed for gnome-terminal 3.14 2014-11-17 14:57:21 +01:00
Luca Bruno 97d5a55dd7 libndp: add new package
Library for Neighbor Discovery Protocol.

Will be needed for the new networkmanager.

http://libndp.org/
2014-11-17 14:55:45 +01:00
Jean-Philippe Bernardy 92f67bccba add parsek 2014-11-17 12:13:12 +01:00
Vladimír Čunát 48776868f7 nginxUnstable: disable the broken syslog patch 2014-11-17 09:27:55 +01:00
Peter Simons 21801bc1e6 Merge pull request #5010 from abhinav/master
haskell-digest-pure: Add version 0.0.3
2014-11-17 09:08:32 +01:00
Michael Raskin 4dd7bf116b Adding eudev 2014-11-17 09:44:44 +03:00
aszlig a28ba461e7
libjreen: Add new package, version 1.2.0.
Required as an optional dependency of the Tomahawk music player.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-17 01:37:13 +01:00
aszlig 2856b0e66c
websocketpp: Add new package, version 0.4.0.
Required as a dependency of the Tomahawk music player.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-17 01:35:41 +01:00
aszlig 0a271c00be
lucenepp: Add new package, version 3.0.6.
Required as a dependency of the Tomahawk music player.

The latest upstream release needs to be patched quite a bit in order to
build and to correctly install the header files. Other distributions
seem to largely use the latest Git master version, because all those
build problems have been fixed there already.

In order to ensure we have version 3.0.6, we just cherry-pick the
relevant patches, so as soon as the next upstream version is released we
just need to drop the patches/postPatch attributes.

The postPatch is needed in order to get rid of the subversion
dependency, which the upstream build process tries to use for fetching
gtest. We don't have networking support inside the Nix build process, so
let's pass that dependency directly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-17 01:33:09 +01:00
aszlig 281a95b454
qtkeychain: Add new package, version 0.4.0.
Required as a dependency of the Tomahawk music player.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-17 01:21:09 +01:00
aszlig aafc04ef35
libechonest: Add new package, version 2.3.0.
Required as a dependency of the Tomahawk music player.

Tests are disabled because they require networking support.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-17 01:18:10 +01:00
aszlig b2557476f7
quazip: Use qt instead of qt5 for refering to Qt.
Qt 5 is passed via all-packages.nix, so it doesn't look too odd if you
want to build against qt4 instead. Before you'd have to use something
like:

quazip.override { qt5 = qt4; }

Now, it is:

quazip.override { qt = qt4; }

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-11-17 01:06:02 +01:00
Abhinav Gupta d6e8ab78db haskell-digest-pure: Add version 0.0.3 2014-11-16 15:32:29 -08:00
Aristid Breitkreuz 4790b70fb5 remove gcc33 from release expressions 2014-11-16 17:34:03 +01:00
Aristid Breitkreuz 7bb0ff509c remove gcc 3.3 and snx ("SSL Network Extender"), the only package that depends on it 2014-11-16 14:57:42 +01:00
Vincent Laporte 099d145590 Adds ocaml-camlpdf-1.7.2
OCaml library for reading, writing and modifying PDF files

Homepage: https://github.com/johnwhitington/camlpdf
2014-11-16 08:42:55 +00:00
David Virgilio 55bb7dd1f2 new package: hayland 2014-11-16 02:08:39 -06:00
David Virgilio 7b8237f6fc new package: data-flags 2014-11-16 00:57:50 -06:00
Benno Fünfstück a1bca683f4 xvkbd: new expression 2014-11-15 21:37:34 +01:00
Moritz Ulrich 0fc8d92e53 slic3r: Bump to 1.2.1
Also adds OpenGL and WxGLCanvas to perlPackages..

OpenGL currently contains some pretty ugly hacks regarding OpenGL
feature-detection. Expect it to fail on different systems.
2014-11-15 19:22:59 +01:00
Domen Kožar 830141f918 python-packages: refer to current python build instead of hard-coded py27 2014-11-15 18:55:12 +01:00
Domen Kožar 0d4f0500cb garden 2014-11-15 18:22:04 +01:00
Domen Kožar 00f1f9357d fix python3Packages.pyqtgraph by not using python2.7 pil as dependency in pyopengl 2014-11-15 18:22:04 +01:00
Moritz Ulrich c227e8f259 notmuch: Update to 0.19.
This commit also enables manpages.
2014-11-15 17:58:40 +01:00
Michael Raskin ba77c90161 Revert "cups: update package"
This reverts commit aa548af5a5.
2014-11-15 17:00:15 +03:00
Michael Raskin d86c047f9c Revert "cups-filters: add package"
This reverts commit f7ba33de56.
2014-11-15 16:59:58 +03:00
Michael Raskin a7c8d00b27 Merge pull request #4857 from abbradar/cups2
[WIP] Improve printing experience and update related packages
2014-11-15 15:18:35 +03:00
William A. Kennington III 478e4b46d1 pgpool: Add derivation 2014-11-15 01:23:25 -08:00
William A. Kennington III 9f8804f664 libnl: Remove old 3.2.19 version 2014-11-14 23:18:09 -08:00
William A. Kennington III 7a318d5f73 kyotocabinet: Add derivation 2014-11-14 21:53:33 -08:00
William A. Kennington III 9458bc6ee3 goffice_0_8: Fix build 2014-11-14 19:51:54 -08:00
Petr Rockai c5b5020681 ConTeXt: Update to a current version & include it in texLiveFull. 2014-11-14 22:49:06 +01:00
Luca Bruno e8adc8b5ec Drop GNOME 3.10 2014-11-14 22:46:37 +01:00
William A. Kennington III a3af559455 Actually remove linux_3_15 2014-11-14 11:06:52 -08:00
William A. Kennington III 1a405c999e kernel: Remove 3.15 2014-11-14 11:05:51 -08:00
Michael Raskin 4ca96793d5 Merge pull request #4985 from rened/master
update julia, make it portable accross cpu architectures
2014-11-14 20:51:16 +03:00
Vladimír Čunát 3529567ed4 libgphoto-2.4: remove the old unneeded version 2014-11-14 18:00:04 +01:00
Rene Donner 60eeaf355c update julia, make it portable accross cpu architectures 2014-11-14 16:05:33 +01:00
Eelco Dolstra bf17f43fe9 firefox: Use regular linker
It builds on Nix >= 1.8pre3890 due to the removal of the
ADDR_LIMIT_3GB personality flag.
2014-11-14 15:58:19 +01:00
Vladimír Čunát b4af993c3f Merge branch 'master' into staging
Conflicts (simple):
	pkgs/development/lisp-modules/clwrapper/setup-hook.sh
2014-11-14 14:28:23 +01:00
Nikolay Amiantov f7ba33de56 cups-filters: add package 2014-11-14 13:51:26 +03:00
Nikolay Amiantov aa548af5a5 cups: update package 2014-11-14 13:51:26 +03:00
Nikolay Amiantov f2c3bda151 ijs: add package 2014-11-14 13:51:26 +03:00
Nikolay Amiantov 0836fd5054 qpdf: add package 2014-11-14 13:51:26 +03:00
Nikolay Amiantov e723c512c5 ghostscript: drop GNU fork and update 2014-11-14 13:51:26 +03:00
Peter Simons 3d8e94bc8e Merge pull request #4869 from abbradar/release-packageset
release-lib: add option to use another package set
2014-11-14 11:32:12 +01:00
Daniel Austin 5d56bda1fb Development tools: added atom-shell 2014-11-14 04:53:20 +01:00
Gavin Rogers ec3e96683a zeromq: renamed package from zmq 2014-11-13 23:00:53 +00:00
Nikolay Amiantov aa14fb6389 release-lib: add option to use another package set 2014-11-14 00:34:51 +03:00
Vincent Laporte 7361406e20 Adds bluefish
Bluefish is a powerful editor targeted towards programmers and
webdevelopers, with many options to write websites, scripts and
programming code.

Homepage: http://bluefish.openoffice.nl/
2014-11-13 19:49:44 +00:00
Pascal Wittmann 4d59ac9e67 Merge pull request #4977 from 23a1a74/caudec
Caudec
2014-11-13 17:50:16 +01:00
Pascal Wittmann 38022c9938 add icmake, a program maintenance utility 2014-11-13 17:48:06 +01:00
Michael Raskin 221a78739e Merge pull request #4964 from ehmry/qtbitcointrader
QtBitcoinTrader: 1.07.98 -> 1.08.02
2014-11-13 19:42:20 +03:00
_1126 e2bfd40083 caudec: adds new package 2014-11-13 17:32:23 +01:00
Peter Simons 76ed569875 Drop obsolete versions of Haskell cairo, glib, gtk, pango, threadscope, and some other patches. 2014-11-13 17:21:33 +01:00
Emery Hemingway d925fcf384 QtBitcoinTrader: 1.07.98 -> 1.08.02 2014-11-13 10:21:30 -05:00
Peter Simons d2c0c6102e haskell-threadscope: update to version 0.2.5 2014-11-13 14:51:36 +01:00
Julian K. Arni 9134fc29b7 Matching hspec-hspec2
Upgraded hspec2 to 0.6.
        Upgraded hspec to 2.0.1.
        This allows (recursively) depending on hspec2 and hspec to work nicely,
        since now hspec2 is just a re-export of hspec.
2014-11-13 14:51:35 +01:00
cillianderoiste 81680a17a8 Merge pull request #4214 from manveru/keybase
keybase-node-client: 0.7.0
2014-11-13 13:13:14 +01:00
Jos van den Oever 184cd101fb cvxopt: fix license typo (close #4974) 2014-11-13 12:41:34 +01:00
Vincent Laporte 13490c9467 Adds commons-bsf
Bean Scripting Framework (BSF) is a set of Java classes which provides
scripting language support within Java applications, and access to Java
objects and methods from scripting languages.

Homepage: http://commons.apache.org/proper/commons-bsf/
2014-11-13 07:53:37 +00:00
Vincent Laporte c13c705a7c Adds commons-logging
Wrapper around a variety of logging API implementations

Homepage: http://commons.apache.org/proper/commons-logging/
2014-11-13 07:53:37 +00:00
Shea Levy 8bc56d5d8e Merge branch 'nix-exec-git' of git://github.com/proger/nixpkgs 2014-11-12 20:04:11 -05:00
Domen Kožar a08fbc5ad5 Merge pull request #4969 from gavinrogers/master
zmq: initial package
2014-11-13 00:32:24 +01:00
Gavin Rogers b9c7f8dba1 zmq: initial package 2014-11-12 23:08:05 +00:00
Bjørn Forsman 3ad886f824 winpdb: new package
Platform independent Python debugger.

http://winpdb.org/

Tested by debugging a Python script on Linux.
2014-11-12 23:16:42 +01:00
Michael Raskin 0d6306be4d Merge pull request #4950 from joachifm/dnscrypt-proxy
dnscrypt-proxy service
2014-11-13 00:25:05 +03:00
Michael Raskin 232f6bb4d2 Merge pull request #4929 from abbradar/prl-tools
Add packages and support for Parallel Guest Tools
2014-11-13 00:22:42 +03:00
Michael Raskin f5c3ad443b Merge pull request #4578 from offlinehacker/pkgs/pythonPackages/scikit_algo
pythonPackages: scikit-learn and pyalgotrade
2014-11-13 00:17:39 +03:00
John Wiegley 38ab111dd7 coqPackages.unimath: new expression 2014-11-12 14:37:25 -06:00
Arseniy Seroka c75502acd2 Merge pull request #4897 from MarcWeber/submit/vim-plugins-with-vam-or-pathogen
experimental/vim-vam-pathogen-vimrc-support
2014-11-12 22:11:29 +03:00
Longrin Wischnewski 348597b939 pkgs: add xsnow 2014-11-12 17:52:21 +01:00
Vladimír Čunát 4a62542f55 xorg.xf86-video-intel: use the new versions
The old driver wasn't updated since August 2013, and e.g. won't compile
with glibc-2.20. Distros like Arch or Ubuntu are using newer one for a long time.

(cherry picked from commit 515dcb0f66)
 because the old driver won't compile with new X server.
2014-11-12 16:33:20 +01:00
Vladimir Kirillov c04dac7807 nix-exec: make git less heavyweight 2014-11-12 17:32:02 +02:00
Arseniy Seroka 542f3d47bd Merge pull request #4960 from jyp/hask-pkgs
add labeled-tree
2014-11-12 16:03:12 +03:00
Jean-Philippe Bernardy 9ce6651c8b add labeled-tree 2014-11-12 13:51:53 +01:00
Eelco Dolstra ea679bca7c Catalyst::Runtime: Require Term::Size::Any
Otherwise you get stupid warnings all the time.
2014-11-12 13:44:16 +01:00
Nikolay Amiantov bfbb46ea92 ipopt: add package 2014-11-12 03:43:35 +03:00
Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Nikolay Amiantov 3c8fe179f6 prl-tools: add package 2014-11-12 01:26:23 +03:00
Joachim Fasting 216ed76821 dnscrypt-proxy: new expression 2014-11-11 22:46:49 +01:00
Peter Simons 56d325550b Revert "Revert "haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5"".
This reverts commit dddea7f0d1. @jwiegley, Hakyll builds just fine with
pandoc-citeproc 0.6. See http://hydra.cryp.to/build/239248, for example. If you
have trouble compiling that package, then please share a build log that shows
the error message instead of reverting my commits, please.
2014-11-11 21:17:14 +01:00
cillianderoiste d12d84bf78 Merge pull request #4946 from puffnfresh/package/lightum
Add Lightum package: MacBook light sensor daemon
2014-11-11 20:54:59 +01:00
John Wiegley 68f3d56880 Drop reference to old shelly from haskell-defaults.nix 2014-11-11 12:50:22 -06:00
John Wiegley dddea7f0d1 Revert "haskell-pandoc-citeproc: drop obsolete versions 0.4 and 0.5"
This reverts commit d3b2c3f46c.

@peti I'm reverting this commit until a resolution is found that allows
Hakyll to build.  I've confirmed that reverting it here fixes the build
error.
2014-11-11 12:49:33 -06:00
Brian McKenna e9b6ad43a6 Add Lightum package: MacBook light sensor daemon
Also a NixOS service could make sense but the daemon puts
configuration under the Xdg user path.
2014-11-11 10:22:08 -07:00
Eelco Dolstra 19e5c3c306 firefox-13.0: Remove
It's outdated, insecure and not used anywhere in Nixpkgs.
2014-11-11 15:37:58 +01:00
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
vbgl 0e309af732 Merge pull request #4933 from sjmackenzie/ndn
new package: ndn-cxx
2014-11-11 12:46:50 +00:00
Peter Simons 2650bdf417 Merge pull request #4894 from peti/haskell-updates
Drop obsolete versions of Haskell Platform ...
2014-11-11 13:42:03 +01:00
Stewart Mackenzie 23d0af8f34 new package: ndn-cxx 2014-11-11 18:22:18 +08:00
Eelco Dolstra aa17cbf0a8 Remove unnecessary override 2014-11-11 10:38:48 +01:00
Domen Kožar 43be15a89c fix quake3game build 2014-11-11 09:34:40 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Brian McKenna a6bacd4d81 Add "light" package and setuid wrapper 2014-11-09 19:45:43 -07:00
Luca Bruno 2e380c0070 Revert "add back wayland 1.5 for cogl 1.18"
This reverts commit 9c997fe446.
2014-11-10 01:03:32 +01:00
Luca Bruno 65e6449faa Revert "Use wayland 1.5 also for cogl 1.16"
This reverts commit c2ab75c47b.
2014-11-10 01:03:27 +01:00
Luca Bruno c2ab75c47b Use wayland 1.5 also for cogl 1.16 2014-11-10 00:39:44 +01:00
Luca Bruno 9c997fe446 add back wayland 1.5 for cogl 1.18
Wayland 1.6 removed wayland-egl.pc
2014-11-10 00:13:53 +01:00
koral bc1166c021 ncmpcpp: removed old beta. 2014-11-09 20:57:48 +01:00
Michael Raskin 6dcab5d1ed Merge pull request #4913 from offlinehacker/pythonPackages/jrnl/add
pythonPackages: add jrnl, a simple journal application for your command line
2014-11-09 19:36:40 +03:00
Michael Raskin b6203b804b Mark binary distribution of Mozart/Oz 2.0 as such 2014-11-09 19:26:55 +03:00
Francesco Lazzarino 6e508a61e7 new package – libtomcrypt 2014-11-09 18:50:15 +03:00
Jaka Hudoklin 8b80daeab2 pythonPackages: add jrnl, a simple journal application for your command line 2014-11-09 16:49:20 +01:00
Michael Raskin 67317f4bf6 Fix fetchurl references — Fixes \#4421 2014-11-09 18:34:27 +03:00
Nathaniel Baxter a0fc4263e3 pythonPackages: set guessit and babelfish as python 2.x only 2014-11-09 18:32:47 +03:00
Nathaniel Baxter 3e7d52434d flexget: Use dateutils 1.5 instead of 2.1 for python 2.x support 2014-11-09 18:32:47 +03:00
Nathaniel Baxter 8612f15a68 flexget: Bump version to 1.2.201 Added dateutil_2_1, guessit and bablefish dependencies 2014-11-09 18:32:47 +03:00
Michael Raskin ffbd1d011b Add CMake 3.0 — Fixes #4363 — mostly-merging a PR by bbenoist 2014-11-09 18:31:46 +03:00
Michael Raskin 0fb2c3e85a Add unstable NodeJS — Fixes #4264 (mostly merges the PR from Bodil Stokke) 2014-11-09 18:18:56 +03:00
Jaka Hudoklin 3d2f1c3385 Merge pull request #4854 from offlinehacker/pkgs/libguestfs/add
Add augex, hivex and libguestfs
2014-11-09 16:09:51 +01:00
Michael Raskin 6d0518fbdf Merge pull request #4282 from sztupi/crashplan
Crashplan

OK, it is an external service with unfree client, so let's declare that ensuring usability of the service is not our headache.
2014-11-09 18:09:33 +03:00
Michael Raskin 41ff7d75fd Add mutt sidebar patch — Fixes #3222 (a PR by Leon Waldman) 2014-11-09 17:55:19 +03:00
Jaka Hudoklin 77aed3433d pythonPackages: add scikit-learn 2014-11-09 15:52:20 +01:00
Jaka Hudoklin 0eede5a01f pythonPackages: add pyalgotrade 2014-11-09 15:52:20 +01:00
Jaka Hudoklin 25b2d2d9b0 Add libguestfs, tools for accessing and modifying virtual machine images 2014-11-09 15:24:25 +01:00
Jaka Hudoklin 7dc7ccbe5b Add hivex, windows registry hive extraction library 2014-11-09 15:24:08 +01:00
Peter Simons 3b96e0c752 Switch the default version of GNU Privacy Guard back to 2.0.
This patch effectively undoes @wkennington's update from 850da18. The problem
with GnuPG 2.1 is that its built-in 1.x compatibility differs from the one
provided in version 2.0, and these changes break 'gpg1compat in ways we don't
understand yet.

Commit 4c84621 attempted to remedy that issue by fixing gpg1compat to GPG 2.0,
but this caused further trouble because the GPG agent from versions 2.0 and 2.1
are incompatible, so users of the GPG 1.x interface (who were using GPG 2.0)
could not talk to their X session's agent (which comes from GPG 2.1).

The corresponding ticket is https://github.com/NixOS/nixpkgs/issues/4888.
2014-11-09 14:36:14 +01:00
Jaka Hudoklin cc3ba83055 Add augeas, configuration editing tool 2014-11-09 14:32:08 +01:00
Mateusz Kowalczyk 57a84615c6 vite: fix and update package 2014-11-09 12:59:51 +00:00
Mateusz Kowalczyk ce4f49cec1 EZTrace: new package 2014-11-09 12:05:44 +00:00
Edward Tjörnhammar c329e5bbd9 i2pd: added package, service 2014-11-09 09:55:35 +01:00
Cray Elliott 6349ff15b1 add xwiimote, a linux-only userspace driver for wiimotes 2014-11-08 20:44:25 -08:00
ambrop7@gmail.com 45aeaf6938 Add conntrack-tools and missing dependencies. 2014-11-09 00:28:21 +01:00
Arseniy Seroka 417216aa57 Revert "Add conntrack-tools and missing dependencies." 2014-11-09 02:12:04 +03:00
Arseniy Seroka c66a63e45c Merge pull request #4900 from ambrop72/conntrack
Add conntrack-tools and missing dependencies.
2014-11-09 02:10:59 +03:00
Maciek Starzyk f72c460abf ocaml: 4.02.0 -> 4.02.1 2014-11-08 23:15:53 +01:00
ambrop7@gmail.com 085b5ec48c Add conntrack-tools and missing dependencies. 2014-11-08 23:06:09 +01:00
Michael Raskin bf184758a6 Adding Fish-Fillets-NG game 2014-11-08 22:35:06 +03:00
Domen Kožar c1d6a4a8fb remove unused pythonLinkmeWrapper 2014-11-08 20:19:55 +01:00
Aristid Breitkreuz 928177aa91 Merge pull request #4834 from offlinehacker/pkgs/flannel/add
Add flannel, etcd backed network fabric for containers
2014-11-08 19:56:16 +01:00
Aristid Breitkreuz 392f828c5d Merge pull request #4822 from abbradar/crawl
crawl: fix, update, add console version
2014-11-08 19:42:23 +01:00
Marc Weber 613ca23e85 experimental/vim-vam-pathogen-vimrc-support
This patch implements derving a .vimrc from vim-plugins.nix loading those
plugins by either Pathogen or VAM (VAM seems to be slightly faster and is much
more powerful).

Example:

  environment.systemPackages = [
   # default plain vim
   vim_configurable

   # vim which get's called vim-with-addon-nix
   (vim_configurable.customize {
      name = "vim-with-addon-nix";
     vimrcConfig.vam.pluginDictionaries = [{name = "vim-addon-nix"; }];
   })
  ];

This way you can provide an "enhanced Vim" and a standard Vim.

Details about what this commit changes:
1) provide a new toplevel name vimrc which
  * provides a way to build up a .vimrc using either pathogen or VAM (knowing about plugin dependencies by name)
  * can enhance vim to support. vim.customize { name = "name-user"; vam.pluginDictionaries and/or pathogen.pluginNames = .. }
  * introduce rtp names for each vim plugin pointing to the runtimepath path
  * suggest naming to be the same as vim-pi so that VAM's dependencies work
  * derive some packages as example from vim-pi using VAM's new autoload/nix.vim
    supporting simple dependencies
  * test case for vim-addon-nix for VAM/pathogen

2) enhance vim_configurable to support .customize

3) update many plugins by using VAM's implementation not rewriting those which
  * vim-pi doesn't know about the git source yet (TODO: make vim-pi be aware of
    those)
  * have special build code

This commit partially conflicts with commits done by Bjørn Forsman starting by
37f961628b, eg the one using lower case attr and pkg names, because they don't
match vim-pi (eg YouCompleteMe). Rather than resolving the conflict this just
adds aliases so that both names can be used
2014-11-08 19:34:17 +01:00
Domen Kožar c9ec201cd0 pycdio: fix build 2014-11-08 16:18:50 +01:00
Luca Bruno 83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Peter Simons 0b36cbf8e7 cabal-install: drop obsolete versions 0.10.2, 0.14.0, 0.6.2, 0.8.0, and 0.8.2 2014-11-08 15:50:21 +01:00
Peter Simons b8d631a604 happy: drop obsolete versions 1.18.10 1.18.4, 1.18.5, 1.18.6, and 1.18.9 2014-11-08 15:50:21 +01:00
Peter Simons 64ff17d4e6 haskell-zlib: drop obsolete versions 0.5.0.0, 0.5.2.0, 0.5.3.1, 0.5.3.3, and 0.5.4.0 2014-11-08 15:50:21 +01:00
Peter Simons b2ac4769ab haskell-xhtml: drop obsolete versions 3000.2.0.1, 3000.2.0.4, and 3000.2.0.5 2014-11-08 15:50:20 +01:00