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.

Sign up for GitHub

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

Dependencies for realms-wiki #21873

Merged
merged 14 commits into from Jan 19, 2017
Merged

Dependencies for realms-wiki #21873

merged 14 commits into from Jan 19, 2017

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Jan 14, 2017

Motivation for this change
Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@Mic92, thanks for your PR! By analyzing the history of the files in this pull request, we identified @FRidh to be a potential reviewer.

@Mic92
Copy link
Member Author

Mic92 commented Jan 14, 2017 •
edited

I will put all packages into separate files.

@Mic92 Mic92 force-pushed the python-packages branch 4 times, most recently from 38661ab to 4cc68d7 Compare January 14, 2017 21:52
@Mic92
Copy link
Member Author

Mic92 commented Jan 15, 2017 •
edited

@FRidh I also move out packages out of python-packages.nix here. Can you take a look at some packages and tell me whether you agree on the way I pull in python dependencies into the scope into external packages.

FRidh
FRidh requested changes Jan 15, 2017
View reviewed changes
Copy link
Member

@FRidh FRidh left a comment

Choose a reason for hiding this comment

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

Thanks for moving out those packages Just one more change is needed. Aside from that it looks good to me!

pkgs/development/python-modules/dulwich.nix
@@ -0,0 +1,26 @@
{ stdenv, buildPythonPackage, fetchurl
, pkgs, gevent, geventhttpclient, mock, fastimport }:
Copy link
Member

Choose a reason for hiding this comment

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

not the package set pkgs but individual packages

Copy link
Member Author

Choose a reason for hiding this comment

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

How can I avoid shadowing of packages from pkgs by python packages with the same name in this case?

Copy link
Member

Choose a reason for hiding this comment

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

You can explicitly pass the package to callPackage, e.g. inherit (pkgs) git;,

Copy link
Member Author

Choose a reason for hiding this comment

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

the reasoning behind passing individual packages is to make it easier to overwrite them?

@globin
Copy link
Member

globin commented Jan 18, 2017

@FRidh is specifying python packages in seperate files the prefered syle now?

@FRidh
Copy link
Member

FRidh commented Jan 18, 2017

The file is getting way too big, and the history is also not useful, so yes.

@Mic92 Mic92 merged commit 805e680 into NixOS:master Jan 19, 2017
@Mic92 Mic92 deleted the python-packages branch January 19, 2017 11:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FRidh FRidh FRidh requested changes

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) 8.has: package (update)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Mic92 @mention-bot @globin @FRidh