diff --git a/pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch b/pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch deleted file mode 100644 index cddd20d29e95..000000000000 --- a/pkgs/by-name/li/libpostal/0001-test-adding-header-to-fix-warning.patch +++ /dev/null @@ -1,24 +0,0 @@ -From bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51 Mon Sep 17 00:00:00 2001 -From: Al -Date: Sun, 17 Dec 2017 20:17:01 -0500 -Subject: [PATCH] [test] adding header to fix warning - ---- - test/test_expand.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/test_expand.c b/test/test_expand.c -index 59ed9af7..2b211728 100644 ---- a/test/test_expand.c -+++ b/test/test_expand.c -@@ -4,6 +4,7 @@ - #include - - #include "greatest.h" -+#include "../src/string_utils.h" - #include "../src/libpostal.h" - - SUITE(libpostal_expansion_tests); --- -2.42.0 - diff --git a/pkgs/by-name/li/libpostal/package.nix b/pkgs/by-name/li/libpostal/package.nix index 1d0ea162d1d6..7dd0ac10a5f9 100644 --- a/pkgs/by-name/li/libpostal/package.nix +++ b/pkgs/by-name/li/libpostal/package.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook }: stdenv.mkDerivation rec { pname = "libpostal"; @@ -7,22 +7,10 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "openvenues"; repo = "libpostal"; - rev = "v${version}"; - sha256 = "sha256-gQTD2LQibaB2TK0SbzoILAljAGExURvDcF3C/TfDXqk="; + rev = "refs/tags/v${version}"; + hash = "sha256-7G/CjYdVzsrvUFXGODoXgXoRp8txkl5SddcPtgltrjY="; }; - patches = [ - # Fix darwin compilation with XCode 12 https://github.com/openvenues/libpostal/issues/511 - (fetchpatch { - name = "Fix-C-compilation-macOS.patch"; - url = "https://github.com/openvenues/libpostal/commit/9fcf066e38121b5c1439fc6bdc9a7e02234c8622.patch"; - hash = "sha256-VpboGK+5sc1XrxMB051KWc8vP7Eu2g7zmTirzSaerns="; - }) - # https://github.com/openvenues/libpostal/commit/bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51.patch - # with extra hunk removed so it applies - ./0001-test-adding-header-to-fix-warning.patch - ]; - nativeBuildInputs = [ autoreconfHook ]; configureFlags = [