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

Commits on Jan 21, 2020

  1. pythonPackages.django_2_1: drop 

    Django-2.1 support ended on December 2, 2019, so drop it in nixpkgs as
well.
    @lsix
    lsix committed Jan 21, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1102fc8 View commit details

  2. pythonPackages.django_2_1: drop (#78159) 

    pythonPackages.django_2_1: drop
    @Mic92
    Mic92 authored Jan 21, 2020
    Copy the full SHA
    d3a7bc5 View commit details
Showing with 1 addition and 43 deletions.
  1. +1 −1 pkgs/applications/office/paperless/default.nix
  2. +0 −38 pkgs/development/python-modules/django/2_1.nix
  3. +0 −4 pkgs/top-level/python-packages.nix
2 changes: 1 addition & 1 deletion pkgs/applications/office/paperless/default.nix
View file
Original file line number Diff line number Diff line change
@@ -116,7 +116,7 @@ let
};
};

django_2_0 = pyPkgs: pyPkgs.django_2_1.overrideDerivation (_: rec {
django_2_0 = pyPkgs: pyPkgs.django_2_2.overrideDerivation (_: rec {
pname = "Django";
version = "2.0.12";
name = "${pname}-${version}";
38 changes: 0 additions & 38 deletions pkgs/development/python-modules/django/2_1.nix
View file

This file was deleted.

4 changes: 0 additions & 4 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3187,10 +3187,6 @@ in {
gdal = self.gdal;
};

django_2_1 = callPackage ../development/python-modules/django/2_1.nix {
gdal = self.gdal;
};

django_2_2 = callPackage ../development/python-modules/django/2_2.nix { };

django_1_8 = callPackage ../development/python-modules/django/1_8.nix { };