Skip to content

merge queue: embarking 2.28-maintenance (8db221b), #13591, #13585, #13619 and [#13609 + #13593 + #13647 + #13634 + #13611] together#13667

Closed
mergify[bot] wants to merge 18 commits into2.28-maintenancefrom
mergify/merge-queue/f2cc346394
Closed

merge queue: embarking 2.28-maintenance (8db221b), #13591, #13585, #13619 and [#13609 + #13593 + #13647 + #13634 + #13611] together#13667
mergify[bot] wants to merge 18 commits into2.28-maintenancefrom
mergify/merge-queue/f2cc346394

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jul 30, 2025 •
edited
Loading

🎉 This combination of pull requests has been checked successfully and will be merged soon. 🎉

Branch 2.28-maintenance (8db221b), #13591, #13585, #13619 and [#13609 + #13593 + #13647 + #13634 + #13611] are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of [#13609 + #13593 + #13647 + #13634 + #13611].
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue default for merge:

  • check-success=installer test on macos
  • check-success=installer test on ubuntu
  • check-success=tests on macos
  • check-success=tests on ubuntu
  • check-success=vm_tests
  • any of [🛡 GitHub branch protection]:
    • check-success = installer test on macos
    • check-neutral = installer test on macos
    • check-skipped = installer test on macos
  • any of [🛡 GitHub branch protection]:
    • check-success = installer test on ubuntu
    • check-neutral = installer test on ubuntu
    • check-skipped = installer test on ubuntu
  • any of [🛡 GitHub branch protection]:
    • check-success = tests on macos
    • check-neutral = tests on macos
    • check-skipped = tests on macos
  • any of [🛡 GitHub branch protection]:
    • check-success = tests on ubuntu
    • check-neutral = tests on ubuntu
    • check-skipped = tests on ubuntu

Required conditions to stay in the queue:

---
checking_base_sha: b39697afca6c458615b19ef31676e62a6da297cb
previous_failed_batches: []
pull_requests:
  - number: 13609
  - number: 13593
  - number: 13647
  - number: 13634
  - number: 13611
...

gwennlbh and others added 18 commits July 30, 2025 12:00
@gwennlbh @mergify
docs: add another equivalence for the implication operator
7126d57 
the second equivalence, using a if-else expression, aligns much closer to how most humans think about implication, adding it might help some people :)

(cherry picked from commit 51151c2)
@stefanboca @mergify
nix-profile{,-daemon}.fish: check for profile in XDG_DATA_HOME
3a3ee4a 
...and also NIX_STATE_HOME in nix-profile.fish. This is directly
translated from the bash scripts and makes the fish scripts equivalent
in functionality to the bash scripts.

Note that nix-profile.fish checks for NIX_STATE_HOME and
nix-profile-daemon.fish does not, so the two scripts are no longer
identical.

(cherry picked from commit 751f50f)
@xokdvium @mergify
export/meson: Don't require -std=c++2a for -c libraries in .pc files
354d4c4 
(cherry picked from commit d8da8f0)
@fzakaria @mergify
Overriding gtest with gmock
59da02d 
How did this work before...

* Added .direnv/ to gitignore

(cherry picked from commit 58e34a2)
@donottellmetonottellyou @mergify
add documentation of tarball-ttl to nix-channel
b320aa5 
(cherry picked from commit 6badd21)
@donottellmetonottellyou @fricklerhandwerk @mergify
remove overly verbose mention of fetchTarball
ab3ad12 
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
(cherry picked from commit 633d391)
@donottellmetonottellyou @fricklerhandwerk @mergify
add reference to the tarball-ttl documentation
aace3d9 
Co-authored-by: Valentin Gagarin <valentin@gagarin.work>
(cherry picked from commit c0ceaa2)
@edolstra @mergify
Prevent double copy of nixpkgs source tree
63f18cd 
(cherry picked from commit 0a87ba0)
@jayeshv @mergify
Fix a minor typo
cac6cfe 
(cherry picked from commit 699db04)
@egorkonovalov @mergify
Fix link
01963be 
Remove extra `realise`

(cherry picked from commit df21f24)
@mergify
Merge of #13591
98b7d78
@mergify
Merge of #13585
3dab3dc
@mergify
Merge of #13619
b39697a
@mergify
Merge of #13609
b95388f
@mergify
Merge of #13593
1cd7211
@mergify
Merge of #13647
fba939c
@mergify
Merge of #13634
9bbfcbc
@mergify
Merge of #13611
82dbb90
@mergify mergify bot closed this Jul 31, 2025
@mergify mergify bot deleted the mergify/merge-queue/f2cc346394 branch July 31, 2025 02:59
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 will be requested when the pull request is marked ready for review edolstra is a code owner

Assignees

No one assigned

Labels

documentation

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@gwennlbh @stefanboca @xokdvium @fzakaria @donottellmetonottellyou @edolstra @jayeshv @egorkonovalov