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
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