From 1a161fbc1666f6b6409da5cd89769c1f882f598a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 22 Jul 2023 01:26:35 +0400 Subject: [PATCH] =?UTF-8?q?pg=5Ftileserv:=201.0.9=20=E2=86=92=201.0.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../geospatial/pg_tileserv/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/geospatial/pg_tileserv/default.nix b/pkgs/servers/geospatial/pg_tileserv/default.nix index 5cd8466f97fc..93afa6746a5c 100644 --- a/pkgs/servers/geospatial/pg_tileserv/default.nix +++ b/pkgs/servers/geospatial/pg_tileserv/default.nix @@ -1,17 +1,27 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, fetchpatch, buildGoModule }: buildGoModule rec { pname = "pg_tileserv"; - version = "1.0.9"; + version = "1.0.10"; src = fetchFromGitHub { owner = "CrunchyData"; - repo = pname; + repo = "pg_tileserv"; rev = "v${version}"; - sha256 = "sha256-pNm802DJu5t+Y9QZU6wDUcAVpJTZ4SxDK0J61wzuuRE="; + hash = "sha256-Y8GAmWpnXQGmFcy44wFUQGpA8OvT7u1rY1ZGNg1Qwgs="; }; - vendorSha256 = "sha256-iw9bIh1Ngj5IGhrZwmSPciyaAR73msZ283TB0ibwt+c="; + patches = [ + # Without this, we get error messages like: + # vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod) + # The patch was generated by changing "go 1.15" to "go 1.17" and executing `go mod tidy`. + (fetchpatch { + url = "https://github.com/CrunchyData/pg_tileserv/commit/d8e01469344895267ead9fa35ee7bdb8f966a710.patch"; + hash = "sha256-1P3dV8h51X+MEH2u1n6RxZvBPXBpQWrZBBCTOoCEWQU="; + }) + ]; + + vendorHash = "sha256-gXJFuvJ2d/e91TAtBzV3p2MwriJtUlIuNRw1+3iXJBA="; ldflags = [ "-s" "-w" "-X main.programVersion=${version}" ];