summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-10-25 00:25:06 +0000
committerGitHub <noreply@github.com>2022-10-25 00:25:06 +0000
commit6e24e8b05cdfb9db926ee235fc00f7210d562dd2 (patch)
treef568be5d27e83765fbd8ee6865d9eaa40a0f3e24
parentMerge release-22.05 into staging-next-22.05 (diff)
parentlibrewolf: 105.0.1-1 -> 106.0.1-1 (diff)
downloadnixpkgs-6e24e8b05cdfb9db926ee235fc00f7210d562dd2.tar.gz
Merge release-22.05 into staging-next-22.05
-rw-r--r--pkgs/applications/networking/browsers/librewolf/src.json10
-rw-r--r--pkgs/applications/networking/browsers/palemoon/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/element/element-desktop-package.json3
-rw-r--r--pkgs/applications/networking/instant-messengers/element/pin.json8
4 files changed, 14 insertions, 13 deletions
diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index 22b6b9620299..7beaff12a337 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
{
- "packageVersion": "105.0.1-1",
+ "packageVersion": "106.0.1-1",
"source": {
- "rev": "105.0.1-1",
- "sha256": "0a6vvf62xqxnqn0f87971nsnrr0xzakgjl4d655qhq9xn0apj8wg"
+ "rev": "106.0.1-1",
+ "sha256": "0dg4dvpa4fqhaikqnyqvxmi84g4gw535rdxmax724d0m6ksjm5yh"
},
"firefox": {
- "version": "105.0.1",
- "sha512": "66ef7cd5028953e7da9d55e127135739c9d85be68ec633b71c52d6c9427edb0bd8a38504148484cd322adcefb57bfefe6e57cb15855f195508fe438864f4322b"
+ "version": "106.0.1",
+ "sha512": "15f5a65a69e11dd0c463b358cafb5ad0f31db93619b9ec3f89e8c5e14d4d319d9423fe4dcd0dbbcbedc1ad444dcbd8e5e30e483220277f5b550bff6124b66519"
}
}
diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix
index 47ea42656528..aa4e5ed47b4b 100644
--- a/pkgs/applications/networking/browsers/palemoon/default.nix
+++ b/pkgs/applications/networking/browsers/palemoon/default.nix
@@ -45,7 +45,7 @@ assert with lib.strings; (
stdenv.mkDerivation rec {
pname = "palemoon";
- version = "31.2.0.1";
+ version = "31.3.0.1";
src = fetchFromGitea {
domain = "repo.palemoon.org";
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
repo = "Pale-Moon";
rev = "${version}_Release";
fetchSubmodules = true;
- sha256 = "sha256-ytJC3QW9grbI6DusYITACc40+xUJ94+ATVGaOzWAwHU=";
+ sha256 = "sha256-qspzTlhK9MRJBsXxmYzl5K6in09LZPvaVc+ibovJAD8=";
};
nativeBuildInputs = [
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
# Too many cores can lead to build flakiness
# https://forum.palemoon.org/viewtopic.php?f=5&t=28480
- export jobs=$(($NIX_BUILD_CORES<=20 ? $NIX_BUILD_CORES : 20))
+ export jobs=$(($NIX_BUILD_CORES<=16 ? $NIX_BUILD_CORES : 16))
if [ -z "$enableParallelBuilding" ]; then
jobs=1
fi
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
index fcdad8ba7320..adbfe160bfc7 100644
--- a/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
+++ b/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
- "version": "1.11.5",
+ "version": "1.11.10",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -55,6 +55,7 @@
"@babel/preset-typescript": "^7.18.6",
"@types/auto-launch": "^5.0.1",
"@types/counterpart": "^0.18.1",
+ "@types/detect-libc": "^1.0.0",
"@types/jest": "^28",
"@types/minimist": "^1.2.1",
"@types/mkdirp": "^1.0.2",
diff --git a/pkgs/applications/networking/instant-messengers/element/pin.json b/pkgs/applications/networking/instant-messengers/element/pin.json
index c63cb4771035..9b21a1c7ecd4 100644
--- a/pkgs/applications/networking/instant-messengers/element/pin.json
+++ b/pkgs/applications/networking/instant-messengers/element/pin.json
@@ -1,6 +1,6 @@
{
- "version": "1.11.8",
- "desktopSrcHash": "l6IwztPEPSo3WgdUBPO4ZNgfoLts8NaqvoHekAhfVGg=",
- "desktopYarnHash": "105xj2xwc9g8cfiby0x93gy8w8w5c76mzzxck5mgvawcc6qpvmrc",
- "webHash": "sha256-4cHGtefZYaCyyPz/Wx0cVtxRjNarLrt1oxnoZmtRNog="
+ "version": "1.11.10",
+ "desktopSrcHash": "cywTZ5OgKaFkHh3i3KLfb8HH8ZlIAOY3Xn2WHyY0fNM=",
+ "desktopYarnHash": "1xwnw9hbbrr72xs2d43qwhbmhfk3w4z80cipyrmdj5y248y8sz84",
+ "webHash": "0jk39yiz86yql99fnwzmr9qvp23x215r0d0qg7dgblqs7zy56f0m"
}