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

Jump to bottom

Automated update #130

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Automated update #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/after-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
echo "after=$(<pkgs/test/check-by-name/pinned-version.txt)" >> $GITHUB_ENV

- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
# To trigger CI for automated PRs, we use a separate machine account
# See https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#workarounds-to-trigger-further-workflow-runs
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: cachix/install-nix-action@V27
- uses: cachix/install-nix-action@v30
Copy link
Member

Choose a reason for hiding this comment

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

Woot! 🚀


- name: build
run: nix-build -A ci
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
with:
path: repo

- uses: cachix/install-nix-action@V27
- uses: cachix/install-nix-action@v30

- name: Run update script
run: |
Expand All @@ -35,7 +35,7 @@ jobs:

- name: Create Pull Request
if: ${{ github.event_name != 'pull_request' }}
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
# To trigger CI for automated PRs, we use a separate machine account
# See https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#workarounds-to-trigger-further-workflow-runs
Expand Down
68 changes: 40 additions & 28 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ edition = "2021"
[dependencies]
rnix = "0.11.0"
regex = "1.11.1"
clap = { version = "4.5.20", features = ["derive"] }
serde_json = "1.0.132"
clap = { version = "4.5.21", features = ["derive"] }
serde_json = "1.0.133"
tempfile = "3.14.0"
serde = { version = "1.0.214", features = ["derive"] }
serde = { version = "1.0.215", features = ["derive"] }
anyhow = "1.0"
lazy_static = "1.5.0"
colored = "2.1.0"
itertools = "0.13.0"
rowan = "0.15.16"
rowan = "0.16.1"
Copy link
Member

Choose a reason for hiding this comment

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

@philiptaron This appears to be the problem, because rnix uses rowan < 0.16, leading to two versions of rowan being used, which then fail to interact. Unfortunately just downgrading this would lead to the update script just updating it again next time, possibly caused due to

nixpkgs-vet/default.nix

Lines 111 to 112 in 700a0b2

# --incompatible allows jumping to the next major version.
cargo upgrade --incompatible --manifest-path "$1/Cargo.toml" 2>&1
(ping @willbush 😉)

indoc = "2.0.5"
relative-path = "1.9.3"
textwrap = "0.16.1"
Expand Down
10 changes: 5 additions & 5 deletions npins/sources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"nixpkgs": {
"type": "Channel",
"name": "nixpkgs-unstable",
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-24.11pre704822.85f7e662eda4/nixexprs.tar.xz",
"hash": "0dqlz0xqd3nn49hnx943y5sfqd7nmj25s6gi1pjm907j3vbgg47k"
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.05pre711046.8edf06bea5bc/nixexprs.tar.xz",
"hash": "1mwsn0rvfm603svrq3pca4c51zlix5gkyr4gl6pxhhq3q6xs5s8y"
},
"treefmt-nix": {
"type": "Git",
Expand All @@ -14,9 +14,9 @@
"repo": "treefmt-nix"
},
"branch": "main",
"revision": "746901bb8dba96d154b66492a29f5db0693dbfcc",
"url": "https://github.com/numtide/treefmt-nix/archive/746901bb8dba96d154b66492a29f5db0693dbfcc.tar.gz",
"hash": "18lrzsgksq58xlbnkaavs9r139z2rp5js9b3pc6x9mxavb9rmbxw"
"revision": "705df92694af7093dfbb27109ce16d828a79155f",
"url": "https://github.com/numtide/treefmt-nix/archive/705df92694af7093dfbb27109ce16d828a79155f.tar.gz",
"hash": "1716bc7vhphb2qiafyx5kjia8458wvcfalrbpdy7pg9qrs1sfr75"
}
},
"version": 3
Expand Down
Loading