Merge pull request #21 from materusPL/dependabot/github_actions/actions/checkout-6

build(deps): bump actions/checkout from 4 to 6

.github/workflows/build.yml

@@ -35,11 +35,11 @@ jobs:
         nixPath:
           - nixpkgs=channel:nixos-unstable
           - nixpkgs=channel:nixpkgs-unstable
-          - nixpkgs=channel:nixos-25.11
+          - nixpkgs=channel:nixos-26.05
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
     - name: Install nix
       uses: cachix/install-nix-action@v31
       with:

flake.lock

@@ -28,11 +28,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756022458,
+        "lastModified": 1781009359,
-        "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=",
+        "narHash": "sha256-w/mZkRscTatf8NWyUstli8ROzM/eopxZzi0WRjoeYkU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740",
+        "rev": "c58ead12efcac436afffa93a22099a5595eb4157",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1755615617,
+        "lastModified": 1780749050,
-        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
+        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
+        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1755615617,
+        "lastModified": 1780749050,
-        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
+        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
+        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1756145408,
+        "lastModified": 1781015510,
-        "narHash": "sha256-ltkbs5Watrq+V2l9hWefSdM7cfvxLkabtMJeZn0MiCo=",
+        "narHash": "sha256-DqRzaFfLijAyd3TDilgKEjNiqJ1UVymA/seyVamoWS4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "c9c985b60eb46d97370f7d3fefdc300b953c044d",
+        "rev": "961e2e196da88c8d6513bb8e9865ec5e5a6cb954",
         "type": "github"
       },
       "original": {

pkgs/apps/games/polymc/default.nix

@@ -9,7 +9,7 @@
   ghc_filesystem,
   zlib,
   file,
-  wrapQtAppsHook,
+  kdePackages,
   xorg,
   libpulseaudio,
   openal,
@@ -27,7 +27,6 @@
   addDriverRunpath,
   vulkan-loader,
   msaClientID ? null,
-  extra-cmake-modules,
   qtcharts,
   makeWrapper,
   gamemode,
@@ -65,7 +64,7 @@ let
       gameLibraryPath = libpath + ":${addDriverRunpath.driverLink}/lib";
     in
     stdenv.mkDerivation rec {
-      pname = "polymc" + (lib.optionalString ((lib.versions.major qtbase.version) == "5") "-qt5");
+      pname = "polymc";
       version = "7.0";
       patches = [
         # Fix for Qt >= 6.9.0
@@ -95,10 +94,10 @@ let
       dontWrapQtApps = true;
       nativeBuildInputs = [
         cmake
-        extra-cmake-modules
         ninja
         jdk
-        wrapQtAppsHook
+        kdePackages.extra-cmake-modules
+        kdePackages.wrapQtAppsHook
         file
         ghc_filesystem
       ];

pkgs/default.nix

@@ -12,7 +12,6 @@ rec {
   ffmpeg_7-amf-full = (pkgs.ffmpeg_7-full.overrideAttrs (finalAttrs: previousAttrs: { configureFlags = previousAttrs.configureFlags ++ [ "--enable-amf" ]; buildInputs = previousAttrs.buildInputs ++ [ pkgs.amf-headers ]; }));
 
   polymc = pkgs.qt6Packages.callPackage ./apps/games/polymc { };
-  polymc-qt5 = pkgs.libsForQt5.callPackage ./apps/games/polymc { };
 
   alvr = pkgs.callPackage ./apps/games/alvr { };