diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a11c1e..49cb0fc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: nixPath: - nixpkgs=channel:nixos-unstable - nixpkgs=channel:nixpkgs-unstable - - nixpkgs=channel:nixos-24.11 + - nixpkgs=channel:nixos-25.05 runs-on: ubuntu-latest steps: - name: Checkout repository diff --git a/flake.lock b/flake.lock index 029cb51..dc6c099 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1746798521, - "narHash": "sha256-axfz/jBEH9XHpS7YSumstV7b2PrPf7L8bhWUtLBv3nA=", + "lastModified": 1747565775, + "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", "owner": "nix-community", "repo": "home-manager", - "rev": "e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c", + "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", "type": "github" }, "original": { @@ -44,11 +44,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746663147, - "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { diff --git a/pkgs/apps/fbset.nix b/pkgs/apps/fbset.nix index 1d940d3..77f08cc 100644 --- a/pkgs/apps/fbset.nix +++ b/pkgs/apps/fbset.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Program to modify settings for the framebuffer devices (/dev/fb[0-9]* or /dev/fb/[0-9]*) on Linux, like depth, virtual resolution, timing parameters etc."; homepage = "https://sources.debian.org/src/fbset/"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/libs/amdgpu-pro-libs/prefixes.nix b/pkgs/libs/amdgpu-pro-libs/prefixes.nix index 645e2b2..2f27ccc 100644 --- a/pkgs/libs/amdgpu-pro-libs/prefixes.nix +++ b/pkgs/libs/amdgpu-pro-libs/prefixes.nix @@ -41,8 +41,8 @@ pkgs.buildEnv { (writeShellScriptBin "vk_radv" '' export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - export VK_ICD_FILENAMES="${mesa.drivers}/share/vulkan/icd.d/radeon_icd.x86_64.json" - ${(if with32bit then ''export VK_ICD_FILENAMES=$VK_ICD_FILENAMES:${driversi686Linux.mesa.drivers}/share/vulkan/icd.d/radeon_icd.i686.json'' else "")} + export VK_ICD_FILENAMES="${mesa}/share/vulkan/icd.d/radeon_icd.x86_64.json" + ${(if with32bit then ''export VK_ICD_FILENAMES=$VK_ICD_FILENAMES:${driversi686Linux.mesa}/share/vulkan/icd.d/radeon_icd.i686.json'' else "")} "$@" '' )