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