Merge branch 'develop' into spending-node-rebase

nixos/pkgs/zkapissuer/repo.json

 {
   "owner": "PrivateStorageio",
   "repo": "PaymentServer",
-  "rev": "47478f705332b23219285e9598a69668f2c79aa1",
+  "rev": "d82908141edcd2ddce40bc50b8b2a4f1959f1b30",
   "branch": "main",
   "outputHashAlgo": "sha512",
-  "outputHash": "3z62dfkyivb0l8yc1l1qm31k8sl8i88m9pzrk9nhs42kmgcqyr7sa10lavj499w9l6zvh1628ss0g5pza5yaji537r1bc51qqfszydl"
+  "outputHash": "0r84hjrd03znizr915nn886rybxn9pq4h8fsf6vx8jkh05whr2b950rk4ld3mi9gq75cksd688pi1aqyy9in3ybll2b1m98j9f0h7mz"
 }
\ No newline at end of file

nixpkgs.json

 {
   "name": "source",
-  "url": "https://releases.nixos.org/nixos/21.11/nixos-21.11.336182.a25df4c2b79/nixexprs.tar.xz",
-  "sha256": "02lpc1q7hf00z5llwbz0a48nk5v36fc3c84axbaww7m8vgpkd20m"
+  "url": "https://releases.nixos.org/nixos/21.11/nixos-21.11.336340.2ebb6c1e5ae/nixexprs.tar.xz",
+  "sha256": "1hi47fq801v2bk7ms50sz7a8744zfkkk27kxjpbxzv1n6k0n1w1q"
 }