quickshell/quickshell
1
1
Fork 2
Code Issues Wiki Activity

ci: use latest wayland-protocol for all test cases

Browse source 
Fixes missing protocols on old nixpkgs versions
This commit is contained in:
outfoxxed 2025-09-16 00:15:13 -07:00
parent e4d33fa52f
commit 2115f31416
Signed by: outfoxxed
GPG key ID: 4C88A185FB89301E
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ci/matrix.nix
View file

@ -2,7 +2,10 @@
qtver, qtver,
compiler, compiler,
}: let }: 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}; 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 in pkg

4
ci/nix-checkouts.nix
View file

@ -7,10 +7,12 @@ let
url = "https://github.com/nixos/nixpkgs/archive/${commit}.tar.gz"; url = "https://github.com/nixos/nixpkgs/archive/${commit}.tar.gz";
inherit sha256; inherit sha256;
}) {}; }) {};
in { in rec {
# For old qt versions, grab the commit before the version bump that has all the patches # For old qt versions, grab the commit before the version bump that has all the patches
# instead of the bumped version. # instead of the bumped version.
latest = qt6_9_0;
qt6_9_0 = byCommit { qt6_9_0 = byCommit {
commit = "546c545bd0594809a28ab7e869b5f80dd7243ef6"; commit = "546c545bd0594809a28ab7e869b5f80dd7243ef6";
sha256 = "0562lbi67a9brfwzpqs4n3l0i8zvgla368aakcy5mghr7ps80567"; sha256 = "0562lbi67a9brfwzpqs4n3l0i8zvgla368aakcy5mghr7ps80567";