Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4d566c39b030
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1a24f2c7387f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 7, 2019

  1. pythonPackages.wrf-python: Fix build (#56989) 

    The latest changes to support better cross-compilation compatibility
have introduced a stricter handling of dependency specification in
python. Since b4acd97, gfortran should be put into nativeBuildInputs,
as it's a build-time only dependency for wrf-python. Similarly, mock is
only required when testing, so it should go to checkInputs.

(cherry picked from commit 36f5c0d)
    @knedlsepp
    knedlsepp authored and Robert Schütz committed Mar 7, 2019
    Copy the full SHA
    1a24f2c View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/development/python-modules/wrf-python/default.nix
9 changes: 5 additions & 4 deletions pkgs/development/python-modules/wrf-python/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,13 +16,14 @@ buildPythonPackage rec {
numpy
xarray
];
buildInputs = [

nativeBuildInputs = [
gfortran
] ++ lib.optional (pythonOlder "3.3") mock;
];

checkInputs = [
netcdf4
];
] ++ lib.optional (pythonOlder "3.3") mock;

doCheck = true;
checkPhase = ''