Merge branch 'framework-packages'
This commit is contained in:
commit
fe3998501d
2 changed files with 11 additions and 1 deletions
|
@ -44,7 +44,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
packages = {
|
packages = {
|
||||||
inherit (pkgs) cad-gen cg-gen blender;
|
inherit (pkgs) cad-gen cg-gen blender dataset-gen pddl-spec-gen;
|
||||||
};
|
};
|
||||||
|
|
||||||
inherit ros pkgs;
|
inherit ros pkgs;
|
||||||
|
|
|
@ -7,6 +7,12 @@ self: super: with self.lib; let
|
||||||
hash = "sha256-q1032Lu2xnMWZkr+T0rLhbpdmceDHygHC6BN3AKbFVk=";
|
hash = "sha256-q1032Lu2xnMWZkr+T0rLhbpdmceDHygHC6BN3AKbFVk=";
|
||||||
rev = "69b8512d6b5dafe0571b5d73a910a26bbc6a84a5";
|
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: {
|
bpy = self.blender.overrideAttrs (old: {
|
||||||
pname = "bpy";
|
pname = "bpy";
|
||||||
|
@ -108,4 +114,8 @@ in {
|
||||||
import sys
|
import sys
|
||||||
rcg_full_pipeline(sys.argv[1])
|
rcg_full_pipeline(sys.argv[1])
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
pddl-spec-gen = pddlSpecGeneratorSrc;
|
||||||
|
dataset-gen = rbsFrameworkSrc;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue