Merge pull request #176473 from pacien/matrix-commander-2.30.0
This commit is contained in:
commit
93e34826f1
|
@ -1,38 +1,63 @@
|
|||
{ stdenv, lib, fetchFromGitHub, cacert, python3 }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, buildPythonApplication
|
||||
, cacert
|
||||
, setuptools
|
||||
, matrix-nio
|
||||
, python-magic
|
||||
, markdown
|
||||
, pillow
|
||||
, urllib3
|
||||
, aiofiles
|
||||
, notify2
|
||||
, dbus-python
|
||||
, xdg
|
||||
, python-olm
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
buildPythonApplication rec {
|
||||
pname = "matrix-commander";
|
||||
version = "unstable-2021-08-05";
|
||||
version = "2.37.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "8go";
|
||||
repo = "matrix-commander";
|
||||
rev = "7ab3fd9a0ef4eb19d882cb3701d2025b4d41b63a";
|
||||
sha256 = "sha256-WWf7GbJxGlqIdsS1d0T1DO0WN2RBepHGgJrl/nt7UIg=";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-X5tCPR0EqY1dxViwh8/tEjJM2oo81L3H703pPzWzUv8=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
cacert
|
||||
(python3.withPackages(ps: with ps; [
|
||||
matrix-nio
|
||||
magic
|
||||
markdown
|
||||
pillow
|
||||
urllib3
|
||||
aiofiles
|
||||
notify2
|
||||
]))];
|
||||
format = "pyproject";
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
postPatch = ''
|
||||
# Dependencies already bundled with Python
|
||||
sed -i \
|
||||
-e '/uuid/d' \
|
||||
-e '/argparse/d' \
|
||||
-e '/asyncio/d' \
|
||||
-e '/datetime/d' \
|
||||
setup.cfg requirements.txt
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp $src/matrix-commander.py $out/bin/matrix-commander
|
||||
chmod +x $out/bin/matrix-commander
|
||||
|
||||
runHook postInstall
|
||||
# Dependencies not correctly detected
|
||||
sed -i \
|
||||
-e '/dbus-python/d' \
|
||||
setup.cfg requirements.txt
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
cacert
|
||||
setuptools
|
||||
matrix-nio
|
||||
python-magic
|
||||
markdown
|
||||
pillow
|
||||
urllib3
|
||||
aiofiles
|
||||
notify2
|
||||
dbus-python
|
||||
xdg
|
||||
python-olm
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple but convenient CLI-based Matrix client app for sending and receiving";
|
||||
homepage = "https://github.com/8go/matrix-commander";
|
||||
|
|
|
@ -28146,7 +28146,7 @@ with pkgs;
|
|||
canonicaljson;
|
||||
};
|
||||
|
||||
matrix-commander = callPackage ../applications/networking/instant-messengers/matrix-commander { };
|
||||
matrix-commander = python3Packages.callPackage ../applications/networking/instant-messengers/matrix-commander { };
|
||||
|
||||
matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { };
|
||||
|
||||
|
|
Loading…
Reference in a new issue