Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e036652424ad
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e81788363d82
Choose a head ref
  • 9 commits
  • 6 files changed
  • 5 contributors

Commits on Sep 18, 2020

  1. python3.pkgs.libiio: fix build 

    Add missing setuptools dependency.

(cherry picked from commit ce0a59c)
    @povik
    povik committed Sep 18, 2020
    Copy the full SHA
    cedbe71 View commit details

  2. python3.pkgs.cartopy: 0.17 -> 0.18 

    Fixes build. Formerly cartopy tests were failing, likely since update of
matplotlib to 3.3.0.

(cherry picked from commit 2047252)
    @povik
    povik authored and Jon committed Sep 18, 2020
    Copy the full SHA
    0bfcc86 View commit details

  3. python3Packages.requests-aws4auth: fix build 

    (cherry picked from commit 5f0f2b8)
    @wkral
    wkral authored and Jon committed Sep 18, 2020
    Copy the full SHA
    344d782 View commit details

  4. Merge pull request #98201 from povik/libiio-fix-backport 

    [20.09] python3.pkgs.libiio: fix build
    @risicle
    risicle authored Sep 18, 2020

    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
    4910c6b View commit details

  5. haskell-headed-megaparsec: disable broken build 

    The package needs megaparsec 9.x, which we don't use by default.
    @peti
    peti committed Sep 18, 2020
    Copy the full SHA
    497587a View commit details

  6. python3Packages.irc: fix build 

    (cherry picked from commit 7567bd6)
    @wkral
    wkral committed Sep 18, 2020
    Copy the full SHA
    fc18edd View commit details

Commits on Sep 19, 2020

  1. Merge pull request #98236 from wkral/backport-py-irc 

    [20.09] python3Packages.irc: fix build
    @risicle
    risicle authored Sep 19, 2020

    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
    c22c22b View commit details

  2. python2Packages.hickle: disable 

    ```
  Processing ./hickle-4.0.1-py2-none-any.whl
  ERROR: Package 'hickle' requires a different Python: 2.7.18 not in '>=3.5'
```

(cherry picked from commit f1325cd)
    Jonathan Ringer committed Sep 19, 2020
    Copy the full SHA
    a57cd67 View commit details

  3. python3Packages.hickle: disable tests 

    Incompatible with astropy>=4.0

(cherry picked from commit 389ab45)
    Jonathan Ringer committed Sep 19, 2020
    Copy the full SHA
    e817883 View commit details
2 changes: 2 additions & 0 deletions pkgs/development/haskell-modules/hackage-packages.nix
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion pkgs/development/libraries/libiio/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,7 @@
, python
, libusb1
, runtimeShell
, lib
}:

stdenv.mkDerivation rec {
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
python
libxml2
libusb1
];
] ++ lib.optional python.isPy3k python.pkgs.setuptools;

cmakeFlags = [
"-DUDEV_RULES_INSTALL_DIR=${placeholder "out"}/lib/udev/rules.d"
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/cartopy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,12 +9,12 @@

buildPythonPackage rec {
pname = "cartopy";
version = "0.17.0";
version = "0.18.0";

src = fetchPypi {
inherit version;
pname = "Cartopy";
sha256 = "0q9ckfi37cxj7jwnqnzij62vwcf4krccx576vv5lhvpgvplxjjs2";
sha256 = "0d24fk0cbp29gmkysrwq05vry13swmwi3vx3cpcy04c0ixz33ykz";
};

checkInputs = [ filelock mock pytest_4 pep8 ];
6 changes: 6 additions & 0 deletions pkgs/development/python-modules/hickle/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{ buildPythonPackage
, fetchPypi
, pythonOlder
, h5py
, numpy
, dill
@@ -19,6 +20,7 @@
buildPythonPackage rec {
pname = "hickle";
version = "4.0.1";
disabled = pythonOlder "3.5";

src = fetchPypi {
inherit pname version;
@@ -31,10 +33,14 @@ buildPythonPackage rec {
'';

propagatedBuildInputs = [ h5py numpy dill ];

doCheck = false; # incompatible with latest astropy
checkInputs = [
pytest pytestcov pytestrunner coveralls scipy pandas astropy twine check-manifest codecov
];

pythonImportsCheck = [ "hickle" ];

meta = {
description = "Serialize Python data to HDF5";
homepage = "https://github.com/telegraphic/hickle";
5 changes: 4 additions & 1 deletion pkgs/development/python-modules/irc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
, six, jaraco_logging, jaraco_text, jaraco_stream, pytz, jaraco_itertools
, setuptools_scm, jaraco_collections, importlib-metadata
, setuptools_scm, jaraco_collections, importlib-metadata, toml
}:

buildPythonPackage rec {
@@ -16,6 +16,8 @@ buildPythonPackage rec {

doCheck = false;

pythonImportsCheck = [ "irc" ];

nativeBuildInputs = [ setuptools_scm ];
propagatedBuildInputs = [
six
@@ -26,6 +28,7 @@ buildPythonPackage rec {
pytz
jaraco_itertools
jaraco_collections
toml
];

meta = with lib; {
13 changes: 5 additions & 8 deletions pkgs/development/python-modules/requests-aws4auth/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }:
{ lib, buildPythonPackage, fetchPypi, python, requests }:
with lib;
buildPythonPackage rec {
pname = "requests-aws4auth";
@@ -9,15 +9,12 @@ buildPythonPackage rec {
sha256 = "2950f6ff686b5a452a269076d990e4821d959b61cfac319c3d3c6daaa5db55ce";
};

postPatch = optionalString isPy3k ''
sed "s/path_encoding_style/'path_encoding_style'/" \
-i requests_aws4auth/service_parameters.py
'';

propagatedBuildInputs = [ requests ];

# The test fail on Python >= 3 because of module import errors.
doCheck = !isPy3k;
checkPhase = ''
cd requests_aws4auth
${python.interpreter} test/requests_aws4auth_test.py
'';

meta = {
description = "Amazon Web Services version 4 authentication for the Python Requests library.";