Skip to content

Commit ee9a8bf

Browse files
yvan-srakasamrose
authored andcommitted
chore: bump pgrouting version to 3.8.0
The previously used version was failing to build: /build/source/src/common/get_check_data.c: In function 'pgr_SPI_getText': /build/source/src/common/get_check_data.c:307:28: error: passing argument 1 of 'DatumGetCString' makes integer from pointer without a cast [-Wint-conversion] 307 | return DatumGetCString(SPI_getvalue(*tuple, *tupdesc, info.colNumber)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | | | char * In file included from /build/source/include/c_common/postgres_connection.h:29, from /build/source/src/common/get_check_data.c:27: /nix/store/nn6vpjqlsxxmynwcrsib9agb3hpr5cqj-postgresql-17.4/include/server/postgres.h:335:23: note: expected 'Datum' {aka 'long unsigned int'} but argument is of type 'char *' 335 | DatumGetCString(Datum X) | ~~~~~~^ make[2]: *** [src/common/CMakeFiles/common.dir/build.make:149: src/common/CMakeFiles/common.dir/get_check_data.c.o] Error 1
1 parent d406a95 commit ee9a8bf

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

nix/ext/pgrouting.nix

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
}:
1111
let
1212
pname = "pgrouting";
13+
<<<<<<< HEAD
14+
=======
15+
version = "3.8.0";
16+
>>>>>>> 054e04ac (chore: bump `pgrouting` version to 3.8.0)
1317

1418
# Load version configuration from external file
1519
allVersions = (builtins.fromJSON (builtins.readFile ./versions.json)).${pname};
@@ -122,10 +126,19 @@ buildEnv {
122126
"/share/postgresql/extension"
123127
];
124128

129+
<<<<<<< HEAD
125130
postBuild = ''
126131
#Verify all expected library files are present
127132
expectedFiles=${toString (numberOfVersions + 1)}
128133
actualFiles=$(ls -l $out/lib/lib${pname}*${postgresql.dlSuffix} | wc -l)
134+
=======
135+
src = fetchFromGitHub {
136+
owner = "pgRouting";
137+
repo = pname;
138+
rev = "v${version}";
139+
hash = "sha256-Lvf7TQ3GywbzZmcd9wi3s8I5sCXIQAPeXNTRk/J46to=";
140+
};
141+
>>>>>>> 054e04ac (chore: bump `pgrouting` version to 3.8.0)
129142
130143
if [[ "$actualFiles" != "$expectedFiles" ]]; then
131144
echo "Error: Expected $expectedFiles library files, found $actualFiles"

0 commit comments

Comments
 (0)