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: a9f0ffa06f2d
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: 8a6e7487fb49
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Sep 14, 2020

  1. element-web: 1.7.5 -> 1.7.7 

    https://github.com/vector-im/element-web/releases/tag/v1.7.6
https://github.com/vector-im/element-web/releases/tag/v1.7.7
(cherry picked from commit 33d02b3)
    @Ma27
    Ma27 committed Sep 14, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d240957 View commit details

  2. element-desktop: 1.7.5 -> 1.7.7 

    https://github.com/vector-im/element-desktop/releases/tag/v1.7.6
https://github.com/vector-im/element-desktop/releases/tag/v1.7.7
(cherry picked from commit 441818c)
    @Ma27
    Ma27 committed Sep 14, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8a6e748 View commit details
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "src/electron-main.js",
"version": "1.7.5",
"version": "1.7.7",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
40 changes: 12 additions & 28 deletions pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
View file
Original file line number Diff line number Diff line change
@@ -722,11 +722,11 @@
};
}
{
name = "bl___bl_4.0.2.tgz";
name = "bl___bl_4.0.3.tgz";
path = fetchurl {
name = "bl___bl_4.0.2.tgz";
url = "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz";
sha1 = "52b71e9088515d0606d9dd9cc7aa48dc1f98e73a";
name = "bl___bl_4.0.3.tgz";
url = "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz";
sha1 = "12d6287adc29080e22a705e5764b2a9522cdc489";
};
}
{
@@ -801,14 +801,6 @@
sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef";
};
}
{
name = "buffer___buffer_5.4.3.tgz";
path = fetchurl {
name = "buffer___buffer_5.4.3.tgz";
url = "https://registry.yarnpkg.com/buffer/-/buffer-5.4.3.tgz";
sha1 = "3fbc9c69eb713d323e3fc1a895eee0710c072115";
};
}
{
name = "buffer___buffer_5.6.0.tgz";
path = fetchurl {
@@ -4945,22 +4937,6 @@
sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57";
};
}
{
name = "readable_stream___readable_stream_2.3.6.tgz";
path = fetchurl {
name = "readable_stream___readable_stream_2.3.6.tgz";
url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz";
sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf";
};
}
{
name = "readable_stream___readable_stream_3.4.0.tgz";
path = fetchurl {
name = "readable_stream___readable_stream_3.4.0.tgz";
url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz";
sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc";
};
}
{
name = "readable_stream___readable_stream_3.6.0.tgz";
path = fetchurl {
@@ -5201,6 +5177,14 @@
sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d";
};
}
{
name = "safe_buffer___safe_buffer_5.2.1.tgz";
path = fetchurl {
name = "safe_buffer___safe_buffer_5.2.1.tgz";
url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz";
sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6";
};
}
{
name = "safer_buffer___safer_buffer_2.1.2.tgz";
path = fetchurl {
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View file
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@

let
executableName = "element-desktop";
version = "1.7.5";
version = "1.7.7";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
sha256 = "0781yg15bzkw5bpfzbdkqix239djgsc7kjdvbilv1d1xxqz3462y";
sha256 = "1h3v3d41ykgwn397nhm9zaqgf3n69zh592sjzrprvk1gsn5kj5h2";
};
electron = electron_8;

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

in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.5";
version = "1.7.7";

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

installPhase = ''