From b311242b72c604f30cb10e49af30d3ebe2a69ad7 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 10 Oct 2021 15:15:03 -0700 Subject: [PATCH 1/2] openfst: 1.7.9 -> 1.8.1 --- pkgs/development/libraries/openfst/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 51e661eabb3b..08767680ffd6 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openfst"; - version = "1.7.9"; + version = "1.8.1"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; - sha256 = "1pmx1yhn2gknj0an0zwqmzgwjaycapi896244np50a8y3nrsw6ck"; + sha256 = "sha256-JPtTtyu2h+P6julscqMf8pINmbmAoKj2HdpCb8pnE/A="; }; configureFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a4e05889920..741e8eed9c5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32977,7 +32977,16 @@ with pkgs; python = python3; }; - phonetisaurus = callPackage ../development/libraries/phonetisaurus {}; + phonetisaurus = callPackage ../development/libraries/phonetisaurus { + # https://github.com/AdolfVonKleist/Phonetisaurus/issues/70 + openfst = openfst.overrideAttrs (_: rec { + version = "1.7.9"; + src = fetchurl { + url = "http://www.openfst.org/twiki/pub/FST/FstDownload/openfst-${version}.tar.gz"; + sha256 = "1pmx1yhn2gknj0an0zwqmzgwjaycapi896244np50a8y3nrsw6ck"; + }; + }); + }; duti = callPackage ../os-specific/darwin/duti { inherit (darwin.apple_sdk.frameworks) ApplicationServices; From 0ec38fda7e9988fe925da89b2c4f1e2913b1e6f0 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Sun, 10 Oct 2021 15:16:12 -0700 Subject: [PATCH 2/2] opengrm-ngram: 1.3.11 -> 1.3.13 needed to fix build against openfst 1.8 --- pkgs/development/libraries/opengrm-ngram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opengrm-ngram/default.nix b/pkgs/development/libraries/opengrm-ngram/default.nix index 9b105808b8bb..3b00ae17e910 100644 --- a/pkgs/development/libraries/opengrm-ngram/default.nix +++ b/pkgs/development/libraries/opengrm-ngram/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "opengrm-ngram"; - version = "1.3.11"; + version = "1.3.13"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/GRM/NGramDownload/ngram-${version}.tar.gz"; - sha256 = "0wwpcj8qncdr9f2pmi0vhlw277dyxr85ygdi8g57xp2ifysigm05"; + sha256 = "sha256-5CXf6OXs7owny3yZQrWYA6yhIyN0dgA2B8TSDEUTF1Q="; }; nativeBuildInputs = [ autoreconfHook ];