diff --git a/flake.lock b/flake.lock index f9f44cf..1b01feb 100644 --- a/flake.lock +++ b/flake.lock @@ -3,16 +3,17 @@ "anemone": { "flake": false, "locked": { - "lastModified": 1753053308, - "narHash": "sha256-vyB7gLKzTFLSEPPD4ylc3Uyj3WeKRFFklEnE58jn5JA=", - "owner": "Speyll", + "lastModified": 1787795794, + "narHash": "sha256-PjluJK5TJ6A5MPhrStJO24kknPeMACFRWJl1alBnogU=", + "owner": "PinkNoize", "repo": "anemone", - "rev": "47b2085cb01f0e82fd83221aad79ab0b3d1702e0", + "rev": "8c1bae458ae24ac5fe0ff14706a463b51bf429e5", "type": "github" }, "original": { - "owner": "Speyll", + "owner": "PinkNoize", "repo": "anemone", + "rev": "8c1bae458ae24ac5fe0ff14706a463b51bf429e5", "type": "github" } }, @@ -38,11 +39,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769018530, - "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", + "lastModified": 1789006805, + "narHash": "sha256-xB8mKMOx1IA9vTDNLmJZ6n4wCMq/cuWBBOzGCRnqxrU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", + "rev": "8ce4ef6cb6f871616146b9fe26d2a5ae594e94fe", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9e0fc83..b478f8c 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,9 @@ inputs.nixpkgs-lib.follows = "nixpkgs"; }; anemone = { - url = "github:Speyll/anemone"; + # Pinned to PinkNoize's zola-0.23/Tera-v2 migration until it's merged + # upstream: https://github.com/Speyll/anemone/pull/41 + url = "github:PinkNoize/anemone/8c1bae458ae24ac5fe0ff14706a463b51bf429e5"; flake = false; }; }; @@ -40,7 +42,8 @@ ); nixosModules.default = self.nixosModules.zx-dev; }; - systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin"]; + # x86_64-darwin dropped from nixpkgs 26.11; drop it here too. + systems = ["x86_64-linux" "aarch64-linux" "aarch64-darwin"]; perSystem = { pkgs, self', diff --git a/package.nix b/package.nix index f0abcbf..23e9026 100644 --- a/package.nix +++ b/package.nix @@ -1,6 +1,7 @@ { self, stdenv, + cacert, pkgs, anemone, }: let @@ -19,6 +20,7 @@ in name = "zx.dev"; src = ./.; buildInputs = [pkgs.zola]; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; buildPhase = "zola build"; installPhase = '' mkdir -p $out diff --git a/templates/base.html b/templates/base.html index 38be2d8..7d71084 100644 --- a/templates/base.html +++ b/templates/base.html @@ -30,6 +30,7 @@ + {% block head %}{% endblock %}