update srcs

This commit is contained in:
Игорь Брылёв 2024-12-01 17:31:27 +03:00
parent 5bbbc458b1
commit 77d7e86ac0
22 changed files with 62 additions and 52 deletions

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_python";

17
flake.lock generated
View file

@ -24,17 +24,18 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1732998835,
"lastModified": 1733001380,
"narHash": "sha256-d5elFO/gqbuvst0Ost2yOmApb3BpgFtNK5t+QtlrKX4=",
"ref": "refs/heads/gz-version-fix",
"rev": "8277a937e9326b6842bd9d942245f58975672372",
"revCount": 1091,
"type": "git",
"url": "file:///home/movefasta/Documents/robossembler/nix-ros-overlay"
"owner": "lopsided98",
"repo": "nix-ros-overlay",
"rev": "518d764262aafc6e18abc1f7f4facf41cf24b072",
"type": "github"
},
"original": {
"type": "git",
"url": "file:///home/movefasta/Documents/robossembler/nix-ros-overlay"
"owner": "lopsided98",
"ref": "develop",
"repo": "nix-ros-overlay",
"type": "github"
}
},
"nixpkgs": {

View file

@ -18,11 +18,21 @@
# Apply the overlay to multiple ROS distributions
rosPackages = applyDistroOverlay (import ./overlay.nix) super.rosPackages;
};
pythonOverlay = self: super: {
pythonPackagesExtensions = super.pythonPackagesExtensions ++ [
(
python-final: python-prev: {
rbs-assets-library = self.python3Packages.callPackage ./rbs-assets-library.nix { };
}
)
];
};
pkgs = import nixpkgs {
inherit system;
overlays = [
nix-ros-overlay.overlays.default
rosDistroOverlays
pythonOverlay
];
config.permittedInsecurePackages = [
"freeimage-unstable-2021-11-01"
@ -36,13 +46,13 @@
packages = builtins.intersectAttrs (import ./overlay.nix null null) pkgs.rosPackages.${rosDistro};
checks = builtins.intersectAttrs (import ./overlay.nix null null) pkgs.rosPackages.${rosDistro};
devShells.default = pkgs.mkShell {
name = "Example project";
name = "Robossembler ROS 2 Runtime";
shellHook = ''
unset QT_QPA_PLATFORM
'';
packages = [
pkgs.colcon
(pkgs.python3.withPackages (p: with p; [ dacite scipy ]))
(pkgs.python3.withPackages (p: with p; [ dacite scipy loguru rbs-assets-library ]))
# ... other non-ROS packages
(with pkgs.rosPackages.${rosDistro}; buildEnv {
paths = [

View file

@ -7,8 +7,8 @@ buildRosPackage rec {
src = fetchFromGitHub {
owner = "solid-sinusoid";
repo = "rbs-arm";
rev = "bc13ea275cffdaa062d225bf3934918a6dbaafb3";
sha256 = "0f3j8vlshq19qkcxy7fiv9ij3zz70k5lhn4y4184zfr4czdkpmf0";
rev = "a39c474dcdef2a13af3056165a3ed29be9f4e173";
hash = "sha256-c/umjcDzXd63tZ0mttPMmhQFSXPPkmEIDe6SF4E9Fag=";
};
buildType = "ament_cmake";

View file

@ -8,15 +8,14 @@
buildPythonPackage rec {
pname = "rbs-assets-library";
version = "0.2.0";
version = "unstable-2024-12-01";
pyproject = true;
src = fetchFromGitHub {
owner = "solid-sinusoid";
repo = "rbs_assets_library";
rev = "16d3f6d750a8c903532f4bde22bbe41ebd35ec5c";
hash = "";
fetchLFS = true;
hash = "sha256-0JrOp0xbJc/cZdy7Ho53mSI5HmwVmPDvDJOx+Wu6nIg=";
};
build-system = [
@ -31,7 +30,7 @@ buildPythonPackage rec {
meta = {
description = "";
homepage = "https://github.com/solid-sinusoid/rbs_assets_library";
license = lib.licenses.unfree; # FIXME: nix-init did not find a license
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ ];
};
}

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_python";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_python";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_cmake";

View file

@ -6,8 +6,8 @@ buildRosPackage rec {
src = fetchgit {
url = "https://gitlab.com/robossembler/robossembler-ros2";
rev = "72415c155ce1a410250b48a773d33545d6cb4e78";
sha256 = "sha256-ZCAPrdObbfdmZ0Oq2Nx+7CIBeXGUZnRqKbsYW+1iwYo=";
rev = "b83a68f77724d83e1a0a014ffb4da4ef42ec3a42";
sha256 = "sha256-UdshWzp+WAThBieQPIqNgpy48bLO/+FEEX/higgMJH8=";
};
buildType = "ament_python";

View file

@ -7,8 +7,8 @@ buildRosPackage rec {
src = fetchFromGitHub {
owner = "solid-sinusoid";
repo = "robot-builder";
rev = "5f02b5868047767df2ab8f4bc026fe40a420e94d";
sha256 = "08wi1lk584r6nm9j169rg7d944wp167xk5aw0x5b1smbqnsgcdq5";
rev = "4995d978e9702e6c344ee214aa93caba6fcbb730";
hash = "sha256-qhBD8ee+cotL/J4Q4I9lOgaecnCBVxoUobKGsyeMFiU=";
};
buildType = "ament_python";