1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00

Merge master into staging-next

This commit is contained in:
github-actions[bot] 2024-11-11 06:05:02 +00:00 committed by GitHub
commit 0958e34289
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
31 changed files with 258 additions and 132 deletions

View file

@ -18665,6 +18665,12 @@
githubId = 82817;
name = "Robert Kreuzer";
};
rksm = {
email = "robert@kra.hn";
github = "rksm";
githubId = 467450;
name = "Robert Krahn";
};
rlupton20 = {
email = "richard.lupton@gmail.com";
github = "rlupton20";

View file

@ -109,6 +109,8 @@ stdenv.mkDerivation (finalAttrs: {
env.CFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-D_DARWIN_C_SOURCE";
env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv";
patchPhase = lib.optionalString stdenv.cc.isClang ''
runHook prePatch

View file

@ -175,7 +175,6 @@ stdenv.mkDerivation rec {
libnotify
libdbusmenu
pipewire
stdenv.cc.cc
xdg-utils
wayland
];

View file

@ -0,0 +1,13 @@
diff --git a/src/HyperionProperties.cpp b/src/HyperionProperties.cpp
index b585702..3fd308c 100644
--- a/src/HyperionProperties.cpp
+++ b/src/HyperionProperties.cpp
@@ -59,7 +59,7 @@ HyperionProperties::HyperionProperties(QWidget *parent)
signal_handler_connect(handler, "log", logger_message, this);
connect(ui->ButtonStart, &QPushButton::clicked, this, &HyperionProperties::saveSettings);
- connect(ui->AutoStart, &QCheckBox::stateChanged, this, &HyperionProperties::saveSettings);
+ connect(ui->AutoStart, &QCheckBox::checkStateChanged, this, &HyperionProperties::saveSettings);
connect(ui->ButtonStart, &QPushButton::clicked, this, &HyperionProperties::onStart);
connect(ui->ButtonStop, &QPushButton::clicked, this, &HyperionProperties::onStop);

View file

@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
patches = [ ./check-state-changed.patch ];
cmakeFlags = [
"-DOBS_SOURCE=${obs-studio.src}"
"-DGLOBAL_INSTALLATION=ON"

View file

@ -5,18 +5,18 @@
buildGoModule rec {
pname = "azure-storage-azcopy";
version = "10.26.0";
version = "10.27.0";
src = fetchFromGitHub {
owner = "Azure";
repo = "azure-storage-azcopy";
rev = "refs/tags/v${version}";
hash = "sha256-u6ngYEHqNVjz0YYkWhFnoQGCBRMHLdOzFTee8plwoDo=";
hash = "sha256-TF0vChuM3OF/YbCsP8Vg4x609Q1QgqwBNmKUdWCHHUc=";
};
subPackages = [ "." ];
vendorHash = "sha256-C8UopiCSp6qFeaDNE+w2QUKbSHALSSeV5WVo4lkLDrs=";
vendorHash = "sha256-dYIZb8sSh1Y8yllWOSsWEpiaIwcwZL2wCet3Terl0Ro=";
doCheck = false;

View file

@ -0,0 +1,20 @@
GEM
remote: https://rubygems.org/
specs:
colsole (1.0.0)
completely (0.6.3)
colsole (>= 0.8.1, < 2)
mister_bin (~> 0.7)
docopt_ng (0.7.1)
mister_bin (0.7.6)
colsole (>= 0.8.1, < 2)
docopt_ng (~> 0.7, >= 0.7.1)
PLATFORMS
ruby
DEPENDENCIES
completely
BUNDLED WITH
2.5.16

View file

@ -4,10 +4,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1l29sxy4p9jbvcihckxfsyqx98b8xwzd3hjqvdh1zxw8nv5walnp";
sha256 = "1fvf6dz2wsvjk7q24z0dm8lajq3p2l6i5ywf3mxj683rmhwq49bg";
type = "gem";
};
version = "0.8.2";
version = "1.0.0";
};
completely = {
dependencies = ["colsole" "mister_bin"];
@ -15,30 +15,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0w7cmmsp9m42c8w4j03kr98zy7x7yszw3qsm3ww600dmc0d0xd2b";
sha256 = "0ci8iza647hvc4f1cmf9mpsm3i78ysf6g6213wkyrr5jk296hjjb";
type = "gem";
};
version = "0.5.2";
version = "0.6.3";
};
docopt = {
docopt_ng = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rvlfbb7kzyagncm4zdpcjwrh682zamgf5rcf5qmj0bd6znkgy3k";
sha256 = "0rsnl5s7k2s1gl4n4dg68ssg577kf11sl4a4l2lb2fpswj718950";
type = "gem";
};
version = "0.6.1";
version = "0.7.1";
};
mister_bin = {
dependencies = ["colsole" "docopt"];
dependencies = ["colsole" "docopt_ng"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1f51zs9wjpslhdadp8yfx4ij0jj1ya92cbzqlfd2wfr19wdr2jgd";
sha256 = "0xx8cxvzcn47zsnshcllf477x4rbssrchvp76929qnsg5k9q7fas";
type = "gem";
};
version = "0.7.3";
version = "0.7.6";
};
}

View file

@ -1,6 +1,7 @@
{ lib
, bundlerApp
, bundlerUpdateScript
{
lib,
bundlerApp,
bundlerUpdateScript,
}:
bundlerApp {
@ -11,12 +12,12 @@ bundlerApp {
passthru.updateScript = bundlerUpdateScript "completely";
meta = with lib; {
meta = {
description = "Generate bash completion scripts using a simple configuration file";
homepage = "https://github.com/DannyBen/completely";
license = licenses.mit;
platforms = platforms.unix;
maintainers = with maintainers; [ zendo ];
license = lib.licenses.mit;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ zendo ];
mainProgram = "completely";
};
}

View file

@ -1,20 +1,21 @@
{ lib
, buildGoModule
, fetchFromGitHub
, stdenv
}:
buildGoModule rec {
pname = "gcsfuse";
version = "2.4.0";
version = "2.5.1";
src = fetchFromGitHub {
owner = "googlecloudplatform";
repo = "gcsfuse";
rev = "v${version}";
hash = "sha256-4susiXFe1aBcakxRkhmOe7dvcwsNfam4KKyFFzYXhcU=";
hash = "sha256-4UzRg6fNKBrTSoimJ9jURW9oPRhUOAUDMG3JaM7f100=";
};
vendorHash = "sha256-uOr929RS8q7LB+WDiyxEIyScE/brmvPJKfnq28PfsDM=";
vendorHash = "sha256-QrpILFzgUQwmrvjCdtrlgq1zSW7f82qMHsifI39WaB0=";
subPackages = [ "." "tools/mount_gcsfuse" ];
@ -41,5 +42,7 @@ buildGoModule rec {
changelog = "https://github.com/GoogleCloudPlatform/gcsfuse/releases/tag/v${version}";
license = licenses.asl20;
maintainers = [ ];
# internal/cache/file/downloader/job.go:386:77: undefined: syscall.O_DIRECT
broken = stdenv.hostPlatform.isDarwin;
};
}

View file

@ -0,0 +1,28 @@
{
lib,
fetchFromGitHub,
buildGoModule,
}:
buildGoModule rec {
pname = "kubectl-graph";
version = "0.7.0";
src = fetchFromGitHub {
owner = "steveteuber";
repo = "kubectl-graph";
rev = "v${version}";
hash = "sha256-5N1eC8J0nHEgFUCHEn5b3kUDj6MWejouQBKkdJKsaAo=";
};
vendorHash = "sha256-fvn+CoOyMRjsIemMRXitMjTlbbhjrlDIHu398b4/ZZ0=";
meta = {
description = "Kubectl plugin to visualize Kubernetes resources and relationships";
homepage = "https://github.com/steveteuber/kubectl-graph";
changelog = "https://github.com/steveteuber/kubectl-graph/releases/tag/v${version}";
mainProgram = "kubectl-graph";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.rksm ];
};
}

View file

@ -14,13 +14,13 @@
stdenv.mkDerivation rec {
pname = "libdatachannel";
version = "0.21.2";
version = "0.22.2";
src = fetchFromGitHub {
owner = "paullouisageneau";
repo = "libdatachannel";
rev = "v${version}";
hash = "sha256-3fax57oaJvOgbTDPCiiUdtsfAGhICfPkuMihawq06SA=";
hash = "sha256-ZGxv4JfJ3b0S7zacIHBlBtCbChADCQG1CfxStA1lKKE=";
};
outputs = [

View file

@ -18,7 +18,7 @@
stdenv.mkDerivation (finalAttrs: {
pname = "libnvme";
version = "1.10";
version = "1.11";
outputs = [ "out" ] ++ lib.optionals withDocs [ "man" ];
@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "linux-nvme";
repo = "libnvme";
rev = "v${finalAttrs.version}";
hash = "sha256-guNABLpDKdWDE79gxoNq0ukAUE7CnMw5QRXA3rl3Dk4=";
hash = "sha256-c7+vNUTU0J1e8aWl49C7rEbFAQZ3X53PKtv7r8CcheE=";
};
postPatch = ''

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub,
{ lib, stdenv, fetchFromGitHub, fetchpatch,
libtool, gettext, pkg-config,
vala, gnome-common, gobject-introspection,
libgee, json-glib, skkDictionaries, libxkbcommon }:
@ -14,6 +14,15 @@ stdenv.mkDerivation rec {
sha256 = "0y279pcgs3jrsi9vzx086xhz9jbz23dqqijp4agygc9ackp9sxy5";
};
patches = [
# fix parse error in default.json
# https://github.com/ueno/libskk/pull/90
(fetchpatch {
url = "https://github.com/ueno/libskk/commit/2382ebedc8dca88e745d223ad7badb8b73bbb0de.diff";
hash = "sha256-e1bKVteNjqmr40XI82Qar63LXPWYIfnUVlo5zQSkPNw=";
})
];
buildInputs = [ libxkbcommon ];
nativeBuildInputs = [ vala gnome-common gobject-introspection libtool gettext pkg-config ];
propagatedBuildInputs = [ libgee json-glib ];

View file

@ -15,13 +15,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "nix-unit";
version = "2.24.0";
version = "2.24.1";
src = fetchFromGitHub {
owner = "nix-community";
repo = "nix-unit";
rev = "v${finalAttrs.version}";
hash = "sha256-6O4Q51PSUbr/ODVbfEfAAcoRdID3fqn0lAuHERHq+h4=";
hash = "sha256-PcT0jtv2QFaht5eSs1Vq4XGDqtMLdPC49ao9uwGYclE=";
};
buildInputs = [

View file

@ -3,6 +3,7 @@
fetchFromGitHub,
python3Packages,
testers,
pyamlboot,
}:
python3Packages.buildPythonApplication rec {
@ -27,9 +28,9 @@ python3Packages.buildPythonApplication rec {
];
passthru.tests.version = testers.testVersion {
package = "pyamlboot";
package = pyamlboot;
command = "boot.py -v";
version = "boot.py ${version}";
version = "boot.py ${lib.versions.majorMinor version}";
};
meta = {

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "rapidfuzz-cpp";
version = "3.0.5";
version = "3.1.1";
src = fetchFromGitHub {
owner = "rapidfuzz";
repo = "rapidfuzz-cpp";
rev = "v${finalAttrs.version}";
hash = "sha256-8s2Jd1fI8iNmFyMbCEaGZdpqvYFB1tVNZ41ICLN4AeI=";
hash = "sha256-0ZMK9WVMflgGD4uEKp7/SvWXCByYQtPU9gSJsNEqTbM=";
};
nativeBuildInputs = [

View file

@ -0,0 +1,32 @@
{
lib,
stdenvNoCC,
fetchzip,
}:
stdenvNoCC.mkDerivation rec {
pname = "roboto-flex";
version = "3.200";
src = fetchzip {
url = "https://github.com/googlefonts/roboto-flex/releases/download/${version}/roboto-flex-fonts.zip";
stripRoot = false;
hash = "sha256-p8BvE4f6zQLygl49hzYTXXVQFZEJjrlfUvjNW+miar4=";
};
installPhase = ''
runHook preInstall
install -Dm644 roboto-flex-fonts/fonts/variable/*.ttf -t $out/share/fonts/truetype
runHook postInstall
'';
meta = {
homepage = "https://github.com/googlefonts/roboto-flex";
description = "Google Roboto Flex family of fonts";
license = lib.licenses.ofl;
platforms = lib.platforms.all;
maintainers = [ lib.maintainers.romildo ];
};
}

View file

@ -21,9 +21,13 @@
glslang,
spirv-tools,
ffts,
moltenvk,
apple-sdk_11,
darwinMinVersionHook,
llvmPackages,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "scopehal-apps";
version = "0-unstable-2024-09-16";
@ -37,30 +41,42 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [
cmake
pkg-config
shaderc
spirv-tools
wrapGAppsHook4
];
nativeBuildInputs =
[
cmake
pkg-config
shaderc
spirv-tools
]
++ lib.optionals stdenv.isLinux [
wrapGAppsHook4
];
buildInputs = [
cairomm
ffts
glew
glfw
glslang
gtkmm3
liblxi
libsigcxx
libtirpc
vulkan-headers
vulkan-loader
vulkan-tools
yaml-cpp
zstd
];
buildInputs =
[
cairomm
glew
glfw
glslang
liblxi
libsigcxx
vulkan-headers
vulkan-loader
vulkan-tools
yaml-cpp
zstd
]
++ lib.optionals stdenv.isLinux [
ffts
gtkmm3
libtirpc
]
++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
++ lib.optionals stdenv.isDarwin [
apple-sdk_11
(darwinMinVersionHook "10.15")
moltenvk
];
# Targets InitializeSearchPaths
postPatch = ''
@ -68,12 +84,19 @@ stdenv.mkDerivation rec {
--replace-fail '"/share/' '"/../share/'
'';
cmakeFlags = lib.optionals stdenv.isDarwin [
"-DCMAKE_INSTALL_RPATH=${lib.strings.makeLibraryPath [ vulkan-loader ]}"
];
meta = {
description = "Advanced test & measurement remote control and analysis suite";
homepage = "https://www.ngscopeclient.org/";
license = lib.licenses.bsd3;
mainProgram = "ngscopeclient";
maintainers = with lib.maintainers; [ bgamari ];
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [
bgamari
carlossless
];
platforms = lib.platforms.linux ++ lib.platforms.darwin;
};
}

View file

@ -15,7 +15,7 @@
buildPythonPackage rec {
pname = "google-cloud-bigquery-logging";
version = "1.4.5";
version = "1.5.0";
pyproject = true;
disabled = pythonOlder "3.7";
@ -23,7 +23,7 @@ buildPythonPackage rec {
src = fetchPypi {
pname = "google_cloud_bigquery_logging";
inherit version;
hash = "sha256-XrBXr0Y1vpxWceSR59ERQJKziMBI4+QBoHWK0Wt1cec=";
hash = "sha256-4eDfCpkZBDZySWq92C/fr0FKeKdbkymN6sbl+/qzKfg=";
};
build-system = [ setuptools ];

View file

@ -4,6 +4,7 @@
fetchpatch,
isPyPy,
lib,
stdenv,
numpy,
protobuf,
pytestCheckHook,
@ -84,15 +85,21 @@ buildPythonPackage {
pytestCheckHook
] ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ];
disabledTests = lib.optionals isPyPy [
# error message differs
"testInvalidTimestamp"
# requires tracemalloc which pypy does not implement
# https://foss.heptapod.net/pypy/pypy/-/issues/3048
"testUnknownFieldsNoMemoryLeak"
# assertion is not raised for some reason
"testStrictUtf8Check"
];
disabledTests =
lib.optionals isPyPy [
# error message differs
"testInvalidTimestamp"
# requires tracemalloc which pypy does not implement
# https://foss.heptapod.net/pypy/pypy/-/issues/3048
"testUnknownFieldsNoMemoryLeak"
# assertion is not raised for some reason
"testStrictUtf8Check"
]
++ lib.optionals stdenv.hostPlatform.is32bit [
# OverflowError: timestamp out of range for platform time_t
"testTimezoneAwareDatetimeConversionWhereTimestampLosesPrecision"
"testTimezoneNaiveDatetimeConversionWhereTimestampLosesPrecision"
];
disabledTestPaths =
lib.optionals (lib.versionAtLeast protobuf.version "23") [

View file

@ -50,21 +50,17 @@ buildPythonPackage rec {
];
checkPhase = ''
# Cannot create directory /homeless-shelter/.... Error: FILE_ERROR_ACCESS_DENIED
export HOME=$TMPDIR
# QStandardPaths: XDG_RUNTIME_DIR not set
export XDG_RUNTIME_DIR=$HOME/xdg-runtime-dir
# a Qt wrapper is required to run the Qt backend
# since the upstream script does not have a way to disable tests individually pytest is used directly instead
makeQtWrapper "$(command -v pytest)" tests/run.sh \
--set PYWEBVIEW_LOG debug \
--add-flags "--deselect tests/test_js_api.py::test_concurrent"
pushd tests
substituteInPlace run.sh \
--replace "PYTHONPATH=.." "PYTHONPATH=$PYTHONPATH" \
--replace "pywebviewtest test_js_api.py::test_concurrent ''${PYTEST_OPTIONS}" "# skip flaky test_js_api.py::test_concurrent"
patchShebangs run.sh
wrapQtApp run.sh
xvfb-run -s '-screen 0 800x600x24' ./run.sh
popd
# HOME and XDG directories are required for the tests
env \
HOME=$TMPDIR \
XDG_RUNTIME_DIR=$TMPDIR/xdg-runtime-dir \
xvfb-run -s '-screen 0 800x600x24' tests/run.sh
'';
pythonImportsCheck = [ "webview" ];

View file

@ -4,7 +4,6 @@
buildPythonPackage,
pythonOlder,
fetchFromGitHub,
fetchpatch2,
cmake,
cython,
ninja,
@ -20,7 +19,7 @@
buildPythonPackage rec {
pname = "rapidfuzz";
version = "3.10.0";
version = "3.10.1";
pyproject = true;
disabled = pythonOlder "3.9";
@ -29,18 +28,9 @@ buildPythonPackage rec {
owner = "maxbachmann";
repo = "RapidFuzz";
rev = "refs/tags/v${version}";
hash = "sha256-hLYidU09nCSOi42zgSh7dW83glxIjFY4C6BTmy/sf60=";
hash = "sha256-0L8nkjgWdP/w//M69ZRxYk9If3CIEcnAl9mkJKJ4o1g=";
};
patches = [
# https://github.com/rapidfuzz/RapidFuzz/pull/414
(fetchpatch2 {
name = "support-taskflow-3.8.0.patch";
url = "https://github.com/rapidfuzz/RapidFuzz/commit/8f0429bbd970ccc036018b87108845c384911ff7.patch";
hash = "sha256-1wizdCkXYEMe5JWXUHCOCuDdS0z76FKimR47B3s2oVU=";
})
];
postPatch = ''
substituteInPlace pyproject.toml \
--replace-fail "Cython >=3.0.11, <3.1.0" "Cython"

View file

@ -18,7 +18,7 @@
buildPythonPackage rec {
pname = "soco";
version = "0.30.5";
version = "0.30.6";
pyproject = true;
disabled = pythonOlder "3.6";
@ -27,7 +27,7 @@ buildPythonPackage rec {
owner = "SoCo";
repo = "SoCo";
rev = "refs/tags/v${version}";
hash = "sha256-Lw/VXEfIb+avRpQHcy0TVhWDjdGQlHHtVs2gZZkAAM4=";
hash = "sha256-3/BDqCYNgICb8NGYR1VJM9MsMRmdvJVruqFXuyG6tIY=";
};
build-system = [ setuptools ];

View file

@ -1,5 +1,11 @@
{ fetchurl, lib, stdenv, zstd
, testers, buck2 # for passthru.tests
{
fetchurl,
lib,
stdenv,
zstd,
installShellFiles,
testers,
buck2, # for passthru.tests
}:
# NOTE (aseipp): buck2 uses a precompiled binary build for good reason — the
@ -74,7 +80,10 @@ in stdenv.mkDerivation {
version = "unstable-${version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made
inherit src;
nativeBuildInputs = [ zstd ];
nativeBuildInputs = [
installShellFiles
zstd
];
doCheck = true;
dontConfigure = true;
@ -87,6 +96,12 @@ in stdenv.mkDerivation {
mkdir -p $out/bin
install -D buck2 $out/bin/buck2
'';
postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
installShellCompletion --cmd buck2 \
--bash <( $out/bin/buck2 completion bash ) \
--fish <( $out/bin/buck2 completion fish ) \
--zsh <( $out/bin/buck2 completion zsh )
'';
passthru = {
prelude = prelude-src;

View file

@ -20,11 +20,11 @@ let
'';
in stdenvNoCC.mkDerivation rec {
pname = "linux-firmware";
version = "20241017";
version = "20241110";
src = fetchzip {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz";
hash = "sha256-q4StJdoLCHQThFTzhxETDYlQP/ywmb3vwCr13xtrQzc=";
hash = "sha256-AsEJfAkr+E2Tnev/UkYLRXsf+PWCp7brvO99bMgLQ1A=";
};
postUnpack = ''

View file

@ -49,7 +49,8 @@ in
(if withX then "--with-x" else "--without-x")
(if withQt then "--with-qt=qt5" else "--without-qt")
(if aquaterm then "--with-aquaterm" else "--without-aquaterm")
] ++ lib.optional withCaca "--with-caca";
] ++ lib.optional withCaca "--with-caca"
++ lib.optional withTeXLive "--with-texdir=${placeholder "out"}/share/texmf/tex/latex/gnuplot";
CXXFLAGS = lib.optionalString (stdenv.hostPlatform.isDarwin && withQt) "-std=c++11";

View file

@ -1,20 +0,0 @@
GEM
remote: https://rubygems.org/
specs:
colsole (0.8.2)
completely (0.5.2)
colsole (~> 0.6)
mister_bin (~> 0.7.2)
docopt (0.6.1)
mister_bin (0.7.3)
colsole (~> 0.7)
docopt (~> 0.6)
PLATFORMS
ruby
DEPENDENCIES
completely
BUNDLED WITH
2.4.5

View file

@ -9,16 +9,16 @@ in
rustPlatform.buildRustPackage rec {
pname = "vaultwarden";
version = "1.32.3";
version = "1.32.4";
src = fetchFromGitHub {
owner = "dani-garcia";
repo = "vaultwarden";
rev = version;
hash = "sha256-dtzC5T96fBrIvy5LFDnwLfx1wF9aVGv/FuAUDH56yto=";
hash = "sha256-fT1o+nR7k1fLFS4TeoP1Gm1P0uLTu6Dai6hMGraAKjE=";
};
cargoHash = "sha256-a4OwL7yD2i4uJLnSzWpwfRZRSgFFammfUOE+PHA2iw0=";
cargoHash = "sha256-xidkmkRVIyQ3mutkmR3oObEwi1uRLCiRSyF5GpWVM9w=";
# used for "Server Installed" version in admin panel
env.VW_VERSION = version;

View file

@ -8179,7 +8179,7 @@ with pkgs;
python3 = python311;
};
buck2 = callPackage ../development/tools/build-managers/buck2 { };
buck2 = callPackage ../development/tools/build-managers/buck2 { stdenv = stdenvNoCC; };
build2 = callPackage ../development/tools/build-managers/build2 {
# Break cycle by using self-contained toolchain for bootstrapping
@ -13764,8 +13764,6 @@ with pkgs;
communi = libsForQt5.callPackage ../applications/networking/irc/communi { };
completely = callPackage ../tools/misc/completely { };
confclerk = libsForQt5.callPackage ../applications/misc/confclerk { };
copyq = qt6Packages.callPackage ../applications/misc/copyq { };