JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,098 Commits 2 Branches 0 Tags 13 GiB
74b808a66f
Commit Graph

746 Commits

Author SHA1 Message Date
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