Remove nodejs-6_x which is about to enter EOL

- Remove nodejs-6_x
- Set nodejs / nodejs-slim to nodejs-8_x / nodejs-slim-8_x
- Re-generate node2nix generated files using nodejs-8_x instead
This commit is contained in:
tobias pflug 2019-04-04 19:10:06 +02:00 committed by adisbladis
parent b306b4cf1a
commit 0e296d5fcd
No known key found for this signature in database
GPG key ID: ED58F95069B004F5
26 changed files with 3521 additions and 721 deletions

View file

@ -534,6 +534,13 @@
Same applies to the new <literal>users.ldap.daemon.rootpwmodpwFile</literal> option.
</para>
</listitem>
<listitem>
<para>
<literal>nodejs-6_x</literal> is end-of-life.
<literal>nodejs-6_x</literal>, <literal>nodejs-slim-6_x</literal> and
<literal>nodePackages_6_x</literal> are removed.
</para>
</listitem>
</itemizedlist>
</section>

View file

@ -1,17 +0,0 @@
# This file has been generated by node2nix 1.6.0. Do not edit!
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages-v6.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}

View file

@ -4,6 +4,5 @@
set -eu -o pipefail
rm -f node-env.nix
node2nix -6 -i node-packages-v6.json -o node-packages-v6.nix -c composition-v6.nix
node2nix -8 -i node-packages-v8.json -o node-packages-v8.nix -c composition-v8.nix
node2nix --nodejs-10 -i node-packages-v10.json -o node-packages-v10.nix -c composition-v10.nix

View file

@ -1,10 +0,0 @@
{ stdenv, callPackage, lib, enableNpm ? true }:
let
buildNodejs = callPackage ./nodejs.nix {};
in
buildNodejs {
inherit enableNpm;
version = "6.17.0";
sha256 = "0j17cpl1mbqvbaa0bk9n3nd34jdyljbvm53gx8n64bhwly7cgnn1";
}

View file

@ -1,3 +1,3 @@
#!/bin/sh -e
node2nix -6 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix
node2nix -8 -i pkgs.json -c nodepkgs.nix -e ../../node-packages/node-env.nix

File diff suppressed because it is too large Load diff

View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
let
nodeEnv = import ../../node-packages/node-env.nix {

View file

@ -1,14 +1,6 @@
{ stdenv, pkgs }:
let
# node-packages*.nix generated via:
#
# % node2nix --input node-packages.json \
# --output node-packages-generated.nix \
# --composition node-packages.nix \
# --node-env ./../../development/node-packages/node-env.nix \
# --pkg-name nodejs-6_x
#
nodePackages = import ./node-packages.nix {
inherit pkgs;
inherit (stdenv.hostPlatform) system;

View file

@ -0,0 +1,7 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
exec node2nix -8 \
--input node-packages.json \
--output node-packages-generated.nix \
--composition node-packages.nix \
--node-env ./../../development/node-packages/node-env.nix \

View file

@ -58,15 +58,6 @@ let
sha1 = "a7d898243ae622f7abb6bb604d740a76c6a5461b";
};
};
"builtin-modules-1.1.1" = {
name = "builtin-modules";
packageName = "builtin-modules";
version = "1.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
};
};
"bulk-replace-0.0.1" = {
name = "bulk-replace";
packageName = "bulk-replace";
@ -94,13 +85,13 @@ let
sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7";
};
};
"capture-stack-trace-1.0.0" = {
"capture-stack-trace-1.0.1" = {
name = "capture-stack-trace";
packageName = "capture-stack-trace";
version = "1.0.0";
version = "1.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz";
sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d";
url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz";
sha512 = "mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==";
};
};
"chalk-1.1.3" = {
@ -229,13 +220,13 @@ let
sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
};
};
"esprima-4.0.0" = {
"esprima-4.0.1" = {
name = "esprima";
packageName = "esprima";
version = "4.0.0";
version = "4.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz";
sha512 = "oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==";
url = "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz";
sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
};
};
"filled-array-1.1.0" = {
@ -283,13 +274,13 @@ let
sha1 = "5f81635a61e4a6589f180569ea4e381680a51f35";
};
};
"graceful-fs-4.1.11" = {
"graceful-fs-4.1.15" = {
name = "graceful-fs";
packageName = "graceful-fs";
version = "4.1.11";
version = "4.1.15";
src = fetchurl {
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz";
sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658";
url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz";
sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==";
};
};
"has-ansi-2.0.0" = {
@ -301,22 +292,22 @@ let
sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
};
};
"hepburn-1.0.0" = {
"hepburn-1.1.1" = {
name = "hepburn";
packageName = "hepburn";
version = "1.0.0";
version = "1.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/hepburn/-/hepburn-1.0.0.tgz";
sha1 = "49ce862942a77570cd4f5c8fe100b85d942cb61b";
url = "https://registry.npmjs.org/hepburn/-/hepburn-1.1.1.tgz";
sha512 = "Ok3ZmMJN3ek4WFAL4f5t8k+BmrDRlS5qGjI4um+3cHH0SrYVzJgUTYwIfGvU8s/eWqOEY+gsINwjJSoaBG3A9g==";
};
};
"hosted-git-info-2.6.1" = {
"hosted-git-info-2.7.1" = {
name = "hosted-git-info";
packageName = "hosted-git-info";
version = "2.6.1";
version = "2.7.1";
src = fetchurl {
url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz";
sha512 = "Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A==";
url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz";
sha512 = "7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==";
};
};
"imurmurhash-0.1.4" = {
@ -364,15 +355,6 @@ let
sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
};
};
"is-builtin-module-1.0.0" = {
name = "is-builtin-module";
packageName = "is-builtin-module";
version = "1.0.0";
src = fetchurl {
url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
};
};
"is-finite-1.0.2" = {
name = "is-finite";
packageName = "is-finite";
@ -454,13 +436,13 @@ let
sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
};
};
"js-yaml-3.12.0" = {
"js-yaml-3.13.0" = {
name = "js-yaml";
packageName = "js-yaml";
version = "3.12.0";
version = "3.13.0";
src = fetchurl {
url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz";
sha512 = "PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==";
url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz";
sha512 = "pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==";
};
};
"keypress-0.1.0" = {
@ -481,13 +463,13 @@ let
sha1 = "56f8d6139620847b8017f8f1f4d78e211324168b";
};
};
"limax-1.6.0" = {
"limax-1.7.0" = {
name = "limax";
packageName = "limax";
version = "1.6.0";
version = "1.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/limax/-/limax-1.6.0.tgz";
sha1 = "996163291c7e8c6e7dd5b438c0190b69622f1b33";
url = "https://registry.npmjs.org/limax/-/limax-1.7.0.tgz";
sha512 = "ibcGylOXT5vry2JKfKwLWx2tZudRYWm4SzG9AE/cc5zqwW+3nQy/uPLUvfAUChRdmqxVrK6SNepmO7ZY8RoKfA==";
};
};
"load-json-file-1.1.0" = {
@ -580,22 +562,22 @@ let
sha1 = "5ae5541d024645d32a58fcddc9ceecea7ae3ac2f";
};
};
"nodejieba-2.2.6" = {
"nodejieba-2.3.0" = {
name = "nodejieba";
packageName = "nodejieba";
version = "2.2.6";
version = "2.3.0";
src = fetchurl {
url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.2.6.tgz";
sha1 = "17cd416705b7b01c062e6cd9d7179b30453eb4a3";
url = "https://registry.npmjs.org/nodejieba/-/nodejieba-2.3.0.tgz";
sha512 = "ZzLsVuNDlrmcBQa/b8G/yegdXje2iFmktYmPksk6qLha1brKEANYqg4XPiBspF1D0y7Npho91KTmvKFcDr0UdA==";
};
};
"normalize-package-data-2.4.0" = {
"normalize-package-data-2.5.0" = {
name = "normalize-package-data";
packageName = "normalize-package-data";
version = "2.4.0";
version = "2.5.0";
src = fetchurl {
url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz";
sha512 = "9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==";
url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz";
sha512 = "/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==";
};
};
"number-is-nan-1.0.1" = {
@ -679,6 +661,15 @@ let
sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
};
};
"path-parse-1.0.6" = {
name = "path-parse";
packageName = "path-parse";
version = "1.0.6";
src = fetchurl {
url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz";
sha512 = "GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==";
};
};
"path-type-1.1.0" = {
name = "path-type";
packageName = "path-type";
@ -796,13 +787,13 @@ let
sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde";
};
};
"registry-auth-token-3.3.2" = {
"registry-auth-token-3.4.0" = {
name = "registry-auth-token";
packageName = "registry-auth-token";
version = "3.3.2";
version = "3.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz";
sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==";
url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz";
sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==";
};
};
"registry-url-3.1.0" = {
@ -823,6 +814,15 @@ let
sha1 = "5214c53a926d3552707527fbab415dbc08d06dda";
};
};
"resolve-1.10.0" = {
name = "resolve";
packageName = "resolve";
version = "1.10.0";
src = fetchurl {
url = "https://registry.npmjs.org/resolve/-/resolve-1.10.0.tgz";
sha512 = "3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==";
};
};
"safe-buffer-5.1.2" = {
name = "safe-buffer";
packageName = "safe-buffer";
@ -832,13 +832,13 @@ let
sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
};
};
"semver-5.5.0" = {
"semver-5.7.0" = {
name = "semver";
packageName = "semver";
version = "5.5.0";
version = "5.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz";
sha512 = "4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==";
url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
};
};
"semver-diff-2.1.0" = {
@ -868,22 +868,22 @@ let
sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
};
};
"spdx-correct-3.0.0" = {
"spdx-correct-3.1.0" = {
name = "spdx-correct";
packageName = "spdx-correct";
version = "3.0.0";
version = "3.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz";
sha512 = "N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==";
url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz";
sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==";
};
};
"spdx-exceptions-2.1.0" = {
"spdx-exceptions-2.2.0" = {
name = "spdx-exceptions";
packageName = "spdx-exceptions";
version = "2.1.0";
version = "2.2.0";
src = fetchurl {
url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz";
sha512 = "4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==";
url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz";
sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==";
};
};
"spdx-expression-parse-3.0.0" = {
@ -895,13 +895,13 @@ let
sha512 = "Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==";
};
};
"spdx-license-ids-3.0.0" = {
"spdx-license-ids-3.0.3" = {
name = "spdx-license-ids";
packageName = "spdx-license-ids";
version = "3.0.0";
version = "3.0.3";
src = fetchurl {
url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz";
sha512 = "2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==";
url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz";
sha512 = "uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==";
};
};
"speakingurl-14.0.1" = {
@ -1048,13 +1048,13 @@ let
sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a";
};
};
"validate-npm-package-license-3.0.3" = {
"validate-npm-package-license-3.0.4" = {
name = "validate-npm-package-license";
packageName = "validate-npm-package-license";
version = "3.0.3";
version = "3.0.4";
src = fetchurl {
url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz";
sha512 = "63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==";
url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz";
sha512 = "DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==";
};
};
"widest-line-1.0.0" = {
@ -1102,11 +1102,10 @@ in
sources."argparse-1.0.10"
sources."array-find-index-1.0.2"
sources."boxen-0.3.1"
sources."builtin-modules-1.1.1"
sources."bulk-replace-0.0.1"
sources."camelcase-2.1.1"
sources."camelcase-keys-2.1.0"
sources."capture-stack-trace-1.0.0"
sources."capture-stack-trace-1.0.1"
sources."chalk-1.1.3"
sources."code-point-at-1.1.0"
sources."commander-1.1.1"
@ -1121,22 +1120,21 @@ in
sources."ejs-2.6.1"
sources."error-ex-1.3.2"
sources."escape-string-regexp-1.0.5"
sources."esprima-4.0.0"
sources."esprima-4.0.1"
sources."filled-array-1.1.0"
sources."find-up-1.1.2"
sources."fs-promise-0.3.1"
sources."get-stdin-4.0.1"
sources."got-5.7.1"
sources."graceful-fs-4.1.11"
sources."graceful-fs-4.1.15"
sources."has-ansi-2.0.0"
sources."hepburn-1.0.0"
sources."hosted-git-info-2.6.1"
sources."hepburn-1.1.1"
sources."hosted-git-info-2.7.1"
sources."imurmurhash-0.1.4"
sources."indent-string-2.1.0"
sources."inherits-2.0.3"
sources."ini-1.3.5"
sources."is-arrayish-0.2.1"
sources."is-builtin-module-1.0.0"
sources."is-finite-1.0.2"
sources."is-fullwidth-code-point-1.0.0"
sources."is-npm-1.0.0"
@ -1146,10 +1144,10 @@ in
sources."is-stream-1.1.0"
sources."is-utf8-0.2.1"
sources."isarray-1.0.0"
sources."js-yaml-3.12.0"
sources."js-yaml-3.13.0"
sources."keypress-0.1.0"
sources."latest-version-2.0.0"
sources."limax-1.6.0"
sources."limax-1.7.0"
sources."load-json-file-1.1.0"
sources."loud-rejection-1.6.0"
sources."lowercase-keys-1.0.1"
@ -1163,8 +1161,8 @@ in
})
sources."nan-2.10.0"
sources."node-status-codes-1.0.0"
sources."nodejieba-2.2.6"
sources."normalize-package-data-2.4.0"
sources."nodejieba-2.3.0"
sources."normalize-package-data-2.5.0"
sources."number-is-nan-1.0.1"
sources."object-assign-4.1.1"
sources."open-0.0.5"
@ -1174,6 +1172,7 @@ in
sources."package-json-2.4.0"
sources."parse-json-2.2.0"
sources."path-exists-2.1.0"
sources."path-parse-1.0.6"
sources."path-type-1.1.0"
sources."pify-2.3.0"
sources."pinkie-2.0.4"
@ -1187,18 +1186,19 @@ in
sources."read-pkg-up-1.0.1"
sources."readable-stream-2.3.6"
sources."redent-1.0.0"
sources."registry-auth-token-3.3.2"
sources."registry-auth-token-3.4.0"
sources."registry-url-3.1.0"
sources."repeating-2.0.1"
sources."resolve-1.10.0"
sources."safe-buffer-5.1.2"
sources."semver-5.5.0"
sources."semver-5.7.0"
sources."semver-diff-2.1.0"
sources."signal-exit-3.0.2"
sources."slide-1.1.6"
sources."spdx-correct-3.0.0"
sources."spdx-exceptions-2.1.0"
sources."spdx-correct-3.1.0"
sources."spdx-exceptions-2.2.0"
sources."spdx-expression-parse-3.0.0"
sources."spdx-license-ids-3.0.0"
sources."spdx-license-ids-3.0.3"
sources."speakingurl-14.0.1"
sources."sprintf-js-1.0.3"
sources."string-width-1.0.2"
@ -1215,7 +1215,7 @@ in
sources."url-parse-lax-1.0.0"
sources."util-deprecate-1.0.2"
sources."uuid-2.0.3"
sources."validate-npm-package-license-3.0.3"
sources."validate-npm-package-license-3.0.4"
sources."widest-line-1.0.0"
sources."write-file-atomic-1.3.4"
sources."xdg-basedir-2.0.0"
@ -1227,6 +1227,6 @@ in
license = "MIT";
};
production = true;
bypassCache = false;
bypassCache = true;
};
}

View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
let
nodeEnv = import ../../development/node-packages/node-env.nix {

View file

@ -1,4 +1,4 @@
{ stdenv, pkgs, buildEnv, fetchFromGitHub, nodejs-6_x, phantomjs2, which }:
{ stdenv, pkgs, buildEnv, fetchFromGitHub, nodejs-8_x, phantomjs2, which }:
let
nodePackages = import ./node.nix {
@ -22,7 +22,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ which ];
buildInputs = [ nodejs-6_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [
buildInputs = [ nodejs-8_x phantomjs-prebuilt ] ++ (stdenv.lib.attrVals [
"blint-^1"
"node-static-0.6.0"
"rollup-^0.41.0"

View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
let
nodeEnv = import ../../../../development/node-packages/node-env.nix {
@ -14,4 +14,4 @@ in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
}

View file

@ -1,5 +1,5 @@
{ stdenv, pkgs, buildEnv, fetchFromGitHub, makeWrapper
, fetchpatch, nodejs-6_x, phantomjs2, runtimeShell }:
, fetchpatch, nodejs-8_x, phantomjs2, runtimeShell }:
let
nodePackages = import ./node.nix {
inherit pkgs;
@ -107,7 +107,7 @@ stdenv.mkDerivation rec {
inherit name version src;
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ nodejs-6_x ];
buildInputs = [ nodejs-8_x ];
NODE_PATH = "${nodeEnv}/lib/node_modules";
@ -127,7 +127,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cat > $out/bin/codimd <<EOF
#!${runtimeShell}
${nodejs-6_x}/bin/node $out/app.js
${nodejs-8_x}/bin/node $out/app.js
EOF
cp -R {app.js,bin,lib,locales,package.json,public} $out/
'';

View file

@ -1,7 +1,7 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
node2nix -6 -i deps.json \
node2nix -8 -i deps.json \
-e ../../../development/node-packages/node-env.nix \
--no-copy-node-env \
-c node.nix

View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
@ -14,4 +14,4 @@ in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
}

View file

@ -1,6 +1,6 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
node2nix -6 -i deps.json \
node2nix -8 -i deps.json \
--no-copy-node-env \
-e ../../../development/node-packages/node-env.nix -c node.nix

View file

@ -4,22 +4,22 @@
let
sources = {
"ajv-5.5.2" = {
"ajv-6.10.0" = {
name = "ajv";
packageName = "ajv";
version = "5.5.2";
version = "6.10.0";
src = fetchurl {
url = "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz";
sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965";
url = "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz";
sha512 = "nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==";
};
};
"asn1-0.2.3" = {
"asn1-0.2.4" = {
name = "asn1";
packageName = "asn1";
version = "0.2.3";
version = "0.2.4";
src = fetchurl {
url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
url = "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz";
sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==";
};
};
"assert-plus-1.0.0" = {
@ -49,22 +49,22 @@ let
sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8";
};
};
"aws4-1.7.0" = {
"aws4-1.8.0" = {
name = "aws4";
packageName = "aws4";
version = "1.7.0";
version = "1.8.0";
src = fetchurl {
url = "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz";
sha512 = "32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==";
url = "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz";
sha512 = "ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==";
};
};
"bcrypt-pbkdf-1.0.1" = {
"bcrypt-pbkdf-1.0.2" = {
name = "bcrypt-pbkdf";
packageName = "bcrypt-pbkdf";
version = "1.0.1";
version = "1.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz";
sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d";
url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz";
sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e";
};
};
"buffer-crc32-0.1.1" = {
@ -94,22 +94,13 @@ let
sha1 = "1b681c21ff84033c826543090689420d187151dc";
};
};
"co-4.6.0" = {
name = "co";
packageName = "co";
version = "4.6.0";
src = fetchurl {
url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz";
sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184";
};
};
"combined-stream-1.0.6" = {
"combined-stream-1.0.7" = {
name = "combined-stream";
packageName = "combined-stream";
version = "1.0.6";
version = "1.0.7";
src = fetchurl {
url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz";
sha1 = "723e7df6e801ac5613113a7e445a9b69cb632818";
url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz";
sha512 = "brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==";
};
};
"commander-0.6.1" = {
@ -175,13 +166,13 @@ let
sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0";
};
};
"debug-3.1.0" = {
"debug-4.1.1" = {
name = "debug";
packageName = "debug";
version = "3.1.0";
version = "4.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz";
sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz";
sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
};
};
"delayed-stream-1.0.0" = {
@ -202,22 +193,22 @@ let
sha1 = "103d3527fd31528f40188130c841efdd78264e5c";
};
};
"ecc-jsbn-0.1.1" = {
"ecc-jsbn-0.1.2" = {
name = "ecc-jsbn";
packageName = "ecc-jsbn";
version = "0.1.1";
version = "0.1.2";
src = fetchurl {
url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz";
sha1 = "3a83a904e54353287874c564b7549386849a98c9";
};
};
"extend-3.0.1" = {
"extend-3.0.2" = {
name = "extend";
packageName = "extend";
version = "3.0.1";
version = "3.0.2";
src = fetchurl {
url = "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz";
sha1 = "a755ea7bc1adfcc5a31ce7e762dbaadc5e636444";
url = "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz";
sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==";
};
};
"extsprintf-1.3.0" = {
@ -229,13 +220,13 @@ let
sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
};
};
"fast-deep-equal-1.1.0" = {
"fast-deep-equal-2.0.1" = {
name = "fast-deep-equal";
packageName = "fast-deep-equal";
version = "1.1.0";
version = "2.0.1";
src = fetchurl {
url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz";
sha1 = "c053477817c86b51daa853c81e059b733d023614";
url = "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz";
sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49";
};
};
"fast-json-stable-stringify-2.0.0" = {
@ -256,13 +247,13 @@ let
sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
};
};
"form-data-2.3.2" = {
"form-data-2.3.3" = {
name = "form-data";
packageName = "form-data";
version = "2.3.2";
version = "2.3.3";
src = fetchurl {
url = "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz";
sha1 = "4970498be604c20c005d4f5c23aecd21d6b49099";
url = "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz";
sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
};
};
"formidable-1.0.11" = {
@ -301,13 +292,13 @@ let
sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92";
};
};
"har-validator-5.0.3" = {
"har-validator-5.1.3" = {
name = "har-validator";
packageName = "har-validator";
version = "5.0.3";
version = "5.1.3";
src = fetchurl {
url = "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz";
sha1 = "ba402c266194f15956ef15e0fcf242993f6a7dfd";
url = "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz";
sha512 = "sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==";
};
};
"http-signature-1.2.0" = {
@ -355,13 +346,13 @@ let
sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13";
};
};
"json-schema-traverse-0.3.1" = {
"json-schema-traverse-0.4.1" = {
name = "json-schema-traverse";
packageName = "json-schema-traverse";
version = "0.3.1";
version = "0.4.1";
src = fetchurl {
url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz";
sha1 = "349a6d44c53a51de89b40805c5d5e59b417d3340";
url = "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz";
sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==";
};
};
"json-stringify-safe-5.0.1" = {
@ -382,13 +373,13 @@ let
sha1 = "313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2";
};
};
"lodash-4.17.10" = {
"lodash-4.17.11" = {
name = "lodash";
packageName = "lodash";
version = "4.17.10";
version = "4.17.11";
src = fetchurl {
url = "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz";
sha512 = "UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==";
url = "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz";
sha512 = "cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==";
};
};
"methods-0.0.1" = {
@ -409,22 +400,22 @@ let
sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
};
};
"mime-db-1.33.0" = {
"mime-db-1.38.0" = {
name = "mime-db";
packageName = "mime-db";
version = "1.33.0";
version = "1.38.0";
src = fetchurl {
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz";
sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==";
url = "https://registry.npmjs.org/mime-db/-/mime-db-1.38.0.tgz";
sha512 = "bqVioMFFzc2awcdJZIzR3HjZFX20QhilVS7hytkKrv7xFAn8bM1gzc/FOX2awLISvWe0PV8ptFKcon+wZ5qYkg==";
};
};
"mime-types-2.1.18" = {
"mime-types-2.1.22" = {
name = "mime-types";
packageName = "mime-types";
version = "2.1.18";
version = "2.1.22";
src = fetchurl {
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz";
sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==";
url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.22.tgz";
sha512 = "aGl6TZGnhm/li6F7yx82bJiBZwgiEa4Hf6CNr8YO+r5UHr53tSTYZb102zyU50DOWWKeOv0uQLRL0/9EiKWCog==";
};
};
"mkdirp-0.3.3" = {
@ -436,22 +427,22 @@ let
sha1 = "595e251c1370c3a68bab2136d0e348b8105adf13";
};
};
"ms-2.0.0" = {
"ms-2.1.1" = {
name = "ms";
packageName = "ms";
version = "2.0.0";
version = "2.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz";
sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8";
url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz";
sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==";
};
};
"oauth-sign-0.8.2" = {
"oauth-sign-0.9.0" = {
name = "oauth-sign";
packageName = "oauth-sign";
version = "0.8.2";
version = "0.9.0";
src = fetchurl {
url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz";
sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43";
url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz";
sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
};
};
"pause-0.0.1" = {
@ -472,6 +463,15 @@ let
sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b";
};
};
"psl-1.1.31" = {
name = "psl";
packageName = "psl";
version = "1.1.31";
src = fetchurl {
url = "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz";
sha512 = "/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==";
};
};
"punycode-1.4.1" = {
name = "punycode";
packageName = "punycode";
@ -481,6 +481,15 @@ let
sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
};
};
"punycode-2.1.1" = {
name = "punycode";
packageName = "punycode";
version = "2.1.1";
src = fetchurl {
url = "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz";
sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==";
};
};
"qs-0.5.1" = {
name = "qs";
packageName = "qs";
@ -517,13 +526,13 @@ let
sha512 = "M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==";
};
};
"redis-commands-1.3.5" = {
"redis-commands-1.4.0" = {
name = "redis-commands";
packageName = "redis-commands";
version = "1.3.5";
version = "1.4.0";
src = fetchurl {
url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz";
sha512 = "foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA==";
url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.4.0.tgz";
sha512 = "cu8EF+MtkwI4DLIT0x9P8qNTLFhQD4jLfxLR0cCNkeGzs87FN6879JOJwNQR/1zD7aSYNbU0hgsV9zGY71Itvw==";
};
};
"redis-parser-2.6.0" = {
@ -562,22 +571,22 @@ let
sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
};
};
"sshpk-1.14.2" = {
"sshpk-1.16.1" = {
name = "sshpk";
packageName = "sshpk";
version = "1.14.2";
version = "1.16.1";
src = fetchurl {
url = "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz";
sha1 = "c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98";
url = "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz";
sha512 = "HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==";
};
};
"tough-cookie-2.3.4" = {
"tough-cookie-2.4.3" = {
name = "tough-cookie";
packageName = "tough-cookie";
version = "2.3.4";
version = "2.4.3";
src = fetchurl {
url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz";
sha512 = "TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==";
url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
};
};
"tunnel-agent-0.6.0" = {
@ -607,13 +616,22 @@ let
sha512 = "5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==";
};
};
"uuid-3.3.0" = {
"uri-js-4.2.2" = {
name = "uri-js";
packageName = "uri-js";
version = "4.2.2";
src = fetchurl {
url = "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz";
sha512 = "KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==";
};
};
"uuid-3.3.2" = {
name = "uuid";
packageName = "uuid";
version = "3.3.0";
version = "3.3.2";
src = fetchurl {
url = "https://registry.npmjs.org/uuid/-/uuid-3.3.0.tgz";
sha512 = "ijO9N2xY/YaOqQ5yz5c4sy2ZjWmA6AR6zASb/gdpeKZ8+948CxwfMW9RrKVk5may6ev8c0/Xguu32e2Llelpqw==";
url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz";
sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==";
};
};
"verror-1.10.0" = {
@ -644,13 +662,13 @@ in
sources."cookie-0.0.5"
sources."cookie-signature-0.0.1"
sources."crc-0.2.0"
sources."debug-3.1.0"
sources."debug-4.1.1"
sources."formidable-1.0.11"
sources."fresh-0.1.0"
sources."methods-0.0.1"
sources."mime-1.2.6"
sources."mkdirp-0.3.3"
sources."ms-2.0.0"
sources."ms-2.1.1"
sources."pause-0.0.1"
sources."qs-0.5.1"
sources."range-parser-0.0.4"
@ -661,7 +679,7 @@ in
description = "Sinatra inspired web development framework";
};
production = true;
bypassCache = false;
bypassCache = true;
};
"swig-0.14.0" = nodeEnv.buildNodePackage {
name = "swig";
@ -679,7 +697,7 @@ in
description = "A fast django-like templating engine for node.js and browsers.";
};
production = true;
bypassCache = false;
bypassCache = true;
};
"consolidate-0.10.0" = nodeEnv.buildNodePackage {
name = "consolidate";
@ -695,7 +713,7 @@ in
homepage = https://github.com/visionmedia/consolidate.js;
};
production = true;
bypassCache = false;
bypassCache = true;
};
redis = nodeEnv.buildNodePackage {
name = "redis";
@ -707,7 +725,7 @@ in
};
dependencies = [
sources."double-ended-queue-2.1.0-0"
sources."redis-commands-1.3.5"
sources."redis-commands-1.4.0"
sources."redis-parser-2.6.0"
];
buildInputs = globalBuildInputs;
@ -717,22 +735,22 @@ in
license = "MIT";
};
production = true;
bypassCache = false;
bypassCache = true;
};
connect-redis = nodeEnv.buildNodePackage {
name = "connect-redis";
packageName = "connect-redis";
version = "3.3.3";
version = "3.4.1";
src = fetchurl {
url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.3.3.tgz";
sha512 = "rpWsW2uk1uOe/ccY/JvW+RiLrhZm7auIx8z4yR+KXemFTIhJyD58jXiJbI0E/fZCnybawpdSqOZ+6/ah6aBeyg==";
url = "https://registry.npmjs.org/connect-redis/-/connect-redis-3.4.1.tgz";
sha512 = "oXNcpLg/PJ6G4gbhyGwrQK9mUQTKYa2aEnOH9kWIxbNUjIFPqUmzz75RdLp5JTPSjrBVcz+9ll4sSxfvlW0ZLA==";
};
dependencies = [
sources."debug-3.1.0"
sources."debug-4.1.1"
sources."double-ended-queue-2.1.0-0"
sources."ms-2.0.0"
sources."ms-2.1.1"
sources."redis-2.8.0"
sources."redis-commands-1.3.5"
sources."redis-commands-1.4.0"
sources."redis-parser-2.6.0"
];
buildInputs = globalBuildInputs;
@ -742,18 +760,18 @@ in
license = "MIT";
};
production = true;
bypassCache = false;
bypassCache = true;
};
async = nodeEnv.buildNodePackage {
name = "async";
packageName = "async";
version = "2.6.1";
version = "2.6.2";
src = fetchurl {
url = "https://registry.npmjs.org/async/-/async-2.6.1.tgz";
sha512 = "fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==";
url = "https://registry.npmjs.org/async/-/async-2.6.2.tgz";
sha512 = "H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==";
};
dependencies = [
sources."lodash-4.17.10"
sources."lodash-4.17.11"
];
buildInputs = globalBuildInputs;
meta = {
@ -762,61 +780,66 @@ in
license = "MIT";
};
production = true;
bypassCache = false;
bypassCache = true;
};
request = nodeEnv.buildNodePackage {
name = "request";
packageName = "request";
version = "2.87.0";
version = "2.88.0";
src = fetchurl {
url = "https://registry.npmjs.org/request/-/request-2.87.0.tgz";
sha512 = "fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==";
url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
};
dependencies = [
sources."ajv-5.5.2"
sources."asn1-0.2.3"
sources."ajv-6.10.0"
sources."asn1-0.2.4"
sources."assert-plus-1.0.0"
sources."asynckit-0.4.0"
sources."aws-sign2-0.7.0"
sources."aws4-1.7.0"
sources."bcrypt-pbkdf-1.0.1"
sources."aws4-1.8.0"
sources."bcrypt-pbkdf-1.0.2"
sources."caseless-0.12.0"
sources."co-4.6.0"
sources."combined-stream-1.0.6"
sources."combined-stream-1.0.7"
sources."core-util-is-1.0.2"
sources."dashdash-1.14.1"
sources."delayed-stream-1.0.0"
sources."ecc-jsbn-0.1.1"
sources."extend-3.0.1"
sources."ecc-jsbn-0.1.2"
sources."extend-3.0.2"
sources."extsprintf-1.3.0"
sources."fast-deep-equal-1.1.0"
sources."fast-deep-equal-2.0.1"
sources."fast-json-stable-stringify-2.0.0"
sources."forever-agent-0.6.1"
sources."form-data-2.3.2"
sources."form-data-2.3.3"
sources."getpass-0.1.7"
sources."har-schema-2.0.0"
sources."har-validator-5.0.3"
sources."har-validator-5.1.3"
sources."http-signature-1.2.0"
sources."is-typedarray-1.0.0"
sources."isstream-0.1.2"
sources."jsbn-0.1.1"
sources."json-schema-0.2.3"
sources."json-schema-traverse-0.3.1"
sources."json-schema-traverse-0.4.1"
sources."json-stringify-safe-5.0.1"
sources."jsprim-1.4.1"
sources."mime-db-1.33.0"
sources."mime-types-2.1.18"
sources."oauth-sign-0.8.2"
sources."mime-db-1.38.0"
sources."mime-types-2.1.22"
sources."oauth-sign-0.9.0"
sources."performance-now-2.1.0"
sources."punycode-1.4.1"
sources."psl-1.1.31"
sources."punycode-2.1.1"
sources."qs-6.5.2"
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sshpk-1.14.2"
sources."tough-cookie-2.3.4"
sources."sshpk-1.16.1"
(sources."tough-cookie-2.4.3" // {
dependencies = [
sources."punycode-1.4.1"
];
})
sources."tunnel-agent-0.6.0"
sources."tweetnacl-0.14.5"
sources."uuid-3.3.0"
sources."uri-js-4.2.2"
sources."uuid-3.3.2"
sources."verror-1.10.0"
];
buildInputs = globalBuildInputs;
@ -826,6 +849,6 @@ in
license = "Apache-2.0";
};
production = true;
bypassCache = false;
bypassCache = true;
};
}

View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {

View file

@ -1,4 +1,4 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
exec node2nix -6 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env
exec node2nix -8 -i pkg.json -c nixui.nix -e ../../../development/node-packages/node-env.nix --no-copy-node-env

View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {

View file

@ -102,6 +102,6 @@ in
license = "Apache-2.0";
};
production = true;
bypassCache = false;
bypassCache = true;
};
}

View file

@ -0,0 +1,8 @@
#!/usr/bin/env nix-shell
#! nix-shell -i bash -p nodePackages.node2nix
exec node2nix -8 \
--input node-packages.json \
--output node-packages-generated.nix \
--composition node-packages.nix \
--node-env ./../../../development/node-packages/node-env.nix

File diff suppressed because it is too large Load diff

View file

@ -2,7 +2,7 @@
{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
let
nodeEnv = import ../../../development/node-packages/node-env.nix {

View file

@ -3974,10 +3974,7 @@ in
nodejs = hiPrio nodejs-8_x;
nodejs-slim = nodejs-slim-6_x;
nodejs-6_x = callPackage ../development/web/nodejs/v6.nix {};
nodejs-slim-6_x = callPackage ../development/web/nodejs/v6.nix { enableNpm = false; };
nodejs-slim = nodejs-slim-8_x;
nodejs-8_x = callPackage ../development/web/nodejs/v8.nix {};
nodejs-slim-8_x = callPackage ../development/web/nodejs/v8.nix { enableNpm = false; };
@ -4005,10 +4002,6 @@ in
nodejs = pkgs.nodejs-8_x;
});
nodePackages_6_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v6.nix {
nodejs = pkgs.nodejs-6_x;
});
nodePackages = nodePackages_10_x;
npm2nix = nodePackages.npm2nix;