commit 7325ad9ab735424257b05a81e0c8197e4651e68f · pyrox.dev/nixpkgs

+15 -7

nixos/modules/services/monitoring/graphite.nix

···

       467
       467
        
             ];

     

       468
       468
        
           })

     

       469
       469
        
       

     

       470
       470
       -
           (mkIf cfg.web.enable {

     

       470
       470
       +
           (mkIf cfg.web.enable (let

     

       471
       471
       +
             python27' = pkgs.python27.override {

     

       472
       472
       +
               packageOverrides = self: super: {

     

       473
       473
       +
                 django = self.django_1_8;

     

       474
       474
       +
                 django_tagging = self.django_tagging_0_4_3;

     

       475
       475
       +
               };

     

       476
       476
       +
             };

     

       477
       477
       +
             pythonPackages = python27'.pkgs;

     

       478
       478
       +
           in {

     

       471
       479
        
             systemd.services.graphiteWeb = {

     

       472
       480
        
               description = "Graphite Web Interface";

     

       473
       481
        
               wantedBy = [ "multi-user.target" ];

     
···

       477
       485
        
                 PYTHONPATH = let

     

       478
       486
        
                     penv = pkgs.python.buildEnv.override {

     

       479
       487
        
                       extraLibs = [

     

       480
       480
       -
                         pkgs.python27Packages.graphite_web

     

       481
       481
       -
                         pkgs.python27Packages.pysqlite

     

       488
       488
       +
                         pythonPackages.graphite_web

     

       489
       489
       +
                         pythonPackages.pysqlite

     

       482
       490
        
                       ];

     

       483
       491
        
                     };

     

       484
       492
        
                     penvPack = "${penv}/${pkgs.python.sitePackages}";

     
···

       516
       524
        
                 fi

     

       517
       525
        
       

     

       518
       526
        
                 # Only collect static files when graphite_web changes.

     

       519
       519
       -
                 if ! [ "${dataDir}/current_graphite_web" -ef "${pkgs.python27Packages.graphite_web}" ]; then

     

       527
       527
       +
                 if ! [ "${dataDir}/current_graphite_web" -ef "${pythonPackages.graphite_web}" ]; then

     

       520
       528
        
                   mkdir -p ${staticDir}

     

       521
       529
        
                   ${pkgs.pythonPackages.django_1_8}/bin/django-admin.py collectstatic  --noinput --clear

     

       522
       530
        
                   chown -R graphite:graphite ${staticDir}

     

       523
       523
       -
                   ln -sfT "${pkgs.python27Packages.graphite_web}" "${dataDir}/current_graphite_web"

     

       531
       531
       +
                   ln -sfT "${pythonPackages.graphite_web}" "${dataDir}/current_graphite_web"

     

       524
       532
        
                 fi

     

       525
       533
        
               '';

     

       526
       534
        
             };

     

       527
       535
        
       

     

       528
       528
       -
             environment.systemPackages = [ pkgs.python27Packages.graphite_web ];

     

       529
       529
       -
           })

     

       536
       536
       +
             environment.systemPackages = [ pythonPackages.graphite_web ];

     

       537
       537
       +
           }))

     

       530
       538
        
       

     

       531
       539
        
           (mkIf cfg.api.enable {

     

       532
       540
        
             systemd.services.graphiteApi = {

+11 -4

pkgs/top-level/python-packages.nix

···

       8093
       8093
        
       

     

       8094
       8094
        
         django_tagging = callPackage ../development/python-modules/django_tagging { };

     

       8095
       8095
        
       

     

       8096
       8096
       -
         django_tagging_0_4_3 = self.django_tagging.overrideAttrs (attrs: rec {

     

       8096
       8096
       +
         django_tagging_0_4_3 = if

     

       8097
       8097
       +
              self.django != self.django_1_8

     

       8098
       8098
       +
         then throw "django_tagging_0_4_3 should be build with django_1_8"

     

       8099
       8099
       +
         else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec {

     

       8097
       8100
        
           name = "django-tagging-0.4.3";

     

       8098
       8101
        
       

     

       8099
       8102
        
           src = pkgs.fetchurl {

     

       8100
       8103
        
             url = "mirror://pypi/d/django-tagging/${name}.tar.gz";

     

       8101
       8104
        
             sha256 = "0617azpmp6jpg3d88v2ir97qrc9aqcs2s9gyvv9bgf2cp55khxhs";

     

       8102
       8105
        
           };

     

       8103
       8103
       -
           propagatedBuildInputs = with self; [ django_1_8 ];

     

       8106
       8106
       +
           propagatedBuildInputs = with self; [ django ];

     

       8104
       8107
        
         });

     

       8105
       8108
        
       

     

       8106
       8109
        
         django_classytags = buildPythonPackage rec {

     
···

       22835
       22838
        
           };

     

       22836
       22839
        
         };

     

       22837
       22840
        
       

     

       22838
       22838
       -
         graphite_web = buildPythonPackage rec {

     

       22841
       22841
       +
         graphite_web = if

     

       22842
       22842
       +
                 self.django != self.django_1_8

     

       22843
       22843
       +
              || self.django_tagging != self.django_tagging_0_4_3

     

       22844
       22844
       +
         then throw "graphite_web should be build with django_1_8 and django_tagging_0_4_3"

     

       22845
       22845
       +
         else buildPythonPackage rec {

     

       22839
       22846
        
           name = "graphite-web-${version}";

     

       22840
       22847
        
           disabled = isPy3k;

     

       22841
       22848
        
           version = graphiteVersion;

     
···

       22846
       22853
        
           };

     

       22847
       22854
        
       

     

       22848
       22855
        
           propagatedBuildInputs = with self; [

     

       22849
       22849
       -
             django_1_8 django_tagging_0_4_3 whisper pycairo cairocffi

     

       22856
       22856
       +
             django django_tagging whisper pycairo cairocffi

     

       22850
       22857
        
             ldap memcached pytz urllib3 scandir

     

       22851
       22858
        
           ];

     

       22852
       22859