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

flake.lock: Update #410

Merged
merged 2 commits into from
Oct 3, 2023
Merged

flake.lock: Update #410

merged 2 commits into from
Oct 3, 2023

Conversation

sops-nix-bot
Copy link
Owner

@sops-nix-bot sops-nix-bot commented Sep 24, 2023

Automated changes by the update-flake-lock GitHub Action.

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/46688f8eb5cd6f1298d873d4d2b9cf245e09e88e' (2023-09-15)
  → 'github:NixOS/nixpkgs/bd9b686c0168041aea600222be0805a0de6e6ab8' (2023-09-29)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/596611941a74be176b98aeba9328aa9d01b8b322' (2023-09-16)
  → 'github:NixOS/nixpkgs/dbe90e63a36762f1fbde546e26a84af774a32455' (2023-10-01)

Running GitHub Actions on this PR

GitHub Actions will not run workflows on pull requests which are opened by a GitHub Action.

To run GitHub Actions workflows on this PR, run:

git branch -D update_flake_lock_action
git fetch origin
git checkout update_flake_lock_action
git commit --amend --no-edit
git push origin update_flake_lock_action --force

@sops-nix-bot sops-nix-bot added the merge-queue merge after ci succeeds label Sep 24, 2023
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/46688f8eb5cd6f1298d873d4d2b9cf245e09e88e' (2023-09-15)
  → 'github:NixOS/nixpkgs/bd9b686c0168041aea600222be0805a0de6e6ab8' (2023-09-29)
• Updated input 'nixpkgs-stable':
    'github:NixOS/nixpkgs/596611941a74be176b98aeba9328aa9d01b8b322' (2023-09-16)
  → 'github:NixOS/nixpkgs/dbe90e63a36762f1fbde546e26a84af774a32455' (2023-10-01)
@Mic92
Copy link
Owner

Mic92 commented Oct 3, 2023

@mergify queue

@mergify
Copy link
Contributor

mergify bot commented Oct 3, 2023

queue

❌ Branch protection setting 'linear history' conflicts with Mergify configuration

Branch protection setting 'linear history' works only if merge_method: squash or merge_method: rebase.

@Mic92
Copy link
Owner

Mic92 commented Oct 3, 2023

@mergify queue

@mergify
Copy link
Contributor

mergify bot commented Oct 3, 2023

queue

✅ The pull request has been merged automatically

The pull request has been merged automatically at 746c7fa

@mergify mergify bot merged commit 746c7fa into master Oct 3, 2023
57 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge-queue merge after ci succeeds
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants