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: dd26550fda50
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: 9cd63d068f4a
Choose a head ref
  • 6 commits
  • 4 files changed
  • 3 contributors

Commits on Dec 20, 2019

  1. qgis: 3.10.0 -> 3.10.1 

    (cherry picked from commit 90ebbaa)
    @lsix
    lsix committed Dec 20, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    a4db341 View commit details

  2. pytthonPackages.django_2_2: 2.2.7 -> 2.2.8 

    See https://docs.djangoproject.com/en/2.2/releases/2.2.8/

(cherry picked from commit 40e0bf3)
    @lsix
    lsix committed Dec 20, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    30926cd View commit details

  3. python3Packages.django_2_2: 2.2.8 -> 2.2.9 

    See https://docs.djangoproject.com/en/2.2/releases/2.2.9/ fer release
information.

(cherry picked from commit b7e6b41)
    @lsix
    lsix committed Dec 20, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    2514f09 View commit details

  4. signal-desktop: 1.29.2 -> 1.29.3 

    (cherry picked from commit 313eba4)
Reason: Avoid an expired (unusable) release in the stable release
(Signal-Desktop releases expire after 90 days).
    @primeos
    primeos committed Dec 20, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    762a552 View commit details

  5. Revert "nixos/libinput: apply options to all device types" 

    This reverts commit ea83c79.
    @worldofpeace
    worldofpeace committed Dec 20, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    faffc22 View commit details

  6. Merge pull request #76101 from primeos/signal-desktop-backport 

    [19.09] signal-desktop: 1.29.2 -> 1.29.3 (backport)
    @primeos
    primeos authored Dec 20, 2019

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: ED58F95069B004F5
    Learn about vigilant mode
    Copy the full SHA
    9cd63d0 View commit details
6 changes: 3 additions & 3 deletions nixos/modules/services/x11/hardware/libinput.nix
View file
Original file line number Diff line number Diff line change
@@ -209,12 +209,12 @@ in {

services.xserver.config =
''
# General libinput configuration.
# See CONFIGURATION DETAILS section of man:libinput(4).
# Automatically enable the libinput driver for all touchpads.
Section "InputClass"
Identifier "libinputConfiguration"
MatchDriver "libinput"
MatchIsTouchpad "on"
${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
Driver "libinput"
Option "AccelProfile" "${cfg.accelProfile}"
${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''}
${optionalString (cfg.buttonMapping != null) ''Option "ButtonMapping" "${cfg.buttonMapping}"''}
4 changes: 2 additions & 2 deletions pkgs/applications/gis/qgis/unwrapped.nix
View file
Original file line number Diff line number Diff line change
@@ -10,15 +10,15 @@ let
[ qscintilla-qt5 gdal jinja2 numpy psycopg2
chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
in mkDerivation rec {
version = "3.10.0";
version = "3.10.1";
pname = "qgis";
name = "${pname}-unwrapped-${version}";

src = fetchFromGitHub {
owner = "qgis";
repo = "QGIS";
rev = "final-${lib.replaceStrings ["."] ["_"] version}";
sha256 = "0qq4dznxxbpj8b4ypkz7dixc0b0v6rmf3c5hs4m3ka3rzck8jsqc";
sha256 = "0xq0nnp7zdqaihqvh5rsi1129g23vnk5ijkpxfzaggafgmhf5hgz";
};

passthru = {
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
@@ -58,7 +58,7 @@ let

in stdenv.mkDerivation rec {
pname = "signal-desktop";
version = "1.29.2"; # Please backport all updates to the stable channel.
version = "1.29.3"; # 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:
@@ -68,7 +68,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 = "1w35x0p3znylgr0vx72x3kdm3cyg0xymqy12q8bygvijd0h6182d";
sha256 = "1rkj6rwmwwvyd5041r96j1dxlfbmc6xsdrza43c0ykdrhfj73h11";
};

phases = [ "unpackPhase" "installPhase" ];
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django/2_2.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

buildPythonPackage rec {
pname = "Django";
version = "2.2.7";
version = "2.2.9";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "16040e1288c6c9f68c6da2fe75ebde83c0a158f6f5d54f4c5177b0c1478c5b86";
sha256 = "199mwqs6apdxjm4afqjbvqs98j2927rv2wbgy5vzvqwjhzviyak6";
};

patches = stdenv.lib.optional withGdal