Bump vlog

knowsys · Jun 12, 2024 · 9a3e683 · 9a3e683
1 parent 496b2b0
commit 9a3e683
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 4 deletions.
diff --git a/nix/pkgs/vlog/default.nix b/nix/pkgs/vlog/default.nix
@@ -20,14 +20,14 @@
 in
   stdenv.mkDerivation rec {
     pname = "vlog";
-    version = "unstable-2022-11-25";
+    version = "unstable-2023-07-16";
     src = pkgs.fetchFromGitHub {
       owner = "karmaresearch";
       repo = "vlog";
       #  rev = "v${version}";
       # 'rev' and 'sha256' point to the latest VLog master branch tag/commit we want to test
-      rev = "ca63a3c6b32b0c4e5c099b645ff3d51a89212c76";
-      sha256 = "uyOSE01zc+D5Fqrex/fUespBKZgh+vDaAN/vE3ZW3RY=";
+      rev = "10e23c7453b93876b93c69a51c030aef962b9348";
+      hash = "sha256-NApmZ9wz0d87XyrWrOhOJU/Ph7QAEMec1ZZLZYXBqcs=";
     };
 
     buildInputs = [kognac trident sparsehash jdk curl lz4];
@@ -44,7 +44,10 @@ in
       "-DTRIDENT_INC=${trident}/share/include"
     ];
     # this patch forces CMake to prefer our provided lz4 library.
-    patches = [./patches/vlog-lz4.patch];
+    patches = [
+      ./patches/vlog-lz4.patch
+      ./patches/vlog-cstdint.patch
+    ];
 
     postInstall = ''
       mkdir -p $out/bin

diff --git a/nix/pkgs/vlog/patches/vlog-cstdint.patch b/nix/pkgs/vlog/patches/vlog-cstdint.patch
@@ -0,0 +1,37 @@
+From 288f9e1cbf42ee981cdfd2dc5250d1a4308df068 Mon Sep 17 00:00:00 2001
+From: Maximilian Marx <[email protected]>
+Date: Wed, 12 Jun 2024 15:08:23 +0200
+Subject: [PATCH] Fix missing include
+
+---
+ src/vlog/ml/LogisticRegression.cpp | 1 +
+ src/vlog/ml/helper.cpp             | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/vlog/ml/LogisticRegression.cpp b/src/vlog/ml/LogisticRegression.cpp
+index bc7dae2..ab68fda 100644
+--- a/src/vlog/ml/LogisticRegression.cpp
++++ b/src/vlog/ml/LogisticRegression.cpp
+@@ -5,6 +5,7 @@
+ #include <vlog/ml/LogisticRegression.h>
+ #include <cstdlib>
+ #include <cassert>
++#include <cstdint>
+ #include <vlog/ml/helper.h>
+
+ using namespace std;
+diff --git a/src/vlog/ml/helper.cpp b/src/vlog/ml/helper.cpp
+index 245f21d..34929ad 100644
+--- a/src/vlog/ml/helper.cpp
++++ b/src/vlog/ml/helper.cpp
+@@ -5,6 +5,7 @@
+ #include <sstream>
+ #include <iostream>
+ #include <ctime>
++#include <cstdint>
+ #include <vlog/ml/helper.h>
+
+ using namespace std;
+-- 
+2.44.1
+