diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-02 09:18:37 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-02 09:18:37 +0200 |
| commit | 6f723b9bad655a64f1234557b5e08b5ce9556228 (patch) | |
| tree | 68931ba6b8defdba041734ccc72ac40a0fee5b94 /pkgs/development/web | |
| parent | 55e4555b77ff7506579c1d4f5d9b562ca6e853b4 (diff) | |
| parent | 7d4f67a23f599d82f26d1ec9b89f82e1cc5f3ba9 (diff) | |
| download | nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.tar nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.gz nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.bz2 nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.lz nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.xz nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.tar.zst nixlib-6f723b9bad655a64f1234557b5e08b5ce9556228.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/web')
| -rw-r--r-- | pkgs/development/web/nodejs/v8.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/web/remarkjs/nodepkgs.nix | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/pkgs/development/web/nodejs/v8.nix b/pkgs/development/web/nodejs/v8.nix deleted file mode 100644 index 90d88215d3fd..000000000000 --- a/pkgs/development/web/nodejs/v8.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage, enableNpm ? true }: - -let - buildNodejs = callPackage ./nodejs.nix {}; -in - buildNodejs { - inherit enableNpm; - version = "8.16.0"; - sha256 = "0h3k5y51fyysqnqb8n5v5zxga937pipag49xzx6xr9b82phfh59m"; - } diff --git a/pkgs/development/web/remarkjs/nodepkgs.nix b/pkgs/development/web/remarkjs/nodepkgs.nix index 32c24174b5ec..10fbc98d51ab 100644 --- a/pkgs/development/web/remarkjs/nodepkgs.nix +++ b/pkgs/development/web/remarkjs/nodepkgs.nix @@ -2,7 +2,7 @@ {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ../../node-packages/node-env.nix { |