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.

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

[main] Update flake.lock & generated files #2002

Merged
merged 2 commits into from
Aug 11, 2024
Merged

[main] Update flake.lock & generated files #2002

merged 2 commits into from
Aug 11, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Aug 10, 2024

Flake lockfile

Flake lock file updates:

• Updated input 'git-hooks':
    'github:cachix/git-hooks.nix/06939f6b7ec4d4f465bf3132a05367cccbbf64da' (2024-08-05)
  → 'github:cachix/git-hooks.nix/c7012d0c18567c889b948781bc74a501e92275d1' (2024-08-09)
• Updated input 'home-manager':
    'github:nix-community/home-manager/afc892db74d65042031a093adb6010c4c3378422' (2024-08-02)
  → 'github:nix-community/home-manager/b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e' (2024-08-07)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/cb9a96f23c491c081b38eab96d22fa958043c9fa' (2024-08-04)
  → 'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b' (2024-08-09)
• Updated input 'nuschtosSearch':
    'github:NuschtOS/search/aa5f6246565cc9b1e697d2c9d6ed2c842b17fff6' (2024-08-04)
  → 'github:NuschtOS/search/1016f4620e321c12ff1dbcd464e9de889e302d1c' (2024-08-08)

Generate

No changes

Fixes #2010

@@ -28,7 +28,7 @@ let
{
name = "astro";
description = "astrols for Astro";
package = pkgs.nodePackages."@astrojs/language-server";
package = pkgs.astro-language-server;
Copy link
Member

Choose a reason for hiding this comment

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

How long has pkgs.astro-language-server existed? Will this be a breaking change for any users who's pkgs is slightly older than ours?

Copy link
Member

Choose a reason for hiding this comment

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

Since this exact bump.
We end up on the same question as last time: should we start handling multiple distinct revisions of nixpkgs ?
Here sure, we could set package = pkgs.astro-language-server or pkgs.nodePackages."@astrojs/language-server";...

Copy link
Member

Choose a reason for hiding this comment

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

My ideal would be to evaluate the package options lazily, so that this only affects users that are using the module.

I appreciate if you don't think it's worth the effort, but I think it's more user-friendly to have the fallback; especially given most of our users aren't using our nixpkgs lock - either because they aren't using standalone or because they have a follows.

Copy link
Member

Choose a reason for hiding this comment

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

Sure, I think here we can go for this minor tweak.

Copy link
Member

Choose a reason for hiding this comment

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

I've opened #2004 for the more general issue

Copy link

Choose a reason for hiding this comment

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

Here is the nixpkgs issue for the package: NixOS/nixpkgs#309100
The change was merged 5th, August.

Copy link

Choose a reason for hiding this comment

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

I opened a bug report NixOS/nixpkgs#333677

Flake lock file updates:

• Updated input 'git-hooks':
    'github:cachix/git-hooks.nix/06939f6b7ec4d4f465bf3132a05367cccbbf64da' (2024-08-05)
  → 'github:cachix/git-hooks.nix/c7012d0c18567c889b948781bc74a501e92275d1' (2024-08-09)
• Updated input 'home-manager':
    'github:nix-community/home-manager/afc892db74d65042031a093adb6010c4c3378422' (2024-08-02)
  → 'github:nix-community/home-manager/b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e' (2024-08-07)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/cb9a96f23c491c081b38eab96d22fa958043c9fa' (2024-08-04)
  → 'github:NixOS/nixpkgs/5e0ca22929f3342b19569b21b2f3462f053e497b' (2024-08-09)
• Updated input 'nuschtosSearch':
    'github:NuschtOS/search/aa5f6246565cc9b1e697d2c9d6ed2c842b17fff6' (2024-08-04)
  → 'github:NuschtOS/search/1016f4620e321c12ff1dbcd464e9de889e302d1c' (2024-08-08)
@GaetanLepage
Copy link
Member

treefmt still behaves strangely for me locally...

❯ nix fmt
treefmt: error: --tree-root and --tree-root-file can't be used together

@MattSturgeon
Copy link
Member

treefmt still behaves strangely for me locally...

❯ nix fmt
treefmt: error: --tree-root and --tree-root-file can't be used together

I can't reproduce this on this branch:

$ format
warning: ignoring untrusted substituter 'https://nix-community.cachix.org', you are not a trusted user.
Run `man nix.conf` for more information on the `substituters` configuration option.
WARN format: no formatter for path: .editorconfig
traversed 686 files
emitted 686 files for processing
formatted 661 files (0 changed) in 47.822s

@GaetanLepage
Copy link
Member

I can't reproduce this on this branch:

Ok, maybe some impurities on my side then.
Should we merge this ?

Copy link
Member

@MattSturgeon MattSturgeon left a comment

Choose a reason for hiding this comment

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

LGTM

rupurt added a commit to rupurt/nix-home that referenced this pull request Aug 11, 2024
- [ ] try again when astrojs node packages is fixed nix-community/nixvim#2002
@GaetanLepage
Copy link
Member

@Mergifyio queue

Copy link
Contributor

mergify bot commented Aug 11, 2024

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at f13bdef

@mergify mergify bot merged commit f13bdef into main Aug 11, 2024
4 checks passed
rupurt added a commit to rupurt/nix-home that referenced this pull request Aug 11, 2024
- [ ] try again when astrojs node packages is fixed nix-community/nixvim#2002
rupurt added a commit to rupurt/nix-home that referenced this pull request Aug 12, 2024
- [ ] try again when astrojs node packages is fixed nix-community/nixvim#2002
rupurt added a commit to rupurt/nix-home that referenced this pull request Aug 28, 2024
- [ ] try again when astrojs node packages is fixed nix-community/nixvim#2002
rupurt added a commit to rupurt/nix-home that referenced this pull request Aug 28, 2024
- [ ] try again when astrojs node packages is fixed nix-community/nixvim#2002
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Alias @astrojs/language-server is still in node-packages.nix
3 participants