Upstream tracking #4
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This avoids timeouts like those seen in https://github.com/NixOS/nix/actions/runs/13376958708/job/37358120348?pr=6962. (cherry picked from commit 11c42cb)
…/pr-12497 Don't override default man search paths (backport NixOS#12497)
…/pr-12499 startDaemon(): Detect if the daemon crashes before creating the socket (backport NixOS#12499)
Tagging release 2.26.2
For when the overlay is used with nixos-unstable. 1.9.0 has our patches. (cherry picked from commit b0bbb12)
…/pr-12484 Support libgit2 1.9.0 (backport NixOS#12484)
Sync with Nix 2.26.2
... as intended.
Requirements:
- don't build fresh libraries for each git commit
- have git commit in the CLI
Bug:
- echo ${version} went into the wrong file => use the fact that it's
a symlink, not just for reading but also for writing.
(cherry picked from commit bba4e6b)
This way it's easier to get right. See previous commit. (cherry picked from commit 3556f6b)
(cherry picked from commit 2b5365b)
…/pr-12498 Restore detailed Nix CLI version (backport NixOS#12498)
This makes it easier to implement batch overriding for the components. (cherry picked from commit cca0140)
(cherry picked from commit f31d862)
(cherry picked from commit 48fb6fd)
(cherry picked from commit 03efba3)
(cherry picked from commit 0dbe28a)
This makes `nix.version` quicker to evaluate, which should speed up package listing operations. If you want an accurate count, use `lib.optionals` in your override instead of `null` values. (cherry picked from commit d47e3c9)
... from nixpkgs, my bad. (cherry picked from commit f0bdb65)
…/pr-12503 Overriding the componentized build (backport NixOS#12503)
... when nixpkgs is nixos-unstable or the overlay is used. (cherry picked from commit 5488e29)
…/pr-12518 packaging: Restore libgit2 USE_SSH=exec (backport NixOS#12518)
…rwin Test on x86_64-darwin
Curl creates sockets without setting FD_CLOEXEC/SOCK_CLOEXEC, this can cause connections to remain open forever when using commands like `nix shell` This change sets the FD_CLOEXEC flag using a CURLOPT_SOCKOPTFUNCTION callback. (cherry picked from commit 12d2527)
…/pr-12439 Set FD_CLOEXEC on sockets created by curl (backport NixOS#12439)
…2-2b4c-4741-9fb8-959a7cf48281 Release v3.2.1
Tagging release 2.28.0
Tagging release 2.28.1
Sync with upstream 2.28.1
ci: manual: don't try to comment on the perpetual PR
This allows subcommands to declare aliases, e.g. `nix store ping` is now a proper alias of `nix store info`.
…tall-to-add Rename `nix profile install` to `nix profile add`
…a-6093-4d14-8780-4e4103b77863 Release v3.3.0
…2-faca-451d-8b79-7a950f146b77 Release v3.3.1
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Not intended to be merged directly. This PR is a convenience to show the diff between upstream Nix and Determinate Nix (the
detsys-mainbranch).Context
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.