Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 859637e3f27a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 404a1538ac8b
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 11, 2020

  1. python3Packages.mautrix: 0.4.0 -> 0.4.1 

    https://pypi.org/project/mautrix/0.4.1/
    @Ma27
    Ma27 committed Jan 11, 2020
    Copy the full SHA
    8343af8 View commit details

  2. mautrix-whatsapp: 2019-11-17 -> 2020-01-07

    @Ma27
    Ma27 committed Jan 11, 2020
    Copy the full SHA
    404a153 View commit details
11 changes: 2 additions & 9 deletions pkgs/development/python-modules/mautrix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,20 +4,13 @@

buildPythonPackage rec {
pname = "mautrix";
version = "0.4.0";
version = "0.4.1";

src = fetchPypi {
inherit pname version;
sha256 = "03m59d683nr547v5xr80wc3j07das2d2sc3i4bf03dpbkfg0h17w";
sha256 = "0mfxfc1y317h90h1jx7amsk09jwzxbvfc75qxzl9nf8ah432yfpr";
};

patches = [
(fetchpatch {
url = "https://github.com/tulir/mautrix-python/commit/ac46f3bb1bea11d22d8a486cc4821604c844da5e.patch";
sha256 = "198g63s0iv8g1w22g4g5hb54y41ws82wraglibz33qhrwsfn8axn";
})
];

propagatedBuildInputs = [
aiohttp
future-fstrings
46 changes: 0 additions & 46 deletions pkgs/servers/mautrix-whatsapp/0001-Add-missing-go-dependencies-to-go.sum.patch
View file

This file was deleted.

10 changes: 4 additions & 6 deletions pkgs/servers/mautrix-whatsapp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,18 +2,16 @@

buildGoModule {
pname = "mautrix-whatsapp-unstable";
version = "2019-11-17";
version = "2020-01-07";

src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "0fba1db6aa88a95ff567f44aa9be7ce6ef24787f";
sha256 = "07cgpvicr6n897myx86mlnx7bydsxnf51lnjbv9dl5yyii73f957";
rev = "302fae6649f083ae2a1d4431157e6045865f62ad";
sha256 = "0rnlbw1xqk9kjc23pmybxdznxylpfxl35wa37lkafymfardjjavb";
};

patches = [ ./0001-Add-missing-go-dependencies-to-go.sum.patch ];

modSha256 = "0y0im3dz5z3rcsmnxkk0l6xqwcyxb0bi9h4arw7zblfy16iw6vrr";
modSha256 = "18bcv7x49bqnzwhafh8fvyv9z2d4j6w0iyqql0alq57hy7h7lxik";

meta = with stdenv.lib; {
homepage = https://github.com/tulir/mautrix-whatsapp;