Commit 1ebed52d authored by Raito Bezarius's avatar Raito Bezarius
Browse files

isso: 0.12.6.2 -> 0.13.0 

This uses `buildNpmPackage` now and Node.js 20.
Also, packages the HTML documentation in a new output.

https://isso-comments.de/news/#isso-version-0-13-0-released
parent 4a188679

pkgs/servers/isso/default.nix

+22 −19
Original line number Diff line number Diff line 
{ 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

  '';

pkgs/servers/isso/node-env.nix

deleted100644 → 0
+0 −573

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/servers/isso/node-packages.nix

deleted100644 → 0
+0 −558

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/servers/isso/package.json

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
{

  "name": "isso",

  "version": "latest",

  "author": "Martin Zimmermann",

  "description": "lightweight Disquis alternative",

  "license": "MIT",

  "repository": "github:posativ/isso",

  "dependencies": {},

  "devDependencies": {

    "almond": "^0.3.3",

    "jade": "^1.5.0",

    "requirejs": "^2.3.6",

    "requirejs-text": "^2.0.15"

  }

}

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -21207,7 +21207,7 @@ with pkgs; 
  };















  isso = callPackage ../servers/isso {













    nodejs = nodejs_14;













    nodejs = nodejs_20;















  };





























  itk_5_2 = callPackage ../development/libraries/itk/5.2.x.nix {