rubber: 1.3 -> 1.4 #21565

Merged
merged 1 commit into from Jan 8, 2017

Projects

None yet

5 participants

@peterhoeg
Contributor
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

@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;
@FRidh
FRidh Jan 1, 2017 Member

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

@peterhoeg
peterhoeg Jan 2, 2017 Contributor

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.

@FRidh
FRidh Jan 2, 2017 Member

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 ];
@FRidh
FRidh Jan 1, 2017 Member

wrapPython is provided by buildPythonApplication

@peterhoeg
peterhoeg Jan 2, 2017 Contributor

Removed.

- buildInputs = [ python2Packages.python texinfo ];
- nativeBuildInputs = [ python2Packages.wrapPython ];
+ nativeBuildInputs = [ pypkgs.wrapPython ];
+ propagatedBuildInputs = [ pypkgs.python texinfo ];
@FRidh
FRidh Jan 1, 2017 Member

python as well

@peterhoeg
peterhoeg Jan 2, 2017 Contributor

Removed.

@peterhoeg
Contributor

@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.

@peterhoeg peterhoeg referenced this pull request Jan 2, 2017
Merged

puddletag: get rid of pypkgs variable #21587

0 of 7 tasks complete
@Mic92 Mic92 merged commit 5b78b3e into NixOS:master Jan 8, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@Mic92
Contributor
Mic92 commented Jan 8, 2017

Thanks!

@peterhoeg peterhoeg deleted the peterhoeg:u/rubber branch Jan 9, 2017
@peterhoeg peterhoeg restored the peterhoeg:u/rubber branch Jan 9, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment