From db7a44f4799b44ad8bed73bd08c3ab931291a694 Mon Sep 17 00:00:00 2001
From: Igor Brylyov <movefasta@dezcom.org>
Date: Mon, 22 Apr 2024 15:57:32 +0300
Subject: [PATCH] rbs framework single source

---
 flake.nix                                             | 11 +++++++++--
 .../python-modules/freecad.robossembler/default.nix   |  8 +++-----
 .../python-modules/rcg-pipeline/default.nix           |  8 +++-----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/flake.nix b/flake.nix
index ba62d22..b92fb7d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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
diff --git a/pkgs/development/python-modules/freecad.robossembler/default.nix b/pkgs/development/python-modules/freecad.robossembler/default.nix
index 4033eac..6eff57a 100644
--- a/pkgs/development/python-modules/freecad.robossembler/default.nix
+++ b/pkgs/development/python-modules/freecad.robossembler/default.nix
@@ -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 = [
diff --git a/pkgs/development/python-modules/rcg-pipeline/default.nix b/pkgs/development/python-modules/rcg-pipeline/default.nix
index 3c3de0e..01efd32 100644
--- a/pkgs/development/python-modules/rcg-pipeline/default.nix
+++ b/pkgs/development/python-modules/rcg-pipeline/default.nix
@@ -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 = [