From 741264ec481a276dd3ed02a71f03e3d0b69575bd Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Tue, 12 Sep 2023 12:18:43 +0000
Subject: [PATCH] nixpkgs: 2023-09-08 -> 2023-09-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b' (2023-09-08)
  → 'github:nixos/nixpkgs/3a2786eea085f040a66ecde1bc3ddc7099f6dbeb' (2023-09-11)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/faf21ac162173c2deb54e5fdeed002a9bd6e8623' (2023-09-05)
  → 'github:Mic92/sops-nix/ea208e55f8742fdcc0986b256bdfa8986f5e4415' (2023-09-12)
```
---
 flake.lock         | 12 ++++++------
 overlays/cross.nix | 13 +++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index 18d8f997..b7d73237 100644
--- a/flake.lock
+++ b/flake.lock
@@ -85,11 +85,11 @@
     },
     "nixpkgs-unpatched": {
       "locked": {
-        "lastModified": 1694183432,
-        "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=",
+        "lastModified": 1694422566,
+        "narHash": "sha256-lHJ+A9esOz9vln/3CJG23FV6Wd2OoOFbDeEs4cMGMqc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b",
+        "rev": "3a2786eea085f040a66ecde1bc3ddc7099f6dbeb",
         "type": "github"
       },
       "original": {
@@ -116,11 +116,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1693898833,
-        "narHash": "sha256-OIrMAGNYNeLs6IvBynxcXub7aSW3GEUvWNsb7zx6zuU=",
+        "lastModified": 1694495315,
+        "narHash": "sha256-sZEYXs9T1NVHZSSbMqBEtEm2PGa7dEDcx0ttQkArORc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "faf21ac162173c2deb54e5fdeed002a9bd6e8623",
+        "rev": "ea208e55f8742fdcc0986b256bdfa8986f5e4415",
         "type": "github"
       },
       "original": {
diff --git a/overlays/cross.nix b/overlays/cross.nix
index d33bf848..365fdd22 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -1720,6 +1720,19 @@ in {
     ];
   });
 
+  spdlog = prev.spdlog.overrideAttrs (upstream: {
+    # oops: <https://github.com/NixOS/nixpkgs/pull/250435/files#diff-ba4902b7396cd55a6e49ae0a0f5ad80f194e8b642e7016a825c90cef372df7f4R35>
+    # nativeCheckInputs = (upstream.nativeCheckInputs or []) ++ [ final.catch2_3 ];
+    # # checkInputs = (upstream.checkInputs or []) ++ [ final.systemd ];
+    # # pkgsBuildBuild = (upstream.pkgsBuildBuild or []) ++ [ final.pkg-config ];
+    # postPatch = (upstream.postPatch or "") + ''
+    #   substituteInPlace tests/CMakeLists.txt \
+    #     --replace 'Catch2 3 QUIET' 'Catch2 3'
+    # '';
+    doCheck = false;
+    cmakeFlags = lib.remove "-DSPDLOG_BUILD_TESTS=ON" upstream.cmakeFlags;
+  });
+
   squeekboard = prev.squeekboard.overrideAttrs (upstream: {
     # fixes: "meson.build:1:0: ERROR: 'rust' compiler binary not defined in cross or native file"
     # new error: "meson.build:1:0: ERROR: Rust compiler rustc --target aarch64-unknown-linux-gnu -C linker=aarch64-unknown-linux-gnu-gcc can not compile programs."