Skip to content

xdp-tools: patch to allow building with Emacs 30 #386619

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

Merged
K900 merged 1 commit into from
Mar 3, 2025
Merged

xdp-tools: patch to allow building with Emacs 30 #386619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pkgs/tools/networking/xdp-tools/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ stdenv.mkDerivation rec {
hash = "sha256-NJawacCrmTuRXsOiAOMD8RaljPnuPFISoWEgiDcInw8=";
};

patches = [
# Allow building with emacs 30
# Submitted upstream: https://github.com/xdp-project/xdp-tools/pull/484
# FIXME: remove when merged
./emacs-30.patch
];

outputs = [
"out"
"lib"
Expand Down
13 changes: 13 additions & 0 deletions pkgs/tools/networking/xdp-tools/emacs-30.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/configure b/configure
index 271c370..33aabfa 100755
--- a/configure
+++ b/configure
@@ -97,7 +97,7 @@ check_toolchain()
EMACS=""
else
emacs_version=$($EMACS --version 2>/dev/null | head -n 1)
- if echo $emacs_version | grep -Eq 'GNU Emacs 2[6789]'; then
+ if echo $emacs_version | grep -Eq 'GNU Emacs (2[6789]|30)'; then
echo "using emacs: $emacs_version"
else
echo "not using emacs: $emacs_version"
Loading