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: 47be5473a2f1
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: 5769ebc21a2f
Choose a head ref
  • 9 commits
  • 4 files changed
  • 6 contributors

Commits on Jan 30, 2019

  1. pythonPackages.django_1_11: 1.11.16 -> 1.11.17 (#52636) 

    (cherry picked from commit ddd91fc)
    @marsam
    marsam authored and Robert Schütz committed Jan 30, 2019
    Copy the full SHA
    8f9bbbe View commit details

  2. python.pkgs.django_1_11: 1.11.17 -> 1.11.18 

    fixes CVE-2019-3498

(cherry picked from commit e79d165)
    Robert Schütz committed Jan 30, 2019
    Copy the full SHA
    ec76d88 View commit details

  3. python.pkgs.django_2_0: 2.0.9 -> 2.0.10 

    fixes CVE-2019-3498

(cherry picked from commit 682b551)
    Robert Schütz committed Jan 30, 2019
    Copy the full SHA
    67f7b70 View commit details

  4. python36Packages.django_2_1: 2.1.2 -> 2.1.3 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.6-django/versions

(cherry picked from commit 1330965)
    @r-ryantm
    r-ryantm authored and Robert Schütz committed Jan 30, 2019
    Copy the full SHA
    425238f View commit details

  5. python37Packages.django_2_1: 2.1.3 -> 2.1.4 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-django/versions

(cherry picked from commit 375f2c2)
    @r-ryantm
    r-ryantm authored and Robert Schütz committed Jan 30, 2019
    Copy the full SHA
    a38319b View commit details

  6. python37Packages.django_2_1: 2.1.4 -> 2.1.5 

    Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-django/versions

(cherry picked from commit 0f5b4ec)
    @r-ryantm
    r-ryantm authored and Robert Schütz committed Jan 30, 2019
    Copy the full SHA
    e9a99dd View commit details

  7. dockerTools: unpin go version 

    The linked PR has been merged, and in fact dockerTools has upgraded to the
latest `go1.11` compiler:

moby/moby#35739
moby/moby#37358
(cherry picked from commit 4d8bb9a)
    @bhipple @andir
    bhipple authored and andir committed Jan 30, 2019
    Copy the full SHA
    f39fb7b View commit details

Commits on Jan 31, 2019

  1. Merge pull request #54944 from andir/18.09/dockerTools 

    [18.09] dockerTools: unpin go version
    @andir
    andir authored Jan 31, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cdf9d7c View commit details

  2. Merge pull request #54941 from dotlambda/CVE-2019-3498-backport 

    django: [18.09] CVE-2019-3498
    @dotlambda
    dotlambda authored Jan 31, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5769ebc View commit details
11 changes: 5 additions & 6 deletions pkgs/development/python-modules/django/1_11.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,11 @@

buildPythonPackage rec {
pname = "Django";
version = "1.11.16";

disabled = pythonOlder "2.7";
version = "1.11.18";

src = fetchurl {
url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
sha256 = "14apywfi8mfy50xh07cagp24kx9mlqfzfq4f60klz90ng328q9i9";
url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
sha256 = "19b6f020als9hr4q1im5282yn2b1hzf586n9kjrlkrslq7da3k3k";
};

patches = stdenv.lib.optionals withGdal [
@@ -34,8 +32,9 @@ buildPythonPackage rec {
# too complicated to setup
doCheck = false;

meta = {
meta = with stdenv.lib; {
description = "A high-level Python Web framework";
homepage = https://www.djangoproject.com/;
license = licenses.bsd3;
};
}
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django/2_0.nix
View file
Original file line number Diff line number Diff line change
@@ -6,13 +6,13 @@

buildPythonPackage rec {
pname = "Django";
version = "2.0.9";
version = "2.0.10";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "0sgx548zp5xf8dajiamdskbrphssiyajhgbw8iza6b68mda4bnfn";
sha256 = "0292a7ad7d8ffc9cfc6a77f043d2e81f5bbc360c0c4a1686e130ef3432437d23";
};

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

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "0ibbs76pzy8zd47yviljrp1s66fmbf5b62fixayaznj7pdzavg7g";
sha256 = "1hwqqsfg8jgnn039yxrq6xrksk11y7vwpfvba6lk01c3v8c3jffn";
};

patches = stdenv.lib.optionals withGdal [
3 changes: 1 addition & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -129,8 +129,7 @@ with pkgs;

digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { };

# go 1.9 pin until https://github.com/moby/moby/pull/35739
dockerTools = callPackage ../build-support/docker { go = go_1_9; };
dockerTools = callPackage ../build-support/docker { };

docker_compose = pythonPackages.docker_compose;