Merged
Conversation
github-actions
bot
added
10.rebuild-darwin: 1
drupol
reviewed
Apr 21, 2025
drupol
requested changes
Apr 22, 2025
drupol
reviewed
Apr 22, 2025
Contributor
drupol
left a comment
drupol
left a comment
There was a problem hiding this comment.
Diff LGTM, I'll wait for another reviewer to have a look at this before merging.
Contributor
|
I just made a review, why are you again requesting a review from me? |
Contributor
Author
According to github you have requested a change and therefore merging is blocked. Is this a technical error or do you still want changes? |
drupol
reviewed
Apr 23, 2025
Contributor
drupol
left a comment
drupol
left a comment
There was a problem hiding this comment.
What worries me in this PR is that it might not be picked up for automatic update by the bot because the version attribute is set to 4.1.1, while the tags on the repository have a different pattern.
I don't really know what's best to do here, this is the reason why I'd like someone else to have a look.
Contributor
|
Here's a diff fixing the issue and remove the extra dependency to ruby which seems to be not needed. diff --git a/pkgs/by-name/gz/gz-cmake/package.nix b/pkgs/by-name/gz/gz-cmake/package.nix
index ad8654503d..094ecfc2ab 100644
--- a/pkgs/by-name/gz/gz-cmake/package.nix
+++ b/pkgs/by-name/gz/gz-cmake/package.nix
@@ -4,21 +4,21 @@
fetchFromGitHub,
cmake,
pkg-config,
- ruby,
doxygen,
graphviz,
}:
let
- version = "4.1.1";
- tag_version = "${lib.versions.major version}_${version}";
+ tag = "gz-cmake4_4.1.1";
+ version = lib.head (lib.tail (lib.splitString "_" tag));
in
stdenv.mkDerivation (finalAttrs: {
pname = "gz-cmake";
version = version;
+
src = fetchFromGitHub {
owner = "gazebosim";
repo = "gz-cmake";
- tag = "gz-cmake${tag_version}";
+ inherit tag;
hash = "sha256-BWgRm+3UW65Cu7TqXtFFG05JlYF52dbpAsIE8aDnJM0=";
};
@@ -29,10 +29,6 @@
graphviz
];
- buildInputs = [
- ruby
- ];
-
cmakeFlags = [
"-DBUILD_TESTING=OFF"
];
@@ -40,7 +36,7 @@
meta = {
description = "CMake modules to build Gazebo projects";
homepage = "https://github.com/gazebosim/gz-cmake";
- changelog = "https://github.com/gazebosim/gz-cmake/releases/tag/gz-cmake${tag_version}";
+ changelog = "https://github.com/gazebosim/gz-cmake/releases/tag/${tag}";
license = lib.licenses.asl20;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ guelakais ]; |
Guelakais
force-pushed
the
gz_cmake
branch
2 times, most recently
from
268fd69 to
2cefab3
Compare
Contributor
Author
done |
Contributor
|
Contributor
|
drupol
approved these changes
Apr 23, 2025
Contributor
|
After asking on Matrix about this and being wrong on how the tag/version should be handled, I merged it. Thanks ! |
Contributor
Author
|
Now comes the hard part: packaging ament_cmake! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.