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

Sync flake with nixpkg #2218

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+19 −16
Open

Sync flake with nixpkg #2218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28684d1
chore(deps): Bump Nix flake dependencies
alerque Jan 17, 2025
91ca987
refactor(nix): Update Flake a bit to closer match nixpkgs
alerque Jan 17, 2025
648a4bf
style(nix): Reformat Nix-lang sources with nixfmt-rfc-style
alerque Jan 17, 2025
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
29 changes: 16 additions & 13 deletions build-aux/pkg.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
autoreconfHook
gitMinimal
pkg-config
fontconfig # fc-match
jq
cargo
rustc
Expand All @@ -78,19 +79,18 @@ stdenv.mkDerivation (finalAttrs: {
sed -i -e 's/tarball-version/flake-version/' configure.ac
'';

buildInputs =
[
finalAttrs.finalPackage.passthru.luaEnv
cargo-edit
harfbuzz
icu
fontconfig
libiconv
libxslt
stylua
taplo
typos
];
buildInputs = [
finalAttrs.finalPackage.passthru.luaEnv
cargo-edit
harfbuzz
icu
fontconfig
libiconv
libxslt
stylua
taplo
typos
];
Comment on lines +82 to +93
Copy link
Contributor

Choose a reason for hiding this comment

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

This is one of my painful points in the new nix formatting, but I guess I'll have to live with it :).

Copy link
Member Author

Choose a reason for hiding this comment

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

My beef is it did not apply the same style to all elements, e.g. luaPackages and configureFlags did not get formatted the same way buildInputs and others did. 🤷


configureFlags =
[
Expand Down Expand Up @@ -123,6 +123,9 @@ stdenv.mkDerivation (finalAttrs: {
];
};

strictDeps = true;
env.LUA = "${finalAttrs.finalPackage.passthru.luaEnv}/bin/lua";

enableParallelBuilding = true;

# See commentary in bootstrap.sh; we're getting AMINCCLUDE stuff inlined
Expand Down
6 changes: 3 additions & 3 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.

Loading