Skip to content

Comments

[25.05] nix-tree: 0.6.1 -> 0.6.3#426475

Merged
wolfgangwalther merged 1 commit intoNixOS:release-25.05from
wamserma:bump-nixtree-stable
Jul 19, 2025
Merged

[25.05] nix-tree: 0.6.1 -> 0.6.3#426475
wolfgangwalther merged 1 commit intoNixOS:release-25.05from
wamserma:bump-nixtree-stable

Conversation

@wamserma
Copy link
Member

selective manual backport of version bump

hand picked new version/hash from haskell package update in #413046

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 others READMEs.

Add a 👍 reaction to pull requests you find important.

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Please follow the backporting guidelines and cherry-pick with the -x flag.
This requires changes to the unstable master and staging branches first, before backporting them.

Occasionally, it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts or when updating minor versions of packages which have already advanced to the next major on unstable.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Couldn't locate original commit hash in message of 9c836aefe36cb6a63df69da7e3d0f5f29c0dd8a8.

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

@nixpkgs-ci nixpkgs-ci bot added 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: haskell General-purpose, statically typed, purely functional programming language 4.workflow: backport This targets a stable branch labels Jul 18, 2025
@nix-owners nix-owners bot requested a review from utdemir July 18, 2025 20:15
Copy link
Member

@utdemir utdemir left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I appreciate your work - and sorry for being late to release which caused all these!

However - I'm not involved with nixpkgs Haskell Team, so I do not know about their view of updating (auto-generated) hackage-packages.nix by hand. So I'm unable to approve/reject the PR.

@wamserma
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 426475


aarch64-linux

✅ 1 package built:
  • nix-tree

@sternenseemann
Copy link
Member

Please use https://github.com/NixOS/nixpkgs/blob/nixos-25.05/pkgs/development/haskell-modules/replacements-by-name/README.md, see e.g. #364210. You can easily generate the necessary package expression using cabal2nix.

Copy link
Member

@sternenseemann sternenseemann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sternenseemann sternenseemann dismissed github-actions[bot]’s stale review July 19, 2025 10:17

Haskell backports can't be facilitated by cherry-picking commits from master.

@wamserma wamserma force-pushed the bump-nixtree-stable branch from 9c836ae to 20fbdc6 Compare July 19, 2025 10:32
@wamserma wamserma requested a review from sternenseemann July 19, 2025 10:33
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Please follow the backporting guidelines and cherry-pick with the -x flag.
This requires changes to the unstable master and staging branches first, before backporting them.

Occasionally, it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts or when updating minor versions of packages which have already advanced to the next major on unstable.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Couldn't locate original commit hash in message of 20fbdc60e0c04345788ca24b739ea6a9f4a5822f.

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

@sternenseemann sternenseemann dismissed github-actions[bot]’s stale review July 19, 2025 10:36

Haskell updates can't be cherry-picked individually.

@sternenseemann
Copy link
Member

The commit message shouldn't have the [Backport …] prefix. Other than that LGTM.

@wamserma wamserma force-pushed the bump-nixtree-stable branch from 20fbdc6 to 4b7d727 Compare July 19, 2025 10:40
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Please follow the backporting guidelines and cherry-pick with the -x flag.
This requires changes to the unstable master and staging branches first, before backporting them.

Occasionally, it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts or when updating minor versions of packages which have already advanced to the next major on unstable.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Couldn't locate original commit hash in message of 4e91eee.

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

@wamserma
Copy link
Member Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 426475


aarch64-linux

✅ 1 package built:
  • nix-tree

@wamserma wamserma changed the title [Backport release-25.05] nix-tree: 0.6.1 -> 0.6.3 [25.05] nix-tree: 0.6.1 -> 0.6.3 Jul 19, 2025
@sternenseemann
Copy link
Member

I meant that there shouldn't be a prefix in brackets at all. Commit message format guideline is the same for all branches.

selective manual backport of version bump

hand picked new version/hash from haskell package update in
NixOS#413046
@wamserma wamserma force-pushed the bump-nixtree-stable branch from 4b7d727 to 4e91eee Compare July 19, 2025 14:27
@wamserma
Copy link
Member Author

I meant that there shouldn't be a prefix in brackets at all. Commit message format guideline is the same for all branches.

Oh my. Sorry for keeping you busy with this. Should be fine now.

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 19, 2025
@wolfgangwalther
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 426475
Commit: 4e91eee2a8f32335cc04c4c0211b40b96b1083e4


x86_64-linux

✅ 3 packages built:
  • haskellPackages.nix-tree
  • haskellPackages.nix-tree.doc
  • nix-tree

aarch64-linux

✅ 3 packages built:
  • haskellPackages.nix-tree
  • haskellPackages.nix-tree.doc
  • nix-tree

x86_64-darwin

✅ 3 packages built:
  • haskellPackages.nix-tree
  • haskellPackages.nix-tree.doc
  • nix-tree

aarch64-darwin

✅ 3 packages built:
  • haskellPackages.nix-tree
  • haskellPackages.nix-tree.doc
  • nix-tree

@wolfgangwalther
Copy link
Contributor

@sternenseemann to avoid so many repeated reviews requesting changes by CI, you can dismiss the review shortly before merge. When a not-dismissed-yet review is still there, this will only be updated and a new one will not be created.

@wolfgangwalther wolfgangwalther merged commit 4975018 into NixOS:release-25.05 Jul 19, 2025
24 of 28 checks passed
@wamserma wamserma deleted the bump-nixtree-stable branch July 19, 2025 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 6.topic: haskell General-purpose, statically typed, purely functional programming language 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. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants