From eaed9240d55e424306b1bacea6548aa8e0c0fb36 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Wed, 5 Nov 2025 11:33:20 +0100
Subject: [PATCH] use upstream `types.fileset`

Signed-off-by: Kiara Grouwstra <kiara@procolix.eu>
---
 deployment/check/common/nixosTest.nix | 11 +----------
 npins/sources.json                    |  6 +++---
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/deployment/check/common/nixosTest.nix b/deployment/check/common/nixosTest.nix
index ac2c6b4d..1929c945 100644
--- a/deployment/check/common/nixosTest.nix
+++ b/deployment/check/common/nixosTest.nix
@@ -14,7 +14,6 @@ let
     toJSON
     ;
   inherit (lib)
-    types
     fileset
     mkOption
     genAttrs
@@ -49,15 +48,7 @@ in
     extraTestScript = mkOption { };
 
     sourceFileset = mkOption {
-      ## FIXME: grab `lib.types.fileset` from NixOS, once upstreaming PR
-      ## https://github.com/NixOS/nixpkgs/pull/428293 lands.
-      type = types.mkOptionType {
-        name = "fileset";
-        description = "fileset";
-        descriptionClass = "noun";
-        check = (x: (builtins.tryEval (fileset.unions [ x ])).success);
-        merge = (_: defs: fileset.unions (map (x: x.value) defs));
-      };
+      type = (import "${sources.nixpkgs-unstable}/lib/types.nix" { inherit lib; }).fileset;
       description = ''
         A fileset that will be copied to the deployer node in the current
         working directory. This should contain all the files that are
diff --git a/npins/sources.json b/npins/sources.json
index f9806543..8af0a896 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -163,9 +163,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "f33a4d26226c05d501b9d4d3e5e60a3a59991921",
-      "url": "https://github.com/nixos/nixpkgs/archive/f33a4d26226c05d501b9d4d3e5e60a3a59991921.tar.gz",
-      "hash": "1b6dm1sn0bdpcsmxna0zzspjaixa2dald08005fry5jrbjvwafdj"
+      "revision": "12c1f0253aa9a54fdf8ec8aecaafada64a111e24",
+      "url": "https://github.com/nixos/nixpkgs/archive/12c1f0253aa9a54fdf8ec8aecaafada64a111e24.tar.gz",
+      "hash": "0zr033ybqjc5spwh7xnzkhbqgc6gh8waw6z76rpvadxckyqlfgiq"
     },
     "nixpkgs-stable": {
       "type": "Git",