Skip to content

cld2: fix for CMake 4#449403

Merged
Sigmanificient merged 1 commit intoNixOS:masterfrom
jshholland:fix-cdl2
Oct 7, 2025
Merged

cld2: fix for CMake 4#449403
Sigmanificient merged 1 commit intoNixOS:masterfrom
jshholland:fix-cdl2

Conversation

@jshholland
Copy link
Contributor

@jshholland jshholland commented Oct 7, 2025 •
edited
Loading

Update patch adding CMake files from Debian, and add a new patch to
fix C++0x compatibility. Another option would be to pass -std=c++98 -
I'm not sure which would be preferred.

Related: #445447 #449383

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.

@jshholland
cld2: fix build with CMake 4
5238a8a 
Import an updated patch from Debian to update the
cmake_minimum_version to 3.10.  Also add the patch from upstream to
fix the build with C++0x.

Fixes: NixOS#449383
Related: NixOS#445447
@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. labels Oct 7, 2025
@nix-owners nix-owners bot requested a review from chvp October 7, 2025 08:20
@Sigmanificient
Copy link
Member

Sigmanificient commented Oct 7, 2025

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 449403
Commit: 5238a8ac8ea3f9b135b8dca9955f6e9a5e7038be (subsequent changes)
Merge: 1b9fa2d0927f28ace119a43b435a66e757646c88

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

x86_64-linux

✅ 4 packages built:
  • cld2
  • lbdb
  • mu
  • mu.mu4e

aarch64-linux

✅ 4 packages built:
  • cld2
  • lbdb
  • mu
  • mu.mu4e

x86_64-darwin (sandbox = true)

❌ 3 packages failed to build:
  • lbdb
  • mu
  • mu.mu4e
✅ 1 package built:
  • cld2
Error logs: `x86_64-darwin`
mu 
[47/47] 🌒 test-cmd-move                           92s
[47/47] 🌓 test-cmd-move                           93s
[47/47] 🌔 test-cmd-move                           94s
[47/47] 🌕 test-cmd-move                           95s
[47/47] 🌖 test-cmd-move                           96s
[47/47] 🌗 test-cmd-move                           97s
[47/47] 🌘 test-cmd-move                           98s
[47/47] 🌑 test-cmd-move                           99s
[47/47] 🌒 test-cmd-move                           100s
[47/47] 🌓 test-cmd-move                           101s
47/47 test-cmd-move                 OK             101.95s

Summary of Failures:


35/47 test-store            FAIL           84.25s   killed by signal 6 SIGABRT


Ok:                46

Fail:              1


Full log written to /nix/build/nix-10754-2039617041/source/build/meson-logs/testlog.txt

aarch64-darwin (sandbox = true)

✅ 4 packages built:
  • cld2
  • lbdb
  • mu
  • mu.mu4e

@Sigmanificient Sigmanificient added this pull request to the merge queue Oct 7, 2025
Merged via the queue into NixOS:master with commit ee1e851 Oct 7, 2025
29 of 33 checks passed
@jshholland jshholland deleted the fix-cdl2 branch October 7, 2025 11:50
@collares collares mentioned this pull request Oct 7, 2025
Closed
13 tasks
This was referenced Oct 7, 2025
Closed
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@chvp chvp Awaiting requested review from chvp

Assignees

No one assigned

Labels

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@jshholland @Sigmanificient