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: 96d5fdcdac08
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 671372110545
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 4, 2019

  1. mautrix-whatsapp: 2019-07-04 -> 2019-09-03 

    Also got rid of the dependency hakery by using `buildGoModule` and
letting `go.mod` do the job.
    @Ma27
    Ma27 committed Sep 4, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    B4dM4n Fabian Möller
    GPG key ID: 70B29D65DD8A7E31
    Verified
    Learn about vigilant mode
    Copy the full SHA
    edaf80a View commit details

Commits on Sep 5, 2019

  1. Merge pull request #68111 from Ma27/bump-mautrix-whatsapp 

    mautrix-whatsapp: 2019-07-04 -> 2019-09-03
    @ryantm
    ryantm authored Sep 5, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    B4dM4n Fabian Möller
    GPG key ID: 70B29D65DD8A7E31
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6713721 View commit details
Showing with 7 additions and 220 deletions.
  1. +7 −9 pkgs/servers/mautrix-whatsapp/default.nix
  2. +0 −211 pkgs/servers/mautrix-whatsapp/deps.nix
16 changes: 7 additions & 9 deletions pkgs/servers/mautrix-whatsapp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
{ stdenv, buildGoPackage, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub }:

buildGoPackage rec {
buildGoModule rec {
pname = "mautrix-unstable";
version = "2019-07-04";

goPackagePath = "maunium.net/go/mautrix-whatsapp";
version = "2019-09-03";

src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "29f5ae45c4b22f463003b23e355b951831f08b3e";
sha256 = "12209m3x01i7bnnkg57ag1ivsk6n6pqaqfin7y02irgi3i3rm31r";
rev = "22fb5c125db1a0a3a8be8e8e09e92bb38718e6bf";
sha256 = "03wd6mn9jr1hr3qxg1r707ibi1s9511y97bfrmzka4mrsymgamxa";
};

goDeps = ./deps.nix;
modSha256 = "14bqxx2hcr8yhcd5hi087pyc1hzqmr13p2fqb3nnsx12j7n07gww";

meta = with stdenv.lib; {
homepage = https://github.com/tulir/mautrix-whatsapp;
description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";
license = licenses.agpl3;
maintainers = with maintainers; [ vskilet ];
maintainers = with maintainers; [ vskilet ma27 ];
};
}
211 changes: 0 additions & 211 deletions pkgs/servers/mautrix-whatsapp/deps.nix
View file

This file was deleted.