cryptpad: 2.25.0 -> 3.0.0 (#67838)

authored by Julian Stecklina and committed by zimbatm.tngl.sh ea3bae4f ca15c0bd

+15 -16
+4 -4
pkgs/servers/web-apps/cryptpad/bower-packages.nix
··· 13 13 (fetchbower "secure-fabric.js" "secure-v1.7.9" "secure-v1.7.9" "1l56mk7hbnsm9cdg5zdcmg95p7a9w96dq0bbl8fp11vs0awjil7a") 14 14 (fetchbower "hyperjson" "1.4.0" "~1.4.0" "1n68ls3x4lyhg1yy8i4q3xkgh5xqpyakf45sny4x91mkr68x4bd9") 15 15 (fetchbower "chainpad-crypto" "0.2.2" "^0.2.0" "1zmhc24zgg7jkb6c7r5syhxmlk61vmcsa2l0ip37dk52ygl6yfg5") 16 - (fetchbower "chainpad-listmap" "0.5.2" "^0.5.0" "0zmg6y5pzf75i84mlnvif6v1g7f4s1vyyzd6ng9ql4b9sdlf4zpc") 16 + (fetchbower "chainpad-listmap" "0.7.0" "^0.7.0" "141hk4x7kwzgiazsghyg4h4df519m72qh3xfb3lzwy245c2nh1ak") 17 17 (fetchbower "chainpad" "5.1.2" "^5.1.0" "1qzdbaf15vaz2573dzm4sxi28m56hi1gi2z00f5ilayxshrbdrlc") 18 18 (fetchbower "file-saver" "1.3.1" "1.3.1" "065nzkvdiicxnw06z1sjz1sbp9nyis8z839hv6ng1fk25dc5kvkg") 19 19 (fetchbower "alertifyjs" "1.0.11" "1.0.11" "0v7323bzq90k35shm3h6azj4wd9la3kbi1va1pw4qyvndkwma69l") ··· 22 22 (fetchbower "less" "3.7.1" "3.7.1" "1n7ps4xlbrc9m63b3q62mg3p6i7d5hwchhpjshb0drzj5crvz556") 23 23 (fetchbower "bootstrap" "4.3.1" "^v4.0.0" "081xw746bshhy8m14x7y8y6ryl38jz3l5545v62vjzr6b4609xd9") 24 24 (fetchbower "diff-dom" "2.1.1" "2.1.1" "0nrn6xqlhp0p5ixjxdk8qg3939crkggh1l8swd20d7bsz186l5f1") 25 - (fetchbower "nthen" "0.1.10" "^0.1.5" "0ipaydp1g63hgjis9qpp4nzf7p0b06g0xnz8nlxnwarkknci55y8") 25 + (fetchbower "nthen" "0.1.7" "0.1.7" "03yap5ildigaw4rwxmxs37pcwhq415iham8w39zd56ka98gpfxa5") 26 26 (fetchbower "open-sans-fontface" "1.4.2" "^1.4.2" "0ksav1fcq640fmdz49ra4prwsrrfj35y2p4shx1jh1j7zxd044nf") 27 27 (fetchbower "bootstrap-tokenfield" "0.12.1" "^0.12.1" "0ib1v5k8h360sp19yiy7q92rfaz2554fvwwg2ixmxn01ydqlprw6") 28 28 (fetchbower "bootstrap" "3.1.1" "~3.1.1" "06bhjwa8p7mzbpr3jkgydd804z1nwrkdql66h7jkfml99psv9811") ··· 33 33 (fetchbower "saferphore" "0.0.1" "^0.0.1" "1wfr9wpbm3lswmvy2p0247ydb108h4qh5s286py89k871qh6jwdi") 34 34 (fetchbower "jszip" "Stuk/jszip#3.2.2" "Stuk/jszip#^3.1.5" "1k0va2ps2x29d1virg51n5s5rdjk21zfh7h14nnljcfnvxvk3rpp") 35 35 (fetchbower "requirejs-plugins" "1.0.3" "^1.0.3" "00s3sdz1ykygx5shldwhhhybwgw7c99vkqd94i5i5x0gl97ifxf5") 36 - (fetchbower "chainpad-netflux" "0.7.6" "^0.7.0" "02qjk0qv423r2ksxma49i4l45p42j20ifr2rrr23dz0fq44j6llc") 37 - (fetchbower "netflux-websocket" "0.1.20" "^0.1.19" "0bpkkg4vfyhiwwf2d2hxld6zsppjx4clknrwsivp4m0vx2ddc54s") 36 + (fetchbower "chainpad-netflux" "0.9.0" "^0.9.0" "0qx9ihnpmcrmg2lwkpm330bhj8zsp1gdxxrbsd05bwd8pm2x11av") 37 + (fetchbower "netflux-websocket" "0.1.20" "^0.1.20" "1xwqq7nw7fmhglndbplarkdzxfmkq831aqs8nm6qj0hz2ggbibhz") 38 38 (fetchbower "es6-promise" "3.3.1" "^3.2.2" "0ai6z5admfs84fdx6663ips49kqgz4x68ays78cic0xfb7pp6vcz") 39 39 ]; }
-1
pkgs/servers/web-apps/cryptpad/default.nix
··· 15 15 bowerPackages = buildBowerComponents { 16 16 name = "${cryptpad.name}-bower-packages"; 17 17 # this list had to be tweaked by hand: 18 - # * remove the # in the sortablejs dependency 19 18 # * add the second bootstrap ~3.1.1 entry 20 19 generated = ./bower-packages.nix; 21 20 src = cryptpad.src;
+9 -9
pkgs/servers/web-apps/cryptpad/node-packages-generated.nix
··· 364 364 sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; 365 365 }; 366 366 }; 367 - "nthen-0.1.10" = { 367 + "nthen-0.1.8" = { 368 368 name = "nthen"; 369 369 packageName = "nthen"; 370 - version = "0.1.10"; 370 + version = "0.1.8"; 371 371 src = fetchurl { 372 - url = "https://registry.npmjs.org/nthen/-/nthen-0.1.10.tgz"; 373 - sha512 = "W5LOhoFlQZSVg9SnRUJHgm3lOiT3HV6xq+Qo0dGKju2FWsDrKPwcgbJ9o5CORGz7UKKVhPScY9wOJHUogVG2UA=="; 372 + url = "https://registry.npmjs.org/nthen/-/nthen-0.1.8.tgz"; 373 + sha512 = "Oh2CwIbhj+wUT94lQV7LKmmgw3UYAGGd8oLIqp6btQN3Bz3PuWp4BuvtUo35H3rqDknjPfKx5P6mt7v+aJNjcw=="; 374 374 }; 375 375 }; 376 376 "on-finished-2.3.0" = { ··· 619 619 }; 620 620 in 621 621 { 622 - "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" = nodeEnv.buildNodePackage { 622 + "cryptpad-git+https://github.com/xwiki-labs/cryptpad.git#3.0.0" = nodeEnv.buildNodePackage { 623 623 name = "cryptpad"; 624 624 packageName = "cryptpad"; 625 - version = "2.25.0"; 625 + version = "3.0.0"; 626 626 src = fetchgit { 627 627 url = "https://github.com/xwiki-labs/cryptpad.git"; 628 - rev = "0b17df3302fc4a7683a8790f305c8a2c7b1b4fe8"; 629 - sha256 = "261531da1745f9ff930bce3729afba2b7a52ee02f51340426ecf6b19204a21b7"; 628 + rev = "166ab65cd47a64e020528089244ed5be34f6e3c8"; 629 + sha256 = "35a3b733b5c128b7c7e1c0e7473f4a6a446d663f4c787745b36b1071205c1fd7"; 630 630 }; 631 631 dependencies = [ 632 632 sources."accepts-1.3.7" ··· 669 669 sources."mime-types-2.1.24" 670 670 sources."ms-2.0.0" 671 671 sources."negotiator-0.6.2" 672 - sources."nthen-0.1.10" 672 + sources."nthen-0.1.8" 673 673 sources."on-finished-2.3.0" 674 674 sources."parseurl-1.3.3" 675 675 sources."path-to-regexp-0.1.7"
+1 -1
pkgs/servers/web-apps/cryptpad/node-packages.json
··· 1 1 [ 2 - { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#2.25.0" } 2 + { "cryptpad": "git+https://github.com/xwiki-labs/cryptpad.git#3.0.0" } 3 3 ]
+1 -1
pkgs/servers/web-apps/cryptpad/node-packages.nix
··· 14 14 import ./node-packages-generated.nix { 15 15 inherit (pkgs) fetchurl fetchgit; 16 16 inherit nodeEnv; 17 - } 17 + }