Bump backports

diff --git a/flakes/backports/flake.lock b/flakes/backports/flake.lock
index 2d046a2ee29105c95811f1040dbec08f8204e346..a16b090fdc83e68b273bac9a7d7948b30716cb60 100644 (file)
--- a/flakes/backports/flake.lock
+++ b/flakes/backports/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "flake-utils": {
       "locked": {
-        "lastModified": 1656928814,
-        "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -17,11 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1659522808,
-        "narHash": "sha256-HBcM19nGhI3IWwPNVlYb0MZ8VW6iKp4JbAVkeIHVykc=",
+        "lastModified": 1663087123,
+        "narHash": "sha256-cNIRkF/J4mRxDtNYw+9/fBNq/NOA2nCuPOa3EdIyeDs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "168d1c578909dc143ba52dbed661c36e76b12b36",
+        "rev": "9608ace7009ce5bc3aeb940095e01553e635cbc7",
         "type": "github"
       },
       "original": {

diff --git a/flakes/backports/flake.nix b/flakes/backports/flake.nix
index 796664a2e6c28dfb27f7cdff5a0d13a89a9a2189..463639fd33032a6cca90b17691fe305199de5f2d 100644 (file)
--- a/flakes/backports/flake.nix
+++ b/flakes/backports/flake.nix
@@ -10,10 +10,16 @@
     in rec {
       packages = {
         ntfy-sh = pkgs.ntfy-sh;
+        khard = pkgs.khard;
+        khal = pkgs.khal;
+        go-task = pkgs.go-task;
       };
       legacyPackages = packages;
       apps = {
         ntfy-sh = flake-utils.lib.mkApp { drv = packages.ntfy-sh; name = "ntfy-sh"; };
+        khard = flake-utils.lib.mkApp { drv = packages.khard; name = "khard"; };
+        khal = flake-utils.lib.mkApp { drv = packages.khal; name = "khal"; };
+        go-task = flake-utils.lib.mkApp { drv = packages.go-task; name = "go-task"; };
       };
     }
   ) // rec {
@@ -24,9 +30,15 @@
     };
     overlays = {
       ntfy-sh = final: prev: { ntfy-sh = self.packages."${final.system}".ntfy-sh; };
+      khard = final: prev: { khard = self.packages."${final.system}".khard; };
+      khal = final: prev: { khal = self.packages."${final.system}".khal; };
+      go-task = final: prev: { go-task = self.packages."${final.system}".go-task; };
     };
     overlay = final: prev: ({}
       // overlays.ntfy-sh final prev
+      // overlays.khard final prev
+      // overlays.khal final prev
+      // overlays.go-task final prev
     );
 
     nixosModules = {

diff --git a/overlays/default.nix b/overlays/default.nix
index 673d2ae2577531fc385706d4f6e7876eb5596d78..716a508e0e48e55190259e4c1bd624767ab901f5 100644 (file)
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -44,7 +44,6 @@ in flakes // {
   weechat = import ./weechat;
   ympd = import ./ympd;
   doing = import ./doing;
-  khal = import ./khal;
   nix-direnv = import ./nix-direnv;
   morph = import ./morph;
   urlwatch = import ./urlwatch;

diff --git a/overlays/khal/default.nix b/overlays/khal/default.nix
deleted file mode 100644 (file)
index 597cc0e..0000000
--- a/overlays/khal/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-self: super: {
-  khal = super.khal.overridePythonAttrs(old: {
-    postPatch = ''
-      sed -i "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" tests/cli_test.py
-      sed -i "s/Invalid value for \"\[ICS\]\"/Invalid value for \\\'[ICS]\\\'/" tests/cli_test.py
-    '';
-  });
-}

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 6f817d9078727acc2357798f8be8837ccba5ac8b..6534bc4abdd8f6a9ef6fa8e0fe2b18e3a9a42479 100644 (file)
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -14,6 +14,7 @@ rec {
   fluentd = callPackage ./fluentd {};
   fluent-bit = callPackage ./fluent-bit {};
   genius = callPackage ./genius {};
+  ical2html = callPackage ./ical2html {};
   mtop = callPackage ./mtop {};
   muttprint = callPackage ./muttprint {};
   mutt-ics = callPackage ./mutt-ics { inherit mylibs; };

diff --git a/pkgs/ical2html/default.nix b/pkgs/ical2html/default.nix
new file mode 100644 (file)
index 0000000..5ce6433
--- /dev/null
+++ b/pkgs/ical2html/default.nix
@@ -0,0 +1,11 @@
+{ pkgs ? import <nixpkgs> {} }:
+pkgs.stdenv.mkDerivation rec {
+  pname = "ical2html";
+  version = "3.0";
+  src= pkgs.fetchurl {
+    url = "https://www.w3.org/Tools/Ical2html/${pname}-${version}.tar.gz";
+    sha256 = "sha256-1QhE04cmohhPgZ3I8jz28Z7ZnSJkH2aPnRse5/pReEA=";
+  };
+  buildInputs = [ pkgs.libical ];
+
+}