Skip to content

Upstream tracking #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 585 commits into
base: 2.28-maintenance
Choose a base branch
from
Draft

Upstream tracking #4

wants to merge 585 commits into from

Conversation

edolstra
Copy link
Collaborator

@edolstra edolstra commented Mar 5, 2025

Motivation

Not intended to be merged directly. This PR is a convenience to show the diff between upstream Nix and Determinate Nix (the detsys-main branch).

Context


Add 👍 to pull requests you find important.

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

lucperkins and others added 30 commits February 25, 2025 14:40
Bump version to 3.0.0, rename nix to determinate-nix
…r-follow-up

Consolidate security doc into one
…9c49104-90af-4ead-b554-78147516495c

Release v0.38.0
…b11bd48-ecd9-43e3-a256-95eba397ad1e

Release v0.38.1
The User-Agent now shows `curl/8.11.0 Nix/2.26.3
DeterminateNix/3.0.0`. This is useful for distinguishing Determinate
Nix from upstream Nix in binary cache logs.
Include DeterminateNix in the User-Agent header
This should fix a few packaging regressions.

`dev` also includes a merged `includes/`, which may be helpful until
inter-component includes are fixed properly.

(cherry picked from commit 4108529)
…/pr-12582

packaging/everything.nix: Use a multi-output derivation (backport NixOS#12582)
Apparently dead code in our use case, but good to keep nonetheless.
Credit: ztzg in NixOS#12498 (review)

(cherry picked from commit dcaea8c)
…/pr-12600

packaging: Typo in setVersionLayer / preConfigure (backport NixOS#12600)
Fixup propose-release: don't puke if the version number didn't change
…sess-impact-of-flakelock-url-change-between-nix-versions

Canonicalize flake input URLs before checking flake.lock file staleness, for dealing with `dir` in URL-style flakerefs
@github-actions github-actions bot temporarily deployed to production May 8, 2025 19:18 Inactive
@github-actions github-actions bot temporarily deployed to pull request May 8, 2025 19:21 Inactive
@github-actions github-actions bot temporarily deployed to production May 9, 2025 15:03 Inactive
@github-actions github-actions bot temporarily deployed to pull request May 9, 2025 15:09 Inactive
@github-actions github-actions bot temporarily deployed to production May 9, 2025 17:48 Inactive
@github-actions github-actions bot temporarily deployed to pull request May 9, 2025 17:56 Inactive
@github-actions github-actions bot temporarily deployed to production May 9, 2025 20:54 Inactive
@github-actions github-actions bot temporarily deployed to pull request May 9, 2025 20:55 Inactive
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants