Commit graph

1758 commits

Author SHA1 Message Date
Robert Helgesson 748fcd083a eclipse-plugin-checkstyle: 6.16.0 -> 6.19.0 2016-06-24 12:22:17 +02:00
zimbatm a53427144f Merge pull request #16464 from igsha/fix-bviplus
bviplus: fix build
2016-06-24 01:02:51 +01:00
Simon Vandel Sillesen a4787f09cc vscode: 1.0.0 -> 1.2.1
fixes #15548
2016-06-23 21:33:56 +02:00
Igor Sharonov ffe0b43dc0 bviplus: fix build 2016-06-23 22:12:27 +03:00
zimbatm a0fe5dc90c Merge pull request #16363 from mimadrid/update/texstudio-2.11.0
texstudio: 2.9.4 -> 2.11.0
2016-06-23 15:17:16 +01:00
Andrew Abbott 5c71b9564d textadept: 8.2 -> 8.7 2016-06-22 15:12:29 +10:00
Miguel Madrid 4c454fed33 texmaker: 4.4.1 -> 4.5 (#16359) 2016-06-21 14:32:03 +02:00
Edward Tjörnhammar e945646be3
idea: make jdk overrideable using .override
Signed-off-by: Edward Tjörnhammar <ed@cflags.cc>
2016-06-21 11:09:50 +02:00
mimadrid ba0d3ce5f1
texstudio: 2.9.4 -> 2.11.0 2016-06-20 16:47:01 +02:00
Bjørn Forsman bd01fad0ed Captialize meta.description of all packages
In line with the Nixpkgs manual.

A mechanical change, done with this command:

  find pkgs -name "*.nix" | \
      while read f; do \
          sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
      done

I manually skipped some:

* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
zimbatm 53f421c0c4 Merge pull request #16325 from taku0/android-studio-2.1.2.0
android-studio: 2.1.1.0 -> 2.1.2.0, fixed Gradle link error
2016-06-19 22:30:34 +01:00
Damien Cassou bbac378d7c Merge pull request #16335 from DamienCassou/helm-projectile-20160614
helm-projectile: 20160603.611 -> 20160614.832
2016-06-19 19:20:40 +02:00
Damien Cassou 54ba61690a helm-projectile: 20160603.611 -> 20160614.832 2016-06-19 11:53:49 +02:00
taku0 3cca6c6960 android-studio: 2.1.1.0 -> 2.1.2.0, fixed Gradle link error
- Set `LD_LIBRARY_PATH` because Gradle installs `libnative-platform.so` in `~/.gradle`, that requires `libstdc++.so.6`
- Uses Android SDK with support libraries since standard templates use them.
- Version bump
2016-06-19 12:07:50 +09:00
Aristid Breitkreuz 9ea88aa7be Merge pull request #16206 from hrdinka/fix/vim_configurable
vim_configurable: googlecode -> github
2016-06-18 17:01:18 +02:00
Christoph Hrdinka 8cbbc73dce vim_configurable: googlecode -> github
Vim is now hosted on github instead of googlecode.
2016-06-16 15:35:58 +02:00
José Romildo Malaquias 1f77d3cd09
idea.idea-{community,ultimate}: 2016.1.2 -> 2016.1.3
(cherry picked from commit a6fd3e8680)
2016-06-14 12:28:27 +02:00
Thomas Tuegel 8a37d9cb6d Merge pull request #16176 from bendlas/update-emacs-packages
melpa(-unstable)-packages 2016-06-12
2016-06-13 14:07:52 -05:00
Moritz Ulrich edca4a1b55 Merge pull request #16159 from matthewbauer/neovim-darwin-fixes
Neovim darwin fixes
2016-06-13 10:42:20 +02:00
Matthew Bauer e0884e85cf neovim: fix build on darwin, cleanup lua paths
fixes #16152

The cmake script had trouble finding the lua paths, this sets them
using “luaPackages.getLuaPath” and “luaPackages.getLuaCPath”.
2016-06-12 21:02:09 -05:00
Herwig Hochleitner 887c316b7d melpa(-unstable)-packages 2016-06-12 2016-06-12 17:11:51 +02:00
Joachim Fasting 72d589080f
emacs25pre: 25.0.94 -> 25.0.95 2016-06-11 21:59:53 +02:00
Christian L 64a6e09979 atom: 1.7.3 -> 1.8.0 (#16118) 2016-06-10 11:30:50 +01:00
Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-06-10 09:27:04 +00:00
Rushmore Mushambi 5c8a8808ba Merge pull request #16056 from ljli/fix-atom
atom: patchelf ctags binary
2016-06-08 18:57:50 +02:00
Rok Garbas 28ddc8c043 neovim: pkgs argument was unused 2016-06-06 13:00:44 +02:00
Leon Isenberg 213f882fd3 atom: patchelf ctags binary 2016-06-04 23:04:28 +02:00
Thomas Tuegel ebc49cee04 Merge pull request #15941 from bendlas/update-emacs-packages
emacs-packages: update stable and unstable
2016-06-04 11:35:42 -05:00
Rok Garbas f878018ece neovim: 0.1.3 -> 0.1.4
* removing luaMessagePack (only used by neovim)
* using libmpack (updated to latest master since they fixed a lot of packaging
  issues)
* package libmpack lua bidnings
* neovim expression now excepts luaPackages as an input and not individual
  lua packages (to avoid depending on different lua version)
2016-06-04 17:58:01 +02:00
Herwig Hochleitner 893a50b957 melpa-packages 2016-06-04
remove company override from ac-php
2016-06-04 13:55:43 +02:00
Joachim Fasting 236cfe4e78 Merge pull request #15940 from j-hao/master
emacs|emacs25pre: Check AT_FDCWD is not defined before define it
2016-06-04 02:17:56 +02:00
Tuomas Tynkkynen bac26e08db Fix lots of fetchgit hashes (fallout from #15469) 2016-06-03 17:17:08 +03:00
Jun Hao b8b15ca2a3 emacs|emacs25pre: Check AT_FDCWD is not defined before define it
https://github.com/NixOS/nixpkgs/issues/11723
2016-06-03 09:52:31 +08:00
Tobias Pflug 71c9c5dffe neovim: fix broken build (#15876) 2016-05-31 21:38:43 +02:00
Robin Gloster 2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Robin Gloster eb6809eafd emacs25pre: disable format hardening 2016-05-30 19:34:16 +00:00
Thomas Tuegel 649b5bceb1 Merge pull request #15602 from mdorman/emacs-updates
Emacs updates
2016-05-28 07:25:33 -05:00
Joachim Fasting 39d7f65a33 Merge pull request #15710 from chris-martin/sublime-desktop-item
sublime: add a desktop item and icons
2016-05-27 16:57:32 +02:00
Joachim Fasting 0eaea886b9 Merge pull request #15685 from chris-martin/idea-wmClass
idea: set StartupWMClass on desktop item
2016-05-27 16:56:51 +02:00
Vladimír Čunát 81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
Chris Martin 79a50c0473 sublime: add a desktop item and icons 2016-05-25 19:26:37 -04:00
Rok Garbas e9c86755dd neovim: make clipboard work ootb 2016-05-25 15:02:41 +02:00
Chris Martin acaa3d9474 idea: set StartupWMClass on desktop item
This makes all Idea product behave nicely with the Gnome launcher.

The WM class for every Idea product is in the form

    jetbrains-<product>[-ce]

Where <product> is e.g. "idea", "pycharm", etc., and "-ce" is appended
for community editions.
2016-05-24 22:43:13 -04:00
Vladimír Čunát 0b192a0976 Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
2016-05-23 09:02:10 +02:00
Michael Alan Dorman 1ab65e6db2 crux: un-mark broken melpa-package version
The melpa-stable package still needs to be updated before it can be
unbroken.
2016-05-22 14:26:12 -04:00
Michael Alan Dorman 9675099db6 melpa-packages: 2016-05-22 2016-05-22 14:26:10 -04:00
Michael Alan Dorman 16df12ad1b melpa-stable-packages: 2016-05-22 2016-05-22 14:26:08 -04:00
Michael Alan Dorman 91faa8e672 elpa-packages: 2016-05-22 2016-05-22 14:26:05 -04:00
Vladimír Čunát 73f1f5eb39 imagemagick: split dev output to fix #9604
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02:00
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
Franz Pletz f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-05-18 17:10:02 +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 a4f13a8bae)
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
Robin Gloster c92bca56f8 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-02 22:58:02 +00: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
Robin Gloster a36f51f773 neovim: disable fortify hardening 2016-04-19 02:05:50 +00:00
Robin Gloster d020caa5b2 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-18 13:49:22 +00: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
Robin Gloster 3e68106afd Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-07 21:52:26 +00: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
Robin Gloster bbbaccfa68 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-04 15:24:52 +00: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
Robin Gloster 696d85a62d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-04-03 11:01:57 +00: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
Franz Pletz 2e08d8234e Merge remote-tracking branch 'origin/master' 2016-03-31 10:06:30 +02:00
Chris Martin 19abd55420 idea.idea15-ultimate: init at 15.0.5 2016-03-30 02:02:53 -07:00
Robin Gloster f60c9df0ba Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-28 15:16:29 +00: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
Robin Gloster 3f45f0948d Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-15 01:44:24 +00: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
Franz Pletz e9fc4e7db6 Merge remote-tracking branch 'origin/master' into hardened-stdenv 2016-03-07 22:08:27 +01:00
John Wiegley 0ee75214f3 proofgeneral_HEAD: New expr: Proof General from GitHub 2016-03-07 07:16:04 -08:00
Robin Gloster 2013614e1d vim-configurable: Disable hardening flag fortify
Fortify hardening detects a probable buffer overflow in vim at runtime. This
has to be fixed upstream.

Debian also disables fortify:

  https://anonscm.debian.org/cgit/pkg-vim/vim.git/tree/debian/rules#n6
2016-03-06 16:57:34 +00: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
Franz Pletz 0cad2e7af1 vim: Disable hardening flag fortify
Fortify hardening detects a probable buffer overflow in vim at runtime. This
has to be fixed upstream.

Debian also disables fortify:

  https://anonscm.debian.org/cgit/pkg-vim/vim.git/tree/debian/rules#n6
2016-03-05 21:45:04 +01:00
Franz Pletz aff1f4ab94 Use general hardening flag toggle lists
The following parameters are now available:

  * hardeningDisable
    To disable specific hardening flags
  * hardeningEnable
    To enable specific hardening flags

Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.

cc-wrapper supports the following flags:

  * fortify
  * stackprotector
  * pie (disabled by default)
  * pic
  * strictoverflow
  * format
  * relro
  * bindnow
2016-03-05 18:55:26 +01:00
Brian McKenna b1096d0811 elpa-packages 2016-03-06 2016-03-06 00:03:26 +11:00
Robin Gloster d47857c3d9 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-03-01 21:09:17 +00: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
Robin Gloster 3b4765c9e5 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-02-28 16:32:57 +00:00