commit 75fa5ad17cb30cb105282a1a8cfe8fb805d42d8e · pyrox.dev/nixpkgs

+3 -3

pkgs/development/web/nodejs/nodejs.nix

···

       1
       1
       -
       { stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser

     

       1
       1
       +
       { stdenv, fetchurl, openssl, python, zlib, libuv, utillinux, http-parser

     

       2
       2
        
       , pkgconfig, which

     

       3
       3
        
       # Updater dependencies

     

       4
       4
        
       , writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix, runtimeShell

     
···

       55
       55
        
           buildInputs = optionals stdenv.isDarwin [ CoreServices ApplicationServices ]

     

       56
       56
        
             ++ [ zlib libuv openssl http-parser icu ];

     

       57
       57
        
       

     

       58
       58
       -
           nativeBuildInputs = [ which utillinux pkgconfig python2 ]

     

       58
       58
       +
           nativeBuildInputs = [ which utillinux pkgconfig python ]

     

       59
       59
        
             ++ optionals stdenv.isDarwin [ xcbuild ];

     

       60
       60
        
       

     

       61
       61
        
           configureFlags = let

     
···

       145
       145
        
             platforms = platforms.linux ++ platforms.darwin;

     

       146
       146
        
           };

     

       147
       147
        
       

     

       148
       148
       -
           passthru.python = python2; # to ensure nodeEnv uses the same version

     

       148
       148
       +
           passthru.python = python; # to ensure nodeEnv uses the same version

     

       149
       149
        
       }

+5 -2

pkgs/development/web/nodejs/v10.nix

···

       1
       1
       -
       { callPackage, openssl, enableNpm ? true }:

     

       1
       1
       +
       { callPackage, openssl, icu, python2, enableNpm ? true }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         buildNodejs = callPackage ./nodejs.nix { inherit openssl; };

     

       4
       4
       +
         buildNodejs = callPackage ./nodejs.nix { 

     

       5
       5
       +
           inherit openssl icu;

     

       6
       6
       +
           python = python2;

     

       7
       7
       +
         };

     

       5
       8
        
       in

     

       6
       9
        
         buildNodejs {

     

       7
       10
        
           inherit enableNpm;

+5 -2

pkgs/development/web/nodejs/v12.nix

···

       1
       1
       -
       { callPackage, openssl, icu, enableNpm ? true }:

     

       1
       1
       +
       { callPackage, openssl, icu, python2, enableNpm ? true }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; };

     

       4
       4
       +
         buildNodejs = callPackage ./nodejs.nix { 

     

       5
       5
       +
           inherit openssl icu;

     

       6
       6
       +
           python = python2;

     

       7
       7
       +
         };

     

       5
       8
        
       in

     

       6
       9
        
         buildNodejs {

     

       7
       10
        
           inherit enableNpm;

+5 -2

pkgs/development/web/nodejs/v13.nix

···

       1
       1
       -
       { callPackage, openssl, icu, enableNpm ? true }:

     

       1
       1
       +
       { callPackage, openssl, icu, python3, enableNpm ? true }:

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; };

     

       4
       4
       +
         buildNodejs = callPackage ./nodejs.nix { 

     

       5
       5
       +
           inherit openssl icu;

     

       6
       6
       +
           python = python3;

     

       7
       7
       +
         };

     

       5
       8
        
       in

     

       6
       9
        
         buildNodejs {

     

       7
       10
        
           inherit enableNpm;