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

Commits on Jun 1, 2020

  1. mautrix-whatsapp: 2020-05-27 -> 2020-05-29 

    (cherry picked from commit 55fea6d)
    @Ma27
    Ma27 committed Jun 1, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    renovate-bot Mend Renovate
    GPG key ID: 81C63AE1C224182B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7a21e9f View commit details

  2. alacritty: 0.4.2 -> 0.4.3 

    https://github.com/alacritty/alacritty/releases/tag/v0.4.3
(cherry picked from commit 043ecdb)
    @Ma27
    Ma27 committed Jun 1, 2020
    Copy the full SHA
    bdee067 View commit details
Showing with 7 additions and 7 deletions.
  1. +4 −4 pkgs/applications/misc/alacritty/default.nix
  2. +3 −3 pkgs/servers/mautrix-whatsapp/default.nix
8 changes: 4 additions & 4 deletions pkgs/applications/misc/alacritty/default.nix
View file
Original file line number Diff line number Diff line change
@@ -52,16 +52,16 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "alacritty";
version = "0.4.2";
version = "0.4.3";

src = fetchFromGitHub {
owner = "alacritty";
repo = pname;
rev = "v${version}";
sha256 = "133d8vm7ihlvgw8n1jghhh35h664h0f52h6gci54f11vl6c1spws";
sha256 = "1b6fspcd8yn1857cgn1m8a828bvjspvrfc2giwsa9ai0ighcqbgl";
};

cargoSha256 = "0y7yzbl6hyb89f2lcn3s65jbrzibr8b8x7l84iriw6ifsqnvcyg5";
cargoSha256 = "0hskj1rnql8sxsgr317vidcb9av3rvjwfwrfp89dlw5l87gyvn8s";

nativeBuildInputs = [
cmake
@@ -129,7 +129,7 @@ rustPlatform.buildRustPackage rec {
description = "A cross-platform, GPU-accelerated terminal emulator";
homepage = "https://github.com/alacritty/alacritty";
license = licenses.asl20;
maintainers = with maintainers; [ filalex77 mic92 cole-h ];
maintainers = with maintainers; [ filalex77 mic92 cole-h ma27 ];
platforms = platforms.unix;
};
}
6 changes: 3 additions & 3 deletions pkgs/servers/mautrix-whatsapp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

buildGoModule {
pname = "mautrix-whatsapp-unstable";
version = "2020-05-27";
version = "2020-05-29";

src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "7cf19b0908dec6cb8239aebc3f79ee88dccbfc51";
sha256 = "14cadqvbcjd9vp6dix3jzn0l071r3i9sz0lwpppgzpid8mg9zbx4";
rev = "7947ba616ca1b776883ca7db9cab8de9ee8d9ee6";
sha256 = "10rkkjnbppv9gi67hknijh8ib841qyy16grdw29gz3ips6qs8zq7";
};

modSha256 = "1klwbp9cmyp8dj6divalxsw1dfjh0frw57pwfgd2gakmzj35416b";