public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2019-08-03 07:48:19 +02:00
parent 421782edb1 fbf4028074
commit 4afe7a7bf3
172 changed files with 107512 additions and 184323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/languagemachines/packages.nix
View File

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

6
pkgs/development/libraries/protobuf/3.8.nix Normal file
View File

@@ -0,0 +1,6 @@
{ callPackage, ... }:
callPackage ./generic-v3.nix {
version = "3.8.0";
sha256 = "0vll02a6k46k720wfh25sl4hdai0130s3ix2l1wh6j1lm9pi7bm8";
}

6
pkgs/development/libraries/protobuf/3.9.nix Normal file
View File

@@ -0,0 +1,6 @@
{ callPackage, ... }:
callPackage ./generic-v3.nix {
version = "3.9.0";
sha256 = "1xq2njqrbmizwg91ggi1lqr0n26cm2jdyk668ljc24ihrpk0z9bw";
}