Vladimír Čunát
39ebb01d6e
Merge branch 'staging', containing closure-size #7701
2016-04-13 09:25:28 +02:00
Micxjo Funkcio
dd2f24bc0d
nvpy: 0.9.2 -> 0.9.7
2016-04-12 18:54:24 -07:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Moritz Ulrich
6cd2eccdc7
neovim: Fix build by via order of buildInputs
...
See #14442 for details and further real fixes.
2016-04-06 21:08:23 +02:00
Robert Helgesson
56d45e9b99
eclipse-plugin-scala: 4.3.0.201512011535 -> 4.4.0.201604010956
2016-04-05 20:08:26 +02:00
Peter Simons
d2ef7ab10f
Merge pull request #14467 from DamienCassou/emacs-25.0.92
...
emacs25pre: 25.0.50-1b5630e -> 25.0.92
2016-04-05 10:04:32 +02:00
Damien Cassou
9b52caaa0c
emacs25pre: 25.0.50-1b5630e -> 25.0.92
2016-04-05 09:57:05 +02:00
Christoph Ruegge
c251f82de9
emacs25pre: call autogen.sh before configuring
2016-04-04 11:03:02 +02:00
mucaho
0c195db5dd
vscode: shrink derivation size
...
Prune out compile-time dependencies.
2016-04-04 02:49:58 +01:00
joachifm
a703bd49a9
Merge pull request #14418 from mucaho/vscode
...
Add visual studio code editor
2016-04-03 19:07:08 +00:00
mucaho
aa38510267
vscode: init at 0.10.10
2016-04-03 19:49:32 +01:00
Tim Steinbach
d17dbcb081
atom: 1.6.1 -> 1.6.2
2016-04-02 14:20:13 +00:00
Tim Steinbach
160c7df751
atom: 1.6.0 -> 1.6.1
2016-04-01 08:08:31 -04:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Chris Martin
19abd55420
idea.idea15-ultimate: init at 15.0.5
2016-03-30 02:02:53 -07:00
Nikolay Amiantov
4e9ddd3770
Revert "codeblocks: fix build"
...
This reverts commit fd9416fb4b
.
This shouldn't be needed now that we properly link wxGTK.
2016-03-27 20:54:35 +03:00
Robert Helgesson
1b30674165
eclipse-plugin-testng: 6.9.10 -> 6.9.11
2016-03-27 14:37:05 +02:00
Domen Kožar
b07e7bfc7b
Merge remote-tracking branch 'origin/staging'
2016-03-27 13:19:04 +01:00
Joachim Fasting
fd9416fb4b
codeblocks: fix build
...
https://hydra.nixos.org/build/33633573/nixlog/1/raw
2016-03-27 03:49:42 +02:00
Domen Kožar
0e6df91569
Merge pull request #14154 from grahamc/codeblocks
...
codeblocks: ad libX11 build dependency to fix 16.03 hydra build
2016-03-23 15:42:28 +00:00
rnhmjoj
a4d5f49603
tweak: init at 3.20
2016-03-23 15:18:03 +01:00
Graham Christensen
3f6023dd16
codeblocks: ad libX11 build dependency to fix hydra build
...
http://hydra.nixos.org/build/33296816/nixlog/1
2016-03-23 08:04:45 -05:00
Thomas Tuegel
6c05554b85
emacsPackagesNg: remove compatibility cl-lib
...
ELPA has the compatibility library cl-lib-0.5 which interferes with the
builtin cl-lib-1.0.
2016-03-21 15:36:39 -05:00
Sven Keidel
c2dc5a3e98
eclipse: add eclipse platform 4.5.2
2016-03-19 18:50:20 +01:00
Arseniy Seroka
4d82228a63
vim: 7.4.827 -> 7.4.1585
2016-03-19 00:21:27 +03:00
Edward Tjörnhammar
5bb0aa3bac
idea.idea-{community,ultimate}: 15.0.4 -> 2016.1
2016-03-18 18:26:23 +01:00
Tim Steinbach
a1dfa5f913
atom: 1.5.4 -> 1.6.0
2016-03-18 08:24:58 -04:00
joachifm
71655b0b69
Merge pull request #13843 from ambrop72/kdevelop-473
...
kdevelop: 4.7.1 -> 4.7.3
2016-03-14 21:30:12 +00:00
zimbatm
94774a717b
Merge pull request #13889 from frlan/Update/Geany/1.27
...
geany: 1.26 -> 1.27
2016-03-13 18:29:18 +00:00
Frank Lanitz
9d34f2054d
geany: 1.26 -> 1.27
...
Also adding myself as list of maintainers
2016-03-13 18:41:08 +01:00
宋文武
93feb5d115
drop my maintainership ( close #13881 )
2016-03-13 18:39:01 +01:00
Ambroz Bizjak
1edb9b9558
kdevelop: 4.7.1 -> 4.7.3
2016-03-12 16:30:41 +01:00
joachifm
7c73dc227b
Merge pull request #13830 from Chattered/fix/emacs-w3m
...
emacs-w3m: fix reference to env variable
2016-03-11 16:10:16 +00:00
Phil Scott
cbd4a203b7
emacs-w3m: fix reference to env variable
2016-03-11 07:23:11 +00:00
Allan Espinosa
fd59345d73
macvim: remove extra MacVim.app
...
/MacVim.app is a duplicate of /Applications/MacVim.app
2016-03-10 10:38:13 -06:00
Thomas Tuegel
3ef7671cea
ncurses: combine $lib and $out outputs
...
The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
2016-03-08 11:35:24 -06:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Joachim Fasting
d43578b599
nano: 2.5.0 -> 2.5.3
...
Also move build-time dependencies to nativeBuildInputs
2016-03-08 00:14:57 +01:00
John Wiegley
0ee75214f3
proofgeneral_HEAD: New expr: Proof General from GitHub
2016-03-07 07:16:04 -08:00
Robert Helgesson
54c7ef17a9
eclipse-plugin-checkstyle: 6.14.0 -> 6.16.0
2016-03-06 09:39:22 +01:00
Arseniy Seroka
4b934ec3af
Merge pull request #13698 from puffnfresh/feature/window-manager/emacs-exwm
...
exwm service: init (Emacs X Window Manager)
2016-03-06 10:54:48 +03:00
Tim Steinbach
d3deb49b54
atom: 1.5.3 -> 1.5.4
2016-03-05 22:11:27 +00:00
Brian McKenna
b1096d0811
elpa-packages 2016-03-06
2016-03-06 00:03:26 +11:00
Michael Ekstrand
b3faef0d93
nano: build info manual ( close #13527 )
...
Make nano depend use texinfo, so that the built packages include the
info manual, and put it into a separate output.
2016-02-28 21:50:17 +01:00
zimbatm
69ce5cb656
use the sourceforge mirrors everywhere
...
find pkgs -name "*.nix" -exec sed -r \
"s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
2016-02-28 12:07:42 +00:00
Matt McHenry
98a0484471
eclipse: run with the jdk, not the jre
...
This is necessary so that tools like native2ascii are available to
maven eclipse integration (m2e).
2016-02-27 13:40:38 +01:00
Arseniy Seroka
c80a1baa15
Merge pull request #13486 from zimbatm/vim-default-config
...
vim: provide a default vimrc
2016-02-27 01:09:52 +03:00
zimbatm
89f0e25189
vim: provide a default vimrc
...
Minimal sane defaults imported from ArchLinux.
This is basically `set :nocompatible` with some other small changes.
2016-02-26 21:58:21 +00:00
Charles Strahan
53ea7dee75
emacs: fix priority for ctags
...
This fixes the previous attempt (in commit 46d1dd5
) to make ctags' ctags
override emacs' ctags. The higher the value of the priority attribute,
the higher the priority (see the definition of `buildEnv`).
2016-02-26 12:27:04 -05:00