Commit Graph

714 Commits

Author SHA1 Message Date
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
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
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
Eugene Akentyev
08ca4e2d59 Add Light Table editor. 2014-07-17 12:25:22 +02:00
Pascal Wittmann
70caf388eb org: update from 8.2.7 to 8.2.7b 2014-07-17 12:20:22 +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
496d12958e Add automatic plugin activation for vim 2014-07-15 14:59:15 +02:00
Eelco Dolstra
ff97b7dbe6 Merge remote-tracking branch 'origin/master' into staging 2014-07-14 17:04:55 +02:00
Peter Simons
d2e731e111 Add "please don't edit" comment at the top of every auto-generated Haskell file. 2014-07-14 13:21:41 +02:00
Peter Simons
ac44601157 idea: minor cosmetic chance to fix syntax highlighting in Emacs 2014-07-09 16:10:50 +02:00
Peter Simons
d4fa3e2e54 Rename 'idea_community_1313' attribute to 'idea_community', i.e. drop the
version number so that it's possible to refer to some "default version of the
package" without knowing what version number that actually is.

The same applies to idea_ultimate_1313.
2014-07-09 16:10:50 +02:00
Austin Seipp
c734ec6952 Merge pull request #3201 from cstrahan/update-macvim
Update `macvim` package to v7.4.355
2014-07-08 11:47:09 -05:00
Moritz Maxeiner
682aadfc91 eclipse: add Eclipse Standard 4.4 Luna 2014-07-08 00:34:56 +02:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Charles Strahan
03391f9894 Update macvim package to v7.4.355
MacVim's maintenance has stagnated, so this moves `macvim` to a new maintainer.
Additionally, the `-headerpad_max_install_names` linker flag is passed to
prevent problems when setting the rpaths.
2014-07-07 00:16:55 -04:00
cillianderoiste
00cb266c4f Merge pull request #3163 from pSub/writegood-mode
Update writegood-mode from 1.3 to 2.0
2014-07-02 14:15:10 +02:00
Pascal Wittmann
da8b931738 Update writegood-mode from 1.3 to 2.0 2014-07-02 13:03:01 +02:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
John Wiegley
79aaef4846 Merge pull request #3038 from bennofs/fetch-rev-attr
fetchbzr, fetchdarcs, fetchhg: use `rev` attr
2014-06-28 17:04:04 -07:00
Benno Fünfstück
e10001042d fetchbzr, fetchdarcs, fetchhg: use rev attr
This makes it match the behaviour of fetchgit and fetchsvn, so it's
easier to write scripts that support all of them.
2014-06-28 21:06:10 +02:00
John Wiegley
bf610b79ff structured-haskell-mode: 1.0.2 > 1.0.3 2014-06-28 09:23:22 -07:00
Bjørn Forsman
e395f91607 zile: fix description (don't repeat package name) 2014-06-23 13:36:21 +02:00
John Wiegley
3b267d77a8 Merge pull request #3031 from jwiegley/proofgeneral
proofgeneral_4_3_pre: Add expression needed for current prooftree
2014-06-21 09:22:29 -07:00
John Wiegley
bfe77718d4 emacs-modes-emms, emacs-modes-org: Relax platform qualifier 2014-06-20 22:37:09 -07:00
John Wiegley
073933101e proofgeneral: Delete default.nix for proofgeneral 2014-06-20 22:36:06 -07:00
John Wiegley
0cf6e55a70 proofgeneral_4_3_pre: Add expression needed for current prooftree 2014-06-20 22:31:55 -07:00
Austin Seipp
85c70f642f Merge pull request #2977 from bluescreen303/emacs-org2blog
Emacs org2blog - bring up to date - now works with org-8.* again
2014-06-18 16:21:02 -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
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
Mathijs Kwik
ff995adb0d emacs-idris-mode: upgrade to 0.9.13.1 2014-06-16 22:43:51 +02:00
Mathijs Kwik
b193dd5d77 emacs-org2blog: upgrade to 0.8.1 2014-06-16 22:43:11 +02:00
Mathijs Kwik
ab8337e4fc add emacs-metaweblog 2014-06-16 22:43:10 +02:00
Pascal Wittmann
63ee29b808 Org-mode 8.2.7 depends on texlive-cm-super. 2014-06-16 21:58:59 +02:00
Pascal Wittmann
19110c9a53 Update org-mode from 8.2.6 to 8.2.7 and add myself as a maintainer. 2014-06-13 14:21:39 +02:00
Peter Simons
f6eddf9e72 Merge pull request #2863 from Fuuzetsu/yi
yi: improve expression
2014-06-09 10:08:54 +02:00
Michael Raskin
ba0cc81737 Merge pull request #2858 from offlinehacker/nixos/atom/add
Add github atom, a hackable text editor for the 21st Century
2014-06-09 09:47:09 +04:00
John Wiegley
6a3a9589e2 macvim: add missing call to ensureDir 2014-06-07 20:22:58 +00:00
John Wiegley
c06613a3af macvim: move the .app bundle to $out/Applications 2014-06-07 20:18:27 +00:00
John Wiegley
03bd5f9f44 Merge pull request #2856 from cstrahan/macvim
add MacVim
2014-06-07 15:16:48 -05:00
Mateusz Kowalczyk
a91a4e9db2 yi: improve expression
Disable Haddock docs so that it actually builds (bug in GHC 7.6.3), make
pango optional (OSX people often complain), tell the binary where to
find various libraries needed at runtime (currently it could not find
even its own library).
2014-06-07 21:33:46 +02:00
Charles Strahan
72cd8ce56c add MacVim 2014-06-07 15:26:01 -04:00
Jaka Hudoklin
905081c029 Add github atom, a hackable text editor for the 21st Century 2014-06-07 12:46:51 +02:00
Peter Simons
80a60810ca emacs-sbt-mode: add initial version 2014-06-05 14:34:32 +02:00