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: 4a10b030ce9a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5aa46b6bdb5f
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 4, 2019

  1. python3Packages.lammps-cython: fix tests

    ZHF #68361
    
    (cherry picked from commit 2aaea01)
    Signed-off-by: Jonathan Ringer <jonringer117@gmail.com>
    Jonathan Ringer committed Oct 4, 2019
    Copy the full SHA
    5aa46b6 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/python-modules/lammps-cython/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/lammps-cython/default.nix
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
, pymatgen
, ase
, pytestrunner
, pytest
, pytest_4
, pytestcov
, isPy3k
, openssh
@@ -26,7 +26,7 @@ buildPythonPackage rec {
};

buildInputs = [ cython pytestrunner ];
checkInputs = [ pytest pytestcov openssh ];
checkInputs = [ pytest_4 pytestcov openssh ];
propagatedBuildInputs = [ mpi4py pymatgen ase numpy ];

preBuild = ''