feat(pkgs/to-haskell-overlay/iCalendar): add it

flake.nix

@@ -20,6 +20,7 @@
           pkgs-to-flat-packages
           pkgs-to-python-modules
           pkgs-to-vim-plugins
+          pkgs-to-haskell-overlay
           ;
         templates = import ./templates;
       in
@@ -86,6 +87,7 @@
             pkgs-to-flat-packages pkgs
             // {
               pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ (pkgs-to-python-modules pkgs) ];
+              haskellPackages = prev.haskellPackages.extend (pkgs-to-haskell-overlay prev);
               vimPlugins = prev.vimPlugins // (pkgs-to-vim-plugins pkgs);
             };
         };

pkgs/default.nix

@@ -3,8 +3,10 @@ let
   to-override-packages = import ./to-override-packages;
   to-sources = import ./to-sources;
   to-python-modules = import ./to-python-modules;
+  to-haskell-overlay = import ./to-haskell-overlay;
   to-vim-plugins = import ./to-vim-plugins;
   pkgs-to-python-modules = pkgs: to-python-modules { inherit pkgs to-sources; };
+  pkgs-to-haskell-overlay = pkgs: to-haskell-overlay { inherit pkgs to-sources; };
   pkgs-to-normal-packages = pkgs: to-normal-packages { inherit pkgs to-sources; };
   pkgs-to-override-packages = pkgs: to-override-packages { inherit pkgs to-sources; };
   pkgs-to-flat-packages =
@@ -36,9 +38,10 @@ let
             googletrans
             ;
         };
+      haskell-packages = (pkgs-to-haskell-overlay pkgs { } pkgs.haskellPackages);
       vim-plugins = pkgs-to-vim-plugins pkgs;
     in
-    flat-packages // python-packages // vim-plugins;
+    flat-packages // python-packages // vim-plugins // haskell-packages;
   pkgs-to-vim-plugins = pkgs: to-vim-plugins { inherit pkgs to-sources; };
 in
 {
@@ -47,5 +50,6 @@ in
     pkgs-to-flat-packages
     pkgs-to-python-modules
     pkgs-to-vim-plugins
+    pkgs-to-haskell-overlay
     ;
 }

pkgs/to-haskell-overlay/default.nix

@@ -0,0 +1,38 @@
+{ pkgs, to-sources }:
+final: prev:
+let
+  sources = to-sources { inherit pkgs; };
+  inherit (prev) callPackage;
+  callIFD = import ../callIFD.nix;
+in
+rec {
+  iCalendar =
+    (pkgs.haskell.lib.overrideSrc prev.iCalendar {
+      src = pkgs.fetchFromGitHub {
+        owner = "wrvsrx";
+        repo = "iCalendar";
+        rev = "e2f5f700294ae0d205b6bf2e372f3a99f801d7fc";
+        hash = "sha256-e2aZr8Vh/HJnTV8GwIDMzGTZBZdYf72NtapHElHw0gg=";
+      };
+    }).overrideAttrs
+      (old: {
+        meta = old.meta // {
+          broken = false;
+        };
+      });
+  osc52 = callIFD {
+    inherit callPackage;
+    source = sources.osc52;
+  };
+  taskwarrior-utils = callIFD {
+    inherit callPackage;
+    source = sources.taskwarrior-utils;
+  };
+  calendar-visualization = callIFD {
+    inherit callPackage;
+    source = sources.calendar-visualization;
+    otherArgs = {
+      inherit iCalendar;
+    };
+  };
+}

pkgs/to-normal-packages/default.nix

@@ -55,16 +55,4 @@ rec {
       height = 2160;
     };
   };
-  osc52 = callIFD {
-    inherit (haskellPackages) callPackage;
-    source = sources.osc52;
-  };
-  taskwarrior-utils = callIFD {
-    inherit (haskellPackages) callPackage;
-    source = sources.taskwarrior-utils;
-  };
-  calendar-visualization = callIFD {
-    inherit (haskellPackages) callPackage;
-    source = sources.calendar-visualization;
-  };
 }

pkgs/to-normal-packages/metacubexd/default.nix

@@ -29,7 +29,8 @@ let
     buildPhase = ''
       mkdir cache
       export XDG_CACHE_HOME=$PWD/cache
-      bun install --frozen-lockfile --verbose --production --ignore-scripts
+      # bun's update breaks `bun.lockb` sometimes
+      bun install --verbose --ignore-scripts
     '';
     installPhase = "cp -r cache $out";
     outputHash = "sha256-xuFQajgU+W/k6NIYKuV9AQAGX3OkU0h5SBr+KT1zBi0=";
@@ -55,7 +56,8 @@ let
       cp -r ${node_modules_cache} cache
       export XDG_CACHE_HOME=$PWD/cache
       chmod +w $PWD/cache/.bun/install/cache
-      bun install --frozen-lockfile --verbose --production
+      # bun's update breaks `bun.lockb` sometimes
+      bun install --verbose
       bun run build
     '';
     installPhase = "cp -r dist $out";

pkgs/to-override-packages/default.nix

@@ -10,8 +10,4 @@ in
     source = sources.xclip;
   };
   lyra = callPackage ./lyra { source = sources.lyra; };
-  spdlog = callPackage ./spdlog {
-    inherit (pkgs) spdlog;
-    source = sources.spdlog;
-  };
 }