diff --git a/nixos/modules/services/misc/ntfy-sh.nix b/nixos/modules/services/misc/ntfy-sh.nix index 69919c83e779..57e8a63a86e7 100644 --- a/nixos/modules/services/misc/ntfy-sh.nix +++ b/nixos/modules/services/misc/ntfy-sh.nix @@ -11,23 +11,24 @@ let in { + imports = [ + (lib.mkRemovedOptionModule [ + "services" + "ntfy-sh" + "user" + ] "ntfy-sh is now a DynamicUser service, so a static user is no longer needed.") + (lib.mkRemovedOptionModule [ + "services" + "ntfy-sh" + "group" + ] "ntfy-sh is now a DynamicUser service, so a static group is no longer needed.") + ]; + options.services.ntfy-sh = { enable = lib.mkEnableOption "[ntfy-sh](https://ntfy.sh), a push notification service"; package = lib.mkPackageOption pkgs "ntfy-sh" { }; - user = lib.mkOption { - default = "ntfy-sh"; - type = lib.types.str; - description = "User the ntfy-sh server runs under."; - }; - - group = lib.mkOption { - default = "ntfy-sh"; - type = lib.types.str; - description = "Primary group of ntfy-sh user."; - }; - settings = lib.mkOption { type = lib.types.submodule { freeformType = settingsFormat.type; @@ -101,7 +102,6 @@ in serviceConfig = { ExecStart = "${cfg.package}/bin/ntfy serve -c ${configuration}"; - User = cfg.user; StateDirectory = "ntfy-sh"; RuntimeDirectory = "ntfy-sh"; @@ -125,16 +125,5 @@ in EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; }; }; - - users.groups = lib.optionalAttrs (cfg.group == "ntfy-sh") { - ntfy-sh = { }; - }; - - users.users = lib.optionalAttrs (cfg.user == "ntfy-sh") { - ntfy-sh = { - isSystemUser = true; - group = cfg.group; - }; - }; }; } diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 2d981701ee7b..16698464d413 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -2082,8 +2082,9 @@ in systemd.services.grafana = { description = "Grafana Service Daemon"; wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; after = [ - "network.target" + "network-online.target" ] ++ lib.optional usePostgresql "postgresql.target" ++ lib.optional useMysql "mysql.service"; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix b/nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix index f9fbb3d323da..6029a9a4bf1c 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/mqtt.nix @@ -11,6 +11,7 @@ let mkIf mkEnableOption mkOption + mkPackageOption types ; cfg = config.services.prometheus.exporters.mqtt; @@ -21,6 +22,7 @@ in # https://github.com/kpetremann/mqtt-exporter/tree/master?tab=readme-ov-file#configuration port = 9000; extraOpts = { + package = mkPackageOption pkgs "mqtt-exporter" { }; keepFullTopic = mkEnableOption "Keep entire topic instead of the first two elements only. Usecase: Shelly 3EM"; logLevel = mkOption { type = types.enum [ @@ -134,7 +136,7 @@ in }; serviceConfig = { EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; - ExecStart = lib.getExe pkgs.mqtt-exporter; + ExecStart = lib.getExe cfg.package; }; }; } diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index 8938293fee28..3f130dda4bba 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -188,14 +188,14 @@ in fi if [ ! -s /run/xrdp/rsakeys.ini ]; then mkdir -p /run/xrdp - ${pkgs.xrdp}/bin/xrdp-keygen xrdp /run/xrdp/rsakeys.ini + ${cfg.package}/bin/xrdp-keygen xrdp /run/xrdp/rsakeys.ini fi ''; serviceConfig = { User = "xrdp"; Group = "xrdp"; PermissionsStartOnly = true; - ExecStart = "${pkgs.xrdp}/bin/xrdp --nodaemon --port ${toString cfg.port} --config ${confDir}/xrdp.ini"; + ExecStart = "${cfg.package}/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 = "${pkgs.xrdp}/bin/xrdp-sesman --nodaemon --config ${confDir}/sesman.ini"; + ExecStart = "${cfg.package}/bin/xrdp-sesman --nodaemon --config ${confDir}/sesman.ini"; ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; }; }; diff --git a/nixos/modules/services/x11/redshift.nix b/nixos/modules/services/x11/redshift.nix index 0ebde5bf642b..7baedf1ad50e 100644 --- a/nixos/modules/services/x11/redshift.nix +++ b/nixos/modules/services/x11/redshift.nix @@ -52,7 +52,7 @@ in temperature = { day = mkOption { type = types.ints.between 1000 25000; - default = 5500; + default = 6500; 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 = 3700; + default = 4500; description = '' Colour temperature to use at night, between `1000` and `25000` K. diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index 2d3a6303210c..cacb6a5fc4e0 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "cosmic-protocols"; - version = "0-unstable-2026-08-14"; + version = "0-unstable-2026-09-11"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-protocols"; - rev = "a2da48188362c4ea05d33de2f6c67d8148deba88"; - hash = "sha256-hqsOzu0mlkE2jtgL5HvbT9vtOKiMSniNwV+xk4UzTkc="; + rev = "c0cff4db14c37ed954983158e4055aa94c7741d9"; + hash = "sha256-FL2YkCVrJ6JWUGMDg+jJJa51oar/PWDfgPgCyjcv6gk="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/de/devpi-server/unwrapped.nix b/pkgs/by-name/de/devpi-server/unwrapped.nix index d5c74d2e3bb3..a2dff27c8159 100644 --- a/pkgs/by-name/de/devpi-server/unwrapped.nix +++ b/pkgs/by-name/de/devpi-server/unwrapped.nix @@ -5,7 +5,7 @@ versionCheckHook, # build-system - setuptools, + setuptools_80, # dependencies aiohttp, @@ -42,14 +42,14 @@ buildPythonPackage (finalAttrs: { pname = "devpi-server"; - version = "6.19.2"; + version = "6.20.3"; pyproject = true; src = fetchFromGitHub { owner = "devpi"; repo = "devpi"; tag = "server-${finalAttrs.version}"; - hash = "sha256-rAku3oHcmzFNA/MP/64382gCTgqopwjjy4S4HTEFZiY="; + hash = "sha256-6OoINJu8DoDCZzu/umdINH0UQXh19pQ2e6XQjJpdAYc="; }; postPatch = '' @@ -60,7 +60,7 @@ buildPythonPackage (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/server"; build-system = [ - setuptools + setuptools_80 ]; dependencies = [ @@ -79,7 +79,7 @@ buildPythonPackage (finalAttrs: { py pyramid repoze-lru - setuptools + setuptools_80 strictyaml waitress ] diff --git a/pkgs/by-name/di/diskbloom/package.nix b/pkgs/by-name/di/diskbloom/package.nix index e99c1a36e649..cdd8bec90019 100644 --- a/pkgs/by-name/di/diskbloom/package.nix +++ b/pkgs/by-name/di/diskbloom/package.nix @@ -25,6 +25,11 @@ buildGoModule (finalAttrs: { "-w" "-X main.version=${finalAttrs.version}" ]; + + checkFlags = [ + "-skip=TestScanAggregates" + ]; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/go/go2tv/package.nix b/pkgs/by-name/go/go2tv/package.nix index d39fe395242a..ceee111960b7 100644 --- a/pkgs/by-name/go/go2tv/package.nix +++ b/pkgs/by-name/go/go2tv/package.nix @@ -19,16 +19,16 @@ buildGoModule rec { pname = "go2tv" + lib.optionalString (!withGui) "-lite"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "alexballas"; repo = "go2tv"; tag = "v${version}"; - hash = "sha256-rNoQafBIxE0xoBFQNy6GoeIE93Uq3QEsktko77P2ps8="; + hash = "sha256-Goj+x1i2Amo1s50Yd9HDj2d2WH+5y7N3y4ngeNkBgH8="; }; - vendorHash = "sha256-h8/DBqkaSSxIIFrdbun4doN3qyKbR3BhO4SwL5H/sfc="; + vendorHash = "sha256-tabupT5OF1BzMWuSNPEe7G6DF/PJWZ7WeRLNHefYvP0="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/hy/hyprtoolkit/package.nix b/pkgs/by-name/hy/hyprtoolkit/package.nix index 603bcd17b984..a4653b944e27 100644 --- a/pkgs/by-name/hy/hyprtoolkit/package.nix +++ b/pkgs/by-name/hy/hyprtoolkit/package.nix @@ -6,6 +6,7 @@ pkg-config, hyprwayland-scanner, wayland-scanner, + abseil-cpp, aquamarine, cairo, gtest, @@ -25,13 +26,13 @@ gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprtoolkit"; - version = "0.5.4"; + version = "0.6.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprtoolkit"; tag = "v${finalAttrs.version}"; - hash = "sha256-gJSBj4Pd4e9nERAKo/qiHqDMpS2hBfyOI0uGCbbiML4="; + hash = "sha256-0rb1yZZ0PR4lRrXC2BdiMjGFttZe6MFQFSnx3wD4dko="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ gcc16Stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + abseil-cpp aquamarine cairo gtest diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index d24135484f82..a01db75e815d 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -109,13 +109,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "immich"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "immich-app"; repo = "immich"; tag = "v${finalAttrs.version}"; - hash = "sha256-1gaQ6f9Ja5FSis3wKyDUQprbcgs6sFtxNTwgihuxKL0="; + hash = "sha256-ufdMwERs1h+m2usMHztZicRXpI20BM+2PeOLBArXw1Y="; }; pnpmDeps = fetchPnpmDeps { diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index 852ce7d2742e..af4f6a4370fc 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "knossosnet"; - version = "1.3.10"; + version = "1.3.11"; src = fetchFromGitHub { owner = "KnossosNET"; repo = "Knossos.NET"; tag = "v${version}"; - hash = "sha256-oIkeR3072Ye24BQRNidf1Lr0/2z6h+eljwTr9NMqq98="; + hash = "sha256-9ad9jcq5se40PLXqXWy9leg3AuwD3fVOxVU/vbavzyw="; }; patches = [ ./dotnet-8-upgrade.patch ]; diff --git a/pkgs/by-name/li/libghostty-vt/deps.nix b/pkgs/by-name/li/libghostty-vt/deps.nix index 1229b3fe8d8c..2117ab63f313 100644 --- a/pkgs/by-name/li/libghostty-vt/deps.nix +++ b/pkgs/by-name/li/libghostty-vt/deps.nix @@ -6,18 +6,29 @@ fetchurl, fetchgit, runCommandLocal, - zig_0_15, + zig_0_16, zstd, name ? "zig-packages", }: let unpackZigArtifact = - { 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" - ''; + { + 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 + ''; fetchZig = { @@ -92,6 +103,15 @@ 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 { @@ -147,11 +167,11 @@ linkFarm name [ }; } { - name = "gobject-0.3.0-Skun7ANLnwDvEfIpVmohcppXgOvg_I6YOJFmPIsKfXk-"; + name = "gobject-0.3.2-Skun7F6HogCMynX2JqeSHS7xr-8pK4ob-qRFIcEasVi3"; path = fetchZigArtifact { name = "gobject"; - url = "https://deps.files.ghostty.org/gobject-2025-11-08-23-1.tar.zst"; - hash = "sha256-OxS9/XC5aMJj1KhOcFP1ZZN7PI4ADw4f7ocx6V64mOc="; + 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="; unpack = true; }; } @@ -186,17 +206,17 @@ linkFarm name [ name = "N-V-__8AAEbOfQBnvcFcCX2W5z7tDaN8vaNZGamEQtNOe0UI"; path = fetchZigArtifact { name = "imgui"; - url = "https://github.com/ocornut/imgui/archive/refs/tags/v1.92.5-docking.tar.gz"; + url = "https://deps.files.ghostty.org/N-V-__8AAEbOfQBnvcFcCX2W5z7tDaN8vaNZGamEQtNOe0UI.tar.gz"; hash = "sha256-yBbCDox18+Fa6Gc1DnmSVQLRpqhZOLsac7iSfl8x+cs="; unpack = false; }; } { - name = "N-V-__8AALZGBAAS5NLVH-c8eC-6VtCdcH-9nUvVfUSkWS__"; + name = "N-V-__8AAGxKBAAjYkT1jYUiOZDXQuj0u34ndIjAWxiR1KX9"; path = fetchZigArtifact { name = "iterm2_themes"; - url = "https://deps.files.ghostty.org/ghostty-themes-release-20260713-155359-c3968b3.tgz"; - hash = "sha256-FLMES+9no8uDUjlzvRbTqg+wCW3dHg7Lo5FtFNbWfyA="; + url = "https://deps.files.ghostty.org/ghostty-themes-release-20260720-153658-97e244c.tgz"; + hash = "sha256-cynQ4ulY7oQE5RamVQvQczTtxhEzSnP4TVBHfapFnww="; unpack = false; }; } @@ -219,11 +239,11 @@ linkFarm name [ }; } { - name = "libxev-0.0.0-86vtc4IcEwCqEYxEYoN_3KXmc6A9VLcm22aVImfvecYs"; + name = "libxev-0.0.0-86vtcwIRFADbH4hk-EjROXxlrKIRPQdA41XiTSytYO-F"; path = fetchZigArtifact { name = "libxev"; - url = "https://deps.files.ghostty.org/libxev-34fa50878aec6e5fa8f532867001ab3c36fae23e.tar.gz"; - hash = "sha256-1B9oJExVyOWRj+Y9d9eHkOBTlOYuEkcwGBUKdlgRhkg="; + url = "https://deps.files.ghostty.org/libxev-9ce8e8e6ff89e583258a7f8e7adeeeaeae8611bf.tar.gz"; + hash = "sha256-fOU1oxIxfoEgoLuWz7fVX6M+zmqpo7gqZObWiH/aDE0="; unpack = true; }; } @@ -291,29 +311,38 @@ linkFarm name [ }; } { - name = "uucode-0.1.0-ZZjBPj96QADXyt5sqwBJUnhaDYs_qBeeKijZvlRa0eqM"; + name = "translate_c-0.0.0-Q_BUWmU6BwB_9JKG2l2W7i_mhmYWeRseTGBEHi_YlV5f"; path = fetchZigArtifact { - name = "uucode"; - url = "git+https://github.com/jacobsandlund/uucode#5f05f8f83a75caea201f12cc8ea32a2d82ea9732"; - hash = "sha256-sHPh+TQSdUGus/QTbj7KSJJkTuNTrK4VNmQDjS30Lf8="; + name = "translate_c"; + url = "https://deps.files.ghostty.org/translate_c-80f8b6e4f45a303268717d8e5f4f91d7837138bb.tar.gz"; + hash = "sha256-fB7OsZ2PIijMzVMYg8SzDBtTKX7IZHbEvPuBTdyGtWk="; unpack = true; }; } { - name = "uucode-0.2.0-ZZjBPqZVVABQepOqZHR7vV_NcaN-wats0IB6o-Exj6m9"; + name = "uucode-0.2.0-ZZjBPlK5VADj7fdoq7G8LIHzD5o6FSkcBXXrRWr4jnrA"; path = fetchZigArtifact { name = "uucode"; - url = "https://deps.files.ghostty.org/uucode-0.2.0-ZZjBPqZVVABQepOqZHR7vV_NcaN-wats0IB6o-Exj6m9.tar.gz"; - hash = "sha256-jLrhrmCXQ1T+LQP1JTBBB3Jn+1hCZfODbC4SdlfNdKg="; + url = "https://deps.files.ghostty.org/uucode-2826a37a4562284fdacd8fa029d49509cc9bffcd.tar.gz"; + hash = "sha256-R5RXW5tWIaDq5JOF2+oWd5YOYOyns6WH7f687WE+b20="; unpack = true; }; } { - name = "vaxis-0.5.1-BWNV_LosCQAGmCCNOLljCIw6j6-yt53tji6n6rwJ2BhS"; + name = "vaxis-0.6.0-BWNV_MjFCQCs9UDHiRkrgw_ayeiPkzOe4xVbaAqXkUWW"; path = fetchZigArtifact { name = "vaxis"; - url = "https://deps.files.ghostty.org/vaxis-7dbb9fd3122e4ffad262dd7c151d80d863b68558.tar.gz"; - hash = "sha256-zTyrZrIffM+GJIt973tKDeWHmOCwbn7KLDdQxSiK00Y="; + url = "git+https://github.com/rockorager/libvaxis.git#c1e1f23be38951c425cdf31af455ba23ef178940"; + hash = "sha256-bIXu8lGwGo42QbItC0jOi/eN7u+f4snknBexw7dc0DI="; + unpack = true; + }; + } + { + name = "vaxis-0.6.0-BWNV_CrbCQCscGpzsAlR402rYQ_tV3aAl081c2iRRkka"; + path = fetchZigArtifact { + name = "vaxis"; + url = "https://deps.files.ghostty.org/vaxis-1dbbe575dff4586fe51e3217aa5c3fecdcbb6089.tar.gz"; + hash = "sha256-z3J3w+oYapfAZZR+MvWXwg+th1hePDA1TptnKFO4r+M="; unpack = true; }; } @@ -326,6 +355,15 @@ 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 { @@ -335,15 +373,6 @@ 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 { @@ -354,56 +383,56 @@ linkFarm name [ }; } { - name = "z2d-0.10.0-j5P_Hu-6FgBsZNgwphIqh17jDnj8_yPtD8yzjO6PpHRQ"; + name = "z2d-0.12.1-j5P_Hsw8EQAKyZTQICCQnAH2xYkLDW8k9uefbsYdfPZ-"; path = fetchZigArtifact { name = "z2d"; - url = "https://deps.files.ghostty.org/z2d-0.10.0-j5P_Hu-6FgBsZNgwphIqh17jDnj8_yPtD8yzjO6PpHRQ.tar.gz"; - hash = "sha256-qD+XexnAjSanRAwr5ZIaPY1aQhNW5DFVJ4PYLwhIr2E="; + url = "https://deps.files.ghostty.org/z2d-7dbae85c81784dba9988320bf9543ed9a81350c8.tar.gz"; + hash = "sha256-Fjr1ORn0ozxU7QY09o2ZOZQHIJsXfVw0UCdZxTKmZJ0="; unpack = true; }; } { - name = "zf-0.10.3-OIRy8RuJAACKA3Lohoumrt85nRbHwbpMcUaLES8vxDnh"; + name = "zf-0.11.0-OIRy8X-RAAAwaRXHMYpj2uvBnuGTZWEE_3V7acqHQNtW"; path = fetchZigArtifact { name = "zf"; - url = "https://deps.files.ghostty.org/zf-3c52637b7e937c5ae61fd679717da3e276765b23.tar.gz"; - hash = "sha256-BfAZILill3I/nBf1oWwol77N34Jcpm4hudC+XSeMgZY="; + url = "https://deps.files.ghostty.org/zf-c35c421f84895193246db06c40683c1a30e616ef.tar.gz"; + hash = "sha256-LHurWwqK8jhP8AZd/CXrMJNeVsKftRCTN31/EgEgKaA="; unpack = true; }; } { - name = "zig_js-0.0.0-rjCAV-6GAADxFug7rDmPH-uM_XcnJ5NmuAMJCAscMjhi"; + name = "zig_js-0.0.0-rjCAV7-GAADvMTBL7lPMuvDk7xgS9PCMIZWiOUXLZSlj"; path = fetchZigArtifact { name = "zig_js"; - url = "https://deps.files.ghostty.org/zig_js-04db83c617da1956ac5adc1cb9ba1e434c1cb6fd.tar.gz"; - hash = "sha256-r6GdXwrv+jTu0AkTlyN/FuO+N4X+l20gsbS59wrE7V4="; + url = "https://deps.files.ghostty.org/zig_js-3c23860e47fdcdc5af805efb7fd0bdac5fd3e9bc.tar.gz"; + hash = "sha256-Q1643wb/MCX0QkPa9QEY9xeQbqpC2IOrjER0ZyL3mH0="; unpack = true; }; } { - name = "zig_objc-0.0.0-Ir_Sp5gTAQCvxxR7oVIrPXxXwsfKgVP7_wqoOQrZjFeK"; + name = "zig_objc-0.0.0-Ir_Sp9gsAQCPAJc0oF5xoWePHWP6Y6tCphDeyNUThJoi"; path = fetchZigArtifact { name = "zig_objc"; - url = "https://deps.files.ghostty.org/zig_objc-f356ed02833f0f1b8e84d50bed9e807bf7cdc0ae.tar.gz"; - hash = "sha256-jWFQ5BrV880qqa9KypltWuRLqNSh21rDxt6Jxp0EoMM="; + url = "https://deps.files.ghostty.org/zig_objc-c8de82ff80281215ad92900866dab7103a8efa8b.tar.gz"; + hash = "sha256-t8cTTJm0crcoGAyOqXO0wB2w7Yit80J2Orwr6prd/G0="; unpack = true; }; } { - name = "wayland-0.5.0-dev-lQa1khrMAQDJDwYFKpdH3HizherB7sHo5dKMECfvxQHe"; + name = "wayland-0.6.0-lQa1kqz8AQADQmdNJsNhLoNHcnEGEUjrOaPV-dtEnEmX"; path = fetchZigArtifact { name = "zig_wayland"; - url = "https://deps.files.ghostty.org/zig_wayland-1b5c038ec10da20ed3a15b0b2a6db1c21383e8ea.tar.gz"; - hash = "sha256-1wRkixysjdFMyrATxlXdukAc34MwfNj0B6ydYVn+UKw="; + url = "https://deps.files.ghostty.org/wayland-0.6.0-lQa1kqz8AQADQmdNJsNhLoNHcnEGEUjrOaPV-dtEnEmX.tar.gz"; + hash = "sha256-3m/ITNhZUJ/5uD/Tqm+0uZSktGoYgWF5oldOqOCUkIE="; unpack = true; }; } { - name = "zigimg-0.1.0-8_eo2vHnEwCIVW34Q14Ec-xUlzIoVg86-7FU2ypPtxms"; + name = "zigimg-0.1.0-8_eo2oyaFwBZwJpmqPkCfVXWBrHcqbYwmrp1I6bTD3lI"; path = fetchZigArtifact { name = "zigimg"; - url = "https://github.com/ivanstepanovftw/zigimg/archive/d7b7ab0ba0899643831ef042bd73289510b39906.tar.gz"; - hash = "sha256-vkcTloGX+vRw7e6GYJLO9eocYaEOYjXYE0dT7jscZ4A="; + url = "git+https://github.com/zigimg/zigimg#d695acd97c02e57bb151e8f659d1280f5cd6ca70"; + hash = "sha256-0IYATQldT6eJxRR2T/2CsIYZuzomqjvmdVyjmsjguyE="; unpack = true; }; } diff --git a/pkgs/by-name/li/libghostty-vt/package.nix b/pkgs/by-name/li/libghostty-vt/package.nix index 5132cad9839f..a100e62c2607 100644 --- a/pkgs/by-name/li/libghostty-vt/package.nix +++ b/pkgs/by-name/li/libghostty-vt/package.nix @@ -10,20 +10,20 @@ pkg-config, runCommand, xcbuild, - zig_0_15, + zig_0_16, optimize ? "ReleaseFast", simd ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "libghostty-vt"; - version = "0.1.0-unstable-2026-07-20"; + version = "0.1.0-unstable-2026-08-06"; src = fetchFromGitHub { owner = "ghostty-org"; repo = "ghostty"; - rev = "88b4cd047fa627cdca6781bc7e7dc8b75a2cecb9"; - hash = "sha256-298x90knBUWX5GHGXh2SKsAKvStjU2ri9UgOGoF79/8="; + rev = "22d13172cde98a0a4dda05d3d6a3fcb0dd8ed018"; + hash = "sha256-tRtgTg/i3w1nFdRHU2IGekfJN8EyP+HARW4MtoUZyqk="; }; # 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_15 + zig_0_16 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools @@ -60,6 +60,16 @@ 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 = [ @@ -102,6 +112,6 @@ stdenv.mkDerivation (finalAttrs: { "libghostty-vt-static" ]; maintainers = with lib.maintainers; [ domenkozar ]; - platforms = zig_0_15.meta.platforms; + platforms = zig_0_16.meta.platforms; }; }) diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix index fade2f889cbd..4a75a1487588 100644 --- a/pkgs/by-name/mo/moor/package.nix +++ b/pkgs/by-name/mo/moor/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "moor"; - version = "2.19.0"; + version = "2.19.1"; src = fetchFromGitHub { owner = "walles"; repo = "moor"; tag = "v${finalAttrs.version}"; - hash = "sha256-H9AVB6XFz+/j26Es926A/jQ3ZaKcIY/YH7wL6+Zr3FQ="; + hash = "sha256-84Q0BAe3hQOaRM8LJm9jnA2D+IYbHVOV6UpSCVYRVu4="; }; vendorHash = "sha256-y9NejPlFRCVhfR0A+kTQABpqAxMVmKlZizbJjI39F/k="; diff --git a/pkgs/by-name/ne/nezha-theme-user/package.nix b/pkgs/by-name/ne/nezha-theme-user/package.nix index 291081db0722..24daa6b29cfe 100644 --- a/pkgs/by-name/ne/nezha-theme-user/package.nix +++ b/pkgs/by-name/ne/nezha-theme-user/package.nix @@ -13,13 +13,13 @@ let in buildNpmPackage (finalAttrs: { pname = "nezha-theme-user"; - version = "2.4.2"; + version = "2.4.3"; src = fetchFromGitHub { owner = "hamster1963"; repo = "nezha-dash-v2"; tag = "v${finalAttrs.version}"; - hash = "sha256-n1q9mjheW2J500mEPhBaGHuMAEVtddxXCyLC+Au/8Ts="; + hash = "sha256-EK0I6O2+mfEz6QgDSVUco9cioik/9fqVFhboJKc6G5A="; }; postPatch = '' diff --git a/pkgs/by-name/op/opencolorio/package.nix b/pkgs/by-name/op/opencolorio/package.nix index a18f3a0f3843..2d745ca4cdba 100644 --- a/pkgs/by-name/op/opencolorio/package.nix +++ b/pkgs/by-name/op/opencolorio/package.nix @@ -32,7 +32,15 @@ stdenv.mkDerivation rec { hash = "sha256-b4tdQ9VH9M7hAD5Uuxu4QKwwpaVwroj/Bvg+Zsy0M1M="; }; - postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # 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 '' # 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 \ diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix index eb142fac6516..73f6a06105c8 100644 --- a/pkgs/by-name/se/seaweedfs/package.nix +++ b/pkgs/by-name/se/seaweedfs/package.nix @@ -9,7 +9,7 @@ }: buildGoModule (finalAttrs: { pname = "seaweedfs"; - version = "4.46"; + version = "4.47"; src = fetchFromGitHub { owner = "seaweedfs"; @@ -22,10 +22,10 @@ buildGoModule (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf popd ''; - hash = "sha256-7RSTQcBp94+ySbN0MQpTljf8cJ74OTlCH6jCcOTXfns="; + hash = "sha256-NEDQos7TF2RsbBLdg6bf1FumIa3KxqrpDFLB0avJpC8="; }; - vendorHash = "sha256-jq7GjP+P9ghVA9V/bHoL4KErbpABZp/ewSS1rNUdeqU="; + vendorHash = "sha256-xDTcGTiGQdpOdLKvLmMrkiKlkcGdEtE52jWpcC+sOm4="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/sp/spaghettikart/package.nix b/pkgs/by-name/sp/spaghettikart/package.nix index 79b9a60a1db3..3348b01f9d55 100644 --- a/pkgs/by-name/sp/spaghettikart/package.nix +++ b/pkgs/by-name/sp/spaghettikart/package.nix @@ -4,7 +4,6 @@ applyPatches, writeTextFile, fetchurl, - fetchpatch, stdenv, replaceVars, yaml-cpp, @@ -102,20 +101,6 @@ 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"; @@ -154,12 +139,7 @@ stdenv.mkDerivation (finalAttrs: { rev = "7e635fca68d014934b4af8a1cf874f63989352b7"; hash = "sha256-cxTaOuLXHRU8xMz9gluYz0a93O0ez2xOxbloyc1m1ns="; }; - yaml-cpp_src = fetchFromGitHub { - owner = "jbeder"; - repo = "yaml-cpp"; - rev = "28f93bdec6387d42332220afa9558060c8016795"; - hash = "sha256-59/s4Rqiiw7LKQw0UwH3vOaT/YsNVcoq3vblK0FiO5c="; - }; + yaml-cpp_src = srcOnly yaml-cpp; tinyxml2_src = srcOnly tinyxml-2; }) @@ -204,7 +184,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" "${yaml-patched}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${srcOnly yaml-cpp}") ]; strictDeps = true; diff --git a/pkgs/by-name/st/starship-sf64/package.nix b/pkgs/by-name/st/starship-sf64/package.nix index ec907ef85153..b4a8ad77b8aa 100644 --- a/pkgs/by-name/st/starship-sf64/package.nix +++ b/pkgs/by-name/st/starship-sf64/package.nix @@ -3,8 +3,6 @@ fetchFromGitHub, applyPatches, writeTextFile, - fetchurl, - fetchpatch, stdenv, replaceVars, yaml-cpp, @@ -95,20 +93,6 @@ 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"; @@ -140,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { rev = "7e635fca68d014934b4af8a1cf874f63989352b7"; hash = "sha256-cxTaOuLXHRU8xMz9gluYz0a93O0ez2xOxbloyc1m1ns="; }; - yaml-cpp_src = srcOnly yaml-patched; + yaml-cpp_src = srcOnly yaml-cpp; tinyxml2_src = srcOnly tinyxml-2; }) @@ -180,7 +164,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" "${yaml-patched}") + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${srcOnly yaml-cpp}") ]; strictDeps = true; diff --git a/pkgs/by-name/tl/tlottie/package.nix b/pkgs/by-name/tl/tlottie/package.nix index a74dfa9d0ddb..de0e931d2dee 100644 --- a/pkgs/by-name/tl/tlottie/package.nix +++ b/pkgs/by-name/tl/tlottie/package.nix @@ -1,7 +1,9 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, + fixDarwinDylibNames, nix-update-script, }: @@ -22,6 +24,10 @@ 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" diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix index b274f1f6e488..4ad453b8cb29 100644 --- a/pkgs/by-name/tr/trealla/package.nix +++ b/pkgs/by-name/tr/trealla/package.nix @@ -24,13 +24,13 @@ assert lib.elem lineEditingLibrary [ ]; stdenv.mkDerivation (finalAttrs: { pname = "trealla"; - version = "3.9.39"; + version = "3.10.3"; src = fetchFromGitHub { owner = "trealla-prolog"; repo = "trealla"; rev = "v${finalAttrs.version}"; - hash = "sha256-yfulQuwR3DgZk7ZUrVdqs09uZOcRmrTkZuU45Sw/f/o="; + hash = "sha256-QWjFbBnIHBTplx2nmD5mGL1bfhUy5o2T4izAPeiy2XE="; }; postPatch = '' diff --git a/pkgs/by-name/tr/treemd/package.nix b/pkgs/by-name/tr/treemd/package.nix index 4c3b666dac12..db3f22557771 100644 --- a/pkgs/by-name/tr/treemd/package.nix +++ b/pkgs/by-name/tr/treemd/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "treemd"; - version = "0.7.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "Epistates"; repo = "treemd"; tag = "v${finalAttrs.version}"; - hash = "sha256-PnW3lZT45xtvxrFaWaZk/6+sqRD9dFNq9mhux7BxjIk="; + hash = "sha256-HSLl24PEOsSmoMNbfQm866msgjfcs0QKSED9GPhmjvQ="; }; - cargoHash = "sha256-F5Q+uIQ7meHXdq5jwgo8QUBmCbBpq6177Ps2qbqTrZg="; + cargoHash = "sha256-YmejEZAZrmiviXGXvLqEGHia1fHNyJaYZGg4Px18Ae0="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json index 8a53b71600dc..82d72a23e748 100644 --- a/pkgs/by-name/wa/warp-terminal/versions.json +++ b/pkgs/by-name/wa/warp-terminal/versions.json @@ -1,14 +1,14 @@ { "darwin": { - "hash": "sha256-t1Fa6LwZAdgFA05bB2XQeNstYL3gfM9l4P+s9vJCJlk=", - "version": "0.2026.09.02.08.27.stable_01" + "hash": "sha256-1VkabqdyHIeffNVk/2iehifmjtfrZ6fgLY2CJr2D39M=", + "version": "0.2026.09.09.08.26.stable_02" }, "linux_x86_64": { - "hash": "sha256-T1YfuWr/Y4ASItpOiJHDiyCogmgKHtagKG8Q54u/CZY=", - "version": "0.2026.09.02.08.27.stable_01" + "hash": "sha256-Z+Sy2biI1Ezdb2A9xrKYRfUZxtrvqk/brrONhyvPOfc=", + "version": "0.2026.09.09.08.26.stable_02" }, "linux_aarch64": { - "hash": "sha256-lR64dyireK22WsWXkkjVp3F/dOXHMI5XKsRqwZJ6CuM=", - "version": "0.2026.09.02.08.27.stable_01" + "hash": "sha256-wWLlkJctUR0yFe5NcjkTdTTzppoP1ECip3185/T0gCE=", + "version": "0.2026.09.09.08.26.stable_02" } } diff --git a/pkgs/by-name/xd/xdg-desktop-portal-umbriel/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-umbriel/package.nix index 807505633980..2fbfa6b4c7e2 100644 --- a/pkgs/by-name/xd/xdg-desktop-portal-umbriel/package.nix +++ b/pkgs/by-name/xd/xdg-desktop-portal-umbriel/package.nix @@ -21,7 +21,7 @@ }: stdenv.mkDerivation { pname = "xdg-desktop-portal-umbriel"; - version = "0-unstable-2026-08-31"; + version = "0-unstable-2026-09-07"; strictDeps = true; __structuredAttrs = true; @@ -30,8 +30,8 @@ stdenv.mkDerivation { owner = "noctalia-dev"; repo = "xdg-desktop-portal-umbriel"; # No tagged releases yet - rev = "d996f0c2bd4e8c868c0a143f0c9ce060f3c47ed5"; - hash = "sha256-1mKBFkIO9RA3ERsLo1QZhyvS6bFSjG1lBpegQnPbIUY="; + rev = "d7a1bc386c2a6dfaecaa953165f9f373735c9ee0"; + hash = "sha256-x2D1TiCn0rTwbA8darNxthxOWOCoZLwefptsUM7587I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ya/yaml-cpp/package.nix b/pkgs/by-name/ya/yaml-cpp/package.nix index 284372846afb..bc9fbeac2c6b 100644 --- a/pkgs/by-name/ya/yaml-cpp/package.nix +++ b/pkgs/by-name/ya/yaml-cpp/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, gitUpdater, cmake, static ? stdenv.hostPlatform.isStatic, @@ -10,30 +9,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "yaml-cpp"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "jbeder"; repo = "yaml-cpp"; - rev = finalAttrs.version; - hash = "sha256-J87oS6Az1/vNdyXu3L7KmUGWzU0IAkGrGMUUha+xDXI="; + tag = "yaml-cpp-${finalAttrs.version}"; + hash = "sha256-+FOsPQY44h1g9tEw3O281LkiYKXdW2jnFKw+oTRkhGw="; }; - 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 = [ @@ -41,14 +25,14 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - "-DYAML_CPP_BUILD_TOOLS=false" + (lib.cmakeBool "YAML_CPP_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "YAML_CPP_BUILD_TOOLS" false) (lib.cmakeBool "YAML_BUILD_SHARED_LIBS" (!static)) - "-DINSTALL_GTEST=false" ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = gitUpdater { rev-prefix = "yaml-cpp-"; }; meta = { description = "YAML parser and emitter for C++"; diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix index 9293557a8d43..a2acf3f9015e 100644 --- a/pkgs/by-name/za/zashboard/package.nix +++ b/pkgs/by-name/za/zashboard/package.nix @@ -12,13 +12,13 @@ let in buildNpmPackage (finalAttrs: { pname = "zashboard"; - version = "3.25.0"; + version = "3.26.0"; src = fetchFromGitHub { owner = "Zephyruso"; repo = "zashboard"; tag = "v${finalAttrs.version}"; - hash = "sha256-Mt20lUq9YQn2A39bkWwz3Fzgv1pUQwnFW8bCrKp713Q="; + hash = "sha256-28TPqsg294XUvKnOIUru9ReQQ78II4B0HuaI581XT4I="; }; npmDeps = null; diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix index 633c44a6d62f..5bbc331be2e9 100644 --- a/pkgs/development/python-modules/asyncsleepiq/default.nix +++ b/pkgs/development/python-modules/asyncsleepiq/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "asyncsleepiq"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-gOg1cxd2OsDRg5jtc6MfEMsK9T0Croo8K1jzsvbAbdY="; + hash = "sha256-m0Is5X46pOGTu7TBBBY/sgC3GNxULYkONe5H1rCAnb0="; }; nativeBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index 60a11b371a55..903cbfc59a9e 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -10,7 +10,7 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "check-manifest"; version = "0.51"; pyproject = true; @@ -18,10 +18,15 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "mgedmin"; repo = "check-manifest"; - tag = version; + tag = finalAttrs.version; hash = "sha256-tT6xQZwqJIsyrO9BjWweIeNgYaopziewerVBk0mFVYg="; }; + patches = [ + # upstream fix for setuptools >= 83, unreleased as of 0.51 + ./setuptools-83-ignorelist.patch + ]; + build-system = [ setuptools ]; dependencies = [ @@ -47,9 +52,9 @@ buildPythonPackage rec { meta = { description = "Check MANIFEST.in in a Python source package for completeness"; homepage = "https://github.com/mgedmin/check-manifest"; - changelog = "https://github.com/mgedmin/check-manifest/blob/${version}/CHANGES.rst"; + changelog = "https://github.com/mgedmin/check-manifest/blob/${finalAttrs.version}/CHANGES.rst"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lewo ]; mainProgram = "check-manifest"; }; -} +}) diff --git a/pkgs/development/python-modules/check-manifest/setuptools-83-ignorelist.patch b/pkgs/development/python-modules/check-manifest/setuptools-83-ignorelist.patch new file mode 100644 index 000000000000..2e3f2bb4a69c --- /dev/null +++ b/pkgs/development/python-modules/check-manifest/setuptools-83-ignorelist.patch @@ -0,0 +1,30 @@ +Backport of upstream fix for setuptools >= 83 + +ref: +https://github.com/mgedmin/check-manifest/commit/5cdb776d4ad547518002ab33528b880b51378b48 + +diff --git a/check_manifest.py b/check_manifest.py +--- a/check_manifest.py ++++ b/check_manifest.py +@@ -592,10 +592,19 @@ class IgnoreList: + self._regexps = [] + + def __repr__(self): +- return 'IgnoreList(%r)' % (self._regexps) ++ return 'IgnoreList(%r)' % ( ++ [getattr(p, '_pattern', p) for p in self._regexps] ++ ) + + def __eq__(self, other): +- return isinstance(other, IgnoreList) and self._regexps == other._regexps ++ return ( ++ isinstance(other, IgnoreList) ++ and len(self._regexps) == len(other._regexps) ++ and all( ++ getattr(a, '_pattern', a) == getattr(b, '_pattern', b) ++ for a, b in zip(self._regexps, other._regexps) ++ ) ++ ) + + def __iadd__(self, other): + assert isinstance(other, IgnoreList) diff --git a/pkgs/development/python-modules/cson/default.nix b/pkgs/development/python-modules/cson/default.nix index dec4d63c3035..341fdd05b92e 100644 --- a/pkgs/development/python-modules/cson/default.nix +++ b/pkgs/development/python-modules/cson/default.nix @@ -2,20 +2,25 @@ lib, buildPythonPackage, fetchPypi, + setuptools, speg, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "cson"; version = "0.8"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-7owBZvzR9ReJiHGX4+g1Sse++jlvwpcGvOta8l7cngE="; }; - propagatedBuildInputs = [ speg ]; + build-system = [ setuptools ]; + + dependencies = [ speg ]; pythonImportsCheck = [ "cson" ]; @@ -25,4 +30,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ xworld21 ]; }; -} +}) diff --git a/pkgs/development/python-modules/pyramid-chameleon/default.nix b/pkgs/development/python-modules/pyramid-chameleon/default.nix index f6770c5fd985..e62c51525ce4 100644 --- a/pkgs/development/python-modules/pyramid-chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid-chameleon/default.nix @@ -6,7 +6,7 @@ fetchPypi, pyramid, pytestCheckHook, - setuptools, + setuptools_80, zope-interface, }: @@ -35,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ chameleon pyramid - setuptools + setuptools_80 zope-interface ]; diff --git a/pkgs/development/python-modules/victron-mqtt/default.nix b/pkgs/development/python-modules/victron-mqtt/default.nix index ab3b48934a6f..a12b906e5240 100644 --- a/pkgs/development/python-modules/victron-mqtt/default.nix +++ b/pkgs/development/python-modules/victron-mqtt/default.nix @@ -14,14 +14,14 @@ buildPythonPackage (finalAttrs: { pname = "victron-mqtt"; - version = "2026.8.9"; + version = "2026.9.5"; pyproject = true; src = fetchFromGitHub { owner = "tomer-w"; repo = "victron_mqtt"; tag = "v${finalAttrs.version}"; - hash = "sha256-dO8uGjC5RRANNbAL0i3yPLP04rrTK/7rz0UX3/5ClbQ="; + hash = "sha256-GOWQbWzGfvQ373ozyxRMAKpceB9x4V73iSu735M/tp0="; }; build-system = [ diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index a26ad7267293..81413bc04859 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -15,14 +15,14 @@ let variants = { # ./update-xanmod.sh lts lts = { - version = "6.18.51"; - hash = "sha256-9iUOgXffGPXMgtxP2Dh0iWDwqi/iFc21CZsle3B7SSw="; + version = "6.18.52"; + hash = "sha256-VbMijsO4Et7wYVXi2kBYt4ilnO87wrzRkje1BTv4c/U="; isLTS = true; }; # ./update-xanmod.sh main main = { - version = "7.2.5"; - hash = "sha256-PQDZPcIc+F7dAkb0/3S0Ft7b2JYvQ9BldSyCifEIcpM="; + version = "7.2.6"; + hash = "sha256-RBoN7XFXtLCPin3K+Wc1vyk/6IG7hXRX5Nrxr9rC3/k="; }; };