about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLucas Hoffmann <lucc@posteo.de>2023-04-23 20:50:49 +0200
committerMatthieu Coudron <teto@users.noreply.github.com>2023-04-23 22:27:37 +0200
commit5afaa90a001b9da66894c5d26a8961e580022706 (patch)
treea4987244717d61d5c1b9a88f7a910ec3c77c211d
parentc35725f12757410427fe1d73e4f410c320b1d42f (diff)
khal: 0.10.5 -> 0.11.1
-rw-r--r--pkgs/applications/misc/khal/default.nix17
1 files changed, 2 insertions, 15 deletions
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 18952865eb84c..9999d83ee4636 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , glibcLocales
 , installShellFiles
 , python3
@@ -9,13 +8,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "khal";
-  version = "0.10.5";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "pimutils";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-FneJmoAOb7WjSgluCwlspf27IU3MsQZFKryL9OSSsUw=";
+    hash = "sha256-5wBKo24EKdEUoYhhv1EqMPOjdwUS31d3R24kLdbyvPA=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -55,18 +54,6 @@ python3.pkgs.buildPythonApplication rec {
     vdirsyncer
   ];
 
-  patches = [
-    # Tests working with latest pytz version, https://github.com/pimutils/khal/pull/1183
-    (fetchpatch {
-      name = "support-later-pytz.patch";
-      url = "https://github.com/pimutils/khal/commit/53eb8a7426d5c09478c78d809c4df4391438e246.patch";
-      sha256 = "sha256-drGtvJlQ3qFUdeukRWCFycPSZGWG/FSRqnbwJzFKITc=";
-      excludes = [
-        "CHANGELOG.rst"
-      ];
-    })
-  ];
-
   postInstall = ''
     # shell completions
     installShellCompletion --cmd khal \