From 7a3e62127da1171b0276b9bd71411606036422a3 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sat, 8 Jan 2022 18:31:38 -0500 Subject: [PATCH 1/3] mautrix-facebook: Remove max version requirements. It appears that these are bumped to match manual testing however they do not work well in nixpkgs as every time a dependency is updated this package breaks. To resolve this issue just strip the max version requirements and assume that it works. Ideally we would do a semver-type comparison but this is likely not an issue because a new major version would need a new attribute name anyways. --- pkgs/servers/mautrix-facebook/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index b3fdef8698b0..c3ad98e47da9 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -32,6 +32,11 @@ python3.pkgs.buildPythonPackage rec { yarl ] ++ lib.optional enableSystemd systemd; + postPatch = '' + # Drop version limiting so that every dependency update doesn't break this package. + sed -i -e 's/,<.*//' requirements.txt + ''; + doCheck = false; postInstall = '' From fffad300050ed810014397419d23ecdfdddcb867 Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sun, 9 Jan 2022 19:14:02 -0500 Subject: [PATCH 2/3] mautrix-facebook: Update to latest git. The last released version doesn't work with the version of pythonPackages.mautrix that is in nixpkgs. --- pkgs/servers/mautrix-facebook/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index c3ad98e47da9..e1c4c548314e 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -7,13 +7,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-facebook"; - version = "0.3.2"; + version = "2022-01-10"; src = fetchFromGitHub { owner = "mautrix"; repo = "facebook"; - rev = "v${version}"; - sha256 = "1n7gshm2nir6vgjkj36lq9m2bclkgy0y236xi8zvdlvfcb2m596f"; + rev = "eebfbe49fc699806e1d71becf261ba0995c91f60"; + hash = "sha256-zfsuoPySIRAAmsSL0NUUVH7k+xV7rZOHOkIvBQdVe0A="; }; propagatedBuildInputs = with python3.pkgs; [ @@ -30,6 +30,7 @@ python3.pkgs.buildPythonPackage rec { ruamel-yaml unpaddedbase64 yarl + zstandard ] ++ lib.optional enableSystemd systemd; postPatch = '' From 16e552207519f0d8015ef5bd2c2fae685eb0a53e Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sun, 9 Jan 2022 19:14:02 -0500 Subject: [PATCH 3/3] mautrix-facebook: Add version test. --- pkgs/servers/mautrix-facebook/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index e1c4c548314e..33df669aaac5 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -38,8 +38,6 @@ python3.pkgs.buildPythonPackage rec { sed -i -e 's/,<.*//' requirements.txt ''; - doCheck = false; - postInstall = '' mkdir -p $out/bin @@ -50,6 +48,10 @@ python3.pkgs.buildPythonPackage rec { chmod +x $out/bin/mautrix-facebook ''; + checkPhase = '' + $out/bin/mautrix-facebook --help + ''; + meta = with lib; { homepage = "https://github.com/mautrix/facebook"; description = "A Matrix-Facebook Messenger puppeting bridge";