JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,320 Commits 2 Branches 0 Tags 13 GiB
c5f54786a1
Commit Graph

56 Commits

Author SHA1 Message Date
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02: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
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
Charles Strahan
e08dd09c25 emacs: add optional support for 24-bit color ttys 2016-02-26 00:33:56 -05:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
John Wiegley
fdc69f2e8f emacs24: Add jwiegley as a maintainer 2016-01-11 12:55:48 -08:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size 
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
 2015-11-20 14:32:58 +01:00
Jude Taylor
df80090d09 use per-derivation sandbox profiles 2015-11-19 11:31:06 -08:00
Jude Taylor
e3246b357c emacs: propagate AppKit for dependencies 2015-10-28 13:56:38 -07:00
Jude Taylor
83deac082f clean up emacs arguments 2015-10-28 13:34:53 -07:00
Jude Taylor
5207f6b45c clean up emacs framework dependencies 2015-10-28 13:34:53 -07:00
Vladimír Čunát
cba6641623 cairo, pango: fix some string references 2015-10-13 20:18:51 +02:00
Jude Taylor
b345f70939 propagate cf-private with AppKit; fixes emacs and others 2015-10-11 12:09:27 -07: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
Jude Taylor
71d98332e9 make emacs buildable 2015-09-21 12:17:29 -07: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
Shea Levy
3506c0bf04 emacs: Build cocoa on darwin 2015-08-20 08:37:04 -04:00
Vladimír Čunát
8f2be7122c emacs24: style fixups 
Unused gtk parameter, "incorrect" usage of optional.
 2015-08-11 17:26:51 +02:00
Eelco Dolstra
761fc1a457 Remove tabs 2015-07-26 12:00:43 +02:00
Asko Soukka
278287a99b emacs: fix to use \${gettext}/share/locale/locale.alias 2015-07-03 03:18:15 +03:00
Herwig Hochleitner
8b0b9be025 emacs24: add options for acl and gpm 2015-06-07 13:26:27 +02:00
Aycan iRiCAN
151456da27 emacs-24: Removed obsolete patch file 2015-04-20 08:28:17 +03:00
Luca Bruno
9d3f02c5de Revert "Emacs 24.5: Fix build on Darwin." 
This reverts commit 869b86d925.

It breaks tarball evaluation, see 869b86d925
 2015-04-17 13:01:09 +02:00
Moritz Ulrich
869b86d925 Emacs 24.5: Fix build on Darwin. 
`darwin-new-sections.patch' is now in upstream.
 2015-04-15 12:02:38 +02:00
Thomas Tuegel
e75a0c50bd emacs: allow gtk without X on Darwin 2015-04-14 09:16:21 -05:00
Thomas Tuegel
cebf589462 Merge pull request #7294 from ttuegel/emacs 
emacs: allow choosing gtk2 or gtk3
 2015-04-12 15:12:12 -05:00
Moritz Ulrich
034e1c4aef emacs24: Update to 24.5 2015-04-11 14:24:41 +02:00
Thomas Tuegel
bc4f39f48b emacs: allow choosing gtk2 or gtk3 2015-04-09 11:38:46 -05:00
=
46d1dd5b11 Downgraded Emacs priority, for exuberant ctags 
Exuberant ctags works with Emacs among with other editors, and if
installed is probably preferred to Emacs' ctags.
 2015-03-26 21:42:36 +00:00
Moritz Ulrich
86bd152378 Emacs: Fix `woman'. 2015-03-07 12:03:26 +01:00
John Wiegley
0d1a16d48f emacs24: Add #define for building on Yosemite (darwin) 2015-01-03 07:32:38 -05:00
Moritz Ulrich
635d49e973 Emacs: remove --with-crt-dir (no longer supported) 2014-10-25 20:34:51 +02:00
Moritz Ulrich
7e78166563 emacs24: Update to 24.4. 2014-10-20 22:08:19 +02:00
Moritz Ulrich
10ba4b67e4 Emacs: Use gnutls instead of OpenSSL. 
It looks like this error was introduced accidentally with 0132e1b. Emacs
can't use openssl to make secure connections.
 2014-08-21 12:45:28 +02:00
Eelco Dolstra
0132e1bb48 emacs: On Darwin, don't depend on gconf and cairo 2014-08-09 19:08:37 +02:00
Eelco Dolstra
a7c1541a21 emacs: Fix building on Darwin with recent versions of GCC 
This gets rid of the "unexec: unrecognized section __static_data in
__DATA segment" error while dumping Emacs.
 2014-08-09 19:08:37 +02:00
Petr Rockai
e3fae16a29 emacs: Allow non-GTK X11 builds (--with-x-toolkit=lucid). 2014-01-25 16:30:14 +01:00
Eric Kow
9a97b842c5 Emacs darwin: avoid X unless explictly requested 
This keeps the dependencies lighter. Perhaps future work on this
derivation could enable the Cocoa interface by default on Mac.
 2013-11-10 13:41:10 +00:00
Benno Fünfstück
351c9e310d Emacs: Fix TRAMP by adjusting its path so that it finds ls and other binaries on NixOS systems 
Close #1094.
 2013-10-22 09:56:43 +03:00
Vladimír Čunát
d3c6bd45ca emacs24: fix license typo, change indentation 
Note that the double-quote "indented strings" strip indentation,
so this ugly style was pointless.
 2013-09-14 15:30:27 +02:00
Jason \"Don\" O'Conal
ad454f3511 emacs24: fix build on darwin (clos #932) 2013-09-14 15:19:54 +02:00
Danie Roux
fcd9904be6 emacs24: Let -nox be a whole lot less X than it was 
--with-x-toolkit=no still wants to -lX11 when checking for ncurses
 2013-09-01 16:30:32 +02:00
Moritz Ulrich
a10812f792 Add emacs24-nox: emacs built without X (or GTK) libraries. 
This commit also fixes an issue where pkgconfig was only added as a
dependency when gtk support was enabled. This made ./configure unable
to find other libraries (libtiff, libxml2, gnutls, and others).
 2013-08-24 07:36:11 +03:00
Eelco Dolstra
7ac6b10446 emacs: Support building without GTK+ 2013-08-21 11:47:57 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Jason "Don" O'Conal
72a771b6e4 emacs24: fix build on darwin 2013-07-03 19:57:38 +10:00
Peter Simons
5186e75c4f emacs: update to version 24.3 
The builder.sh script used to call "make bootstrap" before running the build.
This build step, however, removes all kinds of generated files normally
included in the distributions -- such as the 'configure' script. If that target
is run, then new version of Emacs require Autoconf and Automake to compile.
Since the benefit of running "make bootstrap" is unclean to me, I chose to
remove that build step instead. As far as I can tell, the Emacs binary that
results from this build works fine.
 2013-03-11 19:18:31 +01:00
Ludovic Courtès
dc4cfe89ff emacs: Update to 24.2. 2012-08-27 18:16:06 +02:00
Peter Simons
6ace4728f5 emacs-24: improved meta.description 
svn path=/nixpkgs/trunk/; revision=34477
 2012-06-12 12:18:12 +00:00