Skip to content

Conversation

oriongonza
Copy link
Contributor

This adds support for direnv and nix flakes / nix shell. I'm not sure if we should have a working nix configuration though.

r? @Noratrieb

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 2, 2024
Copy link
Member

@Noratrieb Noratrieb left a comment

Choose a reason for hiding this comment

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

seems fine, though I'm a bit on the edge if it's worth it

@Noratrieb
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 3, 2024

📌 Commit 510e262 has been approved by Noratrieb

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 3, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 3, 2024
.gitignore files for nix

This adds support for direnv and nix flakes / nix shell. I'm not sure if we should have a working nix configuration though.

r? `@noratrieb`
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 3, 2024
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#131024 (Don't give method suggestions when method probe fails due to bad implementation of `Deref`)
 - rust-lang#131112 (TransmuteFrom: Gracefully handle unnormalized types and normalization errors)
 - rust-lang#131176 (.gitignore files for nix)
 - rust-lang#131183 (Refactoring to `OpaqueTyOrigin`)
 - rust-lang#131187 (Avoid ICE in coverage builds with bad `#[coverage(..)]` attributes)
 - rust-lang#131192 (Handle `rustc_query_impl` cases of `rustc::potential_query_instability` lint)
 - rust-lang#131197 (Avoid emptiness check in `PeekMut::pop`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d3a3ac2 into rust-lang:master Oct 4, 2024
6 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Oct 4, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 4, 2024
Rollup merge of rust-lang#131176 - dev-ardi:gitignore, r=Noratrieb

.gitignore files for nix

This adds support for direnv and nix flakes / nix shell. I'm not sure if we should have a working nix configuration though.

r? ``@noratrieb``
fmease added a commit to fmease/rust that referenced this pull request Dec 10, 2024
…2024-12-10, r=Noratrieb

Miscellaneous fixes for nix-dev-shell

this makes it so files in `src/nix-dev-shell` are *not* ignored, as they
should not be. note that `flake.lock` is still ignored globally.

r? `@Noratrieb`

See individual commits for more info.

cc rust-lang#131176 (it added gitignore entries I'm changing).
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 10, 2024
Rollup merge of rust-lang#134102 - WaffleLapkin:nix-dev-shell-fixups-2024-12-10, r=Noratrieb

Miscellaneous fixes for nix-dev-shell

this makes it so files in `src/nix-dev-shell` are *not* ignored, as they
should not be. note that `flake.lock` is still ignored globally.

r? `@Noratrieb`

See individual commits for more info.

cc rust-lang#131176 (it added gitignore entries I'm changing).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants