fix: d2 builds now

nix/base-system/d2.nix

@@ -1,54 +0,0 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, installShellFiles
-, git
-, testers
-, d2
-}:
-
-buildGoModule rec {
-  pname = "d2";
-  version = "0.6.3";
-
-  src = fetchFromGitHub {
-    owner = "terrastruct";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-GImv4OJHanj6dKtAJpTaGLrR4AaVTboiYHwRdh/gXaU";
-  };
-
-  vendorHash = "sha256-T7eki06fQuGvYIJKvBJsIkFS1fQ9Jbv+ieUSr2vupqg=";
-
-  excludedPackages = [ "./e2etests" ];
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X oss.terrastruct.com/d2/lib/version.Version=v${version}"
-  ];
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  postInstall = ''
-    installManPage ci/release/template/man/d2.1
-  '';
-
-  nativeCheckInputs = [ git ];
-
-  preCheck = ''
-    # See https://github.com/terrastruct/d2/blob/master/docs/CONTRIBUTING.md#running-tests.
-    export TESTDATA_ACCEPT=1
-  '';
-
-  passthru.tests.version = testers.testVersion {
-    package = d2;
-    version = "v${version}";
-  };
-
-  meta = with lib; {
-    description = "A modern diagram scripting language that turns text to diagrams";
-    homepage = "https://d2lang.com";
-    license = licenses.mpl20;
-  };
-}

nix/base-system/darwin-configuration.nix

@@ -1,4 +1,7 @@
 { pkgs, config, lib, ... }:
+let
+    vfkit = pkgs.callPackage ../packages/vfkit.nix {};
+in
 {
 
   nix = {
@@ -283,6 +286,9 @@
   # Use a custom configuration.nix location.
   # $ darwin-rebuild switch -I darwin-config=$HOME/.config/nixpkgs/darwin/configuration.nix
   # environment.darwinConfig = "$HOME/.config/nixpkgs/darwin/configuration.nix";
+  environment.systemPackages = [
+    vfkit
+  ];
 
   # Auto upgrade nix package and the daemon service.
   services.nix-daemon.enable = true;

nix/base-system/flake.lock

@@ -1116,11 +1116,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1706367331,
+        "lastModified": 1718870667,
-        "narHash": "sha256-AqgkGHRrI6h/8FWuVbnkfFmXr4Bqsr4fV23aISqj/xg=",
+        "narHash": "sha256-jab3Kpc8O1z3qxwVsCMHL4+18n5Wy/HHKyu1fcsF7gs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "160b762eda6d139ac10ae081f8f78d640dd523eb",
+        "rev": "9b10b8f00cb5494795e5f51b39210fed4d2b0748",
         "type": "github"
       },
       "original": {

nix/base-system/flake.nix

@@ -233,9 +233,7 @@ EOF";
       clio = clio-flake.packages."${system}".default;
       unstablePkgs = import unstable { inherit system; };
       #lean4Pkg = lean4-flake.defaultPackage."${system}";
-    in { config, pkgs, ... }: let
+    in { config, pkgs, ... }: {
-        d2-lang = pkgs.callPackage ./d2.nix {};
-	in {
       
       imports = [
         agenix-flake.nixosModules.default
@@ -252,6 +250,7 @@ EOF";
             durnitisp = durnitisp;
             clio = clio;
             victoria-logs = pkgs.callPackage ../packages/victoria-logs.nix { };
+            podman = unstablePkgs.podman;
           })
           rust-overlay
         ];
@@ -306,6 +305,7 @@ EOF";
             ghidra
             #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.
+            podman
             qemu
             lima
             rlwrap
@@ -315,8 +315,7 @@ EOF";
             alloy6
             tlaplus
             jdk
-            # TODO(zaphar): d2 is broken in latest nixpkgs
+            d2
-            #d2-lang
             plantuml-c4
             nssTools
             nomad

nix/packages/vfkit.nix

@@ -0,0 +1,39 @@
+{ lib, fetchurl, stdenvNoCC, testers }:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "vfkit";
+  version = "0.5.1";
+
+  src = fetchurl {
+    url = "https://github.com/crc-org/vfkit/releases/download/v${finalAttrs.version}/vfkit";
+    hash = "sha256-at+KsvsKO359d4VUvcSuio2ej5hM6//U4Mj/jqXwhEc=";
+  };
+
+  dontUnpack = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 $src $out/bin/vfkit
+
+    runHook postInstall
+  '';
+
+  passthru.tests = {
+    version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+    };
+  };
+
+  meta = {
+    description = "Simple command line tool to start VMs through virtualization framework";
+    homepage = "https://github.com/crc-org/vfkit";
+    license = lib.licenses.asl20;
+    maintainers = [ ];
+    platforms = lib.platforms.darwin;
+    # Source build will be possible after darwin SDK 12.0 bump
+    # https://github.com/NixOS/nixpkgs/pull/229210
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    mainProgram = "vfkit";
+  };
+})