diff --git a/pkgs/applications/networking/instant-messengers/schildichat/pin.json b/pkgs/applications/networking/instant-messengers/schildichat/pin.json index 3e5af22c824a..fbae80954e8b 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/pin.json +++ b/pkgs/applications/networking/instant-messengers/schildichat/pin.json @@ -1,9 +1,9 @@ { - "version": "1.11.13-sc.1", - "rev": "v1.11.13-sc.1", - "srcHash": "1yvd0mzw4qz03nf6im2msi1lp1v4ca9zknvb3ls6va11nxr01h3g", - "webYarnHash": "0bmjg9qhd89bdnh398lp257mxdgdd88wj5g3fmc3cavyd6hmgzbn", - "jsSdkYarnHash": "0j0jhbfhq0zabnc4glk2kypn53mi5s09l39i41p0zv7g1riwz7al", - "reactSdkYarnHash": "195ck2k5fhzi1b8grh5c88aiq4i3baqanjx48dam76li2msfxxfn", - "desktopYarnHash": "1scp9y2lmah3n20f1kpc9paspd3qgslg129diis7g11cz4h0wyi5" + "version": "1.11.30-sc.2", + "rev": "v1.11.30-sc.2", + "srcHash": "1qb1fcr52gyzxndz3j77vn3ddwjpxwvicnh16c72zpzpfbbky7a5", + "webYarnHash": "0bg5vc7q8afqfpsaqqkczf9whbzici5d2bxj5cadhrlmlb27f8nx", + "jsSdkYarnHash": "0p1whh3pmqz170l542fiq3zgljl5daa9b96i59p3wvggnx7kny7j", + "reactSdkYarnHash": "02ysshiyjj3w00b628is9bd7i8qc3vc8kr1zam2dpj26lb9k5pdd", + "desktopYarnHash": "16pzmlwzf3z8mky3wb4azaiggigyfnpxmbq3irjp30ic6yhl50yw" } diff --git a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix index 0573c7231e27..cf2c44f5f2f2 100644 --- a/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/schildichat/schildichat-desktop.nix @@ -58,13 +58,18 @@ stdenv.mkDerivation rec { runHook postConfigure ''; + # Only affects unused scripts in $out/share/element/electron/scripts. Also + # breaks because there are some `node`-scripts with a `npx`-shebang and + # this shouldn't be in the closure just for unused scripts. + dontPatchShebangs = true; + buildPhase = '' runHook preBuild pushd element-desktop - npx tsc - yarn run i18n - node ./scripts/copy-res.js + yarn --offline run build:ts + yarn --offline run i18n + yarn --offline run build:res popd runHook postBuild @@ -97,10 +102,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - # Do not attempt generating a tarball for element-web again. - # note: `doDist = false;` does not work. - distPhase = ";"; - # The desktop item properties should be kept in sync with data from upstream: # https://github.com/schildichat/element-desktop/blob/sc/package.json desktopItems = [ diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 315e3871f1bf..48f9485790d7 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,14 +3,14 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "6.1.25"; - hash = "sha256-Cn8NAVdfL2VJIPuZ3tANxB3VyQI0X2/YZG0/4r/ccYg="; + version = "6.1.27"; + hash = "sha256-Wq95e0UEwbm1nOQNOdUuxTWGfYz/UXvSbfl3P1AEnw0="; variant = "lts"; }; mainVariant = { - version = "6.2.12"; - hash = "sha256-K/s1nSLOrzZ/A3pnv9qFs8SkI9R6keG0WGV1o7K6jUQ="; + version = "6.3.1"; + hash = "sha256-ofCL8LxSndjj2pg8tphe58n51+TbSDcLDrCFGFSoLhg="; variant = "main"; }; @@ -52,7 +52,7 @@ let extraMeta = { branch = lib.versions.majorMinor version; - maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault atemu ]; + maintainers = with lib.maintainers; [ fortuneteller2k lovesegfault atemu shawn8901 ]; description = "Built with custom settings and new features built to provide a stable, responsive and smooth desktop experience"; broken = stdenv.isAarch64; }; diff --git a/pkgs/servers/web-apps/wordpress/packages/languages.json b/pkgs/servers/web-apps/wordpress/packages/languages.json index 79714a57982c..2ccc93b6e288 100644 --- a/pkgs/servers/web-apps/wordpress/packages/languages.json +++ b/pkgs/servers/web-apps/wordpress/packages/languages.json @@ -7,14 +7,14 @@ }, "fr_FR": { "path": "fr_FR", - "rev": "1073950", - "sha256": "0gzgnwsdv83w8rmms52kjb60zmx1dcmik96561a4r95i4wi2nqrr", - "version": "6.1" + "rev": "1112199", + "sha256": "0ggqadldfspxzs4cqbmqs1bnc41w28z9vm2bfb4mz024hlszgpy0", + "version": "6.2" }, "ro_RO": { "path": "ro_RO", - "rev": "1096709", - "sha256": "067iknc79sr185hl9f6d92jgz74bzp39k6j2mck6d9m5qa2f398r", - "version": "6.1" + "rev": "1109099", + "sha256": "0fdj3myl9i7lknliwvv5k2lcw47361mwi7sarrw8b69lxy9n9yp2", + "version": "6.2" } } diff --git a/pkgs/servers/web-apps/wordpress/packages/plugins.json b/pkgs/servers/web-apps/wordpress/packages/plugins.json index a79672dcdabd..9a168a74fbfe 100644 --- a/pkgs/servers/web-apps/wordpress/packages/plugins.json +++ b/pkgs/servers/web-apps/wordpress/packages/plugins.json @@ -12,10 +12,10 @@ "version": "5.1" }, "antispam-bee": { - "path": "antispam-bee/tags/2.11.2", - "rev": "2860691", - "sha256": "0yg82rx4n0bmj71d0mcjspghg9m3fp7ndf4jsjcp3kvbnhlxihaa", - "version": "2.11.2" + "path": "antispam-bee/tags/2.11.3", + "rev": "2898402", + "sha256": "0rh5r7qdhq9y7dily2b7h24dn5r0qr10gqw9qvvnz4lsqq3mpw2q", + "version": "2.11.3" }, "async-javascript": { "path": "async-javascript/tags/2.21.08.31", @@ -24,10 +24,10 @@ "version": "2.21.08.31" }, "breeze": { - "path": "breeze/tags/2.0.18", - "rev": "2883385", - "sha256": "1fx186mqlmda5sk3a3pndnjadalygp2xw27xffmvwmvvmv7nikv9", - "version": "2.0.18" + "path": "breeze/tags/2.0.21", + "rev": "2906926", + "sha256": "11apjskzfajvz4bm06bva0pjm6z7salvvl024267l6n5hyp924zs", + "version": "2.0.21" }, "co-authors-plus": { "path": "co-authors-plus/tags/3.5.10", @@ -54,10 +54,10 @@ "version": "1.0.1" }, "gutenberg": { - "path": "gutenberg/tags/15.5.0", - "rev": "2894522", - "sha256": "132bbnvnv43pq7bn16r3fkks6r3jl4bnqksvh2q7hmysr8xgllwf", - "version": "15.5.0" + "path": "gutenberg/tags/15.6.2", + "rev": "2902464", + "sha256": "0y7j46qxv1x3b9av80f0xx0wv13g3rzcsnsi6ckd800pvnsp4506", + "version": "15.6.2" }, "hello-dolly": { "path": "hello-dolly/tags/1.7.2", @@ -72,10 +72,10 @@ "version": "2.3.2" }, "jetpack": { - "path": "jetpack/tags/12.0", - "rev": "2893834", - "sha256": "1sxa15qspk5z0qgx44v97gpa70v0h4r6gmyhqg0722ijnvli6dx0", - "version": "12.0" + "path": "jetpack/tags/12.1", + "rev": "2907118", + "sha256": "0z6qzxfqcsx6ywzvak24l64aig33g344x84zy4n9a3h6ymz4rcrb", + "version": "12.1" }, "jetpack-lite": { "path": "jetpack-lite/tags/3.0.3", @@ -84,16 +84,16 @@ "version": "3.0.3" }, "lightbox-photoswipe": { - "path": "lightbox-photoswipe/tags/5.0.30", - "rev": "2891767", - "sha256": "13y2ascd8cq1kvn8kl2r6xpz3fl8silm0llbbybmdqiihc41mwdw", - "version": "5.0.30" + "path": "lightbox-photoswipe/tags/5.0.35", + "rev": "2907179", + "sha256": "1imzrav4a9848imkhvldm9x4cnw57vi5agllqw614j36kkxk1fpg", + "version": "5.0.35" }, "mailpoet": { - "path": "mailpoet/tags/4.11.0", - "rev": "2893564", - "sha256": "1zcxb3r4lypa4ha75ngxvf4n0qn2457bkgrzi0y75i69y1bxmyls", - "version": "4.11.0" + "path": "mailpoet/tags/4.14.0", + "rev": "2906897", + "sha256": "14ivmrl4h78nrmmii6aci1xwm3c1hp9yld8iadrfl69k1fif1814", + "version": "4.14.0" }, "merge-minify-refresh": { "path": "merge-minify-refresh/trunk", @@ -120,22 +120,22 @@ "version": "0.9.3" }, "webp-converter-for-media": { - "path": "webp-converter-for-media/tags/5.8.4", - "rev": "2883502", - "sha256": "073zki4a3di322cavav2iyv3yqaksqc6pmd0jikv9kc63b6vxapc", - "version": "5.8.4" + "path": "webp-converter-for-media/tags/5.8.6", + "rev": "2906166", + "sha256": "0i30yshs94rdlj1wpfkkp2n4b4w98mq806cmkk2696ak9ddi5gdh", + "version": "5.8.6" }, "webp-express": { - "path": "webp-express/tags/0.25.5", - "rev": "2728620", - "sha256": "0m8hbz72kvzlrcb5jnyfka90xfk1dg602rwmf22xnawzbw52532p", - "version": "0.25.5" + "path": "webp-express/tags/0.25.6", + "rev": "2899406", + "sha256": "1ah2gbm5aiqa4yw3kfhx49n6j3jyl6s44s9c5xqnpsjxr211h7p4", + "version": "0.25.6" }, "wordpress-seo": { - "path": "wordpress-seo/tags/20.4", - "rev": "2888177", - "sha256": "1wc0r8d7i32g5c9djb5mwhawj4yrrlbhga1x3zlrpg52kqz27pbn", - "version": "20.4" + "path": "wordpress-seo/tags/20.6", + "rev": "2904263", + "sha256": "1wwwilapiw0dd80ng5k573rgqa0fz9bf2h43cxp77ksapskvw1j7", + "version": "20.6" }, "worker": { "path": "worker/tags/4.9.17", @@ -150,10 +150,10 @@ "version": "1.0" }, "wp-fastest-cache": { - "path": "wp-fastest-cache/tags/1.1.3", - "rev": "2895486", - "sha256": "190451g1b2dsizrgi6vghmxnd4mikgbdj2314r4hjn8lam3wpixi", - "version": "1.1.3" + "path": "wp-fastest-cache/tags/1.1.5", + "rev": "2905667", + "sha256": "1vpw526zw9yin1ppkcf98027yxwdzk5q7xvhbgar74jchq91zzfc", + "version": "1.1.5" }, "wp-gdpr-compliance": { "path": "wp-gdpr-compliance/tags/2.0.22", @@ -162,16 +162,16 @@ "version": "2.0.22" }, "wp-mail-smtp": { - "path": "wp-mail-smtp/tags/3.7.0", - "rev": "2834385", - "sha256": "1qrmdz2qb0qz2qf5zxf3vs3a1cgnpmi0xlbm7wpxq45bg6qziwzr", - "version": "3.7.0" + "path": "wp-mail-smtp/tags/3.8.0", + "rev": "2904482", + "sha256": "0wd2x1kkh499gaq7p33sjvbbhrmgfi6vlalv2lsmlnh9nbgdf6cn", + "version": "3.8.0" }, "wp-statistics": { - "path": "wp-statistics/tags/14.0.2", - "rev": "2877167", - "sha256": "1wk4il8pl1k78gsb9ayvsf0wnnhnj39igf23aazaiikn2mmz7zzw", - "version": "14.0.2" + "path": "wp-statistics/tags/14.1", + "rev": "2907012", + "sha256": "0pb5988x1aqpdkr5ar32zl004c48c6040bvjdws6f3z6vi6i475x", + "version": "14.1" }, "wp-user-avatars": { "path": "wp-user-avatars/trunk", @@ -180,9 +180,9 @@ "version": "1.4.1" }, "wpforms-lite": { - "path": "wpforms-lite/tags/1.8.1.1", - "rev": "2890148", - "sha256": "0qf99shcz0grnhqkf0rfwn0f5sg8nls0vsnnspwrd2m21ka5jp9k", - "version": "1.8.1.1" + "path": "wpforms-lite/tags/1.8.1.2", + "rev": "2897758", + "sha256": "07wdk0139l9fwg7yc9qh2g0a8c5c37788si6xaf8gcvqj7fd9c2z", + "version": "1.8.1.2" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 500cb63fa7b5..88afb7a5c3f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6226,7 +6226,7 @@ with pkgs; schildichat-desktop = callPackage ../applications/networking/instant-messengers/schildichat/schildichat-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_20; + electron = electron_22; }; schildichat-desktop-wayland = writeScriptBin "schildichat-desktop" '' #!/bin/sh