mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-21 04:13:12 +00:00
Merge pull request #129824 from expipiplus1/joe-mautrix
mautrix-signal: 0.1.1 -> 2021-07-01
This commit is contained in:
commit
01baf393d8
@ -4,11 +4,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mautrix";
|
||||
version = "0.9.6";
|
||||
version = "0.9.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1810deb7f780700e7e0734e1844c1b4b2525ee990b8665f7b98e3f335a31bbcf";
|
||||
sha256 = "1yx9ybpw9ppym8k2ky5pxh3f2icpmk887i8ipwixrcrnml3q136p";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -1,29 +1,17 @@
|
||||
{ lib, python3, fetchFromGitHub }:
|
||||
|
||||
let
|
||||
python = python3.override {
|
||||
packageOverrides = self: super: {
|
||||
mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec {
|
||||
version = "0.8.18";
|
||||
src = oldAttrs.src.override {
|
||||
inherit version;
|
||||
sha256 = "32daf7a7dcf5d4013b37321df7b319f36523f38884ccc3e2e965917d0a5c73c1";
|
||||
};
|
||||
});
|
||||
};
|
||||
};
|
||||
in python.pkgs.buildPythonPackage rec {
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "mautrix-signal";
|
||||
version = "0.1.1";
|
||||
version = "unstable-2021-07-01";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tulir";
|
||||
repo = "mautrix-signal";
|
||||
rev = "v${version}";
|
||||
sha256 = "11snsl7i407855h39g1fgk26hinnq0inr8sjrgd319li0d3jwzxl";
|
||||
rev = "56eb24412fcafb4836f29375fba9cc6db1715d6f";
|
||||
sha256 = "10nbfl48yb7h23znkxvkqh1dgp2xgldvxsigwfmwa1qbq0l4dljl";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
CommonMark
|
||||
aiohttp
|
||||
asyncpg
|
||||
@ -53,7 +41,7 @@ in python.pkgs.buildPythonPackage rec {
|
||||
" > $out/bin/mautrix-signal
|
||||
chmod +x $out/bin/mautrix-signal
|
||||
wrapProgram $out/bin/mautrix-signal \
|
||||
--set PATH ${python}/bin \
|
||||
--set PATH ${python3}/bin \
|
||||
--set PYTHONPATH "$PYTHONPATH"
|
||||
'';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user