prescientmoon/satellite
prescientmoon/satellite
1
Fork 0
Code Activity

A ton of changes

Browse source
This commit is contained in:
Matei Adriel 2022-07-27 11:00:25 +03:00
parent c01ce48abe
commit cde6b1322a
21 changed files with 143 additions and 147 deletions

2
modules/overlays/npm/default.nix
View file

@ -1,4 +1,4 @@
# This file has been generated by node2nix 1.9.0. Do not edit!
# This file has been generated by node2nix 1.11.1. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;

32
modules/overlays/npm/node-env.nix
View file

@ -98,7 +98,7 @@ let
''
+ (lib.concatMapStrings (dependency:
''
if [ ! -e "${dependency.name}" ]; then
if [ ! -e "${dependency.packageName}" ]; then
${composePackage dependency}
fi
''
@ -257,8 +257,8 @@ let
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
if(![1, 2].includes(packageLock.lockfileVersion)) {
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
process.exit(1);
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
process.exit(1);
}
if(packageLock.dependencies !== undefined) {
@ -390,7 +390,7 @@ let
buildNodePackage =
{ name
, packageName
, version
, version ? null
, dependencies ? []
, buildInputs ? []
, production ? true
@ -409,7 +409,7 @@ let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
in
stdenv.mkDerivation ({
name = "${name}-${version}";
name = "${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
++ lib.optional (stdenv.isDarwin) libtool
@ -441,6 +441,14 @@ let
if [ -d "$out/lib/node_modules/.bin" ]
then
ln -s $out/lib/node_modules/.bin $out/bin
# Patch the shebang lines of all the executables
ls $out/bin/* | while read i
do
file="$(readlink -f "$i")"
chmod u+rwx "$file"
patchShebangs "$file"
done
fi
# Create symlinks to the deployed manual page folders, if applicable
@ -471,7 +479,7 @@ let
buildNodeDependencies =
{ name
, packageName
, version
, version ? null
, src
, dependencies ? []
, buildInputs ? []
@ -489,7 +497,7 @@ let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
in
stdenv.mkDerivation ({
name = "node-dependencies-${name}-${version}";
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ tarWrapper python nodejs ]
++ lib.optional (stdenv.isLinux) utillinux
@ -519,6 +527,7 @@ let
if [ -f ${src}/package-lock.json ]
then
cp ${src}/package-lock.json .
chmod 644 package-lock.json
fi
''}
@ -541,7 +550,7 @@ let
buildNodeShell =
{ name
, packageName
, version
, version ? null
, src
, dependencies ? []
, buildInputs ? []
@ -557,9 +566,10 @@ let
let
nodeDependencies = buildNodeDependencies args;
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
in
stdenv.mkDerivation {
name = "node-shell-${name}-${version}";
stdenv.mkDerivation ({
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
buildCommand = ''
@ -578,7 +588,7 @@ let
export NODE_PATH=${nodeDependencies}/lib/node_modules
export PATH="${nodeDependencies}/bin:$PATH"
'';
};
} // extraArgs);
in
{
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;

124
modules/overlays/npm/node-packages.nix
View file

@ -1,16 +1,16 @@
# This file has been generated by node2nix 1.9.0. Do not edit!
# This file has been generated by node2nix 1.11.1. Do not edit!
{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
let
sources = {
"core-js-3.23.1" = {
"core-js-3.23.5" = {
name = "core-js";
packageName = "core-js";
version = "3.23.1";
version = "3.23.5";
src = fetchurl {
url = "https://registry.npmjs.org/core-js/-/core-js-3.23.1.tgz";
sha512 = "wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w==";
url = "https://registry.npmjs.org/core-js/-/core-js-3.23.5.tgz";
sha512 = "7Vh11tujtAZy82da4duVreQysIoO2EvVrur7y6IzZkH1IHPSekuDi8Vuw1+YKjkbfWLRD7Nc9ICQ/sIUDutcyg==";
};
};
"core_d-5.0.1" = {
@ -31,13 +31,13 @@ let
sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
};
};
"jsonc-parser-3.0.0" = {
"jsonc-parser-3.1.0" = {
name = "jsonc-parser";
packageName = "jsonc-parser";
version = "3.0.0";
version = "3.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz";
sha512 = "fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==";
url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.1.0.tgz";
sha512 = "DRf0QjnNeCUds3xTjKlQQ3DpJD51GvDjJfnxUVWg6PZTo2otSm+slzNAxU/35hF8/oJIKoG9slq30JYOsF2azg==";
};
};
"nanolru-1.0.0" = {
@ -49,6 +49,15 @@ let
sha512 = "GyQkE8M32pULhQk7Sko5raoIbPalAk90ICG+An4fq6fCsFHsP6fB2K46WGXVdoJpy4SGMnZ/EKbo123fZJomWg==";
};
};
"picomatch-2.3.1" = {
name = "picomatch";
packageName = "picomatch";
version = "2.3.1";
src = fetchurl {
url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz";
sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==";
};
};
"prettier-2.7.1" = {
name = "prettier";
packageName = "prettier";
@ -94,58 +103,58 @@ let
sha512 = "C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==";
};
};
"vscode-css-languageservice-5.4.2" = {
"vscode-css-languageservice-6.0.1" = {
name = "vscode-css-languageservice";
packageName = "vscode-css-languageservice";
version = "5.4.2";
version = "6.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-5.4.2.tgz";
sha512 = "DT7+7vfdT2HDNjDoXWtYJ0lVDdeDEdbMNdK4PKqUl2MS8g7PWt7J5G9B6k9lYox8nOfhCEjLnoNC3UKHHCR1lg==";
url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.0.1.tgz";
sha512 = "81n/eeYuJwQdvpoy6IK1258PtPbO720fl13FcJ5YQECPyHMFkmld1qKHwPJkyLbLPfboqJPM53ys4xW8v+iBVw==";
};
};
"vscode-html-languageservice-4.2.5" = {
"vscode-html-languageservice-5.0.1" = {
name = "vscode-html-languageservice";
packageName = "vscode-html-languageservice";
version = "4.2.5";
version = "5.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-4.2.5.tgz";
sha512 = "dbr10KHabB9EaK8lI0XZW7SqOsTfrNyT3Nuj0GoPi4LjGKUmMiLtsqzfedIzRTzqY+w0FiLdh0/kQrnQ0tLxrw==";
url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.1.tgz";
sha512 = "OYsyn5HGAhxs0OIG+M0jc34WnftLtD67Wg7+TfrYwvf0waOkkr13zUqtdrVm2JPNQ6fJx+qnuM+vTbq7o1dCdQ==";
};
};
"vscode-json-languageservice-4.2.1" = {
"vscode-json-languageservice-5.1.0" = {
name = "vscode-json-languageservice";
packageName = "vscode-json-languageservice";
version = "4.2.1";
version = "5.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.2.1.tgz";
sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA==";
url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.1.0.tgz";
sha512 = "D5612D7h/Gh4A0JmdttPveWzT9dur21WXvBHWKPdOt0sLO6ILz8vN6+IzWnvwDOVAEFTpzIAMVMZwbKZkwGGiA==";
};
};
"vscode-jsonrpc-8.0.1" = {
"vscode-jsonrpc-8.0.2" = {
name = "vscode-jsonrpc";
packageName = "vscode-jsonrpc";
version = "8.0.1";
version = "8.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz";
sha512 = "N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ==";
url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz";
sha512 = "RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==";
};
};
"vscode-languageserver-8.0.1" = {
"vscode-languageserver-8.0.2" = {
name = "vscode-languageserver";
packageName = "vscode-languageserver";
version = "8.0.1";
version = "8.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.1.tgz";
sha512 = "sn7SjBwWm3OlmLtgg7jbM0wBULppyL60rj8K5HF0ny/MzN+GzPBX1kCvYdybhl7UW63V5V5tRVnyB8iwC73lSQ==";
url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.0.2.tgz";
sha512 = "bpEt2ggPxKzsAOZlXmCJ50bV7VrxwCS5BI4+egUmure/oI/t4OlFzi/YNtVvY24A2UDOZAgwFGgnZPwqSJubkA==";
};
};
"vscode-languageserver-protocol-3.17.1" = {
"vscode-languageserver-protocol-3.17.2" = {
name = "vscode-languageserver-protocol";
packageName = "vscode-languageserver-protocol";
version = "3.17.1";
version = "3.17.2";
src = fetchurl {
url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.1.tgz";
sha512 = "BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg==";
url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz";
sha512 = "8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==";
};
};
"vscode-languageserver-textdocument-1.0.5" = {
@ -157,13 +166,22 @@ let
sha512 = "1ah7zyQjKBudnMiHbZmxz5bYNM9KKZYz+5VQLj+yr8l+9w3g+WAhCkUkWbhMEdC5u0ub4Ndiye/fDyS8ghIKQg==";
};
};
"vscode-languageserver-types-3.17.1" = {
"vscode-languageserver-types-3.17.2" = {
name = "vscode-languageserver-types";
packageName = "vscode-languageserver-types";
version = "3.17.1";
version = "3.17.2";
src = fetchurl {
url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz";
sha512 = "K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ==";
url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz";
sha512 = "zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==";
};
};
"vscode-markdown-languageservice-0.0.0-alpha.11" = {
name = "vscode-markdown-languageservice";
packageName = "vscode-markdown-languageservice";
version = "0.0.0-alpha.11";
src = fetchurl {
url = "https://registry.npmjs.org/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.0.0-alpha.11.tgz";
sha512 = "syFamf99xx+Q9DkA66+8fbSz2A2LJkyOV+nSziGgAzdDPv4jkb7eWF6l+nUteHTGbRLQ+q0tfkj0A7OovueCSQ==";
};
};
"vscode-nls-5.0.1" = {
@ -209,42 +227,44 @@ in
license = "ISC";
};
production = true;
bypassCache = false;
bypassCache = true;
reconstructLock = true;
};
vscode-langservers-extracted = nodeEnv.buildNodePackage {
name = "vscode-langservers-extracted";
packageName = "vscode-langservers-extracted";
version = "4.2.1";
version = "4.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.2.1.tgz";
sha512 = "Un7gzQgvACjGtsT0Yll5QqHgL65a4mTK5ChgMnO4dgTZ3tuwJCaP84oztBqvuFZzN9QxA3C07J4QEQvf1xjcgQ==";
url = "https://registry.npmjs.org/vscode-langservers-extracted/-/vscode-langservers-extracted-4.4.0.tgz";
sha512 = "sWXDFmAvXMUhF5E+6v4e77SwhVPSvdLxGGfkOz15LmAsfKoamKMnW7aARnu6mRWOzqz3hKJqVZN4hnCpdvtLKg==";
};
dependencies = [
sources."core-js-3.23.1"
sources."jsonc-parser-3.0.0"
sources."core-js-3.23.5"
sources."jsonc-parser-3.1.0"
sources."picomatch-2.3.1"
sources."regenerator-runtime-0.13.9"
sources."request-light-0.5.8"
sources."typescript-4.7.4"
sources."vscode-css-languageservice-5.4.2"
sources."vscode-html-languageservice-4.2.5"
sources."vscode-json-languageservice-4.2.1"
sources."vscode-jsonrpc-8.0.1"
sources."vscode-languageserver-8.0.1"
sources."vscode-languageserver-protocol-3.17.1"
sources."vscode-css-languageservice-6.0.1"
sources."vscode-html-languageservice-5.0.1"
sources."vscode-json-languageservice-5.1.0"
sources."vscode-jsonrpc-8.0.2"
sources."vscode-languageserver-8.0.2"
sources."vscode-languageserver-protocol-3.17.2"
sources."vscode-languageserver-textdocument-1.0.5"
sources."vscode-languageserver-types-3.17.1"
sources."vscode-languageserver-types-3.17.2"
sources."vscode-markdown-languageservice-0.0.0-alpha.11"
sources."vscode-nls-5.0.1"
sources."vscode-uri-3.0.3"
];
buildInputs = globalBuildInputs;
meta = {
description = "HTML/CSS/JSON language servers extracted from [vscode](https://github.com/Microsoft/vscode).";
description = "HTML/CSS/JSON/ESLint language servers extracted from [vscode](https://github.com/Microsoft/vscode).";
homepage = "https://github.com/hrsh7th/vscode-langservers-extracted#readme";
license = "MIT";
};
production = true;
bypassCache = false;
bypassCache = true;
reconstructLock = true;
};
}