Skip to content

Commit

Permalink
Fix nix.dev (#1142)
Browse files Browse the repository at this point in the history
The nix.dev flake changed the output schema in

NixOS/nix.dev@957bda7

This failed the last attempted automated CI update:

https://github.com/NixOS/nixos-homepage/actions/runs/6700205463/job/18205745665
  • Loading branch information
infinisil authored Oct 31, 2023
1 parent b8fbc8a commit 83473ec
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 33 deletions.
34 changes: 4 additions & 30 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ rec {
"NIXOS_AMIS=${nixosAmis}"
"NIX_PILLS_MANUAL_IN=${nixPills.html-split}/share/doc/nix-pills"
"NIX_PILLS_MANUAL_EPUB=${nixPills.epub}/share/doc/nix-pills/nix-pills.epub"
"NIX_DEV_MANUAL_IN=${nix-dev.defaultPackage.${system}}"
"NIX_DEV_MANUAL_IN=${nix-dev.packages.${system}.default}"

"-j 1"
];
Expand Down Expand Up @@ -174,7 +174,7 @@ rec {
export NIXOS_AMIS="${nixosAmis}"
export NIX_PILLS_MANUAL_IN="${nixPills.html-split}/share/doc/nix-pills"
export NIX_PILLS_MANUAL_EPUB="${nixPills.epub}/share/doc/nix-pills/nix-pills.epub"
export NIX_DEV_MANUAL_IN="${nix-dev.defaultPackage.${system}}"
export NIX_DEV_MANUAL_IN="${nix-dev.packages.${system}.default}"
rm -f site-styles/common-styles
ln -s ${nixos-common-styles.packages."${system}".commonStyles} site-styles/common-styles
Expand Down
5 changes: 4 additions & 1 deletion scripts/update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -e

echo "Updating flake inputs..."
nix flake lock \
--extra-experimental-features 'nix-command flakes' \
--update-input released-nixpkgs-unstable \
--update-input released-nixpkgs-stable \
--update-input released-nix-unstable \
Expand All @@ -12,4 +13,6 @@ nix flake lock \
--update-input nix-dev

echo "Updating blog..."
nix develop --command update-blog --output-dir blog/
nix develop \
--extra-experimental-features 'nix-command flakes' \
--command update-blog --output-dir blog/

1 comment on commit 83473ec

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎉 Published on https://nixos.org as production
🚀 Deployed on https://65413b780d3bf44292cbcb0d--nixos-homepage.netlify.app

Please sign in to comment.