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: a7829c70716b
Choose a base ref
...
head repository: NixOS/nix
compare: da404b5d81c1
Choose a head ref
  • 15 commits
  • 12 files changed
  • 6 contributors

Commits on Jan 21, 2021

  1. narinfo: Change NAR URLs to be addressed on the NAR hash instead of t…

    …he compressed hash
    
    This change is to simplify [Trustix](https://github.com/tweag/trustix) indexing and makes it possible to reconstruct this URL regardless of the compression used.
    
    In particular this means that https://github.com/tweag/trustix/blob/7c2e9ca597de233846e0b265fb081626ca6c59d8/contrib/nix/nar/nar.go#L61-L71 can be removed and only the bits that are required to establish trust needs to be published in the Trustix build logs.
    adisbladis committed Jan 21, 2021
    Copy the full SHA
    144cad9 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2021

  1. Add Stale bot

    The configuration was taken from nixpkgs repository and adjusted to
    `NixOS/nix`.
    
    A `stale` label was added to the labels (with gray color).
    
    Issues and PRs with `critical` label are excluded from interacting with the
    stale bot.
    garbas committed Feb 6, 2021
    Copy the full SHA
    6af26b7 View commit details
    Browse the repository at this point in the history
  2. typo

    garbas committed Feb 6, 2021
    Copy the full SHA
    91d8342 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2021

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

Commits on Feb 9, 2021

  1. Merge pull request #4464 from tweag/nar-narhash-addressed

    narinfo: Change NAR URLs to be addressed on the NAR hash instead of the compressed hash
    edolstra committed Feb 9, 2021
    Copy the full SHA
    ee3846b View commit details
    Browse the repository at this point in the history
  2. Revert "narinfo: Change NAR URLs to be addressed on the NAR hash inst…

    …ead of the compressed hash"
    grahamc committed Feb 9, 2021
    Copy the full SHA
    f224509 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2021

  1. Merge pull request #4526 from NixOS/add-stale-bot

    Add Stale bot
    edolstra committed Feb 10, 2021
    Copy the full SHA
    2d4e102 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #4535 from NixOS/revert-4464-nar-narhash-addressed

    Revert "narinfo: Change NAR URLs to be addressed on the NAR hash instead of the compressed hash"
    edolstra committed Feb 10, 2021
    Copy the full SHA
    4e98f03 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2021

  1. Don't crash nix-build when not all outputs are realised

    Change the `nix-build` logic for linking/printing the output paths to allow for
    some outputs to be missing. This might happen when the toplevel
    derivation didn't have to be built, either because all the required
    outputs were already there, or because they have all been substituted.
    thufschmitt committed Feb 16, 2021
    Copy the full SHA
    7c6c588 View commit details
    Browse the repository at this point in the history
  2. Test the garbage collection of CA derivations

    Simple test to ensure that `nix-build && nix-collect-garbage &&
    nix-build -j0` works as it should
    thufschmitt committed Feb 16, 2021
    Copy the full SHA
    d3af4f3 View commit details
    Browse the repository at this point in the history
  3. Register the realisations for unresolved drvs

    Once a build is done, get back to the original derivation, and register
    all the newly built outputs for this derivation.
    
    This allows Nix to work properly with derivations that don't have all
    their build inputs available − thus allowing garbage collection and
    (once it's implemented) binary substitution
    thufschmitt committed Feb 16, 2021
    Copy the full SHA
    e5c927e View commit details
    Browse the repository at this point in the history
  4. Syntactic fixes

    Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
    2 people authored and thufschmitt committed Feb 16, 2021
    Copy the full SHA
    dcab172 View commit details
    Browse the repository at this point in the history
  5. Don't expose the "bang" drvoutput syntax

    It's not fixed nor useful atm, so better keep it hidden
    
    Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
    2 people authored and thufschmitt committed Feb 16, 2021
    Copy the full SHA
    12c2674 View commit details
    Browse the repository at this point in the history
  6. Store the output hashes in the initialOutputs of the drv goal

    That way we
    1. Don't have to recompute them several times
    2. Can compute them in a place where we know the type of the parent
      derivation, meaning that we don't need the casting dance we had before
    thufschmitt committed Feb 16, 2021
    Copy the full SHA
    413ecb7 View commit details
    Browse the repository at this point in the history
  7. Remove the drv resolution caching mechanism

    It isn't needed anymore now that don't need to eagerly resolve
    everything like we used to do. So we can safely get rid of it
    thufschmitt committed Feb 16, 2021
    Copy the full SHA
    da404b5 View commit details
    Browse the repository at this point in the history