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

Commits on Nov 24, 2018

  1. fixup aws-xray-sdk

    @FRidh
    FRidh committed Nov 24, 2018

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

  2. fixup hmmlearn

    @FRidh
    FRidh committed Nov 24, 2018
    Copy the full SHA
    d3ac93a View commit details

  3. fixup google_apputils

    @FRidh
    FRidh committed Nov 24, 2018
    Copy the full SHA
    1932715 View commit details
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/aws-xray-sdk/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
, wrapt
, requests
, future
, botocore
}:

buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
};

propagatedBuildInputs = [
jsonpickle wrapt requests future
jsonpickle wrapt requests future botocore
];

meta = {
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/google_apputils/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,7 +27,8 @@ buildPythonPackage rec {
${python.executable} setup.py google_test
'';

doCheck = true;
# ERROR:root:Trying to access flag test_tmpdir before flags were parsed.
doCheck = false;

meta = with stdenv.lib; {
description = "Google Application Utilities for Python";
5 changes: 2 additions & 3 deletions pkgs/development/python-modules/hmmlearn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, fetchurl, buildPythonPackage, numpy }:
{ lib, fetchurl, buildPythonPackage, numpy, scikitlearn }:

buildPythonPackage rec {
pname = "hmmlearn";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
sha256 = "d43f5b25f9019ef5d01914d0972a5fa0594e82ab75d2c6aec26d682e47bd553c";
};

propagatedBuildInputs = [ numpy ];
propagatedBuildInputs = [ numpy scikitlearn ];

doCheck = false;

@@ -19,6 +19,5 @@ buildPythonPackage rec {
homepage = https://github.com/hmmlearn/hmmlearn;
license = licenses.bsd3;
maintainers = with maintainers; [ abbradar ];
platforms = platforms.unix;
};
}