Unverified Commit c17ee9c5 authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

[Backport release-25.05] peertube: 7.0.1 -> 7.2.1 (#423978)

parents 9999ee5e 8caa4cc2

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

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ let 
    "@obsolete"

    "@privileged"

    "@setuid"

    "@spawn"

  ];



  cfgService = {

pkgs/by-name/pe/peertube/package.nix

+16 −9
Original line number Diff line number Diff line
@@ -48,23 +48,23 @@ let 
in

stdenv.mkDerivation rec {

  pname = "peertube";

  version = "7.0.1";

  version = "7.2.1";



  src = fetchFromGitHub {

    owner = "Chocobozzz";

    repo = "PeerTube";

    tag = "v${version}";

    hash = "sha256-DoUSzqb8lrU+s5R95rxCN/5A8sgb11edAhv0T6YACRo=";

    hash = "sha256-I53LCCtB8iNGuABgvhRjUfxocasXCv4TV7jXtHVpMnU=";

  };



  yarnOfflineCacheServer = fetchYarnDeps {

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

    hash = "sha256-WLaIIyz6SEekLFeVO39Swpny5/x5Jc1zoxy/6bmOXTk=";

    hash = "sha256-PMU6ZMcT+9Z3Y6+085e3hRnvs4Xii5FIkkOPvsltfMY=";

  };



  yarnOfflineCacheClient = fetchYarnDeps {

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

    hash = "sha256-/ZdORSnwk29ubsgKKB7RfHCetODNOH9DzkflQdDsMz0=";

    hash = "sha256-AWUnxC/cwtKCa70MKmHeOr6ussMYyQ5awQAnWYzCA1s=";

  };



  yarnOfflineCacheAppsCli = fetchYarnDeps {
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec { 


  yarnOfflineCacheAppsRunner = fetchYarnDeps {

    yarnLock = "${src}/apps/peertube-runner/yarn.lock";

    hash = "sha256-R7oXJUT698l2D1WkQGTWfkmbC7bC1XJ04xT0O8bwuI8=";

    hash = "sha256-t7H0VNLM48sTfctD9V2CFdi/0JRETu5cj/dBy6aNFW8=";

  };



  outputs = [
@@ -106,6 +106,13 @@ stdenv.mkDerivation rec { 
    cd ~/client

    yarn config --offline set yarn-offline-mirror $yarnOfflineCacheClient

    yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress



    # Switch sass-embedded to sass

    find node_modules/vite/dist -name "*.js" -type f -exec grep -l "sass-embedded" {} \; | while read file; do

      echo "Patching $file"

      sed -i 's/"sass-embedded"/"sass"/g; s/'"'"'sass-embedded'"'"'/'"'"'sass'"'"'/g' "$file"

    done



    cd ~/apps/peertube-cli

    yarn config --offline set yarn-offline-mirror $yarnOfflineCacheAppsCli

    yarn install --offline --frozen-lockfile --ignore-engines --ignore-scripts --no-progress
@@ -174,7 +181,7 @@ stdenv.mkDerivation rec { 
    # be needed, either now or in the future. If they might be, then we probably want

    # to move the package to $out above instead of removing the broken symlink.

    rm $out/node_modules/@peertube/{peertube-server,peertube-transcription-devtools,peertube-types-generator,tests}

    rm $out/client/node_modules/@peertube/{peertube-transcription-devtools,peertube-types-generator,tests}

    rm $out/client/node_modules/@peertube/{peertube-transcription-devtools,peertube-types-generator,tests,player}



    mkdir -p $cli/bin

    mv ~/apps/peertube-cli/{dist,node_modules,package.json,yarn.lock} $cli
@@ -193,7 +200,7 @@ stdenv.mkDerivation rec { 


  passthru.tests.peertube = nixosTests.peertube;



  meta = with lib; {

  meta = {

    description = "Free software to take back control of your videos";

    longDescription = ''

      PeerTube aspires to be a decentralized and free/libre alternative to video
@@ -209,7 +216,7 @@ stdenv.mkDerivation rec { 
      though if the administrator of your instance had previously connected it

      with other instances.

    '';

    license = licenses.agpl3Plus;

    license = lib.licenses.agpl3Plus;

    homepage = "https://joinpeertube.org/";

    platforms = [

      "x86_64-linux"
@@ -217,7 +224,7 @@ stdenv.mkDerivation rec { 
      # feasible, looking for maintainer to help out

      # "x86_64-darwin" "aarch64-darwin"

    ];

    maintainers = with maintainers; [

    maintainers = with lib.maintainers; [

      immae

      izorkin

      stevenroose