Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
base: 061e32dd3eb1
Choose a base ref
...
head repository: NixOS/nix
compare: 192e3ef442fe
Choose a head ref
  • 15 commits
  • 9 files changed
  • 4 contributors

Commits on May 5, 2020

  1. Copy the full SHA
    04967de View commit details
    Browse the repository at this point in the history

Commits on May 8, 2020

  1. Copy the full SHA
    14073fb View commit details
    Browse the repository at this point in the history
  2. 1
    Copy the full SHA
    772e5db View commit details
    Browse the repository at this point in the history

Commits on May 14, 2020

  1. Copy the full SHA
    183dd28 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2020

  1. actions: use latest OS

    domenkozar committed May 15, 2020
    Copy the full SHA
    546b179 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2020

  1. Remove -j option from simple-build-testing

    By default Nix/NixOS already set a reasonable default `max-jobs = auto`
    so we don't need to mention it in this tutorial.
    The option is still documented in other parts of the documentation
    if users ever stumble over this.
    
    Fixes #2531
    Mic92 committed May 16, 2020
    Copy the full SHA
    e223eea View commit details
    Browse the repository at this point in the history

Commits on May 18, 2020

  1. Merge pull request #3592 from Mic92/doc-fixes

    Remove -j option from simple-build-testing
    edolstra committed May 18, 2020
    Copy the full SHA
    2e16186 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    0ed946a View commit details
    Browse the repository at this point in the history
  3. Cleanup

    edolstra committed May 18, 2020
    Copy the full SHA
    5ef64f0 View commit details
    Browse the repository at this point in the history
  4. Dynamically allocate UIDs

    Rather than rely on a nixbld group, we now allocate UIDs/GIDs
    dynamically starting at a configurable ID (872415232 by default).
    
    Also, we allocate 2^18 UIDs and GIDs per build, and run the build as
    root in its UID namespace. (This should not be the default since it
    breaks some builds. We probably should enable this conditional on a
    requiredSystemFeature.) The goal is to be able to run (NixOS)
    containers in a build. However, this will also require some cgroup
    initialisation.
    
    The 2^18 UIDs/GIDs is intended to provide enough ID space to run
    multiple containers per build, e.g. for distributed NixOS tests.
    edolstra committed May 18, 2020
    Copy the full SHA
    019e9e3 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    d1df286 View commit details
    Browse the repository at this point in the history
  6. Run builds in their own cgroup

    Also, run builds in a cgroup namespace (ensuring /proc/self/cgroup
    doesn't leak information about the outside world) and mount /sys. This
    enables running systemd-nspawn and thus NixOS containers in a Nix
    build.
    edolstra committed May 18, 2020
    Copy the full SHA
    0a128dd View commit details
    Browse the repository at this point in the history
  7. Reduce # of UIDs per build to 65536

    2^18 was overkill. The idea was to enable multiple containers to run
    inside a build. However, those containers can use the same UID range -
    we don't really care about perfect isolation between containers inside
    a build.
    edolstra committed May 18, 2020
    Copy the full SHA
    135ef6c View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    fa49bfa View commit details
    Browse the repository at this point in the history
  9. Simplify cgroup creation

    edolstra committed May 18, 2020
    Copy the full SHA
    192e3ef View commit details
    Browse the repository at this point in the history