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

rubber: 1.3 -> 1.4 #21565

Merged
merged 1 commit into from Jan 8, 2017
Merged

rubber: 1.3 -> 1.4 #21565

merged 1 commit into from Jan 8, 2017

Conversation

peterhoeg
Copy link
Member

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

@peterhoeg, thanks for your PR! By analyzing the history of the files in this pull request, we identified @ttuegel, @FRidh and @Fuuzetsu to be potential reviewers.

stdenv.mkDerivation rec {
name = "rubber-1.3";
let
pypkgs = python2Packages;
Copy link
Member

Choose a reason for hiding this comment

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

Please use either python2Packages or pythonPackages instead of a custom variable.

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 idea was to avoid having to specify python2Packages 3 times. If we need to move to python 3 at some point, that means changing only one variable.

Copy link
Member

Choose a reason for hiding this comment

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

That would be a simple search & replace. In any case, you can still use the let expression but don't use another name; everywhere pythonPackages is used so stick with it.

};

buildInputs = [ python2Packages.python texinfo ];
nativeBuildInputs = [ python2Packages.wrapPython ];
nativeBuildInputs = [ pypkgs.wrapPython ];
Copy link
Member

Choose a reason for hiding this comment

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

wrapPython is provided by buildPythonApplication

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.

buildInputs = [ python2Packages.python texinfo ];
nativeBuildInputs = [ python2Packages.wrapPython ];
nativeBuildInputs = [ pypkgs.wrapPython ];
propagatedBuildInputs = [ pypkgs.python texinfo ];
Copy link
Member

Choose a reason for hiding this comment

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

python as well

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.

@peterhoeg
Copy link
Member Author

@FRidh, I ripped out the pypkgs variable as requested. I personally think it is less intuitive to use pythonPackages as a local variable, so then we're better off without IMHO.

@Mic92 Mic92 merged commit 5b78b3e into NixOS:master Jan 8, 2017
@Mic92
Copy link
Member

Mic92 commented Jan 8, 2017

Thanks!

@peterhoeg peterhoeg deleted the u/rubber branch January 9, 2017 01:20
@peterhoeg peterhoeg restored the u/rubber branch January 9, 2017 02:23
@peterhoeg peterhoeg deleted the u/rubber branch March 1, 2017 03:13
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

5 participants