Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0ef99d4e0108
Choose a base ref
...
head repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c86dba245f48
Choose a head ref
5 contributors
Loading
Showing with 294 additions and 417 deletions.
  1. +2 −0 .gitignore
  2. +30 −14 Makefile
  3. +231 −221 blogs.xml
  4. +2 −0 commercial-support.tt
  5. +1 −1 community.tt
  6. +21 −21 flake.lock
  7. +6 −4 flake.nix
  8. +1 −1 layout.tt
  9. +0 −110 site-styles/configuration.less
  10. +0 −44 site-styles/default.nix
  11. +0 −1 site-styles/setup.less
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -17,8 +17,10 @@
/blogs.xml
/demos/*.cast
/demos/*.svg
/tmp.*
/favicon.png
/favicon.ico
/site-styles/common-styles
/news-rss.xml
/nixos-release.tt
/robots.txt
44 changes: 30 additions & 14 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -124,7 +124,6 @@ $(NIXOS_MANUAL_UNSTABLE_OUT): $(NIXOS_MANUAL_UNSTABLE_IN) scripts/bootstrapify-d


all: $(HTML) favicon.png favicon.ico robots.txt \
styles \
$(subst .png,-small.png,$(filter-out %-small.png,$(wildcard images/screenshots/*)))


@@ -195,19 +194,36 @@ update: blogs.xml
@true
endif

# The nix-built site will use the provided SITE_STYLES
ifeq ($(strip $(NIXOS_SITE_STYLES)),)
# But development `make` builds will nix-build.
styles: $(wildcard site-styles/*)
nix build ./#packages.x86_64-linux.siteStyles \
--experimental-features 'nix-command flakes' \
--no-update-lock-file \
--no-write-lock-file \
--out-link $@
else
styles:
@ln -sfn $(NIXOS_SITE_STYLES) $@
endif
tmp.svg.less: $(wildcard site-styles/assets/*)
embed-svg site-styles/assets tmp.svg.less

tmp.styles: tmp.svg.less $(wildcard site-styles/*.less)
mkdir -p tmp.styles
cp -R site-styles/* tmp.styles/
rm -rf tmp.styles/assets/*
cp tmp.svg.less tmp.styles/assets/svg.less

styles/fonts: $(wildcard site-styles/common-styles/fonts/*)
rm -rf styles/fonts
mkdir -p styles/fonts
cp site-styles/common-styles/fonts/*.ttf styles/fonts

styles/index.css: tmp.styles $(wildcard site-styles/*.less)
mkdir -vp styles
lessc --verbose --source-map=styles/index.css.map tmp.styles/index.less styles/index.css

styles/pages/community.css: tmp.styles $(wildcard site-styles/*.less)
mkdir -vp styles/pages
lessc --verbose \
--source-map=styles/pages/community.css.map \
tmp.styles/pages/community.private.less \
styles/pages/community.css;

styles: $(wildcard site-styles/*.less) \
tmp.styles \
styles/fonts \
styles/index.css \
styles/pages/community.css

all: manuals

Loading