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

Commits on Jun 1, 2019

  1. riot-{web,desktop}: 1.1.0 -> 1.2.1

    @nyanloutre @worldofpeace
    nyanloutre authored and worldofpeace committed Jun 1, 2019
    Copy the full SHA
    06195c9 View commit details

  2. Merge pull request #62253 from nyanloutre/riot_update_1_2_0 

    riot-{web,desktop}: 1.1.0 -> 1.2.1
    @worldofpeace
    worldofpeace authored Jun 1, 2019
    Copy the full SHA
    c90e94a 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.1.0",
"version": "1.2.1",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"dependencies": {
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
@@ -7,12 +7,12 @@ with (import ./yarn2nix.nix { inherit pkgs; });

let
executableName = "riot-desktop";
version = "1.1.0";
version = "1.2.1";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
sha256 = "0h1rr70jg64v824k31mvb93nfssr572xlyicc8yh91bl7hdh342x";
sha256 = "0l50swqzdzbzbnrlkvwi133d54jgj15cj3awmlc1qdhnfdc3wxbb";
};

in mkYarnPackage rec {
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
@@ -6,11 +6,11 @@
let configFile = writeText "riot-config.json" conf; in
stdenv.mkDerivation rec {
name= "riot-web-${version}";
version = "1.1.0";
version = "1.2.1";

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

installPhase = ''