mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-05-18 20:46:51 +02:00
fix: asahi-nixos - revert mesa to 25.2.6
Signed-off-by: Ryan Yin <xiaoyin_c@qq.com>
This commit is contained in:
Generated
+25
-7
@@ -7,15 +7,16 @@
|
|||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764169039,
|
"lastModified": 1764168798,
|
||||||
"narHash": "sha256-9DabwGlLz2mEOV7nw97HP6LLx1xv4RAHhnQSICbW+mE=",
|
"narHash": "sha256-aB2OhrotdYU8w3uQLio5a/IiyAQvzywOKr81oldqxss=",
|
||||||
"owner": "ezKEa",
|
"owner": "ezKEa",
|
||||||
"repo": "aagl-gtk-on-nix",
|
"repo": "aagl-gtk-on-nix",
|
||||||
"rev": "c4a5f08a6ff74624ac576525765b06c79d2077e3",
|
"rev": "e272196d003064dfb177ed9cae6a12021b806048",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "ezKEa",
|
"owner": "ezKEa",
|
||||||
|
"ref": "release-25.11",
|
||||||
"repo": "aagl-gtk-on-nix",
|
"repo": "aagl-gtk-on-nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -778,16 +779,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763966396,
|
"lastModified": 1764020296,
|
||||||
"narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",
|
"narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",
|
"rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-25.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -839,6 +840,22 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-mesa": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1761817761,
|
||||||
|
"narHash": "sha256-qAEhDH77SIUUOUQC6DYYR+LGTAK+OctxBJPpo9rGMwc=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "2b1f0ea3ee3952e68b164efa0a1c5e394ef2e781",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "2b1f0ea3ee3952e68b164efa0a1c5e394ef2e781",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs-patched": {
|
"nixpkgs-patched": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762844143,
|
"lastModified": 1762844143,
|
||||||
@@ -1105,6 +1122,7 @@
|
|||||||
"nixpkgs": "nixpkgs_6",
|
"nixpkgs": "nixpkgs_6",
|
||||||
"nixpkgs-darwin": "nixpkgs-darwin",
|
"nixpkgs-darwin": "nixpkgs-darwin",
|
||||||
"nixpkgs-master": "nixpkgs-master",
|
"nixpkgs-master": "nixpkgs-master",
|
||||||
|
"nixpkgs-mesa": "nixpkgs-mesa",
|
||||||
"nixpkgs-patched": "nixpkgs-patched",
|
"nixpkgs-patched": "nixpkgs-patched",
|
||||||
"nixpkgs-stable": "nixpkgs-stable_2",
|
"nixpkgs-stable": "nixpkgs-stable_2",
|
||||||
"nu_scripts": "nu_scripts",
|
"nu_scripts": "nu_scripts",
|
||||||
|
|||||||
@@ -36,7 +36,8 @@
|
|||||||
# Official NixOS package source, using nixos's unstable branch by default
|
# Official NixOS package source, using nixos's unstable branch by default
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||||
# nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
# revert mesa to 25.2.6
|
||||||
|
nixpkgs-mesa.url = "github:nixos/nixpkgs/2b1f0ea3ee3952e68b164efa0a1c5e394ef2e781";
|
||||||
|
|
||||||
# nixpkgs with some custom patches
|
# nixpkgs with some custom patches
|
||||||
nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable-patched";
|
nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable-patched";
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
nixos-apple-silicon,
|
nixos-apple-silicon,
|
||||||
my-asahi-firmware,
|
my-asahi-firmware,
|
||||||
|
nixpkgs-mesa,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
@@ -9,6 +10,13 @@
|
|||||||
nixos-apple-silicon.nixosModules.default
|
nixos-apple-silicon.nixosModules.default
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Workaround for Mesa 25.3.0 regression
|
||||||
|
# https://github.com/nix-community/nixos-apple-silicon/issues/380
|
||||||
|
# https://github.com/NixOS/nixpkgs/pull/461866
|
||||||
|
hardware.graphics.package =
|
||||||
|
assert pkgs.mesa.version == "25.3.0";
|
||||||
|
(import nixpkgs-mesa { localSystem = pkgs.stdenv.hostPlatform; }).mesa;
|
||||||
|
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
extra-substituters = [
|
extra-substituters = [
|
||||||
"https://nixos-apple-silicon.cachix.org"
|
"https://nixos-apple-silicon.cachix.org"
|
||||||
|
|||||||
Reference in New Issue
Block a user