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: 13a15f262a2b
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: 6ec10fc77e56
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on Sep 22, 2020

  1. coturn: 4.5.1.2 -> 4.5.1.3 

    (cherry picked from commit 5c67b5e)

Fixes CVE-2020-4067.
    @r-ryantm @fpletz
    r-ryantm authored and fpletz committed Sep 22, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    fpletz Franz Pletz
    GPG key ID: 846FDED7792617B4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    683736a View commit details

  2. python3Packages.Django: 2.2.14 -> 2.2.15 

    (cherry picked from commit 6eaaf2e)
    @FRidh @lsix
    FRidh authored and lsix committed Sep 22, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lsix lsix
    GPG key ID: 02E1542BA66FB047
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    68efe6d View commit details

  3. pythonPackages.django: 2.2.15 -> 2.2.16 

    See https://docs.djangoproject.com/en/dev/releases/2.2.16/

(cherry picked from commit bd4805b)
    @lsix
    lsix committed Sep 22, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    lsix lsix
    GPG key ID: 02E1542BA66FB047
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6ec10fc View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/python-modules/django/2_2.nix
  2. +2 −2 pkgs/servers/coturn/default.nix
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.14";
version = "2.2.16";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "14b1w00hrf4n7hla6d6nf2p5r4k6jh3fcmv7bd1v04vpcpvfrw7d";
sha256 = "1535g2r322cl4x52fb0dmzlbg23539j2wx6027j54p22xvjlbkv2";
};

patches = stdenv.lib.optional withGdal
4 changes: 2 additions & 2 deletions pkgs/servers/coturn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "coturn";
version = "4.5.1.2";
version = "4.5.1.3";

src = fetchFromGitHub {
owner = "coturn";
repo = "coturn";
rev = version;
sha256 = "01y65az8qyv2kjnb4fj7rgl4zq5pc2b286gfn727x3hfhksx9zp2";
sha256 = "1801931k4qdvc7jvaqxvjyhbh1xsvjz0pjajf6xc222n4ggar1q5";
};

buildInputs = [ openssl libevent ];