From 0c3cdd016f85f5e1ada253943f6eb249d5a55040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 30 Nov 2022 22:49:44 +0100
Subject: [PATCH] Switch to nixpkgs stable fork for cherry-picked fixes

---
 flake.lock | 46 +++++++++++++++++++++++-----------------------
 flake.nix  |  3 ++-
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/flake.lock b/flake.lock
index a94603ab..94428017 100644
--- a/flake.lock
+++ b/flake.lock
@@ -113,11 +113,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1669703151,
-        "narHash": "sha256-I6EcDjBIyFv3H7uhsq7agt9eJGUzCRKsRwXexrKBxNc=",
+        "lastModified": 1669789565,
+        "narHash": "sha256-9fBxYzp0cnkHygZOY5HTM7QMYr1WsC062Yc8glQNIgM=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "723bf93513f1331961c5251817214e64d306b24a",
+        "rev": "bba229a06ca03938a1abd4ce6361bf9bf4f651cd",
         "type": "github"
       },
       "original": {
@@ -349,15 +349,15 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1669558522,
-        "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=",
-        "owner": "nixos",
+        "lastModified": 1669842486,
+        "narHash": "sha256-ogRw+3pxB+I/FwTppNolpdgwJGrU7xsgqTfFUjuys8o=",
+        "owner": "SuperSandro2000",
         "repo": "nixpkgs",
-        "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82",
+        "rev": "07e0bf5ccddcabe20d2b3bd89aaace918a4a6402",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "SuperSandro2000",
         "ref": "nixos-22.11",
         "repo": "nixpkgs",
         "type": "github"
@@ -511,11 +511,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1669668296,
-        "narHash": "sha256-/i1UWcpqW1f/Ulj0ZHb38uEbz+3e7XuamQhNoHYAQ48=",
+        "lastModified": 1669840858,
+        "narHash": "sha256-ptLvigZ91boFMYhSOXKFsycrjSiIQ1ZmjiYC1iZ3US0=",
         "owner": "astro",
         "repo": "nix-openwrt-imagebuilder",
-        "rev": "e3b0754ab36871291da773355932c58ac81b3952",
+        "rev": "e3e2f451ce6255dce904427c83b11ef2a6eba755",
         "type": "github"
       },
       "original": {
@@ -562,11 +562,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1669551522,
-        "narHash": "sha256-ScH3I2/5+tCN23U8mUUj/HoZXDF11fo1z93X9imAfOo=",
+        "lastModified": 1669747020,
+        "narHash": "sha256-kNfchCXcI4jcwBdU57f4ifdgPAvLKLJIHKUCiZVv+v0=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "6d61be8e65ac0fd45eaf178e1f7a1ec6b582de1f",
+        "rev": "398a71affb05aeeea1991044ec9ca1229e68f0f3",
         "type": "github"
       },
       "original": {
@@ -586,11 +586,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1669689198,
-        "narHash": "sha256-YsWu3C9IGbH3+xguTzEDyQorFe/igr6FGZ+Q5T2ocxE=",
+        "lastModified": 1669775522,
+        "narHash": "sha256-6xxGArBqssX38DdHpDoPcPvB/e79uXyQBwpBcaO/BwY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "4e093ce661a63aca4bcbace33695225eae4ef4e4",
+        "rev": "3158e47f6b85a288d12948aeb9a048e0ed4434d6",
         "type": "github"
       },
       "original": {
@@ -645,11 +645,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1669412899,
-        "narHash": "sha256-UlYIzmjAHZ6LdjD/SFXJLHCBPCJ+y8oC94Rhl9pZtR0=",
+        "lastModified": 1669843159,
+        "narHash": "sha256-FVW/rRnuWahLhmBVO9svpVsK2yPYNc5hh2e9BoMCZHk=",
         "owner": "astro",
         "repo": "skyflake",
-        "rev": "162a95bbe72c91f2a43ea40773761464e2c659cc",
+        "rev": "54853b3efeaf57ab08cee76680fe0e2d5c144fe7",
         "type": "github"
       },
       "original": {
@@ -668,11 +668,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1669520266,
-        "narHash": "sha256-NY0lyWC5djlvAiAhGb9xvT0bknBVLh/egvd3TqmJasc=",
+        "lastModified": 1669714206,
+        "narHash": "sha256-9aiMbzRL8REsyi9U0eZ+lT4s7HaILA1gh9n2apKzLxU=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "a01f386f34a854fe4f8754e62a6837748bc84a8a",
+        "rev": "8295b8139ef7baadeb90c5cad7a40c4c9297ebf7",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5d91b64b..ad170611 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,8 @@
   description = "C3D2 NixOS configurations";
 
   inputs = {
-    nixos.url = "github:nixos/nixpkgs/nixos-22.11";
+    # use sandro's fork full with cherry-picked fixes
+    nixos.url = "github:SuperSandro2000/nixpkgs/nixos-22.11";
     nixpkgs-mobilizon.url = "github:minijackson/nixpkgs/init-mobilizon";
     nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-hardware.url = "github:nixos/nixos-hardware";