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

Commits on Jun 20, 2019

  1. pythonPackages.django: 1.11.20 -> 1.11.21 

    See https://www.djangoproject.com/weblog/2019/jun/03/security-releases/

(cherry picked from commit 1a3e334)
    @lsix
    lsix committed Jun 20, 2019
    Copy the full SHA
    eea232f View commit details

  2. pythonPackages.django_2_1: 2.1.7 -> 2.1.8 

    See https://docs.djangoproject.com/en/2.2/releases/2.1.8/ for release
information

(cherry picked from commit 952d983)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
    @lsix
    lsix committed Jun 20, 2019
    Copy the full SHA
    03be9e3 View commit details

  3. pythonPackages.django_2_1: 2.1.8 -> 2.1.9 

    See https://www.djangoproject.com/weblog/2019/jun/03/security-releases/

(cherry picked from commit 13859d3)
Signed-off-by: Lancelot SIX <lsix@lancelotsix.com>
    @lsix
    lsix committed Jun 20, 2019
    Copy the full SHA
    cf82fcd View commit details
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkgs/development/python-modules/django/1_11.nix
  2. +2 −2 pkgs/development/python-modules/django/2_1.nix
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.20";
version = "1.11.21";

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

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.7";
version = "2.1.9";

disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963";
sha256 = "1nkqylj6hz7k45mvwch2y5cc06ncnzbxnzw2d7vbv10azzsdwljh";
};

patches = stdenv.lib.optionals withGdal [