Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: db5bbef31fa0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4059ac951ba5
Choose a head ref
  • 4 commits
  • 6 files changed
  • 1 contributor

Commits on Jun 28, 2020

  1. python3Packages.somajo: 2.0.6 -> 2.1.0 

    Changelog:

https://github.com/tsproisl/SoMaJo/releases/tag/v2.1.0
    @danieldk
    danieldk authored and Jon committed Jun 28, 2020
    Copy the full SHA
    209ab7c View commit details

  2. python3Packages.pkuseg: init at 0.0.25

    @danieldk
    danieldk authored and Jon committed Jun 28, 2020
    Copy the full SHA
    9c06da0 View commit details

  3. licenses: add LGPL For Linguistic Resources

    @danieldk
    danieldk authored and Jon committed Jun 28, 2020
    Copy the full SHA
    d4737c9 View commit details

  4. pythonPackages.spacy_models: add more models 

    This change adds the missing language-specific spaCy models:

da_core_news_lg, da_core_news_md, da_core_news_sm, de_core_news_lg,
el_core_news_lg, es_core_news_lg, fr_core_news_lg, it_core_news_lg,
it_core_news_md, lt_core_news_lg, lt_core_news_md, nb_core_news_lg,
nb_core_news_md, nl_core_news_lg, nl_core_news_md, pl_core_news_lg,
pl_core_news_md, pl_core_news_sm, pt_core_news_lg, pt_core_news_md,
ro_core_news_sm, ro_core_news_md, ro_core_news_lg, zh_core_web_lg,
zh_core_web_md, zh_core_web_sm

I also checked the licenses and fixed them where necessary.
    @danieldk
    danieldk authored and Jon committed Jun 28, 2020
    Copy the full SHA
    4059ac9 View commit details
5 changes: 5 additions & 0 deletions lib/licenses.nix
View file
Original file line number Diff line number Diff line change
@@ -462,6 +462,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) {
fullName = "GNU Lesser General Public License v3.0 or later";
};

lgpllr = spdx {
spdxId = "LGPLLR";
fullName = "Lesser General Public License For Linguistic Resources";
};

libpng = spdx {
spdxId = "Libpng";
fullName = "libpng License";
36 changes: 36 additions & 0 deletions pkgs/development/python-modules/pkuseg/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, isPy3k
, cython
, numpy
}:

buildPythonPackage rec {
pname = "pkuseg";
version = "0.0.25";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "148yp0l7h8cflxag62pc1iwj5b5liyljnaxwfjaiqwl96vwjn0fx";
};

# Does not seem to have actual tests, but unittest discover
# recognizes some non-tests as tests and fails.
doCheck = false;

nativeBuildInputs = [ cython ];

propagatedBuildInputs = [ numpy ];

pythonImportsCheck = [ "pkuseg" ];

meta = with stdenv.lib; {
description = "Toolkit for multi-domain Chinese word segmentation";
homepage = "https://github.com/lancopku/pkuseg-python";
license = licenses.unfree;
maintainers = with maintainers; [ danieldk ];
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/somajo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@

buildPythonPackage rec {
pname = "SoMaJo";
version = "2.0.6";
version = "2.1.0";
disabled = !isPy3k;

src = fetchFromGitHub {
owner = "tsproisl";
repo = pname;
rev = "v${version}";
sha256 = "08nicj3nj6pi6djli26gf0kf3s2da9ysn1cpkyw7j88v8vav0p7s";
sha256 = "17ybm5rgwc6jy3i1c8nm05j7fd418n6hp44zv0q77kzhd66am6pp";
};

propagatedBuildInputs = [ regex ];
182 changes: 169 additions & 13 deletions pkgs/development/python-modules/spacy/models.json
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,145 @@
[{
"pname": "da_core_news_lg",
"version": "2.3.0",
"sha256": "18y1jany1ha27jkwb9563haxsbylm0axkh5c8009lsfxc8y2w9hr",
"license": "cc-by-sa-40"
},
{
"pname": "da_core_news_md",
"version": "2.3.0",
"sha256": "06nm5grj5jdx0rja7vw1f91vvd69p6vhafrwpfr1npqk24j6cacb",
"license": "cc-by-sa-40"
},
{
"pname": "da_core_news_sm",
"version": "2.3.0",
"sha256": "00byhlrcbg4wxplr473g9b3126pvk4vwy0q34xg0zx4994qb6rgn",
"license": "cc-by-sa-40"
},
{
"pname": "de_core_news_lg",
"version": "2.3.0",
"sha256": "0rixhgdz4z7sq6f2b1w3n5cn1645cr37g40hbd9xzlvdzdf5cg6d",
"license": "mit"
},
{
"pname": "de_core_news_md",
"version": "2.3.0",
"sha256": "0kxir1w000r5fn1kpa38m7688xinkn2mk1m82aiwqlck3r72jdi6",
"license": "cc-by-sa-40"
"license": "mit"
},
{
"pname": "de_core_news_sm",
"version": "2.3.0",
"sha256": "00cbmrf4njg28laysapdnp4rv4lw4yw03rxkynw1ain5fwb0izl7",
"license": "cc-by-sa-40"
"license": "mit"
},
{
"pname": "el_core_news_lg",
"version": "2.3.0",
"sha256": "001c19dd1kirlvzbdv2i89zw8nf6c4icv2w0chm7rd6x9m3i13gd",
"license": "cc-by-nc-sa-30"
},
{
"pname": "el_core_news_md",
"version": "2.3.0",
"sha256": "170x8bzm5nf02mhkxyxjk58yk2639hsjb5b9prcc69500c0vmnp0",
"license": "cc-by-sa-40"
"license": "cc-by-nc-sa-30"
},
{
"pname": "el_core_news_sm",
"version": "2.3.0",
"sha256": "10mh3za4jvr07rawzk8ps642rp11s3smraj9xvrxflik4fqkz18b",
"license": "cc-by-sa-40"
"license": "cc-by-nc-sa-30"
},
{
"pname": "en_core_web_lg",
"version": "2.3.0",
"sha256": "0mfa5wz31ya295jhyj489gb4qy806zmpq1zc11bvv5alv2m35if2",
"license": "cc-by-sa-40"
"license": "mit"
},
{
"pname": "en_core_web_md",
"version": "2.3.0",
"sha256": "1ys8sqkhiap1mq6mhbkbq8bc07lvl68xngbx725xkwvirzl5gabh",
"license": "cc-by-sa-40"
"license": "mit"
},
{
"pname": "en_core_web_sm",
"version": "2.3.0",
"sha256": "04icv9qf4pj53ll8vqxcjl2a723q1k00i7lifk8wx5saif28g37a",
"license": "cc-by-sa-40"
"license": "mit"
},
{
"pname": "en_vectors_web_lg",
"version": "2.3.0",
"sha256": "13g012rwh0bcxx3ii5mmygqzyryah1y3zd000zhidnacc1x1g743",
"license": "cc-by-sa-40"
"license": "cc-by-sa-30"
},
{
"pname": "es_core_news_lg",
"version": "2.3.0",
"sha256": "1r0pr0lzs3j9w7rd5z9nw87iayjm36v7f7gamvaiiphs6bc5p7ls",
"license": "gpl3"
},
{
"pname": "es_core_news_md",
"version": "2.3.0",
"sha256": "0nz33bmpr3rxqbnv6vb1id8pkfsvh8ii8vqplwgb3b8772kmpzy2",
"license": "cc-by-sa-40"
"license": "gpl3"
},
{
"pname": "es_core_news_sm",
"version": "2.3.0",
"sha256": "02xqhg4m0gg5r9yibvl02zixkll6w0nsmbdhp07y5yyaqjarc90d",
"license": "cc-by-sa-40"
"license": "gpl3"
},
{
"pname": "fr_core_news_lg",
"version": "2.3.0",
"sha256": "1yliamws8nqqjhpk9gr2dzlk0dms2mr958zbj21biv8fimbq60ik",
"license": "lgpllr"
},
{
"pname": "fr_core_news_md",
"version": "2.3.0",
"sha256": "04fk212ksac3bp9dj7dmzsdcnbqmbsgymsic6ddcv9zbfdv5d0db",
"license": "cc-by-sa-40"
"license": "lgpllr"
},
{
"pname": "fr_core_news_sm",
"version": "2.3.0",
"sha256": "0kldww855z67qfc9maa9z1lsvdf5vj5vc8gj0x3h68kv5n1xr4h0",
"license": "cc-by-sa-40"
"license": "lgpllr"
},
{
"pname": "it_core_news_lg",
"version": "2.3.0",
"sha256": "192rdmqnwl3ajxzhnw4r1cqv5bkziv0yc2bbzckmzqss64wk7k70",
"license": "cc-by-nc-sa-30"
},
{
"pname": "it_core_news_md",
"version": "2.3.0",
"sha256": "019ih4vwq1w6j38j0wc8pyyg1an6yy37wxq2w4amwppynmmcnd5w",
"license": "cc-by-nc-sa-30"
},
{
"pname": "it_core_news_sm",
"version": "2.3.0",
"sha256": "1c3ywqa8li0j7cyvd1xqbb096y61978hd6qv7rc6cxxjdhmkrrds",
"license": "cc-by-nc-sa-40"
},
{
"pname": "lt_core_news_lg",
"version": "2.3.0",
"sha256": "0hn5w8n7mgv33i6gvnaxl1j44n9gz4j86gg1a9jjlgdw5z98n0p2",
"license": "cc-by-sa-40"
},
{
"pname": "lt_core_news_md",
"version": "2.3.0",
"sha256": "1xya79cz2xd5vgzg6qg0ww5j2bmv7kppdk3mdjf6zpwrlzwdbk5d",
"license": "cc-by-sa-40"
},
{
@@ -82,27 +148,117 @@
"sha256": "0r3rbqgz4897wyhz5jli30lryb45039f4rlvn4q0364cg1pm92g9",
"license": "cc-by-sa-40"
},
{
"pname": "nb_core_news_lg",
"version": "2.3.0",
"sha256": "18mblypw3c82004qz5w1p3262iqwn99wl9b781dq7aqwxskr02d6",
"license": "mit"
},
{
"pname": "nb_core_news_md",
"version": "2.3.0",
"sha256": "0iw97k9glxbar8mrpvnmmcb1nffgdhb83akn99p53pwmqbzxy9p3",
"license": "mit"
},
{
"pname": "nb_core_news_sm",
"version": "2.3.0",
"sha256": "07b7xri2q3m7fvn9a2gjc1044a3f14231vr32hrw96h7k6vg95h7",
"license": "mit"
},
{
"pname": "nl_core_news_lg",
"version": "2.3.0",
"sha256": "016166kzpgi0p3m0x3k308a0r60a28yz7npagjvmpl1dfm9lzhnv",
"license": "cc-by-sa-40"
},
{
"pname": "nl_core_news_md",
"version": "2.3.0",
"sha256": "1anfhig531k9k14s0cbgsvmvifp3h50qi1h8dhx894kjmq10k2lg",
"license": "cc-by-sa-40"
},
{
"pname": "nl_core_news_sm",
"version": "2.3.0",
"sha256": "0alvz7pn7cj0yax8h5gp71vrdblh3mcsmyhzgiddsd44ry35nxnj",
"license": "cc-by-sa-40"
},
{
"pname": "pl_core_news_lg",
"version": "2.3.0",
"sha256": "1acchp8pv1h4c6cwvxz07lh4ychn6aw809zfg3mbbsxgsgd2ahjr",
"license": "gpl3"
},
{
"pname": "pl_core_news_md",
"version": "2.3.0",
"sha256": "19jjjjvbys3ayibkm3cx497b4bh63ll39hfq04wx116rj4ajpwwg",
"license": "gpl3"
},
{
"pname": "pl_core_news_sm",
"version": "2.3.0",
"sha256": "166mqlfkgiszcc6hwg2mr6sir9y88y22nd81a1nidq0fiif5lfji",
"license": "gpl3"
},
{
"pname": "pt_core_news_lg",
"version": "2.3.0",
"sha256": "18gvdmfwyy2sbq6206imglhghyagd6a4gb6wcfkwhm7lzbnq714d",
"license": "cc-by-sa-40"
},
{
"pname": "pt_core_news_md",
"version": "2.3.0",
"sha256": "1yxnpwby2aq6ydvd35lylc4fs141fisfnzlx8pl88pp2b2gxijvl",
"license": "cc-by-sa-40"
},
{
"pname": "pt_core_news_sm",
"version": "2.3.0",
"sha256": "1vcvzdg9f93x0vaafkk9l9xhpmaavfj0cf0l3p06c5kx2d76f9ph",
"license": "cc-by-sa-40"
},
{
"pname": "ro_core_news_sm",
"version": "2.3.0",
"sha256": "0lsmbdwsaczv37y5sa1vvgwszy2hs8jp24a0nvc5qm8vb71rxj8w",
"license": "cc-by-sa-40"
},
{
"pname": "ro_core_news_md",
"version": "2.3.0",
"sha256": "1igwkz3yd1117gi2g78yilh9ln8n5yrdimas4prfxjgzwid3q8bc",
"license": "cc-by-sa-40"
},
{
"pname": "ro_core_news_lg",
"version": "2.3.0",
"sha256": "0id1y32kjfans7llh1i55rgr4n2x6xn208y4qf6yl3pbc17i0n9z",
"license": "cc-by-sa-40"
},
{
"pname": "xx_ent_wiki_sm",
"version": "2.3.0",
"sha256": "0x3zmmybl5kh4dn5prkfmr4q5j9bh13p40qc3rhdfi0i3jxc11pn",
"license": "cc-by-sa-40"
"license": "mit"
},
{
"pname": "zh_core_web_lg",
"version": "2.3.1",
"sha256": "17zxk7cz47k07yb3qaigc3sx4dj4zwilr1lsn2jq6w7jc8k2h1ll",
"license": "mit"
},
{
"pname": "zh_core_web_md",
"version": "2.3.1",
"sha256": "1n4iwxyam4ykn0f9jdzwkhczack8r9c3kkbyga3c4h6iwqsflzcj",
"license": "mit"
},
{
"pname": "zh_core_web_sm",
"version": "2.3.1",
"sha256": "1lj5nwhx38cpwnvajwxlfkf84dr1xx2h6wwbg3scycsh459i9fpc",
"license": "mit"
}]
10 changes: 7 additions & 3 deletions pkgs/development/python-modules/spacy/models.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
{ stdenv, buildPythonPackage, fetchurl, spacy }:
{ stdenv, lib, buildPythonPackage, fetchurl, jieba, pkuseg, spacy }:
let
buildModelPackage = { pname, version, sha256, license }: buildPythonPackage {
buildModelPackage = { pname, version, sha256, license }:
let
lang = builtins.substring 0 2 pname;
in buildPythonPackage {
inherit pname version;

src = fetchurl {
url = "https://github.com/explosion/spacy-models/releases/download/${pname}-${version}/${pname}-${version}.tar.gz";
inherit sha256;
};

propagatedBuildInputs = [ spacy ];
propagatedBuildInputs = [ spacy ]
++ lib.optionals (lang == "zh") [ jieba pkuseg ];

meta = with stdenv.lib; {
description = "Models for the spaCy NLP library";
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7330,6 +7330,8 @@ in {

murmurhash = callPackage ../development/python-modules/murmurhash { };

pkuseg = callPackage ../development/python-modules/pkuseg { };

plac = callPackage ../development/python-modules/plac { };

preshed = callPackage ../development/python-modules/preshed { };