Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix nix.dev #1142

Merged
merged 2 commits into from
Oct 31, 2023
Merged

Fix nix.dev #1142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cee0e30
scripts/update.sh: Explicitly enable experimental Nix features
infinisil Oct 31, 2023
b90846c
flake: Update nix.dev and fix output reference
infinisil Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 4 additions & 30 deletions flake.lock
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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/