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

pythonefl: 1.20.0 -> 1.21.0 #45668

Merged
merged 3 commits into from Aug 29, 2018
Merged

pythonefl: 1.20.0 -> 1.21.0 #45668

merged 3 commits into from Aug 29, 2018

Conversation

romildo
Copy link
Contributor

@romildo romildo commented Aug 27, 2018

Motivation for this change

Update to version 1.21.0

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@romildo romildo requested a review from FRidh as a code owner August 27, 2018 10:07
@@ -15649,10 +15649,10 @@ EOF
# Should be bumped along with EFL!
pythonefl = buildPythonPackage rec {
Copy link
Member

Choose a reason for hiding this comment

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

We are moving Python expressions out of pkgs/top-level/python-packages.nix into pkgs/development/python-modules/<module>/default.nix.

Please move the expression there, and call it from pkgs/top-level/python-packages.nix using callPackage ../development/python-modules/<package> { };.

Copy link
Member

Choose a reason for hiding this comment

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

@FRidh a bot for this message would be nice :)

Copy link
Member

Choose a reason for hiding this comment

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

maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx ];
};
};
pythonefl = callPackage ../development/python-modules/python-efl { };
Copy link
Member

Choose a reason for hiding this comment

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

You forgot to add the file itself.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

In fact. Added it now.

- Move out of pkgs/top-level/python-packages.nix into
pkgs/development/python-modules/python-efl/default.nix.

- Add dependency on dbus-python.

- Remove hardeningDisable.

- Update some meta attributes.
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
'';

preBuild = "${python}/bin/${python.executable} setup.py build_ext";
Copy link
Member

Choose a reason for hiding this comment

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

Use ${python.interpreter}.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.


preBuild = "${python}/bin/${python.executable} setup.py build_ext";

installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out";
Copy link
Member

Choose a reason for hiding this comment

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

Is this phase not the default?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Is this phase not the default?

I do not think so, because without it most of the files are not installed. It was already present in prior versions of the nix expression.

@Mic92 Mic92 merged commit ff449e1 into NixOS:master Aug 29, 2018
@romildo romildo deleted the upd.python-efl branch August 29, 2018 10:07
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.

None yet

4 participants