From 81e21c8705544d0a3c7c93eebbfebb6b547a8dfe Mon Sep 17 00:00:00 2001 From: qzylinra Date: Fri, 19 Sep 2025 21:15:11 +0800 Subject: [PATCH 1/2] yap: fix updateScript --- pkgs/by-name/ya/yap/package.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ya/yap/package.nix b/pkgs/by-name/ya/yap/package.nix index eed356f397ab..5a26f327bcb4 100644 --- a/pkgs/by-name/ya/yap/package.nix +++ b/pkgs/by-name/ya/yap/package.nix @@ -9,7 +9,9 @@ gmp, zlib, librdf_raptor2, - nix-update-script, + writeShellScript, + nix-update, + common-updater-scripts, }: stdenv.mkDerivation { @@ -50,7 +52,13 @@ stdenv.mkDerivation { # libYap.a(pl-buffer.o):/build/yap-6.3.3/H/pl-yap.h:230: first defined here env.NIX_CFLAGS_COMPILE = "-fpermissive -fcommon"; - passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + passthru.updateScript = writeShellScript "update-yap" '' + ${lib.getExe nix-update} yap --version=branch + version=$(nix eval --raw --file . yap.version) + src=$(nix eval --raw --file . yap.src) + latestVersion=$(grep -E '^[[:space:]]*set\(YAP_(MAJOR|MINOR|PATCH)_VERSION' "$src"/CMakeLists.txt | sed -E 's/.* ([0-9]+).*/\1/' | paste -sd.) + ${lib.getExe' common-updater-scripts "update-source-version"} yap ''${latestVersion}-''${version#*-} --ignore-same-hash + ''; meta = { # linux 32 bit build fails. From 8ec68fd78a40d98a57bd20957169e6f9108d624f Mon Sep 17 00:00:00 2001 From: qzylinra Date: Fri, 19 Sep 2025 21:16:08 +0800 Subject: [PATCH 2/2] yap: 7.6.0-unstable-2025-05-23 -> 8.0.1-unstable-2025-10-27 --- pkgs/by-name/ya/yap/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ya/yap/package.nix b/pkgs/by-name/ya/yap/package.nix index 5a26f327bcb4..e8f14777bd45 100644 --- a/pkgs/by-name/ya/yap/package.nix +++ b/pkgs/by-name/ya/yap/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation { pname = "yap"; - version = "7.6.0-unstable-2025-05-23"; + version = "8.0.1-unstable-2025-10-27"; src = fetchFromGitHub { owner = "vscosta"; repo = "yap"; - rev = "010bb5e48d2f4fbdc0c47ae9faa830a179b3c31b"; - hash = "sha256-ojhporq7vCEtdwCIRHwzjpc6dbFFXAgF+p6M7eL3JIE="; + rev = "d5ef32dec671e8d1bc7465e3d2ecdf468c568f16"; + hash = "sha256-aNA7OV+UjdcCL5Ia2tzPgDLcn6/bzvKfdk2aWk300zk="; }; nativeBuildInputs = [