Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ece42b96d16f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5c0abc553cfa
Choose a head ref
  • 4 commits
  • 4 files changed
  • 1 contributor

Commits on Jul 4, 2019

  1. python3Packages.django_1_8: add more known vulns 

    I'm just assuming that these affect 1.8, since they affect every later
version.

(cherry picked from commit 6bbeeb6)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
    @alyssais @lsix
    alyssais authored and lsix committed Jul 4, 2019

    Unverified

    No user is associated with the committer email.
    Learn about vigilant mode
    Copy the full SHA
    2b6b923 View commit details

  2. python3Packages.django_2_2: 2.2.2 -> 2.2.3 

    (cherry picked from commit b37c76f)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
    @alyssais @lsix
    alyssais authored and lsix committed Jul 4, 2019
    Copy the full SHA
    1ab0dd3 View commit details

  3. python3Packages.django_2_1: 2.1.9 -> 2.1.10 

    CVE-2019-12781

(cherry picked from commit 26b6cba)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
    @alyssais @lsix
    alyssais authored and lsix committed Jul 4, 2019
    Copy the full SHA
    c2f9536 View commit details

  4. python3Packages.django: 1.11.21 -> 1.11.22 

    CVE-2019-12781

(cherry picked from commit 20a5961)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
    @alyssais @lsix
    alyssais authored and lsix committed Jul 4, 2019
    Copy the full SHA
    5c0abc5 View commit details
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django/1_11.nix
View file
Original file line number Diff line number Diff line change
@@ -6,11 +6,11 @@

buildPythonPackage rec {
pname = "Django";
version = "1.11.21";
version = "1.11.22";

src = fetchurl {
url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
sha256 = "0adhcw8sx2mgwk9y2j760y96pqbip1ni3sf2v2ls5zxc9x93wwms";
sha256 = "0if8p7sgbvpy3m8d25pw1x232s14ndd60w5s5d88jl3hl505s3c3";
};

patches = stdenv.lib.optionals withGdal [
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/django/1_8.nix
View file
Original file line number Diff line number Diff line change
@@ -29,6 +29,9 @@ buildPythonPackage rec {
# The patches were not backported due to Django 1.8 having reached EOL
https://www.djangoproject.com/weblog/2018/aug/01/security-releases/
https://www.djangoproject.com/weblog/2019/jan/04/security-releases/
https://www.djangoproject.com/weblog/2019/feb/11/security-releases/
https://www.djangoproject.com/weblog/2019/jun/03/security-releases/
https://www.djangoproject.com/weblog/2019/jul/01/security-releases/
];
};

4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django/2_1.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

buildPythonPackage rec {
pname = "Django";
version = "2.1.9";
version = "2.1.10";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "1nkqylj6hz7k45mvwch2y5cc06ncnzbxnzw2d7vbv10azzsdwljh";
sha256 = "0n794x17x8q2jzjm12glb900y53r3bxg8dafvl65djiglm4abqk5";
};

patches = stdenv.lib.optionals withGdal [
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.2";
version = "2.2.3";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "1xbqsa016szsqx6pnggrlxs81169hd8adzmdvp969007xg9k0gbm";
sha256 = "1sn0a7yjipwxrplh1x4kr77a93xzik1inh07bxwaqaw94qdzc8sd";
};

patches = stdenv.lib.optional withGdal