about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorTheofilos Augoustis <theofilos.augoustis@tum.de>2025-08-27 15:39:47 +0000
committerTheofilos Augoustis <theofilos.augoustis@tum.de>2025-08-27 15:39:47 +0000
commit979d793cdeb3ce4d2a48d219ac3f08d4e880a80c (patch)
treeb05e8fe07f651d796aa213f9f9c24ccb3260e2ad
parentf1dd7b0bfcbd0d73621456be181f2904b349b884 (diff)
downloadfocaccia-979d793cdeb3ce4d2a48d219ac3f08d4e880a80c.tar.gz
focaccia-979d793cdeb3ce4d2a48d219ac3f08d4e880a80c.zip
Support using custom miasm fork directly in flake
-rw-r--r--flake.nix2
-rw-r--r--pyproject.toml4
-rw-r--r--uv.lock32
3 files changed, 12 insertions, 26 deletions
diff --git a/flake.nix b/flake.nix
index 3d6b73e..074197d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,8 @@
 	description = "Focaccia: A Symbolic Tester for QEMU";
 
 	inputs = {
+		self.submodules = true;
+
 		nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
 		nixpkgs-qemu-60.url = "github:nixos/nixpkgs/f8f124009497b3f9908f395d2533a990feee1de8";
diff --git a/pyproject.toml b/pyproject.toml
index 5d27a33..dfc5464 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,6 @@ dev = [
 	"ruff",
 	"black",
 	"pyright",
-	"miasm @ git+https://github.com/taugoust/miasm.git@develop",
 ]
 
 [project.scripts]
@@ -32,6 +31,9 @@ focaccia = "focaccia:cli.main"
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
+[tool.uv.sources]
+miasm = { path = "./miasm" }
+
 [tool.hatch.metadata]
 allow-direct-references = true
 
diff --git a/uv.lock b/uv.lock
index d90a6fb..de742ef 100644
--- a/uv.lock
+++ b/uv.lock
@@ -65,7 +65,6 @@ dependencies = [
 [package.optional-dependencies]
 dev = [
     { name = "black" },
-    { name = "miasm" },
     { name = "pyright" },
     { name = "ruff" },
 ]
@@ -75,8 +74,7 @@ requires-dist = [
     { name = "black", marker = "extra == 'dev'" },
     { name = "cpuid", git = "https://github.com/taugoust/cpuid.py.git?rev=master" },
     { name = "lldb-python" },
-    { name = "miasm" },
-    { name = "miasm", marker = "extra == 'dev'", git = "https://github.com/taugoust/miasm.git?rev=develop" },
+    { name = "miasm", directory = "miasm" },
     { name = "pyright", marker = "extra == 'dev'" },
     { name = "ruff", marker = "extra == 'dev'" },
     { name = "setuptools" },
@@ -84,15 +82,6 @@ requires-dist = [
 provides-extras = ["dev"]
 
 [[package]]
-name = "future"
-version = "1.0.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/a7/b2/4140c69c6a66432916b26158687e821ba631a4c9273c474343badf84d3ba/future-1.0.0.tar.gz", hash = "sha256:bd2968309307861edae1458a4f8a4f3598c03be43b97521076aebf5d94c07b05", size = 1228490, upload-time = "2024-02-21T11:52:38.461Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/da/71/ae30dadffc90b9006d77af76b393cb9dfbfc9629f339fc1574a1c52e6806/future-1.0.0-py3-none-any.whl", hash = "sha256:929292d34f5872e70396626ef385ec22355a1fae8ad29e1a734c3e43f9fbc216", size = 491326, upload-time = "2024-02-21T11:52:35.956Z" },
-]
-
-[[package]]
 name = "lldb-python"
 version = "19.0.0.dev1"
 source = { registry = "https://pypi.org/simple" }
@@ -103,13 +92,15 @@ wheels = [
 
 [[package]]
 name = "miasm"
-version = "0.1.5"
-source = { git = "https://github.com/taugoust/miasm.git?rev=develop#2a15c60712b326b541d42ac48f372f97023547e7" }
+version = "0.1.4"
+source = { directory = "miasm" }
 dependencies = [
-    { name = "future" },
-    { name = "pyparsing" },
+    { name = "setuptools" },
 ]
 
+[package.metadata]
+requires-dist = [{ name = "setuptools" }]
+
 [[package]]
 name = "mypy-extensions"
 version = "1.1.0"
@@ -156,15 +147,6 @@ wheels = [
 ]
 
 [[package]]
-name = "pyparsing"
-version = "3.2.3"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/bb/22/f1129e69d94ffff626bdb5c835506b3a5b4f3d070f17ea295e12c2c6f60f/pyparsing-3.2.3.tar.gz", hash = "sha256:b9c13f1ab8b3b542f72e28f634bad4de758ab3ce4546e4301970ad6fa77c38be", size = 1088608, upload-time = "2025-03-25T05:01:28.114Z" }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/05/e7/df2285f3d08fee213f2d041540fa4fc9ca6c2d44cf36d3a035bf2a8d2bcc/pyparsing-3.2.3-py3-none-any.whl", hash = "sha256:a749938e02d6fd0b59b356ca504a24982314bb090c383e3cf201c95ef7e2bfcf", size = 111120, upload-time = "2025-03-25T05:01:24.908Z" },
-]
-
-[[package]]
 name = "pyright"
 version = "1.1.402"
 source = { registry = "https://pypi.org/simple" }