Skip to content

python3Packages.pyroaring: 1.0.2 -> 1.0.3#450330

Merged
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
shymega:shymega/bump-pyroaring
Nov 12, 2025
Merged

python3Packages.pyroaring: 1.0.2 -> 1.0.3#450330
SuperSandro2000 merged 1 commit intoNixOS:masterfrom
shymega:shymega/bump-pyroaring

Conversation

@shymega
Copy link
Member

@shymega shymega commented Oct 9, 2025

Bump pyroaring to v1.0.3, and revert c92de0a., as pyroaring v1.0.3 fixes the need for that commit.

pyroaring changelog:

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@shymega shymega force-pushed the shymega/bump-pyroaring branch from 873114b to aa25b52 Compare October 9, 2025 15:24
@nixpkgs-ci nixpkgs-ci bot added 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 6.topic: python Python is a high-level, general-purpose programming language. 9.needs: reviewer This PR currently has no reviewers requested and needs attention. and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Oct 9, 2025
@shymega shymega force-pushed the shymega/bump-pyroaring branch from aa25b52 to a021303 Compare October 15, 2025 20:06
@Sigmanificient
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 450330
Commit: a021303aec78df794943c2b41ccd3b189ceeac04 (subsequent changes)
Merge: 00d72235d1b1cfb2509366070cb6a567c5bc8537

Logs: https://github.com/Sigmanificient/nixpkgs-review-gha/actions/runs/18546249729


x86_64-linux

✅ 10 packages built:
  • buildstream
  • buildstream.dist
  • python312Packages.pyiceberg
  • python312Packages.pyiceberg.dist
  • python312Packages.pyroaring
  • python312Packages.pyroaring.dist
  • python313Packages.pyiceberg
  • python313Packages.pyiceberg.dist
  • python313Packages.pyroaring
  • python313Packages.pyroaring.dist

aarch64-linux

✅ 10 packages built:
  • buildstream
  • buildstream.dist
  • python312Packages.pyiceberg
  • python312Packages.pyiceberg.dist
  • python312Packages.pyroaring
  • python312Packages.pyroaring.dist
  • python313Packages.pyiceberg
  • python313Packages.pyiceberg.dist
  • python313Packages.pyroaring
  • python313Packages.pyroaring.dist

x86_64-darwin (sandbox = true)

✅ 4 packages built:
  • python312Packages.pyroaring
  • python312Packages.pyroaring.dist
  • python313Packages.pyroaring
  • python313Packages.pyroaring.dist

aarch64-darwin (sandbox = true)

❌ 2 packages failed to build:
  • python312Packages.pyiceberg
  • python312Packages.pyiceberg.dist
✅ 6 packages built:
  • python312Packages.pyroaring
  • python312Packages.pyroaring.dist
  • python313Packages.pyiceberg
  • python313Packages.pyiceberg.dist
  • python313Packages.pyroaring
  • python313Packages.pyroaring.dist

Error logs: `aarch64-darwin`
python312Packages.pyiceberg
ERROR tests/catalog/test_glue.py::test_drop_namespace - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_drop_non_empty_namespace - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_drop_namespace_that_contains_non_iceberg_tables - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_drop_non_exist_namespace - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_load_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_load_non_exist_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_update_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_load_empty_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_load_default_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_update_namespace_properties_overlap_update_removal - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_commit_table_update_schema - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_commit_table_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_commit_append_table_snapshot_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_commit_overwrite_table_snapshot_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_create_table_transaction[1] - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_create_table_transaction[2] - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_table_exists - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_register_table_with_given_location - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_glue_endpoint_override - OSError: [Errno 48] Address already in use
========= 2890 passed, 4 skipped, 102 deselected, 80 errors in 31.17s ==========

@shymega shymega force-pushed the shymega/bump-pyroaring branch from a021303 to 807cf9a Compare October 16, 2025 16:10
@shymega shymega force-pushed the shymega/bump-pyroaring branch from 807cf9a to 33fd07f Compare November 4, 2025 22:56
@mdaniels5757
Copy link
Member

Re-running CI due to a since-fixed unrelated treefmt-nix failure

@mdaniels5757 mdaniels5757 reopened this Nov 5, 2025
@shymega shymega force-pushed the shymega/bump-pyroaring branch 2 times, most recently from 381fd53 to a6d2b37 Compare November 5, 2025 16:31
@Sigmanificient
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 450330
Commit: a6d2b377972be6d92183c19b43b11ecc1d06f8a8 (subsequent changes)
Merge: 33e8623cf8def1cde5d96f7189285da2be5ebc5d

Logs: https://github.com/Sigmanificient/nixpkgs-review-gha/actions/runs/19214702882


x86_64-linux

❌ 2 packages failed to build:
  • buildstream
  • buildstream.dist
✅ 8 packages built:
  • python312Packages.pyiceberg
  • python312Packages.pyiceberg.dist
  • python312Packages.pyroaring
  • python312Packages.pyroaring.dist
  • python313Packages.pyiceberg
  • python313Packages.pyiceberg.dist
  • python313Packages.pyroaring
  • python313Packages.pyroaring.dist

Error logs: `x86_64-linux`
buildstream
FAILED tests/frontend/completions.py::test_argument_element[project-bst build com-2-expected1-None] - AssertionError: assert [] == ['compose-all...ude-bin.bst ']
FAILED tests/frontend/completions.py::test_argument_element[project-bst show -2-expected2-files] - AssertionError: assert [] == ['compose-all...'target.bst ']
FAILED tests/frontend/completions.py::test_argument_element[project-bst build com-2-expected3-files] - AssertionError: assert [] == ['compose-all...ude-bin.bst ']
FAILED tests/frontend/completions.py::test_argument_element[project-bst --directory ../ show -4-expected4-files] - AssertionError: assert [] == ['compose-all...'target.bst ']
FAILED tests/frontend/completions.py::test_argument_element[project-bst --directory ../ build com-4-expected5-files] - AssertionError: assert [] == ['compose-all...ude-bin.bst ']
FAILED tests/frontend/completions.py::test_argument_element[project-bst --directory ../ artifact checkout t -5-expected6-files] - AssertionError: assert [] == ['target.bst ']
FAILED tests/frontend/completions.py::test_argument_element[project-bst --directory ../ artifact checkout --directory -6-expected7-files] - AssertionError: assert [] == ['bin-files/', 'dev-files/']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst show -2-expected8-None] - AssertionError: assert [] == ['compose-all...ev.bst ', ...]
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst build com-2-expected9-None] - AssertionError: assert [] == ['compose-all...ude-bin.bst ']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst show -2-expected10-files] - AssertionError: assert [] == ['compose-all...ev.bst ', ...]
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst build com-2-expected11-files] - AssertionError: assert [] == ['compose-all...ude-bin.bst ']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst --directory ../ show -4-expected12-files] - AssertionError: assert [] == ['compose-all...ev.bst ', ...]
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst --directory ../ show f-4-expected13-files] - AssertionError: assert [] == ['files/']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst --directory ../ show files/-4-expected14-files] - AssertionError: assert [] == ['files/bin-f...s/dev-files/']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst --directory ../ build com-4-expected15-files] - AssertionError: assert [] == ['compose-all...ude-bin.bst ']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst --directory ../ artifact checkout t -5-expected16-files] - AssertionError: assert [] == ['target.bst ']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst --directory ../ artifact checkout --directory -6-expected17-files] - AssertionError: assert [] == ['bin-files/', 'dev-files/']
FAILED tests/frontend/completions.py::test_argument_element[sub-folders-bst show base-2-expected18-None] - AssertionError: assert [] == ['base/wanted.bst ']
FAILED tests/frontend/completions.py::test_argument_element[sub-folders-bst show base/-2-expected19-None] - AssertionError: assert [] == ['base/wanted.bst ']
= 50 failed, 1387 passed, 237 skipped, 32 xfailed, 3933 warnings in 277.19s (0:04:37) =

aarch64-linux

❌ 2 packages failed to build:
  • buildstream
  • buildstream.dist
✅ 8 packages built:
  • python312Packages.pyiceberg
  • python312Packages.pyiceberg.dist
  • python312Packages.pyroaring
  • python312Packages.pyroaring.dist
  • python313Packages.pyiceberg
  • python313Packages.pyiceberg.dist
  • python313Packages.pyroaring
  • python313Packages.pyroaring.dist

Error logs: `aarch64-linux`
buildstream
FAILED tests/frontend/completions.py::test_argument_element[project-bst build com-2-expected1-None] - AssertionError: assert [] == ['compose-all...ude-bin.bst ']
FAILED tests/frontend/completions.py::test_argument_element[project-bst show -2-expected2-files] - AssertionError: assert [] == ['compose-all...'target.bst ']
FAILED tests/frontend/completions.py::test_argument_element[project-bst build com-2-expected3-files] - AssertionError: assert [] == ['compose-all...ude-bin.bst ']
FAILED tests/frontend/completions.py::test_argument_element[project-bst --directory ../ show -4-expected4-files] - AssertionError: assert [] == ['compose-all...'target.bst ']
FAILED tests/frontend/completions.py::test_argument_element[project-bst --directory ../ build com-4-expected5-files] - AssertionError: assert [] == ['compose-all...ude-bin.bst ']
FAILED tests/frontend/completions.py::test_argument_element[project-bst --directory ../ artifact checkout t -5-expected6-files] - AssertionError: assert [] == ['target.bst ']
FAILED tests/frontend/completions.py::test_argument_element[project-bst --directory ../ artifact checkout --directory -6-expected7-files] - AssertionError: assert [] == ['bin-files/', 'dev-files/']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst show -2-expected8-None] - AssertionError: assert [] == ['compose-all...ev.bst ', ...]
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst build com-2-expected9-None] - AssertionError: assert [] == ['compose-all...ude-bin.bst ']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst show -2-expected10-files] - AssertionError: assert [] == ['compose-all...ev.bst ', ...]
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst build com-2-expected11-files] - AssertionError: assert [] == ['compose-all...ude-bin.bst ']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst --directory ../ show -4-expected12-files] - AssertionError: assert [] == ['compose-all...ev.bst ', ...]
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst --directory ../ show f-4-expected13-files] - AssertionError: assert [] == ['files/']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst --directory ../ show files/-4-expected14-files] - AssertionError: assert [] == ['files/bin-f...s/dev-files/']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst --directory ../ build com-4-expected15-files] - AssertionError: assert [] == ['compose-all...ude-bin.bst ']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst --directory ../ artifact checkout t -5-expected16-files] - AssertionError: assert [] == ['target.bst ']
FAILED tests/frontend/completions.py::test_argument_element[no-element-path-bst --directory ../ artifact checkout --directory -6-expected17-files] - AssertionError: assert [] == ['bin-files/', 'dev-files/']
FAILED tests/frontend/completions.py::test_argument_element[sub-folders-bst show base-2-expected18-None] - AssertionError: assert [] == ['base/wanted.bst ']
FAILED tests/frontend/completions.py::test_argument_element[sub-folders-bst show base/-2-expected19-None] - AssertionError: assert [] == ['base/wanted.bst ']
= 50 failed, 1386 passed, 238 skipped, 32 xfailed, 3933 warnings in 246.55s (0:04:06) =

x86_64-darwin (sandbox = true)

✅ 4 packages built:
  • python312Packages.pyroaring
  • python312Packages.pyroaring.dist
  • python313Packages.pyroaring
  • python313Packages.pyroaring.dist

aarch64-darwin (sandbox = true)

❌ 2 packages failed to build:
  • python312Packages.pyiceberg
  • python312Packages.pyiceberg.dist
✅ 6 packages built:
  • python312Packages.pyroaring
  • python312Packages.pyroaring.dist
  • python313Packages.pyiceberg
  • python313Packages.pyiceberg.dist
  • python313Packages.pyroaring
  • python313Packages.pyroaring.dist

Error logs: `aarch64-darwin`
python312Packages.pyiceberg
ERROR tests/catalog/test_glue.py::test_drop_namespace - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_drop_non_empty_namespace - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_drop_namespace_that_contains_non_iceberg_tables - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_drop_non_exist_namespace - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_load_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_load_non_exist_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_update_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_load_empty_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_load_default_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_update_namespace_properties_overlap_update_removal - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_commit_table_update_schema - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_commit_table_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_commit_append_table_snapshot_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_commit_overwrite_table_snapshot_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_create_table_transaction[1] - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_create_table_transaction[2] - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_table_exists - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_register_table_with_given_location - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_glue_endpoint_override - OSError: [Errno 48] Address already in use
========= 2890 passed, 4 skipped, 102 deselected, 80 errors in 28.86s ==========

@shymega
Copy link
Member Author

shymega commented Nov 10, 2025

@Sigmanificient This PR will fail until #450036 is merged.

@eyJhb
Copy link
Member

eyJhb commented Nov 12, 2025

@shymega if you want to include the changelog, can you then link TO the changelog instead in the future? Right now you're pinging and tagging issues/PRs, which doesn't make any sense.

@SuperSandro2000
Copy link
Member

and revert c92de0a., as pyroaring v1.0.3 fixes the need for that commit.

This is not technically a revert as we use it in nixpkgs. 😅 The change itself is and was good but it is being removed as part of the upgrade. I squashed the commits together.

@SuperSandro2000 SuperSandro2000 changed the title pyroaring: 1.0.2 -> 1.0.3 python3Packages.pyroaring: 1.0.2 -> 1.0.3 Nov 12, 2025
@SuperSandroBot
Copy link

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 450330
Commit: a0d07454dfd46d18524261e0879d449482f517ab (subsequent changes)
Merge: 10e66c66dd692b779af29335e18396f6ab54c9f4

Logs: https://github.com/SuperSandro2000/nixpkgs-review-gha/actions/runs/19300795812


x86_64-linux

✅ 10 packages built:
  • buildstream
  • buildstream.dist
  • python312Packages.pyiceberg
  • python312Packages.pyiceberg.dist
  • python312Packages.pyroaring
  • python312Packages.pyroaring.dist
  • python313Packages.pyiceberg
  • python313Packages.pyiceberg.dist
  • python313Packages.pyroaring
  • python313Packages.pyroaring.dist

aarch64-linux

✅ 10 packages built:
  • buildstream
  • buildstream.dist
  • python312Packages.pyiceberg
  • python312Packages.pyiceberg.dist
  • python312Packages.pyroaring
  • python312Packages.pyroaring.dist
  • python313Packages.pyiceberg
  • python313Packages.pyiceberg.dist
  • python313Packages.pyroaring
  • python313Packages.pyroaring.dist

x86_64-darwin (sandbox = relaxed)

✅ 4 packages built:
  • python312Packages.pyroaring
  • python312Packages.pyroaring.dist
  • python313Packages.pyroaring
  • python313Packages.pyroaring.dist

aarch64-darwin (sandbox = relaxed)

❌ 2 packages failed to build:
  • python312Packages.pyiceberg
  • python312Packages.pyiceberg.dist
✅ 6 packages built:
  • python312Packages.pyroaring
  • python312Packages.pyroaring.dist
  • python313Packages.pyiceberg
  • python313Packages.pyiceberg.dist
  • python313Packages.pyroaring
  • python313Packages.pyroaring.dist

Error logs: `aarch64-darwin`
python312Packages.pyiceberg
ERROR tests/catalog/test_glue.py::test_drop_namespace - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_drop_non_empty_namespace - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_drop_namespace_that_contains_non_iceberg_tables - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_drop_non_exist_namespace - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_load_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_load_non_exist_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_update_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_load_empty_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_load_default_namespace_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_update_namespace_properties_overlap_update_removal - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_commit_table_update_schema - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_commit_table_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_commit_append_table_snapshot_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_commit_overwrite_table_snapshot_properties - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_create_table_transaction[1] - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_create_table_transaction[2] - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_table_exists - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_register_table_with_given_location - OSError: [Errno 48] Address already in use
ERROR tests/catalog/test_glue.py::test_glue_endpoint_override - OSError: [Errno 48] Address already in use
========= 2890 passed, 4 skipped, 102 deselected, 80 errors in 35.90s ==========

@SuperSandro2000 SuperSandro2000 added this pull request to the merge queue Nov 12, 2025
Merged via the queue into NixOS:master with commit 1665234 Nov 12, 2025
27 of 30 checks passed
@shymega
Copy link
Member Author

shymega commented Nov 12, 2025

@shymega if you want to include the changelog, can you then link TO the changelog instead in the future? Right now you're pinging and tagging issues/PRs, which doesn't make any sense.

@eyJhb Noted, apologies for this. Can I suggest this is explicit in the template for PRs, to avoid any further occurrences? I could submit a PR for that, if that works.

@shymega
Copy link
Member Author

shymega commented Nov 12, 2025

and revert c92de0a., as pyroaring v1.0.3 fixes the need for that commit.

This is not technically a revert as we use it in nixpkgs. 😅 The change itself is and was good but it is being removed as part of the upgrade. I squashed the commits together.

@SuperSandro2000 Thanks :)

@shymega shymega deleted the shymega/bump-pyroaring branch November 12, 2025 17:30
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Nov 12, 2025

Backport failed for release-25.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-25.05
git worktree add -d .worktree/backport-450330-to-release-25.05 origin/release-25.05
cd .worktree/backport-450330-to-release-25.05
git switch --create backport-450330-to-release-25.05
git cherry-pick -x a0d07454dfd46d18524261e0879d449482f517ab

@shymega
Copy link
Member Author

shymega commented Nov 12, 2025

Backport failed for release-25.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-25.05
git worktree add -d .worktree/backport-450330-to-release-25.05 origin/release-25.05
cd .worktree/backport-450330-to-release-25.05
git switch --create backport-450330-to-release-25.05
git cherry-pick -x a0d07454dfd46d18524261e0879d449482f517ab

Hm. Never seen this before. How would one deal with an issue like this - would I have to defer to a Nixpkgs committer?

@mdaniels5757
Copy link
Member

It's because 25.05 is on 1.0.0 currently, so there's a merge conflict. The solution is to cherry-pick the upgrades that happened in between, then the new one. I'll do so, and then a committer can merge it.

(The alternate way, which would allow a maintainer to merge it if this package was in pkgs/by-name, would be to apply the backport release-25.05 label to the oldest unbackported update, merge that, and then repeat. But that's not worth the trouble here, because a committer would need to merge anyways.)

@mdaniels5757 mdaniels5757 added 8.has: port to stable This PR already has a backport to the stable release. and removed backport release-25.05 labels Nov 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: port to stable This PR already has a backport to the stable release. 9.needs: reviewer This PR currently has no reviewers requested and needs attention. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants