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

Jump to bottom

libcbor: unstable-2019-07-25 -> 0.8.0 #99021

Merged
merged 1 commit into from Oct 22, 2020
Merged

libcbor: unstable-2019-07-25 -> 0.8.0 #99021

merged 1 commit into from Oct 22, 2020

Conversation

prusnak
Copy link
Member

@prusnak prusnak commented Sep 28, 2020 •
edited

Motivation for this change

version update to the latest stable release

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

FRidh
FRidh reviewed Oct 20, 2020
View reviewed changes
pkgs/development/libraries/libcbor/default.nix Outdated
@@ -1,14 +1,17 @@
{ stdenv, fetchFromGitHub, cmake, cmocka }:
Copy link
Member

Choose a reason for hiding this comment

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

Please don't change style; people have different preferences and unless there is a clear improvement it is just noise.

(I personally don't consider this an improvement unless the final }: is on a separate line as well, as that makes it easier when resolving merge conflicts.)

Copy link
Member Author

Choose a reason for hiding this comment

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

Reverted the style changes in 33c65031f1f807763059b85588245d5eb9174a52

jtojnar
jtojnar requested changes Oct 22, 2020
View reviewed changes
Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

As per the changelog, we need -DBUILD_SHARED_LIBS=on in cmakeFlags. Also it looks like we no longer need to disable lto since 0.7.0.

@jtojnar
Copy link
Contributor

jtojnar commented Oct 22, 2020

I also opened PJK/libcbor#164 which will allow us to drop the CMAKE_INSTALL_LIBDIR flag and split the package to multiple outputs.

@prusnak
Copy link
Member Author

prusnak commented Oct 22, 2020 •
edited

As per the changelog, we need -DBUILD_SHARED_LIBS=on in cmakeFlags. Also it looks like we no longer need to disable lto since 0.7.0.

Addresed in e8ba9cd

@jtojnar jtojnar merged commit a21e252 into NixOS:staging Oct 22, 2020
@jtojnar
Copy link
Contributor

jtojnar commented Oct 22, 2020

Thanks.

@jtojnar jtojnar added the 8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. label Oct 22, 2020
@prusnak prusnak deleted the libcbor branch October 22, 2020 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh left review comments

@jtojnar jtojnar jtojnar approved these changes

@dtzWill dtzWill Awaiting requested review from dtzWill

Assignees
No one assigned
Labels
8.has: upstream changes reviewed Reviewer checked the changelogs/commit logs associated with the release and did not find any issues. 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@prusnak @jtojnar @FRidh