Skip to content

Commit

Permalink
Merge pull request #632 from coal-library/nix-coal
Browse files Browse the repository at this point in the history
Update hpp-fcl -> coal in nix flake
  • Loading branch information
jorisv authored Nov 25, 2024
2 parents a12b65f + 11f2b30 commit 7103469
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 17 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed
- Remove CMake CMP0167 warnings ([#630](https://github.com/coal-library/coal/pull/630))
- Allow to run test in the build directory on Windows ([#630](https://github.com/coal-library/coal/pull/630))
- Updated nix flake from `hpp-fcl` to `coal` ([#632](https://github.com/coal-library/coal/pull/632)

### Added
- Add Pixi support ([#629](https://github.com/coal-library/coal/pull/629))
Expand Down
25 changes: 13 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 6 additions & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

inputs = {
flake-parts.url = "github:hercules-ci/flake-parts";
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# use gepetto fork until https://github.com/NixOS/nixpkgs/pull/337549
nixpkgs.url = "github:gepetto/nixpkgs";
# TODO: switch back to nixos-unstable after
# https://github.com/NixOS/nixpkgs/pull/357705
nixpkgs.url = "github:NixOS/nixpkgs/refs/pull/357705/head";
};

outputs =
Expand All @@ -21,13 +21,14 @@
};
devShells.default = pkgs.mkShell { inputsFrom = [ self'.packages.default ]; };
packages = {
default = self'.packages.hpp-fcl;
hpp-fcl = pkgs.python3Packages.hpp-fcl.overrideAttrs (_: {
default = self'.packages.coal;
coal = pkgs.python3Packages.coal.overrideAttrs (_: {
src = pkgs.lib.fileset.toSource {
root = ./.;
fileset = pkgs.lib.fileset.unions [
./CMakeLists.txt
./doc
./hpp-fclConfig.cmake
./include
./package.xml
./python
Expand Down

0 comments on commit 7103469

Please sign in to comment.