Skip to content

lomiri.trust-store: Fix compatibility with glog 0.7.x, pin Boost to 1.86#375363

Merged
OPNA2608 merged 1 commit intoNixOS:masterfrom
OPNA2608:fix/trust-store-glog-boost187
Jan 22, 2025
Merged

lomiri.trust-store: Fix compatibility with glog 0.7.x, pin Boost to 1.86#375363
OPNA2608 merged 1 commit intoNixOS:masterfrom
OPNA2608:fix/trust-store-glog-boost187

Conversation

@OPNA2608
Copy link
Contributor

Glog issue was mentioned in #371915 (comment).

Additionally, Boost 1.87 dropped some legacy code which dbus-cpp's headers depend on, so pin to boost186: https://gitlab.com/ubports/development/core/lib-cpp/dbus-cpp/-/issues/8

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@OPNA2608 OPNA2608 force-pushed the fix/trust-store-glog-boost187 branch from 025ea59 to 110716d Compare January 20, 2025 19:20
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 20, 2025
@OPNA2608
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 375363


x86_64-linux

✅ 9 packages built:
  • lomiri.lomiri
  • lomiri.lomiri-session
  • lomiri.lomiri-system-settings
  • lomiri.lomiri-system-settings-unwrapped
  • lomiri.lomiri-system-settings-unwrapped.dev
  • lomiri.trust-store
  • lomiri.trust-store.bin
  • lomiri.trust-store.dev
  • lomiri.trust-store.doc

Tests need #375365 for all their dependencies to build, but a recent test driver change is breaking any OCR in them. Reverting that change makes all of them pass, debugging the OCR stuff separately.

@OPNA2608 OPNA2608 merged commit eac5f2c into NixOS:master Jan 22, 2025
23 of 25 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any 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.

1 participant