Unverified Commit 12ab22da authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

node-env.nix: remove references to python2 (#391707)

parents 25f1461f f86abd8b
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ let
    inherit (pkgs)
      stdenv
      lib
      python2
      runCommand
      writeTextFile
      writeShellScript
+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ let
    inherit (pkgs)
      stdenv
      lib
      python2
      runCommand
      writeTextFile
      writeShellScript
+2 −2
Original line number Diff line number Diff line
# This file originates from node2nix

{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
{lib, stdenv, nodejs, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:

let
  python = if nodejs ? python then nodejs.python else python2;
  inherit (nodejs) python;

  # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
  tarWrapper = runCommand "tarWrapper" {} ''
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@

let
  nodeEnv = import ../../development/node-packages/node-env.nix {
    inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
    inherit (pkgs) stdenv lib runCommand writeTextFile writeShellScript;
    inherit pkgs nodejs;
    libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
  };
+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ let
    inherit (pkgs)
      stdenv
      lib
      python2
      runCommand
      writeTextFile
      writeShellScript
Loading