Merged
Conversation
github-actions
bot
added
10.rebuild-darwin: 11-100
Contributor
Author
|
isabelroses
approved these changes
Mar 16, 2025
isabelroses
added
the
12.approvals: 1
Member
|
This doesn't need to target staging, unless I'm missing something. |
Member
|
Would it be possible for me to add a commit to this PR? I need to update my maintainer info as it's using my old GH username and I don't wanna open a whole other PR for it |
Contributor
Author
I am not sure if there is a canonical way to do this, but I’ll gladly cherry‐pick another commit. |
github-actions
bot
added
the
8.has: maintainer-list (update)
Member
|
Opening a separate PR would likely have been less friction. @kinzokudev is this sufficient? |
wegank
added
the
2.status: merge conflict
Contributor
Author
|
Resolved the merge conflict. |
nixpkgs-ci
bot
removed
the
2.status: merge conflict
nixpkgs-ci
bot
added
the
2.status: merge conflict
Member
|
Could you please rebase again? |
nixpkgs-ci
bot
added
10.rebuild-darwin: 1-10
Member
|
Member
|
All of the failures seem to be caused by flaxlib. |
Member
|
It's caused by line 29 of From 8377d941f0f075987dc1b31703515268baa38011 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 30 Sep 2025 19:32:02 -0400
Subject: [PATCH] python3Packages.flaxlib: fix for tomlq version bump
---
pkgs/development/python-modules/flaxlib/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pkgs/development/python-modules/flaxlib/default.nix b/pkgs/development/python-modules/flaxlib/default.nix
index 2848c216f956..b9bf868d13b1 100644
--- a/pkgs/development/python-modules/flaxlib/default.nix
+++ b/pkgs/development/python-modules/flaxlib/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
postPatch = ''
expected_version="$version"
- actual_version=$(${lib.getExe tomlq} --file pyproject.toml "project.version")
+ actual_version=$(${lib.getExe tomlq} --raw --file pyproject.toml "project.version")
if [ "$actual_version" != "$expected_version" ]; then
echo -e "\n\tERROR:"
--
2.50.1 |
mdaniels5757
requested changes
Sep 30, 2025
Member
mdaniels5757
left a comment
mdaniels5757
left a comment
There was a problem hiding this comment.
In addition to the patch for flaxlib, this needs a release notes entry due to the rename of the binary from tomlq to tq.
nixpkgs-ci
bot
added
6.topic: python
GaetanLepage
reviewed
Oct 1, 2025
pkgs/by-name/to/tomlq/package.nix
Outdated
| cargoHash = "sha256-RkzAYVMycQwcewuP8wDbL06YddapyFhm+57CGOICey0="; | ||
|
|
||
| nativeInstallCheckInputs = [ versionCheckHook ]; | ||
| versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; |
Contributor
There was a problem hiding this comment.
Suggested change
| versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"; |
This is now the default behavior.
GaetanLepage
approved these changes
Oct 1, 2025
Contributor
GaetanLepage
left a comment
GaetanLepage
left a comment
There was a problem hiding this comment.
LGTM. Please squash all the commits into a single one (tomlq: 0.1.6 -> 0.2.2).
nixpkgs-ci
bot
added
12.approvals: 2
Member
|
mdaniels5757
approved these changes
Oct 2, 2025
Member
|
mdaniels5757
approved these changes
Oct 2, 2025
nixpkgs-ci
bot
added
12.approvals: 3+
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
8 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.
finalAttrspatternThings 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.