git ssb - dev version: some more plugins · Dominic/scuttlebot@9f9cf35e

Henry committed on 9/4/2018, 11:17:10 AM
Parent: baf487aec799cdad500c1703921b896ae071d32c

bin.jsView
		@@ -49,8 +49,11 @@
49	49 …	.use(require('./plugins/local'))
50	50 …	.use(require('./plugins/logging'))
51	51 …	.use(require('ssb-query'))
52	52 …	.use(require('ssb-links'))
	53 …	+ .use(require('ssb-backlinks'))
	54 …	+ .use(require('ssb-about'))
	55 …	+ .use(require('ssb-private'))
53	56 …	.use(require('ssb-ws'))
54	57 …	.use(require('ssb-ebt'))
55	58 …	// add third-party plugins
56	59 …	require('./plugins/plugins').loadUserPlugins(createSbot, config)

package.jsonView
		@@ -1,8 +1,8 @@
1	1 …	{
2	2 …	"name": "scuttlebot",
3	3 …	"description": "network protocol layer for secure-scuttlebutt",
4		- "version": "11.4.2",
	4 …	+ "version": "11.5.0-cryptix",
5	5 …	"homepage": "https://github.com/ssbc/scuttlebot",
6	6 …	"repository": {
7	7 …	"type": "git",
8	8 …	"url": "git://github.com/ssbc/scuttlebot.git"
		@@ -50,16 +50,19 @@
50	50 …	"pull-stringify": "~1.2.2",
51	51 …	"rimraf": "^2.4.2",
52	52 …	"secret-stack": "ssbc/secret-stack#plugable-config-scope",
53	53 …	"secure-scuttlebutt": "^18.2.0",
	54 …	+ "ssb-about": "^0.1.2",
	55 …	+ "ssb-backlinks": "^0.7.3",
54	56 …	"ssb-blobs": "^1.1.4",
55	57 …	"ssb-client": "^4.5.7",
56	58 …	"ssb-config": "ssbc/ssb-config#add-connections",
57	59 …	"ssb-ebt": "^5.1.4",
58		- "ssb-friends": "^2.4.0",
	60 …	+ "ssb-friends": "^3.1.3",
59	61 …	"ssb-keys": "^7.0.13",
60	62 …	"ssb-links": "^3.0.2",
61	63 …	"ssb-msgs": "~5.2.0",
	64 …	+ "ssb-private": "^0.2.3",
62	65 …	"ssb-query": "^2.1.0",
63	66 …	"ssb-ref": "^2.9.1",
64	67 …	"ssb-ws": "^2.1.1",
65	68 …	"statistics": "^3.0.0",

shell.nixView
		@@ -1,0 +1,57 @@
	1 …	+with import <nixpkgs> {};
	2 …	+with pkgs;
	3 …	+
	4 …	+let ssbScuttlebotEnv = buildEnv {
	5 …	+ name = "scuttlebot";
	6 …	+ paths = [
	7 …	+ atk
	8 …	+ binutils
	9 …	+ bzip2
	10 …	+ dbus.lib
	11 …	+ expat
	12 …	+ gcc
	13 …	+ glib
	14 …	+ glibc
	15 …	+ gnumake
	16 …	+ libcap
	17 …	+ libgpgerror
	18 …	+ libnotify
	19 …	+ libsodium
	20 …	+ nspr
	21 …	+ nss
	22 …	+ readline
	23 …	+ systemd
	24 …	+ udev
	25 …	+ zlib
	26 …	+ ];
	27 …	+ extraOutputsToInstall = [ "lib" "dev" "out" ];
	28 …	+}; in
	29 …	+
	30 …	+(pkgs.buildFHSUserEnv {
	31 …	+ name = "Scuttlebot";
	32 …	+
	33 …	+ targetPkgs = pkgs: (with pkgs; [
	34 …	+ nodejs-8_x
	35 …	+ xvfb_run
	36 …	+ unzip
	37 …	+ git
	38 …	+ ssbScuttlebotEnv
	39 …	+ ]);
	40 …	+
	41 …	+ extraOutputsToInstall = [ "lib" "dev" "out" ];
WritePreview
	42 …	+
	43 …	+ extraBuildCommands = ''
	44 …	+ (cd usr/lib64 && ln -sv libbz2.so.1.0.* libbz2.so.1.0)
	45 …	+ '';
	46 …	+
	47 …	+ profile = ''
	48 …	+ export npm_config_cache="/tmp/ssbScuttlebot-npm-cache/"
	49 …	+ export npm_config_devdir="/tmp/ssbScuttlebot-gyp/"
	50 …	+ export ELECTRON_CACHE="/tmp/ssbScuttlebot-electron-cache/"
	51 …	+
	52 …	+ export CFLAGS="$NIX_CFLAGS_COMPILE"
	53 …	+ export CXXFLAGS="$NIX_CFLAGS_COMPILE"
	54 …	+ export LDFLAGS="$NIX_LDFLAGS_BEFORE"
	55 …	+ '';
	56 …	+}).env
	57 …	+

Dominic / scuttlebot