···

       
1
       
1
       
-
       
From bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51 Mon Sep 17 00:00:00 2001

     

       
2
       
2
       
-
       
From: Al <albarrentine@gmail.com>

     

       
3
       
3
       
-
       
Date: Sun, 17 Dec 2017 20:17:01 -0500

     

       
4
       
4
       
-
       
Subject: [PATCH] [test] adding header to fix warning

     

       
5
       
5
       
-
       


     

       
6
       
6
       
-
       
---

     

       
7
       
7
       
-
       
 test/test_expand.c | 2 +-

     

       
8
       
8
       
-
       
 1 file changed, 1 insertion(+), 1 deletion(-)

     

       
9
       
9
       
-
       


     

       
10
       
10
       
-
       
diff --git a/test/test_expand.c b/test/test_expand.c

     

       
11
       
11
       
-
       
index 59ed9af7..2b211728 100644

     

       
12
       
12
       
-
       
--- a/test/test_expand.c

     

       
13
       
13
       
-
       
+++ b/test/test_expand.c

     

       
14
       
14
       
-
       
@@ -4,6 +4,7 @@

     

       
15
       
15
       
-
       
 #include <stdarg.h>

     

       
16
       
16
       
-
       
 

     

       
17
       
17
       
-
       
 #include "greatest.h"

     

       
18
       
18
       
-
       
+#include "../src/string_utils.h"

     

       
19
       
19
       
-
       
 #include "../src/libpostal.h"

     

       
20
       
20
       
-
       
 

     

       
21
       
21
       
-
       
 SUITE(libpostal_expansion_tests);

     

       
22
       
22
       
-
       
-- 

     

       
23
       
23
       
-
       
2.42.0

     

       
24
       
24
       
-
       


     

···

       
1
       
1
       
-
       
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:

     

       
1
       
1
       
+
       
{ lib, stdenv, fetchFromGitHub, fetchzip, autoreconfHook, withData ? false }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
-
       
stdenv.mkDerivation rec {

     

       
3
       
3
       
+
       
let

     

       
4
       
4
       
+
       
  releases = "https://github.com/openvenues/libpostal/releases";

     

       
5
       
5
       
+
       
  assets-base = fetchzip {

     

       
6
       
6
       
+
       
    url = "${releases}/download/v1.0.0/libpostal_data.tar.gz";

     

       
7
       
7
       
+
       
    hash = "sha256-FpGCkkRhVzyr08YcO0/iixxw0RK+3Of0sv/DH3GbbME=";

     

       
8
       
8
       
+
       
    stripRoot = false;

     

       
9
       
9
       
+
       
  };

     

       
10
       
10
       
+
       
  assets-parser = fetchzip {

     

       
11
       
11
       
+
       
    url = "${releases}/download/v1.0.0/parser.tar.gz";

     

       
12
       
12
       
+
       
    hash = "sha256-OHETb3e0GtVS2b4DgklKDlrE/8gxF7XZ3FwmCTqZbqQ=";

     

       
13
       
13
       
+
       
    stripRoot = false;

     

       
14
       
14
       
+
       
  };

     

       
15
       
15
       
+
       
  assets-language-classifier = fetchzip {

     

       
16
       
16
       
+
       
    url = "${releases}/download/v1.0.0/language_classifier.tar.gz";

     

       
17
       
17
       
+
       
    hash = "sha256-/Gn931Nx4UDBaiFUgGqC/NJUIKQ5aZT/+OYSlcfXva8=";

     

       
18
       
18
       
+
       
    stripRoot = false;

     

       
19
       
19
       
+
       
  };

     

       
20
       
20
       
+
       
in stdenv.mkDerivation rec {

     

       
4
       
21
       
 
       
  pname = "libpostal";

     

       
5
       
22
       
 
       
  version = "1.1";

     

       
6
       
23
       
 
       


     

       
7
       
24
       
 
       
  src = fetchFromGitHub {

     

       
8
       
25
       
 
       
    owner = "openvenues";

     

       
9
       
26
       
 
       
    repo = "libpostal";

     

       
10
       
10
       
-
       
    rev = "v${version}";

     

       
11
       
11
       
-
       
    sha256 = "sha256-gQTD2LQibaB2TK0SbzoILAljAGExURvDcF3C/TfDXqk=";

     

       
27
       
27
       
+
       
    rev = "refs/tags/v${version}";

     

       
28
       
28
       
+
       
    hash = "sha256-7G/CjYdVzsrvUFXGODoXgXoRp8txkl5SddcPtgltrjY=";

     

       
12
       
29
       
 
       
  };

     

       
13
       
30
       
 
       


     

       
14
       
14
       
-
       
  patches = [

     

       
15
       
15
       
-
       
    # Fix darwin compilation with XCode 12 https://github.com/openvenues/libpostal/issues/511

     

       
16
       
16
       
-
       
    (fetchpatch {

     

       
17
       
17
       
-
       
      name = "Fix-C-compilation-macOS.patch";

     

       
18
       
18
       
-
       
      url = "https://github.com/openvenues/libpostal/commit/9fcf066e38121b5c1439fc6bdc9a7e02234c8622.patch";

     

       
19
       
19
       
-
       
      hash = "sha256-VpboGK+5sc1XrxMB051KWc8vP7Eu2g7zmTirzSaerns=";

     

       
20
       
20
       
-
       
    })

     

       
21
       
21
       
-
       
    # https://github.com/openvenues/libpostal/commit/bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51.patch

     

       
22
       
22
       
-
       
    # with extra hunk removed so it applies

     

       
23
       
23
       
-
       
    ./0001-test-adding-header-to-fix-warning.patch

     

       
24
       
24
       
-
       
  ];

     

       
25
       
25
       
-
       


     

       
26
       
31
       
 
       
  nativeBuildInputs = [ autoreconfHook ];

     

       
27
       
32
       
 
       


     

       
28
       
33
       
 
       
  configureFlags = [

     

       
29
       
34
       
 
       
    "--disable-data-download"

     

       
30
       
35
       
 
       
  ] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "--disable-sse2" ];

     

       
36
       
36
       
+
       


     

       
37
       
37
       
+
       
  postBuild = lib.optionalString withData ''

     

       
38
       
38
       
+
       
    mkdir -p $out/share/libpostal

     

       
39
       
39
       
+
       
    ln -s ${assets-language-classifier}/language_classifier $out/share/libpostal/language_classifier

     

       
40
       
40
       
+
       
    ln -s ${assets-base}/transliteration                    $out/share/libpostal/transliteration

     

       
41
       
41
       
+
       
    ln -s ${assets-base}/numex                              $out/share/libpostal/numex

     

       
42
       
42
       
+
       
    ln -s ${assets-base}/address_expansions                 $out/share/libpostal/address_expansions

     

       
43
       
43
       
+
       
    ln -s ${assets-parser}/address_parser                   $out/share/libpostal/address_parser

     

       
44
       
44
       
+
       
  '';

     

       
45
       
45
       
+
       
  doCheck = withData;

     

       
31
       
46
       
 
       


     

       
32
       
47
       
 
       
  meta = with lib; {

     

       
33
       
48
       
 
       
    description = "C library for parsing/normalizing street addresses around the world. Powered by statistical NLP and open geo data";

     

···

       
18838
       
18838
       
 
       
  biblioteca = callPackage ../by-name/bi/biblioteca/package.nix {

     

       
18839
       
18839
       
 
       
    webkitgtk = webkitgtk_6_0;

     

       
18840
       
18840
       
 
       
  };

     

       
18841
       
18841
       
+
       


     

       
18842
       
18842
       
+
       
  libpostalWithData = callPackage ../by-name/li/libpostal/package.nix {

     

       
18843
       
18843
       
+
       
    withData = true;

     

       
18844
       
18844
       
+
       
  };

     

       
18841
       
18845
       
 
       
}