rbs framework single source

This commit is contained in:
Igor Brylyov 2024-04-22 15:57:32 +03:00
parent 7aa811cb0b
commit db7a44f479
3 changed files with 15 additions and 12 deletions

View file

@ -22,6 +22,13 @@
# pkgs = nixpkgs.legacyPackages.${system}.extend overlay;
ros = ros-flake.legacyPackages.${system};
# single source for Robossembler Framework packages
rbsFrameworkSrc = pkgs.fetchgit {
url = "https://gitlab.com/robossembler/framework";
hash = "sha256-K6vnCQn129TWiMEKe81eBx/1H6PaIriCnkHGRwL8fg0=";
rev = "e8bb59124d56c5aee0180b4c7d5c7bfeec9cb1ea";
};
pkgs = import nixpkgs { inherit system; overlays = [ overlay gazebo.overlays.default ]; };
overlay = final: prev: {
@ -129,8 +136,8 @@
ansitable = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/ansitable { };
megapose6d = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/megapose6d { inherit webdataset; };
spatialmath = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/spatialmath { inherit ansitable; };
rcg-pipeline = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/rcg-pipeline { bpy = bpy-lib; };
rbs-workbench = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/freecad.robossembler { inherit freecad-py; };
rcg-pipeline = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/rcg-pipeline { bpy = bpy-lib; inherit rbsFrameworkSrc; };
rbs-workbench = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/freecad.robossembler { inherit freecad-py; inherit rbsFrameworkSrc; };
freecad-py = pkgs.python3Packages.toPythonModule (pkgs.callPackage ./pkgs/misc/freecad-lib { });
bpy-lib = pkgs.python3Packages.toPythonModule bpy;
in

View file

@ -10,6 +10,7 @@
, pytestCheckHook
, toPythonModule
, python
, rbsFrameworkSrc
, ... }:
buildPythonPackage rec {
@ -17,11 +18,8 @@ buildPythonPackage rec {
version = "1.0.0";
format = "setuptools";
src = fetchgit {
url = "https://gitlab.com/robossembler/framework";
hash = "sha256-K6vnCQn129TWiMEKe81eBx/1H6PaIriCnkHGRwL8fg0=";
rev = "e8bb59124d56c5aee0180b4c7d5c7bfeec9cb1ea";
};
src = rbsFrameworkSrc;
sourceRoot = "${src.name}/freecad_workbench";
nativeBuildInputs = [

View file

@ -9,6 +9,7 @@
, numpy
, setuptools
, bpy
, rbsFrameworkSrc
, ... }:
buildPythonPackage rec {
@ -16,11 +17,8 @@ buildPythonPackage rec {
version = "1.0.0";
format = "pyproject";
src = fetchgit {
url = "https://gitlab.com/robossembler/framework";
hash = "sha256-N9xFVU4+GbuRR5saMkK7GjKPqKjk2LjcTFWqVhhJ0bs=";
rev = "946e83fd159f9ed234b70923df657bc5120cc62f";
};
src = rbsFrameworkSrc;
sourceRoot = "${src.name}/rcg_pipeline";
nativeBuildInputs = [