Commit Graph

1293 Commits

Author SHA1 Message Date
mucaho
d0d953d910 rstudio: add run-time dependency gnumake
fixes #9163.
2015-10-25 16:18:21 +01:00
Wout Mertens
5c34563cda Merge pull request #10517 from demin-dmitriy/sublime3
sublime3: make sublime text work with pkexec and gksudo
2015-10-24 19:16:34 +02:00
Demin Dmitriy
8a1e5d9a27 sublime3: add myself as a maintainer 2015-10-24 18:15:59 +03:00
Demin Dmitriy
c66f8b293b sublime3: add pkexec and gksudo support 2015-10-24 18:14:59 +03:00
Jude Taylor
8f663ee0fb neovim: don't link with libutil on Darwin 2015-10-22 13:47:03 -07:00
Jude Taylor
97ebba6f1a add vim-vanilla changes to vim_configurable 2015-10-19 16:46:23 -07:00
Arseniy Seroka
4b8d0394f9 Merge pull request #10457 from rycee/bump/checkstyle
eclipse-plugin-checkstyle: 6.11.0 -> 6.11.1
2015-10-18 23:10:11 +03:00
Robert Helgesson
3a6439f8d5 eclipse-plugin-testng: 6.9.7 -> 6.9.8 2015-10-18 18:19:55 +02:00
Robert Helgesson
ab605f0a99 eclipse-plugin-checkstyle: 6.11.0 -> 6.11.1 2015-10-18 14:34:34 +02:00
Peter Simons
c7105ce939 emacs-markdown-mode: fix misspelled license attribute 2015-10-15 15:14:34 +02:00
Peter Simons
7fb7fafe0f emacs-markdown-mode: add version 2.0-82-gfe30ef7 2015-10-15 14:35:57 +02:00
Joe Hermaszewski
d5a364cf8f neovim: 2015-10-08 -> 2015-10-12 2015-10-14 20:15:42 +01:00
Joe Hermaszewski
d6d88aaa2b neovim: Create symlink to correct python3 binary
The symlink being created pointed to 'python' rather than 'python3'
2015-10-14 11:57:40 +02:00
Vladimír Čunát
f014217a55 spidermonkey-{17,24}: split the dev and lib outputs 2015-10-13 20:19:02 +02:00
Vladimír Čunát
1fdbc3097b alsa-lib: split "dev" output and fix referrers 2015-10-13 20:18:55 +02:00
Vladimír Čunát
cba6641623 cairo, pango: fix some string references 2015-10-13 20:18:51 +02:00
Vladimír Čunát
91407a8bdf ncurses: split into multiple outputs
Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
2015-10-13 20:18:44 +02:00
David Tulig
a96b35b4ce android-studio: 1.2.2.0 -> 1.4.0.10 2015-10-11 20:04:32 -05:00
Jude Taylor
b345f70939 propagate cf-private with AppKit; fixes emacs and others 2015-10-11 12:09:27 -07:00
vbgl
055f08dcf9 Merge pull request #10311 from expipiplus1/bump-neovim-version
neovim: 2015-06-09 -> 2015-10-08
2015-10-11 08:39:46 +02:00
Pascal Wittmann
5b68b8aa17 Merge pull request #10301 from rycee/bump/checkstyle
eclipse-plugin-checkstyle: 6.9.0 -> 6.11.0
2015-10-10 21:29:36 +02:00
Joe Hermaszewski
36be2e9144 neovim: 2015-06-09 -> 2015-10-08 2015-10-10 20:29:06 +01:00
Robert Helgesson
abd63d4147 eclipse-plugin-testng: 6.9.5 -> 6.9.7 2015-10-10 13:47:25 +02:00
Robert Helgesson
e2acc25cbc eclipse-plugin-checkstyle: 6.9.0 -> 6.11.0 2015-10-10 13:28:25 +02:00
Juho Östman
4f8fa82a39 geany: add geany-with-vte to use the terminal 2015-10-07 00:17:57 +03:00
Juho Östman
b79d3c266b textadept: 8.0 -> 8.2 2015-10-06 22:41:46 +03:00
Pascal Wittmann
7970239f52 org-mode: 8.3.1 -> 8.3.2 2015-10-06 18:14:09 +02:00
Pascal Wittmann
0f90d10d0b Merge pull request #10243 from frlan/Update/Geany/1.25.x
Geany: Update to 1.25
2015-10-06 14:48:17 +02:00
Jude Taylor
7283bb7466 introduce separate cf-private package to account for no CLT 2015-10-06 00:11:10 -07:00
Frank Lanitz
8597245eac Geany: Update from 1.24.1 to 1.25 2015-10-06 07:48:03 +02:00
John Wiegley
c4a32f6376 emacsMacport_24_5: upgrade 24.5-mac-5.10 -> 24.5-mac-5.11 2015-10-05 14:15:45 -07:00
Vladimír Čunát
f8c211fd2b fontconfig: split into multiple outputs
Fixed all 'fontconfig}' references as well, hopefully, ugh!
2015-10-05 12:23:56 +02:00
Vladimír Čunát
b44d846990 udev: complete rework
- systemd puts all into one output now (except for man),
  because I wasn't able to fix all systemd/udev refernces
  for NixOS to work well
- libudev is now by default *copied* into another path,
  which is what most packages will use as build input :-)
- pkgs.udev = [ libudev.out libudev.dev ]; because there are too many
  references that just put `udev` into build inputs (to rewrite them all),
  also this made "${udev}/foo" fail at *evaluation* time
  so it's easier to catch and change to something more specific
2015-10-04 10:03:53 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Jude Taylor
0870c09854 darwin purity: emacs-24.5-mac 2015-09-30 17:14:43 -07:00
Arseniy Seroka
df13fd5ae5 Merge pull request #10150 from khumba/netbeans-8
netbeans: 7.4 -> 8.0.2
2015-09-30 15:02:14 +03:00
Bryan Gardiner
eaddd4e5e8
netbeans: additional patching
- Patches a new awk call in the Netbeans 8 launcher, to fix a warning
  on startup:

    /nix/store/...-netbeans-8.0.2/netbeans/platform/lib/nbexec: line 201:
    /usr/bin/awk: No such file or directory

- Patches a bunch of sh/perl/python shebangs.
2015-09-29 22:03:38 -07:00
Bryan Gardiner
30cd66910e
netbeans: 7.4 -> 8.0.2 2015-09-29 22:03:38 -07:00
Brandon Martin
265e675152 vim: update python_framework.patch for darwin 2015-09-29 06:44:17 -06:00
Edward Tjörnhammar
e8ebf051a9 idea-{community,ultimate}: 14.1.4 -> 14.1.5 2015-09-28 07:22:59 +02:00
Thomas Tuegel
2e0589b4ca kde414: build with kdelibs-4.14.12
Upstream changes to the build system required adjusting many packages'
dependencies. On the Nixpkgs side, we no longer propagate the dependency
on cmake (to reduce closure size), so downstream dependencies had to be
adjusted for most packages that depend on kdelibs.
2015-09-27 15:08:12 -05:00
Matthias Beyer
1adaab27e2 joe: Move version to own variable 2015-09-25 15:40:28 +02:00
Matthias Beyer
0a818afe22 joe: 4.0 -> 4.1 2015-09-25 15:37:16 +02:00
William A. Kennington III
5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Arseniy Seroka
b81e25ef49 Merge pull request #10008 from rycee/fix/eclipse-plugin-scala
eclipse-plugin-scala: 4.1.1 -> 4.1.1.20150911
2015-09-23 18:23:12 +03:00
Vladimír Čunát
76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Robert Helgesson
17c468c9c7 eclipse-plugin-scala: 4.1.1 -> 4.1.1.20150911
No URL change since the update, unfortunately, happens in-place.
2015-09-23 01:25:41 +02:00
Jude Taylor
71d98332e9 make emacs buildable 2015-09-21 12:17:29 -07:00
Vincent Laporte
34c59894a6 ocaml-mode: fix build for OCaml >= 4.02 2015-09-17 20:58:35 +02:00
Robert Helgesson
d243a5d0c9 eclipse-plugin-bytecode-outline: init at 2.4.3 2015-09-15 22:13:14 +02:00
William A. Kennington III
773b4deb7c Merge commit 'a6f6c0e' into master.upstream
This is a partial merge of staging where we have up to date binaries for
all packages.
2015-09-15 12:16:49 -07:00
Peter Simons
8836c58dc0 Remove all references to haskell-ng and haskellngPackages from Nixpkgs. 2015-09-15 16:11:58 +02:00
Vladimír Čunát
88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát
21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Pascal Wittmann
db0819f955 Fix some meta.license attributes 2015-09-15 11:02:09 +02:00
Domen Kožar
eb29d8e44b Merge pull request #9869 from Mathnerd314/import-fix
all-packages: Use callPackage where possible
2015-09-15 06:53:50 +02:00
Mathnerd314
eb7404d97a all-packages: Use callPackage where possible 2015-09-14 22:27:19 -06:00
Domen Kožar
60ad36ba67 libreoffice: 5.0.0.5 -> 5.0.1.2, refactor
I've extracted some of libraries and made expression simpler.

(cherry picked from commit 66e6f99d40)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-15 05:41:37 +02:00
Samuel Rivas
40d26f6730 erlang-mode: refactor maintainers (close #9855) 2015-09-14 23:47:20 +02:00
Robert Helgesson
11693943de eclipse-plugin-checkstyle: 6.5.0.201504121610 -> 6.9.0.201508291549 2015-09-09 09:47:48 +02:00
Arseniy Seroka
54bcc4e446 Merge pull request #9699 from samuelrivas/emacs-erlang-mode
Add erlang-mode for emacs
2015-09-08 00:00:33 +03:00
Jascha Geerds
33e210a5cb Merge pull request #9695 from desiderius/pycharm-4.5.4
idea.pycharm-{community,professional}: 4.5.3 -> 4.5.4
2015-09-07 22:59:40 +02:00
Arseniy Seroka
b70ffedbcc Merge pull request #9694 from samuelrivas/update-emacs-solarized-theme
update emacs solarized theme and fix the name
2015-09-07 23:45:20 +03:00
Samuel Rivas
43fe8f2859 color-theme-solarized: initial at 1.0.0
update emacs solarized theme and fix the name

  * Added myself as maintainer as no one was there
  * Picked the latest version (no tags in that repo)
  * Changed the name, this was (probably mistakenly) named as color-theme, which
    is another package
2015-09-07 22:35:36 +02:00
Samuel Rivas
ce433f2a5f emacs-mode: initial (same version as erlang)
This is just extracted from the erlang derivation. Otherwise one needs to know
where the emacs mode is (and the path depends on the version of Erlang used)
2015-09-07 22:32:26 +02:00
desiderius
709ddcb475 idea.pycharm-{community,professional}: 4.5.3 -> 4.5.4 2015-09-07 16:01:43 +02:00
Domen Kožar
d2f0bc747d atom: 1.0.0 -> 1.0.4
(cherry picked from commit 072196adb0)
Signed-off-by: Domen Kožar <domen@dev.si>
2015-09-07 12:22:08 +02:00
William A. Kennington III
c6f689f951 Merge branch 'master.upstream' into staging.upstream 2015-09-04 12:05:11 -07:00
Domen Kožar
162f4e9e66 Revert "Updated atom to 1.0.10"
This reverts commit 6a974efdd2.

Atom doesn't start
2015-09-04 20:21:49 +02:00
Peter Simons
398fc5d9fe emacs-ido-ubiquitous: add version 3.6-4-gb659bf8 2015-09-04 12:38:51 +02:00
William A. Kennington III
b8b47ecea0 codeblock: Boost 1.59 compat 2015-09-03 17:31:22 -07:00
Shaun Bruce
6a974efdd2 Updated atom to 1.0.10 2015-09-02 08:17:38 +00:00
John Wiegley
b3bd3eef38 emacsMacport: 24.5-mac-5.9 -> 24.5-mac-5.10 2015-09-01 08:39:45 -07:00
Peter Simons
881fb00fdf emacs-magit: update to version 2.2.1 2015-09-01 16:56:12 +02:00
Peter Simons
bcd3e06f4c emacs-git-modes: update to version 1.2.0 2015-09-01 16:56:12 +02:00
Peter Simons
ebd99dea2f emacs-dash: update to version 2.11.0 2015-09-01 16:56:12 +02:00
Peter Simons
f33f8e1b34 emacs-haskell-mode: update to version 13.14-169-g0d3569d 2015-09-01 16:56:11 +02:00
Enrico Fasoli
0f041e5487 ne: init at 3.0.1
ne: building improvements
2015-08-28 14:24:03 +00:00
Jascha Geerds
4e478cbeaa cask: 0.7.2 -> 0.7.3 2015-08-27 22:08:24 +02:00
Bjørn Forsman
5c8a1fe5e1 eclipse: name plugins "eclipse-plugin-${name}"
Instead of "eclipse-${name}". The latter is slightly confusing since
there are non-plugin eclipse packages named "eclipse-${name}", like
eclipse-modeling or eclipse-cpp.
2015-08-26 22:54:23 +02:00
Robert Helgesson
771b1a5358 eclipse-scala: fix sha256, file changed upstream 2015-08-26 22:46:42 +02:00
Robert Helgesson
3d23cb0375 eclipse-testng: 6.9.5.201506120235 -> 6.9.5.201508210528 2015-08-26 22:43:27 +02:00
lethalman
5828e34309 Merge pull request #9366 from gebner/edbrowse-3.5.4.1
edbrowse: 3.5.2 -> 3.5.4.1
2015-08-26 10:47:52 +02:00
Kamil Chmielewski
75250d5add vim_configurable: fix revision name and update (close #9365) 2015-08-22 09:14:37 +02:00
William A. Kennington III
8255ac0d68 vim: 7.4.826 -> 7.4.827
Fix the version string to match the new versioning scheme after the
github migration.
2015-08-20 15:57:28 -07:00
Peter Simons
58c02a0cbe emacs-haskell-mode: update to latest Git version
Hopefully, this update fixes the TAB-completion issues in ghci.
2015-08-20 22:06:07 +02:00
Shea Levy
3506c0bf04 emacs: Build cocoa on darwin 2015-08-20 08:37:04 -04:00
Gabriel Ebner
8a137ead51 edbrowse: 3.5.2 -> 3.5.4.1 2015-08-20 14:33:12 +02:00
Thomas Tuegel
8f271a771d Merge pull request #9270 from Mathnerd314/supertux-editor
supertux-editor: init at git-2014-08-20
2015-08-17 17:13:44 -05:00
Mathnerd314
4ff22bd680 supertux-editor: init at git-2014-08-20 2015-08-17 09:00:18 -06:00
William A. Kennington III
d438d0e98b vim: 7.4.683 -> 7.4.826
Also, since googlecode is shutting down in <1 month move this to the new
github tree. This removes the dependence on mercurial.
2015-08-14 14:06:58 -07:00
Bjørn Forsman
55d93854ce eclipse-gnuarmeclipse (plugin): init at 2.8.1-201504061754 2015-08-12 23:13:36 +02:00
Bjørn Forsman
b56e9bc92a eclipse-cdt (plugin): init at 8.7.0 2015-08-12 23:13:36 +02:00
Vladimír Čunát
8f2be7122c emacs24: style fixups
Unused gtk parameter, "incorrect" usage of optional.
2015-08-11 17:26:51 +02:00
Luca Bruno
43c3664ec6 vanubi: 0.0.14 -> 0.0.16 2015-08-11 12:19:28 +02:00
Robert Helgesson
24a5d47883 eclipse.plugins: unpack plugins when required
Some plugin bundles must be unpacked when used in Eclipse. With this
change the plugin manifest is checked for the setting indicating that
unpacking should happen.
2015-08-10 23:12:03 +02:00
Robert Helgesson
7d60bb48eb scala-eclipse: 4.1.0 -> 4.1.1 2015-08-10 23:12:03 +02:00
Robert Helgesson
d0bbbd42f0 eclipse.plugins: remove useless function arguments
Simplifies `buildEclipsePlugin` and `buildEclipseUpdateSite` functions
such that they require only absolutely necessary arguments. Also
add/expand comments slightly.
2015-08-10 23:12:03 +02:00
Robert Helgesson
0bbaba47e9 eclipses: do not recurse into plugins.nix
It does not really make sense to install the plugin packages directly as
they are intended for use with `eclipseWithPlugins`. Therefore it is
best not to present them to users as such.
2015-08-10 23:12:03 +02:00
Robert Helgesson
4134d6b5b9 eclipse-acejump: init at 1.0.0.201501181511 2015-08-10 23:12:03 +02:00
Robert Helgesson
b253f95529 eclipses.plugins: put standard builders in set
This makes these builder functions available for use outside the file.
That is, plugins can be defined out-of-tree.
2015-08-10 23:12:03 +02:00
Robert Helgesson
c24e01665b eclipses.plugins: add buildEclipsePluginBase
This function provides functionality common to all Eclipse plugin
builders. In particular, it sets a package name and flags the derivation
as an Eclipse plugin.
2015-08-10 23:12:03 +02:00
Robert Helgesson
2fca9e09c4 eclipse-platform: init at 4.5 2015-08-10 23:12:03 +02:00
Robert Helgesson
35eade30ff eclipse-scala: init at 4.1.0 2015-08-10 23:12:03 +02:00
Robert Helgesson
89dd331906 eclipse-jdt: init at 4.5 2015-08-10 23:12:03 +02:00
Robert Helgesson
35a24a7977 eclipse-testng: init at 6.9.5.201506120235 2015-08-10 23:12:03 +02:00
Robert Helgesson
95cb770b53 eclipse-eclemma: init at 2.3.2.201409141915 2015-08-10 23:12:03 +02:00
Robert Helgesson
d16bb1af3d eclipse-checkstyle: init at 6.5.0.201504121610
Also add helper function for building packages from downloaded Eclipse
update site.
2015-08-10 23:12:03 +02:00
Robert Helgesson
28bb4e4018 eclipse-color-theme: init at 1.0.0.201410260308 2015-08-10 23:12:02 +02:00
Robert Helgesson
543da4e00f eclipse-findbugs: init at 3.0.1.20150306-5afe4d1 2015-08-10 23:12:02 +02:00
Robert Helgesson
90edb9e5ae eclipse-emacsplus: init at 4.2.0 2015-08-10 23:12:02 +02:00
Robert Helgesson
733d902299 eclipse-anyedittools: init at 2.4.15.201504172030
This commit also introduces some infrastructure surrounding Eclipse
plugins.
2015-08-10 23:12:02 +02:00
Robert Helgesson
3310ebe993 eclipses: add function eclipseWithPlugins
This function allows installation of a given Eclipse with a given list
of Eclipse plugins.
2015-08-10 23:12:02 +02:00
Pascal Wittmann
45c284c955 org: update from 8.3 to 8.3.1 2015-08-07 18:14:17 +02:00
Peter Simons
c67aaca6d9 emacs-haskell-mode: switch default to git version
We track the git version, because haskell-mode does not provide regular
releases except via MELPA, which our Emacs infrastructure does not support yet.
2015-08-07 15:13:14 +02:00
Arseniy Seroka
d25014a3cd Merge pull request #9060 from oxij/emacs-cleanup
Cleanup in emacs-packages
2015-08-06 20:54:46 +03:00
Pascal Wittmann
3dbdac801c org-mode: update from 8.2.10 to 8.3 2015-08-05 14:35:35 +02:00
Charles Strahan
7c1a3da1c4 macvim: fix bad copy/paste in 6f08fdd26
In 6f08fdd26, I left in a typo after copying from my `~/.nixpkgs/config`.
I would normally test this out locally, but I'm fixing up my conf locally,
and, in the interest of not forgetting to push this change up, made the edit
through GitHub's UI.
Oops.
2015-08-04 17:46:45 -05:00
Charles Strahan
6f08fdd26a macvim: 7.4.479 -> 7.4.648
This updates macvim to 7.4.648. This also fixes the build, which was broken when I set the default Ruby version to 2.2.2 (one of the symbols was renamed).
2015-08-04 17:42:08 -05:00
Jan Malakhovski
56fbeb7a93 emacs-packages: add automatic meta.homepages to builders, cleanup other expressions
Because we can.
2015-07-31 02:02:04 +00:00
Tobias Geerinckx-Rice
6c6201a99b Remove unnecessary rec{s from "my" packages 2015-07-31 02:02:07 +02:00
Bjørn Forsman
f595450912 eclipse: switch to officially mirrored download URLs
That is, replace all mirror specific URLs with the generic form:

  http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/path/to/file

* r=1 auto-redirects to best mirror
* nf=1 returns HTTP 404 if there is no file, instead of HTML data

It's documented here:

  http://wiki.eclipse.org/IT_Infrastructure_Doc#Use_mirror_sites.2Fsee_which_mirrors_are_mirroring_my_files.3F

All URLs are tested (they work).
2015-07-29 13:41:35 +02:00
Arseniy Seroka
0117488423 Merge pull request #8987 from Profpatsch/texmacs-update
texmacs: update to 1.99.2
2015-07-29 00:27:12 +03:00
Bjørn Forsman
3715c2e089 eclipses: add eclipse-cpp-4.5 (Mars release) 2015-07-28 21:18:54 +02:00
Profpatsch
f3c1ad6baf texmacs: 1.0.7.11 -> 1.99.2 2015-07-28 16:06:29 +02:00
Eelco Dolstra
761fc1a457 Remove tabs 2015-07-26 12:00:43 +02:00
vbgl
384d2febfe Merge pull request #8915 from vbgl/pg
ProofGeneral: 4.3pre131011 -> 4.3pre150313
2015-07-26 11:03:44 +02:00
Vladimír Čunát
2cacf77c13 Merge branch 'master' into staging 2015-07-22 22:33:55 +02:00
Vincent Laporte
1173278f34 ProofGeneral: 4.3pre131011 -> 4.3pre150313 2015-07-21 15:27:02 +02:00
John Wiegley
60c6a9921e emacs: Update Mac Port Emacs to 24.5-mac-5.9 2015-07-20 14:22:43 -07:00
desiderius
17d9f91395 pycharm: update 4.5.2 to 4.5.3 2015-07-20 09:16:17 +02:00
William A. Kennington III
05c0fc15c0 Merge branch 'master.upstream' into staging.upstream 2015-07-19 15:20:04 -07:00
Austin Seipp
3d031a0764 Merge pull request #8873 from joachifm/nano-2_4_2
nano: 2.4.1 -> 2.4.2
2015-07-19 16:58:00 -05:00
Joachim Fasting
19d6b78cc5 nano: 2.4.1 -> 2.4.2 2015-07-18 11:44:54 +02:00
William A. Kennington III
e6d4367e92 ed: 1.10 -> 1.12 2015-07-17 14:37:34 -07:00
Vladimír Čunát
9f37e91ec5 Merge master into staging
There are larger-rebuild changes: gnutls and samba.
2015-07-17 06:38:04 +02:00
Robin Gloster
aaa44b7c57 phpstorm: 8.0.3 -> 9.0 2015-07-16 19:39:29 +00:00
Leonardo Cecchi
3f2de3eb64 leo-editor: init at 5.1 2015-07-14 21:49:28 +02:00
William A. Kennington III
333f145d76 Merge branch 'master.upstream' into staging.upstream 2015-07-13 15:11:31 -07:00
Tobias Geerinckx-Rice
335cc971be flycheck: correct description & use src's homepage 2015-07-13 00:44:55 +02:00
Pascal Wittmann
6d32ae415a heme: fix build by using -lncurses (ZHF) 2015-07-09 12:57:41 +02:00
Jude Taylor
976d80eb57 map apple sdk frameworks CF to darwin.CF to avoid confusion 2015-07-08 14:15:04 -07:00
William A. Kennington III
d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
Edward Tjörnhammar
d06fd884dc Merge pull request #8646 from bobvanderlinden/android-studio-1.2.2.0
idea: android-studio: update 1.2.1.1 -> 1.2.2.0
2015-07-05 14:07:56 +02:00
Bob van der Linden
542a508c63 idea: android-studio: update 1.2.1.1 -> 1.2.2.0 2015-07-05 11:43:46 +02:00
Pascal Wittmann
0f2f98fbfe Merge pull request #8610 from datakurre/datakurre-master-emacs
emacs: fix to use \${gettext}/share/locale/locale.alias
2015-07-04 23:37:27 +02:00
Vincent Laporte
2363660191 jedit: fix build 2015-07-04 13:05:11 +02:00
Kevin Quick
882f3ad0db htmlize: update source location 2015-07-03 15:33:26 -07:00
Asko Soukka
278287a99b emacs: fix to use \${gettext}/share/locale/locale.alias 2015-07-03 03:18:15 +03:00
Pascal Wittmann
27e0488e11 Merge pull request #8421 from travisbhartwell/update/atom
atom: 0.187.0 -> 1.0.0
2015-07-02 11:37:33 +02:00