Unverified Commit d8bfbd35 authored by 0x4A6F's avatar 0x4A6F Committed by GitHub
Browse files

upgrade nodejs_18 dependents in prevision for upcoming EOL (#399749)

parents f4f51fb7 dc8397c0

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

+2 −2
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ in 
      environment = env;



      path = with pkgs; [

        nodejs_18

        nodejs_20

        yarn

        ffmpeg-headless

        openssl
@@ -945,7 +945,7 @@ in 
      })

      (lib.attrsets.setAttrByPath

        [ cfg.user "packages" ]

        [ peertubeEnv pkgs.nodejs_18 pkgs.yarn pkgs.ffmpeg-headless ]

        [ peertubeEnv pkgs.nodejs_20 pkgs.yarn pkgs.ffmpeg-headless ]

      )

      (lib.mkIf cfg.redis.enableUnixSocket {

        ${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];

nixos/modules/services/web-apps/wiki-js.nix

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ in 
        WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}";

        DynamicUser = true;

        PrivateTmp = true;

        ExecStart = "${pkgs.nodejs_18}/bin/node ${pkgs.wiki-js}/server";

        ExecStart = "${pkgs.nodejs_20}/bin/node ${pkgs.wiki-js}/server";

      };

    };

  };

pkgs/by-name/cl/clever-tools/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  lib,

  buildNpmPackage,

  fetchFromGitHub,

  nodejs_18,

  nodejs_20,

  installShellFiles,

  makeWrapper,

  stdenv,
@@ -13,7 +13,7 @@ buildNpmPackage rec { 


  version = "3.12.0";



  nodejs = nodejs_18;

  nodejs = nodejs_20;



  src = fetchFromGitHub {

    owner = "CleverCloud";

pkgs/by-name/db/db-rest/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  lib,

  buildNpmPackage,

  fetchFromGitHub,

  nodejs_18,

  nodejs,

  nix-update-script,

  nixosTests,

}:
@@ -10,7 +10,7 @@ buildNpmPackage rec { 
  pname = "db-rest";

  version = "6.1.0";



  nodejs = nodejs_18;

  inherit nodejs;



  src = fetchFromGitHub {

    owner = "derhuerst";

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

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
  fixup-yarn-lock,

  jq,

  fd,

  nodejs_18,

  nodejs_20,

  which,

  yarn,

}:
@@ -92,7 +92,7 @@ stdenv.mkDerivation rec { 
    fd

  ];



  buildInputs = [ nodejs_18 ];

  buildInputs = [ nodejs_20 ];



  buildPhase = ''

    # Build node modules