commit f20de6f5f15cab9937a317d00bd3d5228a6f983f · pyrox.dev/nixpkgs

+1

lib/systems/doubles.nix

···

       69
       69
        
       

     

       70
       70
        
         arm           = filterDoubles predicates.isAarch32;

     

       71
       71
        
         armv7         = filterDoubles predicates.isArmv7;

     

       72
       72
       +
         aarch         = filterDoubles predicates.isAarch;

     

       72
       73
        
         aarch64       = filterDoubles predicates.isAarch64;

     

       73
       74
        
         x86           = filterDoubles predicates.isx86;

     

       74
       75
        
         i686          = filterDoubles predicates.isi686;

+5 -1

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

···

       25
       25
        
         Users can use it by `services.displayManager.ly.enable` and config it by

     

       26
       26
        
         `services.displayManager.ly.settings` to generate `/etc/ly/config.ini`

     

       27
       27
        
       

     

       28
       28
       -
       ## New Services {#sec-release-24.11-new-services}

     

       28
       28
       +
       ## New Modules {#sec-release-24.11-new-modules}

     

       29
       29
        
       

     

       30
       30
        
       - [TaskChampion Sync-Server](https://github.com/GothenburgBitFactory/taskchampion-sync-server), a [Taskwariror 3](https://taskwarrior.org/docs/upgrade-3/) sync server, replacing Taskwarrior 2's sync server named [`taskserver`](https://github.com/GothenburgBitFactory/taskserver).

     

       31
       31
        
       

     
···

       200
       200
        
         ```

     

       201
       201
        
       

     

       202
       202
        
       - `pkgs.nextcloud27` has been removed since it's EOL.

     

       203
       203
       +
       

     

       204
       204
       +
       - `frigate` was updated past 0.14.0. This release includes various breaking changes, so please go read the [release notes](https://github.com/blakeblackshear/frigate/releases/tag/v0.14.0).

     

       205
       205
       +
          Most prominently access to the webinterface and API are now protected by authentication. Retrieve the auto-created

     

       206
       206
       +
          admin account from the `frigate.service` journal after upgrading.

     

       203
       207
        
       

     

       204
       208
        
       - `services.forgejo.mailerPasswordFile` has been deprecated by the drop-in replacement `services.forgejo.secrets.mailer.PASSWD`,

     

       205
       209
        
         which is part of the new free-form `services.forgejo.secrets` option.

+4 -4

nixos/modules/i18n/input-method/fcitx5.nix

···

       119
       119
        
           ];

     

       120
       120
        
           environment.etc =

     

       121
       121
        
             let

     

       122
       122
       -
               lib.optionalFile = p: f: v: lib.optionalAttrs (v != { }) {

     

       122
       122
       +
               optionalFile = p: f: v: lib.optionalAttrs (v != { }) {

     

       123
       123
        
                 "xdg/fcitx5/${p}".text = f v;

     

       124
       124
        
               };

     

       125
       125
        
             in

     

       126
       126
        
             lib.attrsets.mergeAttrsList [

     

       127
       127
       -
               (lib.optionalFile "config" (lib.generators.toINI { }) cfg.settings.globalOptions)

     

       128
       128
       -
               (lib.optionalFile "profile" (lib.generators.toINI { }) cfg.settings.inputMethod)

     

       127
       127
       +
               (optionalFile "config" (lib.generators.toINI { }) cfg.settings.globalOptions)

     

       128
       128
       +
               (optionalFile "profile" (lib.generators.toINI { }) cfg.settings.inputMethod)

     

       129
       129
        
               (lib.concatMapAttrs

     

       130
       130
       -
                 (name: value: lib.optionalFile

     

       130
       130
       +
                 (name: value: optionalFile

     

       131
       131
        
                   "conf/${name}.conf"

     

       132
       132
        
                   (lib.generators.toINIWithGlobalSection { })

     

       133
       133
        
                   value)

+195 -81

nixos/modules/services/video/frigate.nix

···

       39
       39
        
                       '';

     

       40
       40
        
                     };

     

       41
       41
        
                     roles = mkOption {

     

       42
       42
       -
                       type = listOf (enum [ "detect" "record" "rtmp" ]);

     

       43
       43
       -
                       example = literalExpression ''

     

       44
       44
       -
                         [ "detect" "rtmp" ]

     

       45
       45
       -
                       '';

     

       42
       42
       +
                       type = listOf (enum [ "audio" "detect" "record" ]);

     

       43
       43
       +
                       example = [ "detect" "record" ];

     

       46
       44
        
                       description = ''

     

       47
       45
        
                         List of roles for this stream

     

       48
       46
        
                       '';

     
···

       54
       52
        
           };

     

       55
       53
        
         };

     

       56
       54
        
       

     

       55
       55
       +
         # auth_request.conf

     

       56
       56
       +
         nginxAuthRequest = ''

     

       57
       57
       +
           # Send a subrequest to verify if the user is authenticated and has permission to access the resource.

     

       58
       58
       +
           auth_request /auth;

     

       59
       59
       +
       

     

       60
       60
       +
           # Save the upstream metadata response headers from Authelia to variables.

     

       61
       61
       +
           auth_request_set $user $upstream_http_remote_user;

     

       62
       62
       +
           auth_request_set $groups $upstream_http_remote_groups;

     

       63
       63
       +
           auth_request_set $name $upstream_http_remote_name;

     

       64
       64
       +
           auth_request_set $email $upstream_http_remote_email;

     

       65
       65
       +
       

     

       66
       66
       +
           # Inject the metadata response headers from the variables into the request made to the backend.

     

       67
       67
       +
           proxy_set_header Remote-User $user;

     

       68
       68
       +
           proxy_set_header Remote-Groups $groups;

     

       69
       69
       +
           proxy_set_header Remote-Email $email;

     

       70
       70
       +
           proxy_set_header Remote-Name $name;

     

       71
       71
       +
       

     

       72
       72
       +
           # Refresh the cookie as needed

     

       73
       73
       +
           auth_request_set $auth_cookie $upstream_http_set_cookie;

     

       74
       74
       +
           add_header Set-Cookie $auth_cookie;

     

       75
       75
       +
       

     

       76
       76
       +
           # Pass the location header back up if it exists

     

       77
       77
       +
           auth_request_set $redirection_url $upstream_http_location;

     

       78
       78
       +
           add_header Location $redirection_url;

     

       79
       79
       +
         '';

     

       80
       80
       +
       

     

       81
       81
       +
         nginxProxySettings = ''

     

       82
       82
       +
           # Basic Proxy Configuration

     

       83
       83
       +
           client_body_buffer_size 128k;

     

       84
       84
       +
           proxy_next_upstream error timeout invalid_header http_500 http_502 http_503; ## Timeout if the real server is dead.

     

       85
       85
       +
           proxy_redirect  http://  $scheme://;

     

       86
       86
       +
           proxy_cache_bypass $cookie_session;

     

       87
       87
       +
           proxy_no_cache $cookie_session;

     

       88
       88
       +
           proxy_buffers 64 256k;

     

       89
       89
       +
       

     

       90
       90
       +
           # Advanced Proxy Configuration

     

       91
       91
       +
           send_timeout 5m;

     

       92
       92
       +
           proxy_read_timeout 360;

     

       93
       93
       +
           proxy_send_timeout 360;

     

       94
       94
       +
           proxy_connect_timeout 360;

     

       95
       95
       +
         '';

     

       96
       96
       +
       

     

       57
       97
        
       in

     

       58
       98
        
       

     

       59
       99
        
       {

     
···

       126
       166
        
           services.nginx = {

     

       127
       167
        
             enable = true;

     

       128
       168
        
             additionalModules = with pkgs.nginxModules; [

     

       169
       169
       +
               develkit

     

       129
       170
        
               secure-token

     

       130
       130
       -
               rtmp

     

       171
       171
       +
               set-misc

     

       131
       172
        
               vod

     

       132
       173
        
             ];

     

       133
       174
        
             recommendedProxySettings = mkDefault true;

     
···

       158
       199
        
             # Based on https://github.com/blakeblackshear/frigate/blob/v0.13.1/docker/main/rootfs/usr/local/nginx/conf/nginx.conf

     

       159
       200
        
             virtualHosts."${cfg.hostname}" = {

     

       160
       201
        
               locations = {

     

       161
       161
       -
                 "/api/" = {

     

       162
       162
       -
                   proxyPass = "http://frigate-api/";

     

       202
       202
       +
                 # auth_location.conf

     

       203
       203
       +
                 "/auth" = {

     

       204
       204
       +
                   proxyPass = "http://frigate-api/auth";

     

       163
       205
        
                   extraConfig = ''

     

       164
       164
       -
                     proxy_cache frigate_api_cache;

     

       165
       165
       -
                     proxy_cache_lock on;

     

       166
       166
       -
                     proxy_cache_use_stale updating;

     

       167
       167
       -
                     proxy_cache_valid 200 5s;

     

       168
       168
       -
                     proxy_cache_bypass $http_x_cache_bypass;

     

       169
       169
       -
                     proxy_no_cache $should_not_cache;

     

       170
       170
       -
                     add_header X-Cache-Status $upstream_cache_status;

     

       206
       206
       +
                     internal;

     

       171
       207
        
       

     

       172
       172
       -
                     location /api/vod/ {

     

       173
       173
       -
                         proxy_pass http://frigate-api/vod/;

     

       174
       174
       -
                         proxy_cache off;

     

       175
       175
       -
                     }

     

       208
       208
       +
                     # Strip all request headers

     

       209
       209
       +
                     proxy_pass_request_headers off;

     

       176
       210
        
       

     

       177
       177
       -
                     location /api/stats {

     

       178
       178
       -
                         access_log off;

     

       179
       179
       -
                         rewrite ^/api/(.*)$ $1 break;

     

       180
       180
       -
                         proxy_pass http://frigate-api;

     

       181
       181
       -
                     }

     

       211
       211
       +
                     # Pass info about the request

     

       212
       212
       +
                     proxy_set_header X-Original-Method $request_method;

     

       213
       213
       +
                     proxy_set_header X-Original-URL $scheme://$http_host$request_uri;

     

       214
       214
       +
                     proxy_set_header X-Server-Port $server_port;

     

       215
       215
       +
                     proxy_set_header Content-Length "";

     

       216
       216
       +
       

     

       217
       217
       +
                     # Pass along auth related info

     

       218
       218
       +
                     proxy_set_header Authorization $http_authorization;

     

       219
       219
       +
                     proxy_set_header Cookie $http_cookie;

     

       220
       220
       +
                     proxy_set_header X-CSRF-TOKEN "1";

     

       221
       221
       +
       

     

       222
       222
       +
                     # Pass headers for common auth proxies

     

       223
       223
       +
                     proxy_set_header Remote-User $http_remote_user;

     

       224
       224
       +
                     proxy_set_header Remote-Groups $http_remote_groups;

     

       225
       225
       +
                     proxy_set_header Remote-Email $http_remote_email;

     

       226
       226
       +
                     proxy_set_header Remote-Name $http_remote_name;

     

       227
       227
       +
                     proxy_set_header X-Forwarded-User $http_x_forwarded_user;

     

       228
       228
       +
                     proxy_set_header X-Forwarded-Groups $http_x_forwarded_groups;

     

       229
       229
       +
                     proxy_set_header X-Forwarded-Email $http_x_forwarded_email;

     

       230
       230
       +
                     proxy_set_header X-Forwarded-Preferred-Username $http_x_forwarded_preferred_username;

     

       231
       231
       +
                     proxy_set_header X-authentik-username $http_x_authentik_username;

     

       232
       232
       +
                     proxy_set_header X-authentik-groups $http_x_authentik_groups;

     

       233
       233
       +
                     proxy_set_header X-authentik-email $http_x_authentik_email;

     

       234
       234
       +
                     proxy_set_header X-authentik-name $http_x_authentik_name;

     

       235
       235
       +
                     proxy_set_header X-authentik-uid $http_x_authentik_uid;

     

       182
       236
        
       

     

       183
       183
       -
                     location /api/version {

     

       184
       184
       -
                         access_log off;

     

       185
       185
       -
                         rewrite ^/api/(.*)$ $1 break;

     

       186
       186
       -
                         proxy_pass http://frigate-api;

     

       187
       187
       -
                     }

     

       188
       188
       -
                   '';

     

       189
       189
       -
                 };

     

       190
       190
       -
                 "~* /api/.*\.(jpg|jpeg|png)$" = {

     

       191
       191
       -
                   proxyPass = "http://frigate-api";

     

       192
       192
       -
                   extraConfig = ''

     

       193
       193
       -
                     rewrite ^/api/(.*)$ $1 break;

     

       237
       237
       +
                     ${nginxProxySettings}

     

       194
       238
        
                   '';

     

       195
       239
        
                 };

     

       196
       240
        
                 "/vod/" = {

     

       197
       197
       -
                   extraConfig = ''

     

       241
       241
       +
                   extraConfig = nginxAuthRequest + ''

     

       198
       242
        
                     aio threads;

     

       199
       243
        
                     vod hls;

     

       200
       244
        
       

     
···

       206
       250
        
                   '';

     

       207
       251
        
                 };

     

       208
       252
        
                 "/stream/" = {

     

       209
       209
       -
                   # TODO

     

       253
       253
       +
                   alias = "/var/cache/frigate/stream/";

     

       254
       254
       +
                   extraConfig = nginxAuthRequest + ''

     

       255
       255
       +
                     add_header Cache-Control "no-store";

     

       256
       256
       +
                     expires off;

     

       257
       257
       +
       

     

       258
       258
       +
                     types {

     

       259
       259
       +
                         application/dash+xml mpd;

     

       260
       260
       +
                         application/vnd.apple.mpegurl m3u8;

     

       261
       261
       +
                         video/mp2t ts;

     

       262
       262
       +
                         image/jpeg jpg;

     

       263
       263
       +
                     }

     

       264
       264
       +
                   '';

     

       265
       265
       +
                 };

     

       266
       266
       +
                 "/clips/" = {

     

       267
       267
       +
                   root = "/var/lib/frigate";

     

       268
       268
       +
                   extraConfig = nginxAuthRequest + ''

     

       269
       269
       +
                     types {

     

       270
       270
       +
                         video/mp4 mp4;

     

       271
       271
       +
                         image/jpeg jpg;

     

       272
       272
       +
                     }

     

       273
       273
       +
       

     

       274
       274
       +
                     expires 7d;

     

       275
       275
       +
                     add_header Cache-Control "public";

     

       276
       276
       +
                     autoindex on;

     

       277
       277
       +
                   '';

     

       278
       278
       +
                 };

     

       279
       279
       +
                 "/cache/" = {

     

       280
       280
       +
                   alias = "/var/cache/frigate/";

     

       281
       281
       +
                   extraConfig = ''

     

       282
       282
       +
                     internal;

     

       283
       283
       +
                   '';

     

       284
       284
       +
                 };

     

       285
       285
       +
                 "/recordings/" = {

     

       286
       286
       +
                   root = "/var/lib/frigate";

     

       287
       287
       +
                   extraConfig = nginxAuthRequest + ''

     

       288
       288
       +
                     types {

     

       289
       289
       +
                         video/mp4 mp4;

     

       290
       290
       +
                     }

     

       291
       291
       +
       

     

       292
       292
       +
                     autoindex on;

     

       293
       293
       +
                     autoindex_format json;

     

       294
       294
       +
                   '';

     

       295
       295
       +
                 };

     

       296
       296
       +
                 "/exports/" = {

     

       297
       297
       +
                   root = "/var/lib/frigate";

     

       298
       298
       +
                   extraConfig = nginxAuthRequest + ''

     

       299
       299
       +
                     types {

     

       300
       300
       +
                       video/mp4 mp4;

     

       301
       301
       +
                     }

     

       302
       302
       +
       

     

       303
       303
       +
                     autoindex on;

     

       304
       304
       +
                     autoindex_format json;

     

       305
       305
       +
                   '';

     

       210
       306
        
                 };

     

       211
       307
        
                 "/ws" = {

     

       212
       308
        
                   proxyPass = "http://frigate-mqtt-ws/";

     

       213
       309
        
                   proxyWebsockets = true;

     

       310
       310
       +
                   extraConfig = nginxAuthRequest + nginxProxySettings;

     

       214
       311
        
                 };

     

       215
       312
        
                 "/live/jsmpeg" = {

     

       216
       313
        
                   proxyPass = "http://frigate-jsmpeg/";

     

       217
       314
        
                   proxyWebsockets = true;

     

       218
       218
       -
                 };

     

       219
       219
       -
                 "/live/mse/" = {

     

       220
       220
       -
                   proxyPass = "http://frigate-go2rtc/";

     

       221
       221
       -
                   proxyWebsockets = true;

     

       315
       315
       +
                   extraConfig = nginxAuthRequest + nginxProxySettings;

     

       222
       316
        
                 };

     

       223
       317
        
                 # frigate lovelace card uses this path

     

       224
       318
        
                 "/live/mse/api/ws" = {

     

       225
       319
        
                   proxyPass = "http://frigate-go2rtc/api/ws";

     

       226
       320
        
                   proxyWebsockets = true;

     

       227
       227
       -
                   extraConfig = ''

     

       321
       321
       +
                   extraConfig = nginxAuthRequest + nginxProxySettings + ''

     

       228
       322
        
                     limit_except GET {

     

       229
       323
        
                         deny  all;

     

       230
       324
        
                     }

     

       231
       325
        
                   '';

     

       232
       326
        
                 };

     

       233
       233
       -
                 "/live/webrtc/" = {

     

       234
       234
       -
                   proxyPass = "http://frigate-go2rtc/";

     

       235
       235
       -
                   proxyWebsockets = true;

     

       236
       236
       -
                 };

     

       237
       327
        
                 "/live/webrtc/api/ws" = {

     

       238
       328
        
                   proxyPass = "http://frigate-go2rtc/api/ws";

     

       239
       329
        
                   proxyWebsockets = true;

     

       240
       240
       -
                   extraConfig = ''

     

       330
       330
       +
                   extraConfig = nginxAuthRequest + nginxProxySettings + ''

     

       241
       331
        
                     limit_except GET {

     

       242
       332
        
                         deny  all;

     

       243
       333
        
                     }

     
···

       246
       336
        
                 # pass through go2rtc player

     

       247
       337
        
                 "/live/webrtc/webrtc.html" = {

     

       248
       338
        
                   proxyPass = "http://frigate-go2rtc/webrtc.html";

     

       249
       249
       -
                   proxyWebsockets = true;

     

       250
       250
       -
                   extraConfig = ''

     

       339
       339
       +
                   extraConfig = nginxAuthRequest + nginxProxySettings + ''

     

       251
       340
        
                     limit_except GET {

     

       252
       341
        
                         deny  all;

     

       253
       342
        
                     }

     

       254
       343
        
                   '';

     

       255
       344
        
                 };

     

       345
       345
       +
                 # frontend uses this to fetch the version

     

       256
       346
        
                 "/api/go2rtc/api" = {

     

       257
       347
        
                   proxyPass = "http://frigate-go2rtc/api";

     

       258
       258
       -
                   proxyWebsockets = true;

     

       259
       259
       -
                   extraConfig = ''

     

       348
       348
       +
                   extraConfig = nginxAuthRequest + nginxProxySettings + ''

     

       260
       349
        
                     limit_except GET {

     

       261
       350
        
                         deny  all;

     

       262
       351
        
                     }

     
···

       266
       355
        
                 "/api/go2rtc/webrtc" = {

     

       267
       356
        
                   proxyPass = "http://frigate-go2rtc/api/webrtc";

     

       268
       357
        
                   proxyWebsockets = true;

     

       269
       269
       -
                   extraConfig = ''

     

       358
       358
       +
                   extraConfig = nginxAuthRequest + nginxProxySettings + ''

     

       270
       359
        
                     limit_except GET {

     

       271
       360
        
                         deny  all;

     

       272
       361
        
                     }

     

       273
       362
        
                   '';

     

       274
       363
        
                 };

     

       275
       275
       -
                 "/cache/" = {

     

       276
       276
       -
                   alias = "/var/cache/frigate/";

     

       364
       364
       +
                 "~* /api/.*\.(jpg|jpeg|png|webp|gif)$" = {

     

       365
       365
       +
                   proxyPass = "http://frigate-api";

     

       366
       366
       +
                   extraConfig = nginxAuthRequest + nginxProxySettings + ''

     

       367
       367
       +
                     rewrite ^/api/(.*)$ $1 break;

     

       368
       368
       +
                   '';

     

       277
       369
        
                 };

     

       278
       278
       -
                 "/clips/" = {

     

       279
       279
       -
                   root = "/var/lib/frigate";

     

       280
       280
       -
                   extraConfig = ''

     

       281
       281
       -
                     types {

     

       282
       282
       -
                         video/mp4 mp4;

     

       283
       283
       -
                         image/jpeg jpg;

     

       370
       370
       +
                 "/api/" = {

     

       371
       371
       +
                   proxyPass = "http://frigate-api/";

     

       372
       372
       +
                   extraConfig = nginxAuthRequest + nginxProxySettings + ''

     

       373
       373
       +
                     add_header Cache-Control "no-store";

     

       374
       374
       +
                     expires off;

     

       375
       375
       +
       

     

       376
       376
       +
                     proxy_cache frigate_api_cache;

     

       377
       377
       +
                     proxy_cache_lock on;

     

       378
       378
       +
                     proxy_cache_use_stale updating;

     

       379
       379
       +
                     proxy_cache_valid 200 5s;

     

       380
       380
       +
                     proxy_cache_bypass $http_x_cache_bypass;

     

       381
       381
       +
                     proxy_no_cache $should_not_cache;

     

       382
       382
       +
                     add_header X-Cache-Status $upstream_cache_status;

     

       383
       383
       +
       

     

       384
       384
       +
                     location /api/vod/ {

     

       385
       385
       +
                         ${nginxAuthRequest}

     

       386
       386
       +
                         proxy_pass http://frigate-api/vod/;

     

       387
       387
       +
                         proxy_cache off;

     

       388
       388
       +
                         add_header Cache-Control "no-store";

     

       389
       389
       +
                         ${nginxProxySettings}

     

       284
       390
        
                     }

     

       285
       391
        
       

     

       286
       286
       -
                     autoindex on;

     

       287
       287
       -
                   '';

     

       288
       288
       -
                 };

     

       289
       289
       -
                 "/recordings/" = {

     

       290
       290
       -
                   root = "/var/lib/frigate";

     

       291
       291
       -
                   extraConfig = ''

     

       292
       292
       -
                     types {

     

       293
       293
       -
                         video/mp4 mp4;

     

       392
       392
       +
                     location /api/login {

     

       393
       393
       +
                         auth_request off;

     

       394
       394
       +
                         rewrite ^/api(/.*)$ $1 break;

     

       395
       395
       +
                         proxy_pass http://frigate-api;

     

       396
       396
       +
                         ${nginxProxySettings}

     

       397
       397
       +
                     }

     

       398
       398
       +
       

     

       399
       399
       +
                     location /api/stats {

     

       400
       400
       +
                         ${nginxAuthRequest}

     

       401
       401
       +
                         access_log off;

     

       402
       402
       +
                         rewrite ^/api/(.*)$ $1 break;

     

       403
       403
       +
                         add_header Cache-Control "no-store";

     

       404
       404
       +
                         proxy_pass http://frigate-api;

     

       405
       405
       +
                         ${nginxProxySettings}

     

       294
       406
        
                     }

     

       295
       407
        
       

     

       296
       296
       -
                     autoindex on;

     

       297
       297
       -
                     autoindex_format json;

     

       408
       408
       +
                     location /api/version {

     

       409
       409
       +
                         ${nginxAuthRequest}

     

       410
       410
       +
                         access_log off;

     

       411
       411
       +
                         rewrite ^/api/(.*)$ $1 break;

     

       412
       412
       +
                         add_header Cache-Control "no-store";

     

       413
       413
       +
                         proxy_pass http://frigate-api;

     

       414
       414
       +
                         ${nginxProxySettings}

     

       415
       415
       +
                     }

     

       298
       416
        
                   '';

     

       299
       417
        
                 };

     

       300
       418
        
                 "/assets/" = {

     
···

       307
       425
        
                 };

     

       308
       426
        
                 "/" = {

     

       309
       427
        
                   root = cfg.package.web;

     

       310
       310
       -
                   tryFiles = "$uri $uri/ /index.html";

     

       428
       428
       +
                   tryFiles = "$uri $uri.html $uri/ /index.html";

     

       311
       429
        
                   extraConfig = ''

     

       312
       430
        
                     add_header Cache-Control "no-store";

     

       313
       431
        
                     expires off;

     

       314
       314
       -
       

     

       315
       315
       -
                     sub_filter 'href="/BASE_PATH/' 'href="$http_x_ingress_path/';

     

       316
       316
       -
                     sub_filter 'url(/BASE_PATH/' 'url($http_x_ingress_path/';

     

       317
       317
       -
                     sub_filter '"/BASE_PATH/dist/' '"$http_x_ingress_path/dist/';

     

       318
       318
       -
                     sub_filter '"/BASE_PATH/js/' '"$http_x_ingress_path/js/';

     

       319
       319
       -
                     sub_filter '"/BASE_PATH/assets/' '"$http_x_ingress_path/assets/';

     

       320
       320
       -
                     sub_filter '"/BASE_PATH/monacoeditorwork/' '"$http_x_ingress_path/assets/';

     

       321
       321
       -
                     sub_filter 'return"/BASE_PATH/"' 'return window.baseUrl';

     

       322
       322
       -
                     sub_filter '<body>' '<body><script>window.baseUrl="$http_x_ingress_path/";</script>';

     

       323
       323
       -
                     sub_filter_types text/css application/javascript;

     

       324
       324
       -
                     sub_filter_once off;

     

       325
       432
        
                   '';

     

       326
       433
        
                 };

     

       327
       434
        
               };

     
···

       338
       445
        
                 vod_segment_duration 10000;

     

       339
       446
        
                 vod_hls_mpegts_align_frames off;

     

       340
       447
        
                 vod_hls_mpegts_interleave_frames on;

     

       448
       448
       +
       

     

       341
       449
        
                 # file handle caching / aio

     

       342
       450
        
                 open_file_cache max=1000 inactive=5m;

     

       343
       451
        
                 open_file_cache_valid 2m;

     

       344
       452
        
                 open_file_cache_min_uses 1;

     

       345
       453
        
                 open_file_cache_errors on;

     

       346
       454
        
                 aio on;

     

       455
       455
       +
       

     

       347
       456
        
                 # https://github.com/kaltura/nginx-vod-module#vod_open_file_thread_pool

     

       348
       457
        
                 vod_open_file_thread_pool default;

     

       458
       458
       +
       

     

       349
       459
        
                 # vod caches

     

       350
       460
        
                 vod_metadata_cache metadata_cache 512m;

     

       351
       461
        
                 vod_mapping_cache mapping_cache 5m 10m;

     

       462
       462
       +
       

     

       352
       463
        
                 # gzip manifest

     

       353
       464
        
                 gzip_types application/vnd.apple.mpegurl;

     

       354
       465
        
               '';

     
···

       427
       538
        
               PrivateTmp = true;

     

       428
       539
        
               CacheDirectory = "frigate";

     

       429
       540
        
               CacheDirectoryMode = "0750";

     

       541
       541
       +
       

     

       542
       542
       +
               # Sockets/IPC

     

       543
       543
       +
               RuntimeDirectory = "frigate";

     

       430
       544
        
             };

     

       431
       545
        
           };

     

       432
       546
        
         };

+1 -1

nixos/tests/ceph-single-node-bluestore-dmcrypt.nix

···

       17
       17
        
         {

     

       18
       18
        
           name = "basic-single-node-ceph-cluster-bluestore-dmcrypt";

     

       19
       19
        
           meta = with pkgs.lib.maintainers; {

     

       20
       20
       -
             maintainers = [ benaryorg nh2 ];

     

       20
       20
       +
             maintainers = [ nh2 ];

     

       21
       21
        
           };

     

       22
       22
        
       

     

       23
       23
        
           nodes = {

+8 -10

nixos/tests/fcitx5/default.nix

···

       14
       14
        
             pkgs.alacritty

     

       15
       15
        
           ];

     

       16
       16
        
       

     

       17
       17
       -
           services.xserver = {

     

       17
       17
       +
           services.displayManager.autoLogin = {

     

       18
       18
        
             enable = true;

     

       19
       19
       -
       

     

       20
       20
       -
             displayManager = {

     

       21
       21
       -
               lightdm.enable = true;

     

       22
       22
       -
               autoLogin = {

     

       23
       23
       -
                 enable = true;

     

       24
       24
       -
                 user = "alice";

     

       25
       25
       -
               };

     

       26
       26
       -
             };

     

       19
       19
       +
             user = "alice";

     

       20
       20
       +
           };

     

       27
       21
        
       

     

       22
       22
       +
           services.xserver = {

     

       23
       23
       +
             enable = true;

     

       24
       24
       +
             displayManager.lightdm.enable = true;

     

       28
       25
        
             desktopManager.xfce.enable = true;

     

       29
       26
        
           };

     

       30
       27
        
       

     

       31
       28
        
           i18n.inputMethod = {

     

       32
       32
       -
             enabled = "fcitx5";

     

       29
       29
       +
             enable = true;

     

       30
       30
       +
             type = "fcitx5";

     

       33
       31
        
             fcitx5.addons = [

     

       34
       32
        
               pkgs.fcitx5-chinese-addons

     

       35
       33
        
               pkgs.fcitx5-hangul

+14 -7

nixos/tests/frigate.nix

···

       5
       5
        
         meta.maintainers = with lib.maintainers; [ hexa ];

     

       6
       6
        
       

     

       7
       7
        
         nodes = {

     

       8
       8
       -
           machine = { config, ... }: {

     

       8
       8
       +
           machine = {

     

       9
       9
        
             services.frigate = {

     

       10
       10
        
               enable = true;

     

       11
       11
        
       

     
···

       40
       40
        
               ];

     

       41
       41
        
               serviceConfig = {

     

       42
       42
        
                 DynamicUser = true;

     

       43
       43
       -
                 ExecStart = "${lib.getBin pkgs.ffmpeg-headless}/bin/ffmpeg -re -f lavfi -i smptebars=size=800x600:rate=10 -f mpegts -listen 1 http://0.0.0.0:8080";

     

       43
       43
       +
                 ExecStart = "${lib.getExe pkgs.ffmpeg-headless} -re -f lavfi -i smptebars=size=1280x720:rate=5 -f mpegts -listen 1 http://0.0.0.0:8080";

     

       44
       44
        
                 Restart = "always";

     

       45
       45
        
               };

     

       46
       46
        
             };

     

       47
       47
       +
       

     

       48
       48
       +
             environment.systemPackages = with pkgs; [ httpie ];

     

       47
       49
        
           };

     

       48
       50
        
         };

     

       49
       51
        
       

     

       50
       52
        
         testScript = ''

     

       51
       53
        
           start_all()

     

       52
       54
        
       

     

       55
       55
       +
           # wait until frigate is up

     

       53
       56
        
           machine.wait_for_unit("frigate.service")

     

       57
       57
       +
           machine.wait_for_open_port(5001)

     

       54
       58
        
       

     

       55
       55
       -
           # Frigate startup

     

       56
       56
       -
           machine.wait_for_open_port(5001)

     

       59
       59
       +
           # extract admin password from logs

     

       60
       60
       +
           machine.wait_until_succeeds("journalctl -u frigate.service -o cat | grep -q 'Password: '")

     

       61
       61
       +
           password = machine.execute("journalctl -u frigate.service -o cat | grep -oP '([a-f0-9]{32})'")[1]

     

       57
       62
        
       

     

       58
       58
       -
           # nginx startup

     

       59
       59
       -
           machine.wait_for_open_port(80)

     

       63
       63
       +
           # login and store session

     

       64
       64
       +
           machine.log(machine.succeed(f"http --check-status --session=frigate post http://localhost/api/login user=admin password={password}"))

     

       60
       65
        
       

     

       61
       61
       -
           machine.succeed("curl http://localhost")

     

       66
       66
       +
           # make authenticated api requested

     

       67
       67
       +
           machine.log(machine.succeed("http --check-status --session=frigate get http://localhost/api/version"))

     

       62
       68
        
       

     

       69
       69
       +
           # wait for a recording to appear

     

       63
       70
        
           machine.wait_for_file("/var/cache/frigate/test@*.mp4")

     

       64
       71
        
         '';

     

       65
       72
        
       })

+2 -2

pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix

···

       10
       10
        
         mktplcRef = {

     

       11
       11
        
           name = "context-mapper-vscode-extension";

     

       12
       12
        
           publisher = "contextmapper";

     

       13
       13
       -
           version = "6.11.0";

     

       14
       14
       -
           hash = "sha256-TvApcBBI+Egu7t4tJuEYTs6mhvABOY2eXVb57O4gWfs=";

     

       13
       13
       +
           version = "6.12.0";

     

       14
       14
       +
           hash = "sha256-iGaVipNvx6J3NgZ2KbBJOSVCwG+lr25u7mfMCY4yB18=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ makeWrapper ];

+2 -2

pkgs/applications/editors/vscode/extensions/default.nix

···

       735
       735
        
               mktplcRef = {

     

       736
       736
        
                 name = "vscode-intelephense-client";

     

       737
       737
        
                 publisher = "bmewburn";

     

       738
       738
       -
                 version = "1.10.4";

     

       739
       739
       -
                 hash = "sha256-bD7AL4x0yL5S+MzQXMBrSZs1pVclfvsTfUbImP1oQok=";

     

       738
       738
       +
                 version = "1.12.5";

     

       739
       739
       +
                 hash = "sha256-2Tamwag4KovIOKTe/g4qePVDFxm0mgsLtPNdWcKzigI=";

     

       740
       740
        
               };

     

       741
       741
        
               meta = {

     

       742
       742
        
                 description = "PHP code intelligence for Visual Studio Code";

+45 -45

pkgs/applications/emulators/retroarch/hashes.json

···

       55
       55
        
               "src": {

     

       56
       56
        
                   "owner": "libretro",

     

       57
       57
        
                   "repo": "beetle-pce-libretro",

     

       58
       58
       -
                   "rev": "f6613f4b26e04e9769a0c872cdac13f9dfaa61c8",

     

       59
       59
       -
                   "hash": "sha256-ugJDgzpH1cvLgK3boLe502vwkY4clA5IeU3jxeG5vqM="

     

       58
       58
       +
                   "rev": "3260947537deb14c4b464fd80a132dc9d3f80a4f",

     

       59
       59
       +
                   "hash": "sha256-2RJnXdkcyCrNK6Y2sT9PHfXtNXB4KUdsWh43G3yZrGU="

     

       60
       60
        
               },

     

       61
       61
       -
               "version": "unstable-2024-08-23"

     

       61
       61
       +
               "version": "unstable-2024-08-30"

     

       62
       62
        
           },

     

       63
       63
        
           "beetle-pce-fast": {

     

       64
       64
        
               "fetcher": "fetchFromGitHub",

     

       65
       65
        
               "src": {

     

       66
       66
        
                   "owner": "libretro",

     

       67
       67
        
                   "repo": "beetle-pce-fast-libretro",

     

       68
       68
       -
                   "rev": "1c7342061ec00bc9f4253f3bfa4d1d7cfd1be769",

     

       69
       69
       -
                   "hash": "sha256-gXp3jBszow0pwkP1iIFyFuHIJa65IjxAxW16tF4s1bQ="

     

       68
       68
       +
                   "rev": "f2b4d9b24175348ca48bffd6fd4bb203d08e01d9",

     

       69
       69
       +
                   "hash": "sha256-ulGGr215WJIb1uF1G8sGsu/693KKLDpjBuMNRLKQMZI="

     

       70
       70
        
               },

     

       71
       71
       -
               "version": "unstable-2024-08-16"

     

       71
       71
       +
               "version": "unstable-2024-08-30"

     

       72
       72
        
           },

     

       73
       73
        
           "beetle-pcfx": {

     

       74
       74
        
               "fetcher": "fetchFromGitHub",

     
···

       85
       85
        
               "src": {

     

       86
       86
        
                   "owner": "libretro",

     

       87
       87
        
                   "repo": "beetle-psx-libretro",

     

       88
       88
       -
                   "rev": "208ba3fe105835ac4ce1d12e728a4a1579e8f955",

     

       89
       89
       -
                   "hash": "sha256-nT+MsN1NQOkBIUiuxP+pos/MhgOrkkDDQPvpjmMMYP4="

     

       88
       88
       +
                   "rev": "3b6aa830f1345a588c6217f0bf8f5da2f8e08c29",

     

       89
       89
       +
                   "hash": "sha256-XrE9Ms6yypZWy1M0dfUD2O2zXR409or5VKLCVsiZW7U="

     

       90
       90
        
               },

     

       91
       91
       -
               "version": "unstable-2024-08-23"

     

       91
       91
       +
               "version": "unstable-2024-08-30"

     

       92
       92
        
           },

     

       93
       93
        
           "beetle-saturn": {

     

       94
       94
        
               "fetcher": "fetchFromGitHub",

     
···

       115
       115
        
               "src": {

     

       116
       116
        
                   "owner": "libretro",

     

       117
       117
        
                   "repo": "beetle-supergrafx-libretro",

     

       118
       118
       -
                   "rev": "178fcb2759ee8eb461bfff199ada559e71cdc74f",

     

       119
       119
       -
                   "hash": "sha256-JR/yOMqjbgblpAx06RkZFhwnuiCNYJ7YJfKm+7bjTQo="

     

       118
       118
       +
                   "rev": "4376f838433134dbeaa14f4a7e926d68d6f89457",

     

       119
       119
       +
                   "hash": "sha256-gKVx9EBVQXiR6z9hhA+6DYm7zbHsoKMDG+v/tAK3c+I="

     

       120
       120
        
               },

     

       121
       121
       -
               "version": "unstable-2024-08-23"

     

       121
       121
       +
               "version": "unstable-2024-08-30"

     

       122
       122
        
           },

     

       123
       123
        
           "beetle-vb": {

     

       124
       124
        
               "fetcher": "fetchFromGitHub",

     
···

       165
       165
        
               "src": {

     

       166
       166
        
                   "owner": "libretro",

     

       167
       167
        
                   "repo": "bsnes-libretro",

     

       168
       168
       -
                   "rev": "c7ccdb0942df48c88ec763613d343b069f72f96d",

     

       169
       169
       -
                   "hash": "sha256-NkI9G1e8nqPjZ/MQjsn/de/EVV5lEC7CBnIE/kTi8KE="

     

       168
       168
       +
                   "rev": "d47f5d162e879fddf117583e7cc391989359c009",

     

       169
       169
       +
                   "hash": "sha256-0tVXa+valyBbHFqXGG8jmargBdqgJafLrFuZ4ym7i8I="

     

       170
       170
        
               },

     

       171
       171
       -
               "version": "unstable-2024-08-23"

     

       171
       171
       +
               "version": "unstable-2024-08-30"

     

       172
       172
        
           },

     

       173
       173
        
           "bsnes-hd": {

     

       174
       174
        
               "fetcher": "fetchFromGitHub",

     
···

       287
       287
        
               "src": {

     

       288
       288
        
                   "owner": "libretro",

     

       289
       289
        
                   "repo": "fbneo",

     

       290
       290
       -
                   "rev": "1c76e0b0aa8103b9306e4526f6de1437a85e7fab",

     

       291
       291
       -
                   "hash": "sha256-2N8Eurp511MXIX/oPam/iCGySiFfPgLPzNXch2Lad1s="

     

       290
       290
       +
                   "rev": "5ea732a897919b9d4059a09146f45f4e91f5fe0d",

     

       291
       291
       +
                   "hash": "sha256-w8XTOQlffUKDvZSEQXQYsHDhE4/2bRHNwfJRHSfpnf4="

     

       292
       292
        
               },

     

       293
       293
       -
               "version": "unstable-2024-08-21"

     

       293
       293
       +
               "version": "unstable-2024-08-29"

     

       294
       294
        
           },

     

       295
       295
        
           "fceumm": {

     

       296
       296
        
               "fetcher": "fetchFromGitHub",

     
···

       307
       307
        
               "src": {

     

       308
       308
        
                   "owner": "flyinghead",

     

       309
       309
        
                   "repo": "flycast",

     

       310
       310
       -
                   "rev": "308d9fc1acee55a58be5a21471680d4694ba983c",

     

       311
       311
       -
                   "hash": "sha256-DAIxXY2ffTTv/KJ7N+raXbjB/gbDj/cej3f5CooLAS0=",

     

       310
       310
       +
                   "rev": "9691fe962228ab0c08f3a4801e6fa0a3c47218ef",

     

       311
       311
       +
                   "hash": "sha256-pRrc5EAZQ6fz9JAzOa2mPVByplQ66On2KMqGPVhmA4A=",

     

       312
       312
        
                   "fetchSubmodules": true

     

       313
       313
        
               },

     

       314
       314
       -
               "version": "unstable-2024-08-24"

     

       314
       314
       +
               "version": "unstable-2024-08-30"

     

       315
       315
        
           },

     

       316
       316
        
           "fmsx": {

     

       317
       317
        
               "fetcher": "fetchFromGitHub",

     
···

       348
       348
        
               "src": {

     

       349
       349
        
                   "owner": "libretro",

     

       350
       350
        
                   "repo": "gambatte-libretro",

     

       351
       351
       -
                   "rev": "cdfdb9bd307b14da7255e001388af58ca95647a7",

     

       352
       352
       -
                   "hash": "sha256-kzbGpEIdaVs3vm0IE5dkzVLb+IDSSbe59ahahRYo+hs="

     

       351
       351
       +
                   "rev": "1fbeee0a46b12d3ab28c4795172929ebb31808ea",

     

       352
       352
       +
                   "hash": "sha256-EusFBTtJheGNfbA3lXHGt1IlSbvT6uAY/J/XkIaLJag="

     

       353
       353
        
               },

     

       354
       354
       -
               "version": "unstable-2024-08-23"

     

       354
       354
       +
               "version": "unstable-2024-08-30"

     

       355
       355
        
           },

     

       356
       356
        
           "genesis-plus-gx": {

     

       357
       357
        
               "fetcher": "fetchFromGitHub",

     

       358
       358
        
               "src": {

     

       359
       359
        
                   "owner": "libretro",

     

       360
       360
        
                   "repo": "Genesis-Plus-GX",

     

       361
       361
       -
                   "rev": "0ef7121e43670559f2d0de6ccaa33fae45b205f9",

     

       362
       362
       -
                   "hash": "sha256-8keyk2XF6QS163YRX94uRmTYjZR5xiRL6o1Tk91DNUw="

     

       361
       361
       +
                   "rev": "f0a21a7b30e033cef8e4870f7ab3781dad3606db",

     

       362
       362
       +
                   "hash": "sha256-h9QJVlAoztlObYKqOWWRxxJ18+VhgmpMRUQOE+/PCI0="

     

       363
       363
        
               },

     

       364
       364
       -
               "version": "unstable-2024-08-23"

     

       364
       364
       +
               "version": "unstable-2024-08-30"

     

       365
       365
        
           },

     

       366
       366
        
           "gpsp": {

     

       367
       367
        
               "fetcher": "fetchFromGitHub",

     
···

       408
       408
        
               "src": {

     

       409
       409
        
                   "owner": "libretro",

     

       410
       410
        
                   "repo": "mame",

     

       411
       411
       -
                   "rev": "e1fa727f7c3f6363e50c71ae9b24d3d6c6b8b8ea",

     

       412
       412
       -
                   "hash": "sha256-c7mbq0+GUQ/5gHf1byOeDX8cFuegE1AWmzO+34A+v8Q=",

     

       411
       411
       +
                   "rev": "dc299d16818b40f123ad9507e0244f608224f621",

     

       412
       412
       +
                   "hash": "sha256-XiZTL3umGKg4CbVCX6q4wA26JEvEPS5FyXJw6l0kDFQ=",

     

       413
       413
        
                   "fetchSubmodules": true

     

       414
       414
        
               },

     

       415
       415
       -
               "version": "unstable-2024-08-19"

     

       415
       415
       +
               "version": "unstable-2024-08-29"

     

       416
       416
        
           },

     

       417
       417
        
           "mame2000": {

     

       418
       418
        
               "fetcher": "fetchFromGitHub",

     
···

       439
       439
        
               "src": {

     

       440
       440
        
                   "owner": "libretro",

     

       441
       441
        
                   "repo": "mame2003-plus-libretro",

     

       442
       442
       -
                   "rev": "77808fade3b4a0df04c96b115631470df0d4ac12",

     

       443
       443
       -
                   "hash": "sha256-iq9QMhCmk6F2WBM5rtVEwqRFEpdCJkOQikNvA/jaXX0="

     

       442
       442
       +
                   "rev": "7d4e2ccc0143451969e0efbcb207acc690249d4c",

     

       443
       443
       +
                   "hash": "sha256-YMbCJNP//PKUsONfNMn80nGW+lTMHXpwBybdphWCaKU="

     

       444
       444
        
               },

     

       445
       445
       -
               "version": "unstable-2024-08-24"

     

       445
       445
       +
               "version": "unstable-2024-08-28"

     

       446
       446
        
           },

     

       447
       447
        
           "mame2010": {

     

       448
       448
        
               "fetcher": "fetchFromGitHub",

     
···

       652
       652
        
               "src": {

     

       653
       653
        
                   "owner": "jpd002",

     

       654
       654
        
                   "repo": "Play-",

     

       655
       655
       -
                   "rev": "fa204246a09b28adc0fbf6b414e50c8e443322ba",

     

       656
       656
       -
                   "hash": "sha256-xFpT8Vx4I1DiEITaYahLfBxkC2lFLcxBB8zdQSfVDxg=",

     

       655
       655
       +
                   "rev": "663a1d9a75f72c34befc304901ad6063f34dc9d3",

     

       656
       656
       +
                   "hash": "sha256-j3lqwp2qKkt2ytHQvs4IuzpFfA++uVwgz1mupOuCzH8=",

     

       657
       657
        
                   "fetchSubmodules": true

     

       658
       658
        
               },

     

       659
       659
       -
               "version": "unstable-2024-08-23"

     

       659
       659
       +
               "version": "unstable-2024-08-27"

     

       660
       660
        
           },

     

       661
       661
        
           "ppsspp": {

     

       662
       662
        
               "fetcher": "fetchFromGitHub",

     

       663
       663
        
               "src": {

     

       664
       664
        
                   "owner": "hrydgard",

     

       665
       665
        
                   "repo": "ppsspp",

     

       666
       666
       -
                   "rev": "6f5374b8aa457d78ee8e5fc579ad0787433ac7e3",

     

       667
       667
       -
                   "hash": "sha256-rkOXhaPBGUoK7MhTbrAEEU1bj5Ko83UMkbwX0s7umcY=",

     

       666
       666
       +
                   "rev": "5fd8fae8b5bedafc97487d7bc004533d9612a6c7",

     

       667
       667
       +
                   "hash": "sha256-bSbe9qVdrXU778fheqZuXENlJRBYD/k24BC2ZT2UnwM=",

     

       668
       668
        
                   "fetchSubmodules": true

     

       669
       669
        
               },

     

       670
       670
       -
               "version": "unstable-2024-08-24"

     

       670
       670
       +
               "version": "unstable-2024-08-27"

     

       671
       671
        
           },

     

       672
       672
        
           "prboom": {

     

       673
       673
        
               "fetcher": "fetchFromGitHub",

     
···

       694
       694
        
               "src": {

     

       695
       695
        
                   "owner": "libretro",

     

       696
       696
        
                   "repo": "libretro-uae",

     

       697
       697
       -
                   "rev": "4493a194dd42e593914c26952ee8cb4ba750f596",

     

       698
       698
       -
                   "hash": "sha256-uSnxx85+AX/15UvyOOiVApKT5I9SjKITfi5Osd4nBSE="

     

       697
       697
       +
                   "rev": "3ef950be5b45b89d09e05bdc1f8f2f4a794dd7a6",

     

       698
       698
       +
                   "hash": "sha256-364KIt7LoJqW3nsdy30CDwctWgqH+tgtWUjsmf8AswA="

     

       699
       699
        
               },

     

       700
       700
       -
               "version": "unstable-2024-05-25"

     

       700
       700
       +
               "version": "unstable-2024-08-26"

     

       701
       701
        
           },

     

       702
       702
        
           "quicknes": {

     

       703
       703
        
               "fetcher": "fetchFromGitHub",

     
···

       794
       794
        
               "src": {

     

       795
       795
        
                   "owner": "stella-emu",

     

       796
       796
        
                   "repo": "stella",

     

       797
       797
       -
                   "rev": "e89cf0b15b4a53064f542bb7a8315ad5137febe0",

     

       798
       798
       -
                   "hash": "sha256-YST/9us1+oz4EwNtOtUyhO/1XPVGHD717Il+26JZzAk="

     

       797
       797
       +
                   "rev": "59f82b1fe159a508528a0b40e541d2abdb15d67c",

     

       798
       798
       +
                   "hash": "sha256-GIkxwon6qnzQzy0TE2w0j5KAQmuEoRr7OvtFrcutuSo="

     

       799
       799
        
               },

     

       800
       800
       -
               "version": "unstable-2024-08-24"

     

       800
       800
       +
               "version": "unstable-2024-08-29"

     

       801
       801
        
           },

     

       802
       802
        
           "stella2014": {

     

       803
       803
        
               "fetcher": "fetchFromGitHub",

+1

pkgs/applications/graphics/imv/default.nix

···

       124
       124
        
           maintainers = with maintainers; [ rnhmjoj markus1189 ];

     

       125
       125
        
           platforms = platforms.all;

     

       126
       126
        
           badPlatforms = platforms.darwin;

     

       127
       127
       +
           mainProgram = "imv";

     

       127
       128
        
         };

     

       128
       129
        
       }

+3 -3

pkgs/applications/misc/cotp/default.nix

···

       8
       8
        
       

     

       9
       9
        
       rustPlatform.buildRustPackage rec {

     

       10
       10
        
         pname = "cotp";

     

       11
       11
       -
         version = "1.8.0";

     

       11
       11
       +
         version = "1.9.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "replydev";

     

       15
       15
        
           repo = "cotp";

     

       16
       16
        
           rev = "v${version}";

     

       17
       17
       -
           hash = "sha256-ey5JIlvCGmkXDGP0jol5cy/eC7grTmgNoqWecyY8DDk=";

     

       17
       17
       +
           hash = "sha256-Of4stKrk3zQX2gxXaM9YrZf1SVjzIVUU+7JraKHk180=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
       -
         cargoHash = "sha256-O7GqYPwbVrvU0wElUtkVVeX+4QKb6zg9Gfw+tZ78SDw=";

     

       20
       20
       +
         cargoHash = "sha256-DLq8w65UlfAdPsJ96mNZ+dJtm/VMPzlIYqsEJtkLKzI=";

     

       21
       21
        
       

     

       22
       22
        
         buildInputs = lib.optionals stdenv.isLinux [ libxcb ]

     

       23
       23
        
           ++ lib.optionals stdenv.isDarwin [ AppKit ];

+2 -2

pkgs/applications/misc/mob/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "mob";

     

       12
       12
       -
         version = "5.1.0";

     

       12
       12
       +
         version = "5.1.1";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "remotemobprogramming";

     

       16
       16
        
           repo = "mob";

     

       17
       17
        
           rev = "v${version}";

     

       18
       18
       -
           hash = "sha256-C8EWiInjDxo82Y8QH1d95C8CU/qEKQmPDxp3VKL8TRQ=";

     

       18
       18
       +
           hash = "sha256-+v48znHCfu2qBFB0JhYT1vnce0wSHMULTlwaLv0237Q=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         vendorHash = null;

+3 -3

pkgs/applications/networking/cluster/argocd/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "argocd";

     

       5
       5
       -
         version = "2.12.2";

     

       5
       5
       +
         version = "2.12.3";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "argoproj";

     

       9
       9
        
           repo = "argo-cd";

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           hash = "sha256-dQ9YLqj+voovhZShgCz46cmjSDd5qLCjIcL/3YwwP0A=";

     

       11
       11
       +
           hash = "sha256-XD/+alC0OZUDExXpAnxmN6zcGPrsYGxaWGU9KgdoCgM=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         proxyVendor = true; # darwin/linux hash mismatch

     

       15
       15
       -
         vendorHash = "sha256-abhoGqxM+2wiWPjZaGMDQnD9r60+E0aXTrH7J5r5prk=";

     

       15
       15
       +
         vendorHash = "sha256-8BX0QErfe2mxTbIToNgZ3U9OtpIy887936U68Qr+3W0=";

     

       16
       16
        
       

     

       17
       17
        
         # Set target as ./cmd per cli-local

     

       18
       18
        
         # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227

+28 -50

pkgs/applications/video/frigate/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , callPackage

     

       3
       3
       -
       , python311

     

       3
       3
       +
       , python312

     

       4
       4
        
       , fetchFromGitHub

     

       5
       5
        
       , fetchurl

     

       6
       6
       -
       , fetchpatch2

     

       7
       6
        
       , frigate

     

       8
       7
        
       , nixosTests

     

       9
       8
        
       }:

     

       10
       9
        
       

     

       11
       10
        
       let

     

       12
       12
       -
         version = "0.13.2";

     

       11
       11
       +
         version = "0.14.1";

     

       13
       12
        
       

     

       14
       13
        
         src = fetchFromGitHub {

     

       15
       15
       -
           #name = "frigate-${version}-source";

     

       14
       14
       +
           name = "frigate-${version}-source";

     

       16
       15
        
           owner = "blakeblackshear";

     

       17
       16
        
           repo = "frigate";

     

       18
       17
        
           rev = "refs/tags/v${version}";

     

       19
       19
       -
           hash = "sha256-NVT7yaJkVA7b7GL0S0fHjNneBzhjCru56qY1Q4sTVcE=";

     

       18
       18
       +
           hash = "sha256-PfUlo9ua4SVcQJTfmSVoEXHH1MUJ8A/w3kJHFpEzll8=";

     

       20
       19
        
         };

     

       21
       20
        
       

     

       22
       21
        
         frigate-web = callPackage ./web.nix {

     

       23
       22
        
           inherit version src;

     

       24
       23
        
         };

     

       25
       24
        
       

     

       26
       26
       -
         python = python311.override {

     

       25
       25
       +
         python = python312.override {

     

       27
       26
        
           self = python;

     

       28
       27
        
           packageOverrides = self: super: {

     

       29
       29
       -
             pydantic = super.pydantic_1;

     

       30
       30
       -
       

     

       31
       31
       -
             versioningit = super.versioningit.overridePythonAttrs {

     

       32
       32
       -
               # checkPhase requires pydantic>=2

     

       33
       33
       -
               doCheck = false;

     

       34
       34
       -
             };

     

       28
       28
       +
             paho-mqtt = super.paho-mqtt_2;

     

       35
       29
        
           };

     

       36
       30
        
         };

     

       37
       31
        
       

     
···

       60
       54
        
       

     

       61
       55
        
         inherit src;

     

       62
       56
        
       

     

       63
       63
       -
         patches = [

     

       64
       64
       -
           (fetchpatch2 {

     

       65
       65
       -
             name = "frigate-flask3.0-compat.patch";

     

       66
       66
       -
             url = "https://github.com/blakeblackshear/frigate/commit/56bdacc1c661eff8a323e033520e75e2ba0a3842.patch";

     

       67
       67
       -
             hash = "sha256-s/goUJxIbjq/woCEOEZECdcZoJDoWc1eM63sd60cxeY=";

     

       68
       68
       -
           })

     

       69
       69
       -
           (fetchpatch2 {

     

       70
       70
       -
             # https://github.com/blakeblackshear/frigate/pull/10967

     

       71
       71
       -
             name = "frigate-wsdl-path.patch";

     

       72
       72
       -
             url = "https://github.com/blakeblackshear/frigate/commit/b65656fa8733c1c2f3d944f716d2e9493ae7c99f.patch";

     

       73
       73
       -
             hash = "sha256-taPWFV4PldBGUKAwFMKag4W/3TLMSGdKLYG8bj1Y5mU=";

     

       74
       74
       -
           })

     

       75
       75
       -
           (fetchpatch2 {

     

       76
       76
       -
             # https://github.com/blakeblackshear/frigate/pull/10097

     

       77
       77
       -
             name = "frigate-secrets-permissionerror.patch";

     

       78
       78
       -
             url = "https://github.com/blakeblackshear/frigate/commit/a1424bad6c0163e790129ade7a9784514d0bf89d.patch";

     

       79
       79
       -
             hash = "sha256-/kIy4aW9o5AKHJQfCDVY46si+DKaUb+CsZsCGIbXvUQ=";

     

       80
       80
       -
           })

     

       81
       81
       -
           # https://github.com/blakeblackshear/frigate/pull/12324

     

       82
       82
       -
           ./mpl-3.9.0.patch

     

       83
       83
       -
         ];

     

       84
       84
       -
       

     

       85
       57
        
         postPatch = ''

     

       86
       58
        
           echo 'VERSION = "${version}"' > frigate/version.py

     

       87
       59
        
       

     

       88
       60
        
           substituteInPlace frigate/app.py \

     

       89
       89
       -
             --replace "Router(migrate_db)" 'Router(migrate_db, "${placeholder "out"}/share/frigate/migrations")'

     

       61
       61
       +
             --replace-fail "Router(migrate_db)" 'Router(migrate_db, "${placeholder "out"}/share/frigate/migrations")'

     

       90
       62
        
       

     

       91
       63
        
           substituteInPlace frigate/const.py \

     

       92
       92
       -
             --replace "/media/frigate" "/var/lib/frigate" \

     

       93
       93
       -
             --replace "/tmp/cache" "/var/cache/frigate" \

     

       94
       94
       -
             --replace "/config" "/var/lib/frigate" \

     

       95
       95
       -
             --replace "{CONFIG_DIR}/model_cache" "/var/cache/frigate/model_cache"

     

       64
       64
       +
             --replace-fail "/media/frigate" "/var/lib/frigate" \

     

       65
       65
       +
             --replace-fail "/tmp/cache" "/var/cache/frigate" \

     

       66
       66
       +
             --replace-fail "/config" "/var/lib/frigate" \

     

       67
       67
       +
             --replace-fail "{CONFIG_DIR}/model_cache" "/var/cache/frigate/model_cache"

     

       96
       68
        
       

     

       97
       97
       -
           substituteInPlace frigate/http.py \

     

       98
       98
       -
             --replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}"

     

       69
       69
       +
           substituteInPlace frigate/comms/{config,detections,events}_updater.py frigate/comms/inter_process.py \

     

       70
       70
       +
             --replace-fail "ipc:///tmp/cache" "ipc:///run/frigate"

     

       99
       71
        
       

     

       100
       100
       -
           substituteInPlace frigate/output.py \

     

       101
       101
       -
             --replace "/opt/frigate" "${placeholder "out"}/${python.sitePackages}"

     

       72
       72
       +
           substituteInPlace frigate/detectors/detector_config.py \

     

       73
       73
       +
             --replace-fail "/labelmap.txt" "${placeholder "out"}/share/frigate/labelmap.txt"

     

       102
       74
        
       

     

       103
       103
       -
           substituteInPlace frigate/detectors/detector_config.py \

     

       104
       104
       -
             --replace "/labelmap.txt" "${placeholder "out"}/share/frigate/labelmap.txt"

     

       75
       75
       +
           # work around onvif-zeep idiosyncrasy

     

       76
       76
       +
           substituteInPlace frigate/ptz/onvif.py \

     

       77
       77
       +
             --replace-fail dist-packages site-packages

     

       105
       78
        
       

     

       106
       79
        
           substituteInPlace frigate/config.py \

     

       107
       107
       -
             --replace "/cpu_model.tflite" "${tflite_cpu_model}" \

     

       108
       108
       -
             --replace "/edgetpu_model.tflite" "${tflite_edgetpu_model}"

     

       80
       80
       +
             --replace-fail "/cpu_model.tflite" "${tflite_cpu_model}" \

     

       81
       81
       +
             --replace-fail "/edgetpu_model.tflite" "${tflite_edgetpu_model}"

     

       109
       82
        
       

     

       110
       83
        
           substituteInPlace frigate/test/test_config.py \

     

       111
       111
       -
             --replace "(MODEL_CACHE_DIR" "('/build/model_cache'" \

     

       112
       112
       -
             --replace "/config/model_cache" "/build/model_cache"

     

       84
       84
       +
             --replace-fail "(MODEL_CACHE_DIR" "('/build/model_cache'" \

     

       85
       85
       +
             --replace-fail "/config/model_cache" "/build/model_cache"

     

       113
       86
        
         '';

     

       114
       87
        
       

     

       115
       88
        
         dontBuild = true;

     
···

       119
       92
        
           scikit-build

     

       120
       93
        
           # docker/main/requirements-wheel.txt

     

       121
       94
        
           click

     

       95
       95
       +
           distutils

     

       122
       96
        
           flask

     

       97
       97
       +
           flask-limiter

     

       123
       98
        
           imutils

     

       99
       99
       +
           joserfc

     

       124
       100
        
           markupsafe

     

       125
       101
        
           matplotlib

     

       126
       102
        
           norfair

     
···

       128
       104
        
           onvif-zeep

     

       129
       105
        
           opencv4

     

       130
       106
        
           openvino

     

       107
       107
       +
           pandas

     

       131
       108
        
           paho-mqtt

     

       132
       109
        
           peewee

     

       133
       110
        
           peewee-migrate

     
···

       136
       113
        
           pydantic

     

       137
       114
        
           pytz

     

       138
       115
        
           pyyaml

     

       116
       116
       +
           pyzmq

     

       139
       117
        
           requests

     

       140
       118
        
           ruamel-yaml

     

       141
       119
        
           scipy

     

       142
       120
        
           setproctitle

     

       143
       143
       -
           tensorflow

     

       121
       121
       +
           tensorflow-bin

     

       144
       122
        
           tzlocal

     

       145
       123
        
           unidecode

     

       146
       124
        
           ws4py

-42

pkgs/applications/video/frigate/mpl-3.9.0.patch

···

       1
       1
       -
       From fba8cff13186bd80ceaa06806392957598139deb Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Martin Weinelt <hexa@darmstadt.ccc.de>

     

       3
       3
       -
       Date: Sun, 7 Jul 2024 14:23:29 +0200

     

       4
       4
       -
       Subject: [PATCH] Fix colormap usage with matplotlib 3.9.0

     

       5
       5
       -
       

     

       6
       6
       -
       The mpl.cm toplevel registration has been removed.

     

       7
       7
       -
       

     

       8
       8
       -
       https://matplotlib.org/stable/api/prev_api_changes/api_changes_3.9.0.html#top-level-cmap-registration-and-access-functions-in-mpl-cm

     

       9
       9
       -
       ---

     

       10
       10
       -
        frigate/config.py                    | 2 +-

     

       11
       11
       -
        frigate/detectors/detector_config.py | 2 +-

     

       12
       12
       -
        2 files changed, 2 insertions(+), 2 deletions(-)

     

       13
       13
       -
       

     

       14
       14
       -
       diff --git a/frigate/config.py b/frigate/config.py

     

       15
       15
       -
       index 2e8b2570..af4f3263 100644

     

       16
       16
       -
       --- a/frigate/config.py

     

       17
       17
       -
       +++ b/frigate/config.py

     

       18
       18
       -
       @@ -807,7 +807,7 @@ class CameraConfig(FrigateBaseModel):

     

       19
       19
       -
            def __init__(self, **config):

     

       20
       20
       -
                # Set zone colors

     

       21
       21
       -
                if "zones" in config:

     

       22
       22
       -
       -            colors = plt.cm.get_cmap("tab10", len(config["zones"]))

     

       23
       23
       -
       +            colors = plt.colormaps["tab10"].resampled(len(config["zones"]))

     

       24
       24
       -
                    config["zones"] = {

     

       25
       25
       -
                        name: {**z, "color": tuple(round(255 * c) for c in colors(idx)[:3])}

     

       26
       26
       -
                        for idx, (name, z) in enumerate(config["zones"].items())

     

       27
       27
       -
       diff --git a/frigate/detectors/detector_config.py b/frigate/detectors/detector_config.py

     

       28
       28
       -
       index 7fc958a3..b65631eb 100644

     

       29
       29
       -
       --- a/frigate/detectors/detector_config.py

     

       30
       30
       -
       +++ b/frigate/detectors/detector_config.py

     

       31
       31
       -
       @@ -125,7 +125,7 @@ class ModelConfig(BaseModel):

     

       32
       32
       -
        

     

       33
       33
       -
            def create_colormap(self, enabled_labels: set[str]) -> None:

     

       34
       34
       -
                """Get a list of colors for enabled labels."""

     

       35
       35
       -
       -        cmap = plt.cm.get_cmap("tab10", len(enabled_labels))

     

       36
       36
       -
       +        cmap = plt.colormaps["tab10"].resampled(len(enabled_labels))

     

       37
       37
       -
        

     

       38
       38
       -
                for key, val in enumerate(enabled_labels):

     

       39
       39
       -
                    self._colormap[val] = tuple(int(round(255 * c)) for c in cmap(key)[:3])

     

       40
       40
       -
       -- 

     

       41
       41
       -
       2.45.1

     

       42
       42
       -

+9 -2

pkgs/applications/video/frigate/web.nix

···

       13
       13
        
           substituteInPlace package.json \

     

       14
       14
        
             --replace-fail "--base=/BASE_PATH/" ""

     

       15
       15
        
       

     

       16
       16
       -
           substituteInPlace src/routes/Storage.jsx \

     

       16
       16
       +
           substituteInPlace \

     

       17
       17
       +
             src/views/system/StorageMetrics.tsx \

     

       18
       18
       +
             src/components/card/{AnimatedEvent,Export,Review}Card.tsx \

     

       19
       19
       +
             src/components/timeline/EventSegment.tsx \

     

       20
       20
       +
             src/pages/Exports.tsx \

     

       21
       21
       +
             src/components/player/PreviewThumbnailPlayer.tsx \

     

       17
       22
        
             --replace-fail "/media/frigate" "/var/lib/frigate" \

     

       23
       23
       +
       

     

       24
       24
       +
           substituteInPlace src/views/system/StorageMetrics.tsx \

     

       18
       25
        
             --replace-fail "/tmp/cache" "/var/cache/frigate"

     

       19
       26
        
         '';

     

       20
       27
        
       

     

       21
       21
       -
         npmDepsHash = "sha256-+36quezGArqIM9dM+UihwcIgmE3EVmJQThuicLgDW4A=";

     

       28
       28
       +
         npmDepsHash = "sha256-PLs3oCWQjK38eHgdQt2Qkj7YqkfanC8JnLMpzMjNfxU=";

     

       22
       29
        
       

     

       23
       30
        
         installPhase = ''

     

       24
       31
        
           cp -rv dist/ $out

+2 -2

pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix

···

       9
       9
        
       

     

       10
       10
        
       stdenv.mkDerivation rec {

     

       11
       11
        
         pname = "obs-vertical-canvas";

     

       12
       12
       -
         version = "1.4.8";

     

       12
       12
       +
         version = "1.4.9";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "Aitum";

     

       16
       16
        
           repo = "obs-vertical-canvas";

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           sha256 = "sha256-AeN2Nr8HExdDMOiAwaIcnEVsbhOuiPJ+R2z6/qEnu/8=";

     

       18
       18
       +
           sha256 = "sha256-DFSwcN7XadHa1SGEHUdtRqPJMtS23y4dU4e/F8QmUUo=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         nativeBuildInputs = [ cmake ];

+2 -2

pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix

···

       13
       13
        
       

     

       14
       14
        
       mkHyprlandPlugin hyprland rec {

     

       15
       15
        
         pluginName = "hyprgrass";

     

       16
       16
       -
         version = "0.7.0";

     

       16
       16
       +
         version = "0.8.1";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "horriblename";

     

       20
       20
        
           repo = "hyprgrass";

     

       21
       21
        
           rev = "v${version}";

     

       22
       22
       -
           hash = "sha256-DfM2BqnFW48NlHkBfC7ErHgK7WHlOgiiE+aFetN/yJ4=";

     

       22
       22
       +
           hash = "sha256-3CN9ZioI5XBtp6WF61hH2EyASHUIPJQCTXiW1rt9n5w=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeBuildInputs = [

+3 -3

pkgs/applications/window-managers/wayfire/wayfire-shadows.nix

···

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation (finalAttrs: {

     

       16
       16
        
         pname = "wayfire-shadows";

     

       17
       17
       -
         version = "unstable-2024-03-28";

     

       17
       17
       +
         version = "0-unstable-2024-08-30";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "timgott";

     

       21
       21
        
           repo = "wayfire-shadows";

     

       22
       22
       -
           rev = "81699f6e4be65dcf3f7ad5155dfb4247b37b7997";

     

       23
       23
       -
           hash = "sha256-H9pqpHoeDfNBrtVLax57CUXVhU2XT+syAUZTYSJizxw=";

     

       22
       22
       +
           rev = "11c8ab63c1cde663a38502c6ecaeec980920c4d1";

     

       23
       23
       +
           hash = "sha256-/utqJevG7fn/kX81eDIN/SDvVa3rzNBe1crkHfMx8qo=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/bo/boxbuddy/package.nix

···

       9
       9
        
       

     

       10
       10
        
       rustPlatform.buildRustPackage rec {

     

       11
       11
        
         pname = "boxbuddy";

     

       12
       12
       -
         version = "2.2.9";

     

       12
       12
       +
         version = "2.2.10";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "Dvlv";

     

       16
       16
        
           repo = "BoxBuddyRS";

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           hash = "sha256-u5roZFpeVsqO/4kNdwnD2BCMSM8C0jVG98p/IdlHA8o=";

     

       18
       18
       +
           hash = "sha256-q09yrFO/qBXr/O3tK7seqWyBEraQ7VJB39RukS6v+ys=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         cargoHash = "sha256-LjHPIQoC/Nldfgl5sjbd+sxjtjY2ZeUd5rVaEEELQq4=";

     

       21
       21
       +
         cargoHash = "sha256-Ow16RxhauuisQ+GiJ5TdFa0D9FcgmAjwnk7WenXoQYo=";

     

       22
       22
        
       

     

       23
       23
        
         # The software assumes it is installed either in flatpak or in the home directory

     

       24
       24
        
         # so the xdg data path needs to be patched here

+3 -3

pkgs/by-name/c2/c2patool/package.nix

···

       10
       10
        
       }:

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "c2patool";

     

       13
       13
       -
         version = "0.9.7";

     

       13
       13
       +
         version = "0.9.8";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "contentauth";

     

       17
       17
        
           repo = pname;

     

       18
       18
        
           rev = "v${version}";

     

       19
       19
       -
           sha256 = "sha256-5zHjPjWwYiUz+ebDoZkuEdZ+mbPTC3AnX6dTrhvjtPI=";

     

       19
       19
       +
           sha256 = "sha256-f1Ec2dJGVjk9Jp5nmcVYwTyIlmnZmERj1pV9weVO3lI=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         cargoHash = "sha256-lPCaR3s4Tfy0n6xGxK+eLAObRhmzXc57CI0JnVrF8sg=";

     

       22
       22
       +
         cargoHash = "sha256-wUGOabFTKLCEmg4zNPUklK3YddIIM4N3pev2TtlVthM=";

     

       23
       23
        
       

     

       24
       24
        
         # use the non-vendored openssl

     

       25
       25
        
         OPENSSL_NO_VENDOR = 1;

+3 -3

pkgs/by-name/ca/cargo-expand/package.nix

···

       5
       5
        
       

     

       6
       6
        
       rustPlatform.buildRustPackage rec {

     

       7
       7
        
         pname = "cargo-expand";

     

       8
       8
       -
         version = "1.0.89";

     

       8
       8
       +
         version = "1.0.90";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "dtolnay";

     

       12
       12
        
           repo = pname;

     

       13
       13
        
           rev = version;

     

       14
       14
       -
           hash = "sha256-oFc3hcTEZW0qgk8m4dl3NThz10ogWEMn+3BMUXmpehI=";

     

       14
       14
       +
           hash = "sha256-8Ls7Wklb5cnYo6acmGtjTHV1ZhSPVEQ9BsbR78a2LG0=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         cargoHash = "sha256-ce+yu3UbWbpB4UOyAAJR8MKmbJhfCHmaGHEhs5GpFeU=";

     

       17
       17
       +
         cargoHash = "sha256-8IKKK0xBgl5FiEoPrwO1uL/S+fOLv4Rof8KjquHJ6DI=";

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           description = "Cargo subcommand to show result of macro expansion";

+3 -3

pkgs/by-name/ca/cargo-make/package.nix

···

       10
       10
        
       

     

       11
       11
        
       rustPlatform.buildRustPackage rec {

     

       12
       12
        
         pname = "cargo-make";

     

       13
       13
       -
         version = "0.37.15";

     

       13
       13
       +
         version = "0.37.16";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchFromGitHub {

     

       16
       16
        
           owner = "sagiegurari";

     

       17
       17
        
           repo = "cargo-make";

     

       18
       18
        
           rev = version;

     

       19
       19
       -
           hash = "sha256-sIiRlqUn59BxrvOs7N1es3vJVQRerV0EhNntuXXgPJA=";

     

       19
       19
       +
           hash = "sha256-OC1HzoEb9OyusYGC5jmEC4qW4U3oGApYvpy5XkZttSg=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
       -
         cargoHash = "sha256-MvCGdlEevHND7buW+JuAyH6gRck5ppSAq9xylXSgm5w=";

     

       22
       22
       +
         cargoHash = "sha256-voa456NCuOVEcLlJeUD1G3phzLufqfE0R88aYxcd3ew=";

     

       23
       23
        
       

     

       24
       24
        
         nativeBuildInputs = [ pkg-config ];

     

       25
       25

+3 -3

pkgs/by-name/cy/cyme/package.nix

···

       13
       13
        
       

     

       14
       14
        
       rustPlatform.buildRustPackage rec {

     

       15
       15
        
         pname = "cyme";

     

       16
       16
       -
         version = "1.8.1";

     

       16
       16
       +
         version = "1.8.2";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "tuna-f1sh";

     

       20
       20
        
           repo = "cyme";

     

       21
       21
        
           rev = "v${version}";

     

       22
       22
       -
           hash = "sha256-Rq7ykD6L+DrDNz+d++ztv+fmoSSNCoeC1YfXiIJiXzM=";

     

       22
       22
       +
           hash = "sha256-bmVgl6E+MdjzM4wfhKHdii+58srAStRTYU+IP/OTqdU=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         cargoHash = "sha256-XvU8r4bmI18qp+1O3nsJG3RTiiNxfKksRgkSBMsja5s=";

     

       25
       25
       +
         cargoHash = "sha256-dpdtjeejt+jfSlSN1NZeAWSMcDq8mOGAHTJlmBkp/4s=";

     

       26
       26
        
       

     

       27
       27
        
         nativeBuildInputs = [

     

       28
       28
        
           pkg-config

+2 -2

pkgs/by-name/dw/dwl/package.nix

···

       38
       38
        
       assert withCustomConfigH -> (configH != null);

     

       39
       39
        
       stdenv.mkDerivation (finalAttrs: {

     

       40
       40
        
         pname = "dwl";

     

       41
       41
       -
         version = "0.6";

     

       41
       41
       +
         version = "0.7";

     

       42
       42
        
       

     

       43
       43
        
         src = fetchFromGitea {

     

       44
       44
        
           domain = "codeberg.org";

     

       45
       45
        
           owner = "dwl";

     

       46
       46
        
           repo = "dwl";

     

       47
       47
        
           rev = "v${finalAttrs.version}";

     

       48
       48
       -
           hash = "sha256-fygUzEi4bgopesvHByfpatkLFYI98qozJOUBNM2t9Mg=";

     

       48
       48
       +
           hash = "sha256-7SoCITrbMrlfL4Z4hVyPpjB9RrrjLXHP9C5t1DVXBBA=";

     

       49
       49
        
         };

     

       50
       50
        
       

     

       51
       51
        
         nativeBuildInputs = [

+2 -2

pkgs/by-name/jr/jreleaser-cli/package.nix

···

       7
       7
        
       }:

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "jreleaser-cli";

     

       10
       10
       -
         version = "1.13.1";

     

       10
       10
       +
         version = "1.14.0";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchurl {

     

       13
       13
        
           url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar";

     

       14
       14
       -
           hash = "sha256-aqpyEbu+UY0jToP09Wt5X9dRFs85+4uGnHu0IgdK1aM=";

     

       14
       14
       +
           hash = "sha256-LkkVxC3/0s468O84sgp7cNX53QRzdmUjCw+cgSWa5U0=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ makeWrapper ];

+3 -3

pkgs/by-name/ko/komac/package.nix

···

       12
       12
        
       }:

     

       13
       13
        
       

     

       14
       14
        
       let

     

       15
       15
       -
         version = "2.5.0";

     

       15
       15
       +
         version = "2.6.0";

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "russellbanks";

     

       18
       18
        
           repo = "Komac";

     

       19
       19
        
           rev = "v${version}";

     

       20
       20
       -
           hash = "sha256-X+LZ6D7MTt/0k4hLvk7TVKiL174QDdxwPKu01MyREYw=";

     

       20
       20
       +
           hash = "sha256-YFaa2kU42NlhRivBEPV1mSr3j95P4NFwUKM0Xx8tpfg=";

     

       21
       21
        
         };

     

       22
       22
        
       in

     

       23
       23
        
       rustPlatform.buildRustPackage {

     
···

       25
       25
        
       

     

       26
       26
        
         pname = "komac";

     

       27
       27
        
       

     

       28
       28
       -
         cargoHash = "sha256-VBfXD1IF6D1z28dzXfKRz3/Hh2KRxcsYRRDV8e/Akww=";

     

       28
       28
       +
         cargoHash = "sha256-kb18phtY5rRNUw0ZaZu2tipAaOURSy+2duf/+cOj5Y8=";

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [ pkg-config ];

     

       31
       31

+17 -7

pkgs/by-name/me/meli/package.nix

···

       1
       1
        
       { stdenv

     

       2
       2
        
       , lib

     

       3
       3
        
       , fetchzip

     

       4
       4
       +
       , fetchpatch

     

       4
       5
        
       , rustPlatform

     

       5
       6
        
       

     

       6
       7
        
       # native build inputs

     
···

       23
       24
        
       

     

       24
       25
        
       rustPlatform.buildRustPackage rec {

     

       25
       26
        
         pname = "meli";

     

       26
       26
       -
         version = "0.8.6";

     

       27
       27
       +
         version = "0.8.7";

     

       27
       28
        
       

     

       28
       29
        
         src = fetchzip {

     

       29
       30
        
           urls = [

     
···

       31
       32
        
             "https://codeberg.org/meli/meli/archive/v${version}.tar.gz"

     

       32
       33
        
             "https://github.com/meli/meli/archive/refs/tags/v${version}.tar.gz"

     

       33
       34
        
           ];

     

       34
       34
       -
           hash = "sha256-7lSxXv2i8B6vRWIJqMiXlMqHH6fmgACy9X5qNKuj+IU=";

     

       35
       35
       +
           hash = "sha256-2+JIehi2wuWdARbhFPvNPIJ9ucZKWjNSORszEG9lyjw=";

     

       35
       36
        
         };

     

       36
       37
        
       

     

       37
       37
       -
         cargoHash = "sha256-vZkMfaALnRBK9ZwMB2uvvJgQq+BdUX7enNnr9t5H+MY=";

     

       38
       38
       +
         cargoHash = "sha256-ZVhUkpiiPKbWcf56cXFgn3Nyr63STHLlD7mpYEetNIY=";

     

       39
       39
       +
       

     

       40
       40
       +
         cargoPatches = [

     

       41
       41
       +
           (fetchpatch {

     

       42
       42
       +
             # https://github.com/NixOS/nixpkgs/issues/332957#issuecomment-2278578811

     

       43
       43
       +
             name = "fix-rust-1.80-compat.patch";

     

       44
       44
       +
             url = "https://git.meli-email.org/meli/meli/commit/6b05279a0987315c401516cac8ff0b016a8e02a8.patch";

     

       45
       45
       +
             hash = "sha256-mh8H7wmHMXAe01UTvdY8vJeeLyH6ZFwylNLFFL+4LO0=";

     

       46
       46
       +
           })

     

       47
       47
       +
         ];

     

       38
       48
        
       

     

       39
       49
        
         # Needed to get openssl-sys to use pkg-config

     

       40
       50
        
         OPENSSL_NO_VENDOR=1;

     
···

       55
       65
        
       

     

       56
       66
        
         nativeCheckInputs = [

     

       57
       67
        
           file

     

       68
       68
       +
           gnum4

     

       58
       69
        
         ];

     

       59
       70
        
       

     

       60
       71
        
         postInstall = ''

     
···

       70
       81
        
         '';

     

       71
       82
        
       

     

       72
       83
        
         checkFlags = [

     

       73
       73
       -
           "--skip=conf::test_config_parse"        # panicking due to sandbox

     

       74
       74
       -
           "--skip=smtp::test::test_smtp"          # requiring network

     

       75
       75
       -
           "--skip=utils::xdg::query_default_app"  # doesn't build

     

       76
       76
       -
           "--skip=utils::xdg::query_mime_info"    # doesn't build

     

       84
       84
       +
           "--skip=conf::tests::test_config_parse"            # panicking due to sandbox

     

       85
       85
       +
           "--skip=utils::tests::test_shellexpandtrait_impls" # panicking due to sandbox

     

       86
       86
       +
           "--skip=utils::tests::test_shellexpandtrait"       # panicking due to sandbox

     

       77
       87
        
         ];

     

       78
       88
        
       

     

       79
       89
        
         meta = with lib; {

+3 -3

pkgs/by-name/pi/picocrypt-cli/package.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "picocrypt-cli";

     

       8
       8
       -
         version = "2.05";

     

       8
       8
       +
         version = "2.06";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "Picocrypt";

     

       12
       12
        
           repo = "CLI";

     

       13
       13
        
           rev = version;

     

       14
       14
       -
           hash = "sha256-9VvPgATij6WkOVaRDAmwjRshzPk6UCTlaiYJzceTHFQ=";

     

       14
       14
       +
           hash = "sha256-vxHYTgNVhTTN1yQkqjvlzqq7pV0XiQqTHI9HqIUVyR4=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         sourceRoot = "${src.name}/picocrypt";

     

       18
       18
       -
         vendorHash = "sha256-UNyBDWdl9G8Rt3BLWZyuh1bv4jd9TZ9sOfUAgDPzjlw=";

     

       18
       18
       +
         vendorHash = "sha256-Nuo4oIJxp+liNLNXRvbFTE1ElEIM1OBp5CTb0KEV/7g=";

     

       19
       19
        
       

     

       20
       20
        
         ldflags = [

     

       21
       21
        
           "-s"

+2 -2

pkgs/by-name/ro/rofimoji/package.nix

···

       15
       15
        
       

     

       16
       16
        
       python3Packages.buildPythonApplication rec {

     

       17
       17
        
         pname = "rofimoji";

     

       18
       18
       -
         version = "6.3.2";

     

       18
       18
       +
         version = "6.4.0";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromGitHub {

     

       22
       22
        
           owner = "fdw";

     

       23
       23
        
           repo = "rofimoji";

     

       24
       24
        
           rev = "refs/tags/${version}";

     

       25
       25
       -
           hash = "sha256-LJJWHn3UnrCJaowHHuYksD2MHqClLc2MmYYXQfUxTgQ=";

     

       25
       25
       +
           hash = "sha256-QFwAlC3MwpslIOCvEAlS33tPFaz4T8G5+YCVznMhzes=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         nativeBuildInputs = [

+3 -3

pkgs/by-name/se/serie/package.nix

···

       11
       11
        
       

     

       12
       12
        
       rustPlatform.buildRustPackage rec {

     

       13
       13
        
         pname = "serie";

     

       14
       14
       -
         version = "0.1.2";

     

       14
       14
       +
         version = "0.2.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "lusingander";

     

       18
       18
        
           repo = "serie";

     

       19
       19
        
           rev = "v${version}";

     

       20
       20
       -
           hash = "sha256-sFxIGC9zg8D0qhHpT1fAzrU25AxBbJRPzD2c+H8Z/1Y=";

     

       20
       20
       +
           hash = "sha256-0NQ/csgAoD15fyuXCDgABF6eDEITwJk98qPL81IptJA=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
       -
         cargoHash = "sha256-JaR1BcKigMa27l8kdsRoClb3ifPtob3+sa2cqnpFeFs=";

     

       23
       23
       +
         cargoHash = "sha256-4Mic+hFBmId01k4AmOBA2matf28Py3mVOsVNWgqaMA0=";

     

       24
       24
        
       

     

       25
       25
        
         buildInputs = lib.optionals stdenv.isDarwin (

     

       26
       26
        
           with darwin.apple_sdk.frameworks;

+2 -2

pkgs/by-name/sp/spicetify-cli/package.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "spicetify-cli";

     

       11
       11
       -
         version = "2.37.4";

     

       11
       11
       +
         version = "2.37.7";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "spicetify";

     

       15
       15
        
           repo = "cli";

     

       16
       16
        
           rev = "v${version}";

     

       17
       17
       -
           hash = "sha256-MiuQeyFNW0/RNYrJnVSi6Tyo1CSxciUnVytU3Wnug+g=";

     

       17
       17
       +
           hash = "sha256-Sfh2dvqCsV5rl6SmfqV6icJrTcsJy89RibCIRrf2p0k=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         vendorHash = "sha256-kv+bMyVOJTztn8mNNTK/kp4nvc5m1I5M041s3nPpob8=";

+2 -2

pkgs/by-name/st/stats/package.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       10
       10
        
         pname = "stats";

     

       11
       11
       -
         version = "2.11.4";

     

       11
       11
       +
         version = "2.11.7";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";

     

       15
       15
       -
           hash = "sha256-Cm5gu+rL3eerAOnNcNUL2MlXsxV2jMiJLwgGtskIVP4=";

     

       15
       15
       +
           hash = "sha256-UppO7Cky+9xYg292t/78GPJ822kJ0RMG9yvetxRMVsU=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         sourceRoot = ".";

+3 -3

pkgs/by-name/sy/syshud/package.nix

···

       12
       12
        
       

     

       13
       13
        
       stdenv.mkDerivation (finalAttrs: {

     

       14
       14
        
         pname = "syshud";

     

       15
       15
       -
         version = "0-unstable-2024-08-24";

     

       15
       15
       +
         version = "0-unstable-2024-08-27";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "System64fumo";

     

       19
       19
        
           repo = "syshud";

     

       20
       20
       -
           rev = "93f94c866b0ed6326ec7cc6da04221e1feaafeef";

     

       21
       21
       -
           hash = "sha256-+l7WDDrdKiFZAGrtARC86hDrNML8BMYIw0Z4yg/bKsU=";

     

       20
       20
       +
           rev = "aa2c153f6aa15962c6b97a77dbe8c45708155fe0";

     

       21
       21
       +
           hash = "sha256-SBpufr37K6LC4yc9ircUEBrzuRCKmJzD3C17N34qNGk=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         postPatch = ''

+2 -2

pkgs/by-name/wa/walker/package.nix

···

       12
       12
        
       

     

       13
       13
        
       buildGoModule rec {

     

       14
       14
        
         pname = "walker";

     

       15
       15
       -
         version = "0.7.6";

     

       15
       15
       +
         version = "0.7.7";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchFromGitHub {

     

       18
       18
        
           owner = "abenz1267";

     

       19
       19
        
           repo = "walker";

     

       20
       20
        
           rev = "v${version}";

     

       21
       21
       -
           hash = "sha256-cVWBpe+quzZweZkklFgw10CN7/KrhvqPvFpzbuLILzw=";

     

       21
       21
       +
           hash = "sha256-UJxLVnKfMLPkzec3XwNHcHE1x5kPFMoyqed0VNgFJ4w=";

     

       22
       22
        
         };

     

       23
       23
        
       

     

       24
       24
        
         vendorHash = "sha256-xLhpHrggOGq5VLjQO7OvH/Ei5YivJJhTsy2ek2AudRs=";

+36

pkgs/by-name/wl/wl-restart/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         stdenv,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         cmake,

     

       6
       6
       +
         scdoc,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       stdenv.mkDerivation (finalAttrs: {

     

       10
       10
       +
         pname = "wl-restart";

     

       11
       11
       +
         version = "0.2.0";

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchFromGitHub {

     

       14
       14
       +
           owner = "Ferdi265";

     

       15
       15
       +
           repo = "wl-restart";

     

       16
       16
       +
           rev = "refs/tags/v${finalAttrs.version}";

     

       17
       17
       +
           hash = "sha256-pMsYLU9pjN2cgz7FxJJwkDHKJt1mIAuagJSBjrPUMAM=";

     

       18
       18
       +
         };

     

       19
       19
       +
       

     

       20
       20
       +
         cmakeFlags = [ (lib.cmakeBool "INSTALL_DOCUMENTATION" true) ];

     

       21
       21
       +
       

     

       22
       22
       +
         nativeBuildInputs = [

     

       23
       23
       +
           scdoc

     

       24
       24
       +
           cmake

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         meta = {

     

       28
       28
       +
           description = "Simple tool that restarts your compositor when it crashes";

     

       29
       29
       +
           homepage = "https://github.com/Ferdi265/wl-restart";

     

       30
       30
       +
           changelog = "https://github.com/Ferdi265/wl-restart/releases/tag/v${finalAttrs.version}";

     

       31
       31
       +
           license = lib.licenses.gpl3Plus;

     

       32
       32
       +
           mainProgram = "wl-restart";

     

       33
       33
       +
           maintainers = with lib.maintainers; [ bot-wxt1221 ];

     

       34
       34
       +
           platforms = lib.platforms.linux;

     

       35
       35
       +
         };

     

       36
       36
       +
       })

+3 -3

pkgs/data/themes/whitesur-kde/default.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenvNoCC.mkDerivation {

     

       10
       10
        
         pname = "whitesur-kde";

     

       11
       11
       -
         version = "2022-05-01-unstable-2024-08-07";

     

       11
       11
       +
         version = "2022-05-01-unstable-2024-08-26";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchFromGitHub {

     

       14
       14
        
           owner = "vinceliuice";

     

       15
       15
        
           repo = "whitesur-kde";

     

       16
       16
       -
           rev = "a5c704224069a9e10fce82eec3c4ba482924d7ef";

     

       17
       17
       -
           hash = "sha256-GGrddhmYOp2qm1rHyBnSjQIyw0pU7CNJhxUt6da8ZpQ=";

     

       16
       16
       +
           rev = "ead6fd7308b3cae1b4634d00ddc685f9a88c59a9";

     

       17
       17
       +
           hash = "sha256-1YDy+g8r6NIceV1ygJK+w24g4ehzsPFMSWoLkuiNosU=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         # Propagate sddm theme dependencies to user env otherwise sddm does

+2 -2

pkgs/development/interpreters/php/8.3.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         base = callPackage ./generic.nix (_args // {

     

       5
       5
       -
           version = "8.3.10";

     

       6
       6
       -
           hash = "sha256-5YQZnDULRjQ8NwabucwgrYk8sEx0fIme8bBercDuo7A=";

     

       5
       5
       +
           version = "8.3.11";

     

       6
       6
       +
           hash = "sha256-ZkDiRVCAqJrcQdTle7BPjCv7fuxif+GZr5c7/zTX8O4=";

     

       7
       7
        
         });

     

       8
       8
        
       in

     

       9
       9
        
       base.withExtensions ({ all, ... }: with all; ([

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "aiortm";

     

       19
       19
       -
         version = "0.8.20";

     

       19
       19
       +
         version = "0.8.22";

     

       20
       20
        
         pyproject = true;

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.9";

     
···

       25
       25
        
           owner = "MartinHjelmare";

     

       26
       26
        
           repo = "aiortm";

     

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

     

       28
       28
       -
           hash = "sha256-W0o4RdaGExfTlTIndY3QUmqqeG2GA3pf3zeokY6xPvk=";

     

       28
       28
       +
           hash = "sha256-9owFyqkeCdOAb0erD8wNPAwF5qNPLpISNGjfMdUorPk=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         postPatch = ''

+2 -2

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

···

       42
       42
        
       

     

       43
       43
        
       buildPythonPackage rec {

     

       44
       44
        
         pname = "coffea";

     

       45
       45
       -
         version = "2024.8.2";

     

       45
       45
       +
         version = "2024.8.3";

     

       46
       46
        
         pyproject = true;

     

       47
       47
        
       

     

       48
       48
        
         disabled = pythonOlder "3.8";

     
···

       51
       51
        
           owner = "CoffeaTeam";

     

       52
       52
        
           repo = "coffea";

     

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

     

       54
       54
       -
           hash = "sha256-Lgen4HNZpnd+IDXRHk3U0kFiFZh72RcqAOIg+eyd150=";

     

       54
       54
       +
           hash = "sha256-aOe1U0IWQIgTJgUAs6WZWQmYnOTzdS+hRlK9QgU3qqk=";

     

       55
       55
        
         };

     

       56
       56
        
       

     

       57
       57
        
         build-system = [

+2 -2

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

···

       23
       23
        
       

     

       24
       24
        
       buildPythonPackage rec {

     

       25
       25
        
         pname = "cohere";

     

       26
       26
       -
         version = "5.8.1";

     

       26
       26
       +
         version = "5.9.0";

     

       27
       27
        
         pyproject = true;

     

       28
       28
        
       

     

       29
       29
        
         disabled = pythonOlder "3.8";

     
···

       32
       32
        
           owner = "cohere-ai";

     

       33
       33
        
           repo = "cohere-python";

     

       34
       34
        
           rev = "refs/tags/${version}";

     

       35
       35
       -
           hash = "sha256-IU+6X2lyH+5SeWSfzogLLj0D5t1rRwkNbb8AyaaIxnA=";

     

       35
       35
       +
           hash = "sha256-lD/J21RfJ6iBLOr0lzYBJmbTdiZUV8z6IMhZFbfWixM=";

     

       36
       36
        
         };

     

       37
       37
        
       

     

       38
       38
        
         build-system = [ poetry-core ];

+2 -2

pkgs/development/python-modules/dbt-core/default.nix

···

       29
       29
        
       

     

       30
       30
        
       buildPythonPackage rec {

     

       31
       31
        
         pname = "dbt-core";

     

       32
       32
       -
         version = "1.8.2";

     

       32
       32
       +
         version = "1.8.6";

     

       33
       33
        
         pyproject = true;

     

       34
       34
        
       

     

       35
       35
        
         disabled = pythonOlder "3.8";

     
···

       38
       38
        
           owner = "dbt-labs";

     

       39
       39
        
           repo = "dbt-core";

     

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

     

       41
       41
       -
           hash = "sha256-W1bD/XUmBYKzx66/rO//lCG+LOwDSlOW/KQPs0+cKTI=";

     

       41
       41
       +
           hash = "sha256-Zd1qPTfJgoGpkrMSt0K1jAdYAxICdru9vIXXqbmZryo=";

     

       42
       42
        
         };

     

       43
       43
        
       

     

       44
       44
        
         sourceRoot = "${src.name}/core";

+2 -2

pkgs/development/python-modules/django-webpack-loader/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildPythonPackage rec {

     

       11
       11
        
         pname = "django-webpack-loader";

     

       12
       12
       -
         version = "3.1.0";

     

       12
       12
       +
         version = "3.1.1";

     

       13
       13
        
         pyproject = true;

     

       14
       14
        
       

     

       15
       15
        
         disabled = pythonOlder "3.7";

     

       16
       16
        
       

     

       17
       17
        
         src = fetchPypi {

     

       18
       18
        
           inherit pname version;

     

       19
       19
       -
           hash = "sha256-sGuDyoGe1Lu4WKtXuNjLZ6JcSlftgi3t1On+5MCXr9U=";

     

       19
       19
       +
           hash = "sha256-8Rt5cA0b/BKZExvfS6R5wewgD4OhQA4aL+tcK6e2+MQ=";

     

       20
       20
        
         };

     

       21
       21
        
       

     

       22
       22
        
         build-system = [ setuptools-scm ];

+2 -2

pkgs/development/python-modules/json-schema-for-humans/default.nix

···

       19
       19
        
       

     

       20
       20
        
       buildPythonPackage rec {

     

       21
       21
        
         pname = "json-schema-for-humans";

     

       22
       22
       -
         version = "1.0.2";

     

       22
       22
       +
         version = "1.0.3";

     

       23
       23
        
         pyproject = true;

     

       24
       24
        
       

     

       25
       25
        
         disabled = pythonOlder "3.7";

     
···

       28
       28
        
           owner = "coveooss";

     

       29
       29
        
           repo = "json-schema-for-humans";

     

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

     

       31
       31
       -
           hash = "sha256-SSMUHC4IsMIIhmRrG0ZWNO2MNKKvoBSybmEEibAY5q0=";

     

       31
       31
       +
           hash = "sha256-QMDbuiHfL8JLYJwceyxGR3Zc8+ZBVlCGHOBeH5x4BmQ=";

     

       32
       32
        
         };

     

       33
       33
        
       

     

       34
       34
        
         pythonRelaxDeps = [ "dataclasses-json" ];

+2 -2

pkgs/development/python-modules/jsonschema-spec/default.nix

···

       20
       20
        
       

     

       21
       21
        
       buildPythonPackage rec {

     

       22
       22
        
         pname = "jsonschema-spec";

     

       23
       23
       -
         version = "0.2.4";

     

       23
       23
       +
         version = "0.3.3";

     

       24
       24
        
         format = "pyproject";

     

       25
       25
        
       

     

       26
       26
        
         disabled = pythonOlder "3.8";

     
···

       29
       29
        
           owner = "p1c2u";

     

       30
       30
        
           repo = pname;

     

       31
       31
        
           rev = "refs/tags/${version}";

     

       32
       32
       -
           hash = "sha256-1Flb3XQCGhrAYzTvriSVhHDb/Z/uvCyZdbav2u7f3sg=";

     

       32
       32
       +
           hash = "sha256-oBzB6Ke19QDcMQm4MpnaS132/prrtnCekAXuPMloZx4=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         postPatch = ''

+2 -2

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

···

       17
       17
        
       

     

       18
       18
        
       buildPythonPackage rec {

     

       19
       19
        
         pname = "lacuscore";

     

       20
       20
       -
         version = "1.10.11";

     

       20
       20
       +
         version = "1.10.12";

     

       21
       21
        
         pyproject = true;

     

       22
       22
        
       

     

       23
       23
        
         disabled = pythonOlder "3.8";

     
···

       26
       26
        
           owner = "ail-project";

     

       27
       27
        
           repo = "LacusCore";

     

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

     

       29
       29
       -
           hash = "sha256-WO0aAvSm0fE7AjgFxnLc5Sej0Ub7v8LruSgrwdFlUPE=";

     

       29
       29
       +
           hash = "sha256-A81zSdEpCNgPjSAGs/1Ja6MR2WcDf7Xx31Lm4SKkBtc=";

     

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         pythonRelaxDeps = [

+2 -2

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

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "llfuse";

     

       18
       18
       -
         version = "1.5.0";

     

       18
       18
       +
         version = "1.5.1";

     

       19
       19
        
       

     

       20
       20
        
         format = "pyproject";

     

       21
       21
        
       

     
···

       25
       25
        
           owner = "python-llfuse";

     

       26
       26
        
           repo = "python-llfuse";

     

       27
       27
        
           rev = "refs/tags/release-${version}";

     

       28
       28
       -
           hash = "sha256-6/iW5eHmX6ODVPLFkOo3bN9yW8ixqy2MHwQ2r9FA0iI=";

     

       28
       28
       +
           hash = "sha256-wni/b1hEn6/G0RszCJi+wmBHx6F0Ov1cZ/sRf8PLmps=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         nativeBuildInputs = [

-46

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

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         buildPythonPackage,

     

       4
       4
       -
         fetchPypi,

     

       5
       5
       -
         pythonOlder,

     

       6
       6
       -
         pythonAtLeast,

     

       7
       7
       -
         subunit,

     

       8
       8
       -
         testrepository,

     

       9
       9
       -
         testtools,

     

       10
       10
       -
         six,

     

       11
       11
       -
         pbr,

     

       12
       12
       -
         fixtures,

     

       13
       13
       -
       }:

     

       14
       14
       -
       

     

       15
       15
       -
       buildPythonPackage rec {

     

       16
       16
       -
         pname = "mox3";

     

       17
       17
       -
         version = "1.1.0";

     

       18
       18
       -
         format = "setuptools";

     

       19
       19
       -
         disabled = pythonOlder "3.6" || pythonAtLeast "3.11";

     

       20
       20
       -
       

     

       21
       21
       -
         src = fetchPypi {

     

       22
       22
       -
           inherit pname version;

     

       23
       23
       -
           sha256 = "8a526b7b9b6341f541a9aef3e08c93fd84a5373fe89d4cc51dd571f085b2363c";

     

       24
       24
       -
         };

     

       25
       25
       -
       

     

       26
       26
       -
         buildInputs = [

     

       27
       27
       -
           subunit

     

       28
       28
       -
           testrepository

     

       29
       29
       -
           testtools

     

       30
       30
       -
           six

     

       31
       31
       -
         ];

     

       32
       32
       -
         propagatedBuildInputs = [

     

       33
       33
       -
           pbr

     

       34
       34
       -
           fixtures

     

       35
       35
       -
         ];

     

       36
       36
       -
       

     

       37
       37
       -
         # Disabling as several tests dependencies are missing:

     

       38
       38
       -
         # https://opendev.org/openstack/mox3/src/branch/master/test-requirements.txt

     

       39
       39
       -
         doCheck = false;

     

       40
       40
       -
       

     

       41
       41
       -
         meta = with lib; {

     

       42
       42
       -
           description = "Mock object framework for Python";

     

       43
       43
       -
           homepage = "https://docs.openstack.org/mox3/latest/";

     

       44
       44
       -
           license = licenses.asl20;

     

       45
       45
       -
         };

     

       46
       46
       -
       }

+2 -2

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

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "svg2tikz";

     

       14
       14
       -
         version = "3.1.0";

     

       14
       14
       +
         version = "3.2.0";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     

       17
       17
        
       

     
···

       21
       21
        
           owner = "xyz2tex";

     

       22
       22
        
           repo = "svg2tikz";

     

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

     

       24
       24
       -
           hash = "sha256-lL+CQGZMK+rxjw2kTNE6kK3FCt6ARsAD6ROMsXWwDCs=";

     

       24
       24
       +
           hash = "sha256-5SOUvrK83ff1x4MTVoJy68OaDmZUfrEwraEWmPMJKTA=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         build-system = [

+3 -3

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

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "wikipedia-api";

     

       11
       11
       -
         version = "0.6.0";

     

       11
       11
       +
         version = "0.7.1";

     

       12
       12
        
         format = "setuptools";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "martin-majlis";

     

       16
       16
        
           repo = "Wikipedia-API";

     

       17
       17
       -
           rev = "v${version}";

     

       18
       18
       -
           hash = "sha256-cmwyQhKbkIpZXkKqqT0X2Lp8OFma2joeb4uxDRPiQe8=";

     

       17
       17
       +
           rev = "refs/tags/v${version}";

     

       18
       18
       +
           hash = "sha256-bjmvUZpwDJJrB2k13NMSMHNyiJFXCvo007PPHwBVeq8=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         propagatedBuildInputs = [ requests ];

+2 -2

pkgs/os-specific/darwin/bartender/default.nix

···

       6
       6
        
       

     

       7
       7
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       8
       8
        
         pname = "bartender";

     

       9
       9
       -
         version = "5.1.0";

     

       9
       9
       +
         version = "5.1.1";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchurl {

     

       12
       12
        
           name = "Bartender ${lib.versions.major finalAttrs.version}.dmg";

     

       13
       13
        
           url = "https://www.macbartender.com/B2/updates/${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}/Bartender%20${lib.versions.major finalAttrs.version}.dmg";

     

       14
       14
       -
           hash = "sha256-rYHr0/ooBesi6AuCL4rw1neBkg1OSecubxhid6UyEr4=";

     

       14
       14
       +
           hash = "sha256-XxBnzHYX/S172rVEiymc3sLOmIeH7ttIxSHMsh1vR/s=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         dontPatch = true;

+2 -2

pkgs/os-specific/linux/ima-evm-utils/default.nix

···

       14
       14
        
       

     

       15
       15
        
       stdenv.mkDerivation rec {

     

       16
       16
        
         pname = "ima-evm-utils";

     

       17
       17
       -
         version = "1.6";

     

       17
       17
       +
         version = "1.6.2";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "linux-integrity";

     

       21
       21
        
           repo = "ima-evm-utils";

     

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

     

       23
       23
       -
           hash = "sha256-rS2KChYKHnaR17VKYXyb28AsWnLZ8CRoHhLOUejO8Z8=";

     

       23
       23
       +
           hash = "sha256-vIu12Flc2DiEqUSKAfoUi7Zg6D25pURvlYKEQKHER4I=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         strictDeps = true;

+3 -3

pkgs/os-specific/linux/nvidia-x11/default.nix

···

       62
       62
        
         # Vulkan developer beta driver

     

       63
       63
        
         # See here for more information: https://developer.nvidia.com/vulkan-driver

     

       64
       64
        
         vulkan_beta = generic rec {

     

       65
       65
       -
           version = "550.40.70";

     

       65
       65
       +
           version = "550.40.71";

     

       66
       66
        
           persistencedVersion = "550.54.14";

     

       67
       67
        
           settingsVersion = "550.54.14";

     

       68
       68
       -
           sha256_64bit = "sha256-tZhIf1TzbcRnEaJjB3ZvsiA0IkdjG/Ak412po14p+N8=";

     

       69
       69
       -
           openSha256 = "sha256-HyaBybZkQfuUvW8tmw09i/c8gOjMFAXEMhoyBohBrRo=";

     

       68
       68
       +
           sha256_64bit = "sha256-LDh3Kz7Iop+Y2rxXANuPPkDr6WKPuZ5KV9L3+RPa2d0=";

     

       69
       69
       +
           openSha256 = "sha256-0HGAE0SlQmEc75E0h7Oq7qu7rVfLhQoBqQF1OuHSa2Y=";

     

       70
       70
        
           settingsSha256 = "sha256-m2rNASJp0i0Ez2OuqL+JpgEF0Yd8sYVCyrOoo/ln2a4=";

     

       71
       71
        
           persistencedSha256 = "sha256-XaPN8jVTjdag9frLPgBtqvO/goB5zxeGzaTU0CdL6C4=";

     

       72
       72
        
           url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";

+2 -2

pkgs/servers/http/nginx/modules.nix

···

       218
       218
        
             name = "develkit";

     

       219
       219
        
             owner = "vision5";

     

       220
       220
        
             repo = "ngx_devel_kit";

     

       221
       221
       -
             rev = "v0.3.1";

     

       222
       222
       -
             sha256 = "1c5zfpvm0hrd9lp8rasmw79dnr2aabh0i6y11wzb783bp8m3p2sq";

     

       221
       221
       +
             rev = "v0.3.3";

     

       222
       222
       +
             hash= "sha256-/RQUVHwIdNqm3UemQ/oNs2ksg8beziA4Pxejd5Yg0Pg=";

     

       223
       223
        
           };

     

       224
       224
        
       

     

       225
       225
        
           meta = with lib; {

+3 -3

pkgs/tools/text/jotdown/default.nix

···

       5
       5
        
       

     

       6
       6
        
       rustPlatform.buildRustPackage rec {

     

       7
       7
        
         pname = "jotdown";

     

       8
       8
       -
         version = "0.4.1";

     

       8
       8
       +
         version = "0.5.0";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "hellux";

     

       12
       12
        
           repo = "jotdown";

     

       13
       13
        
           rev = version;

     

       14
       14
       -
           hash = "sha256-qFx87AVGi42OCFCvksgiLh+NkXNgzfPxjcP0zDeC1is=";

     

       14
       14
       +
           hash = "sha256-lJnHdywxKf3CWgSB91MqQreyUhKArpT2lqQqSIpgnUY=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         cargoHash = "sha256-IsUlTSv2QcO67FpN0eAK1gKLJelr9sfX8DefcmzHbcc=";

     

       17
       17
       +
         cargoHash = "sha256-ESwo1J5OCJbmlZoTOPaeNIqRCTMAJtgkhrR0bcRqQwk=";

     

       18
       18
        
       

     

       19
       19
        
         meta = with lib; {

     

       20
       20
        
           description = "Minimal Djot CLI";

+1 -1

pkgs/top-level/all-packages.nix

···

       29525
       29525
        
         dyff = callPackage ../development/tools/dyff { };

     

       29526
       29526
        
       

     

       29527
       29527
        
         dwl = callPackage ../by-name/dw/dwl/package.nix {

     

       29528
       29528
       -
           wlroots = wlroots_0_17;

     

       29528
       29528
       +
           wlroots = wlroots_0_18;

     

       29529
       29529
        
         };

     

       29530
       29530
        
       

     

       29531
       29531
        
         dwm = callPackage ../applications/window-managers/dwm {

+1

pkgs/top-level/python-aliases.nix

···

       326
       326
        
         mitmproxy-wireguard = throw "mitmproxy-wireguard has been removed because it was replaced by upstream with mitmproxy-rs"; # added 2023-11-06

     

       327
       327
        
         mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28

     

       328
       328
        
         mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21

     

       329
       329
       +
         mox3 = throw "mox3 was removed because it is unmaintained"; # added 2024-08-30

     

       329
       330
        
         mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01

     

       330
       331
        
         multi_key_dict = multi-key-dict; # added 2023-11-05

     

       331
       332
        
         mutmut = throw "mutmut has been promoted to a top-level attribute name: `pkgs.mutmut`"; # added 2022-10-02

-2

pkgs/top-level/python-packages.nix

···

       8066
       8066
        
       

     

       8067
       8067
        
         moviepy = callPackage ../development/python-modules/moviepy { };

     

       8068
       8068
        
       

     

       8069
       8069
       -
         mox3 = callPackage ../development/python-modules/mox3 { };

     

       8070
       8070
       -
       

     

       8071
       8069
        
         mozart-api = callPackage ../development/python-modules/mozart-api { };

     

       8072
       8070
        
       

     

       8073
       8071
        
         mozilla-django-oidc = callPackage ../development/python-modules/mozilla-django-oidc { };

+2 -2

pkgs/top-level/ruby-packages.nix

···

       3137
       3137
        
           platforms = [];

     

       3138
       3138
        
           source = {

     

       3139
       3139
        
             remotes = ["https://rubygems.org"];

     

       3140
       3140
       -
             sha256 = "0428ady49qssmnmwnafzrjvyba8mzbridsgblv7c7kmd0vqgfn99";

     

       3140
       3140
       +
             sha256 = "1ik3in0957l9s6iwdm3nsk4za072cj27riiqgpx6zzcd22flbw3s";

     

       3141
       3141
        
             type = "gem";

     

       3142
       3142
        
           };

     

       3143
       3143
       -
           version = "3.3.0";

     

       3143
       3143
       +
           version = "3.3.6";

     

       3144
       3144
        
         };

     

       3145
       3145
        
         rmagick = {

     

       3146
       3146
        
           dependencies = ["observer" "pkg-config"];