From d99ab26cf59810b63bcb99c7785ae59a643e2e07 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Sat, 1 Jun 2024 12:21:14 -0400
Subject: [PATCH] update: nixpkgs 24.05

---
 nix/base-system/flake.lock | 16 ++++++++--------
 nix/base-system/flake.nix  | 14 ++++++++------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/nix/base-system/flake.lock b/nix/base-system/flake.lock
index c551ab0..146177c 100644
--- a/nix/base-system/flake.lock
+++ b/nix/base-system/flake.lock
@@ -527,16 +527,16 @@
     },
     "nixpkgs-darwin": {
       "locked": {
-        "lastModified": 1715818734,
-        "narHash": "sha256-WvAJWCwPj/6quKcsgsvQYyZRxV8ho/yUzj0HZQ34DVU=",
+        "lastModified": 1717100421,
+        "narHash": "sha256-T+0Q1QHBDCoa4yBJrY7cG3vDEhqm4PwOLmNI6mzEwVc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "95742536dc6debb5a8b8b78b27001c38f369f1e7",
+        "rev": "75000c2cf4422c8a1776284314921ac1289c02c9",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixpkgs-23.11-darwin",
+        "ref": "nixpkgs-24.05-darwin",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -633,16 +633,16 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1701282334,
-        "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
+        "lastModified": 1717179513,
+        "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
+        "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "23.11",
+        "ref": "24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index 1587054..9a10325 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -1,9 +1,9 @@
 {
   inputs = {
     # Default to sane nixpkgs versions
-    nixpkgs.url = "github:nixos/nixpkgs/23.11";
+    nixpkgs.url = "github:nixos/nixpkgs/24.05";
     unstable.url = "nixpkgs";
-    nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-23.11-darwin";
+    nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-24.05-darwin";
     #lean4-flake = { 
     #  url = "github:leanprover/lean4/v4.4.0";
     #  inputs.nixpkgs.follows = "nixpkgs";
@@ -213,7 +213,8 @@ EOF";
             nil-pkg
 			lua-language-server
             rust-analyzer
-            dbeaver
+            # TODO(jwall): This is no longer provided for darwin in nixpkgs
+            #dbeaver-bin
         ]);
       };
     };
@@ -273,7 +274,8 @@ EOF";
             # Should be fixed by: https://github.com/NixOS/nixpkgs/pull/282624
             #isabelle
             # Should be fixed by: https://github.com/NixOS/nixpkgs/pull/282624
-            (lean4.override { stdenv = stdenv.override { allowedRequisites = null; cc = llvmPackages_11.clang; }; })
+            #(lean4.override { stdenv = stdenv.override { allowedRequisites = null; cc = llvmPackages_11.clang; }; })
+            lean4
             terraform # TODO(jeremy): Replace with opentofu when that is an option.
             nomad
             oha
@@ -309,7 +311,8 @@ EOF";
             alloy6
             tlaplus
             jdk
-            d2-lang
+            # TODO(zaphar): d2 is broken in latest nixpkgs
+            #d2-lang
             plantuml-c4
             nssTools
             nomad
@@ -346,7 +349,6 @@ EOF";
         (vimModule system)
         ./modules/darwin-monitor.nix
         ./modules/victoria-logs.nix
-        ./modules/vector.nix
         ./darwin-configuration.nix
       ];
     };