diff options
author | Emily <vcs@emily.moe> | 2020-02-10 00:26:59 +0000 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-02-10 19:57:23 +0100 |
commit | 6957e476f422a58951a5869e4b5a34367ceb6d8c (patch) | |
tree | e4634beede3e8314a1b6d542c1f90fbc3bac1d9f | |
parent | ab0b90ec5036c2bcb0133d69d2f8c5c9e9c30541 (diff) | |
download | nixlib-6957e476f422a58951a5869e4b5a34367ceb6d8c.tar nixlib-6957e476f422a58951a5869e4b5a34367ceb6d8c.tar.gz nixlib-6957e476f422a58951a5869e4b5a34367ceb6d8c.tar.bz2 nixlib-6957e476f422a58951a5869e4b5a34367ceb6d8c.tar.lz nixlib-6957e476f422a58951a5869e4b5a34367ceb6d8c.tar.xz nixlib-6957e476f422a58951a5869e4b5a34367ceb6d8c.tar.zst nixlib-6957e476f422a58951a5869e4b5a34367ceb6d8c.zip |
weechatScripts.weechat-matrix: unstable-2019-11-10 -> unstable-2020-01-21
-rw-r--r-- | pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix | 49 |
1 files changed, 36 insertions, 13 deletions
diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index ff6a7d947411..845dd9287663 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -1,20 +1,34 @@ -{ buildPythonPackage, stdenv, python, fetchFromGitHub, - pyopenssl, webcolors, future, atomicwrites, - attrs, Logbook, pygments, cachetools, matrix-nio }: +{ buildPythonPackage +, stdenv +, python +, fetchFromGitHub +, pyopenssl +, webcolors +, future +, atomicwrites +, attrs +, Logbook +, pygments +, matrix-nio +, aiohttp +, requests +}: let - matrixUploadPython = python.withPackages (ps: with ps; [ - magic + scriptPython = python.withPackages (ps: with ps; [ + aiohttp + requests + python_magic ]); in buildPythonPackage { pname = "weechat-matrix"; - version = "unstable-2019-11-10"; + version = "unstable-2020-01-21"; src = fetchFromGitHub { owner = "poljar"; repo = "weechat-matrix"; - rev = "69ad2a9c03d516c212d3d0700dbb2bfe654f6365"; - sha256 = "1mfbkag5np2lgv6f31nyfnvavyh67jrrx6gxhzb8m99dd43lgs8c"; + rev = "46640df3e0bfb058e97d8abe723bb88fdf4e5177"; + sha256 = "1j3l43j741csfxsp1nsc74y6wj2wm86c45iraf167g6p0sdzcq8z"; }; propagatedBuildInputs = [ @@ -25,8 +39,9 @@ in buildPythonPackage { attrs Logbook pygments - cachetools matrix-nio + aiohttp + requests ]; passthru.scripts = [ "matrix.py" ]; @@ -38,10 +53,18 @@ in buildPythonPackage { mkdir -p $out/share $out/bin cp $src/main.py $out/share/matrix.py - cp $src/contrib/matrix_upload $out/bin/ + cp \ + $src/contrib/matrix_upload \ + $src/contrib/matrix_decrypt \ + $src/contrib/matrix_sso_helper \ + $out/bin/ substituteInPlace $out/bin/matrix_upload \ - --replace '/usr/bin/env -S python3 -u' '${matrixUploadPython}/bin/python -u' - + --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' + substituteInPlace $out/bin/matrix_sso_helper \ + --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' + substituteInPlace $out/bin/matrix_decrypt \ + --replace '/usr/bin/env python3' '${scriptPython}/bin/python' + mkdir -p $out/${python.sitePackages} cp -r $src/matrix $out/${python.sitePackages}/matrix ''; @@ -53,6 +76,6 @@ in buildPythonPackage { homepage = "https://github.com/poljar/weechat-matrix"; license = licenses.isc; platforms = platforms.linux; - maintainers = [ maintainers.tilpner ]; + maintainers = with maintainers; [ tilpner emily ]; }; } |