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

gnustep.(base|gui): fix icu 68 compatibility #114667

Merged
merged 2 commits into from
Mar 1, 2021

Conversation

ajs124
Copy link
Member

@ajs124 ajs124 commented Feb 28, 2021

Motivation for this change

Doesn't compile on master after #107774 / unicode-org/icu@c3fe7e09d844

We could also stick with icu 67.x instead.

cc @marsam (please tell me if I should stop pinging you on these)

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) (sogo)
  • 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.

@rmcgibbo
Copy link
Contributor

rmcgibbo commented Feb 28, 2021

Here's the result from @r-rmcgibbo, which for some reason crashed while trying to upload the comment


Result of nixpkgs-review pr 114667 at 71c43913 run on x86_64-linux 1

9 packages failed to build:
4 packages built:
1 suggestion:
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/desktops/gnustep/base/default.nix:36:15:

       |
    36 |   patches = [ ./fixup-paths.patch ];
       |               ^
    

@ajs124
Copy link
Member Author

ajs124 commented Feb 28, 2021

oof, looks like other gnustep components also relied on those #defines

@marsam
Copy link
Contributor

marsam commented Mar 1, 2021

please continue pinging me on all the icu 68 related issues :)

@ajs124 ajs124 changed the title gnustep.base: fix icu 68 compatibility gnustep.(base|gui): fix icu 68 compatibility Mar 1, 2021
Copy link
Contributor

@marsam marsam left a comment

Choose a reason for hiding this comment

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

Thank you!

@marsam marsam merged commit 32548b0 into NixOS:master Mar 1, 2021
@ajs124 ajs124 deleted the fix/gnustep-base branch March 1, 2021 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants