Reformat code
diff --git a/packages/etherpad/default.nix b/packages/etherpad/default.nix
index 08f947e..9782cbb 100644
--- a/packages/etherpad/default.nix
+++ b/packages/etherpad/default.nix
@@ -1,8 +1,11 @@
# This file has been generated by node2nix 1.11.1. Do not edit!
-{pkgs ? import <nixpkgs> {
+{ pkgs ? import <nixpkgs> {
inherit system;
- }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
+ }
+, system ? builtins.currentSystem
+, nodejs ? pkgs."nodejs-14_x"
+}:
let
nodeEnv = import ./node-env.nix {
diff --git a/packages/etherpad/node-env.nix b/packages/etherpad/node-env.nix
index 5dad9ec..d5bf407 100644
--- a/packages/etherpad/node-env.nix
+++ b/packages/etherpad/node-env.nix
@@ -1,6 +1,6 @@
# 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 +9,7 @@
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 <<EOF
@@ -90,26 +90,28 @@
# 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 != []) (
+ 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:
+ composePackage = { name, packageName, src, dependencies ? [ ], ... }@args:
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
installPackage "${packageName}" "${src}"
${includeDependencies { inherit dependencies; }}
@@ -117,7 +119,7 @@
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
'';
- pinpointDependencies = {dependencies, production}:
+ pinpointDependencies = { dependencies, production }:
let
pinpointDependenciesFromPackageJSON = writeTextFile {
name = "pinpointDependencies.js";
@@ -194,7 +196,7 @@
# dependencies in the package.json file to the versions that are actually
# being used.
- pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
+ pinpointDependenciesOfPackage = { packageName, dependencies ? [ ], production ? true, ... }@args:
''
if [ -d "${packageName}" ]
then
@@ -207,7 +209,7 @@
# Extract the Node.js source code which is used to compile packages with
# native bindings
- nodeSources = runCommand "node-sources" {} ''
+ nodeSources = runCommand "node-sources" { } ''
tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
mv node-* $out
'';
@@ -414,64 +416,64 @@
'';
};
- prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
+ 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
+ # 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 .
+ # 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.
+ # 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
+ 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
+ ${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}
- ''}
-
- node ${addIntegrityFieldsScript}
+ 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
+
+ # Link executables defined in package.json
+ node ${linkBinsScript}
'';
# Builds and composes an NPM package including all its dependencies
@@ -479,8 +481,8 @@
{ name
, packageName
, version ? null
- , dependencies ? []
- , buildInputs ? []
+ , dependencies ? [ ]
+ , buildInputs ? [ ]
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
@@ -490,8 +492,9 @@
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
- , meta ? {}
- , ... }@args:
+ , meta ? { }
+ , ...
+ }@args:
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
@@ -569,8 +572,8 @@
, packageName
, version ? null
, src
- , dependencies ? []
- , buildInputs ? []
+ , dependencies ? [ ]
+ , buildInputs ? [ ]
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
@@ -579,60 +582,61 @@
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
- , ... }@args:
+ , ...
+ }@args:
let
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
in
- stdenv.mkDerivation ({
- name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
+ 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;
+ 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;
+ inherit dontStrip; # Stripping may fail a build for some package deployments
+ inherit dontNpmInstall unpackPhase buildPhase;
- includeScript = includeDependencies { inherit dependencies; };
- pinpointDependenciesScript = pinpointDependenciesOfPackage args;
+ includeScript = includeDependencies { inherit dependencies; };
+ pinpointDependenciesScript = pinpointDependenciesOfPackage args;
- passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
+ passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
- installPhase = ''
- source ${installPackage}
+ installPhase = ''
+ source ${installPackage}
- mkdir -p $out/${packageName}
- cd $out/${packageName}
+ mkdir -p $out/${packageName}
+ cd $out/${packageName}
- source $includeScriptPath
+ 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
- ''}
+ # 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 .."}
+ # 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; }}
+ ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
- # Expose the executables that were installed
- cd ..
- ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
+ # 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);
+ mv ${packageName} lib
+ ln -s $out/lib/node_modules/.bin $out/bin
+ '';
+ } // extraArgs);
# Builds a development shell
buildNodeShell =
@@ -640,8 +644,8 @@
, packageName
, version ? null
, src
- , dependencies ? []
- , buildInputs ? []
+ , dependencies ? [ ]
+ , buildInputs ? [ ]
, production ? true
, npmFlags ? ""
, dontNpmInstall ? false
@@ -650,7 +654,8 @@
, dontStrip ? true
, unpackPhase ? "true"
, buildPhase ? "true"
- , ... }@args:
+ , ...
+ }@args:
let
nodeDependencies = buildNodeDependencies args;
@@ -672,7 +677,7 @@
# Provide the dependencies in a development shell through the NODE_PATH environment variable
inherit nodeDependencies;
- shellHook = lib.optionalString (dependencies != []) ''
+ shellHook = lib.optionalString (dependencies != [ ]) ''
export NODE_PATH=${nodeDependencies}/lib/node_modules
export PATH="${nodeDependencies}/bin:$PATH"
'';
diff --git a/packages/etherpad/node-packages.nix b/packages/etherpad/node-packages.nix
index 26a251c..70f7d49 100644
--- a/packages/etherpad/node-packages.nix
+++ b/packages/etherpad/node-packages.nix
@@ -1,6 +1,6 @@
# This file has been generated by node2nix 1.11.1. Do not edit!
-{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}:
+{ nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? [ ] }:
let
sources = {
@@ -5617,7 +5617,8 @@
"*"
"!package.json"
"!package-lock.json"
- ] args.src;
+ ]
+ args.src;
dontBuild = true;
installPhase = "mkdir -p $out; cp -r ./* $out;";
};