Commit Graph

628 Commits

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