commit 0044b4fa2255355b997b7f4fcafe832704710845 · pyrox.dev/nixpkgs

+10

nixos/doc/manual/from_md/release-notes/rl-2211.section.xml

···

       259
       259
        
             </listitem>

     

       260
       260
        
             <listitem>

     

       261
       261
        
               <para>

     

       262
       262
       +
                 The <literal>services.graphite.api</literal> and

     

       263
       263
       +
                 <literal>services.graphite.beacon</literal> NixOS options, and

     

       264
       264
       +
                 the <literal>python3.pkgs.graphite_api</literal>,

     

       265
       265
       +
                 <literal>python3.pkgs.graphite_beacon</literal> and

     

       266
       266
       +
                 <literal>python3.pkgs.influxgraph</literal> packages, have

     

       267
       267
       +
                 been removed due to lack of upstream maintenance.

     

       268
       268
       +
               </para>

     

       269
       269
       +
             </listitem>

     

       270
       270
       +
             <listitem>

     

       271
       271
       +
               <para>

     

       262
       272
        
                 (Neo)Vim can not be configured with

     

       263
       273
        
                 <literal>configure.pathogen</literal> anymore to reduce

     

       264
       274
        
                 maintainance burden. Use <literal>configure.packages</literal>

nixos/doc/manual/release-notes/rl-2211.section.md

···

       99
       99
        
       

     

       100
       100
        
       - riak package removed along with `services.riak` module, due to lack of maintainer to update the package.

     

       101
       101
        
       

     

       102
       102
       +
       - The `services.graphite.api` and `services.graphite.beacon` NixOS options, and

     

       103
       103
       +
         the `python3.pkgs.graphite_api`, `python3.pkgs.graphite_beacon` and

     

       104
       104
       +
         `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream

     

       105
       105
       +
         maintenance.

     

       106
       106
       +
       

     

       102
       107
        
       - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden.

     

       103
       108
        
       Use `configure.packages` instead.

     

       104
       109

+3 -157

nixos/modules/services/monitoring/graphite.nix

···

       24
       24
        
           + cfg.web.extraConfig

     

       25
       25
        
         );

     

       26
       26
        
       

     

       27
       27
       -
         graphiteApiConfig = pkgs.writeText "graphite-api.yaml" ''

     

       28
       28
       -
           search_index: ${dataDir}/index

     

       29
       29
       -
           ${optionalString (config.time.timeZone != null) "time_zone: ${config.time.timeZone}"}

     

       30
       30
       -
           ${optionalString (cfg.api.finders != []) "finders:"}

     

       31
       31
       -
           ${concatMapStringsSep "\n" (f: "  - " + f.moduleName) cfg.api.finders}

     

       32
       32
       -
           ${optionalString (cfg.api.functions != []) "functions:"}

     

       33
       33
       -
           ${concatMapStringsSep "\n" (f: "  - " + f) cfg.api.functions}

     

       34
       34
       -
           ${cfg.api.extraConfig}

     

       35
       35
       -
         '';

     

       36
       36
       -
       

     

       37
       27
        
         seyrenConfig = {

     

       38
       28
        
           SEYREN_URL = cfg.seyren.seyrenUrl;

     

       39
       29
        
           MONGO_URL = cfg.seyren.mongoUrl;

     
···

       72
       62
        
       in {

     

       73
       63
        
       

     

       74
       64
        
         imports = [

     

       65
       65
       +
           (mkRemovedOptionModule ["services" "graphite" "api"] "")

     

       66
       66
       +
           (mkRemovedOptionModule ["services" "graphite" "beacon"] "")

     

       75
       67
        
           (mkRemovedOptionModule ["services" "graphite" "pager"] "")

     

       76
       68
        
         ];

     

       77
       69
        
       

     
···

       115
       107
        
             };

     

       116
       108
        
           };

     

       117
       109
        
       

     

       118
       118
       -
           api = {

     

       119
       119
       -
             enable = mkOption {

     

       120
       120
       -
               description = ''

     

       121
       121
       -
                 Whether to enable graphite api. Graphite api is lightweight alternative

     

       122
       122
       -
                 to graphite web, with api and without dashboard. It's advised to use

     

       123
       123
       -
                 grafana as alternative dashboard and influxdb as alternative to

     

       124
       124
       -
                 graphite carbon.

     

       125
       125
       -
       

     

       126
       126
       -
                 For more information visit

     

       127
       127
       -
                 <link xlink:href="https://graphite-api.readthedocs.org/en/latest/"/>

     

       128
       128
       -
               '';

     

       129
       129
       -
               default = false;

     

       130
       130
       -
               type = types.bool;

     

       131
       131
       -
             };

     

       132
       132
       -
       

     

       133
       133
       -
             finders = mkOption {

     

       134
       134
       -
               description = "List of finder plugins to load.";

     

       135
       135
       -
               default = [];

     

       136
       136
       -
               example = literalExpression "[ pkgs.python3Packages.influxgraph ]";

     

       137
       137
       -
               type = types.listOf types.package;

     

       138
       138
       -
             };

     

       139
       139
       -
       

     

       140
       140
       -
             functions = mkOption {

     

       141
       141
       -
               description = "List of functions to load.";

     

       142
       142
       -
               default = [

     

       143
       143
       -
                 "graphite_api.functions.SeriesFunctions"

     

       144
       144
       -
                 "graphite_api.functions.PieFunctions"

     

       145
       145
       -
               ];

     

       146
       146
       -
               type = types.listOf types.str;

     

       147
       147
       -
             };

     

       148
       148
       -
       

     

       149
       149
       -
             listenAddress = mkOption {

     

       150
       150
       -
               description = "Graphite web service listen address.";

     

       151
       151
       -
               default = "127.0.0.1";

     

       152
       152
       -
               type = types.str;

     

       153
       153
       -
             };

     

       154
       154
       -
       

     

       155
       155
       -
             port = mkOption {

     

       156
       156
       -
               description = "Graphite api service port.";

     

       157
       157
       -
               default = 8080;

     

       158
       158
       -
               type = types.int;

     

       159
       159
       -
             };

     

       160
       160
       -
       

     

       161
       161
       -
             package = mkOption {

     

       162
       162
       -
               description = "Package to use for graphite api.";

     

       163
       163
       -
               default = pkgs.python3Packages.graphite_api;

     

       164
       164
       -
               defaultText = literalExpression "pkgs.python3Packages.graphite_api";

     

       165
       165
       -
               type = types.package;

     

       166
       166
       -
             };

     

       167
       167
       -
       

     

       168
       168
       -
             extraConfig = mkOption {

     

       169
       169
       -
               description = "Extra configuration for graphite api.";

     

       170
       170
       -
               default = ''

     

       171
       171
       -
                 whisper:

     

       172
       172
       -
                   directories:

     

       173
       173
       -
                       - ${dataDir}/whisper

     

       174
       174
       -
               '';

     

       175
       175
       -
               defaultText = literalExpression ''

     

       176
       176
       -
                 '''

     

       177
       177
       -
                   whisper:

     

       178
       178
       -
                     directories:

     

       179
       179
       -
                       - ''${config.${opt.dataDir}}/whisper

     

       180
       180
       -
                 '''

     

       181
       181
       -
               '';

     

       182
       182
       -
               example = ''

     

       183
       183
       -
                 allowed_origins:

     

       184
       184
       -
                   - dashboard.example.com

     

       185
       185
       -
                 cheat_times: true

     

       186
       186
       -
                 influxdb:

     

       187
       187
       -
                   host: localhost

     

       188
       188
       -
                   port: 8086

     

       189
       189
       -
                   user: influxdb

     

       190
       190
       -
                   pass: influxdb

     

       191
       191
       -
                   db: metrics

     

       192
       192
       -
                 cache:

     

       193
       193
       -
                   CACHE_TYPE: 'filesystem'

     

       194
       194
       -
                   CACHE_DIR: '/tmp/graphite-api-cache'

     

       195
       195
       -
               '';

     

       196
       196
       -
               type = types.lines;

     

       197
       197
       -
             };

     

       198
       198
       -
           };

     

       199
       199
       -
       

     

       200
       110
        
           carbon = {

     

       201
       111
        
             config = mkOption {

     

       202
       112
        
               description = "Content of carbon configuration file.";

     
···

       354
       264
        
               '';

     

       355
       265
        
             };

     

       356
       266
        
           };

     

       357
       357
       -
       

     

       358
       358
       -
           beacon = {

     

       359
       359
       -
             enable = mkEnableOption "graphite beacon";

     

       360
       360
       -
       

     

       361
       361
       -
             config = mkOption {

     

       362
       362
       -
               description = "Graphite beacon configuration.";

     

       363
       363
       -
               default = {};

     

       364
       364
       -
               type = types.attrs;

     

       365
       365
       -
             };

     

       366
       366
       -
           };

     

       367
       267
        
         };

     

       368
       268
        
       

     

       369
       269
        
         ###### implementation

     
···

       489
       389
        
             environment.systemPackages = [ pkgs.python3Packages.graphite-web ];

     

       490
       390
        
           }))

     

       491
       391
        
       

     

       492
       492
       -
           (mkIf cfg.api.enable {

     

       493
       493
       -
             systemd.services.graphiteApi = {

     

       494
       494
       -
               description = "Graphite Api Interface";

     

       495
       495
       -
               wantedBy = [ "multi-user.target" ];

     

       496
       496
       -
               after = [ "network.target" ];

     

       497
       497
       -
               environment = {

     

       498
       498
       -
                 PYTHONPATH = let

     

       499
       499
       -
                     aenv = pkgs.python3.buildEnv.override {

     

       500
       500
       -
                       extraLibs = [ cfg.api.package pkgs.cairo pkgs.python3Packages.cffi ] ++ cfg.api.finders;

     

       501
       501
       -
                     };

     

       502
       502
       -
                   in "${aenv}/${pkgs.python3.sitePackages}";

     

       503
       503
       -
                 GRAPHITE_API_CONFIG = graphiteApiConfig;

     

       504
       504
       -
                 LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib";

     

       505
       505
       -
               };

     

       506
       506
       -
               serviceConfig = {

     

       507
       507
       -
                 ExecStart = ''

     

       508
       508
       -
                   ${pkgs.python3Packages.waitress}/bin/waitress-serve \

     

       509
       509
       -
                   --host=${cfg.api.listenAddress} --port=${toString cfg.api.port} \

     

       510
       510
       -
                   graphite_api.app:app

     

       511
       511
       -
                 '';

     

       512
       512
       -
                 User = "graphite";

     

       513
       513
       -
                 Group = "graphite";

     

       514
       514
       -
                 PermissionsStartOnly = true;

     

       515
       515
       -
               };

     

       516
       516
       -
               preStart = ''

     

       517
       517
       -
                 if ! test -e ${dataDir}/db-created; then

     

       518
       518
       -
                   mkdir -p ${dataDir}/cache/

     

       519
       519
       -
                   chmod 0700 ${dataDir}/cache/

     

       520
       520
       -
       

     

       521
       521
       -
                   chown graphite:graphite ${cfg.dataDir}

     

       522
       522
       -
                   chown -R graphite:graphite ${cfg.dataDir}/cache

     

       523
       523
       -
       

     

       524
       524
       -
                   touch ${dataDir}/db-created

     

       525
       525
       -
                 fi

     

       526
       526
       -
               '';

     

       527
       527
       -
             };

     

       528
       528
       -
           })

     

       529
       529
       -
       

     

       530
       392
        
           (mkIf cfg.seyren.enable {

     

       531
       393
        
             systemd.services.seyren = {

     

       532
       394
        
               description = "Graphite Alerting Dashboard";

     
···

       550
       412
        
             services.mongodb.enable = mkDefault true;

     

       551
       413
        
           })

     

       552
       414
        
       

     

       553
       553
       -
           (mkIf cfg.beacon.enable {

     

       554
       554
       -
             systemd.services.graphite-beacon = {

     

       555
       555
       -
               description = "Grpahite Beacon Alerting Daemon";

     

       556
       556
       -
               wantedBy = [ "multi-user.target" ];

     

       557
       557
       -
               serviceConfig = {

     

       558
       558
       -
                 ExecStart = ''

     

       559
       559
       -
                   ${pkgs.python3Packages.graphite_beacon}/bin/graphite-beacon \

     

       560
       560
       -
                     --config=${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)}

     

       561
       561
       -
                 '';

     

       562
       562
       -
                 User = "graphite";

     

       563
       563
       -
                 Group = "graphite";

     

       564
       564
       -
               };

     

       565
       565
       -
             };

     

       566
       566
       -
           })

     

       567
       567
       -
       

     

       568
       415
        
           (mkIf (

     

       569
       416
        
             cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay ||

     

       570
       570
       -
             cfg.web.enable || cfg.api.enable ||

     

       571
       571
       -
             cfg.seyren.enable || cfg.beacon.enable

     

       417
       417
       +
             cfg.web.enable || cfg.seyren.enable

     

       572
       418
        
            ) {

     

       573
       419
        
             users.users.graphite = {

     

       574
       420
        
               uid = config.ids.uids.graphite;

-12

nixos/tests/graphite.nix

···

       12
       12
        
                     SECRET_KEY = "abcd";

     

       13
       13
        
                   '';

     

       14
       14
        
                 };

     

       15
       15
       -
                 api = {

     

       16
       16
       -
                   enable = true;

     

       17
       17
       -
                   port = 8082;

     

       18
       18
       -
                   finders = [ ];

     

       19
       19
       -
                 };

     

       20
       15
        
                 carbon.enableCache = true;

     

       21
       16
        
                 seyren.enable = false;  # Implicitely requires openssl-1.0.2u which is marked insecure

     

       22
       22
       -
                 beacon.enable = true;

     

       23
       17
        
               };

     

       24
       18
        
             };

     

       25
       19
        
         };

     
···

       28
       22
        
           start_all()

     

       29
       23
        
           one.wait_for_unit("default.target")

     

       30
       24
        
           one.wait_for_unit("graphiteWeb.service")

     

       31
       31
       -
           one.wait_for_unit("graphiteApi.service")

     

       32
       32
       -
           one.wait_for_unit("graphite-beacon.service")

     

       33
       25
        
           one.wait_for_unit("carbonCache.service")

     

       34
       26
        
           # The services above are of type "simple". systemd considers them active immediately

     

       35
       27
        
           # even if they're still in preStart (which takes quite long for graphiteWeb).

     

       36
       28
        
           # Wait for ports to open so we're sure the services are up and listening.

     

       37
       29
        
           one.wait_for_open_port(8080)

     

       38
       38
       -
           one.wait_for_open_port(8082)

     

       39
       30
        
           one.wait_for_open_port(2003)

     

       40
       31
        
           one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003')

     

       41
       32
        
           one.wait_until_succeeds(

     

       42
       33
        
               "curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2"

     

       43
       43
       -
           )

     

       44
       44
       -
           one.wait_until_succeeds(

     

       45
       45
       -
               "curl 'http://localhost:8082/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2"

     

       46
       34
        
           )

     

       47
       35
        
         '';

     

       48
       36
        
       })

-46

pkgs/development/python-modules/graphite-api/default.nix

···

       1
       1
       -
       { stdenv, buildPythonPackage, fetchFromGitHub, lib, flask, flask-caching, cairocffi, pyparsing, pytz, pyyaml

     

       2
       2
       -
       , raven, six, structlog, tzlocal, nose, mock, cairo, isPyPy

     

       3
       3
       -
       }:

     

       4
       4
       -
       

     

       5
       5
       -
       buildPythonPackage rec {

     

       6
       6
       -
         pname = "graphite-api";

     

       7
       7
       -
         version = "1.1.3";

     

       8
       8
       -
       

     

       9
       9
       -
         disabled = isPyPy;

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchFromGitHub {

     

       12
       12
       -
           owner = "brutasse";

     

       13
       13
       -
           repo = "graphite-api";

     

       14
       14
       -
           rev = version;

     

       15
       15
       -
           sha256 = "0sz3kav2024ms2z4q03pigcf080gsr5v774z9bp3zw29k2p47ass";

     

       16
       16
       -
         };

     

       17
       17
       -
       

     

       18
       18
       -
         # https://github.com/brutasse/graphite-api/pull/239 rebased onto 1.1.3

     

       19
       19
       -
         patches = [ ./flask-caching-rebased.patch ];

     

       20
       20
       -
       

     

       21
       21
       -
         checkPhase = "nosetests";

     

       22
       22
       -
       

     

       23
       23
       -
         propagatedBuildInputs = [

     

       24
       24
       -
           flask

     

       25
       25
       -
           flask-caching

     

       26
       26
       -
           cairocffi

     

       27
       27
       -
           pyparsing

     

       28
       28
       -
           pytz

     

       29
       29
       -
           pyyaml

     

       30
       30
       -
           raven

     

       31
       31
       -
           six

     

       32
       32
       -
           structlog

     

       33
       33
       -
           tzlocal

     

       34
       34
       -
         ];

     

       35
       35
       -
       

     

       36
       36
       -
         checkInputs = [ nose mock ];

     

       37
       37
       -
       

     

       38
       38
       -
         LD_LIBRARY_PATH = "${cairo.out}/lib";

     

       39
       39
       -
       

     

       40
       40
       -
         meta = with lib; {

     

       41
       41
       -
           broken = stdenv.isDarwin;

     

       42
       42
       -
           description = "Graphite-web, without the interface. Just the rendering HTTP API";

     

       43
       43
       -
           homepage = "https://github.com/brutasse/graphite-api";

     

       44
       44
       -
           license = licenses.asl20;

     

       45
       45
       -
         };

     

       46
       46
       -
       }

-132

pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch

···

       1
       1
       -
       diff --git a/graphite_api/config.py b/graphite_api/config.py

     

       2
       2
       -
       index 5e1e382..dc033a8 100644

     

       3
       3
       -
       --- a/graphite_api/config.py

     

       4
       4
       -
       +++ b/graphite_api/config.py

     

       5
       5
       -
       @@ -112,11 +112,11 @@ def configure(app):

     

       6
       6
       -
            app.cache = None

     

       7
       7
       -
            if 'cache' in config:

     

       8
       8
       -
                try:

     

       9
       9
       -
       -            from flask.ext.cache import Cache

     

       10
       10
       -
       +            from flask_caching import Cache

     

       11
       11
       -
                except ImportError:

     

       12
       12
       -
                    warnings.warn("'cache' is provided in the configuration but "

     

       13
       13
       -
       -                          "Flask-Cache is not installed. Please `pip install "

     

       14
       14
       -
       -                          "Flask-Cache`.")

     

       15
       15
       -
       +                          "flask-caching is not installed. Please `pip "

     

       16
       16
       -
       +                          "install flask-caching`.")

     

       17
       17
       -
                else:

     

       18
       18
       -
                    cache_conf = {'CACHE_DEFAULT_TIMEOUT': 60,

     

       19
       19
       -
                                  'CACHE_KEY_PREFIX': 'graphite-api:'}

     

       20
       20
       -
       diff --git a/requirements.txt b/requirements.txt

     

       21
       21
       -
       index c68b446..7826b0c 100644

     

       22
       22
       -
       --- a/requirements.txt

     

       23
       23
       -
       +++ b/requirements.txt

     

       24
       24
       -
       @@ -1,5 +1,5 @@

     

       25
       25
       -
        Flask

     

       26
       26
       -
       -Flask-Cache

     

       27
       27
       -
       +Flask-Caching

     

       28
       28
       -
        cairocffi

     

       29
       29
       -
        pyparsing>=1.5.7

     

       30
       30
       -
        pytz

     

       31
       31
       -
       diff --git a/setup.py b/setup.py

     

       32
       32
       -
       index 0337cbe..df07989 100644

     

       33
       33
       -
       --- a/setup.py

     

       34
       34
       -
       +++ b/setup.py

     

       35
       35
       -
       @@ -38,7 +38,7 @@ setup(

     

       36
       36
       -
            extras_require={

     

       37
       37
       -
                'sentry': ['raven[flask]'],

     

       38
       38
       -
                'cyanite': ['cyanite'],

     

       39
       39
       -
       -        'cache': ['Flask-Cache'],

     

       40
       40
       -
       +        'cache': ['Flask-Caching'],

     

       41
       41
       -
                'statsd': ['statsd'],

     

       42
       42
       -
            },

     

       43
       43
       -
            zip_safe=False,

     

       44
       44
       -
       diff --git a/tests/test_render.py b/tests/test_render.py

     

       45
       45
       -
       index be5609d..a0e7190 100644

     

       46
       46
       -
       --- a/tests/test_render.py

     

       47
       47
       -
       +++ b/tests/test_render.py

     

       48
       48
       -
       @@ -8,7 +8,7 @@ from graphite_api._vendor import whisper

     

       49
       49
       -
        from . import TestCase, WHISPER_DIR

     

       50
       50
       -
        

     

       51
       51
       -
        try:

     

       52
       52
       -
       -    from flask.ext.cache import Cache

     

       53
       53
       -
       +    from flask_caching import Cache

     

       54
       54
       -
        except ImportError:

     

       55
       55
       -
            Cache = None

     

       56
       56
       -
        

     

       57
       57
       -
       diff --git a/tox.ini b/tox.ini

     

       58
       58
       -
       index 85a0abb..c820393 100644

     

       59
       59
       -
       --- a/tox.ini

     

       60
       60
       -
       +++ b/tox.ini

     

       61
       61
       -
       @@ -47,7 +47,7 @@ basepython = python2.7

     

       62
       62
       -
        deps =

     

       63
       63
       -
        	{[testenv]deps}

     

       64
       64
       -
        	Flask

     

       65
       65
       -
       -	Flask-Cache

     

       66
       66
       -
       +	Flask-Caching

     

       67
       67
       -
        	pyparsing

     

       68
       68
       -
        	mock

     

       69
       69
       -
        

     

       70
       70
       -
       @@ -56,7 +56,7 @@ basepython = python3.3

     

       71
       71
       -
        deps =

     

       72
       72
       -
        	{[testenv]deps}

     

       73
       73
       -
        	Flask

     

       74
       74
       -
       -	Flask-Cache

     

       75
       75
       -
       +	Flask-Caching

     

       76
       76
       -
        	pyparsing

     

       77
       77
       -
        

     

       78
       78
       -
        [testenv:py34]

     

       79
       79
       -
       @@ -66,7 +66,7 @@ commands =

     

       80
       80
       -
        deps =

     

       81
       81
       -
        	{[testenv]deps}

     

       82
       82
       -
        	Flask

     

       83
       83
       -
       -	Flask-Cache

     

       84
       84
       -
       +	Flask-Caching

     

       85
       85
       -
        	pyparsing

     

       86
       86
       -
        

     

       87
       87
       -
        [testenv:py35]

     

       88
       88
       -
       @@ -76,7 +76,7 @@ commands =

     

       89
       89
       -
        deps =

     

       90
       90
       -
        	{[testenv]deps}

     

       91
       91
       -
        	Flask

     

       92
       92
       -
       -	Flask-Cache

     

       93
       93
       -
       +	Flask-Caching

     

       94
       94
       -
        	pyparsing

     

       95
       95
       -
        

     

       96
       96
       -
        [testenv:pyparsing1]

     

       97
       97
       -
       @@ -84,7 +84,7 @@ basepython = python2.7

     

       98
       98
       -
        deps =

     

       99
       99
       -
        	{[testenv]deps}

     

       100
       100
       -
        	Flask

     

       101
       101
       -
       -	Flask-Cache

     

       102
       102
       -
       +	Flask-Caching

     

       103
       103
       -
        	pyparsing==1.5.7

     

       104
       104
       -
        	mock

     

       105
       105
       -
        

     

       106
       106
       -
       @@ -93,7 +93,7 @@ basepython = pypy

     

       107
       107
       -
        deps =

     

       108
       108
       -
        	{[testenv]deps}

     

       109
       109
       -
        	Flask

     

       110
       110
       -
       -	Flask-Cache

     

       111
       111
       -
       +	Flask-Caching

     

       112
       112
       -
        	pyparsing

     

       113
       113
       -
        	mock

     

       114
       114
       -
        

     

       115
       115
       -
       @@ -102,7 +102,7 @@ basepython = python2.7

     

       116
       116
       -
        deps =

     

       117
       117
       -
        	{[testenv]deps}

     

       118
       118
       -
        	Flask<0.9

     

       119
       119
       -
       -	Flask-Cache

     

       120
       120
       -
       +	Flask-Caching

     

       121
       121
       -
        	pyparsing

     

       122
       122
       -
        	mock

     

       123
       123
       -
        

     

       124
       124
       -
       @@ -111,7 +111,7 @@ basepython = python2.7

     

       125
       125
       -
        deps =

     

       126
       126
       -
        	{[testenv]deps}

     

       127
       127
       -
        	Flask<0.10

     

       128
       128
       -
       -	Flask-Cache

     

       129
       129
       -
       +	Flask-Caching

     

       130
       130
       -
        	pyparsing

     

       131
       131
       -
        	mock

     

       132
       132
       -

-33

pkgs/development/python-modules/graphite_beacon/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , tornado_5, pyyaml, funcparserlib

     

       3
       3
       -
       , nixosTests

     

       4
       4
       -
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       buildPythonPackage rec {

     

       7
       7
       -
         pname = "graphite_beacon";

     

       8
       8
       -
         version = "0.27.0";

     

       9
       9
       -
       

     

       10
       10
       -
         src = fetchPypi {

     

       11
       11
       -
           inherit pname version;

     

       12
       12
       -
           sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks";

     

       13
       13
       -
         };

     

       14
       14
       -
       

     

       15
       15
       -
         propagatedBuildInputs = [ tornado_5 pyyaml funcparserlib ];

     

       16
       16
       -
       

     

       17
       17
       -
         postPatch = ''

     

       18
       18
       -
           substituteInPlace requirements.txt --replace "==" ">="

     

       19
       19
       -
         '';

     

       20
       20
       -
       

     

       21
       21
       -
         pythonImportsCheck = [ "graphite_beacon" ];

     

       22
       22
       -
       

     

       23
       23
       -
         passthru.tests = {

     

       24
       24
       -
           nixos = nixosTests.graphite;

     

       25
       25
       -
         };

     

       26
       26
       -
       

     

       27
       27
       -
         meta = with lib; {

     

       28
       28
       -
           description = "A simple alerting application for Graphite metrics";

     

       29
       29
       -
           homepage = "https://github.com/klen/graphite-beacon";

     

       30
       30
       -
           maintainers = [ maintainers.offline ];

     

       31
       31
       -
           license = licenses.mit;

     

       32
       32
       -
         };

     

       33
       33
       -
       }

-24

pkgs/development/python-modules/influxgraph/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, isPy3k

     

       2
       2
       -
       , influxdb, graphite_api, python-memcached

     

       3
       3
       -
       }:

     

       4
       4
       -
       

     

       5
       5
       -
       buildPythonPackage rec {

     

       6
       6
       -
         pname = "influxgraph";

     

       7
       7
       -
         version = "1.5.0";

     

       8
       8
       -
       

     

       9
       9
       -
         src = fetchPypi {

     

       10
       10
       -
           inherit pname version;

     

       11
       11
       -
           sha256 = "0l33sfwdh4bfprmzp2kx0d9098g6yxbnhyyx9qr3kzczpm0jg9vy";

     

       12
       12
       -
         };

     

       13
       13
       -
       

     

       14
       14
       -
         propagatedBuildInputs = [ influxdb graphite_api python-memcached ];

     

       15
       15
       -
       

     

       16
       16
       -
         passthru.moduleName = "influxgraph.InfluxDBFinder";

     

       17
       17
       -
       

     

       18
       18
       -
         meta = with lib; {

     

       19
       19
       -
           description = "InfluxDB storage plugin for Graphite-API";

     

       20
       20
       -
           homepage = "https://github.com/InfluxGraph/influxgraph";

     

       21
       21
       -
           license = licenses.asl20;

     

       22
       22
       -
           maintainers = with maintainers; [ basvandijk ];

     

       23
       23
       -
         };

     

       24
       24
       -
       }

pkgs/top-level/python-aliases.nix

···

       79
       79
        
         glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28

     

       80
       80
        
         google_api_python_client = google-api-python-client; # added 2021-03-19

     

       81
       81
        
         googleapis_common_protos = googleapis-common-protos; # added 2021-03-19

     

       82
       82
       +
         graphite_api = throw "graphite_api was removed, because it is no longer maintained"; # added 2022-07-10

     

       83
       83
       +
         graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09

     

       82
       84
        
         grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21

     

       83
       85
        
         ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06

     

       84
       86
        
         HAP-python = hap-python; # added 2021-06-01

     
···

       87
       89
        
         hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29

     

       88
       90
        
         IMAPClient = imapclient; # added 2021-10-28

     

       89
       91
        
         ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30

     

       92
       92
       +
         influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10

     

       90
       93
        
         jupyter_client = jupyter-client; # added 2021-10-15

     

       91
       94
        
         Keras = keras; # added 2021-11-25

     

       92
       95
        
         lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04

+1 -7

pkgs/top-level/python-packages.nix

···

       3759
       3759
        
       

     

       3760
       3760
        
         grapheme = callPackage ../development/python-modules/grapheme { };

     

       3761
       3761
        
       

     

       3762
       3762
       -
         graphite_api = callPackage ../development/python-modules/graphite-api { };

     

       3763
       3763
       -
       

     

       3764
       3764
       -
         graphite_beacon = callPackage ../development/python-modules/graphite_beacon { };

     

       3765
       3765
       -
       

     

       3766
       3762
        
         graphite-web = callPackage ../development/python-modules/graphite-web { };

     

       3767
       3763
        
       

     

       3768
       3764
        
         graphene = callPackage ../development/python-modules/graphene { };

     
···

       4283
       4279
        
         influxdb = callPackage ../development/python-modules/influxdb { };

     

       4284
       4280
        
       

     

       4285
       4281
        
         influxdb-client = callPackage ../development/python-modules/influxdb-client { };

     

       4286
       4286
       -
       

     

       4287
       4287
       -
         influxgraph = callPackage ../development/python-modules/influxgraph { };

     

       4288
       4282
        
       

     

       4289
       4283
        
         inform = callPackage ../development/python-modules/inform { };

     

       4290
       4284
        
       

     
···

       10666
       10660
        
         # Used by circus and grab-site, 2020-08-29

     

       10667
       10661
        
         tornado_4 = callPackage ../development/python-modules/tornado/4.nix { };

     

       10668
       10662
        
       

     

       10669
       10669
       -
         # Used by streamlit, graphite_beacon, 2021-01-29

     

       10663
       10663
       +
         # Used by streamlit, 2021-01-29

     

       10670
       10664
        
         tornado_5 = callPackage ../development/python-modules/tornado/5.nix { };

     

       10671
       10665
        
       

     

       10672
       10666
        
         torrequest = callPackage ../development/python-modules/torrequest { };