diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/editors/emacs')
5 files changed, 35 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 3d0073bf8143..00f50233d50f 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix @@ -83,6 +83,18 @@ self: let rm $outd/xapian-lite.cc $outd/emacs-module.h $outd/emacs-module-prelude.h $outd/demo.gif $outd/Makefile ''; }); + + # native compilation for tests/seq-tests.el never ends + # delete tests/seq-tests.el to workaround this + seq = super.seq.overrideAttrs (old: { + dontUnpack = false; + postUnpack = (old.postUnpack or "") + "\n" + '' + local content_directory=$(echo seq-*) + rm --verbose $content_directory/tests/seq-tests.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + ''; + }); }; elpaDevelPackages = super // overrides; diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 0b142281559a..18a0a36fc06c 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -63,9 +63,6 @@ self: let cl-print = null; # builtin tle = null; # builtin advice = null; # builtin - seq = if lib.versionAtLeast self.emacs.version "27" - then null - else super.seq; # Compilation instructions for the Ada executables: # https://www.nongnu.org/ada-mode/ ada-mode = super.ada-mode.overrideAttrs (old: { @@ -174,6 +171,18 @@ self: let ''; }); + # native compilation for tests/seq-tests.el never ends + # delete tests/seq-tests.el to workaround this + seq = super.seq.overrideAttrs (old: { + dontUnpack = false; + postUnpack = (old.postUnpack or "") + "\n" + '' + local content_directory=$(echo seq-*) + rm --verbose $content_directory/tests/seq-tests.el + src=$PWD/$content_directory.tar + tar --create --verbose --file=$src $content_directory + ''; + }); + }; diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix index 692481cc7fbc..3ab796bcbd19 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Project management for Emacs"; + mainProgram = "cask"; longDescription = '' Cask is a project management tool for Emacs that helps automate the package development cycle; development, dependencies, testing, building, diff --git a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix index 67b1b600390e..34c077da7739 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix @@ -9,13 +9,13 @@ }: let - version = "unstable-2023-12-01"; + version = "unstable-2024-02-03"; src = fetchFromGitHub { owner = "zbelial"; repo = "lspce"; - rev = "1958b6fcdfb6288aa17fa42360315d6c4aa85991"; - hash = "sha256-HUIRm1z6xNJWgX7ykujzniBrOTh76D3dJHrm0LR3nuQ="; + rev = "543dcf0ea9e3ff5c142c4365d90b6ae8dc27bd15"; + hash = "sha256-LZWRQOKkTjNo8jecBRholW9SHpiK0SWcV8yObojpvxo="; }; meta = { @@ -30,7 +30,7 @@ let inherit version src meta; pname = "lspce-module"; - cargoHash = "sha256-qMLwdZwqrK7bPXL1bIbOqM7xQPpeiO8FDoje0CEJeXQ="; + cargoHash = "sha256-W9rsi7o4KvyRoG/pqRKOBbJtUoSW549Sh8+OV9sLcxs="; checkFlags = [ # flaky test diff --git a/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix b/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix index c48550f8680a..a52533564616 100644 --- a/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix +++ b/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix @@ -68,6 +68,7 @@ , withAlsaLib ? false , withAthena ? false , withCsrc ? true +, withDbus ? stdenv.isLinux , withGTK2 ? false , withGTK3 ? withPgtk && !noGui , withGconf ? false @@ -77,6 +78,7 @@ , withMotif ? false , withNS ? stdenv.isDarwin && !(variant == "macport" || noGui) , withPgtk ? false +, withSelinux ? stdenv.isLinux , withSQLite3 ? lib.versionAtLeast version "29" , withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , withToolkitScrollBars ? true @@ -227,8 +229,9 @@ mkDerivation (finalAttrs: { alsa-lib ] ++ lib.optionals withGpm [ gpm - ] ++ lib.optionals stdenv.isLinux [ + ] ++ lib.optionals withDbus [ dbus + ] ++ lib.optionals withSelinux [ libselinux ] ++ lib.optionals (!stdenv.isDarwin && withGTK3) [ gsettings-desktop-schemas @@ -338,6 +341,8 @@ mkDerivation (finalAttrs: { (lib.withFeature withTreeSitter "tree-sitter") (lib.withFeature withXinput2 "xinput2") (lib.withFeature withXwidgets "xwidgets") + (lib.withFeature withDbus "dbus") + (lib.withFeature withSelinux "selinux") ]; env = lib.optionalAttrs withNativeCompilation { |