Compare commits

..

2 Commits

Author SHA1 Message Date
nixpkgs-ci[bot]
2d20de34e5 Merge master into staging-nixos 2026-09-15 00:26:24 +00:00
nixpkgs-ci[bot]
673028b7b1 Merge master into staging-nixos 2026-09-14 18:11:25 +00:00
21 changed files with 159 additions and 168 deletions

View File

@@ -2082,9 +2082,8 @@ in
systemd.services.grafana = {
description = "Grafana Service Daemon";
wantedBy = [ "multi-user.target" ];
wants = [ "network-online.target" ];
after = [
"network-online.target"
"network.target"
]
++ lib.optional usePostgresql "postgresql.target"
++ lib.optional useMysql "mysql.service";

View File

@@ -188,14 +188,14 @@ in
fi
if [ ! -s /run/xrdp/rsakeys.ini ]; then
mkdir -p /run/xrdp
${cfg.package}/bin/xrdp-keygen xrdp /run/xrdp/rsakeys.ini
${pkgs.xrdp}/bin/xrdp-keygen xrdp /run/xrdp/rsakeys.ini
fi
'';
serviceConfig = {
User = "xrdp";
Group = "xrdp";
PermissionsStartOnly = true;
ExecStart = "${cfg.package}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${confDir}/xrdp.ini";
ExecStart = "${pkgs.xrdp}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${confDir}/xrdp.ini";
};
};
@@ -205,7 +205,7 @@ in
description = "xrdp session manager";
restartIfChanged = false; # do not restart on "nixos-rebuild switch". like "display-manager", it can have many interactive programs as children
serviceConfig = {
ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${confDir}/sesman.ini";
ExecStart = "${pkgs.xrdp}/bin/xrdp-sesman --nodaemon --config ${confDir}/sesman.ini";
ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
};
};

View File

@@ -52,7 +52,7 @@ in
temperature = {
day = mkOption {
type = types.ints.between 1000 25000;
default = 6500;
default = 5500;
description = ''
Colour temperature to use during the day, between
`1000` and `25000` K.
@@ -60,7 +60,7 @@ in
};
night = mkOption {
type = types.ints.between 1000 25000;
default = 4500;
default = 3700;
description = ''
Colour temperature to use at night, between
`1000` and `25000` K.

View File

@@ -19,16 +19,16 @@
buildGoModule rec {
pname = "go2tv" + lib.optionalString (!withGui) "-lite";
version = "2.6.0";
version = "2.5.0";
src = fetchFromGitHub {
owner = "alexballas";
repo = "go2tv";
tag = "v${version}";
hash = "sha256-Goj+x1i2Amo1s50Yd9HDj2d2WH+5y7N3y4ngeNkBgH8=";
hash = "sha256-rNoQafBIxE0xoBFQNy6GoeIE93Uq3QEsktko77P2ps8=";
};
vendorHash = "sha256-tabupT5OF1BzMWuSNPEe7G6DF/PJWZ7WeRLNHefYvP0=";
vendorHash = "sha256-h8/DBqkaSSxIIFrdbun4doN3qyKbR3BhO4SwL5H/sfc=";
nativeBuildInputs = [ pkg-config ];

View File

@@ -6,7 +6,6 @@
pkg-config,
hyprwayland-scanner,
wayland-scanner,
abseil-cpp,
aquamarine,
cairo,
gtest,
@@ -26,13 +25,13 @@
gcc16Stdenv.mkDerivation (finalAttrs: {
pname = "hyprtoolkit";
version = "0.6.0";
version = "0.5.4";
src = fetchFromGitHub {
owner = "hyprwm";
repo = "hyprtoolkit";
tag = "v${finalAttrs.version}";
hash = "sha256-0rb1yZZ0PR4lRrXC2BdiMjGFttZe6MFQFSnx3wD4dko=";
hash = "sha256-gJSBj4Pd4e9nERAKo/qiHqDMpS2hBfyOI0uGCbbiML4=";
};
nativeBuildInputs = [
@@ -43,7 +42,6 @@ gcc16Stdenv.mkDerivation (finalAttrs: {
];
buildInputs = [
abseil-cpp
aquamarine
cairo
gtest

View File

@@ -11,13 +11,13 @@
buildDotnetModule rec {
pname = "knossosnet";
version = "1.3.11";
version = "1.3.10";
src = fetchFromGitHub {
owner = "KnossosNET";
repo = "Knossos.NET";
tag = "v${version}";
hash = "sha256-9ad9jcq5se40PLXqXWy9leg3AuwD3fVOxVU/vbavzyw=";
hash = "sha256-oIkeR3072Ye24BQRNidf1Lr0/2z6h+eljwTr9NMqq98=";
};
patches = [ ./dotnet-8-upgrade.patch ];

View File

@@ -6,29 +6,18 @@
fetchurl,
fetchgit,
runCommandLocal,
zig_0_16,
zig_0_15,
zstd,
name ? "zig-packages",
}:
let
unpackZigArtifact =
{
name,
artifact,
}:
runCommandLocal name
{
nativeBuildInputs = [ zig_0_16 ];
}
''
# workaround https://codeberg.org/ziglang/zig/issues/31866
# https://github.com/Cloudef/zig2nix/issues/54
mkdir "$TMPDIR/src" "$TMPDIR/cache"
touch "$TMPDIR/src/build.zig"
hash="$(cd "$TMPDIR/src" && zig fetch --global-cache-dir "$TMPDIR/cache" ${artifact})"
mkdir "$out"
tar zxvf "$TMPDIR/cache/p/$hash.tar.gz" --directory "$out/" --strip-components=1
'';
{ name, artifact }:
runCommandLocal name { nativeBuildInputs = [ zig_0_15 ]; } ''
hash="$(cd "$TMPDIR" && zig fetch --global-cache-dir "$TMPDIR" ${artifact})"
mv "$TMPDIR/p/$hash" "$out"
chmod 755 "$out"
'';
fetchZig =
{
@@ -103,15 +92,6 @@ let
fetcher.${proto};
in
linkFarm name [
{
name = "aro-0.0.0-JSD1Qk8rOQDnuVcD4jAwMpHitA6pADRKzQ7M7hKRwxvD";
path = fetchZigArtifact {
name = "aro";
url = "https://github.com/vancluever/arocc/archive/ecbc5c799574e0da2758a961b12efa586007f03c.tar.gz";
hash = "sha256-rjNfhWjmA/1WR/xuHo4ls4fnDCbsI1VZSvb8SFRvwso=";
unpack = true;
};
}
{
name = "N-V-__8AANT61wB--nJ95Gj_ctmzAtcjloZ__hRqNw5lC1Kr";
path = fetchZigArtifact {
@@ -167,11 +147,11 @@ linkFarm name [
};
}
{
name = "gobject-0.3.2-Skun7F6HogCMynX2JqeSHS7xr-8pK4ob-qRFIcEasVi3";
name = "gobject-0.3.0-Skun7ANLnwDvEfIpVmohcppXgOvg_I6YOJFmPIsKfXk-";
path = fetchZigArtifact {
name = "gobject";
url = "https://github.com/ghostty-org/zig-gobject/releases/download/0.10.0-2026-07-28-36-1/ghostty-gobject-0.10.0-2026-07-28-36-1.tar.zst";
hash = "sha256-dyCfm2XjiAk30zccjD6AgKFBdE7IRsJuoqnscfvnWSQ=";
url = "https://deps.files.ghostty.org/gobject-2025-11-08-23-1.tar.zst";
hash = "sha256-OxS9/XC5aMJj1KhOcFP1ZZN7PI4ADw4f7ocx6V64mOc=";
unpack = true;
};
}
@@ -206,17 +186,17 @@ linkFarm name [
name = "N-V-__8AAEbOfQBnvcFcCX2W5z7tDaN8vaNZGamEQtNOe0UI";
path = fetchZigArtifact {
name = "imgui";
url = "https://deps.files.ghostty.org/N-V-__8AAEbOfQBnvcFcCX2W5z7tDaN8vaNZGamEQtNOe0UI.tar.gz";
url = "https://github.com/ocornut/imgui/archive/refs/tags/v1.92.5-docking.tar.gz";
hash = "sha256-yBbCDox18+Fa6Gc1DnmSVQLRpqhZOLsac7iSfl8x+cs=";
unpack = false;
};
}
{
name = "N-V-__8AAGxKBAAjYkT1jYUiOZDXQuj0u34ndIjAWxiR1KX9";
name = "N-V-__8AALZGBAAS5NLVH-c8eC-6VtCdcH-9nUvVfUSkWS__";
path = fetchZigArtifact {
name = "iterm2_themes";
url = "https://deps.files.ghostty.org/ghostty-themes-release-20260720-153658-97e244c.tgz";
hash = "sha256-cynQ4ulY7oQE5RamVQvQczTtxhEzSnP4TVBHfapFnww=";
url = "https://deps.files.ghostty.org/ghostty-themes-release-20260713-155359-c3968b3.tgz";
hash = "sha256-FLMES+9no8uDUjlzvRbTqg+wCW3dHg7Lo5FtFNbWfyA=";
unpack = false;
};
}
@@ -239,11 +219,11 @@ linkFarm name [
};
}
{
name = "libxev-0.0.0-86vtcwIRFADbH4hk-EjROXxlrKIRPQdA41XiTSytYO-F";
name = "libxev-0.0.0-86vtc4IcEwCqEYxEYoN_3KXmc6A9VLcm22aVImfvecYs";
path = fetchZigArtifact {
name = "libxev";
url = "https://deps.files.ghostty.org/libxev-9ce8e8e6ff89e583258a7f8e7adeeeaeae8611bf.tar.gz";
hash = "sha256-fOU1oxIxfoEgoLuWz7fVX6M+zmqpo7gqZObWiH/aDE0=";
url = "https://deps.files.ghostty.org/libxev-34fa50878aec6e5fa8f532867001ab3c36fae23e.tar.gz";
hash = "sha256-1B9oJExVyOWRj+Y9d9eHkOBTlOYuEkcwGBUKdlgRhkg=";
unpack = true;
};
}
@@ -311,38 +291,29 @@ linkFarm name [
};
}
{
name = "translate_c-0.0.0-Q_BUWmU6BwB_9JKG2l2W7i_mhmYWeRseTGBEHi_YlV5f";
path = fetchZigArtifact {
name = "translate_c";
url = "https://deps.files.ghostty.org/translate_c-80f8b6e4f45a303268717d8e5f4f91d7837138bb.tar.gz";
hash = "sha256-fB7OsZ2PIijMzVMYg8SzDBtTKX7IZHbEvPuBTdyGtWk=";
unpack = true;
};
}
{
name = "uucode-0.2.0-ZZjBPlK5VADj7fdoq7G8LIHzD5o6FSkcBXXrRWr4jnrA";
name = "uucode-0.1.0-ZZjBPj96QADXyt5sqwBJUnhaDYs_qBeeKijZvlRa0eqM";
path = fetchZigArtifact {
name = "uucode";
url = "https://deps.files.ghostty.org/uucode-2826a37a4562284fdacd8fa029d49509cc9bffcd.tar.gz";
hash = "sha256-R5RXW5tWIaDq5JOF2+oWd5YOYOyns6WH7f687WE+b20=";
url = "git+https://github.com/jacobsandlund/uucode#5f05f8f83a75caea201f12cc8ea32a2d82ea9732";
hash = "sha256-sHPh+TQSdUGus/QTbj7KSJJkTuNTrK4VNmQDjS30Lf8=";
unpack = true;
};
}
{
name = "vaxis-0.6.0-BWNV_MjFCQCs9UDHiRkrgw_ayeiPkzOe4xVbaAqXkUWW";
name = "uucode-0.2.0-ZZjBPqZVVABQepOqZHR7vV_NcaN-wats0IB6o-Exj6m9";
path = fetchZigArtifact {
name = "vaxis";
url = "git+https://github.com/rockorager/libvaxis.git#c1e1f23be38951c425cdf31af455ba23ef178940";
hash = "sha256-bIXu8lGwGo42QbItC0jOi/eN7u+f4snknBexw7dc0DI=";
name = "uucode";
url = "https://deps.files.ghostty.org/uucode-0.2.0-ZZjBPqZVVABQepOqZHR7vV_NcaN-wats0IB6o-Exj6m9.tar.gz";
hash = "sha256-jLrhrmCXQ1T+LQP1JTBBB3Jn+1hCZfODbC4SdlfNdKg=";
unpack = true;
};
}
{
name = "vaxis-0.6.0-BWNV_CrbCQCscGpzsAlR402rYQ_tV3aAl081c2iRRkka";
name = "vaxis-0.5.1-BWNV_LosCQAGmCCNOLljCIw6j6-yt53tji6n6rwJ2BhS";
path = fetchZigArtifact {
name = "vaxis";
url = "https://deps.files.ghostty.org/vaxis-1dbbe575dff4586fe51e3217aa5c3fecdcbb6089.tar.gz";
hash = "sha256-z3J3w+oYapfAZZR+MvWXwg+th1hePDA1TptnKFO4r+M=";
url = "https://deps.files.ghostty.org/vaxis-7dbb9fd3122e4ffad262dd7c151d80d863b68558.tar.gz";
hash = "sha256-zTyrZrIffM+GJIt973tKDeWHmOCwbn7KLDdQxSiK00Y=";
unpack = true;
};
}
@@ -355,15 +326,6 @@ linkFarm name [
unpack = false;
};
}
{
name = "N-V-__8AAFdWDwA0ktbNUi9pFBHCRN4weXIgIfCrVjfGxqgA";
path = fetchZigArtifact {
name = "wayland_protocols";
url = "https://deps.files.ghostty.org/N-V-__8AAFdWDwA0ktbNUi9pFBHCRN4weXIgIfCrVjfGxqgA.tar.gz";
hash = "sha256-3S3xSrX0EDgleq7cxLX7msDuAY8/D5SvkJcCjmDTMiM=";
unpack = false;
};
}
{
name = "N-V-__8AAKw-DAAaV8bOAAGqA0-oD7o-HNIlPFYKRXSPT03S";
path = fetchZigArtifact {
@@ -373,6 +335,15 @@ linkFarm name [
unpack = false;
};
}
{
name = "N-V-__8AAFdWDwA0ktbNUi9pFBHCRN4weXIgIfCrVjfGxqgA";
path = fetchZigArtifact {
name = "wayland_protocols";
url = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/archive/1.47/wayland-protocols-1.47.tar.gz";
hash = "sha256-3S3xSrX0EDgleq7cxLX7msDuAY8/D5SvkJcCjmDTMiM=";
unpack = false;
};
}
{
name = "N-V-__8AAAzZywE3s51XfsLbP9eyEw57ae9swYB9aGB6fCMs";
path = fetchZigArtifact {
@@ -383,56 +354,56 @@ linkFarm name [
};
}
{
name = "z2d-0.12.1-j5P_Hsw8EQAKyZTQICCQnAH2xYkLDW8k9uefbsYdfPZ-";
name = "z2d-0.10.0-j5P_Hu-6FgBsZNgwphIqh17jDnj8_yPtD8yzjO6PpHRQ";
path = fetchZigArtifact {
name = "z2d";
url = "https://deps.files.ghostty.org/z2d-7dbae85c81784dba9988320bf9543ed9a81350c8.tar.gz";
hash = "sha256-Fjr1ORn0ozxU7QY09o2ZOZQHIJsXfVw0UCdZxTKmZJ0=";
url = "https://deps.files.ghostty.org/z2d-0.10.0-j5P_Hu-6FgBsZNgwphIqh17jDnj8_yPtD8yzjO6PpHRQ.tar.gz";
hash = "sha256-qD+XexnAjSanRAwr5ZIaPY1aQhNW5DFVJ4PYLwhIr2E=";
unpack = true;
};
}
{
name = "zf-0.11.0-OIRy8X-RAAAwaRXHMYpj2uvBnuGTZWEE_3V7acqHQNtW";
name = "zf-0.10.3-OIRy8RuJAACKA3Lohoumrt85nRbHwbpMcUaLES8vxDnh";
path = fetchZigArtifact {
name = "zf";
url = "https://deps.files.ghostty.org/zf-c35c421f84895193246db06c40683c1a30e616ef.tar.gz";
hash = "sha256-LHurWwqK8jhP8AZd/CXrMJNeVsKftRCTN31/EgEgKaA=";
url = "https://deps.files.ghostty.org/zf-3c52637b7e937c5ae61fd679717da3e276765b23.tar.gz";
hash = "sha256-BfAZILill3I/nBf1oWwol77N34Jcpm4hudC+XSeMgZY=";
unpack = true;
};
}
{
name = "zig_js-0.0.0-rjCAV7-GAADvMTBL7lPMuvDk7xgS9PCMIZWiOUXLZSlj";
name = "zig_js-0.0.0-rjCAV-6GAADxFug7rDmPH-uM_XcnJ5NmuAMJCAscMjhi";
path = fetchZigArtifact {
name = "zig_js";
url = "https://deps.files.ghostty.org/zig_js-3c23860e47fdcdc5af805efb7fd0bdac5fd3e9bc.tar.gz";
hash = "sha256-Q1643wb/MCX0QkPa9QEY9xeQbqpC2IOrjER0ZyL3mH0=";
url = "https://deps.files.ghostty.org/zig_js-04db83c617da1956ac5adc1cb9ba1e434c1cb6fd.tar.gz";
hash = "sha256-r6GdXwrv+jTu0AkTlyN/FuO+N4X+l20gsbS59wrE7V4=";
unpack = true;
};
}
{
name = "zig_objc-0.0.0-Ir_Sp9gsAQCPAJc0oF5xoWePHWP6Y6tCphDeyNUThJoi";
name = "zig_objc-0.0.0-Ir_Sp5gTAQCvxxR7oVIrPXxXwsfKgVP7_wqoOQrZjFeK";
path = fetchZigArtifact {
name = "zig_objc";
url = "https://deps.files.ghostty.org/zig_objc-c8de82ff80281215ad92900866dab7103a8efa8b.tar.gz";
hash = "sha256-t8cTTJm0crcoGAyOqXO0wB2w7Yit80J2Orwr6prd/G0=";
url = "https://deps.files.ghostty.org/zig_objc-f356ed02833f0f1b8e84d50bed9e807bf7cdc0ae.tar.gz";
hash = "sha256-jWFQ5BrV880qqa9KypltWuRLqNSh21rDxt6Jxp0EoMM=";
unpack = true;
};
}
{
name = "wayland-0.6.0-lQa1kqz8AQADQmdNJsNhLoNHcnEGEUjrOaPV-dtEnEmX";
name = "wayland-0.5.0-dev-lQa1khrMAQDJDwYFKpdH3HizherB7sHo5dKMECfvxQHe";
path = fetchZigArtifact {
name = "zig_wayland";
url = "https://deps.files.ghostty.org/wayland-0.6.0-lQa1kqz8AQADQmdNJsNhLoNHcnEGEUjrOaPV-dtEnEmX.tar.gz";
hash = "sha256-3m/ITNhZUJ/5uD/Tqm+0uZSktGoYgWF5oldOqOCUkIE=";
url = "https://deps.files.ghostty.org/zig_wayland-1b5c038ec10da20ed3a15b0b2a6db1c21383e8ea.tar.gz";
hash = "sha256-1wRkixysjdFMyrATxlXdukAc34MwfNj0B6ydYVn+UKw=";
unpack = true;
};
}
{
name = "zigimg-0.1.0-8_eo2oyaFwBZwJpmqPkCfVXWBrHcqbYwmrp1I6bTD3lI";
name = "zigimg-0.1.0-8_eo2vHnEwCIVW34Q14Ec-xUlzIoVg86-7FU2ypPtxms";
path = fetchZigArtifact {
name = "zigimg";
url = "git+https://github.com/zigimg/zigimg#d695acd97c02e57bb151e8f659d1280f5cd6ca70";
hash = "sha256-0IYATQldT6eJxRR2T/2CsIYZuzomqjvmdVyjmsjguyE=";
url = "https://github.com/ivanstepanovftw/zigimg/archive/d7b7ab0ba0899643831ef042bd73289510b39906.tar.gz";
hash = "sha256-vkcTloGX+vRw7e6GYJLO9eocYaEOYjXYE0dT7jscZ4A=";
unpack = true;
};
}

View File

@@ -10,20 +10,20 @@
pkg-config,
runCommand,
xcbuild,
zig_0_16,
zig_0_15,
optimize ? "ReleaseFast",
simd ? true,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "libghostty-vt";
version = "0.1.0-unstable-2026-08-06";
version = "0.1.0-unstable-2026-07-20";
src = fetchFromGitHub {
owner = "ghostty-org";
repo = "ghostty";
rev = "22d13172cde98a0a4dda05d3d6a3fcb0dd8ed018";
hash = "sha256-tRtgTg/i3w1nFdRHU2IGekfJN8EyP+HARW4MtoUZyqk=";
rev = "88b4cd047fa627cdca6781bc7e7dc8b75a2cecb9";
hash = "sha256-298x90knBUWX5GHGXh2SKsAKvStjU2ri9UgOGoF79/8=";
};
# Zig's build runner computes relative paths from `cwd` to the build directory.
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
gitMinimal
ncurses
pkg-config
zig_0_16
zig_0_15
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
cctools
@@ -60,16 +60,6 @@ stdenv.mkDerivation (finalAttrs: {
buildInputs = [ ];
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
substituteInPlace src/build/LibtoolStep.zig \
--replace-fail /bin/cp cp \
--replace-fail /usr/bin/ranlib ranlib
substituteInPlace src/build/GhosttyLibVt.zig \
--replace-fail /bin/ln ln
substituteInPlace pkg/apple-sdk/native_link.zig \
--replace-fail /usr/bin/xcrun xcrun
'';
dontSetZigDefaultFlags = true;
zigBuildFlags = [
@@ -112,6 +102,6 @@ stdenv.mkDerivation (finalAttrs: {
"libghostty-vt-static"
];
maintainers = with lib.maintainers; [ domenkozar ];
platforms = zig_0_16.meta.platforms;
platforms = zig_0_15.meta.platforms;
};
})

View File

@@ -32,15 +32,7 @@ stdenv.mkDerivation rec {
hash = "sha256-b4tdQ9VH9M7hAD5Uuxu4QKwwpaVwroj/Bvg+Zsy0M1M=";
};
# This test produces an invalid multi-line array in YAML, which is rejected
# by yaml-cpp 0.9.0.
# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/2340
postPatch = ''
substituteInPlace tests/cpu/Config_tests.cpp --replace-fail \
'inactive_colorspaces: [cs1\t\n \n, \ncs2]\n' \
'inactive_colorspaces: [cs1\t\n \n , \n cs2]\n'
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
# these tests don't like being run headless on darwin. no builtin
# way of skipping tests so this is what we're reduced to.
substituteInPlace tests/cpu/Config_tests.cpp \

View File

@@ -9,7 +9,7 @@
}:
buildGoModule (finalAttrs: {
pname = "seaweedfs";
version = "4.47";
version = "4.46";
src = fetchFromGitHub {
owner = "seaweedfs";
@@ -22,10 +22,10 @@ buildGoModule (finalAttrs: {
find "$out" -name .git -print0 | xargs -0 rm -rf
popd
'';
hash = "sha256-NEDQos7TF2RsbBLdg6bf1FumIa3KxqrpDFLB0avJpC8=";
hash = "sha256-7RSTQcBp94+ySbN0MQpTljf8cJ74OTlCH6jCcOTXfns=";
};
vendorHash = "sha256-xDTcGTiGQdpOdLKvLmMrkiKlkcGdEtE52jWpcC+sOm4=";
vendorHash = "sha256-jq7GjP+P9ghVA9V/bHoL4KErbpABZp/ewSS1rNUdeqU=";
nativeBuildInputs = [ installShellFiles ];

View File

@@ -4,6 +4,7 @@
applyPatches,
writeTextFile,
fetchurl,
fetchpatch,
stdenv,
replaceVars,
yaml-cpp,
@@ -101,6 +102,20 @@ let
tag = "v4.1.0";
hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88=";
};
# Include cmake4 patch
# Remove when yaml-cpp.src is updated to include it
yaml-patched = applyPatches {
src = yaml-cpp.src;
patches = [
(fetchpatch {
name = "yaml-cpp-fix-cmake-4.patch";
url = "https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e.patch";
hash = "sha256-1kXRa+xrAbLEhcJxNV1oGHPmayj1RNIe6dDWXZA3mUA=";
})
];
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "spaghettikart";
@@ -139,7 +154,12 @@ stdenv.mkDerivation (finalAttrs: {
rev = "7e635fca68d014934b4af8a1cf874f63989352b7";
hash = "sha256-cxTaOuLXHRU8xMz9gluYz0a93O0ez2xOxbloyc1m1ns=";
};
yaml-cpp_src = srcOnly yaml-cpp;
yaml-cpp_src = fetchFromGitHub {
owner = "jbeder";
repo = "yaml-cpp";
rev = "28f93bdec6387d42332220afa9558060c8016795";
hash = "sha256-59/s4Rqiiw7LKQw0UwH3vOaT/YsNVcoq3vblK0FiO5c=";
};
tinyxml2_src = srcOnly tinyxml-2;
})
@@ -184,7 +204,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TINYXML2" "${tinyxml-2}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TOMLPLUSPLUS" "${tomlplusplus.src}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${srcOnly yaml-cpp}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-patched}")
];
strictDeps = true;

View File

@@ -3,6 +3,8 @@
fetchFromGitHub,
applyPatches,
writeTextFile,
fetchurl,
fetchpatch,
stdenv,
replaceVars,
yaml-cpp,
@@ -93,6 +95,20 @@ let
tag = "v4.1.0";
hash = "sha256-zhRFEmPYNFLqQCfvdAaG5VBNle9Qm8FepIIIrT9sh88=";
};
# Include cmake4 patch
# Remove when yaml-cpp.src is updated to include it
yaml-patched = applyPatches {
src = yaml-cpp.src;
patches = [
(fetchpatch {
name = "yaml-cpp-fix-cmake-4.patch";
url = "https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e.patch";
hash = "sha256-1kXRa+xrAbLEhcJxNV1oGHPmayj1RNIe6dDWXZA3mUA=";
})
];
};
in
stdenv.mkDerivation (finalAttrs: {
pname = "starship-sf64";
@@ -124,7 +140,7 @@ stdenv.mkDerivation (finalAttrs: {
rev = "7e635fca68d014934b4af8a1cf874f63989352b7";
hash = "sha256-cxTaOuLXHRU8xMz9gluYz0a93O0ez2xOxbloyc1m1ns=";
};
yaml-cpp_src = srcOnly yaml-cpp;
yaml-cpp_src = srcOnly yaml-patched;
tinyxml2_src = srcOnly tinyxml-2;
})
@@ -164,7 +180,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TINYXML2" "${tinyxml-2}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${srcOnly yaml-cpp}")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-patched}")
];
strictDeps = true;

View File

@@ -1,9 +1,7 @@
{
lib,
stdenv,
rustPlatform,
fetchFromGitHub,
fixDarwinDylibNames,
nix-update-script,
}:
@@ -24,10 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
buildFeatures = [ "c-api" ];
nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
fixDarwinDylibNames
];
checkFlags = [
# called `Result::unwrap()` on an `Err` value: LimitExceeded(ParseMemory)
"--skip=dos::renderer_rejects_generated_work_after_successful_parse"

View File

@@ -24,13 +24,13 @@ assert lib.elem lineEditingLibrary [
];
stdenv.mkDerivation (finalAttrs: {
pname = "trealla";
version = "3.10.3";
version = "3.9.39";
src = fetchFromGitHub {
owner = "trealla-prolog";
repo = "trealla";
rev = "v${finalAttrs.version}";
hash = "sha256-QWjFbBnIHBTplx2nmD5mGL1bfhUy5o2T4izAPeiy2XE=";
hash = "sha256-yfulQuwR3DgZk7ZUrVdqs09uZOcRmrTkZuU45Sw/f/o=";
};
postPatch = ''

View File

@@ -21,7 +21,7 @@
}:
stdenv.mkDerivation {
pname = "xdg-desktop-portal-umbriel";
version = "0-unstable-2026-09-07";
version = "0-unstable-2026-08-31";
strictDeps = true;
__structuredAttrs = true;
@@ -30,8 +30,8 @@ stdenv.mkDerivation {
owner = "noctalia-dev";
repo = "xdg-desktop-portal-umbriel";
# No tagged releases yet
rev = "d7a1bc386c2a6dfaecaa953165f9f373735c9ee0";
hash = "sha256-x2D1TiCn0rTwbA8darNxthxOWOCoZLwefptsUM7587I=";
rev = "d996f0c2bd4e8c868c0a143f0c9ce060f3c47ed5";
hash = "sha256-1mKBFkIO9RA3ERsLo1QZhyvS6bFSjG1lBpegQnPbIUY=";
};
nativeBuildInputs = [

View File

@@ -2,6 +2,7 @@
lib,
stdenv,
fetchFromGitHub,
fetchpatch,
gitUpdater,
cmake,
static ? stdenv.hostPlatform.isStatic,
@@ -9,15 +10,30 @@
stdenv.mkDerivation (finalAttrs: {
pname = "yaml-cpp";
version = "0.9.0";
version = "0.8.0";
src = fetchFromGitHub {
owner = "jbeder";
repo = "yaml-cpp";
tag = "yaml-cpp-${finalAttrs.version}";
hash = "sha256-+FOsPQY44h1g9tEw3O281LkiYKXdW2jnFKw+oTRkhGw=";
rev = finalAttrs.version;
hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI=";
};
patches = [
(fetchpatch {
name = "yaml-cpp-fix-cmake-4.patch";
url = "https://github.com/jbeder/yaml-cpp/commit/c2680200486572baf8221ba052ef50b58ecd816e.patch";
hash = "sha256-1kXRa+xrAbLEhcJxNV1oGHPmayj1RNIe6dDWXZA3mUA=";
})
# Fix build with gcc15
# https://github.com/jbeder/yaml-cpp/pull/1310
(fetchpatch {
name = "yaml-cpp-add-include-cstdint-gcc15.patch";
url = "https://github.com/jbeder/yaml-cpp/commit/7b469b4220f96fb3d036cf68cd7bd30bd39e61d2.patch";
hash = "sha256-4Mua6cYD8UR+fJfFeu0fdYVFprsiuF89HvbaTByz9nI=";
})
];
strictDeps = true;
nativeBuildInputs = [
@@ -25,14 +41,14 @@ stdenv.mkDerivation (finalAttrs: {
];
cmakeFlags = [
(lib.cmakeBool "YAML_CPP_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "YAML_CPP_BUILD_TOOLS" false)
"-DYAML_CPP_BUILD_TOOLS=false"
(lib.cmakeBool "YAML_BUILD_SHARED_LIBS" (!static))
"-DINSTALL_GTEST=false"
];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
passthru.updateScript = gitUpdater { rev-prefix = "yaml-cpp-"; };
passthru.updateScript = gitUpdater { };
meta = {
description = "YAML parser and emitter for C++";

View File

@@ -12,13 +12,13 @@ let
in
buildNpmPackage (finalAttrs: {
pname = "zashboard";
version = "3.26.0";
version = "3.25.0";
src = fetchFromGitHub {
owner = "Zephyruso";
repo = "zashboard";
tag = "v${finalAttrs.version}";
hash = "sha256-28TPqsg294XUvKnOIUru9ReQQ78II4B0HuaI581XT4I=";
hash = "sha256-Mt20lUq9YQn2A39bkWwz3Fzgv1pUQwnFW8bCrKp713Q=";
};
npmDeps = null;

View File

@@ -8,12 +8,12 @@
buildPythonPackage rec {
pname = "asyncsleepiq";
version = "1.7.2";
version = "1.7.1";
pyproject = true;
src = fetchPypi {
inherit pname version;
hash = "sha256-m0Is5X46pOGTu7TBBBY/sgC3GNxULYkONe5H1rCAnb0=";
hash = "sha256-gOg1cxd2OsDRg5jtc6MfEMsK9T0Croo8K1jzsvbAbdY=";
};
nativeBuildInputs = [ setuptools ];

View File

@@ -2,25 +2,20 @@
lib,
buildPythonPackage,
fetchPypi,
setuptools,
speg,
}:
buildPythonPackage (finalAttrs: {
buildPythonPackage rec {
pname = "cson";
version = "0.8";
pyproject = true;
__structuredAttrs = true;
format = "setuptools";
src = fetchPypi {
inherit (finalAttrs) pname version;
inherit pname version;
hash = "sha256-7owBZvzR9ReJiHGX4+g1Sse++jlvwpcGvOta8l7cngE=";
};
build-system = [ setuptools ];
dependencies = [ speg ];
propagatedBuildInputs = [ speg ];
pythonImportsCheck = [ "cson" ];
@@ -30,4 +25,4 @@ buildPythonPackage (finalAttrs: {
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ xworld21 ];
};
})
}

View File

@@ -14,14 +14,14 @@
buildPythonPackage (finalAttrs: {
pname = "victron-mqtt";
version = "2026.9.5";
version = "2026.8.9";
pyproject = true;
src = fetchFromGitHub {
owner = "tomer-w";
repo = "victron_mqtt";
tag = "v${finalAttrs.version}";
hash = "sha256-GOWQbWzGfvQ373ozyxRMAKpceB9x4V73iSu735M/tp0=";
hash = "sha256-dO8uGjC5RRANNbAL0i3yPLP04rrTK/7rz0UX3/5ClbQ=";
};
build-system = [

View File

@@ -15,14 +15,14 @@ let
variants = {
# ./update-xanmod.sh lts
lts = {
version = "6.18.52";
hash = "sha256-VbMijsO4Et7wYVXi2kBYt4ilnO87wrzRkje1BTv4c/U=";
version = "6.18.51";
hash = "sha256-9iUOgXffGPXMgtxP2Dh0iWDwqi/iFc21CZsle3B7SSw=";
isLTS = true;
};
# ./update-xanmod.sh main
main = {
version = "7.2.6";
hash = "sha256-RBoN7XFXtLCPin3K+Wc1vyk/6IG7hXRX5Nrxr9rC3/k=";
version = "7.2.5";
hash = "sha256-PQDZPcIc+F7dAkb0/3S0Ft7b2JYvQ9BldSyCifEIcpM=";
};
};