Merge pull request #199835 from SuperSandro2000/nodejs-normalisation
This commit is contained in:
commit
f152e714e5
|
@ -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}
|
||||
|
|
|
@ -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" ];})
|
||||
];
|
||||
|
||||
|
|
|
@ -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,6 +1,6 @@
|
|||
#!/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';
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 ../../../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs-16_x }:
|
||||
{ stdenv, fetchYarnDeps, fixup_yarn_lock, callPackage, nodejs_16 }:
|
||||
let
|
||||
common = callPackage ./common.nix { };
|
||||
in
|
||||
|
@ -16,8 +16,8 @@ stdenv.mkDerivation {
|
|||
nativeBuildInputs = [
|
||||
fixup_yarn_lock
|
||||
# Use Node JS 16 because of @achrinza/node-ipc@9.2.2
|
||||
nodejs-16_x
|
||||
nodejs-16_x.pkgs.yarn
|
||||
nodejs_16
|
||||
nodejs_16.pkgs.yarn
|
||||
];
|
||||
|
||||
configurePhase = ''
|
||||
|
|
|
@ -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 ../../../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -6,13 +6,13 @@
|
|||
postInstall = ''
|
||||
mkdir "$out/bin"
|
||||
echo '#!/bin/sh' >> "$out/bin/matrix-recorder"
|
||||
echo "'${pkgs.nodejs-14_x}/bin/node'" \
|
||||
echo "'${pkgs.nodejs_14}/bin/node'" \
|
||||
"'$out/lib/node_modules/matrix-recorder/matrix-recorder.js'" \
|
||||
'"$@"' >> "$out/bin/matrix-recorder"
|
||||
echo '#!/bin/sh' >> "$out/bin/matrix-recorder-to-html"
|
||||
echo 'cd "$1"' >> "$out/bin/matrix-recorder-to-html"
|
||||
echo "test -d templates/ || ln -sfT '$out/lib/node_modules/matrix-recorder/templates' templates" >> "$out/bin/matrix-recorder-to-html"
|
||||
echo "'${pkgs.nodejs-14_x}/bin/node'" \
|
||||
echo "'${pkgs.nodejs_14}/bin/node'" \
|
||||
"'$out/lib/node_modules/matrix-recorder/recorder-to-html.js'" \
|
||||
'.' >> "$out/bin/matrix-recorder-to-html"
|
||||
chmod a+x "$out/bin/matrix-recorder"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, nodejs-16_x, stdenv, lib, nixosTests }:
|
||||
{ pkgs, nodejs_16, stdenv, lib, nixosTests }:
|
||||
|
||||
let
|
||||
nodePackages = import ./node-composition.nix {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ./node-env.nix {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
let
|
||||
|
||||
# To control nodejs version we pass down
|
||||
nodejs = pkgs.nodejs-14_x;
|
||||
nodejs = pkgs.nodejs_14;
|
||||
|
||||
fetchElmDeps = pkgs.callPackage ./fetchElmDeps.nix { };
|
||||
|
||||
|
@ -116,7 +116,7 @@ let
|
|||
|
||||
nodePkgs = pkgs.callPackage ./packages/node-composition.nix {
|
||||
inherit pkgs;
|
||||
nodejs = pkgs.nodejs-14_x;
|
||||
nodejs = pkgs.nodejs_14;
|
||||
inherit (pkgs.stdenv.hostPlatform) system;
|
||||
};
|
||||
|
||||
|
|
|
@ -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-packages/node-env.nix {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}:
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ./node-env.nix {
|
||||
|
|
|
@ -13,7 +13,7 @@ rm -f ./node-env.nix
|
|||
-i node-packages.json \
|
||||
-o node-packages.nix \
|
||||
-c composition.nix \
|
||||
--pkg-name nodejs-18_x
|
||||
--pkg-name nodejs_18
|
||||
|
||||
# using --no-out-link in nix-build argument would cause the
|
||||
# gc to run before the script finishes
|
||||
|
|
|
@ -281,7 +281,7 @@ final: prev: {
|
|||
};
|
||||
|
||||
manta = prev.manta.override ( oldAttrs: {
|
||||
nativeBuildInputs = with pkgs; [ nodejs-14_x installShellFiles ];
|
||||
nativeBuildInputs = with pkgs; [ nodejs_14 installShellFiles ];
|
||||
postInstall = ''
|
||||
# create completions, following upstream procedure https://github.com/joyent/node-manta/blob/v5.2.3/Makefile#L85-L91
|
||||
completion_cmds=$(find ./bin -type f -printf "%f\n")
|
||||
|
@ -341,23 +341,16 @@ final: prev: {
|
|||
src = fetchFromGitHub {
|
||||
owner = "svanderburg";
|
||||
repo = "node2nix";
|
||||
rev = "026360084db8a27095aafdac7125d7f1a93046c8";
|
||||
sha256 = "sha256-zO/xGG10v7HGv58RLX5SFd7QOXAL2vRxCRM8IfRZ8JA=";
|
||||
rev = "315e1b85a6761152f57a41ccea5e2570981ec670";
|
||||
sha256 = "sha256-8OxTOkwBPcnjyhXhxQEDd8tiaQoHt91zUJX5Ka+IXco=";
|
||||
};
|
||||
nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
|
||||
postInstall = let
|
||||
patches = [
|
||||
# Needed to fix Node.js 16+ - PR svanderburg/node2nix#302
|
||||
# fix nodejs attr names
|
||||
(fetchpatch {
|
||||
name = "emit-lockfile-v2-and-fix-bin-links-with-npmv7.patch";
|
||||
url = "https://github.com/svanderburg/node2nix/commit/375a055041b5ee49ca5fb3f74a58ca197c90c7d5.patch";
|
||||
hash = "sha256-uVYrXptJILojeur9s2O+J/f2vyPNCaZMn1GM/NoC5n8=";
|
||||
})
|
||||
# Needed to fix packages with DOS line-endings after above patch - PR svanderburg/node2nix#314
|
||||
(fetchpatch {
|
||||
name = "convert-crlf-for-script-bin-files.patch";
|
||||
url = "https://github.com/svanderburg/node2nix/commit/91aa511fe7107938b0409a02ab8c457a6de2d8ca.patch";
|
||||
hash = "sha256-ISiKYkur/o8enKDzJ8mQndkkSC4yrTNlheqyH+LiXlU=";
|
||||
url = "https://github.com/svanderburg/node2nix/commit/3b63e735458947ef39aca247923f8775633363e5.patch";
|
||||
hash = "sha256-pe8Xm4mjPh9oKXugoMY6pRl8YYgtdw0sRXN+TienalU=";
|
||||
})
|
||||
];
|
||||
in ''
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
, glibcLocales
|
||||
, lib
|
||||
, nixosTests
|
||||
, nodejs-16_x
|
||||
, nodejs_16
|
||||
, stdenv
|
||||
, which
|
||||
}:
|
||||
|
@ -156,7 +156,7 @@ buildDotnetModule rec {
|
|||
|
||||
preCheck = ''
|
||||
mkdir -p _layout/externals
|
||||
ln -s ${nodejs-16_x} _layout/externals/node16
|
||||
ln -s ${nodejs_16} _layout/externals/node16
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
@ -193,7 +193,7 @@ buildDotnetModule rec {
|
|||
# externals/node16. As opposed to the official releases, we don't
|
||||
# link the Alpine Node flavors.
|
||||
mkdir -p $out/lib/externals
|
||||
ln -s ${nodejs-16_x} $out/lib/externals/node16
|
||||
ln -s ${nodejs_16} $out/lib/externals/node16
|
||||
|
||||
# Install Nodejs scripts called from workflows
|
||||
install -D src/Misc/layoutbin/hashFiles/index.js $out/lib/github-runner/hashFiles/index.js
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
, git
|
||||
, lib
|
||||
, makeDesktopItem
|
||||
, nodejs-16_x
|
||||
, nodejs_16
|
||||
, stdenvNoCC
|
||||
, util-linux
|
||||
, zip
|
||||
|
@ -16,7 +16,7 @@ let
|
|||
pname = "electron-fiddle";
|
||||
version = "0.32.1";
|
||||
electron = electron_22;
|
||||
nodejs = nodejs-16_x;
|
||||
nodejs = nodejs_16;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "electron";
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
{ lib
|
||||
, buildNpmPackage
|
||||
, nodejs-16_x
|
||||
, nodejs_16
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
let
|
||||
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; };
|
||||
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; };
|
||||
in
|
||||
buildNpmPackage' rec {
|
||||
pname = "docker-compose-language-service";
|
||||
|
|
|
@ -4,13 +4,13 @@
|
|||
, stdenv
|
||||
, makeWrapper
|
||||
, fetchurl
|
||||
, nodejs-16_x
|
||||
, nodejs_16
|
||||
, coreutils
|
||||
, which
|
||||
}:
|
||||
|
||||
let
|
||||
nodejs = nodejs-16_x;
|
||||
nodejs = nodejs_16;
|
||||
inherit (builtins) elemAt;
|
||||
info = lib.splitString "-" stdenv.hostPlatform.system;
|
||||
arch = elemAt info 0;
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-16_x"}:
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_16"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ./node-env.nix {
|
||||
|
|
|
@ -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 {
|
||||
|
|
2
pkgs/misc/base16-builder/node-packages.nix
generated
2
pkgs/misc/base16-builder/node-packages.nix
generated
|
@ -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
|
||||
globalBuildInputs = pkgs.lib.attrValues (import ./supplement.nix {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
, stdenv
|
||||
, pkgs
|
||||
, fetchFromGitHub
|
||||
, nodejs ? pkgs.nodejs-14_x
|
||||
, nodejs ? pkgs.nodejs_14
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
|
|
@ -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 ../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs-16_x, tone, ffmpeg-full, util-linux, libwebp }:
|
||||
{ lib, stdenv, pkgs, fetchFromGitHub, runCommand, buildNpmPackage, nodejs_16, tone, ffmpeg-full, util-linux, libwebp }:
|
||||
|
||||
let
|
||||
nodejs = nodejs-16_x;
|
||||
nodejs = nodejs_16;
|
||||
|
||||
pname = "audiobookshelf";
|
||||
version = "2.2.18";
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand
|
||||
{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper
|
||||
, cacert, moreutils, jq, git, rsync, pkg-config, yarn, python3
|
||||
, esbuild, nodejs-16_x, node-gyp, libsecret, xorg, ripgrep
|
||||
, esbuild, nodejs_16, node-gyp, libsecret, xorg, ripgrep
|
||||
, AppKit, Cocoa, CoreServices, Security, cctools, xcbuild, quilt }:
|
||||
|
||||
let
|
||||
system = stdenv.hostPlatform.system;
|
||||
|
||||
nodejs = nodejs-16_x;
|
||||
nodejs = nodejs_16;
|
||||
python = python3;
|
||||
yarn' = yarn.override { inherit nodejs; };
|
||||
defaultYarnOpts = [ ];
|
||||
|
@ -241,7 +241,7 @@ in stdenv.mkDerivation rec {
|
|||
ln -s "${cloudAgent}/bin/cloud-agent" $out/libexec/code-server/lib/coder-cloud-agent
|
||||
|
||||
# create wrapper
|
||||
makeWrapper "${nodejs-16_x}/bin/node" "$out/bin/code-server" \
|
||||
makeWrapper "${nodejs_16}/bin/node" "$out/bin/code-server" \
|
||||
--add-flags "$out/libexec/code-server/out/node/entry.js"
|
||||
'';
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 ../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
, callPackage
|
||||
, fetchFromGitHub
|
||||
, nixosTests
|
||||
, nodejs-18_x
|
||||
, nodejs_18
|
||||
}:
|
||||
|
||||
let
|
||||
|
@ -13,7 +13,7 @@ let
|
|||
inherit pkgs;
|
||||
inherit (stdenv.hostPlatform) system;
|
||||
# pin nodejs version
|
||||
nodejs = nodejs-18_x;
|
||||
nodejs = nodejs_18;
|
||||
}).nodeDependencies;
|
||||
in
|
||||
|
||||
|
@ -31,7 +31,7 @@ buildGoModule rec {
|
|||
vendorHash = "sha256-ZsXPA4KyKbc/bwkidyHNDg62mE8KlE+yIssOBZLmHVg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
nodejs-18_x
|
||||
nodejs_18
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#! /usr/bin/env nix-shell
|
||||
#! nix-shell -i bash -p nodePackages.node2nix nodejs-18_x gnused wget
|
||||
#! nix-shell -i bash -p nodePackages.node2nix nodejs_18 gnused wget
|
||||
|
||||
# Usage: ./generate-dependencies.sh <version>
|
||||
# Use the same version format as in ./default.nix (without the 'v')
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}:
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ./node-env.nix {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
{ stdenv, fetchFromGitLab, pkgs, lib, nodejs-14_x, pkg-config
|
||||
{ stdenv, fetchFromGitLab, pkgs, lib, nodejs_14, pkg-config
|
||||
, libjpeg, pixman, cairo, pango, which, postgresql }:
|
||||
|
||||
let
|
||||
nodejs = nodejs-14_x;
|
||||
nodejs = nodejs_14;
|
||||
|
||||
version = "0.1.1";
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{pkgs ? import ../../.. {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper, runCommand
|
||||
{ lib, stdenv, fetchFromGitHub, buildGoModule, makeWrapper
|
||||
, cacert, moreutils, jq, git, pkg-config, yarn, python3
|
||||
, esbuild, nodejs-16_x, libsecret, xorg, ripgrep
|
||||
, esbuild, nodejs_16, libsecret, xorg, ripgrep
|
||||
, AppKit, Cocoa, Security, cctools }:
|
||||
|
||||
let
|
||||
system = stdenv.hostPlatform.system;
|
||||
|
||||
nodejs = nodejs-16_x;
|
||||
nodejs = nodejs_16;
|
||||
yarn' = yarn.override { inherit nodejs; };
|
||||
defaultYarnOpts = [ "frozen-lockfile" "non-interactive" "no-progress"];
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_12"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -7,13 +7,13 @@
|
|||
{ stdenv
|
||||
, pkgs
|
||||
, lib
|
||||
, nodejs-14_x
|
||||
, nodejs_14
|
||||
, fetchzip
|
||||
}:
|
||||
|
||||
let
|
||||
# nodejs-16_x fails with ENOTCACHED
|
||||
nodejs = nodejs-14_x;
|
||||
# nodejs_16 fails with ENOTCACHED
|
||||
nodejs = nodejs_14;
|
||||
|
||||
nodePackages = import ./node-composition.nix {
|
||||
inherit pkgs nodejs;
|
||||
|
|
|
@ -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 ../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
, yarn
|
||||
, fixup_yarn_lock
|
||||
, nodePackages
|
||||
, nodejs-16_x
|
||||
, nodejs_16
|
||||
|
||||
, plugins ? []
|
||||
}@args:
|
||||
|
@ -159,9 +159,9 @@ let
|
|||
cd ../..
|
||||
|
||||
mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/
|
||||
ln -s "${nodejs-16_x.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a
|
||||
ln -s "${nodejs_16.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a
|
||||
|
||||
ln -s ${nodejs-16_x.libv8}/include vendor/v8/include
|
||||
ln -s ${nodejs_16.libv8}/include vendor/v8/include
|
||||
|
||||
mkdir -p ext/libv8-node
|
||||
echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml
|
||||
|
@ -208,7 +208,7 @@ let
|
|||
nodePackages.uglify-js
|
||||
nodePackages.terser
|
||||
yarn
|
||||
nodejs-16_x
|
||||
nodejs_16
|
||||
];
|
||||
|
||||
outputs = [ "out" "javascripts" ];
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
{ stdenv
|
||||
, pkgs
|
||||
, lib
|
||||
, nodejs-14_x
|
||||
, nodejs_14
|
||||
}:
|
||||
|
||||
let
|
||||
nodejs = nodejs-14_x;
|
||||
nodejs = nodejs_14;
|
||||
|
||||
nodePackages = import ./node-packages.nix {
|
||||
inherit pkgs nodejs;
|
||||
|
|
|
@ -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 ../../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
{ stdenv
|
||||
, pkgs
|
||||
, lib
|
||||
, nodejs-16_x
|
||||
, nodejs_16
|
||||
, runtimeShell
|
||||
}:
|
||||
|
||||
let
|
||||
nodejs = nodejs-16_x;
|
||||
nodejs = nodejs_16;
|
||||
|
||||
nodePackages = import ./node-packages.nix {
|
||||
inherit pkgs nodejs;
|
||||
|
|
|
@ -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 ../../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs-16_x, jq, dos2unix }:
|
||||
{ lib, fetchpatch, fetchzip, yarn2nix-moretea, nodejs_16, jq, dos2unix }:
|
||||
|
||||
yarn2nix-moretea.mkYarnPackage {
|
||||
version = "1.1.5";
|
||||
|
@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
|
|||
preFixup = ''
|
||||
mkdir -p $out/bin
|
||||
chmod a+x $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
|
||||
sed -i '1i#!${nodejs-16_x}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
|
||||
sed -i '1i#!${nodejs_16}/bin/node' $out/libexec/meshcentral/deps/meshcentral/meshcentral.js
|
||||
ln -s $out/libexec/meshcentral/deps/meshcentral/meshcentral.js $out/bin/meshcentral
|
||||
'';
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
, nodePackages
|
||||
}:
|
||||
let
|
||||
nodejs = pkgs.nodejs-14_x;
|
||||
nodejs = pkgs.nodejs_14;
|
||||
nodeEnv = import ../../../development/node-packages/node-env.nix {
|
||||
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
|
||||
inherit pkgs nodejs;
|
||||
|
|
|
@ -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 ../../../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -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 ../../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -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 ../../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
, makeDesktopItem
|
||||
, makeWrapper
|
||||
, moreutils
|
||||
, nodejs-16_x
|
||||
, nodejs_16
|
||||
, pkg-config
|
||||
, python3
|
||||
, rustPlatform
|
||||
|
@ -22,7 +22,7 @@ let
|
|||
description = "A secure and free password manager for all of your devices";
|
||||
icon = "bitwarden";
|
||||
|
||||
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; };
|
||||
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; };
|
||||
|
||||
version = "2023.3.2";
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
@ -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 ../../../development/node-packages/node-env.nix {
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
, fetchFromGitHub
|
||||
, git
|
||||
, nixosTests
|
||||
, nodejs-16_x
|
||||
, nodejs_16
|
||||
, python3
|
||||
}:
|
||||
|
||||
let
|
||||
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; };
|
||||
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs_16; };
|
||||
|
||||
version = "2023.3.0b";
|
||||
|
||||
|
|
|
@ -1121,9 +1121,19 @@ mapAliases ({
|
|||
nmap-unfree = nmap; # Added 2021-04-06
|
||||
nmap-graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Added 2022-04-26
|
||||
nmap_graphical = throw "nmap graphical support has been removed due to its python2 dependency"; # Modified 2022-04-26
|
||||
nodejs-10_x = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31
|
||||
nodejs-12_x = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04
|
||||
nodejs_10 = throw "nodejs-10_x has been removed. Use a newer version instead."; # Added 2022-05-31
|
||||
nodejs-10_x = nodejs_10; # Added 2022-11-06
|
||||
nodejs_12 = throw "nodejs-12_x has been removed. Use a newer version instead."; # Added 2022-07-04
|
||||
nodejs-12_x = nodejs_12; # Added 2022-11-06
|
||||
nodejs-14_x = nodejs_14; # Added 2022-11-06
|
||||
nodejs-slim-14_x = nodejs-slim_14; # Added 2022-11-06
|
||||
nodejs-16_x = nodejs_16; # Added 2022-11-06
|
||||
nodejs-16_x-openssl_1_1 = throw "nodejs-16_x-openssl_1_1 has been removed."; # Added 2023-02-04
|
||||
nodejs-slim-16_x = nodejs-slim_16; # Added 2022-11-06
|
||||
nodejs-18_x = nodejs_18; # Added 2022-11-06
|
||||
nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06
|
||||
nodejs-19_x = nodejs_19; # Added 2022-11-06
|
||||
nodejs-slim-19_x = nodejs-slim_19; # Added 2022-11-06
|
||||
nologin = throw "'nologin' has been renamed to/replaced by 'shadow'"; # Converted to throw 2022-02-22
|
||||
nomad_1_1 = throw "nomad_1_1 has been removed because it's outdated. Use a a newer version instead"; # Added 2022-05-22
|
||||
nordic-polar = throw "nordic-polar was removed on 2021-05-27, now integrated in nordic"; # Added 2021-05-27
|
||||
|
|
|
@ -3590,7 +3590,7 @@ with pkgs;
|
|||
|
||||
play-with-mpv = callPackage ../tools/video/play-with-mpv { };
|
||||
|
||||
plausible = callPackage ../servers/web-apps/plausible { nodejs = nodejs-16_x; };
|
||||
plausible = callPackage ../servers/web-apps/plausible { nodejs = nodejs_16; };
|
||||
|
||||
pam-reattach = callPackage ../os-specific/darwin/pam-reattach { };
|
||||
|
||||
|
@ -6174,9 +6174,9 @@ with pkgs;
|
|||
|
||||
hedgedoc = callPackage ../servers/web-apps/hedgedoc {
|
||||
inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix {
|
||||
nodejs = nodejs-16_x;
|
||||
nodejs = nodejs_16;
|
||||
}) mkYarnPackage;
|
||||
nodejs = nodejs-16_x;
|
||||
nodejs = nodejs_16;
|
||||
};
|
||||
|
||||
colord = callPackage ../tools/misc/colord { };
|
||||
|
@ -9400,27 +9400,27 @@ with pkgs;
|
|||
|
||||
nodenv = callPackage ../development/tools/nodenv { };
|
||||
|
||||
nodejs = hiPrio nodejs-18_x;
|
||||
nodejs = hiPrio nodejs_18;
|
||||
|
||||
nodejs-slim = nodejs-slim-18_x;
|
||||
nodejs-slim = nodejs-slim_18;
|
||||
|
||||
nodejs-14_x = callPackage ../development/web/nodejs/v14.nix {
|
||||
nodejs_14 = callPackage ../development/web/nodejs/v14.nix {
|
||||
openssl = openssl_1_1;
|
||||
};
|
||||
nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix {
|
||||
nodejs-slim_14 = callPackage ../development/web/nodejs/v14.nix {
|
||||
openssl = openssl_1_1;
|
||||
enableNpm = false;
|
||||
};
|
||||
nodejs-16_x = callPackage ../development/web/nodejs/v16.nix { };
|
||||
nodejs-slim-16_x = callPackage ../development/web/nodejs/v16.nix {
|
||||
nodejs_16 = callPackage ../development/web/nodejs/v16.nix { };
|
||||
nodejs-slim_16 = callPackage ../development/web/nodejs/v16.nix {
|
||||
enableNpm = false;
|
||||
};
|
||||
nodejs-18_x = callPackage ../development/web/nodejs/v18.nix { };
|
||||
nodejs-slim-18_x = callPackage ../development/web/nodejs/v18.nix {
|
||||
nodejs_18 = callPackage ../development/web/nodejs/v18.nix { };
|
||||
nodejs-slim_18 = callPackage ../development/web/nodejs/v18.nix {
|
||||
enableNpm = false;
|
||||
};
|
||||
nodejs-19_x = callPackage ../development/web/nodejs/v19.nix { };
|
||||
nodejs-slim-19_x = callPackage ../development/web/nodejs/v19.nix {
|
||||
nodejs_19 = callPackage ../development/web/nodejs/v19.nix { };
|
||||
nodejs-slim_19 = callPackage ../development/web/nodejs/v19.nix {
|
||||
enableNpm = false;
|
||||
};
|
||||
nodejs_20 = callPackage ../development/web/nodejs/v20.nix { };
|
||||
|
@ -9987,10 +9987,10 @@ with pkgs;
|
|||
};
|
||||
|
||||
mirakurun = callPackage ../applications/video/mirakurun {
|
||||
yarn = yarn.override { nodejs = nodejs-16_x; };
|
||||
yarn = yarn.override { nodejs = nodejs_16; };
|
||||
inherit (callPackage ../development/tools/yarn2nix-moretea/yarn2nix {
|
||||
nodejs = nodejs-16_x;
|
||||
yarn = yarn.override { nodejs = nodejs-16_x; };
|
||||
nodejs = nodejs_16;
|
||||
yarn = yarn.override { nodejs = nodejs_16; };
|
||||
}) mkYarnPackage;
|
||||
};
|
||||
|
||||
|
@ -20961,7 +20961,7 @@ with pkgs;
|
|||
};
|
||||
|
||||
isso = callPackage ../servers/isso {
|
||||
nodejs = nodejs-14_x;
|
||||
nodejs = nodejs_14;
|
||||
};
|
||||
|
||||
itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix {
|
||||
|
@ -25225,7 +25225,7 @@ with pkgs;
|
|||
};
|
||||
|
||||
lemmy-ui = callPackage ../servers/web-apps/lemmy/ui.nix {
|
||||
nodejs = nodejs-14_x;
|
||||
nodejs = nodejs_14;
|
||||
};
|
||||
|
||||
lightgbm = callPackage ../development/libraries/lightgbm { };
|
||||
|
@ -25423,7 +25423,7 @@ with pkgs;
|
|||
outline = callPackage ../servers/web-apps/outline (lib.fix (super: {
|
||||
yarn2nix-moretea = yarn2nix-moretea.override { inherit (super) nodejs yarn; };
|
||||
yarn = yarn.override { inherit (super) nodejs; };
|
||||
nodejs = nodejs-16_x;
|
||||
nodejs = nodejs_16;
|
||||
}));
|
||||
|
||||
openbgpd = callPackage ../servers/openbgpd { };
|
||||
|
@ -29876,7 +29876,7 @@ with pkgs;
|
|||
epeg = callPackage ../applications/graphics/epeg { };
|
||||
|
||||
epgstation = callPackage ../applications/video/epgstation {
|
||||
nodejs = nodejs-16_x;
|
||||
nodejs = nodejs_16;
|
||||
};
|
||||
|
||||
inherit (gnome) epiphany;
|
||||
|
@ -33001,7 +33001,7 @@ with pkgs;
|
|||
peek = callPackage ../applications/video/peek { };
|
||||
|
||||
peertube = callPackage ../servers/peertube {
|
||||
nodejs = nodejs-16_x;
|
||||
nodejs = nodejs_16;
|
||||
};
|
||||
|
||||
peroxide = callPackage ../applications/networking/peroxide { };
|
||||
|
|
Loading…
Reference in a new issue