nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-28 02:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-21.05 into staging-21.05

Browse Source
This commit is contained in:
github-actions[bot]
2021-12-16 00:09:00 +00:00
committed by GitHub
parent 149feb6f51 e2add42dd6
commit 63ae862d80
10 changed files with 462 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/barrier/default.nix
View File

@@ -5,13 +5,13 @@
mkDerivation rec {
pname = "barrier";
version = "2.3.3";
version = "2.4.0";
src = fetchFromGitHub {
owner = "debauchee";
repo = pname;
rev = "v${version}";
sha256 = "11vqkzpcjiv3pq6ps022223j6skgm1d23dj18n4a5nsf53wsvvp4";
sha256 = "sha256-2tHqLF3zS3C4UnOVIZfpcuzaemC9++nC7lXgFnFSfKU=";
fetchSubmodules = true;
};

10
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@@ -44,9 +44,9 @@
}
},
"ungoogled-chromium": {
"version": "96.0.4664.93",
"sha256": "14rlm91pzpdll6x2r1sxdswiv19h1ykxcq0csi9k9g0a9s71yyvw",
"sha256bin64": "15233njj6ln7q3c112ssfh9s4m3shhp920zw8648z9dr7k8512qb",
"version": "96.0.4664.110",
"sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n",
"sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb",
"deps": {
"gn": {
"version": "2021-09-24",
@@ -55,8 +55,8 @@
"sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi"
},
"ungoogled-patches": {
"rev": "96.0.4664.93-1",
"sha256": "0r8cwriaxbmzy9sxa6mx71h8n1a0x7pdx3kmqc1sg97b2qwmg15r"
"rev": "96.0.4664.110-1",
"sha256": "098mfcd1lr2hhlic0i1l5gxsq71axvqnn4gayr4r9j6nbj9byf4h"
}
}
}

786
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View File

File diff suppressed because it is too large Load Diff

6
pkgs/applications/networking/instant-messengers/element/element-desktop-package.json
View File

@@ -2,7 +2,7 @@
"name": "element-desktop",
"productName": "Element",
"main": "lib/electron-main.js",
"version": "1.9.2",
"version": "1.9.7",
"description": "A feature-rich client for Matrix.org",
"author": "Element",
"repository": {
@@ -54,7 +54,7 @@
"@types/minimist": "^1.2.1",
"@typescript-eslint/eslint-plugin": "^4.17.0",
"@typescript-eslint/parser": "^4.17.0",
"allchange": "^1.0.2",
"allchange": "^1.0.6",
"asar": "^2.0.1",
"chokidar": "^3.5.2",
"electron": "13.5",
@@ -83,7 +83,7 @@
},
"build": {
"appId": "im.riot.app",
"electronVersion": "13.5.1",
"electronVersion": "13.5.2",
"files": [
"package.json",
{

56
pkgs/applications/networking/instant-messengers/element/element-desktop-yarndeps.nix
View File

@@ -146,11 +146,11 @@
};
}
{
name = "_electron_get___get_1.13.0.tgz";
name = "_electron_get___get_1.13.1.tgz";
path = fetchurl {
name = "_electron_get___get_1.13.0.tgz";
url = "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz";
sha1 = "95c6bcaff4f9a505ea46792424f451efea89228c";
name = "_electron_get___get_1.13.1.tgz";
url = "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz";
sha1 = "42a0aa62fd1189638bd966e23effaebb16108368";
};
}
{
@@ -730,11 +730,11 @@
};
}
{
name = "_types_node___node_14.17.21.tgz";
name = "_types_node___node_14.18.0.tgz";
path = fetchurl {
name = "_types_node___node_14.17.21.tgz";
url = "https://registry.yarnpkg.com/@types/node/-/node-14.17.21.tgz";
sha1 = "6359d8cf73481e312a43886fa50afc70ce5592c6";
name = "_types_node___node_14.18.0.tgz";
url = "https://registry.yarnpkg.com/@types/node/-/node-14.18.0.tgz";
sha1 = "98df2397f6936bfbff4f089e40e06fa5dd88d32a";
};
}
{
@@ -898,11 +898,11 @@
};
}
{
name = "allchange___allchange_1.0.3.tgz";
name = "allchange___allchange_1.0.6.tgz";
path = fetchurl {
name = "allchange___allchange_1.0.3.tgz";
url = "https://registry.yarnpkg.com/allchange/-/allchange-1.0.3.tgz";
sha1 = "f8814ddfbcfe39a01bf4570778ee7e6d9ff0ebb3";
name = "allchange___allchange_1.0.6.tgz";
url = "https://registry.yarnpkg.com/allchange/-/allchange-1.0.6.tgz";
sha1 = "f905918255541dc92d6a1f5cdf758db4597f569c";
};
}
{
@@ -1633,14 +1633,6 @@
sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e";
};
}
{
name = "core_js___core_js_3.18.2.tgz";
path = fetchurl {
name = "core_js___core_js_3.18.2.tgz";
url = "https://registry.yarnpkg.com/core-js/-/core-js-3.18.2.tgz";
sha1 = "63a551e8a29f305cd4123754846e65896619ba5b";
};
}
{
name = "core_util_is___core_util_is_1.0.2.tgz";
path = fetchurl {
@@ -1769,6 +1761,14 @@
sha1 = "72580b7e9145fb39b6676f9c5e5fb100b934179a";
};
}
{
name = "debug___debug_4.3.3.tgz";
path = fetchurl {
name = "debug___debug_4.3.3.tgz";
url = "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz";
sha1 = "04266e0b70a98d4462e6e288e38259213332b664";
};
}
{
name = "decompress_response___decompress_response_3.3.0.tgz";
path = fetchurl {
@@ -2010,11 +2010,11 @@
};
}
{
name = "electron___electron_13.5.1.tgz";
name = "electron___electron_13.5.2.tgz";
path = fetchurl {
name = "electron___electron_13.5.1.tgz";
url = "https://registry.yarnpkg.com/electron/-/electron-13.5.1.tgz";
sha1 = "76c02c39be228532f886a170b472cbd3d93f0d0f";
name = "electron___electron_13.5.2.tgz";
url = "https://registry.yarnpkg.com/electron/-/electron-13.5.2.tgz";
sha1 = "5c5826e58a5e12bb5ca8047b789d07b45260ecbc";
};
}
{
@@ -2618,11 +2618,11 @@
};
}
{
name = "global_agent___global_agent_2.2.0.tgz";
name = "global_agent___global_agent_3.0.0.tgz";
path = fetchurl {
name = "global_agent___global_agent_2.2.0.tgz";
url = "https://registry.yarnpkg.com/global-agent/-/global-agent-2.2.0.tgz";
sha1 = "566331b0646e6bf79429a16877685c4a1fbf76dc";
name = "global_agent___global_agent_3.0.0.tgz";
url = "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz";
sha1 = "ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6";
};
}
{

4
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@@ -19,12 +19,12 @@
let
executableName = "element-desktop";
version = "1.9.2";
version = "1.9.7";
src = fetchFromGitHub {
owner = "vector-im";
repo = "element-desktop";
rev = "v${version}";
sha256 = "sha256-F1uyyBbs+U7tQzRtn+p923Z/BY8Nwxr/JTMYwsak8W8=";
sha256 = "sha256-bUzIIPNVgK2whQJoEZOaoa+jsJx4No+xji6hXK6wxFY=";
};
in mkYarnPackage rec {
name = "element-desktop-${version}";

4
pkgs/applications/networking/instant-messengers/element/element-web.nix
View File

@@ -12,11 +12,11 @@ let
in stdenv.mkDerivation rec {
pname = "element-web";
version = "1.9.2";
version = "1.9.7";
src = fetchurl {
url = "https://github.com/vector-im/element-web/releases/download/v${version}/element-v${version}.tar.gz";
sha256 = "sha256-Qkn0vyZGvBAeOfTzxydWzjFQJwY39INAhwZNX4xsM7U=";
sha256 = "sha256-Q/PAHunpIq/+wnj8DMW5yf87k65pCHYnQXrzhe23obs=";
};
installPhase = ''

4
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
View File

@@ -359,14 +359,16 @@ if [ "$action" = edit ]; then
exit 1
fi
ORIGIN_PWD="$PWD"
tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60"
cd "$tmpDir"
cleanup() {
for ctrl in "$tmpDir"/ssh-*; do
ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true
done
cd "$ORIGIN_PWD"
rm -rf "$tmpDir"
}
trap cleanup EXIT

19
pkgs/servers/x11/xorg/overrides.nix
View File

@@ -627,11 +627,30 @@ self: super:
];
postInstall = ":"; # prevent infinite recursion
});
fpgit = commit: sha256: name: fetchpatch (
{
url = "https://gitlab.freedesktop.org/xorg/xserver/-/commit/${commit}.diff";
inherit sha256;
} // lib.optionalAttrs (name != null) {
name = name + ".patch";
}
);
in
if (!isDarwin)
then {
outputs = [ "out" "dev" ];
patches = [
# https://lists.x.org/archives/xorg-announce/2021-December/003122.html
(fpgit "ebce7e2d80e7c80e1dda60f2f0bc886f1106ba60"
"sNi16FqN4rS4s8j5+PUVeOQBasccCkB5KvywP7xl28M=" "CVE-2021-4008")
(fpgit "b5196750099ae6ae582e1f46bd0a6dad29550e02"
"5hgzQXBBaJfhSTa9hs8K2N1fQ6+Vp8TTkertmQhkw8Y=" "CVE-2021-4009")
(fpgit "6c4c53010772e3cb4cb8acd54950c8eec9c00d21"
"1gGG9RpjLMi7Emwh13/z5CN1+ISLsPL3hJXP5gQcNkE=" "CVE-2021-4010")
(fpgit "e56f61c79fc3cee26d83cda0f84ae56d5979f768"
"e1KgSXGwwI3GgcYeWaF3KHPmkE4tf9VTqvfTYqRpysY=" "CVE-2021-4011")
# The build process tries to create the specified logdir when building.
#
# We set it to /var/log which can't be touched from inside the sandbox causing the build to hard-fail

6
pkgs/top-level/php-packages.nix
View File

@@ -235,7 +235,11 @@ lib.makeScope pkgs.newScope (self: with self; {
(dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}")
internalDeps}
'';
checkPhase = "runHook preCheck; NO_INTERACTON=yes make test; runHook postCheck";
checkPhase = ''
runHook preCheck
NO_INTERACTON=yes SKIP_PERF_SENSITIVE=yes make test
runHook postCheck
'';
outputs = [ "out" "dev" ];
installPhase = ''
mkdir -p $out/lib/php/extensions