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

pythonManylinuxPackages: add libz and expat #196802

Merged
merged 1 commit into from
Jul 2, 2023
Merged

Conversation

jneem
Copy link
Contributor

@jneem jneem commented Oct 19, 2022

Description of changes

Adds two libs to the pythonManylinuxPackages collection. These libs aren't mentioned in PEP 513, but auditwheel allows them (pypa/auditwheel#152) and so built wheels may depend on them.

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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@jneem jneem requested a review from FRidh as a code owner October 19, 2022 19:40
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels Oct 19, 2022
@Janik-Haag Janik-Haag added the 12. first-time contribution This PR is the author's first one; please be gentle! label Jun 12, 2023
Copy link
Member

@Janik-Haag Janik-Haag left a comment

Choose a reason for hiding this comment

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

LGTM

@Janik-Haag
Copy link
Member

Result of nixpkgs-review pr 196802 run on x86_64-linux 1

Copy link
Member

@Janik-Haag Janik-Haag left a comment

Choose a reason for hiding this comment

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

the diff looks fine but the build throws errors:

nix-build -A pythonManylinuxPackages                            
error:
       … while calling the 'foldl'' builtin

         at /home/janik/Projects/nixos/nixpkgs/pkgs/development/interpreters/python/manylinux/default.nix:78:16:

           77|   # Additionally, add `autoPatchelfHook` to `nativeBuildInputs`.
           78|   manylinux1 = lib.unique (lib.attrValues manylinux1Libs);
             |                ^
           79|   manylinux2010 = lib.unique (lib.attrValues manylinux2010Libs);

       … while evaluating a branch condition

         at /home/janik/Projects/nixos/nixpkgs/lib/lists.nix:646:28:

          645|    */
          646|   unique = foldl' (acc: e: if elem e acc then acc else acc ++ [ e ]) [];
             |                            ^
          647|

       (stack trace truncated; use '--show-trace' to show the full trace)

       error: undefined variable 'libz'

       at /home/janik/Projects/nixos/nixpkgs/pkgs/development/interpreters/python/manylinux/default.nix:59:19:

           58|     "libglib-2.0.so.0" = glib;
           59|     "libz.so.1" = libz;
             |                   ^
           60|     "libexpat.so.1" = expat;
``` :/

These libs aren't mentioned in PEP 513, but auditwheel allows them
(pypa/auditwheel#152) and so built wheels
may depend on them.
@jneem
Copy link
Contributor Author

jneem commented Jul 2, 2023

Thanks for checking, and sorry for the mistake. (I could have sworn I ran nix-build -A pythonManylinuxPackages already!)

Anyway, it should be better now.

@Janik-Haag
Copy link
Member

Thanks for your contribution and sorry that It took so long until someone reviewed it /:
I will merge this since PR runs successfully and the package builts fine locally.

@Janik-Haag Janik-Haag merged commit 7939b3d into NixOS:master Jul 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: python 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux 12. first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants