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: f2b2cad9272e
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: caad1a78c47c
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Jan 9, 2020

  1. firefox-bin: 72.0 -> 72.0.1 [security] CVE-2019-17026 

    (cherry picked from commit 0271b2c)
    @tokudan
    tokudan committed Jan 9, 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
    af4d6c2 View commit details

  2. Merge pull request #77374 from tokudan/1909-ffbin7201 

    firefox-bin: 72.0 -> 72.0.1 [security] CVE-2019-17026 [19.09]
    @flokli
    flokli authored Jan 9, 2020
    Copy the full SHA
    fe6cd5a View commit details

  3. pythonPackages.blaze: fix build

    @FRidh
    FRidh committed Jan 9, 2020
    Copy the full SHA
    2cb5749 View commit details

  4. pythonPackages.odo: disable tests, fix build

    @FRidh
    FRidh committed Jan 9, 2020
    Copy the full SHA
    caad1a7 View commit details
770 changes: 385 additions & 385 deletions pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

Large diffs are not rendered by default.

49 changes: 18 additions & 31 deletions pkgs/development/python-modules/blaze/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,28 +2,27 @@
, buildPythonPackage
, fetchFromGitHub
, pytest
, contextlib2
, cytoolz
, dask
, datashape
, flask
, flask-cors
, h5py
, multipledispatch
, numba
, numpy
, odo
, pandas
, psutil
, pymongo
, pyyaml
, requests
, sqlalchemy
, tables
, toolz
}:

buildPythonPackage rec {
let
disabledTests = [
"test_table_resource"
"test_can_trivially_create_csv_data"
"test_data_passes_kwargs_to_resource"
"test_all_string_infer_header"
"test_csv_with_trailing_commas"
"test_Data_attribute_repr"
];

testExpression = lib.optionalString (disabledTests != [])
"-k 'not ${lib.concatStringsSep " and not " disabledTests}'";

in buildPythonPackage rec {
pname = "blaze";
version = "0.11.3";

@@ -34,32 +33,20 @@ buildPythonPackage rec {
sha256 = "0w916k125058p40cf7i090f75pgv3cqdb8vwjzqhb9r482fa6717";
};

checkInputs = [ pytest ];
checkInputs = [
pytest
];
propagatedBuildInputs = [
contextlib2
cytoolz
dask
datashape
flask
flask-cors
h5py
multipledispatch
numba
numpy
odo
pandas
psutil
pymongo
pyyaml
requests
sqlalchemy
tables
toolz
];

checkPhase = ''
rm pytest.ini # Not interested in coverage
py.test blaze/tests
py.test blaze/tests ${testExpression}
'';

meta = {
7 changes: 3 additions & 4 deletions pkgs/development/python-modules/odo/default.nix
View file
Original file line number Diff line number Diff line change
@@ -24,15 +24,12 @@ buildPythonPackage rec {

checkInputs = [
pytest
dask
];

propagatedBuildInputs = [
dask
datashape
numpy
pandas
toolz
multipledispatch
networkx
];

@@ -49,6 +46,8 @@ buildPythonPackage rec {
and not test_numpy_asserts_type_after_dataframe"
'';

doCheck = false; # Many failing tests

meta = with lib; {
homepage = https://github.com/ContinuumIO/odo;
description = "Data migration utilities";