Skip to content

Backport git+file:./ fixes to 2.24 (#12107 + #12277)#12287

Merged
roberth merged 7 commits intoNixOS:2.24-maintenancefrom
bryango:2.24-maintenance
Jan 21, 2025
Merged

Backport git+file:./ fixes to 2.24 (#12107 + #12277)#12287
roberth merged 7 commits intoNixOS:2.24-maintenancefrom
bryango:2.24-maintenance

Conversation

@bryango
Copy link
Copy Markdown
Member

@bryango bryango commented Jan 17, 2025 •
edited
Loading

Motivation

This PR rolls up some backports of git+file:./ fixes to 2.24, including the warning against the use of it in flake inputs.

Note however, that:

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.

@github-actions github-actions bot added with-tests Issues related to testing. PRs with tests have some priority fetching Networking with the outside (non-Nix) world, input locking labels Jan 17, 2025
@bryango bryango changed the title Backport git+file:./ fixes (backport #12107, #12280, #12277) Backport git+file:./ fixes (#12107, #12280, #12277) Jan 17, 2025
@bryango bryango force-pushed the 2.24-maintenance branch 6 times, most recently from 3bbc5f9 to e5738e4 Compare January 18, 2025 16:49
bryango and others added 7 commits January 19, 2025 14:55
@bryango
fetchers/git: make path absolute for local repo
6e44bc2 
(cherry picked from commit 96bd9ba)
@bryango
tests/flakes: check git+file:./${submodule} protocol
84e3f4a 
Relative, local git repo used to work (for submodules), but it
fails after 3e0129c.

This commit adds a test to prevent such failure in the future.

(cherry picked from commit 9d088fa)
@bryango
tests/flake-in-submodule: git+file:./* input
d4f0e8f 
(cherry picked from commit 37ac18d)
@roberth @bryango
Clarify cd call in tests/functional/flakes/flakes.sh
b2acf4a 
(cherry picked from commit d9a50c0)
@edolstra @bryango
Use isAbsolute()
d944cb7 
(cherry picked from commit ff9d886)
@edolstra @bryango
Warn against the use of relative 'git+file:' flake inputs
f27e263 
(cherry picked from commit 12e1495)
@edolstra @bryango
Add link to tracking issue
876d724 
(cherry picked from commit 3197c19)
@bryango bryango marked this pull request as ready for review January 19, 2025 12:11
@bryango bryango requested a review from edolstra as a code owner January 19, 2025 12:11
@bryango bryango changed the title Backport git+file:./ fixes (#12107, #12280, #12277) Backport git+file:./ fixes to 2.24 (#12107 + #12277) Jan 19, 2025
@bryango bryango mentioned this pull request Jan 19, 2025
Closed
@roberth roberth merged commit f22359b into NixOS:2.24-maintenance Jan 21, 2025
@roberth roberth mentioned this pull request Jan 21, 2025
Closed
@roberth
Copy link
Copy Markdown
Member

roberth commented Jan 21, 2025

Thank you @bryango!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@edolstra edolstra Awaiting requested review from edolstra edolstra is a code owner

1 more reviewer

@roberth roberth roberth approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

fetching Networking with the outside (non-Nix) world, input locking with-tests Issues related to testing. PRs with tests have some priority

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@bryango @roberth @edolstra