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 #2964

Merged
merged 3 commits into from
Feb 5, 2025
Merged

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

merged 3 commits into from
Feb 5, 2025

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Feb 3, 2025

Flake lockfile

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/18fa9f323d8adbb0b7b8b98a8488db308210ed93?narHash=sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg%3D' (2025-02-01)
  → 'github:nix-community/home-manager/f20b7a8ab527a2482f13754dc00b2deaddc34599?narHash=sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38%3D' (2025-02-05)
• Updated input 'nix-darwin':
    'github:lnl7/nix-darwin/49b807fa7c37568d7fbe2aeaafb9255c185412f9?narHash=sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3%2B%2B0qN1rQBg8FW0%3D' (2025-01-30)
  → 'github:lnl7/nix-darwin/ae406c04577ff9a64087018c79b4fdc02468c87c?narHash=sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc%3D' (2025-02-05)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/102a39bfee444533e6b4e8611d7e92aa39b7bec1?narHash=sha256-Q4vhtbLYWBUnjWD4iQb003Lt%2BN5PuURDad1BngGKdUs%3D' (2025-02-01)
  → 'github:NixOS/nixpkgs/5b2753b0356d1c951d7a3ef1d086ba5a71fff43c?narHash=sha256-UEYOKfXXKU49fR7dGB05As0s2pGbLK4xDo48Qtdm7xs%3D' (2025-02-05)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/bebf27d00f7d10ba75332a0541ac43676985dea3?narHash=sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk%3D' (2025-01-28)
  → 'github:numtide/treefmt-nix/64dbb922d51a42c0ced6a7668ca008dded61c483?narHash=sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I%3D' (2025-02-04)

Generate

No changes

@GaetanLepage GaetanLepage marked this pull request as draft February 3, 2025 13:33
@GaetanLepage GaetanLepage marked this pull request as ready for review February 4, 2025 07:25
@GaetanLepage GaetanLepage requested a review from a team February 4, 2025 07:25
@GaetanLepage GaetanLepage force-pushed the update/main branch 3 times, most recently from 868de57 to 1f76cd7 Compare February 4, 2025 12:41
@GaetanLepage
Copy link
Member

Most tests fail with:

error: assertion '(((builtins).isAttrs localSystem) -> (! ((localSystem) ? parsed)))' failed
       at /nix/store/2cxciy0vg27dg357nm08gvgmr00j1f90-source/pkgs/top-level/default.nix:51:1

I bisected nixpkgs and got:

434e36ab91be1454bcd4854878d683aaf50633f5 is the first bad commit
commit 434e36ab91be1454bcd4854878d683aaf50633f5
Author: Wolfgang Walther <walther@technowledgy.de>
Date:   Sun Jan 26 14:38:49 2025 +0100

    pkgs/top-level: add assert to prevent passing elaborated systems
    
    The commit to make package sets composable depends on the fact that
    localSystem and crossSystem can be passed forward to lower package sets
    for composition. Once we pass a fully elaborated system, this will break
    down - getters like "isStatic", "isMusl" etc. will not change with the
    package set anymore, but be stuck on the value passed in via those
    options.
    
    This is a limitation of lib.systems.elaborate primarily, because it
    can't deal with arbitrary overrides properly.
    
    freshBootstrapTools on darwin used to do this, although in this case it
    didn't do any harm: There shouldn't be any package sets composed during
    bootstrap anyway. Refactor it, to avoid throwing the assert.

 pkgs/top-level/all-packages.nix | 4 ++--
 pkgs/top-level/default.nix      | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

NixOS/nixpkgs#376988

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.

Looks like nix-darwin also needs updating to work-around the new nixpkgs assertions. I don't think we can merge this until nix-darwin has a fix?

One way we could get this merged early would be to override our nix-darwin input to point to LnL7/nix-darwin#1318, but I think I'd rather wait for it to be merged.

MattSturgeon and others added 3 commits February 5, 2025 15:56
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/18fa9f323d8adbb0b7b8b98a8488db308210ed93?narHash=sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg%3D' (2025-02-01)
  → 'github:nix-community/home-manager/f20b7a8ab527a2482f13754dc00b2deaddc34599?narHash=sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38%3D' (2025-02-05)
• Updated input 'nix-darwin':
    'github:lnl7/nix-darwin/49b807fa7c37568d7fbe2aeaafb9255c185412f9?narHash=sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3%2B%2B0qN1rQBg8FW0%3D' (2025-01-30)
  → 'github:lnl7/nix-darwin/ae406c04577ff9a64087018c79b4fdc02468c87c?narHash=sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc%3D' (2025-02-05)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/102a39bfee444533e6b4e8611d7e92aa39b7bec1?narHash=sha256-Q4vhtbLYWBUnjWD4iQb003Lt%2BN5PuURDad1BngGKdUs%3D' (2025-02-01)
  → 'github:NixOS/nixpkgs/5b2753b0356d1c951d7a3ef1d086ba5a71fff43c?narHash=sha256-UEYOKfXXKU49fR7dGB05As0s2pGbLK4xDo48Qtdm7xs%3D' (2025-02-05)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/bebf27d00f7d10ba75332a0541ac43676985dea3?narHash=sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk%3D' (2025-01-28)
  → 'github:numtide/treefmt-nix/64dbb922d51a42c0ced6a7668ca008dded61c483?narHash=sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I%3D' (2025-02-04)
@GaetanLepage
Copy link
Member

@mergify queue

Copy link
Contributor

mergify bot commented Feb 5, 2025

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at d709c12

Copy link
Contributor

mergify bot commented Feb 5, 2025

This pull request, with head sha d709c12cdd0cf449415ad8fa627cedb6516588c8, has been successfully merged with fast-forward by Mergify.

This pull request will be automatically closed by GitHub.

As soon as GitHub detects that the sha d709c12cdd0cf449415ad8fa627cedb6516588c8 is part of the main branch, it will mark this pull request as merged.

It is possible for this pull request to remain open if this detection does not happen, this usually happens when a force-push is done on this branch update/main, this means GitHub will fail to detect the merge.

@mergify mergify bot merged commit d709c12 into main Feb 5, 2025
4 checks passed
@mergify mergify bot temporarily deployed to github-pages February 5, 2025 16:39 Inactive
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.

2 participants