Unverified Commit f152e714 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #199835 from SuperSandro2000/nodejs-normalisation

parents eedee8f9 9dc7d17e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ See `node2nix` [docs](https://github.com/svanderburg/node2nix) for more info.
#### Pitfalls {#javascript-node2nix-pitfalls}

- If upstream package.json does not have a "version" attribute, `node2nix` will crash. You will need to add it like shown in [the package.json section](#javascript-upstream-package-json).
- `node2nix` has some [bugs](https://github.com/svanderburg/node2nix/issues/238) related to working with lock files from NPM distributed with `nodejs-16_x`.
- `node2nix` has some [bugs](https://github.com/svanderburg/node2nix/issues/238) related to working with lock files from NPM distributed with `nodejs_16`.
- `node2nix` does not like missing packages from NPM. If you see something like `Cannot resolve version: vue-loader-v16@undefined` then you might want to try another tool. The package might have been pulled off of NPM.

### yarn2nix {#javascript-yarn2nix}
+2 −2
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ in {

      environment = env;

      path = with pkgs; [ bashInteractive ffmpeg nodejs-16_x openssl yarn python3 ];
      path = with pkgs; [ bashInteractive ffmpeg nodejs_16 openssl yarn python3 ];

      script = ''
        #!/bin/sh
@@ -859,7 +859,7 @@ in {
          home = cfg.package;
        };
      })
      (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs-16_x pkgs.yarn ])
      (lib.attrsets.setAttrByPath [ cfg.user "packages" ] [ cfg.package peertubeEnv peertubeCli pkgs.ffmpeg pkgs.nodejs_16 pkgs.yarn ])
      (lib.mkIf cfg.redis.enableUnixSocket {${config.services.peertube.user}.extraGroups = [ "redis-peertube" ];})
    ];

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ in {
        WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}";
        DynamicUser = true;
        PrivateTmp = true;
        ExecStart = "${pkgs.nodejs-16_x}/bin/node ${pkgs.wiki-js}/server";
        ExecStart = "${pkgs.nodejs_16}/bin/node ${pkgs.wiki-js}/server";
      };
    };
  };
+1 −1
Original line number Diff line number Diff line
#!/usr/bin/env nix-shell
/*
#!nix-shell -i node -p nodejs-18_x
#!nix-shell -i node -p nodejs_18
*/

import { promises as fs } from 'node:fs';
+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@

{pkgs ? import <nixpkgs> {
    inherit system;
  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:

let
  nodeEnv = import ./node-env.nix {
Loading