diff options
| author | Lin Jian <me@linj.tech> | 2024-03-03 01:13:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-03 01:13:18 +0800 |
| commit | df3358c5d2147a23801b4c381a0968791d30c0e8 (patch) | |
| tree | 9c6e3b1b8fd09d461544a5390c785ec43fbad5f8 /pkgs/applications/editors/emacs/elisp-packages | |
| parent | 4208fbd039461da4c1382b9544a0ecfbad4f4be8 (diff) | |
| parent | a9cfbfda7f3354200dba03a2f122a20f50784601 (diff) | |
Merge pull request #291416 from linj-fork/pr/fix-magit-seq
emacs.pkgs.seq: stop shadowing it
Diffstat (limited to 'pkgs/applications/editors/emacs/elisp-packages')
| -rw-r--r-- | pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix | 12 | ||||
| -rw-r--r-- | pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix | 15 |
2 files changed, 24 insertions, 3 deletions
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix index 3d0073bf81432..00f50233d50f1 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix +++ b/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/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 0b142281559a9..18a0a36fc06cb 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/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 + ''; + }); + }; |