From f3530d0ddb6fc100f318e80906a79747ade52800 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 26 Nov 2023 12:37:31 +0000 Subject: [PATCH 1/2] postgresql12JitPackages.pgrouting: 3.5.1 -> 3.6.0 --- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 51cef6b3f490..42f8fcdb3758 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.5.1"; + version = "3.6.0"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "sha256-X7ZXGPUkhPDBB2QpUGfqDTgOairkYZF78Ol0XEAmxD8="; + sha256 = "sha256-FOHIQzL8tmSWllCTzQkuGOiqk47S+HTB8aEpAC30YNk="; }; installPhase = '' From bf92006f47ad996ab1261a9408ec7d14e432f61a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 26 Nov 2023 12:38:00 +0000 Subject: [PATCH 2/2] postgresqlPackages.pgrouting: fix build darwin --- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 42f8fcdb3758..c4166a404b08 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, postgresql, perl, cmake, boost }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, postgresql, perl, cmake, boost }: stdenv.mkDerivation rec { pname = "pgrouting"; @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-FOHIQzL8tmSWllCTzQkuGOiqk47S+HTB8aEpAC30YNk="; }; + patches = [ + # Fix issues with size_t vs uint64_ on Darwin. Remove with the next release. + (fetchpatch { + url = "https://github.com/pgRouting/pgrouting/commit/b16e9da748e9d78c8b19d2b1db3baeb19c33c6aa.patch"; + hash = "sha256-CJmuVxZ3zIJTa6KXhM2cvynAE6Vmff7XBDfSGg4W9dE="; + }) + ]; + installPhase = '' install -D lib/*.so -t $out/lib install -D sql/pgrouting--${version}.sql -t $out/share/postgresql/extension