From 63b7d9bdf4f1c0593467d9dd2e462cda06753c09 Mon Sep 17 00:00:00 2001
From: zmrocze <karolochmanmilarski@gmail.com>
Date: Fri, 26 Apr 2024 20:15:35 +0200
Subject: [PATCH 1/5] Fix typo: superdirt-install now in devshell

---
 flake.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index fa85318..66fb3d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -108,7 +108,7 @@
       };
 
       # Installs SuperDirt under your user's supercollider quarks.
-      superdirt-install = pkgs.writeShellScriptBin "superdirt-start" ''
+      superdirt-install = pkgs.writeShellScriptBin "superdirt-install" ''
         ${supercollider}/bin/sclang ${superdirt}/install.sc
       '';
 
@@ -174,6 +174,7 @@
         buildInputs = [
           tidalpkgs.supercollider
           tidalpkgs.superdirt-start
+          tidalpkgs.superdirt-install
           tidalpkgs.tidal
         ];
         # Convenient access to a config providing all quarks required for Tidal.

From c3fca7e2beb5e837a91a8cf3bec6f068949c1fdc Mon Sep 17 00:00:00 2001
From: zmrocze <karolochmanmilarski@gmail.com>
Date: Fri, 26 Apr 2024 23:36:30 +0200
Subject: [PATCH 2/5] Attempt at install-src

---
 quark/lib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quark/lib.nix b/quark/lib.nix
index c4ecf24..b011a84 100644
--- a/quark/lib.nix
+++ b/quark/lib.nix
@@ -34,8 +34,8 @@
         # Write a `sc` file that can be used to install the quark imperatively.
         # TODO: Don't clear all quarks - only remove any with matching ${name}.
         install-sc = ''
-          Quarks.clear;
-          Quarks.install(\"$out\");
+          Quarks:clear;
+          Quarks:install(\"$out\");
           thisProcess.recompile();\
         '';
 

From adcedb434665918a4079386e9710a33b0243d3af Mon Sep 17 00:00:00 2001
From: zmrocze <karolochmanmilarski@gmail.com>
Date: Mon, 29 Apr 2024 20:07:48 +0200
Subject: [PATCH 3/5] Add scland-with-superdirt

---
 flake.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 66fb3d5..a871463 100644
--- a/flake.nix
+++ b/flake.nix
@@ -161,7 +161,7 @@
       tidal = final: prev: let
         tidalpkgs = mkPackages prev;
       in {
-        inherit (tidalpkgs) superdirt-start superdirt-install tidal;
+        inherit (tidalpkgs) superdirt-start superdirt-install tidal sclang-with-superdirt;
         vimPlugins = prev.vimPlugins // {inherit (tidalpkgs) vim-tidal;};
       };
       default = tidal;
@@ -176,6 +176,7 @@
           tidalpkgs.superdirt-start
           tidalpkgs.superdirt-install
           tidalpkgs.tidal
+          tidalpkgs.sclang-with-superdirt
         ];
         # Convenient access to a config providing all quarks required for Tidal.
         SUPERDIRT_SCLANG_CONF = "${tidalpkgs.superdirt}/sclang_conf.yaml";

From 1e06603385b03d0a854fece59cc3d278d710dc62 Mon Sep 17 00:00:00 2001
From: zmrocze <karolochmanmilarski@gmail.com>
Date: Tue, 30 Apr 2024 00:23:00 +0200
Subject: [PATCH 4/5] Revert the buggy change

---
 quark/lib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/quark/lib.nix b/quark/lib.nix
index b011a84..c4ecf24 100644
--- a/quark/lib.nix
+++ b/quark/lib.nix
@@ -34,8 +34,8 @@
         # Write a `sc` file that can be used to install the quark imperatively.
         # TODO: Don't clear all quarks - only remove any with matching ${name}.
         install-sc = ''
-          Quarks:clear;
-          Quarks:install(\"$out\");
+          Quarks.clear;
+          Quarks.install(\"$out\");
           thisProcess.recompile();\
         '';
 

From 6de93596fff8126689d9246084ff77d540db1cc9 Mon Sep 17 00:00:00 2001
From: zmrocze <karolochmanmilarski@gmail.com>
Date: Fri, 10 May 2024 22:51:30 +0200
Subject: [PATCH 5/5] Rename install.sc -> install.scd

---
 flake.nix     | 2 +-
 quark/lib.nix | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index a871463..d861428 100644
--- a/flake.nix
+++ b/flake.nix
@@ -109,7 +109,7 @@
 
       # Installs SuperDirt under your user's supercollider quarks.
       superdirt-install = pkgs.writeShellScriptBin "superdirt-install" ''
-        ${supercollider}/bin/sclang ${superdirt}/install.sc
+        ${supercollider}/bin/sclang ${superdirt}/install.scd
       '';
 
       # Run the tidal interpreter (ghci running BootTidal.hs).
diff --git a/quark/lib.nix b/quark/lib.nix
index c4ecf24..ba571be 100644
--- a/quark/lib.nix
+++ b/quark/lib.nix
@@ -9,7 +9,7 @@
   # The resulting quark contains:
   # - `quark` subdirectory, containing the quark itself along with symbolic
   # links to each of its dependencies.
-  # - a `install.sc` file that can be used to install the Quark imperatively.
+  # - a `install.scd` file that can be used to install the Quark imperatively.
   # - a `sclang_conf.yaml` that can be used to provide the quark and its
   # dependencies directly to an interpreter.
   #
@@ -33,10 +33,10 @@
 
         # Write a `sc` file that can be used to install the quark imperatively.
         # TODO: Don't clear all quarks - only remove any with matching ${name}.
-        install-sc = ''
+        install-scd = ''
           Quarks.clear;
           Quarks.install(\"$out\");
-          thisProcess.recompile();\
+          thisProcess.recompile();
         '';
 
         # Write a yaml config file with an entry for this quark.
@@ -52,7 +52,7 @@
         mkdir -p $out/quark/${name}
         cp -r ./* $out/quark/${name}
         ${ln-deps}
-        echo "${install-sc}" >> $out/install.sc
+        echo "${install-scd}" >> $out/install.scd
         echo "${sclang-conf-yaml}" >> $out/sclang_conf.yaml
       '';
     };