From 2a6440b294b5b82df4e55489aebcc03a9e12836e Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 28 Oct 2015 06:26:00 +0100
Subject: [PATCH 1/2] =?UTF-8?q?khard:=200.6.0=20=E2=86=92=200.6.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkgs/applications/misc/khard/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index f1e2467362cc..ac566c9609be 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,13 +1,13 @@
{ stdenv, fetchurl, pkgs, pythonPackages }:
pythonPackages.buildPythonPackage rec {
- version = "0.6.0";
+ version = "0.6.3";
name = "khard-${version}";
namePrefix = "";
src = fetchurl {
url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
- sha256 = "1ag6p416iibwgvijjc8bwyrssxw3s3j559700xfgp10vj0nqk1hb";
+ sha256 = "1dn1v4ycgqbq8vknz1dy710asq8cizxmzaynn69xknwkpgda7fm9";
};
propagatedBuildInputs = with pythonPackages; [
From 979eba4010482fabcd2c5c5353620df7d2c0977e Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 29 Oct 2015 08:02:36 +0100
Subject: [PATCH 2/2] =?UTF-8?q?vobject:=200.8.1c=20=E2=86=92=200.8.1d?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkgs/top-level/python-packages.nix | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b62a6d4552bd..44abefb8d609 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11086,12 +11086,14 @@ let
};
vobject = buildPythonPackage rec {
- version = "0.8.1c";
+ version = "0.8.1d";
name = "vobject-${version}";
- src = pkgs.fetchurl {
- url = "https://pypi.python.org/packages/source/v/vobject/vobject-${version}.tar.gz";
- sha256 = "1xanqn7rn96841s3lim5lnx5743gc4kyfg4ggj1ys5r0gw8i6har";
+ src = pkgs.fetchFromGitHub {
+ owner = "adieu";
+ repo = "vobject";
+ sha256 = "04fz8g9i9pvrksbpzmp2ci8z34gwjdr7j0f0cxr60v5sdv6v88l9";
+ rev = "ef870dfbb7642756d6b691ebf9f52285ec9e504f";
};
disabled = isPy3k || isPyPy;
@@ -11100,7 +11102,7 @@ let
meta = {
description = "Module for reading vCard and vCalendar files";
- homepage = http://vobject.skyhouseconsulting.com/;
+ homepage = https://github.com/adieu/vobject/;
license = licenses.asl20;
maintainers = with maintainers; [ DamienCassou ];
};