From a8baf5245410bd4ab15a889785f1e51916f99a37 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 28 Apr 2025 22:59:06 +0100 Subject: [PATCH] prelink: unstable-2019-06-24 -> 20151030-unstable-2024-07-02 Without the change build fails on `gcc-14` as https://hydra.nixos.org/build/294837353: execstack.c: In function 'execstack_make_rdwr': execstack.c:138:17: error: passing argument 1 of 'asprintf' from incompatible pointer type [] 138 | asprintf (&prelink_path, "%s/%s", dirname, PRELINK_PROG EXEEXT); | ^~~~~~~~~~~~~ | | | const char ** (cherry picked from commit 22d5893faec01fce7b9abbe9f9ba415f924c21b0) --- pkgs/by-name/pr/prelink/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pr/prelink/package.nix b/pkgs/by-name/pr/prelink/package.nix index b149e2e857f5..b5328d7b5d05 100644 --- a/pkgs/by-name/pr/prelink/package.nix +++ b/pkgs/by-name/pr/prelink/package.nix @@ -5,17 +5,18 @@ autoreconfHook, libelf, libiberty, + unstableGitUpdater, }: stdenv.mkDerivation { pname = "prelink"; - version = "unstable-2019-06-24"; + version = "20151030-unstable-2024-07-02"; src = fetchgit { - url = "https://git.yoctoproject.org/git/prelink-cross"; + url = "https://git.yoctoproject.org/prelink-cross"; branchName = "cross_prelink"; - rev = "f9975537dbfd9ade0fc813bd5cf5fcbe41753a37"; - sha256 = "sha256-O9/oZooLRyUBBZX3SFcB6LFMmi2vQqkUlqtZnrq5oZc="; + rev = "ff2561c02ade96c5d4d56ddd4e27ff064840a176"; + sha256 = "sha256-wmX7ybrZDWEop9fiInZMvgK/fpEk3sq+Wu8DSWWIvQY="; }; strictDeps = true; @@ -40,6 +41,8 @@ stdenv.mkDerivation { enableParallelBuilding = true; + passthru.updateScript = unstableGitUpdater { }; + meta = with lib; { description = "ELF prelinking utility to speed up dynamic linking"; homepage = "https://wiki.yoctoproject.org/wiki/Cross-Prelink";