commit 9ee9672d55032fc27a8c6baaa6c3b780fc2edc4b · pyrox.dev/nixpkgs

-1

.github/workflows/push.yml

···

       13
       13
        
             - release-*

     

       14
       14
        
             - staging-*

     

       15
       15
        
             - haskell-updates

     

       16
       16
       -
             - python-updates

     

       17
       16
        
       

     

       18
       17
        
       permissions: {}

     

       19
       18

+1 -1

ci/README.md

···

       36
       36
        
         - Pull Requests required.

     

       37
       37
        
         - Long-lived, no deletion, no force push.

     

       38
       38
        
       - **Secondary development** branches

     

       39
       39
       -
         - `staging-` prefix, `haskell-updates` and `python-updates`

     

       39
       39
       +
         - `staging-` prefix and `haskell-updates`

     

       40
       40
        
         - Pull Requests normally required, except when merging development branches into each other.

     

       41
       41
        
         - Long-lived, no deletion, no force push.

     

       42
       42
        
       - **Work-In-Progress** branches

-1

ci/request-reviews/dev-branches.txt

···

       6
       6
        
       release-*

     

       7
       7
        
       staging-*

     

       8
       8
        
       haskell-updates

     

       9
       9
       -
       python-updates

-1

ci/supportedBranches.js

···

       9
       9
        
         staging: ['development', 'secondary'],

     

       10
       10
        
         'staging-next': ['development', 'secondary'],

     

       11
       11
        
         'haskell-updates': ['development', 'secondary'],

     

       12
       12
       -
         'python-updates': ['development', 'secondary'],

     

       13
       12
        
         nixos: ['channel'],

     

       14
       13
        
         nixpkgs: ['channel'],

     

       15
       14
        
       }

+1 -4

nixos/modules/services/misc/paperless.nix

···

       31
       31
        
           PAPERLESS_REDIS = "unix://${redisServer.unixSocket}";

     

       32
       32
        
         }

     

       33
       33
        
         // lib.optionalAttrs (cfg.settings.PAPERLESS_ENABLE_NLTK or true) {

     

       34
       34
       -
           PAPERLESS_NLTK_DIR = pkgs.symlinkJoin {

     

       35
       35
       -
             name = "paperless_ngx_nltk_data";

     

       36
       36
       -
             paths = cfg.package.nltkData;

     

       37
       37
       -
           };

     

       34
       34
       +
           PAPERLESS_NLTK_DIR = cfg.package.nltkDataDir;

     

       38
       35
        
         }

     

       39
       36
        
         // lib.optionalAttrs (cfg.openMPThreadingWorkaround) {

     

       40
       37
        
           OMP_NUM_THREADS = "1";

+34 -4

nixos/modules/services/video/frigate.nix

···

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

     

       104
       104
        
           auth_request /auth;

     

       105
       105
        
       

     

       106
       106
       -
           # Save the upstream metadata response headers from Authelia to variables.

     

       106
       106
       +
           # Save the upstream metadata response headers from the auth request to variables

     

       107
       107
        
           auth_request_set $user $upstream_http_remote_user;

     

       108
       108
       +
           auth_request_set $role $upstream_http_remote_role;

     

       108
       109
        
           auth_request_set $groups $upstream_http_remote_groups;

     

       109
       110
        
           auth_request_set $name $upstream_http_remote_name;

     

       110
       111
        
           auth_request_set $email $upstream_http_remote_email;

     

       111
       112
        
       

     

       112
       113
        
           # Inject the metadata response headers from the variables into the request made to the backend.

     

       113
       114
        
           proxy_set_header Remote-User $user;

     

       115
       115
       +
           proxy_set_header Remote-Role $role;

     

       114
       116
        
           proxy_set_header Remote-Groups $groups;

     

       115
       117
        
           proxy_set_header Remote-Email $email;

     

       116
       118
        
           proxy_set_header Remote-Name $name;

     
···

       195
       197
        
       

     

       196
       198
        
           checkConfig = mkOption {

     

       197
       199
        
             type = bool;

     

       198
       198
       -
             default = pkgs.stdenv.buildPlatform.canExecute pkgs.stdenv.hostPlatform;

     

       199
       199
       -
             defaultText = literalExpression ''

     

       200
       200
       +
             default =

     

       200
       201
        
               pkgs.stdenv.buildPlatform.canExecute pkgs.stdenv.hostPlatform

     

       202
       202
       +
               && (!pkgs.stdenv.hostPlatform.isAarch64);

     

       203
       203
       +
             defaultText = literalExpression ''

     

       204
       204
       +
               pkgs.stdenv.buildPlatform.canExecute pkgs.stdenv.hostPlatform && !(pkgs.stdenv.hostPlaform.isAarch64)

     

       201
       205
        
             '';

     

       202
       206
        
             description = ''

     

       203
       207
        
               Whether to check the configuration at build time.

     
···

       343
       347
        
                     expires off;

     

       344
       348
        
       

     

       345
       349
        
                     keepalive_disable safari;

     

       350
       350
       +
       

     

       351
       351
       +
                     # vod module returns 502 for non-existent media

     

       352
       352
       +
                     # https://github.com/kaltura/nginx-vod-module/issues/468

     

       353
       353
       +
                     error_page 502 =404 /vod-not-found;

     

       346
       354
        
                   '';

     

       355
       355
       +
                 };

     

       356
       356
       +
                 "/vod-not-found" = {

     

       357
       357
       +
                   return = 404;

     

       347
       358
        
                 };

     

       348
       359
        
                 "/stream/" = {

     

       349
       360
        
                   alias = "/var/cache/frigate/stream/";

     
···

       549
       560
        
                     add_header Cache-Control "public";

     

       550
       561
        
                   '';

     

       551
       562
        
                 };

     

       563
       563
       +
                 "/locales/" = {

     

       564
       564
       +
                   root = cfg.package.web;

     

       565
       565
       +
                   extraConfig = ''

     

       566
       566
       +
                     access_log off;

     

       567
       567
       +
                     add_header Cache-Control "public";

     

       568
       568
       +
                   '';

     

       569
       569
       +
                 };

     

       570
       570
       +
                 "~ ^/.*-([A-Za-z0-9]+)\.webmanifest$" = {

     

       571
       571
       +
                   root = cfg.package.web;

     

       572
       572
       +
                   extraConfig = ''

     

       573
       573
       +
                     access_log off;

     

       574
       574
       +
                     expires 1y;

     

       575
       575
       +
                     add_header Cache-Control "public";

     

       576
       576
       +
                     default_type application/json;

     

       577
       577
       +
                     proxy_set_header Accept-Encoding "";

     

       578
       578
       +
                   '';

     

       579
       579
       +
                 };

     

       552
       580
        
                 "/" = {

     

       553
       581
        
                   root = cfg.package.web;

     

       554
       582
        
                   tryFiles = "$uri $uri.html $uri/ /index.html";

     
···

       582
       610
        
                 open_file_cache_min_uses 1;

     

       583
       611
        
                 open_file_cache_errors on;

     

       584
       612
        
                 aio on;

     

       613
       613
       +
       

     

       614
       614
       +
                 # file upload size

     

       615
       615
       +
                 client_max_body_size 20M;

     

       585
       616
        
       

     

       586
       617
        
                 # https://github.com/kaltura/nginx-vod-module#vod_open_file_thread_pool

     

       587
       618
        
                 vod_open_file_thread_pool default;

     
···

       657
       688
        
               [

     

       658
       689
        
                 # unfree:

     

       659
       690
        
                 # config.boot.kernelPackages.nvidiaPackages.latest.bin

     

       660
       660
       -
                 ffmpeg-headless

     

       661
       691
        
                 libva-utils

     

       662
       692
        
                 procps

     

       663
       693
        
                 radeontop

+34 -31

pkgs/applications/audio/youtube-music/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
       +
         stdenv,

     

       3
       4
        
         fetchFromGitHub,

     

       4
       5
        
         makeWrapper,

     

       5
       6
        
         electron,

     

       6
       7
        
         python3,

     

       7
       7
       -
         stdenv,

     

       8
       8
        
         copyDesktopItems,

     

       9
       9
        
         nodejs,

     

       10
       10
        
         pnpm,

     

       11
       11
        
         makeDesktopItem,

     

       12
       12
       +
         nix-update-script,

     

       12
       13
        
       }:

     

       13
       14
        
       

     

       14
       15
        
       stdenv.mkDerivation (finalAttrs: {

     

       15
       16
        
         pname = "youtube-music";

     

       16
       16
       -
         version = "3.9.0";

     

       17
       17
       +
         version = "3.10.0";

     

       17
       18
        
       

     

       18
       19
        
         src = fetchFromGitHub {

     

       19
       20
        
           owner = "th-ch";

     

       20
       21
        
           repo = "youtube-music";

     

       21
       21
       -
           rev = "v${finalAttrs.version}";

     

       22
       22
       -
           hash = "sha256-xaHYNfW5ZLYiaeJ0F32NQ87woMh6K4Ea9rjgNOyabck=";

     

       22
       22
       +
           tag = "v${finalAttrs.version}";

     

       23
       23
       +
           hash = "sha256-+PCDA7lHaUQw9DhODRsEScyJC+9v8UPiZ1W8w2h/Ljg=";

     

       23
       24
        
         };

     

       24
       25
        
       

     

       26
       26
       +
         patches = [

     

       27
       27
       +
           # MPRIS's DesktopEntry property needs to match the desktop entry basename

     

       28
       28
       +
           ./fix-mpris-desktop-entry.patch

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       25
       31
        
         pnpmDeps = pnpm.fetchDeps {

     

       26
       32
        
           inherit (finalAttrs) pname version src;

     

       27
       27
       -
           fetcherVersion = 1;

     

       28
       28
       -
           hash = "sha256-xIQyTetHU37gTxCcQp4VCqzGdIfVQGy/aORCVba6YQ0=";

     

       33
       33
       +
           fetcherVersion = 2;

     

       34
       34
       +
           hash = "sha256-b5I0n3CedA6qCL68lePU3pwyGp1JlQHzUpfCvhqw2qI=";

     

       29
       35
        
         };

     

       30
       36
        
       

     

       31
       37
        
         nativeBuildInputs = [

     
···

       36
       42
        
         ]

     

       37
       43
        
         ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ copyDesktopItems ];

     

       38
       44
        
       

     

       39
       39
       -
         ELECTRON_SKIP_BINARY_DOWNLOAD = 1;

     

       45
       45
       +
         env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;

     

       40
       46
        
       

     

       41
       47
        
         postBuild =

     

       42
       48
        
           lib.optionalString stdenv.hostPlatform.isDarwin ''

     
···

       51
       57
        
               -c.electronVersion=${electron.version}

     

       52
       58
        
           '';

     

       53
       59
        
       

     

       60
       60
       +
         desktopItems = [

     

       61
       61
       +
           (makeDesktopItem {

     

       62
       62
       +
             name = "com.github.th_ch.youtube_music";

     

       63
       63
       +
             exec = "youtube-music %u";

     

       64
       64
       +
             icon = "youtube-music";

     

       65
       65
       +
             desktopName = "YouTube Music";

     

       66
       66
       +
             startupWMClass = "com.github.th_ch.youtube_music";

     

       67
       67
       +
             categories = [ "AudioVideo" ];

     

       68
       68
       +
           })

     

       69
       69
       +
         ];

     

       70
       70
       +
       

     

       54
       71
        
         installPhase = ''

     

       55
       72
        
           runHook preInstall

     

       56
       73
        
       

     
···

       58
       75
        
         + lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       59
       76
        
           mkdir -p $out/{Applications,bin}

     

       60
       77
        
           mv pack/mac*/YouTube\ Music.app $out/Applications

     

       61
       61
       -
           makeWrapper $out/Applications/YouTube\ Music.app/Contents/MacOS/YouTube\ Music $out/bin/youtube-music

     

       78
       78
       +
           ln -s "$out/Applications/YouTube Music.app/Contents/MacOS/YouTube Music" $out/bin/youtube-music

     

       62
       79
        
         ''

     

       63
       80
        
         + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''

     

       64
       64
       -
           mkdir -p "$out/share/lib/youtube-music"

     

       65
       65
       -
           cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/youtube-music"

     

       81
       81
       +
           mkdir -p "$out/share/youtube-music"

     

       82
       82
       +
           cp -r pack/*-unpacked/{locales,resources{,.pak}} "$out/share/youtube-music"

     

       66
       83
        
       

     

       67
       84
        
           pushd assets/generated/icons/png

     

       68
       85
        
           for file in *.png; do

     
···

       77
       94
        
       

     

       78
       95
        
         postFixup = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''

     

       79
       96
        
           makeWrapper ${electron}/bin/electron $out/bin/youtube-music \

     

       80
       80
       -
             --add-flags $out/share/lib/youtube-music/resources/app.asar \

     

       81
       81
       -
             --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \

     

       97
       97
       +
             --add-flags $out/share/youtube-music/resources/app.asar \

     

       98
       98
       +
             --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \

     

       82
       99
        
             --set-default ELECTRON_FORCE_IS_PACKAGED 1 \

     

       83
       100
        
             --set-default ELECTRON_IS_DEV 0 \

     

       84
       101
        
             --inherit-argv0

     

       85
       102
        
         '';

     

       86
       103
        
       

     

       87
       87
       -
         patches = [

     

       88
       88
       -
           # MPRIS's DesktopEntry property needs to match the desktop entry basename

     

       89
       89
       -
           ./fix-mpris-desktop-entry.patch

     

       90
       90
       -
         ];

     

       91
       91
       -
       

     

       92
       92
       -
         desktopItems = [

     

       93
       93
       -
           (makeDesktopItem {

     

       94
       94
       -
             name = "com.github.th_ch.youtube_music";

     

       95
       95
       -
             exec = "youtube-music %u";

     

       96
       96
       -
             icon = "youtube-music";

     

       97
       97
       -
             desktopName = "YouTube Music";

     

       98
       98
       -
             startupWMClass = "com.github.th_ch.youtube_music";

     

       99
       99
       -
             categories = [ "AudioVideo" ];

     

       100
       100
       -
           })

     

       101
       101
       -
         ];

     

       104
       104
       +
         passthru.updateScript = nix-update-script { };

     

       102
       105
        
       

     

       103
       103
       -
         meta = with lib; {

     

       106
       106
       +
         meta = {

     

       104
       107
        
           description = "Electron wrapper around YouTube Music";

     

       105
       108
        
           homepage = "https://th-ch.github.io/youtube-music/";

     

       106
       109
        
           changelog = "https://github.com/th-ch/youtube-music/blob/master/changelog.md#${

     

       107
       107
       -
             lib.replaceStrings [ "." ] [ "" ] finalAttrs.src.rev

     

       110
       110
       +
             lib.replaceStrings [ "." ] [ "" ] finalAttrs.src.tag

     

       108
       111
        
           }";

     

       109
       109
       -
           license = licenses.mit;

     

       110
       110
       -
           maintainers = with maintainers; [

     

       112
       112
       +
           license = lib.licenses.mit;

     

       113
       113
       +
           maintainers = with lib.maintainers; [

     

       111
       114
        
             aacebedo

     

       112
       115
        
             SuperSandro2000

     

       113
       116
        
           ];

-79

pkgs/applications/editors/code-browser/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchurl,

     

       5
       5
       -
         copper,

     

       6
       6
       -
         python3,

     

       7
       7
       -
         pkg-config,

     

       8
       8
       -
         withQt ? false,

     

       9
       9
       -
         qtbase ? null,

     

       10
       10
       -
         wrapQtAppsHook ? null,

     

       11
       11
       -
         withGtk2 ? false,

     

       12
       12
       -
         gtk2,

     

       13
       13
       -
         withGtk3 ? false,

     

       14
       14
       -
         gtk3,

     

       15
       15
       -
         mkDerivation ? stdenv.mkDerivation,

     

       16
       16
       -
       }:

     

       17
       17
       -
       let

     

       18
       18
       -
         onlyOneEnabled = xs: 1 == builtins.length (builtins.filter lib.id xs);

     

       19
       19
       -
       in

     

       20
       20
       -
       assert onlyOneEnabled [

     

       21
       21
       -
         withQt

     

       22
       22
       -
         withGtk2

     

       23
       23
       -
         withGtk3

     

       24
       24
       -
       ];

     

       25
       25
       -
       mkDerivation rec {

     

       26
       26
       -
         pname = "code-browser";

     

       27
       27
       -
         version = "8.0";

     

       28
       28
       -
         src = fetchurl {

     

       29
       29
       -
           url = "https://tibleiz.net/download/code-browser-${version}-src.tar.gz";

     

       30
       30
       -
           sha256 = "sha256-beCp4lx4MI1+hVgWp2h3piE/zu51zfwQdB5g7ImgmwY=";

     

       31
       31
       -
         };

     

       32
       32
       -
         postPatch = ''

     

       33
       33
       -
           substituteInPlace Makefile --replace "LFLAGS=-no-pie" "LFLAGS=-no-pie -L."

     

       34
       34
       -
           patchShebangs .

     

       35
       35
       -
         ''

     

       36
       36
       -
         + lib.optionalString withQt ''

     

       37
       37
       -
           substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o"

     

       38
       38
       -
           substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: qt"

     

       39
       39
       -
         ''

     

       40
       40
       -
         + lib.optionalString withGtk2 ''

     

       41
       41
       -
           substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk2"

     

       42
       42
       -
         ''

     

       43
       43
       -
         + lib.optionalString withGtk3 ''

     

       44
       44
       -
           substituteInPlace libs/copper-ui/Makefile --replace "all: qt gtk gtk2" "all: gtk"

     

       45
       45
       -
         '';

     

       46
       46
       -
         nativeBuildInputs = [

     

       47
       47
       -
           copper

     

       48
       48
       -
           python3

     

       49
       49
       -
           pkg-config

     

       50
       50
       -
         ]

     

       51
       51
       -
         ++ lib.optionals withGtk2 [ gtk2 ]

     

       52
       52
       -
         ++ lib.optionals withGtk3 [ gtk3 ]

     

       53
       53
       -
         ++ lib.optionals withQt [

     

       54
       54
       -
           qtbase

     

       55
       55
       -
           wrapQtAppsHook

     

       56
       56
       -
         ];

     

       57
       57
       -
         buildInputs =

     

       58
       58
       -
           lib.optionals withQt [ qtbase ]

     

       59
       59
       -
           ++ lib.optionals withGtk2 [ gtk2 ]

     

       60
       60
       -
           ++ lib.optionals withGtk3 [ gtk3 ];

     

       61
       61
       -
         makeFlags = [

     

       62
       62
       -
           "prefix=$(out)"

     

       63
       63
       -
           "COPPER=${copper}/bin/copper-elf64"

     

       64
       64
       -
           "with-local-libs"

     

       65
       65
       -
         ]

     

       66
       66
       -
         ++ lib.optionals withQt [

     

       67
       67
       -
           "QINC=${qtbase.dev}/include"

     

       68
       68
       -
           "UI=qt"

     

       69
       69
       -
         ]

     

       70
       70
       -
         ++ lib.optionals withGtk2 [ "UI=gtk2" ]

     

       71
       71
       -
         ++ lib.optionals withGtk3 [ "UI=gtk" ];

     

       72
       72
       -
       

     

       73
       73
       -
         meta = with lib; {

     

       74
       74
       -
           description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code";

     

       75
       75
       -
           homepage = "https://tibleiz.net/code-browser/";

     

       76
       76
       -
           license = licenses.gpl2;

     

       77
       77
       -
           platforms = platforms.x86_64;

     

       78
       78
       -
         };

     

       79
       79
       -
       }

-56

pkgs/applications/misc/gxneur/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchurl,

     

       5
       5
       -
         pkg-config,

     

       6
       6
       -
         intltool,

     

       7
       7
       -
         gtk2,

     

       8
       8
       -
         xorg,

     

       9
       9
       -
         glib,

     

       10
       10
       -
         xneur,

     

       11
       11
       -
         libglade,

     

       12
       12
       -
         GConf,

     

       13
       13
       -
         libappindicator-gtk2,

     

       14
       14
       -
         pcre,

     

       15
       15
       -
       }:

     

       16
       16
       -
       

     

       17
       17
       -
       stdenv.mkDerivation rec {

     

       18
       18
       -
         pname = "gxneur";

     

       19
       19
       -
         version = "0.20.0";

     

       20
       20
       -
       

     

       21
       21
       -
         src = fetchurl {

     

       22
       22
       -
           url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/${version}/gxneur_${version}.orig.tar.gz";

     

       23
       23
       -
           sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr";

     

       24
       24
       -
         };

     

       25
       25
       -
       

     

       26
       26
       -
         # glib-2.62 deprecations

     

       27
       27
       -
         env.NIX_CFLAGS_COMPILE = "-DGLIB_DISABLE_DEPRECATION_WARNINGS";

     

       28
       28
       -
       

     

       29
       29
       -
         nativeBuildInputs = [

     

       30
       30
       -
           pkg-config

     

       31
       31
       -
           intltool

     

       32
       32
       -
         ];

     

       33
       33
       -
         buildInputs = [

     

       34
       34
       -
           xorg.libX11

     

       35
       35
       -
           glib

     

       36
       36
       -
           gtk2

     

       37
       37
       -
           xorg.libXpm

     

       38
       38
       -
           xorg.libXt

     

       39
       39
       -
           xorg.libXext

     

       40
       40
       -
           xneur

     

       41
       41
       -
           libglade

     

       42
       42
       -
           GConf

     

       43
       43
       -
           pcre

     

       44
       44
       -
           libappindicator-gtk2

     

       45
       45
       -
         ];

     

       46
       46
       -
       

     

       47
       47
       -
         meta = with lib; {

     

       48
       48
       -
           description = "GUI for XNEUR keyboard layout switcher";

     

       49
       49
       -
           platforms = platforms.linux;

     

       50
       50
       -
           license = with licenses; [

     

       51
       51
       -
             gpl2

     

       52
       52
       -
             gpl3

     

       53
       53
       -
           ];

     

       54
       54
       -
           mainProgram = "gxneur";

     

       55
       55
       -
         };

     

       56
       56
       -
       }

+4 -2

pkgs/build-support/appimage/default.nix

···

       128
       128
        
               krb5

     

       129
       129
        
               gsettings-desktop-schemas

     

       130
       130
        
               hicolor-icon-theme # dont show a gtk warning about hicolor not being installed

     

       131
       131
       +
       

     

       132
       132
       +
               # libraries not on the upstream include list, but nevertheless expected

     

       133
       133
       +
               # by at least one appimage

     

       134
       134
       +
               libsecret # For bitwarden, appimage is x86_64 only

     

       131
       135
        
             ];

     

       132
       136
        
       

     

       133
       137
        
           # list of libraries expected in an appimage environment:

     
···

       244
       248
        
               at-spi2-core

     

       245
       249
        
               pciutils # for FreeCAD

     

       246
       250
        
               pipewire # immersed-vr wayland support

     

       247
       247
       -
       

     

       248
       248
       -
               libsecret # For bitwarden

     

       249
       251
        
               libmpg123 # Slippi launcher

     

       250
       252
        
               brotli # TwitchDropsMiner

     

       251
       253
        
             ];

+1 -3

pkgs/by-name/au/authentik/package.nix

···

       308
       308
        
                 substituteInPlace authentik/lib/default.yml \

     

       309
       309
        
                   --replace-fail '/blueprints' "$out/blueprints" \

     

       310
       310
        
                   --replace-fail './media' '/var/lib/authentik/media'

     

       311
       311
       -
                 substituteInPlace pyproject.toml \

     

       312
       312
       -
                   --replace-fail 'djangorestframework-guardian' 'djangorestframework-guardian2'

     

       313
       311
        
                 substituteInPlace authentik/stages/email/utils.py \

     

       314
       312
        
                   --replace-fail 'web/' '${webui}/'

     

       315
       313
        
               '';

     
···

       346
       344
        
                   django-storages

     

       347
       345
        
                   django-tenants

     

       348
       346
        
                   djangorestframework

     

       349
       349
       -
                   djangorestframework-guardian2

     

       347
       347
       +
                   djangorestframework-guardian

     

       350
       348
        
                   docker

     

       351
       349
        
                   drf-orjson-renderer

     

       352
       350
        
                   drf-spectacular

+3 -2

pkgs/by-name/cl/cloudflare-warp/package.nix

···

       92
       92
        
           patchelf --replace-needed libpcap.so.0.8 ${libpcap}/lib/libpcap.so $out/bin/warp-dex

     

       93
       93
        
           mv lib/systemd/system $out/lib/systemd/

     

       94
       94
        
           substituteInPlace $out/lib/systemd/system/warp-svc.service \

     

       95
       95
       -
             --replace "ExecStart=" "ExecStart=$out"

     

       95
       95
       +
             --replace-fail "ExecStart=" "ExecStart=$out"

     

       96
       96
        
           substituteInPlace $out/lib/systemd/user/warp-taskbar.service \

     

       97
       97
       -
             --replace "ExecStart=" "ExecStart=$out"

     

       97
       97
       +
             --replace-fail "ExecStart=" "ExecStart=$out" \

     

       98
       98
       +
             --replace-fail "BindsTo=" "PartOf="

     

       98
       99
        
       

     

       99
       100
        
           cat >>$out/lib/systemd/user/warp-taskbar.service <<EOF

     

       100
       101

-34

pkgs/by-name/co/copper/package.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchurl,

     

       5
       5
       -
         libffi,

     

       6
       6
       -
       }:

     

       7
       7
       -
       stdenv.mkDerivation rec {

     

       8
       8
       -
         pname = "copper";

     

       9
       9
       -
         version = "4.6";

     

       10
       10
       -
         src = fetchurl {

     

       11
       11
       -
           url = "https://tibleiz.net/download/copper-${version}-src.tar.gz";

     

       12
       12
       -
           sha256 = "sha256-tyxAMJp4H50eBz8gjt2O3zj5fq6nOIXKX47wql8aUUg=";

     

       13
       13
       -
         };

     

       14
       14
       -
         buildInputs = [

     

       15
       15
       -
           libffi

     

       16
       16
       -
         ];

     

       17
       17
       -
         postPatch = ''

     

       18
       18
       -
           patchShebangs .

     

       19
       19
       -
         '';

     

       20
       20
       -
         buildPhase = ''

     

       21
       21
       -
           make BACKEND=elf64 boot-elf64

     

       22
       22
       -
           make BACKEND=elf64 COPPER=stage3/copper-elf64 copper-elf64

     

       23
       23
       -
         '';

     

       24
       24
       -
         installPhase = ''

     

       25
       25
       -
           make BACKEND=elf64 install prefix=$out

     

       26
       26
       -
         '';

     

       27
       27
       -
         meta = with lib; {

     

       28
       28
       -
           description = "Simple imperative language, statically typed with type inference and genericity";

     

       29
       29
       -
           homepage = "https://tibleiz.net/copper/";

     

       30
       30
       -
           license = licenses.bsd2;

     

       31
       31
       -
           platforms = platforms.x86_64;

     

       32
       32
       -
           broken = true;

     

       33
       33
       -
         };

     

       34
       34
       -
       }

+3 -3

pkgs/by-name/en/envoy-bin/package.nix

···

       8
       8
        
         versionCheckHook,

     

       9
       9
        
       }:

     

       10
       10
        
       let

     

       11
       11
       -
         version = "1.35.0";

     

       11
       11
       +
         version = "1.35.1";

     

       12
       12
        
         inherit (stdenv.hostPlatform) system;

     

       13
       13
        
         throwSystem = throw "envoy-bin is not available for ${system}.";

     

       14
       14
        
       

     
···

       21
       21
        
       

     

       22
       22
        
         hash =

     

       23
       23
        
           {

     

       24
       24
       -
             aarch64-linux = "sha256-PLlFrs65Z+mV5V2OoW+bb/91DC5V9Ss2HnERccIunWY=";

     

       25
       25
       -
             x86_64-linux = "sha256-0l12MVwCNrUPjn9t6hOpuUscP6EQQHNLd0kG4YjhEeY=";

     

       24
       24
       +
             aarch64-linux = "sha256-tIBXnm6bGdA6tlYFL+aDf1bOjlUVof0MDNDpFi0tcbE=";

     

       25
       25
       +
             x86_64-linux = "sha256-emAbbVhEw0MA21rPxQD/z/p3yVuDi5JZg1yjuRkkmlo=";

     

       26
       26
        
           }

     

       27
       27
        
           .${system} or throwSystem;

     

       28
       28
        
       in

+7 -365

pkgs/by-name/fr/frigate/constants.patch

···

       1
       1
       -
       diff --git a/frigate/api/media.py b/frigate/api/media.py

     

       2
       2
       -
       index b5f3ba70..09a09c13 100644

     

       3
       3
       -
       --- a/frigate/api/media.py

     

       4
       4
       -
       +++ b/frigate/api/media.py

     

       5
       5
       -
       @@ -31,6 +31,7 @@ from frigate.config import FrigateConfig

     

       6
       6
       -
        from frigate.const import (

     

       7
       7
       -
            CACHE_DIR,

     

       8
       8
       -
            CLIPS_DIR,

     

       9
       9
       -
       +    INSTALL_DIR,

     

       10
       10
       -
            MAX_SEGMENT_DURATION,

     

       11
       11
       -
            PREVIEW_FRAME_TYPE,

     

       12
       12
       -
            RECORD_DIR,

     

       13
       13
       -
       @@ -154,7 +155,9 @@ def latest_frame(

     

       14
       14
       -
                    frame_processor.get_current_frame_time(camera_name) + retry_interval

     

       15
       15
       -
                ):

     

       16
       16
       -
                    if request.app.camera_error_image is None:

     

       17
       17
       -
       -                error_image = glob.glob("/opt/frigate/frigate/images/camera-error.jpg")

     

       18
       18
       -
       +                error_image = glob.glob(

     

       19
       19
       -
       +                    os.path.join(INSTALL_DIR, "frigate/images/camera-error.jpg")

     

       20
       20
       -
       +                )

     

       21
       21
       -
        

     

       22
       22
       -
                        if len(error_image) > 0:

     

       23
       23
       -
                            request.app.camera_error_image = cv2.imread(

     

       24
       24
       -
       @@ -497,7 +500,7 @@ def recording_clip(

     

       25
       25
       -
            )

     

       26
       26
       -
        

     

       27
       27
       -
            file_name = sanitize_filename(f"playlist_{camera_name}_{start_ts}-{end_ts}.txt")

     

       28
       28
       -
       -    file_path = f"/tmp/cache/{file_name}"

     

       29
       29
       -
       +    file_path = os.path.join(CACHE_DIR, file_name)

     

       30
       30
       -
            with open(file_path, "w") as file:

     

       31
       31
       -
                clip: Recordings

     

       32
       32
       -
                for clip in recordings:

     

       33
       33
       -
       diff --git a/frigate/api/preview.py b/frigate/api/preview.py

     

       34
       34
       -
       index d14a15ff..2db2326a 100644

     

       35
       35
       -
       --- a/frigate/api/preview.py

     

       36
       36
       -
       +++ b/frigate/api/preview.py

     

       37
       37
       -
       @@ -9,7 +9,7 @@ from fastapi import APIRouter

     

       38
       38
       -
        from fastapi.responses import JSONResponse

     

       39
       39
       -
        

     

       40
       40
       -
        from frigate.api.defs.tags import Tags

     

       41
       41
       -
       -from frigate.const import CACHE_DIR, PREVIEW_FRAME_TYPE

     

       42
       42
       -
       +from frigate.const import BASE_DIR, CACHE_DIR, PREVIEW_FRAME_TYPE

     

       43
       43
       -
        from frigate.models import Previews

     

       44
       44
       -
        

     

       45
       45
       -
        logger = logging.getLogger(__name__)

     

       46
       46
       -
       @@ -52,7 +52,7 @@ def preview_ts(camera_name: str, start_ts: float, end_ts: float):

     

       47
       47
       -
                clips.append(

     

       48
       48
       -
                    {

     

       49
       49
       -
                        "camera": preview["camera"],

     

       50
       50
       -
       -                "src": preview["path"].replace("/media/frigate", ""),

     

       51
       51
       -
       +                "src": preview["path"].replace(BASE_DIR, ""),

     

       52
       52
       -
                        "type": "video/mp4",

     

       53
       53
       -
                        "start": preview["start_time"],

     

       54
       54
       -
                        "end": preview["end_time"],

     

       55
       1
        
       diff --git a/frigate/comms/webpush.py b/frigate/comms/webpush.py

     

       56
       56
       -
       index abfd52d1..ab4cf3c5 100644

     

       2
       2
       +
       index c5986d45..b767e19e 100644

     

       57
       3
        
       --- a/frigate/comms/webpush.py

     

       58
       4
        
       +++ b/frigate/comms/webpush.py

     

       59
       59
       -
       @@ -12,7 +12,7 @@ from pywebpush import WebPusher

     

       5
       5
       +
       @@ -17,7 +17,7 @@ from titlecase import titlecase

     

       6
       6
       +
        from frigate.comms.base_communicator import Communicator

     

       60
       7
        
        from frigate.comms.config_updater import ConfigSubscriber

     

       61
       61
       -
        from frigate.comms.dispatcher import Communicator

     

       62
       8
        
        from frigate.config import FrigateConfig

     

       63
       9
        
       -from frigate.const import CONFIG_DIR

     

       64
       10
        
       +from frigate.const import BASE_DIR, CONFIG_DIR

     

       65
       11
        
        from frigate.models import User

     

       66
       12
        
        

     

       67
       13
        
        logger = logging.getLogger(__name__)

     

       68
       68
       -
       @@ -151,7 +151,7 @@ class WebPushClient(Communicator):  # type: ignore[misc]

     

       69
       69
       -
                camera: str = payload["after"]["camera"]

     

       70
       70
       -
                title = f"{', '.join(sorted_objects).replace('_', ' ').title()}{' was' if state == 'end' else ''} detected in {', '.join(payload['after']['data']['zones']).replace('_', ' ').title()}"

     

       71
       71
       -
                message = f"Detected on {camera.replace('_', ' ').title()}"

     

       14
       14
       +
       @@ -333,7 +333,7 @@ class WebPushClient(Communicator):  # type: ignore[misc]

     

       15
       15
       +
        

     

       16
       16
       +
                title = f"{titlecase(', '.join(sorted_objects).replace('_', ' '))}{' was' if state == 'end' else ''} detected in {titlecase(', '.join(payload['after']['data']['zones']).replace('_', ' '))}"

     

       17
       17
       +
                message = f"Detected on {titlecase(camera.replace('_', ' '))}"

     

       72
       18
        
       -        image = f"{payload['after']['thumb_path'].replace('/media/frigate', '')}"

     

       73
       19
        
       +        image = f"{payload['after']['thumb_path'].replace(BASE_DIR, '')}"

     

       74
       20
        
        

     

       75
       21
        
                # if event is ongoing open to live view otherwise open to recordings view

     

       76
       22
        
                direct_url = f"/review?id={reviewId}" if state == "end" else f"/#{camera}"

     

       77
       77
       -
       diff --git a/frigate/const.py b/frigate/const.py

     

       78
       78
       -
       index 5976f47b..dc710467 100644

     

       79
       79
       -
       --- a/frigate/const.py

     

       80
       80
       -
       +++ b/frigate/const.py

     

       81
       81
       -
       @@ -1,5 +1,6 @@

     

       82
       82
       -
        import re

     

       83
       83
       -
        

     

       84
       84
       -
       +INSTALL_DIR = "/opt/frigate"

     

       85
       85
       -
        CONFIG_DIR = "/config"

     

       86
       86
       -
        DEFAULT_DB_PATH = f"{CONFIG_DIR}/frigate.db"

     

       87
       87
       -
        MODEL_CACHE_DIR = f"{CONFIG_DIR}/model_cache"

     

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

     

       89
       89
       -
       index 452f1fee..13535a62 100644

     

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

     

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

     

       92
       92
       -
       @@ -9,7 +9,7 @@ import requests

     

       93
       93
       -
        from pydantic import BaseModel, ConfigDict, Field

     

       94
       94
       -
        from pydantic.fields import PrivateAttr

     

       95
       95
       -
        

     

       96
       96
       -
       -from frigate.const import DEFAULT_ATTRIBUTE_LABEL_MAP

     

       97
       97
       -
       +from frigate.const import DEFAULT_ATTRIBUTE_LABEL_MAP, MODEL_CACHE_DIR

     

       98
       98
       -
        from frigate.plus import PlusApi

     

       99
       99
       -
        from frigate.util.builtin import generate_color_palette, load_labels

     

       100
       100
       -
        

     

       101
       101
       -
       @@ -117,7 +117,7 @@ class ModelConfig(BaseModel):

     

       102
       102
       -
                    return

     

       103
       103
       -
        

     

       104
       104
       -
                model_id = self.path[7:]

     

       105
       105
       -
       -        self.path = f"/config/model_cache/{model_id}"

     

       106
       106
       -
       +        self.path = os.path.join(MODEL_CACHE_DIR, model_id)

     

       107
       107
       -
                model_info_path = f"{self.path}.json"

     

       108
       108
       -
        

     

       109
       109
       -
                # download the model if it doesn't exist

     

       110
       110
       -
       diff --git a/frigate/detectors/plugins/hailo8l.py b/frigate/detectors/plugins/hailo8l.py

     

       111
       111
       -
       index b66d78bd..69e86bc5 100644

     

       112
       112
       -
       --- a/frigate/detectors/plugins/hailo8l.py

     

       113
       113
       -
       +++ b/frigate/detectors/plugins/hailo8l.py

     

       114
       114
       -
       @@ -22,6 +22,7 @@ except ModuleNotFoundError:

     

       115
       115
       -
        from pydantic import BaseModel, Field

     

       116
       116
       -
        from typing_extensions import Literal

     

       117
       117
       -
        

     

       118
       118
       -
       +from frigate.const import MODEL_CACHE_DIR

     

       119
       119
       -
        from frigate.detectors.detection_api import DetectionApi

     

       120
       120
       -
        from frigate.detectors.detector_config import BaseDetectorConfig

     

       121
       121
       -
        

     

       122
       122
       -
       @@ -57,7 +58,7 @@ class HailoDetector(DetectionApi):

     

       123
       123
       -
                self.h8l_tensor_format = detector_config.model.input_tensor

     

       124
       124
       -
                self.h8l_pixel_format = detector_config.model.input_pixel_format

     

       125
       125
       -
                self.model_url = "https://hailo-model-zoo.s3.eu-west-2.amazonaws.com/ModelZoo/Compiled/v2.11.0/hailo8l/ssd_mobilenet_v1.hef"

     

       126
       126
       -
       -        self.cache_dir = "/config/model_cache/h8l_cache"

     

       127
       127
       -
       +        self.cache_dir = os.path.join(MODEL_CACHE_DIR, "h8l_cache")

     

       128
       128
       -
                self.expected_model_filename = "ssd_mobilenet_v1.hef"

     

       129
       129
       -
                output_type = "FLOAT32"

     

       130
       130
       -
        

     

       131
       131
       -
       diff --git a/frigate/detectors/plugins/openvino.py b/frigate/detectors/plugins/openvino.py

     

       132
       132
       -
       index 51e48530..d199317b 100644

     

       133
       133
       -
       --- a/frigate/detectors/plugins/openvino.py

     

       134
       134
       -
       +++ b/frigate/detectors/plugins/openvino.py

     

       135
       135
       -
       @@ -7,6 +7,7 @@ import openvino.properties as props

     

       136
       136
       -
        from pydantic import Field

     

       137
       137
       -
        from typing_extensions import Literal

     

       138
       138
       -
        

     

       139
       139
       -
       +from frigate.const import MODEL_CACHE_DIR

     

       140
       140
       -
        from frigate.detectors.detection_api import DetectionApi

     

       141
       141
       -
        from frigate.detectors.detector_config import BaseDetectorConfig, ModelTypeEnum

     

       142
       142
       -
        

     

       143
       143
       -
       @@ -35,8 +36,10 @@ class OvDetector(DetectionApi):

     

       144
       144
       -
                    logger.error(f"OpenVino model file {detector_config.model.path} not found.")

     

       145
       145
       -
                    raise FileNotFoundError

     

       146
       146
       -
        

     

       147
       147
       -
       -        os.makedirs("/config/model_cache/openvino", exist_ok=True)

     

       148
       148
       -
       -        self.ov_core.set_property({props.cache_dir: "/config/model_cache/openvino"})

     

       149
       149
       -
       +        os.makedirs(os.path.join(MODEL_CACHE_DIR, "openvino"), exist_ok=True)

     

       150
       150
       -
       +        self.ov_core.set_property(

     

       151
       151
       -
       +            {props.cache_dir: os.path.join(MODEL_CACHE_DIR, "openvino")}

     

       152
       152
       -
       +        )

     

       153
       153
       -
                self.interpreter = self.ov_core.compile_model(

     

       154
       154
       -
                    model=detector_config.model.path, device_name=detector_config.device

     

       155
       155
       -
                )

     

       156
       156
       -
       diff --git a/frigate/detectors/plugins/rknn.py b/frigate/detectors/plugins/rknn.py

     

       157
       157
       -
       index df94d7b6..bc3d9ae0 100644

     

       158
       158
       -
       --- a/frigate/detectors/plugins/rknn.py

     

       159
       159
       -
       +++ b/frigate/detectors/plugins/rknn.py

     

       160
       160
       -
       @@ -6,6 +6,7 @@ from typing import Literal

     

       161
       161
       -
        

     

       162
       162
       -
        from pydantic import Field

     

       163
       163
       -
        

     

       164
       164
       -
       +from frigate.const import MODEL_CACHE_DIR

     

       165
       165
       -
        from frigate.detectors.detection_api import DetectionApi

     

       166
       166
       -
        from frigate.detectors.detector_config import BaseDetectorConfig, ModelTypeEnum

     

       167
       167
       -
        

     

       168
       168
       -
       @@ -17,7 +18,7 @@ supported_socs = ["rk3562", "rk3566", "rk3568", "rk3576", "rk3588"]

     

       169
       169
       -
        

     

       170
       170
       -
        supported_models = {ModelTypeEnum.yolonas: "^deci-fp16-yolonas_[sml]$"}

     

       171
       171
       -
        

     

       172
       172
       -
       -model_cache_dir = "/config/model_cache/rknn_cache/"

     

       173
       173
       -
       +model_cache_dir = os.path.join(MODEL_CACHE_DIR, "rknn_cache/")

     

       174
       174
       -
        

     

       175
       175
       -
        

     

       176
       176
       -
        class RknnDetectorConfig(BaseDetectorConfig):

     

       177
       177
       -
       diff --git a/frigate/detectors/plugins/rocm.py b/frigate/detectors/plugins/rocm.py

     

       178
       178
       -
       index 60118d12..7c87edb5 100644

     

       179
       179
       -
       --- a/frigate/detectors/plugins/rocm.py

     

       180
       180
       -
       +++ b/frigate/detectors/plugins/rocm.py

     

       181
       181
       -
       @@ -9,6 +9,7 @@ import numpy as np

     

       182
       182
       -
        from pydantic import Field

     

       183
       183
       -
        from typing_extensions import Literal

     

       184
       184
       -
        

     

       185
       185
       -
       +from frigate.const import MODEL_CACHE_DIR

     

       186
       186
       -
        from frigate.detectors.detection_api import DetectionApi

     

       187
       187
       -
        from frigate.detectors.detector_config import (

     

       188
       188
       -
            BaseDetectorConfig,

     

       189
       189
       -
       @@ -116,7 +117,7 @@ class ROCmDetector(DetectionApi):

     

       190
       190
       -
        

     

       191
       191
       -
                    logger.info(f"AMD/ROCm: saving parsed model into {mxr_path}")

     

       192
       192
       -
        

     

       193
       193
       -
       -            os.makedirs("/config/model_cache/rocm", exist_ok=True)

     

       194
       194
       -
       +            os.makedirs(os.path.join(MODEL_CACHE_DIR, "rocm"), exist_ok=True)

     

       195
       195
       -
                    migraphx.save(self.model, mxr_path)

     

       196
       196
       -
        

     

       197
       197
       -
                logger.info("AMD/ROCm: model loaded")

     

       198
       198
       -
       diff --git a/frigate/output/birdseye.py b/frigate/output/birdseye.py

     

       199
       199
       -
       index 00f17c8f..8331eb64 100644

     

       200
       200
       -
       --- a/frigate/output/birdseye.py

     

       201
       201
       -
       +++ b/frigate/output/birdseye.py

     

       202
       202
       -
       @@ -16,7 +16,7 @@ import numpy as np

     

       203
       203
       -
        

     

       204
       204
       -
        from frigate.comms.config_updater import ConfigSubscriber

     

       205
       205
       -
        from frigate.config import BirdseyeModeEnum, FfmpegConfig, FrigateConfig

     

       206
       206
       -
       -from frigate.const import BASE_DIR, BIRDSEYE_PIPE

     

       207
       207
       -
       +from frigate.const import BASE_DIR, BIRDSEYE_PIPE, INSTALL_DIR

     

       208
       208
       -
        from frigate.util.image import (

     

       209
       209
       -
            SharedMemoryFrameManager,

     

       210
       210
       -
            copy_yuv_to_position,

     

       211
       211
       -
       @@ -297,7 +297,9 @@ class BirdsEyeFrameManager:

     

       212
       212
       -
                    birdseye_logo = cv2.imread(custom_logo_files[0], cv2.IMREAD_UNCHANGED)

     

       213
       213
       -
        

     

       214
       214
       -
                if birdseye_logo is None:

     

       215
       215
       -
       -            logo_files = glob.glob("/opt/frigate/frigate/images/birdseye.png")

     

       216
       216
       -
       +            logo_files = glob.glob(

     

       217
       217
       -
       +                os.path.join(INSTALL_DIR, "frigate/images/birdseye.png")

     

       218
       218
       -
       +            )

     

       219
       219
       -
        

     

       220
       220
       -
                    if len(logo_files) > 0:

     

       221
       221
       -
                        birdseye_logo = cv2.imread(logo_files[0], cv2.IMREAD_UNCHANGED)

     

       222
       222
       -
       diff --git a/frigate/test/http_api/base_http_test.py b/frigate/test/http_api/base_http_test.py

     

       223
       223
       -
       index e7a1d03e..4fa4a5b5 100644

     

       224
       224
       -
       --- a/frigate/test/http_api/base_http_test.py

     

       225
       225
       -
       +++ b/frigate/test/http_api/base_http_test.py

     

       226
       226
       -
       @@ -9,6 +9,7 @@ from playhouse.sqliteq import SqliteQueueDatabase

     

       227
       227
       -
        

     

       228
       228
       -
        from frigate.api.fastapi_app import create_fastapi_app

     

       229
       229
       -
        from frigate.config import FrigateConfig

     

       230
       230
       -
       +from frigate.const import BASE_DIR, CACHE_DIR

     

       231
       231
       -
        from frigate.models import Event, Recordings, ReviewSegment

     

       232
       232
       -
        from frigate.review.types import SeverityEnum

     

       233
       233
       -
        from frigate.test.const import TEST_DB, TEST_DB_CLEANUPS

     

       234
       234
       -
       @@ -72,19 +73,19 @@ class BaseTestHttp(unittest.TestCase):

     

       235
       235
       -
                                "total": 67.1,

     

       236
       236
       -
                                "used": 16.6,

     

       237
       237
       -
                            },

     

       238
       238
       -
       -                    "/media/frigate/clips": {

     

       239
       239
       -
       +                    os.path.join(BASE_DIR, "clips"): {

     

       240
       240
       -
                                "free": 42429.9,

     

       241
       241
       -
                                "mount_type": "ext4",

     

       242
       242
       -
                                "total": 244529.7,

     

       243
       243
       -
                                "used": 189607.0,

     

       244
       244
       -
                            },

     

       245
       245
       -
       -                    "/media/frigate/recordings": {

     

       246
       246
       -
       +                    os.path.join(BASE_DIR, "recordings"): {

     

       247
       247
       -
                                "free": 0.2,

     

       248
       248
       -
                                "mount_type": "ext4",

     

       249
       249
       -
                                "total": 8.0,

     

       250
       250
       -
                                "used": 7.8,

     

       251
       251
       -
                            },

     

       252
       252
       -
       -                    "/tmp/cache": {

     

       253
       253
       -
       +                    CACHE_DIR: {

     

       254
       254
       -
                                "free": 976.8,

     

       255
       255
       -
                                "mount_type": "tmpfs",

     

       256
       256
       -
                                "total": 1000.0,

     

       257
       257
       -
       diff --git a/frigate/test/test_config.py b/frigate/test/test_config.py

     

       258
       258
       -
       index e6cb1274..5a3deefd 100644

     

       259
       259
       -
       --- a/frigate/test/test_config.py

     

       260
       260
       -
       +++ b/frigate/test/test_config.py

     

       261
       261
       -
       @@ -854,9 +854,9 @@ class TestConfig(unittest.TestCase):

     

       262
       262
       -
                assert frigate_config.model.merged_labelmap[0] == "person"

     

       263
       263
       -
        

     

       264
       264
       -
            def test_plus_labelmap(self):

     

       265
       265
       -
       -        with open("/config/model_cache/test", "w") as f:

     

       266
       266
       -
       +        with open(os.path.join(MODEL_CACHE_DIR, "test"), "w") as f:

     

       267
       267
       -
                    json.dump(self.plus_model_info, f)

     

       268
       268
       -
       -        with open("/config/model_cache/test.json", "w") as f:

     

       269
       269
       -
       +        with open(os.path.join(MODEL_CACHE_DIR, "test.json"), "w") as f:

     

       270
       270
       -
                    json.dump(self.plus_model_info, f)

     

       271
       271
       -
        

     

       272
       272
       -
                config = {

     

       273
       273
       -
       diff --git a/frigate/test/test_http.py b/frigate/test/test_http.py

     

       274
       274
       -
       index 21379425..66f9d22a 100644

     

       275
       275
       -
       --- a/frigate/test/test_http.py

     

       276
       276
       -
       +++ b/frigate/test/test_http.py

     

       277
       277
       -
       @@ -12,6 +12,7 @@ from playhouse.sqliteq import SqliteQueueDatabase

     

       278
       278
       -
        

     

       279
       279
       -
        from frigate.api.fastapi_app import create_fastapi_app

     

       280
       280
       -
        from frigate.config import FrigateConfig

     

       281
       281
       -
       +from frigate.const import BASE_DIR, CACHE_DIR

     

       282
       282
       -
        from frigate.models import Event, Recordings, Timeline

     

       283
       283
       -
        from frigate.stats.emitter import StatsEmitter

     

       284
       284
       -
        from frigate.test.const import TEST_DB, TEST_DB_CLEANUPS

     

       285
       285
       -
       @@ -76,19 +77,19 @@ class TestHttp(unittest.TestCase):

     

       286
       286
       -
                                "total": 67.1,

     

       287
       287
       -
                                "used": 16.6,

     

       288
       288
       -
                            },

     

       289
       289
       -
       -                    "/media/frigate/clips": {

     

       290
       290
       -
       +                    os.path.join(BASE_DIR, "clips"): {

     

       291
       291
       -
                                "free": 42429.9,

     

       292
       292
       -
                                "mount_type": "ext4",

     

       293
       293
       -
                                "total": 244529.7,

     

       294
       294
       -
                                "used": 189607.0,

     

       295
       295
       -
                            },

     

       296
       296
       -
       -                    "/media/frigate/recordings": {

     

       297
       297
       -
       +                    os.path.join(BASE_DIR, "recordings"): {

     

       298
       298
       -
                                "free": 0.2,

     

       299
       299
       -
                                "mount_type": "ext4",

     

       300
       300
       -
                                "total": 8.0,

     

       301
       301
       -
                                "used": 7.8,

     

       302
       302
       -
                            },

     

       303
       303
       -
       -                    "/tmp/cache": {

     

       304
       304
       -
       +                    CACHE_DIR: {

     

       305
       305
       -
                                "free": 976.8,

     

       306
       306
       -
                                "mount_type": "tmpfs",

     

       307
       307
       -
                                "total": 1000.0,

     

       308
       308
       -
       diff --git a/frigate/util/config.py b/frigate/util/config.py

     

       309
       309
       -
       index d456c755..b6b270c9 100644

     

       310
       310
       -
       --- a/frigate/util/config.py

     

       311
       311
       -
       +++ b/frigate/util/config.py

     

       312
       312
       -
       @@ -14,7 +14,7 @@ from frigate.util.services import get_video_properties

     

       313
       313
       -
        logger = logging.getLogger(__name__)

     

       314
       314
       -
        

     

       315
       315
       -
        CURRENT_CONFIG_VERSION = "0.15-1"

     

       316
       316
       -
       -DEFAULT_CONFIG_FILE = "/config/config.yml"

     

       317
       317
       -
       +DEFAULT_CONFIG_FILE = os.path.join(CONFIG_DIR, "config.yml")

     

       318
       318
       -
        

     

       319
       319
       -
        

     

       320
       320
       -
        def find_config_file() -> str:

     

       321
       321
       -
       diff --git a/frigate/util/model.py b/frigate/util/model.py

     

       322
       322
       -
       index ce2c9538..6e93cb38 100644

     

       323
       323
       -
       --- a/frigate/util/model.py

     

       324
       324
       -
       +++ b/frigate/util/model.py

     

       325
       325
       -
       @@ -12,6 +12,8 @@ except ImportError:

     

       326
       326
       -
            # openvino is not included

     

       327
       327
       -
            pass

     

       328
       328
       -
        

     

       329
       329
       -
       +from frigate.const import MODEL_CACHE_DIR

     

       330
       330
       -
       +

     

       331
       331
       -
        logger = logging.getLogger(__name__)

     

       332
       332
       -
        

     

       333
       333
       -
        

     

       334
       334
       -
       @@ -46,7 +48,8 @@ def get_ort_providers(

     

       335
       335
       -
                    # so it is not enabled by default

     

       336
       336
       -
                    if device == "Tensorrt":

     

       337
       337
       -
                        os.makedirs(

     

       338
       338
       -
       -                    "/config/model_cache/tensorrt/ort/trt-engines", exist_ok=True

     

       339
       339
       -
       +                    os.path.join(MODEL_CACHE_DIR, "tensorrt/ort/trt-engines"),

     

       340
       340
       -
       +                    exist_ok=True,

     

       341
       341
       -
                        )

     

       342
       342
       -
                        device_id = 0 if not device.isdigit() else int(device)

     

       343
       343
       -
                        providers.append(provider)

     

       344
       344
       -
       @@ -57,19 +60,23 @@ def get_ort_providers(

     

       345
       345
       -
                                and os.environ.get("USE_FP_16", "True") != "False",

     

       346
       346
       -
                                "trt_timing_cache_enable": True,

     

       347
       347
       -
                                "trt_engine_cache_enable": True,

     

       348
       348
       -
       -                        "trt_timing_cache_path": "/config/model_cache/tensorrt/ort",

     

       349
       349
       -
       -                        "trt_engine_cache_path": "/config/model_cache/tensorrt/ort/trt-engines",

     

       350
       350
       -
       +                        "trt_timing_cache_path": os.path.join(

     

       351
       351
       -
       +                            MODEL_CACHE_DIR, "tensorrt/ort"

     

       352
       352
       -
       +                        ),

     

       353
       353
       -
       +                        "trt_engine_cache_path": os.path.join(

     

       354
       354
       -
       +                            MODEL_CACHE_DIR, "tensorrt/ort/trt-engines"

     

       355
       355
       -
       +                        ),

     

       356
       356
       -
                            }

     

       357
       357
       -
                        )

     

       358
       358
       -
                    else:

     

       359
       359
       -
                        continue

     

       360
       360
       -
                elif provider == "OpenVINOExecutionProvider":

     

       361
       361
       -
       -            os.makedirs("/config/model_cache/openvino/ort", exist_ok=True)

     

       362
       362
       -
       +            os.makedirs(os.path.join(MODEL_CACHE_DIR, "openvino/ort"), exist_ok=True)

     

       363
       363
       -
                    providers.append(provider)

     

       364
       364
       -
                    options.append(

     

       365
       365
       -
                        {

     

       366
       366
       -
                            "arena_extend_strategy": "kSameAsRequested",

     

       367
       367
       -
       -                    "cache_dir": "/config/model_cache/openvino/ort",

     

       368
       368
       -
       +                    "cache_dir": os.path.join(MODEL_CACHE_DIR, "openvino/ort"),

     

       369
       369
       -
                            "device_type": device,

     

       370
       370
       -
                        }

     

       371
       371
       -
                    )

     

       372
       372
       -
       @@ -103,7 +110,7 @@ class ONNXModelRunner:

     

       373
       373
       -
                        self.type = "ov"

     

       374
       374
       -
                        self.ov = ov.Core()

     

       375
       375
       -
                        self.ov.set_property(

     

       376
       376
       -
       -                    {ov.properties.cache_dir: "/config/model_cache/openvino"}

     

       377
       377
       -
       +                    {ov.properties.cache_dir: os.path.join(MODEL_CACHE_DIR, "openvino")}

     

       378
       378
       -
                        )

     

       379
       379
       -
                        self.interpreter = self.ov.compile_model(

     

       380
       380
       -
                            model=model_path, device_name=device

+39

pkgs/by-name/fr/frigate/ffmpeg.patch

···

       1
       1
       +
       diff --git a/frigate/config/camera/ffmpeg.py b/frigate/config/camera/ffmpeg.py

     

       2
       2
       +
       index 04bbfac7..4390a571 100644

     

       3
       3
       +
       --- a/frigate/config/camera/ffmpeg.py

     

       4
       4
       +
       +++ b/frigate/config/camera/ffmpeg.py

     

       5
       5
       +
       @@ -70,18 +70,14 @@ class FfmpegConfig(FrigateBaseModel):

     

       6
       6
       +
            @property

     

       7
       7
       +
            def ffmpeg_path(self) -> str:

     

       8
       8
       +
                if self.path == "default":

     

       9
       9
       +
       -            return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg"

     

       10
       10
       +
       -        elif self.path in INCLUDED_FFMPEG_VERSIONS:

     

       11
       11
       +
       -            return f"/usr/lib/ffmpeg/{self.path}/bin/ffmpeg"

     

       12
       12
       +
       +            return "@ffmpeg@"

     

       13
       13
       +
                else:

     

       14
       14
       +
                    return f"{self.path}/bin/ffmpeg"

     

       15
       15
       +
        

     

       16
       16
       +
            @property

     

       17
       17
       +
            def ffprobe_path(self) -> str:

     

       18
       18
       +
                if self.path == "default":

     

       19
       19
       +
       -            return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffprobe"

     

       20
       20
       +
       -        elif self.path in INCLUDED_FFMPEG_VERSIONS:

     

       21
       21
       +
       -            return f"/usr/lib/ffmpeg/{self.path}/bin/ffprobe"

     

       22
       22
       +
       +            return "@ffprobe@"

     

       23
       23
       +
                else:

     

       24
       24
       +
                    return f"{self.path}/bin/ffprobe"

     

       25
       25
       +
        

     

       26
       26
       +
       diff --git a/frigate/record/export.py b/frigate/record/export.py

     

       27
       27
       +
       index 0d3f96da..09cadbcd 100644

     

       28
       28
       +
       --- a/frigate/record/export.py

     

       29
       29
       +
       +++ b/frigate/record/export.py

     

       30
       30
       +
       @@ -126,7 +126,7 @@ class RecordingExporter(threading.Thread):

     

       31
       31
       +
                    minutes = int(diff / 60)

     

       32
       32
       +
                    seconds = int(diff % 60)

     

       33
       33
       +
                    ffmpeg_cmd = [

     

       34
       34
       +
       -                "/usr/lib/ffmpeg/7.0/bin/ffmpeg",  # hardcode path for exports thumbnail due to missing libwebp support

     

       35
       35
       +
       +                "@ffmpeg@",  # hardcode path for exports thumbnail due to missing libwebp support

     

       36
       36
       +
                        "-hide_banner",

     

       37
       37
       +
                        "-loglevel",

     

       38
       38
       +
                        "warning",

     

       39
       39
       +
       ~

+38 -25

pkgs/by-name/fr/frigate/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         stdenv,

     

       4
       4
        
         callPackage,

     

       5
       5
       -
         python312,

     

       5
       5
       +
         replaceVars,

     

       6
       6
       +
         python312Packages,

     

       6
       7
        
         fetchFromGitHub,

     

       7
       8
        
         fetchurl,

     

       8
       8
       -
         rocmPackages,

     

       9
       9
       +
         ffmpeg-headless,

     

       9
       10
        
         sqlite-vec,

     

       10
       11
        
         frigate,

     

       11
       12
        
         nixosTests,

     

       12
       13
        
       }:

     

       13
       14
        
       

     

       14
       15
        
       let

     

       15
       15
       -
         version = "0.15.2";

     

       16
       16
       +
         version = "0.16.0";

     

       16
       17
        
       

     

       17
       18
        
         src = fetchFromGitHub {

     

       18
       19
        
           name = "frigate-${version}-source";

     

       19
       20
        
           owner = "blakeblackshear";

     

       20
       21
        
           repo = "frigate";

     

       21
       22
        
           tag = "v${version}";

     

       22
       22
       -
           hash = "sha256-YJFtMVCTtp8h9a9RmkcoZSQ+nIKb5o/4JVynVslkx78=";

     

       23
       23
       +
           hash = "sha256-O1rOFRrS3hDbf4fVgfz+KASo20R1aqbDoIf3JKQ1jhs=";

     

       23
       24
        
         };

     

       24
       25
        
       

     

       25
       26
        
         frigate-web = callPackage ./web.nix {

     

       26
       27
        
           inherit version src;

     

       27
       28
        
         };

     

       28
       29
        
       

     

       29
       29
       -
         python = python312;

     

       30
       30
       +
         python = python312Packages.python;

     

       30
       31
        
       

     

       31
       32
        
         # Tensorflow audio model

     

       32
       33
        
         # https://github.com/blakeblackshear/frigate/blob/v0.15.0/docker/main/Dockerfile#L125

     
···

       55
       56
        
           hash = "sha256-5Cj2vEiWR8Z9d2xBmVoLZuNRv4UOuxHSGZQWTJorXUQ=";

     

       56
       57
        
         };

     

       57
       58
        
       in

     

       58
       58
       -
       python.pkgs.buildPythonApplication rec {

     

       59
       59
       +
       python312Packages.buildPythonApplication rec {

     

       59
       60
        
         pname = "frigate";

     

       60
       61
        
         inherit version;

     

       61
       62
        
         format = "other";

     

       62
       63
        
       

     

       63
       64
        
         inherit src;

     

       64
       65
        
       

     

       65
       65
       -
         patches = [ ./constants.patch ];

     

       66
       66
       +
         patches = [

     

       67
       67
       +
           ./constants.patch

     

       68
       68
       +
       

     

       69
       69
       +
           (replaceVars ./ffmpeg.patch {

     

       70
       70
       +
             ffmpeg = lib.getExe ffmpeg-headless;

     

       71
       71
       +
             ffprobe = lib.getExe' ffmpeg-headless "ffprobe";

     

       72
       72
       +
           })

     

       73
       73
       +
         ];

     

       66
       74
        
       

     

       67
       75
        
         postPatch = ''

     

       68
       76
        
           echo 'VERSION = "${version}"' > frigate/version.py

     
···

       86
       94
        
           substituteInPlace frigate/db/sqlitevecq.py \

     

       87
       95
        
             --replace-fail "/usr/local/lib/vec0" "${lib.getLib sqlite-vec}/lib/vec0${stdenv.hostPlatform.extensions.sharedLibrary}"

     

       88
       96
        
       

     

       89
       89
       -
         ''

     

       90
       90
       -
         # clang-rocm, provided by `rocmPackages.clr`, only works on x86_64-linux specifically

     

       91
       91
       -
         + lib.optionalString (with stdenv.hostPlatform; isx86_64 && isLinux) ''

     

       92
       92
       -
           substituteInPlace frigate/detectors/plugins/rocm.py \

     

       93
       93
       -
             --replace-fail "/opt/rocm/bin/rocminfo" "rocminfo" \

     

       94
       94
       -
             --replace-fail "/opt/rocm/lib" "${rocmPackages.clr}/lib"

     

       95
       95
       -
       

     

       96
       96
       -
         ''

     

       97
       97
       -
         + ''

     

       98
       97
        
           # provide default paths for models and maps that are shipped with frigate

     

       99
       98
        
           substituteInPlace frigate/config/config.py \

     

       100
       99
        
             --replace-fail "/cpu_model.tflite" "${tflite_cpu_model}" \

     
···

       106
       105
        
           substituteInPlace frigate/events/audio.py \

     

       107
       106
        
             --replace-fail "/cpu_audio_model.tflite" "${placeholder "out"}/share/frigate/cpu_audio_model.tflite" \

     

       108
       107
        
             --replace-fail "/audio-labelmap.txt" "${placeholder "out"}/share/frigate/audio-labelmap.txt"

     

       109
       109
       -
       

     

       110
       110
       -
           # work around onvif-zeep idiosyncrasy

     

       111
       111
       -
           substituteInPlace frigate/ptz/onvif.py \

     

       112
       112
       -
             --replace-fail dist-packages site-packages

     

       113
       108
        
         '';

     

       114
       109
        
       

     

       115
       110
        
         dontBuild = true;

     

       116
       111
        
       

     

       117
       117
       -
         dependencies = with python.pkgs; [

     

       112
       112
       +
         dependencies = with python312Packages; [

     

       118
       113
        
           # docker/main/requirements.txt

     

       119
       114
        
           scikit-build

     

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

     

       116
       116
       +
           aiofiles

     

       121
       117
        
           aiohttp

     

       118
       118
       +
           appdirs

     

       119
       119
       +
           argcomplete

     

       120
       120
       +
           contextlib2

     

       122
       121
        
           click

     

       122
       122
       +
           distlib

     

       123
       123
        
           fastapi

     

       124
       124
       +
           filelock

     

       125
       125
       +
           future

     

       126
       126
       +
           importlib-metadata

     

       127
       127
       +
           importlib-resources

     

       124
       128
        
           google-generativeai

     

       125
       125
       -
           imutils

     

       126
       129
        
           joserfc

     

       130
       130
       +
           levenshtein

     

       127
       131
        
           markupsafe

     

       132
       132
       +
           netaddr

     

       133
       133
       +
           netifaces

     

       128
       134
        
           norfair

     

       129
       135
        
           numpy

     

       130
       136
        
           ollama

     

       131
       137
        
           onnxruntime

     

       132
       132
       -
           onvif-zeep

     

       138
       138
       +
           onvif-zeep-async

     

       133
       139
        
           openai

     

       134
       140
        
           opencv4

     

       135
       141
        
           openvino

     
···

       138
       144
        
           pathvalidate

     

       139
       145
        
           peewee

     

       140
       146
        
           peewee-migrate

     

       147
       147
       +
           prometheus-client

     

       141
       148
        
           psutil

     

       142
       149
        
           py3nvml

     

       150
       150
       +
           pyclipper

     

       143
       151
        
           pydantic

     

       152
       152
       +
           python-multipart

     

       144
       153
        
           pytz

     

       145
       154
        
           py-vapid

     

       146
       155
        
           pywebpush

     
···

       149
       158
        
           ruamel-yaml

     

       150
       159
        
           scipy

     

       151
       160
        
           setproctitle

     

       161
       161
       +
           shapely

     

       152
       162
        
           slowapi

     

       153
       163
        
           starlette

     

       154
       164
        
           starlette-context

     

       155
       165
        
           tensorflow-bin

     

       166
       166
       +
           titlecase

     

       156
       167
        
           transformers

     

       157
       168
        
           tzlocal

     

       158
       169
        
           unidecode

     

       159
       170
        
           uvicorn

     

       171
       171
       +
           verboselogs

     

       172
       172
       +
           virtualenv

     

       160
       173
        
           ws4py

     

       161
       174
        
         ];

     

       162
       175
        
       

     
···

       178
       191
        
           runHook postInstall

     

       179
       192
        
         '';

     

       180
       193
        
       

     

       181
       181
       -
         nativeCheckInputs = with python.pkgs; [

     

       194
       194
       +
         nativeCheckInputs = with python312Packages; [

     

       182
       195
        
           pytestCheckHook

     

       183
       196
        
         ];

     

       184
       197
        
       

     
···

       200
       213
        
         passthru = {

     

       201
       214
        
           web = frigate-web;

     

       202
       215
        
           inherit python;

     

       203
       203
       -
           pythonPath = (python.pkgs.makePythonPath dependencies) + ":${frigate}/${python.sitePackages}";

     

       216
       216
       +
           pythonPath = (python312Packages.makePythonPath dependencies) + ":${frigate}/${python.sitePackages}";

     

       204
       217
        
           tests = {

     

       205
       218
        
             inherit (nixosTests) frigate;

     

       206
       219
        
           };

+1 -1

pkgs/by-name/fr/frigate/web.nix

···

       30
       30
        
             --replace-fail "/tmp/cache" "/var/cache/frigate"

     

       31
       31
        
         '';

     

       32
       32
        
       

     

       33
       33
       -
         npmDepsHash = "sha256-tPwydUJtFDJs17q0haJaUVEkxua+nHfmwQ9Z9Y24ca8=";

     

       33
       33
       +
         npmDepsHash = "sha256-CrK/6BaKmKIxlohEZdGEEKJkioszBUupyKQx4nBeLqI=";

     

       34
       34
        
       

     

       35
       35
        
         installPhase = ''

     

       36
       36
        
           cp -rv dist/ $out

+1 -1

pkgs/by-name/fr/froide/package.nix

···

       135
       135
        
         '';

     

       136
       136
        
       

     

       137
       137
        
         nativeCheckInputs = with python.pkgs; [

     

       138
       138
       -
           (postgresql.withPackages (p: [ p.postgis ]))

     

       138
       138
       +
           (postgresql.withPackages (p: [ p.postgis ])).out

     

       139
       139
        
           postgresqlTestHook

     

       140
       140
        
           pytest-django

     

       141
       141
        
           pytest-playwright

+76 -65

pkgs/by-name/pa/paperless-ngx/package.nix

···

       24
       24
        
         xcbuild,

     

       25
       25
        
         pango,

     

       26
       26
        
         pkg-config,

     

       27
       27
       +
         symlinkJoin,

     

       27
       28
        
         nltk-data,

     

       28
       29
        
         xorg,

     

       29
       30
        
       }:

     

       30
       31
        
       let

     

       31
       31
       -
         version = "2.17.1";

     

       32
       32
       +
         version = "2.18.1";

     

       32
       33
        
       

     

       33
       34
        
         src = fetchFromGitHub {

     

       34
       35
        
           owner = "paperless-ngx";

     

       35
       36
        
           repo = "paperless-ngx";

     

       36
       37
        
           tag = "v${version}";

     

       37
       37
       -
           hash = "sha256-6FvP/HgomsPxqCtKrZFxMlD2fFyT2e/JII2L7ANiOao=";

     

       38
       38
       +
           hash = "sha256-POHF00cV8pl6i1rcwxtZ+Q1AlLybDj6gSlL0lPwSSCo=";

     

       38
       39
        
         };

     

       39
       40
        
       

     

       40
       41
        
         python = python3.override {

     

       41
       42
        
           self = python;

     

       42
       43
        
           packageOverrides = final: prev: {

     

       43
       43
       -
             django = prev.django_5_1;

     

       44
       44
       +
             django = prev.django_5_2;

     

       44
       45
        
       

     

       45
       46
        
             fido2 = prev.fido2.overridePythonAttrs {

     

       46
       47
        
               version = "1.2.0";

     
···

       71
       72
        
           poppler-utils

     

       72
       73
        
         ];

     

       73
       74
        
       

     

       74
       74
       -
         frontend =

     

       75
       75
       -
           let

     

       76
       76
       -
             frontendSrc = src + "/src-ui";

     

       77
       77
       -
           in

     

       78
       78
       -
           stdenv.mkDerivation rec {

     

       79
       79
       -
             pname = "paperless-ngx-frontend";

     

       80
       80
       -
             inherit version;

     

       75
       75
       +
         frontend = stdenv.mkDerivation (finalAttrs: {

     

       76
       76
       +
           pname = "paperless-ngx-frontend";

     

       77
       77
       +
           inherit version;

     

       81
       78
        
       

     

       82
       82
       -
             src = frontendSrc;

     

       79
       79
       +
           src = src + "/src-ui";

     

       83
       80
        
       

     

       84
       84
       -
             pnpmDeps = pnpm.fetchDeps {

     

       85
       85
       -
               inherit pname version src;

     

       86
       86
       -
               fetcherVersion = 1;

     

       87
       87
       -
               hash = "sha256-VtYYwpMXPAC3g1OESnw3dzLTwiGqJBQcicFZskEucok=";

     

       88
       88
       -
             };

     

       81
       81
       +
           pnpmDeps = pnpm.fetchDeps {

     

       82
       82
       +
             inherit (finalAttrs) pname version src;

     

       83
       83
       +
             fetcherVersion = 1;

     

       84
       84
       +
             hash = "sha256-bx/jXlG3lRiwKyz1M0dU00Xn5xaeALSIxIAGzo8gAgo=";

     

       85
       85
       +
           };

     

       86
       86
       +
       

     

       87
       87
       +
           nativeBuildInputs = [

     

       88
       88
       +
             node-gyp

     

       89
       89
       +
             nodejs_20

     

       90
       90
       +
             pkg-config

     

       91
       91
       +
             pnpm.configHook

     

       92
       92
       +
             python3

     

       93
       93
       +
           ]

     

       94
       94
       +
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       95
       95
       +
             xcbuild

     

       96
       96
       +
           ];

     

       89
       97
        
       

     

       90
       90
       -
             nativeBuildInputs = [

     

       91
       91
       -
               node-gyp

     

       92
       92
       -
               nodejs_20

     

       93
       93
       -
               pkg-config

     

       94
       94
       -
               pnpm.configHook

     

       95
       95
       -
               python3

     

       96
       96
       -
             ]

     

       97
       97
       -
             ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       98
       98
       -
               xcbuild

     

       99
       99
       -
             ];

     

       98
       98
       +
           buildInputs = [

     

       99
       99
       +
             pango

     

       100
       100
       +
           ]

     

       101
       101
       +
           ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       102
       102
       +
             giflib

     

       103
       103
       +
           ];

     

       100
       104
        
       

     

       101
       101
       -
             buildInputs = [

     

       102
       102
       -
               pango

     

       103
       103
       -
             ]

     

       104
       104
       -
             ++ lib.optionals stdenv.hostPlatform.isDarwin [

     

       105
       105
       -
               giflib

     

       106
       106
       -
             ];

     

       105
       105
       +
           CYPRESS_INSTALL_BINARY = "0";

     

       106
       106
       +
           NG_CLI_ANALYTICS = "false";

     

       107
       107
        
       

     

       108
       108
       -
             CYPRESS_INSTALL_BINARY = "0";

     

       109
       109
       -
             NG_CLI_ANALYTICS = "false";

     

       108
       108
       +
           buildPhase = ''

     

       109
       109
       +
             runHook preBuild

     

       110
       110
        
       

     

       111
       111
       -
             buildPhase = ''

     

       112
       112
       -
               runHook preBuild

     

       111
       111
       +
             pushd node_modules/canvas

     

       112
       112
       +
             node-gyp rebuild

     

       113
       113
       +
             popd

     

       113
       114
        
       

     

       114
       114
       -
               pushd node_modules/canvas

     

       115
       115
       -
               node-gyp rebuild

     

       116
       116
       -
               popd

     

       115
       115
       +
             # cat forcefully disables angular cli's spinner which doesn't work with nix' tty which is 0x0

     

       116
       116
       +
             pnpm run build --configuration production | cat

     

       117
       117
        
       

     

       118
       118
       -
               pnpm run build --configuration production

     

       118
       118
       +
             runHook postBuild

     

       119
       119
       +
           '';

     

       119
       120
        
       

     

       120
       120
       -
               runHook postBuild

     

       121
       121
       -
             '';

     

       121
       121
       +
           doCheck = true;

     

       122
       122
       +
           checkPhase = ''

     

       123
       123
       +
             runHook preCheck

     

       122
       124
        
       

     

       123
       123
       -
             doCheck = true;

     

       124
       124
       -
             checkPhase = ''

     

       125
       125
       -
               runHook preCheck

     

       125
       125
       +
             pnpm run test | cat

     

       126
       126
        
       

     

       127
       127
       -
               pnpm run test

     

       127
       127
       +
             runHook postCheck

     

       128
       128
       +
           '';

     

       128
       129
        
       

     

       129
       129
       -
               runHook postCheck

     

       130
       130
       -
             '';

     

       130
       130
       +
           installPhase = ''

     

       131
       131
       +
             runHook preInstall

     

       131
       132
        
       

     

       132
       132
       -
             installPhase = ''

     

       133
       133
       -
               runHook preInstall

     

       133
       133
       +
             mkdir -p $out/lib/paperless-ui

     

       134
       134
       +
             mv ../src/documents/static/frontend $out/lib/paperless-ui/

     

       134
       135
        
       

     

       135
       135
       -
               mkdir -p $out/lib/paperless-ui

     

       136
       136
       -
               mv ../src/documents/static/frontend $out/lib/paperless-ui/

     

       136
       136
       +
             runHook postInstall

     

       137
       137
       +
           '';

     

       138
       138
       +
         });

     

       137
       139
        
       

     

       138
       138
       -
               runHook postInstall

     

       139
       139
       -
             '';

     

       140
       140
       -
           };

     

       140
       140
       +
         nltkDataDir = symlinkJoin {

     

       141
       141
       +
           name = "paperless_ngx_nltk_data";

     

       142
       142
       +
           paths = with nltk-data; [

     

       143
       143
       +
             punkt-tab

     

       144
       144
       +
             snowball-data

     

       145
       145
       +
             stopwords

     

       146
       146
       +
           ];

     

       147
       147
       +
         };

     

       141
       148
        
       in

     

       142
       149
        
       python.pkgs.buildPythonApplication rec {

     

       143
       150
        
         pname = "paperless-ngx";

     
···

       161
       168
        
           fi

     

       162
       169
        
           substituteInPlace pyproject.toml \

     

       163
       170
        
             --replace-fail '"--numprocesses=auto",' "" \

     

       164
       164
       -
             --replace-fail '--maxprocesses=16' "--numprocesses=$NIX_BUILD_CORES" \

     

       165
       165
       -
             --replace-fail "djangorestframework-guardian~=0.3.0" "djangorestframework-guardian2"

     

       171
       171
       +
             --replace-fail '--maxprocesses=16' "--numprocesses=$NIX_BUILD_CORES"

     

       166
       172
        
         '';

     

       167
       173
        
       

     

       168
       174
        
         nativeBuildInputs = [

     
···

       171
       177
        
         ];

     

       172
       178
        
       

     

       173
       179
        
         pythonRelaxDeps = [

     

       180
       180
       +
           "django"

     

       174
       181
        
           "django-allauth"

     

       175
       182
        
           "django-auditlog"

     

       176
       183
        
           "django-guardian"

     
···

       185
       192
        
         dependencies =

     

       186
       193
        
           with python.pkgs;

     

       187
       194
        
           [

     

       195
       195
       +
             babel

     

       188
       196
        
             bleach

     

       189
       197
        
             channels

     

       190
       198
        
             channels-redis

     
···

       204
       212
        
               }

     

       205
       213
        
             ))

     

       206
       214
        
             django-auditlog

     

       215
       215
       +
             django-cachalot

     

       207
       216
        
             django-celery-results

     

       208
       217
        
             django-compression-middleware

     

       209
       218
        
             django-cors-headers

     
···

       213
       222
        
             django-multiselectfield

     

       214
       223
        
             django-soft-delete

     

       215
       224
        
             djangorestframework

     

       216
       216
       -
             djangorestframework-guardian2

     

       225
       225
       +
             djangorestframework-guardian

     

       217
       226
        
             drf-spectacular

     

       218
       227
        
             drf-spectacular-sidecar

     

       219
       228
        
             drf-writable-nested

     
···

       232
       241
        
             pathvalidate

     

       233
       242
        
             pdf2image

     

       234
       243
        
             psycopg

     

       244
       244
       +
             psycopg-pool

     

       235
       245
        
             python-dateutil

     

       236
       246
        
             python-dotenv

     

       237
       247
        
             python-gnupg

     
···

       320
       330
        
           export PATH="${path}:$PATH"

     

       321
       331
        
           export HOME=$(mktemp -d)

     

       322
       332
        
           export XDG_DATA_DIRS="${liberation_ttf}/share:$XDG_DATA_DIRS"

     

       333
       333
       +
           export PAPERLESS_NLTK_DIR=${passthru.nltkDataDir}

     

       323
       334
        
         '';

     

       324
       335
        
       

     

       325
       336
        
         disabledTests = [

     
···

       337
       348
        
           # Favicon tests fail due to static file handling in the test environment

     

       338
       349
        
           "test_favicon_view"

     

       339
       350
        
           "test_favicon_view_missing_file"

     

       351
       351
       +
           # Requires DNS

     

       352
       352
       +
           "test_send_webhook_data_or_json"

     

       353
       353
       +
           "test_workflow_webhook_send_webhook_retry"

     

       354
       354
       +
           "test_workflow_webhook_send_webhook_task"

     

       340
       355
        
         ];

     

       341
       356
        
       

     

       342
       357
        
         doCheck = !stdenv.hostPlatform.isDarwin;

     

       343
       358
        
       

     

       344
       359
        
         passthru = {

     

       345
       360
        
           inherit

     

       346
       346
       -
             python

     

       347
       347
       -
             path

     

       348
       361
        
             frontend

     

       362
       362
       +
             nltkDataDir

     

       363
       363
       +
             path

     

       364
       364
       +
             python

     

       349
       365
        
             tesseract5

     

       350
       366
        
             ;

     

       351
       351
       -
           nltkData = with nltk-data; [

     

       352
       352
       -
             punkt-tab

     

       353
       353
       -
             snowball-data

     

       354
       354
       -
             stopwords

     

       355
       355
       -
           ];

     

       356
       367
        
           tests = { inherit (nixosTests) paperless; };

     

       357
       368
        
         };

     

       358
       369

+6 -2

pkgs/by-name/vi/victoriametrics/package.nix

···

       13
       13
        
       

     

       14
       14
        
       buildGoModule (finalAttrs: {

     

       15
       15
        
         pname = "VictoriaMetrics";

     

       16
       16
       -
         version = "1.123.0";

     

       16
       16
       +
         version = "1.124.0";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "VictoriaMetrics";

     

       20
       20
        
           repo = "VictoriaMetrics";

     

       21
       21
        
           tag = "v${finalAttrs.version}";

     

       22
       22
       -
           hash = "sha256-GUVRMlF94BaZSVfz4Z+IBSpf6WuA5o1WQQmeZAqKZ1g=";

     

       22
       22
       +
           hash = "sha256-f0Mf/4cFnJ/3I8z/4UhhNJnSCau9Q7mFfR32lP9/yi0=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         vendorHash = null;

     
···

       50
       50
        
           #

     

       51
       51
        
           # This appears to be some kind of test server for development purposes only.

     

       52
       52
        
           rm -f app/vmui/packages/vmui/web/{go.mod,main.go}

     

       53
       53
       +
       

     

       54
       54
       +
           # Allow older go versions

     

       55
       55
       +
           substituteInPlace go.mod \

     

       56
       56
       +
             --replace-fail "go 1.24.6" "go ${finalAttrs.passthru.go.version}"

     

       53
       57
        
       

     

       54
       58
        
           # Increase timeouts in tests to prevent failure on heavily loaded builders

     

       55
       59
        
           substituteInPlace lib/storage/storage_test.go \

+16

pkgs/by-name/xw/xwin/package.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         rustPlatform,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       +
         openssl,

     

       6
       6
       +
         pkg-config,

     

       5
       7
        
         versionCheckHook,

     

       6
       8
        
       }:

     

       7
       9
        
       rustPlatform.buildRustPackage (finalAttrs: {

     
···

       16
       18
        
         };

     

       17
       19
        
       

     

       18
       20
        
         cargoHash = "sha256-77ArdZ9mOYEon4nzNUNSL0x0UlE1iVujFLwreAd9iMM=";

     

       21
       21
       +
       

     

       22
       22
       +
         strictDeps = true;

     

       23
       23
       +
         nativeBuildInputs = [

     

       24
       24
       +
           pkg-config

     

       25
       25
       +
         ];

     

       26
       26
       +
       

     

       27
       27
       +
         buildInputs = [

     

       28
       28
       +
           openssl

     

       29
       29
       +
         ];

     

       30
       30
       +
       

     

       31
       31
       +
         buildNoDefaultFeatures = true;

     

       32
       32
       +
         buildFeatures = [

     

       33
       33
       +
           "native-tls"

     

       34
       34
       +
         ];

     

       19
       35
        
       

     

       20
       36
        
         doCheck = true;

     

       21
       37
        
         # Requires network access

+4 -1

pkgs/development/compilers/graalvm/default.nix

···

       28
       28
        
               (prev: {

     

       29
       29
        
                 autoPatchelfIgnoreMissingDeps = [ "libonnxruntime.so.1" ];

     

       30
       30
        
               });

     

       31
       31
       +
           graalvm-oracle_24 = (self.callPackage ./graalvm-oracle { version = "24"; }).overrideAttrs (prev: {

     

       32
       32
       +
             autoPatchelfIgnoreMissingDeps = [ "libonnxruntime.so.1.18.0" ];

     

       33
       33
       +
           });

     

       31
       34
        
           graalvm-oracle_23 = self.callPackage ./graalvm-oracle { version = "23"; };

     

       32
       35
        
           graalvm-oracle_17 = self.callPackage ./graalvm-oracle { version = "17"; };

     

       33
       33
       -
           graalvm-oracle = self.graalvm-oracle_23;

     

       36
       36
       +
           graalvm-oracle = self.graalvm-oracle_24;

     

       34
       37
        
         }

     

       35
       38
        
         // lib.optionalAttrs config.allowAliases {

     

       36
       39
        
           graalvm-oracle_22 = throw "GraalVM 22 is EOL, use a newer version instead";

+1 -1

pkgs/development/compilers/graalvm/graalvm-oracle/default.nix

···

       4
       4
        
         fetchurl,

     

       5
       5
        
         graalvmPackages,

     

       6
       6
        
         useMusl ? false,

     

       7
       7
       -
         version ? "23",

     

       7
       7
       +
         version ? "24",

     

       8
       8
        
       }:

     

       9
       9
        
       

     

       10
       10
        
       graalvmPackages.buildGraalvm {

+18

pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix

···

       22
       22
        
             url = "https://github.com/graalvm/oracle-graalvm-ea-builds/releases/download/jdk-25.0.0-ea.34/graalvm-jdk-25.0.0-ea.34_macos-aarch64_bin.tar.gz";

     

       23
       23
        
           };

     

       24
       24
        
         };

     

       25
       25
       +
         "24" = {

     

       26
       26
       +
           "aarch64-linux" = {

     

       27
       27
       +
             hash = "sha256-dvJVfzLoz75ti3u/Mx8PCS674cw2omeOCYMFiSB2KYs=";

     

       28
       28
       +
             url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_linux-aarch64_bin.tar.gz";

     

       29
       29
       +
           };

     

       30
       30
       +
           "x86_64-linux" = {

     

       31
       31
       +
             hash = "sha256-sBYaSbvB0PQGl1Mt36u4BSpaFeRjd15pRf4+SSAlm64=";

     

       32
       32
       +
             url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_linux-x64_bin.tar.gz";

     

       33
       33
       +
           };

     

       34
       34
       +
           "x86_64-darwin" = {

     

       35
       35
       +
             hash = "sha256-3w+eXRASAcUL+muqPGV6gaKIPFtQl6n1q5PauG9+O6I=";

     

       36
       36
       +
             url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_macos-x64_bin.tar.gz";

     

       37
       37
       +
           };

     

       38
       38
       +
           "aarch64-darwin" = {

     

       39
       39
       +
             hash = "sha256-LcdjTtk5xyXUGjU/c0Q/8y5w8vtXc2fxKmk2EH40lNw=";

     

       40
       40
       +
             url = "https://download.oracle.com/graalvm/24/archive/graalvm-jdk-24.0.2_macos-aarch64_bin.tar.gz";

     

       41
       41
       +
           };

     

       42
       42
       +
         };

     

       25
       43
        
         "23" = {

     

       26
       44
        
           "aarch64-linux" = {

     

       27
       45
        
             hash = "sha256-VlB664/l7NWFQrPE3vEJvCXkEzKEJ0ck/HNU5pGGTwU=";

+4 -2

pkgs/development/ocaml-modules/multicore-bench/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildDunePackage,

     

       4
       4
        
         fetchurl,

     

       5
       5
       +
         backoff,

     

       5
       6
        
         domain-local-await,

     

       6
       7
        
         mtime,

     

       7
       8
        
         multicore-magic,

     
···

       10
       11
        
       

     

       11
       12
        
       buildDunePackage rec {

     

       12
       13
        
         pname = "multicore-bench";

     

       13
       13
       -
         version = "0.1.4";

     

       14
       14
       +
         version = "0.1.7";

     

       14
       15
        
       

     

       15
       16
        
         src = fetchurl {

     

       16
       17
        
           url = "https://github.com/ocaml-multicore/multicore-bench/releases/download/${version}/multicore-bench-${version}.tbz";

     

       17
       17
       -
           hash = "sha256-iCx5QvhYo/e53cW23Sza2as4aez4HeESVvLPF1DW85A=";

     

       18
       18
       +
           hash = "sha256-vrp9yiuTwhijhYjeDKPFRGyh/5LeydKWJSyMLZRRXIM=";

     

       18
       19
        
         };

     

       19
       20
        
       

     

       20
       21
        
         propagatedBuildInputs = [

     

       22
       22
       +
           backoff

     

       21
       23
        
           domain-local-await

     

       22
       24
        
           mtime

     

       23
       25
        
           multicore-magic

+2 -2

pkgs/development/python-modules/django-auditlog/default.nix

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "django-auditlog";

     

       19
       19
       -
         version = "3.2.0";

     

       19
       19
       +
         version = "3.2.1";

     

       20
       20
        
         pyproject = true;

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitHub {

     

       23
       23
        
           owner = "jazzband";

     

       24
       24
        
           repo = "django-auditlog";

     

       25
       25
        
           tag = "v${version}";

     

       26
       26
       -
           hash = "sha256-NOtpnYh6HUo7VRSyCUhbpNDv0V9KWST0OEzl7Pt6eR8=";

     

       26
       26
       +
           hash = "sha256-159p82PT3za3wp2XhekGxy+NYxLyQfAyUOyhDjyr2CI=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         nativeBuildInputs = [

+17 -2

pkgs/development/python-modules/django-cachalot/default.nix

···

       7
       7
        
         psycopg2,

     

       8
       8
        
         jinja2,

     

       9
       9
        
         beautifulsoup4,

     

       10
       10
       +
         pytest-django,

     

       11
       11
       +
         pytestCheckHook,

     

       10
       12
        
         python,

     

       11
       13
        
         pytz,

     

       14
       14
       +
         redis,

     

       15
       15
       +
         redisTestHook,

     

       16
       16
       +
         setuptools,

     

       17
       17
       +
         stdenv,

     

       12
       18
        
       }:

     

       13
       19
        
       

     

       14
       20
        
       buildPythonPackage rec {

     
···

       29
       35
        
           ./disable-unsupported-tests.patch

     

       30
       36
        
         ];

     

       31
       37
        
       

     

       32
       32
       -
         propagatedBuildInputs = [ django ];

     

       38
       38
       +
         build-system = [ setuptools ];

     

       39
       39
       +
       

     

       40
       40
       +
         dependencies = [ django ];

     

       33
       41
        
       

     

       34
       34
       -
         checkInputs = [

     

       42
       42
       +
         nativeCheckInputs = [

     

       35
       43
        
           beautifulsoup4

     

       36
       44
        
           django-debug-toolbar

     

       37
       45
        
           psycopg2

     

       38
       46
        
           jinja2

     

       47
       47
       +
           pytest-django

     

       48
       48
       +
           pytestCheckHook

     

       39
       49
        
           pytz

     

       50
       50
       +
           redis

     

       51
       51
       +
           redisTestHook

     

       40
       52
        
         ];

     

       41
       53
        
       

     

       42
       54
        
         pythonImportsCheck = [ "cachalot" ];

     

       55
       55
       +
       

     

       56
       56
       +
         # redisTestHook does not work on darwin

     

       57
       57
       +
         doCheck = !stdenv.hostPlatform.isDarwin;

     

       43
       58
        
       

     

       44
       59
        
         # disable broken pinning test

     

       45
       60
        
         preCheck = ''

+9 -8

pkgs/development/python-modules/djangorestframework-dataclasses/default.nix

···

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
        
         djangorestframework,

     

       6
       6
       +
         pytest-django,

     

       7
       7
       +
         pytestCheckHook,

     

       6
       8
        
         setuptools,

     

       7
       9
        
       }:

     

       8
       10
        
       

     
···

       18
       20
        
           hash = "sha256-nUkR5xTyeBv7ziJ6Mej9TKvMOa5/k+ELBqt4BVam/wk=";

     

       19
       21
        
         };

     

       20
       22
        
       

     

       21
       21
       -
         build-system = [ setuptools ];

     

       22
       22
       -
       

     

       23
       23
        
         postPatch = ''

     

       24
       24
        
           patchShebangs manage.py

     

       25
       25
        
         '';

     

       26
       26
       +
       

     

       27
       27
       +
         build-system = [ setuptools ];

     

       26
       28
        
       

     

       27
       29
        
         dependencies = [ djangorestframework ];

     

       28
       30
        
       

     

       29
       29
       -
         checkPhase = ''

     

       30
       30
       -
           runHook preCheck

     

       31
       31
       -
       

     

       32
       32
       -
           ./manage.py test

     

       31
       31
       +
         nativeCheckInputs = [

     

       32
       32
       +
           pytest-django

     

       33
       33
       +
           pytestCheckHook

     

       34
       34
       +
         ];

     

       33
       35
        
       

     

       34
       34
       -
           runHook postCheck

     

       35
       35
       -
         '';

     

       36
       36
       +
         env.DJANGO_SETTINGS_MODULE = "tests.django_settings";

     

       36
       37
        
       

     

       37
       38
        
         pythonImportsCheck = [ "rest_framework_dataclasses" ];

     

       38
       39

+14 -14

pkgs/development/python-modules/djangorestframework-guardian/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         django,

     

       6
       5
        
         django-guardian,

     

       7
       6
        
         djangorestframework,

     

       7
       7
       +
         pytest-django,

     

       8
       8
       +
         pytestCheckHook,

     

       9
       9
       +
         setuptools,

     

       8
       10
        
       }:

     

       9
       11
        
       

     

       10
       12
        
       buildPythonPackage rec {

     

       11
       13
        
         pname = "djangorestframework-guardian";

     

       12
       12
       -
         version = "0.3.0";

     

       13
       13
       -
         format = "setuptools";

     

       14
       14
       +
         version = "0.4.0";

     

       15
       15
       +
         pyproject = true;

     

       14
       16
        
       

     

       15
       17
        
         src = fetchFromGitHub {

     

       16
       18
        
           owner = "rpkilby";

     

       17
       19
        
           repo = "django-rest-framework-guardian";

     

       18
       20
        
           rev = version;

     

       19
       19
       -
           hash = "sha256-jl/VEl1pUHU8J1d5ZQSGJweNJayIGw1iVAmwID85fqw=";

     

       21
       21
       +
           hash = "sha256-7SaKyWoLen5DAwSyrWeA4rEmjXMcPwJ7LM7WYxk+IKs=";

     

       20
       22
        
         };

     

       21
       23
        
       

     

       22
       22
       -
         postPatch = ''

     

       23
       23
       -
           chmod +x manage.py

     

       24
       24
       -
           patchShebangs manage.py

     

       25
       25
       -
         '';

     

       24
       24
       +
         build-system = [ setuptools ];

     

       26
       25
        
       

     

       27
       27
       -
         propagatedBuildInputs = [

     

       26
       26
       +
         dependencies = [

     

       28
       27
        
           django-guardian

     

       29
       28
        
           djangorestframework

     

       30
       29
        
         ];

     

       31
       30
        
       

     

       32
       32
       -
         checkPhase = ''

     

       33
       33
       -
           ./manage.py test

     

       34
       34
       -
         '';

     

       31
       31
       +
         nativeCheckInputs = [

     

       32
       32
       +
           pytest-django

     

       33
       33
       +
           pytestCheckHook

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         env.DJANGO_SETTINGS_MODULE = "tests.settings";

     

       35
       37
        
       

     

       36
       38
        
         pythonImportsCheck = [ "rest_framework_guardian" ];

     

       37
       39
        
       

     
···

       40
       42
        
           homepage = "https://github.com/rpkilby/django-rest-framework-guardian";

     

       41
       43
        
           license = licenses.bsd3;

     

       42
       44
        
           maintainers = [ ];

     

       43
       43
       -
           # unmaintained, last compatible version is 3.x, use djangorestframework-guardian2 instead

     

       44
       44
       -
           broken = lib.versionAtLeast django.version "4";

     

       45
       45
        
         };

     

       46
       46
        
       }

-46

pkgs/development/python-modules/djangorestframework-guardian2/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         buildPythonPackage,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         django-guardian,

     

       6
       6
       -
         djangorestframework,

     

       7
       7
       -
         setuptools,

     

       8
       8
       -
       }:

     

       9
       9
       -
       

     

       10
       10
       -
       buildPythonPackage rec {

     

       11
       11
       -
         pname = "djangorestframework-guardian2";

     

       12
       12
       -
         version = "0.7.0";

     

       13
       13
       -
         pyproject = true;

     

       14
       14
       -
       

     

       15
       15
       -
         src = fetchFromGitHub {

     

       16
       16
       -
           owner = "johnthagen";

     

       17
       17
       -
           repo = "django-rest-framework-guardian2";

     

       18
       18
       -
           tag = "v${version}";

     

       19
       19
       -
           hash = "sha256-LrIhOoBWC3HttjAGbul4zof++OW35pGMyFGZzUpG1Tk=";

     

       20
       20
       -
         };

     

       21
       21
       -
       

     

       22
       22
       -
         postPatch = ''

     

       23
       23
       -
           chmod +x manage.py

     

       24
       24
       -
           patchShebangs manage.py

     

       25
       25
       -
         '';

     

       26
       26
       -
       

     

       27
       27
       -
         build-system = [ setuptools ];

     

       28
       28
       -
       

     

       29
       29
       -
         dependencies = [

     

       30
       30
       -
           django-guardian

     

       31
       31
       -
           djangorestframework

     

       32
       32
       -
         ];

     

       33
       33
       -
       

     

       34
       34
       -
         checkPhase = ''

     

       35
       35
       -
           ./manage.py test

     

       36
       36
       -
         '';

     

       37
       37
       -
       

     

       38
       38
       -
         pythonImportsCheck = [ "rest_framework_guardian" ];

     

       39
       39
       -
       

     

       40
       40
       -
         meta = with lib; {

     

       41
       41
       -
           description = "Django-guardian support for Django REST Framework";

     

       42
       42
       -
           homepage = "https://github.com/johnthagen/django-rest-framework-guardian2/";

     

       43
       43
       -
           license = licenses.bsd3;

     

       44
       44
       -
           maintainers = with maintainers; [ e1mo ];

     

       45
       45
       -
         };

     

       46
       46
       -
       }

+2 -2

pkgs/development/python-modules/drf-spectacular-sidecar/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "drf-spectacular-sidecar";

     

       11
       11
       -
         version = "2025.4.1";

     

       11
       11
       +
         version = "2025.8.1";

     

       12
       12
        
         pyproject = true;

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "tfranzel";

     

       16
       16
        
           repo = "drf-spectacular-sidecar";

     

       17
       17
        
           rev = version;

     

       18
       18
       -
           hash = "sha256-YzSUwShj7QGCVKlTRM2Gro38Y+jGYQsMGBMAH0radmA=";

     

       18
       18
       +
           hash = "sha256-H2eHFX7VG7YqLztEV/G4QnVYytkfADeHxgBTRlmKt50=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         build-system = [ setuptools ];

+2 -2

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

···

       33
       33
        
       

     

       34
       34
        
       buildPythonPackage rec {

     

       35
       35
        
         pname = "python-openstackclient";

     

       36
       36
       -
         version = "8.1.0";

     

       36
       36
       +
         version = "8.2.0";

     

       37
       37
        
         pyproject = true;

     

       38
       38
        
       

     

       39
       39
        
         src = fetchPypi {

     

       40
       40
        
           pname = "python_openstackclient";

     

       41
       41
        
           inherit version;

     

       42
       42
       -
           hash = "sha256-m5xCs/a8S0tICmJU/FYKywGXh4MeCUOW2/msmuVxrks=";

     

       42
       42
       +
           hash = "sha256-1hKvGN/GbMjzHmzpZpC2wnOt6KJA7EC39INaiJb7vgE=";

     

       43
       43
        
         };

     

       44
       44
        
       

     

       45
       45
        
         build-system = [

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

···

       49
       49
        
       

     

       50
       50
        
         __darwinAllowLocalNetworking = true;

     

       51
       51
        
       

     

       52
       52
       +
         # redisTestHook does not work on darwin-x86_64

     

       53
       53
       +
         doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64);

     

       54
       54
       +
       

     

       52
       55
        
         disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [

     

       53
       56
        
           # PermissionError: [Errno 13] Permission denied: '/tmp/rq-tests.txt'

     

       54
       57
        
           "test_deleted_jobs_arent_executed"

+5 -2

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

···

       69
       69
        
         ]

     

       70
       70
        
         ++ optional-dependencies.http3;

     

       71
       71
        
       

     

       72
       72
       -
         doCheck = !stdenv.hostPlatform.isDarwin;

     

       73
       73
       -
       

     

       74
       72
        
         preCheck = ''

     

       75
       73
        
           # Some tests depends on sanic on PATH

     

       76
       74
        
           PATH="$out/bin:$PATH"

     
···

       78
       76
        
       

     

       79
       77
        
           # needed for relative paths for some packages

     

       80
       78
        
           cd tests

     

       79
       79
       +
         ''

     

       80
       80
       +
         # Work around "OSError: AF_UNIX path too long"

     

       81
       81
       +
         + lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       82
       82
       +
           substituteInPlace worker/test_socket.py \

     

       83
       83
       +
             --replace-fail '"./test.sock"' '"/tmp/test.sock"'

     

       81
       84
        
         '';

     

       82
       85
        
       

     

       83
       86
        
         disabledTests = [

+6 -8

pkgs/development/python-modules/tika-client/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         buildPythonPackage,

     

       4
       4
        
         fetchFromGitHub,

     

       5
       5
       -
         pythonOlder,

     

       5
       5
       +
         anyio,

     

       6
       6
        
         hatchling,

     

       7
       7
        
         httpx,

     

       8
       8
        
       }:

     
···

       11
       11
        
         pname = "tika-client";

     

       12
       12
        
         version = "0.10.0";

     

       13
       13
        
         pyproject = true;

     

       14
       14
       -
       

     

       15
       15
       -
         disabled = pythonOlder "3.9";

     

       16
       14
        
       

     

       17
       15
        
         src = fetchFromGitHub {

     

       18
       16
        
           owner = "stumpylog";

     
···

       23
       21
        
       

     

       24
       22
        
         build-system = [ hatchling ];

     

       25
       23
        
       

     

       26
       26
       -
         dependencies = [ httpx ];

     

       24
       24
       +
         dependencies = [

     

       25
       25
       +
           anyio

     

       26
       26
       +
           httpx

     

       27
       27
       +
         ];

     

       27
       28
        
       

     

       28
       29
        
         pythonImportsCheck = [ "tika_client" ];

     

       29
       30
        
       

     

       30
       30
       -
         # Almost all of the tests (all except one in 0.1.0) fail since there

     

       31
       31
       -
         # is no tika http API endpoint reachable. Since tika is not yet

     

       32
       32
       -
         # packaged for nixpkgs, it seems like an unreasonable amount of effort

     

       33
       33
       -
         # fixing these tests.

     

       31
       31
       +
         # The tests expect the tika-server to run in a docker container

     

       34
       32
        
         doChecks = false;

     

       35
       33
        
       

     

       36
       34
        
         meta = with lib; {

-54

pkgs/tools/backup/zbackup/default.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         lib,

     

       3
       3
       -
         stdenv,

     

       4
       4
       -
         fetchFromGitHub,

     

       5
       5
       -
         cmake,

     

       6
       6
       -
         protobufc,

     

       7
       7
       -
         libunwind,

     

       8
       8
       -
         lzo,

     

       9
       9
       -
         openssl,

     

       10
       10
       -
         protobuf,

     

       11
       11
       -
         zlib,

     

       12
       12
       -
       }:

     

       13
       13
       -
       

     

       14
       14
       -
       stdenv.mkDerivation rec {

     

       15
       15
       -
         pname = "zbackup";

     

       16
       16
       -
         version = "1.4.4";

     

       17
       17
       -
       

     

       18
       18
       -
         src = fetchFromGitHub {

     

       19
       19
       -
           owner = "zbackup";

     

       20
       20
       -
           repo = "zbackup";

     

       21
       21
       -
           rev = version;

     

       22
       22
       -
           hash = "sha256-9Fk4EhEeQ2J4Kirc7oad4CzmW70Mmza6uozd87qfgZI=";

     

       23
       23
       -
         };

     

       24
       24
       -
       

     

       25
       25
       -
         patches = [

     

       26
       26
       -
           # compare with https://github.com/zbackup/zbackup/pull/158;

     

       27
       27
       -
           # but that doesn't apply cleanly to this version

     

       28
       28
       -
           ./protobuf-api-change.patch

     

       29
       29
       -
         ];

     

       30
       30
       -
       

     

       31
       31
       -
         # zbackup uses dynamic exception specifications which are not

     

       32
       32
       -
         # allowed in C++17

     

       33
       33
       -
         env.NIX_CFLAGS_COMPILE = toString [ "--std=c++14" ];

     

       34
       34
       -
       

     

       35
       35
       -
         buildInputs = [

     

       36
       36
       -
           zlib

     

       37
       37
       -
           openssl

     

       38
       38
       -
           protobuf

     

       39
       39
       -
           lzo

     

       40
       40
       -
           libunwind

     

       41
       41
       -
         ];

     

       42
       42
       -
         nativeBuildInputs = [

     

       43
       43
       -
           cmake

     

       44
       44
       -
           protobufc

     

       45
       45
       -
         ];

     

       46
       46
       -
       

     

       47
       47
       -
         meta = {

     

       48
       48
       -
           description = "Versatile deduplicating backup tool";

     

       49
       49
       -
           mainProgram = "zbackup";

     

       50
       50
       -
           homepage = "http://zbackup.org/";

     

       51
       51
       -
           platforms = lib.platforms.linux;

     

       52
       52
       -
           license = lib.licenses.gpl2Plus;

     

       53
       53
       -
         };

     

       54
       54
       -
       }

-11

pkgs/tools/backup/zbackup/protobuf-api-change.patch

···

       1
       1
       -
       --- a/backup_restorer.cc

     

       2
       2
       -
       +++ b/backup_restorer.cc

     

       3
       3
       -
       @@ -48,7 +48,7 @@

     

       4
       4
       -
          // TODO: this disables size checks for each separate message. Figure a better

     

       5
       5
       -
          // way to do this while keeping them enabled. It seems we need to create an

     

       6
       6
       -
          // instance of CodedInputStream for each message, but it might be expensive

     

       7
       7
       -
       -  cis.SetTotalBytesLimit( backupData.size(), -1 );

     

       8
       8
       -
       +  cis.SetTotalBytesLimit( backupData.size() );

     

       9
       9
       -
        

     

       10
       10
       -
          // Used when emitting chunks

     

       11
       11
       -
          string chunk;

pkgs/top-level/aliases.nix

···

       619
       619
        
         cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18

     

       620
       620
        
         clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07

     

       621
       621
        
         CoinMP = coinmp; # Added 2024-06-12

     

       622
       622
       +
         code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22

     

       623
       623
       +
         code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22

     

       624
       624
       +
         code-browser-qt = throw "'code-browser-qt' has been removed, as it was broken since 22.11"; # Added 2025-08-22

     

       622
       625
        
         collada-dom = opencollada; # added 2024-02-21

     

       623
       626
        
         colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20

     

       624
       627
        
         colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19

     

       625
       628
        
         colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15

     

       626
       629
        
         connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27

     

       630
       630
       +
         copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22

     

       627
       631
        
         cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07

     

       628
       632
        
         coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27

     

       629
       633
        
         corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01

     
···

       1073
       1077
        
         guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09

     

       1074
       1078
        
         guile-disarchive = disarchive; # Added 2023-10-27

     

       1075
       1079
        
         gutenprintBin = gutenprint-bin; # Added 2025-08-21

     

       1080
       1080
       +
         gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17

     

       1076
       1081
        
       

     

       1077
       1082
        
         ### H ###

     

       1078
       1083
        
       

     
···

       2439
       2444
        
         z3_4_8 = throw "'z3_4_8' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18

     

       2440
       2445
        
         zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'.";

     

       2441
       2446
        
         zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'.";

     

       2447
       2447
       +
         zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22

     

       2442
       2448
        
         zeroadPackages = recurseIntoAttrs {

     

       2443
       2449
        
           zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22

     

       2444
       2450
        
           zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22

-12

pkgs/top-level/all-packages.nix

···

       2615
       2615
        
       

     

       2616
       2616
        
         cask-server = libsForQt5.callPackage ../applications/misc/cask-server { };

     

       2617
       2617
        
       

     

       2618
       2618
       -
         code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; };

     

       2619
       2619
       -
         code-browser-gtk2 = callPackage ../applications/editors/code-browser { withGtk2 = true; };

     

       2620
       2620
       -
         code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk3 = true; };

     

       2621
       2621
       -
       

     

       2622
       2618
        
         cffconvert = python3Packages.toPythonApplication python3Packages.cffconvert;

     

       2623
       2619
        
       

     

       2624
       2620
        
         ckb-next = libsForQt5.callPackage ../tools/misc/ckb-next { };

     
···

       4582
       4578
        
       

     

       4583
       4579
        
         # To expose more packages for Yi, override the extraPackages arg.

     

       4584
       4580
        
         yi = callPackage ../applications/editors/yi/wrapper.nix { };

     

       4585
       4585
       -
       

     

       4586
       4586
       -
         zbackup = callPackage ../tools/backup/zbackup {

     

       4587
       4587
       -
           protobuf = protobuf_21;

     

       4588
       4588
       -
         };

     

       4589
       4581
        
       

     

       4590
       4582
        
         zbar = libsForQt5.callPackage ../tools/graphics/zbar { };

     

       4591
       4583
        
       

     
···

       13835
       13827
        
                 wrapQtAppsHook

     

       13836
       13828
        
                 ;

     

       13837
       13829
        
             };

     

       13838
       13838
       -
       

     

       13839
       13839
       -
         gxneur = callPackage ../applications/misc/gxneur {

     

       13840
       13840
       -
           inherit (gnome2) libglade GConf;

     

       13841
       13841
       -
         };

     

       13842
       13830
        
       

     

       13843
       13831
        
         xournalpp = callPackage ../applications/graphics/xournalpp {

     

       13844
       13832
        
           lua = lua5_3;

pkgs/top-level/python-aliases.nix

···

       188
       188
        
         distutils_extra = distutils-extra; # added 2023-10-12

     

       189
       189
        
         digital-ocean = python-digitalocean; # addad 2024-04-12

     

       190
       190
        
         dj-stripe = throw "dj-stripe has been removed because it is unused and broken"; # added 2025-07-21

     

       191
       191
       +
         djangorestframework-guardian2 = throw "djangorestframework-guardian2 has been removed because djangorestframework-guardian is active again and the upstream project was archived"; # added 2025-08-22

     

       191
       192
        
         djangorestframework-jwt = drf-jwt; # added 2021-07-20

     

       192
       193
        
         django-allauth-2fa = throw "django-allauth-2fa was removed because it was unused and django-allauth now contains 2fa logic itself."; # added 2025-02-15

     

       193
       194
        
         django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18

-4

pkgs/top-level/python-packages.nix

···

       4142
       4142
        
           callPackage ../development/python-modules/djangorestframework-guardian

     

       4143
       4143
        
             { };

     

       4144
       4144
        
       

     

       4145
       4145
       -
         djangorestframework-guardian2 =

     

       4146
       4146
       -
           callPackage ../development/python-modules/djangorestframework-guardian2

     

       4147
       4147
       -
             { };

     

       4148
       4148
       -
       

     

       4149
       4145
        
         djangorestframework-jsonp = callPackage ../development/python-modules/djangorestframework-jsonp { };

     

       4150
       4146
        
       

     

       4151
       4147
        
         djangorestframework-recursive =