commit 35a73717df2640655dc15aeca9083251a744f1bf · pyrox.dev/nixpkgs

+4 -4

nixos/modules/services/web-apps/peertube.nix

···

       429
       429
        
       

     

       430
       430
        
             environment = env;

     

       431
       431
        
       

     

       432
       432
       -
             path = with pkgs; [ bashInteractive ffmpeg nodejs_16 openssl yarn python3 ];

     

       432
       432
       +
             path = with pkgs; [ bashInteractive ffmpeg nodejs_18 openssl yarn python3 ];

     

       433
       433
        
       

     

       434
       434
        
             script = ''

     

       435
       435
        
               #!/bin/sh

     
···

       490
       490
        
           services.nginx = lib.mkIf cfg.configureNginx {

     

       491
       491
        
             enable = true;

     

       492
       492
        
             virtualHosts."${cfg.localDomain}" = {

     

       493
       493
       -
               root = "/var/lib/peertube";

     

       493
       493
       +
               root = "/var/lib/peertube/www";

     

       494
       494
        
       

     

       495
       495
        
               # Application

     

       496
       496
        
               locations."/" = {

     
···

       593
       593
        
       

     

       594
       594
        
               # Bypass PeerTube for performance reasons.

     

       595
       595
        
               locations."~ ^/client/(assets/images/(icons/icon-36x36\.png|icons/icon-48x48\.png|icons/icon-72x72\.png|icons/icon-96x96\.png|icons/icon-144x144\.png|icons/icon-192x192\.png|icons/icon-512x512\.png|logo\.svg|favicon\.png|default-playlist\.jpg|default-avatar-account\.png|default-avatar-account-48x48\.png|default-avatar-video-channel\.png|default-avatar-video-channel-48x48\.png))$" = {

     

       596
       596
       -
                 tryFiles = "/www/client-overrides/$1 /www/client/$1 $1";

     

       596
       596
       +
                 tryFiles = "/client-overrides/$1 /client/$1 $1";

     

       597
       597
        
                 priority = 1310;

     

       598
       598
        
               };

     

       599
       599
        
       

     
···

       859
       859
        
                 home = cfg.package;

     

       860
       860
        
               };

     

       861
       861
        
             })

     

       862
       862
       -
             (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs_16 pkgs.yarn ])

     

       862
       862
       +
             (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs_18 pkgs.yarn ])

     

       863
       863
        
             (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];})

     

       864
       864
        
           ];

     

       865
       865

+4 -4

pkgs/servers/peertube/default.nix

···

       14
       14
        
       

     

       15
       15
        
       in stdenv.mkDerivation rec {

     

       16
       16
        
         pname = "peertube";

     

       17
       17
       -
         version = "5.0.0";

     

       17
       17
       +
         version = "5.1.0";

     

       18
       18
        
       

     

       19
       19
        
         src = fetchFromGitHub {

     

       20
       20
        
           owner = "Chocobozzz";

     

       21
       21
        
           repo = "PeerTube";

     

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

     

       23
       23
       -
           hash = "sha256-Z2l0I/vVEx4ivC87N26QaUnQjySU/XRFW3biEwl7Od0=";

     

       23
       23
       +
           hash = "sha256-C9mBF+QymGXyBB3IFX6MNgsZpHk739qv1/DLuvzrTaU=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         yarnOfflineCacheServer = fetchYarnDeps {

     

       27
       27
        
           yarnLock = "${src}/yarn.lock";

     

       28
       28
       -
           hash = "sha256-EVviTrgSZYsi68hJIlSC9ArQS3aVp6EQNKbkVx12WJk=";

     

       28
       28
       +
           hash = "sha256-W+pX2XO27j6qAVxvo+Xf1h7g3V0LUMtwNf+meZmkgwE=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         yarnOfflineCacheTools = fetchYarnDeps {

     
···

       35
       35
        
       

     

       36
       36
        
         yarnOfflineCacheClient = fetchYarnDeps {

     

       37
       37
        
           yarnLock = "${src}/client/yarn.lock";

     

       38
       38
       -
           hash = "sha256-ehA1W1bDXzApTpkWH7MEAQ9Ek73q3En76/LdvJhxh2Q=";

     

       38
       38
       +
           hash = "sha256-TAv8QAAfT3q28jUo26h0uCGsoqBzAn8lybIaqNAApU8=";

     

       39
       39
        
         };

     

       40
       40
        
       

     

       41
       41
        
         nativeBuildInputs = [ brotli fixup_yarn_lock jq nodejs which yarn ];

+1 -1

pkgs/top-level/all-packages.nix

···

       33122
       33122
        
         peek = callPackage ../applications/video/peek { };

     

       33123
       33123
        
       

     

       33124
       33124
        
         peertube = callPackage ../servers/peertube {

     

       33125
       33125
       -
           nodejs = nodejs_16;

     

       33125
       33125
       +
           nodejs = nodejs_18;

     

       33126
       33126
        
         };

     

       33127
       33127
        
       

     

       33128
       33128
        
         peroxide = callPackage ../applications/networking/peroxide { };