1 files changed, 22 insertions, 19 deletions
diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix
index 459ca2c713001..00432ab5fc6f0 100644
--- a/pkgs/servers/isso/default.nix
+++ b/pkgs/servers/isso/default.nix
@@ -1,30 +1,28 @@
-{ pkgs, nodejs, lib, python3Packages, fetchFromGitHub, nixosTests }:
-let
-  nodeEnv = import ./node-env.nix {
-    inherit (pkgs) stdenv lib python2 runCommand writeTextFile;
-    inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
-  };
-  nodePackages = import ./node-packages.nix {
-    inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
-    inherit nodeEnv;
-  };
+{ pkgs, nodejs, lib, python3Packages, fetchFromGitHub, nixosTests, fetchNpmDeps, npmHooks }:
 
-  nodeDependencies = (nodePackages.shell.override (old: {
-  })).nodeDependencies;
-in
-with python3Packages; buildPythonApplication rec {
+with python3Packages;
 
+buildPythonApplication rec {
   pname = "isso";
-  version = "0.12.6.2";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "posativ";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-T5T3EJS8ef8uo+P9qkC+7I70qv+4PFrnhImr04Fz57U=";
+    sha256 = "sha256-kZNf7Rlb1DZtQe4dK1B283OkzQQcCX+pbvZzfL65gsA=";
+  };
+
+  npmDeps = fetchNpmDeps {
+    inherit src;
+    hash = "sha256-RBpuhFI0hdi8bB48Pks9Ac/UdcQ/DJw+WFnNj5f7IYE=";
   };
 
+  outputs = [
+    "out"
+    "doc"
+  ];
+
   propagatedBuildInputs = [
     itsdangerous
     jinja2
@@ -37,12 +35,17 @@ with python3Packages; buildPythonApplication rec {
 
   nativeBuildInputs = [
     cffi
+    sphinxHook
+    sphinx
     nodejs
+    npmHooks.npmConfigHook
   ];
 
+  NODE_PATH = "$npmDeps";
+
   preBuild = ''
-    ln -s ${nodeDependencies}/lib/node_modules ./node_modules
-    export PATH="${nodeDependencies}/bin:$PATH"
+    ln -s ${npmDeps}/node_modules ./node_modules
+    export PATH="${npmDeps}/bin:$PATH"
 
     make js
   '';