diff options
author | Sander van der Burg <svanderburg@gmail.com> | 2020-03-15 16:37:47 +0100 |
---|---|---|
committer | Sander van der Burg <svanderburg@gmail.com> | 2020-03-15 16:37:47 +0100 |
commit | 875bcef98ba6dc224d49e8cf39aad4aa19219983 (patch) | |
tree | 642eafca8946edcd38d9d9073c7d036e334c30d2 /pkgs/servers/web-apps/cryptpad | |
parent | 798ab51bc7ec46fb7f9033713b18dbbbc7c3b8c0 (diff) | |
download | nixpkgs-875bcef98ba6dc224d49e8cf39aad4aa19219983.tar nixpkgs-875bcef98ba6dc224d49e8cf39aad4aa19219983.tar.gz nixpkgs-875bcef98ba6dc224d49e8cf39aad4aa19219983.tar.bz2 nixpkgs-875bcef98ba6dc224d49e8cf39aad4aa19219983.tar.lz nixpkgs-875bcef98ba6dc224d49e8cf39aad4aa19219983.tar.xz nixpkgs-875bcef98ba6dc224d49e8cf39aad4aa19219983.tar.zst nixpkgs-875bcef98ba6dc224d49e8cf39aad4aa19219983.zip |
base16-builder: regenerate with node2nix 1.8.0, add supplement.json with node-pre-gyp to fix build
Diffstat (limited to 'pkgs/servers/web-apps/cryptpad')
-rwxr-xr-x | pkgs/servers/web-apps/cryptpad/generate.sh | 2 | ||||
-rw-r--r-- | pkgs/servers/web-apps/cryptpad/node-packages-generated.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/web-apps/cryptpad/node-packages.nix | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/web-apps/cryptpad/generate.sh b/pkgs/servers/web-apps/cryptpad/generate.sh index 8abf47409d4..2fe4099efa4 100755 --- a/pkgs/servers/web-apps/cryptpad/generate.sh +++ b/pkgs/servers/web-apps/cryptpad/generate.sh @@ -2,7 +2,7 @@ #! nix-shell -i bash -I nixpkgs=../../../.. -p nodePackages.node2nix nodePackages.bower2nix set -euo pipefail -node2nix -6 \ +node2nix --nodejs-10 \ --input node-packages.json \ --output node-packages-generated.nix \ --composition node-packages.nix \ diff --git a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix index 03207d7ab02..8581f7095cc 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages-generated.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.7.0. Do not edit! +# This file has been generated by node2nix 1.8.0. Do not edit! {nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: diff --git a/pkgs/servers/web-apps/cryptpad/node-packages.nix b/pkgs/servers/web-apps/cryptpad/node-packages.nix index cae300a53f4..3eecf3c9099 100644 --- a/pkgs/servers/web-apps/cryptpad/node-packages.nix +++ b/pkgs/servers/web-apps/cryptpad/node-packages.nix @@ -1,8 +1,8 @@ -# This file has been generated by node2nix 1.7.0. Do not edit! +# This file has been generated by node2nix 1.8.0. Do not edit! {pkgs ? import <nixpkgs> { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}: let nodeEnv = import ../../../development/node-packages/node-env.nix { |