forked from cccb-website-team/www
Merge branch 'main-staging' into staging
This commit is contained in:
commit
75ae1c30a2
35 changed files with 10781 additions and 761 deletions
|
|
@ -2,7 +2,7 @@
|
|||
description = "A flake containing a development environment for the CCCB website.";
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
devShells = forAllSystems (import ./devShells.nix);
|
||||
|
||||
formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-rfc-style);
|
||||
formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree);
|
||||
|
||||
lib.mkWwwContent =
|
||||
{ domain, system }:
|
||||
|
|
@ -50,10 +50,6 @@
|
|||
nativeBuildInputs = [
|
||||
pkgs.hugo
|
||||
pkgs.glibcLocales
|
||||
(pkgs.python3.withPackages (python-pkgs: [
|
||||
python-pkgs.icalendar
|
||||
python-pkgs.pytz
|
||||
]))
|
||||
];
|
||||
|
||||
# LOCALE_ARCHIVE = builtins.trace pkgs.glibcLocales "${pkgs.glibcLocales}/lib/locale/locale-archive";
|
||||
|
|
|
|||
Loading…
Reference in a new issue