diff options
author | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2019-04-07 19:49:24 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-07 19:49:24 -0400 |
commit | 40d59c6e8e1f179822f6f78a221a097aca3169d1 (patch) | |
tree | 61e9ff382fc8ebf39f1c4bb7c6e53dc5504d1171 /pkgs/top-level/all-packages.nix | |
parent | 096603c68a6e77d2210dcb8baea6274aa6b81e6e (diff) | |
parent | 0e296d5fcdaf32dd113e49738dfba6216c01a8da (diff) | |
download | nixlib-40d59c6e8e1f179822f6f78a221a097aca3169d1.tar nixlib-40d59c6e8e1f179822f6f78a221a097aca3169d1.tar.gz nixlib-40d59c6e8e1f179822f6f78a221a097aca3169d1.tar.bz2 nixlib-40d59c6e8e1f179822f6f78a221a097aca3169d1.tar.lz nixlib-40d59c6e8e1f179822f6f78a221a097aca3169d1.tar.xz nixlib-40d59c6e8e1f179822f6f78a221a097aca3169d1.tar.zst nixlib-40d59c6e8e1f179822f6f78a221a097aca3169d1.zip |
Merge pull request #58976 from gilligan/remove-nodejs6
Remove nodejs-6_x which is about to enter EOL
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10bb5104352f..5403509a81aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3976,10 +3976,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; }; @@ -4007,10 +4004,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; |