From 2115f314167dd8d797de2853b1fad35f3f2213f9 Mon Sep 17 00:00:00 2001 From: outfoxxed Date: Tue, 16 Sep 2025 00:15:13 -0700 Subject: [PATCH] ci: use latest wayland-protocol for all test cases Fixes missing protocols on old nixpkgs versions --- ci/matrix.nix | 7 +++++-- ci/nix-checkouts.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ci/matrix.nix b/ci/matrix.nix index be2da61..dd20fa5 100644 --- a/ci/matrix.nix +++ b/ci/matrix.nix @@ -2,7 +2,10 @@ qtver, compiler, }: let - nixpkgs = (import ./nix-checkouts.nix).${builtins.replaceStrings ["."] ["_"] qtver}; + checkouts = import ./nix-checkouts.nix; + nixpkgs = checkouts.${builtins.replaceStrings ["."] ["_"] qtver}; compilerOverride = (nixpkgs.callPackage ./variations.nix {}).${compiler}; - pkg = (nixpkgs.callPackage ../default.nix {}).override compilerOverride; + pkg = (nixpkgs.callPackage ../default.nix {}).override (compilerOverride // { + wayland-protocols = checkouts.latest.wayland-protocols; + }); in pkg diff --git a/ci/nix-checkouts.nix b/ci/nix-checkouts.nix index 73c2415..d3e0159 100644 --- a/ci/nix-checkouts.nix +++ b/ci/nix-checkouts.nix @@ -7,10 +7,12 @@ let url = "https://github.com/nixos/nixpkgs/archive/${commit}.tar.gz"; inherit sha256; }) {}; -in { +in rec { # For old qt versions, grab the commit before the version bump that has all the patches # instead of the bumped version. + latest = qt6_9_0; + qt6_9_0 = byCommit { commit = "546c545bd0594809a28ab7e869b5f80dd7243ef6"; sha256 = "0562lbi67a9brfwzpqs4n3l0i8zvgla368aakcy5mghr7ps80567";