public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #97463 from WilliButz/codimd/fix-sqlite/node12 

codimd: build with nodejs-12_x instead of nodejs-10_x
This commit is contained in:
Maximilian Bosch 2020-09-09 19:48:11 +02:00 committed by GitHub
parent f729755d4d 46e3949819
commit 1b344f2695
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/web-apps/codimd/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper { stdenv, fetchFromGitHub, fetchpatch, makeWrapper
, which, nodejs, mkYarnPackage, python2 }: , which, nodejs, mkYarnPackage, python2, nixosTests }:
mkYarnPackage rec { mkYarnPackage rec {
name = "codimd"; name = "codimd";
@ -63,6 +63,8 @@ mkYarnPackage rec {
runHook postDist runHook postDist
''; '';
passthru.tests = { inherit (nixosTests) codimd; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Realtime collaborative markdown notes on all platforms"; description = "Realtime collaborative markdown notes on all platforms";
license = licenses.agpl3; license = licenses.agpl3;

2
pkgs/top-level/all-packages.nix
View File

@ -2706,7 +2706,7 @@ in
cmt = callPackage ../applications/audio/cmt {}; cmt = callPackage ../applications/audio/cmt {};
codimd = callPackage ../servers/web-apps/codimd { codimd = callPackage ../servers/web-apps/codimd {
nodejs = nodejs-10_x; nodejs = nodejs-12_x;
}; };
colord = callPackage ../tools/misc/colord { }; colord = callPackage ../tools/misc/colord { };