From 6a1ce4f42aabd2008116f5ab8f649f7d4f28e9a2 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Thu, 13 Jul 2023 08:06:14 -0400
Subject: [PATCH] Update nixpkgs and reenable podman

---
 nix/base-system/flake.nix |  4 ++--
 nix/darwin/flake.lock     | 50 ++++++++++++++-------------------------
 nix/darwin/flake.nix      |  5 +++-
 3 files changed, 24 insertions(+), 35 deletions(-)

diff --git a/nix/base-system/flake.nix b/nix/base-system/flake.nix
index 0e6d683..801dec0 100644
--- a/nix/base-system/flake.nix
+++ b/nix/base-system/flake.nix
@@ -104,8 +104,8 @@
             colima
             #podman-desktop # Broken on darwin right now with electron build issues.
             # Note that podman expects qemu to be installed in order to use the podman machine setup.
-            #qemu
-            #podman
+            qemu
+            podman
             lima
             rlwrap
             docker-client
diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock
index cd48d78..7b126b3 100644
--- a/nix/darwin/flake.lock
+++ b/nix/darwin/flake.lock
@@ -25,19 +25,21 @@
         "agenix-flake": "agenix-flake",
         "durnitisp-flake": "durnitisp-flake",
         "jj-flake": "jj-flake",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
         "runwhen-flake": "runwhen-flake",
         "rust-overlay-flake": "rust-overlay-flake",
         "sile-flake": "sile-flake"
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-6Sh7ndGBv+lkGeA/emKAilsIjWIY60r8yf9UMBUYWcY=",
-        "path": "/nix/store/87i4jbb52x7b8glwz3k5k9ms6ag47gpd-source/nix/base-system",
+        "narHash": "sha256-BCPkQmfIGNCZSE0aGAiuvtLXwBwoeNRq2ICOvyIuYas=",
+        "path": "/nix/store/g9k3q47ggx3qccfkxp5qskxpplh1yqbg-source/nix/base-system",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/87i4jbb52x7b8glwz3k5k9ms6ag47gpd-source/nix/base-system",
+        "path": "/nix/store/g9k3q47ggx3qccfkxp5qskxpplh1yqbg-source/nix/base-system",
         "type": "path"
       }
     },
@@ -66,7 +68,7 @@
     },
     "darwin_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
         "lastModified": 1687691275,
@@ -349,7 +351,7 @@
     },
     "naersk_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1650101877,
@@ -410,22 +412,6 @@
       }
     },
     "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1687809362,
-        "narHash": "sha256-e72RNXWY3ICo6/pg51WzTTUAHAH/BFeyYUIc2HrVGgU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "6b6afd2c68c6ecc0fe055b8b9ea2dbbc30219836",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "release-23.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
       "locked": {
         "lastModified": 1650109093,
         "narHash": "sha256-tqlnKrAdJktRLXTou9le0oTqrYBAFpGscV5RADdpArU=",
@@ -439,7 +425,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1650222748,
         "narHash": "sha256-AHh/goEfG5hlhIMVgGQwACbuv5Wit2ND9vrcB4QthJs=",
@@ -454,7 +440,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1682109806,
         "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
@@ -470,7 +456,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1687274257,
         "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
@@ -483,13 +469,13 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_9": {
+    "nixpkgs_8": {
       "locked": {
-        "lastModified": 1686526929,
-        "narHash": "sha256-ybQ4GDx/AViKJfeu2PUWvxxlGcmVHVY15zay849i6dg=",
+        "lastModified": 1689326639,
+        "narHash": "sha256-79zi0t83Dcc2dE0NuYZ+2hqtKXZN1yWVq5mtx8D2d7Y=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5f6396e85487aa59c801da5f7c87ac20098b2fa8",
+        "rev": "9fdfaeb7b96f05e869f838c73cde8d98c640c649",
         "type": "github"
       },
       "original": {
@@ -503,7 +489,7 @@
       "inputs": {
         "base-system": "base-system",
         "darwin": "darwin_2",
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_8"
       }
     },
     "runwhen-flake": {
@@ -511,7 +497,7 @@
         "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils_3",
         "naersk": "naersk_2",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_5",
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
@@ -606,7 +592,7 @@
         "flake-utils": "flake-utils_6",
         "gitignore": "gitignore",
         "libtexpdf-src": "libtexpdf-src",
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1687444516,
diff --git a/nix/darwin/flake.nix b/nix/darwin/flake.nix
index b026831..c242853 100644
--- a/nix/darwin/flake.nix
+++ b/nix/darwin/flake.nix
@@ -3,7 +3,10 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/release-23.05";
     darwin.url = "github:lnl7/nix-darwin";
-    base-system.url = "../base-system/";
+    base-system = {
+      url = "../base-system/";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {self,