colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
556,091 Commits 125 Branches 0 Tags 3.4 GiB
00accfe565
Commit Graph

752 Commits

Author SHA1 Message Date
Mario Rodas
bdce9a2bc2 emacs: fix build on x86_64-darwin 2023-09-02 04:20:00 +00:00
Lucas Franceschino
0efb400ade emacs: add missing libXi dependency when enabling withXinput2 
Without libXi, the configure flag `--with-xinput2` has no effect.

This can be verified by looking up the variable `system-configuration-features` in Emacs.
 2023-09-01 13:30:27 +00:00
Andrew Pan
0f4255bf11 emacs: fix env shallow merge 
Fixes regression caused by #252244.

`env` was first defined in its own attrset, which was merged with a
second attrset:

```nix
...
{
   env = {
     NATIVE_FULL_AOT = "1";
     LIBRARY_PATH = lib.concatStringsSep ":" libGccJitLibraryPaths;
   };
} // {
...
   env.NIX_CFLAGS_COMPILE = ...
...
}
```

In this situation, the `env` from the first attrset is not preserved,
since `//` does a shallow merge.

Signed-off-by: Andrew Pan <a@tny.town>
 2023-08-31 19:22:47 +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
8761b1475b nongnu-packages: updated 2023-08-26 (from overlay) 2023-08-29 10:41:54 +00:00
Anderson Torres
9e2d98584d melpa-packages: updated 2023-08-26 (from overlay) 2023-08-29 10:41:54 +00:00
Anderson Torres
d751b58f99 elpa-devel-packages: updated 2023-08-26 (from overlay) 2023-08-29 10:41:54 +00:00
Anderson Torres
eff18386fe elpa-packages: updated 2023-08-26 (from overlay) 2023-08-29 10:41:54 +00:00
Lin Jian
7d4ea94d02 emacs: keep the default first writable native-comp-eln-load-path dir 
Fixes https://github.com/NixOS/nixpkgs/issues/247804.
 2023-08-28 15:46:04 +00:00
Lin Jian
2d324ed8f9 emacs: fix the detection of native compilation for Emacs 29 
In Emacs 29, feature comp does not load early enough.  We use
native-compile instead.  This is also what Emacs uses[1].

[1]: https://git.savannah.gnu.org/cgit/emacs.git/tree/lisp/startup.el?id=3685387e609753293c4518be75e77c659c3b2d8d#n586
 2023-08-28 15:46:04 +00:00
Lin Jian
1506ab49e3 emacs: correct the order of profiles and their sub dirs in load-path 
This patch does two things:
1. making user profiles preferred over system profiles
2. putting sub dirs of one profile to the right place
  - before this patch, they are appended to the end of load-path
  - after this patch, they are inserted right after the profile

Example value of load-path before this patch:

  /run/current-system/sw/share/emacs/site-lisp/
  /etc/profiles/per-user/user/share/emacs/site-lisp/
  /nix/store/hash1-emacs-packages-deps/share/emacs/site-lisp
  /nix/store/hash1-emacs-packages-deps/share/emacs/site-lisp/elpa
  /nix/store/hash1-emacs-packages-deps/share/emacs/site-lisp/elpa/wgrep-20230203.1214
  /nix/store/hash2-emacs-29.1-rc1/share/emacs/29.1/site-lisp
  /nix/store/hash2-emacs-29.1-rc1/share/emacs/site-lisp
  /nix/store/hash2-emacs-29.1-rc1/share/emacs/29.1/lisp
  /nix/store/hash2-emacs-29.1-rc1/share/emacs/29.1/lisp/vc
  ...
  /etc/profiles/per-user/user/share/emacs/site-lisp/elpa
  /etc/profiles/per-user/user/share/emacs/site-lisp/elpa/jinx-20230730.1200
  /run/current-system/sw/share/emacs/site-lisp/elpa
  /run/current-system/sw/share/emacs/site-lisp/elpa/repology-1.2.3

after this patch:

  /etc/profiles/per-user/user/share/emacs/site-lisp
  /etc/profiles/per-user/user/share/emacs/site-lisp/elpa
  /etc/profiles/per-user/user/share/emacs/site-lisp/elpa/jinx-20230730.1200
  /run/current-system/sw/share/emacs/site-lisp
  /run/current-system/sw/share/emacs/site-lisp/elpa
  /run/current-system/sw/share/emacs/site-lisp/elpa/repology-1.2.3
  /nix/store/hash1-emacs-packages-deps/share/emacs/site-lisp
  /nix/store/hash1-emacs-packages-deps/share/emacs/site-lisp/elpa
  /nix/store/hash1-emacs-packages-deps/share/emacs/site-lisp/elpa/wgrep-20230203.1214
  /nix/store/hash2-emacs-29.1-rc1/share/emacs/29.1/site-lisp
  /nix/store/hash2-emacs-29.1-rc1/share/emacs/site-lisp
  /nix/store/hash2-emacs-29.1-rc1/share/emacs/29.1/lisp
  /nix/store/hash2-emacs-29.1-rc1/share/emacs/29.1/lisp/vc
  ...
 2023-08-28 15:46:04 +00:00
Daniel Nagy
1159c64f58
emacsPackages.pikchr-mode: replace program 2023-08-27 09:15:00 +02:00
Mario Rodas
a153adf6cc
Merge pull request #251201 from nagy/emacs-typst-mode 
emacsPackages.typst-mode: replace program
 2023-08-26 11:35:19 -05: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
Daniel Nagy
faeb7ac63a
emacsPackages.typst-mode: replace program 2023-08-26 16:30:00 +02:00
Anthony Cowley
9b3fefd37d elpa-devel-packages: build xeft dynamic module 
Build the native dynamic module required by the xeft package for Emacs.
 2023-08-24 03:26:59 +00:00
Anthony Cowley
6dd389dd9f elpa-packages: build xeft dynamic module 
Build the native dynamic module required by the xeft package for Emacs.
 2023-08-24 03:26:59 +00:00
Anderson Torres
473e81ede4 emacs: better glib-networking detection 
Fixes https://github.com/NixOS/nixpkgs/issues/249756
 2023-08-18 11:58:47 +00:00
Anderson Torres
68f38d4634 emacsPackages.consult-gh: init at 20230706.438 2023-08-15 12:48:06 +00:00
Anderson Torres
e270bfe914 emacsPackages.power-mode: remove 
Because it was MELPA'd.
 2023-08-15 12:48:06 +00:00
Anderson Torres
2160abc3ed emacs29-macport: init at 29.1 2023-08-10 23:45:09 -03:00
Anderson Torres
05d277b11e emacs29: 29.1-rc1 -> 29.1 2023-08-10 23:45:09 -03:00
Anderson Torres
7e445b6d72 emacs: factor meta 2023-08-10 23:45:04 -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
Lin Jian
de24b1e3b1 emacs.pkgs.eglot: build info manual 2023-08-08 18:53:47 +00:00
Anderson Torres
065a7ed424 nongnu-packages: updated 2023-08-06 (from overlay) 2023-08-08 11:38:19 +00:00
Anderson Torres
c23bd886e1 melpa-packages: updated 2023-08-06 (from overlay) 2023-08-08 11:38:19 +00:00
Anderson Torres
deb0c58086 elpa-devel-packages: updated 2023-08-06 (from overlay) 2023-08-08 11:38:19 +00:00
Anderson Torres
e07cb46e21 elpa-packages: updated 2023-08-06 (from overlay) 2023-08-08 11:38:19 +00:00
Austin Horstman
58920127ca
treewide: add meta.mainProgram to editors 2023-08-04 11:44:05 -05:00
Jan Malakhovski
5852f26bdc treewide: noop: refer to src.name or similar in sourceRoot where appropriate, part 1: trivial cases 2023-08-03 16:32:03 +00:00
Mario Rodas
503c869a42 emacs29: 29.0.92 -> 29.1-rc1 
Changelog: https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-29

Release Notes: https://lists.gnu.org/archive/html/emacs-devel/2023-07/msg00704.html
 2023-07-23 04:20:00 +00:00
Theodore Ni
43850a77db
emacsPackages.tsc: adapt update script to new nix-prefetch-github 
The update script seems to have been broken already. More work needs to
be done to fix it. In the meantime, this PR also takes the opportunity
to switch to using newer "hash" and "cargoHash" attributes.
 2023-07-18 16:55:33 -07:00
R. Ryantm
75d49ecfa9 emacsPackages.ebuild-mode: 1.64 -> 1.65 2023-07-13 12:54:56 +00:00
Anderson Torres
a062bf3d8e emacs: factor meta 
Because metadata pertains to the source code variants, not to the build logic.
 2023-07-07 00:23:47 -03:00
adisbladis
e4d9386f02
Merge pull request #238737 from panchoh/bump-emacs-29.0.92 
emacs29: 29.0.91 -> 29.0.92
 2023-06-21 04:14:30 +12:00
pancho horrillo
dcbae5b0aa
emacs29: 29.0.91 -> 29.0.92 (both pretest) 
The new pretest was recently made available¹.

[1]: https://lists.gnu.org/archive/html/emacs-devel/2023-06/msg00503.html
 2023-06-20 11:48:08 +02:00
adisbladis
8ce7893477 emacs: add back treeSitter passthru 2023-06-20 02:18:47 +12:00
adisbladis
75650d79da emacs: add nativeComp passthru 
As reported by @terlar in
https://github.com/NixOS/nixpkgs/pull/235859#issuecomment-1597012885
the removal of nativeComp in passthru breaks external tooling.

This adds back `passthru.nativeComp` with a deprecation notice which sets the removal for 23.11.
 2023-06-20 02:18:47 +12:00
R. Ryantm
0b282be97a emacsPackages.ebuild-mode: 1.63 -> 1.64 2023-06-19 04:57:08 +00:00
Brian Leung
3cda91a80c Update elpa-devel-generated 2023-06-15 01:10:27 +00:00
Brian Leung
9c53e33ed6 Update emacs2nix 2023-06-15 01:10:27 +00:00
Mario Rodas
104992f3cf emacs: disable withXwidgets on darwin 
withXwidgets requires webkitgtk, which is marked as broken on Darwin.
 2023-06-13 04:20:00 +00:00
Atemu
328bcf4d57
Merge pull request #235859 from atorres1985-contrib/emacs-refactor 
Emacs refactor - Round II
 2023-06-12 15:31:54 +02:00
Anderson Torres
6889144e31 nongnu-packages: updated 2023-06-11 (from overlay) 2023-06-11 20:54:28 +00:00
Anderson Torres
8aa4d45ecc nongnu-packages: updated 2023-06-10 (from overlay) 2023-06-11 20:54:28 +00:00
Anderson Torres
f7cbd9fce2 melpa-packages: updated 2023-06-11 (from overlay) 2023-06-11 20:54:28 +00:00
Anderson Torres
51e5f35b27 melpa-packages: updated 2023-06-10 (from overlay) 2023-06-11 20:54:28 +00:00
Anderson Torres
487476d477 elpa-devel-packages: updated 2023-06-11 (from overlay) 2023-06-11 20:54:28 +00:00
Anderson Torres
110edeb87e elpa-packages: updated 2023-06-11 (from overlay) 2023-06-11 20:54:28 +00:00
Anderson Torres
b5bb1a4b47 elpa-packages: updated 2023-06-10 (from overlay) 2023-06-11 20:54:28 +00:00
Anderson Torres
4775531c49 emacs.pkgs.sunrise-commander: refactor 2023-06-11 20:54:28 +00:00
Anderson Torres
817356b227 emacs update-from-overlay: include elpa-devel 2023-06-11 20:54:28 +00:00
Brian Ryall
9967f8a796 emacsPackages.beancount: init at 20230205.436 2023-06-10 15:40:16 +00:00
Anderson Torres
e5e43e6beb emacs generic: rename attributes 
Namely:

- treeSitter -> withTreeSitter
- nativeComp -> withNativeCompilation
 2023-06-07 23:26:31 -03:00
Kira Bruneau
3f9a4f843c lsp-bridge: 20230603.345 -> 20230607.135 2023-06-07 13:00:01 -04:00
Damien Cassou
f676747451
Merge pull request #235994 from marsam/refactor-emacs.pkgs.treesit-grammars 2023-06-06 21:53:58 +02:00
Anderson Torres
196d71b295 emacs generic: decouple Xwidgets from X 2023-06-04 22:51:03 -03:00
Anderson Torres
441036d7f9 emacs generic.nix: append -macport to pname when appropriate 2023-06-04 22:49:27 -03:00
Anderson Torres
6a6110bd76 emacs generic.nix: require pname 
Also, remove versionModifier and name
 2023-06-04 22:46:55 -03:00
Juanjo Presa
2d6b28f068 emacsPackages.elpaDevelPackages: init 2023-06-04 18:53:00 +02:00
adisbladis
17e9d22b2b
Merge pull request #235710 from kira-bruneau/emacsPackages.acm-terminal 
emacsPackages.acm-terminal: 20230215.414 -> 20230601.1326
 2023-06-03 21:13:48 +12:00
Kira Bruneau
0cad02d6da emacsPackages.acm-terminal: 20230215.414 -> 20230601.1326 2023-06-03 01:00:14 -04:00
Kira Bruneau
44f6f0e404 emacsPackages.lsp-bridge: 20230424.1642 -> 20230603.345 2023-06-03 00:58:45 -04:00
Mario Rodas
8f0515dbf7 emacs.pkgs.treesit-grammars: refactor 
- Do not pass tree-sitter since it refers to the Emacs packages and it's
  not needed

- Use stdenv.hostPlatform since it's not a compiler.
 2023-06-03 04:20:00 +00:00
adisbladis
a11f65c777
Merge pull request #233538 from yuzukicat/emacsPackages.mind-wave 
emacsPackages.mind-wave 2d94f553a394ce73bcb91490b81e0fc042baa8d3 -> 5…
 2023-06-01 11:40:48 +12:00
Brian Leung
0bf7571e2f
emacs: Enable SQLite3 and WebP for Emacs >=29 2023-05-30 16:04:30 -07: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
Daniel Nagy
3ac96ee222
emacsPackages.hsc3-mode: use trivialBuild 2023-05-24 16:38:43 +02:00
yuzukicat
507c3f748c
emacsPackages.mind-wave 2d94f553a394ce73bcb91490b81e0fc042baa8d3 -> 5109162b74872091c5090a28389bef8f7020274c 2023-05-23 12:34:10 +09:00
Daniel Nagy
bf17936bdf emacsPackages.color-theme-solarized: use packageRequires 2023-05-21 10:33:05 -03:00
Daniel Nagy
f5f2c185df
emacsPackages.prolog-mode: use trivialBuild 2023-05-19 11:45:00 +02:00
Damien Cassou
2a26bcd60c
Merge pull request #230751 from DamienCassou/emacs-tree-sitter-grammars 2023-05-16 20:20:20 +02:00
Aidan Gauland
4bfdf5a7b3 header-file-mode: remove 
I am no longer able to maintain this package, and an incoming PR
(#231411) breaks this package.
 2023-05-12 20:42:00 -03:00
Damien Cassou
e764298465
emacs.pkgs.treesit-grammars: init fake package 
Adding this package gives Emacs access to tree-sitter grammars.
 2023-05-09 20:36:17 +02:00
Daniel Nagy
2e9917baa1
emacsPackages.tokei: replace program 2023-05-05 16:15:00 +02:00
Mario Rodas
120dd6a803
Merge pull request #226470 from nagy/wat-mode 
emacsPackages.wat-mode: init at unstable-2022-07-13
 2023-05-01 18:38:26 -05:00
Kira Bruneau
740e1e27fa
Merge pull request #227856 from kira-bruneau/emacsPackages.lsp-bridge 
emacsPackages.lsp-bridge: 20230311.1648 -> 20230424.1642
 2023-04-23 21:36:55 -04:00
Kira Bruneau
072de16b78 emacsPackages.lsp-bridge: 20230311.1648 -> 20230424.1642 2023-04-23 14:39:14 -04:00
Anderson Torres
423204a982 emacsPackages.ligo-mode: fixup meta 2023-04-22 16:20:10 -03:00
Anderson Torres
00cc237f08 malpa-packages: shadow ligo-mode 2023-04-22 12:16:23 -03:00
Anderson Torres
fa9e9b0a65 emacsPackages.ligo-mode: init at 20230302.1616 
Maybe it should solve the problem with the auto-updater.
 2023-04-22 12:16:23 -03:00
Anderson Torres
3b23c18951 elisp-packages: break ligo-mode 
Because the auto-updater is not picking the correct hash.
 2023-04-22 12:16:23 -03:00
Anderson Torres
255786c08a elisp-packages: remove bqn-mode 
It is now provided by MELPA - and we already package MELPA things.
 2023-04-22 12:16:23 -03:00
Anderson Torres
1af03fae83 nongnu-packages: updated 2023-04-21 (from overlay) 2023-04-22 12:16:23 -03:00
Anderson Torres
342214aa58 melpa-packages: updated 2023-04-21 (from overlay) 2023-04-22 12:16:23 -03:00
Anderson Torres
e4024ca853 elpa-packages: updated 2023-04-21 (from overlay) 2023-04-22 12:16:23 -03:00
adisbladis
1d01024c5b
Merge pull request #227160 from treed/jinx-on-darwin 
emacs.pkgs.jinx: use platform-specific library extension
 2023-04-21 18:07:19 +12:00
Ted Reed
dc24509e1d emacs.pkgs.jinx: use platform-specific library extension 2023-04-20 18:54:40 -07:00
R. Ryantm
2e80c06347 emacsPackages.ebuild-mode: 1.61 -> 1.63 2023-04-20 06:11:57 +00:00
Damien Cassou
5bf1f8fd50
emacs.pkgs.sqlite3: build .so file 2023-04-17 15:29:17 +02:00
Daniel Nagy
c8fe3df4ec
emacsPackages.wat-mode: init at unstable-2022-07-13 2023-04-16 15:30:00 +02:00
adisbladis
bcdc29d7ae emacs.pkgs.ement: remove manually packaged ement.el 
It's better that we use the one from elpa that is auto-generated.
 2023-04-12 23:56:04 +12:00
Vladimír Čunát
fd77cd7a01
Merge branch 'master' into staging-next 
Indentation conflict in vulkan-related src fetches.
 2023-04-08 11:33:08 +02:00
Adam Joseph
82d4de8ecf emacs: mark meta.broken if cross 2023-04-07 00:46:00 -07:00
github-actions[bot]
5e498b046d
Merge staging-next into staging 2023-04-04 12:01:50 +00:00
adisbladis
9a3ed17bc8
Merge pull request #213419 from stig/ox-rss 
ox-rss: init at version 20230129
 2023-04-04 22:25:39 +12:00
Damien Cassou
1b5ba6d5bd
emacs.pkgs.jinx: build .so file 
Co-authored-by: Jian Lin <75130626+jian-lin@users.noreply.github.com>
 2023-04-03 21:13:51 +02:00
Bernardo Meurer
f1f6ca8bcd
Merge pull request #209870 from amjoseph-nixpkgs/pr/stdenv/external-gcc-bootstrap 2023-04-03 08:19:03 -07:00