From b83e517bfc92868c6e7e216d4373ea3edb19d876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 13 May 2025 08:10:23 +0200 Subject: [PATCH 1/5] bump tests/flake.nix to 24.11 --- tests/flake.lock | 52 +++++++++++++++++++++++++----------------------- tests/flake.nix | 5 ++--- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/tests/flake.lock b/tests/flake.lock index c0ee1775..ba2dc9ab 100644 --- a/tests/flake.lock +++ b/tests/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1736232973, - "narHash": "sha256-8YT/8TMwWRRYFiLWMS98wPW50YBwYeErX7nQ7EmSaVA=", + "lastModified": 1747083103, + "narHash": "sha256-dMx20S2molwqJxbmMB4pGjNfgp5H1IOHNa1Eby6xL+0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3713545aca79365cba20d7873b6e51044890b4e8", + "rev": "d1d68fe8b00248caaa5b3bbe4984c12b47e0867d", "type": "github" }, "original": { @@ -37,34 +37,36 @@ }, "nixos-stable": { "locked": { - "lastModified": 1735563628, - "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798", - "type": "github" + "lastModified": 1746957726, + "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "ref": "nixos-24.11", + "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" }, "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" + "ref": "nixos-24.11", + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" } }, "nixos-unstable-small": { "locked": { - "lastModified": 1736208088, - "narHash": "sha256-2030VBfWuPLPEUrONVY/uF79EuNCztKunuKLgKkQWqM=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "42de2bcb35ccf24626325bd6114ef9d812eaeb0d", - "type": "github" + "lastModified": 1747040834, + "narHash": "sha256-iKQKoNlZmxQq+O2WfImm/jn97g5GZBVW5EZEoCTXZ3I=", + "ref": "nixos-unstable-small", + "rev": "e4f52f3ea82ddd3754b467e3fdc0d709685c9a05", + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" }, "original": { - "owner": "NixOS", "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" + "shallow": true, + "type": "git", + "url": "https://github.com/NixOS/nixpkgs" } }, "root": { diff --git a/tests/flake.nix b/tests/flake.nix index 2e65b843..91de6edf 100644 --- a/tests/flake.nix +++ b/tests/flake.nix @@ -2,8 +2,8 @@ description = "Test flake for nixos-hardware"; inputs = { - nixos-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; - nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixos-unstable-small.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixos-unstable-small"; + nixos-stable.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixos-24.11"; # override in the test nixos-hardware.url = "github:NixOS/nixos-hardware"; flake-parts.url = "github:hercules-ci/flake-parts"; @@ -23,7 +23,6 @@ system, lib, pkgs, - inputs', ... }: let From d371c70b454935c787c237550bc21debab684f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 13 May 2025 08:11:36 +0200 Subject: [PATCH 2/5] docs/CONTRIBUTING: replace bors with mergify --- CONTRIBUTING.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 22e78dd4..63a147a7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,8 +48,6 @@ assurance is up to *you*. # For reviewers: -This repository has bors enabled for easier merging after a successfull build: +This repository has [mergify](https://mergify.com/) enabled for easier merging after a successfull build: -* `bors try` - check if the PR builds. -* `bors merge` - same as `bors try` but will also merge the PR if it builds successfully. -* https://bors.tech/documentation/ +* `@mergify queue` will add the current pull request to the merge queue and merge when all tests succeed From 91dc75a805501815969342ad1672e9b553d1f95b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 13 May 2025 08:14:17 +0200 Subject: [PATCH 3/5] fix system.stateVersion for tests --- tests/build-profile.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/build-profile.nix b/tests/build-profile.nix index 786fa8b6..36ab88b5 100644 --- a/tests/build-profile.nix +++ b/tests/build-profile.nix @@ -16,6 +16,6 @@ device = "/dev/disk/by-uuid/00000000-0000-0000-0000-000000000000"; fsType = "btrfs"; }; - system.stateVersion = lib.version; + system.stateVersion = config.system.nixos.release; }) ]).config.system.build.toplevel From 5aa1b0f04942d01cb51b4e865d2ca161ce14a818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 13 May 2025 08:21:52 +0200 Subject: [PATCH 4/5] dell-xps-15-9530-nvidia: include ada-lovelace profile --- dell/xps/15-9530/nvidia/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/dell/xps/15-9530/nvidia/default.nix b/dell/xps/15-9530/nvidia/default.nix index 257462a4..e82bada6 100644 --- a/dell/xps/15-9530/nvidia/default.nix +++ b/dell/xps/15-9530/nvidia/default.nix @@ -3,6 +3,7 @@ imports = [ ../default.nix ../../../../common/gpu/nvidia/prime.nix + ../../../../common/gpu/nvidia/ada-lovelace ]; hardware.nvidia.prime = { From ff949f78d6b04a5294ff059cf7cdce9638ea8a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 13 May 2025 11:41:12 +0200 Subject: [PATCH 5/5] ideacentr-k330: include nvidia-fermi architecture --- common/gpu/nvidia/fermi/default.nix | 7 +++++++ lenovo/ideacentre/k330/default.nix | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 common/gpu/nvidia/fermi/default.nix diff --git a/common/gpu/nvidia/fermi/default.nix b/common/gpu/nvidia/fermi/default.nix new file mode 100644 index 00000000..0f5c47f0 --- /dev/null +++ b/common/gpu/nvidia/fermi/default.nix @@ -0,0 +1,7 @@ +{ ... }: +{ + imports = [ ../. ]; + + # The open source driver does not support Fermi GPUs. + hardware.nvidia.open = false; +} diff --git a/lenovo/ideacentre/k330/default.nix b/lenovo/ideacentre/k330/default.nix index 381276fc..ff5cf3c4 100644 --- a/lenovo/ideacentre/k330/default.nix +++ b/lenovo/ideacentre/k330/default.nix @@ -2,7 +2,7 @@ { imports = [ ../../../common/cpu/intel - ../../../common/gpu/nvidia # Is it possible/advisable to pin this to the 390.xx driver family in case the user wants to use non-free drivers? + ../../../common/gpu/nvidia/fermi # Is it possible/advisable to pin this to the 390.xx driver family in case the user wants to use non-free drivers? ../../../common/gpu/amd # The K330 could be bought with AMD GPUs but I don't have that configuration ../../../common/pc ]; @@ -14,6 +14,6 @@ # What if somebody installs both plasma AND another DE? # The goal is to prefer x11 over wayland due to compatibility issues with the old hardware - + services.displayManager.defaultSession = lib.mkIf config.services.xserver.desktopManager.plasma6.enable (lib.mkDefault "plasmax11"); -} \ No newline at end of file +}