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

Commits on Apr 3, 2019

  1. conan: pin pluginbase to 0.7 

    Upstream requires
    pluginbase>=0.5, < 1.0

(cherry picked from commit 244fcfc)
    Robert Schütz committed Apr 3, 2019
    Copy the full SHA
    f5d2da5 View commit details

  2. python.pkgs.cufflinks: 0.14.6 -> 0.15 

    (cherry picked from commit ed57afc)
    Robert Schütz committed Apr 3, 2019
    Copy the full SHA
    e18a582 View commit details
Showing with 21 additions and 6 deletions.
  1. +14 −6 pkgs/development/python-modules/cufflinks/default.nix
  2. +7 −0 pkgs/development/tools/build-managers/conan/default.nix
20 changes: 14 additions & 6 deletions pkgs/development/python-modules/cufflinks/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
{ buildPythonPackage, stdenv, fetchPypi, pandas, plotly, colorlover
{ buildPythonPackage, stdenv, fetchPypi
, numpy, pandas, plotly, six, colorlover
, ipython, ipywidgets, nose
}:

buildPythonPackage rec {
pname = "cufflinks";
version = "0.14.6";
version = "0.15";

src = fetchPypi {
inherit pname version;
sha256 = "4188324361cc584214150aadaeb28ed07e9d150adb714b53c5f09d5b3fcdd28a";
sha256 = "014098a4568199957198c0a7fe3dbeb3b4010b6de8d692a41fe3b3ac107b660e";
};

propagatedBuildInputs = [ pandas plotly colorlover ];
propagatedBuildInputs = [
numpy pandas plotly six colorlover
ipython ipywidgets
];

# tests not included in archive
doCheck = false;
checkInputs = [ nose ];

checkPhase = ''
nosetests -xv tests.py
'';

meta = {
homepage = https://github.com/santosjorge/cufflinks;
7 changes: 7 additions & 0 deletions pkgs/development/tools/build-managers/conan/default.nix
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,13 @@ let newPython = python3.override {
sha256 = "1fyybgbmlr8ms32j7h76hz5g9xc6nf0644mwhc40a0s5k14makav";
};
});
pluginbase = super.pluginbase.overridePythonAttrs (oldAttrs: rec {
version = "0.7";
src = oldAttrs.src.override {
inherit version;
sha256 = "c0abe3218b86533cca287e7057a37481883c07acef7814b70583406938214cc8";
};
});
};
};