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: 9396b273cc83
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 05bed043b77b
Choose a head ref
  • 5 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 26, 2019

  1. khal: 0.9.10 -> 0.10.0 

    https://github.com/pimutils/khal/releases/tag/v0.10.0

* new dep, click-log
* enable tests (pass!)

Release notes mention 'only dateutil < 2.7 is supported',
which may be a problem as ours is currently 2.8.

There's a history of python-dateutil version particularity
in previous releases (such as 0.9.10 upgrading from),
unsure if should override to older or if it's just a suggestion.
    @dtzWill
    dtzWill committed Mar 26, 2019
    Copy the full SHA
    ad91dca View commit details

  2. khal: no need to set LC_ALL, python build bits do this.

    @dtzWill
    dtzWill committed Mar 26, 2019
    Copy the full SHA
    c8fa127 View commit details

Commits on Mar 31, 2019

  1. khal: 0.10.0 -> 0.10.1

    @dtzWill
    dtzWill committed Mar 31, 2019
    Copy the full SHA
    4f62e1b View commit details

  2. khal: disable tests on aarch64

    @dtzWill
    dtzWill committed Mar 31, 2019
    Copy the full SHA
    d4f172c View commit details

  3. Merge pull request #58324 from dtzWill/update/khal-0.10.0 

    khal: 0.9.10 -> 0.10.0
    @gebner
    gebner authored Mar 31, 2019
    Copy the full SHA
    05bed04 View commit details
Showing with 5 additions and 7 deletions.
  1. +5 −7 pkgs/applications/misc/khal/default.nix
12 changes: 5 additions & 7 deletions pkgs/applications/misc/khal/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,18 +2,17 @@

with python3.pkgs; buildPythonApplication rec {
pname = "khal";
version = "0.9.10";
version = "0.10.1";

src = fetchPypi {
inherit pname version;
sha256 = "03h0j0d3xyqh98x5v2gv63wv3g91hip3vsaxvybsn5iz331d23h4";
sha256 = "1r8bkgjwkh7i8ygvsv51h1cnax50sb183vafg66x5snxf3dgjl6l";
};

LC_ALL = "en_US.UTF-8";

propagatedBuildInputs = [
atomicwrites
click
click-log
configobj
dateutil
icalendar
@@ -27,15 +26,14 @@ with python3.pkgs; buildPythonApplication rec {
pkginfo
freezegun
];
nativeBuildInputs = [ setuptools_scm pkgs.glibcLocales ];
nativeBuildInputs = [ setuptools_scm ];
checkInputs = [ pytest ];

postInstall = ''
install -D misc/__khal $out/share/zsh/site-functions/__khal
'';

# One test fails as of 0.9.10 due to the upgrade to icalendar 4.0.3
doCheck = false;
doCheck = !stdenv.isAarch64;

checkPhase = ''
py.test