From c56ed872831cfeb9862d2f01056f54fcd85712f6 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Thu, 28 Aug 2025 08:41:40 +0800
Subject: [PATCH 1/2] yap: 6.3.3 -> 7.6.0-unstable-2025-05-23

---
 pkgs/by-name/ya/yap/package.nix | 38 ++++++++++++++++++++++++---------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ya/yap/package.nix b/pkgs/by-name/ya/yap/package.nix
index 28fd6dabcd92..e3bc2be60306 100644
--- a/pkgs/by-name/ya/yap/package.nix
+++ b/pkgs/by-name/ya/yap/package.nix
@@ -1,28 +1,47 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  R,
   readline,
   gmp,
   zlib,
+  librdf_raptor2,
 }:
 
-stdenv.mkDerivation rec {
-  version = "6.3.3";
+stdenv.mkDerivation {
   pname = "yap";
+  version = "7.6.0-unstable-2025-05-23";
 
-  src = fetchurl {
-    url = "https://www.dcc.fc.up.pt/~vsc/Yap/${pname}-${version}.tar.gz";
-    sha256 = "0y7sjwimadqsvgx9daz28c9mxcx9n1znxklih9xg16k6n54v9qxf";
+  src = fetchFromGitHub {
+    owner = "vscosta";
+    repo = "yap";
+    rev = "010bb5e48d2f4fbdc0c47ae9faa830a179b3c31b";
+    hash = "sha256-ojhporq7vCEtdwCIRHwzjpc6dbFFXAgF+p6M7eL3JIE=";
   };
 
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    R
+  ];
+
   buildInputs = [
     readline
     gmp
     zlib
+    librdf_raptor2
   ];
 
-  configureFlags = [ "--enable-tabling=yes" ];
+  cmakeFlags = [
+    (lib.cmakeBool "WITH_READLINE" true)
+    (lib.cmakeBool "WITH_R" true)
+    (lib.cmakeBool "WITH_Raptor2" true)
+    (lib.cmakeBool "WITH_CUDD" false)
+    (lib.cmakeBool "WITH_Gecode" false)
+  ];
 
   # -fcommon: workaround build failure on -fno-common toolchains like upstream
   # gcc-10. Otherwise build fails as:
@@ -31,13 +50,12 @@ stdenv.mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = "-fpermissive -fcommon";
 
   meta = {
-    # the linux 32 bit build fails.
+    # linux 32 bit build fails.
     broken =
       (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) || !stdenv.hostPlatform.is64bit;
-    homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/";
+    homepage = "https://github.com/vscosta/yap";
     description = "ISO-compatible high-performance Prolog compiler";
     license = lib.licenses.artistic2;
-
     platforms = lib.platforms.linux;
   };
 }

From d85b4f4f4605caa45b1228bdd300e95fa9b79a15 Mon Sep 17 00:00:00 2001
From: qzylinra <225773816+qzylinra@users.noreply.github.com>
Date: Thu, 4 Sep 2025 17:43:58 +0800
Subject: [PATCH 2/2] yap: add updateScript

---
 pkgs/by-name/ya/yap/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ya/yap/package.nix b/pkgs/by-name/ya/yap/package.nix
index e3bc2be60306..eed356f397ab 100644
--- a/pkgs/by-name/ya/yap/package.nix
+++ b/pkgs/by-name/ya/yap/package.nix
@@ -9,6 +9,7 @@
   gmp,
   zlib,
   librdf_raptor2,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation {
@@ -49,6 +50,8 @@ 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" ]; };
+
   meta = {
     # linux 32 bit build fails.
     broken =