gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2025-06-05 16:35:28 +00:00
committed by GitHub
parent 4b1a98bf84 2377a24e8d
commit 7f22dba658
69 changed files with 913 additions and 939 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/monitoring/alloy.nix
+10
View File
@@ -48,6 +48,15 @@ in
'';
};
environmentFile = lib.mkOption {
type = with lib.types; nullOr path;
default = null;
example = "/run/secrets/alloy.env";
description = ''
EnvironmentFile as defined in {manpage}`systemd.exec(5)`.
'';
};
extraFlags = lib.mkOption {
type = with lib.types; listOf str;
default = [ ];
@@ -84,6 +93,7 @@ in
StateDirectory = "alloy";
WorkingDirectory = "%S/alloy";
Type = "simple";
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
};
};
};
nixos/modules/services/web-servers/nginx/default.nix
+4 -7
View File
@@ -1002,17 +1002,14 @@ in
};
mapHashBucketSize = mkOption {
type = types.nullOr (
types.enum [
32
64
128
]
);
type = types.nullOr (types.ints.positive);
default = null;
description = ''
Sets the bucket size for the map variables hash tables. Default
value depends on the processor’s cache line size.
Refer to [the nginx docs on hashes](https://nginx.org/en/docs/hash.html)
for more information.
'';
};
nixos/tests/mattermost/default.nix
+1 -1
View File
@@ -569,7 +569,7 @@ import ../make-test-python.nix (
shutdown_queue.task_done()
threading.Thread(target=shutdown_worker, daemon=True).start()
${pkgs.lib.optionalString pkgs.stdenv.isx86_64 ''
${pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 ''
# Only run the MySQL tests on x86_64 so we don't have to debug MySQL ARM issues.
run_mattermost_tests(
shutdown_queue,
pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix
+2 -2
View File
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
mktplcRef = {
name = "amazon-q-vscode";
publisher = "AmazonWebServices";
version = "1.69.0";
hash = "sha256-DmkDkBItpcbCW3pQJ2j4SFJFubSL9jhfF66EDN96W5k=";
version = "1.70.0";
hash = "sha256-nMAhVl93CImy0tQ6naB2tBAcMVC6Elo2AfvQj3jaEc4=";
};
meta = {
pkgs/applications/editors/vscode/extensions/default.nix
+2
View File
@@ -4101,6 +4101,8 @@ let
};
};
robocorp.robotframework-lsp = callPackage ./robocorp.robotframework-lsp { };
roman.ayu-next = buildVscodeMarketplaceExtension {
mktplcRef = {
name = "ayu-next";
pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
postInstall = ''
cd "$out/$installPrefix"
jq '.contributes.configuration.properties."prettier.prettierPath".default = "${prettier}/lib/node_modules/prettier"' package.json | sponge package.json
jq '.contributes.configuration.properties."prettier.prettierPath".default = "${prettier}"' package.json | sponge package.json
'';
meta = {
pkgs/applications/editors/vscode/extensions/robocorp.robotframework-lsp/default.nix
+21
View File
@@ -0,0 +1,21 @@
{
lib,
vscode-utils,
}:
vscode-utils.buildVscodeMarketplaceExtension {
mktplcRef = {
name = "robotframework-lsp";
publisher = "robocorp";
version = "1.13.0";
hash = "sha256-3hyKKAMUy4kXGRWBQCL4adV1W6xtgS1OYhJJYSzswbo=";
};
meta = {
changelog = "https://marketplace.visualstudio.com/items/myriad-dreamin.tinymist/changelog";
description = "VSCode extension for providing an integration solution for Typst";
downloadPage = "https://marketplace.visualstudio.com/items?itemName=myriad-dreamin.tinymist";
homepage = "https://github.com/myriad-dreamin/tinymist";
license = lib.licenses.asl20;
maintainers = [ lib.maintainers.drupol ];
};
}
pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+1 -4
View File
@@ -19,10 +19,7 @@ buildMozillaMach rec {
changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
description = "Web browser built from Firefox source tree";
homepage = "http://www.mozilla.com/en-US/firefox/";
maintainers = with lib.maintainers; [
lovesegfault
hexa
];
maintainers = with lib.maintainers; [ hexa ];
platforms = lib.platforms.unix;
broken = stdenv.buildPlatform.is32bit;
# since Firefox 60, build on 32-bit platforms fails with "out of memory".
pkgs/by-name/ac/actual-server/package.nix
+1 -1
View File
@@ -208,7 +208,7 @@ stdenv.mkDerivation {
mainProgram = "actual-server";
license = lib.licenses.mit;
# https://github.com/NixOS/nixpkgs/issues/403846
broken = stdenv.isDarwin;
broken = stdenv.hostPlatform.isDarwin;
maintainers = [
lib.maintainers.oddlama
lib.maintainers.patrickdag
pkgs/by-name/ag/age-plugin-se/package.nix
+1 -1
View File
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
];
# Can't find libdispatch without this on NixOS. (swift 5.8)
LD_LIBRARY_PATH = lib.optionalString stdenv.isLinux "${swiftPackages.Dispatch}/lib";
LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isLinux "${swiftPackages.Dispatch}/lib";
postPatch =
let
pkgs/by-name/ak/akkoma-admin-fe/package.nix
+1 -1
View File
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
python3
git
libsass
] ++ lib.optional stdenv.isDarwin xcbuild;
] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
configurePhase = ''
runHook preConfigure
pkgs/by-name/ar/ares-rs/package.nix
+1 -1
View File
@@ -37,6 +37,6 @@ rustPlatform.buildRustPackage rec {
license = licenses.mit;
maintainers = with maintainers; [ fab ];
mainProgram = "ares";
broken = stdenv.isDarwin;
broken = stdenv.hostPlatform.isDarwin;
};
}
pkgs/by-name/ar/arp-scan-rs/package.nix
+1 -1
View File
@@ -45,6 +45,6 @@ rustPlatform.buildRustPackage rec {
license = lib.licenses.agpl3Only;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "arp-scan";
broken = stdenv.isDarwin;
broken = stdenv.hostPlatform.isDarwin;
};
}
pkgs/by-name/bi/bicep-lsp/package.nix
+3 -3
View File
@@ -34,16 +34,16 @@ buildDotnetModule rec {
dotnet-sdk = dotnetCorePackages.sdk_8_0;
dotnet-runtime = dotnetCorePackages.runtime_8_0;
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
buildInputs = lib.optionals stdenv.isLinux [
buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
icu
libkrb5
openssl
stdenv.cc.cc.lib
];
doCheck = !(stdenv.isDarwin && stdenv.isAarch64); # mono is not available on aarch64-darwin
doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64); # mono is not available on aarch64-darwin
meta = {
description = "Domain Specific Language (DSL) for deploying Azure resources declaratively";
pkgs/by-name/ca/camilladsp/package.nix
+1 -1
View File
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildInputs = [
libpulseaudio
openssl
] ++ lib.optionals stdenv.isLinux [ alsa-lib ];
] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; };
pkgs/by-name/ca/cargo-bazel/package.nix
+1 -1
View File
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
hash = "sha256-FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios=";
};
buildInputs = lib.optional stdenv.isDarwin libz;
buildInputs = lib.optional stdenv.hostPlatform.isDarwin libz;
useFetchCargoVendor = true;
cargoHash = "sha256-E/yF42Vx9tv8Ik1j23El3+fI19ZGzq6nikVMATY7m3E=";
pkgs/by-name/cl/cli-visualizer/package.nix
-53
View File
@@ -1,53 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
cmake,
fftw,
ncurses5,
libpulseaudio,
makeWrapper,
}:
stdenv.mkDerivation rec {
version = "1.8";
pname = "cli-visualizer";
src = fetchFromGitHub {
owner = "dpayne";
repo = "cli-visualizer";
rev = "v${version}";
sha256 = "003mbbwsz43mg3d7llphpypqa9g7rs1p1cdbqi1mbc2bfrc1gcq2";
};
postPatch = ''
sed '1i#include <cmath>' -i src/Transformer/SpectrumCircleTransformer.cpp
'';
nativeBuildInputs = [
cmake
makeWrapper
];
buildInputs = [
fftw
ncurses5
libpulseaudio
];
buildFlags = [ "ENABLE_PULSE=1" ];
postInstall = ''
# See https://github.com/dpayne/cli-visualizer/issues/62#issuecomment-330738075
wrapProgram $out/bin/vis --set TERM rxvt-256color
'';
meta = {
homepage = "https://github.com/dpayne/cli-visualizer";
description = "CLI based audio visualizer";
license = lib.licenses.mit;
maintainers = [ lib.maintainers.matthiasbeyer ];
platforms = with lib.platforms; linux;
mainProgram = "vis";
};
}
pkgs/by-name/cl/cloud-provider-kind/package.nix
+1 -1
View File
@@ -19,7 +19,7 @@ buildGoModule rec {
vendorHash = null;
checkFlags = lib.optional stdenv.isDarwin "-skip=^Test_firstSuccessfulProbe$";
checkFlags = lib.optional stdenv.hostPlatform.isDarwin "-skip=^Test_firstSuccessfulProbe$";
meta = {
description = "Load Balancer implementation for Kubernetes-in-Docker";
pkgs/by-name/cr/crowdin-cli/package.nix
+2 -2
View File
@@ -14,11 +14,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "crowdin-cli";
version = "4.7.0";
version = "4.7.1";
src = fetchurl {
url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip";
hash = "sha256-PAmWjFKaiazw+tW3ITekkmMnNCB/fHYM0X/n8ef6jWE=";
hash = "sha256-Go1/oz0FF8BhjADkjqjfcoQX5wRBS/9Z9m//pBvTJz8=";
};
nativeBuildInputs = [
pkgs/by-name/dh/dhcpcd/package.nix
+4 -4
View File
@@ -8,6 +8,8 @@
runtimeShellPackage,
runtimeShell,
nixosTests,
# Always tries to do dynamic linking for udev.
withUdev ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic,
enablePrivSep ? false,
}:
@@ -27,7 +29,7 @@ stdenv.mkDerivation rec {
[
runtimeShellPackage # So patchShebangs finds a bash suitable for the installed scripts
]
++ lib.optionals stdenv.hostPlatform.isLinux [
++ lib.optionals withUdev [
udev
]
++ lib.optionals stdenv.hostPlatform.isFreeBSD [
@@ -58,9 +60,7 @@ stdenv.mkDerivation rec {
];
# Check that the udev plugin got built.
postInstall = lib.optionalString (
udev != null && stdenv.hostPlatform.isLinux
) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
postInstall = lib.optionalString withUdev "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
passthru.tests = {
inherit (nixosTests.networking.scripted)
pkgs/by-name/ez/ezstream/package.nix
+7 -2
View File
@@ -2,6 +2,7 @@
lib,
stdenv,
fetchurl,
check,
libiconv,
libshout,
taglib,
@@ -11,13 +12,17 @@
stdenv.mkDerivation rec {
pname = "ezstream";
version = "0.6.0";
version = "1.0.2";
src = fetchurl {
url = "https://ftp.osuosl.org/pub/xiph/releases/ezstream/${pname}-${version}.tar.gz";
sha256 = "f86eb8163b470c3acbc182b42406f08313f85187bd9017afb8b79b02f03635c9";
hash = "sha256-Ed6Jf0ValbpYVGvc1AqV072mmGbsX3h5qDsCQSbFTCo=";
};
checkInputs = [
check
];
buildInputs = [
libiconv
libshout
pkgs/by-name/fl/fluent-bit/package.nix
+1 -1
View File
@@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
versionCheckProgramArg = "--version";
passthru = {
tests = lib.optionalAttrs stdenv.isLinux {
tests = lib.optionalAttrs stdenv.hostPlatform.isLinux {
inherit (nixosTests) fluent-bit;
};
pkgs/by-name/gc/gcc-arm-embedded-13/package.nix
+3 -3
View File
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
./info-fix.patch
];
nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
makeBinaryWrapper
darwin.sigtool
];
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
'';
preFixup =
lib.optionalString stdenv.isLinux ''
lib.optionalString stdenv.hostPlatform.isLinux ''
find $out -type f | while read f; do
patchelf "$f" > /dev/null 2>&1 || continue
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
} "$f" || true
done
''
+ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
+ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
find "$out" -executable -type f | while read executable; do
( \
install_name_tool \
pkgs/by-name/gc/gcc-arm-embedded-14/package.nix
+3 -3
View File
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
};
nativeBuildInputs = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
makeBinaryWrapper
darwin.sigtool
];
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
'';
preFixup =
lib.optionalString stdenv.isLinux ''
lib.optionalString stdenv.hostPlatform.isLinux ''
find $out -type f | while read f; do
patchelf "$f" > /dev/null 2>&1 || continue
patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
} "$f" || true
done
''
+ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
+ lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
find "$out" -executable -type f | while read executable; do
( \
install_name_tool \
pkgs/by-name/gz/gz-cmake/package.nix
+1 -1
View File
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
postPatch = ''
patchShebangs examples/test_c_child_requires_c_no_deps.bash
substituteInPlace examples/CMakeLists.txt --replace-fail \
"$""{CMAKE_INSTALL_LIBDIR}" "${if stdenv.isDarwin then "lib" else "lib64"}"
"$""{CMAKE_INSTALL_LIBDIR}" "${if stdenv.hostPlatform.isDarwin then "lib" else "lib64"}"
'';
nativeBuildInputs = [
pkgs/by-name/ht/http-scanner/package.nix
+1 -1
View File
@@ -31,6 +31,6 @@ buildGoModule rec {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ fab ];
mainProgram = "http-scanner";
broken = stdenv.isDarwin;
broken = stdenv.hostPlatform.isDarwin;
};
}
pkgs/by-name/ja/jai/package.nix
+1 -1
View File
@@ -37,7 +37,7 @@ let
];
};
in
if stdenv.isLinux then
if stdenv.hostPlatform.isLinux then
buildFHSEnv {
inherit meta pname version;
targetPkgs = pkgs: [ pkgs.zlib ];
pkgs/by-name/li/libcdio/package.nix
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-izjZk2kz9PkLm9+INUdl1e7jMz3nUsQKdplKI9Io+CM=";
};
env = lib.optionalAttrs stdenv.is32bit {
env = lib.optionalAttrs stdenv.hostPlatform.is32bit {
NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE";
};
pkgs/by-name/ma/matrix-brandy/package.nix
+2 -2
View File
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
hash = "sha256-sMgYgV4/vV1x5xSICXRpW6K8uCdVlJrS7iEg6XzQRo8=";
};
patches = lib.optionals stdenv.isDarwin [ ./no-lrt.patch ];
patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./no-lrt.patch ];
makeFlags = lib.optionals stdenv.isDarwin [
makeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
"CC=cc"
"LD=clang"
];
pkgs/by-name/mu/musl-obstack/package.nix
+1 -1
View File
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-oydS7FubUniMHAUWfg84OH9+CZ0JCrTXy7jzwOyJzC8=";
};
patches = lib.optionals stdenv.isDarwin [
patches = lib.optionals stdenv.hostPlatform.isDarwin [
./0001-ignore-obstack_free-alias-on-darwin.patch
];
pkgs/by-name/mu/muvm/package.nix
+2 -2
View File
@@ -39,7 +39,7 @@ let
dhcpcd
passt
(placeholder "out")
] ++ lib.optionals stdenv.isAarch64 [ fex ];
] ++ lib.optionals stdenv.hostPlatform.isAarch64 [ fex ];
wrapArgs = lib.escapeShellArgs [
"--prefix"
"PATH"
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec {
--replace-fail "/sbin/sysctl" "${lib.getExe' procps "sysctl"}"
''
# Only patch FEX path if we're aarch64, otherwise we don't want the derivation to pull in FEX in any way
+ lib.optionalString stdenv.isAarch64 ''
+ lib.optionalString stdenv.hostPlatform.isAarch64 ''
substituteInPlace crates/muvm/src/guest/mount.rs \
--replace-fail "/usr/share/fex-emu" "${fex}/share/fex-emu"
'';
pkgs/by-name/ne/neofetch/package.nix
+4 -2
View File
@@ -5,7 +5,7 @@
bash,
makeWrapper,
pciutils,
x11Support ? !stdenvNoCC.isOpenBSD,
x11Support ? !stdenvNoCC.hostPlatform.isOpenBSD,
ueberzug,
fetchpatch,
}:
@@ -56,7 +56,9 @@ stdenvNoCC.mkDerivation {
postInstall = ''
wrapProgram $out/bin/neofetch \
--prefix PATH : ${
lib.makeBinPath (lib.optional (!stdenvNoCC.isOpenBSD) pciutils ++ lib.optional x11Support ueberzug)
lib.makeBinPath (
lib.optional (!stdenvNoCC.hostPlatform.isOpenBSD) pciutils ++ lib.optional x11Support ueberzug
)
}
'';
pkgs/by-name/op/openvswitch/package.nix
+2 -2
View File
@@ -30,13 +30,13 @@
stdenv.mkDerivation rec {
pname = if withDPDK then "openvswitch-dpdk" else "openvswitch";
version = "3.5.0";
version = "3.5.1";
src = fetchFromGitHub {
owner = "openvswitch";
repo = "ovs";
tag = "v${version}";
hash = "sha256-fEntEZHmQX78XZZic9hFr07PWC2RQIpuCfb1FYX3hd0=";
hash = "sha256-iiFpX4w6vdsRxjhRcxXTTtSAb8WPwg1afqwgBpzjhoA=";
};
outputs = [
pkgs/by-name/os/osu-lazer-bin/package.nix
+5 -5
View File
@@ -10,23 +10,23 @@
let
pname = "osu-lazer-bin";
version = "2025.424.0";
version = "2025.605.3";
src =
{
aarch64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
hash = "sha256-fgG3SnltGxOYHwos8BTngaW4YrRdpOdURxd73sz0t7o=";
hash = "sha256-TN0TnwY4lXsKHeCYBKmYSenuBZIt0n0bbEw1BVWwDZc=";
stripRoot = false;
};
x86_64-darwin = fetchzip {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
hash = "sha256-0K+uAH4f8JOfzG4J37aGaStpEkH5tdUfHEqsogMtN2I=";
hash = "sha256-vFqow+G8Ebzgnau9c6TYit7SKDMIeJJOKI0DXAevBXY=";
stripRoot = false;
};
x86_64-linux = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
hash = "sha256-8nOoSkNbzEFpDj0FivCYI20tZzT02YHcKZblfEfh+Zo=";
hash = "sha256-k09fyaSfGZgC7VoDp68+xb5wxiXGQllXKqCpz+7k0So=";
};
}
.${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
@@ -55,7 +55,7 @@ let
passthru.updateScript = ./update.sh;
in
if stdenvNoCC.isDarwin then
if stdenvNoCC.hostPlatform.isDarwin then
stdenvNoCC.mkDerivation {
inherit
pname
pkgs/by-name/os/osu-lazer/deps.json
Generated
+4 -4
View File
@@ -651,8 +651,8 @@
},
{
"pname": "ppy.osu.Framework",
"version": "2025.419.0",
"hash": "sha256-fsuEdzD4pzBID7I7DNAYs4JGrCkm/ALtZkEu5/QgKVQ="
"version": "2025.604.1",
"hash": "sha256-TnxNneBVR6YYuaUbU1sHewwVzy15qmCpudSopHol1tM="
},
{
"pname": "ppy.osu.Framework.NativeLibs",
@@ -666,8 +666,8 @@
},
{
"pname": "ppy.osu.Game.Resources",
"version": "2025.321.0",
"hash": "sha256-vjNwUVBSOrWEc8z8QXD+CPSZMj9BCKuKIQZXxqaXldc="
"version": "2025.605.0",
"hash": "sha256-t9uNvlimF81LNECTBnhLidSmN8cOXi3Sn0rqI3na3zQ="
},
{
"pname": "ppy.osuTK.NS20",
pkgs/by-name/os/osu-lazer/package.nix
+2 -2
View File
@@ -22,13 +22,13 @@
buildDotnetModule rec {
pname = "osu-lazer";
version = "2025.424.0";
version = "2025.605.3";
src = fetchFromGitHub {
owner = "ppy";
repo = "osu";
tag = version;
hash = "sha256-+r7YeaNrUkoYoMzGqhqT+bqdO1UohvJRlAcAskF7vn4=";
hash = "sha256-hzD2OX+bnJ4cvq09wXQ1rINZ3DI97BwSrZ/yxyjWKoM=";
};
projectFile = "osu.Desktop/osu.Desktop.csproj";
pkgs/by-name/ov/ovftool/package.nix
+1 -1
View File
@@ -341,7 +341,7 @@ stdenv.mkDerivation (final: {
];
platforms = builtins.attrNames ovftoolSystems;
mainProgram = "ovftool";
knownVulnerabilities = lib.optionals (stdenv.isDarwin) [
knownVulnerabilities = lib.optionals (stdenv.hostPlatform.isDarwin) [
"The bundled version of openssl 1.0.2zj in ovftool for Darwin has open vulnerabilities."
"https://openssl-library.org/news/vulnerabilities-1.0.2/"
"CVE-2024-0727"
pkgs/by-name/ri/rime-wanxiang/package.nix
+2 -2
View File
@@ -9,13 +9,13 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "rime-wanxiang";
version = "6.8.7";
version = "7.0.5";
src = fetchFromGitHub {
owner = "amzxyz";
repo = "rime_wanxiang";
tag = "v" + finalAttrs.version;
hash = "sha256-t3A79jvNxroq+aeHwwc24rvzPDJbKxkOgrb9mgdN340=";
hash = "sha256-We1MuK9lLrIBRXQODrk91Xe0aWskwsiOZvxCh/oCdeU=";
};
nativeBuildInputs = [
pkgs/by-name/rp/rp/package.nix
+2 -2
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
cmake
ninja
];
buildInputs = lib.optionals (stdenv.isLinux) [ stdenv.cc.libc.static ];
buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ stdenv.cc.libc.static ];
src = fetchFromGitHub {
owner = "0vercl0k";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
installPhase = ''
mkdir -p $out/bin
cp rp-${if stdenv.isDarwin then "osx" else "lin"} $out/bin/rp
cp rp-${if stdenv.hostPlatform.isDarwin then "osx" else "lin"} $out/bin/rp
'';
meta = with lib; {
pkgs/by-name/ry/ryubing/package.nix
+1 -1
View File
@@ -101,7 +101,7 @@ buildDotnetModule rec {
"--set SDL_VIDEODRIVER x11"
];
preInstall = lib.optionalString stdenv.isLinux ''
preInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
# workaround for https://github.com/Ryujinx/Ryujinx/issues/2349
mkdir -p $out/lib/sndio-6
ln -s ${sndio}/lib/libsndio.so $out/lib/sndio-6/libsndio.so.6
pkgs/by-name/sd/sdcc/package.nix
+14 -5
View File
@@ -39,11 +39,20 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-1QMEN/tDa7HZOo29v7RrqqYGEzGPT7P1hx1ygV0e7YA=";
};
outputs = [
"out"
"doc"
"man"
];
# TODO: sdcc version 4.5.0 does not currently produce a man output.
# Until the fix to sdcc's makefiles is released, this workaround
# conditionally withholds the man output on darwin.
#
# sdcc's tracking issue:
# <https://sourceforge.net/p/sdcc/bugs/3848/>
outputs =
[
"out"
"doc"
]
++ lib.optionals (!stdenv.isDarwin) [
"man"
];
enableParallelBuilding = true;
pkgs/by-name/sp/spider/package.nix
+1 -1
View File
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
"--skip=pdl_is_fresh"
"--skip=verify_revision_available"
]
++ lib.optionals stdenv.isDarwin [
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Sandbox limitation: attempted to create a NULL object
"--skip=website::test_link_duplicates"
"--skip=website::not_crawl_blacklist"
pkgs/by-name/st/stalwart-mail/package.nix
+3 -20
View File
@@ -9,7 +9,6 @@
sqlite,
foundationdb,
zstd,
rust-jemalloc-sys-unprefixed,
stdenv,
nix-update-script,
nixosTests,
@@ -19,9 +18,6 @@
stalwartEnterprise ? false,
}:
let
rocksdbJemalloc = rocksdb.override { enableJemalloc = true; };
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise");
version = "0.12.2";
@@ -33,17 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
hash = "sha256-P19jeEzFE8Gu6hqHZJiPoJ70r+zOmzOpEwfFqPQczZY=";
};
# rocksdb does not properly distinguish between pointers it has allocated itself
# and pointers which were passed in and might be registered with a different
# allocator, so we enable the unprefixed_malloc_on_supported_platforms to use
# jemalloc implicitly in the entire process.
postPatch = ''
for file in crates/main/Cargo.toml tests/Cargo.toml; do
substituteInPlace $file --replace-fail \
'jemallocator = "0.5.0"' 'jemallocator = { version = "0.5.0", features = ["unprefixed_malloc_on_supported_platforms"] }'
done
'';
useFetchCargoVendor = true;
cargoHash = "sha256-WVvDapCA9pTgOtPpbsK78u2AC2hUfo3sOejZ6pJSlQk=";
@@ -58,8 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
openssl
sqlite
zstd
rust-jemalloc-sys-unprefixed
rocksdbJemalloc
] ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ];
# Issue: https://github.com/stalwartlabs/stalwart/issues/1104
@@ -80,8 +63,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
env = {
OPENSSL_NO_VENDOR = true;
ZSTD_SYS_USE_PKG_CONFIG = true;
ROCKSDB_INCLUDE_DIR = "${rocksdbJemalloc}/include";
ROCKSDB_LIB_DIR = "${rocksdbJemalloc}/lib";
ROCKSDB_INCLUDE_DIR = "${rocksdb}/include";
ROCKSDB_LIB_DIR = "${rocksdb}/lib";
};
postInstall = ''
@@ -172,7 +155,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
__darwinAllowLocalNetworking = true;
passthru = {
rocksdb = rocksdbJemalloc; # make used rocksdb version available (e.g., for backup scripts)
inherit rocksdb; # make used rocksdb version available (e.g., for backup scripts)
webadmin = callPackage ./webadmin.nix { };
updateScript = nix-update-script { };
tests.stalwart-mail = nixosTests.stalwart-mail;
pkgs/by-name/yn/ynetd/package.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-7gioQ0r0LlUftIWKRwTqeZQl0GtskcRKaEE5z6A0S24=";
};
postPatch = lib.optionalString stdenv.isDarwin ''
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace Makefile --replace-fail "-Wl,-z,relro,-z,now" ""
'';
pkgs/development/beam-modules/build-mix.nix
+2 -2
View File
@@ -57,8 +57,8 @@ let
in
"[${lib.concatStringsSep "," options}]";
LANG = if stdenv.isLinux then "C.UTF-8" else "C";
LC_CTYPE = if stdenv.isLinux then "C.UTF-8" else "UTF-8";
LANG = if stdenv.hostPlatform.isLinux then "C.UTF-8" else "C";
LC_CTYPE = if stdenv.hostPlatform.isLinux then "C.UTF-8" else "UTF-8";
# add to ERL_LIBS so other modules can find at runtime.
# http://erlang.org/doc/man/code.html#code-path
pkgs/development/beam-modules/mix-release.nix
+2 -2
View File
@@ -138,8 +138,8 @@ stdenv.mkDerivation (
in
"[${lib.concatStringsSep "," options}]";
LANG = if stdenv.isLinux then "C.UTF-8" else "C";
LC_CTYPE = if stdenv.isLinux then "C.UTF-8" else "UTF-8";
LANG = if stdenv.hostPlatform.isLinux then "C.UTF-8" else "C";
LC_CTYPE = if stdenv.hostPlatform.isLinux then "C.UTF-8" else "UTF-8";
postUnpack =
''
pkgs/development/compilers/dotnet/packages.nix
+7 -4
View File
@@ -162,10 +162,13 @@ let
runHook postInstall
'';
${if stdenvNoCC.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null} = ''
mkdir -p "$out"/nix-support
cp "$src"/nix-support/manual-sdk-deps "$out"/nix-support/manual-sdk-deps
'';
${
if stdenvNoCC.hostPlatform.isDarwin && lib.versionAtLeast version "10" then "postInstall" else null
} =
''
mkdir -p "$out"/nix-support
cp "$src"/nix-support/manual-sdk-deps "$out"/nix-support/manual-sdk-deps
'';
passthru = {
inherit (vmr) icu targetRid hasILCompiler;
pkgs/development/compilers/elm/packages/node/node-composition.nix
+1 -1
View File
@@ -18,7 +18,7 @@ let
writeShellScript
;
inherit pkgs nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
pkgs/development/compilers/llvm/default.nix
+3 -3
View File
@@ -33,9 +33,9 @@ let
"19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
"20.1.5".officialRelease.sha256 = "sha256-WKfY+VvAsZEEc0xYgF6+MsXDXZz7haMU6bxqmUpaHuQ=";
"21.0.0-git".gitRelease = {
rev = "0004c37c1cd55c461bbf24b83165d11f49be1397";
rev-version = "21.0.0-unstable-2025-05-25";
sha256 = "sha256-n8WFnYNb46kK7MEh7XF/Psdbn+KJQFKs/LQBZxCklY4=";
rev = "9e2684e4cfb0a7e30d5e49f812127d07cdda600d";
rev-version = "21.0.0-unstable-2025-06-06";
sha256 = "sha256-OtIRNU+AuUaPhAsd0Kn0odAdPJhkV/139+DR6Ls0XrE=";
};
} // llvmVersions;
pkgs/development/compilers/zig/generic.nix
+1 -4
View File
@@ -68,9 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
"doc"
];
# strictDeps breaks zig when clang is being used.
# https://github.com/NixOS/nixpkgs/issues/317055#issuecomment-2148438395
strictDeps = !stdenv.cc.isClang;
strictDeps = true;
# On Darwin, Zig calls std.zig.system.darwin.macos.detect during the build,
# which parses /System/Library/CoreServices/SystemVersion.plist and
@@ -79,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: {
# OSVersionDetectionFail when the sandbox is enabled.
__impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [
"/System/Library/CoreServices/.SystemVersionPlatform.plist"
"/System/Library/CoreServices/SystemVersion.plist"
];
preBuild = ''
pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+1 -1
View File
@@ -25,7 +25,7 @@ qtModule {
];
strictDeps = true;
nativeBuildInputs = lib.optionals stdenv.isDarwin [
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
darwin.sigtool
];
pkgs/development/libraries/webkitgtk/default.nix
+2 -2
View File
@@ -80,7 +80,7 @@
# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
clangStdenv.mkDerivation (finalAttrs: {
pname = "webkitgtk";
version = "2.48.2";
version = "2.48.3";
name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
if lib.versionAtLeast gtk3.version "4.0" then
"6.0"
@@ -100,7 +100,7 @@ clangStdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
hash = "sha256-7Fj238JdOzYDiOGS+GUGjWmqsJtNffAh+Q4xTS+lTzc=";
hash = "sha256-1NxZcPD8alKf9/1nvL+rK7tekb54my6SeWQLMhengsM=";
};
patches = lib.optionals clangStdenv.hostPlatform.isLinux [
pkgs/development/lisp-modules/imported.nix
+2 -2
View File
@@ -15922,7 +15922,7 @@ lib.makeScope pkgs.newScope (self: {
meta = {
hydraPlatforms = [ ];
# darwin cannot find libpango.dylib
broken = stdenv.isDarwin;
broken = stdenv.hostPlatform.isDarwin;
};
}
);
@@ -39541,7 +39541,7 @@ lib.makeScope pkgs.newScope (self: {
meta = {
hydraPlatforms = [ ];
# darwin cannot find libpango.dylib
broken = stdenv.isDarwin;
broken = stdenv.hostPlatform.isDarwin;
};
}
);
pkgs/development/mobile/androidenv/build-tools.nix
+1 -1
View File
@@ -23,7 +23,7 @@ deployAndroidPackage {
pkgs.ncurses5
pkgs.libcxx
]
++ lib.optionals (os == "linux" && stdenv.isx86_64) (
++ lib.optionals (os == "linux" && stdenv.hostPlatform.isx86_64) (
with pkgsi686Linux;
[
glibc
pkgs/development/php-packages/tideways/default.nix
+1 -1
View File
@@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
or (throw "Unsupported platform for tideways-php: ${stdenvNoCC.hostPlatform.system}");
nativeBuildInputs = lib.optionals stdenvNoCC.isLinux [
nativeBuildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [
autoPatchelfHook
];
pkgs/development/python-modules/cmd2/default.nix
+2 -2
View File
@@ -20,14 +20,14 @@
buildPythonPackage rec {
pname = "cmd2";
version = "2.5.11";
version = "2.6.0";
pyproject = true;
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-MKDThQIfvkpBFmcoReVpW75W62gvkJYGZ3Y5T5VKdCk=";
hash = "sha256-jP+rp4EFJkIcqzv6AQG0kH4SmP8rzYEZYVllourl2V8=";
};
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
pkgs/development/python-modules/cut-cross-entropy/default.nix
+1 -1
View File
@@ -58,7 +58,7 @@ buildPythonPackage {
transformers
];
# `deepspeed` is not yet packaged in nixpkgs
# ++ lib.optionals (!stdenv.isDarwin) [
# ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
# deepspeed
# ];
};
pkgs/development/python-modules/django/5_1.nix
+2 -2
View File
@@ -44,7 +44,7 @@
buildPythonPackage rec {
pname = "django";
version = "5.1.9";
version = "5.1.10";
pyproject = true;
disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
owner = "django";
repo = "django";
rev = "refs/tags/${version}";
hash = "sha256-uBP6MoVjPUtNu6KxLjaYmKTN42JIUCTJSuSnQWSxyQU=";
hash = "sha256-+VsTrlff1eBGaVBqRHNOivVXqBkfjZvY2dzawE1sOOQ=";
};
patches =
pkgs/development/python-modules/fmpy/default.nix
+1 -1
View File
@@ -119,7 +119,7 @@ buildPythonPackage rec {
cmakeConfigurePhase
cmake --build native/src/build --config Release
''
+ lib.optionalString (enableRemoting && stdenv.isLinux) ''
+ lib.optionalString (enableRemoting && stdenv.hostPlatform.isLinux) ''
# reimplementation of native/build_remoting.py
cmakeFlags="-S native/remoting -B remoting/linux64 -D RPCLIB=${rpclib}"
cmakeConfigurePhase
pkgs/development/python-modules/peft/default.nix
+1 -1
View File
@@ -71,7 +71,7 @@ buildPythonPackage rec {
pytestFlagsArray = [ "tests" ];
# These tests fail when MPS devices are detected
disabledTests = lib.optional stdenv.isDarwin [
disabledTests = lib.optional stdenv.hostPlatform.isDarwin [
"gpu"
];
pkgs/development/python-modules/prometheus-fastapi-instrumentator/default.nix
+1 -1
View File
@@ -46,7 +46,7 @@ buildPythonPackage rec {
];
# numerous test failures on Darwin
doCheck = stdenv.isLinux;
doCheck = stdenv.hostPlatform.isLinux;
pythonImportsCheck = [ "prometheus_fastapi_instrumentator" ];
pkgs/development/python-modules/pygal/default.nix
+1 -1
View File
@@ -61,7 +61,7 @@ buildPythonPackage rec {
__impureHostDeps = [ "/System/Library/Fonts" ];
postCheck = ''
export LANG=${if stdenv.isDarwin then "en_US.UTF-8" else "C.UTF-8"}
export LANG=${if stdenv.hostPlatform.isDarwin then "en_US.UTF-8" else "C.UTF-8"}
'';
meta = with lib; {
pkgs/development/python-modules/smolagents/default.nix
+1 -1
View File
@@ -132,7 +132,7 @@ buildPythonPackage rec {
"test_visit_webpage"
"test_wikipedia_search"
]
++ lib.optionals stdenv.isDarwin [
++ lib.optionals stdenv.hostPlatform.isDarwin [
# Missing dependencies
"test_get_mlx"
pkgs/development/python-modules/vllm/default.nix
+1 -1
View File
@@ -295,7 +295,7 @@ buildPythonPackage rec {
lib.optionals cpuSupport [
oneDNN
]
++ lib.optionals (cpuSupport && stdenv.isLinux) [
++ lib.optionals (cpuSupport && stdenv.hostPlatform.isLinux) [
numactl
]
++ lib.optionals cudaSupport (
pkgs/kde/generated/sources/gear.json
+750 -750
View File
File diff suppressed because it is too large Load Diff
pkgs/servers/nextcloud/packages/apps/recognize.nix
+1 -1
View File
@@ -10,7 +10,7 @@
ffmpeg-headless,
# Current derivation only supports linux-x86_64 (contributions welcome, without libTensorflow builtin webassembly can be used)
useLibTensorflow ? stdenv.isx86_64 && stdenv.isLinux,
useLibTensorflow ? stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isLinux,
ncVersion,
}:
pkgs/servers/sql/percona-server/8_4.nix
+2 -2
View File
@@ -50,11 +50,11 @@ assert !(withJemalloc && withTcmalloc);
stdenv.mkDerivation (finalAttrs: {
pname = "percona-server";
version = "8.4.4-4";
version = "8.4.5-5";
src = fetchurl {
url = "https://downloads.percona.com/downloads/Percona-Server-${lib.versions.majorMinor finalAttrs.version}/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
hash = "sha256-10QYJQeCY3pFHmtBIQ72rsagicNJgHvNtbLPvjjUyg4=";
hash = "sha256-i0f/Ndwqbn6qyqLSBK5FbBW12ZUzYMy2JQ2o1o2Y9q8=";
};
nativeBuildInputs = [
pkgs/tools/system/uefitool/new-engine.nix
+1 -1
View File
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
zip
wrapQtAppsHook
];
patches = lib.optionals stdenv.isDarwin [ ./bundle-destination.patch ];
patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./bundle-destination.patch ];
meta = {
description = "UEFI firmware image viewer and editor";
pkgs/top-level/aliases.nix
+1
View File
@@ -443,6 +443,7 @@ mapAliases {
clamsmtp = throw "'clamsmtp' has been removed as it is unmaintained and broken"; # Added 2025-05-17
clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05
clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05
cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
inherit (libsForQt5.mauiPackages) clip; # added 2022-05-17
cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18
clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07