Update nixpkgs

And adapt for change in NixOS/nixpkgs#82751

modules/options.nix

@@ -9,11 +9,19 @@ let
   };
 
   pkgsModule = nixpkgs: { lib, config, ... }: {
-    nixpkgs.system = lib.mkDefault builtins.currentSystem;
+    config.nixpkgs.system = lib.mkDefault builtins.currentSystem;
     # Not using nixpkgs.pkgs because that would apply the overlays again
-    _module.args.pkgs = lib.mkDefault (import nixpkgs {
+    config._module.args.pkgs = lib.mkDefault (import nixpkgs {
       inherit (config.nixpkgs) config overlays localSystem crossSystem;
     });
+
+    # Export the pkgs arg because we use it outside the module
+    # See https://github.com/NixOS/nixpkgs/pull/82751 why that's necessary
+    options._pkgs = lib.mkOption {
+      readOnly = true;
+      internal = true;
+      default = config._module.args.pkgs;
+    };
   };
 
   topconfig = config;
@@ -71,7 +79,7 @@ let
     };
 
     config = {
-      _module.args.pkgs = config.configuration._module.args.pkgs;
+      _module.args.pkgs = config.configuration._pkgs;
     };
   };
 

nixpkgs.nix

@@ -1,5 +1,4 @@
 fetchTarball {
-  # Needs to include changes from https://github.com/NixOS/nixpkgs/pull/75031
-  url = "https://github.com/NixOS/nixpkgs/tarball/cdf79db19d6ce1f305acebd86dabd58edb42e7c0";
-  sha256 = "0m7ib1qdyymsg3kq10pcy0239gacvrc605vxgvwghyp6axib24ff";
+  url = "https://github.com/NixOS/nixpkgs/tarball/3320a06049fc259e87a2bd98f4cd42f15f746b96";
+  sha256 = "1g5l186d5xh187vdcpfsz1ff8s749949c1pclvzfkylpar09ldkl";
 }