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: 2557e8aecd63
Choose a base ref
...
head repository: NixOS/nix
compare: 3ac9d74eb1de
Choose a head ref
  • 8 commits
  • 24 files changed
  • 2 contributors

Commits on Dec 9, 2020

  1. Use no substituers by default in the tests

    Otherwise https://cache.nixos.org is chosen by default, causing the OSX
    testsuite to hang inside the sandbox.
    
    (In a way, this is probably rugging an actual bug under the carpet as
    Nix should be able to gracefully timeout in such a case, but that's
    beyond mac OSX-fu)
    thufschmitt committed Dec 9, 2020
    Copy the full SHA
    5286310 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #4343 from tweag/fix-osx-ci

    Use no substituers by default in the tests
    edolstra committed Dec 9, 2020
    Copy the full SHA
    29fbc3c View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2020

  1. Add lvlNotice log level

    This is like syslog's LOG_NOTICE: "normal, but significant,
    condition".
    edolstra committed Dec 10, 2020
    Copy the full SHA
    a8f533b View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    c6a1bcd View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2020

  1. Fix the nix command with CA derivations

    Prevents a crash because most `nix` subcommands assumed that derivations
    know their output path, which isn't the case for CA derivations
    thufschmitt committed Dec 11, 2020
    Copy the full SHA
    eb45308 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #4350 from NixOS/ca/fix-build-with-nix-command

    Fix the `nix` command with CA derivations
    edolstra committed Dec 11, 2020
    Copy the full SHA
    9c143c4 View commit details
    Browse the repository at this point in the history
  3. Store metadata about drv outputs realisations

    For each known realisation, store:
    - its output
    - its output path
    
    This comes with a set of needed changes:
    
    - New `realisations` module declaring the types needed for describing
      these mappings
    - New `Store::registerDrvOutput` method registering all the needed informations
      about a derivation output (also replaces `LocalStore::linkDeriverToPath`)
    - new `Store::queryRealisation` method to retrieve the informations for a
      derivations
    
    This introcudes some redundancy on the remote-store side between
    `wopQueryDerivationOutputMap` and `wopQueryRealisation`.
    However we might need to keep both (regardless of backwards compat)
    because we sometimes need to get some infos for all the outputs of a
    derivation (where `wopQueryDerivationOutputMap` is handy), but all the
    stores can't implement it − because listing all the outputs of a
    derivation isn't really possible for binary caches where the server
    doesn't allow to list a directory.
    thufschmitt committed Dec 11, 2020
    Copy the full SHA
    58cdab6 View commit details
    Browse the repository at this point in the history
  4. Rework the db schema for derivation outputs

    Add a new table for tracking the derivation output mappings.
    
    We used to hijack the `DerivationOutputs` table for that, but (despite its
    name), it isn't a really good fit:
    
    - Its entries depend on the drv being a valid path, making it play badly with
      garbage collection and preventing us to copy a drv output without copying
      the whole drv closure too;
    - It dosen't guaranty that the output path exists;
    
    By using a different table, we can experiment with a different schema better
    suited for tracking the output mappings of CA derivations.
    (incidentally, this also fixes #4138)
    thufschmitt committed Dec 11, 2020
    Copy the full SHA
    3ac9d74 View commit details
    Browse the repository at this point in the history