nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 18:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge release-23.05 into staging-next-23.05

Browse Source
This commit is contained in:
github-actions[bot]
2023-11-02 00:12:52 +00:00
committed by GitHub
parent f7f8802b6b 9eb24edd6a
commit a0cded2e62
12 changed files with 49 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/tests/filesystem.sh
View File

@@ -64,8 +64,14 @@ expectSuccess "pathType $PWD/directory" '"directory"'
expectSuccess "pathType $PWD/regular" '"regular"'
expectSuccess "pathType $PWD/symlink" '"symlink"'
expectSuccess "pathType $PWD/fifo" '"unknown"'
# Different errors depending on whether the builtins.readFilePath primop is available or not
expectFailure "pathType $PWD/non-existent" "error: (evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'|getting status of '$PWD/non-existent': No such file or directory)"
# Only check error message when a Nixpkgs-specified error is thrown,
# which is only the case when `readFileType` is not available
# and the fallback implementation needs to be used.
if [[ "$(nix-instantiate --eval --expr 'builtins ? readFileType')" == false ]]; then
expectFailure "pathType $PWD/non-existent" \
"error: evaluation aborted with the following error message: 'lib.filesystem.pathType: Path $PWD/non-existent does not exist.'"
fi
expectSuccess "pathIsDirectory /." "true"
expectSuccess "pathIsDirectory $PWD/directory" "true"

4
pkgs/applications/editors/vscode/extensions/default.nix
View File

@@ -2854,8 +2854,8 @@ let
mktplcRef = {
name = "svelte-vscode";
publisher = "svelte";
version = "107.4.3";
sha256 = "sha256-z1foIJXVKmJ0G4FfO9xsjiQgmq/ZtoB3b6Ch8Nyj1zY=";
version = "107.12.0";
sha256 = "036ri011fd0cf91iwv59j57m05mxliy27ms4di2y9jlk7jzmr4s2";
};
meta = {
changelog = "https://github.com/sveltejs/language-tools/releases";

12
pkgs/applications/networking/browsers/microsoft-edge/default.nix
View File

@@ -1,20 +1,20 @@
{
stable = import ./browser.nix {
channel = "stable";
version = "118.0.2088.46";
version = "118.0.2088.76";
revision = "1";
sha256 = "sha256-/3lo/y/LhAmGqiOhZgDoJVS+c2631NB/Z/lBNFunU30=";
sha256 = "sha256-cd8W/0UZi+NhPSILR8e8aOLxy6ra+0DVwRowo2jG8DA=";
};
beta = import ./browser.nix {
channel = "beta";
version = "118.0.2088.46";
version = "119.0.2151.32";
revision = "1";
sha256 = "sha256-u0w7COYoAgcpqVEsB0t27iMD2AGVYFCJyE72uWKIY70=";
sha256 = "sha256-tsDFUKZDiusr/fGO5NMRqzTDIF+MTgC/1gJu95wXwAw=";
};
dev = import ./browser.nix {
channel = "dev";
version = "119.0.2151.2";
version = "120.0.2172.1";
revision = "1";
sha256 = "sha256-42wbnA9i1FdBq14Y+xxstAe9ciWDzEBVMULCSURQzj0=";
sha256 = "sha256-EvTS0AO3/A8Ut9H36mMOnS9PRR062WAoas9/Pd90NBM=";
};
}

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

@@ -98,6 +98,13 @@ stdenv.mkDerivation rec {
hash = "sha256-KC99LzGcWTXUhtOLQ6UbqxGJ+0Uj4QLWyuRYeGle3a4=";
stripLen = 1;
})
(fetchpatch {
name = "CVE-2023-34059.patch";
url = "https://raw.githubusercontent.com/vmware/open-vm-tools/CVE-2023-34059.patch/CVE-2023-34059.patch";
hash = "sha256-RMQh1DyVdNlHbhUb9oGGUX0a2r6fUWN5urr0HlMlm2c=";
stripLen = 1;
})
];
postPatch = ''

15
pkgs/tools/networking/yggdrasil/default.nix → pkgs/by-name/yg/yggdrasil/package.nix
View File

@@ -2,28 +2,25 @@
buildGoModule rec {
pname = "yggdrasil";
version = "0.4.7";
version = "0.5.1";
src = fetchFromGitHub {
owner = "yggdrasil-network";
repo = "yggdrasil-go";
rev = "v${version}";
sha256 = "sha256-01ciAutRIn4DmqlvDTXhRiuZHTtF8b6js7SUrLOjtAY=";
sha256 = "sha256-JeeOT3fb+4+eUyWl7rAXa5+Yf1XCT20xJeCdhBC0oeo=";
};
vendorSha256 = "sha256-hwDi59Yp92eMDqA8OD56nxsKSX2ngxs0lYdmEMLX+Oc=";
# Change the default location of the management socket on Linux
# systems so that the yggdrasil system service unit does not have to
# be granted write permission to /run.
patches = [ ./change-runtime-dir.patch ];
vendorHash = "sha256-yu725RgKDRmpNFNuffBFKZjZOFyzt00kKGuz696JHk0=";
subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ];
ldflags = [
"-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}"
"-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}"
"-s" "-w"
"-X github.com/yggdrasil-network/yggdrasil-go/src/config.defaultAdminListen=unix:///var/run/yggdrasil/yggdrasil.sock"
"-s"
"-w"
];
passthru.tests.basic = nixosTests.yggdrasil;

4
pkgs/development/python-modules/pyramid/default.nix
View File

@@ -18,14 +18,14 @@
buildPythonPackage rec {
pname = "pyramid";
version = "2.0.1";
version = "2.0.2";
format = "setuptools";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
hash = "sha256-+r/XRQOeJq1bCRX8OW6HJcD4o9F7lB+WEezR7XbP59o=";
hash = "sha256-NyE4pzjkIWU1zHbczm7d1aGqypUTDyNU+4NCZMBvGN4=";
};
propagatedBuildInputs = [

4
pkgs/development/tools/misc/strace/default.nix
View File

@@ -2,11 +2,11 @@
stdenv.mkDerivation rec {
pname = "strace";
version = "6.5";
version = "6.6";
src = fetchurl {
url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
sha256 = "sha256-37BRcCOJ4ZeaFRiStZAa/J6Tu8HHDYTJBq3jIkypGYA=";
sha256 = "sha256-QhtBhsBrcFFj5k3IXycevc9nZgr4ZnKDFH1ehZ/IqWw=";
};
depsBuildBuild = [ buildPackages.stdenv.cc ];

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

@@ -5,8 +5,8 @@
, buildWebExtension ? false
}:
let
version = "1.6.1";
gitHash = "a9e67e2";
version = "1.6.2";
gitHash = "dd61b0c";
in
buildNpmPackage rec {
pname = "vencord";
@@ -16,7 +16,7 @@ buildNpmPackage rec {
owner = "Vendicated";
repo = "Vencord";
rev = "v${version}";
hash = "sha256-t4+8ybPzqcCtTSukBBgvbD7HiKG4K51WPVnJg0RQbs8=";
hash = "sha256-AqyUnDMIASJ/kUTeICdN94W5U0E52RFs6hM2/E8AjXI=";
};
ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: {
@@ -34,7 +34,7 @@ buildNpmPackage rec {
npmRebuildFlags = [ "|| true" ];
makeCacheWritable = true;
npmDepsHash = "sha256-PWasfMX75emOwOtHd4FrVA6TDfFcOowXsAxgZqMsgP8=";
npmDepsHash = "sha256-RzOv8LekJqX0C/AjC5ONkfkMK36bAGWFxyM9Akn1CIg=";
npmFlags = [ "--legacy-peer-deps" ];
npmBuildScript = if buildWebExtension then "buildWeb" else "build";
npmBuildFlags = [ "--" "--standalone" "--disable-updater" ];

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

@@ -1,12 +1,12 @@
{
"name": "vencord",
"version": "1.6.1",
"version": "1.6.2",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "vencord",
"version": "1.6.1",
"version": "1.6.2",
"license": "GPL-3.0-or-later",
"dependencies": {
"@sapphi-red/web-noise-suppressor": "0.3.3",
@@ -893,9 +893,9 @@
"dev": true
},
"node_modules/@types/node": {
"version": "18.18.7",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.7.tgz",
"integrity": "sha512-bw+lEsxis6eqJYW8Ql6+yTqkE6RuFtsQPSe5JxXbqYRFQEER5aJA9a5UH9igqDWm3X4iLHIKOHlnAXLM4mi7uQ==",
"version": "18.18.8",
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.8.tgz",
"integrity": "sha512-OLGBaaK5V3VRBS1bAkMVP2/W9B+H8meUfl866OrMNQqt7wDgdpWPp5o6gmIc9pB+lIQHSq4ZL8ypeH1vPxcPaQ==",
"dev": true,
"dependencies": {
"undici-types": "~5.26.4"
@@ -4169,9 +4169,9 @@
}
},
"node_modules/punycode": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
"integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
"version": "2.3.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
"integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
"dev": true,
"engines": {
"node": ">=6"

8
pkgs/os-specific/linux/kernel/xanmod-kernels.nix
View File

@@ -3,14 +3,14 @@
let
# These names are how they are designated in https://xanmod.org.
ltsVariant = {
version = "6.1.58";
hash = "sha256-Lnp1CSh1jLbIkEx9hLfxhdIA12iQZmywhOec9uZ7UjI=";
version = "6.1.60";
hash = "sha256-KYCeONJxyFPee4pvBLRw/MBTzPU7D2oZCrAVr3t/yPM=";
variant = "lts";
};
mainVariant = {
version = "6.5.8";
hash = "sha256-lHi+O7RE6YdiqPmuxHajGkc7jS9F5cB89+JbTVKkB/c=";
version = "6.5.9";
hash = "sha256-5SFPBsDTmq7tA6pyM7rbIjBPAtPbqhUl6VfA2z5baPA=";
variant = "main";
};

12
pkgs/tools/networking/yggdrasil/change-runtime-dir.patch
View File

@@ -1,12 +0,0 @@
diff -ruN a/src/defaults/defaults_linux.go b/src/defaults/defaults_linux.go
--- a/src/defaults/defaults_linux.go 2019-06-17 10:23:09.495613784 -0700
+++ b/src/defaults/defaults_linux.go 2019-07-01 10:17:11.295669440 -0700
@@ -7,7 +7,7 @@
func GetDefaults() platformDefaultParameters {
return platformDefaultParameters{
// Admin
- DefaultAdminListen: "unix:///var/run/yggdrasil.sock",
+ DefaultAdminListen: "unix:///var/run/yggdrasil/yggdrasil.sock",
// Configuration (used for yggdrasilctl)
DefaultConfigFile: "/etc/yggdrasil.conf",

2
pkgs/top-level/all-packages.nix
View File

@@ -29199,8 +29199,6 @@ with pkgs;
appvm = callPackage ../applications/virtualization/appvm { };
yggdrasil = callPackage ../tools/networking/yggdrasil { };
masterpdfeditor = libsForQt5.callPackage ../applications/misc/masterpdfeditor { };
masterpdfeditor4 = libsForQt5.callPackage ../applications/misc/masterpdfeditor4 { };