From f39330984962e3cd305952ed0ef1d2aacd55871b Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Wed, 8 May 2024 11:13:23 -0700
Subject: [PATCH] chore(ci): flake update

---
 ci/update.sh                     |  2 +-
 flake.lock                       | 30 +++++++++++++++---------------
 modules/nixos/home-assistant.nix |  3 +++
 nixos/unifi.nix                  | 13 +++++++++----
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/ci/update.sh b/ci/update.sh
index ba78aa97..0436dc42 100644
--- a/ci/update.sh
+++ b/ci/update.sh
@@ -40,7 +40,7 @@ git add flake.lock
 env \
 	GIT_{COMMITTER,AUTHOR}_EMAIL=github@kittywit.ch \
 	GIT_{COMMITTER,AUTHOR}_NAME="flake cron job" \
-git commit --message="ci: flake update"
+git commit --message="chore(ci): flake update"
 
 if [[ ${GITHUB_REF-} = refs/heads/${NF_UPDATE_BRANCH-main} ]]; then
 	git push origin HEAD:${NF_UPDATE_BRANCH-main}
diff --git a/flake.lock b/flake.lock
index 6e8fdfb6..6bcd4882 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712091889,
-        "narHash": "sha256-u9zDQaf3n3D4O8xBbvLm1DzlFjrmUHkQ241oAjucx5I=",
+        "lastModified": 1715015942,
+        "narHash": "sha256-acSCdcggbwQdgGY/C29HY9KOBL9D2y2kP22GG6wWcL8=",
         "owner": "arcnmx",
         "repo": "nixexprs",
-        "rev": "f2c2012ce5f2b8f5d3c123a0978a056809bb4734",
+        "rev": "1dfe8e22dffb4ee7110404b318caba16b7d7aaa8",
         "type": "github"
       },
       "original": {
@@ -160,11 +160,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714865296,
-        "narHash": "sha256-02r2Qzh4fGYBPB/3Lj8vwPMtE6H/UchZnN7A/dQMHIA=",
+        "lastModified": 1715077503,
+        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e0825ea2112d09d9f0680833cd716f6aee3b973f",
+        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
         "type": "github"
       },
       "original": {
@@ -190,11 +190,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714635257,
-        "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
+        "lastModified": 1715087517,
+        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
+        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
         "type": "github"
       },
       "original": {
@@ -206,11 +206,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1713638189,
-        "narHash": "sha256-q7APLfB6FmmSMI1Su5ihW9IwntBsk2hWNXh8XtSdSIk=",
+        "lastModified": 1714858427,
+        "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "74574c38577914733b4f7a775dd77d24245081dd",
+        "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76",
         "type": "github"
       },
       "original": {
@@ -267,11 +267,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1713892811,
-        "narHash": "sha256-uIGmA2xq41vVFETCF1WW4fFWFT2tqBln+aXnWrvjGRE=",
+        "lastModified": 1715035358,
+        "narHash": "sha256-RY6kqhpCPa/q3vbqt3iYRyjO3hJz9KZnshMjbpPon8o=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f1b0adc27265274e3b0c9b872a8f476a098679bd",
+        "rev": "893e3df091f6838f4f9d71c61ab079d5c5dedbd1",
         "type": "github"
       },
       "original": {
diff --git a/modules/nixos/home-assistant.nix b/modules/nixos/home-assistant.nix
index b0a4ac67..6c5fbc76 100644
--- a/modules/nixos/home-assistant.nix
+++ b/modules/nixos/home-assistant.nix
@@ -190,6 +190,9 @@ in {
       pyasn1prefix = "${python.pkgs.pysnmp-pyasn1}/${python.sitePackages}";
       home-assistant = pkgs.home-assistant.override {
         packageOverrides = self: super: {
+          pydantic = let
+            pydantic2 = self.callPackage (pkgs.path + "/pkgs/development/python-modules/pydantic") { };
+          in lib.warnIf (lib.versionAtLeast super.pydantic.version "2.0") "home-assistant pydantic override may no longer be needed" pydantic2;
           brother = super.brother.overridePythonAttrs (old: {
             dontCheckRuntimeDeps =
               if old.dontCheckRuntimeDeps or false
diff --git a/nixos/unifi.nix b/nixos/unifi.nix
index c626da33..316be282 100644
--- a/nixos/unifi.nix
+++ b/nixos/unifi.nix
@@ -14,12 +14,17 @@ in {
       mongodb-5_0_26 = pkgs.mongodb-5_0.overrideAttrs (old: rec {
         version = "5.0.26";
         name = "${old.pname}-${version}";
-        src = pkgs.fetchurl {
-          url = "https://fastdl.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-          sha256 = "sha256-GGvE52zCu2tg4p35XJ5I78nBxRUp4KwBqlmtiv50N7w=";
+        src = pkgs.fetchFromGitHub {
+          owner = "mongodb";
+          repo = "mongo";
+          rev = "r${version}";
+          sha256 = "sha256-lVRTrEnwuyKETFL1C8bVqBfrDaYrbQIdmHN42CF8ZIw=";
         };
+        sconsFlags = old.sconsFlags ++ [
+          "MONGO_VERSION=${version}"
+        ];
       });
-      isUpdated = lib.versionAtLeast pkgs.mongodb-5_0.version "5.0.26";
+      isUpdated = lib.versionAtLeast pkgs.mongodb-5_0.version mongodb-5_0_26.version;
       message = "mongodb 5.0 updated in upstream nixpkgs, override no longer needed";
     in if !isUpdated then mongodb-5_0_26 else lib.warn message pkgs.mongodb-5_0;
   };