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

Commits on Oct 27, 2019

  1. python38Packages.tables: fix build for 3.8 

    We need to regenerate the C code with Cython.
    @FRidh
    FRidh committed Oct 27, 2019
    Copy the full SHA
    8607aa5 View commit details

  2. python38Packages.moto: does not function yet

    @FRidh
    FRidh committed Oct 27, 2019
    Copy the full SHA
    62c8128 View commit details
Showing with 18 additions and 2 deletions.
  1. +5 −0 pkgs/development/python-modules/moto/default.nix
  2. +13 −2 pkgs/development/python-modules/tables/default.nix
5 changes: 5 additions & 0 deletions pkgs/development/python-modules/moto/default.nix
View file
Original file line number Diff line number Diff line change
@@ -22,6 +22,7 @@
, sure
, werkzeug
, xmltodict
, isPy38
}:

buildPythonPackage rec {
@@ -33,6 +34,10 @@ buildPythonPackage rec {
sha256 = "0rhbjvqi1khp80gfnl3x632kwlpq3k7m8f13nidznixdpa78vm4m";
};

# 3.8 is not yet support
# https://github.com/spulec/moto/pull/2519
disabled = isPy38;

# Backported fix from 1.3.14.dev for compatibility with botocore >= 1.9.198.
patches = [
(fetchpatch {
15 changes: 13 additions & 2 deletions pkgs/development/python-modules/tables/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,16 +6,27 @@ with stdenv.lib;
buildPythonPackage rec {
version = "3.6.0";
pname = "tables";
disabled = isPy38; # unable to build, remove with next bump.

src = fetchPypi {
inherit pname version;
sha256 = "0k9xc0b49j311r6yayw7wzjay6ch3jznijhzc4x33yv490hqhd6v";
};

buildInputs = [ hdf5 cython bzip2 lzo c-blosc ];
nativeBuildInputs = [ cython ];

buildInputs = [ hdf5 bzip2 lzo c-blosc ];
propagatedBuildInputs = [ numpy numexpr six mock ];

# When doing `make distclean`, ignore docs
postPatch = ''
substituteInPlace Makefile --replace "src doc" "src"
'';

# Regenerate C code with Cython
preBuild = ''
make distclean
'';

# The setup script complains about missing run-paths, but they are
# actually set.
setupPyBuildFlags = [