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

Commits on Jun 15, 2019

  1. ddar: fix build

    @FRidh
    FRidh committed Jun 15, 2019
    Copy the full SHA
    e66ceaa View commit details

  2. pythonPackages.pygal: fix build

    @FRidh
    FRidh committed Jun 15, 2019
    Copy the full SHA
    ad9a4d0 View commit details

  3. pythonPackages.ipython: fix in order for ipykernel tests to pass

    @FRidh
    FRidh committed Jun 15, 2019
    Copy the full SHA
    8d93e63 View commit details

  4. python: audioread: 2.1.7 -> 2.1.8

    @FRidh
    FRidh committed Jun 15, 2019
    Copy the full SHA
    b5ff613 View commit details

  5. pythonPackages.audioread: fix build

    @FRidh
    FRidh committed Jun 15, 2019
    Copy the full SHA
    bd2188a View commit details
9 changes: 6 additions & 3 deletions pkgs/development/python-modules/audioread/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
{ lib
, buildPythonPackage
, fetchPypi
, pytestrunner
}:

buildPythonPackage rec {
pname = "audioread";
version = "2.1.7";
version = "2.1.8";

src = fetchPypi {
inherit pname version;
sha256 = "f488f9e6fa1ccb09289e3db194639bc6388168b27ef27b2c62380aa1d35a3abe";
sha256 = "073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168";
};

nativeBuildInputs = [ pytestrunner ];

# No tests, need to disable or py3k breaks
doCheck = false;

@@ -20,4 +23,4 @@ buildPythonPackage rec {
homepage = "https://github.com/sampsyo/audioread";
license = lib.licenses.mit;
};
}
}
8 changes: 8 additions & 0 deletions pkgs/development/python-modules/ipython/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@
, pexpect
, appnope
, backcall
, fetchpatch
}:

buildPythonPackage rec {
@@ -33,6 +34,13 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace "'gnureadline'" " "
'';

patches = [
(fetchpatch {
url = "https://github.com/ipython/ipython/commit/e1b53e9ef91a43b9e275bb9e48b4253218375d87.patch";
sha256 = "sha256:0q7zsgalwxss6aikhakbdkvvz0g4ac4sa3ncrklm74ksqh56rsgb";
})
];

buildInputs = [ glibcLocales ];

checkInputs = [ nose pygments ];
4 changes: 4 additions & 0 deletions pkgs/development/python-modules/pygal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -41,6 +41,10 @@ buildPythonPackage rec {
export LANG=en_US.UTF-8
'';

postPatch = ''
substituteInPlace setup.cfg --replace "[pytest]" "[tool:pytest]"
'';

propagatedBuildInputs = [ cairosvg tinycss cssselect ]
++ stdenv.lib.optionals (!isPyPy) [ lxml ];

4 changes: 2 additions & 2 deletions pkgs/tools/backup/ddar/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, python2, fetchFromGitHub, roundup }:
{ lib, python2, fetchFromGitHub, roundup, ncurses }:

python2.pkgs.buildPythonApplication rec {
pname = "ddar";
@@ -26,7 +26,7 @@ python2.pkgs.buildPythonApplication rec {
nativeBuildInputs = with python2.pkgs; [ protobuf.protobuf ];
propagatedBuildInputs = with python2.pkgs; [ protobuf ];

checkInputs = [ roundup ];
checkInputs = [ roundup ncurses ];

checkPhase = ''
roundup t/basic-test.sh