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

Commits on Mar 7, 2019

  1. pythonPackages.django_1_11: 1.11.18 -> 1.11.20 

    See release notes:
- https://docs.djangoproject.com/en/dev/releases/1.11.19/
- https://docs.djangoproject.com/en/dev/releases/1.11.20/

(cherry picked from commit 3e81b45)
    @lsix
    lsix committed Mar 7, 2019

    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
    aceb50e View commit details

  2. python: Django: 2.1.5 -> 2.1.7 

    (cherry picked from commit b67226f)
    @FRidh @lsix
    FRidh authored and lsix committed Mar 7, 2019

    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
    8abca4b 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.18";
version = "1.11.20";

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

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

disabled = !isPy3k;

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

patches = stdenv.lib.optionals withGdal [