c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge staging-next into staging

Browse source
This commit is contained in:
nixpkgs-ci[bot] 2026-07-02 07:09:50 +00:00 • committed by GitHub
commit 443edeffde
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 291 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/networking/cluster/terraform-providers/providers.json
View file

@ -1058,11 +1058,11 @@
"vendorHash": null
},
"oracle_oci": {
"hash": "sha256-ByAuY0y7tpzeaHmf1VTpvVUzRFxhuS49g57XqJ4Mnuk=",
"hash": "sha256-2mdir7UZJpDxRy5GcB27ovJrE8UQmzjS5ciYY9pKZW8=",
"homepage": "https://registry.terraform.io/providers/oracle/oci",
"owner": "oracle",
"repo": "terraform-provider-oci",
"rev": "v8.19.0",
"rev": "v8.20.0",
"spdx": "MPL-2.0",
"vendorHash": null
},

6
pkgs/by-name/be/betterleaks/package.nix
View file

@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "betterleaks";
version = "1.5.0";
version = "1.6.1";
src = fetchFromGitHub {
owner = "betterleaks";
repo = "betterleaks";
tag = "v${finalAttrs.version}";
hash = "sha256-7Oa6mtFhkHqgd4/FH85W7Bc/KSMwPCeHRhIFk2KVkik=";
hash = "sha256-2VjvTS2qOUH8W+hFm4xA3xCGZZs+oP1KQOSq6FBLjaw=";
};
vendorHash = "sha256-KAZfl2t8LUsgQBKsrgXsh/1ziX0FZvDhnSUAv7D/hSA=";
vendorHash = "sha256-UBzobzZeIYzP+mU3+9GRF4lAs+cpqkIt+3mBpTN1BN8=";
ldflags = [
"-s"

6
pkgs/by-name/cl/clusternet/package.nix
View file

@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "clusternet";
version = "0.18.1";
version = "1.0.0";
src = fetchFromGitHub {
owner = "clusternet";
repo = "clusternet";
tag = "v${finalAttrs.version}";
hash = "sha256-MtiQM2msHv2gLaVpYoSrzJMZWwA0vMBIklwAQi+lG4g=";
hash = "sha256-Nrnk3Ru4DTOagc7iTC4ZGyYhqhQwLIgs3fu67l0stEs=";
};
vendorHash = "sha256-vG+k9ttXp/QqhbVKgwn2uo5kEk8OD+LBvJi5lBQfUk4=";
vendorHash = "sha256-mMXtiCz4Y5pL77c24RnZ2Uoq5Fh2pkrkApAdkd/xyyw=";
ldFlags = [
"-s"

4
pkgs/by-name/dr/drasl/package.nix
View file

@ -10,13 +10,13 @@
}:
buildGoModule (finalAttrs: {
pname = "drasl";
version = "3.4.3";
version = "3.4.4";
src = fetchFromGitHub {
owner = "unmojang";
repo = "drasl";
tag = "v${finalAttrs.version}";
hash = "sha256-kisClBALEESxuGh2gtwCyB02/SrYvabouaApho7z7GY=";
hash = "sha256-GHwgN1yWf/xav2t03/09x/U0c6fRBDmEn0mDIv+V9ic=";
};
nativeBuildInputs = [

6
pkgs/by-name/fi/filebeat8/package.nix
View file

@ -8,18 +8,18 @@
buildGoModule (finalAttrs: {
pname = "filebeat";
version = "8.19.16";
version = "8.19.17";
src = fetchFromGitHub {
owner = "elastic";
repo = "beats";
tag = "v${finalAttrs.version}";
hash = "sha256-OBPaSbPAp7SvhEi2yycgT70yRfCtIEdkL4/GSR2YrO4=";
hash = "sha256-Xpth1SoXMXCUh/DFf3wA+Ql6SedtUB7tCYzDElpX5Lc=";
};
proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-aCoXzWnNsctxJmsfeUyVSLkUY59adtIn2JxxGKPBob8=";
vendorHash = "sha256-Wxk+eI0XfBpQqqUNuskyr+/bTRqT38hszdkz/LJweQo=";
subPackages = [ "filebeat" ];

4
pkgs/by-name/ft/ft2-clone/package.nix
View file

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "ft2-clone";
version = "2.19";
version = "2.20";
src = fetchFromGitHub {
owner = "8bitbubsy";
repo = "ft2-clone";
rev = "v${finalAttrs.version}";
hash = "sha256-vIo+7yb8QjzHAj68N2rHHc1o2knaBn6hCatDeKr+5gs=";
hash = "sha256-e0oIn/g5bWYMFhvd54reacGI8/s7pMfujnEPzYnUbF4=";
};
nativeBuildInputs = [ cmake ];

6
pkgs/by-name/in/intelli-shell/package.nix
View file

@ -11,16 +11,16 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "intelli-shell";
version = "3.4.4";
version = "3.4.5";
src = fetchFromGitHub {
owner = "lasantosr";
repo = "intelli-shell";
rev = "v${finalAttrs.version}";
hash = "sha256-/DkR2s6xHXhQxwJEEs4vXK7Zc4lwLQvBnqUqW75h0Do=";
hash = "sha256-jC5hvyefEEU8odiPaUWtWm8o2oHyS7ZOw4nJdvylb0U=";
};
cargoHash = "sha256-9/ZxPYgkETIKRizrlz+Pb9oWUYEeoSSmGk8EjzQO7PY=";
cargoHash = "sha256-g/sJJiwUl+N4ryFXhrbSIaOl0zzXKbehGyxTNamtua8=";
nativeBuildInputs = [
pkg-config

10
pkgs/by-name/io/ioping/package.nix
View file

@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
pkgsCross,
}:
stdenv.mkDerivation (finalAttrs: {
@ -15,13 +16,20 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-9lJEjns8ttjgI52ZXeWgL77GMd7o7IvefBJ5UH9y9ks=";
};
makeFlags = [ "PREFIX=$(out)" ];
makeFlags = [
"PREFIX=$(out)"
"CC:=$(CC)"
];
outputs = [
"out"
"man"
];
passthru.tests = {
aarch64-cross = pkgsCross.aarch64-multiplatform.ioping;
};
meta = {
description = "Disk I/O latency measuring tool";
maintainers = with lib.maintainers; [ raskin ];

126
pkgs/by-name/kr/krunkit/boot-test.nix Normal file
View file

@ -0,0 +1,126 @@
{
krunkit,
lib,
nixos,
pkgs,
runCommand,
}:
let
linuxPkgs = import pkgs.path {
system = "aarch64-linux";
};
nixosConfig =
(nixos {
nixpkgs.pkgs = linuxPkgs;
imports = [ "${pkgs.path}/nixos/modules/profiles/qemu-guest.nix" ];
boot = {
kernelParams = [ "console=hvc0" ];
loader = {
efi.canTouchEfiVariables = false;
systemd-boot.enable = true;
};
};
documentation.enable = false;
environment.defaultPackages = [ ];
fileSystems = {
"/" = {
device = "/dev/disk/by-label/nixos";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-label/ESP";
fsType = "vfat";
};
};
systemd.services.krunkit-boot-ok = {
wantedBy = [ "multi-user.target" ];
after = [ "multi-user.target" ];
serviceConfig.Type = "oneshot";
script = ''
echo krunkit-boot-ok >/dev/hvc0
'';
};
system.stateVersion = lib.trivial.release;
}).config;
image = import "${pkgs.path}/nixos/lib/make-disk-image.nix" {
inherit lib;
config = nixosConfig;
pkgs = linuxPkgs;
additionalSpace = "64M";
baseName = "krunkit-nixos";
bootSize = "128M";
copyChannel = false;
format = "raw";
partitionTableType = "efi";
};
in
runCommand "krunkit-nixos-boot-test"
{
requiredSystemFeatures = [ "apple-virt" ];
meta.platforms = [ "aarch64-darwin" ];
}
''
image=${image}/krunkit-nixos.img
disk=$TMPDIR/disk.img
console=$TMPDIR/console.log
log=$TMPDIR/krunkit.log
cp "$image" "$disk"
chmod u+w "$disk"
touch "$console" "$log"
cleanup() {
set +e
if [ -n "''${pid:-}" ]; then
kill "$pid" >/dev/null 2>&1
for _ in $(seq 1 20); do
kill -0 "$pid" >/dev/null 2>&1 || break
sleep 1
done
kill -KILL "$pid" >/dev/null 2>&1
fi
}
trap cleanup EXIT
${krunkit}/bin/krunkit \
--cpus 1 \
--memory 1024 \
--log-file "$log" \
--device "virtio-blk,path=$disk,format=raw" \
--device "virtio-serial,logFilePath=$console" &
pid=$!
for _ in $(seq 1 120); do
if grep -q krunkit-boot-ok "$console"; then
touch "$out"
exit 0
fi
if ! kill -0 "$pid" >/dev/null 2>&1; then
echo "krunkit exited before the guest reached multi-user.target"
wait "$pid"
cat "$log"
cat "$console"
exit 1
fi
sleep 1
done
echo "timed out waiting for krunkit guest boot marker"
cat "$log"
cat "$console"
exit 1
''

12
pkgs/by-name/kr/krunkit/package.nix
View file

@ -1,4 +1,5 @@
{
callPackage,
cargo,
darwin,
pkg-config,
@ -43,10 +44,19 @@ stdenv.mkDerivation (finalAttrs: {
makeFlags = [ "PREFIX=${placeholder "out"}" ];
postInstall = ''
install -Dm444 edk2/KRUN_EFI.silent.fd $out/share/krunkit/KRUN_EFI.silent.fd
'';
# This is necessary in order for the binary to keep its entitlements
dontStrip = true;
passthru.updateScript = nix-update-script { };
passthru = {
tests.boot = callPackage ./boot-test.nix {
krunkit = finalAttrs.finalPackage;
};
updateScript = nix-update-script { };
};
meta = {
description = "Launch configurable virtual machines with libkrun";

6
pkgs/by-name/ku/kubectl-cnpg/package.nix
View file

@ -6,16 +6,16 @@
buildGoModule (finalAttrs: {
pname = "kubectl-cnpg";
version = "1.29.1";
version = "1.30.0";
src = fetchFromGitHub {
owner = "cloudnative-pg";
repo = "cloudnative-pg";
rev = "v${finalAttrs.version}";
hash = "sha256-SlisY7v/CFVXH85IAvlBH1RjyrTS+e8hFHJIwh0FgCc=";
hash = "sha256-UHgllbD2eNBVYrF5nPZhethZIyyBkEji1xf0okGshoI=";
};
vendorHash = "sha256-He5L4HBTMOlzLgB+tAxNbjvDdvGyz5UolC8mMFibwZ4=";
vendorHash = "sha256-Eh057tW8NTCNVtgyeY4A+Cc8wQbRDpUYDFmj4l+pn8o=";
subPackages = [ "cmd/kubectl-cnpg" ];

6
pkgs/by-name/na/nak/package.nix
View file

@ -10,16 +10,16 @@
buildGoModule (finalAttrs: {
pname = "nak";
version = "0.19.13";
version = "0.20.0";
src = fetchFromGitHub {
owner = "fiatjaf";
repo = "nak";
tag = "v${finalAttrs.version}";
hash = "sha256-bM91nnwQxcqzWFFFJXEmCJ1DKBIKb/o/qTwRjxCc15Q=";
hash = "sha256-jewvap5dYDpW7kqN2BvJuaqXG8C+gya9y6NxwPQhR4I=";
};
vendorHash = "sha256-hpvBJXtzKWY5Kuy72qMtw8wuS9ejGy1wT+h28gACsXw=";
vendorHash = "sha256-gDBDN+loVtsTTj8J1sFlWqMgcdlKepj/16hLkiQEmTs=";
ldflags = [
"-s"

6
pkgs/by-name/op/open-webui/package.nix
View file

@ -9,13 +9,13 @@
}:
let
pname = "open-webui";
version = "0.10.1";
version = "0.10.2";
src = fetchFromGitHub {
owner = "open-webui";
repo = "open-webui";
tag = "v${version}";
hash = "sha256-ec/pmmjuFDYsL4MwHbTiw8PxG9iMHM/ntGfJIm3OpH8=";
hash = "sha256-tJ9b5up5FoX5TrmpwMWevyA/o3Ai/lKsHu+nahc2Ttc=";
};
frontend = buildNpmPackage rec {
@ -30,7 +30,7 @@ let
url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
};
npmDepsHash = "sha256-hHBTbiEaZsyfZWpwiNNbGOJTt6Bor0FKClYrCY5mjzE=";
npmDepsHash = "sha256-yw/1n1jBCUtt8wUqJmIkB3W53wsXTKuAFG/EMwcTpx8=";
npmFlags = [ "--force" ];

4
pkgs/by-name/op/openimageio/package.nix
View file

@ -26,13 +26,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "openimageio";
version = "3.1.14.1";
version = "3.1.15.0";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "OpenImageIO";
tag = "v${finalAttrs.version}";
hash = "sha256-gAW9pUK0oPGoeNRBCS7i444PQ3b6f9Pa0UJwhSJV9ss=";
hash = "sha256-ebB9f0QkW83ZT6ydbpV2srvSaFayw1OM3HjI8rqPL4k=";
};
outputs = [

6
pkgs/by-name/pl/plakar/package.nix
View file

@ -8,7 +8,7 @@
}:
buildGo125Module (finalAttrs: {
pname = "plakar";
version = "1.1.3";
version = "1.1.4";
# to avoid having all the Test(Get|Set|Validate)Service.* tests fail on darwin
__darwinAllowLocalNetworking = true;
@ -17,10 +17,10 @@ buildGo125Module (finalAttrs: {
owner = "PlakarKorp";
repo = "plakar";
tag = "v${finalAttrs.version}";
hash = "sha256-AQyE8VtTdkuevBVMLDfhN1h6/DirdhLgPu+76QfRUas=";
hash = "sha256-Urj1BG3XGhSroaa9pl9NGiKj38J1P+H9sA7noGwIhdc=";
};
vendorHash = "sha256-nueFE6Ka1dq4Rt+Qs9YJU9N+yYfEyA8jkVGC4vKLjSI=";
vendorHash = "sha256-aqHjSTVVxBbaHAZZNQaFbftN0Hbl/+7wgk5uFM664po=";
buildInputs = [
fuse

6
pkgs/by-name/po/podman-desktop/package.nix
View file

@ -16,6 +16,7 @@
jq,
gnugrep,
podman,
krunkit,
}:
let
@ -120,7 +121,10 @@ stdenv.mkDerivation (finalAttrs: {
installPhase =
let
commonWrapperArgs = "--prefix PATH : ${lib.makeBinPath [ podman ]}";
prefixPackages = lib.makeBinPath (
[ podman ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform krunkit) krunkit
);
commonWrapperArgs = "--prefix PATH : ${prefixPackages}";
in
(
''

6
pkgs/by-name/ru/rufin/package.nix
View file

@ -14,7 +14,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "rufin";
version = "0.7.8";
version = "0.7.13";
__structuredAttrs = true;
@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "screwys";
repo = "Rufin";
tag = "v${finalAttrs.version}";
hash = "sha256-TgPjv3s0ERLSnncbtzyr+K1cVscr0PbPxFuDuiPwuV4=";
hash = "sha256-gY/Y+9D/9VlVrmYH+Cf7uP787yxhTyb0RyFRhiTjynM=";
};
cargoHash = "sha256-hddBiTzJBSk37/Lq7GQ+kTOx6ikLh641B0ISWN2Z2qI=";
cargoHash = "sha256-DQRURA9IvUZC9gTvKIsAmO8uq8DwGGYTySDI7cGSxMU=";
strictDeps = true;

4
pkgs/by-name/un/unityhub/package.nix
View file

@ -11,11 +11,11 @@
stdenv.mkDerivation rec {
pname = "unityhub";
version = "3.18.3";
version = "3.19.1";
src = fetchurl {
url = "https://hub-dist.unity3d.com/artifactory/hub-debian-prod-local/pool/main/u/unity/unityhub_amd64/UnityHubSetup-${version}-amd64.deb";
hash = "sha256-6Gjik6zIQMYoAr8jmMp3X6+Xu5fdcbh2Exd8eToSbto=";
hash = "sha256-PoWjyHBDsJPrGUBuTB2yXdLPu2gxrGn68flpy7fxC7Q=";
};
nativeBuildInputs = [

6
pkgs/by-name/xe/xenia-canary/package.nix
View file

@ -33,14 +33,14 @@ let
in
llvmPackages_20.stdenv.mkDerivation {
pname = "xenia-canary";
version = "0-unstable-2026-06-22";
version = "0-unstable-2026-06-29";
src = fetchFromGitHub {
owner = "xenia-canary";
repo = "xenia-canary";
fetchSubmodules = true;
rev = "9c8e34b29e276320a319a0a46f7713de60efa50c";
hash = "sha256-56WAS3woSzqNQf1GJNLLvHYdLhb5JWykJ1h+6yZmKOY=";
rev = "9588ce244dc2684d1573736a717a5d234bf7c2bb";
hash = "sha256-nQuBh4XOSSeIX51KLXLyv+gTk51I4/VNgSBrV835mBI=";
};
dontConfigure = true;

6
pkgs/by-name/xo/xorg-server/package.nix
View file

@ -152,8 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
"-Dxkb_bin_dir=${xkbcomp}/bin"
"-Dxkb_dir=${xkeyboard-config}/share/X11/xkb"
"-Dxkb_output_dir=$out/share/X11/xkb/compiled"
]
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
"-Dxcsecurity=true"
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
@ -177,6 +176,9 @@ stdenv.mkDerivation (finalAttrs: {
--subst-var-by XQUARTZ_APP "$out/Applications/XQuartz.app"
'';
# avoid linux rebuilds
${if stdenv.hostPlatform.isDarwin then "hardeningDisable" else null} = [ "strictflexarrays1" ];
# default X install symlinks this to Xorg, we want XQuartz
postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
ln -sf $out/bin/Xquartz $out/bin/X

20
pkgs/by-name/xq/xquartz/package.nix
View file

@ -240,12 +240,12 @@ stdenv.mkDerivation {
cp ${fontsConf} $fontsConfPath
substituteInPlace $out/bin/startx \
--replace "bindir=${xinit}/bin" "bindir=$out/bin" \
--replace 'defaultserver=${xorg-server}/bin/X' "defaultserver=$out/bin/Xquartz" \
--replace "${xinit}" "$out" \
--replace "${xorg-server}" "$out" \
--replace "eval xinit" "eval $out/bin/xinit" \
--replace "sysclientrc=/etc/X11/xinit/xinitrc" "sysclientrc=$out/etc/X11/xinit/xinitrc"
--replace-fail "${xinit}" "$out" \
--replace-fail "xserver=\"${xorg-server}/bin/X\"" "xserver=\"$out/bin/Xquartz\"" \
--replace-fail 'xinit="xinit"' "xinit=$out/bin/xinit" \
--replace-fail '"xauth"' "${lib.getExe xauth}" \
--replace-fail "xauth " '"$xauth" ' \
--replace-fail "sysclientrc=/etc/X11/xinit/xinitrc" "sysclientrc=$out/etc/X11/xinit/xinitrc"
wrapProgram $out/bin/Xquartz \
--set XQUARTZ_APP $out/Applications/XQuartz.app
@ -262,9 +262,9 @@ stdenv.mkDerivation {
EOF
substituteInPlace $out/etc/X11/xinit/xinitrc \
--replace ${xinit} $out \
--replace xmodmap ${xmodmap}/bin/xmodmap \
--replace xrdb ${xrdb}/bin/xrdb
--replace-fail ${xinit} $out \
--replace-fail '"xmodmap"' ${xmodmap}/bin/xmodmap \
--replace-fail '"xrdb"' ${xrdb}/bin/xrdb
mkdir -p $out/etc/X11/xinit/xinitrc.d
@ -281,7 +281,7 @@ stdenv.mkDerivation {
chmod +x $out/etc/X11/xinit/xinitrc.d/99-quartz-wm.sh
substituteInPlace $out/etc/X11/xinit/privileged_startx.d/20-font_cache \
--replace ${xinit} $out
--replace-fail ${xinit} $out
cp ${./font_cache} $out/bin/font_cache
substituteInPlace $out/bin/font_cache \

6
pkgs/by-name/yg/yggdrasil-ng/package.nix
View file

@ -5,16 +5,16 @@
}:
rustPlatform.buildRustPackage (oldAttrs: {
pname = "yggdrasil-ng";
version = "0.1.6";
version = "0.2.0";
src = fetchFromGitHub {
owner = "Revertron";
repo = "Yggdrasil-ng";
tag = "v${oldAttrs.version}";
hash = "sha256-nJLK5O2kjFRGZ3JwqwLHtYqvJfrOxtZOjdM6q2NNrbk=";
hash = "sha256-Ic3r8xNeBMg+vN9C2JPRrpVRNHqT5XuDT+EoD493qdM=";
};
cargoHash = "sha256-mJr8IMTbB+mSrsxzq6ehnfBueulNqZtxU/1aHAyv954=";
cargoHash = "sha256-eA5tXPqZJnRIYQGxmjOA8esDV8u74afWMfZ9bn9PsWE=";
__structuredAttrs = true;

6
pkgs/by-name/za/zashboard/package.nix
View file

@ -12,13 +12,13 @@ let
in
buildNpmPackage (finalAttrs: {
pname = "zashboard";
version = "3.10.1";
version = "3.12.0";
src = fetchFromGitHub {
owner = "Zephyruso";
repo = "zashboard";
tag = "v${finalAttrs.version}";
hash = "sha256-unk/QO2V5BzuY8TL8Z1K/EPPMB6JwW15OQICix8Mukk=";
hash = "sha256-bNkp3FQYM8gdkszPgbN3Ovypg0Uj7Ny0WNkfC82xark=";
};
npmDeps = null;
@ -26,7 +26,7 @@ buildNpmPackage (finalAttrs: {
inherit (finalAttrs) pname version src;
inherit pnpm;
fetcherVersion = 3;
hash = "sha256-7bjsqBQssirsrIbegm5G/J/v3+yzfomq/gxCbxKEb6g=";
hash = "sha256-ag72Aw8Kor9vpVthq/shWqyNUFL8hHrwdeKHNHgm8NU=";
};
nativeBuildInputs = [ pnpm ];

80
pkgs/development/compilers/gnat-bootstrap/default.nix
View file

@ -33,23 +33,6 @@ stdenv.mkDerivation (
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-${finalAttrs.version}/gnat-${stdenv.hostPlatform.system}-${finalAttrs.version}.tar.gz";
in
{
"12" = {
gccVersion = "12.1.0";
alireRevision = "2";
}
// {
x86_64-darwin = {
inherit url;
hash = "sha256-zrcVFvFZMlGUtkG0p1wST6kGInRI64Icdsvkcf25yVs=";
upstreamTriplet = "x86_64-apple-darwin19.6.0";
};
x86_64-linux = {
inherit url;
hash = "sha256-EPDPOOjWJnJsUM7GGxj20/PXumjfLoMIEFX1EDtvWVY=";
upstreamTriplet = "x86_64-pc-linux-gnu";
};
}
.${stdenv.hostPlatform.system} or throwUnsupportedSystem;
"13" = {
gccVersion = "13.2.0";
alireRevision = "2";
@ -99,6 +82,63 @@ stdenv.mkDerivation (
};
}
.${stdenv.hostPlatform.system} or throwUnsupportedSystem;
"15" = {
gccVersion = "15.2.0";
}
// {
x86_64-darwin = {
alireRevision = "1";
inherit url;
hash = "sha256-1YTqWsLBwNH/GBAtF5CL/YZHQvfE/3PE0LlLJ9HmjAg=";
upstreamTriplet = "x86_64-apple-darwin22.6.0";
};
x86_64-linux = {
alireRevision = "1";
inherit url;
hash = "sha256-b4hAg3ifoBRqgPxpfMYuOdunw7wzRTL/G5YGBO+im24=";
upstreamTriplet = "x86_64-pc-linux-gnu";
};
aarch64-linux = {
alireRevision = "1";
inherit url;
hash = "sha256-0V/VHqOSYQI6LmvpUIHy3zB6hI3dG0njOcDsrg8oZq8=";
upstreamTriplet = "aarch64-linux-gnu";
};
aarch64-darwin = {
alireRevision = "2-pre0";
url = "https://github.com/alire-project/GNAT-FSF-builds/releases/download/gnat-15.2.0-2-macos-pre0/gnat-${stdenv.hostPlatform.system}-${finalAttrs.version}.tar.gz";
hash = "sha256-4bFtsjixfXYc8wYOc+5iAbp1MmiIS1h1NcdKno2IdJg=";
upstreamTriplet = "aarch64-apple-darwin24.6.0";
};
}
.${stdenv.hostPlatform.system} or throwUnsupportedSystem;
"16" = {
gccVersion = "16.1.0";
alireRevision = "1";
}
// {
x86_64-darwin = {
inherit url;
hash = "sha256-u/cYFKqWLTaFADTscDxnrkYSoemKrfKpNIZ8XPlTbLI=";
upstreamTriplet = "x86_64-apple-darwin24.6.0";
};
x86_64-linux = {
inherit url;
hash = "sha256-5bKYPJnXDGa80BtAogLE82X0zTuYKdN2cKh503oMeic=";
upstreamTriplet = "x86_64-pc-linux-gnu";
};
aarch64-linux = {
inherit url;
hash = "sha256-jJnqDJGBOjqbT4hDW0nRpV0oA3RXxJhvI7BuvQkPDQI=";
upstreamTriplet = "aarch64-linux-gnu";
};
aarch64-darwin = {
inherit url;
hash = "sha256-TJlV/Ngq6SwpIgGkwamTN3aRGP2BnEzJyBGovtWb6Y0=";
upstreamTriplet = "aarch64-apple-darwin24.6.0";
};
}
.${stdenv.hostPlatform.system} or throwUnsupportedSystem;
};
inherit (versionMap.${majorVersion}) gccVersion alireRevision upstreamTriplet;
in
@ -146,13 +186,15 @@ stdenv.mkDerivation (
++
lib.optionals
(
lib.versionAtLeast majorVersion "14" && stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux
(majorVersion == "14" && stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux)
|| (lib.versionAtLeast majorVersion "15" && stdenv.hostPlatform.isLinux)
)
[
# not sure why the bootstrap binaries link to zstd only on this architecture but they do
zstd
];
__structuredAttrs = true;
strictDeps = true;
# https://github.com/alire-project/GNAT-FSF-builds/issues/51
@ -245,8 +287,6 @@ stdenv.mkDerivation (
platforms = [
"x86_64-linux"
"x86_64-darwin"
]
++ lib.optionals (lib.versionAtLeast majorVersion "13") [
"aarch64-darwin"
]
++ lib.optionals (lib.versionAtLeast majorVersion "14") [

4
pkgs/development/python-modules/victron-mqtt/default.nix
View file

@ -12,14 +12,14 @@
buildPythonPackage (finalAttrs: {
pname = "victron-mqtt";
version = "2026.6.7";
version = "2026.6.8";
pyproject = true;
src = fetchFromGitHub {
owner = "tomer-w";
repo = "victron_mqtt";
tag = "v${finalAttrs.version}";
hash = "sha256-06+vn0HKvml3VRvPnQHz832OQnbvjd8tJEcnE6TIer8=";
hash = "sha256-zwdSpfI1UtH9ZDYXk/0jozt9qTs5ZaMrg5c60HBnOWo=";
};
build-system = [

25
pkgs/top-level/all-packages.nix
View file

@ -3467,7 +3467,7 @@ with pkgs;
enableLTO = false;
};
gnat = gnat13; # When changing this, update also gnatPackages
gnat = pkgs."gnat${toString default-gcc-version}"; # When changing this, update also gnatPackages
gnat13 = wrapCC (
gcc13.cc.override {
@ -3535,7 +3535,7 @@ with pkgs;
# If we are cross-compiling GNAT, we may as well do the same.
gnat-bootstrap =
if stdenv.hostPlatform == stdenv.targetPlatform && stdenv.buildPlatform == stdenv.hostPlatform then
buildPackages.gnat-bootstrap14
buildPackages.gnat-bootstrap15
else
buildPackages.gnat15;
stdenv =
@ -3544,7 +3544,7 @@ with pkgs;
&& stdenv.buildPlatform == stdenv.hostPlatform
&& stdenv.buildPlatform.isDarwin
then
overrideCC gccStdenv gnat-bootstrap14
overrideCC gccStdenv gnat-bootstrap15
else
stdenv;
}
@ -3562,7 +3562,7 @@ with pkgs;
# If we are cross-compiling GNAT, we may as well do the same.
gnat-bootstrap =
if stdenv.hostPlatform == stdenv.targetPlatform && stdenv.buildPlatform == stdenv.hostPlatform then
buildPackages.gnat-bootstrap14
buildPackages.gnat-bootstrap16
else
buildPackages.gnat16;
stdenv =
@ -3571,13 +3571,14 @@ with pkgs;
&& stdenv.buildPlatform == stdenv.hostPlatform
&& stdenv.buildPlatform.isDarwin
then
overrideCC gccStdenv gnat-bootstrap14
overrideCC gccStdenv gnat-bootstrap16
else
stdenv;
}
);
gnat-bootstrap = gnat-bootstrap13;
gnat-bootstrap = pkgs."gnat-bootstrap${toString default-gcc-version}";
gnat-bootstrap13 = wrapCCWith {
cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "13"; };
isAlireGNAT = true;
@ -3588,11 +3589,21 @@ with pkgs;
isAlireGNAT = true;
};
gnat-bootstrap15 = wrapCCWith {
cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "15"; };
isAlireGNAT = true;
};
gnat-bootstrap16 = wrapCCWith {
cc = callPackage ../development/compilers/gnat-bootstrap { majorVersion = "16"; };
isAlireGNAT = true;
};
gnat13Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat13; });
gnat14Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat14; });
gnat15Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat15; });
gnat16Packages = recurseIntoAttrs (callPackage ./ada-packages.nix { gnat = buildPackages.gnat16; });
gnatPackages = gnat13Packages;
gnatPackages = pkgs."gnat${toString default-gcc-version}Packages";
inherit (gnatPackages)
gprbuild