remove unstable

this downgrades vaultwarden back to what's in stable; this was the last
thing we used from unstable, so remove that as well.

flake.lock

@@ -506,9 +506,7 @@
         "nixos-mailserver": [
           "nixos-mailserver"
         ],
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs",
-          "nixpkgs-unstable"
-        ],
         "pnpm2nix": "pnpm2nix",
         "sops-nix": [
           "sops-nix"
@@ -568,9 +566,7 @@
           "deploy-rs",
           "flake-compat"
         ],
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_2",
-          "nixpkgs-unstable"
-        ],
         "nixpkgs-22_11": "nixpkgs-22_11",
         "nixpkgs-23_05": [
           "nixpkgs"
@@ -597,16 +593,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1695559356,
+        "lastModified": 1695644571,
-        "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=",
+        "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0",
+        "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-23.05",
+        "ref": "nixos-unstable",
         "type": "indirect"
       }
     },
@@ -641,21 +637,52 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
+    "nixpkgs_2": {
       "locked": {
-        "lastModified": 1695318763,
+        "lastModified": 1695644571,
-        "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=",
+        "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e12483116b3b51a185a33a272bf351e357ba9a99",
+        "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "type": "indirect"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1695559356,
+        "narHash": "sha256-kXZ1pUoImD9OEbPCwpTz4tHsNTr4CIyIfXb3ocuR8sI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "261abe8a44a7e8392598d038d2e01f7b33cf26d0",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-23.05",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1695806987,
+        "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nose": {
       "flake": false,
       "locked": {
@@ -791,9 +818,8 @@
         "mattermost-webapp": "mattermost-webapp",
         "nix-hexchen": "nix-hexchen",
         "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_3",
         "nixpkgs-oldstable": "nixpkgs-oldstable",
-        "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix",
         "tracktrain": "tracktrain"
       }
@@ -848,9 +874,7 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_4",
-          "nixpkgs-unstable"
-        ],
         "nixpkgs-stable": [
           "nixpkgs"
         ]

flake.nix

@@ -8,7 +8,6 @@
     mattermost-server.flake = false;
 
     nixpkgs.url = "nixpkgs/nixos-23.05";
-    nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
     nixpkgs-oldstable.url = "github:/NixOS/nixpkgs?rev=c4aec3c021620d98861639946123214207e98344";
     nix-hexchen.url = "gitlab:hexchen/nixfiles";
     nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.05";
@@ -19,14 +18,12 @@
     deploy-rs.inputs.nixpkgs.follows = "nixpkgs";
     deploy-rs.inputs.flake-compat.follows = "nix-hexchen/apple-silicon/flake-compat";
     sops-nix.url = "github:Mic92/sops-nix";
-    sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
     sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
     
     # these exist mostly to make the flake.lock somewhat more human-friendly
     # note that in theory doing this might break things, but it seems fairly unlikely
     nix-hexchen.inputs = {
       nixos-mailserver.follows = "nixos-mailserver";
-      nixpkgs.follows = "nixpkgs-unstable";
       deploy-rs.follows = "deploy-rs";
       doom-emacs.follows = "nix-hexchen/nix-doom-emacs/doom-emacs";
       emacs-overlay.follows = "nix-hexchen/nix-doom-emacs/emacs-overlay";
@@ -36,7 +33,6 @@
     };
     nixos-mailserver.inputs = {
       "nixpkgs-23_05".follows = "nixpkgs";
-      nixpkgs.follows = "nixpkgs-unstable";
       utils.follows = "/deploy-rs/utils";
       flake-compat.follows = "/deploy-rs/flake-compat";
     };

pkgs/default.nix

@@ -2,7 +2,6 @@
 
 let
   pkgs = import sources.nixpkgs args;
-  unstable = import sources.nixpkgs-unstable args;
   oldstable = import sources.nixpkgs-oldstable args;
 
   callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs);
@@ -48,9 +47,6 @@ let
       });
     });
 
-    inherit (unstable) vaultwarden vaultwarden-vault;
-    inherit oldstable;
-
     inherit (oldstable) uwsgi flask;
   };