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

jupyter_server: Patch unicode test for Darwin #145993

Merged
merged 1 commit into from
Nov 15, 2021

Conversation

toonn
Copy link
Contributor

@toonn toonn commented Nov 14, 2021

Motivation for this change

The test relies on creating and then reading files with unicode names
to/from disk. Apple's HFS+, the default file system until recently, is
unicode-normalizing with normal form D (NFD). So not all unicode file
names round-trip. This patch implements one imperfect solution.

ZHF: #144627

I've opened a PR to implement this upstream to see if they're ok with this solution or would prefer an alternative but I haven't received a response yet. If upstream ends up deciding on a different solution I will update this PR or open a new one.

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
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 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.

The test relies on creating and then reading files with unicode names
to/from disk. Apple's HFS+, the default file system until recently, is
unicode-normalizing with normal form D (NFD). So not all unicode file
names round-trip. This patch implements one imperfect solution.

ZHF: NixOS#144627
@toonn
Copy link
Contributor Author

toonn commented Nov 14, 2021

Nixpkgs-review:

6 packages failed to build:
python38Packages.jupyterlab python38Packages.jupytext python38Packages.nbclassic python39Packages.jupyterlab python39Packages.jupytext python39Packages.nbclassic

10 packages built:
python38Packages.jupyter-server-mathjax python38Packages.jupyter_server python38Packages.jupyterlab-git python38Packages.jupyterlab_server python38Packages.nbdime python39Packages.jupyter-server-mathjax python39Packages.jupyter_server python39Packages.jupyterlab-git python39Packages.jupyterlab_server python39Packages.nbdime

@veprbl
Copy link
Member

veprbl commented Nov 14, 2021

@GrahamcOfBorg build python3Packages.jupyter_server

Copy link
Member

@veprbl veprbl left a comment

Choose a reason for hiding this comment

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

Makes sense

@nrdxp
Copy link
Contributor

nrdxp commented Nov 15, 2021

cc @NixOS/darwin-maintainers

@veprbl veprbl merged commit 9e7f498 into NixOS:master Nov 15, 2021
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