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: 0e1969501346
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 461552526ba6
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Dec 24, 2018

  1. python.pkgs.django_1_8: 1.8.18 -> 1.8.19 

    This fixes CVE-2018-7536 and CVE-2018-7537:
https://www.djangoproject.com/weblog/2018/mar/06/security-releases/

cc #52679
    Robert Schütz committed Dec 24, 2018
    Copy the full SHA
    4615525 View commit details
Showing with 4 additions and 5 deletions.
  1. +2 −3 pkgs/development/python-modules/django/1_8.nix
  2. +1 −1 pkgs/development/python-modules/graphite-web/default.nix
  3. +1 −1 pkgs/top-level/python-packages.nix
5 changes: 2 additions & 3 deletions pkgs/development/python-modules/django/1_8.nix
View file
Original file line number Diff line number Diff line change
@@ -6,12 +6,11 @@

buildPythonPackage rec {
name = "Django-${version}";
version = "1.8.18";
disabled = pythonOlder "2.7";
version = "1.8.19";

src = fetchurl {
url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
sha256 = "1ishvbihr9pain0486qafb18dnb7v2ppq34nnx1s8f95bvfiqqf7";
sha256 = "0iy0ni9j1rnx9b06ycgbg2dkrf3qid3y2jipk9x28cykz5f4mm1k";
};

# too complicated to setup
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/graphite-web/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, which
, django, django_tagging, whisper, pycairo, cairocffi, ldap, memcached, pytz, urllib3, scandir
}:
if django.version != "1.8.18"
if django.version != "1.8.19"
|| django_tagging.version != "0.4.3"
then throw "graphite-web should be build with django_1_8 and django_tagging_0_4_3"
else buildPythonPackage rec {
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -2215,7 +2215,7 @@ in {
django_tagging = callPackage ../development/python-modules/django_tagging { };

django_tagging_0_4_3 = if
self.django.version != "1.8.18"
self.django.version != "1.8.19"
then throw "django_tagging_0_4_3 should be build with django_1_8"
else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec {
pname = "django-tagging";