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

Jump to bottom

python3Minimal: 3.7.4 -> 3.7.5 #73824

Merged
merged 1 commit into from Nov 21, 2019
Merged

python3Minimal: 3.7.4 -> 3.7.5 #73824

merged 1 commit into from Nov 21, 2019

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Nov 20, 2019

Base it on python37 so we ensure the package remains up to date.

Motivation for this change
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 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 @

@FRidh
Copy link
Member Author

FRidh commented Nov 20, 2019

@adisbladis @flokli given you've added it, maybe you should add yourselves as maintainer.

@FRidh
python3Minimal: 3.7.4 -> 3.7.5
1bfd011 
Base it on python37 so we ensure the package remains up to date.
@FRidh FRidh merged commit ad3ef64 into NixOS:master Nov 21, 2019
@flokli
Copy link
Contributor

flokli commented Nov 21, 2019

Urgh - this was not python3.override on purpose (from 99e6ca2):

    We can't just use python3.override, as things like
    python3Minimal.withPackages would pass the wrong python derivation into
    these modules.

@FRidh
Copy link
Member Author

FRidh commented Nov 21, 2019

That's why there is a self = python3Minimal;.

@flokli
Copy link
Contributor

flokli commented Nov 21, 2019 •
edited

I still end up with the non-minimal python in the runtime closure:

⇒  du -sh $(nix-store -qR $(nix-build -E "with import <nixpkgs> {}; python3Minimal.withPackages(ps: with ps; [ pystemd ])" -I nixpkgs=$PWD))
29M	/nix/store/xlxiw4rnxx2dksa91fizjzf7jb5nqghc-glibc-2.27
1.4M	/nix/store/b34zjdmq5l8k6rwdykjx55yl9r9isl8k-bash-4.4-p23
64K	/nix/store/5h4mz4l2y4d7p7z2cp0l6d8d5mck7i32-libffi-3.2.1
140K	/nix/store/8wanm00dzn5vlajz1rznbf6dbj8931d6-zlib-1.2.11
316K	/nix/store/dvi67hzkwbq94aa9flqd5qz3n7wf6ip0-expat-2.2.8
356K	/nix/store/l9d2ycm68b007la6aag0qhxlwrdi3hsj-xz-5.2.4
92K	/nix/store/ndgvwzxcf05cg2xfa4443zvz8x9jmirc-bzip2-1.0.6.0.1
23M	/nix/store/gfqc6gjrnw5aha6ba72gpmnzf8y2lx3w-python3-minimal-3.7.5
36K	/nix/store/i8rfylg7gcn29wk9lm4ff8fmdwch6srn-libcap-2.27-lib
748K	/nix/store/fvlkiwdl891w2gimrax1q7jj04zfcbgr-libgpg-error-1.36
1.3M	/nix/store/pg89pi9h91bvqs9mnwm3r8hiapjylig9-libgcrypt-1.8.5
520K	/nix/store/wi4jj6psx4cicii33xc15x2xsxz01j9j-lz4-1.9.1
1.8M	/nix/store/9n9s7vm8d55vwly1l6mjjq27rvlgfp6i-systemd-243-lib
1.3M	/nix/store/bwc7rjzl4iy409vbb6b3gcqbpdgrn7mh-sqlite-3.30.0
4.0M	/nix/store/d86czzx6rlm7la0xi6h6chy78wy755wk-openssl-1.1.1d
728K	/nix/store/smlb4hfh7wha17shddqzl2r2wkf5xjl9-gdbm-1.18.1
12M	/nix/store/yfpiz0n3dykir9r2skbxlvcard9xp275-ncurses-6.1-20190112
408K	/nix/store/z31ch0hlb5bdb4s61lwfq0sw41d7v1h3-readline-6.3p08
66M	/nix/store/drr8qcgiccfc5by09r5zc30flgwh1mbx-python3-3.7.5
700K	/nix/store/hnbhb531rb3dlx9ffkzlkf7r4w8crixj-python3.7-pystemd-0.6.0
884K	/nix/store/4idmcca3l0l4yxhja4rhbm2g4xqwdkmb-python3-minimal-3.7.5-env

nix why-depends --all /nix/store/4idmcca3l0l4yxhja4rhbm2g4xqwdkmb-python3-minimal-3.7.5-env /nix/store/drr8qcgiccfc5by09r5zc30flgwh1mbx-python3-3.7.5 | cat
/nix/store/4idmcca3l0l4yxhja4rhbm2g4xqwdkmb-python3-minimal-3.7.5-env
╚═══lib/python3.7/site-packages/pystemd -> /nix/store/hnbhb531rb3dlx9ffkzlkf7r4w8crixj-python3.7-pystemd-0.6.0/lib/python3.7/site-packages/pystemd
    lib/python3.7/site-packages/pystemd-0.6.0.dist-info -> /nix/store/hnbhb531rb3dlx9ffkzlkf7r4w8crixj-python3.7-pystemd-0.6.0/lib/python3.7/site-packages/pystemd-0.6.0.dist-info
    => /nix/store/hnbhb531rb3dlx9ffkzlkf7r4w8crixj-python3.7-pystemd-0.6.0
    ╚═══lib/python3.7/site-packages/pystemd/daemon.cpython-37m-x86_64-linux-gnu.so: …LIBC_2.2.5.GLIBC_2.4./nix/store/drr8qcgiccfc5by09r5zc30flgwh1mbx-python3-3.7.5/lib:/nix/store/9n…
        lib/python3.7/site-packages/pystemd/dbusexc.cpython-37m-x86_64-linux-gnu.so: …LIBC_2.2.5.GLIBC_2.4./nix/store/drr8qcgiccfc5by09r5zc30flgwh1mbx-python3-3.7.5/lib:/nix/store/9n…
        lib/python3.7/site-packages/pystemd/dbuslib.cpython-37m-x86_64-linux-gnu.so: …D_237.LIBSYSTEMD_221./nix/store/drr8qcgiccfc5by09r5zc30flgwh1mbx-python3-3.7.5/lib:/nix/store/9n…
        => /nix/store/drr8qcgiccfc5by09r5zc30flgwh1mbx-python3-3.7.5

@flokli
Copy link
Contributor

flokli commented Nov 21, 2019

@FRidh does this somehow make sense to you? Otherwise, I'd suggest to revert back to (callPackage ./cpython, as in #66762 - maybe while doing a bump to 3.7.5 (and adding a comment on why it's the way it currently is).

@FRidh FRidh deleted the python3Minimal branch November 21, 2019 20:47
@FRidh
Copy link
Member Author

FRidh commented Nov 21, 2019

fixed with 1939a97

@flokli
Copy link
Contributor

flokli commented Nov 22, 2019 •
edited

Thanks a lot ❤️

lopsided98
lopsided98 reviewed Dec 1, 2019
View reviewed changes
pkgs/development/interpreters/python/default.nix
@@ -46,7 +46,7 @@ with pkgs;
inherit hasDistutilsCxxPatch pythonForBuild;
};

in {
in rec {
Copy link
Contributor

Choose a reason for hiding this comment

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

Why was this rec added? It doesn't seem to be necessary and breaks overriding/adding packages in the Python package set in an overlay using packageOverrides. The overrides do not end up applied to python3Packages.python.pkgs.

Copy link
Contributor

Choose a reason for hiding this comment

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

cc @FRidh

Copy link
Member Author

Choose a reason for hiding this comment

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

removed rec in 92d2153. If overriding is broken, show it with an example.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks, that fixes it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lopsided98 lopsided98 lopsided98 left review comments

@adisbladis adisbladis Awaiting requested review from adisbladis

@flokli flokli Awaiting requested review from flokli

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 501+ 10.rebuild-darwin: 2501-5000 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@FRidh @flokli @lopsided98