Update nixpkgs (and current flake.nix)

flake.lock

@@ -84,11 +84,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1640408860,
-        "narHash": "sha256-h2uF3+a8bVfM8SjcS4hLbsOzOuG3qsxuImC0BucWs1Q=",
+        "lastModified": 1645334861,
+        "narHash": "sha256-We9ECiMglthzbZ5S6Myqqf+RHzBFZPoM2qL5/jDkUjs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cb372c3b8880e504b06946e8fb2ca9777c685505",
+        "rev": "d5f237872975e6fb6f76eef1368b5634ffcd266f",
         "type": "github"
       },
       "original": {
@@ -98,12 +98,41 @@
         "type": "github"
       }
     },
+    "nixpkgs-master": {
+      "locked": {
+        "lastModified": 1643565674,
+        "narHash": "sha256-VP+0nFRcmQY7DbZgbudgrCJfnbPxcnkI8QiDnMsWWpE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "24bc16243e07744359ccdde9e086fde0eb61db8a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1640408860,
-        "narHash": "sha256-h2uF3+a8bVfM8SjcS4hLbsOzOuG3qsxuImC0BucWs1Q=",
-        "path": "/nix/store/m6p4m1rs0xi67kaa25bm1rqkm4633qjr-source",
-        "rev": "cb372c3b8880e504b06946e8fb2ca9777c685505",
+        "lastModified": 1641887635,
+        "narHash": "sha256-kDGpufwzVaiGe5e1sBUBPo9f1YN+nYHJlYqCaVpZTQQ=",
+        "path": "/nix/store/1hdyp90ilq8gksc56dryg991kq3pc9bb-source",
+        "rev": "b2737d4980a17cc2b7d600d7d0b32fd7333aca88",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1643169865,
+        "narHash": "sha256-+KIpNRazbc8Gac9jdWCKQkFv9bjceaLaLhlwqUEYu8c=",
+        "path": "/nix/store/8jc465d8r1mrjxb7j6wx7qc7d95frv0k-source",
+        "rev": "945ec499041db73043f745fad3b2a3a01e826081",
         "type": "path"
       },
       "original": {
@@ -119,13 +148,10 @@
         "quasar-network": "quasar-network"
       },
       "locked": {
-        "host": "git.c3pb.de",
         "lastModified": 1641951740,
-        "narHash": "sha256-zXakWDKFROSNg6J5opIYCmp3bo6Xo8sawcl1vkFP97s=",
-        "owner": "jens",
-        "repo": "q",
-        "rev": "9ecc87bb6bec339bb63f3a61e43b46d8953cb7e2",
-        "type": "gitlab"
+        "narHash": "sha256-uKdv0lK5wZTELhI1yGFNZKVHQHhwjZmIM17vCz7tD7c=",
+        "type": "git",
+        "url": "file:///home/jens/dev/jens/q"
       },
       "original": {
         "host": "git.c3pb.de",
@@ -158,7 +184,7 @@
     },
     "quasar": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "host": "git.c3pb.de",
@@ -178,10 +204,7 @@
     },
     "quasar-network": {
       "inputs": {
-        "nixpkgs": [
-          "q",
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_2",
         "quasar": "quasar"
       },
       "locked": {
@@ -208,6 +231,7 @@
         "matrix-homeserver": "matrix-homeserver",
         "mobile-nixos": "mobile-nixos",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-pinephone": [
           "nixpkgs"
         ],

flake.nix

@@ -2,6 +2,8 @@
   inputs = {
     nixpkgs.url = github:nixos/nixpkgs/nixos-unstable;
 
+    nixpkgs-master.url = github:nixos/nixpkgs/master;
+
     nixpkgs-pinephone.url = github:nixos/nixpkgs/nixos-unstable;
     nixpkgs-pinephone.follows = "nixpkgs";
 
@@ -11,11 +13,9 @@
     };
     qauth = {
       url = gitlab:jens/qauth?host=git.c3pb.de;
-      inputs.nixpkgs.follows = "nixpkgs";
     };
     q = {
       url = gitlab:jens/q?host=git.c3pb.de;
-      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     mobile-nixos = {
@@ -23,6 +23,12 @@
       flake = false;
     };
 
+    emacs-overlay.url = github:nix-community/emacs-overlay;
+    emacs-term-cursor = {
+      url = github:denrat/term-cursor.el;
+      flake = false;
+    };
+
     matrix-homeserver.url = github:queezle42/matrix-homeserver;
   };