Commit Graph

80 Commits

Author SHA1 Message Date
Martin Weinelt
49cd2f2d1f
Revert "emacs: set 29 as default version and remove 28" (#272785)
Too many rebuilds to go to master, even if they are cheap they cause a lot of delay on nixos-unstable.
2023-12-08 01:34:55 +01:00
Lin Jian
96bc94784d
emacs: remove 28 2023-11-30 12:04:47 +08:00
Anderson Torres
b2fae2486e emacs: small rewrite 2023-10-29 17:30:40 -03:00
Andrew Pan
407f8a3806
emacs: use llvmPackages_14 from apple_sdk_11_0
Fixes issues with macport x86_64 build.

Signed-off-by: Andrew Pan <a@tny.town>
2023-09-07 13:06:55 -05:00
Mario Rodas
bdce9a2bc2 emacs: fix build on x86_64-darwin 2023-09-02 04:20:00 +00:00
Andrew Pan
f607a78516 emacs-macport: build on LLVM 14
- Build on `apple_sdk_11_0` to support `aarch64-darwin`
- Add frameworks required for building on newer SDKs
  - `Accelerate`, `UniformTypeIdentifiers`
- Include header to work around `CF_NOESCAPE` issue circa LLVM 7.0
2023-08-31 14:20:27 +00:00
Anderson Torres
f6a6dc801f emacs: refactor
- Remove the excessive repetition of inherited packages
- Factor the excessive repetition of metadata in sources.nix
2023-08-26 16:21:58 +00:00
Anderson Torres
2160abc3ed emacs29-macport: init at 29.1 2023-08-10 23:45:09 -03:00
Anderson Torres
ae4e2e8676 emacs28-macport: rename from emacs-macport
Also, move emacsMacport to aliases.nix.
2023-08-10 22:47:13 -03:00
Anderson Torres
3d43f48a93 emacs29: init at 20.0.91
Given that Emacs 29 is considered beta, it will not be aliased to `emacs`.
And, given that Emacs 29 ships with Pure GTK feature, why not to make it
available?
2023-05-29 22:23:52 -03:00
Anderson Torres
c4e48ded59 emacs: a huge refactor
A list of modifications:

- The calling handles at `top-level/all-packages.nix` were transferred to
`pkgs/applications/editors/emacs/default.nix` (the good old `recurseIntoAttrs`
design pattern);
- The files `macport.nix` and `28.nix` were removed, replaced by the bigger and
better `sources.nix`;
- Aliases for the most important derivations were put on `all-packages.nix`;
- The file `generic.nix` was refactored. Among its changes, the most noticeable:
  - `pname` is decorated according to the selected UI options;
  - Environment variables are explicitly under `env` set;
  - The `null` defaults and (in)equality tests were removed;
    - It obliged the addition of some Boolean flag guards;
  - The flag `noGui` was added, allowing easier override for `emacs-nox`.

With this huge refactor, the emacs build functions become more sane and
maintainable, allowing future additions.
2023-05-29 22:16:45 -03:00
adisbladis
967259e6b4
emacs: Factor out expression to a generic build 2020-08-21 00:54:00 +02:00
adisbladis
d95c93c2ae
emacs: Add --with-cairo when X is enabled 2020-08-17 11:31:42 +02:00
Peter Hoeg
5230f07301 emacs: use autoreconfHook instead of manually invoking it 2020-08-16 23:28:05 +08:00
adisbladis
7defacb757
emacs: 26.3 -> 27.1 2020-08-11 13:41:44 +02:00
adisbladis
5f74b92a14
emacs: Make stdenv.mkDerivation params non recursive 2020-07-24 12:11:05 +02:00
adisbladis
d1b0eef9b5
emacs: Don't use interpolation for version 2020-07-24 12:10:54 +02:00
adisbladis
807e8e053c
emacs: Always add cairo as a build input if X is enabled 2020-07-24 03:16:17 +02:00
adisbladis
bf9e3b8dbf
emacs: Add native-comp feature branch infrastructure 2020-07-23 20:34:40 +02:00
adisbladis
24fd45ad8b
emacs: Add jansson & harbuzz inputs
These are required for emacs 27 and above and the nix-community emacs
overlay are adding these via overrides.

Add these already on emacs 26 to be forwards compatible and require
less overrides in the overlay.
2020-07-23 20:34:39 +02:00
adisbladis
2b520b08d9
emacs: Move toolkit to function arguments
It's possible to build Emacs without any toolkits which uses xlib.
2020-05-23 22:34:26 +01:00
Jörg Thalheim
887295fd2d
treewide: remove the-kenny from maintainers
@the-kenny did a good job in the past and is set as maintainer in many package,
however since 2017-2018 he stopped contributing. To create less confusion
in pull requests when people try to request his feedback, I removed him as
maintainer from all packages.
2020-05-09 10:28:57 +01:00
Pavol Rusnak
6abf4a43ad
treewide: per RFC45, remove more unquoted URLs 2020-05-08 15:20:47 +02:00
John Wiegley
fd494fc013
Merge pull request #84785 from mikesperber/unbreak-emacs-macos 2020-04-20 10:57:17 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Mike Sperber
076f221a0b emacs: Unbreak on macOS
Backport an unexec fix.
2020-04-09 10:17:38 +02:00
Suwon Park
0d09b7025b
accidently added semicolon
Oops
2020-03-18 23:20:28 +09:00
Suwon Park
a99565139f
glib-networking for TLS/SSL network (https://) in xwidget
ea5bcb78c2 (r31513119)
He accidently errased the glib-networking.
But it is needed for TLS/SSL networking.
2020-03-18 23:03:17 +09:00
adisbladis
cf719bf9a8
emacs: Add adisbladis as maintainer 2020-03-15 01:03:40 +00:00
Robin Gloster
0f67406076
treewide: installTargets is a list 2019-12-30 04:50:37 +01:00
Mario Rodas
bc8ef6c3ff
emacs: also allow librsvg dependency when using withNS 2019-11-05 21:00:00 -05:00
Matthew Bauer
abd1172a6f emacs: 26.2 -> 26.3; emacs-mac: 26.2-7.6 -> 26.3-7.7 2019-08-29 10:19:55 -04:00
Matthew Bauer
2255f29206
Merge pull request #64901 from dgchurchill/emacs-imagemagick-macos
emacs: Also allow imagemagick dependency when using withNS
2019-07-17 10:07:01 -04:00
Dave Churchill
9339970dbf emacs: Also allow imagemagick dependency when using withNS
This allows Emacs to be used with imagemagick on macOS.
2019-07-16 22:09:43 +10:00
Daiderd Jordan
f2d2381838
emacs: remove cf-private 2019-07-03 22:20:19 +02:00
volth
f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Peter Hoeg
496f930948 emacs: do not capture build environment details for a (more) reproducible build 2019-04-29 14:38:04 +08:00
adisbladis
abedaef818
emacs: 26.1 -> 26.2 2019-04-13 00:00:03 +01:00
Vladyslav M
60ec578e6a
Merge pull request #57237 from vlaci/pkgs/emacs
emacs: backport hunspell 1.7.0 support from upstream
2019-03-29 16:32:07 +02:00
Andrew Childs
26e82e684c emacs: only use patchelf on linux
This prevents building Emacs with X on Darwin.

Broken by 5af6e9f75e (#54916)
2019-03-28 16:03:46 +09:00
László Vaskó
4952378a87 emacs: backport hunspell 1.7.0 support from upstream
NixOS 19.03 has hunspell 1.7.0 which is incompatible with emacs 26.1.
This issue has been fixed in upstream and we should drop this patch
after emacs is updated too.
2019-03-10 15:39:29 +01:00
deliciouslytyped
e5442ee185 emacs26: adds parameter siteStart: don't hard-code ./site-start.el 2019-03-03 20:25:00 +01:00
Florian Friesdorf
fbef5ab82f Remove myself as maintainer from packages
I'm currently not maintaining any packages.
2019-02-22 16:14:13 +01:00
Matthew Bauer
d6d5795ed9
Merge pull request #54916 from pbogdan/emacs-xcursor
emacs: link libXcursor when using lucid toolkit
2019-02-19 22:50:30 -05:00
Piotr Bogdan
5af6e9f75e emacs: link libXcursor when using lucid toolkit 2019-01-30 16:21:06 +00:00
Olli Helenius
2f9b85855b emacs: tramp: detect wrapped gvfsd-fuse daemon
Tramp checks for a running `gvfsd-fuse` process to figure out whether to enable
gvfs-based. Its `tramp-compat-process-running-p` function uses
`/proc/<pid>/comm` to check for the name of running process(es). In Nix, the
gvfsd processes are launched via wrappers and the name of `gvfsd-fuse` in
`comm` in Linux is `.gvfsd-fuse-wra` (truncated to 15 characters) which
means the process is not detected and `tramp-gvfs-enabled` ends up with
`nil` even when gvfs is available.

This patch adds `.gvfsd-fuse-wrapped` to the list of process names to check when
determining the value of `tramp-gvfs-enabled`.
2019-01-10 18:16:03 +02:00
c0bw3b
0498ccd076 Treewide: use HTTPS on GNU domains
HTTP -> HTTPS for :
- http://gnu.org/
- http://www.gnu.org/
- http://elpa.gnu.org/
- http://lists.gnu.org/
- http://gcc.gnu.org/
- http://ftp.gnu.org/ (except in fetchurl mirrors)
- http://bugs.gnu.org/
2018-12-02 15:51:59 +01:00
Daiderd Jordan
f495707eb6 emacs: include cf-private on darwin and don't propagate frameworks
Undefined symbols for architecture x86_64:
      "_CFNotificationCenterAddObserver", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_CFNotificationCenterGetLocalCenter", referenced from:
          _macfont_copy_available_families_cache in macfont.o
      "_NSDefaultRunLoopMode", referenced from:
          _ns_send_appdefined in nsterm.o
          -[EmacsApp run] in nsterm.o
      "_OBJC_CLASS_$_NSArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in nsimage.o
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSDictionary", referenced from:
          objc-class-ref in macfont.o
      "_OBJC_CLASS_$_NSLocale", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSMutableDictionary", referenced from:
          objc-class-ref in nsmenu.o
          objc-class-ref in nsselect.o
      "_OBJC_CLASS_$_NSMutableSet", referenced from:
          objc-class-ref in nsterm.o
      "_OBJC_CLASS_$_NSRunLoop", referenced from:
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSTimer", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsmenu.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_CLASS_$_NSUserDefaults", referenced from:
          objc-class-ref in nsterm.o
          objc-class-ref in nsfns.o
      "_OBJC_EHTYPE_$_NSException", referenced from:
          GCC_except_table8 in nsterm.o
          GCC_except_table1 in nsselect.o
    ld: symbol(s) not found for architecture x86_64
2018-11-05 21:16:58 +01:00
Andrew Childs
bbf37b8c45 emacs: allow X and cli-only builds on Darwin 2018-09-10 12:20:23 +09:00
Herwig Hochleitner
ea5bcb78c2 emacs: update dependencies
new config options, xwidgets support updated in emacs 26

cc @chaoflow @lovek323 @peti @the-kenny @jwiegley
2018-08-16 09:38:55 +02:00