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

Commits on Sep 11, 2019

  1. django: don't wrap binary files twice

    @B4dM4n
    B4dM4n committed Sep 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    endocrimes Danielle
    GPG key ID: 8D65584EF3DDF91B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7a4644f View commit details

  2. Merge pull request #68486 from B4dM4n/django-doublewrap 

    django: don't wrap binary files twice
    @Mic92
    Mic92 authored Sep 11, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    endocrimes Danielle
    GPG key ID: 8D65584EF3DDF91B
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c7a84aa View commit details
Showing with 0 additions and 15 deletions.
  1. +0 −5 pkgs/development/python-modules/django/1_11.nix
  2. +0 −5 pkgs/development/python-modules/django/1_8.nix
  3. +0 −5 pkgs/development/python-modules/django/2_1.nix
5 changes: 0 additions & 5 deletions pkgs/development/python-modules/django/1_11.nix
View file
Original file line number Diff line number Diff line change
@@ -21,11 +21,6 @@ buildPythonPackage rec {
})
];

# patch only $out/bin to avoid problems with starter templates (see #3134)
postFixup = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath"
'';

propagatedBuildInputs = [ pytz ];

# too complicated to setup
5 changes: 0 additions & 5 deletions pkgs/development/python-modules/django/1_8.nix
View file
Original file line number Diff line number Diff line change
@@ -15,11 +15,6 @@ buildPythonPackage rec {
# too complicated to setup
doCheck = false;

# patch only $out/bin to avoid problems with starter templates (see #3134)
postFixup = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath"
'';

meta = with stdenv.lib; {
description = "A high-level Python Web framework";
homepage = https://www.djangoproject.com/;
5 changes: 0 additions & 5 deletions pkgs/development/python-modules/django/2_1.nix
View file
Original file line number Diff line number Diff line change
@@ -24,11 +24,6 @@ buildPythonPackage rec {
})
];

# patch only $out/bin to avoid problems with starter templates (see #3134)
postFixup = ''
wrapPythonProgramsIn $out/bin "$out $pythonPath"
'';

propagatedBuildInputs = [ pytz ];

# too complicated to setup