MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #59097 from dtzWill/feature/joplin-cli

Browse source 
joplin: init at 1.0.124 (CLI note-taking app, cc joplin-desktop)
This commit is contained in:
Will Dietz 2019-04-17 14:05:52 -05:00 committed by GitHub
commit fd8bf47c5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 3389 additions and 1936 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/node-packages/default-v10.nix
View file

@ -94,4 +94,18 @@ nodePackages // {
webtorrent-cli = nodePackages.webtorrent-cli.override {
buildInputs = [ nodePackages.node-gyp-build ];
};
joplin = nodePackages.joplin.override {
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = with pkgs; [
# sharp, dep list:
# http://sharp.pixelplumbing.com/en/stable/install/
cairo expat fontconfig freetype fribidi gettext giflib
glib harfbuzz lcms libcroco libexif libffi libgsf
libjpeg_turbo libpng librsvg libtiff vips
libwebp libxml2 pango pixman zlib
nodePackages.node-pre-gyp
];
};
}

1
pkgs/development/node-packages/node-packages-v10.json
View file

@ -48,6 +48,7 @@
, "indium"
, "jake"
, "javascript-typescript-langserver"
, "joplin"
, "jsdoc"
, "jshint"
, "json"

5252
pkgs/development/node-packages/node-packages-v10.nix
View file

File diff suppressed because it is too large Load diff

16
pkgs/development/node-packages/node-packages-v6.nix
View file

@ -1714,13 +1714,13 @@ let
sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f";
};
};
"semver-5.6.0" = {
"semver-5.7.0" = {
name = "semver";
packageName = "semver";
version = "5.6.0";
version = "5.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz";
sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==";
url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
};
};
"set-blocking-2.0.0" = {
@ -2581,7 +2581,7 @@ in
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
sources."semver-5.6.0"
sources."semver-5.7.0"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.2"
sources."string-width-1.0.2"
@ -2606,10 +2606,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
version = "3.0.1";
version = "3.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/pnpm/-/pnpm-3.0.1.tgz";
sha512 = "hYWjRN7U96zHDvgQxGyYaMF469Uzx0iZo2ej1VMUSaOULUFI9ue7dDku29AOf/E0+5Zd9zFs0qE0Tuq5Zsrk0A==";
url = "https://registry.npmjs.org/pnpm/-/pnpm-3.1.0.tgz";
sha512 = "+Ywkb2rg5uX6/CppRBFmefrQn8EiXK8H0ntRoWHuQAzLErrVXtbyuRKhWMUG5ewr9raQUOACou/uaThE9jzhwA==";
};
buildInputs = globalBuildInputs;
meta = {

40
pkgs/development/node-packages/node-packages-v8.nix
View file

@ -4,13 +4,13 @@
let
sources = {
"@types/node-8.10.44" = {
"@types/node-8.10.45" = {
name = "_at_types_slash_node";
packageName = "@types/node";
version = "8.10.44";
version = "8.10.45";
src = fetchurl {
url = "https://registry.npmjs.org/@types/node/-/node-8.10.44.tgz";
sha512 = "HY3SK7egERHGUfY8p6ztXIEQWcIPHouYhCGcLAPQin7gE2G/fALFz+epnMwcxKUS6aKqTVoAFdi+t1llQd3xcw==";
url = "https://registry.npmjs.org/@types/node/-/node-8.10.45.tgz";
sha512 = "tGVTbA+i3qfXsLbq9rEq/hezaHY55QxQLeXQL2ejNgFAxxrgu8eMmYIOsRcl7hN1uTLVsKOOYacV/rcJM3sfgQ==";
};
};
"JSV-4.0.2" = {
@ -1075,6 +1075,15 @@ let
sha512 = "6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==";
};
};
"commander-2.20.0" = {
name = "commander";
packageName = "commander";
version = "2.20.0";
src = fetchurl {
url = "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz";
sha512 = "7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==";
};
};
"component-emitter-1.2.1" = {
name = "component-emitter";
packageName = "component-emitter";
@ -3613,6 +3622,15 @@ let
sha512 = "RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==";
};
};
"semver-5.7.0" = {
name = "semver";
packageName = "semver";
version = "5.7.0";
src = fetchurl {
url = "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz";
sha512 = "Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==";
};
};
"set-blocking-2.0.0" = {
name = "set-blocking";
packageName = "set-blocking";
@ -4518,7 +4536,7 @@ in
sources."chalk-1.1.3"
sources."chmodr-1.2.0"
sources."colors-1.3.3"
sources."commander-2.19.0"
sources."commander-2.20.0"
sources."concat-map-0.0.1"
sources."convert-source-map-1.6.0"
sources."core-js-2.6.5"
@ -4623,7 +4641,7 @@ in
sha512 = "MMiK5sFfIocNMWCc5PshUCAe6aY4P13/GCmSwudOziA/pFdQMHU8jhu+jU2SSWFug4K1ugeuCwtMXe43oL0PhQ==";
};
dependencies = [
sources."@types/node-8.10.44"
sources."@types/node-8.10.45"
sources."JSV-4.0.2"
sources."adal-node-0.1.28"
sources."ajv-6.10.0"
@ -4810,7 +4828,7 @@ in
sources."har-schema-2.0.0"
(sources."har-validator-2.0.6" // {
dependencies = [
sources."commander-2.19.0"
sources."commander-2.20.0"
];
})
sources."has-ansi-2.0.0"
@ -5521,7 +5539,7 @@ in
sources."safe-buffer-5.1.2"
sources."safer-buffer-2.1.2"
sources."sax-1.2.4"
sources."semver-5.6.0"
sources."semver-5.7.0"
sources."set-blocking-2.0.0"
sources."signal-exit-3.0.2"
sources."string-width-1.0.2"
@ -5546,10 +5564,10 @@ in
pnpm = nodeEnv.buildNodePackage {
name = "pnpm";
packageName = "pnpm";
version = "3.0.1";
version = "3.1.0";
src = fetchurl {
url = "https://registry.npmjs.org/pnpm/-/pnpm-3.0.1.tgz";
sha512 = "hYWjRN7U96zHDvgQxGyYaMF469Uzx0iZo2ej1VMUSaOULUFI9ue7dDku29AOf/E0+5Zd9zFs0qE0Tuq5Zsrk0A==";
url = "https://registry.npmjs.org/pnpm/-/pnpm-3.1.0.tgz";
sha512 = "+Ywkb2rg5uX6/CppRBFmefrQn8EiXK8H0ntRoWHuQAzLErrVXtbyuRKhWMUG5ewr9raQUOACou/uaThE9jzhwA==";
};
buildInputs = globalBuildInputs;
meta = {

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

@ -3720,6 +3720,8 @@ in
john = callPackage ../tools/security/john { };
joplin = nodePackages.joplin;
joplin-desktop = callPackage ../applications/misc/joplin-desktop { };
journalbeat = callPackage ../tools/system/journalbeat { };