Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/development/node-packages/composition-v13.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{pkgs ? import <nixpkgs> {
inherit system;
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-13_x"}:
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems wrong?


let
nodeEnv = import ./node-env.nix {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/development/node-packages/node-env.nix
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ let

npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild

if [ "''${dontNpmInstall-}" != "1" ]
if [ "$dontNpmInstall" != "1" ]
then
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
rm -f npm-shrinkwrap.json
Expand Down
34 changes: 17 additions & 17 deletions pkgs/development/node-packages/node-packages-v10.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8941,13 +8941,13 @@ let
sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
};
};
"caniuse-lite-1.0.30001025" = {
"caniuse-lite-1.0.30001027" = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these changes relevant here?

name = "caniuse-lite";
packageName = "caniuse-lite";
version = "1.0.30001025";
version = "1.0.30001027";
src = fetchurl {
url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001025.tgz";
sha512 = "SKyFdHYfXUZf5V85+PJgLYyit27q4wgvZuf8QTOk1osbypcROihMBlx9GRar2/pIcKH2r4OehdlBr9x6PXetAQ==";
url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001027.tgz";
sha512 = "7xvKeErvXZFtUItTHgNtLgS9RJpVnwBlWX8jSo/BO8VsF6deszemZSkJJJA1KOKrXuzZH4WALpAJdq5EyfgMLg==";
};
};
"capture-stack-trace-1.0.1" = {
Expand Down Expand Up @@ -25586,13 +25586,13 @@ let
sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ==";
};
};
"loglevel-1.6.6" = {
"loglevel-1.6.7" = {
name = "loglevel";
packageName = "loglevel";
version = "1.6.6";
version = "1.6.7";
src = fetchurl {
url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz";
sha512 = "Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==";
url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz";
sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==";
};
};
"loglevel-colored-level-prefix-1.0.0" = {
Expand Down Expand Up @@ -42937,13 +42937,13 @@ let
sha512 = "AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==";
};
};
"unist-util-visit-children-1.1.3" = {
"unist-util-visit-children-1.1.4" = {
name = "unist-util-visit-children";
packageName = "unist-util-visit-children";
version = "1.1.3";
version = "1.1.4";
src = fetchurl {
url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-1.1.3.tgz";
sha512 = "/GQ8KNRrG+qD30H76FZNc6Ok+8XTu8lxJByN5LnQ4eQfqxda2gP0CPsCX63BRB26ZRMNf6i1c+jlvNlqysEoFg==";
url = "https://registry.npmjs.org/unist-util-visit-children/-/unist-util-visit-children-1.1.4.tgz";
sha512 = "sA/nXwYRCQVRwZU2/tQWUqJ9JSFM1X3x7JIOsIgSzrFHcfVt6NkzDtKzyxg2cZWkCwGF9CO8x4QNZRJRMK8FeQ==";
};
};
"unist-util-visit-parents-2.1.2" = {
Expand Down Expand Up @@ -47629,7 +47629,7 @@ in
sources."callsites-2.0.0"
sources."camel-case-3.0.0"
sources."camelcase-4.1.0"
sources."caniuse-lite-1.0.30001025"
sources."caniuse-lite-1.0.30001027"
sources."capture-stack-trace-1.0.1"
sources."cardinal-2.1.1"
sources."caseless-0.12.0"
Expand Down Expand Up @@ -61446,7 +61446,7 @@ in
})
sources."call-me-maybe-1.0.1"
sources."camelcase-5.3.1"
sources."caniuse-lite-1.0.30001025"
sources."caniuse-lite-1.0.30001027"
sources."caw-2.0.1"
(sources."chalk-2.4.2" // {
dependencies = [
Expand Down Expand Up @@ -65813,7 +65813,7 @@ in
sources."callsites-2.0.0"
sources."camelcase-5.3.1"
sources."caniuse-api-3.0.0"
sources."caniuse-lite-1.0.30001025"
sources."caniuse-lite-1.0.30001027"
sources."caseless-0.12.0"
sources."chalk-2.4.2"
sources."chokidar-2.1.8"
Expand Down Expand Up @@ -73170,7 +73170,7 @@ in
sources."unist-util-remove-position-1.1.4"
sources."unist-util-stringify-position-1.1.2"
sources."unist-util-visit-1.4.1"
sources."unist-util-visit-children-1.1.3"
sources."unist-util-visit-children-1.1.4"
sources."unist-util-visit-parents-2.1.2"
sources."untildify-2.1.0"
sources."unzip-response-2.0.1"
Expand Down Expand Up @@ -75752,7 +75752,7 @@ in
sources."lodash.merge-4.6.2"
sources."lodash.rest-4.0.5"
sources."lodash.unescape-4.0.1"
sources."loglevel-1.6.6"
sources."loglevel-1.6.7"
(sources."loglevel-colored-level-prefix-1.0.0" // {
dependencies = [
sources."ansi-regex-2.1.1"
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4677,7 +4677,7 @@ in

nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { };

nodejs = hiPrio nodejs-10_x;
nodejs = hiPrio nodejs-12_x;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 I would like this, too. Perhaps also update nodejs-slim?


nodejs-slim = nodejs-slim-10_x;

Expand Down