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

icu: bugfix #71142 - Fixes icu-config reporting bad location #72869

Merged
merged 1 commit into from Nov 7, 2019

Conversation

@redvers
Copy link
Contributor

redvers commented Nov 6, 2019

Motivation for this change

Copied from issue# 71142:

Describe the bug

While attempting to build some software, I have discovered that icu-config --incpkgdatafile returns the wrong location which causes my downstream build to fail.

To Reproduce
Steps to reproduce the behavior:

[red@apophenia:~/projects/ltfs]$ nix-shell -p icu

[nix-shell:~/projects/ltfs]$ icu-config --incpkgdatafile
/nix/store/vb7zl9wdbmgkkfdkzvklh87lv29mxbds-icu4c-64.2/lib/icu/64.2/pkgdata.inc 

[nix-shell:~/projects/ltfs]$ ls -la /nix/store/vb7zl9wdbmgkkfdkzvklh87lv29mxbds-icu4c-64.2/lib/icu/64.2/pkgdata.inc 
ls: cannot access '/nix/store/vb7zl9wdbmgkkfdkzvklh87lv29mxbds-icu4c-64.2/lib/icu/64.2/pkgdata.inc': No such file or directory

@jtojnar provided a suggested patch which I have now applied and tested. It resolves the issue and doesn't break any downstream packages that I have detected.

Things done

Applied suggested patch and created this PR

  • 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 nix-review --run "nix-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.
Notify maintainers

cc @raskin @jtojnar @shlevy

@7c6f434c

This comment has been minimized.

Copy link
Member

7c6f434c commented Nov 6, 2019

I think it should go to staging

@redvers

This comment has been minimized.

Copy link
Contributor Author

redvers commented Nov 6, 2019

I think it should go to staging

I'm still a little new around these parts, so I'm guessing that means using a different branch other than master?

Which would you like me to set it against?
Also - I guess since we're jumping branches I would need to open a second PR?

So, do that and leave this one in limbo?

@7c6f434c

This comment has been minimized.

Copy link
Member

7c6f434c commented Nov 6, 2019

Staging is the staging branch, this is the branch where large non-time-critical rebuilds get accumulated for some time before forcing a mass rebuild on master. I think GitHub allows you to edit Pull Request and change the target branch.

@jtojnar

This comment has been minimized.

@redvers redvers changed the base branch from master to staging Nov 6, 2019
@redvers

This comment has been minimized.

Copy link
Contributor Author

redvers commented Nov 6, 2019

Staging is the staging branch, this is the branch where large non-time-critical rebuilds get accumulated for some time before forcing a mass rebuild on master. I think GitHub allows you to edit Pull Request and change the target branch.

Done!

@jtojnar
jtojnar approved these changes Nov 6, 2019
Copy link
Contributor

jtojnar left a comment

Hopefully, icu-config will be removed soon but, for now, this will do.

@7c6f434c 7c6f434c merged commit 66488f3 into NixOS:staging Nov 7, 2019
15 checks passed
15 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
icu on aarch64-linux Success
Details
icu on x86_64-linux Success
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.