From 90ce7ec4bb409aac75df7f7ad786727267784605 Mon Sep 17 00:00:00 2001 From: SkohTV Date: Wed, 13 May 2026 17:34:53 -0400 Subject: [PATCH] pilot-link: 0.13.0-unstable-2022-09-26 -> 0.13.0-unstable-2026-04-25 --- .../pi/pilot-link/configure-checks.patch | 27 ------------------- pkgs/by-name/pi/pilot-link/package.nix | 7 +++-- 2 files changed, 3 insertions(+), 31 deletions(-) delete mode 100644 pkgs/by-name/pi/pilot-link/configure-checks.patch diff --git a/pkgs/by-name/pi/pilot-link/configure-checks.patch b/pkgs/by-name/pi/pilot-link/configure-checks.patch deleted file mode 100644 index 4533d463cff8..000000000000 --- a/pkgs/by-name/pi/pilot-link/configure-checks.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- pilot-link/configure.ac -+++ pilot-link/configure.ac -@@ -63,8 +63,8 @@ - dnl Eat -Werror so configure will run properly, if the user provided it - enable_werror=no - save_CFLAGS="$CFLAGS" --CFLAGS=$(echo $save_CFLAGS | sed -e s/-Werror//g) --CXXFLAGS=$(echo $save_CXXFLAGS | sed -e s/-Werror//g) -+CFLAGS=$(echo "$save_CFLAGS" | sed -e 's/-Werror[^=]//g') -+CXXFLAGS=$(echo "$save_CXXFLAGS" | sed -e 's/-Werror[^=]//g') - if test "x$CFLAGS" != "x$save_CFLAGS"; then - dnl -Werror was set; treat it as implicit --enable-werror below - enable_werror="yes" -@@ -392,11 +392,8 @@ - dnl Determine if system popt is good enough - save_LIBS="$LIBS" - AC_CHECK_HEADER(popt.h, -- AC_CHECK_DECL(POPT_BIT_SET, -- AC_CHECK_LIB(popt, poptStrippedArgv,, -- [with_included_popt="yes"]), -- [with_included_popt="yes"], -- [#include ]), -+ AC_CHECK_LIB(popt, poptStrippedArgv,, -+ [with_included_popt="yes"]), - [with_included_popt="yes"] - ) - LIBS="$save_LIBS" diff --git a/pkgs/by-name/pi/pilot-link/package.nix b/pkgs/by-name/pi/pilot-link/package.nix index ea3f75aad9b9..dab17aea2417 100644 --- a/pkgs/by-name/pi/pilot-link/package.nix +++ b/pkgs/by-name/pi/pilot-link/package.nix @@ -19,20 +19,19 @@ stdenv.mkDerivation { pname = "pilot-link"; - version = "0.13.0-unstable-2022-09-26"; + version = "0.13.0-unstable-2026-04-25"; src = fetchFromGitHub { owner = "desrod"; repo = "pilot-link"; - rev = "14338868111ce592c7ca7918a1f8a32ceecb7caf"; - hash = "sha256-3b5T/QnRZawnjTgwvQKUbJTE/NiJ93eU2+qbRFuI13I"; + rev = "fa3c832fb0aabd9465664309168abf278fd38f2a"; + hash = "sha256-EZwE2iO1QZCzv5uVYTpUaHS9tIlBASs5W8i9f3QV4Ks="; }; # Resolve build issues on modern systems. # https://github.com/desrod/pilot-link/issues/16 # https://aur.archlinux.org/packages/pilot-link-git patches = [ - ./configure-checks.patch ./incompatible-pointer-type.patch ] ++ lib.optionals enableConduits [ ./format-string-literals.patch ]