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

Commits on Sep 16, 2020

  1. xonsh: 0.9.21 -> 0.9.22 

    https://github.com/xonsh/xonsh/releases/tag/0.9.22
    @marsam
    marsam committed Sep 16, 2020
    Copy the full SHA
    0561fde View commit details

Commits on Sep 17, 2020

  1. Revert "python: gsd: 1.7.0 -> 1.9.3" 

    Incorrect update. Should not update the Python 2 version.

This reverts commit d1a46d4.
    @FRidh
    FRidh committed Sep 17, 2020
    Copy the full SHA
    af92611 View commit details

  2. Merge pull request #98145 from marsam/update-xonsh 

    xonsh: 0.9.21 -> 0.9.22
    @Ma27
    Ma27 authored Sep 17, 2020
    Copy the full SHA
    6803bc6 View commit details

  3. signal-desktop: ringrtc depends on libpulseaudio 

    voice/video calls should now work, fixing #98082
    @collares @primeos
    collares authored and primeos committed Sep 17, 2020
    Copy the full SHA
    3df04be View commit details
3 changes: 2 additions & 1 deletion pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
, libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
, cups, expat, libuuid, at-spi2-core, libappindicator-gtk3
# Runtime dependencies:
, systemd, libnotify, libdbusmenu
, systemd, libnotify, libdbusmenu, libpulseaudio
# Unfortunately this also overwrites the UI language (not just the spell
# checking language!):
, hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE"
@@ -122,6 +122,7 @@ in stdenv.mkDerivation rec {
--replace /opt/Signal/signal-desktop $out/bin/signal-desktop
autoPatchelf --no-recurse -- $out/lib/Signal/
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so $out/lib/Signal/resources/app.asar.unpacked/node_modules/ringrtc/build/linux/libringrtc.node
'';

# Tests if the application launches and waits for "Link your phone to Signal Desktop":
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/gsd/1.7.nix
View file
Original file line number Diff line number Diff line change
@@ -5,12 +5,12 @@
}:

buildPythonPackage rec {
version = "1.9.3";
version = "1.7.0";
pname = "gsd";

src = fetchPypi {
inherit pname version;
sha256 = "c6b37344e69020f69fda2b8d97f894cb41fd720840abeda682edd680d1cff838";
sha256 = "0fpk69wachyydpk9cbs901m7hkwrrvq24ykxsrz62km9ql8lr2vp";
};

propagatedBuildInputs = [ numpy ];
4 changes: 2 additions & 2 deletions pkgs/shells/xonsh/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,14 +8,14 @@

python3Packages.buildPythonApplication rec {
pname = "xonsh";
version = "0.9.21";
version = "0.9.22";

# fetch from github because the pypi package ships incomplete tests
src = fetchFromGitHub {
owner = "xonsh";
repo = "xonsh";
rev = version;
sha256 = "16k8506fk54krpkls374cn3vm1dp9ixi0byh5xvi3m5a4bnbvrs0";
sha256 = "04yd8y4lksmxbgl6v6bw1k32r8v5mia3sm8y9v39cgfzjbkvys1p";
};

LC_ALL = "en_US.UTF-8";