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

Commits on May 7, 2020

  1. riot-web: 1.5.15 -> 1.6.0 

    https://github.com/vector-im/riot-web/releases/tag/v1.6.0
(cherry picked from commit b978747)
    @Ma27
    Ma27 authored and Milan committed May 7, 2020
    Copy the full SHA
    31063de View commit details

  2. riot-desktop: 1.5.15 -> 1.6.0 

    https://github.com/vector-im/riot-web/releases/tag/v1.6.0
(cherry picked from commit bc6bad2)
    @Ma27
    Ma27 authored and Milan committed May 7, 2020
    Copy the full SHA
    88e91e4 View commit details
2 changes: 1 addition & 1 deletion 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-web",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.5.15",
"version": "1.6.0",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
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
@@ -610,11 +610,11 @@
};
}
{
name = "minimist___minimist_1.2.2.tgz";
name = "minimist___minimist_1.2.3.tgz";
path = fetchurl {
name = "minimist___minimist_1.2.2.tgz";
url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz";
sha1 = "b00a00230a1108c48c169e69a291aafda3aacd63";
name = "minimist___minimist_1.2.3.tgz";
url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz";
sha1 = "3db5c0765545ab8637be71f333a104a965a9ca3f";
};
}
{
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.5.15";
version = "1.6.0";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
sha256 = "08yk5is6n9ci1jml0b94a3swdybx01k5klbl30i1b76biyn75m77";
sha256 = "16zm6l4c7vkfdlxh6gdw531k5r4v3mb0h66q41h94dvmj79dz2bj";
};
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.5.15";
version = "1.6.0";

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

installPhase = ''