Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions pkgs/applications/misc/khal/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
{ stdenv, pkgs, python3Packages }:
{ stdenv, pkgs, python3 }:

with python3Packages;
let
python = python3.override {
packageOverrides = self: super: {

buildPythonApplication rec {
# https://github.com/pimutils/khal/issues/780
python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec {
version = "2.6.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca";
};
});

};
};

in with python.pkgs; buildPythonApplication rec {
pname = "khal";
version = "0.9.9";

Expand All @@ -29,10 +43,11 @@ buildPythonApplication rec {
pkginfo
freezegun
];
buildInputs = [ setuptools_scm pytest pkgs.glibcLocales ];
nativeBuildInputs = [ setuptools_scm pkgs.glibcLocales ];
checkInputs = [ pytest ];

checkPhase = ''
# py.test
py.test
'';

meta = with stdenv.lib; {
Expand Down
7 changes: 4 additions & 3 deletions pkgs/development/python-modules/pendulum/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{ stdenv, fetchPypi, buildPythonPackage, dateutil, pytzdata, tzlocal }:
{ lib, fetchPypi, buildPythonPackage, pythonOlder
, dateutil, pytzdata, typing }:

buildPythonPackage rec {
pname = "pendulum";
Expand All @@ -9,12 +10,12 @@ buildPythonPackage rec {
sha256 = "544e44d8a92954e5ef4db4fa8b662d3282f2ac7b7c2cbf4227dc193ba78b9e1e";
};

propagatedBuildInputs = [ dateutil pytzdata tzlocal ];
propagatedBuildInputs = [ dateutil pytzdata ] ++ lib.optional (pythonOlder "3.5") typing;

# No tests
doCheck = false;

meta = with stdenv.lib; {
meta = with lib; {
description = "Python datetimes made easy";
homepage = https://github.com/sdispater/pendulum;
license = licenses.mit;
Expand Down
3 changes: 3 additions & 0 deletions pkgs/development/python-modules/pytest-httpbin/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ buildPythonPackage rec {
py.test
'';

# https://github.com/kevin1024/pytest-httpbin/pull/51
doCheck = false;

meta = {
description = "Easily test your HTTP library against a local copy of httpbin.org";
homepage = https://github.com/kevin1024/pytest-httpbin;
Expand Down
21 changes: 18 additions & 3 deletions pkgs/servers/radicale/default.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
{ stdenv, fetchFromGitHub, python3Packages }:
{ stdenv, fetchFromGitHub, python3 }:

let
version = "2.1.9";
sha256 = "1sywxn7j9bq39qwq74h327crc44j9049cykai1alv44agx8s1nhz";

python = python3.override {
packageOverrides = self: super: {

# https://github.com/eventable/vobject/issues/112
python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec {
version = "2.6.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca";
};
});

};
};
in

python3Packages.buildPythonApplication {
python.pkgs.buildPythonApplication {
name = "radicale-${version}";
inherit version;

Expand All @@ -18,7 +33,7 @@ python3Packages.buildPythonApplication {

doCheck = false;

propagatedBuildInputs = with python3Packages; [
propagatedBuildInputs = with python.pkgs; [
vobject
passlib
pytz
Expand Down
28 changes: 20 additions & 8 deletions pkgs/tools/misc/papis/default.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,24 @@
{ buildPythonApplication, lib, fetchFromGitHub, bashInteractive
, argcomplete, arxiv2bib, beautifulsoup4, bibtexparser
, configparser, dmenu-python, habanero, papis-python-rofi
, pylibgen, prompt_toolkit, pyparser, pytest, python_magic
, pyyaml, requests, unidecode, urwid, vobject, tkinter
, vim
, python3, vim
}:

buildPythonApplication rec {
let
python = python3.override {
packageOverrides = self: super: {

# https://github.com/eventable/vobject/issues/112
python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec {
version = "2.6.1";
src = oldAttrs.src.override {
inherit version;
sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca";
};
});

};
};

in python.pkgs.buildPythonApplication rec {
pname = "papis";
version = "0.5.3";

Expand All @@ -23,15 +35,15 @@ buildPythonApplication rec {
patchShebangs tests
'';

propagatedBuildInputs = [
propagatedBuildInputs = with python.pkgs; [
argcomplete arxiv2bib beautifulsoup4 bibtexparser
configparser dmenu-python habanero papis-python-rofi
pylibgen prompt_toolkit pyparser python_magic pyyaml
requests unidecode urwid vobject tkinter
vim
];

checkInputs = [ pytest ];
checkInputs = with python.pkgs; [ pytest ];

# Papis tries to create the config folder under $HOME during the tests
checkPhase = ''
Expand Down