iosevka: Merge node dependencies into nodePackages

pkgs/data/fonts/iosevka/default.nix

@@ -1,5 +1,5 @@
-{ stdenv, lib, pkgs
+{ stdenv, lib, pkgs, fetchFromGitHub
-, nodejs, remarshal, ttfautohint-nox, otfcc
+, nodejs, nodePackages, remarshal, ttfautohint-nox, otfcc
 
 # Custom font set options.
 # See https://github.com/be5invis/Iosevka#build-your-own-style
@@ -12,12 +12,6 @@
 
 assert (privateBuildPlan != null) -> set != null;
 
-let
-  nodePackages = import ./node-packages.nix {
-    inherit pkgs nodejs;
-    inherit (stdenv.hostPlatform) system;
-  };
-in
 stdenv.mkDerivation rec {
   pname =
     if set != null
@@ -26,11 +20,16 @@ stdenv.mkDerivation rec {
 
   version = "2.3.0";
 
-  src = nodePackages."iosevka-https://github.com/be5invis/Iosevka/archive/v${version}.tar.gz";
+  src = fetchFromGitHub {
-  sourceRoot = "${src.name}/lib/node_modules/iosevka";
+    owner = "be5invis";
+    repo = "Iosevka";
+    rev = version;
+    sha256 = "1qnbxhx9wvij9zia226mc3sy8j7bfsw5v1cvxvsbbwjskwqdamvv";
+  };
 
   nativeBuildInputs = [
     nodejs
+    nodePackages."iosevka-build-deps-../../data/fonts/iosevka"
     remarshal
     otfcc
     ttfautohint-nox
@@ -49,6 +48,7 @@ stdenv.mkDerivation rec {
       echo -e "\n" >> parameters.toml
       remarshal -i "$extraParametersJSONPath" -if json -of toml >> parameters.toml
     ''}
+    cp -r ${nodePackages."iosevka-build-deps-../../data/fonts/iosevka"}/lib/node_modules/iosevka-build-deps/* ./
     runHook postConfigure
   '';
 

pkgs/data/fonts/iosevka/generate.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -I nixpkgs=../../../.. -i bash -p nodePackages.node2nix
-
-node2nix \
-	--nodejs-10 \
-	--input node-packages.json \
-	--output node-packages-generated.nix \
-	--composition node-packages.nix \
-	--node-env ./../../../development/node-packages/node-env.nix \
-	--development

pkgs/data/fonts/iosevka/node-packages.json

@@ -1,3 +0,0 @@
-[
-  { "iosevka": "https://github.com/be5invis/Iosevka/archive/v2.3.0.tar.gz" }
-]

pkgs/data/fonts/iosevka/node-packages.nix

@@ -1,17 +0,0 @@
-# This file has been generated by node2nix 1.7.0. Do not edit!
-
-{pkgs ? import <nixpkgs> {
-    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
-
-let
-  nodeEnv = import ../../../development/node-packages/node-env.nix {
-    inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
-    inherit nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
-  };
-in
-import ./node-packages-generated.nix {
-  inherit (pkgs) fetchurl fetchgit;
-  inherit nodeEnv;
-}

pkgs/data/fonts/iosevka/package.json

@@ -0,0 +1,26 @@
+{
+	"name": "iosevka-build-deps",
+	"version": "2.3.0",
+	"scripts": {
+		"build": "verda -f verdafile.js"
+	},
+	"dependencies": {
+		"caryll-shapeops": "^0.3.1",
+		"colors": "^1.3.3",
+		"libspiro-js": "^0.3.1",
+		"megaminx": "^0.9.0",
+		"object-assign": "^4.1.1",
+		"otfcc-ttcize": "^0.8.0",
+		"patel": "^0.33.1",
+		"patrisika-scopes": "^0.11.1",
+		"primitive-quadify-off-curves": "^0.4.0",
+		"stylus": "^0.54.5",
+		"toml": "^2.3.2",
+		"topsort": "0.0.2",
+		"ttf2woff": "^2.0.1",
+		"ttf2woff2": "^2.0.3",
+		"unorm": "^1.4.1",
+		"verda": "^1.0.0-0",
+		"yargs": "^12.0.0"
+	}
+}

pkgs/development/node-packages/node-packages-v10.json

@@ -56,6 +56,7 @@
 , "indium"
 , "ionic"
 , "ios-deploy"
+, { "iosevka-build-deps": "../../data/fonts/iosevka" }
 , "jake"
 , "javascript-typescript-langserver"
 , "joplin"

pkgs/development/node-packages/node-packages-v12.nix

@@ -1255,13 +1255,13 @@ let
         sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
       };
     };
-    "minipass-2.6.2" = {
+    "minipass-2.8.1" = {
       name = "minipass";
       packageName = "minipass";
-      version = "2.6.2";
+      version = "2.8.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minipass/-/minipass-2.6.2.tgz";
+        url = "https://registry.npmjs.org/minipass/-/minipass-2.8.1.tgz";
-        sha512 = "38Jwdc8AttUDaQAIRX8Iaw3QoCDWjAwKMGeGDF9JUi9QCPMjH5qAQg/hdO8o1nC7Nmh1/CqzMg5FQPEKuKwznQ==";
+        sha512 = "QCG523ParRcE2+9A6wYh9UI3uy2FFLw4DQaVYQrY5HPfszc5M6VDD+j0QCwHm19LI2imes4RB+NBD8cOJccyCg==";
       };
     };
     "minizlib-1.2.2" = {
@@ -2038,13 +2038,13 @@ let
         sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
       };
     };
-    "tar-4.4.10" = {
+    "tar-4.4.11" = {
       name = "tar";
       packageName = "tar";
-      version = "4.4.10";
+      version = "4.4.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz";
+        url = "https://registry.npmjs.org/tar/-/tar-4.4.11.tgz";
-        sha512 = "g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==";
+        sha512 = "iI4zh3ktLJKaDNZKZc+fUONiQrSn9HkCFzamtb7k8FFmVilHVob7QsLX/VySAW8lAviMzMbFw4QtFb4errwgYA==";
       };
     };
     "temp-0.9.0" = {
@@ -2675,7 +2675,7 @@ in
       sources."mime-types-2.1.24"
       sources."minimatch-3.0.4"
       sources."minimist-0.0.8"
-      sources."minipass-2.6.2"
+      sources."minipass-2.8.1"
       sources."minizlib-1.2.2"
       sources."mkdirp-0.5.1"
       sources."ncp-0.4.2"
@@ -2748,7 +2748,7 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      sources."tar-4.4.10"
+      sources."tar-4.4.11"
       sources."temp-0.9.0"
       (sources."tough-cookie-2.4.3" // {
         dependencies = [