8000 merge queue: embarking main (bfd2857), #659 and #651 together by mergify[bot] 路 Pull Request #661 路 nix-community/nix-init 路 GitHub
[go: up one dir, main page]
Skip to content

Repository navigation

merge queue: embarking main (bfd2857), #659 and #651 together #661

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 4 commits into from
Closed

merge queue: embarking main (bfd2857), #659 and #651 together #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22527ba
fetchCargoTarball -> fetchCargoVendor
figsoda Dec 30, 2025
0afc0f0
build(deps): bump DeterminateSystems/nix-installer-action from 16 to 21
dependabot[bot] Dec 30, 2025
763634f
Merge of #659
mergify[bot] Dec 30, 2025
4a4574a
Merge of #651
mergify[bot] Dec 30, 2025
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/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- uses: actions/checkout@v6
with:
ref: ${{ inputs.tag != null && format('refs/tags/{0}', inputs.tag) || '' }}
- uses: DeterminateSystems/nix-installer-action@v16
- uses: DeterminateSystems/nix-installer-action@v21
- uses: DeterminateSystems/flakehub-push@v6
with:
visibility: public
Expand Down
2 changes: 1 addition & 1 deletion src/lang/rust/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ pub async fn cargo_deps_hash(
if has_cargo_lock {
let (hash, _) = tokio::join!(
fod_hash(format!(
r#"(import({nixpkgs}){{}}).rustPlatform.fetchCargoTarball{{name="{pname}-{version}";src={src};hash="{FAKE_HASH}";}}"#,
r#"(import({nixpkgs}){{}}).rustPlatform.fetchCargoVendor{{pname="{pname}";version="{version}";src={src};hash="{FAKE_HASH}";}}"#,
)),
async {
if let Some(lock) = resolve_workspace(src_dir) {
Expand Down
10 changes: 4 additions & 6 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,9 +660,8 @@ async fn run() -> Result<()> {
RustVendorData::Hash(hash) => {
write!(out, " ")?;
writedoc! {out, r#"
cargoDeps = rustPlatform.fetchCargoTarball {{
inherit src;
name = "${{pname}}-${{version}}";
cargoDeps = rustPlatform.fetchCargoVendor {{
inherit pname version src;
hash = "{hash}";
}};

Expand Down Expand Up @@ -773,9 +772,8 @@ async fn run() -> Result<()> {

src = {src_expr};

cargoDeps = rustPlatform.fetchCargoTarball {{
inherit src;
name = "${{pname}}-${{version}}";
cargoDeps = rustPlatform.fetchCargoVendor {{
inherit pname version src;
hash = "{hash}";
}};

Expand Down
0