Merge branch 'framework-packages'

flake.nix

@@ -44,7 +44,7 @@
           };
 
           packages = {
-            inherit (pkgs) cad-gen cg-gen blender;
+            inherit (pkgs) cad-gen cg-gen blender dataset-gen pddl-spec-gen;
           };
 
           inherit ros pkgs;

pkgs/default.nix

@@ -8,6 +8,12 @@ self: super: with self.lib; let
     rev = "69b8512d6b5dafe0571b5d73a910a26bbc6a84a5";
   };
 
+  pddlSpecGeneratorSrc = self.fetchgit {
+    url = "https://gitlab.com/robossembler/pddl-spec-generator";
+    hash = "sha256-g/yaaIHRJriPwvVr2pVytQZmJG/BYvsg4q64yEps0T8=";
+    rev = "61dcd1553365436f13107f395d1ee7e7b012c3e6";
+  };
+  
   bpy = self.blender.overrideAttrs (old: {
     pname = "bpy";
     src = self.fetchurl {
@@ -108,4 +114,8 @@ in {
     import sys
     rcg_full_pipeline(sys.argv[1])
     '';
+
+  pddl-spec-gen = pddlSpecGeneratorSrc;
+  dataset-gen = rbsFrameworkSrc;
+
 }