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: 2ad09a0811e8
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: 91cdcf313578
Choose a head ref
  • 5 commits
  • 2 files changed
  • 2 contributors

Commits on May 14, 2020

  1. firefox: 76.0 -> 76.0.1 

    (cherry picked from commit b70435e)
    @andir
    andir committed May 14, 2020
    Copy the full SHA
    0ec56df View commit details

Commits on May 15, 2020

  1. signal-desktop: 1.33.4 -> 1.34.0 

    (cherry picked from commit b0df5a6)
    @primeos
    primeos committed May 15, 2020
    Copy the full SHA
    2215dff View commit details

  2. signal-desktop: Add passthru.tests 

    (cherry picked from commit facfa00)
    @primeos
    primeos committed May 15, 2020
    Copy the full SHA
    9faab3a View commit details

  3. Merge pull request #87888 from primeos/signal-desktop-backport 

    [20.03] signal-desktop: 1.33.4 -> 1.34.0 (backport)
    @primeos
    primeos authored May 15, 2020
    Copy the full SHA
    39b049e View commit details

  4. Merge pull request #87834 from andir/20.03/firefox 

    [20.03] firefox: 76.0 -> 76.0.1
    @andir
    andir authored May 15, 2020
    Copy the full SHA
    91cdcf3 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/browsers/firefox/packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7,10 +7,10 @@ in
rec {
firefox = common rec {
pname = "firefox";
ffversion = "76.0";
ffversion = "76.0.1";
src = fetchurl {
url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz";
sha512 = "3dq9h84w1qqidabbrl34jgyjr8bbmbf5wddjazpr7znfm49fn2xyg8fmm5lx9dakghk3wp8yhfi36gmk08fzlrm47v6h17dm9hkh0hz";
sha512 = "0gnhfcgrz6022xf3vqia3s3639xa5pjp13h343d3c09mn8r919cmm6s38vzj1v3734fm25zb68acyarsp72xqq8z1420rh02b2pv38q";
};

patches = [
9 changes: 6 additions & 3 deletions pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook
{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests
, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig
, dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
@@ -23,7 +23,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.33.4"; # Please backport all updates to the stable channel.
version = "1.34.0"; # Please backport all updates to the stable channel.
# All releases have a limited lifetime and "expire" 90 days after the release.
# When releases "expire" the application becomes unusable until an update is
# applied. The expiration date for the current release can be extracted with:
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {

src = fetchurl {
url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
sha256 = "0mcxia2zaflaazfdl1ngpab0dyhwwzbhad7brc6kwhjxydbnmwcd";
sha256 = "175iir85qlign5ns8wk4x4mf7xw8sriq8jyj61n76is79jjk7b3d";
};

nativeBuildInputs = [
@@ -121,6 +121,9 @@ in stdenv.mkDerivation rec {
autoPatchelf --no-recurse -- $out/lib/Signal/
'';

# Tests if the application launches and waits for "Link your phone to Signal Desktop":
passthru.tests.application-launch = nixosTests.signal-desktop;

meta = {
description = "Private, simple, and secure messenger";
longDescription = ''