Skip to content

libdeflate: 1.8 -> 1.17#216181

Merged
mweinelt merged 1 commit intoNixOS:stagingfrom
evils:libdeflate
Feb 15, 2023
Merged

libdeflate: 1.8 -> 1.17#216181
mweinelt merged 1 commit intoNixOS:stagingfrom
evils:libdeflate

Conversation

@evils
Copy link
Member

@evils evils commented Feb 13, 2023 •
edited
Loading

Description of changes

https://github.com/ebiggers/libdeflate/blob/bd925ae68e99f65d69f20181cb845aaba5c8f098/NEWS.md

package update and cleanup to resolve a minor warning in the KiCad build
(not finding libdeflate.pc, which was introduced in 1.9)

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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
    • 18260 packages affected
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 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.

@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Feb 13, 2023
@ajs124 ajs124 requested a review from orivej-nixos February 14, 2023 14:42
@evils
Copy link
Member Author

evils commented Feb 14, 2023

hmm, the current version is from 2021-07-15
that feels like there must be a good reason it was left untouched...

@ajs124
Copy link
Member

ajs124 commented Feb 14, 2023

feels like there must be a good reason it was left untouched

I'd assume the reason was just that nobody got around to updating it and r-ryantm failed.

@evils
libdeflate: 1.8 -> 1.17
3cf92a8 
patch was included in 1.9
which also started exposing a libdeflate.pc
  which is wanted by KiCad

project switched to cmake in 1.15
@dark-ether dark-ether mentioned this pull request Feb 15, 2023
Closed
13 tasks
@mweinelt
Copy link
Member

mweinelt commented Feb 15, 2023 •
edited
Loading

Build tested on aarch64-linux and aarch64-darwin as well as x86_64-linux with musl.

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Feb 15, 2023

@ofborg build nix

SuperSandro2000
SuperSandro2000 approved these changes Feb 15, 2023
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

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

merging soonish when nix is not broken

@mweinelt mweinelt merged commit 08b6dab into NixOS:staging Feb 15, 2023
@mweinelt
Copy link
Member

mweinelt commented Feb 15, 2023

merging soonish when nix is not broken

There is no dependency, nix builds just fine.

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Feb 15, 2023

Oh, that's libarchive. 😅

@bheesham bheesham mentioned this pull request Feb 16, 2023
Closed
12 tasks
@vcunat
Copy link
Member

vcunat commented Feb 18, 2023

It won't build on x86_64-darwin (and did before updating): https://hydra.nixos.org/build/209838214

@vcunat vcunat mentioned this pull request Feb 18, 2023
Merged
6 tasks
@viraptor
Copy link
Contributor

viraptor commented Feb 18, 2023 •
edited
Loading

@vcunat the callPackage for it needs to use darwin.apple_sdk_11_0.callPackage now. It's a trivial fix. I'll do that tomorrow(-ish) unless someone gets there first. (Feel free)

@vcunat
Copy link
Member

vcunat commented Feb 18, 2023

Sounds fast enough to me. Fixes for this should be submitted against the staging-next branch.

@viraptor viraptor mentioned this pull request Feb 19, 2023
Merged
12 tasks
@ajs124 ajs124 mentioned this pull request Feb 23, 2023
Closed
12 tasks
@alex-robbins alex-robbins mentioned this pull request Mar 18, 2023
Closed
This was referenced Mar 22, 2023
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@orivej-nixos orivej-nixos Awaiting requested review from orivej-nixos

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@evils @ajs124 @mweinelt @SuperSandro2000 @vcunat @viraptor