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: ce55b09ad5d1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4e0f91170f11
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 23, 2020

  1. pythonPackages.crashtest: mirror the python version range specified i… 

    …n pyproject.toml

Trying to build crashtest with python35 fails with:

> ERROR: Package 'crashtest' requires a different Python: 3.5.9 not in
> '>=3.6,<4.0'
    @ento @FRidh
    ento authored and FRidh committed Jul 23, 2020
    Copy the full SHA
    aff753d View commit details

  2. pythonPackages.clikit: fix dependency on crashtest 

    From clikit's pyproject.toml:

> Crashtest is only needed for Python ^3.6 to provide
> better error messsages
    @ento @FRidh
    ento authored and FRidh committed Jul 23, 2020
    Copy the full SHA
    4e0f911 View commit details
Showing with 7 additions and 5 deletions.
  1. +5 −3 pkgs/development/python-modules/clikit/default.nix
  2. +2 −2 pkgs/development/python-modules/crashtest/default.nix
8 changes: 5 additions & 3 deletions pkgs/development/python-modules/clikit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
, isPy27
, isPy27, pythonAtLeast
, pylev, pastel, typing, enum34, crashtest }:

buildPythonPackage rec {
@@ -12,8 +12,10 @@ buildPythonPackage rec {
};

propagatedBuildInputs = [
crashtest pylev pastel
] ++ lib.optionals isPy27 [ typing enum34 ];
pylev pastel
]
++ lib.optionals (pythonAtLeast "3.6") [ crashtest ]
++ lib.optionals isPy27 [ typing enum34 ];

# The Pypi tarball doesn't include tests, and the GitHub source isn't
# buildable until we bootstrap poetry, see
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/crashtest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, isPy27, pytest }:
{ lib, buildPythonPackage, fetchFromGitHub, fetchPypi, pythonAtLeast, pytest }:

buildPythonPackage rec {
pname = "crashtest";
version = "0.3.0";
disabled = isPy27;
disabled = !(pythonAtLeast "3.6");

src = fetchPypi {
inherit pname version;