diff options
| author | Vladimír Čunát <v@cunat.cz> | 2024-03-13 00:36:34 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2024-03-13 00:36:34 +0100 |
| commit | cd20c0c426cc7d5cbba6fdeeda19166787809500 (patch) | |
| tree | e96c0a1fa0704b5807b4b202dd0cf3403a345f8e /pkgs/applications/editors/emacs/elisp-packages | |
| parent | 14feac318eefa31d936d9b6a2aacb1928899abfe (diff) | |
| parent | 20eae76661fb92857beb6f56141ab5469da22d7b (diff) | |
| download | nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.tar nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.tar.gz nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.tar.bz2 nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.tar.lz nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.tar.xz nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.tar.zst nixlib-cd20c0c426cc7d5cbba6fdeeda19166787809500.zip | |
Merge branch 'staging' into staging-next
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 3d0073bf8143..00f50233d50f 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 0b142281559a..18a0a36fc06c 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 + ''; + }); + }; |