frog: Fix build (icu64 -> icu60)

icu60 is the latest version that works.

Build the derivation languageMachines.test to test.
This commit is contained in:
Daniel Schaefer 2019-07-31 19:08:33 +02:00
parent 7a7cf6faf0
commit 851ebff688
2 changed files with 11 additions and 5 deletions

View File

@ -1,13 +1,17 @@
{ callPackage }: { pkgs }:
let
inherit (pkgs) callPackage;
icu = pkgs.icu60;
in
{ {
ticcutils = callPackage ./ticcutils.nix { }; ticcutils = callPackage ./ticcutils.nix { };
libfolia = callPackage ./libfolia.nix { }; libfolia = callPackage ./libfolia.nix { inherit icu; };
ucto = callPackage ./ucto.nix { }; ucto = callPackage ./ucto.nix { inherit icu; };
uctodata = callPackage ./uctodata.nix { }; uctodata = callPackage ./uctodata.nix { };
timbl = callPackage ./timbl.nix { }; timbl = callPackage ./timbl.nix { };
timblserver = callPackage ./timblserver.nix { }; timblserver = callPackage ./timblserver.nix { };
mbt = callPackage ./mbt.nix { }; mbt = callPackage ./mbt.nix { };
frog = callPackage ./frog.nix { }; frog = callPackage ./frog.nix { inherit icu; };
frogdata = callPackage ./frogdata.nix { }; frogdata = callPackage ./frogdata.nix { };
test = callPackage ./test.nix { }; test = callPackage ./test.nix { };

View File

@ -11268,7 +11268,9 @@ in
stdenv = gccStdenv; stdenv = gccStdenv;
}; };
languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix { inherit callPackage; }); languageMachines = recurseIntoAttrs (import ../development/libraries/languagemachines/packages.nix {
inherit pkgs;
});
lasem = callPackage ../development/libraries/lasem { }; lasem = callPackage ../development/libraries/lasem { };