Skip to content

merge queue: embarking 2.28-maintenance (8db221b), #13591, #13585, #13619, #13609, #13593, #13647, #13634, #13611 and [#13645 + #13625 + #13617 + #13581 + #13649] together#13668

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

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, #13609, #13593, #13647, #13634, #13611 and [#13645 + #13625 + #13617 + #13581 + #13649] are embarked together for merge.

This pull request has been created by Mergify to speculatively check the mergeability of [#13645 + #13625 + #13617 + #13581 + #13649].
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: 1f47e075841017f9f7268694cfe27b8cbfd9ba83
previous_failed_batches: []
pull_requests:
  - number: 13645
  - number: 13625
  - number: 13617
  - number: 13581
  - number: 13649
...

pbsds and others added 28 commits July 30, 2025 11:53
@pbsds @mergify
docs: fix duplicate anchor
1e371c4 
`#deriving-path-encoding` is defined in two places, I _think_ this is the correct one to change.

(cherry picked from commit 4c50cf7)
@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)
@poperigby @mergify
Modify docker.nix to use mapAttrsToList instead of mapAttrsFlatten
556b71d 
The latter alias is deprecated in favor of the former, and produces a
warning.

(cherry picked from commit cfc15d6)
@edolstra @mergify
Prevent double copy of nixpkgs source tree
63f18cd 
(cherry picked from commit 0a87ba0)
@lucperkins @mergify
Fix broken link in configuration description
f97ff25 
(cherry picked from commit 525078c)
@jayeshv @mergify
Fix a minor typo
cac6cfe 
(cherry picked from commit 699db04)
@synalice @mergify
Update docs
66a5d4c 
(cherry picked from commit 785f386)
@egorkonovalov @mergify
Fix link
01963be 
Remove extra `realise`

(cherry picked from commit df21f24)
@xokdvium @mergify
libstore-tests: Don't leak memory in tests
9af1782 
We shouldn't leak memory in unit tests in order
to make enabling ASAN easier.

(cherry picked from commit 55d12df)
@mergify
Merge of #13591
e980bca
@mergify
Merge of #13585
68d078c
@mergify
Merge of #13619
9da6f09
@mergify
Merge of #13609
2293221
@mergify
Merge of #13593
64eb6cb
@mergify
Merge of #13647
92935ac
@mergify
Merge of #13634
c4665cd
@mergify
Merge of #13611
1f47e07
@mergify
Merge of #13645
4a11a0a
@mergify
Merge of #13625
d88c272
@mergify
Merge of #13617
8cf76c2
@mergify
Merge of #13581
23978ac
@mergify
Merge of #13649
cd77c44
@github-actions github-actions bot added documentation c api Nix as a C library with a stable interface labels Jul 30, 2025
@mergify mergify bot closed this Jul 31, 2025
@mergify mergify bot deleted the mergify/merge-queue/30c7c605cd branch July 31, 2025 03:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314 Ericson2314 will be requested when the pull request is marked ready for review Ericson2314 is a code owner

@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

c api Nix as a C library with a stable interface documentation

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.