diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-23 06:04:29 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-23 06:04:29 +0000 |
commit | 3db29499114c808a32b3a34112899fb25316182a (patch) | |
tree | 49ca32e97e6fba8b4d90b49b4939c95c95ae75e6 /pkgs | |
parent | 64eb8c173da51def327a8ca4a7fcca8e96a971d4 (diff) | |
parent | c54b530a3955cdb0c3a201d3cee90c77a3b61a82 (diff) | |
download | nixpkgs-3db29499114c808a32b3a34112899fb25316182a.tar nixpkgs-3db29499114c808a32b3a34112899fb25316182a.tar.gz nixpkgs-3db29499114c808a32b3a34112899fb25316182a.tar.bz2 nixpkgs-3db29499114c808a32b3a34112899fb25316182a.tar.lz nixpkgs-3db29499114c808a32b3a34112899fb25316182a.tar.xz nixpkgs-3db29499114c808a32b3a34112899fb25316182a.tar.zst nixpkgs-3db29499114c808a32b3a34112899fb25316182a.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs')
19 files changed, 75 insertions, 42 deletions
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 4d273d187ca..6cd07fd373f 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.14.1"; + version = "4.14.3"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-OXSxfNCwbZ1RjjoxDlsREtKtbzlQcuPylvD1/ehfgsI="; + sha256 = "sha256-6OEgSnW96jufc/Z+B17ghtAbj9SLulue26ffKREGzbY="; }; libPath = lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index ac33025b727..5cfca0b4a2b 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.17.5"; + version = "1.18.0"; src = fetchPypi { inherit pname version; - sha256 = "9d64bca2bf0cdecaff1336e0656917eb9028586fee4ac342761d6cb9a0cdb4f9"; + sha256 = "a0658cd2b629ec5b24b9a893056ce7224088ee5eb760f30642131a8df0279131"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 93ec987e2c6..c645693e19a 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -17,14 +17,14 @@ let }; in stdenv.mkDerivation rec { - version = "14.31.39"; + version = "14.31.41"; pname = "jmol"; src = let baseVersion = "${lib.versions.major version}.${lib.versions.minor version}"; in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${version}/Jmol-${version}-binary.tar.gz"; - sha256 = "sha256-ss+QvBsmivqNdjXW45Sv9h/JXuZpryCGmRTsUgcDlRE="; + sha256 = "sha256-dI1WkQgFikxaIjjqVKZcsGvc3QIu/NMIcRW3N8PGbkY="; }; patchPhase = '' diff --git a/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix b/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix index 5d714cf1799..8b91b5e5fa5 100644 --- a/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix +++ b/pkgs/applications/video/kodi-packages/a4ksubtitles/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "a4ksubtitles"; namespace = "service.subtitles.a4ksubtitles"; - version = "2.3.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "a4k-openproject"; repo = "a4kSubtitles"; rev = "${namespace}/${namespace}-${version}"; - sha256 = "0hxvxkbihfyvixmlxf5n4ccn70w0244hhw3hr44rqvx00a0bg1lh"; + sha256 = "1rzgrxdcws064ji65fdbzzmgd2pdlaak3apa5n1clkmzknn7n881"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi-packages/certifi/default.nix b/pkgs/applications/video/kodi-packages/certifi/default.nix index d122cacc878..b99a64f3eec 100644 --- a/pkgs/applications/video/kodi-packages/certifi/default.nix +++ b/pkgs/applications/video/kodi-packages/certifi/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "certifi"; namespace = "script.module.certifi"; - version = "2019.11.28+matrix.1"; + version = "2020.12.05+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "0vsd68izv1ix0hb1gm74qq3zff0sxmhfhjyh7y9005zzp2gpi62v"; + sha256 = "1z49b8va7wdyr714c8ixb2sldi0igffcjj3xpbmga58ph0z985vy"; }; passthru.updateScript = addonUpdateScript { diff --git a/pkgs/applications/video/kodi-packages/chardet/default.nix b/pkgs/applications/video/kodi-packages/chardet/default.nix index 7c069592c67..cfe3d501cbd 100644 --- a/pkgs/applications/video/kodi-packages/chardet/default.nix +++ b/pkgs/applications/video/kodi-packages/chardet/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "chardet"; namespace = "script.module.chardet"; - version = "3.0.4+matrix.3"; + version = "4.0.0+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "05928dj4fsj2zg8ajdial3sdf8izddq64sr0al3zy1gqw91jp80f"; + sha256 = "1jsd165mb1b8jdan2jbjd3y3xa0xam2cxcccmwazkybpa0r6a7dj"; }; passthru.updateScript = addonUpdateScript { diff --git a/pkgs/applications/video/kodi-packages/idna/default.nix b/pkgs/applications/video/kodi-packages/idna/default.nix index 662a45188ec..c90f52ffdc9 100644 --- a/pkgs/applications/video/kodi-packages/idna/default.nix +++ b/pkgs/applications/video/kodi-packages/idna/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "idna"; namespace = "script.module.idna"; - version = "2.8.1+matrix.1"; + version = "2.10.0+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "02s75fhfmbs3a38wvxba51aj3lv5bidshjdkl6yjfji6waxpr9xh"; + sha256 = "0pm86m8kh2p0brps3xzxcmmabvb4izkglzkj8dsn33br3vlc7cm7"; }; passthru.updateScript = addonUpdateScript { diff --git a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix index b42c32fed10..4ca45f8b7b9 100644 --- a/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix +++ b/pkgs/applications/video/kodi-packages/inputstreamhelper/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "inputstreamhelper"; namespace = "script.module.inputstreamhelper"; - version = "0.5.2+matrix.1"; + version = "0.5.5+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "18lkksljfa57w69yklbldf7dgyykrm84pd10mdjdqdm88fdiiijk"; + sha256 = "0y4xn3ygwv1kb7gya7iwdga0g9sa89snpnram0wwqzqn8wn2lyb4"; }; passthru.updateScript = addonUpdateScript { diff --git a/pkgs/applications/video/kodi-packages/jellyfin/default.nix b/pkgs/applications/video/kodi-packages/jellyfin/default.nix index 03a037ce538..b162ca11fa8 100644 --- a/pkgs/applications/video/kodi-packages/jellyfin/default.nix +++ b/pkgs/applications/video/kodi-packages/jellyfin/default.nix @@ -1,17 +1,17 @@ -{ lib, addonDir, buildKodiAddon, fetchFromGitHub, kodi, requests, dateutil, six, kodi-six, signals }: +{ lib, addonDir, buildKodiAddon, fetchFromGitHub, kodi, requests, dateutil, six, kodi-six, signals, websocket }: let python = kodi.pythonPackages.python.withPackages (p: with p; [ pyyaml ]); in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "0.7.1"; + version = "0.7.4"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "0fx20gmd5xlg59ks4433qh2b3jhbs5qrnc49zi4rkqqr4jr4nhnn"; + sha256 = "1ykgz1l2gmpdlsp3fbm31q8757879i9dd13svslqykvxadg69x03"; }; nativeBuildInputs = [ @@ -19,13 +19,13 @@ buildKodiAddon rec { ]; prePatch = '' - substituteInPlace .config/generate_xml.py \ - --replace "'jellyfin-kodi/release.yaml'" "'release.yaml'" \ - --replace "'jellyfin-kodi/addon.xml'" "'addon.xml'" + # ZIP does not support timestamps before 1980 - https://bugs.python.org/issue34097 + substituteInPlace build.py \ + --replace "with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w') as z:" "with zipfile.ZipFile('{}/{}'.format(target, archive_name), 'w', strict_timestamps=False) as z:" ''; buildPhase = '' - ${python}/bin/python3 .config/generate_xml.py py3 + ${python}/bin/python3 build.py --version=py3 ''; postInstall = '' @@ -38,6 +38,7 @@ buildKodiAddon rec { six kodi-six signals + websocket ]; meta = with lib; { diff --git a/pkgs/applications/video/kodi-packages/netflix/default.nix b/pkgs/applications/video/kodi-packages/netflix/default.nix index 1aac5f8e9b2..20317b26828 100644 --- a/pkgs/applications/video/kodi-packages/netflix/default.nix +++ b/pkgs/applications/video/kodi-packages/netflix/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "netflix"; namespace = "plugin.video.netflix"; - version = "1.15.1"; + version = "1.16.0"; src = fetchFromGitHub { owner = "CastagnaIT"; repo = namespace; rev = "v${version}"; - sha256 = "0c5cdi6s76vg2gyxzf0ylisxai1ii8vi6h4q4mznpfmplfdp667v"; + sha256 = "0k5jz6zjsazf0z2xv7gk848p4hvkzd79d0kl71a5d20f96g3938k"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi-packages/requests/default.nix b/pkgs/applications/video/kodi-packages/requests/default.nix index 7d79abd0872..0f2d5044f04 100644 --- a/pkgs/applications/video/kodi-packages/requests/default.nix +++ b/pkgs/applications/video/kodi-packages/requests/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "requests"; namespace = "script.module.requests"; - version = "2.22.0+matrix.1"; + version = "2.25.1+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "09576galkyzhw8fhy2h4aablm5rm2v08g0mdmg9nn55dlxhkkljq"; + sha256 = "00qhykizvspzfwgl7qz9cyxrazs54jgin40g49v5nzmjq3qf62hb"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi-packages/six/default.nix b/pkgs/applications/video/kodi-packages/six/default.nix index 8d7b8f936f3..1742d1f6f04 100644 --- a/pkgs/applications/video/kodi-packages/six/default.nix +++ b/pkgs/applications/video/kodi-packages/six/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "six"; namespace = "script.module.six"; - version = "1.14.0+matrix.2"; + version = "1.15.0+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "1f9g43j4y5x7b1bgbwqqfj0p2bkqjpycj17dj7a9j271mcr5zhwb"; + sha256 = "0c8vb0c4vhknkqqgvzj8l2ddgcm4iah0ca686slxbxbp800cydnf"; }; passthru.updateScript = addonUpdateScript { diff --git a/pkgs/applications/video/kodi-packages/urllib3/default.nix b/pkgs/applications/video/kodi-packages/urllib3/default.nix index e3127a8d118..12d8e60d67b 100644 --- a/pkgs/applications/video/kodi-packages/urllib3/default.nix +++ b/pkgs/applications/video/kodi-packages/urllib3/default.nix @@ -2,11 +2,11 @@ buildKodiAddon rec { pname = "urllib3"; namespace = "script.module.urllib3"; - version = "1.25.8+matrix.1"; + version = "1.26.4+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "080yq8ns0sag6rmdag1hjwi0whcmp35wzqjp3by92m81cpszs75q"; + sha256 = "1d2k6gbsnhdadcl1xc7igz4m71z2fcnpln5ppfjv455cmkk110vf"; }; passthru.updateScript = addonUpdateScript { diff --git a/pkgs/applications/video/kodi-packages/websocket/default.nix b/pkgs/applications/video/kodi-packages/websocket/default.nix new file mode 100644 index 00000000000..3c83e1f9b00 --- /dev/null +++ b/pkgs/applications/video/kodi-packages/websocket/default.nix @@ -0,0 +1,27 @@ +{ lib, buildKodiAddon, fetchzip, addonUpdateScript, six, addonDir }: + +buildKodiAddon rec { + pname = "websocket"; + namespace = "script.module.websocket"; + version = "0.58.0+matrix.2"; + + src = fetchzip { + url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; + sha256 = "0j2fcrn3hc6207g0k0gx5ypj4j3ww9pd7rnlzq1fgdig00laa8y7"; + }; + + propagatedBuildInputs = [ + six + ]; + + passthru.updateScript = addonUpdateScript { + attrPath = "kodi.packages.websocket"; + }; + + meta = with lib; { + homepage = "https://github.com/websocket-client/websocket-client"; + description = "A WebSocket client for Python"; + license = licenses.lgpl2Only; + maintainers = teams.kodi.members; + }; +} diff --git a/pkgs/applications/video/kodi-packages/youtube/default.nix b/pkgs/applications/video/kodi-packages/youtube/default.nix index c108aa36f92..65613658e0f 100644 --- a/pkgs/applications/video/kodi-packages/youtube/default.nix +++ b/pkgs/applications/video/kodi-packages/youtube/default.nix @@ -3,11 +3,11 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "6.8.10+matrix.1"; + version = "6.8.14+matrix.1"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip"; - sha256 = "18z9zh6yqihnmfwd6cc4kpy2frzbarvhg8qpyc3w851ad053q7v0"; + sha256 = "1a18whh3fisprwipwhxf26kc958sxhwpvs8pxwq2sq96vr7b4xq7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pysbd/default.nix b/pkgs/development/python-modules/pysbd/default.nix index f25283dbbbc..b85d1f6cd53 100644 --- a/pkgs/development/python-modules/pysbd/default.nix +++ b/pkgs/development/python-modules/pysbd/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , tqdm , spacy @@ -8,12 +8,15 @@ buildPythonPackage rec { pname = "pysbd"; - version = "0.3.3"; + version = "0.3.4"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "56ab48a28a8470f0042a4cb7c9da8a6dde8621ecf87a86d75f201cbf1837e77f"; + # provides no sdist on pypi + src = fetchFromGitHub { + owner = "nipunsadvilkar"; + repo = "pySBD"; + rev = "v${version}"; + sha256 = "12p7qm237z56hw4zr03n8rycgfymhki2m9c4w3ib0mvqq122a5dp"; }; checkInputs = [ tqdm spacy ]; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index c4393821b7d..4bf0ab7b567 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.3.5"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-XOYq+p76XFt7j4oxMClZox5wsaXuV5ovcB6kZJhMBlU="; + sha256 = "sha256-iqWQAZV1H3p9Ud+6U2RwIpfFlsu+7SE96Abh3u8CCVs="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/analog/default.nix b/pkgs/tools/admin/analog/default.nix index d85e5365d63..3d8556d8103 100644 --- a/pkgs/tools/admin/analog/default.nix +++ b/pkgs/tools/admin/analog/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "analog"; - version = "6.0.16"; + version = "6.0.17"; src = fetchFromGitHub { owner = "c-amie"; repo = "analog-ce"; rev = version; - sha256 = "15hi8kfknldwpvm885r9s7zd5h7cirs7x0zazx2nnz62xvz3iymk"; + sha256 = "sha256-89nNkIUKzlcKKy0TfthA9T27A446Fqv9hYllGjYkDP4="; }; postPatch = '' diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix index f9bf8dc8706..b0e9e8c0a1e 100644 --- a/pkgs/top-level/kodi-packages.nix +++ b/pkgs/top-level/kodi-packages.nix @@ -126,4 +126,6 @@ let self = rec { urllib3 = callPackage ../applications/video/kodi-packages/urllib3 { }; + websocket = callPackage ../applications/video/kodi-packages/websocket { }; + }; in self |