Commit graph

852 commits

Author SHA1 Message Date
Vladimír Čunát 6d6695ec14 vim: improve *.nix plugin (#4662)
- Sync syntax from source.
- Add indentation conventions.
2014-11-14 22:08:31 +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
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
Michael Raskin 2126714a84 Merge pull request #4979 from bosu/vim-cscope
vim_configurable: add cscope support by default
2014-11-13 19:49:07 +03:00
Boris Sukholitko 8bc9e80d94 vim_configurable: add cscope support by default 2014-11-13 18:02:14 +02:00
Vincent Laporte 6e737145d7 jEdit: update from 4.4.2 to 5.1.0 2014-11-13 07:53:37 +00: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
Pascal Wittmann 8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Luca Bruno 6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Peter Simons 7da8ef80a7 emacs-ess: update checksum of the tarball 2014-11-08 18:44:15 +01:00
Peter Simons 6835392708 Merge pull request #4895 from joachifm/ess-14_09
ess: bump version to 14.09
2014-11-08 16:06:52 +01:00
Joachim Fasting 47bc68a687 ess: bump version to 14.09 2014-11-08 16:01:07 +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 69bb66902f emacs-icicles: add current icicles snapshot to emacsPackages 2014-11-07 11:55:57 +01:00
Mateusz Kowalczyk b8c561451f haskell-yi: update to version 0.11.1
cc @peti ; I took the courtesy to cherry-pick your yi-rope update ahead
2014-11-07 02:51:01 +00:00
Edward Tjörnhammar beb14981bb idea-{community,ultimate}: 14pre -> 14 2014-11-06 21:19:47 +01:00
Eelco Dolstra 0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk 007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Mathijs Kwik 8913f14a5f emacs-idris-mode: upgrade to 0.9.15 2014-11-05 18:28:59 +01:00
Vladimír Čunát 52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Edward Tjörnhammar 6c1ebab0a0 idea.ruby-mine: added 6.3.3 2014-11-04 21:22:42 +01:00
Edward Tjörnhammar a7d3aed056 idea.clion: added eap 2014-11-04 21:22:42 +01:00
Eelco Dolstra 7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00
Michael Raskin fe624050e8 Merge pull request #4737 from ambrop72/kdevelop-dependencies
KDevelop: Add some propagatedUserEnvPkgs dependencies.
2014-11-04 12:39:09 +03:00
John Wiegley 4c81ac3320 macvim: Update sha256 2014-11-03 15:27:32 -06:00
Edward Tjörnhammar 263d618d2c idea-{community,ultimate}: 13.1.5 -> 14pre 2014-11-03 18:47:55 +01:00
John Wiegley 198874e489 emacs24Macport: allow installing either 24.3 or 24.4 2014-11-03 10:51:29 -06:00
Peter Simons f2ae7bd844 magit: update to version 90141025 2014-11-03 14:41:05 +01:00
Allan Espinosa c6089871bb Use fetchurl and the exact release tag 2014-11-03 22:15:58 +09:00
Allan Espinosa 21880ab6fb Update the sha256sum of the new MacVim build
Correct the update from #4576
2014-11-03 22:15:58 +09:00
Georges Dubus 5258211e32 focuswriter: added expression 2014-11-01 21:20:59 +01:00
ambrop7@gmail.com 2d38837355 KDevelop: Add some propagatedUserEnvPkgs dependencies.
Now KDevelop should start in a functional form without having to
manually install those.
2014-10-30 22:18:39 +01:00
Scott Christopher 36308f6bbc IDEA Editor: Adds PHPStorm support. 2014-10-30 22:25:28 +11:00
Pascal Wittmann 5b542ec902 org: update from 8.2.8 to 8.2.10 2014-10-28 12:47:09 +01:00
karsten gebbert 3071a57c34 Add hsc3 haskell package. 2014-10-26 16:22:29 +01:00
Georges Dubus af5c2d6579 Merge pull request #4650 from madjar/master
Atom: updated to 0.139.0
2014-10-26 13:21:46 +01:00
Mateusz Kowalczyk 19e665126b haskell-yi: update to 0.11.0 2014-10-26 03:45:25 +00:00
Pascal Wittmann f8d64212b3 bvi: update from 1.3.2 to 1.4.0 and adopt it 2014-10-26 02:37:33 +02:00
Moritz Ulrich 635d49e973 Emacs: remove --with-crt-dir (no longer supported) 2014-10-25 20:34:51 +02:00
Mateusz Kowalczyk 9eaee3fd54 haskell-yi-custom: use NIX_* vars for nicer wrap
According to @bennofs , this should now work regardless of what kind of
mess the user is in.
2014-10-24 14:36:08 +01:00
Mateusz Kowalczyk bd43ff7b6a haskell-yi-custom: improve wrapper
Apparently it is possible for the config to be compiled correctly but
for ‘hint’ still not know where the packages are: it seems to ignore the
GHC in PATH and does whatever.
2014-10-24 10:04:27 +01:00
Georges Dubus 03d6843b87 Atom: updated to 0.139.0 2014-10-24 11:04:06 +02:00
Markus Kohlhase 4bc0d5bc92 leafpad: added platform information to the meta section 2014-10-23 20:35:02 +02:00
Markus Kohlhase 137eb4c98a added leafpad editor 2014-10-23 17:54:56 +02:00
Peter Simons b31ac058cc magit: don't install lisp files into a "magit" sub-directory
After this change, Emacs can load the magit-*.el files without further
configuration. Just add

    (require 'magit-autoloads)

to ~/.emacs, and run M-x magit-status or any other magit command.
2014-10-22 13:06:43 +02:00
Peter Simons dba01b2e77 magit: update to the latest release from Melpa 2014-10-22 11:46:56 +02:00
Peter Simons 3b4a72c3d6 git-modes: add git-modes package version 0.15.0-8-g4e10851 for Emacs
These files are required by the latest version of Magit.
2014-10-22 11:46:56 +02:00
Mateusz Kowalczyk 917c1638bf emacs-magit: fix URL (hopefully) 2014-10-21 22:40:28 +01:00
Mateusz Kowalczyk 2026054746 emacs-magit: update to 1.2.1 2014-10-21 20:21:11 +01:00
John Wiegley 0fdd8b312e emacs24Macport: 23.4-mac-4.8 -> 24.4-mac-5.0 2014-10-21 13:40:53 -05:00