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

Commits on Oct 1, 2019

  1. riot-web: 1.4.0 -> 1.4.1

    @pacien
    pacien committed Oct 1, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    wyattjoh Wyatt Johnson
    SSH Key Fingerprint: JvqInbZyDOQR8af6w1gV1Amt8FGpIOaAFxem3scS1ZU
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bdd8693 View commit details

  2. riot-desktop: 1.4.0 -> 1.4.1

    @pacien
    pacien committed Oct 1, 2019
    Copy the full SHA
    7a82c74 View commit details

  3. Merge pull request #70200 from pacien/riot-v1.4.1 

    riot-{web,desktop}: 1.4.0 -> 1.4.1
    @Ma27
    Ma27 authored Oct 1, 2019
    Copy the full SHA
    bb8b193 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.4.0",
"version": "1.4.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
@@ -6,12 +6,12 @@

let
executableName = "riot-desktop";
version = "1.4.0";
version = "1.4.1";
riot-web-src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-web";
rev = "v${version}";
sha256 = "1p8bl7v2214shywn53fpcb27vvvdjrs3kcys3f045v2l5fg5xhsa";
sha256 = "0w4w39smak6hp65vam5rrz6l48rb4yzszzyn1yjhr1m8w8j9bvfl";
};

in yarn2nix-moretea.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
@@ -5,11 +5,11 @@

stdenv.mkDerivation rec {
pname = "riot-web";
version = "1.4.0";
version = "1.4.1";

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

installPhase = let