diff --git a/flake.lock b/flake.lock
index 4b4fb1c4c..431483ac1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -18,11 +18,11 @@
     "mobile-nixos": {
       "flake": false,
       "locked": {
-        "lastModified": 1677879564,
-        "narHash": "sha256-luJTRYY1zEoN5fSGwbZxq66IE1kdrqOq0/iBWzw7gOI=",
+        "lastModified": 1679516998,
+        "narHash": "sha256-w4baQlS84X8Lf0E5RN0nGkx03luDuV1X0+jWMAXm6fs=",
         "owner": "nixos",
         "repo": "mobile-nixos",
-        "rev": "9a0c317a027d1c085c641fe6df1f51b71880b720",
+        "rev": "7a6e97e3af73c4cca87e12c83abcb4913dac7dbc",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1677948530,
-        "narHash": "sha256-BkQjq8AGHD55RJe4PUnrWRZZ8jS64p/k0bGDck5wKwY=",
+        "lastModified": 1679748960,
+        "narHash": "sha256-BP8XcYHyj1NxQi04RpyNW8e7KiXSoI+Fy1tXIK2GfdA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d51554151a91cd4543a7620843cc378e3cbc767e",
+        "rev": "da26ae9f6ce2c9ab380c0f394488892616fc5a6a",
         "type": "github"
       },
       "original": {
@@ -82,16 +82,16 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1678380223,
-        "narHash": "sha256-HUxnK38iqrX84QdQxbFcosRKV3/koj1Zzp5b5aP4lIo=",
+        "lastModified": 1679983302,
+        "narHash": "sha256-vJe9Fct7k3NSnh0KVQAdS+hZQTKbei7xVJXBRQ4e7zY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1e2590679d0ed2cee2736e8b80373178d085d263",
+        "rev": "f027fe965cc27f258e9f7ffd3d0cec011e51a41c",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "staging",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -113,11 +113,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1678440572,
-        "narHash": "sha256-zfL09Yy6H7QQwfacCPL0gOfWpVkTbE5jXJh5oZmGf8g=",
+        "lastModified": 1679799335,
+        "narHash": "sha256-YrnDyftm0Mk4JLuw3sDBPNfSjk054N0dqQx8FW4JqDM=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1568702de0d2488c1e77011a9044de7fadec80c4",
+        "rev": "4740f80ca6e756915aaaa0a9c5fbb61ba09cc145",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 356af0b37..2101872c5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,7 +22,8 @@
     # nixpkgs-stable.url = "github:nixos/nixpkgs?ref=nixos-22.11";
 
     # <https://github.com/nixos/nixpkgs/tree/nixos-unstable>
-    nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    # nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs-unpatched.url = "github:nixos/nixpkgs?ref=staging";
 
     # nixpkgs = {
     #   url = "./nixpatches";
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index 8fce2f68b..e3f15abf7 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -28,21 +28,17 @@
   # it's a revert of nixpkgs commit dcf630c172df2a9ecaa47c77f868211e61ae8e52
   # ./2023-01-30-mesa-cma-leak.patch
   # upgrade to 22.3.6 instead
-  ./2023-02-28-mesa-22.3.6.patch
+  # ./2023-02-28-mesa-22.3.6.patch
 
   # fix qt6.qtbase and qt6.qtModule to cross-compile.
   # unfortunately there's some tangle that makes that difficult to do via the normal `override` facilities
   ./2023-03-03-qtbase-cross-compile.patch
 
   # let ccache cross-compile
-  ./2023-03-04-ccache-cross-fix.patch
-
-  # 2023-03-09: phosh: 0.23 -> 0.25.1
-  (fetchpatch {
-    url = "https://github.com/NixOS/nixpkgs/pull/219355.diff";
-    hash = "sha256-hx2keVWuokla2Oi92zoXsnjVuwakxL2cB55ctzlO8OQ=";
-  })
+  # TODO: why doesn't this apply?
+  # ./2023-03-04-ccache-cross-fix.patch
 
+  # TODO: point to upstream PR
   ./2023-03-10-hase.patch
 
   # # kaiteki: init at 2022-09-03