Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update patch for new unstable release, and remove now-unneeded Emacs 28 attributes #192

Merged
merged 3 commits into from Dec 4, 2021
Merged

Update patch for new unstable release, and remove now-unneeded Emacs 28 attributes #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbe704f
Revert most of "Merge pull request #188 from afontaine/afontaine/add-…
leungbk Dec 4, 2021
5e7af7d
Update for release of 28.0.90
leungbk Dec 4, 2021
a89b419
Add emacsUnstableGcc
leungbk Dec 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 6 additions & 12 deletions default.nix
View file
Open in desktop
Expand Up @@ -95,22 +95,18 @@ let

emacsPgtkGcc = mkPgtkEmacs "emacs-pgtkgcc" ./repos/emacs/emacs-feature_pgtk.json { nativeComp = true; };

emacsGcc28 = (mkGitEmacs "emacs-gcc-28" ./repos/emacs/emacs-emacs-28.json { nativeComp = true; }).overrideAttrs (
old: {
patches = [ ./patches/tramp-detect-wrapped-gvfsd-28.patch ];
});

emacs28 = (mkGitEmacs "emacs-gcc-28" ./repos/emacs/emacs-emacs-28.json { }).overrideAttrs (
emacsUnstable = (mkGitEmacs "emacs-unstable" ./repos/emacs/emacs-unstable.json { }).overrideAttrs (
old: {
patches = [
./patches/tramp-detect-wrapped-gvfsd-28.patch
];
});
}
);

emacsUnstable = (mkGitEmacs "emacs-unstable" ./repos/emacs/emacs-unstable.json { }).overrideAttrs (
emacsUnstableGcc = (mkGitEmacs "emacs-unstable-gcc" ./repos/emacs/emacs-unstable.json { nativeComp = true; }).overrideAttrs (
old: {
patches = [
./patches/tramp-detect-wrapped-gvfsd-27.patch
./patches/tramp-detect-wrapped-gvfsd-28.patch
];
}
);
Expand All @@ -119,9 +115,7 @@ in
{
inherit emacsGit emacsUnstable;

inherit emacs28 emacsGcc28;

inherit emacsGcc;
inherit emacsGcc emacsUnstableGcc;

inherit emacsPgtk emacsPgtkGcc;

Expand Down
12 changes: 0 additions & 12 deletions patches/tramp-detect-wrapped-gvfsd-27.patch
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion repos/emacs/emacs-emacs-28.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion repos/emacs/emacs-unstable.json
View file
Open in desktop
@@ -1 +1 @@
{"type": "savannah", "repo": "emacs", "rev": "emacs-27.2", "sha256": "0p5ilxpn9kj57h9fbw3jwz409k5j1ilpyj7z3i3crxs7aigiga8s", "version": "27.2"}
{"type": "savannah", "repo": "emacs", "rev": "emacs-28.0.90", "sha256": "0jlvxg0k744zyvdhpvwf2hv3fxc7b31iapjwlm4h3qxsgpjh7gvm", "version": "28.0.90"}
1 change: 0 additions & 1 deletion repos/emacs/update
View file
Open in desktop
Expand Up @@ -54,7 +54,6 @@ function update_release() {

update_savannah_branch master
update_savannah_branch feature/pgtk
update_savannah_branch emacs-28
update_release

nix-build --no-out-link --show-trace ./test.nix