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

Commits on Sep 8, 2019

  1. pythonPackage.XlsxWriter: 1.1.8 -> 1.2.0

    @jluttine @FRidh
    jluttine authored and FRidh committed Sep 8, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a00a398 View commit details

  2. pythonPackages.can: 3.1.0 -> 3.3.1

    @jluttine @FRidh
    jluttine authored and FRidh committed Sep 8, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    766f0d0 View commit details
Showing with 15 additions and 13 deletions.
  1. +2 −2 pkgs/development/python-modules/XlsxWriter/default.nix
  2. +13 −11 pkgs/development/python-modules/can/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/XlsxWriter/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,15 +3,15 @@
buildPythonPackage rec {

pname = "XlsxWriter";
version = "1.1.8";
version = "1.2.0";

# PyPI release tarball doesn't contain tests so let's use GitHub. See:
# https://github.com/jmcnamara/XlsxWriter/issues/327
src = fetchFromGitHub{
owner = "jmcnamara";
repo = pname;
rev = "RELEASE_${version}";
sha256 = "19qhdcycaiamd3bp8v2z9rpirxsr4c29fgs219k2766fpmfrgx40";
sha256 = "0w9ggzi887w4z6i5mz24kcy7qbkd4d7gycqi0dhqgaj9lzxh7jjh";
};

meta = {
24 changes: 13 additions & 11 deletions pkgs/development/python-modules/can/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, fetchPypi
, pythonOlder
, isPy27
, aenum
, wrapt
, typing
, pyserial
@@ -14,21 +16,21 @@

buildPythonPackage rec {
pname = "python-can";
version = "3.1.0";
version = "3.3.1";

# PyPI tarball is missing some tests and is missing __init__.py in test
# directory causing the tests to fail. See:
# https://github.com/hardbyte/python-can/issues/518
src = fetchFromGitHub {
repo = pname;
owner = "hardbyte";
rev = "v${version}";
sha256 = "01lfsh7drm4qvv909x9i0vnhskdh27mcb5xa86sv9m3zfpq8cjis";
src = fetchPypi {
inherit pname version;
sha256 = "1giv9s6w90lalxsijgnxzynygkckcfyaxnxsldbwv0784vwy1jcd";
};

propagatedBuildInputs = [ wrapt pyserial ] ++ lib.optional (pythonOlder "3.5") typing;
propagatedBuildInputs = [ wrapt pyserial aenum ] ++ lib.optional (pythonOlder "3.5") typing;
checkInputs = [ nose mock pytest pytest-timeout hypothesis future ];

# Tests won't work with hypothesis 4.7.3 under Python 2. So skip the tests in
# that case. This clause can be removed once hypothesis has been upgraded in
# nixpkgs.
doCheck = !(isPy27 && (hypothesis.version == "4.7.3"));

# Add the scripts to PATH
checkPhase = ''
PATH=$out/bin:$PATH pytest -c /dev/null