diff --git a/packages/node-packages/composition.nix b/packages/node-packages/composition.nix index d9c0daef..7a9598ce 100644 --- a/packages/node-packages/composition.nix +++ b/packages/node-packages/composition.nix @@ -1,17 +1,34 @@ # This file has been generated by node2nix 1.11.1. Do not edit! -{pkgs ? import { +{ + pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}: + }, + system ? builtins.currentSystem, + nodejs ? pkgs."nodejs_18", +}: let nodeEnv = import ./node-env.nix { - inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; + inherit (pkgs) + stdenv + lib + python2 + runCommand + writeTextFile + writeShellScript + ; inherit pkgs nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; in import ./node-packages.nix { - inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit (pkgs) + fetchurl + nix-gitignore + stdenv + lib + fetchgit + ; inherit nodeEnv; } diff --git a/packages/node-packages/node-env.nix b/packages/node-packages/node-env.nix index bc1e3662..e942abfc 100644 --- a/packages/node-packages/node-env.nix +++ b/packages/node-packages/node-env.nix @@ -1,6 +1,16 @@ # This file originates from node2nix -{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: +{ + lib, + stdenv, + nodejs, + python2, + pkgs, + libtool, + runCommand, + writeTextFile, + writeShellScript, +}: let # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master @@ -9,7 +19,7 @@ let python = if nodejs ? python then nodejs.python else python2; # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise - tarWrapper = runCommand "tarWrapper" {} '' + tarWrapper = runCommand "tarWrapper" { } '' mkdir -p $out/bin cat > $out/bin/tar < $out/bin/shell < $out/bin/shell <