Commit graph

77 commits

Author SHA1 Message Date
Lin Jian
a6329647be
Move default.nix into overlays dir
This is to prepare for splitting the overlay into two seperated ones.
2022-10-04 22:14:20 +08:00
Brian Leung
6c1b2aae7d
Add workaround to fix failing Hydra for emacsGit
See https://github.com/NixOS/nixpkgs/pull/193621.

Once that PR is merged into nixpkgs, we can remove it here.
2022-10-03 02:29:44 -07:00
Brian Leung
6ac93f1274
Revert "Use upstream withPgtk input attribute and remove mkPgtkEmacs" 2022-09-23 01:43:27 -07:00
Brian Leung
3cba3fe734
Use upstream withPgtk input attribute and remove mkPgtkEmacs 2022-09-15 22:10:41 -07:00
Brian Leung
ca91042729
Move Emacs 29's bonus-feature flags to mkGitEmacs 2022-09-15 22:09:22 -07:00
Payas Relekar
246ff03a67 Enable withGTK3 flag for emacs-pgtk derivations 2022-09-11 08:57:30 +05:30
Brian Leung
7d143d61f8
Revert "Use withPgtk option to fix failing emacsPgtk build" 2022-09-06 15:07:43 -07:00
Brian Leung
9bebb050cb
Adapt to nixos-unstable default setting of nativeComp = true 2022-09-05 17:32:52 -07:00
Brian Leung
ff1e7016d1
Remove mkPgtkEmacs and use withPgtk flag instead 2022-09-05 17:30:10 -07:00
Brian Leung
c62d7d09d4
Move flags for Emacs 29 bonus features to mkGitEmacs 2022-09-05 17:30:06 -07:00
Osama Rebach
572514917a
Disable webp support in emacsGit-nox and emacsUnstable-nox 2022-09-06 00:29:49 +01:00
Connor Prussin
65255005b8
Use super.emacs instead of self.emacs 2022-08-14 15:35:46 -07:00
Brian Leung
e46c7738bd
Build Emacs 29 with libwebp by default 2022-07-30 22:49:39 -07:00
adisbladis
2fb7261976 Add fallback case when allowAliases is not set 2022-05-10 04:35:27 +12:00
adisbladis
e47ffb5d60 flake.nix: Add a packages output 2022-05-10 04:28:43 +12:00
benjaminor
498364dcdf
Rename emacsPgtkGcc to emacsPgtkNativeComp
This keeps consistency with the other *NativeComp attributes
2022-04-23 22:24:13 +02:00
benjaminor
b50be56283
Add emacsGitNativeComp attribute
As described in #222, this adds an emacs build from master with native
	compilation enabled, but without using pure GTK.
2022-04-23 22:17:25 +02:00
adisbladis
1e654497fb Change the emacsGcc attribute to emacsNativeComp
In upstream nixpkgs PR https://github.com/NixOS/nixpkgs/pull/168076
native compilation support was introduced to the nixpkgs attribute.
This is a better naming more in line with upstream, so we should also
adopt it.

I have aliased emacsGcc to emacsNativeComp for backwards compatibility
with a trace notice informing users about the change.

Additionally we will now default to the upstream native comp derivation if it exists.
2022-04-16 16:56:16 +12:00
adisbladis
f329d31bd0 Remove native-comp flag name compatibility hack 2021-12-24 11:26:51 -08:00
John Soo
a317fd1462
Use --without-ns for nox variants.
Fixes installation of gui on darwin when nox is specified.
2021-12-21 16:09:41 -08:00
adisbladis
e4ec255047 Drop gvfsd patches
These are no longer applicable and is instead dealt with upstream in nixpkgs.
2021-12-19 02:00:52 -08:00
Santiago Calandrino
0fbfa7143c emacsPgtk: Use the master branch for pgtk build 2021-12-19 01:41:30 -08:00
Brian Leung
765a260b12 Add sqlite3 support for Emacs 29 2021-12-12 22:48:20 -08:00
adisbladis
fe1b51ee40 Drop emacsUnstableGcc
We now default to building the unstable release, so this attribute is superflous.
2021-12-10 18:18:49 -08:00
adisbladis
482974075f emacsGcc: Use the unstable emacs release for native compilation
This should result in much better binary cache hits since it updates much less frequently than the git master counterpart.
2021-12-08 11:37:36 -08:00
Brian Leung
a89b419b0c Add emacsUnstableGcc 2021-12-03 18:41:17 -08:00
Brian Leung
5e7af7d4bd Update for release of 28.0.90 2021-12-03 18:41:17 -08:00
Brian Leung
bbe704f1c4 Revert most of "Merge pull request #188 from afontaine/afontaine/add-emacs-28"
This reverts most of commit 640ff172f4,
reversing most changes made to
cb52bccea4.

We keep the patch file.
2021-12-03 18:26:57 -08:00
Vonfry
a566e0ace9
Remove orgPackages due to deprecation 2021-12-01 12:01:16 +08:00
Andrew Fontaine
63002ce581
Add emacs 28
As the release branch for emacs 28 has been cut, and emacsGit now builds
emacs 29, let's add a way to track emacs 28.
2021-11-23 19:11:27 +00:00
adisbladis
0fce209cb2
Merge pull request #161 from Vonfry/nongnu/add
Add nongnu elpa
2021-07-28 08:45:23 -05:00
sternenseemann
63e8dca357 mkExDrv: properly pass commit as required by recent package-build
9140d4b06f
broke certain builds that were not properly passing commit as an
argument to the builder. This also caused the exwm xelb (i. e.
emacsPackages.xelb) to fail. Since we have the commit as
`repoMeta.rev` anyways, passing it properly is trivial.
2021-07-24 22:40:12 +02:00
Vonfry
2efdc4dcab
Add nongnu elpa 2021-07-21 16:22:16 -05:00
Florian Franzen
f177e5d14a
Update that native-comp was merged in master (#143) 2021-04-30 19:03:16 +02:00
adisbladis
6f1b476527
Fix arg overriding evaluation order 2021-02-27 10:20:26 +02:00
adisbladis
8091609efc
Fix - typo in native-comp flag (old flag was actually --with-nativecomp) 2021-02-27 09:58:24 +02:00
adisbladis
b7e6a6866a
Ensure native-comp flag is replaced exactly in the same location as the original flag 2021-02-26 23:55:21 +02:00
adisbladis
942fe92269
native-comp: Fix changed configure flag 2021-02-26 23:41:42 +02:00
adisbladis
28af2c8daa
Remove 20.03 compat hacks 2021-02-26 23:35:18 +02:00
adisbladis
323d9e7cc0
emacs: Remove clean-env patches
This is now fixed upstream in nixpkgs using substituteInPlace which means we don't have to carry patches.
See https://github.com/NixOS/nixpkgs/pull/114335
2021-02-25 14:32:26 +02:00
Mauricio Collares
d7bdc8d3be use overrideAttrs' argument instead of referring to derivation 2021-01-31 17:12:56 -03:00
Tony Olagbaiye
7689a4093e
fix passthru pkgs 2021-01-19 00:13:48 +00:00
talyz
8298ba46b6
Fetch upstream releases from Savannah, use upstream pgtk branch 2020-12-28 09:29:27 +01:00
Vincent Szolnoky
4629eb4142
Add support for PGTK and PGTK + native comp forks 2020-11-17 23:50:32 +01:00
Vincent Szolnoky
a5218a2f19
Move repo info into json files 2020-11-17 23:49:46 +01:00
adisbladis
8c65ae9551
default.nix: Reformat with nixpkgs-fmt 2020-08-11 18:41:19 +02:00
adisbladis
1428703cee
mkGitEmacs: Reimplement as a pipeline
Fix isStable compat hacks
2020-08-11 18:41:19 +02:00
adisbladis
4d9dac0cb8
emacsUnstable: Re-add harfbuzz & jansson 2020-07-31 19:06:23 +02:00
adisbladis
5191889856
Invert stable check
Doh!
2020-07-27 13:43:03 +02:00
adisbladis
4538df67b3
Fix 20.03 git/unstable emacs 2020-07-27 13:08:10 +02:00