Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 29c0151c82ef
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f277096c4c4f
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on Jun 5, 2020

  1. mautrix-whatsapp: 2020-06-01 -> 0.1.1 

    https://github.com/tulir/mautrix-whatsapp/releases/tag/v0.1.1
https://github.com/tulir/mautrix-whatsapp/releases/tag/v0.1.0
(cherry picked from commit 0402df6)
    @Ma27
    Ma27 committed Jun 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    alexarice Alex Rice
    GPG key ID: 93DDCD7A2B3F3B88
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a0466d5 View commit details

  2. riot-web: 1.6.3 -> 1.6.4 

    https://github.com/vector-im/riot-web/releases/tag/v1.6.4
(cherry picked from commit 3351a81)
    @Ma27
    Ma27 committed Jun 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    33d51b7 View commit details

  3. riot-desktop: 1.6.3 -> 1.6.4 

    https://github.com/vector-im/riot-desktop/releases/tag/v1.6.4
(cherry picked from commit 877d65b)
    @Ma27
    Ma27 committed Jun 5, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f277096 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "riot-desktop",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.6.3",
"version": "1.6.4",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
@@ -48,7 +48,7 @@
"find-npm-prefix": "^1.0.2",
"fs-extra": "^8.1.0",
"glob": "^7.1.6",
"matrix-js-sdk": "6.2.0",
"matrix-js-sdk": "6.2.1",
"mkdirp": "^1.0.3",
"needle": "^2.3.2",
"node-pre-gyp": "^0.14.0",
8 changes: 4 additions & 4 deletions pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix
View file
Original file line number Diff line number Diff line change
@@ -3154,11 +3154,11 @@
};
}
{
name = "matrix_js_sdk___matrix_js_sdk_6.2.0.tgz";
name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz";
path = fetchurl {
name = "matrix_js_sdk___matrix_js_sdk_6.2.0.tgz";
url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.0.tgz";
sha1 = "b1aa6f23858ab3ee4b66be25d3e854f6e287d36b";
name = "matrix_js_sdk___matrix_js_sdk_6.2.1.tgz";
url = "https://registry.yarnpkg.com/matrix-js-sdk/-/matrix-js-sdk-6.2.1.tgz";
sha1 = "d5f76491a650c0a36fcdd078cff59f2da96edd7b";
};
}
{
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix
View file
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@

let
executableName = "riot-desktop";
version = "1.6.3";
version = "1.6.4";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
sha256 = "0dic2xpasf4m22275yrf7s8xnkh77n14cr62gd86j6g7x9rxa8fd";
sha256 = "05z7mggsp33m7ljl4ibk9r4dccglbsc2arp4i3dknq364zdga3m2";
};
electron = electron_7;

4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/riot/riot-web.nix
View file
Original file line number Diff line number Diff line change
@@ -12,11 +12,11 @@ let

in stdenv.mkDerivation rec {
pname = "riot-web";
version = "1.6.3";
version = "1.6.4";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "1v8sz2shj2gjf0vlj7r8g9d2v0qbsg9x64bq5g62nglbnphkcv0k";
sha256 = "0n99ivpfsz48zl0nibhkmli26sks2lpd2h0iph73f2w1p7zw1ln2";
};

installPhase = ''
14 changes: 7 additions & 7 deletions pkgs/servers/mautrix-whatsapp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{ stdenv, buildGoModule, fetchFromGitHub, olm }:

buildGoModule {
pname = "mautrix-whatsapp-unstable";
version = "2020-06-01";
buildGoModule rec {
pname = "mautrix-whatsapp";
version = "0.1.1";

src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "f1b50a22f3c3d54dfb7df12bb607dee8638259d6";
sha256 = "1fy8wqjrjnlv60xj7i6dflkw9kx3i7c7mwgqjjkg6afmmhmwr559";
rev = "v${version}";
sha256 = "0cjgyn311zvpdsagyndkw89bvdrcli5kqznss8dsh05wrllxp3x4";
};

modSha256 = "1klwbp9cmyp8dj6divalxsw1dfjh0frw57pwfgd2gakmzj35416b";

buildInputs = [ olm ];

modSha256 = "0jv0xxkz75ny0v74cyhnn57w3qj6gsc8filinnfclnyq8fh0c8wq";

meta = with stdenv.lib; {
homepage = https://github.com/tulir/mautrix-whatsapp;
description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";