Skip to content

Commit 4ef54c9

Browse files
github-actions[bot]github-actions[bot]
authored
Merge staging-next-21.11 into staging-21.11
2 parents 5a9a0b1 + c90e993 commit 4ef54c9

File tree

15 files changed

+64
-33
lines changed

15 files changed

+64
-33
lines changed

‎nixos/modules/services/networking/unifi.nix‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ let
77
@${cfg.jrePackage}/bin/java java \
88
${optionalString (cfg.initialJavaHeapSize != null) "-Xms${(toString cfg.initialJavaHeapSize)}m"} \
99
${optionalString (cfg.maximumJavaHeapSize != null) "-Xmx${(toString cfg.maximumJavaHeapSize)}m"} \
10+
${optionalString (lib.versionOlder cfg.unifiPackage.version "6.5.54") "-Dlog4j2.formatMsgNoLookups=true"} \
1011
-jar ${stateDir}/lib/ace.jar
1112
'';
1213
in

‎pkgs/applications/editors/emacs/generic.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
, Xaw3d, libXcursor, pkg-config, gettext, libXft, dbus, libpng, libjpeg, giflib
1111
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
1212
, alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
13-
, sigtool, jansson, harfbuzz
13+
, sigtool, jansson, harfbuzz, sqlite
1414
, dontRecurseIntoAttrs ,emacsPackagesFor
1515
, libgccjit, targetPlatform, makeWrapper # native-comp params
1616
, systemd ? null
@@ -20,6 +20,7 @@
2020
, withGTK3 ? true, gtk3-x11 ? null, gsettings-desktop-schemas ? null
2121
, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
2222
, withMotif ? false, motif ? null
23+
, withSQLite3 ? false
2324
, withCsrc ? true
2425
, srcRepo ? false, autoreconfHook ? null, texinfo ? null
2526
, siteStart ? ./site-start.el
@@ -116,6 +117,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
116117
++ lib.optional (withX && withGTK2) gtk2-x11
117118
++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ]
118119
++ lib.optional (withX && withMotif) motif
120+
++ lib.optional withSQLite3 sqlite
119121
++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ]
120122
++ lib.optionals withNS [ AppKit GSS ImageIO ]
121123
++ lib.optionals stdenv.isDarwin [ sigtool ]

‎pkgs/applications/networking/instant-messengers/element/element-desktop-package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "element-desktop",
33
"productName": "Element",
44
"main": "lib/electron-main.js",
5-
"version": "1.9.6",
5+
"version": "1.9.7",
66
"description": "A feature-rich client for Matrix.org",
77
"author": "Element",
88
"repository": {
@@ -83,7 +83,7 @@
8383
},
8484
"build": {
8585
"appId": "im.riot.app",
86-
"electronVersion": "13.5.1",
86+
"electronVersion": "13.5.2",
8787
"files": [
8888
"package.json",
8989
{

‎pkgs/applications/networking/instant-messengers/element/pin.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"version": "1.9.6",
3-
"desktopSrcHash": "AJLKp9VbNF0XvcQe6t0/pw1hiVCgRiRb27KJooQ2NlQ=",
4-
"desktopYarnHash": "1xa8vrqj3g3hfhzrk8m7yr57my9ipyyhw8vsx4m86v8i1iqrpmnm",
5-
"webHash": "161w6i122i81jyb23mpxlf7k5wx2v4c6ai2liywn89q74hj3axr5"
2+
"version": "1.9.7",
3+
"desktopSrcHash": "bUzIIPNVgK2whQJoEZOaoa+jsJx4No+xji6hXK6wxFY=",
4+
"desktopYarnHash": "1n9dqpvq31k94mx5s1dgqavaxdd0jrzcwdx106c5dnq6xnxs941p",
5+
"webHash": "1fx1nznqbwvs84kpc239ms9kpzy9p72hrz3qqbzay8p9x4gc1ws3"
66
}

‎pkgs/applications/networking/instant-messengers/schildichat/pin.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"version": "1.9.0-sc.1",
3-
"srcHash": "10swz5gwz1izryzllmjm8mhhd0vqk2cp8qjcmmr5gbzspj7p3xgw",
4-
"webYarnHash": "134llyh0197andpnbmfcxnidcgi3xxnb9v10bwfvrqysgnhb5z8v",
5-
"desktopYarnHash": "150jc6p9kbdz599bdkinrhbhncpamhz35j6rcc008qxg2d9qfhwr"
2+
"version": "1.9.7-sc.1",
3+
"srcHash": "0qrjjwcxa141phsgdz325rrkfmjqdmxc3h917cs9c9kf6cblkxaq",
4+
"webYarnHash": "19c594pql2yz1z15phfdlkwcvrcbm8k058fcq7p0k6840dhif5fd",
5+
"desktopYarnHash": "058ihkljb1swjzvgf8gqci5ghvwapmpcf2bsab3yr66lhps7fhci"
66
}

‎pkgs/applications/networking/instant-messengers/signald/default.nix‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
{ lib, stdenv, fetchurl, fetchFromGitLab, jre_headless, coreutils, gradle_6, git, perl
2-
, makeWrapper }:
2+
, makeWrapper, fetchpatch
3+
}:
34

45
let
56
pname = "signald";
67
version = "0.14.1";
78

9+
log4j-update-cve-2021-44228 = fetchpatch {
10+
url = "https://gitlab.com/signald/signald/-/commit/7f668062ab9ffa09a49d171e995f57cf0a0803a7.patch";
11+
sha256 = "sha256-504je6hKciUGelVCGZjxGjHi1qZQaovagXD5PBQP+mM=";
12+
};
13+
814
src = fetchFromGitLab {
915
owner = pname;
1016
repo = pname;
@@ -26,6 +32,7 @@ let
2632
deps = stdenv.mkDerivation {
2733
name = "${pname}-deps";
2834
inherit src version postPatch;
35+
patches = [ log4j-update-cve-2021-44228 ];
2936
nativeBuildInputs = [ gradle_6 perl ];
3037
buildPhase = ''
3138
export GRADLE_USER_HOME=$(mktemp -d)
@@ -43,15 +50,18 @@ let
4350
outputHashMode = "recursive";
4451
# Downloaded jars differ by platform
4552
outputHash = {
46-
x86_64-linux = "/gJFoT+vvdSWr33oI44XiZXlFfyUjtRVB1M6CMzSztM=";
47-
aarch64-linux = "v71stMWBbNALasfGAHvsVTBaDOZfpKK3sQrjNJ6FG1A=";
53+
x86_64-linux = "sha256-Tn0x5MJJMe04Du+eFGAkdvh/7Sgb7pf2FtBiRyCvjo8=";
54+
aarch64-linux = "sha256-T/Cj/QxlW48xW6l+O3K4fFA19fulOB8nk9dRoiP1sys=";
4855
}.${stdenv.system} or (throw "Unsupported platform");
4956
};
5057

5158
in stdenv.mkDerivation rec {
5259
inherit pname src version postPatch;
5360

54-
patches = [ ./gradle-plugin.patch ];
61+
patches = [
62+
./gradle-plugin.patch
63+
log4j-update-cve-2021-44228
64+
];
5565

5666
buildPhase = ''
5767
runHook preBuild

‎pkgs/applications/science/logic/why3/with-provers.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ stdenv.mkDerivation {
1717
nativeBuildInputs = [ makeWrapper ];
1818
buildInputs = [ why3 ] ++ provers;
1919

20+
dontUnpack = true;
21+
2022
buildPhase = ''
2123
mkdir -p $out/share/why3/
22-
why3 config --detect-provers -C $out/share/why3/why3.conf
24+
why3 config detect -C $out/share/why3/why3.conf
2325
awk -i inplace -f ${configAwkScript} $out/share/why3/why3.conf
2426
'';
2527

‎pkgs/applications/terminal-emulators/foot/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
}:
2828

2929
let
30-
version = "1.10.2";
30+
version = "1.10.3";
3131

3232
# build stimuli file for PGO build and the script to generate it
3333
# independently of the foot's build, so we can cache the result
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
9999
owner = "dnkl";
100100
repo = pname;
101101
rev = version;
102-
sha256 = "00096c2m8pn4gpafvmg9lhyprwgnsis62bq4qmagnbb49bj5kr9v";
102+
sha256 = "13v6xqaw3xn1x84dn4gnkiimcsllb19mrbvcdj2fnm8klnrys3gs";
103103
};
104104

105105
depsBuildBuild = [

‎pkgs/development/libraries/olm/default.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
stdenv.mkDerivation rec {
44
pname = "olm";
5-
version = "3.2.6";
5+
version = "3.2.8";
66

77
src = fetchFromGitLab {
88
domain = "gitlab.matrix.org";
99
owner = "matrix-org";
1010
repo = pname;
1111
rev = version;
12-
sha256 = "1srmw36nxi0z2y5d9adks09p950qm0fscbnrq1fl37fdypvjl1sk";
12+
sha256 = "1jfhydfcnqpksb2bhi960v3h10prf4v5gx42mm2rp6p0jfbqcy50";
1313
};
1414

1515
nativeBuildInputs = [ cmake ];

‎pkgs/development/tools/ocaml/camlp4/default.nix‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ lib, stdenv, fetchzip, which, ocaml, ocamlbuild }:
22

3-
if lib.versionAtLeast ocaml.version "4.09"
3+
if lib.versionAtLeast ocaml.version "4.14"
44
then throw "camlp4 is not available for OCaml ${ocaml.version}"
55
else
66

@@ -26,6 +26,21 @@ let param = {
2626
"4.08" = {
2727
version = "4.08+1";
2828
sha256 = "0qplawvxwai25bi27niw2cgz2al01kcnkj8wxwhxslpi21z6pyx1"; };
29+
"4.09" = {
30+
version = "4.09+1";
31+
sha256 = "1gr33x6xs1rs0bpyq4vzyfxd6vn47jfkg8imi81db2r0cbs0kxx1"; };
32+
"4.10" = {
33+
version = "4.10+1";
34+
sha256 = "093bc1c28wid5li0jwglnd4p3csxw09fmbs9ffybq2z41a5mgay6"; };
35+
"4.11" = {
36+
version = "4.11+1";
37+
sha256 = "0sn7f6im940qh0ixmx1k738xrwwdvy9g7r19bv5218jb6mh0g068"; };
38+
"4.12" = {
39+
version = "4.12+1";
40+
sha256 = "1cfk5ppnd511vzsr9gc0grxbafmh0m3m897aij198rppzxps5kyz"; };
41+
"4.13" = {
42+
version = "4.13+1";
43+
sha256 = "0fzxa1zdhk74mlxpin7p90flks6sp4gkc0mfclmj9zak15rii55n"; };
2944
}.${ocaml.meta.branch};
3045
in
3146

0 commit comments

Comments
 (0)