nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 13:30:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge staging-next-23.05 into staging-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-10-28 00:12:51 +00:00
committed by GitHub
parent 664770c36b 1adeb32e82
commit ceed079145
8 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/web-servers/nginx/default.nix
View File

@@ -35,6 +35,7 @@ let
compressMimeTypes = [
"application/atom+xml"
"application/geo+json"
"application/javascript" # Deprecated by IETF RFC 9239, but still widely used
"application/json"
"application/ld+json"
"application/manifest+json"

4
pkgs/applications/networking/browsers/mullvad-browser/default.nix
View File

@@ -78,7 +78,7 @@ let
++ lib.optionals mediaSupport [ ffmpeg ]
);
version = "13.0";
version = "13.0.1";
sources = {
x86_64-linux = fetchurl {
@@ -90,7 +90,7 @@ let
"https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
];
hash = "sha256-YtkGgSnQVJ9wtamDOtLROufhPJ9KizV8j5kK26iJ+ZY=";
hash = "sha256-VYkRHWyTAAt5P7jnNuf4s2bOv36LuqcTMMKOLRGE9FQ=";
};
};

6
pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
View File

@@ -86,7 +86,7 @@ lib.warnIf (useHardenedMalloc != null)
ffmpeg
];
version = "13.0";
version = "13.0.1";
sources = {
x86_64-linux = fetchurl {
@@ -96,7 +96,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
];
hash = "sha256-zdmPbmJo5FDoOjob+9TDCvCgKgLHvLi3bOMhcZg8DVM=";
hash = "sha256-ORa973US2VY9Can4Nr35YSpZrYGqBP4I/S/ulsbRJLc=";
};
i686-linux = fetchurl {
@@ -106,7 +106,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
];
hash = "sha256-Hlvx2C4DF/wcHo9ES+g9UUgNFGDokW5OAX3FeOvR+fY=";
hash = "sha256-OBUleXLTNFG+aFuftnphgBtQCfyoIWDcoVFs5elJ0tA=";
};
};

12
pkgs/applications/networking/instant-messengers/armcord/default.nix
View File

@@ -20,7 +20,6 @@
, glib
, gtk3
, libappindicator-gtk3
, libdbusmenu
, libdrm
, libnotify
, libpulseaudio
@@ -39,7 +38,7 @@
stdenv.mkDerivation rec {
pname = "armcord";
version = "3.2.4";
version = "3.2.5";
src =
let
@@ -47,12 +46,12 @@ stdenv.mkDerivation rec {
in
{
x86_64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_amd64.deb";
hash = "sha256-IUHcDHIJeGx7QKjxl3fUFHqUfs1JdIFxesvDXt3mVw0=";
url = "${base}/v${version}/ArmCord_${builtins.head (lib.splitString "-" version)}_amd64.deb";
hash = "sha256-6zlYm4xuYpG+Bgsq5S+B/Zt9TRB2GZnueKAg2ywYLE4=";
};
aarch64-linux = fetchurl {
url = "${base}/v${version}/ArmCord_${version}_arm64.deb";
hash = "sha256-TWVlEjakdRyZmOuBq9HLO+R7y5jmgstFtyEHjf8nxxM=";
url = "${base}/v${version}/ArmCord_${builtins.head (lib.splitString "-" version)}_arm64.deb";
hash = "sha256-HJu1lRa3zOTohsPMe23puHxg1VMWNR2aOjDQJqc4TqE=";
};
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -137,6 +136,5 @@ stdenv.mkDerivation rec {
license = licenses.osl3;
maintainers = with maintainers; [ ludovicopiero wrmilling ];
platforms = [ "x86_64-linux" "aarch64-linux" ];
knownVulnerabilities = [ "CVE-2023-4863" ];
};
}

10
pkgs/applications/virtualization/open-vm-tools/default.nix
View File

@@ -1,5 +1,6 @@
{ stdenv
, lib
, fetchpatch
, fetchFromGitHub
, makeWrapper
, autoreconfHook
@@ -90,6 +91,15 @@ stdenv.mkDerivation rec {
libXtst
];
patches = [
(fetchpatch {
name = "CVE-2023-34058.patch";
url = "https://raw.githubusercontent.com/vmware/open-vm-tools/CVE-2023-34058.patch/CVE-2023-34058.patch";
hash = "sha256-KC99LzGcWTXUhtOLQ6UbqxGJ+0Uj4QLWyuRYeGle3a4=";
stripLen = 1;
})
];
postPatch = ''
sed -i Makefile.am \
-e 's,etc/vmware-tools,''${prefix}/etc/vmware-tools,'

4
pkgs/development/tools/continuous-integration/github-runner/default.nix
View File

@@ -17,13 +17,13 @@
}:
buildDotnetModule rec {
pname = "github-runner";
version = "2.310.2";
version = "2.311.0";
src = fetchFromGitHub {
owner = "actions";
repo = "runner";
rev = "v${version}";
hash = "sha256-cOHA4VjccIJmCgCxRrBFzBFnh4SGQ3LpcTvtGuogHQU=";
hash = "sha256-71SwPuX1XZygT/TdAHECudxFxsQuXrl/tcAYVAxfxfI=";
leaveDotGit = true;
postFetch = ''
git -C $out rev-parse --short HEAD > $out/.git-revision

8
pkgs/misc/vencord/default.nix
View File

@@ -5,8 +5,8 @@
, buildWebExtension ? false
}:
let
version = "1.5.8";
gitHash = "544edce";
version = "1.6.0";
gitHash = "ffe6bb1";
in
buildNpmPackage rec {
pname = "vencord";
@@ -16,7 +16,7 @@ buildNpmPackage rec {
owner = "Vendicated";
repo = "Vencord";
rev = "v${version}";
hash = "sha256-cJ+8CKCET7Z2MebyrW5OQr50tvbDM3mkvEQQm3zSbdU=";
hash = "sha256-t4+8ybPzqcCtTSukBBgvbD7HiKG4K51WPVnJg0RQbs8=";
};
ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: {
@@ -34,7 +34,7 @@ buildNpmPackage rec {
npmRebuildFlags = [ "|| true" ];
makeCacheWritable = true;
npmDepsHash = "sha256-JeJjjrCfJMuxP9sVVkKJQ7bRCGu0jbGfiw78jS0r2Sg=";
npmDepsHash = "sha256-H2f6xdAa7fNETbQhIv+InCB7+O4nq0bx+RILjGjqXdY=";
npmFlags = [ "--legacy-peer-deps" ];
npmBuildScript = if buildWebExtension then "buildWeb" else "build";
npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];

33
pkgs/misc/vencord/package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "vencord",
"version": "1.5.8",
"version": "1.6.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "vencord",
"version": "1.5.8",
"version": "1.6.0",
"license": "GPL-3.0-or-later",
"dependencies": {
"@sapphi-red/web-noise-suppressor": "0.3.3",
@@ -694,9 +694,9 @@
}
},
"node_modules/@eslint-community/regexpp": {
"version": "4.9.1",
"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.9.1.tgz",
"integrity": "sha512-Y27x+MBLjXa+0JWDhykM3+JE+il3kHKAEqabfEWq3SDhZjLYb6/BHL/JKFnH3fe207JaXkyDo685Oc2Glt6ifA==",
"version": "4.10.0",
"resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz",
"integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==",
"dev": true,
"engines": {
"node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -893,10 +893,13 @@
"dev": true
},
"node_modules/@types/node": {
"version": "18.18.6",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.6.tgz",
"integrity": "sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w==",
"dev": true
"version": "18.18.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.7.tgz",
"integrity": "sha512-bw+lEsxis6eqJYW8Ql6+yTqkE6RuFtsQPSe5JxXbqYRFQEER5aJA9a5UH9igqDWm3X4iLHIKOHlnAXLM4mi7uQ==",
"dev": true,
"dependencies": {
"undici-types": "~5.26.4"
}
},
"node_modules/@types/normalize-package-data": {
"version": "2.4.3",
@@ -911,9 +914,9 @@
"dev": true
},
"node_modules/@types/react": {
"version": "18.2.31",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.31.tgz",
"integrity": "sha512-c2UnPv548q+5DFh03y8lEDeMfDwBn9G3dRwfkrxQMo/dOtRHUUO57k6pHvBIfH/VF4Nh+98mZ5aaSe+2echD5g==",
"version": "18.2.33",
"resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.33.tgz",
"integrity": "sha512-v+I7S+hu3PIBoVkKGpSYYpiBT1ijqEzWpzQD62/jm4K74hPpSP7FF9BnKG6+fg2+62weJYkkBWDJlZt5JO/9hg==",
"dev": true,
"dependencies": {
"@types/prop-types": "*",
@@ -5549,6 +5552,12 @@
"through": "^2.3.8"
}
},
"node_modules/undici-types": {
"version": "5.26.5",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
"dev": true
},
"node_modules/union-value": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",