diff --git a/pkgs/by-name/xd/xdp-tools/emacs-30.patch b/pkgs/by-name/xd/xdp-tools/emacs-30.patch deleted file mode 100644 index f95f301372a9..000000000000 --- a/pkgs/by-name/xd/xdp-tools/emacs-30.patch +++ /dev/null @@ -1,13 +0,0 @@ -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" diff --git a/pkgs/by-name/xd/xdp-tools/package.nix b/pkgs/by-name/xd/xdp-tools/package.nix index 7b6a0fd9606a..5fef58f3756d 100644 --- a/pkgs/by-name/xd/xdp-tools/package.nix +++ b/pkgs/by-name/xd/xdp-tools/package.nix @@ -16,22 +16,15 @@ }: stdenv.mkDerivation rec { pname = "xdp-tools"; - version = "1.5.2"; + version = "1.5.5"; src = fetchFromGitHub { owner = "xdp-project"; repo = "xdp-tools"; rev = "v${version}"; - hash = "sha256-NJawacCrmTuRXsOiAOMD8RaljPnuPFISoWEgiDcInw8="; + hash = "sha256-dK+ZpD1wv20iU51dsMUiW/Z9jojuwC8P3rrjU3LEB1Y="; }; - 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"