commit
4f0ec2c783
8 changed files with 19 additions and 40 deletions
|
@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
|
|||
)
|
||||
|
||||
# connects to the daemon
|
||||
machine.succeed("emacsclient --create-frame $EDITOR >&2 &")
|
||||
machine.succeed("emacsclient --no-wait --frame-parameters='((display . \"'\"$DISPLAY\"'\"))' --create-frame $EDITOR >&2")
|
||||
|
||||
# checks that Emacs shows the edited filename
|
||||
machine.wait_for_text("emacseditor")
|
||||
|
|
|
@ -1,16 +0,0 @@
|
|||
import ./generic.nix (rec {
|
||||
version = "27.2";
|
||||
sha256 = "sha256-tKfMTnjmPzeGJOCRkhW5EK9bsqCvyBn60pgnLp9Awbk=";
|
||||
patches = fetchpatch: [
|
||||
(fetchpatch {
|
||||
name = "fix-aarch64-darwin-triplet.patch";
|
||||
url = "https://git.savannah.gnu.org/cgit/emacs.git/patch/?id=a88f63500e475f842e5fbdd9abba4ce122cdb082";
|
||||
sha256 = "sha256-RF9b5PojFUAjh2TDUW4+HaWveV30Spy1iAXhaWf1ZVg=";
|
||||
})
|
||||
# glibc 2.34 compat
|
||||
(fetchpatch {
|
||||
url = "https://src.fedoraproject.org/rpms/emacs/raw/181aafcdb7ee2fded9fce4cfc448f27edccc927f/f/emacs-glibc-2.34.patch";
|
||||
sha256 = "sha256-2o3C/jhZPl2OW/LmVPt/fhdwbS9NOdF9lVEF1Kn9aEk=";
|
||||
})
|
||||
];
|
||||
})
|
5
pkgs/applications/editors/emacs/28.nix
Normal file
5
pkgs/applications/editors/emacs/28.nix
Normal file
|
@ -0,0 +1,5 @@
|
|||
import ./generic.nix (rec {
|
||||
version = "28.1";
|
||||
sha256 = "sha256-KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=";
|
||||
patches = _: [ ];
|
||||
})
|
|
@ -1,15 +0,0 @@
|
|||
diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h
|
||||
index 84ede3e..8e8f42e 100644
|
||||
--- a/lib/careadlinkat.h
|
||||
+++ b/lib/careadlinkat.h
|
||||
@@ -23,6 +23,10 @@
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
+#ifndef AT_FDCWD
|
||||
+#define AT_FDCWD -2
|
||||
+#endif
|
||||
+
|
||||
struct allocator;
|
||||
|
||||
/* Assuming the current directory is FD, get the symbolic link value
|
|
@ -11,7 +11,7 @@
|
|||
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
|
||||
, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
|
||||
, sigtool, jansson, harfbuzz, sqlite, nixosTests
|
||||
, dontRecurseIntoAttrs ,emacsPackagesFor
|
||||
, dontRecurseIntoAttrs, emacsPackagesFor
|
||||
, libgccjit, targetPlatform, makeWrapper # native-comp params
|
||||
, systemd ? null
|
||||
, withX ? !stdenv.isDarwin
|
||||
|
|
|
@ -344,8 +344,8 @@ mapAliases ({
|
|||
electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned"; # Added 2022-01-01
|
||||
|
||||
# Emacs
|
||||
emacs27Packages = emacs27.pkgs; # Added 2020-12-18
|
||||
emacs27WithPackages = emacs27.pkgs.withPackages; # Added 2020-12-18
|
||||
emacs28Packages = emacs28.pkgs; # Added 2021-10-04
|
||||
emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04
|
||||
emacsPackages = emacs.pkgs; # Added 2020-12-18
|
||||
emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22
|
||||
emacsPackagesNg = emacs.pkgs; # Added 2019-08-07
|
||||
|
|
|
@ -25480,10 +25480,11 @@ with pkgs;
|
|||
|
||||
em = callPackage ../applications/editors/em { };
|
||||
|
||||
emacs = emacs27;
|
||||
emacs-nox = emacs27-nox;
|
||||
emacs = emacs28;
|
||||
emacsNativeComp = emacs28NativeComp;
|
||||
emacs-nox = emacs28-nox;
|
||||
|
||||
emacs27 = callPackage ../applications/editors/emacs/27.nix {
|
||||
emacs28 = callPackage ../applications/editors/emacs/28.nix {
|
||||
# use override to enable additional features
|
||||
libXaw = xorg.libXaw;
|
||||
Xaw3d = null;
|
||||
|
@ -25495,7 +25496,11 @@ with pkgs;
|
|||
inherit (darwin) sigtool;
|
||||
};
|
||||
|
||||
emacs27-nox = lowPrio (emacs27.override {
|
||||
emacs28NativeComp = emacs28.override {
|
||||
nativeComp = true;
|
||||
};
|
||||
|
||||
emacs28-nox = lowPrio (emacs28.override {
|
||||
withX = false;
|
||||
withNS = false;
|
||||
withGTK2 = false;
|
||||
|
|
|
@ -47,6 +47,6 @@
|
|||
};
|
||||
|
||||
# This is an alias which we disallow by default; explicitly allow it
|
||||
emacs27Packages = emacs27.pkgs;
|
||||
emacs28Packages = emacs28.pkgs;
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue