commit 17e8dda59713e2758928aae63d182961176a212c · pyrox.dev/nixpkgs

+8 -8

pkgs/development/python-modules/django/1.7.7-gis-libs.template.patch pkgs/development/python-modules/django/1.10-gis-libs.template.patch

···

       13
       13
        
       diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py

     

       14
       14
        
       --- a/django/contrib/gis/geos/libgeos.py

     

       15
       15
        
       +++ b/django/contrib/gis/geos/libgeos.py

     

       16
       16
       -
       @@ -23,7 +23,7 @@ try:

     

       17
       17
       -
            lib_path = settings.GEOS_LIBRARY_PATH

     

       18
       18
       -
        except (AttributeError, EnvironmentError,

     

       19
       19
       -
                ImportError, ImproperlyConfigured):

     

       20
       20
       -
       -    lib_path = None

     

       21
       21
       -
       +    lib_path = "@geos@/lib/libgeos_c.so"

     

       16
       16
       +
       @@ -26,7 +26,7 @@ try:

     

       17
       17
       +
                lib_path = settings.GEOS_LIBRARY_PATH

     

       18
       18
       +
            except (AttributeError, EnvironmentError,

     

       19
       19
       +
                    ImportError, ImproperlyConfigured):

     

       20
       20
       +
       -        lib_path = None

     

       21
       21
       +
       +        lib_path = "@geos@/lib/libgeos_c.so"

     

       22
       22
        
        

     

       23
       23
       -
        # Setting the appropriate names for the GEOS-C library.

     

       24
       24
       -
        if lib_path:

     

       23
       23
       +
            # Setting the appropriate names for the GEOS-C library.

     

       24
       24
       +
            if lib_path:

+37 -6

pkgs/top-level/python-packages.nix

···

       8891
       8891
        
           };

     

       8892
       8892
        
         };

     

       8893
       8893
        
       

     

       8894
       8894
       -
         django = self.django_1_9;

     

       8894
       8894
       +
         django = self.django_1_10;

     

       8895
       8895
        
       

     

       8896
       8896
        
         django_gis = self.django.override rec {

     

       8897
       8897
        
           patches = [

     

       8898
       8898
        
             (pkgs.substituteAll {

     

       8899
       8899
       -
               src = ../development/python-modules/django/1.7.7-gis-libs.template.patch;

     

       8899
       8899
       +
               src = ../development/python-modules/django/1.10-gis-libs.template.patch;

     

       8900
       8900
        
               geos = pkgs.geos;

     

       8901
       8901
        
               gdal = pkgs.gdal;

     

       8902
       8902
        
             })

     

       8903
       8903
        
           ];

     

       8904
       8904
       +
         };

     

       8905
       8905
       +
       

     

       8906
       8906
       +
         django_1_10 = buildPythonPackage rec {

     

       8907
       8907
       +
           name = "Django-${version}";

     

       8908
       8908
       +
           version = "1.10";

     

       8909
       8909
       +
           disabled = pythonOlder "2.7";

     

       8910
       8910
       +
       

     

       8911
       8911
       +
           src = pkgs.fetchurl {

     

       8912
       8912
       +
             url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz";

     

       8913
       8913
       +
             sha256 = "01bh5yra6zyxcpqacahbwfbn0y4ivw07j2jsw3crvmjzivb6if26";

     

       8914
       8914
       +
           };

     

       8915
       8915
       +
       

     

       8916
       8916
       +
           # patch only $out/bin to avoid problems with starter templates (see #3134)

     

       8917
       8917
       +
           postFixup = ''

     

       8918
       8918
       +
             wrapPythonProgramsIn $out/bin "$out $pythonPath"

     

       8919
       8919
       +
           '';

     

       8920
       8920
       +
       

     

       8921
       8921
       +
           # too complicated to setup

     

       8922
       8922
       +
           doCheck = false;

     

       8923
       8923
       +
       

     

       8924
       8924
       +
           meta = {

     

       8925
       8925
       +
             description = "A high-level Python Web framework";

     

       8926
       8926
       +
             homepage = https://www.djangoproject.com/;

     

       8927
       8927
       +
           };

     

       8904
       8928
        
         };

     

       8905
       8929
        
       

     

       8906
       8930
        
         django_1_9 = buildPythonPackage rec {

     
···

       9090
       9114
        
       

     

       9091
       9115
        
         django_compat = buildPythonPackage rec {

     

       9092
       9116
        
           name = "django-compat-${version}";

     

       9093
       9093
       -
           version = "1.0.8";

     

       9117
       9117
       +
           version = "1.0.13";

     

       9094
       9118
        
       

     

       9095
       9119
        
           # build process attempts to access a missing README.rst

     

       9096
       9120
        
           disabled = isPy35;

     

       9097
       9121
        
       

     

       9098
       9122
        
           src = pkgs.fetchurl {

     

       9099
       9123
        
             url = "mirror://pypi/d/django-compat/${name}.tar.gz";

     

       9100
       9100
       -
             sha256 = "195dgr55vzpw1fbjvbw2h35k9bfhvm5zchh2p7nzbq57xmwb3sra";

     

       9124
       9124
       +
             sha256 = "0s0z7cx0vv1kjsyzk24sg256hfnd09ssilc9rakhxrzr3firgx80";

     

       9101
       9125
        
           };

     

       9102
       9126
        
       

     

       9103
       9127
        
           buildInputs = with self; [ django_nose ];

     

       9104
       9128
        
           propagatedBuildInputs = with self; [ django six ];

     

       9105
       9129
        
       

     

       9106
       9130
        
           meta = {

     

       9107
       9107
       -
             description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, and 1.9";

     

       9131
       9131
       +
             description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9 and 1.10";

     

       9108
       9132
        
             homepage = https://github.com/arteria/django-compat;

     

       9109
       9133
        
             license = licenses.mit;

     

       9110
       9134
        
           };

     
···

       9178
       9202
        
             sha256 = "0rpi1bkfx74xfbb2nk874kfdra1jcqp2vzky1r3z7zidlc9kah04";

     

       9179
       9203
        
           };

     

       9180
       9204
        
       

     

       9181
       9181
       -
           propagatedBuildInputs = with self; [ django django_compat ];

     

       9205
       9205
       +
           # TODO improve the that multi-override necessity (the fixpoint based python

     

       9206
       9206
       +
           # packages work can be the solution)

     

       9207
       9207
       +
           propagatedBuildInputs = with self; [ django_1_9 (django_compat.override {

     

       9208
       9208
       +
             buildInputs = with self; [ (django_nose.override {

     

       9209
       9209
       +
               propagatedBuildInputs = with self; [ django_1_9 nose ];

     

       9210
       9210
       +
             }) ];

     

       9211
       9211
       +
             propagatedBuildInputs = with self; [ django_1_9 six ];

     

       9212
       9212
       +
           }) ];

     

       9182
       9213
        
       

     

       9183
       9214
        
           meta = {

     

       9184
       9215
        
             description = "Allows superusers to hijack (=login as) and work on behalf of another user";