Commit Graph

1241 Commits

Author SHA1 Message Date
Edward Tjörnhammar
d975ba397c idea.android-studio: bump 0.8.10 -> 0.8.12 2014-10-12 10:27:10 +02:00
Edward Tjörnhammar
9eb5fef92f idea.idea-{community,ultimate}: bump 13.1.4b -> 13.1.5 2014-10-12 10:27:10 +02:00
Edward Tjörnhammar
a4d94a0042 idea.desktop: fixed that the item got malformed Comment input 2014-10-12 10:27:10 +02:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Michael Raskin
ff371b96df A sigil cleanup 2014-10-07 18:51:33 +04:00
Nick Sauce
bfa942c9bf sigil: new package 2014-10-07 18:51:33 +04:00
Aristid Breitkreuz
c892ba93b4 atom: update from 0.129.0 to 0.135.0 2014-10-06 21:54:59 +02:00
Pascal Wittmann
806d2aa68c org-mode: update from 8.2.7c to 8.2.8 2014-10-03 11:23:08 +02:00
Baptist BENOIST
c35a1b828f geany: Update from 1.23.1 to 1.24.1
Closes #4359
2014-10-02 06:39:03 +01:00
Mateusz Kowalczyk
ce4ae2aa1e Merge pull request #4305 from vbgl/coq-containers
Working with Coq
2014-09-30 15:04:30 +01:00
Mateusz Kowalczyk
f04b0b9879 emacs24Packages.tuaregMode: update from 2.0.6 to 2.0.8 2014-09-30 10:56:11 +01:00
Mateusz Kowalczyk
3043af8838 emacs24Packages.rainbowDelimiters: update from 1.3.8 to 1.3.12 2014-09-30 10:56:11 +01:00
Mateusz Kowalczyk
9d246d2cff emacs24Packages.structuredHaskellMode: update from 1.0.3 to 1.0.4 2014-09-30 10:56:11 +01:00
Mateusz Kowalczyk
c00b69969f flpsed: update from 0.7.1 to 0.7.2 2014-09-30 10:45:42 +01:00
Vincent Laporte
94828070ed ProofGeneral: makes the dependency on TeXLive optional
And fixes the default value of $PGHOME
2014-09-28 14:03:15 +01:00
Anonymous
e223bc046c android-studio: new package 2014-09-24 12:13:55 +02:00
Anonymous
a3b565f7a3 idea: hack to get fsnotifier working
more information: https://bugs.archlinux.org/task/34703
2014-09-24 12:13:54 +02:00
Eelco Dolstra
cd71f7a2e6 Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
Conflicts:
	pkgs/development/interpreters/ruby/ruby-19.nix
	pkgs/development/libraries/libc++/default.nix
	pkgs/development/libraries/libc++abi/default.nix
	pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
Edward Tjörnhammar
175a40133a ideas: refactored products into common subexpression.
Closes #4039
2014-09-21 15:20:21 +01:00
Mateusz Kowalczyk
cdce34d82a Merge pull request #4153 from ambrop72/kdevelop47
Update KDevelop to 4.7.0.
2014-09-20 22:52:16 +01:00
Jan Niklas Hasse
3b45556a3b atom: 0.99.0 -> 0.129.0
[Bjørn Forsman: include fixupPhase, to fix this startup error on NixOS:
 $ ./result/bin/atom
 ./result/bin/atom: /nix/store/q3r5ww6pg5yb4j6p0d8inrhbgzmik0b6-atom-0.129.0/bin/.atom-wrapped: /bin/bash: bad interpreter: No such file or directory
]
2014-09-20 14:02:08 +02:00
cillianderoiste
1b8d79e0b2 Merge pull request #4143 from geerds/cask
Add "cask" package
2014-09-19 13:23:28 +02:00
ambrop7@gmail.com
2bdc12eeed Update KDevelop to 4.7.0. 2014-09-18 22:23:23 +02:00
Jascha Geerds
771d1bd865 Add "cask" package 2014-09-18 00:46:45 +02:00
wyvie
490dc64347 Fixed file name with new version 2014-09-14 21:19:38 +02:00
wyvie
57f62dd2b4 Bumped version of sublime3 2014-09-14 21:13:54 +02:00
Pascal Wittmann
8d67b9a240 transformed meta.maintainers of some packages into lists 2014-09-13 13:52:02 +02:00
Luca Bruno
f5c43d9f62 vanubi: new package
Programming editor for GTK+ inspired by Emacs

http://vanubi.github.io/vanubi
2014-09-13 12:39:18 +02:00
Matej Cotman
bca3e21d81 remove nodewebkit patch code and upgrade zed to 0.13 2014-09-13 10:43:28 +02:00
Peter Simons
df4c114252 Merge pull request #4036 from lostdj/ltp/master/ijifix
IntelliJ IDEA: do not assume that we are using OpenJDK.
2014-09-12 10:16:55 +02:00
lostdj
f3e0f5e755 IntelliJ IDEA: do not assume that we are using OpenJDK. 2014-09-11 20:51:12 +04:00
Joel Taylor
3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Eelco Dolstra
585983bc95 Merge remote-tracking branch 'origin/staging'
Conflicts:
	pkgs/applications/version-management/subversion/default.nix
2014-09-08 11:42:09 +02:00
Vladimír Čunát
06fea81c6e Merge recent master into staging
Hydra: ?compare=1150594
2014-09-06 16:52:45 +02:00
Peter Simons
6f819ef4f4 emacs-ensime: depend on scala-mode2 and sbt-mode 2014-09-06 13:30:44 +02:00
Peter Simons
1e92a86240 emacs-rainbow-delimiters: add version 1.3.8 2014-09-06 13:30:44 +02:00
gounnoticed
de03197100 Add luna cpp build for eclipse
didnt have sha512 so used md5 instead.
2014-09-05 19:35:28 +01:00
Peter Simons
7f5bc10186 emacs-ensime: add current git snapshot 2014-09-05 16:06:16 +02:00
Peter Simons
e8bff6f838 emacs-s: add version 1.9.0 2014-09-05 16:06:16 +02:00
Peter Simons
a4ec7a6316 emacs-dash: add version 1.5.0 2014-09-05 16:06:16 +02:00
Peter Simons
309851f999 scala-mode2: update to latest version 2014-09-05 16:06:16 +02:00
Pascal Wittmann
d812281674 zile: update from 2.4.9 to 2.4.11, adpot it and set platforms to linux 2014-09-02 17:57:09 +02:00
Peter Simons
1c0d15b90e Merge branch 'origin/master' into staging.
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
Vladimír Čunát
acba6b4da2 ed: update to 1.10, working around *.lz problem 2014-08-30 23:00:58 +02:00
Eelco Dolstra
74b808a66f Revert "ed: update to 1.10 (close #3852)"
This reverts commit 60902b97fe. It
breaks building on Darwin:

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

It also adds a gratuitous dependency to the stdenv bootstrap.
2014-08-30 22:41:01 +02:00
Longrin Wischnewski
33cbd6687c wxhexeditor: adding version 0.22
wxhexeditor: add the package to all-packages.nix

wxhexeditor: fix shebang
2014-08-30 12:24:43 +01:00
Vladimír Čunát
e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
Mateusz Kowalczyk
60902b97fe ed: update to 1.10 (close #3852) 2014-08-29 13:58:51 +02:00
Mathijs Kwik
0e1ed7bbc9 fix js2-mode revision 2014-08-25 13:56:53 +02:00
Mathijs Kwik
fb2449c026 add emacs color-theme solarized 2014-08-25 13:56:53 +02:00
Mathijs Kwik
3be7d4b478 idris-mode: upgrade to 0.9.14 2014-08-25 13:56:52 +02:00
Edward Tjörnhammar
8bd3c67552 IDEA: 13.1.3 -> 13.1.4
Changed, attribute name separator changed to dashes and decription.
Added longDescription.
2014-08-25 11:03:35 +02:00
Bjørn Forsman
c9baba9212 Fix many package descriptions
(My OCD kicked in today...)

Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.

I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.

I've tried to stay away from generated expressions (and I think I
succeeded).

Some specifics worth mentioning:
 * cron, has "Vixie Cron" in its description. The "Vixie" part is not
   mentioned anywhere else. I kept it in a parenthesis at the end of the
   description.

 * ctags description started with "Exuberant Ctags ...", and the
   "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
   at the end of description.

 * nix has the description "The Nix Deployment System". Since that
   doesn't really say much what it is/does (especially after removing
   the package name!), I changed that to "Powerful package manager that
   makes package management reliable and reproducible" (borrowed from
   nixos.org).

 * Tons of "GNU Foo, Foo is a [the important bits]" descriptions
   is changed to just [the important bits]. If the package name doesn't
   contain GNU I don't think it's needed to say it in the description
   either.
2014-08-24 22:31:37 +02:00
Cray Elliott
5ec6492ea0 Mark yi and yi-contrib as broken
They no longer build with lens v4.4.0.1 and up
2014-08-24 20:28:12 +02:00
Eelco Dolstra
ce6b86cc68 Fix various evaluation problems
http://hydra.nixos.org/build/13616685
2014-08-22 11:57:40 +02:00
Moritz Ulrich
10ba4b67e4 Emacs: Use gnutls instead of OpenSSL.
It looks like this error was introduced accidentally with 0132e1b. Emacs
can't use openssl to make secure connections.
2014-08-21 12:45:28 +02:00
Vladimír Čunát
56d9b2cc8a merge #3428: nano: bump and add system-wide config 2014-08-14 23:51:29 +02:00
Jascha Geerds
bebdea6ac9 pycharm: add icon in desktop file 2014-08-12 21:21:57 +02:00
Mateusz Kowalczyk
83f532fdfd haskell-yi: update to 0.8.2
Allows it to work with glib/gtk/pango 0.13.x
2014-08-11 13:56:12 +02:00
John Wiegley
326ca0f690 Many minor fixes to get things building after recent compiler changes 2014-08-10 23:18:57 -05:00
Eelco Dolstra
0132e1bb48 emacs: On Darwin, don't depend on gconf and cairo 2014-08-09 19:08:37 +02:00
Eelco Dolstra
a7c1541a21 emacs: Fix building on Darwin with recent versions of GCC
This gets rid of the "unexec: unrecognized section __static_data in
__DATA segment" error while dumping Emacs.
2014-08-09 19:08:37 +02:00
Vladimír Čunát
52d9c93abe Merge 'staging' into master 2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618 Mark a bunch of packages as broken or not supported on Darwin 2014-08-08 17:59:02 +02:00
Peter Simons
9226fbf56a Merge remote-tracking branch 'origin/master' into staging. 2014-08-08 09:51:01 +02:00
Aycan iRiCAN
c35224efb6 Merge remote-tracking branch 'upstream/master' 2014-08-06 10:21:57 +03:00
Bjørn Forsman
310400e0f5 intellij-idea: don't access 'shortName' license attribute
I don't think packages should poke into the license attributes.
2014-08-05 07:22:06 +02:00
Jascha Geerds
eaad8d6923 Packaging PyCharm IDE 2014-08-05 07:15:43 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Aycan iRiCAN
307a08c9a3 removed rev 2014-08-03 21:21:52 +03:00
Aycan iRiCAN
02dcf1e493 Upgrade js2-mod to 20140114 2014-08-03 21:20:26 +03:00
Joachim Fasting
2fc0537018 nano: bump to version 2.3.6 2014-08-01 18:19:03 +02:00
Joachim Fasting
decb4266f1 nano: support system-wide nanorc
This patch does two things
1. builds nano with sysconfdir=/etc; and
2. adds an option programs.nano.nanorc
2014-08-01 18:19:03 +02:00
Matej Cotman
b1ba1689bd zed: build from source, ditch the installer, upgrade node-webkit 2014-07-30 12:43:24 +02:00
Pascal Wittmann
cf744cb715 org: update from 8.2.7b to 8.2.7c 2014-07-30 12:14:15 +02:00
Peter Simons
d0ca8c237e Fix broken license references. 2014-07-28 11:43:20 +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
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
Peter Simons
1fc21bd6a9 emacs-scala-mode: package version 2 2014-06-05 14:34:31 +02:00
Austin Seipp
a470fcff8c Merge pull request #2807 from cstrahan/vim-update
update vim to v7.4.316
2014-06-03 20:34:18 -05:00
Austin Seipp
c7f93873db Merge pull request #2805 from edwtjo/idea-13.1.3
IDEA 13.1.2 -> 13.1.3
2014-06-03 20:31:20 -05:00
Charles Strahan
0ec25c6f94 update vim to v7.4.316 2014-06-01 21:09:55 -04:00
Edward Tjörnhammar
05dbaa9a17 IDEA 13.1.2 -> 13.1.3 2014-06-01 18:29:27 +02:00
John Wiegley
32c3bcaa80 emacs24Macport: new expression
This is "Mac port" addition to GNU Emacs 24. This provides a native GUI
support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later already
contain the official GUI support via the NS (Cocoa) port for Mac OS X
10.4 and later. So if it is good enough for you, then you don't need to
try this.
2014-05-31 20:39:48 +00:00
Peter Simons
1fddf8d0aa Merge pull request #2733 from pSub/org-update
Update org-mode to latest stable version
2014-05-23 20:17:08 +02:00
Pascal Wittmann
8806abe97e Update org-mode to latest stable version 2014-05-23 20:06:02 +02:00
Peter Simons
e2d1b8c60b leksah: remove broken package 2014-05-17 12:56:52 +02:00
Vladimír Čunát
93e65a4d53 codeblocks: fix eval on non-linux, minor refactoring 2014-05-13 20:07:13 +02:00
Linquize
977248ba15 codeblocks: new package 13.12 (close #2533)
@vcunat: minor refactoring.
2014-05-13 12:59:19 +02:00
Bjørn Forsman
d2587a014f eclipse: add Eclipse IDE for C/C++ Developers 4.3.2 2014-05-05 22:39:37 +02:00
Edward Tjörnhammar
ec2d52fca8 idea 13.1.1 -> 13.1.2 2014-05-05 21:30:25 +02:00
Peter Simons
0293dc9fbd Merge pull request #2357 from Chaddai/texstudio
Texstudio : advanced editor for LaTeX
2014-05-01 13:06:06 +02:00
Thomas Tuegel
7896a84849 qvim: add lua support 2014-04-29 22:19:58 +02:00
Chaddaï Fouché
600bd22f27 Adding myself as maintainer of texstudio 2014-04-29 16:49:21 +02:00
Chaddaï Fouché
ce82a2d6d9 Cleaning up the description and fixing qt to qt4 2014-04-29 16:49:20 +02:00
Chaddaï Fouché
ed3a809a3d Add the necessary preConfigure so that TeXstudio compile (find poppler-qt4.h) 2014-04-29 16:48:22 +02:00
Chaddaï Fouché
89595fbcea Creation of a new package for texstudio, an editor for LaTeX documents 2014-04-29 16:48:22 +02:00
Peter Simons
3445df42a4 Merge pull request #2368 from Chaddai/texmaker
TeXmaker
2014-04-28 22:42:47 +02:00
Austin Seipp
0f1f2115e9 hol_light: fix script, upgrade to r189
This also tweaks the version number to just use the SVN revision (rather
than date), since it's unambiguous and increasing anyway.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-27 13:31:36 -05:00
Austin Seipp
9ef104cbad cryptol-mode: 0.1.0
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-26 12:51:08 -05:00
Chaddaï Fouché
31b58dccfe Added TeXmaker package : an advanced editor for latex 2014-04-24 10:59:29 +02:00
Austin Seipp
6376ac57d8 emacsPackages: add cryptol-mode
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-04-14 18:23:51 -05:00
Benno Fünfstück
2fd160f027 haskell: update yi to 0.8.1 2014-04-12 20:33:15 +02:00
Peter Simons
79f19f687c flymake-cursor: the sha256 hash of the file has changed
No change was documented on the emacs wiki. Not sure what happened. :-(
2014-04-08 12:48:22 +02:00
Peter Simons
1b1225fb0b flymake-cursor: remove redundant 'meta.platforms = stdenv.lib.platforms.all' setting 2014-04-08 12:48:22 +02:00
Mathijs Kwik
593c633aa8 emacs-idris-mode: upgrade to support idris 0.9.12 2014-04-08 08:38:43 +02:00
Peter Simons
69b53c990a structured-haskell-mode: re-generate with latest cabal2nix 2014-03-31 23:10:56 +02:00
Edward Tjörnhammar
8af6b20856 idea: update 13.0.2 -> 13.1.1
And use buildnumbers only in the buildscript and use more familiar
version numbers in the package name.

[bjorn.forsman@gmail.com: modify commit message]
2014-03-26 21:21:12 +01:00
Peter Simons
cc8c69890b haskell-yi: update to version 0.7.2 2014-03-22 09:04:46 +01:00
Peter Simons
441dca211e haskell-yi-contrib: update to version 0.7.2 2014-03-22 09:04:46 +01:00
Shea Levy
506924c6c2 Merge branch 'kdevelop46' of git://github.com/ambrop72/nixpkgs
kdevelop: Update to 4.6.
2014-03-19 18:11:35 -04:00
Shea Levy
a1fff61e4d Merge branch 'u/vimrc' of git://github.com/wizeman/nixpkgs
vimHugeX: also add wrapper for system-wide vimrc
2014-03-19 18:07:04 -04:00
Shea Levy
5a38bfdb9c Merge branch 'darcsum' of git://github.com/falsifian/nixpkgs
Added darcsum, "a pcl-cvs like interface for managing darcs patches".
2014-03-14 19:42:27 -04:00
ambrop7@gmail.com
927971d8e3 kdevelop: Update to 4.6. 2014-03-11 18:36:16 +01:00
Ricardo M. Correia
05a2b88df7 vimHugeX: also add wrapper for system-wide vimrc 2014-03-10 23:40:59 +01:00
Domen Kožar
152f87cc47 Merge pull request #959 from wizeman/vimrc
vim: add config option to generate global vimrc
2014-03-07 12:56:15 +01:00
Pascal Wittmann
af3cf0dbeb Add structured-haskell-mode 2014-03-03 11:55:26 +01:00
Mathijs Kwik
d2dd22651d idris-mode: upgrade to current version 2014-03-02 08:41:45 +01:00
Peter Simons
861061cf65 haskell-yi: update to version 0.7.1 2014-02-28 13:01:00 +01:00
Peter Simons
fbd5795852 haskell-yi-contrib: update to version 0.7.1 2014-02-28 13:01:00 +01:00
Ricardo M. Correia
2537b7c679 vim: add config option to generate vimrc 2014-02-20 14:08:42 +01:00
Peter Simons
c3dc693586 writegood-mode: update to version 1.3
https://github.com/bnbeckwith/writegood-mode/issues/7
2014-02-13 22:29:34 +01:00
Domen Kožar
5c9dc83bb9 vim ft: address the problem with broken highlighting in big files
It seems Vim needs to be instructed how to scan for the begining
of the multiline statements to correctly and efficiently highlight
lanuages.

See :help syn-sync-maxlines
2014-02-12 14:41:27 +01:00
cillianderoiste
19757df9dc Merge pull request #1673 from pSub/writegood-mode
Add emacs minor mode writegood
2014-02-12 01:52:01 +01:00
cillianderoiste
c75ce202e6 Merge pull request #1570 from rszibele/scite
Added SciTE 3.3.7.
2014-02-12 01:39:40 +01:00
Sander van der Burg
5b243ad015 netbeans: Bump to version 7.4 2014-02-07 13:20:52 +01:00
Domen Kožar
4f3d4c55ff vim-ft: match attributes with dash and set nix as ft 2014-02-07 11:06:41 +01:00
Rob Vermaas
6fe07cb304 Fix IDEA, previously it could not find the jdk. 2014-02-05 15:49:45 +01:00
Pascal Wittmann
e8b0001268 idris-mode: fixed link to homepage (merge #1671) 2014-02-04 18:56:24 +01:00
Pascal Wittmann
351e070366 Add emacs minor mode writegood 2014-02-04 16:01:35 +01:00
Edward Tjörnhammar
cf99e5f939 IntelliJ IDEA version bump (13.0.1->13.0.2) 2014-02-01 17:52:21 +01:00
Petr Rockai
6f5be260b4 Adopt packages. 2014-01-28 17:31:17 +01:00
Wojciech Danilo
c50314dc38 Added SublimeText3 support. SublimeText2 and SublimeText3 can be installed side by side.
They provide 'sublime', 'sublime2' and 'sublime3' commands. SublimeText3 has lower precedense than SublimeText2
because its in beta mode (for over a year now)
2014-01-27 20:50:08 +01:00
Petr Rockai
e3fae16a29 emacs: Allow non-GTK X11 builds (--with-x-toolkit=lucid). 2014-01-25 16:30:14 +01:00
rszibele
1d50967424 Added SciTE 3.3.7. 2014-01-23 10:35:02 +01:00
Peter Simons
c1209b5144 emacs-bbdb: update to version 2.36 2014-01-21 20:18:27 +01:00
Shea Levy
fea2266290 llvm: Split llvmFull into separate derivations
Now most packages in the llvm suite are built as separate derivations.
The exceptions are:

* compiler-rt must currently be built with llvm. This increases llvm's
  size by 6 MB
* clang-tools-extra must be built with clang

In addition, the top-level llvm attribute is defaulted to llvm 3.4, and
llvm 3.3 must be accessed by the llvm_33 attribute. This is to make the
out-of-date packages obvious in the hope that eventually all will be
updated to work with 3.4 and 3.3 can be removed. I think we should keep
this policy in the future (latest llvm gets top-level name, the rest are
versioned until they can be removed).

The llvm packages (except libc++, which exception I will try to remove
on the next update) can all be accessed via the llvmPackages attribute,
and there are also aliases for the packages that already existed (llvm,
clang, and dragonegg).

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-20 20:33:06 -05:00
Vladimír Čunát
ac6761c908 Merge master into stdenv-updates
Conflicts:
	pkgs/applications/version-management/gource/default.nix
	pkgs/top-level/all-packages.nix
2014-01-20 19:39:28 +01:00
Shea Levy
55e6303d6a Add full llvm build, update libc++ and dragonegg
Some packages in the llvm suite (e.g. compiler-rt) cannot be built
separate from the build of llvm, and while some others (e.g. clang) can
the combined build is much better tested (we've had to work around
annoying issues before). So this puts llvm, clang, clang-tools-extra,
compiler-rt, lld, lldb, and polly all into one big build (llvmFull).
This build includes a static llvm, as dynamic is similarly less tested
and has known failures.

This also updates libc++ and dragonegg. libc++ now builds against
libc++abi as a separate package rather than building it during the
libc++ build.

The clang purity patch is gone. Instead, we simply set --sysroot to
/var/empty for pure builds, as all impure paths are either looked up in
the gcc prefix (which we hard-code at compile time) or in the sysroot.
This also means that if NIX_ENFORCE_PURITY is 0 then clang will look in
the normal Linux paths by default, which is the proper behavior IMO.

polly required an updated isl. When stdenv-updates is merged, perhaps we
can update the isl used by gcc and avoid having two versions.

Since llvm on its own is now separate from the llvm used by clang, I've
removed myself as maintainer from llvm and will leave maintenance of
that to those who are interested in llvm separate from clang.

Signed-off-by: Shea Levy <shea@shealevy.com>
2014-01-20 05:42:38 -05:00
James Cook
638e1586cf Added darcsum, "a pcl-cvs like interface for managing darcs patches". 2014-01-18 12:25:34 -08:00
Vladimír Čunát
0a58b512cb Merge master into stdenv-updates
Conflicts (simple):
	pkgs/development/compilers/gcc/4.8/default.nix
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/gmp/5.1.1.nix
	pkgs/development/libraries/gmp/5.1.3.nix
	pkgs/development/libraries/gmp/5.1.x.nix
	pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
Eelco Dolstra
e9f1c3abeb eclipse: Remove patchelf from the buildInputs 2014-01-14 13:51:17 +01:00
Nixpkgs Monitor
16cd5aba6a emacs24Packages.haskellMode: update from 13.07 to 13.10 2014-01-13 17:05:45 +01:00
Eelco Dolstra
6fb27abf33 Merge branch 'java' 2014-01-13 13:16:17 +01:00
Vladimír Čunát
a2c316288c Merge master into stdenv-updates
Conflicts:
	pkgs/development/lisp-modules/stumpwm/default.nix (auto-solved)
	pkgs/top-level/all-packages.nix (trivial)
2014-01-12 12:29:24 +01:00
Peter Simons
2f51f6908e yi: re-generate expression with cabal2nix 2014-01-11 12:03:41 +01:00
Eelco Dolstra
16e626a80d Replace lib/java -> share/java 2014-01-09 13:01:38 +01:00
Benno Fünfstück
eddb74a5cf New expressions: yi, yi contrib and dependencies 2014-01-08 19:11:33 +01:00
Mathijs Kwik
8fad5a72ec add emacs/idris-mode 2014-01-07 07:16:47 +01:00
Vladimír Čunát
9443129b08 Merge master into stdenv-updates
Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)
2014-01-04 18:34:53 +01:00
Eelco Dolstra
d150d49128 jedit: Fix build 2014-01-03 14:31:57 +01:00
Domen Kožar
3710322678 Merge pull request #1442 from ttuegel/vim
vim: enable support for Lua
2014-01-01 14:28:45 -08:00
Domen Kožar
28acbbef3a vim: ft-nix-support: update keywords, add builtins 2014-01-01 21:22:02 +01:00
Thomas Tuegel
dd0f48ed98 vim: enable support for Lua 2014-01-01 09:30:57 -06:00
Michael Raskin
e9ec56a596 Update vim_configurable to the same source tag as default vim 2013-12-29 19:38:43 +04:00
William A. Kennington III
a2ff906257 vim: Update from 7.4.23 -> 7.4.131
Instead of applying all of the patches, this build pulls an archive from
the source code repo with all of the patches already applied. This is the
preferred way from http://www.vim.org/sources.php
2013-12-29 07:51:58 -06:00
Vladimír Čunát
e740b565cf Merge master into stdenv-updates
Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix
2013-12-29 10:01:22 +01:00
Edward Tjörnhammar
01c39bdefc Adding IntelliJ IDEA13 Community and Ultimate 2013-12-26 00:12:19 +01:00
Vladimír Čunát
2b24f1349a Merge master into x-updates 2013-12-21 10:20:55 +01:00
Peter Simons
778a55d352 ess-mode: enable Hydra builds on Linux 2013-12-21 00:05:29 +01:00
Vladimír Čunát
4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Peter Simons
45e8de9a7d Merge branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/tools/misc/less/default.nix
2013-12-16 21:13:24 +01:00
Nixpkgs Monitor
873c95ba8d hexedit: update from 1.2.12 to 1.2.13 2013-12-15 13:00:22 +02:00
Nixpkgs Monitor
71d1e429a7 nano: update from 2.2.6 to 2.3.2 2013-12-14 17:59:57 +02:00
Nixpkgs Monitor
c8f28ec7e3 geany: update from 1.23 to 1.23.1 2013-12-12 03:11:34 +02:00
Nixpkgs Monitor
b95f7102ee flpsed: update from 0.7.0 to 0.7.1 2013-12-12 03:11:33 +02:00
Vladimír Čunát
c11747b3f5 merge #1197: gnuplot darwin changes 2013-12-10 12:46:45 +01:00
Peter Simons
c32bf83301 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/interpreters/perl/5.16/default.nix
	pkgs/tools/networking/curl/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-python.nix
	pkgs/top-level/release-small.nix
	pkgs/top-level/release.nix
2013-12-04 18:33:52 +01:00
Peter Simons
1a996759a5 ess-mode: update to version 13.09 2013-12-03 12:44:52 +01:00
Rok Garbas
f685b08d0d emacs offlineimap mode added 2013-11-12 11:00:58 +01:00
Eric Kow
9a97b842c5 Emacs darwin: avoid X unless explictly requested
This keeps the dependencies lighter. Perhaps future work on this
derivation could enable the Cocoa interface by default on Mac.
2013-11-10 13:41:10 +00:00
Sergey Mironov
2b1b4f3d3a qvim: chage platforms from 'unix' to 'linux'
I have no Darwin machine available so lets test qvim on Linux for now
2013-11-08 12:24:51 +04:00
Sergey Mironov
c8bb648f0f qvim: clean up the code 2013-11-06 11:27:06 +04:00
Sergey Mironov
d6d2de4147 Add qvim - an experimental Qt gui for Vim
vim-qt has the most complete set of Ctrl-Alt-Meta binding functionality.
For example, qvim is able to correctly bind keys like Alt-<nonlatin>.
More: https://bitbucket.org/equalsraf/vim-qt/wiki/Features
2013-11-04 23:02:54 +04:00
Peter Simons
91f2c362de Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/top-level/all-packages.nix
2013-10-26 18:28:05 +02:00
Benno Fünfstück
351c9e310d Emacs: Fix TRAMP by adjusting its path so that it finds ls and other binaries on NixOS systems
Close #1094.
2013-10-22 09:56:43 +03:00
Peter Simons
6be8ad3392 Merge branch 'origin/master' into stdenv-updates.
There was a minor conflict in 'stumpwm'. The package needs texinfo
version 4.x. At least is used to, I'm not sure whether it still does.
2013-10-18 18:57:24 +02:00
Karn Kallio
c51e6c75a6 eclipse: add Eclipse Classic version 4.3.1 (codename Kepler). 2013-10-11 22:25:58 +02:00
Eelco Dolstra
2147a07938 Fix a bunch of Hydra evaluation errors 2013-10-07 17:36:47 +02:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Mathijs Kwik
4d32a074a2 org-mode: install to proper dir 2013-10-04 09:07:45 +02:00
Peter Simons
ac5d5297dd Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-10-02 22:44:12 +02:00
Pascal Wittmann
296da4bfae Updating org-mode to 8.2.1 2013-10-01 15:52:31 +02:00
Song Wenwu
6ab7c495d5 add aseprite 0.9.5 2013-09-28 22:57:14 +08:00
Peter Simons
9407832de4 Merge remote-tracking branch 'origin/master' into stdenv-updates.
Conflicts:
	pkgs/development/libraries/gettext/default.nix
2013-09-23 10:59:44 +02:00
Vladimír Čunát
009780587f vim: add the missing patches
Somehow curl from github piped into git am didn't add them.
Sorry, I didn't notice. Thanks @shlevy.
2013-09-19 00:03:35 +02:00
Jason \"Don\" O'Conal
2eb384b982 vim_configurable: add patches to 7.4.23 (close #912) 2013-09-18 21:59:49 +02:00
Vladimír Čunát
d3c6bd45ca emacs24: fix license typo, change indentation
Note that the double-quote "indented strings" strip indentation,
so this ugly style was pointless.
2013-09-14 15:30:27 +02:00
Jason \"Don\" O'Conal
ad454f3511 emacs24: fix build on darwin (clos #932) 2013-09-14 15:19:54 +02:00
Peter Simons
3d2caf1180 Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-09-08 22:54:35 +02:00
Rob Vermaas
691d143b29 Update sublime text to 2.0.2 2013-09-02 20:26:25 +02:00
Danie Roux
fcd9904be6 emacs24: Let -nox be a whole lot less X than it was
--with-x-toolkit=no still wants to -lX11 when checking for ncurses
2013-09-01 16:30:32 +02:00
Eelco Dolstra
8adb1d003e ed: Update to 1.9 2013-08-26 14:52:22 +02:00
Moritz Ulrich
a10812f792 Add emacs24-nox: emacs built without X (or GTK) libraries.
This commit also fixes an issue where pkgconfig was only added as a
dependency when gtk support was enabled. This made ./configure unable
to find other libraries (libtiff, libxml2, gnutls, and others).
2013-08-24 07:36:11 +03:00
Eelco Dolstra
7ac6b10446 emacs: Support building without GTK+ 2013-08-21 11:47:57 +02:00
Domen Kožar
7837b994bf fix eval 2013-08-21 01:23:40 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Song Wenwu
40cfa15513 add tiled-qt 0.9.1 2013-08-14 09:23:15 +08:00
Lluís Batlle i Rossell
2a444fbdee Marc Weber suggests to drop 'latest' in vim_configurable. 2013-08-13 17:52:07 +02:00
Lluís Batlle i Rossell
09e831e292 Updating vim and vim_configurable to 7.4.
I change vim_configurable from 'latest' to 'default', as 'default' now is more
recent than latest.
2013-08-13 17:47:27 +02:00
Justin Bedo
9ab74cd977 Add expression for flpsed 2013-08-13 08:20:08 +02:00
Joachim Schiele
6b1116cfce Merge branch 'dhex' 2013-07-31 15:21:54 +00:00
Joachim Schiele
afbc5cd5e9 added dhex, a nice ncurses based hex editor for the shell 2013-07-31 15:20:23 +00:00
Zef Hemel
b92b8dce05 MicroGNUEmacs, a.k.a. MG 2013-07-30 20:24:28 +02:00
Mathijs Kwik
9230619ee7 haskell-mode: upgrade to 13.07 2013-07-21 09:08:16 +02:00
Domen Kožar
ac1803f424 Merge pull request #747 from lovek323/vim-plugins-command-t
vim-plugins: add expression command-t
2013-07-14 23:04:33 -07:00
Evgeny Egorochkin
da4be371e9 make package use mirror:// for gnu, savannah and gnome repositories where possible 2013-07-14 05:23:06 +03:00
Jason "Don" O'Conal
1d7d0addcc vim-plugins: add expression command-t
* also fix build of vim on darwin
2013-07-14 11:24:45 +10:00
Evgeny Egorochkin
b084b29d26 Even more mirror:// fixes 2013-07-14 04:17:07 +03:00
Evgeny Egorochkin
5ae43d2494 Change more packages from direct downloads to mirror://sourceforge 2013-07-14 02:48:32 +03:00
Evgeny Egorochkin
aa85b80459 Change package urls to use mirror://sourceforge 2013-07-14 02:35:26 +03:00
Vladimír Čunát
355092dcdc kile: minor update 2013-07-05 14:45:58 +02:00
Jason "Don" O'Conal
72a771b6e4 emacs24: fix build on darwin 2013-07-03 19:57:38 +10:00
Eelco Dolstra
acba9240cd nixos.org/tarballs -> tarballs.nixos.org
It's currently the same machine, but tarballs.nixos.org should become
an S3/CloudFront site eventually.
2013-06-25 14:12:16 +02:00
Domen Kožar
5a0902456e Merge pull request #648 from lovek323/vim
vim_configurable: fix python on darwin
2013-06-20 23:19:51 -07:00
Evgeny Egorochkin
e77a7d21dc Fix attr name to match version 2013-06-19 05:15:05 +03:00
Jason "Don" O'Conal
719b488b10 vim_configurable: fix python on darwin
* was not linking to the correct python library on darwin (using the OS
  X framework, which is not what we want)
2013-06-19 12:06:55 +10:00
Vladimír Čunát
f0417726d1 Merge pull request #533 from MarcWeber/submit/eclipses
eclipse: add latest stable eclipse (sdk), fix 3.7 urls, introducing more...
2013-06-18 14:20:10 -07:00
Vladimír Čunát
c72ed04892 Merge 'master' and 'stdenv-fixes' into x-updates
Final stabilization phase before merging into master.

Conflicts (glibc-2.13):
	pkgs/top-level/all-packages.nix
2013-06-16 10:13:51 +02:00
Domen Kožar
0d15be335c Merge pull request #629 from lovek323/vim_configurable
vim_configurable: improvements
2013-06-15 10:36:51 -07:00
Peter Simons
38d22b4851 ess: add Emacs Speaks Statistics mode 2013-06-15 17:13:37 +02:00
Jason "Don" O'Conal
b7b98f04a2 vim_configurable: improvements
* add ruby interpreter (may have been accidentally removed, or may never
  have existed)
* allow selection of GUI options by setting `config.vim.gui`
2013-06-15 20:48:20 +10:00
Michael Raskin
19530856ed Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/misc/ghostscript/default.nix
	pkgs/top-level/all-packages.nix
2013-06-13 17:12:43 +04:00
Jason "Don" O'Conal
6baad4d4d6 vim_configurable: fix compilation on darwin
* compile with gccApple
* enable darwinSupport by default
* do not use patchelf
2013-06-13 22:20:54 +10:00
Michael Raskin
1a45886454 Merge branch 'master' into x-updates 2013-06-11 15:46:10 +04:00
Michael Raskin
46cd2d0d68 Merge pull request #568 from MarcWeber/submit/vim-multiple-version-and-plugins
vim: supporting multiple sources & complicated plugins
2013-06-10 23:06:56 -07:00
Michael Raskin
8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts:
	pkgs/misc/emulators/wine/default.nix
2013-06-10 10:04:46 +04:00
Christophe Raffalli
a69cd62f71 Added tuareg emacs mode and fixed some other emacs mode.
ecb emacs mode is commented out because it's dependency appears not to compile.
2013-06-08 12:42:46 +02:00
Vladimír Čunát
7af694700c Merge branch 'master' into x-updates
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
Peter Simons
823765e305 haskell-mode: update to current version from git 2013-06-03 10:51:27 +02:00
Vladimír Čunát
b770365574 ReRevert Merge x-updates into master
This reverts commit ec3965d8d0.

Conflicts (taken x-updates):
	pkgs/development/libraries/libgcrypt/default.nix
	pkgs/development/libraries/libgpg-error/default.nix
	pkgs/development/libraries/poppler/default.nix
2013-05-29 23:25:02 +02:00
Marc Weber
71628d6e35 vim: supporting multiple sources:
- vim-nox: client-server implementation without X
- latest:  latest mercurial sources (still very stable)
- default: latest release

vim-plugins: Introduce an area to put vim plugins which are worth adding to nix
because they need more effort than just "unpacking". Document that
2013-05-27 22:26:29 +02:00
Marc Weber
93063dcf03 eclipse: add latest stable eclipse (sdk), fix 3.7 urls, introducing more declarative style (use getAttr in favour of if) 2013-05-16 09:59:26 +02:00
Peter Simons
3b2254a3af Remove myself from the meta.maintainer field of most Haskell packages.
There is no point in receiving hundreds of e-mails; I cannot read them anyway.
2013-05-11 00:36:59 +02:00
Evgeny Egorochkin
f2f439a44b Eclipse: replace disappeared mirrors 2013-05-10 23:38:59 +03:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Vladimír Čunát
bde20f3e88 Merge branch 'master' into x-updates
Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix
2013-04-24 06:29:09 +00:00
Marco Maggesi
d9aa18843b ProofGeneral: Workaround for bug #458
"ProofGeneral 4.2 byte-compilation fails with Emacs 24.2.90"
http://proofgeneral.inf.ed.ac.uk/trac/ticket/458
2013-04-23 14:09:10 +02:00
Mathijs Kwik
40502b492d magit: fix download url 2013-04-22 21:44:04 +02:00
Vladimír Čunát
3da96b38cd Merge pull request #465 from bjornfor/eclipse
eclipse: add Eclipse IDE for C/C++ Developers 4.2
2013-04-20 01:38:39 -07:00
Bjørn Forsman
07a71f7a1a eclipse: add Eclipse IDE for C/C++ Developers 4.2
If you upgrade from 3.7 you might get errors like these:

In the Package Explorer:
 Could not create the view: org.eclipse.jdt.ui

And some other stuff in the Error Log; "Unable to resolve plug-in [...]"

The solution is to delete your eclipse workspace (or just the hidden
setting files in there, if you have important user data).
2013-04-15 21:26:59 +02:00
Vladimír Čunát
17ae1617dc Merge branch 'master' into x-updates
Conflicts (systemd version is split on x-updates):
	pkgs/os-specific/linux/systemd/default.nix
2013-04-13 12:21:31 +02:00
Peter Simons
84ff838780 emacs-prolog-mode: update to version 1.25 2013-04-12 21:33:37 +02:00
Vladimír Čunát
8249695b61 Merge branch 'master' into x-updates
Needed that to fix the tarball.
2013-04-11 23:31:33 +02:00
Vladimír Čunát
7c86a69b2a geany: fix build via a minor update 2013-04-11 19:28:21 +02:00
Peter Simons
f8faea23f8 emacs-cedet: update to version 1.1 to fix the build 2013-04-06 01:24:46 +02:00
Peter Simons
58211c125a Merge pull request #407 from maggesi/proofgeneral_updates
Update ProofGeneral to version 4.2
2013-03-25 03:33:21 -07:00
Marco Maggesi
7b35dcdc62 ProofGeneral: remove dead code (compatibility with emacs 23). 2013-03-24 23:43:18 +01:00
Peter Simons
6fc2cccfe6 Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix. 2013-03-23 15:58:14 +01:00
Mathijs Kwik
208a35558e emacs-w3m: upgrade to current cvs 2013-03-22 00:00:06 +01:00
Mathijs Kwik
b73b3c9d62 htmlize: upgrade to 1.47 2013-03-22 00:00:06 +01:00
Marco Maggesi
cd3caeaf8f Update ProofGeneral to version 4.2 2013-03-19 14:49:45 +01:00
Peter Simons
5186e75c4f emacs: update to version 24.3
The builder.sh script used to call "make bootstrap" before running the build.
This build step, however, removes all kinds of generated files normally
included in the distributions -- such as the 'configure' script. If that target
is run, then new version of Emacs require Autoconf and Automake to compile.
Since the benefit of running "make bootstrap" is unclean to me, I chose to
remove that build step instead. As far as I can tell, the Emacs binary that
results from this build works fine.
2013-03-11 19:18:31 +01:00
Peter Simons
7165babaf1 Re-generate all Haskell packages with the latest version of cabal2nix.
This change brings support for building and running the regressions test suites.
2013-02-24 22:09:07 +01:00
Shea Levy
aacca1902c Merge branch 'upstream-master' into stdenv-updates 2013-02-19 10:09:39 -05:00
Song Wenwu
679150157b emacs: add "auto-complete-clang-async" mode (aka emacs-clang-complete-async) 2013-02-18 21:06:29 +08:00
Vladimír Čunát
19721fe792 vim: fix a typo from commit ab3eea 2013-02-05 17:51:30 +01:00
Eelco Dolstra
eeb116a2eb emacs-22: Remove 2013-01-29 11:39:38 +01:00
Eelco Dolstra
5bb548d2e4 Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-01-17 14:19:14 +01:00
Eelco Dolstra
7fd42a8380 Get rid of the "sf" alias for "sourceforge" 2013-01-14 12:00:32 +01:00
Mathijs Kwik
1f0a6fbf52 htmlize: upgrade to 1.43 2013-01-13 14:30:54 +01:00
Mathijs Kwik
4bd5a8e26d flymake-cursor: upgrade to 0.1.5 2013-01-13 14:30:54 +01:00
Mathijs Kwik
0890c45498 buildNativeInputs -> nativeBuildInputs 2013-01-13 11:33:45 +01:00
Peter Simons
b33ad366a1 Merge branch 'master' into stdenv-updates. 2013-01-11 15:46:10 +01:00
Ludovic Courtès
563416500e zile: remove `help2man' from the cross-build inputs 2013-01-07 17:37:51 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
85996ac018 ed: Update to 1.7 2012-12-12 17:17:05 +01:00
Eelco Dolstra
f364619e22 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-12 17:01:20 +01:00
aszlig
6acc5289fc
vbindiff: New package, version 3.0_beta4.
Visual binary differences viewer, very useful for reverse-engineering
proprieritary file formats.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-12-12 12:36:18 +01:00
Eelco Dolstra
5e256ccc88 Merge remote-tracking branch 'origin/master' into stdenv-updates 2012-12-04 17:12:35 +01:00
Ludovic Courtès
2809f9bbce ed: disable tests on Darwin 2012-12-03 15:26:20 +01:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Ludovic Courtès
310567b91f zile: update to 2.4.9 2012-11-29 10:07:21 +01:00
Baptist BENOIST
82bdf7c8d9 opera|dia|geany: remove the obsolete share/icons/hicolor/icon-theme.cache file
This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
It have no reasons to exist in a redistribuable package
2012-11-28 00:21:34 +01:00
Eelco Dolstra
148f8d2c21 nano: Update to 2.2.6
Also enable all features that were disabled (mouse support!).  This
adds a whopping 48 KB to the binary.
2012-11-23 16:41:42 +01:00
Eelco Dolstra
880ce8da2e nxml-mode: Remove
This package is now part of Emacs itself.
2012-11-23 11:10:30 +01:00
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates.
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
2012-11-21 16:20:36 +01:00
Peter Simons
26f32d8df6 Merge pull request #191 from qknight/gobby_update
updates to libinfinity 0.5.3 and gobby 0.4.94
2012-11-21 03:07:38 -08:00
Joachim Schiele
1ed9e35be6 fixed compile errors for libinfinity and gobby 2012-11-20 21:21:47 +00:00
Peter Simons
2f55f31f49 Merge pull request #155 from bbenoist/newpkgs
New pkgs: qtcreator fox xfe gmrun geany
2012-11-20 12:43:06 -08:00
Peter Simons
58b56c268b graphviz-dot-mode: add version 0.3.3 2012-11-16 18:59:18 +01:00
Rob Vermaas
dca0643b29 Make sublime work on 32bit linux. 2012-11-11 13:23:15 +01:00
Rob Vermaas
aeb8d4c406 Oops, should have at least parsed the expression when committing before having had coffee... 2012-11-11 13:21:33 +01:00
Rob Vermaas
277bfc232b Sublime: add license attribute, and add assertion for i686-linux/x86_64-linux 2012-11-11 13:15:22 +01:00
Rob Vermaas
ee142ea983 Add Sublime Text editor 2012-11-10 20:37:42 +01:00
Mathijs Kwik
320e0a46dc eclipse-sdk-4.2: upgrade to 4.2.1 2012-11-08 10:41:23 +01:00
Rob Vermaas
b0cafe41ce Merge pull request #156 from ecarreras/eclipse_icon
Put eclipse icon into share/pixmaps
2012-10-28 07:06:18 -07:00
Eduard Carreras
9acffb949d Change copy file to symbolic link 2012-10-17 14:16:23 +02:00
Eduard Carreras
d22e3a02fd Put eclipse icon into share/pixmaps 2012-10-16 18:38:53 +02:00
Baptist BENOIST
51fe788417 Add geany-1.22
Geany is a small and lightweight Integrated Development Environment.
It was developed to provide a small and fast IDE, which has only a few dependencies from other packages.
Another goal was to be as independent as possible from a special Desktop Environment like KDE or GNOME.
Geany only requires the GTK2 runtime libraries.

Some basic features of Geany:
 - Syntax highlighting
 - Code folding
 - Symbol name auto-completion
 - Construct completion/snippets
 - Auto-closing of XML and HTML tags
 - Call tips
 - Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal (full list)
 - Symbol lists
 - Code navigation
 - Build system to compile and execute your code
 - Simple project management
 - Plugin interface

Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-16 18:03:12 +02:00
Peter Simons
f77a2f460a Merge branch 'master' into x-updates. 2012-10-12 15:24:24 +02:00
Sander van der Burg
b8e30a8af6 Changed the netbeans expression to use openjdk, which should work now 2012-10-11 10:31:42 +02:00
Peter Simons
6ff829f19d Merge branch 'master' into x-updates 2012-10-10 18:46:48 +02:00
Sander van der Burg
27cadaa404 Added package for netbeans IDE 2012-10-09 11:40:06 +02:00
Eelco Dolstra
d5758c99a3 Merge remote-tracking branch 'origin/master' into x-updates
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
2012-09-26 14:51:51 -04:00
Peter Simons
964efb4adc magit: update to version 1.2.0 2012-09-24 13:25:19 +02:00
Eelco Dolstra
205e9235fc zile: Update to 2.4.8 and fix compilation
http://hydra.nixos.org/build/3052831
2012-09-21 13:43:56 -04:00
Eelco Dolstra
e6077fbc46 Remove getConfig helper function
An expression like ‘getConfig [ "cabal" "libraryProfiling" ] false’
can be written more concisely as ‘config.cabal.libraryProfiling or false’.
2012-09-19 13:56:56 -04:00
Eelco Dolstra
6d3ce2e347 ed: Update to 1.6 2012-09-18 14:48:01 -04:00
aszlig
b2392c09a0
aewan: New package, version 1.0.01.
This adds a small ASCII art drawing tool, which supports drawing with multiple
layers. Might be especially helpful for larger "images", which become quite
tedious to do using vim.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-14 23:24:10 +02:00
aszlig
cb94852ae3
hexedit: New package, version 1.2.12.
A typical three-pane style hex editor, which is somewhat similar than bvi, but
smaller and without vi-like keybindings.

(Don't ask me why I use both, I just can't tell why I'm sometimes in bvi and
sometimes in hexedit mood... there simply is no rational explanation)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-09-14 23:24:10 +02:00
Mathijs Kwik
da87b2c9bf emacs: add package "org2blog" 2012-09-09 19:32:27 +02:00
Mathijs Kwik
7bbda346ba emacs: add package "xml-rpc" 2012-09-09 19:32:14 +02:00
Mathijs Kwik
338e78c7b6 emacs htmlize: upgrade to 1.40 2012-09-09 19:31:54 +02:00
Mathijs Kwik
2b8d80d22d org-mode: upgrade to 7.9.1 2012-09-04 17:49:31 +02:00
Yury G. Kudryashov
096db8fe10 KDevelop-4.3.1 2012-08-31 12:20:09 +04:00
Mathijs Kwik
23f20dcdfe emacs/sunrise-commander: change to github source
previous source replaces itself every now and then and doesn't do versioning
2012-08-29 22:57:57 +02:00
Ludovic Courtès
dc4cfe89ff emacs: Update to 24.2. 2012-08-27 18:16:06 +02:00
Mathijs Kwik
a5663aee4d emacs: add "sunrise commander" 2012-08-21 10:33:20 +02:00
Mathijs Kwik
85c88d473b emacs: add "rect-mark" 2012-08-21 10:33:06 +02:00
Mathijs Kwik
5a146e9cff emacs: add "color-theme" 2012-08-17 08:55:47 +02:00
Mathijs Kwik
50cc5629af emacs: add "jade-mode" 2012-08-13 17:50:19 +02:00
Mathijs Kwik
58ccf70f47 it seems fetchgit does not like version tags
I think they built ok on my system before, because I nix-prefetch-git'd them.
2012-08-11 11:45:31 +02:00
Mathijs Kwik
b62acd8855 oops typo 2012-08-11 11:34:59 +02:00
Mathijs Kwik
a6f17bd1a9 emacs: add "flymake-cursor" 2012-08-11 09:36:20 +02:00
Mathijs Kwik
7fd5e6d668 emacs: upgrade "haskell-mode" to more recent git version 2012-08-10 08:27:09 +02:00
Mathijs Kwik
c0a455b370 emacs: add "auto-complete" mode 2012-08-10 08:27:09 +02:00
Mathijs Kwik
260650e7e2 emacs: add "coffee-mode" 2012-08-10 08:27:09 +02:00
Mathijs Kwik
d6befca296 emacs/js2-mode: upgrade 2012-08-10 08:27:09 +02:00
Shea Levy
988ef8acea Merge pull request #85 from coreyoconnor/master
Adds Eclipse 4.2 to editors/eclipse
2012-08-06 13:27:06 -04:00
Mathijs Kwik
a8be5de82e emacs: add lorem-ipsum package 2012-08-05 02:16:01 +02:00
Mathijs Kwik
56d30f72da emacs: add gist package 2012-08-05 02:15:48 +02:00
Mathijs Kwik
ad5c002891 emacs: add gh (github) package 2012-08-05 02:15:34 +02:00
Mathijs Kwik
733b548cd0 emacs: add pcache package 2012-08-05 02:15:11 +02:00
Mathijs Kwik
c700ec276d emacs: add logito package 2012-08-05 02:14:53 +02:00
Corey O'Connor
a79dd881c7 add eclipse 4.2 2012-08-04 11:14:02 -07:00
Shea Levy
5300731177 Joe: Bump to 3.7 2012-07-31 16:30:50 -04:00
Shea Levy
1a0baad6b2 Update some (seemingly very old) packages that hard-coded the path to make-wrapper.sh 2012-07-15 03:32:50 -04:00
Peter Simons
c5c98b7617 Updated Haskell packages.
- derive: updated to version 2.5.9
 - ghc-mod: updated to version 1.11.0
 - hamlet: updated to version 1.0.1.4
 - http-conduit: updated to version 1.4.1.10
 - leksah: updated to version 0.12.1.3
 - mmap: updated to version 0.5.8
 - mtl: added version 2.1.2
 - prolog-graph-lib: updated to version 0.2.0.1
 - prolog: updated to version 0.2.0.1
 - reactive-banana-wx: updated to version 0.6.0.1
 - resourcet: updated to version 0.3.3
 - shelly: updated to version 0.12.0.2
 - simple-sendfile: updated to version 0.2.4
 - syb: added version 0.3.6.2
 - wai-app-static: updated to version 1.2.0.4
 - wai: updated to version 1.2.0.3
 - warp: updated to version 1.2.2
 - xml-types: updated to version 0.3.2
 - zlib-conduit: updated to version 0.4.0.2
2012-06-28 14:50:44 +02:00
Peter Simons
4490fe934e Updated Haskell packages.
- base64-bytestring: updated to version 0.1.2.0
 - binary-shared: updated to version 0.8.2
 - bson: updated to version 0.2.1
 - leksah-server: updated to version 0.12.1.2
 - leksah: updated to version 0.12.1.2
 - MonadRandom: updated to version 0.1.7
 - random-shuffle: updated to version 0.0.4

svn path=/nixpkgs/trunk/; revision=34569
2012-06-20 10:56:24 +00:00
Vladimír Čunát
cf2a383bc7 Hot-fixing kile's nl handbook compilation problem on KDE-4.7 by removing it.
svn path=/nixpkgs/trunk/; revision=34568
2012-06-20 09:11:58 +00:00
Vladimír Čunát
fc6ce9f799 Minor kile update.
svn path=/nixpkgs/trunk/; revision=34554
2012-06-18 20:18:09 +00:00
Karn Kallio
c89f37078d Make ProofGeneral build with Emacs 24.
svn path=/nixpkgs/trunk/; revision=34485
2012-06-12 21:51:53 +00:00
Florian Friesdorf
20db3374cf js2-mode-0-20120601
svn path=/nixpkgs/trunk/; revision=34484
2012-06-12 21:18:22 +00:00
Peter Simons
6ace4728f5 emacs-24: improved meta.description
svn path=/nixpkgs/trunk/; revision=34477
2012-06-12 12:18:12 +00:00
Peter Simons
b4ebc3bb42 emacs: version emacs-24.1 is out
The 24.x version is still low-prio in nixpkgs until we've figured out how to
support multiple 'emacsPackages' sets properly.

svn path=/nixpkgs/trunk/; revision=34447
2012-06-11 07:44:12 +00:00
Peter Simons
7d15ad90b9 Updated Haskell packages.
- http-conduit: updated to version 1.4.1.8
 - leksah-server: updated to version 0.12.1.0
 - leksah: updated to version 0.12.1.0
 - ltk: updated to version 0.12.1.0
 - yaml: updated to version 0.7.0.3

svn path=/nixpkgs/trunk/; revision=34356
2012-06-05 08:31:42 +00:00
Peter Simons
68f07e270a magit: updated to version 1.1.1
svn path=/nixpkgs/trunk/; revision=33866
2012-04-20 22:37:30 +00:00
Ludovic Courtès
24feabdcec GNU Emacs 23.4.
svn path=/nixpkgs/trunk/; revision=33698
2012-04-09 20:51:04 +00:00
Ludovic Courtès
0e84e56083 GNU Zile 2.4.7.
svn path=/nixpkgs/trunk/; revision=33695
2012-04-09 20:50:50 +00:00
Yury G. Kudryashov
9105d0546d Drop old kdevplatform/kdevelop
svn path=/nixpkgs/trunk/; revision=33571
2012-04-04 16:14:57 +00:00
Peter Simons
880dcc2c64 Removed myself as a maintainer from Haskell packages that I don't personally use.
By now, it happened twice that a commit broke GHC and thus all Haskell packages
we have in Nixpkgs. On such an occasion, I receive well in excess of 3000
notification e-mails from Hydra, and then I receive another 3000 e-mails after
the bug has been fixed. Under these circumstances, subscribing to these
notifications makes no sense for me.

svn path=/nixpkgs/trunk/; revision=33392
2012-03-24 10:21:28 +00:00
Peter Simons
e58d3914bb haskell-mode: updated to version 2.8.0.29-g7682f99
svn path=/nixpkgs/trunk/; revision=33380
2012-03-23 12:03:23 +00:00
Peter Simons
4f576ac4b5 pkgs/applications/editors/emacs-modes/haskell: updated haskell-mode to the latest version from Github
svn path=/nixpkgs/trunk/; revision=33326
2012-03-21 11:46:18 +00:00
Yury G. Kudryashov
102a1d82e7 Oops, fix kdevelop-4.3.0 hash
svn path=/nixpkgs/trunk/; revision=33299
2012-03-20 16:17:46 +00:00
Yury G. Kudryashov
34fcba81be Add new release of kdevelop
I'll remove the old release when Hydra will build the new one, and I'll test the
result.

svn path=/nixpkgs/trunk/; revision=33296
2012-03-20 14:12:53 +00:00
Peter Simons
c86a90c4e9 Updating Haskell packages.
- Agda-executable: updated to version 2.3.0.1
 - Agda: updated to version 2.3.0.1
 - gio: added version 0.12.3
 - hamlet: updated to version 0.10.9.1
 - leksah-server: updated to version 0.12.0.4
 - leksah: updated to version 0.12.0.3
 - ltk: updated to version 0.12.0.0
 - packages.nix: cosmetic change
 - pandoc: updated to version 1.9.1.2
 - polyparse: added version 1.8
 - shakespeare-css: updated to version 0.10.8
 - shakespeare-i18n: updated to version 0.0.2.1
 - shakespeare-js: updated to version 0.11.2
 - shakespeare-text: updated to version 0.11
 - shakespeare: updated to version 0.11
 - tls: updated to version 0.9.1
 - unordered-containers: updated to version 0.2.0.1
 - uuagc: updated to version 0.9.40.3
 - yesod-core: updated to version 0.10.2.2
 - yesod-form: updated to version 0.4.2.1
 - yesod: updated to version 0.10.1.4

svn path=/nixpkgs/trunk/; revision=33015
2012-03-12 14:06:18 +00:00
Florian Friesdorf
7b47dea7b0 emacs-24.0.94 (pretest)
svn path=/nixpkgs/trunk/; revision=32997
2012-03-11 20:45:49 +00:00
Yury G. Kudryashov
0210e20b5a svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32713
2012-03-01 07:04:39 +00:00
Arie Middelkoop
6e8c9ea906 ocaml-mode for emacs.
There seem to exist multiple (very old) versions.
I'm taking the one shipped with the ocaml compiler, which is hopefully the "most appropriate".

svn path=/nixpkgs/trunk/; revision=32688
2012-02-29 12:53:13 +00:00
Yury G. Kudryashov
e5027e5b36 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
2012-02-16 15:02:26 +00:00
Peter Simons
ac69747aa8 Regenerated all Haskell packages with the latest version of cabal2nix.
svn path=/nixpkgs/trunk/; revision=32292
2012-02-14 17:00:37 +00:00
Yury G. Kudryashov
5144a19987 svn merge ^/nixpkgs/trunk
There were a few merge conflicts due to ensureDir->mkdir -p migration

svn path=/nixpkgs/branches/stdenv-updates/; revision=32174
2012-02-10 10:24:30 +00:00
Peter Simons
4afaf0be23 emacs-w3m: updated the SHA256 hash
Thanks Ludo!

svn path=/nixpkgs/trunk/; revision=32124
2012-02-07 17:45:47 +00:00
Florian Friesdorf
2f7102afc0 emacs 24.0.93
svn path=/nixpkgs/trunk/; revision=32123
2012-02-07 17:40:05 +00:00
Florian Friesdorf
df12f0bd01 emacs js2-mode
svn path=/nixpkgs/trunk/; revision=32122
2012-02-07 17:40:02 +00:00
Florian Friesdorf
f3b60febd3 calfw-1.3-5-ga9b6615 for fix in combination with org-mode
svn path=/nixpkgs/trunk/; revision=32119
2012-02-07 17:39:54 +00:00
Florian Friesdorf
4e3afe1b8d emacs mode calfw-1.3
svn path=/nixpkgs/trunk/; revision=32118
2012-02-07 17:39:51 +00:00
Yury G. Kudryashov
215a07c1a9 svn merge ^/nixpkgs/trunk
Merge conflicts:
* unzip (almost trivial)
* dvswitch (trivial)
* gmp (copied result of `git merge`)

The last item introduced gmp-5.0.3, thus full rebuild.
+ensureDir->mkdir -p in TeX packages was catched by git but not svn.

svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
2012-02-06 23:03:12 +00:00
Peter Simons
ace1095639 upgraded emacs-w3m
svn path=/nixpkgs/trunk/; revision=32080
2012-02-06 19:08:58 +00:00
Yury G. Kudryashov
5b132f6e96 svn merge ^/nixpkgs/trunk
Conflicts: cups, all-packages.nix (gcc45_debug)

svn path=/nixpkgs/branches/stdenv-updates/; revision=31863
2012-01-26 15:27:03 +00:00
Arie Middelkoop
d6f60f7135 emacs htmlize: fix of broken source url.
svn path=/nixpkgs/trunk/; revision=31827
2012-01-24 22:06:35 +00:00
Florian Friesdorf
5c05e3f866 emacs-24 alsaLib and imagemagickBig
svn path=/nixpkgs/trunk/; revision=31788
2012-01-23 00:55:48 +00:00
Peter Simons
e926d8d9f2 emacs: updated 23.3 to 23.3b
svn path=/nixpkgs/trunk/; revision=31771
2012-01-21 18:46:37 +00:00
Peter Simons
e86daecce9 emacs: strip trailing whitespace from expression for 23.x
svn path=/nixpkgs/trunk/; revision=31770
2012-01-21 18:46:28 +00:00
Florian Friesdorf
c554168536 org-7.8.03
svn path=/nixpkgs/trunk/; revision=31765
2012-01-21 18:29:06 +00:00
Florian Friesdorf
57733bae5d remove emacsSnapshot in favour of emacs24
svn path=/nixpkgs/trunk/; revision=31764
2012-01-21 18:29:02 +00:00
Florian Friesdorf
0d2d1dd139 emacs-24.0.92
svn path=/nixpkgs/trunk/; revision=31763
2012-01-21 18:28:57 +00:00
Florian Friesdorf
aa277f7d06 emacs-23 as base for emacs-24
svn path=/nixpkgs/trunk/; revision=31762
2012-01-21 18:28:54 +00:00
Yury G. Kudryashov
84c0185038 svn merge ^/nixpkgs/trunk, one simple conflict in jruby
svn path=/nixpkgs/branches/stdenv-updates/; revision=31721
2012-01-19 21:31:51 +00:00
Ludovic Courtès
449c5b537d GNU Zile 2.4.3.
svn path=/nixpkgs/trunk/; revision=31664
2012-01-18 20:51:58 +00:00
Peter Simons
db009e0eb8 emacs org-mode: upgraded to latest version
svn path=/nixpkgs/trunk/; revision=31645
2012-01-18 20:32:10 +00:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Eelco Dolstra
48ee2523da * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31633
2012-01-18 15:53:12 +00:00
Arie Middelkoop
b02bc1ef59 Update of the 'jedit' package.
svn path=/nixpkgs/trunk/; revision=31614
2012-01-17 22:40:05 +00:00
Yury G. Kudryashov
3d61c49b42 svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31268
2012-01-04 09:54:17 +00:00
Karn Kallio
ec8e23cc97 In Emacs site-start.el check that NIX_PROFILES is set.
In the stdenv this is not set, which causes an elisp error
which in turn makes builds depending on Emacs (eg gnuplot) fail.

svn path=/nixpkgs/trunk/; revision=31261
2012-01-04 05:48:38 +00:00
Florian Friesdorf
5a78287adf added myself to maintainers
svn path=/nixpkgs/trunk/; revision=31254
2012-01-03 20:59:00 +00:00
Florian Friesdorf
f051f29fbd load-path also for emacs-22 and emacs-snapshot
svn path=/nixpkgs/trunk/; revision=31253
2012-01-03 20:58:57 +00:00
Florian Friesdorf
195ff32a63 set emacs load-path according to NIX_PROFILES via site-start.el
svn path=/nixpkgs/trunk/; revision=31252
2012-01-03 20:58:54 +00:00
Yury G. Kudryashov
08761e83fc Merge trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
2012-01-02 14:12:40 +00:00
Peter Simons
1d7bc50e9a emacs-modes/magit: updated to 1.1.0.0
svn path=/nixpkgs/trunk/; revision=31106
2011-12-26 20:24:59 +00:00
Yury G. Kudryashov
b077940b3b svn merge https://nixos.org/repos/nix/nixpkgs/trunk
No conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=30916
2011-12-15 19:16:38 +00:00
Karn Kallio
135fe9059f ProofGeneral 4.1
svn path=/nixpkgs/trunk/; revision=30863
2011-12-13 01:13:46 +00:00
Eelco Dolstra
39c8bfdcc4 * New version of ‘ed’. W00t!
svn path=/nixpkgs/branches/stdenv-updates/; revision=30862
2011-12-12 23:44:49 +00:00
Ludovic Courtès
db1b4e2edc GNU Zile: Fix cross-compilation.
svn path=/nixpkgs/trunk/; revision=30414
2011-11-13 21:28:29 +00:00
Ludovic Courtès
e26fc2311a GNU Zile 2.4.2.
svn path=/nixpkgs/trunk/; revision=30110
2011-10-30 00:00:25 +00:00
Yury G. Kudryashov
c35c6ec9fa Drop 'gnomevfs = gnome_vfs;' alias
s/gnomevfs/gnome_vfs/ in packages

svn path=/nixpkgs/trunk/; revision=29718
2011-10-08 12:06:03 +00:00
Yury G. Kudryashov
c7d6b60287 Drop kde3.kile
Use kde4.kile instead

svn path=/nixpkgs/trunk/; revision=29715
2011-10-07 20:46:29 +00:00
Yury G. Kudryashov
dd19f22e7e Add kde4.kile
svn path=/nixpkgs/trunk/; revision=29622
2011-10-04 11:12:11 +00:00
Yury G. Kudryashov
371cd8bc51 kde3: use meta.platforms
svn path=/nixpkgs/trunk/; revision=29596
2011-10-02 21:15:36 +00:00
Ludovic Courtès
2af4615ea8 GNU TeXmacs 1.0.7.11.
svn path=/nixpkgs/trunk/; revision=29012
2011-09-04 23:05:57 +00:00
David Guibert
11e9d58bcf eclipse 3.7 (java and cpp)
svn path=/nixpkgs/trunk/; revision=28619
2011-08-16 18:17:31 +00:00
Yury G. Kudryashov
31ab846d05 Upgrade kdevelop and kdevplatform
svn path=/nixpkgs/trunk/; revision=28604
2011-08-15 23:39:20 +00:00
Peter Simons
493e36669c haskell-leksah: updated build expression for recent versions of cabal.nix
svn path=/nixpkgs/trunk/; revision=28512
2011-08-12 11:02:44 +00:00
Peter Simons
d0e60c7130 leksah: disable Darwin builds
The expression needs more attention before it can be built on platforms
other than Linux:

  at `haskellPackages.leksahServer' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jbcbv6lf44wiy5afsk99sv3vzd1zhg9f-nixpkgs-r28407/pkgs/os-specific/linux/kernel-headers/2.6.32.nix:3:1'

  at `haskellPackages.leksah' [system = "i686-darwin"]:
  assertion failed at `/nix/store/jbcbv6lf44wiy5afsk99sv3vzd1zhg9f-nixpkgs-r28407/pkgs/os-specific/linux/kernel-headers/2.6.32.nix:3:1'

svn path=/nixpkgs/trunk/; revision=28412
2011-08-09 07:49:41 +00:00
Andres Löh
ce5ccbb0ea Updating leksah.
svn path=/nixpkgs/trunk/; revision=28376
2011-08-08 07:41:45 +00:00
Peter Simons
f80ef6645b magit: fixed download url
svn path=/nixpkgs/trunk/; revision=27821
2011-07-18 13:45:47 +00:00
Peter Simons
ea4daca60d pkgs/applications/editors/emacs-modes/bbdb: replace custom build script with standard builder
Also added most of optional contributions shipped in the release tarball to the
installation.

svn path=/nixpkgs/trunk/; revision=27646
2011-07-07 21:04:56 +00:00
Ludovic Courtès
99e79048d4 GNU Zile 2.3.24.
svn path=/nixpkgs/trunk/; revision=27326
2011-05-30 21:49:31 +00:00
Marco Maggesi
503f04ca54 ProofGeneral 4.0
svn path=/nixpkgs/trunk/; revision=27252
2011-05-14 20:59:53 +00:00
Florian Friesdorf
ce249b627b org: include more pdf doc, yet failing html-doc and contrib/
contrib is added as profile/share/org/contrib, better ideas
welcome. profile/share/doc/org-7.5/contrib could be an option but then
one needs to adjust personal emacs config to point to the new
contrib/lisp dir with each upgrade.

svn path=/nixpkgs/trunk/; revision=26805
2011-04-12 15:09:30 +00:00
Florian Friesdorf
f1b0d532b2 org: added myself as maintainer as I intend to help looking after it
svn path=/nixpkgs/trunk/; revision=26804
2011-04-12 12:28:42 +00:00
Florian Friesdorf
dc5e18f626 emacs org mode 7.4 -> 7.5
svn path=/nixpkgs/trunk/; revision=26803
2011-04-12 12:28:37 +00:00
Eelco Dolstra
1c2ba5bcec * Add the Eclipse Modeling Tools.
svn path=/nixpkgs/trunk/; revision=26799
2011-04-12 08:41:53 +00:00
Eelco Dolstra
e91e1cfe76 * Eclipse: don't use an ugly "version" argument. Instead there now is
a function "buildEclipse" that takes a binary Eclipse distribution
  plus metadata as arguments.  The package name now distinguishes
  between Eclipse distributions (e.g. "eclipse-sdk" for Classic,
  "eclipse-cpp" for the C/C++ IDE).

svn path=/nixpkgs/trunk/; revision=26787
2011-04-11 20:29:47 +00:00
Karn Kallio
3ce36f7d72 Bump eclipse version to 3.6.2 after 3.6.1 disappeared from source server.
svn path=/nixpkgs/trunk/; revision=26750
2011-04-08 08:06:11 +00:00
Ludovic Courtès
fe5b564e6b Magit: Install to $out.
svn path=/nixpkgs/trunk/; revision=26524
2011-03-26 11:50:01 +00:00
Peter Simons
1dbbeeab2c magit: updated to version 1.0.0
svn path=/nixpkgs/trunk/; revision=26515
2011-03-25 12:59:09 +00:00
Ludovic Courtès
cc91f09d6b GNU Zile 2.3.23.
svn path=/nixpkgs/trunk/; revision=26480
2011-03-23 21:55:54 +00:00
Eelco Dolstra
f208edd1a5 * Merge the x-updates branch.
svn path=/nixpkgs/trunk/; revision=26330
2011-03-15 18:29:27 +00:00
Russell O'Connor
22fbb1f3d9 Adding freetype dependency for TeXmacs.
svn path=/nixpkgs/trunk/; revision=26306
2011-03-14 22:03:26 +00:00
Eelco Dolstra
3e3eac2e30 * Sync with the trunk.
svn path=/nixpkgs/branches/x-updates/; revision=26303
2011-03-14 18:26:46 +00:00
Russell O'Connor
43bed60351 Fix PDF export.
svn path=/nixpkgs/trunk/; revision=26293
2011-03-14 00:04:30 +00:00
Ludovic Courtès
1ddb8e3f44 GNU TeXmacs 1.0.7.10.
svn path=/nixpkgs/trunk/; revision=26258
2011-03-10 14:53:56 +00:00
Ludovic Courtès
7e8149bf87 GNU Emacs 23.3.
svn path=/nixpkgs/trunk/; revision=26255
2011-03-10 14:53:41 +00:00
Ludovic Courtès
38d4789236 GNU Zile 2.3.22.
svn path=/nixpkgs/trunk/; revision=26253
2011-03-10 14:53:30 +00:00
Eelco Dolstra
a9633d80de * Emacs: don't depend on dbus on non-Linux platforms.
svn path=/nixpkgs/branches/x-updates/; revision=26007
2011-02-17 10:17:49 +00:00
Russell O'Connor
7748f89d86 Bump TeXmacs to verion 1.0.7.9.
svn path=/nixpkgs/trunk/; revision=25770
2011-02-03 16:23:05 +00:00
Ludovic Courtès
7c88378532 Org 7.4.
svn path=/nixpkgs/trunk/; revision=25484
2011-01-10 09:55:28 +00:00
Eelco Dolstra
c14382cb45 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25225
2010-12-21 15:14:33 +00:00
Evgeny Egorochkin
9b4c2f5f56 Emacs PHP mode: packaged. Patch by Karn Kallio.
svn path=/nixpkgs/trunk/; revision=25216
2010-12-21 04:40:38 +00:00
Lluís Batlle i Rossell
b48b2a7bb4 Merging from trunk. I solved some trivial merge conflicts.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25188
2010-12-17 20:39:58 +00:00
Lluís Batlle i Rossell
99831841f0 Updating the urls where to get nvi from. The previous did not work anymore.
I took some from the list provided by:
http://dir.filewatcher.com/d/Perl-CPAN/misc/nvi-1.79.tar.gz.1295401.html

svn path=/nixpkgs/trunk/; revision=25140
2010-12-15 09:39:30 +00:00
Ludovic Courtès
8416f47e26 GNU Zile 2.3.21.
svn path=/nixpkgs/branches/stdenv-updates/; revision=25075
2010-12-12 20:19:03 +00:00
Michael Raskin
6af8a1debd Merging from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24804
2010-11-22 11:39:42 +00:00
Rob Vermaas
db8748b170 added eclipse 3.6.1, maven3, szip
svn path=/nixpkgs/trunk/; revision=24772
2010-11-19 13:24:11 +00:00
Michael Raskin
fb58f74d82 Updating from trunk again
svn path=/nixpkgs/branches/stdenv-updates/; revision=24745
2010-11-17 17:03:09 +00:00
Andres Löh
ad9d05d909 Version bump for leksah (plus dependencies). Now works with ghc-6.12.3.
svn path=/nixpkgs/trunk/; revision=24737
2010-11-17 14:48:12 +00:00
Ludovic Courtès
08d9437bce Quack 0.39.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24670
2010-11-11 22:12:02 +00:00
Lluís Batlle i Rossell
f4f84af4ab Updating from trunk. I only had to take away the usual stdenv2 in
all-packages.nix


svn path=/nixpkgs/branches/stdenv-updates/; revision=24553
2010-10-31 19:30:31 +00:00
Ludovic Courtès
94d5ee9410 GNU TeXmacs 1.0.7.6.
svn path=/nixpkgs/trunk/; revision=24546
2010-10-30 21:44:16 +00:00
Lluís Batlle i Rossell
6dc839d344 Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
2010-10-23 14:52:21 +00:00
Ludovic Courtès
57ed005e24 GNU EMMS: Add dependency on MP3Info.
svn path=/nixpkgs/trunk/; revision=24365
2010-10-19 13:20:24 +00:00
Ludovic Courtès
bf006e3fd2 GNU Zile 2.3.20.
svn path=/nixpkgs/trunk/; revision=24358
2010-10-19 08:09:35 +00:00
Lluís Batlle i Rossell
46201622cb Making vim73 cross-build (it needs a patch)
svn path=/nixpkgs/branches/stdenv-updates/; revision=24243
2010-10-12 18:33:02 +00:00
Lluís Batlle i Rossell
fca582bff0 Updating from trunk. I had to resolve the pcre and some stdenv2 in all-packages
svn path=/nixpkgs/branches/stdenv-updates/; revision=24155
2010-10-07 21:21:31 +00:00
Peter Simons
789c12add5 pkgs/applications/editors/emacs-modes/haskell: updated to version 2.8.0
svn path=/nixpkgs/trunk/; revision=24136
2010-10-07 13:14:01 +00:00
Peter Simons
48ecb667ab pkgs/applications/editors/emacs-modes/haskell: added meta section
svn path=/nixpkgs/trunk/; revision=24134
2010-10-07 13:13:42 +00:00
Yury G. Kudryashov
67b5d732a2 Move kdevplatform and kdevelop to all-packages.nix
svn path=/nixpkgs/trunk/; revision=24063
2010-10-05 05:43:39 +00:00
Russell O'Connor
228303d47e Merging roconnor's and ludo' texmacs derivations.
texmacs now has extra font options.
texmacs is abstracted over which tex it uses (AFAIK texmacs only uses metafont).
texmacs now depends on aspell, ghostscript soft dependencies.

svn path=/nixpkgs/trunk/; revision=24054
2010-10-04 15:07:38 +00:00
Evgeny Egorochkin
c9ad6ec90a Packaged Gobby
svn path=/nixpkgs/trunk/; revision=24040
2010-10-04 04:15:23 +00:00
Lluís Batlle i Rossell
cd4b54748a Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=24038
2010-10-03 09:25:34 +00:00
Lluís Batlle i Rossell
bc92057a17 Making vim some configurable options go through getConfig.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24033
2010-10-03 09:18:14 +00:00
Lluís Batlle i Rossell
530ac48a7c Making the default vim have multibyte+nls support. Checking with 'du', I think
the results take almost the same amount of bytes, while we get support for utf8 terminals.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24031
2010-10-03 09:17:22 +00:00
Michael Raskin
2fed251436 Update vim_configurable to 7.3
svn path=/nixpkgs/trunk/; revision=24014
2010-10-01 05:01:32 +00:00
Armijn Hemel
8db80a9616 update to 7.3
svn path=/nixpkgs/trunk/; revision=24008
2010-09-30 17:00:13 +00:00
Lluís Batlle i Rossell
c00b676654 Making the default vim have multibyte+nls support. Checking with 'du', I think
the results take almost the same amount of bytes, while we get support for utf8 terminals.

svn path=/nixpkgs/trunk/; revision=23859
2010-09-18 16:29:47 +00:00
Lluís Batlle i Rossell
2c5de61327 Updating from trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=23840
2010-09-17 19:10:21 +00:00
Peter Simons
c66aa309be pkgs/applications/editors/emacs-modes/magit: updated to version 0.8.2
svn path=/nixpkgs/trunk/; revision=23697
2010-09-09 16:06:34 +00:00