Update to 25.05

This commit is contained in:
Mateusz Słodkowicz 2025-05-18 23:08:56 +02:00
parent 8c329020c6
commit 84d8b84d1e
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
4 changed files with 10 additions and 10 deletions

View File

@ -35,7 +35,7 @@ jobs:
nixPath: nixPath:
- nixpkgs=channel:nixos-unstable - nixpkgs=channel:nixos-unstable
- nixpkgs=channel:nixpkgs-unstable - nixpkgs=channel:nixpkgs-unstable
- nixpkgs=channel:nixos-24.11 - nixpkgs=channel:nixos-25.05
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout repository - name: Checkout repository

View File

@ -28,11 +28,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746798521, "lastModified": 1747565775,
"narHash": "sha256-axfz/jBEH9XHpS7YSumstV7b2PrPf7L8bhWUtLBv3nA=", "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c", "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -44,11 +44,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1746663147, "lastModified": 1747542820,
"narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -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."; 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/"; homepage = "https://sources.debian.org/src/fbset/";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = [ "x86_64-linux" ];
}; };
} }

View File

@ -41,8 +41,8 @@ pkgs.buildEnv {
(writeShellScriptBin "vk_radv" (writeShellScriptBin "vk_radv"
'' ''
export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1
export VK_ICD_FILENAMES="${mesa.drivers}/share/vulkan/icd.d/radeon_icd.x86_64.json" 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.drivers}/share/vulkan/icd.d/radeon_icd.i686.json'' else "")} ${(if with32bit then ''export VK_ICD_FILENAMES=$VK_ICD_FILENAMES:${driversi686Linux.mesa}/share/vulkan/icd.d/radeon_icd.i686.json'' else "")}
"$@" "$@"
'' ''
) )