Merge pull request #1478 from NixOS/nixpkgs-update

tests: Nixpkgs update

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.
+* `@mergify queue` will add the current pull request to the merge queue and merge when all tests succeed
-* `bors merge` - same as `bors try` but will also merge the PR if it builds successfully.
-* https://bors.tech/documentation/

common/gpu/nvidia/fermi/default.nix

@@ -0,0 +1,7 @@
+{ ... }:
+{
+  imports = [ ../. ];
+
+  # The open source driver does not support Fermi GPUs.
+  hardware.nvidia.open = false;
+}

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 = {

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");
-}
+}

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

tests/flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736143030,
+        "lastModified": 1743550720,
-        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
+        "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,
+        "lastModified": 1747083103,
-        "narHash": "sha256-8YT/8TMwWRRYFiLWMS98wPW50YBwYeErX7nQ7EmSaVA=",
+        "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,
+        "lastModified": 1746957726,
-        "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
+        "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=",
-        "owner": "NixOS",
+        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
+        "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94",
-        "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
+        "shallow": true,
-        "type": "github"
+        "type": "git",
+        "url": "https://github.com/NixOS/nixpkgs"
       },
       "original": {
-        "owner": "NixOS",
+        "ref": "nixos-24.11",
-        "ref": "nixos-24.05",
+        "shallow": true,
-        "repo": "nixpkgs",
+        "type": "git",
-        "type": "github"
+        "url": "https://github.com/NixOS/nixpkgs"
       }
     },
     "nixos-unstable-small": {
       "locked": {
-        "lastModified": 1736208088,
+        "lastModified": 1747040834,
-        "narHash": "sha256-2030VBfWuPLPEUrONVY/uF79EuNCztKunuKLgKkQWqM=",
+        "narHash": "sha256-iKQKoNlZmxQq+O2WfImm/jn97g5GZBVW5EZEoCTXZ3I=",
-        "owner": "NixOS",
+        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
+        "rev": "e4f52f3ea82ddd3754b467e3fdc0d709685c9a05",
-        "rev": "42de2bcb35ccf24626325bd6114ef9d812eaeb0d",
+        "shallow": true,
-        "type": "github"
+        "type": "git",
+        "url": "https://github.com/NixOS/nixpkgs"
       },
       "original": {
-        "owner": "NixOS",
         "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
+        "shallow": true,
-        "type": "github"
+        "type": "git",
+        "url": "https://github.com/NixOS/nixpkgs"
       }
     },
     "root": {

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-unstable-small.url = "git+https://github.com/NixOS/nixpkgs?shallow=1&ref=nixos-unstable-small";
-    nixos-stable.url = "github:NixOS/nixpkgs/nixos-24.05";
+    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