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

dpkg: 1.20.0 -> 1.20.3 #87755

Open
wants to merge 1 commit into
base: master
from
Open

Conversation

@siriobalmelli
Copy link
Contributor

siriobalmelli commented May 13, 2020

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.
@siriobalmelli
Copy link
Contributor Author

siriobalmelli commented May 18, 2020

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 siriobalmelli-foss:fix/dpkg branch from 893c2b8 to d5268f5 May 23, 2020
@siriobalmelli siriobalmelli force-pushed the siriobalmelli-foss:fix/dpkg branch 2 times, most recently from 311c2c8 to a88d2d5 Jun 1, 2020
@siriobalmelli siriobalmelli force-pushed the siriobalmelli-foss:fix/dpkg branch 2 times, most recently from 7f14db6 to 3f3a2b7 Jun 10, 2020
@siriobalmelli siriobalmelli force-pushed the siriobalmelli-foss:fix/dpkg branch 2 times, most recently from 58aeb83 to 3a2ea9d Jun 18, 2020
@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 siriobalmelli-foss:fix/dpkg branch 2 times, most recently from c5c0767 to b04789b Jun 25, 2020
@siriobalmelli siriobalmelli changed the title dpkg: fix Darwin build dpkg: 1.20.0 -> 1.20.3 Jul 1, 2020
@siriobalmelli
Copy link
Contributor Author

siriobalmelli commented Jul 1, 2020

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.

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
@siriobalmelli siriobalmelli force-pushed the siriobalmelli-foss:fix/dpkg branch from 4aa7d78 to de863d7 Jul 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

1 participant
You can’t perform that action at this time.