Commit Graph

1633 Commits

Author SHA1 Message Date
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Nick Novitski
15c6fa023f neovim: fix Man command 2016-05-21 21:51:40 +02:00
Tuomas Tynkkynen
ebf6b3cd51 treewide: Make explicit that 'dev' output of poppler is used 2016-05-19 10:02:29 +02:00
Tuomas Tynkkynen
5e5c5382f6 treewide: Make explicit that 'dev' output of cairo is used 2016-05-19 10:00:28 +02:00
Joachim Fasting
013fd785a1
emacs25pre: 25.0.93 -> 25.0.94 2016-05-18 03:54:17 +02:00
Thomas Tuegel
d191c5c498 Merge pull request #15517 from mdorman/emacs-updates
emacs-packages: various updates
2016-05-17 09:14:23 -05:00
Domen Kožar
b49bf121b8 rename iElectric to domenkozar to match GitHub 2016-05-17 13:00:47 +01:00
Michael Alan Dorman
0bd9f7b2d6 melpa-packages 2016-05-16 2016-05-17 07:32:11 -04:00
Michael Alan Dorman
114550baa3 melpa-stable-packages 2016-05-16 2016-05-17 07:32:11 -04:00
Michael Alan Dorman
ced6d155b2 org-packages 2016-05-16 2016-05-17 07:32:11 -04:00
Michael Alan Dorman
c56614bdb8 elpa-packages 2016-05-16 2016-05-17 07:32:11 -04:00
Franz Pletz
e98a0bc9e0 Merge pull request #15476 from matthiasbeyer/update-unmaintained
Update unmaintained packages
2016-05-16 23:45:11 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Matthias Beyer
5e6bb86f5d joe: 4.1 -> 4.2 2016-05-16 16:12:20 +02:00
Matthias Beyer
57f2e6e0b5 ed: 1.12 -> 1.13 2016-05-15 13:19:37 +02:00
Arseniy Seroka
bc880acb22 Merge pull request #15459 from romildo/upd.atom
atom: 1.6.2 -> 1.7.3
2016-05-15 01:01:09 +03:00
José Romildo Malaquias
080f9c579a atom: 1.6.2 -> 1.7.3 2016-05-14 13:54:27 -03:00
Arseniy Seroka
67d1b8f757 Merge pull request #15431 from zimbatm/sublime-3114
sublime3: 3103 -> 3114
2016-05-14 00:07:01 +03:00
Thomas Tuegel
5e694aa3b3 Merge pull request #15430 from mdorman/emacs-revert
Revert removal of three hand-maintained emacs packages
2016-05-13 11:57:34 -05:00
Adam Russell
74883be684
idea.idea14-ultimate: init at 14.1.7
(cherry picked from commit a4f13a8baeab85376d6eb0a49382a927ef3049ed)
2016-05-13 15:54:34 +02:00
Arseniy Seroka
efa8c3b6be Merge pull request #15428 from chris-martin/idea-security-update
Idea security update
2016-05-13 15:15:28 +03:00
zimbatm
dabef63eaf sublime3: 3103 -> 3114 2016-05-13 11:36:50 +01:00
Michael Alan Dorman
1b314a70c2 Revert "Remove obsolete pcache version"
This reverts commit 5cc4ff09fa.
2016-05-13 06:35:19 -04:00
Michael Alan Dorman
ada0d47b3e Revert "Remove obsolete s version"
This reverts commit 7ccdbff95b.
2016-05-13 06:35:06 -04:00
Michael Alan Dorman
0d4dfbd570 Revert "Remove obsolete xml-rpc version"
This reverts commit 5017e24756.
2016-05-13 06:34:44 -04:00
Chris Martin
ff48229c42 idea.webstorm: 10.0.4 -> 10.0.5 2016-05-13 04:57:20 -04:00
Chris Martin
ee511456fc idea.phpstorm: 10.0.1 -> 10.0.4 2016-05-13 04:57:03 -04:00
Chris Martin
8cf2a2dbeb idea.pycharm-professional: 2016.1.2 -> 2016.1.3 2016-05-13 04:56:36 -04:00
Chris Martin
89f46ab3e3 idea.pycharm-community: 2016.1.2 -> 2016.1.3 2016-05-13 04:55:57 -04:00
Chris Martin
22b8bb4bd0 idea.ruby-mine: 7.1.2 -> 7.1.5 2016-05-13 04:55:32 -04:00
Chris Martin
69448be776 idea.idea-ultimate: 2016.1.1 -> 2016.1.2 2016-05-13 04:55:10 -04:00
Chris Martin
ac076eeb20 idea.idea15-ultimate: 15.0.5 -> 15.0.6 2016-05-13 04:54:48 -04:00
Chris Martin
4217743b94 idea.idea-community: 2016.1.1 -> 2016.1.2 2016-05-13 04:54:25 -04:00
Chris Martin
149ba81f79 idea.idea14-community: 14.1.6 -> 14.1.7 2016-05-13 04:53:55 -04:00
Chris Martin
9fe577bdc0 idea.clion: 1.2.4 -> 1.2.5 2016-05-13 04:53:22 -04:00
Chris Martin
7d0570a253 idea.android-studio: 2.0.0.20 -> 2.1.1.0 2016-05-13 04:52:14 -04:00
Vladimír Čunát
3e387c3e00 Merge branch 'staging'
Darwin isn't in a perfect state, in particular its bootstrap tools won't
build which will block nixpkgs channel. But on the whole it seems
acceptable.
2016-05-13 10:14:53 +02:00
Arseniy Seroka
d3e7141ef3 Merge pull request #15409 from joelmo/netbeans
netbeans: 8.0.2 -> 8.1
2016-05-13 01:26:51 +03:00
Joel Moberg
9e929f3eb6 netbeans: 8.0.2 -> 8.1 2016-05-12 15:08:17 +02:00
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Michael Alan Dorman
5cc4ff09fa Remove obsolete pcache version 2016-05-08 18:33:29 -04:00
Michael Alan Dorman
7ccdbff95b Remove obsolete s version 2016-05-08 18:33:29 -04:00
Michael Alan Dorman
14ba2f4f24 Remove obsolete magit (and associated packages) version 2016-05-08 18:33:29 -04:00
Michael Alan Dorman
a58e53c56e Remove obsolete dash version. 2016-05-08 18:33:28 -04:00
Michael Alan Dorman
5017e24756 Remove obsolete xml-rpc version 2016-05-08 18:33:28 -04:00
Michael Alan Dorman
24da619b4f Remove obsolete flycheck version. 2016-05-08 18:33:28 -04:00
Michael Alan Dorman
ee7af5fdb8 melpa-stable-packages 2016-05-07 2016-05-08 18:33:28 -04:00
Michael Alan Dorman
1912f45f9b melpa-packages 2016-05-07 2016-05-08 18:33:28 -04:00
Michael Alan Dorman
66e337531d elpa-packages 2016-05-07 2016-05-08 18:33:27 -04:00
Michael Alan Dorman
a8b3cf4669 Use generated org and org-plus-contrib packages. 2016-05-08 18:33:27 -04:00
Michael Alan Dorman
525cf616f4 org-packages 2016-05-07 2016-05-08 18:33:23 -04:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Tobias Geerinckx-Rice
b6092775cb
tiled: 0.16.0 -> 0.16.1 2016-05-08 03:29:45 +02:00
Charles Strahan
ec1c8071b1 macvim: fix build 2016-05-06 22:32:23 -04:00
Tobias Geerinckx-Rice
237168d452
neovim: unmaintain
*reinstalls emacs*
2016-05-06 19:17:07 +02:00
Robert Helgesson
1a5b5593d6 eclipse-plugin-scala: 4.4.0 -> 4.4.1 2016-05-06 13:59:01 +02:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Edward Tjörnhammar
066b5cb11a
idea.idea-{community,ultimate}: 2016.1 -> 2016.1.1 2016-05-03 11:01:21 +02:00
Jascha Geerds
cf224573d6 idea.pycharm: 5.0.3 -> 2016.1.2 2016-05-02 11:59:31 +02:00
Nikolay Amiantov
87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Robert Helgesson
f5b3827e0e eclipse-plugin-testng: 6.9.11.201603260617 -> 6.9.11.201604020423 2016-04-29 18:47:31 +02:00
Arseniy Seroka
29ac362a42 Merge pull request #15075 from romildo/upd.eclipse-plugin-cup
eclipse-plugins-cup: 1.0.0.201412081321 -> 1.0.0.201604221613
2016-04-29 19:20:00 +03:00
José Romildo Malaquias
47c068c7a3 eclipse-plugins-cup: 1.0.0.201412081321 -> 1.0.0.201604221613 2016-04-29 07:49:05 -03:00
Yochai Meir
4a0cbae070 eclipse: fix build error 2016-04-28 20:31:14 +03:00
Tuomas Tynkkynen
4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Thomas Tuegel
a286d876ad melpaStablePackages.docker: don't call builtin dependency 2016-04-26 14:12:53 -05:00
Thomas Tuegel
d47fe2bd4a elpa-packages 2016-04-26 2016-04-26 14:07:32 -05:00
Thomas Tuegel
de33f4b48b elpa-packages: update package generation instructions 2016-04-26 14:06:42 -05:00
Thomas Tuegel
559010fa9c melpa-stable-packages 2016-04-26 2016-04-26 14:05:25 -05:00
Thomas Tuegel
f6828eb247 melpa-stable-packages: update package generation instructions 2016-04-26 14:05:00 -05:00
Thomas Tuegel
bf0ae7d45c melpa-packages: update package generation instructions 2016-04-26 14:04:13 -05:00
Thomas Tuegel
d3eea5ae35 melpa-packages 2016-04-26 2016-04-26 14:00:20 -05:00
Nikolay Amiantov
daa8ba26c9 atomEnv: use makeSearchPathOutput 2016-04-25 13:24:40 +03:00
Nicolas Petton
693942b61a
emacs25pre: 25.0.92 -> 25.0.93
joachifm: also update the name & re-use it in the url
2016-04-24 23:27:16 +02:00
Tobias Geerinckx-Rice
1076c93de3
tiled: 0.12.3 -> 0.16.0; clean up; maintain 2016-04-23 01:30:50 +02:00
Vladimír Čunát
e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Nikolay Amiantov
253b84a1eb vscode, electron, atom: run fixup phases 2016-04-22 17:44:30 +03:00
Jakob Gillich
0b8d8b5ca8 vscode: 0.10.10 -> 1.0.0 2016-04-22 16:35:40 +02:00
Jakob Gillich
935493a361 vscode: add desktop file 2016-04-22 16:11:05 +02:00
Nikolay Amiantov
6185f74531 atom, electron, vscode: split dependencies to atomEnv
fixes #14890
2016-04-22 16:10:51 +02:00
Arseniy Seroka
7e934fbf73
android-studio: 2.0.0.0 -> 2.0.0.20 2016-04-21 19:47:02 +03:00
Nikolay Amiantov
de7d8e64cf tiled: move to qmakeHook 2016-04-20 18:55:40 +03:00
Nikolay Amiantov
6d96f2f3b4 texstudio: move to qmake4Hook 2016-04-20 18:55:40 +03:00
Nikolay Amiantov
b1dcfeeeeb texmaker: move to qmake4Hook 2016-04-20 18:55:39 +03:00
Nikolay Amiantov
448100fe83 focuswriter: move to qmake4Hook 2016-04-20 18:55:39 +03:00
Aneesh Agrawal
2e80f19f39 neovim: 0.1.2 -> 0.1.3 2016-04-19 15:20:34 -04:00
Rahul Gopinath
29f895426c vis: init vis at 0.2x (nightly)
Vis editor is a vim like editor.
This commit provides the initial package for vis (nightly)
2016-04-15 19:44:25 -05:00
joachifm
19e425fa0c Merge pull request #14447 from mucaho/vscode_unfree
vscode: switch to unfree, binary package
2016-04-14 14:16:43 +02:00
Nikolay Amiantov
39eefc0cd0 atom: fix library paths 2016-04-13 22:09:42 +03:00
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
mucaho
607a2ae2cb vscode: fix drv
Switch to unfree, binary package.
2016-04-04 17:35:17 +01: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
zimbatm
3833591d95 Merge pull request #13164 from romildo/fix/eclipse-plugin-cup
eclipse-plugins-cup: fix plugin file names
2016-02-26 11:23:28 +00:00
José Romildo Malaquias
0e94a1be40 eclipse-plugins-cup: add dependency on the zest plugin 2016-02-26 06:42:04 -03:00
José Romildo Malaquias
205398c427 eclipse-plugin-zest: init at 3.9.101
eclipse-plugins-cup: remove plugins.nix.orig that was wrongly added.
2016-02-26 06:42:04 -03:00
José Romildo Malaquias
ef11f77c8f eclipse-plugins-cup: fix plugin file names 2016-02-26 06:42:04 -03:00
Charles Strahan
e08dd09c25 emacs: add optional support for 24-bit color ttys 2016-02-26 00:33:56 -05:00
Edward Tjörnhammar
77d11ec577 idea.idea-{community,ultimate}: 15.0.3 -> 15.0.4 2016-02-25 17:48:07 +01:00
Frederik Rietdijk
2d5d0df8f1 kde5.kile: 2016-02-12 -> 2016-02-14
Fixes building (poppler-qt5 could not be found)
2016-02-24 19:48:13 +01:00
Tomasz Czyż
11a474e81b idea.android-studio: 1.5.0.4 -> 2.0.0.0 2016-02-24 10:06:20 +00:00
Frederik Rietdijk
40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Thomas Tuegel
a5356d09e6 elpaPackages 2016-02-22 2016-02-22 06:21:20 -06:00