Merge branch 'master' into dependabot/github_actions/cachix/install-nix-action-22

This commit is contained in:
mergify[bot] 2023-06-24 03:42:05 +00:00 committed by GitHub
commit a16e409108
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View file

@ -17,6 +17,6 @@ pull_request_rules:
- name: merge using the merge queue - name: merge using the merge queue
conditions: conditions:
- base=master - base=master
- label=merge-queue - label~=merge-queue|dependencies
actions: actions:
queue: {} queue: {}

12
flake.lock generated
View file

@ -5,11 +5,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1685518550, "lastModified": 1687171271,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1686488075, "lastModified": 1687335664,
"narHash": "sha256-2otSBt2hbeD+5yY25NF3RhWx7l5SDt1aeU3cJ/9My4M=", "narHash": "sha256-gMoOCTUSLozoi+eSe99SGzjNJdgciMOoNxVJlVrqLfs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9401a0c780b49faf6c28adf55764f230301d0dce", "rev": "7b697d9698d5ae350e49e8eeb05c568708bdd9f0",
"type": "github" "type": "github"
}, },
"original": { "original": {