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

Commits on Nov 9, 2020

  1. element-web: 1.7.12 -> 1.7.13 

    https://github.com/vector-im/element-web/releases/tag/v1.7.13
    @Ma27
    Ma27 committed Nov 9, 2020
    Copy the full SHA
    feb893a View commit details

  2. element-desktop: 1.7.12 -> 1.7.13 

    https://github.com/vector-im/element-desktop/releases/tag/v1.7.13
    @Ma27
    Ma27 committed Nov 9, 2020
    Copy the full SHA
    ad63add 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.12",
"version": "1.7.13",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
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.12";
version = "1.7.13";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
sha256 = "08d9llrglap5bbicdkbdl9l71wba2kkyhdyd0a4iqdz3l2jvv698";
sha256 = "04nm5amhc0bqqwcc1c9x88lnbjaaryfs0xhi4as65l5ac4jdkzjc";
};
electron = electron_9;

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
@@ -12,11 +12,11 @@ let

in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.7.12";
version = "1.7.13";

src = fetchurl {
url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz";
sha256 = "173hdg09cw13vqh0lvz6kl0mq4i3rsacjxhspkpydh2qd1g3hjrs";
sha256 = "13ylzyr1kkrppvp86kih60pqxlsvqlcsgz2gj4azgmrf2bijfby3";
};

installPhase = ''