Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 182f229ba7cc
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0bb35152be89
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Apr 5, 2020

  1. mautrix-whatsapp: 2020-03-26 -> 2020-04-02 

    (cherry picked from commit ca0cb2c)
    @Ma27
    Ma27 committed Apr 5, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    colemickens Cole Mickens
    GPG key ID: B475C2955744A019
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0d4f92d View commit details

  2. bandwhich: 0.12.0 -> 0.13.0 

    https://github.com/imsnif/bandwhich/releases/tag/0.13.0
(cherry picked from commit 35c0d9d)
    @Ma27
    Ma27 committed Apr 5, 2020
    Copy the full SHA
    8f720ba View commit details

  3. firefox: mark as broken on 32-bit buildPlatform 

    (cherry picked from commit ed33a6c)
    @flokli
    volth authored and flokli committed Apr 5, 2020
    Copy the full SHA
    0bb3515 View commit details
Showing with 9 additions and 7 deletions.
  1. +3 −1 pkgs/applications/networking/browsers/firefox/packages.nix
  2. +4 −4 pkgs/servers/mautrix-whatsapp/default.nix
  3. +2 −2 pkgs/tools/networking/bandwhich/default.nix
4 changes: 3 additions & 1 deletion pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ config, lib, callPackage, fetchurl }:
{ config, stdenv, lib, callPackage, fetchurl }:

let
common = opts: callPackage (import ./common.nix opts) {};
@@ -23,6 +23,8 @@ rec {
maintainers = with lib.maintainers; [ eelco andir ];
platforms = lib.platforms.unix;
badPlatforms = lib.platforms.darwin;
broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory".
# not in `badPlatforms` because cross-compilation on 64-bit machine might work.
license = lib.licenses.mpl20;
};
updateScript = callPackage ./update.nix {
8 changes: 4 additions & 4 deletions pkgs/servers/mautrix-whatsapp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,16 +2,16 @@

buildGoModule {
pname = "mautrix-whatsapp-unstable";
version = "2020-03-26";
version = "2020-04-02";

src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "3a9642386cdff8293657c8409da4bffd674184bf";
sha256 = "183ghrm83vlnalmlxq69xinvkylnxwmz41wwm5s4035arizkjh1b";
rev = "064b5b8fedb6896d04509aa0e094a8d9f83426c2";
sha256 = "1xky31x5jk7yxh875nk20vvsn9givy6vxdqhqg5qwf4xjj2zqh2p";
};

modSha256 = "01xwq0h3i8ai0294v8jdagksas48866lxcnkn4slwp3rnzv6cmbp";
modSha256 = "0qcxxhfp3fkx90r3lwhi0lkzg3digwrnxk8cack11k717szg7zrd";

meta = with stdenv.lib; {
homepage = https://github.com/tulir/mautrix-whatsapp;
4 changes: 2 additions & 2 deletions pkgs/tools/networking/bandwhich/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

rustPlatform.buildRustPackage rec {
pname = "bandwhich";
version = "0.12.0";
version = "0.13.0";

src = fetchFromGitHub {
owner = "imsnif";
repo = pname;
rev = version;
sha256 = "0vg2fkjksjysm5ckdlfswg8w7f52wkh417l7k96hghg9ni4yz575";
sha256 = "0xcn65j2q2pmbvrd5dkjg8anw1r12vizazr1wz4cinhrpsxx8p1p";
};

cargoSha256 = "1sa81570cvvpqgdcpnb08b0q4c6ap8a2wxfp2z336jzbv0zgv8a6";