Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

spooles: fix compiler errors and link properly; fix darwin build #270901

Merged
merged 1 commit into from Dec 1, 2023
Merged

spooles: fix compiler errors and link properly; fix darwin build #270901

merged 1 commit into from Dec 1, 2023

Conversation

ghost
Copy link

@ghost ghost commented Nov 29, 2023

fix a few format string errors and use the proper type, 0, not NULL, to specify zero as a function parameter. after the fixes, the calculix program, which links to libspooles, runs on darwin (and produces valid output).

testing: ran some of the calculix examples linked off of http://www.dhondt.de/ and verified that the output matches the references output on both x64 linux and x64 darwin

ZHF: #265948
https://hydra.nixos.org/build/241160456

Result of nixpkgs-review pr 270901 run on x86_64-linux 1

2 packages built:
  • calculix
  • spooles

Result of nixpkgs-review pr 270901 run on x86_64-darwin 1

2 packages built:
  • calculix
  • spooles

Description of changes

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/)
  • 23.11 Release Notes (or backporting 23.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.

Priorities

Add a 👍 reaction to pull requests you find important.

@ghost ghost added 0.kind: ZHF Fixes Fixes during the ZHF campaign backport release-23.11 labels Nov 29, 2023
@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Nov 29, 2023
@ofborg ofborg bot requested a review from gebner November 29, 2023 14:07
fix a few format string errors and use the proper type, 0, not NULL,
to specify zero as a function parameter.
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/3017

Copy link
Contributor

@risicle risicle left a comment

Choose a reason for hiding this comment

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

WFM, nixpkgs-review happy, macos 12 x86_64. pkgsi686Linux, pkgsMusl variant build. Builds, aarch64-linux.

@risicle risicle merged commit af8e4dc into NixOS:master Dec 1, 2023
22 checks passed
Copy link
Contributor

github-actions bot commented Dec 1, 2023

Successfully created backport PR for release-23.11:

@ghost ghost deleted the spooles branch December 1, 2023 23:03
@ghost
Copy link
Author

ghost commented Dec 1, 2023

thanks for all the ZHF reviews!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0.kind: ZHF Fixes Fixes during the ZHF campaign 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants