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

Commits on Nov 30, 2018

  1. pythonPackages.tifffile: 2018.10.18 -> 0.15.1 

    Downgrade package. 2018.XX.XX are not official releases? Fixes
dask-image build as well.
    @costrouc @FRidh
    costrouc authored and FRidh committed Nov 30, 2018
    Copy the full SHA
    f0c8e94 View commit details

  2. python3Packages.gidgethub: refactor fix broken package

    @costrouc @FRidh
    costrouc authored and FRidh committed Nov 30, 2018
    Copy the full SHA
    0be76d8 View commit details

  3. pythonPackages.jwcrypto: init at 0.6.0 dependency for broken github3_py

    @costrouc @FRidh
    costrouc authored and FRidh committed Nov 30, 2018
    Copy the full SHA
    4c77ba4 View commit details

  4. pythonPackages.github3_py: refactor fix broken package

    @costrouc @FRidh
    costrouc authored and FRidh committed Nov 30, 2018
    Copy the full SHA
    c4fd012 View commit details

  5. pythonPackages.lz4 refactor fix broken build

    @costrouc @FRidh
    costrouc authored and FRidh committed Nov 30, 2018
    Copy the full SHA
    e01ea09 View commit details
1 change: 1 addition & 0 deletions pkgs/development/python-modules/gidgethub/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
buildPythonPackage rec {
pname = "gidgethub";
version = "3.0.0";
format = "flit";

disabled = pythonOlder "3.6";

6 changes: 3 additions & 3 deletions pkgs/development/python-modules/github3_py/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,10 +9,10 @@
, dateutil
, requests
, pyopenssl
, uritemplate_py
, uritemplate
, ndg-httpsclient
, requests_toolbelt
, pyasn1
, jwcrypto
}:

buildPythonPackage rec {
@@ -25,7 +25,7 @@ buildPythonPackage rec {
};

buildInputs = [ unittest2 pytest mock betamax betamax-matchers dateutil ];
propagatedBuildInputs = [ requests pyopenssl uritemplate_py ndg-httpsclient requests_toolbelt pyasn1 ];
propagatedBuildInputs = [ requests uritemplate dateutil jwcrypto pyopenssl ndg-httpsclient pyasn1 ];

postPatch = ''
sed -i -e 's/mock ==1.0.1/mock>=1.0.1/' setup.py
26 changes: 26 additions & 0 deletions pkgs/development/python-modules/jwcrypto/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{ lib
, buildPythonPackage
, fetchPypi
, cryptography
}:

buildPythonPackage rec {
pname = "jwcrypto";
version = "0.6.0";

src = fetchPypi {
inherit pname version;
sha256 = "a87ac0922d09d9a65011f76d99849f1fbad3d95439c7452cebf4ab0871c2b665";
};

propagatedBuildInputs = [
cryptography
];

meta = with lib; {
description = "Implementation of JOSE Web standards";
homepage = https://github.com/latchset/jwcrypto;
license = licenses.lgpl3Plus;
maintainers = [ maintainers.costrouc ];
};
}
9 changes: 7 additions & 2 deletions pkgs/development/python-modules/lz4/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, nose
, pytestrunner
, pytest
, psutil
, pkgconfig
, setuptools_scm
}:

buildPythonPackage rec {
@@ -13,7 +17,8 @@ buildPythonPackage rec {
sha256 = "ec265f7c3fc3df706e9579bde632ceeef9278858d7ae87c376a2954d11e9ea39";
};

buildInputs = [ nose ];
buildInputs = [ setuptools_scm pytestrunner pkgconfig ];
checkInputs = [ pytest psutil ];

meta = with stdenv.lib; {
description = "Compression library";
7 changes: 5 additions & 2 deletions pkgs/development/python-modules/tifffile/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,11 +3,14 @@

buildPythonPackage rec {
pname = "tifffile";
version = "2018.10.18";
# 2018.10.18 and 2018.11.6 are not releases...?
# https://github.com/blink1073/tifffile/issues/54
# anaconda uses 0.15.1
version = "0.15.1";

src = fetchPypi {
inherit pname version;
sha256 = "9ca8ee9a54d10d2b38ec262cc65abb687f38c34aa9cda23bb22077cd48a9b1ff";
sha256 = "1fbb2cfd57fd8e42e417bc29001a17f319701f1be00e0b8a0004a52da93f1b08";
};

checkInputs = [ nose ];
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -410,6 +410,8 @@ in {

jira = callPackage ../development/python-modules/jira { };

jwcrypto = callPackage ../development/python-modules/jwcrypto { };

lammps-cython = callPackage ../development/python-modules/lammps-cython {
mpi = pkgs.openmpi;
};