From 9b0da1e267c160f2aa9ad14f2869b04bfd2467a4 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Sat, 7 Jun 2025 19:22:56 +0200
Subject: [PATCH] flake lib.mkWwwContent

---
 flake.nix    | 42 +++++++++++++++++++++++++++++++++++++++-
 packages.nix | 54 +++++++++++++---------------------------------------
 2 files changed, 54 insertions(+), 42 deletions(-)

diff --git a/flake.nix b/flake.nix
index f30d0cc..462a81d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,7 +25,7 @@
             inherit system;
             pkgs = nixpkgs.legacyPackages.${system};
             selfPkgs = self.packages.${system};
-            lib = pkgs.lib;
+            lib = pkgs.lib // self.lib;
           }
         );
     in
@@ -35,5 +35,45 @@
       devShells = forAllSystems (import ./devShells.nix);
 
       formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-rfc-style);
+
+      lib.mkWwwContent =
+        { domain, system }:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+        pkgs.stdenvNoCC.mkDerivation {
+          pname = "www-content";
+          version = domain;
+          src = ./.;
+
+          # Build dependencies
+          nativeBuildInputs = [
+            pkgs.hugo
+            pkgs.glibcLocales
+            (pkgs.python3.withPackages (python-pkgs: [
+              python-pkgs.icalendar
+              python-pkgs.pytz
+            ]))
+          ];
+
+          LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
+
+          # Build phase - run Hugo to generate the site
+          buildPhase = ''
+            mkdir -p public
+            hugo --baseURL=https://${domain}/
+
+            python3 ./tools/merge_cals.py
+            upcoming="$(python3 tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')"
+            cp static/all.ics public/all.ics
+            sed -i "s#CALENDAR#$upcoming#g" public/index.html
+          '';
+
+          # Install phase - copy the public directory to the output
+          installPhase = ''
+            mkdir -p $out
+            cp -r public/* $out/
+          '';
+        };
     };
 }
diff --git a/packages.nix b/packages.nix
index 97e08f6..08271c9 100644
--- a/packages.nix
+++ b/packages.nix
@@ -1,47 +1,19 @@
 {
   pkgs,
+  lib,
   ...
 }:
-let
-  mkWwwContent =
-    { domain }:
-    pkgs.stdenvNoCC.mkDerivation {
-      pname = "www-content";
-      version = domain;
-      src = ./.;
-
-      # Build dependencies
-      nativeBuildInputs = [
-        pkgs.hugo
-        pkgs.glibcLocales
-        (pkgs.python3.withPackages (python-pkgs: [
-          python-pkgs.icalendar
-          python-pkgs.pytz
-        ]))
-      ];
-
-      LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive";
-
-      # Build phase - run Hugo to generate the site
-      buildPhase = ''
-        mkdir -p public
-        hugo --baseURL=https://${domain}/
-
-        python3 ./tools/merge_cals.py
-        upcoming="$(python3 tools/gen_upcoming.py static/all.ics 20 5 | tr '\n' ' ')"
-        cp static/all.ics public/all.ics
-        sed -i "s#CALENDAR#$upcoming#g" public/index.html
-      '';
-
-      # Install phase - copy the public directory to the output
-      installPhase = ''
-        mkdir -p $out
-        cp -r public/* $out/
-      '';
-    };
-in
 {
-  production-content = mkWwwContent { domain = "berlin.ccc.de"; };
-  staging-content = mkWwwContent { domain = "staging.berlin.ccc.de"; };
-  local-content = mkWwwContent { domain = "localhost"; };
+  production-content = lib.mkWwwContent {
+    domain = "berlin.ccc.de";
+    inherit (pkgs) system;
+  };
+  staging-content = lib.mkWwwContent {
+    domain = "staging.berlin.ccc.de";
+    inherit (pkgs) system;
+  };
+  local-content = lib.mkWwwContent {
+    domain = "localhost";
+    inherit (pkgs) system;
+  };
 }