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

Commits on Jun 29, 2020

  1. epson-escpr2: 1.1.12 -> 1.1.13 

    (cherry picked from commit 9884165)
    @Ma27
    Ma27 committed Jun 29, 2020
    Copy the full SHA
    062362b View commit details

  2. riot-desktop: 1.6.6 -> 1.6.7 

    https://github.com/vector-im/riot-desktop/releases/tag/v1.6.7
(cherry picked from commit 27362a6)
    @Ma27
    Ma27 committed Jun 29, 2020
    Copy the full SHA
    11b5bde View commit details

  3. riot-web: 1.6.6 -> 1.6.7 

    https://github.com/vector-im/riot-web/releases/tag/v1.6.7
(cherry picked from commit 260003b)
    @Ma27
    Ma27 committed Jun 29, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    560e3b7 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-desktop",
"productName": "Riot",
"main": "src/electron-main.js",
"version": "1.6.6",
"version": "1.6.7",
"description": "A feature-rich client for Matrix.org",
"author": "New Vector Ltd.",
"repository": {
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.6.6";
version = "1.6.7";
src = fetchFromGitHub {
owner = "vector-im";
repo = "riot-desktop";
rev = "v${version}";
sha256 = "0yrybi6cv3lj0fq4ab4rzjm9l4flfw97hkwzlp7zzixb3z9h09h8";
sha256 = "0l1ih7rkb0nnc79607kkg0k69j9kwqrczhgkqzsmvqxjz7pk9kgn";
};
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.6.6";
version = "1.6.7";

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

installPhase = ''
10 changes: 5 additions & 5 deletions pkgs/misc/drivers/epson-escpr2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,19 +2,19 @@

stdenv.mkDerivation rec {
pname = "epson-inkjet-printer-escpr2";
version = "1.1.12";
version = "1.1.13";

src = fetchurl {
# To find new versions, visit
# http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
# some printer like for instance "WF-7210" to get to the most recent
# version.
# NOTE: Don't forget to update the webarchive link too!
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm"
"https://web.archive.org/web/20200523220202if_/https://download3.ebz.epson.net/dsc/f/03/00/11/12/33/f7e44f924a4f479e4c74f8f587e07c57de3abd85/epson-inkjet-printer-escpr2-1.1.12-1lsb3.2.src.rpm"
urls = [
"https://download3.ebz.epson.net/dsc/f/03/00/11/33/72/48e6a853e518a1bedaee575113e087c0bd5d6e2e/epson-inkjet-printer-escpr2-1.1.13-1lsb3.2.src.rpm"
"https://web.archive.org/web/20200629154055if_/https://download3.ebz.epson.net/dsc/f/03/00/11/33/72/48e6a853e518a1bedaee575113e087c0bd5d6e2e/epson-inkjet-printer-escpr2-1.1.13-1lsb3.2.src.rpm"
];
sha256 = "07sq5xlmidqiycv0qwvpk2xf22vbkbk4fclnjlnx7s08d2jl75kv";
sha256 = "07g62vndn2wh9bablvdl2cxn9wq3hzn16mqji27j20h33cwqmzj1";
};

patches = [ ./cups-filter-ppd-dirs.patch ];