robossembler/nix-overlay
7
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity Actions

Обновление flake'а

Browse source
This commit is contained in:
movefasta 2023-03-21 17:49:17 +03:00
parent f940b067f4
commit 19f2f696e1
No known key found for this signature in database
GPG key ID: 74C6469794E996AD
2 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
flake.lock generated
View file

@ -75,16 +75,16 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1678246785, "lastModified": 1678455318,
"narHash": "sha256-ma+ToZZddLpGed7pPBfG0CFYjP66QU/m0Yn4JM1Ezl4=", "narHash": "sha256-CGO1l4UMkBRaUE2uCVWjtNGD5MaCWlEPU4eZGMRl8dQ=",
"owner": "lopsided98", "owner": "lopsided98",
"repo": "nix-ros-overlay", "repo": "nix-ros-overlay",
"rev": "155fc6ac233c64eb9fa07a1a81d6c6726441271c", "rev": "da01dd9a2be0001c193acf1aa25b0e2b1fe9d060",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "lopsided98", "owner": "lopsided98",
"ref": "staging", "ref": "nix-bot-nueuxlFifM",
"repo": "nix-ros-overlay", "repo": "nix-ros-overlay",
"type": "github" "type": "github"
} }

21
flake.nix
View file

@ -3,7 +3,7 @@
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/22.11"; nixpkgs.url = "github:NixOS/nixpkgs/22.11";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
ros-flake.url = "github:lopsided98/nix-ros-overlay?ref=staging"; ros-flake.url = "github:lopsided98/nix-ros-overlay?ref=nix-bot-nueuxlFifM";
}; };
outputs = { self, nixpkgs, ros-flake, flake-utils }: outputs = { self, nixpkgs, ros-flake, flake-utils }:
@ -26,7 +26,11 @@
mayo = pkgs.libsForQt5.callPackage ./pkgs/misc/mayo { }; mayo = pkgs.libsForQt5.callPackage ./pkgs/misc/mayo { };
darknet = pkgs.callPackage ./pkgs/misc/darknet { }; darknet = pkgs.callPackage ./pkgs/misc/darknet { };
fstl = pkgs.libsForQt5.callPackage ./pkgs/misc/fstl { }; fstl = pkgs.libsForQt5.callPackage ./pkgs/misc/fstl { };
open3d = pkgs.callPackage ./open3d.nix { };
unified-planning = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/unified-planning { }; unified-planning = pkgs.python3Packages.callPackage ./pkgs/development/python-modules/unified-planning { };
tamer = pkgs.python3Packages.callPackage ./tamer.nix { };
blenderproc = pkgs.python3Packages.callPackage ./blenderproc.nix { };
slic3r = pkgs.callPackage ./pkgs/misc/slic3r { };
in in
{ {
inherit pkgs; inherit pkgs;
@ -39,7 +43,7 @@
}; };
packages = { packages = {
inherit mayo blender bpy pysdf fstl darknet; inherit mayo blender bpy pysdf fstl darknet unified-planning slic3r;
gazebo = ros.humble.gazebo; gazebo = ros.humble.gazebo;
}; };
@ -68,12 +72,13 @@
ament-flake8 ament-flake8
tf2-ros tf2-ros
rclcpp rclcpp
gazebo-ros2-control
moveit-core moveit-core
moveit-msgs moveit-msgs
moveit-ros-planning moveit-ros-planning
moveit-ros-planning-interface moveit-ros-planning-interface
gazebo # gazebo
# gazebo-ros2-control
plansys2-bringup
# rbs-skill-interfaces # rbs-skill-interfaces
]) ++ (with pkgs; [ nlohmann_json ]); ]) ++ (with pkgs; [ nlohmann_json ]);
RMW_IMPLEMENTATION = "rmw_fastrtps_dynamic_cpp"; RMW_IMPLEMENTATION = "rmw_fastrtps_dynamic_cpp";
@ -84,13 +89,7 @@
devShells.blender = pkgs.mkShell { packages = [ blender ]; }; devShells.blender = pkgs.mkShell { packages = [ blender ]; };
devShells.up = devShells.up =
let let
my-python-packages = p: with p; [ my-python-packages = p: with p; [ unified-planning ];
# python-gitlab
# jinja2
# unified-planning
# tamer
blenderproc
];
in in
pkgs.mkShell { pkgs.mkShell {
packages = [ (pkgs.python3.withPackages my-python-packages) ]; packages = [ (pkgs.python3.withPackages my-python-packages) ];