From 46ce17d6acd0d8cac569cd618e40fe50d19b0a84 Mon Sep 17 00:00:00 2001
From: Jeremy Wall <jeremy@marzhillstudios.com>
Date: Thu, 14 Jul 2022 17:28:42 -0400
Subject: [PATCH] Add jj to the set

---
 .vscode/settings.json               |  3 ++
 nix/darwin/darwin-configuration.nix |  1 +
 nix/darwin/flake.lock               | 43 +++++++++++++++++++++++++----
 nix/darwin/flake.nix                |  4 ++-
 result                              |  1 +
 5 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 .vscode/settings.json
 create mode 120000 result

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..65e1ec0
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "makefile.extensionOutputFolder": "./.vscode"
+}
\ No newline at end of file
diff --git a/nix/darwin/darwin-configuration.nix b/nix/darwin/darwin-configuration.nix
index 443cfe8..3500695 100644
--- a/nix/darwin/darwin-configuration.nix
+++ b/nix/darwin/darwin-configuration.nix
@@ -92,6 +92,7 @@
         inputs.sile
         inputs.runwhen
         inputs.durnitisp
+        inputs.jj
         # TODO add sonic-pi here if it supports the arch
     ];
 
diff --git a/nix/darwin/flake.lock b/nix/darwin/flake.lock
index 9a29e8e..41a199b 100644
--- a/nix/darwin/flake.lock
+++ b/nix/darwin/flake.lock
@@ -132,6 +132,24 @@
         "type": "github"
       }
     },
+    "jj": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1657821556,
+        "narHash": "sha256-t4B8sC31ZFt/Z1pN+79bhfDYUoMvW5dNbFiWyglPAvs=",
+        "owner": "martinvonz",
+        "repo": "jj",
+        "rev": "92fc2ceb5f431530d2e1238efbb24e9d3e276b68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "martinvonz",
+        "repo": "jj",
+        "type": "github"
+      }
+    },
     "naersk": {
       "inputs": {
         "nixpkgs": "nixpkgs"
@@ -152,7 +170,7 @@
     },
     "naersk_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1650101877,
@@ -183,6 +201,20 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1651634615,
+        "narHash": "sha256-VtvcS61bLh5mIBm9cV3idUHdlfPRFus/NwdJfaj5s8o=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "abfd31179174133ab8131139d650297bf4da63b7",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1653328845,
         "narHash": "sha256-NKc98+iX8YH500np1zWZSQ2C+FoD9sS/nuH02Rg2ats=",
@@ -198,7 +230,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1650109093,
         "narHash": "sha256-tqlnKrAdJktRLXTou9le0oTqrYBAFpGscV5RADdpArU=",
@@ -212,7 +244,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1650222748,
         "narHash": "sha256-AHh/goEfG5hlhIMVgGQwACbuv5Wit2ND9vrcB4QthJs=",
@@ -231,7 +263,8 @@
       "inputs": {
         "darwin": "darwin",
         "durnitisp": "durnitisp",
-        "nixpkgs": "nixpkgs_2",
+        "jj": "jj",
+        "nixpkgs": "nixpkgs_3",
         "runwhen": "runwhen",
         "rust-overlay": "rust-overlay_2"
       }
@@ -241,7 +274,7 @@
         "flake-compat": "flake-compat_2",
         "flake-utils": "flake-utils_2",
         "naersk": "naersk_2",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "rust-overlay": "rust-overlay"
       },
       "locked": {
diff --git a/nix/darwin/flake.nix b/nix/darwin/flake.nix
index 4a593c5..c3dfc27 100644
--- a/nix/darwin/flake.nix
+++ b/nix/darwin/flake.nix
@@ -11,9 +11,10 @@
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    jj.url = "github:martinvonz/jj";
   };
 
-  outputs = {self, nixpkgs, darwin, runwhen, durnitisp, rust-overlay }:
+  outputs = {self, nixpkgs, darwin, runwhen, durnitisp, rust-overlay, jj }:
   let
     forSystem = (system:
       let
@@ -30,6 +31,7 @@
           rust-overlay = rust-overlay.overlay;
           #TODO(jwall): when the libtexpdf issue is fixed we can stop doing this
           sile = pkgs.sile.overrideAttrs(oldAttrs: { doCheck = false; });
+          jj = jj.defaultPackage."${system}";
         };
       });
   in
diff --git a/result b/result
new file mode 120000
index 0000000..703d953
--- /dev/null
+++ b/result
@@ -0,0 +1 @@
+/nix/store/3pl430vvk4prggkvwc7kfw8sjg6l0fh7-darwin-system-22.05.20220523.7ae60dd+darwin4.4fdbb81
\ No newline at end of file