Reformat files with alejandra

3 files changed, 690 insertions, 613 deletions

diff --git a/user/packages/node2nix/default.nix b/user/packages/node2nix/default.nix
index 66f82712..09eea0fe 100644
--- a/user/packages/node2nix/default.nix
+++ b/user/packages/node2nix/default.nix
@@ -1,17 +1,22 @@
 # This file has been generated by node2nix 1.11.1. Do not edit!
-
-{pkgs ? import <nixpkgs> {
-  inherit system;
-}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-18_x"}:
-
-let
+{
+  pkgs ?
+    import <nixpkgs> {
+      inherit system;
+    },
+  system ? builtins.currentSystem,
+  nodejs ? pkgs."nodejs-18_x",
+}: let
   nodeEnv = import ./node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    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 nodeEnv;
-}
+  import ./node-packages.nix {
+    inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
+    inherit nodeEnv;
+  }
diff --git a/user/packages/node2nix/node-env.nix b/user/packages/node2nix/node-env.nix
index 0dd75272..b81347da 100644
--- a/user/packages/node2nix/node-env.nix
+++ b/user/packages/node2nix/node-env.nix
@@ -1,12 +1,25 @@
 # This file originates from node2nix
-
-{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
-
-let
+{
+  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
-  utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
+  utillinux =
+    if pkgs ? utillinux
+    then pkgs.utillinux
+    else pkgs.util-linux;
 
-  python = if nodejs ? python then nodejs.python else python2;
+  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" {} ''
@@ -21,13 +34,16 @@ let
   '';
 
   # Function that generates a TGZ file from a NPM project
-  buildNodeSourceDist =
-    { name, version, src, ... }:
-
+  buildNodeSourceDist = {
+    name,
+    version,
+    src,
+    ...
+  }:
     stdenv.mkDerivation {
       name = "node-tarball-${name}-${version}";
       inherit src;
-      buildInputs = [ nodejs ];
+      buildInputs = [nodejs];
       buildPhase = ''
         export HOME=$TMPDIR
         tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
@@ -40,468 +56,495 @@ let
       '';
     };
 
-    # Common shell logic
-    installPackage = writeShellScript "install-package" ''
-      installPackage() {
-      local packageName=$1 src=$2
+  # Common shell logic
+  installPackage = writeShellScript "install-package" ''
+    installPackage() {
+    local packageName=$1 src=$2
 
-      local strippedName
+    local strippedName
 
-      local DIR=$PWD
-      cd $TMPDIR
+    local DIR=$PWD
+    cd $TMPDIR
 
-      unpackFile $src
+    unpackFile $src
 
-      # Make the base dir in which the target dependency resides first
-      mkdir -p "$(dirname "$DIR/$packageName")"
+    # Make the base dir in which the target dependency resides first
+    mkdir -p "$(dirname "$DIR/$packageName")"
 
-      if [ -f "$src" ]
-      then
-      # Figure out what directory has been unpacked
-      packageDir="$(find . -maxdepth 1 -type d | tail -1)"
+    if [ -f "$src" ]
+    then
+    # Figure out what directory has been unpacked
+    packageDir="$(find . -maxdepth 1 -type d | tail -1)"
 
-      # Restore write permissions to make building work
-      find "$packageDir" -type d -exec chmod u+x {} \;
-      chmod -R u+w "$packageDir"
+    # Restore write permissions to make building work
+    find "$packageDir" -type d -exec chmod u+x {} \;
+    chmod -R u+w "$packageDir"
 
-      # Move the extracted tarball into the output folder
-      mv "$packageDir" "$DIR/$packageName"
-      elif [ -d "$src" ]
-      then
-      # Get a stripped name (without hash) of the source directory.
-      # On old nixpkgs it's already set internally.
-      if [ -z "$strippedName" ]
-      then
-      strippedName="$(stripHash $src)"
-      fi
+    # Move the extracted tarball into the output folder
+    mv "$packageDir" "$DIR/$packageName"
+    elif [ -d "$src" ]
+    then
+    # Get a stripped name (without hash) of the source directory.
+    # On old nixpkgs it's already set internally.
+    if [ -z "$strippedName" ]
+    then
+    strippedName="$(stripHash $src)"
+    fi
 
-      # Restore write permissions to make building work
-      chmod -R u+w "$strippedName"
+    # Restore write permissions to make building work
+    chmod -R u+w "$strippedName"
 
-      # Move the extracted directory into the output folder
-      mv "$strippedName" "$DIR/$packageName"
-      fi
+    # Move the extracted directory into the output folder
+    mv "$strippedName" "$DIR/$packageName"
+    fi
 
-      # Change to the package directory to install dependencies
-      cd "$DIR/$packageName"
-      }
-    '';
+    # Change to the package directory to install dependencies
+    cd "$DIR/$packageName"
+    }
+  '';
 
-    # Bundle the dependencies of the package
-    #
-    # Only include dependencies if they don't exist. They may also be bundled in the package.
-    includeDependencies = {dependencies}:
+  # Bundle the dependencies of the package
+  #
+  # Only include dependencies if they don't exist. They may also be bundled in the package.
+  includeDependencies = {dependencies}:
     lib.optionalString (dependencies != []) (
       ''
         mkdir -p node_modules
         cd node_modules
       ''
-      + (lib.concatMapStrings (dependency:
-      ''
-        if [ ! -e "${dependency.packageName}" ]; then
-        ${composePackage dependency}
-        fi
-      ''
-      ) dependencies)
+      + (lib.concatMapStrings (
+          dependency: ''
+            if [ ! -e "${dependency.packageName}" ]; then
+            ${composePackage dependency}
+            fi
+          ''
+        )
+        dependencies)
       + ''
         cd ..
       ''
     );
 
-    # Recursively composes the dependencies of a package
-    composePackage = { name, packageName, src, dependencies ? [], ... }@args:
+  # Recursively composes the dependencies of a package
+  composePackage = {
+    name,
+    packageName,
+    src,
+    dependencies ? [],
+    ...
+  } @ args:
     builtins.addErrorContext "while evaluating node package '${packageName}'" ''
       installPackage "${packageName}" "${src}"
-      ${includeDependencies { inherit dependencies; }}
-      cd ..
-      ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-    '';
-
-    pinpointDependencies = {dependencies, production}:
-    let
-      pinpointDependenciesFromPackageJSON = writeTextFile {
-        name = "pinpointDependencies.js";
-        text = ''
-          var fs = require('fs');
-          var path = require('path');
-
-          function resolveDependencyVersion(location, name) {
-          if(location == process.env['NIX_STORE']) {
-          return null;
-          } else {
-          var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
-
-          if(fs.existsSync(dependencyPackageJSON)) {
-          var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
-
-          if(dependencyPackageObj.name == name) {
-          return dependencyPackageObj.version;
-          }
-          } else {
-          return resolveDependencyVersion(path.resolve(location, ".."), name);
-          }
-          }
-          }
-
-          function replaceDependencies(dependencies) {
-          if(typeof dependencies == "object" && dependencies !== null) {
-          for(var dependency in dependencies) {
-          var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
-
-          if(resolvedVersion === null) {
-          process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
-          } else {
-          dependencies[dependency] = resolvedVersion;
-          }
-          }
-          }
-          }
-
-          /* Read the package.json configuration */
-          var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-
-          /* Pinpoint all dependencies */
-          replaceDependencies(packageObj.dependencies);
-          if(process.argv[2] == "development") {
-          replaceDependencies(packageObj.devDependencies);
-          }
-          else {
-          packageObj.devDependencies = {};
-          }
-          replaceDependencies(packageObj.optionalDependencies);
-          replaceDependencies(packageObj.peerDependencies);
-
-          /* Write the fixed package.json file */
-          fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
-        '';
-      };
-    in
-    ''
-      node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
-
-      ${lib.optionalString (dependencies != [])
-      ''
-        if [ -d node_modules ]
-        then
-        cd node_modules
-        ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
-        cd ..
-        fi
-      ''}
-    '';
-
-    # Recursively traverses all dependencies of a package and pinpoints all
-    # dependencies in the package.json file to the versions that are actually
-    # being used.
-
-    pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
-    ''
-      if [ -d "${packageName}" ]
-      then
-      cd "${packageName}"
-      ${pinpointDependencies { inherit dependencies production; }}
+      ${includeDependencies {inherit dependencies;}}
       cd ..
       ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-      fi
     '';
 
-    # Extract the Node.js source code which is used to compile packages with
-    # native bindings
-    nodeSources = runCommand "node-sources" {} ''
-      tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
-      mv node-* $out
-    '';
-
-    # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
-    addIntegrityFieldsScript = writeTextFile {
-      name = "addintegrityfields.js";
+  pinpointDependencies = {
+    dependencies,
+    production,
+  }: let
+    pinpointDependenciesFromPackageJSON = writeTextFile {
+      name = "pinpointDependencies.js";
       text = ''
         var fs = require('fs');
         var path = require('path');
 
-        function augmentDependencies(baseDir, dependencies) {
-        for(var dependencyName in dependencies) {
-        var dependency = dependencies[dependencyName];
-
-        // Open package.json and augment metadata fields
-        var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
-        var packageJSONPath = path.join(packageJSONDir, "package.json");
+        function resolveDependencyVersion(location, name) {
+        if(location == process.env['NIX_STORE']) {
+        return null;
+        } else {
+        var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
 
-        if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
-        console.log("Adding metadata fields to: "+packageJSONPath);
-        var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
+        if(fs.existsSync(dependencyPackageJSON)) {
+        var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
 
-        if(dependency.integrity) {
-        packageObj["_integrity"] = dependency.integrity;
-        } else {
-        packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
+        if(dependencyPackageObj.name == name) {
+        return dependencyPackageObj.version;
         }
-
-        if(dependency.resolved) {
-        packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
         } else {
-        packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
+        return resolveDependencyVersion(path.resolve(location, ".."), name);
         }
-
-        if(dependency.from !== undefined) { // Adopt from property if one has been provided
-        packageObj["_from"] = dependency.from;
         }
-
-        fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
         }
 
-        // Augment transitive dependencies
-        if(dependency.dependencies !== undefined) {
-        augmentDependencies(packageJSONDir, dependency.dependencies);
+        function replaceDependencies(dependencies) {
+        if(typeof dependencies == "object" && dependencies !== null) {
+        for(var dependency in dependencies) {
+        var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
+
+        if(resolvedVersion === null) {
+        process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
+        } else {
+        dependencies[dependency] = resolvedVersion;
         }
         }
         }
-
-        if(fs.existsSync("./package-lock.json")) {
-        var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
-
-        if(![1, 2].includes(packageLock.lockfileVersion)) {
-        process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
-        process.exit(1);
         }
 
-        if(packageLock.dependencies !== undefined) {
-        augmentDependencies(".", packageLock.dependencies);
+        /* Read the package.json configuration */
+        var packageObj = JSON.parse(fs.readFileSync('./package.json'));
+
+        /* Pinpoint all dependencies */
+        replaceDependencies(packageObj.dependencies);
+        if(process.argv[2] == "development") {
+        replaceDependencies(packageObj.devDependencies);
         }
+        else {
+        packageObj.devDependencies = {};
         }
+        replaceDependencies(packageObj.optionalDependencies);
+        replaceDependencies(packageObj.peerDependencies);
+
+        /* Write the fixed package.json file */
+        fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
       '';
     };
+  in ''
+    node ${pinpointDependenciesFromPackageJSON} ${
+      if production
+      then "production"
+      else "development"
+    }
+
+    ${lib.optionalString (dependencies != [])
+      ''
+        if [ -d node_modules ]
+        then
+        cd node_modules
+        ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
+        cd ..
+        fi
+      ''}
+  '';
 
-    # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
-    reconstructPackageLock = writeTextFile {
-      name = "reconstructpackagelock.js";
-      text = ''
-        var fs = require('fs');
-        var path = require('path');
+  # Recursively traverses all dependencies of a package and pinpoints all
+  # dependencies in the package.json file to the versions that are actually
+  # being used.
+
+  pinpointDependenciesOfPackage = {
+    packageName,
+    dependencies ? [],
+    production ? true,
+    ...
+  } @ args: ''
+    if [ -d "${packageName}" ]
+    then
+    cd "${packageName}"
+    ${pinpointDependencies {inherit dependencies production;}}
+    cd ..
+    ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+    fi
+  '';
 
-        var packageObj = JSON.parse(fs.readFileSync("package.json"));
-
-        var lockObj = {
-        name: packageObj.name,
-        version: packageObj.version,
-        lockfileVersion: 2,
-        requires: true,
-        packages: {
-        "": {
-        name: packageObj.name,
-        version: packageObj.version,
-        license: packageObj.license,
-        bin: packageObj.bin,
-        dependencies: packageObj.dependencies,
-        engines: packageObj.engines,
-        optionalDependencies: packageObj.optionalDependencies
-        }
-        },
-        dependencies: {}
-        };
-
-        function augmentPackageJSON(filePath, packages, dependencies) {
-        var packageJSON = path.join(filePath, "package.json");
-        if(fs.existsSync(packageJSON)) {
-        var packageObj = JSON.parse(fs.readFileSync(packageJSON));
-        packages[filePath] = {
-        version: packageObj.version,
-        integrity: "sha1-000000000000000000000000000=",
-        dependencies: packageObj.dependencies,
-        engines: packageObj.engines,
-        optionalDependencies: packageObj.optionalDependencies
-        };
-        dependencies[packageObj.name] = {
-        version: packageObj.version,
-        integrity: "sha1-000000000000000000000000000=",
-        dependencies: {}
-        };
-        processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
-        }
-        }
+  # Extract the Node.js source code which is used to compile packages with
+  # native bindings
+  nodeSources = runCommand "node-sources" {} ''
+    tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
+    mv node-* $out
+  '';
+
+  # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
+  addIntegrityFieldsScript = writeTextFile {
+    name = "addintegrityfields.js";
+    text = ''
+      var fs = require('fs');
+      var path = require('path');
+
+      function augmentDependencies(baseDir, dependencies) {
+      for(var dependencyName in dependencies) {
+      var dependency = dependencies[dependencyName];
+
+      // Open package.json and augment metadata fields
+      var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
+      var packageJSONPath = path.join(packageJSONDir, "package.json");
+
+      if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
+      console.log("Adding metadata fields to: "+packageJSONPath);
+      var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
+
+      if(dependency.integrity) {
+      packageObj["_integrity"] = dependency.integrity;
+      } else {
+      packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
+      }
 
-        function processDependencies(dir, packages, dependencies) {
-        if(fs.existsSync(dir)) {
-        var files = fs.readdirSync(dir);
+      if(dependency.resolved) {
+      packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
+      } else {
+      packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
+      }
 
-        files.forEach(function(entry) {
-        var filePath = path.join(dir, entry);
-        var stats = fs.statSync(filePath);
+      if(dependency.from !== undefined) { // Adopt from property if one has been provided
+      packageObj["_from"] = dependency.from;
+      }
 
-        if(stats.isDirectory()) {
-        if(entry.substr(0, 1) == "@") {
-        // When we encounter a namespace folder, augment all packages belonging to the scope
-        var pkgFiles = fs.readdirSync(filePath);
+      fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
+      }
 
-        pkgFiles.forEach(function(entry) {
-        if(stats.isDirectory()) {
-        var pkgFilePath = path.join(filePath, entry);
-        augmentPackageJSON(pkgFilePath, packages, dependencies);
-        }
-        });
-        } else {
-        augmentPackageJSON(filePath, packages, dependencies);
-        }
-        }
-        });
-        }
-        }
+      // Augment transitive dependencies
+      if(dependency.dependencies !== undefined) {
+      augmentDependencies(packageJSONDir, dependency.dependencies);
+      }
+      }
+      }
 
-        processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
+      if(fs.existsSync("./package-lock.json")) {
+      var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
 
-        fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
-      '';
-    };
+      if(![1, 2].includes(packageLock.lockfileVersion)) {
+      process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
+      process.exit(1);
+      }
 
-    # Script that links bins defined in package.json to the node_modules bin directory
-    # NPM does not do this for top-level packages itself anymore as of v7
-    linkBinsScript = writeTextFile {
-      name = "linkbins.js";
-      text = ''
-        var fs = require('fs');
-        var path = require('path');
+      if(packageLock.dependencies !== undefined) {
+      augmentDependencies(".", packageLock.dependencies);
+      }
+      }
+    '';
+  };
+
+  # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
+  reconstructPackageLock = writeTextFile {
+    name = "reconstructpackagelock.js";
+    text = ''
+      var fs = require('fs');
+      var path = require('path');
+
+      var packageObj = JSON.parse(fs.readFileSync("package.json"));
+
+      var lockObj = {
+      name: packageObj.name,
+      version: packageObj.version,
+      lockfileVersion: 2,
+      requires: true,
+      packages: {
+      "": {
+      name: packageObj.name,
+      version: packageObj.version,
+      license: packageObj.license,
+      bin: packageObj.bin,
+      dependencies: packageObj.dependencies,
+      engines: packageObj.engines,
+      optionalDependencies: packageObj.optionalDependencies
+      }
+      },
+      dependencies: {}
+      };
 
-        var packageObj = JSON.parse(fs.readFileSync("package.json"));
+      function augmentPackageJSON(filePath, packages, dependencies) {
+      var packageJSON = path.join(filePath, "package.json");
+      if(fs.existsSync(packageJSON)) {
+      var packageObj = JSON.parse(fs.readFileSync(packageJSON));
+      packages[filePath] = {
+      version: packageObj.version,
+      integrity: "sha1-000000000000000000000000000=",
+      dependencies: packageObj.dependencies,
+      engines: packageObj.engines,
+      optionalDependencies: packageObj.optionalDependencies
+      };
+      dependencies[packageObj.name] = {
+      version: packageObj.version,
+      integrity: "sha1-000000000000000000000000000=",
+      dependencies: {}
+      };
+      processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
+      }
+      }
 
-        var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
+      function processDependencies(dir, packages, dependencies) {
+      if(fs.existsSync(dir)) {
+      var files = fs.readdirSync(dir);
 
-        if(packageObj.bin !== undefined) {
-        fs.mkdirSync(path.join(nodeModules, ".bin"))
+      files.forEach(function(entry) {
+      var filePath = path.join(dir, entry);
+      var stats = fs.statSync(filePath);
 
-        if(typeof packageObj.bin == "object") {
-        Object.keys(packageObj.bin).forEach(function(exe) {
-        if(fs.existsSync(packageObj.bin[exe])) {
-        console.log("linking bin '" + exe + "'");
-        fs.symlinkSync(
-        path.join("..", packageObj.name, packageObj.bin[exe]),
-        path.join(nodeModules, ".bin", exe)
-        );
-        }
-        else {
-        console.log("skipping non-existent bin '" + exe + "'");
-        }
-        })
-        }
-        else {
-        if(fs.existsSync(packageObj.bin)) {
-        console.log("linking bin '" + packageObj.bin + "'");
-        fs.symlinkSync(
-        path.join("..", packageObj.name, packageObj.bin),
-        path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
-        );
-        }
-        else {
-        console.log("skipping non-existent bin '" + packageObj.bin + "'");
-        }
-        }
-        }
-        else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
-        fs.mkdirSync(path.join(nodeModules, ".bin"))
-
-        fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
-        if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
-        console.log("linking bin '" + exe + "'");
-        fs.symlinkSync(
-        path.join("..", packageObj.name, packageObj.directories.bin, exe),
-        path.join(nodeModules, ".bin", exe)
-        );
-        }
-        else {
-        console.log("skipping non-existent bin '" + exe + "'");
-        }
-        })
-        }
-      '';
-    };
+      if(stats.isDirectory()) {
+      if(entry.substr(0, 1) == "@") {
+      // When we encounter a namespace folder, augment all packages belonging to the scope
+      var pkgFiles = fs.readdirSync(filePath);
 
-    prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
-    let
-      forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
-    in
-    ''
-      # Pinpoint the versions of all dependencies to the ones that are actually being used
-      echo "pinpointing versions of dependencies..."
-      source $pinpointDependenciesScriptPath
-
-      # Patch the shebangs of the bundled modules to prevent them from
-      # calling executables outside the Nix store as much as possible
-      patchShebangs .
-
-      # Deploy the Node.js package by running npm install. Since the
-      # dependencies have been provided already by ourselves, it should not
-      # attempt to install them again, which is good, because we want to make
-      # it Nix's responsibility. If it needs to install any dependencies
-      # anyway (e.g. because the dependency parameters are
-      # incomplete/incorrect), it fails.
-      #
-      # The other responsibilities of NPM are kept -- version checks, build
-      # steps, postprocessing etc.
-
-      export HOME=$TMPDIR
-      cd "${packageName}"
-      runHook preRebuild
-
-      ${lib.optionalString bypassCache ''
-        ${lib.optionalString reconstructLock ''
-          if [ -f package-lock.json ]
-          then
-          echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
-          echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
-          rm package-lock.json
-          else
-          echo "No package-lock.json file found, reconstructing..."
-          fi
+      pkgFiles.forEach(function(entry) {
+      if(stats.isDirectory()) {
+      var pkgFilePath = path.join(filePath, entry);
+      augmentPackageJSON(pkgFilePath, packages, dependencies);
+      }
+      });
+      } else {
+      augmentPackageJSON(filePath, packages, dependencies);
+      }
+      }
+      });
+      }
+      }
+
+      processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
+
+      fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
+    '';
+  };
+
+  # Script that links bins defined in package.json to the node_modules bin directory
+  # NPM does not do this for top-level packages itself anymore as of v7
+  linkBinsScript = writeTextFile {
+    name = "linkbins.js";
+    text = ''
+      var fs = require('fs');
+      var path = require('path');
+
+      var packageObj = JSON.parse(fs.readFileSync("package.json"));
+
+      var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
+
+      if(packageObj.bin !== undefined) {
+      fs.mkdirSync(path.join(nodeModules, ".bin"))
+
+      if(typeof packageObj.bin == "object") {
+      Object.keys(packageObj.bin).forEach(function(exe) {
+      if(fs.existsSync(packageObj.bin[exe])) {
+      console.log("linking bin '" + exe + "'");
+      fs.symlinkSync(
+      path.join("..", packageObj.name, packageObj.bin[exe]),
+      path.join(nodeModules, ".bin", exe)
+      );
+      }
+      else {
+      console.log("skipping non-existent bin '" + exe + "'");
+      }
+      })
+      }
+      else {
+      if(fs.existsSync(packageObj.bin)) {
+      console.log("linking bin '" + packageObj.bin + "'");
+      fs.symlinkSync(
+      path.join("..", packageObj.name, packageObj.bin),
+      path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
+      );
+      }
+      else {
+      console.log("skipping non-existent bin '" + packageObj.bin + "'");
+      }
+      }
+      }
+      else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
+      fs.mkdirSync(path.join(nodeModules, ".bin"))
+
+      fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
+      if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
+      console.log("linking bin '" + exe + "'");
+      fs.symlinkSync(
+      path.join("..", packageObj.name, packageObj.directories.bin, exe),
+      path.join(nodeModules, ".bin", exe)
+      );
+      }
+      else {
+      console.log("skipping non-existent bin '" + exe + "'");
+      }
+      })
+      }
+    '';
+  };
+
+  prepareAndInvokeNPM = {
+    packageName,
+    bypassCache,
+    reconstructLock,
+    npmFlags,
+    production,
+  }: let
+    forceOfflineFlag =
+      if bypassCache
+      then "--offline"
+      else "--registry http://www.example.com";
+  in ''
+    # Pinpoint the versions of all dependencies to the ones that are actually being used
+    echo "pinpointing versions of dependencies..."
+    source $pinpointDependenciesScriptPath
+
+    # Patch the shebangs of the bundled modules to prevent them from
+    # calling executables outside the Nix store as much as possible
+    patchShebangs .
+
+    # Deploy the Node.js package by running npm install. Since the
+    # dependencies have been provided already by ourselves, it should not
+    # attempt to install them again, which is good, because we want to make
+    # it Nix's responsibility. If it needs to install any dependencies
+    # anyway (e.g. because the dependency parameters are
+    # incomplete/incorrect), it fails.
+    #
+    # The other responsibilities of NPM are kept -- version checks, build
+    # steps, postprocessing etc.
 
-          node ${reconstructPackageLock}
-        ''}
+    export HOME=$TMPDIR
+    cd "${packageName}"
+    runHook preRebuild
 
-        node ${addIntegrityFieldsScript}
+    ${lib.optionalString bypassCache ''
+      ${lib.optionalString reconstructLock ''
+        if [ -f package-lock.json ]
+        then
+        echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
+        echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
+        rm package-lock.json
+        else
+        echo "No package-lock.json file found, reconstructing..."
+        fi
+
+        node ${reconstructPackageLock}
       ''}
 
-      npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
+      node ${addIntegrityFieldsScript}
+    ''}
 
-      runHook postRebuild
+    npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
 
-      if [ "''${dontNpmInstall-}" != "1" ]
-      then
-      # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
-      rm -f npm-shrinkwrap.json
+    runHook postRebuild
 
-      npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
-      fi
+    if [ "''${dontNpmInstall-}" != "1" ]
+    then
+    # NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
+    rm -f npm-shrinkwrap.json
 
-      # Link executables defined in package.json
-      node ${linkBinsScript}
-    '';
+    npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
+    fi
 
-    # Builds and composes an NPM package including all its dependencies
-    buildNodePackage =
-      { name
-      , packageName
-      , version ? null
-      , dependencies ? []
-      , buildInputs ? []
-      , production ? true
-      , npmFlags ? ""
-      , dontNpmInstall ? false
-      , bypassCache ? false
-      , reconstructLock ? false
-      , preRebuild ? ""
-      , dontStrip ? true
-      , unpackPhase ? "true"
-      , buildPhase ? "true"
-      , meta ? {}
-      , ... }@args:
-
-      let
-        extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
-      in
-      stdenv.mkDerivation ({
-        name = "${name}${if version == null then "" else "-${version}"}";
-        buildInputs = [ tarWrapper python nodejs ]
-        ++ lib.optional (stdenv.isLinux) utillinux
-        ++ lib.optional (stdenv.isDarwin) libtool
-        ++ buildInputs;
+    # Link executables defined in package.json
+    node ${linkBinsScript}
+  '';
+
+  # Builds and composes an NPM package including all its dependencies
+  buildNodePackage = {
+    name,
+    packageName,
+    version ? null,
+    dependencies ? [],
+    buildInputs ? [],
+    production ? true,
+    npmFlags ? "",
+    dontNpmInstall ? false,
+    bypassCache ? false,
+    reconstructLock ? false,
+    preRebuild ? "",
+    dontStrip ? true,
+    unpackPhase ? "true",
+    buildPhase ? "true",
+    meta ? {},
+    ...
+  } @ args: let
+    extraArgs = removeAttrs args ["name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta"];
+  in
+    stdenv.mkDerivation ({
+        name = "${name}${
+          if version == null
+          then ""
+          else "-${version}"
+        }";
+        buildInputs =
+          [tarWrapper python nodejs]
+          ++ lib.optional (stdenv.isLinux) utillinux
+          ++ lib.optional (stdenv.isDarwin) libtool
+          ++ buildInputs;
 
         inherit nodejs;
 
@@ -511,7 +554,7 @@ let
         compositionScript = composePackage args;
         pinpointDependenciesScript = pinpointDependenciesOfPackage args;
 
-        passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
+        passAsFile = ["compositionScript" "pinpointDependenciesScript"];
 
         installPhase = ''
           source ${installPackage}
@@ -523,7 +566,7 @@ let
           # Compose the package and all its dependencies
           source $compositionScriptPath
 
-          ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
+          ${prepareAndInvokeNPM {inherit packageName bypassCache reconstructLock npmFlags production;}}
 
           # Create symlink to the deployed executable folder, if applicable
           if [ -d "$out/lib/node_modules/.bin" ]
@@ -557,128 +600,139 @@ let
           runHook postInstall
         '';
 
-        meta = {
-          # default to Node.js' platforms
-          platforms = nodejs.meta.platforms;
-        } // meta;
-      } // extraArgs);
-
-      # Builds a node environment (a node_modules folder and a set of binaries)
-      buildNodeDependencies =
-        { name
-        , packageName
-        , version ? null
-        , src
-        , dependencies ? []
-        , buildInputs ? []
-        , production ? true
-        , npmFlags ? ""
-        , dontNpmInstall ? false
-        , bypassCache ? false
-        , reconstructLock ? false
-        , dontStrip ? true
-        , unpackPhase ? "true"
-        , buildPhase ? "true"
-        , ... }@args:
-
-        let
-          extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
-        in
-        stdenv.mkDerivation ({
-          name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
-
-          buildInputs = [ tarWrapper python nodejs ]
+        meta =
+          {
+            # default to Node.js' platforms
+            platforms = nodejs.meta.platforms;
+          }
+          // meta;
+      }
+      // extraArgs);
+
+  # Builds a node environment (a node_modules folder and a set of binaries)
+  buildNodeDependencies = {
+    name,
+    packageName,
+    version ? null,
+    src,
+    dependencies ? [],
+    buildInputs ? [],
+    production ? true,
+    npmFlags ? "",
+    dontNpmInstall ? false,
+    bypassCache ? false,
+    reconstructLock ? false,
+    dontStrip ? true,
+    unpackPhase ? "true",
+    buildPhase ? "true",
+    ...
+  } @ args: let
+    extraArgs = removeAttrs args ["name" "dependencies" "buildInputs"];
+  in
+    stdenv.mkDerivation ({
+        name = "node-dependencies-${name}${
+          if version == null
+          then ""
+          else "-${version}"
+        }";
+
+        buildInputs =
+          [tarWrapper python nodejs]
           ++ lib.optional (stdenv.isLinux) utillinux
           ++ lib.optional (stdenv.isDarwin) libtool
           ++ buildInputs;
 
-          inherit dontStrip; # Stripping may fail a build for some package deployments
-          inherit dontNpmInstall unpackPhase buildPhase;
-
-          includeScript = includeDependencies { inherit dependencies; };
-          pinpointDependenciesScript = pinpointDependenciesOfPackage args;
-
-          passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
-
-          installPhase = ''
-            source ${installPackage}
-
-            mkdir -p $out/${packageName}
-            cd $out/${packageName}
-
-            source $includeScriptPath
-
-            # Create fake package.json to make the npm commands work properly
-            cp ${src}/package.json .
-            chmod 644 package.json
-            ${lib.optionalString bypassCache ''
-              if [ -f ${src}/package-lock.json ]
-              then
-              cp ${src}/package-lock.json .
-              chmod 644 package-lock.json
-              fi
-            ''}
-
-            # Go to the parent folder to make sure that all packages are pinpointed
-            cd ..
-            ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-            ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
-
-            # Expose the executables that were installed
-            cd ..
-            ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
-
-            mv ${packageName} lib
-            ln -s $out/lib/node_modules/.bin $out/bin
-          '';
-        } // extraArgs);
-
-        # Builds a development shell
-        buildNodeShell =
-          { name
-          , packageName
-          , version ? null
-          , src
-          , dependencies ? []
-          , buildInputs ? []
-          , production ? true
-          , npmFlags ? ""
-          , dontNpmInstall ? false
-          , bypassCache ? false
-          , reconstructLock ? false
-          , dontStrip ? true
-          , unpackPhase ? "true"
-          , buildPhase ? "true"
-          , ... }@args:
-
-          let
-            nodeDependencies = buildNodeDependencies args;
-            extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
-          in
-          stdenv.mkDerivation ({
-            name = "node-shell-${name}${if version == null then "" else "-${version}"}";
-
-            buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
-            buildCommand = ''
-              mkdir -p $out/bin
-              cat > $out/bin/shell <<EOF
-              #! ${stdenv.shell} -e
-              $shellHook
-              exec ${stdenv.shell}
-              EOF
-              chmod +x $out/bin/shell
-            '';
-
-            # Provide the dependencies in a development shell through the NODE_PATH environment variable
-            inherit nodeDependencies;
-            shellHook = lib.optionalString (dependencies != []) ''
-              export NODE_PATH=${nodeDependencies}/lib/node_modules
-              export PATH="${nodeDependencies}/bin:$PATH"
-            '';
-          } // extraArgs);
-in
-{
+        inherit dontStrip; # Stripping may fail a build for some package deployments
+        inherit dontNpmInstall unpackPhase buildPhase;
+
+        includeScript = includeDependencies {inherit dependencies;};
+        pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+
+        passAsFile = ["includeScript" "pinpointDependenciesScript"];
+
+        installPhase = ''
+          source ${installPackage}
+
+          mkdir -p $out/${packageName}
+          cd $out/${packageName}
+
+          source $includeScriptPath
+
+          # Create fake package.json to make the npm commands work properly
+          cp ${src}/package.json .
+          chmod 644 package.json
+          ${lib.optionalString bypassCache ''
+            if [ -f ${src}/package-lock.json ]
+            then
+            cp ${src}/package-lock.json .
+            chmod 644 package-lock.json
+            fi
+          ''}
+
+          # Go to the parent folder to make sure that all packages are pinpointed
+          cd ..
+          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          ${prepareAndInvokeNPM {inherit packageName bypassCache reconstructLock npmFlags production;}}
+
+          # Expose the executables that were installed
+          cd ..
+          ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+
+          mv ${packageName} lib
+          ln -s $out/lib/node_modules/.bin $out/bin
+        '';
+      }
+      // extraArgs);
+
+  # Builds a development shell
+  buildNodeShell = {
+    name,
+    packageName,
+    version ? null,
+    src,
+    dependencies ? [],
+    buildInputs ? [],
+    production ? true,
+    npmFlags ? "",
+    dontNpmInstall ? false,
+    bypassCache ? false,
+    reconstructLock ? false,
+    dontStrip ? true,
+    unpackPhase ? "true",
+    buildPhase ? "true",
+    ...
+  } @ args: let
+    nodeDependencies = buildNodeDependencies args;
+    extraArgs = removeAttrs args ["name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase"];
+  in
+    stdenv.mkDerivation ({
+        name = "node-shell-${name}${
+          if version == null
+          then ""
+          else "-${version}"
+        }";
+
+        buildInputs = [python nodejs] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
+        buildCommand = ''
+          mkdir -p $out/bin
+          cat > $out/bin/shell <<EOF
+          #! ${stdenv.shell} -e
+          $shellHook
+          exec ${stdenv.shell}
+          EOF
+          chmod +x $out/bin/shell
+        '';
+
+        # Provide the dependencies in a development shell through the NODE_PATH environment variable
+        inherit nodeDependencies;
+        shellHook = lib.optionalString (dependencies != []) ''
+          export NODE_PATH=${nodeDependencies}/lib/node_modules
+          export PATH="${nodeDependencies}/bin:$PATH"
+        '';
+      }
+      // extraArgs);
+in {
   buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
   buildNodePackage = lib.makeOverridable buildNodePackage;
   buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
diff --git a/user/packages/node2nix/node-packages.nix b/user/packages/node2nix/node-packages.nix
index 0d449525..64748fe5 100644
--- a/user/packages/node2nix/node-packages.nix
+++ b/user/packages/node2nix/node-packages.nix
@@ -1,8 +1,13 @@
 # This file has been generated by node2nix 1.11.1. Do not edit!
-
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
-
-let
+{
+  nodeEnv,
+  fetchurl,
+  fetchgit,
+  nix-gitignore,
+  stdenv,
+  lib,
+  globalBuildInputs ? [],
+}: let
   sources = {
     "abort-controller-3.0.0" = {
       name = "abort-controller";
@@ -1058,8 +1063,7 @@ let
       };
     };
   };
-in
-{
+in {
   "pnpm-7.12" = nodeEnv.buildNodePackage {
     name = "pnpm";
     packageName = "pnpm";
@@ -1102,11 +1106,12 @@ in
       sources."fast-safe-stringify-2.1.1"
       sources."fs.realpath-1.0.0"
       sources."glob-8.0.3"
-      (sources."help-me-4.1.0" // {
-        dependencies = [
-          sources."readable-stream-3.6.0"
-        ];
-      })
+      (sources."help-me-4.1.0"
+        // {
+          dependencies = [
+            sources."readable-stream-3.6.0"
+          ];
+        })
       sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -1183,16 +1188,18 @@ in
       sha512 = "2kzWnV1QM6KBetziCAkCf8BJdnDX2CwiAr4yhvOsiQpaNJcMzwMsJTX/gTHz58yQg0dV5uwPsIyBlvyIfl30rg==";
     };
     dependencies = [
-      (sources."asn1.js-5.4.1" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
-      (sources."assert-1.5.0" // {
-        dependencies = [
-          sources."util-0.10.3"
-        ];
-      })
+      (sources."asn1.js-5.4.1"
+        // {
+          dependencies = [
+            sources."bn.js-4.12.0"
+          ];
+        })
+      (sources."assert-1.5.0"
+        // {
+          dependencies = [
+            sources."util-0.10.3"
+          ];
+        })
       sources."base64-js-1.5.1"
       sources."bn.js-5.2.1"
       sources."brorand-1.1.0"
@@ -1200,12 +1207,13 @@ in
       sources."browserify-cipher-1.0.1"
       sources."browserify-des-1.0.2"
       sources."browserify-rsa-4.1.0"
-      (sources."browserify-sign-4.2.1" // {
-        dependencies = [
-          sources."inherits-2.0.4"
-          sources."readable-stream-3.6.0"
-        ];
-      })
+      (sources."browserify-sign-4.2.1"
+        // {
+          dependencies = [
+            sources."inherits-2.0.4"
+            sources."readable-stream-3.6.0"
+          ];
+        })
       sources."browserify-zlib-0.2.0"
       sources."buffer-4.9.2"
       sources."buffer-xor-1.0.3"
@@ -1215,40 +1223,45 @@ in
       sources."console-browserify-1.2.0"
       sources."constants-browserify-1.0.0"
       sources."core-util-is-1.0.3"
-      (sources."create-ecdh-4.0.4" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
+      (sources."create-ecdh-4.0.4"
+        // {
+          dependencies = [
+            sources."bn.js-4.12.0"
+          ];
+        })
       sources."create-hash-1.2.0"
       sources."create-hmac-1.1.7"
       sources."crypto-browserify-3.12.0"
       sources."des.js-1.0.1"
-      (sources."diffie-hellman-5.0.3" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
+      (sources."diffie-hellman-5.0.3"
+        // {
+          dependencies = [
+            sources."bn.js-4.12.0"
+          ];
+        })
       sources."domain-browser-1.2.0"
-      (sources."elliptic-6.5.4" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-          sources."inherits-2.0.4"
-        ];
-      })
+      (sources."elliptic-6.5.4"
+        // {
+          dependencies = [
+            sources."bn.js-4.12.0"
+            sources."inherits-2.0.4"
+          ];
+        })
       sources."events-3.3.0"
       sources."evp_bytestokey-1.0.3"
-      (sources."hash-base-3.1.0" // {
-        dependencies = [
-          sources."inherits-2.0.4"
-          sources."readable-stream-3.6.0"
-        ];
-      })
-      (sources."hash.js-1.1.7" // {
-        dependencies = [
-          sources."inherits-2.0.4"
-        ];
-      })
+      (sources."hash-base-3.1.0"
+        // {
+          dependencies = [
+            sources."inherits-2.0.4"
+            sources."readable-stream-3.6.0"
+          ];
+        })
+      (sources."hash.js-1.1.7"
+        // {
+          dependencies = [
+            sources."inherits-2.0.4"
+          ];
+        })
       sources."hmac-drbg-1.0.1"
       sources."https-browserify-1.0.0"
       sources."ieee754-1.2.1"
@@ -1256,11 +1269,12 @@ in
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."md5.js-1.3.5"
-      (sources."miller-rabin-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
+      (sources."miller-rabin-4.0.1"
+        // {
+          dependencies = [
+            sources."bn.js-4.12.0"
+          ];
+        })
       sources."minimalistic-assert-1.0.1"
       sources."minimalistic-crypto-utils-1.0.1"
       sources."node-gyp-build-4.5.0"
@@ -1273,23 +1287,25 @@ in
       sources."pbkdf2-3.1.2"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
-      (sources."public-encrypt-4.0.3" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
+      (sources."public-encrypt-4.0.3"
+        // {
+          dependencies = [
+            sources."bn.js-4.12.0"
+          ];
+        })
       sources."punycode-1.4.1"
       sources."querystring-0.2.0"
       sources."querystring-es3-0.2.1"
       sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
-      (sources."readable-stream-2.3.7" // {
-        dependencies = [
-          sources."inherits-2.0.4"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
+      (sources."readable-stream-2.3.7"
+        // {
+          dependencies = [
+            sources."inherits-2.0.4"
+            sources."safe-buffer-5.1.2"
+            sources."string_decoder-1.1.1"
+          ];
+        })
       sources."readline-sync-1.4.10"
       sources."ripemd160-2.0.2"
       sources."safe-buffer-5.2.1"
@@ -1305,17 +1321,19 @@ in
       sources."timers-browserify-2.0.12"
       sources."to-arraybuffer-1.0.1"
       sources."tty-browserify-0.0.0"
-      (sources."url-0.11.0" // {
-        dependencies = [
-          sources."punycode-1.3.2"
-        ];
-      })
+      (sources."url-0.11.0"
+        // {
+          dependencies = [
+            sources."punycode-1.3.2"
+          ];
+        })
       sources."utf-8-validate-5.0.9"
-      (sources."util-0.11.1" // {
-        dependencies = [
-          sources."inherits-2.0.3"
-        ];
-      })
+      (sources."util-0.11.1"
+        // {
+          dependencies = [
+            sources."inherits-2.0.3"
+          ];
+        })
       sources."util-deprecate-1.0.2"
       sources."vm-browserify-1.1.2"
       sources."which-1.3.1"