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

dpkg: 1.20.0 -> 1.20.5 #87755

Merged
merged 1 commit into from Jul 20, 2020
Merged

dpkg: 1.20.0 -> 1.20.5 #87755

merged 1 commit into from Jul 20, 2020

Conversation

siriobalmelli
Copy link
Contributor

This patch has also been submitted to
https://lists.debian.org/debian-dpkg/2020/05/threads.html
and is hopefully picked up upstream,
so it can be removed from here in future.

Signed-off-by: Sirio Balmelli sirio@b-ad.ch

Motivation for this change

dpkg build was failing on Darwin, starting with:

i18n.c:27:8: error: unknown type name 'locale_t'
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" ... some Debian package failures because of /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation: file system sandbox blocked stat() on macOS
  • Tested execution of all binary files (usually in ./result/bin/)
  • [N/A] Determined the impact on package closure size (by running nix path-info -S before and after)
  • [N/A] Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 labels May 13, 2020
@siriobalmelli
Copy link
Contributor Author

NOTE: this problem has now been fixed upstream: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=2261027

My understanding is that now there are two alternatives:

  1. point to upstream sources instead of the release
  2. keep the existing patch and remove it once the next upstream release is published

I'm assuming 2.) above, and made a # NOTE comment in the derivation.

Please let me know if that's the preferred approach.

@siriobalmelli siriobalmelli force-pushed the fix/dpkg branch 2 times, most recently from 311c2c8 to a88d2d5 Compare June 8, 2020 13:17
@siriobalmelli siriobalmelli force-pushed the fix/dpkg branch 2 times, most recently from 7f14db6 to 3f3a2b7 Compare June 13, 2020 15:28
@siriobalmelli siriobalmelli force-pushed the fix/dpkg branch 2 times, most recently from 58aeb83 to 3a2ea9d Compare June 20, 2020 14:13
@siriobalmelli siriobalmelli changed the title dpkg: fix build error on Darwin by patching missing dependency on xlocale.h dpkg: fix Darwin build Jun 20, 2020
@siriobalmelli siriobalmelli force-pushed the fix/dpkg branch 2 times, most recently from c5c0767 to b04789b Compare July 1, 2020 14:05
@siriobalmelli siriobalmelli changed the title dpkg: fix Darwin build dpkg: 1.20.0 -> 1.20.3 Jul 1, 2020
@siriobalmelli
Copy link
Contributor Author

NOTE: this problem has now been fixed upstream: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=2261027

My understanding is that now there are two alternatives:

1. point to upstream sources instead of the release

2. keep the existing patch and remove it once the next upstream release is published

I'm assuming 2.) above, and made a # NOTE comment in the derivation.

Please let me know if that's the preferred approach.

Update, this has now made it into a new release, so the pull request is no longer a path but a simple version bump.

@siriobalmelli siriobalmelli force-pushed the fix/dpkg branch 2 times, most recently from 4aa7d78 to de863d7 Compare July 10, 2020 00:20
@siriobalmelli siriobalmelli changed the title dpkg: 1.20.0 -> 1.20.3 dpkg: 1.20.0 -> 1.20.5 Jul 19, 2020
@siriobalmelli
Copy link
Contributor Author

This has been kicking around for 2 months now, and it's just a minor version bump - but it does fix a broken Darwin build.

Any chance of getting this committed, or at least getting some review notes?

Thanks.

@vcunat
Copy link
Member

vcunat commented Jul 20, 2020

@GrahamcOfBorg build dpkg
(to retest that darwin build)

@vcunat vcunat mentioned this pull request Jul 20, 2020
Closed
@siriobalmelli
dpkg: 1.20.0 -> 1.20.5
5a29435 
Fixes broken Darwin build in 1.20.0

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
@siriobalmelli
Copy link
Contributor Author

@vcunat thanks for taking a look and linking this.

I just rebased on top of the latest master and I don't see #92762 in the history, but that pull request is closed.
Not sure why this is or what is desired I do with this one.

Thanks.

@vcunat
Copy link
Member

vcunat commented Jul 20, 2020

It's fine, you don't (didn't) need to do anything. The code in the other PR was just superfluous in addition to your PR, but the r-ryantm bot did some more checks.

Let me just try the darwin build again (I can't find result of the run due to the rebase):
@GrahamcOfBorg build dpkg

vcunat
vcunat approved these changes Jul 20, 2020
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

At a glance I see nothing risky in the changelog.

@vcunat vcunat merged commit eb14ee8 into NixOS:master Jul 20, 2020
@vcunat
Copy link
Member

vcunat commented Jul 20, 2020

Thanks. I'm sorry that this PR has been sitting here for so long. There are just way too many PRs and issues that don't have any maintainer or something like that.

@siriobalmelli
Copy link
Contributor Author

Review and merge appreciated thank you :)

@siriobalmelli siriobalmelli deleted the fix/dpkg branch July 20, 2020 18:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@siriobalmelli @vcunat