From 1931f954fbe486c186ad5afe3364b356da3ea3f4 Mon Sep 17 00:00:00 2001
From: rhiannon morris <rhi@rhiannon.website>
Date: Wed, 4 May 2022 20:13:56 +0200
Subject: [PATCH] renamings

---
 exe/quox-exe.ipkg                |  8 --------
 exe/quox.ipkg                    |  8 ++++++++
 flake.nix                        | 10 +++++-----
 lib/{quox.ipkg => quox-lib.ipkg} |  2 +-
 tests/quox-tests.ipkg            |  2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 exe/quox-exe.ipkg
 create mode 100644 exe/quox.ipkg
 rename lib/{quox.ipkg => quox-lib.ipkg} (97%)

diff --git a/exe/quox-exe.ipkg b/exe/quox-exe.ipkg
deleted file mode 100644
index 0d38492..0000000
--- a/exe/quox-exe.ipkg
+++ /dev/null
@@ -1,8 +0,0 @@
-package quox-exe
-version = 0
-
-depends = base, contrib, elab-util, sop, quox
-
-executable = quox
-sourcedir = "src"
-main = Main
diff --git a/exe/quox.ipkg b/exe/quox.ipkg
new file mode 100644
index 0000000..2fe23b1
--- /dev/null
+++ b/exe/quox.ipkg
@@ -0,0 +1,8 @@
+package quox
+version = 0
+
+depends = base, contrib, elab-util, sop, quox-lib
+
+executable = quox
+sourcedir = "src"
+main = Main
diff --git a/flake.nix b/flake.nix
index d78561e..7b126f7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,13 +17,13 @@
 
         inherit (pkgs.idris2-pkgs._builders) idrisPackage;
 
-        quox       = idrisPackage ./lib   { };
-        quox-exe   = idrisPackage ./exe   { extraPkgs.quox = quox; };
-        quox-tests = idrisPackage ./tests { extraPkgs.quox = quox; };
+        quox-lib   = idrisPackage ./lib   { };
+        quox       = idrisPackage ./exe   { extraPkgs.quox-lib = quox-lib; };
+        quox-tests = idrisPackage ./tests { extraPkgs.quox-lib = quox-lib; };
       in
       {
-        packages = { inherit quox quox-exe quox-tests; };
-        defaultPackage = quox-exe;
+        packages = { inherit quox-lib quox quox-tests; };
+        defaultPackage = quox;
       }
     );
 }
diff --git a/lib/quox.ipkg b/lib/quox-lib.ipkg
similarity index 97%
rename from lib/quox.ipkg
rename to lib/quox-lib.ipkg
index 3a4b0d2..e9c6c52 100644
--- a/lib/quox.ipkg
+++ b/lib/quox-lib.ipkg
@@ -1,4 +1,4 @@
-package quox
+package quox-lib
 version = 0
 
 authors   = "rhiannon morris"
diff --git a/tests/quox-tests.ipkg b/tests/quox-tests.ipkg
index 1fd985e..9f49a69 100644
--- a/tests/quox-tests.ipkg
+++ b/tests/quox-tests.ipkg
@@ -1,6 +1,6 @@
 package quox-tests
 
-depends = base, contrib, elab-util, sop, quox
+depends = base, contrib, elab-util, sop, quox-lib
 
 executable = quox-tests
 sourcedir = "src"