BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #218599 from Izorkin/update-peertube

Browse source 
peertube: 5.0.0 -> 5.1.0
This commit is contained in:
Martin Weinelt 2023-05-09 14:37:44 +02:00 committed by GitHub
commit 35a73717df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/web-apps/peertube.nix
View file

@ -429,7 +429,7 @@ in {
environment = env;
path = with pkgs; [ bashInteractive ffmpeg nodejs_16 openssl yarn python3 ];
path = with pkgs; [ bashInteractive ffmpeg nodejs_18 openssl yarn python3 ];
script = ''
#!/bin/sh
@ -490,7 +490,7 @@ in {
services.nginx = lib.mkIf cfg.configureNginx {
enable = true;
virtualHosts."${cfg.localDomain}" = {
root = "/var/lib/peertube";
root = "/var/lib/peertube/www";
# Application
locations."/" = {
@ -593,7 +593,7 @@ in {
# Bypass PeerTube for performance reasons.
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))$" = {
tryFiles = "/www/client-overrides/$1 /www/client/$1 $1";
tryFiles = "/client-overrides/$1 /client/$1 $1";
priority = 1310;
};
@ -859,7 +859,7 @@ in {
home = cfg.package;
};
})
(lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs_16 pkgs.yarn ])
(lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs_18 pkgs.yarn ])
(lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];})
];

8
pkgs/servers/peertube/default.nix
View file

@ -14,18 +14,18 @@ let
in stdenv.mkDerivation rec {
pname = "peertube";
version = "5.0.0";
version = "5.1.0";
src = fetchFromGitHub {
owner = "Chocobozzz";
repo = "PeerTube";
rev = "v${version}";
hash = "sha256-Z2l0I/vVEx4ivC87N26QaUnQjySU/XRFW3biEwl7Od0=";
hash = "sha256-C9mBF+QymGXyBB3IFX6MNgsZpHk739qv1/DLuvzrTaU=";
};
yarnOfflineCacheServer = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-EVviTrgSZYsi68hJIlSC9ArQS3aVp6EQNKbkVx12WJk=";
hash = "sha256-W+pX2XO27j6qAVxvo+Xf1h7g3V0LUMtwNf+meZmkgwE=";
};
yarnOfflineCacheTools = fetchYarnDeps {
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
yarnOfflineCacheClient = fetchYarnDeps {
yarnLock = "${src}/client/yarn.lock";
hash = "sha256-ehA1W1bDXzApTpkWH7MEAQ9Ek73q3En76/LdvJhxh2Q=";
hash = "sha256-TAv8QAAfT3q28jUo26h0uCGsoqBzAn8lybIaqNAApU8=";
};
nativeBuildInputs = [ brotli fixup_yarn_lock jq nodejs which yarn ];

2
pkgs/top-level/all-packages.nix
View file

@ -33122,7 +33122,7 @@ with pkgs;
peek = callPackage ../applications/video/peek { };
peertube = callPackage ../servers/peertube {
nodejs = nodejs_16;
nodejs = nodejs_18;
};
peroxide = callPackage ../applications/networking/peroxide { };