From dd827cdf5532692c9a1b1ff61fa3382187006816 Mon Sep 17 00:00:00 2001
From: Daylin Morgan <me@dayl.in>
Date: Wed, 27 Mar 2024 03:33:39 -0500
Subject: [PATCH] make oizys versions one level deeper

---
 lib/default.nix                         | 4 ++--
 pkgs/{ => oizys}/oizys-nim/default.nix  | 0
 pkgs/{ => oizys}/oizys-nim/oizys.nim    | 0
 pkgs/{ => oizys}/oizys-nim/oizys.nimble | 0
 pkgs/{ => oizys}/oizys-rs/.gitignore    | 1 -
 pkgs/{ => oizys}/oizys-rs/Cargo.lock    | 0
 pkgs/{ => oizys}/oizys-rs/Cargo.toml    | 0
 pkgs/{ => oizys}/oizys-rs/default.nix   | 0
 pkgs/{ => oizys}/oizys-rs/src/main.rs   | 0
 9 files changed, 2 insertions(+), 3 deletions(-)
 rename pkgs/{ => oizys}/oizys-nim/default.nix (100%)
 rename pkgs/{ => oizys}/oizys-nim/oizys.nim (100%)
 rename pkgs/{ => oizys}/oizys-nim/oizys.nimble (100%)
 rename pkgs/{ => oizys}/oizys-rs/.gitignore (98%)
 rename pkgs/{ => oizys}/oizys-rs/Cargo.lock (100%)
 rename pkgs/{ => oizys}/oizys-rs/Cargo.toml (100%)
 rename pkgs/{ => oizys}/oizys-rs/default.nix (100%)
 rename pkgs/{ => oizys}/oizys-rs/src/main.rs (100%)

diff --git a/lib/default.nix b/lib/default.nix
index 5c88c57..5385591 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -32,8 +32,8 @@ in rec {
   oizysHosts = mapAttrs (name: _: mkSystem name) (readDir ../hosts);
   oizysPkg = forAllSystems (
     pkgs: rec {
-      oizys-nim = pkgs.callPackage ../pkgs/oizys-nim {};
-      oizys = pkgs.callPackage ../pkgs/oizys-rs {};
+      oizys-nim = pkgs.callPackage ../pkgs/oizys/oizys-nim {};
+      oizys = pkgs.callPackage ../pkgs/oizys/oizys-rs {};
       default = oizys;
     }
   );
diff --git a/pkgs/oizys-nim/default.nix b/pkgs/oizys/oizys-nim/default.nix
similarity index 100%
rename from pkgs/oizys-nim/default.nix
rename to pkgs/oizys/oizys-nim/default.nix
diff --git a/pkgs/oizys-nim/oizys.nim b/pkgs/oizys/oizys-nim/oizys.nim
similarity index 100%
rename from pkgs/oizys-nim/oizys.nim
rename to pkgs/oizys/oizys-nim/oizys.nim
diff --git a/pkgs/oizys-nim/oizys.nimble b/pkgs/oizys/oizys-nim/oizys.nimble
similarity index 100%
rename from pkgs/oizys-nim/oizys.nimble
rename to pkgs/oizys/oizys-nim/oizys.nimble
diff --git a/pkgs/oizys-rs/.gitignore b/pkgs/oizys/oizys-rs/.gitignore
similarity index 98%
rename from pkgs/oizys-rs/.gitignore
rename to pkgs/oizys/oizys-rs/.gitignore
index 389159a..6abedac 100644
--- a/pkgs/oizys-rs/.gitignore
+++ b/pkgs/oizys/oizys-rs/.gitignore
@@ -9,7 +9,6 @@ target/
 
 # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
 # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
-Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
diff --git a/pkgs/oizys-rs/Cargo.lock b/pkgs/oizys/oizys-rs/Cargo.lock
similarity index 100%
rename from pkgs/oizys-rs/Cargo.lock
rename to pkgs/oizys/oizys-rs/Cargo.lock
diff --git a/pkgs/oizys-rs/Cargo.toml b/pkgs/oizys/oizys-rs/Cargo.toml
similarity index 100%
rename from pkgs/oizys-rs/Cargo.toml
rename to pkgs/oizys/oizys-rs/Cargo.toml
diff --git a/pkgs/oizys-rs/default.nix b/pkgs/oizys/oizys-rs/default.nix
similarity index 100%
rename from pkgs/oizys-rs/default.nix
rename to pkgs/oizys/oizys-rs/default.nix
diff --git a/pkgs/oizys-rs/src/main.rs b/pkgs/oizys/oizys-rs/src/main.rs
similarity index 100%
rename from pkgs/oizys-rs/src/main.rs
rename to pkgs/oizys/oizys-rs/src/main.rs