commit 2d0fdeb0d7e935baf62416c5d9096e5e0065cecc · pyrox.dev/nixpkgs

-50

pkgs/servers/web-apps/netbox/config.patch

···

       1
       1
       -
       diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py

     

       2
       2
       -
       index 2de06dd10..00406af48 100644

     

       3
       3
       -
       --- a/netbox/netbox/settings.py

     

       4
       4
       -
       +++ b/netbox/netbox/settings.py

     

       5
       5
       -
       @@ -236,6 +236,7 @@ TASKS_REDIS_DATABASE = TASKS_REDIS.get('DATABASE', 0)

     

       6
       6
       -
        TASKS_REDIS_SSL = TASKS_REDIS.get('SSL', False)

     

       7
       7
       -
        TASKS_REDIS_SKIP_TLS_VERIFY = TASKS_REDIS.get('INSECURE_SKIP_TLS_VERIFY', False)

     

       8
       8
       -
        TASKS_REDIS_CA_CERT_PATH = TASKS_REDIS.get('CA_CERT_PATH', False)

     

       9
       9
       -
       +TASKS_REDIS_URL = TASKS_REDIS.get('URL')

     

       10
       10
       -
        

     

       11
       11
       -
        # Caching

     

       12
       12
       -
        if 'caching' not in REDIS:

     

       13
       13
       -
       @@ -253,11 +254,12 @@ CACHING_REDIS_SENTINEL_SERVICE = REDIS['caching'].get('SENTINEL_SERVICE', 'defau

     

       14
       14
       -
        CACHING_REDIS_PROTO = 'rediss' if REDIS['caching'].get('SSL', False) else 'redis'

     

       15
       15
       -
        CACHING_REDIS_SKIP_TLS_VERIFY = REDIS['caching'].get('INSECURE_SKIP_TLS_VERIFY', False)

     

       16
       16
       -
        CACHING_REDIS_CA_CERT_PATH = REDIS['caching'].get('CA_CERT_PATH', False)

     

       17
       17
       -
       +CACHING_REDIS_URL = REDIS['caching'].get('URL', f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}')

     

       18
       18
       -
        

     

       19
       19
       -
        CACHES = {

     

       20
       20
       -
            'default': {

     

       21
       21
       -
                'BACKEND': 'django_redis.cache.RedisCache',

     

       22
       22
       -
       -        'LOCATION': f'{CACHING_REDIS_PROTO}://{CACHING_REDIS_USERNAME_HOST}:{CACHING_REDIS_PORT}/{CACHING_REDIS_DATABASE}',

     

       23
       23
       -
       +        'LOCATION': CACHING_REDIS_URL,

     

       24
       24
       -
                'OPTIONS': {

     

       25
       25
       -
                    'CLIENT_CLASS': 'django_redis.client.DefaultClient',

     

       26
       26
       -
                    'PASSWORD': CACHING_REDIS_PASSWORD,

     

       27
       27
       -
       @@ -410,7 +412,7 @@ USE_X_FORWARDED_HOST = True

     

       28
       28
       -
        X_FRAME_OPTIONS = 'SAMEORIGIN'

     

       29
       29
       -
        

     

       30
       30
       -
        # Static files (CSS, JavaScript, Images)

     

       31
       31
       -
       -STATIC_ROOT = BASE_DIR + '/static'

     

       32
       32
       -
       +STATIC_ROOT = getattr(configuration, 'STATIC_ROOT', os.path.join(BASE_DIR, 'static')).rstrip('/')

     

       33
       33
       -
        STATIC_URL = f'/{BASE_PATH}static/'

     

       34
       34
       -
        STATICFILES_DIRS = (

     

       35
       35
       -
            os.path.join(BASE_DIR, 'project-static', 'dist'),

     

       36
       36
       -
       @@ -640,6 +642,14 @@ if TASKS_REDIS_USING_SENTINEL:

     

       37
       37
       -
                    'socket_connect_timeout': TASKS_REDIS_SENTINEL_TIMEOUT

     

       38
       38
       -
                },

     

       39
       39
       -
            }

     

       40
       40
       -
       +elif TASKS_REDIS_URL:

     

       41
       41
       -
       +    RQ_PARAMS = {

     

       42
       42
       -
       +        'URL': TASKS_REDIS_URL,

     

       43
       43
       -
       +        'PASSWORD': TASKS_REDIS_PASSWORD,

     

       44
       44
       -
       +        'SSL': TASKS_REDIS_SSL,

     

       45
       45
       -
       +        'SSL_CERT_REQS': None if TASKS_REDIS_SKIP_TLS_VERIFY else 'required',

     

       46
       46
       -
       +        'DEFAULT_TIMEOUT': RQ_DEFAULT_TIMEOUT,

     

       47
       47
       -
       +    }

     

       48
       48
       -
        else:

     

       49
       49
       -
            RQ_PARAMS = {

     

       50
       50
       -
                'HOST': TASKS_REDIS_HOST,

-25

pkgs/servers/web-apps/netbox/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         nixosTests,

     

       4
       4
       -
         callPackage,

     

       5
       5
       -
       }:

     

       6
       6
       -
       let

     

       7
       7
       -
         generic = import ./generic.nix;

     

       8
       8
       -
       in

     

       9
       9
       -
       {

     

       10
       10
       -
         netbox_3_7 = callPackage generic {

     

       11
       11
       -
           version = "3.7.8";

     

       12
       12
       -
           hash = "sha256-61pJbMWXNFnvWI0z9yWvsutdCAP4VydeceANNw0nKsk=";

     

       13
       13
       -
           extraPatches = [

     

       14
       14
       -
             # Allow setting the STATIC_ROOT from within the configuration and setting a custom redis URL

     

       15
       15
       -
             ./config.patch

     

       16
       16
       -
           ];

     

       17
       17
       -
           tests.netbox = nixosTests.netbox_3_7;

     

       18
       18
       -
       

     

       19
       19
       -
           maintainers = with lib.maintainers; [

     

       20
       20
       -
             minijackson

     

       21
       21
       -
             raitobezarius

     

       22
       22
       -
           ];

     

       23
       23
       -
           eol = true;

     

       24
       24
       -
         };

     

       25
       25
       -
       }

-119

pkgs/servers/web-apps/netbox/generic.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         fetchFromGitHub,

     

       4
       4
       -
         python3,

     

       5
       5
       -
         version,

     

       6
       6
       -
         hash,

     

       7
       7
       -
         plugins ? ps: [ ],

     

       8
       8
       -
         extraPatches ? [ ],

     

       9
       9
       -
         tests ? { },

     

       10
       10
       -
         maintainers ? [ ],

     

       11
       11
       -
         eol ? false,

     

       12
       12
       -
       }:

     

       13
       13
       -
       let

     

       14
       14
       -
         extraBuildInputs = plugins python3.pkgs;

     

       15
       15
       -
       in

     

       16
       16
       -
       python3.pkgs.buildPythonApplication rec {

     

       17
       17
       -
         pname = "netbox";

     

       18
       18
       -
         inherit version;

     

       19
       19
       -
       

     

       20
       20
       -
         format = "other";

     

       21
       21
       -
       

     

       22
       22
       -
         src = fetchFromGitHub {

     

       23
       23
       -
           owner = "netbox-community";

     

       24
       24
       -
           repo = pname;

     

       25
       25
       -
           rev = "refs/tags/v${version}";

     

       26
       26
       -
           inherit hash;

     

       27
       27
       -
         };

     

       28
       28
       -
       

     

       29
       29
       -
         patches = extraPatches;

     

       30
       30
       -
       

     

       31
       31
       -
         propagatedBuildInputs =

     

       32
       32
       -
           with python3.pkgs;

     

       33
       33
       -
           [

     

       34
       34
       -
             bleach

     

       35
       35
       -
             boto3

     

       36
       36
       -
             django_4

     

       37
       37
       -
             django-cors-headers

     

       38
       38
       -
             django-debug-toolbar

     

       39
       39
       -
             django-filter

     

       40
       40
       -
             django-graphiql-debug-toolbar

     

       41
       41
       -
             django-mptt

     

       42
       42
       -
             django-pglocks

     

       43
       43
       -
             django-prometheus

     

       44
       44
       -
             django-redis

     

       45
       45
       -
             django-rq

     

       46
       46
       -
             django-tables2

     

       47
       47
       -
             django-taggit

     

       48
       48
       -
             django-timezone-field

     

       49
       49
       -
             djangorestframework

     

       50
       50
       -
             drf-spectacular

     

       51
       51
       -
             drf-spectacular-sidecar

     

       52
       52
       -
             drf-yasg

     

       53
       53
       -
             dulwich

     

       54
       54
       -
             swagger-spec-validator # from drf-yasg[validation]

     

       55
       55
       -
             feedparser

     

       56
       56
       -
             graphene-django

     

       57
       57
       -
             jinja2

     

       58
       58
       -
             markdown

     

       59
       59
       -
             markdown-include

     

       60
       60
       -
             netaddr

     

       61
       61
       -
             pillow

     

       62
       62
       -
             psycopg2

     

       63
       63
       -
             pyyaml

     

       64
       64
       -
             requests

     

       65
       65
       -
             sentry-sdk

     

       66
       66
       -
             social-auth-core

     

       67
       67
       -
             social-auth-app-django

     

       68
       68
       -
             svgwrite

     

       69
       69
       -
             tablib

     

       70
       70
       -
             jsonschema

     

       71
       71
       -
           ]

     

       72
       72
       -
           ++ extraBuildInputs;

     

       73
       73
       -
       

     

       74
       74
       -
         buildInputs = with python3.pkgs; [

     

       75
       75
       -
           mkdocs-material

     

       76
       76
       -
           mkdocs-material-extensions

     

       77
       77
       -
           mkdocstrings

     

       78
       78
       -
           mkdocstrings-python

     

       79
       79
       -
         ];

     

       80
       80
       -
       

     

       81
       81
       -
         nativeBuildInputs = [

     

       82
       82
       -
           python3.pkgs.mkdocs

     

       83
       83
       -
         ];

     

       84
       84
       -
       

     

       85
       85
       -
         postBuild = ''

     

       86
       86
       -
           PYTHONPATH=$PYTHONPATH:netbox/

     

       87
       87
       -
           python -m mkdocs build

     

       88
       88
       -
         '';

     

       89
       89
       -
       

     

       90
       90
       -
         installPhase = ''

     

       91
       91
       -
           mkdir -p $out/opt/netbox

     

       92
       92
       -
           cp -r . $out/opt/netbox

     

       93
       93
       -
           chmod +x $out/opt/netbox/netbox/manage.py

     

       94
       94
       -
           makeWrapper $out/opt/netbox/netbox/manage.py $out/bin/netbox \

     

       95
       95
       -
             --prefix PYTHONPATH : "$PYTHONPATH"

     

       96
       96
       -
         '';

     

       97
       97
       -
       

     

       98
       98
       -
         passthru = {

     

       99
       99
       -
           python = python3;

     

       100
       100
       -
           # PYTHONPATH of all dependencies used by the package

     

       101
       101
       -
           pythonPath = python3.pkgs.makePythonPath propagatedBuildInputs;

     

       102
       102
       -
           gunicorn = python3.pkgs.gunicorn;

     

       103
       103
       -
           inherit tests;

     

       104
       104
       -
         };

     

       105
       105
       -
       

     

       106
       106
       -
         meta = {

     

       107
       107
       -
           homepage = "https://github.com/netbox-community/netbox";

     

       108
       108
       -
           description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool";

     

       109
       109
       -
           mainProgram = "netbox";

     

       110
       110
       -
           license = lib.licenses.asl20;

     

       111
       111
       -
           knownVulnerabilities = (

     

       112
       112
       -
             lib.optional eol "Netbox version ${version} is EOL; please upgrade by following the current release notes instructions."

     

       113
       113
       -
           );

     

       114
       114
       -
           # Warning:

     

       115
       115
       -
           # Notice the missing `lib` in the inherit: it is using this function argument rather than a `with lib;` argument.

     

       116
       116
       -
           # If you replace this by `with lib;`, pay attention it does not inherit all maintainers in nixpkgs.

     

       117
       117
       -
           inherit maintainers;

     

       118
       118
       -
         };

     

       119
       119
       -
       }

pkgs/top-level/aliases.nix

···

       1246
       1246
        
         neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28

     

       1247
       1247
        
         netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02

     

       1248
       1248
        
         netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22

     

       1249
       1249
       +
         netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23

     

       1249
       1250
        
         nextcloud29 = throw ''

     

       1250
       1251
        
           Nextcloud v29 has been removed from `nixpkgs` as the support for is dropped

     

       1251
       1252
        
           by upstream in 2025-04. Please upgrade to at least Nextcloud v30 by declaring

-2

pkgs/top-level/all-packages.nix

···

       3867
       3867
        
           hdf5 = hdf5-mpi.override { usev110Api = true; };

     

       3868
       3868
        
         };

     

       3869
       3869
        
       

     

       3870
       3870
       -
         inherit (callPackage ../servers/web-apps/netbox { }) netbox_3_7;

     

       3871
       3871
       -
       

     

       3872
       3870
        
         # Not in aliases because it wouldn't get picked up by callPackage

     

       3873
       3871
        
         netbox = netbox_4_2;

     

       3874
       3872