Skip to content

Commit 49646e4

Browse files
committed
ci: use latest wayland-protocol for all test cases
Fixes missing protocols on old nixpkgs versions
1 parent 6eb1255 commit 49646e4

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

ci/matrix.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
qtver,
33
compiler,
44
}: let
5-
nixpkgs = (import ./nix-checkouts.nix).${builtins.replaceStrings ["."] ["_"] qtver};
5+
checkouts = import ./nix-checkouts.nix;
6+
nixpkgs = checkouts.${builtins.replaceStrings ["."] ["_"] qtver};
67
compilerOverride = (nixpkgs.callPackage ./variations.nix {}).${compiler};
7-
pkg = (nixpkgs.callPackage ../default.nix {}).override compilerOverride;
8+
pkg = (nixpkgs.callPackage ../default.nix {}).override (compilerOverride // {
9+
wayland-protocols = checkouts.latest.wayland-protocols;
10+
});
811
in pkg

ci/nix-checkouts.nix

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ let
77
url = "https://github.com/nixos/nixpkgs/archive/${commit}.tar.gz";
88
inherit sha256;
99
}) {};
10-
in {
10+
in rec {
1111
# For old qt versions, grab the commit before the version bump that has all the patches
1212
# instead of the bumped version.
1313

14+
latest = qt6_9_0;
15+
1416
qt6_9_0 = byCommit {
1517
commit = "546c545bd0594809a28ab7e869b5f80dd7243ef6";
1618
sha256 = "0562lbi67a9brfwzpqs4n3l0i8zvgla368aakcy5mghr7ps80567";

0 commit comments

Comments
 (0)