Compare commits

..

53 Commits

Author SHA1 Message Date
nixpkgs-ci[bot]
66c61c3c1e Merge master into staging-next 2026-07-23 12:33:47 +00:00
Matthieu Coudron
1043b7502f nixos/jellyfin: fix hevc10bit decoding toggle being silently ignored (#520045) 2026-07-23 12:26:40 +00:00
Sandro
95b1ffcd81 wlr-protocols: modernize (#544809) 2026-07-23 12:19:53 +00:00
Martin Weinelt
f63f67e72d ocamlPackages.ocamlfuse: drop (#544403) 2026-07-23 12:19:16 +00:00
Grimmauld
ceb123f3b1 igprof: 5.9.18 -> 6.0.0 (#544783) 2026-07-23 12:19:13 +00:00
Arnout Engelen
36c1fe67de prometheus-imap-mailstat-exporter: 0.7.1 -> 0.7.2 (#544840) 2026-07-23 12:17:34 +00:00
Jhonas Wernery
b8e98fd67a matrix-authentication-service: 1.20.0 -> 1.21.0 (#544479) 2026-07-23 12:15:26 +00:00
fliiiix
93cc79ba2e igprof: 5.9.18 -> 6.0.0 2026-07-23 14:12:25 +02:00
Martin Weinelt
e4221a4c16 esphome: 2026.6.2 -> 2026.6.5 (#544837) 2026-07-23 11:49:12 +00:00
nixpkgs-ci[bot]
406a1745a1 gitte: 0.9.0 -> 0.9.1 (#544785) 2026-07-23 11:44:39 +00:00
Yohann Boniface
a96a7b9dc6 treewide: use finalAttrs.finalPackage.doCheck (#543265) 2026-07-23 11:35:08 +00:00
Jan Tojnar
cfd19c19dd xdg-desktop-poral: remove broken NIX_XDG_DESKTOP_PORTAL_DIR patch (#529088) 2026-07-23 11:29:17 +00:00
whoomee
7151bf1127 esphome: use addBinToPathHook 2026-07-23 13:27:34 +02:00
R. Ryantm
9d1bbdedb5 prometheus-imap-mailstat-exporter: 0.7.1 -> 0.7.2 2026-07-23 11:18:48 +00:00
whoomee
0dffc88487 esphome: 2026.6.2 -> 2026.6.5 2026-07-23 13:18:05 +02:00
whoomee
0f8bcd1f4e esphome: remove platformio from dependencies 2026-07-23 13:18:05 +02:00
whoomee
101df500ef esphome: add maintainer tmarkus 2026-07-23 13:18:05 +02:00
Rasmus Enevoldsen
b98f9d8352 xdg-desktop-portal: remove NIX_XDG_DESKTOP_PORTAL_DIR patch
xdg-desktop-portal 1.20.1 added support for searching all
directories in XDG_DATA_DIRS for portals:
bb37e260db

This made the NIX_XDG_DESKTOP_PORTAL_DIR patch redundant, since
NixOS already ensures /run/current-system/sw/share is on
XDG_DATA_DIRS.

The patch also does not compose well: it hardcodes a single
portal directory, so when both NixOS and home-manager set it,
home-manager's value overwrote NixOS's, breaking portal
discovery for anything only registered by NixOS (e.g. Cosmic
alongside a home-manager-configured Hyprland).
2026-07-23 13:15:51 +02:00
Sandro
baa4b7eb7b nil: 2025-06-13 -> 2026-07-23 (#544806) 2026-07-23 11:08:38 +00:00
Peder Bergebakken Sundt
5025ca1269 closure-compiler: Add $JAVA_ARGS breakout to tweak the JVM (#539324) 2026-07-23 11:05:28 +00:00
Sandro
b29c79713e rustfs: 1.0.0-beta.9 -> 1.0.0-beta.10 (#543195) 2026-07-23 11:01:15 +00:00
Vincent Laporte
317e455b4c coqPackages.multinomials: 2.4.0 -> 2.5.0 (#544572) 2026-07-23 11:00:48 +00:00
nixpkgs-ci[bot]
427f2e52a8 rustywind: 0.25.2 -> 0.26.0 (#544825) 2026-07-23 10:59:25 +00:00
nixpkgs-ci[bot]
67296d631e cargo-edit: 0.13.11 -> 0.13.13 (#544702) 2026-07-23 10:59:12 +00:00
azahi
20a74362aa nelm: 1.25.2 -> 1.25.3 (#544565) 2026-07-23 10:32:01 +00:00
Matthias Beyer
9232f4ebb1 zellijPlugins.cb: init at 0.2.0 (#544485) 2026-07-23 10:26:41 +00:00
Paul Meyer
b1b435598f azure-cli-extensions.vm-repair: 2.2.0 -> 2.2.1 (#544820) 2026-07-23 10:22:07 +00:00
Florian Klink
e7090c7f56 afew: use versionCheckHook (#544521) 2026-07-23 10:16:52 +00:00
yaya
a6ec72c6a9 gitlab-runner: 19.0.0 -> 19.2.0 (#541469) 2026-07-23 10:12:38 +00:00
Pierre Roux
7ad020afbd coqPackages.multinomials: 2.4.0 -> 2.5.0 2026-07-23 11:54:40 +02:00
R. Ryantm
59e8a8cf21 rustywind: 0.25.2 -> 0.26.0 2026-07-23 09:47:20 +00:00
R. Ryantm
9fe6062074 azure-cli-extensions.vm-repair: 2.2.0 -> 2.2.1 2026-07-23 09:15:49 +00:00
klea
1782deba0d wlr-protocols: modernize
As part of https://github.com/NixOS/nixpkgs/issues/356002, https://github.com/NixOS/nixpkgs/issues/541820
2026-07-23 08:38:38 +00:00
R. Ryantm
3f4d020c89 nil: 2025-06-13 -> 2026-07-23 2026-07-23 08:19:09 +00:00
nixpkgs-ci[bot]
10d1260d3a Merge master into staging-next 2026-07-23 06:51:29 +00:00
R. Ryantm
5d66e6eae5 gitte: 0.9.0 -> 0.9.1 2026-07-23 06:07:10 +00:00
nixpkgs-ci[bot]
7bd1ed1622 Merge master into staging-next 2026-07-23 00:32:16 +00:00
R. Ryantm
749fccb89e cargo-edit: 0.13.11 -> 0.13.13 2026-07-22 21:46:08 +00:00
nixpkgs-ci[bot]
ffe6ce2a14 Merge master into staging-next 2026-07-22 18:26:08 +00:00
R. Ryantm
09eee1bc25 nelm: 1.25.2 -> 1.25.3 2026-07-22 13:51:19 +00:00
nixpkgs-ci[bot]
ea1d43ed8a Merge master into staging-next 2026-07-22 12:33:42 +00:00
Florian Klink
cb61121b52 afew: use versionCheckHook
Suugested in https://github.com/NixOS/nixpkgs/pull/544256#issuecomment-5036216052.
2026-07-22 13:54:03 +02:00
Nuno David
3a03d1b84c zellijPlugins.cb: init at 0.2.0 2026-07-22 10:16:36 +01:00
Maximilian Bosch
22f4db51c8 matrix-authentication-service: 1.20.0 -> 1.21.0
ChangeLog: https://github.com/element-hq/matrix-authentication-service/releases/tag/v1.21.0
2026-07-22 08:54:42 +02:00
nixpkgs-ci[bot]
1f22863ccd Merge master into staging-next 2026-07-22 06:53:00 +00:00
夜坂雅
a2ecb16d6f ocamlPackages.ocamlfuse: drop 2026-07-22 09:15:37 +08:00
nixpkgs-ci[bot]
f412c70cf7 Merge master into staging-next 2026-07-22 00:30:23 +00:00
Nuno David
bdfc9a4cde maintainers: add ndavd 2026-07-22 00:38:46 +01:00
polyfloyd
6d7c9bc250 closure-compiler: Add $NIX_JAVA_ARGS breakout to tweak the JVM 2026-07-20 00:42:42 +02:00
Peder Bergebakken Sundt
a0d022d0f4 treewide: use finalAttrs.finalPackage.doCheck 2026-07-18 18:23:21 +02:00
Marcel
f9023b3aea rustfs: 1.0.0-beta.9 -> 1.0.0-beta.10
Diff: https://github.com/rustfs/rustfs/compare/1.0.0-beta.9...1.0.0-beta.10
2026-07-18 02:17:09 +02:00
Yaya
72c659e450 gitlab-runner: 19.0.0 -> 19.1.1
Diff: https://gitlab.com/gitlab-org/gitlab-runner/-/compare/v19.0.0...v19.1.1

Changelog: https://gitlab.com/gitlab-org/gitlab-runner/blob/v19.1.1/CHANGELOG.md
2026-07-13 16:12:41 +02:00
Gautham Venkataraman
1b3a9c7c2a nixos/jellyfin: fix hevc10bit decoding toggle being silently ignored
The hevc10bit option was written as a string entry inside
<HardwareDecodingCodecs>, which Jellyfin ignores - that element only
accepts ffmpeg codec names (h264, hevc, vp9, ...). The actual gate
for 10-bit HEVC hardware decoding is the boolean
EnableDecodingColorDepth10Hevc element, which the module never
emitted.

Mirror the existing hevcRExt10bit / hevcRExt12bit handling: exclude
hevc10bit from the codec string list and emit the dedicated XML
element.
2026-05-14 09:19:44 +02:00
82 changed files with 173 additions and 195 deletions

View File

@@ -19819,6 +19819,12 @@
githubId = 364510;
name = "Tobias Geerinckx-Rice";
};
ndavd = {
email = "email@ndavd.com";
github = "ndavd";
githubId = 74260683;
name = "Nuno David";
};
ndl = {
email = "ndl@endl.ch";
github = "ndl";

View File

@@ -77,6 +77,12 @@
- A number of options for `services.llama-cpp` have been removed in favor of the structured [](#opt-services.llama-cpp.settings) option, attributes from which are used as arguments to `llama-server` executable, you can see all available options by running `llama-server --help`. Configuring model presets using Nix attribute set via `services.llama-cpp.modelsPreset` is no longer supported, please use `services.llama-cpp.settings.models-preset` with a path to an INI file containing desired options.
- The `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable is no longer used in the `xdg-desktop-portal` package and is therefore no longer set in `xdg.portal` module.
Instead the `XDG_DATA_DIRS` environment variable is used to find xdg-portals.
If you were relying on `NIX_XDG_DESKTOP_PORTAL_DIR` to point at custom portal
definitions, add the package providing them to `xdg.portal.extraPortals`.
- Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use.
- `security.polkit.enablePkexecWrapper` has been introduced, making the `pkexec` setuid wrapper opt-in.

View File

@@ -150,7 +150,6 @@ in
sessionVariables = {
NIXOS_XDG_OPEN_USE_PORTAL = mkIf cfg.xdgOpenUsePortal "1";
NIX_XDG_DESKTOP_PORTAL_DIR = "/run/current-system/sw/share/xdg-desktop-portal/portals";
};
etc = lib.concatMapAttrs (

View File

@@ -33,7 +33,11 @@ let
;
cfg = config.services.jellyfin;
filteredDecodingCodecs = builtins.filter (
c: c != "hevcRExt10bit" && c != "hevcRExt12bit" && cfg.transcoding.hardwareDecodingCodecs.${c}
c:
c != "hevc10bit"
&& c != "hevcRExt10bit"
&& c != "hevcRExt12bit"
&& cfg.transcoding.hardwareDecodingCodecs.${c}
) (builtins.attrNames cfg.transcoding.hardwareDecodingCodecs);
encodingXmlText = ''
<?xml version="1.0" encoding="utf-8"?>
@@ -58,6 +62,7 @@ let
<AllowAv1Encoding>${boolToString cfg.transcoding.hardwareEncodingCodecs.av1}</AllowAv1Encoding>
<EnableIntelLowPowerH264HwEncoder>${boolToString cfg.transcoding.enableIntelLowPowerEncoding}</EnableIntelLowPowerH264HwEncoder>
<EnableIntelLowPowerHevcHwEncoder>${boolToString cfg.transcoding.enableIntelLowPowerEncoding}</EnableIntelLowPowerHevcHwEncoder>
<EnableDecodingColorDepth10Hevc>${boolToString cfg.transcoding.hardwareDecodingCodecs.hevc10bit}</EnableDecodingColorDepth10Hevc>
<EnableDecodingColorDepth10HevcRext>${boolToString cfg.transcoding.hardwareDecodingCodecs.hevcRExt10bit}</EnableDecodingColorDepth10HevcRext>
<EnableDecodingColorDepth12HevcRext>${boolToString cfg.transcoding.hardwareDecodingCodecs.hevcRExt12bit}</EnableDecodingColorDepth12HevcRext>
<HardwareDecodingCodecs>

View File

@@ -33,6 +33,7 @@
hardwareDecodingCodecs = {
h264 = true;
hevc = true;
hevc10bit = true;
vp9 = true;
hevcRExt10bit = true;
hevcRExt12bit = true;
@@ -174,7 +175,8 @@
assert config.get("EnableIntelLowPowerH264HwEncoder") == True, f"Intel low power H264: expected True, got '{config.get('EnableIntelLowPowerH264HwEncoder')}'"
assert config.get("EnableIntelLowPowerHevcHwEncoder") == True, f"Intel low power HEVC: expected True, got '{config.get('EnableIntelLowPowerHevcHwEncoder')}'"
# HEVC RExt color depth verification
# HEVC color depth verification
assert config.get("EnableDecodingColorDepth10Hevc") == True, f"HEVC 10bit: expected True, got '{config.get('EnableDecodingColorDepth10Hevc')}'"
assert config.get("EnableDecodingColorDepth10HevcRext") == True, f"HEVC RExt 10bit: expected True, got '{config.get('EnableDecodingColorDepth10HevcRext')}'"
assert config.get("EnableDecodingColorDepth12HevcRext") == True, f"HEVC RExt 12bit: expected True, got '{config.get('EnableDecodingColorDepth12HevcRext')}'"

View File

@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
meta.license = lib.licenses.unfree;
};
in
lib.optionalString finalAttrs.doCheck ''
lib.optionalString finalAttrs.finalPackage.doCheck ''
MWCIncludes=../test ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c
file test.o | grep "ELF 32-bit"
'';

View File

@@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: {
# see also: https://profanity-im.github.io/guide/latest/build.html#expl
mesonFlags = [
(lib.mesonBool "tests" finalAttrs.doCheck)
(lib.mesonBool "tests" finalAttrs.finalPackage.doCheck)
(lib.mesonEnable "notifications" notifySupport)
(lib.mesonEnable "python-plugins" pythonPluginSupport)
(lib.mesonEnable "c-plugins" true)

View File

@@ -3,8 +3,7 @@
python3Packages,
fetchPypi,
pkgs,
testers,
afew,
versionCheckHook,
}:
python3Packages.buildPythonApplication (finalAttrs: {
@@ -39,6 +38,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
nativeCheckInputs = [
pkgs.notmuch
versionCheckHook
]
++ (with python3Packages; [
freezegun
@@ -55,12 +55,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
"man"
];
passthru.tests = {
version = testers.testVersion {
package = afew;
};
};
meta = {
homepage = "https://github.com/afewmail/afew";
description = "Initial tagging script for notmuch mail";

View File

@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
"POD2HTML=${lib.getExe' buildPackages.perl "pod2html"}"
"MANDIR=share/man"
]
++ lib.optional finalAttrs.doCheck "PROVE=${lib.getExe' perl "prove"}";
++ lib.optional finalAttrs.finalPackage.doCheck "PROVE=${lib.getExe' perl "prove"}";
installFlags = [
"DESTDIR=$(out)"

View File

@@ -193,7 +193,7 @@ let
# https://discourse.ardour.org/t/ardour-8-2-released/109615/8
# "--use-external-libs"
]
++ lib.optional finalAttrs.doCheck "--test"
++ lib.optional finalAttrs.finalPackage.doCheck "--test"
++ lib.optional optimize "--optimize";
env = {

View File

@@ -345,9 +345,9 @@
vm-repair = mkAzExtension rec {
pname = "vm-repair";
version = "2.2.0";
version = "2.2.1";
url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl";
hash = "sha256-ppsK4rJa/nFFkO2XJvjnK0PIRp9/haVwWfqfF7oN5WQ=";
hash = "sha256-k/6ATtYT2YXaHm5nbb0Tf7xE98Oz9svRlbjodCOOuo8=";
description = "Support for repairing Azure Virtual Machines";
propagatedBuildInputs = with python3Packages; [ opencensus ];
meta.maintainers = [ ];

View File

@@ -151,7 +151,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "WITH_USDT" enableTracing)
(lib.cmakeFeature "RDTS_CONSENT" "RUNTIME_WARN")
]
++ lib.optionals (!finalAttrs.doCheck) [
++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
(lib.cmakeBool "BUILD_TESTS" false)
(lib.cmakeBool "BUILD_FUZZ_BINARY" false)
(lib.cmakeBool "BUILD_GUI_TESTS" false)

View File

@@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "WITH_ZMQ" true)
(lib.cmakeBool "WITH_USDT" enableTracing)
]
++ lib.optionals (!finalAttrs.doCheck) [
++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
(lib.cmakeBool "BUILD_TESTS" false)
(lib.cmakeBool "BUILD_FUZZ_BINARY" false)
(lib.cmakeBool "BUILD_GUI_TESTS" false)

View File

@@ -227,7 +227,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "BRLCAD_ENABLE_STRICT" false)
(lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "BRLCAD_ENABLE_QT" enableQt)
(lib.cmakeFeature "GTE_INCLUDE_DIR" "${gtmathematics}/include/gtmathematics")
(lib.cmakeFeature "LMDB_LIBRARY" "${lmdb.out}/lib/liblmdb${stdenv.hostPlatform.extensions.sharedLibrary}")

View File

@@ -10,16 +10,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cargo-edit";
version = "0.13.11";
version = "0.13.13";
src = fetchFromGitHub {
owner = "killercup";
repo = "cargo-edit";
rev = "v${finalAttrs.version}";
hash = "sha256-u4mjbIs9rLZOZ4MUITc4QYnfEcTyZT5aXt6U7fwefoo=";
hash = "sha256-yaY6krZ+kt2g3Wnnzsw4P3xnpsaZuNwFfRk9GLvwps8=";
};
cargoHash = "sha256-1PCncmiY+olGGMOT2AfIbGY5sup4ysPVqdBmuecDWk0=";
cargoHash = "sha256-Q4GDA81w0JR9rcpKSPe9Y+9HPpFdAvYP2RI+91R4NWE=";
nativeBuildInputs = [ pkg-config ];

View File

@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
mkdir -p $out/share/java $out/bin
cp ${finalAttrs.src} $out/share/java/closure-compiler-v${finalAttrs.version}.jar
makeWrapper ${jre}/bin/java $out/bin/closure-compiler \
--add-flags "-jar $out/share/java/closure-compiler-v${finalAttrs.version}.jar"
--add-flags "\$NIX_JAVA_ARGS -jar $out/share/java/closure-compiler-v${finalAttrs.version}.jar"
'';
meta = {

View File

@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
cmakeFlags =
lib.optional finalAttrs.doCheck "-DUNIT_TESTING=ON"
lib.optional finalAttrs.finalPackage.doCheck "-DUNIT_TESTING=ON"
++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF";
doCheck = true;

View File

@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
"--with-boost-libdir=${boost.out}/lib"
"--disable-bench"
]
++ lib.optionals (!finalAttrs.doCheck) [
++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
"--disable-tests"
"--disable-gui-tests"
]

View File

@@ -9,6 +9,7 @@
esptool,
git,
versionCheckHook,
addBinToPathHook,
nixosTests,
}:
@@ -24,14 +25,14 @@ let
in
python.pkgs.buildPythonApplication (finalAttrs: {
pname = "esphome";
version = "2026.6.2";
version = "2026.6.5";
pyproject = true;
src = fetchFromGitHub {
owner = "esphome";
repo = "esphome";
tag = finalAttrs.version;
hash = "sha256-h7aMPSXmIUutCGMoZlE3Z1wX2xNxdmZsHfBllcFHBHc=";
hash = "sha256-4sbc/X86OWN/Bx2sPk3H2lgzGxdQNS6bIspNLAVqHz8=";
};
patches = [
@@ -85,7 +86,6 @@ python.pkgs.buildPythonApplication (finalAttrs: {
jinja2
paho-mqtt
pillow
platformio
puremagic
py7zr
pyparsing
@@ -138,6 +138,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
++ [
git
versionCheckHook
addBinToPathHook
];
disabledTestPaths = [
@@ -149,10 +150,6 @@ python.pkgs.buildPythonApplication (finalAttrs: {
"tests/unit_tests/test_espidf_component.py"
];
preCheck = ''
export PATH=$PATH:$out/bin
'';
postInstall =
let
argcomplete = lib.getExe' python.pkgs.argcomplete "register-python-argcomplete";
@@ -164,8 +161,6 @@ python.pkgs.buildPythonApplication (finalAttrs: {
--fish <(${argcomplete} --shell fish esphome)
'';
doInstallCheck = true;
disabledTests = [
# tries to import platformio, which is wrapped in an fhsenv
"test_clean_build"
@@ -207,6 +202,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
picnoir
thanegill
karlbeecken
tmarkus
];
mainProgram = "esphome";
};

View File

@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
];
mesonFlags = [
(lib.mesonOption "validate" (if finalAttrs.doCheck then "enabled" else "disabled"))
(lib.mesonOption "validate" (if finalAttrs.finalPackage.doCheck then "enabled" else "disabled"))
];
doCheck = true;

View File

@@ -233,7 +233,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
cmakeFlagsArray+=("-DBUILD_TESTING:BOOL=FALSE")
else
echo "Keeping checkPhase as-is"
cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck}")
cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck}")
fi
'';

View File

@@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
# and cannot bind FHS paths since those are not available on NixOS.
finalAttrs.passthru.icon-validator-patch
]
++ lib.optionals finalAttrs.doCheck [
++ lib.optionals finalAttrs.finalPackage.doCheck [
# Hardcode paths used by tests and change test runtime generation to use files from Nix store.
# https://github.com/flatpak/flatpak/issues/1460
(replaceVars ./fix-test-paths.patch {

View File

@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "FTXUI_BUILD_EXAMPLES" false)
(lib.cmakeBool "FTXUI_BUILD_DOCS" true)
(lib.cmakeBool "FTXUI_BUILD_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "FTXUI_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
];
meta = {

View File

@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
unzip
zip
]
++ lib.optionals finalAttrs.doCheck [
++ lib.optionals finalAttrs.finalPackage.doCheck [
mtools
dosfstools
];

View File

@@ -12,16 +12,16 @@
buildGoModule (finalAttrs: {
pname = "gitlab-runner";
version = "19.0.0";
version = "19.1.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-runner";
tag = "v${finalAttrs.version}";
hash = "sha256-uScTzj4pSRtSFCMxoOR5KqipCbPknwnydPYG6xU5dOo=";
hash = "sha256-QKiHd4UFTuAZElQ/793Tyid983RnfU9TeNpe1gFwChA=";
};
vendorHash = "sha256-QqqTkIgR9ca1dYQ32SG7C+SpEIA07Hlf8x3lVhZ5vRQ=";
vendorHash = "sha256-Ed2PrEkkqZEWhFLtT1BJavWiacLuv4U7kIAcscMDQgM=";
# For patchShebangs
buildInputs = [ bash ];

View File

@@ -22,7 +22,7 @@
}:
stdenv.mkDerivation (finalAttrs: {
pname = "gitte";
version = "0.9.0";
version = "0.9.1";
__structuredAttrs = true;
@@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
owner = "ckruse";
repo = "Gitte";
tag = finalAttrs.version;
hash = "sha256-k10Rqpf9fhcG+PU6WGr7Q2nVwZb0tLp2B2r3BNeicoI=";
hash = "sha256-/vVNWYuTsFf9SsL/PvM5hOJfULeibRn+9ukAbTs5rXk=";
};
cargoDeps = rustPlatform.fetchCargoVendor {
inherit (finalAttrs) pname version src;
hash = "sha256-eK8o/psq0eHwUlbfD0I/TwIqoA40Ay0eJ9CtZypZCi4=";
hash = "sha256-oz8pX33jua+bOBEmI87p4rkUxYrhzagBLcQvSHPOkp0=";
};
strictDeps = true;

View File

@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
(lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
];
# Building tests is broken on Darwin.

View File

@@ -45,8 +45,8 @@ stdenv.mkDerivation (finalAttrs: {
doBuildExamples = false;
cmakeFlags = [
(lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.doCheck)
(lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
(lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "BUILD_EXAMPLES" finalAttrs.doBuildExamples)
];

View File

@@ -4,32 +4,25 @@
fetchFromGitHub,
libunwind,
cmake,
pcre,
pcre2,
gdb,
}:
stdenv.mkDerivation (finalAttrs: {
version = "5.9.18";
version = "6.0.0";
pname = "igprof";
src = fetchFromGitHub {
owner = "igprof";
repo = "igprof";
rev = "v${finalAttrs.version}";
sha256 = "sha256-UTrAaH8C79km78Z/7NxvQ6dnl4u4Ki80nORf4bsoSNw=";
hash = "sha256-RIDnilCoYlq0D9CBJKMX1zg1DBQ4RPcOlfGcZ2xosUo=";
};
postPatch = ''
substituteInPlace src/igprof \
--replace-fail libigprof.so $out/lib/libigprof.so
substituteInPlace CMakeLists.txt \
--replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)"
'';
buildInputs = [
libunwind
gdb
pcre
pcre2
];
nativeBuildInputs = [ cmake ];
@@ -41,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
];
meta = {
broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
description = "Ignominous Profiler";
longDescription = ''

View File

@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-z10S9ODLprd7CbL5Ecgh7H4eOwTetYwFXiWBUm6fIr4=";
};
patches = lib.optional finalAttrs.doCheck (
patches = lib.optional finalAttrs.finalPackage.doCheck (
# 1. Do not fetch the Unity GitHub repository
# 2. Lookup the Unity pkgconfig file
# 3. Get the generate_test_runner.rb file from the Unity share directory

View File

@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic))
(lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic)
(lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
];
buildInputs = [

View File

@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
"-Wno-dev" # suppress cmake warning about deprecated usage
(lib.cmakeBool "JSON_TUI_BUILD_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "JSON_TUI_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}")
];

View File

@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
(lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)
(lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
"-DENABLE_SASL=ON"
];

View File

@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeFeature "EIGEN_INCLUDE_DIR" "${eigen}/include/eigen3")
(lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
];
doCheck = true;

View File

@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "WITH_SYSTEMD" withSystemd)
(lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
(lib.cmakeBool "WITH_EXAMPLES" buildExamples)
(lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "WITH_TESTS" finalAttrs.finalPackage.doCheck)
];
# This test checks if using the **installed** headers works.

View File

@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic))
(lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic)
(lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

View File

@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
];
configureFlags = [
(lib.withFeature finalAttrs.doCheck "gtest")
(lib.withFeature finalAttrs.finalPackage.doCheck "gtest")
];
__structuredAttrs = true;

View File

@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
configureFlags = [
(lib.withFeature finalAttrs.doCheck "gtest")
(lib.withFeature finalAttrs.finalPackage.doCheck "gtest")
];
enableParallelBuilding = true;

View File

@@ -20,21 +20,21 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "matrix-authentication-service";
version = "1.20.0";
version = "1.21.0";
src = fetchFromGitHub {
owner = "element-hq";
repo = "matrix-authentication-service";
tag = "v${finalAttrs.version}";
hash = "sha256-0fvGhBxwXhSzWvNhflreEFoCBycM10vMkMf4sj95vfY=";
hash = "sha256-4z+u1IM2pclccv9+IH8IWjCodDxWZmffbqWPC726sIg=";
};
cargoHash = "sha256-3V50qNvg24WZvQ9z7IZJAnPXHTibZ6o3EzUoinLU6Gw=";
cargoHash = "sha256-HQU0zaK7rLJnTX5WVZrqNEaT5HfFLDzs+pHRxx5XTaA=";
pnpmDeps = fetchPnpmDeps {
inherit (finalAttrs) pname version src;
fetcherVersion = 4;
hash = "sha256-j2A2VCKQPfoyrNDtazu8hzUHpS130Ju/Cy3yfu9tC5I=";
hash = "sha256-9a62WlBQW8lgXluMh+DM21CkFCqFYd7yUz220G1uTIY=";
};
pnpmRoot = "frontend";

View File

@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeOptionType "string" "Mayo_VersionMajor" (lib.versions.major finalAttrs.version))
(lib.cmakeOptionType "string" "Mayo_VersionMinor" (lib.versions.minor finalAttrs.version))
(lib.cmakeOptionType "string" "Mayo_VersionPatch" (lib.versions.patch finalAttrs.version))
(lib.cmakeBool "Mayo_BuildTests" finalAttrs.doCheck)
(lib.cmakeBool "Mayo_BuildTests" finalAttrs.finalPackage.doCheck)
]
++ lib.optional withAssimp "-DMayo_BuildPluginAssimp=ON";

View File

@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
configureFlags = [
(lib.withFeature finalAttrs.doCheck "gtest")
(lib.withFeature finalAttrs.finalPackage.doCheck "gtest")
];
enableParallelBuilding = true;

View File

@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
MI_SECURE = secureBuild;
MI_BUILD_SHARED = stdenv.hostPlatform.hasSharedLibraries;
MI_LIBC_MUSL = stdenv.hostPlatform.libc == "musl";
MI_BUILD_TESTS = finalAttrs.doCheck;
MI_BUILD_TESTS = finalAttrs.finalPackage.doCheck;
# MI_OPT_ARCH is inaccurate (e.g. it assumes aarch64 == armv8.1-a).
# Nixpkgs's native platform configuration does a better job.

View File

@@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "MZ_OPENSSL" true)
(lib.cmakeBool "MZ_PPMD" false) # PPMD support requres internet access to make a git clone
(lib.cmakeBool "MZ_LIBCOMP" false) # builds only on Darwin by default where it fails due to mising headers
(lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "MZ_COMPAT" enableCompat)
]
++ lib.optionals stdenv.hostPlatform.isi686 [

View File

@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "WITH_BUNDLED_DEPS" false)
(lib.cmakeBool "WITH_WEBSOCKETS" true)
(lib.cmakeBool "WITH_SYSTEMD" withSystemd)
(lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "WITH_TESTS" finalAttrs.finalPackage.doCheck)
];
postFixup = ''

View File

@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.strings.mesonEnable "guile" false)
(lib.strings.mesonEnable "scm" false)
(lib.strings.mesonEnable "readline" false)
(lib.strings.mesonEnable "tests" finalAttrs.doCheck)
(lib.strings.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
(lib.strings.mesonOption "lispdir" "${placeholder "mu4e"}/share/emacs/site-lisp")
];

View File

@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
++ lib.optionals buildDocs [
scdoc
]
++ lib.optionals (buildDocs || finalAttrs.doCheck) [
++ lib.optionals (buildDocs || finalAttrs.finalPackage.doCheck) [
(python3.withPackages (ps: [ ps.pyyaml ]))
];
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
find subprojects -name "*.py" -exec chmod +x {} \;
patchShebangs subprojects
''
+ lib.optionalString finalAttrs.doCheck ''
+ lib.optionalString finalAttrs.finalPackage.doCheck ''
substituteInPlace \
"subprojects/meson-tests/common/14 configure file/test.py.in" \
"subprojects/meson-tests/common/274 customtarget exe for test/generate.py" \
@@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
(muonBool "static" stdenv.targetPlatform.isStatic)
(muonEnable "man-pages" buildDocs)
(muonEnable "meson-docs" buildDocs)
(muonEnable "meson-tests" finalAttrs.doCheck)
(muonEnable "meson-tests" finalAttrs.finalPackage.doCheck)
(muonEnable "samurai" embedSamurai)
(muonEnable "tracy" false)
(muonEnable "website" false)
@@ -177,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: {
owner = "muon-build";
rev = "db92588773a24f67cda2f331b945825ca3a63fa7";
hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM=";
passthru.use = finalAttrs.doCheck;
passthru.use = finalAttrs.finalPackage.doCheck;
};
};

View File

@@ -9,13 +9,13 @@
}:
buildGoModule (finalAttrs: {
pname = "nelm";
version = "1.25.2";
version = "1.25.3";
src = fetchFromGitHub {
owner = "werf";
repo = "nelm";
tag = "v${finalAttrs.version}";
hash = "sha256-2YIxnuHbY9zCVZer+b7JD0fbmUC/ZYyaWmHts7s5ldw=";
hash = "sha256-b0gO1V7yv8RMjIxwnqFX9CPRcRFm/j8u2PwNzyA7jtc=";
};
vendorHash = "sha256-rIiphGjE/a5IwF6Fkk3Ffq36AfEkfAZb12ZljlYP6X4=";

View File

@@ -70,7 +70,7 @@ buildDotnetModule (finalAttrs: {
substituteInPlace src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj \
--replace-fail '$(BaseIntermediateOutputPath)games.json' ${./vendored/games.json}
${lib.optionalString finalAttrs.doCheck ''
${lib.optionalString finalAttrs.finalPackage.doCheck ''
# For some reason these tests fail (intermittently?) with a zero timestamp
touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
''}

View File

@@ -9,16 +9,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "nil";
version = "2025-06-13";
version = "2026-07-23";
src = fetchFromGitHub {
owner = "oxalica";
repo = "nil";
rev = finalAttrs.version;
hash = "sha256-oxvVAFUO9husnRk6XZcLFLjLWL9z0pW25Fk6kVKwt1c=";
hash = "sha256-upJVI2pq9sOKgF2AILt8l6O4/3GNcMtT/s0rmnbO5UA=";
};
cargoHash = "sha256-OZIajxv8xNfCGalVw/FUAwWdQzPqfGuDoeRg2E2RR7s=";
cargoHash = "sha256-ZyTrxGX0mRdskxp4o5ssDCyZzNn36rIgP9fDaA1fDws=";
nativeBuildInputs = [ nix ];

View File

@@ -88,7 +88,7 @@ clangStdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "NLOPT_MATLAB" false)
(lib.cmakeBool "NLOPT_GUILE" false)
(lib.cmakeBool "NLOPT_LUKSAN" (!withoutLuksanSolvers))
(lib.cmakeBool "NLOPT_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "NLOPT_TESTS" finalAttrs.finalPackage.doCheck)
]
++ lib.optional withPython (
lib.cmakeFeature "Python_EXECUTABLE" "${buildPythonBindingsEnv.interpreter}"

View File

@@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DNS3_GTK3=ON"
"-DGTK3_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
]
++ lib.optional finalAttrs.doCheck "-DNS3_TESTS=ON";
++ lib.optional finalAttrs.finalPackage.doCheck "-DNS3_TESTS=ON";
# strictoverflow prevents clang from discovering pyembed when bindings
hardeningDisable = [

View File

@@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
# NOTE: Darwin requires a static build; otherwise, tests fail in the Python package.
BUILD_SHARED_LIBS = if stdenv.hostPlatform.isDarwin then "0" else "1";
ONNX_BUILD_PYTHON = "1";
ONNX_BUILD_TESTS = if finalAttrs.doCheck then "1" else "0";
ONNX_BUILD_TESTS = if finalAttrs.finalPackage.doCheck then "1" else "0";
# ONNX_ML is enabled by default.
# See: https://github.com/onnx/onnx/blob/b751946c3d59a3c8358abcc0569b59e6ddb08cdd/CMakeLists.txt#L66-L73
ONNX_ML = "1";

View File

@@ -286,7 +286,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
# fails to find protoc on darwin, so specify it
(lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe buildPackages.protobuf))
(lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true)
(lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf)
(lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
(lib.cmakeBool "onnxruntime_USE_NCCL" ncclSupport)

View File

@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
"--disable-bench"
"--with-boost-libdir=${boost.out}/lib"
]
++ lib.optionals (!finalAttrs.doCheck) [
++ lib.optionals (!finalAttrs.finalPackage.doCheck) [
"--enable-tests=no"
];

View File

@@ -185,7 +185,7 @@ stdenv.mkDerivation (finalAttrs: {
(mesonBool "want-math-errno" want-math-errno)
]
++ lib.optionals finalAttrs.doCheck [
++ lib.optionals finalAttrs.finalPackage.doCheck [
(mesonBool "tests" true)
# Something is broken with this and I'm not sure what.
(mesonOption "tests-cdefs" "false")

View File

@@ -43,7 +43,7 @@ buildGo127Module (finalAttrs: {
];
# required for TestIsURLPrivate
__darwinAllowLocalNetworking = finalAttrs.doCheck;
__darwinAllowLocalNetworking = finalAttrs.finalPackage.doCheck;
preFixup = ''
mv $out/bin/cmd $out/bin/pocket-id

View File

@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
(lib.cmakeBool "prevail_ENABLE_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "prevail_ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
];
installPhase = ''

View File

@@ -7,16 +7,16 @@
buildGoModule rec {
pname = "imap-mailstat-exporter";
version = "0.7.1";
version = "0.7.2";
src = fetchFromGitHub {
owner = "bt909";
repo = "imap-mailstat-exporter";
tag = "${version}";
hash = "sha256-dinHRHoTVc/0Lu+TzzmfoCyoDZQQhXw8AOlgbH46hm0=";
hash = "sha256-Q+Q7Q9zjJlp83FQ65yqi8eWO02+VkCXlYFRA66yptiE=";
};
vendorHash = "sha256-k3FjfIaNm6408I4uqmJpZsGgMiHel+NUtBclbGKTtZ4=";
vendorHash = "sha256-9rxlXhlQ269E6xtreMrDphqscaZj+IrfsNmssF/C78U=";
nativeBuildInputs = [ installShellFiles ];

View File

@@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
cmakeFlags = [
(lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
];
# 'wxFont::wxFont(int, int, int, int, bool, const wxString&, wxFontEncoding)' is deprecated

View File

@@ -15,7 +15,7 @@
let
console = stdenv.mkDerivation (finalAttrs: {
pname = "rustfs-console";
version = "0.1.13";
version = "0.1.16";
__structuredAttrs = true;
__darwinAllowLocalNetworking = true;
@@ -23,7 +23,7 @@ let
owner = "rustfs";
repo = "console";
tag = "v${finalAttrs.version}";
hash = "sha256-pxpT3kV30qA+Ob/RWi11rsapGyNc6h1EN79fcPi1e1E=";
hash = "sha256-WZ1vROBZJltcaXdwIuTsRmOY2iZxIoi7yW8lapZcaHo=";
};
pnpmDeps = fetchPnpmDeps {
@@ -51,14 +51,14 @@ let
in
rustPlatform.buildRustPackage rec {
pname = "rustfs";
version = "1.0.0-beta.9";
version = "1.0.0-beta.10";
__structuredAttrs = true;
src = fetchFromGitHub {
owner = "rustfs";
repo = "rustfs";
tag = version;
hash = "sha256-aNbicnNHaJn05k5EffgPEURf/Uj2A8PjOHiH2UGPz4M=";
hash = "sha256-lBkfaTH36MhWHk39Ie2uQqcU+yf76uImPdV91C8kWV8=";
};
postPatch = ''
@@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec {
cp -rL ${console} ./rustfs/static
'';
cargoHash = "sha256-abbsElP4dSSZnL4UfQEoHUtiEW8B/p6Y81UA7EbqbD4=";
cargoHash = "sha256-PMgC4+/n/UOpBa5oiZ1F17oht5YmN1RzoFIA0qE+h6M=";
nativeBuildInputs = [
protobuf
@@ -84,10 +84,11 @@ rustPlatform.buildRustPackage rec {
cargoTestFlags = "-p rustfs";
checkFlags = [
# failing since 1.0.0-beta.9, seem like upstream issues
# require real disks
"--skip=app::capacity_dirty_scope_test"
"--skip=app::delete_objects_stat_gating_test"
"--skip=app::put_prelookup_gating_test"
# non-deterministically panics
"--skip=two_embedded_servers_isolate_auth_and_data_planes"
];

View File

@@ -8,16 +8,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rustywind";
version = "0.25.2";
version = "0.26.0";
src = fetchFromGitHub {
owner = "avencera";
repo = "rustywind";
tag = "v${finalAttrs.version}";
hash = "sha256-PeYKBLTQ7/fmNuWtIQiqC47omrdGuIlB55OPxBQJQiM=";
hash = "sha256-uxgp8cwOswrhDLtx5ZAxsdy96/+UjYhzNKwvt0DBmhk=";
};
cargoHash = "sha256-76gC+nw/eV4j68O74XsJDaDFYAEdqZB9EzsRj5vdOvs=";
cargoHash = "sha256-W5dPMSkihxWryLEpQhqt9IpiwyAYSsIgQLbwjnXVjEk=";
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];

View File

@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "SOBJECTIZER_BUILD_STATIC" withStatic)
(lib.cmakeBool "SOBJECTIZER_BUILD_SHARED" withShared)
(lib.cmakeBool "BUILD_EXAMPLES" (buildExamples && withStatic))
(lib.cmakeBool "BUILD_TESTS" (finalAttrs.doCheck && withShared))
(lib.cmakeBool "BUILD_TESTS" (finalAttrs.finalPackage.doCheck && withShared))
];
# The tests require the shared library thanks to the patch.

View File

@@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [
(lib.cmakeFeature "QT_PACKAGE_PREFIX" "Qt${lib.versions.major kdePackages.qtbase.version}")
(lib.cmakeFeature "KF_PACKAGE_PREFIX" "KF${lib.versions.major kdePackages.qtbase.version}")
(lib.cmakeBool "BUILD_TESTING" (finalAttrs.doCheck or false))
(lib.cmakeBool "BUILD_TESTING" (finalAttrs.finalPackage.doCheck or false))
# See https://github.com/Martchus/syncthingtray/issues/208
(lib.cmakeBool "EXCLUDE_TESTS_FROM_ALL" false)
(lib.cmakeFeature "AUTOSTART_EXEC_PATH" autostartExecPath)

View File

@@ -84,8 +84,8 @@ chosenStdenv.mkDerivation (finalAttrs: {
'';
configureFlags = [
(lib.enableFeature finalAttrs.doCheck "unit")
(lib.enableFeature finalAttrs.doCheck "integration")
(lib.enableFeature finalAttrs.finalPackage.doCheck "unit")
(lib.enableFeature finalAttrs.finalPackage.doCheck "integration")
# Strangely, it uses --with-fapi=yes|no instead of a normal configure flag.
"--with-fapi=${lib.boolToYesNo fapiSupport}"

View File

@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-g+ZPKBUhBGlgvce8uTkuR983unD2kbQKgoddko7x+fk=";
})
))
(lib.cmakeBool "TT_UMD_BUILD_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "TT_UMD_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "TT_UMD_BUILD_STATIC" stdenv.hostPlatform.isStatic)
(lib.cmakeBool "TT_UMD_BUILD_PYTHON" true)
(lib.cmakeFeature "nanobind_DIR" "${python3.pkgs.nanobind}/${python3.sitePackages}/nanobind/cmake")

View File

@@ -39,7 +39,7 @@ buildGoModule (finalAttrs: {
'';
# Tests require networking.
__darwinAllowLocalNetworking = finalAttrs.doCheck;
__darwinAllowLocalNetworking = finalAttrs.finalPackage.doCheck;
postInstall = ''
mv $out/bin/wireguard $out/bin/wireguard-go

View File

@@ -1,11 +0,0 @@
--- a/src/xdp-portal-impl.c
+++ b/src/xdp-portal-impl.c
@@ -277,6 +277,8 @@ load_installed_portals (gboolean opt_verbose)
/* We need to override this in the tests */
portal_dir = g_getenv ("XDG_DESKTOP_PORTAL_DIR");
+ if (portal_dir == NULL)
+ portal_dir = g_getenv ("NIX_XDG_DESKTOP_PORTAL_DIR");
if (portal_dir != NULL)
{

View File

@@ -76,11 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
# Allow installing installed tests to a separate output.
./installed-tests-path.patch
# Look for portal definitions under path from `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable.
# While upstream has `XDG_DESKTOP_PORTAL_DIR`, it is meant for tests and actually blocks
# any configs from being loaded from anywhere else.
./nix-pkgdatadir-env.patch
# test tries to read /proc/cmdline, which is not intended to be accessible in the sandbox
./trash-test.patch
];

View File

@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "Z3_SINGLE_THREADED" (!finalAttrs.enableParallelBuilding))
(lib.cmakeBool "Z3_BUILD_LIBZ3_SHARED" (!stdenv.hostPlatform.isStatic))
(lib.cmakeFeature "CMAKE_INSTALL_PREFIX" (placeholder "out"))
(lib.cmakeBool "Z3_BUILD_TEST_EXECUTABLES" finalAttrs.doCheck)
(lib.cmakeBool "Z3_BUILD_TEST_EXECUTABLES" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "Z3_ENABLE_EXAMPLE_TARGETS" false)
]
++ lib.optionals pythonBindings [

View File

@@ -0,0 +1,26 @@
{
lib,
rustPlatform,
fetchFromGitHub,
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zellij-cb";
version = "0.2.0";
src = fetchFromGitHub {
owner = "ndavd";
repo = "zellij-cb";
tag = "v${finalAttrs.version}";
hash = "sha256-wXUwtjMsSbReU6YFZkk3CUYKetvicEQChBOa8cDBzN4=";
};
cargoHash = "sha256-IUYl5lclnlfO9ftFF0KDqAle9afHzhBcl6GWOIUHRWA=";
meta = {
description = "Customizable compact bar plugin for Zellij";
homepage = "https://github.com/ndavd/zellij-cb";
changelog = "https://github.com/ndavd/zellij-cb/releases/tag/${finalAttrs.src.tag}";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.ndavd ];
};
})

View File

@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
texinfo
]
++ lib.optionals finalAttrs.doCheck (
++ lib.optionals finalAttrs.finalPackage.doCheck (
[
which
writableTmpDirAsHomeHook

View File

@@ -30,8 +30,9 @@ let
lib.switch
[ coq.coq-version mathcomp.version ]
[
(case (range "8.20" "9.1") (isGe "2.3.0") "2.1.1")
(case (range "8.20" "9.1") (isGe "2.3.0") "2.1.0")
(case (range "9.0" "9.2") (isGe "2.5.0") "2.1.2")
(case (range "8.20" "9.1") (range "2.3.0" "2.5.0") "2.1.1")
(case (range "8.20" "9.1") (range "2.3.0" "2.5.0") "2.1.0")
(case (range "8.16" "8.20") (isGe "2.1.0") "2.0.3")
(case (range "8.16" "8.20") (isGe "2.0.0") "2.0.1")
(case (range "8.16" "8.17") (isGe "2.0.0") "2.0.0")
@@ -44,6 +45,7 @@ let
]
null;
release."2.1.2".hash = "sha256-ktoejlxAtbPzWGdW+DXwLSAmxNHDzQTujkY1If4EM8E=";
release."2.1.1".hash = "sha256-nAQAX35W9br7dgrT9FqGyHYSzwgMiMsuD1d7SztQDwY=";
release."2.1.0".hash = "sha256-UoDxy2BKraDyRsO42GXRo26O74OF51biZQGkIMWLf8Y=";
release."2.0.3".hash = "sha256-5lDq7IWlEW0EkNzYPu+dA6KOvRgy53W/alikpDr/Kd0=";
@@ -58,7 +60,6 @@ let
release."1.0.3".hash = "sha256:0hc63ny7phzbihy8l7wxjvn3haxx8jfnhi91iw8hkq8n29i23v24";
propagatedBuildInputs = [
mathcomp.ssreflect
mathcomp.algebra
bignums
multinomials
@@ -74,10 +75,15 @@ let
o.propagatedBuildInputs
++ lib.optional (lib.versions.isGe "1.1" o.version || o.version == "dev") mathcomp-real-closed;
});
patched-derivation = patched-derivation1.overrideAttrs (o: {
patched-derivation2 = patched-derivation1.overrideAttrs (o: {
propagatedBuildInputs =
o.propagatedBuildInputs
++ lib.optional (lib.versions.isLe "2.0.3" o.version && o.version != "dev") paramcoq;
});
patched-derivation3 = patched-derivation2.overrideAttrs (o: {
propagatedBuildInputs =
o.propagatedBuildInputs
++ lib.optional (lib.versions.isLe "2.1.1" o.version && o.version != "dev") mathcomp.ssreflect;
});
in
patched-derivation
patched-derivation3

View File

@@ -33,6 +33,7 @@ mkCoqDerivation {
lib.switch
[ coq.coq-version mathcomp.version ]
[
(case (range "9.0" "9.2") (range "2.6.0" "2.6.0") "2.5.0") # also works on MC 2.4 and 2.5 but breaks validsdp
(case (range "8.18" "9.1") (range "2.1.0" "2.5.0") "2.4.0")
(case (range "8.17" "9.0") (range "2.1.0" "2.3.0") "2.3.0")
(case (range "8.17" "8.20") (isGe "2.1.0") "2.2.0")
@@ -49,6 +50,7 @@ mkCoqDerivation {
]
null;
release = {
"2.5.0".hash = "sha256-e1C1NfulQV1Ep2XxNjjcxIoY5FGzndiCuwIy3upwO78=";
"2.4.0".hash = "sha256-7zfIddRH+Sl4nhEPtS/lMZwRUZI45AVFpcC/UC8Z0Yo=";
"2.3.0".hash = "sha256-usIcxHOAuN+f/j3WjVbPrjz8Hl9ac8R6kYeAKi3CEts=";
"2.2.0".hash = "sha256-Cie6paweITwPZy6ej9+qIvHFWknVR382uJPW927t/fo=";

View File

@@ -152,8 +152,8 @@ backendStdenv.mkDerivation (finalAttrs: {
(cmakeBool "CUTLASS_ENABLE_EXAMPLES" false)
# Tests.
(cmakeBool "CUTLASS_ENABLE_TESTS" finalAttrs.doCheck)
(cmakeBool "CUTLASS_ENABLE_GTEST_UNIT_TESTS" finalAttrs.doCheck)
(cmakeBool "CUTLASS_ENABLE_TESTS" finalAttrs.finalPackage.doCheck)
(cmakeBool "CUTLASS_ENABLE_GTEST_UNIT_TESTS" finalAttrs.finalPackage.doCheck)
(cmakeBool "CUTLASS_USE_SYSTEM_GOOGLETEST" true)
# NOTE: Both CUDNN and CUBLAS can be used by the examples and the profiler. Since they are large dependencies, they
@@ -189,12 +189,12 @@ backendStdenv.mkDerivation (finalAttrs: {
# NOTE: Because the test cases immediately create and try to run the binaries, we don't have an opportunity
# to patch them with autoAddDriverRunpath. To get around this, we add the driver runpath to the environment.
# TODO: This would break Jetson when using cuda_compat, as it must come first.
preCheck = optionalString finalAttrs.doCheck ''
preCheck = optionalString finalAttrs.finalPackage.doCheck ''
export LD_LIBRARY_PATH="$(readlink -mnv "${addDriverRunpath.driverLink}/lib")"
'';
# This is *not* a derivation you want to build on a small machine.
requiredSystemFeatures = optionals finalAttrs.doCheck [
requiredSystemFeatures = optionals finalAttrs.finalPackage.doCheck [
"big-parallel"
"cuda"
];

View File

@@ -7,7 +7,7 @@
stdenv.mkDerivation {
pname = "wlr-protocols";
version = "unstable-2022-09-05";
version = "0-unstable-2022-09-05";
src = fetchFromGitLab {
domain = "gitlab.freedesktop.org";
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
patchPhase = ''
substituteInPlace wlr-protocols.pc.in \
--replace '=''${pc_sysrootdir}' "=" \
--replace '=@prefix@' "=$out"
--replace-fail '=''${pc_sysrootdir}' "=" \
--replace-fail '=@prefix@' "=$out"
'';
doCheck = true;

View File

@@ -28,7 +28,7 @@ buildDunePackage (finalAttrs: {
ocplib-endian
];
checkInputs = lib.optionals finalAttrs.doCheck [
checkInputs = lib.optionals finalAttrs.finalPackage.doCheck [
alcotest
cohttp-lwt-unix
graphql-lwt

View File

@@ -1,40 +0,0 @@
{
lib,
buildDunePackage,
fetchFromGitHub,
camlidl,
fuse,
dune-configurator,
}:
buildDunePackage (finalAttrs: {
pname = "ocamlfuse";
version = "2.7.1_cvs13";
src = fetchFromGitHub {
owner = "astrada";
repo = "ocamlfuse";
rev = "v${finalAttrs.version}";
hash = "sha256-h1ExohTlr1gP2DwHKQW3PTwz6d3pust5gdeyTHJ2KBk=";
};
postPatch = ''
substituteInPlace lib/Fuse_main.c \
--replace-warn "<fuse_lowlevel.h>" "<fuse/fuse_lowlevel.h>"
'';
nativeBuildInputs = [ camlidl ];
buildInputs = [ dune-configurator ];
propagatedBuildInputs = [
camlidl
fuse
];
meta = {
homepage = "https://sourceforge.net/projects/ocamlfuse";
description = "OCaml bindings for FUSE";
license = lib.licenses.gpl2;
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ bennofs ];
};
})

View File

@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
buildPhase = ''
runHook preBuild
${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString finalAttrs.doCheck}
${topkg.buildPhase} --with-cmdliner false --tests ${lib.boolToString finalAttrs.finalPackage.doCheck}
runHook postBuild
'';

View File

@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
(lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck)
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
];
nativeCheckInputs = [

View File

@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DNO_SETCAP_OR_SUID=true"
"-Dsystemdunitdir=etc/systemd/system"
"-DINSTALL_SYSTEMD_UNITS=true"
"-DSKIP_TESTS=${lib.boolToString (!finalAttrs.doCheck)}"
"-DSKIP_TESTS=${lib.boolToString (!finalAttrs.finalPackage.doCheck)}"
]
# Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111):
++ lib.optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false";

View File

@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [
cmake
]
++ lib.optionals finalAttrs.doCheck [
++ lib.optionals finalAttrs.finalPackage.doCheck [
gtest
]
++ lib.optional nvidia addDriverRunpath;

View File

@@ -1574,8 +1574,6 @@ let
callPackage ../development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix
{ };
ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { };
ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { };
ocamlgraph_gtk = callPackage ../development/ocaml-modules/ocamlgraph/gtk.nix { };
@@ -2394,6 +2392,7 @@ let
ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom";
ocaml_lwt = throw "ocamlPackages.ocaml_lwt has been renamed to ocamlPackages.lwt"; # Added 2025-12-05
ocaml_mysql = throw "ocamlPackages.ocaml_mysql is not maintained, use ocamlPackages.mariadb instead";
ocamlfuse = throw "ocamlPackages.ocamlfuse has been removed as it depends on fuse2";
torch = throw "ocamlPackages.torch has been removed due to being broken for more than a year; see RFC 180"; # Added 2026-02-05
}
)).overrideScope