git.iko.soy/typeable/nixpkgs
on master help sign in
cryptpad: 2.23.0 -> 2.25.0 (#67592)

Update to latest stable version. Remove patched load-config.js, because it is no longer necessary.

commit3d321db0f25c6419357441398a64cdcbe9371244 authorJulian Stecklina <js@alien8.de> dateWed 28 Aug 2019, 01:00 (7 years ago) parentf7a8641
5 files changed+37−82
pkgs/servers/web-apps/cryptpad/bower-packages.nix+5−5 pkgs/servers/web-apps/cryptpad/default.nix−9 pkgs/servers/web-apps/cryptpad/node-packages-generated.nix+30−66 pkgs/servers/web-apps/cryptpad/node-packages.json+1−1 pkgs/servers/web-apps/cryptpad/node-packages.nix+1−1
pkgs/servers/web-apps/cryptpad/bower-packages.nix+5−5
@@ -5,7 +5,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
55 (fetchbower "tweetnacl" "0.12.2" "0.12.2" "1lfzbfrdaly3zyzbcp1p53yhxlrx56k8x04q924kg7l52gblm65g")
66 (fetchbower "components-font-awesome" "4.7.0" "^4.6.3" "1w27im6ayjrbgjqa0i49ml5d3wy4ld40h9b29hz9myv77bpx4lg1")
77 (fetchbower "ckeditor" "4.7.3" "4.7.3" "02bism1gc0pccdxsp361hsrn9p4jh24dnxh40rv3xikr3g91b414")
8− (fetchbower "codemirror" "5.47.0" "^5.19.0" "0h9kjmljd9i5hsdk53f6klx3k8vf9kfn14j0s7k3ivb5d0x0r1p4")
8+ (fetchbower "codemirror" "5.48.4" "^5.19.0" "1066jrf11dygdr8v7xv2nyzrq4ks7sc6j8wdqvrwl689pw3ycypf")
99 (fetchbower "requirejs" "2.3.5" "2.3.5" "05lyvgz914h2w08r24rk0vkk3yxmqrvlg7j3i5av9ffkg9lpzsli")
1010 (fetchbower "marked" "0.5.0" "0.5.0" "00lclh9xfbhbjzzbbfjnfpr949hmqmr04jx2hq7mdc9f74xinj1r")
1111 (fetchbower "rangy" "rangy-release#1.3.0" "rangy-release#~1.3.0" "13x3wci003p8jyv2ncir0k23bxckx99b3555r0zvgmlwycg7w0zv")
@@ -22,7 +22,7 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
2222 (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556")
2323 (fetchbower "bootstrap" "4.3.1" "^v4.0.0" "081xw746bshhy8m14x7y8y6ryl38jz3l5545v62vjzr6b4609xd9")
2424 (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1")
25− (fetchbower "nthen" "0.1.7" "^0.1.5" "1bxfjw7qzs0sidv6wf1rjrj4fm0x0j7pr5yi3v4nw3d7cjjgd3wg")
25+ (fetchbower "nthen" "0.1.10" "^0.1.5" "0ipaydp1g63hgjis9qpp4nzf7p0b06g0xnz8nlxnwarkknci55y8")
2626 (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf")
2727 (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6")
2828 (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811")
@@ -31,9 +31,9 @@ buildEnv { name = "bower-env"; ignoreCollisions = true; paths = [
3131 (fetchbower "croppie" "2.6.4" "^2.5.0" "1lcdsjdc4xz7a3sii836g40wx15223sxng53mnf3g7h7s5y84h1x")
3232 (fetchbower "sortablejs" "1.9.0" "^1.6.0" "12gncd70fi3craqqpb3la12hg7pm2wf4y01l1r2vvmnzmb5apdan")
3333 (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi")
34− (fetchbower "jszip" "Stuk/jszip#3.2.0" "Stuk/jszip#^3.1.5" "1gyhm07dsqw2bmj6xddfk91f05gj7xd3gxjd94lsxy8z66z6zia5")
34+ (fetchbower "jszip" "Stuk/jszip#3.2.2" "Stuk/jszip#^3.1.5" "1k0va2ps2x29d1virg51n5s5rdjk21zfh7h14nnljcfnvxvk3rpp")
3535 (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5")
36− (fetchbower "chainpad-netflux" "0.7.5" "^0.7.0" "1dgi1x00msbr203xf3lz8pqhd0w2h5nqa3pqzly1559jfxbyw8g0")
37− (fetchbower "netflux-websocket" "0.1.19" "^0.1.19" "0gzn4bxa6biad083aawn6qpwmg3raqb059mapzalaqjb9bvs8x26")
36+ (fetchbower "chainpad-netflux" "0.7.6" "^0.7.0" "02qjk0qv423r2ksxma49i4l45p42j20ifr2rrr23dz0fq44j6llc")
37+ (fetchbower "netflux-websocket" "0.1.20" "^0.1.19" "0bpkkg4vfyhiwwf2d2hxld6zsppjx4clknrwsivp4m0vx2ddc54s")
3838 (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz")
3939]; }
pkgs/servers/web-apps/cryptpad/default.nix−9
@@ -45,12 +45,6 @@ let
4545 nodePackages
4646 ;
4747
48− # Get the patched load-config.js that allows loading config from the env
49− dynamicConfig = fetchurl {
50− url = "https://raw.githubusercontent.com/zimbatm/cryptpad/35dd3abbb5ef6e3f9d5fb0b31b693c430d159b4a/lib/load-config.js";
51− sha256 = "1ch6r4fkcvyxhc501nmdc39zpnxcqwgwkj7nb39ayflkhil19f6a";
52− };
53−
5448 combined = cryptpad.override {
5549 postInstall = ''
5650 out_cryptpad=$out/lib/node_modules/cryptpad
@@ -60,9 +54,6 @@ let
6054 ${bowerPackages}/bower_components \
6155 $out_cryptpad/www/bower_components
6256
63− # patch the load-config.js file
64− cp ${dynamicConfig} $out_cryptpad/lib/load-config.js
65−
6657 # add executable
6758 mkdir $out/bin
6859 cat <<EOF > $out/bin/cryptpad
pkgs/servers/web-apps/cryptpad/node-packages-generated.nix+30−66
@@ -22,13 +22,13 @@ let
2222 sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
2323 };
2424 };
25− "async-limiter-1.0.0" = {
25+ "async-limiter-1.0.1" = {
2626 name = "async-limiter";
2727 packageName = "async-limiter";
28− version = "1.0.0";
28+ version = "1.0.1";
2929 src = fetchurl {
30− url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz";
31− sha512 = "jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==";
30+ url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz";
31+ sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==";
3232 };
3333 };
3434 "body-parser-1.18.3" = {
@@ -49,13 +49,13 @@ let
4949 sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048";
5050 };
5151 };
52− "chainpad-server-3.0.2" = {
52+ "chainpad-server-3.0.3" = {
5353 name = "chainpad-server";
5454 packageName = "chainpad-server";
55− version = "3.0.2";
55+ version = "3.0.3";
5656 src = fetchurl {
57− url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.2.tgz";
58− sha512 = "c5aEljVAapDKKs0+Rt2jymKAszm8X4ZeLFNJj1yxflwBqoh0jr8OANYvbfjtNaYFe2Wdflp/1i4gibYX4IMc+g==";
57+ url = "https://registry.npmjs.org/chainpad-server/-/chainpad-server-3.0.3.tgz";
58+ sha512 = "NRfV7FFBEYy4ZVX7h0P5znu55X8v5K4iGWeMGihkfWZLKu70GmCPUTwpBCP79dUvnCToKEa4/e8aoSPcvZC8pA==";
5959 };
6060 };
6161 "content-disposition-0.5.2" = {
@@ -220,13 +220,13 @@ let
220220 sha512 = "+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA==";
221221 };
222222 };
223− "graceful-fs-4.1.15" = {
223+ "graceful-fs-4.2.2" = {
224224 name = "graceful-fs";
225225 packageName = "graceful-fs";
226− version = "4.1.15";
226+ version = "4.2.2";
227227 src = fetchurl {
228− url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz";
229− sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==";
228+ url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.2.tgz";
229+ sha512 = "IItsdsea19BoLC7ELy13q1iJFNmd7ofZH5+X/pJr90/nRoPEX0DJo1dHDbgtYWOhJhcCgMDTOw84RZ72q6lB+Q==";
230230 };
231231 };
232232 "http-errors-1.6.3" = {
@@ -364,13 +364,13 @@ let
364364 sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
365365 };
366366 };
367− "nthen-0.1.8" = {
367+ "nthen-0.1.10" = {
368368 name = "nthen";
369369 packageName = "nthen";
370− version = "0.1.8";
370+ version = "0.1.10";
371371 src = fetchurl {
372− url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz";
373− sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw==";
372+ url = "https://registry.npmjs.org/nthen/-/nthen-0.1.10.tgz";
373+ sha512 = "W5LOhoFlQZSVg9SnRUJHgm3lOiT3HV6xq+Qo0dGKju2FWsDrKPwcgbJ9o5CORGz7UKKVhPScY9wOJHUogVG2UA==";
374374 };
375375 };
376376 "on-finished-2.3.0" = {
@@ -382,15 +382,6 @@ let
382382 sha1 = "20f1336481b083cd75337992a16971aa2d906947";
383383 };
384384 };
385− "options-0.0.6" = {
386− name = "options";
387− packageName = "options";
388− version = "0.0.6";
389− src = fetchurl {
390− url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
391− sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
392− };
393− };
394385 "parseurl-1.3.3" = {
395386 name = "parseurl";
396387 packageName = "parseurl";
@@ -418,13 +409,13 @@ let
418409 sha512 = "t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==";
419410 };
420411 };
421− "pull-stream-3.6.12" = {
412+ "pull-stream-3.6.14" = {
422413 name = "pull-stream";
423414 packageName = "pull-stream";
424− version = "3.6.12";
415+ version = "3.6.14";
425416 src = fetchurl {
426− url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.12.tgz";
427− sha512 = "+LO1XIVyTMmeoH26UHznpgrgX2npTVYccTkMpgk/EyiQjFt1FmoNm+w+/zMLuz9U3bpvT5sSUicMKEe/2JjgEA==";
417+ url = "https://registry.npmjs.org/pull-stream/-/pull-stream-3.6.14.tgz";
418+ sha512 = "KIqdvpqHHaTUA2mCYcLG1ibEbu/LCKoJZsBWyv9lSYtPkJPBq8m3Hxa103xHi6D2thj5YXa0TqK3L3GUkwgnew==";
428419 };
429420 };
430421 "qs-6.5.2" = {
@@ -571,15 +562,6 @@ let
571562 sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
572563 };
573564 };
574− "ultron-1.0.2" = {
575− name = "ultron";
576− packageName = "ultron";
577− version = "1.0.2";
578− src = fetchurl {
579− url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz";
580− sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa";
581− };
582− };
583565 "ultron-1.1.1" = {
584566 name = "ultron";
585567 packageName = "ultron";
@@ -625,15 +607,6 @@ let
625607 sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc";
626608 };
627609 };
628− "ws-1.1.5" = {
629− name = "ws";
630− packageName = "ws";
631− version = "1.1.5";
632− src = fetchurl {
633− url = "https://registry.npmjs.org/ws/-/ws-1.1.5.tgz";
634− sha512 = "o3KqipXNUdS7wpQzBHSe180lBGO60SoK0yVo3CYJgb2MkobuWuBX6dhkYP5ORCLd55y+SaflMOV5fqAB53ux4w==";
635− };
636− };
637610 "ws-3.3.3" = {
638611 name = "ws";
639612 packageName = "ws";
@@ -646,26 +619,22 @@ let
646619 };
647620in
648621{
649− "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.23.0" = nodeEnv.buildNodePackage {
622+ "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" = nodeEnv.buildNodePackage {
650623 name = "cryptpad";
651624 packageName = "cryptpad";
652− version = "2.23.0";
625+ version = "2.25.0";
653626 src = fetchgit {
654627 url = "https://github.com/xwiki-labs/cryptpad.git";
655− rev = "980e3f964a5b8bcd7c33da92dbe005f42b20cb30";
656− sha256 = "a094708e4a275ee55ca3a59a2890f20f2f9f7dcfe50274b7e3ecd260502c583b";
628+ rev = "0b17df3302fc4a7683a8790f305c8a2c7b1b4fe8";
629+ sha256 = "261531da1745f9ff930bce3729afba2b7a52ee02f51340426ecf6b19204a21b7";
657630 };
658631 dependencies = [
659632 sources."accepts-1.3.7"
660633 sources."array-flatten-1.1.1"
661− sources."async-limiter-1.0.0"
634+ sources."async-limiter-1.0.1"
662635 sources."body-parser-1.18.3"
663636 sources."bytes-3.0.0"
664− (sources."chainpad-server-3.0.2" // {
665− dependencies = [
666− sources."ws-3.3.3"
667− ];
668− })
637+ sources."chainpad-server-3.0.3"
669638 sources."content-disposition-0.5.2"
670639 sources."content-type-1.0.4"
671640 sources."cookie-0.3.1"
@@ -684,7 +653,7 @@ in
684653 sources."fs-extra-7.0.1"
685654 sources."gar-1.0.4"
686655 sources."get-folder-size-2.0.1"
687− sources."graceful-fs-4.1.15"
656+ sources."graceful-fs-4.2.2"
688657 sources."http-errors-1.6.3"
689658 sources."iconv-lite-0.4.23"
690659 sources."inherits-2.0.3"
@@ -700,13 +669,12 @@ in
700669 sources."mime-types-2.1.24"
701670 sources."ms-2.0.0"
702671 sources."negotiator-0.6.2"
703− sources."nthen-0.1.8"
672+ sources."nthen-0.1.10"
704673 sources."on-finished-2.3.0"
705− sources."options-0.0.6"
706674 sources."parseurl-1.3.3"
707675 sources."path-to-regexp-0.1.7"
708676 sources."proxy-addr-2.0.5"
709− sources."pull-stream-3.6.12"
677+ sources."pull-stream-3.6.14"
710678 sources."qs-6.5.2"
711679 sources."range-parser-1.2.1"
712680 sources."raw-body-2.3.3"
@@ -728,11 +696,7 @@ in
728696 sources."unpipe-1.0.0"
729697 sources."utils-merge-1.0.1"
730698 sources."vary-1.1.2"
731− (sources."ws-1.1.5" // {
732− dependencies = [
733− sources."ultron-1.0.2"
734− ];
735− })
699+ sources."ws-3.3.3"
736700 ];
737701 buildInputs = globalBuildInputs;
738702 meta = {
pkgs/servers/web-apps/cryptpad/node-packages.json+1−1
@@ -1,3 +1,3 @@
11[
2− { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.23.0" }
2+ { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" }
33]
pkgs/servers/web-apps/cryptpad/node-packages.nix+1−1
@@ -2,7 +2,7 @@
22
33{pkgs ? import <nixpkgs> {
44 inherit system;
5− }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-10_x"}:
5+ }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}:
66
77let
88 nodeEnv = import ../../../development/node-packages/node-env.nix {