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: ae48415e8b5f
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: df07596d206e
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Mar 26, 2020

  1. signal-desktop: 1.32.1 -> 1.32.2 

    (cherry picked from commit 5c47359)
    @primeos
    primeos committed Mar 26, 2020
    Copy the full SHA
    d5895b9 View commit details

  2. Merge pull request #83417 from primeos/signal-desktop-backport 

    [19.09] signal-desktop: 1.32.1 -> 1.32.2 (backport)
    @primeos
    primeos authored Mar 26, 2020
    Copy the full SHA
    59c3b5f View commit details

  3. nix-bash-completions: 0.6.7 -> 0.6.8 (#81019) 

    (cherry picked from commit 0e5d457)
    @hedning @bjornfor
    hedning authored and bjornfor committed Mar 26, 2020
    Copy the full SHA
    008fc89 View commit details

  4. wire-desktop: Fix StartupWMClass 

    With quotes it doesn't match the Wire's screen, causing the window to not be grouped under its icon in Gnome.

(cherry picked from commit da587da)
    @arianvp @worldofpeace
    arianvp authored and worldofpeace committed Mar 26, 2020
    Copy the full SHA
    df07596 View commit details
4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ let
else "");
in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.32.1"; # Please backport all updates to the stable channel.
version = "1.32.2"; # 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 = "0sfzz1z57l20prj2s8hdl8ip1hrlzb5fqnccqcfd101a6mjnp9i9";
sha256 = "0s64b66yzh797wbnggpj5hym0d1dklh3znbl3xib00hlwdqczbwz";
};

nativeBuildInputs = [
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ let
genericName = "Secure messenger";
categories = "Network;InstantMessaging;Chat;VideoConference";
extraEntries = ''
StartupWMClass="Wire"
StartupWMClass=Wire
'';
};

6 changes: 3 additions & 3 deletions pkgs/shells/bash/nix-bash-completions/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{ stdenv, fetchFromGitHub }:

stdenv.mkDerivation rec {
version = "0.6.7";
version = "0.6.8";
pname = "nix-bash-completions";

src = fetchFromGitHub {
owner = "hedning";
repo = "nix-bash-completions";
rev = "v${version}";
sha256 = "067j1gavpm9zv3vzw9gq0bi3bi0rjrijwprc1j016g44kvpq49qi";
sha256 = "1n5zs6xcnv4bv1hdaypmz7fv4j7dsr4a0ifah99iyj4p5j85i1bc";
};

# To enable lazy loading via. bash-completion we need a symlink to the script
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
'';

meta = with stdenv.lib; {
homepage = https://github.com/hedning/nix-bash-completions;
homepage = "https://github.com/hedning/nix-bash-completions";
description = "Bash completions for Nix, NixOS, and NixOps";
license = licenses.bsd3;
platforms = platforms.all;