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: 01966e8b799e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fb8abc97afc8
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 24, 2019

  1. journalwatch: fix pytest checks 

    (cherry picked from commit ee20ba83144551497fcecedca277f5de32e81c0c)

Reason: The more strict dependency handling of buildPythonPackage in
19.03 uncovered the error of having pytest as buildInput instead of
checkInput, which leads to a broken package on 19.03.
    @florianjacob
    florianjacob committed Jun 24, 2019
    Copy the full SHA
    dbccbd5 View commit details

  2. Merge pull request #63742 from florianjacob/backport-journalwatch 

    journalwatch: fix pytest checks
    @worldofpeace
    worldofpeace authored Jun 24, 2019
    Copy the full SHA
    fb8abc9 View commit details
Showing with 2 additions and 6 deletions.
  1. +2 −6 pkgs/tools/system/journalwatch/default.nix
8 changes: 2 additions & 6 deletions pkgs/tools/system/journalwatch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -20,14 +20,10 @@ buildPythonPackage rec {


doCheck = true;

checkInputs = [ pytest ];
checkPhase = ''
pytest test_journalwatch.py
'';

buildInputs = [
pytest
];
'';

propagatedBuildInputs = [
systemd